Cosmetics, naming.

diff --git a/sigrok-meter b/sigrok-meter
index e80b634035f01b77bb606fd575aa0c3ce1b07745..08441ac07c8cdae70388865cfd43ed82c2c44736 100755 (executable)
--- a/sigrok-meter
+++ b/sigrok-meter
@@ -26,13 +26,13 @@ class SigrokMeter:
         self.builder = Gtk.Builder()
         self.builder.add_from_file("sigrok-meter.glade")
         self.builder.connect_signals(self)
-        self.win = self.builder.get_object("main-window")
+        self.win = self.builder.get_object("mainwindow")
         self.win.show_all()
 
-    def onDeleteWindow(self, *args):
+    def on_quit(self, *args):
         Gtk.main_quit(*args)
 
-    def on_imagemenuitemAbout_activate(self, action):
+    def on_about(self, action):
         about = self.builder.get_object("aboutdialog")
         about.run()
         about.hide()

diff --git a/sigrok-meter.glade b/sigrok-meter.glade
index 9f8fbb62d1bc8603eb6d6b5c2f4c7c17c6e0398b..6b0e5808f5941226439249d082b35d5eb4c97641 100644 (file)
--- a/sigrok-meter.glade
+++ b/sigrok-meter.glade
@@ -10,6 +10,7 @@
     <property name="program_name">sigrok-meter</property>
     <property name="version">0.1.0</property>
     <property name="website">http://www.sigrok.org</property>
+    <property name="website_label" translatable="yes">http://www.sigrok.org</property>
     <property name="license" translatable="yes">GNU GPL, version 3 or later</property>
     <property name="logo">sigrok-logo-notext.png</property>
     <property name="license_type">gpl-3-0</property>
@@ -36,13 +37,13 @@
       </object>
     </child>
   </object>
-  <object class="GtkWindow" id="main-window">
+  <object class="GtkWindow" id="mainwindow">
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">sigrok-meter</property>
     <property name="default_width">320</property>
     <property name="default_height">200</property>
     <property name="icon">sigrok-logo-notext.png</property>
-    <signal name="delete-event" handler="onDeleteWindow" swapped="no"/>
+    <signal name="delete-event" handler="on_quit" swapped="no"/>
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
@@ -71,7 +72,7 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="activate" handler="onDeleteWindow" swapped="no"/>
+                        <signal name="activate" handler="on_quit" swapped="no"/>
                       </object>
                     </child>
                   </object>
@@ -97,7 +98,7 @@
                         <property name="can_focus">False</property>
                         <property name="use_underline">True</property>
                         <property name="use_stock">True</property>
-                        <signal name="activate" handler="on_imagemenuitemAbout_activate" swapped="no"/>
+                        <signal name="activate" handler="on_about" swapped="no"/>
                       </object>
                     </child>
                   </object>