openall_time_applet 0.0.15 → 0.0.16

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/classes/connection.rb

@@ -21,7 +21,20 @@ class Openall_time_applet::Connection
     
     #Verify login by reading dashboard HTML.
     res = @http.get("index.php?c=Dashboard")
-    raise _("Could not log in.") if !res.body.match(/<ul id="webticker" >/)
+    
+    if !res.body.match(/<ul\s*id="webticker"\s*>/)
+      tmp_path = "#{Knj::Os.tmpdir}/openall_login_debug.txt"
+      File.open(tmp_path, "w") do |fp|
+        fp.write(res.body)
+      end
+      
+      #Raise custom wrong-username error if login-form is still shown.
+      if res.body.index("<div id=\"loginform\"") != nil
+        raise _("Wrong username and/or password.")
+      end
+      
+      raise sprintf(_("Could not log in because of unknown reason. Please check debug-output in '%s'."), tmp_path)
+    end
   end
   
   def request(args)

data/glade/win_main.glade

@@ -5,12 +5,12 @@
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-missing-image</property>
+    <property name="stock">gtk-info</property>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-missing-image</property>
+    <property name="stock">gtk-properties</property>
   </object>
   <object class="GtkWindow" id="window">
     <property name="can_focus">False</property>
@@ -277,11 +277,12 @@
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="btnSync">
-                <property name="label" translatable="yes">Sync</property>
+                <property name="label" translatable="yes">_Sync</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_underline">True</property>
                 <signal name="clicked" handler="on_btnSync_clicked" swapped="no"/>
               </object>
               <packing>

data/glade/win_sync_overview.glade

@@ -4,7 +4,7 @@
   <!-- 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="title" translatable="yes">Prepare transfer</property>
     <property name="window_position">center</property>
     <property name="default_width">850</property>
     <property name="default_height">480</property>
@@ -91,7 +91,7 @@
               <object class="GtkLabel" id="label2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="label" translatable="yes">&lt;b&gt;Prepare synchronization&lt;/b&gt;</property>
+                <property name="label" translatable="yes">&lt;b&gt;Prepare transfer&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
               </object>
             </child>

data/gui/trayicon.rb

@@ -85,29 +85,7 @@ class Openall_time_applet::Gui::Trayicon
   end
   
   def on_statusicon_rightclick(tray, button, time)
-    worktime_overview = Gtk::ImageMenuItem.new(Gtk::Stock::HOME)
-    worktime_overview.label = _("Week view")
-    worktime_overview.signal_connect("activate", &self.method(:on_worktimeOverview_activate))
-    
-    pref = Gtk::ImageMenuItem.new(Gtk::Stock::PREFERENCES)
-    pref.signal_connect("activate", &self.method(:on_preferences_activate))
-    
-    quit = Gtk::ImageMenuItem.new(Gtk::Stock::QUIT)
-    quit.signal_connect("activate", &self.method(:on_quit_activate))
-    
-    sync = Gtk::ImageMenuItem.new(Gtk::Stock::HARDDISK)
-    sync.label = _("Synchronize with OpenAll")
-    sync.signal_connect("activate", &self.method(:on_sync_activate))
-    
     menu = Gtk::Menu.new
-    menu.append(worktime_overview)
-    menu.append(Gtk::SeparatorMenuItem.new)
-    menu.append(pref)
-    
-    
-    #Only add seperator if more than one timelog.
-    timelog_count = @args[:oata].ob.list(:Timelog, {"count" => true})
-    menu.append(Gtk::SeparatorMenuItem.new) if timelog_count > 0
     
     #Make a list of all timelogs in the menu.
     @args[:oata].ob.list(:Timelog, {"orderby" => "id"}) do |timelog|
@@ -139,9 +117,6 @@ class Openall_time_applet::Gui::Trayicon
       menu.append(label)
     end
     
-    menu.append(Gtk::SeparatorMenuItem.new)
-    menu.append(sync)
-    menu.append(quit)
     menu.show_all
     
     menu.popup(nil, nil, button, time) do |menu, x, y|
@@ -153,40 +128,6 @@ class Openall_time_applet::Gui::Trayicon
     @args[:oata].show_main
   end
   
