zeitgeist team mailing list archive

[dhananjaysathe <dhananjaysathe@xxxxxxxxx>]

dhananjaysathe has proposed merging lp:~dhananjaysathe/zeitgeist-explorer/zeitgeist-explorer into lp:zeitgeist-explorer.

Requested reviews:
  Zeitgeist Framework Team (zeitgeist)

For more details, see:
https://code.launchpad.net/~dhananjaysathe/zeitgeist-explorer/zeitgeist-explorer/+merge/110610

 Replaced Gtk.Table with Gtk.Grid as it has been deprecated by Gtk 3.4 
-- 
https://code.launchpad.net/~dhananjaysathe/zeitgeist-explorer/zeitgeist-explorer/+merge/110610
Your team Zeitgeist Framework Team is requested to review the proposed merge of lp:~dhananjaysathe/zeitgeist-explorer/zeitgeist-explorer into lp:zeitgeist-explorer.

=== modified file 'zgexplorer/date_widgets.py' (properties changed: -x to +x)
=== modified file 'zgexplorer/eventwidgets.py'
--- zgexplorer/eventwidgets.py	2012-05-25 18:40:22 +0000
+++ zgexplorer/eventwidgets.py	2012-06-15 20:00:23 +0000
@@ -58,20 +58,25 @@
         self.timerange = TimeRangeViewer(self.start_time,self.end_time)
         box.pack_start(self.timerange,False,False,0)
 
-        table = Gtk.Table(1,2,True)
-        box.pack_start(table,False,False,0)
+        grid = Gtk.Grid()
+        grid.set_row_homogeneous(True)
+        grid.set_column_homogeneous(True)
+        grid.set_row_spacing(4)
+        grid.set_column_spacing(6)
+        box.pack_start(grid,False,False,0)
 
         label = Gtk.Label('Result Type:',xalign=0,yalign=0.5)
-        table.attach(label, 0, 1, 0, 1, xpadding=6 ,ypadding=6)
+        grid.attach(label, 0, 0, 1, 1)
         self.result_type = Gtk.ComboBoxText()
         self.result_type.set_active(28)
-        table.attach(self.result_type, 1, 2, 0, 1, xpadding=6 ,ypadding=6)
+        grid.attach(self.result_type, 1, 0, 1, 1)
         for entry in dir(ResultType)[:-1]:
             if not ( entry.startswith('__')):
                 self.result_type.append_text(entry)
 
-        self.table = Gtk.Table(10, 2, False,border_width=5)
-        box.pack_start(self.table, True, True, 0)
+        self.grid = Gtk.Grid()
+        self.grid.set_border_width(5)
+        box.pack_start(self.grid, True, True, 0)
 
         event_label = Gtk.Label()
         event_label.set_markup("<b>%s</b>" %("Event"))
@@ -149,33 +154,33 @@
                self.storage_field.append_text(entry)
 
         attach_list = (
-             (event_label,(0, 2, 0, 1)),
-             (event_inter_label,(0, 1, 1, 2)),
-             (self.event_inter_field,(1, 2, 1, 2)),
-             (event_manifes_label,(0, 1, 2, 3)),
-             (self.event_manifes_field,(1, 2, 2, 3)),
-             (actor_label,(0, 1, 3, 4)),
-             (self.actor_field,(1, 2, 3, 4)),
-             (actor_hbox,(1, 2, 4, 5)),
-             (subj_label,(0, 2, 5, 6)),
-             (uri_label,(0, 1, 6, 7)),
-             (self.uri_field,(1, 2, 6, 7)),
-             (curr_uri_label,(0, 1, 7, 8)),
-             (self.curr_uri_field,(1, 2, 7, 8)),
-             (subj_inter_label,(0, 1, 8, 9)),
-             (self.subj_inter_field,(1, 2, 8, 9)),
-             (subj_manifes_label,(0, 1, 9, 10)),
-             (self.subj_manifes_field,(1, 2, 9,10)),
-             (origin_label,(0, 1, 10, 11)),
-             (self.origin_field,(1, 2, 10, 11)),
-             (mimetype_label,(0, 1, 11, 12)),
-             (self.mimetype_field,(1, 2, 11, 12)),
-             (storage_label,(0, 1, 12, 13)),
-             (self.storage_field,(1, 2, 12, 13))
+             (event_label,(0, 0, 2)),
+             (event_inter_label,(0, 1, 1)),
+             (self.event_inter_field,(1, 1, 1)),
+             (event_manifes_label,(0, 2, 1)),
+             (self.event_manifes_field,(1, 2, 1)),
+             (actor_label,(0, 3, 1)),
+             (self.actor_field,(1, 3, 1)),
+             (actor_hbox,(1, 4, 1)),
+             (subj_label,(0, 5, 2)),
+             (uri_label,(0, 6, 1)),
+             (self.uri_field,(1, 6, 1)),
+             (curr_uri_label,(0, 7, 1)),
+             (self.curr_uri_field,(1, 7, 1)),
+             (subj_inter_label,(0, 8, 1)),
+             (self.subj_inter_field,(1, 8, 1)),
+             (subj_manifes_label,(0, 9, 1)),
+             (self.subj_manifes_field,(1, 9, 1)),
+             (origin_label,(0, 10, 1)),
+             (self.origin_field,(1, 10, 1)),
+             (mimetype_label,(0, 11, 1)),
+             (self.mimetype_field,(1, 11, 1)),
+             (storage_label,(0, 12, 1)),
+             (self.storage_field,(1, 12, 1))
          )
         for widget_entry in attach_list:
             widget,pos = widget_entry
