Changeset 649 for trunk/software

Timestamp:

02/01/10 19:51:33 (2 years ago)

Author:

mosttw

Message:

Made log message scrolling "stick"

Location:

trunk/software/rb/gui

Files:

• logs.py (modified) (6 diffs)
• main.gtk (modified) (2 diffs)

trunk/software/rb/gui/logs.py

@@ -1 @@
-# Copyright (C) 2009 Thomas W. Most
+# Copyright (C) 2009-2010 Thomas W. Most
 #
 # This program is free software: you can redistribute it and/or modify
@@ -62 +62 @@
                 self.display_prefixes = ('',) # List of component prefixes to display
                 self.hide_prefixes = () # Tuple of prefixes to disallow
+                # Whether the scrollbar was at the bottom of the window before an item
+                # was added to the view.
+                self.at_bottom = True
 
                 # Widgets
@@ -67 +70 @@
                 self.level_combo = builder.get_object('logs_level_combo')
                 self.filter_combo = builder.get_object('logs_filter_combo')
+                self.vscroll_adjustment = builder.get_object('logs_vscroll_adjustment')
         
                 # Data model
@@ -98 +102 @@
                 self.level_combo.connect("changed", self.level_changed_cb)
                 self.filter_combo.connect("changed", self.filter_changed_cb)
+                self.vscroll_adjustment.connect("changed", self.vscroll_adjustment_changed_cb)
                 
                 logger.info("Completed loading logging GUI")
@@ -126 +131 @@
                 @gobject.idle_add
                 def update_gui():
+                        page_size = self.vscroll_adjustment.page_size
+                        value = self.vscroll_adjustment.value
+                        self.at_bottom = int(value + page_size) >= int(self.vscroll_adjustment.upper)
                         self.record_store.append(row)
                         return False
@@ -156 +164 @@
                         self.hide_prefixes = tuple(b[1:] for b in bits if b.startswith('!'))
                         self.record_filter.refilter()
+        
+        def vscroll_adjustment_changed_cb(self, adj):
+                if self.at_bottom:
+                        self.vscroll_adjustment.set_value(self.vscroll_adjustment.upper)
 

trunk/software/rb/gui/main.gtk

@@ -769 +769 @@
                     </child>
                     <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow1">
+                      <object class="GtkScrolledWindow" id="logs_scroll">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="vadjustment">logs_vscroll_adjustment</property>
                         <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
                         <child>
                           <object class="GtkTreeView" id="logs_treeview">
@@ -883 +883 @@
   <object class="GtkSizeGroup" id="sensors_1stcol_sizegroup">
     <widgets>
+      <widget name="ms_orient_label"/>
+      <widget name="ms_ang_vel_label"/>
+      <widget name="ms_accel_label"/>
+      <widget name="gps_lat_lon_label"/>
       <widget name="gps_speed_label"/>
-      <widget name="gps_lat_lon_label"/>
-      <widget name="ms_accel_label"/>
-      <widget name="ms_ang_vel_label"/>
-      <widget name="ms_orient_label"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="ms_data_sizegroup">
     <widgets>
+      <widget name="ms_orient_1"/>
+      <widget name="ms_orient_0"/>
+      <widget name="ms_orient_2"/>
+      <widget name="ms_ang_vel_0"/>
+      <widget name="ms_ang_vel_1"/>
+      <widget name="ms_ang_vel_2"/>
+      <widget name="ms_accel_0"/>
+      <widget name="ms_accel_1"/>
       <widget name="ms_accel_2"/>
-      <widget name="ms_accel_1"/>
-      <widget name="ms_accel_0"/>
-      <widget name="ms_ang_vel_2"/>
-      <widget name="ms_ang_vel_1"/>
-      <widget name="ms_ang_vel_0"/>
-      <widget name="ms_orient_2"/>
-      <widget name="ms_orient_0"/>
-      <widget name="ms_orient_1"/>
     </widgets>
   </object>
+  <object class="GtkAdjustment" id="logs_vscroll_adjustment">
+    <property name="upper">100</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+    <property name="page_size">10</property>
+  </object>
 </interface>