-  def on_preferences_activate(*args)
-    @args[:oata].show_main
-  end
-  
-  def on_worktimeOverview_activate(*args)
-    @args[:oata].show_worktime_overview
-  end
-  
-  def on_quit_activate(*args)
-    #Check if a timelog needs to be synced. If so the user needs to confirm he really wants to quit.
-    timelog_found = nil
-    do_destroy = true
-    
-    @args[:oata].ob.list(:Timelog) do |timelog|
-      if timelog[:time].to_f > 0 or timelog[:time_transport].to_f > 0 or timelog[:sync_need].to_i == 1
-        timelog_found = timelog
-        break
-      end
-    end
-    
-    if timelog_found
-      if Knj::Gtk2.msgbox(sprintf(_("The timelog '%s' has not been synced. Are you sure you want to quit?"), timelog_found[:descr]), "yesno") != "yes"
-        do_destroy = false
-      end
-    end
-    
-    @args[:oata].destroy if do_destroy
-  end
-  
-  def on_sync_activate(*args)
-    @args[:oata].sync_static
-    @args[:oata].sync
-  end
-  
   def on_stopTracking_activate(*args)
     @args[:oata].timelog_stop_tracking
   end

data/gui/win_main.rb

@@ -28,15 +28,43 @@ class Openall_time_applet::Gui::Win_main
     
     init_data = @gui["tvTimelogs"].init([
       _("ID"),
-      _("Description"),
-      _("Timestamp"),
-      _("Time"),
-      _("Transport"),
-      _("Length"),
-      _("Transport descr."),
-      _("Transport costs"),
       {
-        :title => _("Fixed travel"),
+        :title => _("Description"),
+        :type => :string,
+        :markup => true
+      },
+      {
+        :title => _("Timestamp"),
+        :type => :string,
+        :markup => true
+      },
+      {
+        :title => _("Time"),
+        :type => :string,
+        :markup => true
+      },
+      {
+        :title => _("Transport"),
+        :type => :string,
+        :markup => true
+      },
+      {
+        :title => _("Length"),
+        :type => :string,
+        :markup => true
+      },
+      {
+        :title => _("Descr."),
+        :type => :string,
+        :markup => true
+      },
+      {
+        :title => _("Costs"),
+        :type => :string,
+        :markup => true
+      },
+      {
+        :title => _("Fixed"),
         :type => :toggle
       },
       {
@@ -51,7 +79,8 @@ class Openall_time_applet::Gui::Win_main
         :title => _("Task"),
         :type => :combo,
         :model => task_ls,
-        :has_entry => false
+        :has_entry => false,
+        :markup => true
       }
     ])
     
@@ -60,8 +89,16 @@ class Openall_time_applet::Gui::Win_main
       :tv => @gui["tvTimelogs"],
       :model_class => :Timelog,
       :renderers => init_data[:renderers],
-      :change_before => proc{ @dont_reload = true },
-      :change_after => proc{ @dont_reload = false },
+      :change_before => proc{|d|
+        if (d[:col_no] == 3 or d[:col_no] == 2) and @args[:oata].timelog_active and @args[:oata].timelog_active.id == d[:model].id
+          raise _("You cannot edit the time for the active timelog.")
+        end
+        
+        @dont_reload = true
+      },
+      :change_after => proc{
+        @dont_reload = false
+      },
       :cols => {
         1 => :descr,
         2 => {:col => :timestamp, :type => :datetime},
@@ -90,11 +127,25 @@ class Openall_time_applet::Gui::Win_main
     )
     
     @gui["tvTimelogs"].columns[0].visible = false
+    
     self.reload_timelogs
     
     #Reload the treeview if something happened to a timelog.
     @reload_id = @args[:oata].ob.connect("object" => :Timelog, "signals" => ["add", "update", "delete"], &self.method(:reload_timelogs))
     
+    #Update switch-button.
+    self.update_switch_button
+    
+    #Update switch-button when active timelog is changed.
+    @event_timelog_active_changed = @args[:oata].events.connect(:timelog_active_changed) do
+      self.update_switch_button
+      self.check_rows
+    end
+    
+    @timeout_id = Gtk.timeout_add(1000) do
+      self.check_rows
+    end
+    
     @gui["window"].show_all
   end
   
