openall_time_applet 0.0.14 → 0.0.15

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.0.15

data/conf/db_schema.rb

@@ -35,6 +35,7 @@ Openall_time_applet::DB_SCHEMA = {
         {"name" => "task_id", "type" => "int"},
         {"name" => "timestamp", "type" => "datetime"},
         {"name" => "time", "type" => "int"},
+        {"name" => "time_sync", "type" => "varchar"},
         {"name" => "timetype", "type" => "enum", "maxlength" => "'normal','overtime150','overtime200'", "default" => "normal"},
         {"name" => "time_transport", "type" => "int"},
         {"name" => "transportlength", "type" => "int"},
@@ -50,6 +51,17 @@ Openall_time_applet::DB_SCHEMA = {
         "task_id"
       ]
     },
+    "Timelog_logged_time" => {
+      "columns" => [
+        {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
+        {"name" => "timelog_id", "type" => "int"},
+        {"name" => "timestamp_start", "type" => "datetime"},
+        {"name" => "timestamp_end", "type" => "datetime"}
+      ],
+      "indexes" => [
+        "timelog_id"
+      ]
+    },
     "Worktime" => {
       "columns" => [
         {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},

data/glade/win_main.glade

@@ -14,6 +14,7 @@
   </object>
   <object class="GtkWindow" id="window">
     <property name="can_focus">False</property>
+    <property name="title" translatable="yes">OpenAll Time Applet</property>
     <property name="window_position">center</property>
     <property name="default_width">640</property>
     <signal name="destroy" handler="on_window_destroy" swapped="no"/>

data/glade/win_sync_overview.glade

@@ -6,7 +6,9 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Overview of sync</property>
     <property name="window_position">center</property>
-    <property name="default_width">640</property>
+    <property name="default_width">850</property>
+    <property name="default_height">480</property>
+    <signal name="destroy" handler="on_window_destroy" swapped="no"/>
     <child>
       <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
@@ -28,44 +30,22 @@
                     <property name="can_focus">False</property>
                     <property name="spacing">3</property>
                     <child>
-                      <object class="GtkTable" id="tableTimelogs">
+                      <object class="GtkViewport" id="viewport1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="n_columns">3</property>
                         <child>
-                          <object class="GtkLabel" id="label3">
+                          <object class="GtkScrolledWindow" id="scrolledwindow1">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Timelog&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label4">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Logged time&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="right_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label5">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Sync. as time&lt;/b&gt;</property>
-                            <property name="use_markup">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="hscrollbar_policy">automatic</property>
+                            <property name="vscrollbar_policy">automatic</property>
+                            <child>
+                              <object class="GtkTreeView" id="tvTimelogs">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                              </object>
+                            </child>
                           </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="right_attach">3</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -98,7 +78,7 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
+                        <property name="expand">False</property>
                         <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
@@ -111,24 +91,26 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;Sync with OpenAll&lt;/b&gt;</property>
+                <property name="label" translatable="yes">&lt;b&gt;Prepare synchronization&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
               </object>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
+            <property name="expand">True</property>
             <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label1">
+          <object class="GtkLabel" id="labTotal">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">[totals]</property>
           </object>
           <packing>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="position">1</property>
           </packing>

data/gui/win_main.rb

@@ -128,16 +128,6 @@ class Openall_time_applet::Gui::Win_main
     end
   end
   
-  def on_tvTimelogs_row_activated(*args)
-    row = @gui["tvTimelogs"].sel
-    return nil if !row
-    
-    timelog = @args[:oata].ob.get(:Timelog, row[0])
-    win_timelog_edit = @args[:oata].show_timelog_edit(timelog)
-    win_timelog_edit.gui["window"].modal = @gui["window"]
-    win_timelog_edit.gui["window"].transient_for = @gui["window"]
-  end
-  
   def on_imiQuit_activate
     @gui["window"].destroy
   end
@@ -180,7 +170,7 @@ class Openall_time_applet::Gui::Win_main
   end
   
   def on_btnSync_clicked
-    @args[:oata].sync_static do
+    @args[:oata].sync_static("transient_for" => @gui["window"]) do
       @args[:oata].sync
     end
   end

data/gui/win_sync_overview.rb

@@ -6,30 +6,95 @@ class Openall_time_applet::Gui::Win_sync_overview
     @gui = Gtk::Builder.new.add("../glade/win_sync_overview.glade")
     @gui.translate
     @gui.connect_signals{|h|method(h)}
-    @gui["btnSync"].label = _("Synchronize")
+    @gui["btnSync"].label = _("Transfer")
     
-    #This hash holds the text-widgets which time, which are used to update the timelogs later.
-    @sync_time_text_widgets = {}
+    #Generate list-store containing tasks for the task-column.
+    task_ls = Gtk::ListStore.new(String, String)
+    iter = task_ls.append
+    iter[0] = _("None")
+    iter[1] = 0.to_s
     
+    tasks = [_("Choose:")]
+    @args[:oata].ob.list(:Task, {"orderby" => "title"}) do |task|
+      iter = task_ls.append
+      iter[0] = task[:title]
+      iter[1] = task.id.to_s
+      tasks << task
+    end
+    
+    #Initialize timelog treeview.
+    init_data = Knj::Gtk2::Tv.init(@gui["tvTimelogs"], [
+      _("ID"),
+      _("Description"),
+      _("Timestamp"),
+      _("Time"),
+      _("Transport"),
+      _("Length"),
+      _("Transport descr."),
+      _("Transport costs"),
+      {
+        :title => _("Fixed travel"),
+        :type => :toggle
+      },
+      {
+        :title => _("Int. work"),
+        :type => :toggle
+      },
+      {
+        :title => _("Sync?"),
+        :type => :toggle
+      },
+      {
+        :title => _("Task"),
+        :type => :combo,
+        :model => task_ls,
+        :has_entry => false
+      },
+      _("Sync time")
+    ])
+    
+    #Make columns editable.
+    Knj::Gtk2::Tv.editable_text_renderers_to_model(
+      :ob => @args[:oata].ob,
+      :tv => @gui["tvTimelogs"],
+      :model_class => :Timelog,
+      :renderers => init_data[:renderers],
+      :change_before => proc{ @dont_reload = true },
+      :change_after => proc{ @dont_reload = false; self.update_totals },
+      :cols => {
+        1 => :descr,
+        2 => {:col => :timestamp, :type => :datetime},
+        3 => {:col => :time, :type => :time_as_sec},
+        4 => {:col => :time_transport, :type => :time_as_sec},
+        5 => {:col => :transportlength, :type => :int},
+        6 => {:col => :transportdescription},
+        7 => {:col => :transportcosts, :type => :human_number, :decimals => 2},
+        8 => {:col => :travelfixed},
+        9 => {:col => :workinternal},
+        10 => {:col => :sync_need},
+        11 => {
+          :col => :task_id,
+          :value_callback => lambda{ |data|
+            task = @args[:oata].ob.get_by(:Task, {"title" => data[:value]})
+            
+            if !task
+              return 0
+            else
+              return task.id
+            end
+          },
+          :value_set_callback => proc{ |data| data[:model].task_name }
+        },
+        12 => {:col => :time_sync, :type => :time_as_sec}
+      }
+    )
+    @gui["tvTimelogs"].columns[0].visible = false
+    
+    
+=begin
     rowc = 1
     @args[:oata].ob.list(:Timelog, {"sync_need" => 1, "task_id_not" => 0}) do |timelog|
-      #Read time and transport from timelog.
-      time = timelog[:time].to_i
-      transport = timelog[:time_transport].to_i
-      
-      #If transport is logged, then the work if offsite. It should be rounded up by 30 min. Else 15 min. round up.
-      if transport > 0
-        roundup = 1800
-      else
-        roundup = 900
-      end
       
-      #Do the actual counting.
-      count_rounded_time = 0
-      loop do
-        break if count_rounded_time >= time
-        count_rounded_time += roundup
-      end
       
       #Spawn widgets.
       timelog_label = Gtk::Label.new(timelog[:descr])
@@ -42,6 +107,7 @@ class Openall_time_applet::Gui::Win_sync_overview
       
       sync_time_text = Gtk::Entry.new
       sync_time_text.text = Knj::Strings.secs_to_human_time_str(count_rounded_time)
+      sync_time_text.signal_connect(:changed, &self.method(:on_syncTimeText_changed))
       @sync_time_text_widgets[timelog.id] = sync_time_text
       
       #Attach widgets in table.
@@ -51,8 +117,14 @@ class Openall_time_applet::Gui::Win_sync_overview
       
       rowc += 1
     end
+=end
     
-    if rowc == 1
+    self.reload_timelogs
+    self.update_totals
+    
+    @reload_id = @args[:oata].ob.connect("object" => :Timelog, "signals" => ["add", "update", "delete"], &self.method(:reload_timelogs))
+    
+    if @timelogs_count <= 0
       #Show error-message and destroy the window, if no timelogs was to be synced.
       Knj::Gtk2.msgbox("msg" => _("There is nothing to sync at this time."), "run" => false)
       @gui["window"].destroy
@@ -62,20 +134,53 @@ class Openall_time_applet::Gui::Win_sync_overview
     end
   end
   
-  def on_btnSync_clicked
-    begin
-      #Go through the shown timelogs and update their time to the entered and rounded time.
-      @sync_time_text_widgets.each do |timelog_id, sync_time_text|
-        timelog = @args[:oata].ob.get(:Timelog, timelog_id)
-        secs = Knj::Strings.human_time_str_to_secs(sync_time_text.text)
-        if !Knj::Php.is_numeric(secs)
-          raise sprintf(_("Time was not numeric for: '%s'."), timelog[:descr])
-        end
-        
-        #Update the time so that is what will be synchronized.
-        timelog[:time] = secs
+  def reload_timelogs
+    return nil if @dont_reload or @gui["tvTimelogs"].destroyed?
+    @gui["tvTimelogs"].model.clear
+    @timelogs_count = 0
+    @args[:oata].ob.list(:Timelog, {"sync_need" => 1, "task_id_not" => 0, "orderby" => "timestamp"}) do |timelog|
+      #Read time and transport from timelog.
+      time = timelog[:time].to_i
+      transport = timelog[:time_transport].to_i
+      
+      #If transport is logged, then the work if offsite. It should be rounded up by 30 min. Else 15 min. round up.
+      if transport > 0
+        roundup = 1800
+      else
+        roundup = 900
+      end
+      
+      #Do the actual counting.
+      count_rounded_time = 0
+      loop do
+        break if count_rounded_time >= time
+        count_rounded_time += roundup
       end
       
+      #Set sync-time on timelog.
+      timelog[:time_sync] = count_rounded_time
+      
+      Knj::Gtk2::Tv.append(@gui["tvTimelogs"], [
+        timelog.id,
+        timelog[:descr],
+        timelog.timestamp_str,
+        timelog.time_as_human,
+        timelog.time_transport_as_human,
+        Knj::Locales.number_out(timelog[:transportlength], 0),
+        timelog.transport_descr_short,
+        Knj::Locales.number_out(timelog[:transportcosts], 2),
+        Knj::Strings.yn_str(timelog[:travelfixed], true, false),
+        Knj::Strings.yn_str(timelog[:workinternal], true, false),
+        Knj::Strings.yn_str(timelog[:sync_need], true, false),
+        timelog.task_name,
+        Knj::Strings.secs_to_human_time_str(count_rounded_time)
+      ])
+      @timelogs_count += 1
+    end
+  end
+  
+  def on_btnSync_clicked
+    begin
       #Destroy this window and start syncing for real.
       @gui["window"].destroy
       @args[:oata].sync_real
@@ -83,4 +188,25 @@ class Openall_time_applet::Gui::Win_sync_overview
       Knj::Gtk2.msgbox(Knj::Errors.error_str(e))
     end
   end
+  
+  def update_totals
+    total_secs = 0
+    
+    @gui["tvTimelogs"].model.each do |model, path, iter|
+      time_val = @gui["tvTimelogs"].model.get_value(iter, 12)
+      
+      begin
+        total_secs += Knj::Strings.human_time_str_to_secs(time_val)
+      rescue
+        #ignore - user is properly entering stuff.
+      end
+    end
+    
+    @gui["labTotal"].markup = "<b>#{_("Total hours:")}</b> #{Knj::Strings.secs_to_human_time_str(total_secs)}"
+  end
+  
+  def on_window_destroy
+    #Unconnect reload-event. Else it will crash on call to destroyed object. Also frees up various ressources.
+    @args[:oata].ob.unconnect("object" => :Timelog, "conn_id" => @reload_id)
+  end
 end

data/lib/openall_time_applet.rb

@@ -239,18 +239,6 @@ class Openall_time_applet
     end
   end
   
-  def show_timelog_new
-    Knj::Gtk2::Window.unique!("timelog_new") do
-      Openall_time_applet::Gui::Win_timelog_edit.new(:oata => self)
-    end
-  end
-  
-  def show_timelog_edit(timelog)
-    Knj::Gtk2::Window.unique!("timelog_edit_#{timelog.id}") do
-      Openall_time_applet::Gui::Win_timelog_edit.new(:oata => self, :timelog => timelog)
-    end
-  end
-  
   def show_overview
     Knj::Gtk2::Window.unique!("overview") do
       Openall_time_applet::Gui::Win_overview.new(:oata => self)
@@ -284,7 +272,7 @@ class Openall_time_applet
   
   #Synchronizes organisations, tasks and worktimes.
   def sync_static(args = nil)
-    sw = Knj::Gtk2::StatusWindow.new
+    sw = Knj::Gtk2::StatusWindow.new("transient_for" => args["transient_for"])
     
     return Knj::Thread.new do
       begin
@@ -301,11 +289,11 @@ class Openall_time_applet
         sw.percent = 1
         
         sleep 1 if !block_given?
-        sw.destroy
+        sw.destroy if sw
         sw = nil
         yield if block_given?
       rescue => e
-        sw.destroy
+        sw.destroy if sw
         sw = nil
         Knj::Gtk2.msgbox("msg" => Knj::Errors.error_str(e), "type" => "warning", "title" => _("Error"), "run" => false)
       ensure
@@ -353,6 +341,7 @@ class Openall_time_applet
         :time => @timelog_active[:time].to_i + secs_passed,
         :sync_need => 1
       )
+      @timelog_logged_time[:timestamp_end] = Time.now
     end
     
     @timelog_active = nil
@@ -362,10 +351,33 @@ class Openall_time_applet
   
   #Sets a new timelog to track. Stops tracking of previous timelog if already tracking.
   def timelog_active=(timelog)
-    self.timelog_stop_tracking
+    begin
+      #Check if there has been logged time another day - if so, clone it and begin logging on the clone instead.
+      tlt = @ob.list(:Timelog_logged_time, {
+        "timelog" => timelog,
+        "timestamp_start_day_not" => Time.now,
+        "limit" => 1
+      })
+      if !tlt.empty?
+        timelog = @ob.add(:Timelog, {
+          :task_id => timelog[:task_id],
+          :timestamp => Time.now,
+          :descr => timelog[:descr],
+          :transportdescription => timelog[:transportdescription],
+          :workinternal => timelog[:workinternal],
+          :timetype => timelog[:timetype]
+        })
+        #raise sprintf(_("You have already logged on this timelog on %s"), tlt.first.timestamp_start.out)
+      end
+      
+      self.timelog_stop_tracking
+      @timelog_logged_time = @ob.add(:Timelog_logged_time, {:timelog_id => timelog.id})
+      @timelog_active = timelog
+      @timelog_active_time = Time.new
+    rescue => e
+      Knj::Gtk2.msgbox("msg" => Knj::Errors.error_str(e), "type" => "warning", "title" => _("Error"), "run" => false)
+    end
     
-    @timelog_active = timelog
-    @timelog_active_time = Time.new
     @ti.update_icon if @ti
   end
   

data/models/timelog.rb

@@ -3,6 +3,10 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
     :Task
   ]
   
+  has_many [
+    {:class => :Timelog_logged_time, :col => :timelog_id, :method => :logged_times, :autodelete => true}
+  ]
+  
   def initialize(*args, &block)
     super(*args, &block)
     
@@ -22,7 +26,7 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
     args[:oata].oa_conn do |conn|
       #Go through timelogs that needs syncing and has a task set.
       self.ob.list(:Timelog, {"sync_need" => 1, "task_id_not" => 0}) do |timelog|
-        secs_sum = timelog[:time].to_i + timelog[:time_transport].to_i
+        secs_sum = timelog[:time_sync].to_i + timelog[:time_transport].to_i
         next if secs_sum <= 0
         
         #The timelog has not yet been created in OpenAll - create it!

data/models/timelog_logged_time.rb

@@ -0,0 +1,9 @@
+class Openall_time_applet::Models::Timelog_logged_time < Knj::Datarow
+  has_one [
+    {:class => :Timelog, :col => :timelog_id, :method => :timelog, :depends => true}
+  ]
+  
+  def self.add(d)
+    d.data[:timestamp_start] = Time.now if !d.data[:timestamp_start]
+  end
+end

data/openall_time_applet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openall_time_applet}
-  s.version = "0.0.14"
+  s.version = "0.0.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-06-18}
+  s.date = %q{2012-06-25}
   s.default_executable = %q{openall_time_applet.rb}
   s.description = %q{Off-line time-tracking for OpenAll with syncing when online.}
   s.email = %q{k@spernj.org}
