openall_time_applet 0.0.5 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.7

data/bin/openall_time_applet.rb

@@ -6,7 +6,5 @@ require "../lib/openall_time_applet.rb"
 GetText.bindtextdomain("default", "../locales", ENV["LANGUAGE"])
 
 oata = Openall_time_applet.new
-oata.update_db
-oata.spawn_trayicon
 
 Gtk.main

data/classes/connection.rb

@@ -9,8 +9,7 @@ class Openall_time_applet::Connection
       :port => @args[:port],
       :follow_redirects => false,
       :ssl => Knj::Strings.yn_str(@args[:ssl], true, false),
-      :debug => false,
-      :encoding_gzip => false
+      :debug => false
     )
     
     self.login
@@ -21,14 +20,11 @@ class Openall_time_applet::Connection
     @http.post_multipart("index.php?c=Auth&m=validateLogin", {"username" => @args[:username], "password" => @args[:password]})
     
     #Verify login by reading dashboard HTML.
-    @http.reconnect
     res = @http.get("index.php?c=Dashboard")
     raise _("Could not log in.") if !res.body.match(/<ul id="webticker" >/)
   end
   
   def request(args)
-    @http.reconnect
-    
     #Possible to give a string instead of hash to do it simple.
     args = {:url => "?c=Jsonapi&m=#{args}"} if args.is_a?(String) or args.is_a?(Symbol)
     args[:url] = "?c=Jsonapi&m=#{args[:method]}" if args[:method] and !args[:url]

data/conf/db_schema.rb