@@ -113,12 +164,12 @@ class Openall_time_applet::Gui::Win_main
     @args[:oata].ob.list(:Timelog, {"orderby" => "id"}) do |timelog|
       @gui["tvTimelogs"].append([
         timelog.id,
-        timelog[:descr],
+        Knj::Web.html(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::Web.html(timelog[:transportdescription]),
         Knj::Locales.number_out(timelog[:transportcosts], 2),
         Knj::Strings.yn_str(timelog[:travelfixed], true, false),
         Knj::Strings.yn_str(timelog[:workinternal], true, false),
@@ -126,10 +177,30 @@ class Openall_time_applet::Gui::Win_main
         timelog.task_name
       ])
     end
+    
+    #Reset cache of which rows are set to bold.
+    @bold_rows = {}
   end
   
   def on_imiQuit_activate
-    @gui["window"].destroy
+    #Check if a timelog needs to be synced. If so the user needs to confirm he really wants to quit.
+    timelog_found = nil
+    do_destroy = true
+    
+    @args[:oata].ob.list(:Timelog) do |timelog|
+      if timelog[:time].to_f > 0 or timelog[:time_transport].to_f > 0 or timelog[:sync_need].to_i == 1
+        timelog_found = timelog
+        break
+      end
+    end
+    
+    if timelog_found
+      if Knj::Gtk2.msgbox(sprintf(_("The timelog '%s' has not been synced. Are you sure you want to quit?"), timelog_found[:descr]), "yesno") != "yes"
+        do_destroy = false
+      end
+    end
+    
+    @args[:oata].destroy if do_destroy
   end
   
   def on_imiPreferences_activate
@@ -143,30 +214,95 @@ class Openall_time_applet::Gui::Win_main
   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)
+    @args[:oata].events.disconnect(:timelog_active_changed, @event_timelog_active_changed) if @event_timelog_active_changed
+    @event_timelog_active_changed = nil
+    Gtk.timeout_remove(@timeout_id)
   end
   
   def on_expOverview_activate(expander)
+    width = @gui["window"].size[0]
+    
     if !expander.expanded?
-      @gui["window"].set_size_request(-1, 480)
+      @gui["window"].resize(width, 480)
     else
-      @gui["window"].set_size_request(-1, -1)
+      Gtk.timeout_add(200) do
+        @gui["window"].resize(width, 1)
+        false
+      end
     end
   end
   
   def on_btnSwitch_clicked
-    task = @gui["cbTask"].sel
-    if !task.is_a?(Knj::Datarow)
-      Knj::Gtk2.msgbox(_("Please choose a task."), "warning")
-      return nil
+    if @args[:oata].timelog_active
+      @args[:oata].timelog_stop_tracking
+      @gui["txtDescr"].grab_focus
+    else
+      task = @gui["cbTask"].sel
+      if !task.is_a?(Knj::Datarow)
+        task_id = 0
+      else
+        task_id = task.id
+      end
+      
+      @timelog = @args[:oata].ob.add(:Timelog, {
+        :task_id => task_id,
+        :descr => @gui["txtDescr"].text
+      })
+      @args[:oata].timelog_active = @timelog
+      @gui["txtDescr"].text = ""
+      @gui["cbTask"].sel = _("Choose:")
     end
     