@@ -40,14 +40,11 @@ Gem::Specification.new do |s|
     "glade/win_overview.glade",
     "glade/win_preferences.glade",
     "glade/win_sync_overview.glade",
-    "glade/win_timelog_edit.glade",
     "glade/win_worktime_overview.glade",
     "gui/trayicon.rb",
     "gui/win_main.rb",
-    "gui/win_overview.rb",
     "gui/win_preferences.rb",
     "gui/win_sync_overview.rb",
-    "gui/win_timelog_edit.rb",
     "gui/win_worktime_overview.rb",
     "lib/openall_time_applet.rb",
     "locales/da_DK/LC_MESSAGES/default.mo",
@@ -55,6 +52,7 @@ Gem::Specification.new do |s|
     "models/organisation.rb",
     "models/task.rb",
     "models/timelog.rb",
+    "models/timelog_logged_time.rb",
     "models/worktime.rb",
     "openall_time_applet.gemspec",
     "spec/openall_time_applet_spec.rb",

metadata

@@ -2,7 +2,7 @@
 name: openall_time_applet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-18 00:00:00 +02:00
+date: 2012-06-25 00:00:00 +02:00
 default_executable: openall_time_applet.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -165,14 +165,11 @@ files:
 - glade/win_overview.glade
 - glade/win_preferences.glade
 - glade/win_sync_overview.glade
