GNOME.org
 

accerciser r418 - in trunk: . plugindata/validate plugins

Author: eitani
Date: Sat Jan 12 01:17:35 2008
New Revision: 418
URL: http://svn.gnome.org/viewvc/accerciser?rev=418&view=rev

Log:
* plugindata/validate/Makefile.am: Fixed install path.
* plugins/event_monitor.py: Added a new global hotkey for
starting/stopping recording.
* plugins/validate.glade: Removed Save button, changed layout so
it won't be so wide. Added label relationships to comobox and label.
* plugins/validate.py: Removed Save button stuff.


Modified:
   trunk/ChangeLog
   trunk/plugindata/validate/Makefile.am
   trunk/plugins/event_monitor.py
   trunk/plugins/validate.glade
   trunk/plugins/validate.py

Modified: trunk/plugindata/validate/Makefile.am
==============================================================================
--- trunk/plugindata/validate/Makefile.am	(original)
+++ trunk/plugindata/validate/Makefile.am	Sat Jan 12 01:17:35 2008
@@ -1,4 +1,4 @@
-plugindatadir = $(datadir)/$(PACKAGE)/plugindata
+plugindatadir = $(datadir)/$(PACKAGE)/plugindata/validate
 plugindata_DATA = \
 	basic.py
 EXTRA_DIST = $(plugindata_DATA)

Modified: trunk/plugins/event_monitor.py
==============================================================================
--- trunk/plugins/event_monitor.py	(original)
+++ trunk/plugins/event_monitor.py	Sat Jan 12 01:17:35 2008
@@ -64,7 +64,13 @@
     '''
     self.global_hotkeys = [(N_('Highlight last event entry'),
                             self._onHighlightEvent,
-                            keysyms.e, gdk.MOD1_MASK | gdk.CONTROL_MASK)]
+                            keysyms.e, gdk.MOD1_MASK | gdk.CONTROL_MASK),
+                           (N_('Start/stop event recording'),
+                            self._onStartStop,
+                            keysyms.r, gdk.MOD1_MASK | gdk.CONTROL_MASK),
+                           (N_('Clear event log'),
+                            self._onClearlog,
+                            keysyms.t, gdk.MOD1_MASK | gdk.CONTROL_MASK)]
     self.source_filter = None
     self.main_xml = gtk.glade.XML(GLADE_FILE, 'monitor_vpaned')
     vpaned = self.main_xml.get_widget('monitor_vpaned')
@@ -82,6 +88,13 @@
     self.main_xml.signal_autoconnect(self)
     self.show_all()
 
+  def _onStartStop(self):
+    active = self.monitor_toggle.get_active()
+    self.monitor_toggle.set_active(not active)
+
+  def _onClearlog(self):
+    self.monitor_buffer.set_text('')
+
   def _popEventsModel(self):
     '''
     Populate the model for the event types tree view. Uses a constant

Modified: trunk/plugins/validate.glade
==============================================================================
--- trunk/plugins/validate.glade	(original)
+++ trunk/plugins/validate.glade	Sat Jan 12 01:17:35 2008
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.0 on Wed Jan  9 21:49:47 2008 -->
+<!--*- mode: xml -*-->
 <glade-interface>
   <widget class="GtkWindow" id="window1">
     <child>
@@ -17,12 +17,8 @@
             <child>
               <widget class="GtkTreeView" id="report table">
                 <property name="visible">True</property>
-                <property name="headers_clickable">True</property>
                 <property name="reorderable">True</property>
                 <property name="rules_hint">True</property>
-                <property name="search_column">1</property>
-                <property name="show_expanders">False</property>
-                <property name="enable_grid_lines">GTK_TREE_VIEW_GRID_LINES_BOTH</property>
                 <signal name="row_activated" handler="_onActivateRow"/>
                 <signal name="cursor_changed" handler="_onCursorChanged"/>
               </widget>