@@ -32,7 +32,6 @@ Openall_time_applet::DB_SCHEMA = {
     "Timelog" => {
       "columns" => [
         {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
-        {"name" => "openall_uid", "type" => "int"},
         {"name" => "task_id", "type" => "int"},
         {"name" => "time", "type" => "int"},
         {"name" => "time_transport", "type" => "int"},
@@ -41,7 +40,6 @@ Openall_time_applet::DB_SCHEMA = {
         {"name" => "sync_last", "type" => "datetime"}
       ],
       "indexes" => [
-        "openall_uid",
         "task_id"
       ]
     },

data/glade/win_sync_overview.glade

@@ -0,0 +1,139 @@
+<?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">Overview of sync</property>
+    <property name="window_position">center</property>
+    <property name="default_width">640</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="GtkVBox" id="vbox2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">3</property>
+                    <child>
+                      <object class="GtkTable" id="tableTimelogs">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="n_columns">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">&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>
+                          </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="right_attach">3</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</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="btnSync">
+                            <property name="label">gtk-harddisk</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_btnSync_clicked" swapped="no"/>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <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="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="GtkLabel" id="label1">
+            <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">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

data/gui/trayicon.rb

@@ -33,7 +33,6 @@ class Openall_time_applet::Gui::Trayicon
     #Calculate minutes tracked and generate variables.
     secs = Time.now.to_i - @args[:oata].timelog_active_time.to_i
     mins = (secs.to_f / 60.0)
-    mins = 1 if mins < 1
     
     if mins >= 60
       hours = mins / 60
@@ -54,7 +53,7 @@ class Openall_time_applet::Gui::Trayicon
     
     #Generate image.
     require "RMagick"
-    canvas = Magick::Image.new(53, 48){
+    canvas = Magick::Image.new(53, 53){
       self.background_color = "transparent"
       self.format = "png"
     }
@@ -136,7 +135,8 @@ class Openall_time_applet::Gui::Trayicon
       
       #If tracking is active, then show how many seconds has been tracked until now in menu as an item.
       secs = Time.now.to_i - @args[:oata].timelog_active_time.to_i
-      label = Gtk::MenuItem.new(sprintf(_("%s seconds"), secs))
+      mins = (secs.to_f / 60.0).round(0)
+      label = Gtk::MenuItem.new(sprintf(_("%s minutes"), mins))
       menu.append(label)
     end
     

data/gui/win_preferences.rb

@@ -60,6 +60,7 @@ class Openall_time_applet::Gui::Win_preferences
   def on_btnTraySave_clicked
     color_key = @tray_colors.keys[@gui["cbTrayTextColor"].sel["active"]]
     Knj::Opts.set("tray_text_color", color_key)
+    @args[:oata].ti.update_icon if @args[:oata].ti
     Knj::Gtk2.msgbox(_("The tray-settings was saved."), "info")
   end
   

data/gui/win_sync_overview.rb

@@ -0,0 +1,86 @@
+#This class handels the window that will be shown before the actual sync takes place.
+class Openall_time_applet::Gui::Win_sync_overview
+  def initialize(args)
+    @args = args
+    
+    @gui = Gtk::Builder.new.add("../glade/win_sync_overview.glade")
+    @gui.translate
+    @gui.connect_signals{|h|method(h)}
+    @gui["btnSync"].label = _("Synchronize")
+    
+    #This hash holds the text-widgets which time, which are used to update the timelogs later.
+    @sync_time_text_widgets = {}
+    
+    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])
+      timelog_label.xalign = 0
+      timelog_label.selectable = true
+      
+      logged_time_label = Gtk::Label.new(Knj::Strings.secs_to_human_time_str(timelog[:time]))
+      logged_time_label.xalign = 0
+      logged_time_label.selectable = true
+      
+      sync_time_text = Gtk::Entry.new
+      sync_time_text.text = Knj::Strings.secs_to_human_time_str(count_rounded_time)
+      @sync_time_text_widgets[timelog.id] = sync_time_text
+      
+      #Attach widgets in table.
+      @gui["tableTimelogs"].attach(timelog_label, 0, 1, rowc, rowc + 1)
+      @gui["tableTimelogs"].attach(logged_time_label, 1, 2, rowc, rowc + 1)
+      @gui["tableTimelogs"].attach(sync_time_text, 2, 3, rowc, rowc + 1)
+      
+      rowc += 1
+    end
+    
+    if rowc == 1
+      #Show error-message and destroy the window, if no timelogs was to be synced.
+      Knj::Gtk2.msgbox(_("There is nothing to sync at this time."))
+      @gui["window"].destroy
+    else
+      #...else show the window.
+      @gui["window"].show_all
+    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
+      end
+      
+      #Destroy this window and start syncing for real.
+      @gui["window"].destroy
+      @args[:oata].sync_real
+    rescue => e
+      Knj::Gtk2.msgbox(Knj::Errors.error_str(e))
+    end
+  end
+end

data/lib/openall_time_applet.rb

@@ -1,5 +1,7 @@
+#Support for libs loaded through RubyGems.
 require "rubygems"
 
+#For secs-to-human-string (MySQL-format), model-framework, database-framework, options-framework, date-framework and more.
 if ENV["HOME"] == "/home/kaspernj" and File.exists?("/home/kaspernj/Dev/Ruby/knjrbfw")
   #For development.
   require "/home/kaspernj/Dev/Ruby/knjrbfw/lib/knjrbfw"
@@ -12,11 +14,19 @@ require "sqlite3"
 require "gettext"
 require "base64"
 
+#For msgbox and translation of windows.
 require "knj/gtk2"
+
+#For easy initialization, getting and settings of values on comboboxes.
 require "knj/gtk2_cb"
+
+#For easy initialization, getting and settings of values on treeviews.
 require "knj/gtk2_tv"
+
+#For easy making status-windows with progressbar.
 require "knj/gtk2_statuswindow"
 
+#The base class of the applet. Spawns all windows, holds subclasses for models and gui, holds models objects and holds database-objects.
 class Openall_time_applet
   #Shortcut to start the application. Used by the Ubuntu-package.
   def self.exec
@@ -58,7 +68,7 @@ class Openall_time_applet
   end
   
   #Various readable variables.
-  attr_reader :db, :ob, :timelog_active, :timelog_active_time
+  attr_reader :db, :ob, :ti, :timelog_active, :timelog_active_time
   attr_accessor :reminder_next
   
   #Config controlling paths and more.
@@ -79,6 +89,9 @@ class Openall_time_applet
       :index_append_table_name => true
     )
     
+    #Update to latest db-revision.
+    self.update_db
+    
     #Models-handeler.
     @ob = Knj::Objects.new(
       :datarow => true,
@@ -97,6 +110,9 @@ class Openall_time_applet
     #Set crash-operation to save tracked time instead of loosing it.
     Kernel.at_exit(&self.method(:destroy))
     
+    #Spawn tray-icon.
+    self.spawn_trayicon
+    
     #Start reminder.
     self.reminding
   end
@@ -199,8 +215,13 @@ class Openall_time_applet
     @ob.static(:Timelog, :push_time_updates, {:oata => self})
   end
   
-  #Refreshes task-cache, create missing worktime from timelogs and push tracked time to timelogs. Shows a status-window while doing so.
+  #Shows the sync overview, which must be seen before the actual sync.
   def sync
+    Openall_time_applet::Gui::Win_sync_overview.new(:oata => self)
+  end
+  
+  #Refreshes task-cache, create missing worktime from timelogs and push tracked time to timelogs. Shows a status-window while doing so.
+  def sync_real
     sw = Knj::Gtk2::StatusWindow.new
     
     if @timelog_active
@@ -232,7 +253,7 @@ class Openall_time_applet
       rescue => e
         Knj::Gtk2.msgbox("msg" => Knj::Errors.error_str(e), "type" => "warning", "title" => _("Error"), "run" => false)
       ensure
-        sw.destroy
+        sw.destroy if sw
         self.timelog_active = timelog_active if timelog_active
       end
     end

data/locales/da_DK/LC_MESSAGES/default.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Openall_time_applet\n"
-"POT-Creation-Date: 2012-05-21 13:20+0100\n"
-"PO-Revision-Date: 2012-05-21 13:20+0100\n"
+"POT-Creation-Date: 2012-05-25 10:56+0100\n"
+"PO-Revision-Date: 2012-05-25 10:58+0100\n"
 "Last-Translator: Kasper Johansen <k@spernj.org>\n"
 "Language-Team: Kasper Johansen <k@spernj.org>\n"
 "Language: \n"
@@ -16,15 +16,15 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: classes/connection.rb:26
+#: classes/connection.rb:24
 msgid "Could not log in."
 msgstr "Kunne ikke logge ind."
 
-#: classes/connection.rb:43
+#: classes/connection.rb:39
 msgid "Empty body returned from OpenAll."
 msgstr "Tom body returneret fra OpenAll."
 
-#: classes/connection.rb:49
+#: classes/connection.rb:45
 msgid "Could not parse JSON from: %s"
 msgstr "Kunne ikke oversætte JSON fra: %s"
 
@@ -56,29 +56,29 @@ msgstr "Lørday"
 msgid "Sunday"
 msgstr "Søndag"
 
-#: gui/trayicon.rb:15
+#: gui/trayicon.rb:84
 msgid "New timelog"
 msgstr "Ny tidslog"
 
-#: gui/trayicon.rb:19
+#: gui/trayicon.rb:88
 msgid "Overview"
 msgstr "Oversigt"
 
-#: gui/trayicon.rb:23
+#: gui/trayicon.rb:92
 msgid "Time overview"
 msgstr "Tids oversigt"
 
-#: gui/trayicon.rb:33
+#: gui/trayicon.rb:102
 msgid "Synchronize with OpenAll"
 msgstr "Synkroniserer med OpenAll"
 
-#: gui/trayicon.rb:46
+#: gui/trayicon.rb:115
 msgid "Track: %s"
 msgstr "Følg: %s"
 
-#: gui/trayicon.rb:69
-msgid "%s seconds"
-msgstr "%s sekunder"
+#: gui/trayicon.rb:139
+msgid "%s minutes"
+msgstr "%s minutter"
 
 #: gui/win_overview.rb:11
 msgid "ID"
@@ -112,20 +112,44 @@ msgstr "Ja"
 msgid "No"
 msgstr "Nej"
 
-#: gui/win_preferences.rb:43
+#: gui/win_preferences.rb:30
+msgid "Black"
+msgstr "Sort"
+
+#: gui/win_preferences.rb:30
+msgid "White"
+msgstr "Hvid"
+
+#: gui/win_preferences.rb:42
+msgid "The OpenAll-settings was saved."
+msgstr "OpenAll-indstillinger blev gemt."
+
+#: gui/win_preferences.rb:47
+msgid "Reminder-minute was not numeric."
+msgstr "Påmindelses-minutter var ikke et gyldigt tal."
+
+#: gui/win_preferences.rb:57
+msgid "The reminder-settings was saved."
+msgstr "Påmindelses-indstillinger blev gemt."
+
+#: gui/win_preferences.rb:64
+msgid "The tray-settings was saved."
+msgstr "Tray-indstillinger blev gemt."
+
+#: gui/win_preferences.rb:70
 msgid "Connecting and logging in..."
 msgstr "Forbinder og logger ind..."
 
-#: gui/win_preferences.rb:51
+#: gui/win_preferences.rb:78
 msgid "Getting task-list."
 msgstr "Henter opgave-liste."
 
-#: gui/win_preferences.rb:54
+#: gui/win_preferences.rb:81
 msgid "Got %s tasks."
 msgstr "Hentet %s opgaver."
 
-#: gui/win_preferences.rb:62
-#: lib/openall_time_applet.rb:203
+#: gui/win_preferences.rb:89
+#: lib/openall_time_applet.rb:254
 msgid "Error"
 msgstr "Fejl"
 
@@ -133,7 +157,7 @@ msgstr "Fejl"
 msgid "Week %s"
 msgstr "Uge %s"
 
-#: gui/win_worktime_overview.rb:103
+#: gui/win_worktime_overview.rb:115
 msgid "No worktimes was found that week."
 msgstr "Der blev ikke fundet nogle arbejdstimer i denne uge."
 
@@ -153,27 +177,43 @@ msgstr "Du har indtastet et ugyldigt transport-tids-format."
 msgid "Do you want to remove this timelog? This will not delete the timelog on OpenAll."
 msgstr "Vil du fjerne denne tidslogning? Dette vil ikke slette tidslogningen fra OpenAll."
 
-#: lib/openall_time_applet.rb:90
+#: gui/win_sync_overview.rb:9
+msgid "Synchronize"
+msgstr "Synkroniser"
+
+#: gui/win_sync_overview.rb:57
+msgid "There is nothing to sync at this time."
+msgstr "Der er intet at synce på nuværende tidspunkt."
+
+#: gui/win_sync_overview.rb:72
+msgid "Time was not numeric for: '%s'."
+msgstr "Tid var ikke numerisk for: '%s'."
+
+#: lib/openall_time_applet.rb:104
 msgid "not set"
 msgstr "ikke sat"
 
-#: lib/openall_time_applet.rb:183
+#: lib/openall_time_applet.rb:149
+msgid "Tracking task: %s"
+msgstr "Følger opgave: %s"
+
+#: lib/openall_time_applet.rb:234
 msgid "Updating organisation-cache."
 msgstr "Opdaterer organisations-cache."
 
-#: lib/openall_time_applet.rb:187
+#: lib/openall_time_applet.rb:238
 msgid "Updating task-cache."
 msgstr "Opdaterer opgave-cache."
 
-#: lib/openall_time_applet.rb:191
+#: lib/openall_time_applet.rb:242
 msgid "Pushing time-updates."
 msgstr "Sender tids-opdateringer."
 
-#: lib/openall_time_applet.rb:195
+#: lib/openall_time_applet.rb:246
 msgid "Updating worktime-cache."
 msgstr "Opdaterer arbejdstids-cache."
 
-#: lib/openall_time_applet.rb:199
+#: lib/openall_time_applet.rb:250
 msgid "Done"
 msgstr "Færdig"
 
@@ -198,6 +238,7 @@ msgid "Start tracking after saving"
 msgstr "Starter med at følge efter gem"
 
 #: glade/win_timelog_edit.glade:188
+#: glade/win_sync_overview.glade:40
 msgid "<b>Timelog</b>"
 msgstr "<b>Tidslog</b>"
 
@@ -205,37 +246,76 @@ msgstr "<b>Tidslog</b>"
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: glade/win_preferences.glade:42
+#: glade/win_preferences.glade:35
 msgid "Host"
 msgstr "Host"
 
-#: glade/win_preferences.glade:53
+#: glade/win_preferences.glade:46
 msgid "Username"
 msgstr "Brugernavn"
 
-#: glade/win_preferences.glade:99
+#: glade/win_preferences.glade:94
 msgid "Password"
 msgstr "Adagngskode"
 
-#: glade/win_preferences.glade:130
+#: glade/win_preferences.glade:126
 msgid "Port"
 msgstr "Port"
 
-#: glade/win_preferences.glade:158
+#: glade/win_preferences.glade:155
 msgid "SSL"
 msgstr "SSL"
 
-#: glade/win_preferences.glade:187
-msgid "<b>OpenAll</b>"
-msgstr "<b>OpenAll</b>"
-
-#: glade/win_preferences.glade:206
+#: glade/win_preferences.glade:190
 msgid "Test"
 msgstr "Test"
 
+#: glade/win_preferences.glade:243
+msgid "OpenAll"
+msgstr "OpenAll"
+
+#: glade/win_preferences.glade:267
+msgid "Reminder enabled"
+msgstr "Påmindelser slået til"
+
+#: glade/win_preferences.glade:283
+msgid "Remind every minute"
+msgstr "Påmind hver minut"
+
+#: glade/win_preferences.glade:372
+msgid "Reminder"
+msgstr "Påminder"
+
+#: glade/win_preferences.glade:398
+msgid "Text color"
+msgstr "Tekst farve"
+
+#: glade/win_preferences.glade:478
+msgid "Tray"
+msgstr "Tray"
+
+#: glade/win_sync_overview.glade:7
+msgid "Overview of sync"
+msgstr "Oversigt over synk"
+
+#: glade/win_sync_overview.glade:49
+msgid "<b>Logged time</b>"
+msgstr "<b>Logget tid</b>"
+
+#: glade/win_sync_overview.glade:62
+msgid "<b>Sync. as time</b>"
+msgstr "<b>Synk. som tid</b>"
+
+#: glade/win_sync_overview.glade:114
+msgid "<b>Sync with OpenAll</b>"
+msgstr "<b>Synk med OpenAll</b>"
+
 #: glade/win_overview.glade:54
 msgid "<b>Timelogs</b>"
 msgstr "<b>Tidslogs</b>"
 
+#~ msgid "%s seconds"
+#~ msgstr "%s sekunder"
+
 #~ msgid "URL"
 #~ msgstr "URL"

data/models/timelog.rb

@@ -18,26 +18,17 @@ class Openall_time_applet::Models::Timelog < Knj::Datarow
         next if secs_sum <= 0
         
         #The timelog has not yet been created in OpenAll - create it!
-        if timelog[:openall_uid].to_i == 0
-          res = conn.request(
-            :method => :createWorktime,
-            :post => {
-              :task_uid => timelog.task[:openall_uid].to_i,
-              :comment => timelog[:descr]
-            }
-          )
-          timelog[:openall_uid] = res["worktime_uid"]
-        end
-        
-        #Push latest work-time.
         res = conn.request(
-          :method => :pushTimeToWorktime,
+          :method => :createWorktime,
           :post => {
-            :worktime_uid => timelog[:openall_uid].to_i,
-            :secs => timelog[:time].to_i,
-            :secs_transport => timelog[:time_transport].to_i
+            :task_uid => timelog.task[:openall_uid].to_i,
+            :comment => timelog[:descr],
+            :worktime => Knj::Strings.secs_to_human_time_str(timelog[:time]),
+            :transporttime => Knj::Strings.secs_to_human_time_str(timelog[:time_transport])
           }
         )
+        
+        #Reset timelog.
         timelog.update(
           :time => 0,
           :time_transport => 0,

data/openall_time_applet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openall_time_applet}
-  s.version = "0.0.5"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-05-21}
+  s.date = %q{2012-05-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}
@@ -32,13 +32,16 @@ Gem::Specification.new do |s|
     "classes/translations.rb",
     "conf/db_schema.rb",
     "gfx/icon_time.png",
+    "gfx/icon_time_orig.png",
     "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_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",

metadata

@@ -2,7 +2,7 @@
 name: openall_time_applet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-21 00:00:00 +02:00
+date: 2012-05-25 00:00:00 +02:00
 default_executable: openall_time_applet.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -157,13 +157,16 @@ files:
 - classes/translations.rb
 - conf/db_schema.rb
 - gfx/icon_time.png
+- gfx/icon_time_orig.png
 - 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_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
@@ -190,7 +193,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3134655013415234649
+      hash: 3607958173407388700
       segments: 
       - 0
       version: "0"