-    @timelog = @args[:oata].ob.add(:Timelog, {
-      :task_id => task.id,
-      :descr => @gui["txtDescr"].text
-    })
-    @args[:oata].timelog_active = @timelog
-    @gui["txtDescr"].text = ""
-    @gui["cbTask"].sel = _("Choose:")
+    self.update_switch_button
+  end
+  
+  #This method updates the switch button to start or stop, based on the if a timelog is tracked or not.
+  def update_switch_button
+    but = @gui["btnSwitch"]
+    tlog_act = @args[:oata].timelog_active
+    
+    if tlog_act
+      but.image = Gtk::Image.new(Gtk::Stock::MEDIA_STOP, Gtk::IconSize::BUTTON)
+      but.label = _("Stop")
+    else
+      but.image = Gtk::Image.new(Gtk::Stock::MEDIA_RECORD, Gtk::IconSize::BUTTON)
+      but.label = _("Start")
+    end
+  end
+  
+  #This method runs through all rows in the treeview and checks if a row should be marked with bold. It also increases the time in the time-column for the tracked timelog.
+  def check_rows
+    act_timelog = @args[:oata].timelog_active
+    
+    if act_timelog
+      act_timelog_id = act_timelog.id
+    else
+      act_timelog_id = nil
+    end
+    
+    rows_bold = [1, 2, 3, 4, 5, 6, 7, 11]
+    
+    @gui["tvTimelogs"].model.each do |model, path, iter|
+      timelog_id = model.get_value(iter, 0).to_i
+      bold = false
+      iter_id = iter.to_s.to_i
+      
+      #Update time tracked.
+      if timelog_id == act_timelog_id
+        secs = act_timelog[:time].to_i + @args[:oata].timelog_active_time_tracked
+        iter[3] = "<b>#{Knj::Strings.secs_to_human_time_str(secs)}</b>"
+        bold = true
+      end
+      
+      #Set all columns to bold if not already set.
+      if bold and !@bold_rows.key?(iter_id)
+        rows_bold.each do |row_no|
+          iter[row_no] = "<b>#{model.get_value(iter, row_no)}</b>"
+        end
+        
+        @bold_rows[iter_id] = true
+      end
+    end
   end
   
   def on_btnSync_clicked
@@ -189,7 +325,21 @@ class Openall_time_applet::Gui::Win_main
   end
   
   def on_btnPlus_clicked
-    @args[:oata].ob.add(:Timelog)
+    #Add new timelog to database.
+    timelog = @args[:oata].ob.add(:Timelog)
+    
+    #Focus new timelog in treeview and open the in-line-editting for the description.
+    added_id = timelog.id.to_i
+    
+    @gui["tvTimelogs"].model.each do |model, path, iter|
+      timelog_id = model.get_value(iter, 0).to_i
+      
+      if timelog_id == added_id
+        col = @gui["tvTimelogs"].columns[1]
+        @gui["tvTimelogs"].set_cursor(path, col, true)
+        break
+      end
+    end
   end
   
   #Redirects 'enter'-events to 'switch'-click-event.

data/lib/openall_time_applet.rb

@@ -55,7 +55,7 @@ class Openall_time_applet
   end
   
   #Various readable variables.
-  attr_reader :db, :debug, :ob, :ti, :timelog_active, :timelog_active_time
+  attr_reader :db, :debug, :events, :ob, :ti, :timelog_active, :timelog_active_time
   attr_accessor :reminder_next
   
   #Config controlling paths and more.
@@ -97,6 +97,9 @@ class Openall_time_applet
       _("not set")
     end
     
+    @events = Knj::Event_handler.new
+    @events.add_event(:name => :timelog_active_changed)
+    
     #Options used to save various information (Openall-username and such).
     Knj::Opts.init("knjdb" => @db, "table" => "Option")
     
@@ -347,6 +350,7 @@ class Openall_time_applet
     @timelog_active = nil
     @timelog_active_time = nil
     @ti.update_icon if @ti
+    @events.call(:timelog_active_changed)
   end
   
   #Sets a new timelog to track. Stops tracking of previous timelog if already tracking.
@@ -374,6 +378,8 @@ class Openall_time_applet
       @timelog_logged_time = @ob.add(:Timelog_logged_time, {:timelog_id => timelog.id})
       @timelog_active = timelog
       @timelog_active_time = Time.new
+      
+      @events.call(:timelog_active_changed)
     rescue => e
       Knj::Gtk2.msgbox("msg" => Knj::Errors.error_str(e), "type" => "warning", "title" => _("Error"), "run" => false)
     end
@@ -381,6 +387,12 @@ class Openall_time_applet
     @ti.update_icon if @ti
   end
   