-- glade/win_timelog_edit.glade
 - glade/win_worktime_overview.glade
 - gui/trayicon.rb
 - gui/win_main.rb
-- gui/win_overview.rb
 - gui/win_preferences.rb
 - gui/win_sync_overview.rb
-- gui/win_timelog_edit.rb
 - gui/win_worktime_overview.rb
 - lib/openall_time_applet.rb
 - locales/da_DK/LC_MESSAGES/default.mo
@@ -180,6 +177,7 @@ files:
 - models/organisation.rb
 - models/task.rb
 - models/timelog.rb
+- models/timelog_logged_time.rb
 - models/worktime.rb
 - openall_time_applet.gemspec
 - spec/openall_time_applet_spec.rb
@@ -198,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2439131216522647471
+      hash: 1181471258583995936
       segments: 
       - 0
       version: "0"

data/glade/win_timelog_edit.glade

@@ -1,440 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="2.24"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkWindow" id="window">
-    <property name="can_focus">False</property>
-    <property name="title" translatable="yes">Timelog</property>
-    <property name="window_position">center</property>
-    <property name="default_width">360</property>
-    <child>
-      <object class="GtkVBox" id="vbox1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <child>
-          <object class="GtkFrame" id="frame1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <object class="GtkAlignment" id="alignment1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkTable" id="table1">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="n_rows">13</property>
-                    <property name="n_columns">2</property>
-                    <property name="column_spacing">3</property>
-                    <property name="row_spacing">3</property>
-                    <child>
-                      <object class="GtkLabel" id="label3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Description</property>
-                      </object>
-                      <packing>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label4">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Time</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="txtTime">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">•</property>
-                        <property name="primary_icon_activatable">False</property>
-                        <property name="secondary_icon_activatable">False</property>
-                        <property name="primary_icon_sensitive">True</property>
-                        <property name="secondary_icon_sensitive">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">1</property>
-                        <property name="bottom_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label5">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Transport</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="txtTimeTransport">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">•</property>
-                        <property name="primary_icon_activatable">False</property>
-                        <property name="secondary_icon_activatable">False</property>
-                        <property name="primary_icon_sensitive">True</property>
-                        <property name="secondary_icon_sensitive">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">2</property>
-                        <property name="bottom_attach">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Task</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">10</property>
-                        <property name="bottom_attach">11</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="cbTask">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">10</property>
-                        <property name="bottom_attach">11</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="cbShouldSync">
-                        <property name="label" translatable="yes">Should sync</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">11</property>
-                        <property name="bottom_attach">12</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="cbStartTracking">
-                        <property name="label" translatable="yes">Start tracking after saving</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">12</property>
-                        <property name="bottom_attach">13</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="txtDescr">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">•</property>
-                        <property name="primary_icon_activatable">False</property>
-                        <property name="secondary_icon_activatable">False</property>
-                        <property name="primary_icon_sensitive">True</property>
-                        <property name="secondary_icon_sensitive">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label7">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Transport length</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label8">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Transport costs</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="txtTransportLength">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">•</property>
-                        <property name="primary_icon_activatable">False</property>
-                        <property name="secondary_icon_activatable">False</property>
-                        <property name="primary_icon_sensitive">True</property>
-                        <property name="secondary_icon_sensitive">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">3</property>
-                        <property name="bottom_attach">4</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="txtTransportCosts">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">•</property>
-                        <property name="primary_icon_activatable">False</property>
-                        <property name="secondary_icon_activatable">False</property>
-                        <property name="primary_icon_sensitive">True</property>
-                        <property name="secondary_icon_sensitive">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">4</property>
-                        <property name="bottom_attach">5</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label9">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Transport description</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">5</property>
-                        <property name="bottom_attach">6</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="txtTransportDescr">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">•</property>
-                        <property name="primary_icon_activatable">False</property>
-                        <property name="secondary_icon_activatable">False</property>
-                        <property name="primary_icon_sensitive">True</property>
-                        <property name="secondary_icon_sensitive">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">5</property>
-                        <property name="bottom_attach">6</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="cbWorkInternal">
-                        <property name="label" translatable="yes">Internal work</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">6</property>
-                        <property name="bottom_attach">7</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="cbTravelFixed">
-                        <property name="label" translatable="yes">Fixed travel</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">7</property>
-                        <property name="bottom_attach">8</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label10">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Time type</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">8</property>
-                        <property name="bottom_attach">9</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBox" id="cbTimeType">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">8</property>
-                        <property name="bottom_attach">9</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label11">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Timestamp</property>
-                      </object>
-                      <packing>
-                        <property name="top_attach">9</property>
-                        <property name="bottom_attach">10</property>
-                        <property name="x_options">GTK_FILL</property>
-                        <property name="y_options">GTK_FILL</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkEntry" id="txtTimestamp">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="invisible_char">•</property>
-                        <property name="primary_icon_activatable">False</property>
-                        <property name="secondary_icon_activatable">False</property>
-                        <property name="primary_icon_sensitive">True</property>
-                        <property name="secondary_icon_sensitive">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="right_attach">2</property>
-                        <property name="top_attach">9</property>
-                        <property name="bottom_attach">10</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;Timelog&lt;/b&gt;</property>
-                <property name="use_markup">True</property>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkHButtonBox" id="hbuttonbox1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="spacing">3</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="btnRemove">
-                <property name="label">gtk-remove</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_btnRemove_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkButton" id="btnSave">
-                <property name="label">gtk-save</property>
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
-                <property name="use_stock">True</property>
-                <signal name="clicked" handler="on_btnSave_clicked" swapped="no"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>

