openall_time_applet 0.0.38 → 0.0.40

data/gui/win_preferences.rb

@@ -77,8 +77,16 @@ class Openall_time_applet::Gui::Win_preferences
     #Do the stuff in thread so GUI wont lock.
     Knj::Thread.new do
       begin
+        args_oa_conn = {
+          :host => @gui["txtHost"].text,
+          :port => @gui["txtPort"].text.to_i,
+          :ssl => @gui["cbSSL"].active?,
+          :username => @gui["txtUsername"].text,
+          :password => @gui["txtPassword"].text
+        }
+        
         #Connect to OpenAll, log in, get a list of tasks to test the information and connection.
-        @args[:oata].oa_conn do |conn|
+        @args[:oata].oa_conn(args_oa_conn) do |conn|
           ws.percent = 0.3
           ws.label = _("Getting task-list.")
           task_list = conn.task_list

data/lib/openall_time_applet.rb

@@ -2,7 +2,7 @@
 require "rubygems"
 
 #For secs-to-human-string (MySQL-format), model-framework, database-framework, options-framework, date-framework and more.
-gems = ["wref", "datet", "http2", "knjrbfw", "gtk2_treeview_settings"]
+gems = ["wref", "datet", "http2", "knjrbfw", "gtk2_expander_settings", "gtk2_treeview_settings", "gtk2_window_settings"]
 gems.each do |gem|
   fpath = "#{File.dirname(__FILE__)}/../../#{gem}/lib/#{gem}.rb"
   if File.exists?(fpath)
@@ -60,7 +60,7 @@ class Openall_time_applet
   end
   
   #Various readable variables.
-  attr_reader :db, :debug, :events, :ob, :ti, :timelog_active, :timelog_active_time
+  attr_reader :db, :debug, :events, :log, :ob, :ti, :timelog_active, :timelog_active_time
   attr_accessor :reminder_next
   
   #Config controlling paths and more.
@@ -68,17 +68,25 @@ class Openall_time_applet
     :settings_path => "#{Knj::Os.homedir}/.openall_time_applet",
     :run_path => "#{Knj::Os.homedir}/.openall_time_applet/run",
     :db_path => "#{Knj::Os.homedir}/.openall_time_applet/openall_time_applet.sqlite3",
-    :sock_path => "#{Knj::Os.homedir}/.openall_time_applet/sock"
+    :sock_path => "#{Knj::Os.homedir}/.openall_time_applet/sock",
+    :log_path => "#{Knj::Os.homedir}/.openall_time_applet/log"
   }
   
   #Initializes config-dir and database.
   def initialize(args = {})
+    #Spawn logging-object.
+    require "logger"
+    @log = Logger.new(CONFIG[:log_path])
+    @log.level = Logger::DEBUG
+    
+    
     Dir.mkdir(CONFIG[:settings_path]) if !File.exists?(CONFIG[:settings_path])
     self.check_runfile_and_cmds
     self.require_gtk2
     @debug = args[:debug]
     
     #Database-connection.
+    @log.debug("Spawning database-object.")
     @db = Knj::Db.new(
       :type => "sqlite3",
       :path => CONFIG[:db_path],
@@ -87,9 +95,11 @@ class Openall_time_applet
     )
     
     #Update to latest db-revision.
+    @log.debug("Updating database.")
     self.update_db
     
     #Models-handeler.
+    @log.debug("Spawning model-handler.")
     @ob = Knj::Objects.new(
       :datarow => true,
       :db => @db,
@@ -98,11 +108,14 @@ class Openall_time_applet
       :module => Openall_time_applet::Models
     )
     @ob.events.connect(:no_name, &self.method(:objects_no_name))
+    @ob.connect("object" => :Timelog, "signals" => ["delete_before"], &self.method(:on_timelog_delete))
     
+    @log.debug("Spawning event-handler.")
     @events = Knj::Event_handler.new
     @events.add_event(:name => :timelog_active_changed)
     
     #Options used to save various information (Openall-username and such).
+    @log.debug("Spawning options-object.")
     Knj::Opts.init("knjdb" => @db, "table" => "Option")
     
     #Set crash-operation to save tracked time instead of loosing it.
@@ -112,16 +125,37 @@ class Openall_time_applet
     Knj::Opts.set("tray_text_color", "green_casalogic") if Knj::Opts.get("tray_text_color").to_s.strip.empty?
     
     #Spawn tray-icon.
+    @log.debug("Spawning tray-icon.")
     self.spawn_trayicon
     
     #Start reminder.