+  #Returns the amount of seconds tracked.
+  def timelog_active_time_tracked
+    return 0 if !@timelog_active_time
+    return Time.now.to_i - @timelog_active_time.to_i
+  end
+  
   #Saves tracking-status if tracking. Stops Gtks main loop.
   def destroy
     self.timelog_stop_tracking

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-06-08 15:47+0100\n"
-"PO-Revision-Date: 2012-06-08 15:48+0100\n"
+"POT-Creation-Date: 2012-06-27 14:25+0100\n"
+"PO-Revision-Date: 2012-06-27 14:26+0100\n"
 "Last-Translator: Kasper Johansen <k@spernj.org>\n"
 "Language-Team: Kasper Johansen <k@spernj.org>\n"
 "Language: \n"
@@ -16,15 +16,19 @@ msgstr ""
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: classes/connection.rb:24
-msgid "Could not log in."
-msgstr "Kunne ikke logge ind."
+#: classes/connection.rb:33
+msgid "Wrong username and/or password."
+msgstr "Forkert brugernavn og/eller adgangskode."
 
-#: classes/connection.rb:39
+#: classes/connection.rb:36
+msgid "Could not log in because of unknown reason. Please check debug-output in '%s'."
+msgstr "Kunne ikke logge ind pga. ukendt årsag. Check venligst debug-output i '%s'."
+
+#: classes/connection.rb:52
 msgid "Empty body returned from OpenAll."
 msgstr "Tom body returneret fra OpenAll."
 
-#: classes/connection.rb:45
+#: classes/connection.rb:58
 msgid "Could not parse JSON from: %s"
 msgstr "Kunne ikke oversætte JSON fra: %s"
 
@@ -56,68 +60,14 @@ msgstr "Lørday"
 msgid "Sunday"
 msgstr "Søndag"
 
-#: gui/trayicon.rb:87
-msgid "New timelog"
-msgstr "Ny tidslog"
-
-#: gui/trayicon.rb:91
-msgid "Timelog list"
-msgstr "Tidslog liste"
-
-#: gui/trayicon.rb:95
-msgid "Week view"
-msgstr "Uge oversigt"
-
-#: gui/trayicon.rb:105
-msgid "Synchronize with OpenAll"
-msgstr "Synkroniserer med OpenAll"
-
-#: gui/trayicon.rb:122
+#: gui/trayicon.rb:92
 msgid "Track: %s"
 msgstr "Følg: %s"
 
-#: gui/trayicon.rb:146
+#: gui/trayicon.rb:116
 msgid "%s minutes"
 msgstr "%s minutter"
 
-#: gui/trayicon.rb:193
-msgid "The timelog '%s' has not been synced. Are you sure you want to quit?"
-msgstr "Tidsloggen '%s' er ikke blevet synkroniseret. Er du sikker på, at du vil afslutte?"
-
-#: gui/win_overview.rb:15
-#: gui/win_timelog_edit.rb:11
-msgid "None"
-msgstr "Ingen"
-
-#: gui/win_overview.rb:28
-msgid "ID"
-msgstr "ID"
-
-#: gui/win_overview.rb:29
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: gui/win_overview.rb:30
-msgid "Time"
-msgstr "Tid"
-
-#: gui/win_overview.rb:31
-msgid "Transport"
-msgstr "Transport"
-
-#: gui/win_overview.rb:33
-msgid "Needs sync"
-msgstr "Behøver sync"
-
-#: gui/win_overview.rb:37
-msgid "Task"
-msgstr "Opgave"
-
-#: gui/win_overview.rb:66
-#: gui/win_overview.rb:86
-msgid "Invalid time entered."
-msgstr "Ugyldig tid indtastet."
-
 #: gui/win_preferences.rb:30
 msgid "Black"
 msgstr "Sort"
@@ -159,8 +109,9 @@ msgid "Got %s tasks."
 msgstr "Hentet %s opgaver."
 
 #: gui/win_preferences.rb:89
-#: lib/openall_time_applet.rb:252
-#: lib/openall_time_applet.rb:283
+#: lib/openall_time_applet.rb:301
+#: lib/openall_time_applet.rb:332
+#: lib/openall_time_applet.rb:384
 msgid "Error"
 msgstr "Fejl"
 
