openall_time_applet 0.0.17 → 0.0.18

data/VERSION

@@ -1 +1 @@
-0.0.17
+0.0.18

data/bin/OpenAll Timelogging

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby1.9.1
+
+#This custom script is to manipulate the tray-text for Gnome Shell.
+
+Dir.chdir(File.dirname(__FILE__))
+require "../lib/openall_time_applet.rb"
+
+GetText.bindtextdomain("default", "../locales", ENV["LANGUAGE"])
+
+oata = Openall_time_applet.new(:debug => true)
+
+Gtk.main

data/gui/trayicon.rb

@@ -121,20 +121,7 @@ class Openall_time_applet::Gui::Trayicon
       
       #Get main-window-object.
       win_main = Knj::Gtk2::Window.get("main")
-      
-      if !win_main.gui["expOverview"].expanded?
-        #If the expander isnt expanded, call the activate and wait a bit before calling the plus-button.
-        win_main.gui["expOverview"].activate
-        
-        Gtk.timeout_add(250) do
-          #Make a "plus"-click which adds a new task.
-          win_main.gui["btnPlus"].clicked
-          false
-        end
-      else
-        #If the expander is already expanded, then call the plus-button instantly to prevent the "laggy" feeling that would otherwise have occurred because of the timeout.
-        win_main.gui["btnPlus"].clicked
-      end
+      win_main.gui["txtDescr"].grab_focus
     end
     
     menu.append(Gtk::SeparatorMenuItem.new)

data/gui/win_main.rb

@@ -23,6 +23,34 @@ class Openall_time_applet::Gui::Win_main
       tasks << task
     end
     
+    
+    #Set up completion for description entry.
+    ec = Gtk::EntryCompletion.new
+    ec.model = Gtk::ListStore.new(String)
+    ec.text_column = 0
+    @gui["txtDescr"].completion = ec
+    
+    added = {}
+    @args[:oata].ob.list(:Worktime, {"orderby" => "timestamp"}) do |worktime|
+      next if added.key?(worktime[:comment])
+      added[worktime[:comment]] = true
+      ec.model.append[0] = worktime[:comment]
+    end
+    
+    @args[:oata].ob.list(:Timelog, {"orderby" => "descr"}) do |timelog|
+      next if added.key?(timelog[:descr])
+      added[timelog[:descr]] = true
+      ec.model.append[0] = timelog[:descr]
+    end
+    
+    ec.signal_connect("match-selected") do |me, model, iter|
+      text = model.get_value(iter, 0)
+      me.entry.text = text
+      true
+    end
+    
+    
+    
     #Add the tasks to the combo-box.
     @gui["cbTask"].init(tasks)
     
@@ -194,14 +222,21 @@ class Openall_time_applet::Gui::Win_main
     end
   end
   
+  #Removes all timelogs from the treeview and adds them again. Does nothing if the 'dont_reload'-variable is set.
   def reload_timelogs
     return nil if @dont_reload or @gui["tvTimelogs"].destroyed?
     @gui["tvTimelogs"].model.clear
-    @args[:oata].ob.list(:Timelog, {"orderby" => "id"}) do |timelog|
+    @args[:oata].ob.list(:Timelog, {"orderby" => [["timestamp", "desc"]]}) do |timelog|
+      begin
+        tstamp_str = timelog.timestamp_str
+      rescue => e
+        tstamp_str = "[#{_("error")}: #{e.message}"
+      end
+      
       @gui["tvTimelogs"].append([
         timelog.id,
         Knj::Web.html(timelog[:descr]),
-        timelog.timestamp_str,
+        tstamp_str,
         timelog.time_as_human,
         timelog.time_transport_as_human,
         Knj::Locales.number_out(timelog[:transportlength], 0),

data/openall_time_applet.gemspec

@@ -5,15 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openall_time_applet}
-  s.version = "0.0.17"
+  s.version = "0.0.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-06-29}
-  s.default_executable = %q{openall_time_applet.rb}
+  s.date = %q{2012-07-05}
   s.description = %q{Off-line time-tracking for OpenAll with syncing when online.}
   s.email = %q{k@spernj.org}
-  s.executables = ["openall_time_applet.rb"]
+  s.executables = ["OpenAll Timelogging", "openall_time_applet.rb"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -27,6 +26,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "bin/OpenAll Timelogging",
     "bin/openall_time_applet.rb",
     "classes/connection.rb",
     "classes/translations.rb",

metadata

@@ -2,7 +2,7 @@
 name: openall_time_applet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,8 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-29 00:00:00 +02:00
-default_executable: openall_time_applet.rb
+date: 2012-07-05 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: knjrbfw
@@ -137,6 +137,7 @@ dependencies:
 description: Off-line time-tracking for OpenAll with syncing when online.
 email: k@spernj.org
 executables: 
+- OpenAll Timelogging
 - openall_time_applet.rb
 extensions: []
 
@@ -152,6 +153,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/OpenAll Timelogging
 - bin/openall_time_applet.rb
 - classes/connection.rb
 - classes/translations.rb
@@ -196,7 +198,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -398963777850608738
+      hash: -1991198915258529709
       segments: 
       - 0
       version: "0"