+    @log.debug("Starting reminder.")
     self.reminding
     
     #Start unix-socket that listens for remote control.
+    @log.debug("Spawning UNIX-socket.")
     @unix_socket = Openall_time_applet::Unix_socket.new(:oata => self)
     
     #Start autosync-timeout.
+    @log.debug("Starting auto-sync.")
     self.restart_autosync
+    
+    @log.debug("OpenAll Time Applet started.")
+    
+    #Used to test when new tasks are created.
+    #@ob.list(:Task, "title" => "New task") do |task|
+    #  puts "Deleting test task."
+    #  @ob.delete(task)
+    #end
+  end
+  
+  #Called when a timelog is deleted.
+  def on_timelog_delete(timelog)
+    #Stop tracking if the active timelog is being deleted.
+    if @timelog_active and @timelog_active.id.to_i == timelog.id.to_i
+      @log.debug("Tracked timelog is being deleted - stopping tracking before deletion.")
+      self.timelog_stop_tracking
+    end
   end
   
   #Called when something doesnt have a name to get a replacement-name in the objects-framework.
@@ -132,26 +166,33 @@ class Openall_time_applet
   #Creates a runfile or sending a command to the running OpenAll-Time-Applet through the Unix-socket.
   def check_runfile_and_cmds
     #If run-file exists and the PID within is still running, then send command (if given) and exit.
-    if File.exists?(CONFIG[:run_path]) and Knj::Unix_proc.pid_running?(File.read(CONFIG[:run_path]).to_i)
-      cmd = nil
-      ARGV.each do |val|
-        if match = val.match(/^--cmd=(.+)$/)
-          cmd = match[1]
-          break
-        end
-      end
+    if File.exists?(CONFIG[:run_path]) and Knj::Unix_proc.pid_running?(File.read(CONFIG[:run_path]).to_i) and File.exists?(CONFIG[:sock_path])
+      running = true
       
-      if cmd
-        puts "Executing command through sock: #{cmd}"
-        
+      begin
         require "socket"
         UNIXSocket.open(CONFIG[:sock_path]) do |sock|
-          sock.puts(cmd)
+          cmd = nil
+          ARGV.each do |val|
+            if match = val.match(/^--cmd=(.+)$/)
+              cmd = match[1]
+              break
+            end
+          end
+          
+          if cmd
+            puts "Executing command through sock: #{cmd}"
+            sock.puts(cmd)
+          end
         end
+      rescue Errno::ECONNREFUSED
+        running = false
       end
       
-      puts "Already running"
-      exit
+      if running
+        puts "Already running"
+        exit
+      end
     end
     
     File.open(CONFIG[:run_path], "w") do |fp|
@@ -212,6 +253,7 @@ class Openall_time_applet
   #This executes the notification that notifies if a timelog is being tracked.
   def reminding_exec
     return nil unless @timelog_active
+    @log.debug("Sending reminder through notify.")
     Knj::Notify.send("time" => 5, "msg" => sprintf(_("Tracking task: %s"), @timelog_active[:descr]))
   end
   
@@ -220,16 +262,19 @@ class Openall_time_applet
   # oata.oa_conn do |conn|
   #   task_list = conn.task_list
   # end
-  def oa_conn
+  def oa_conn(args = nil)
     begin
-      conn = Openall_time_applet::Connection.new(
+      args_conn = {
         :oata => self,
         :host => Knj::Opts.get("openall_host"),
         :port => Knj::Opts.get("openall_port"),
         :username => Knj::Opts.get("openall_username"),
         :password => Base64.strict_decode64(Knj::Opts.get("openall_password")),
         :ssl => Knj::Strings.yn_str(Knj::Opts.get("openall_ssl"), true, false)
-      )
+      }
+      args_conn.merge!(args) if args
+      
+      conn = Openall_time_applet::Connection.new(args_conn)
       yield(conn)
     ensure
       conn.destroy if conn
@@ -243,6 +288,7 @@ class Openall_time_applet
   end
   
   def show_main
+    @log.debug("Show main window.")
     Knj::Gtk2::Window.unique!("main") do
       Openall_time_applet::Gui::Win_main.new(:oata => self)
     end
@@ -250,18 +296,21 @@ class Openall_time_applet
   
   #Spawns the preference-window.
   def show_preferences
+    @log.debug("Show preferences.")
     Knj::Gtk2::Window.unique!("preferences") do
       Openall_time_applet::Gui::Win_preferences.new(:oata => self)
     end
   end
   
   def show_overview