@@ -172,69 +123,148 @@ msgstr "Uge %s"
 msgid "No worktimes was found that week."
 msgstr "Der blev ikke fundet nogle arbejdstimer i denne uge."
 
-#: gui/win_timelog_edit.rb:17
-msgid "Normal"
-msgstr "Normal"
+#: gui/win_main.rb:15
+#: gui/win_sync_overview.rb:14
+msgid "None"
+msgstr "Ingen"
+
+#: gui/win_main.rb:18
+#: gui/win_main.rb:253
+#: gui/win_sync_overview.rb:17
+msgid "Choose:"
+msgstr "Vælg:"
+
+#: gui/win_main.rb:30
+#: gui/win_sync_overview.rb:27
+msgid "ID"
+msgstr "ID"
+
+#: gui/win_main.rb:32
+#: gui/win_sync_overview.rb:28
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: gui/win_main.rb:37
+#: gui/win_sync_overview.rb:29
+msgid "Timestamp"
+msgstr "Tidsstempel"
+
+#: gui/win_main.rb:42
+#: gui/win_sync_overview.rb:30
+msgid "Time"
+msgstr "Tid"
+
+#: gui/win_main.rb:47
+#: gui/win_sync_overview.rb:31
+msgid "Transport"
+msgstr "Transport"
+
+#: gui/win_main.rb:52
+#: gui/win_sync_overview.rb:32
+msgid "Length"
+msgstr "Længde"
+
+#: gui/win_main.rb:57
+msgid "Descr."
+msgstr "Beskr."
+
+#: gui/win_main.rb:62
+msgid "Costs"
+msgstr "Omkost."
+
+#: gui/win_main.rb:67
+msgid "Fixed"
+msgstr "Fikset"
 
-#: gui/win_timelog_edit.rb:18
-#: gui/win_timelog_edit.rb:19
-msgid "Overtime %s"
-msgstr "Overtid %s"
+#: gui/win_main.rb:71
+#: gui/win_sync_overview.rb:40
+msgid "Int. work"
+msgstr "Int. arbejde"
 
-#: gui/win_timelog_edit.rb:91
-msgid "You have entered an invalid time-format."
-msgstr "Du har indtastet et ugyldigt tids-format."
+#: gui/win_main.rb:75
+#: gui/win_sync_overview.rb:44
+msgid "Sync?"
+msgstr "Synk?"
+
+#: gui/win_main.rb:79
+#: gui/win_sync_overview.rb:48
+msgid "Task"
+msgstr "Opgave"
+
+#: gui/win_main.rb:94
+msgid "You cannot edit the time for the active timelog."
+msgstr "Du kan ikke redigere tid for den aktive tidslog."
+
+#: gui/win_main.rb:198
+msgid "The timelog '%s' has not been synced. Are you sure you want to quit?"
+msgstr "Tidsloggen '%s' er ikke blevet synkroniseret. Er du sikker på, at du vil afslutte?"
 
-#: gui/win_timelog_edit.rb:102
-msgid "You have entered an invalid transport-time-format."
-msgstr "Du har indtastet et ugyldigt transport-tids-format."
+#: gui/win_main.rb:266
+msgid "Stop"
+msgstr "Stop"
 
-#: gui/win_timelog_edit.rb:110
-msgid "You have entered an invalid timestamp."
-msgstr "Du har indtastet et ugyldigt tidsstempel."
+#: gui/win_main.rb:269
+msgid "Start"
+msgstr "Start"
 
-#: gui/win_timelog_edit.rb:146
-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."
+#: gui/win_main.rb:319
+msgid "Please choose a timelog to delete."
+msgstr "Vælg venligst en tidslog at slette."
+
+#: gui/win_main.rb:323
+msgid "Do you want to remove this timelog?"
+msgstr "Vil du fjerne denne tidslogning?"
 
 #: gui/win_sync_overview.rb:9
-msgid "Synchronize"
-msgstr "Synkroniser"
+msgid "Transfer"
+msgstr "Overfør"
+
+#: gui/win_sync_overview.rb:33
+msgid "Transport descr."
+msgstr "Transport beskr."
+
+#: gui/win_sync_overview.rb:34
+msgid "Transport costs"
+msgstr "Transport omkostninger"
+
+#: gui/win_sync_overview.rb:36
+msgid "Fixed travel"
+msgstr "Fikset rejse"
 
