openall_time_applet 0.0.38 → 0.0.40

Sign up to get free protection for your applications and to get access to all the features.
Files changed (15) hide show
  1. data/Gemfile +2 -0
  2. data/Gemfile.lock +25 -17
  3. data/VERSION +1 -1
  4. data/conf/db_schema.rb +3 -1
  5. data/glade/win_main.glade +15 -6
  6. data/gui/trayicon.rb +3 -5
  7. data/gui/win_main.rb +403 -189
  8. data/gui/win_preferences.rb +9 -1
  9. data/lib/openall_time_applet.rb +79 -20
  10. data/locales/da_DK/LC_MESSAGES/default.mo +0 -0
  11. data/locales/da_DK/LC_MESSAGES/default.po +89 -73
  12. data/models/task.rb +62 -3
  13. data/models/timelog.rb +30 -0
  14. data/openall_time_applet.gemspec +14 -8
  15. metadata +35 -15
data/Gemfile CHANGED
@@ -10,7 +10,9 @@ gem "json"
10
10
  gem "rmagick"
11
11
  gem "datet"
12
12
  gem "http2"
13
+ gem "gtk2_expander_settings"
13
14
  gem "gtk2_treeview_settings"
15
+ gem "gtk2_window_settings"
14
16
 
15
17
  # Add dependencies to develop your gem here.
16
18
  # Include everything needed to run rake, tests, features, etc.
data/Gemfile.lock CHANGED
@@ -1,42 +1,48 @@
1
1
  GEM
2
2
  remote: http://rubygems.org/
3
3
  specs:
4
- atk (1.1.4)
5
- glib2 (>= 1.1.4)
4
+ atk (1.1.5)
5
+ glib2 (>= 1.1.5)
6
6
  cairo (1.12.2)
7
7
  pkg-config
8
- datet (0.0.15)
8
+ datet (0.0.20)
9
9
  diff-lcs (1.1.3)
10
- gdk_pixbuf2 (1.1.4)
11
- glib2 (>= 1.1.4)
12
- gettext (2.2.1)
10
+ gdk_pixbuf2 (1.1.5)
11
+ glib2 (>= 1.1.5)
12
+ gettext (2.3.0)
13
13
  locale
14
14
  git (1.2.5)
15
- glib2 (1.1.4)
15
+ glib2 (1.1.5)
16
16
  pkg-config
17
- gtk2 (1.1.4)
18
- atk (>= 1.1.4)
19
- gdk_pixbuf2 (>= 1.1.4)
20
- pango (>= 1.1.4)
21
- gtk2_treeview_settings (0.0.0)
17
+ gtk2 (1.1.5)
18
+ atk (>= 1.1.5)
19
+ gdk_pixbuf2 (>= 1.1.5)
20
+ pango (>= 1.1.5)
21
+ gtk2_expander_settings (0.0.1)
22
22
  gtk2
23
+ knjrbfw
24
+ gtk2_treeview_settings (0.0.2)
25
+ gtk2
26
+ gtk2_window_settings (0.0.5)
27
+ gtk2
28
+ knjrbfw
23
29
  http2 (0.0.10)
24
30
  jeweler (1.8.4)
25
31
  bundler (~> 1.0)
26
32
  git (>= 1.2.5)
27
33
  rake
28
34
  rdoc
29
- json (1.7.4)
30
- knjrbfw (0.0.86)
35
+ json (1.7.5)
36
+ knjrbfw (0.0.94)
31
37
  datet
32
38
  http2
33
39
  php4r
34
40
  tsafe
35
41
  wref
36
- locale (2.0.5)
37
- pango (1.1.4)
42
+ locale (2.0.8)
43
+ pango (1.1.5)
38
44
  cairo (>= 1.10.0)
39
- glib2 (>= 1.1.4)
45
+ glib2 (>= 1.1.5)
40
46
  php4r (0.0.3)
41
47
  datet
42
48
  http2
@@ -65,7 +71,9 @@ DEPENDENCIES
65
71
  datet
66
72
  gettext
67
73
  gtk2
74
+ gtk2_expander_settings
68
75
  gtk2_treeview_settings