-            self.table.attach(widget,pos[0],pos[1], pos[2], pos[3], xpadding=3, ypadding=3)
+            self.grid.attach(widget,pos[0],pos[1], pos[2], 1)
 
         self.add_buttons('Apply',Gtk.ResponseType.APPLY,'Cancel',Gtk.ResponseType.CANCEL,'OK',Gtk.ResponseType.OK,)
 
@@ -298,8 +303,9 @@
     def __init__(self):
        super(TemplateViewer, self).__init__()
 
-       self.table = Gtk.Table(10, 2, False, border_width=10)
-       self.pack_start(self.table, True, True, 0)
+       self.grid = Gtk.Grid()
+       self.grid.set_border_width(10)
+       self.pack_start(self.grid, True, True, 0)
 
        event_label = Gtk.Label()
        event_label.set_markup("<b>%s</b>" %("Event"))
@@ -351,27 +357,27 @@
        self.storage_field = Gtk.Label("", xalign=0,yalign=0.5)
 
        attach_list = (
-            (event_label,(0, 2, 0, 1)),
-            (event_inter_label,(0, 1, 1, 2)),
-            (self.event_inter_field,(1, 2, 1, 2)),
-            (event_manifes_label,(0, 1, 2, 3)),
-            (self.event_manifes_field,(1, 2, 2, 3)),
-            (actor_label,(0, 1, 3, 4)),
-            (self.actor_field,(1, 2, 3, 4)),
-            (actor_hbox,(1, 2, 4, 5)),
-            (subj_label,(0, 2, 5, 6)),
-            (subj_inter_label,(0, 1, 6, 7)),
-            (self.subj_inter_field,(1, 2, 6, 7)),
-            (subj_manifes_label,(0, 1, 7, 8)),
-            (self.subj_manifes_field,(1, 2, 7, 8)),
-            (mimetype_label,(0, 1, 8, 9)),
-            (self.mimetype_field,(1, 2, 8, 9)),
-            (storage_label,(0, 1, 9, 10)),
-            (self.storage_field,(1, 2, 9, 10))
+            (event_label,(0, 0, 2)),
+            (event_inter_label,(0, 1, 1)),
+            (self.event_inter_field,(1, 1, 1)),
+            (event_manifes_label,(0, 2, 1)),
+            (self.event_manifes_field,(1, 2, 1)),
+            (actor_label,(0, 3, 1)),
+            (self.actor_field,(1, 3, 1)),
+            (actor_hbox,(1, 4, 1)),
+            (subj_label,(0, 5, 2)),
+            (subj_inter_label,(0, 6, 1)),
+            (self.subj_inter_field,(1, 6, 1)),
+            (subj_manifes_label,(0, 7, 1)),
+            (self.subj_manifes_field,(1, 7, 1)),
+            (mimetype_label,(0, 8, 1)),
+            (self.mimetype_field,(1, 8, 1)),
+            (storage_label,(0, 9, 1)),
+            (self.storage_field,(1, 9, 1))
         )
        for widget_entry in attach_list:
            widget,pos = widget_entry
