cdb/voyage-hildon.diff at master · karfai/cdb · GitHub

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
--- voyage-hildon.py	2009-12-12 20:48:38.000000000 -0500
+++ voyage-hildon.py.o	2009-12-12 20:52:35.000000000 -0500
@@ -17,7 +17,7 @@

 import pygtk
 pygtk.require('2.0')
-import gtk
+import gtk, hildon

 import re, threading, Queue
 from datetime import *
@@ -55,7 +55,7 @@

     def run(self):
         self._routing = schema.Routing()
-        while not self._e.is_set():
+        while not self._e.isSet():
             try:
                 m = self._q.get(False, 1)
                 if m is None:
@@ -415,7 +415,7 @@

 class InfoLabel(gtk.Label):
     def __init__(self, text):
-        gtk.Label.__init__(self, None)
+        gtk.Label.__init__(self, '')
         self.set_property('xalign', 0.0)

     def change_text(self, text):
@@ -480,14 +480,17 @@
         if w.get_property('sensitive'):
             self._panel.poll()

-class Panel(gtk.Window):
+class Panel(hildon.Window):
     def __init__(self):
-        gtk.Window.__init__(self, gtk.WINDOW_TOPLEVEL)
+        hildon.Window.__init__(self)

         self.set_title('voyageur')
         self.set_icon_from_file('icon.png')
         self.set_border_width(6)
+
         self.connect('destroy', self.act_quit)
+        self.connect('key-press-event', self.act_key)
+        self.connect('window-state-event', self.act_state)

         self._ready_for_results = threading.Event()
         self._model = Model(self)
@@ -553,6 +556,19 @@
     def act_selection(self, sel):
         self.enable_exits()

+    def act_key(self, w, evt, *args):
+        if evt.keyval == gtk.keysyms.F6:
+            if self.window_in_fullscreen:
+                self.unfullscreen()
+            else:
+                self.fullscreen()
+
+    def act_state(self, w, evt, *args):
+        if evt.new_window_state & gtk.gdk.WINDOW_STATE_FULLSCREEN:
+            self.window_in_fullscreen = True
+        else:
+            self.window_in_fullscreen = False
+
     def get_query_text(self):
         return self._loc.get_active_text()

@@ -569,10 +585,13 @@
         self._list.get_model().clear()

     def disable(self):
+        self._ban = hildon.hildon_banner_show_animation(self, None, 'Updating')
+        self._ban.show()
         self._list.set_sensitive(False)
         self._info.set_sensitive(False)

     def enable(self):
+        self._ban.destroy()
         self._list.set_sensitive(True)
         self._info.set_sensitive(True)

@@ -657,6 +676,8 @@
         self._model.searches(lambda text: self._loc.add(text))

 gtk.gdk.threads_init()
+app = hildon.Program()
 w = Panel()
+app.add_window(w)
 w.refresh()
 gtk.main()