+    @log.debug("Show overview.")
     Knj::Gtk2::Window.unique!("overview") do
       Openall_time_applet::Gui::Win_overview.new(:oata => self)
     end
   end
   
   def show_worktime_overview
+    @log.debug("Show worktime-overview.")
     Knj::Gtk2::Window.unique!("worktime_overview") do
       Openall_time_applet::Gui::Win_worktime_overview.new(:oata => self)
     end
@@ -269,20 +318,24 @@ class Openall_time_applet
   
   #Updates the task-cache.
   def update_task_cache
+    @log.debug("Updating task-cache.")
     @ob.static(:Task, :update_cache, {:oata => self})
   end
   
   #Updates the worktime-cache.
   def update_worktime_cache
+    @log.debug("Updating worktime-cache.")
     @ob.static(:Worktime, :update_cache, {:oata => self})
   end
   
   def update_organisation_cache
+    @log.debug("Updating organisation-cache.")
     @ob.static(:Organisation, :update_cache, {:oata => self})
   end
   
   #Pushes time-updates to OpenAll.
   def push_time_updates
+    @log.debug("Pushing timelogs.")
     @ob.static(:Timelog, :push_time_updates, {:oata => self})
   end
   
@@ -351,6 +404,7 @@ class Openall_time_applet
   #Stops tracking a timelog. Saves time tracked and sets sync-flag.
   def timelog_stop_tracking
     if @timelog_active
+      @log.debug("Stopping tracking of timelog.")
       secs_passed = Time.now.to_i - @timelog_active_time.to_i
       
       @timelog_active.update(
@@ -373,6 +427,7 @@ class Openall_time_applet
       "descr" => timelog[:descr],
       "timestamp_day" => Time.now
     })
+    
     if !timelog_use
       timelog_use = @ob.add(:Timelog, {
         :task_id => timelog[:task_id],
@@ -385,6 +440,8 @@ class Openall_time_applet
       })
     end
     
+    @log.debug("Starting tracking of timelog.")
+    
     begin
       self.timelog_stop_tracking
       @timelog_logged_time = @ob.add(:Timelog_logged_time, :timelog_id => timelog_use.id)
@@ -393,6 +450,7 @@ class Openall_time_applet
       
       @events.call(:timelog_active_changed)
     rescue => e
+      @log.error("Error while trying to start tracking timelog: '#{e.message}'.\n#{e.backtrace.join("\n")}")
       Knj::Gtk2.msgbox("msg" => Knj::Errors.error_str(e), "type" => "warning", "title" => _("Error"), "run" => false)
     end
     
@@ -461,6 +519,7 @@ class Openall_time_applet
   
   #Prints status to the command line and the statusbar in the main window (if the main window is open).
   def status=(newstatus)
+    @log.debug("New status: '#{newstatus}'.")
     puts "Status: '#{newstatus}'."
     win_main = Knj::Gtk2::Window.get("main")
     

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-08-09 10:02+0100\n"
-"PO-Revision-Date: 2012-08-09 10:04+0100\n"
+"POT-Creation-Date: 2012-08-31 11:29+0100\n"
+"PO-Revision-Date: 2012-08-31 11:30+0100\n"
 "Last-Translator: Kasper Johansen <k@spernj.org>\n"
 "Language-Team: Kasper Johansen <k@spernj.org>\n"
 "Language: \n"
@@ -92,26 +92,26 @@ msgstr "Tray-indstillinger blev gemt."
 msgid "Connecting and logging in..."
 msgstr "Forbinder og logger ind..."
 
-#: gui/win_preferences.rb:83
+#: gui/win_preferences.rb:91
 msgid "Getting task-list."
 msgstr "Henter opgave-liste."
 
-#: gui/win_preferences.rb:86
+#: gui/win_preferences.rb:94
 msgid "Got %s tasks."
 msgstr "Hentet %s opgaver."
 
-#: gui/win_preferences.rb:94
-#: lib/openall_time_applet.rb:316
-#: lib/openall_time_applet.rb:346
-#: lib/openall_time_applet.rb:398
+#: gui/win_preferences.rb:102
+#: lib/openall_time_applet.rb:317
+#: lib/openall_time_applet.rb:347
+#: lib/openall_time_applet.rb:399
 msgid "Error"
 msgstr "Fejl"
 
-#: gui/win_preferences.rb:111
-msgid "The interval was not numeric."
-msgstr "Intervallet var ikke et tal."
+#: gui/win_preferences.rb:119
+msgid "The interval was not numeric or above zero."
+msgstr "Intervallet var ikke et nummer eller over nul."
 