-           self.table.attach(widget,pos[0],pos[1], pos[2], pos[3], xpadding=3, ypadding=3)
+           self.grid.attach(widget,pos[0],pos[1], pos[2], 1)
 
     def set_values(self, values):
         ev = values[2]
@@ -437,8 +443,9 @@
 
         super(EventViewer, self).__init__()
 
-        self.table = Gtk.Table(18, 4, False,border_width=1)
-        self.pack_start(self.table, False, False, 6)
+        self.grid = Gtk.Grid()
+        self.grid.set_border_width(1)
+        self.pack_start(self.grid, False, False, 6)
 
         id_label = Gtk.Label(xalign=0,yalign=0.5)
         id_label.set_markup("<b>%s</b>" %("Event ID"))
@@ -513,37 +520,37 @@
         self.storage_entry = Gtk.Label(xalign=0,yalign=0.5)
 
         attach_list = (
-            (id_label,(0, 1, 0, 1)),
-            (self.id_entry,(1, 2, 0, 1)),
-            (time_label,(2, 3, 0, 1)),
-            (self.time_entry,(3, 4, 0, 1)),
-            (event_int_label,(0, 1, 1, 2)),
-            (self.event_int_entry,(1, 4, 1, 2)),
-            (event_manifes_label,(0, 1, 2, 3)),
-            (self.event_manifes_entry,(1, 4, 2, 3)),
-            (actor_label,(0, 1, 3, 4)),
-            (self.actor_entry,(1, 2, 3, 4)),
-            (actor_box,(2, 4, 3, 4)),
-            (uri_label,(0, 1, 4, 5)),
-            (self.uri_entry,(1, 4, 4, 5)),
-            (current_uri_label,(0, 1, 5, 6)),
-            (self.current_uri_entry,(1, 4, 5, 6)),
-            (subj_int_label,(0, 1, 6, 7)),
-            (self.subj_int_entry,(1, 4, 6, 7)),
-            (subj_manifes_label,(0, 1, 7, 8)),
-            (self.subj_manifes_entry,(1, 4, 7, 8)),
-            (origin_label,(0, 1, 8, 9)),
-            (self.origin_entry,(1, 2, 8, 9)),
-            (mimetype_label,(2, 3, 8, 9)),
-            (self.mime_entry,(3, 4, 8, 9)),
-            (text_label,(0, 1, 9, 10)),
-            (self.text_entry,(1, 2, 9, 10)),
-            (storage_label,(2, 3, 9, 10)),
-            (self.storage_entry,(3, 4, 9, 10))
+            (id_label,(0, 0, 1)),
+            (self.id_entry,(1, 0, 1)),
+            (time_label,(2, 0, 1)),
+            (self.time_entry,(3, 0, 1)),
+            (event_int_label,(0, 1, 1)),
+            (self.event_int_entry,(1, 1, 3)),
+            (event_manifes_label,(0, 2, 1)),
+            (self.event_manifes_entry,(1, 2, 3)),
+            (actor_label,(0, 3, 1)),
+            (self.actor_entry,(1, 3, 1)),
+            (actor_box,(2, 3, 2)),
+            (uri_label,(0, 4, 1)),
+            (self.uri_entry,(1, 4, 3)),
+            (current_uri_label,(0, 5, 1)),
+            (self.current_uri_entry,(1, 5, 3)),
+            (subj_int_label,(0, 6, 1)),
+            (self.subj_int_entry,(1, 6, 3)),
+            (subj_manifes_label,(0, 7, 1)),
+            (self.subj_manifes_entry,(1, 7, 3)),
+            (origin_label,(0, 8, 1)),
+            (self.origin_entry,(1, 8, 1)),
+            (mimetype_label,(2, 8, 1)),
+            (self.mime_entry,(3, 8, 1)),
+            (text_label,(0, 9, 1)),
+            (self.text_entry,(1, 9, 1)),
+            (storage_label,(2, 9, 1)),
+            (self.storage_entry,(3, 9, 1))
          )
         for widget_entry in attach_list:
            widget,pos = widget_entry
-           self.table.attach(widget,pos[0],pos[1], pos[2], pos[3], xpadding=6, ypadding=6)
+           self.grid.attach(widget,pos[0],pos[1], pos[2], 1)
 
     def map(self, event):
         try:

=== modified file 'zgexplorer/remote.py' (properties changed: -x to +x)