data/gui/win_overview.rb

@@ -1,5 +0,0 @@
-class Openall_time_applet::Gui::Win_overview
-  def initialize(args)
-    
-  end
-end

data/gui/win_timelog_edit.rb

@@ -1,153 +0,0 @@
-class Openall_time_applet::Gui::Win_timelog_edit
-  attr_reader :args, :gui
-  
-  def initialize(args)
-    @args = args
-    
-    @gui = Gtk::Builder.new.add("../glade/win_timelog_edit.glade")
-    @gui.translate
-    @gui.connect_signals{|h| method(h)}
-    
-    tasks_opts = [_("None")] + @args[:oata].ob.list(:Task, {"orderby" => "openall_uid"})
-    @gui["cbTask"].init(tasks_opts)
-    
-    Knj::Gtk2::Cb.init(
-      "cb" => @gui["cbTimeType"],
-      "items" => {
-        "normal" => _("Normal"),
-        "overtime150" => sprintf(_("Overtime %s"), 150),
-        "overtime200" => sprintf(_("Overtime %s"), 200)
-      }
-    )
-    
-    
-    #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
-    
-    
-    #We are editting a timelog - set widget-values.
-    @timelog = @args[:timelog]
-    
-    if @timelog
-      @gui["txtDescr"].text = @timelog[:descr]
-      @gui["txtTime"].text = @timelog.time_as_human
-      @gui["txtTimeTransport"].text = @timelog.time_transport_as_human
-      @gui["txtTransportLength"].text = Knj::Locales.number_out(@timelog[:transportlength], 0)
-      @gui["txtTransportCosts"].text = Knj::Locales.number_out(@timelog[:transportcosts], 0)
-      @gui["txtTransportDescr"].text = @timelog[:transportdescription]
-      @gui["cbTask"].sel = @timelog.task if @timelog.task
-      @gui["cbShouldSync"].active = Knj::Strings.yn_str(@timelog[:sync_need], true, false)
-      @gui["cbTravelFixed"].active = Knj::Strings.yn_str(@timelog[:travelfixed], true, false)
-      @gui["cbWorkInternal"].active = Knj::Strings.yn_str(@timelog[:workinternal], true, false)
-      @gui["cbTimeType"].sel = @timelog[:timetype]
-      @gui["txtTimestamp"].text = Knj::Datet.in(@timelog[:timestamp]).out
-    else
-      @gui["btnRemove"].visible = false
-      @gui["txtTimestamp"].text = Knj::Datet.new.out
-    end
-    
-    #Show the window.
-    @gui["window"].show
-  end
-  
-  def on_btnSave_clicked(*args)
-    #Generate task-ID based on widget-value.
-    task = @gui["cbTask"].sel
-    if task.respond_to?(:is_knj?)
-      task_id = task.id
-    else
-      task_id = 0
-    end
-    
-    #Get times as integers based on widget-values.
-    if @gui["txtTime"].text == ""
-      time_secs = 0
-    else
-      begin
-        time_secs = Knj::Strings.human_time_str_to_secs(@gui["txtTime"].text)
-      rescue => e
-        Knj::Gtk2.msgbox(_("You have entered an invalid time-format.") + "\n\n" + Knj::Errors.error_str(e))
-        return nil
-      end
-    end
-    
-    if @gui["txtTimeTransport"].text == ""
-      time_transport_secs = 0
-    else
-      begin
-        time_transport_secs = Knj::Strings.human_time_str_to_secs(@gui["txtTimeTransport"].text)
-      rescue => e
-        Knj::Gtk2.msgbox(_("You have entered an invalid transport-time-format.") + "\n\n" + Knj::Errors.error_str(e))
-        return nil
-      end
-    end
-    
-    begin
-      timestamp_dbstr = Knj::Datet.in(@gui["txtTimestamp"].text).dbstr
-    rescue
-      Knj::Gtk2.msgbox(_("You have entered an invalid timestamp."))
-      return nil
-    end
-    
-    #Generate hash for updating dataabase.
-    save_hash = {
-      :descr => @gui["txtDescr"].text,
-      :timestamp => timestamp_dbstr,
-      :time => time_secs,
-      :timetype => @gui["cbTimeType"].sel,
-      :time_transport => time_transport_secs,
-      :transportdescription => @gui["txtTransportDescr"].text,
-      :transportlength => Knj::Locales.number_in(@gui["txtTransportLength"].text),
-      :transportcosts => Knj::Locales.number_in(@gui["txtTransportCosts"].text),
-      :task_id => task_id,
-      :sync_need => Knj::Strings.yn_str(@gui["cbShouldSync"].active?, 1, 0),
-      :workinternal => Knj::Strings.yn_str(@gui["cbWorkInternal"].active?, 1, 0),
-      :travelfixed => Knj::Strings.yn_str(@gui["cbTravelFixed"].active?, 1, 0)
-    }
-    
-    #Update or add the timelog.
-    if @timelog
-      @timelog.update(save_hash)
-    else
-      @timelog = @args[:oata].ob.add(:Timelog, save_hash)
-    end
-    
-    #Start tracking the current timelog if the checkbox has been checked.
-    if @gui["cbStartTracking"].active?
-      @args[:oata].timelog_active = @timelog
-    end
-    
-    @gui["window"].destroy
-  end
-  
-  def on_btnRemove_clicked(*args)
-    if Knj::Gtk2.msgbox(_("Do you want to remove this timelog? This will not delete the timelog on OpenAll."), "yesno") != "yes"
-      return nil
-    end
-    
-    @args[:oata].ob.delete(@timelog)
-    @gui["window"].destroy
-  end
-end