76
+ gtk2_window_settings
69
77
  http2
70
78
  jeweler (~> 1.8.3)
71
79
  json
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.38
1
+ 0.0.40
data/conf/db_schema.rb CHANGED
@@ -22,7 +22,9 @@ Openall_time_applet::DB_SCHEMA = {
22
22
  {"name" => "id", "type" => "int", "autoincr" => true, "primarykey" => true},
23
23
  {"name" => "openall_uid", "type" => "int"},
24
24
  {"name" => "organisation_id", "type" => "int"},
25
- {"name" => "title", "type" => "varchar"}
25
+ {"name" => "title", "type" => "varchar"},
26
+ {"name" => "status", "type" => "varchar"},
27
+ {"name" => "active", "type" => "enum", "maxlength" => "'0','1'", "default" => "1"}
26
28
  ],
27
29
  "indexes" => [
28
30
  "openall_uid",
data/glade/win_main.glade CHANGED
@@ -264,11 +264,12 @@
264
264
  <property name="layout_style">start</property>
265
265
  <child>
266
266
  <object class="GtkButton" id="btnPlus">
267
- <property name="label" translatable="yes">+</property>
267
+ <property name="label" translatable="yes">_+</property>
268
268
  <property name="visible">True</property>
269
269
  <property name="can_focus">True</property>
270
270
  <property name="receives_default">True</property>
271
271
  <property name="use_action_appearance">False</property>
272
+ <property name="use_underline">True</property>
272
273
  <signal name="clicked" handler="on_btnPlus_clicked" swapped="no"/>
273
274
  </object>
274
275
  <packing>
@@ -279,11 +280,12 @@
279
280
  </child>
280
281
  <child>
281
282
  <object class="GtkButton" id="btnMinus">
282
- <property name="label" translatable="yes">-</property>
283
+ <property name="label" translatable="yes">_-</property>
283
284
  <property name="visible">True</property>
284
285
  <property name="can_focus">True</property>
285
286
  <property name="receives_default">True</property>
286
287
  <property name="use_action_appearance">False</property>
288
+ <property name="use_underline">True</property>
287
289
  <signal name="clicked" handler="on_btnMinus_clicked" swapped="no"/>
288
290
  </object>
289
291
  <packing>
@@ -308,7 +310,7 @@
308
310
  <property name="layout_style">end</property>
309
311
  <child>
310
312
  <object class="GtkButton" id="btnSync">
311
- <property name="label" translatable="yes">Prepare _sync</property>
313
+ <property name="label" translatable="yes">Prepare _transfer</property>
312
314
  <property name="visible">True</property>
313
315
  <property name="can_focus">True</property>
314
316
  <property name="receives_default">True</property>
@@ -465,11 +467,18 @@
465
467
  </packing>
466
468
  </child>
467
469
  <child>
468
- <object class="GtkLabel" id="labTotal">
470
+ <object class="GtkAlignment" id="alignment7">
469
471
  <property name="visible">True</property>
470
472
  <property name="can_focus">False</property>
471
- <property name="xalign">0</property>
472
- <property name="label" translatable="yes">[totals]</property>
473
+ <property name="left_padding">12</property>
474
+ <child>
475
+ <object class="GtkLabel" id="labTotal">
476
+ <property name="visible">True</property>
477
+ <property name="can_focus">False</property>
478
+ <property name="xalign">0</property>
479
+ <property name="label" translatable="yes">[totals]</property>
480
+ </object>
481
+ </child>
473
482
  </object>
474
483
  <packing>
475
484
  <property name="expand">False</property>
data/gui/trayicon.rb CHANGED
@@ -20,11 +20,9 @@ class Openall_time_applet::Gui::Trayicon
20
20
 
21
21
  #This methods starts the thread that updates the tray-icon.
22
22
  def icon_updater
23
- Knj::Thread.new do
24
- loop do
25
- self.update_icon
26
- sleep 30
27
- end
23
+ Gtk.timeout_add(30000) do
24
+ self.update_icon
25
+ true
28
26
  end
29
27
  end
30
28