-#: gui/win_sync_overview.rb:57
+#: gui/win_sync_overview.rb:53
+msgid "Sync time"
+msgstr "Synk tid"
+
+#: gui/win_sync_overview.rb:129
 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
+#: lib/openall_time_applet.rb:97
 msgid "not set"
 msgstr "ikke sat"
 
-#: lib/openall_time_applet.rb:152
+#: lib/openall_time_applet.rb:202
 msgid "Tracking task: %s"
 msgstr "Følger opgave: %s"
 
-#: lib/openall_time_applet.rb:238
+#: lib/openall_time_applet.rb:282
 msgid "Updating organisation-cache."
 msgstr "Opdaterer organisations-cache."
 
-#: lib/openall_time_applet.rb:242
+#: lib/openall_time_applet.rb:286
 msgid "Updating task-cache."
 msgstr "Opdaterer opgave-cache."
 
-#: lib/openall_time_applet.rb:246
-#: lib/openall_time_applet.rb:275
+#: lib/openall_time_applet.rb:290
+#: lib/openall_time_applet.rb:324
 msgid "Updating worktime-cache."
 msgstr "Opdaterer arbejdstids-cache."
 
-#: lib/openall_time_applet.rb:271
+#: lib/openall_time_applet.rb:320
 msgid "Pushing time-updates."
 msgstr "Sender tids-opdateringer."
 
-#: lib/openall_time_applet.rb:279
+#: lib/openall_time_applet.rb:328
 msgid "Done"
 msgstr "Færdig"
 
@@ -246,52 +276,8 @@ msgstr "Uge status"
 msgid "Week"
 msgstr "Uge"
 
-#: glade/win_timelog_edit.glade:7
-msgid "Timelog"
-msgstr "Tidslog"
-
-#: glade/win_timelog_edit.glade:135
-msgid "Should sync"
-msgstr "Skal synces"
-
-#: glade/win_timelog_edit.glade:152
-msgid "Start tracking after saving"
-msgstr "Starter med at følge efter gem"
-
-#: glade/win_timelog_edit.glade:185
-msgid "Transport length"
-msgstr "Transport længde"
-
-#: glade/win_timelog_edit.glade:199
-msgid "Transport costs"
-msgstr "Transport omkostninger"
-
-#: glade/win_timelog_edit.glade:247
-msgid "Transport description"
-msgstr "Transport beskrivelse"
-
-#: glade/win_timelog_edit.glade:275
-msgid "Internal work"
-msgstr "Internt arbejde"
-
-#: glade/win_timelog_edit.glade:290
-msgid "Fixed travel"
-msgstr "Fikset rejse"
-
-#: glade/win_timelog_edit.glade:310
-msgid "Time type"
-msgstr "Tids type"
-
-#: glade/win_timelog_edit.glade:336
-msgid "Timestamp"
-msgstr "Tidsstempel"
-
-#: glade/win_timelog_edit.glade:370
-#: glade/win_sync_overview.glade:40
-msgid "<b>Timelog</b>"
-msgstr "<b>Tidslog</b>"
-
 #: glade/win_preferences.glade:7
+#: glade/win_main.glade:56
 msgid "Preferences"
 msgstr "Indstillinger"
 
@@ -343,26 +329,122 @@ msgstr "Tekst farve"
 msgid "Tray"
 msgstr "Tray"
 
+#: glade/win_main.glade:17
+msgid "OpenAll Time Applet"
+msgstr "OpenAll Tids Applet"
+
+#: glade/win_main.glade:36
+msgid "_Tracker"
+msgstr "_Tracker"
+
+#: glade/win_main.glade:45
+msgid "Week view"
+msgstr "Uge oversigt"
+
+#: glade/win_main.glade:140
+msgid "Switch"
+msgstr "Switch"
+
+#: glade/win_main.glade:161
+msgid "<b>Description</b>"
+msgstr "<b>Beskrivelse</b>"
+
+#: glade/win_main.glade:222
+msgid "+"
+msgstr "+"
+
+#: glade/win_main.glade:237
+msgid "-"
+msgstr "-"
+
+#: glade/win_main.glade:263
+msgid "Overview"
+msgstr "Oversigt"
+
+#: glade/win_main.glade:280
+msgid "_Sync"
+msgstr "_Sync"
+
 #: glade/win_sync_overview.glade:7