-#: gui/win_preferences.rb:120
+#: gui/win_preferences.rb:128
 msgid "The auto. sync. preferences was saved."
 msgstr "Auto synk. indstillingerne blev gemt."
 
@@ -123,180 +123,190 @@ msgstr "Uge %s"
 msgid "No worktimes was found that week."
 msgstr "Der blev ikke fundet nogle arbejdstimer i denne uge."
 
-#: gui/win_main.rb:16
-#: gui/win_main.rb:223
+#: gui/win_main.rb:18
+#: gui/win_main.rb:255
 msgid "None"
 msgstr "Ingen"
 
-#: gui/win_main.rb:19
-#: gui/win_main.rb:226
-#: gui/win_main.rb:641
-#: gui/win_main.rb:660
-#: gui/win_main.rb:670
+#: gui/win_main.rb:21
+#: gui/win_main.rb:258
+#: gui/win_main.rb:776
+#: gui/win_main.rb:795
+#: gui/win_main.rb:805
 msgid "Choose:"
 msgstr "Vælg:"
 
-#: gui/win_main.rb:42
-#: gui/win_main.rb:236
+#: gui/win_main.rb:46
+#: gui/win_main.rb:268
 msgid "ID"
 msgstr "ID"
 
-#: gui/win_main.rb:44
+#: gui/win_main.rb:48
+#: gui/win_main.rb:274
 msgid "Stamp"
 msgstr "Stamp"
 
-#: gui/win_main.rb:50
-#: gui/win_main.rb:243
+#: gui/win_main.rb:54
+#: gui/win_main.rb:275
 msgid "Time"
 msgstr "Tid"
 
-#: gui/win_main.rb:56
-#: gui/win_main.rb:238
+#: gui/win_main.rb:60
+#: gui/win_main.rb:270
 msgid "Description"
 msgstr "Beskrivelse"
 
-#: gui/win_main.rb:63
-#: gui/win_main.rb:244
+#: gui/win_main.rb:67
+#: gui/win_main.rb:276
 msgid "T-time"
 msgstr "T-tid"
 
-#: gui/win_main.rb:69
-#: gui/win_main.rb:245
+#: gui/win_main.rb:73
+#: gui/win_main.rb:277
 msgid "T-km"
 msgstr "T-km"
 
-#: gui/win_main.rb:74
-#: gui/win_main.rb:247
+#: gui/win_main.rb:78
+#: gui/win_main.rb:279
 msgid "T-Descr."
 msgstr "T-Beskr."
 
-#: gui/win_main.rb:81
-#: gui/win_main.rb:251
+#: gui/win_main.rb:85
+#: gui/win_main.rb:283
 msgid "Cost"
 msgstr "Omk."
 
-#: gui/win_main.rb:86
-#: gui/win_main.rb:253
+#: gui/win_main.rb:90
+#: gui/win_main.rb:285
 msgid "Fixed"
 msgstr "Fikset"
 
-#: gui/win_main.rb:91
+#: gui/win_main.rb:95
+#: gui/win_main.rb:289
 msgid "Work"
 msgstr "Arb."
 
-#: gui/win_main.rb:96
-#: gui/win_main.rb:265
+#: gui/win_main.rb:100
+#: gui/win_main.rb:297
 msgid "Task"
 msgstr "Opgave"
 
-#: gui/win_main.rb:131
+#: gui/win_main.rb:109
+msgid "Track"
+msgstr "Track"
+
+#: gui/win_main.rb:141
 msgid "You cannot edit the time for the active timelog."
 msgstr "Du kan ikke redigere tid for den aktive tidslog."
 
-#: gui/win_main.rb:218
+#: gui/win_main.rb:193
+msgid "You cannot track a date. Please track a timelog instead."
+msgstr "Du kan ikke tracke en dato. Brug venligst en tidslog i stedet."
+
+#: gui/win_main.rb:250
 msgid "Transfer"
 msgstr "Overfør"
 
-#: gui/win_main.rb:242
-msgid "Timestamp"
-msgstr "Tidsstempel"
-
-#: gui/win_main.rb:257
-msgid "Internal"
-msgstr "Internt"
-
-#: gui/win_main.rb:261
+#: gui/win_main.rb:293
 msgid "Skip"
 msgstr "Skip"
 
-#: gui/win_main.rb:271
+#: gui/win_main.rb:303
 msgid "Sync time"
 msgstr "Synk tid"
 
-#: gui/win_main.rb:456
+#: gui/win_main.rb:476
 msgid "There is nothing to sync at this time."
 msgstr "Der er intet at synce på nuværende tidspunkt."
 