@@ -32,15 +28,16 @@
         <child>
           <widget class="GtkHBox" id="hbox1">
             <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="spacing">10</property>
+            <property name="spacing">3</property>
             <child>
               <widget class="GtkLabel" id="label1">
                 <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="label" translatable="yes">Sche_ma:</property>
                 <property name="use_underline">True</property>
                 <property name="mnemonic_widget">schema combo</property>
+                <accessibility>
+                  <atkrelation target="schema combo" type="label-for"/>
+                </accessibility>
               </widget>
               <packing>
                 <property name="expand">False</property>
@@ -50,52 +47,29 @@
             <child>
               <widget class="GtkComboBox" id="schema combo">
                 <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <accessibility>
+                  <atkrelation target="label1" type="labelled-by"/>
+                </accessibility>
               </widget>
               <packing>
                 <property name="position">1</property>
               </packing>
             </child>
-            <child>
-              <widget class="GtkButton" id="save button">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-save-as</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="_onSaveAs"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <widget class="GtkButton" id="help button">
-                <property name="visible">True</property>
-                <property name="sensitive">False</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">gtk-help</property>
-                <property name="use_stock">True</property>
-                <property name="response_id">0</property>
-                <signal name="clicked" handler="_onHelp"/>
-              </widget>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">3</property>
-              </packing>
-            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <widget class="GtkHBox" id="hbox3">
+            <property name="visible">True</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="spacing">3</property>
             <child>
               <widget class="GtkToggleButton" id="validate button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
                 <property name="response_id">0</property>
                 <signal name="toggled" handler="_onValidate"/>
                 <child>
@@ -127,28 +101,42 @@
               </widget>
               <packing>
                 <property name="expand">False</property>
-                <property name="position">4</property>
+              </packing>
+            </child>
+            <child>
+              <widget class="GtkButton" id="help button">
+                <property name="visible">True</property>
+                <property name="sensitive">False</property>
+                <property name="can_focus">True</property>
+                <property name="label">gtk-help</property>
+                <property name="use_stock">True</property>
+                <property name="response_id">0</property>
+                <signal name="clicked" handler="_onHelp"/>
+              </widget>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="pack_type">GTK_PACK_END</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </widget>
           <packing>
             <property name="expand">False</property>
-            <property name="position">1</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
           </packing>
         </child>
         <child>
           <widget class="GtkProgressBar" id="progress bar">
             <property name="visible">True</property>
-            <property name="activity_mode">True</property>
-            <property name="show_text">True</property>
-            <property name="pulse_step">0.0099999997764825821</property>
+            <property name="pulse_step">0.0099999997764800008</property>
             <property name="text" translatable="yes">Idle</property>
-            <property name="discrete_blocks">50</property>
           </widget>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">2</property>
+            <property name="position">3</property>
           </packing>
         </child>
       </widget>

Modified: trunk/plugins/validate.py
==============================================================================
--- trunk/plugins/validate.py	(original)
+++ trunk/plugins/validate.py	Sat Jan 12 01:17:35 2008
@@ -171,7 +171,6 @@
     self.report = self.main_xml.get_widget('report table')
     self.progress = self.main_xml.get_widget('progress bar')
     self.validate = self.main_xml.get_widget('validate button')
-    self.save = self.main_xml.get_widget('save button')
     self.help = self.main_xml.get_widget('help button')
     self.schema = self.main_xml.get_widget('schema combo')
 
@@ -263,7 +262,6 @@
     self.progress.set_text(_('Validating'))
     # disable controls
     self.schema.set_sensitive(False)
-    self.save.set_sensitive(False)
     self.help.set_sensitive(False)
 
   def _stopValidate(self):
@@ -282,7 +280,6 @@
     self.validate.set_active(False)
     # enable other controls
     self.schema.set_sensitive(True)
-    self.save.set_sensitive(True)
      
   def _onIdle(self):
     '''
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]