diff --git a/fluent b/fluent index 822101a..db5757d 100755 --- a/fluent +++ b/fluent @@ -99,7 +99,6 @@ class FluentApp: # Connect signals signals = {'on_quit1_activate' : (gtk.main_quit), 'on_appwindow_delete_event' : (gtk.main_quit), - 'on_view_log_activate' : (self.toggle_view_log), 'on_zoom_in_button_clicked' : (self.on_single_view), 'on_zoom_out_button_clicked' : (self.on_multiple_view)} self.widget_tree.signal_autoconnect(signals) @@ -111,14 +110,6 @@ class FluentApp: pt = self.widget_tree.get_widget('main_view') pt.insert_view(plot) - def toggle_view_log(self, menu_item): - lw = self.widget_tree.get_widget('logview') - if menu_item.get_active(): - lw.show() - else: - lw.unparent() - logger.log('debug', 'Toggling log window visibility') - def on_single_view(self, button): nb = self.widget_tree.get_widget('main_view') nb.goto_large() diff --git a/system/fluent.glade b/system/fluent.glade index f84a14a..57bc9e7 100644 --- a/system/fluent.glade +++ b/system/fluent.glade @@ -20,6 +20,8 @@ False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST + True + False True @@ -36,6 +38,8 @@ True + GTK_PACK_DIRECTION_LTR + GTK_PACK_DIRECTION_LTR @@ -173,21 +177,6 @@ True GNOMEUIINFO_MENU_VIEW_TREE - - - - - - - True - Log - True - True - - - - - @@ -404,6 +393,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -472,6 +465,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 0 @@ -497,7 +494,7 @@ - + True True True @@ -544,6 +541,10 @@ 0.5 0 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 tab diff --git a/system/plots.py b/system/plots.py index 8b48626..93d1a27 100644 --- a/system/plots.py +++ b/system/plots.py @@ -29,10 +29,6 @@ class MainView (gtk.Notebook): self.append_page(self.large_view) self.set_current_page(0) - # Set current view to the upper left view. - self.current_view = self.small_view.get_view(0, 0) - self.current_view.mark_active(True) - def goto_small(self): if self.get_current_page() == 0: return None @@ -77,10 +73,14 @@ class SmallView (gtk.Table): def set_child(self, child, col, row): cur_widget = self.child_views[col][row] cur_widget.disconnect(cur_widget.parent_signalling) + print cur_widget self.remove(cur_widget) self.attach(child, col, col+1, row, row+1) child.parent_signalling = child.connect('button_press_event', self.__view_button_event__) self.child_views[col][row] = child + if cur_widget.active: + child.mark_active(True) + cur_widget.mark_active(False) child.show() def borrow_current(self): @@ -169,6 +169,7 @@ class Plot (gtk.Frame): self.mark_active(False) self.connect('button_press_event', self.on_button_press) self.sel_obj = None + self.active = False if project!=None: #its not an Emptyview project.attach(self,'selection_update') @@ -184,6 +185,7 @@ class Plot (gtk.Frame): self.set_shadow_type(gtk.SHADOW_IN) else: self.set_shadow_type(gtk.SHADOW_OUT) + self.active = active def update(self,project,key): pass