-#: gui/win_main.rb:493
+#: gui/win_main.rb:513
 msgid "You cannot edit this on the active timelog."
 msgstr "Du kan ikke redigere den aktive tidslog."
 
-#: gui/win_main.rb:562
+#: gui/win_main.rb:613
+msgid "Could not find timelog in treeview: '%s'."
+msgstr "Kunne ikke finde tidslog i treeviewet: '%s'."
+
+#: gui/win_main.rb:650
+msgid "Could not find iter from that date: '%s'."
+msgstr "Kunne ikke finde iter fra den dato: '%s'."
+
+#: gui/win_main.rb:696
 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_main.rb:667
+#: gui/win_main.rb:802
 msgid "Start"
 msgstr "Start"
 
-#: gui/win_main.rb:723
+#: gui/win_main.rb:861
 msgid "Please choose a timelog to delete."
 msgstr "Vælg venligst en tidslog at slette."
 
-#: gui/win_main.rb:727
+#: gui/win_main.rb:865
 #: spec/openall_time_applet_spec.rb:54
 #: spec/openall_time_applet_spec.rb:83
 msgid "Do you want to remove this timelog?"
 msgstr "Vil du fjerne denne tidslogning?"
 
-#: gui/win_main.rb:731
+#: gui/win_main.rb:869
 msgid "Could not delete the timelog: %s"
 msgstr "Kunne ikke slette tidslog: %s"
 
-#: lib/openall_time_applet.rb:131
+#: lib/openall_time_applet.rb:129
 msgid "not set"
 msgstr "ikke sat"
 
-#: lib/openall_time_applet.rb:217
+#: lib/openall_time_applet.rb:215
 msgid "Tracking task: %s"
 msgstr "Følger opgave: %s"
 
-#: lib/openall_time_applet.rb:297
+#: lib/openall_time_applet.rb:298
 msgid "Updating organisation-cache."
 msgstr "Opdaterer organisations-cache."
 
-#: lib/openall_time_applet.rb:301
+#: lib/openall_time_applet.rb:302
 msgid "Updating task-cache."
 msgstr "Opdaterer opgave-cache."
 
-#: lib/openall_time_applet.rb:305
-#: lib/openall_time_applet.rb:338
+#: lib/openall_time_applet.rb:306
+#: lib/openall_time_applet.rb:339
 msgid "Updating worktime-cache."
 msgstr "Opdaterer arbejdstids-cache."
 
-#: lib/openall_time_applet.rb:330
+#: lib/openall_time_applet.rb:331
 msgid "Pushing time-updates."
 msgstr "Sender tids-opdateringer."
 
-#: lib/openall_time_applet.rb:334
+#: lib/openall_time_applet.rb:335
 msgid "Update task-cache."
 msgstr "Opdaterer opgave-cache."
 
-#: lib/openall_time_applet.rb:342
+#: lib/openall_time_applet.rb:343
 msgid "Done"
 msgstr "Færdig"
 
-#: lib/openall_time_applet.rb:431
+#: lib/openall_time_applet.rb:432
 msgid "Disabled automatic synchronization."
 msgstr "Slået automatisk synkronation fra."
 
-#: lib/openall_time_applet.rb:435
+#: lib/openall_time_applet.rb:436
 msgid "Restarted automatic sync. to run every %s minutes."
 msgstr "Genstartet automatisk synk. til at køre hvert %s minut."
 
-#: lib/openall_time_applet.rb:449
+#: lib/openall_time_applet.rb:450
 msgid "Synchronizing organisations."
 msgstr "Synkroniserer organisationer."
 
-#: lib/openall_time_applet.rb:452
+#: lib/openall_time_applet.rb:453
 msgid "Synchronizing worktime."
 msgstr "Synkroniserer arbejdstid."
 
-#: lib/openall_time_applet.rb:455
+#: lib/openall_time_applet.rb:456
 msgid "Automatic synchronization done."
 msgstr "Automatisk synkronation færdig."
 
-#: lib/openall_time_applet.rb:457
+#: lib/openall_time_applet.rb:458
 msgid "Error while auto-syncing: %s"
 msgstr "Fejl ved auto-synk: %s"
 
@@ -437,6 +447,12 @@ msgstr "Tidslog liste"
 msgid "<b>Timelogs</b>"
 msgstr "<b>Tidslogs</b>"
 
+#~ msgid "Timestamp"
+#~ msgstr "Tidsstempel"
+
+#~ msgid "Internal"
+#~ msgstr "Internt"
+
 #~ msgid "New"
 #~ msgstr "Ny"