-msgid "Overview of sync"
-msgstr "Oversigt over synk"
+msgid "Prepare transfer"
+msgstr "Forbered overførsel"
 
-#: glade/win_sync_overview.glade:49
-msgid "<b>Logged time</b>"
-msgstr "<b>Logget tid</b>"
+#: glade/win_sync_overview.glade:94
+msgid "<b>Prepare transfer</b>"
+msgstr "<b>Forbered overførsel</b>"
 
-#: glade/win_sync_overview.glade:62
-msgid "<b>Sync. as time</b>"
-msgstr "<b>Synk. som tid</b>"
+#: glade/win_sync_overview.glade:110
+msgid "[totals]"
+msgstr "[totaler]"
 
-#: glade/win_sync_overview.glade:114
-msgid "<b>Sync with OpenAll</b>"
-msgstr "<b>Synk med OpenAll</b>"
+#: glade/win_overview.glade:8
+msgid "Timelog list"
+msgstr "Tidslog liste"
 
 #: glade/win_overview.glade:55
 msgid "<b>Timelogs</b>"
 msgstr "<b>Tidslogs</b>"
 
+#~ msgid "Could not log in."
+#~ msgstr "Kunne ikke logge ind."
+
+#~ msgid "New timelog"
+#~ msgstr "Ny tidslog"
+
+#~ msgid "Synchronize with OpenAll"
+#~ msgstr "Synkroniserer med OpenAll"
+
+#~ msgid "Needs sync"
+#~ msgstr "Behøver sync"
+
+#~ msgid "Invalid time entered."
+#~ msgstr "Ugyldig tid indtastet."
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "Overtime %s"
+#~ msgstr "Overtid %s"
+
+#~ msgid "You have entered an invalid time-format."
+#~ msgstr "Du har indtastet et ugyldigt tids-format."
+
+#~ msgid "You have entered an invalid transport-time-format."
+#~ msgstr "Du har indtastet et ugyldigt transport-tids-format."
+
+#~ msgid "You have entered an invalid timestamp."
+#~ msgstr "Du har indtastet et ugyldigt tidsstempel."
+
+#~ msgid "Synchronize"
+#~ msgstr "Synkroniser"
+
+#~ msgid "Time was not numeric for: '%s'."
+#~ msgstr "Tid var ikke numerisk for: '%s'."
+
+#~ msgid "Timelog"
+#~ msgstr "Tidslog"
+
+#~ msgid "Should sync"
+#~ msgstr "Skal synces"
+
+#~ msgid "Start tracking after saving"
+#~ msgstr "Starter med at følge efter gem"
+
+#~ msgid "Transport length"
+#~ msgstr "Transport længde"
+
+#~ msgid "Time type"
+#~ msgstr "Tids type"
+
+#~ msgid "<b>Timelog</b>"
+#~ msgstr "<b>Tidslog</b>"
+
+#~ msgid "<b>Logged time</b>"
+#~ msgstr "<b>Logget tid</b>"
+
+#~ msgid "<b>Sync with OpenAll</b>"
+#~ msgstr "<b>Synk med OpenAll</b>"
+
 #~ msgid "Time overview"
 #~ msgstr "Tids oversigt"
 

data/openall_time_applet.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{openall_time_applet}
-  s.version = "0.0.15"
+  s.version = "0.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = %q{2012-06-25}
+  s.date = %q{2012-06-28}
   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}

metadata

@@ -2,7 +2,7 @@
 name: openall_time_applet
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-25 00:00:00 +02:00
+date: 2012-06-28 00:00:00 +02:00
 default_executable: openall_time_applet.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -196,7 +196,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1181471258583995936
+      hash: 1131527418909996080
       segments: 
       - 0
       version: "0"