X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=blobdiff_plain;f=data%2Fgonvert.glade;h=a3be78bfa2e4fb13eae7396b19d12e5c98490b2f;hp=d435973fb792dd7d1b4b4f5f1d5c4903b8e1b204;hb=e62498c9c596588836ea7e08c83b6b5c21a43fbb;hpb=4f7137edd9b40ebe607a8edaa7303cd4661a02c3

diff --git a/data/gonvert.glade b/data/gonvert.glade
index d435973..a3be78b 100644
--- a/data/gonvert.glade
+++ b/data/gonvert.glade
@@ -18,11 +18,11 @@
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="focus_on_map">True</property>
   <property name="urgency_hint">False</property>
-  <signal name="destroy" handler="on_app1_destroy"/>
+  <signal name="destroy" handler="on_main_window_destroy"/>
   <signal name="size_allocate" handler="on_app1_size_allocate" last_modification_time="Sat, 03 Jul 2004 00:43:38 GMT"/>
 
   <child>
-    <widget class="GtkVBox" id="vbox2">
+    <widget class="GtkVBox" id="mainLayout">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
@@ -47,7 +47,7 @@
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Exit</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_exitMenuItem_activate"/>
+		      <signal name="activate" handler="on_exit_menu_activate"/>
 		      <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 		    </widget>
 		  </child>
@@ -66,33 +66,23 @@
 		<widget class="GtkMenu" id="toolsMenu">
 
 		  <child>
-		    <widget class="GtkCheckMenuItem" id="edit_shortlist1">
+		    <widget class="GtkCheckMenuItem" id="editShortListMenuItem">
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Show shortlist selections</property>
 		      <property name="label" translatable="yes">_Edit shortlist</property>
 		      <property name="use_underline">True</property>
 		      <property name="active">False</property>
-		      <signal name="activate" handler="on_edit_shortlist1_activate" last_modification_time="Fri, 27 May 2005 01:07:57 GMT"/>
+		      <signal name="activate" handler="on_editShortListMenuItem_activate" last_modification_time="Fri, 27 May 2005 01:07:57 GMT"/>
 		    </widget>
 		  </child>
 
 		  <child>
-		    <widget class="GtkMenuItem" id="clear_selections1">
+		    <widget class="GtkMenuItem" id="clearSelectionMenuItem">
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Clear saved selections</property>
 		      <property name="label" translatable="yes">_Clear selections</property>
 		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_clear_selections1_activate" last_modification_time="Sun, 20 Jun 2004 15:41:04 GMT"/>
-		    </widget>
-		  </child>
-
-		  <child>
-		    <widget class="GtkMenuItem" id="write_units1">
-		      <property name="visible">True</property>
-		      <property name="tooltip" translatable="yes">Writes all categories and units to STDOUT</property>
-		      <property name="label" translatable="yes">_Write Units</property>
-		      <property name="use_underline">True</property>
-		      <signal name="activate" handler="on_write_units1_activate"/>
+		      <signal name="activate" handler="on_clearSelectionMenuItem_activate" last_modification_time="Sun, 20 Jun 2004 15:41:04 GMT"/>
 		    </widget>
 		  </child>
 		</widget>
@@ -136,7 +126,7 @@
 	  <property name="position">0</property>
 
 	  <child>
-	    <widget class="GtkScrolledWindow" id="scrolledwindow4">
+	    <widget class="GtkScrolledWindow" id="categoryScrolledWindow">
 	      <property name="width_request">260</property>
 	      <property name="visible">True</property>
 	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
@@ -145,7 +135,7 @@
 	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 	      <child>
-		<widget class="GtkTreeView" id="cat_clist">
+		<widget class="GtkTreeView" id="categoryView">
 		  <property name="width_request">250</property>
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
@@ -156,7 +146,7 @@
 		  <property name="fixed_height_mode">False</property>
 		  <property name="hover_selection">False</property>
 		  <property name="hover_expand">False</property>
-		  <signal name="cursor_changed" handler="on_cat_clist_select_row" last_modification_time="Wed, 19 Feb 2003 00:08:35 GMT"/>
+		  <signal name="cursor_changed" handler="on_categoryView_select_row" last_modification_time="Wed, 19 Feb 2003 00:08:35 GMT"/>
 		</widget>
 	      </child>
 	    </widget>
@@ -167,13 +157,13 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkVBox" id="vbox1">
+	    <widget class="GtkVBox" id="unitConversionLayout">
 	      <property name="visible">True</property>
 	      <property name="homogeneous">False</property>
 	      <property name="spacing">0</property>
 
 	      <child>
-		<widget class="GtkHBox" id="hbox1">
+		<widget class="GtkHBox" id="selectedUnitLayout">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">0</property>
@@ -250,13 +240,13 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkHBox" id="hbox2">
+		<widget class="GtkHBox" id="previousSelectedUnitLayout">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">0</property>
 
 		  <child>
-		    <widget class="GtkEntry" id="entry3">
+		    <widget class="GtkEntry" id="previousUnitName">
 		      <property name="visible">True</property>
 		      <property name="editable">False</property>
 		      <property name="visibility">True</property>
@@ -274,7 +264,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkEntry" id="entry4">
+		    <widget class="GtkEntry" id="previousUnitValue">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
 		      <property name="editable">True</property>
@@ -284,7 +274,7 @@
 		      <property name="has_frame">True</property>
 		      <property name="invisible_char">*</property>
 		      <property name="activates_default">False</property>
-		      <signal name="changed" handler="on_entry4_changed"/>
+		      <signal name="changed" handler="on_previousUnitValue_changed"/>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -294,7 +284,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="label2">
+		    <widget class="GtkLabel" id="previousUnitSymbol">
 		      <property name="width_request">60</property>
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes"></property>
@@ -340,7 +330,7 @@
 		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 		      <child>
-			<widget class="GtkTreeView" id="clist1">
+			<widget class="GtkTreeView" id="unitsView">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
 			  <property name="headers_visible">True</property>
@@ -350,8 +340,7 @@
 			  <property name="fixed_height_mode">False</property>
 			  <property name="hover_selection">False</property>
 			  <property name="hover_expand">False</property>
-			  <signal name="button_release_event" handler="on_clist1_button_released" last_modification_time="Thu, 24 Jun 2004 01:11:55 GMT"/>
-			  <signal name="cursor_changed" handler="on_clist1_cursor_changed" last_modification_time="Thu, 24 Jun 2004 01:11:42 GMT"/>
+			  <signal name="cursor_changed" handler="on_unitsView_cursor_changed" last_modification_time="Thu, 24 Jun 2004 01:11:42 GMT"/>
 			</widget>
 		      </child>
 		    </widget>
@@ -370,7 +359,7 @@
 		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 		      <child>
-			<widget class="GtkTextView" id="text1">
+			<widget class="GtkTextView" id="unitDescription">
 			  <property name="visible">True</property>
 			  <property name="can_focus">True</property>
 			  <property name="editable">False</property>
@@ -403,13 +392,13 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkHBox" id="hbox3">
+		<widget class="GtkHBox" id="searchLayout">
 		  <property name="visible">True</property>
 		  <property name="homogeneous">False</property>
 		  <property name="spacing">0</property>
 
 		  <child>
-		    <widget class="GtkEntry" id="find_entry">
+		    <widget class="GtkEntry" id="findEntry">
 		      <property name="visible">True</property>
 		      <property name="tooltip" translatable="yes">Enter unit to find here</property>
 		      <property name="can_focus">True</property>
@@ -420,8 +409,8 @@
 		      <property name="has_frame">True</property>
 		      <property name="invisible_char">*</property>
 		      <property name="activates_default">False</property>
-		      <signal name="key_press_event" handler="on_find_entry_key_press_event"/>
-		      <signal name="changed" handler="on_find_entry_changed"/>
+		      <signal name="activate" handler="on_findEntry_activated"/>
+		      <signal name="changed" handler="on_findEntry_changed"/>
 		    </widget>
 		    <packing>
 		      <property name="padding">0</property>
@@ -431,14 +420,14 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkButton" id="find_button">
+		    <widget class="GtkButton" id="findButton">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
 		      <property name="label" translatable="yes">Find</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="focus_on_click">True</property>
-		      <signal name="clicked" handler="on_find_button_clicked"/>
+		      <signal name="clicked" handler="on_findButton_clicked"/>
 		      <accelerator key="F6" modifiers="0" signal="clicked"/>
 		    </widget>
 		    <packing>
@@ -449,7 +438,7 @@
 		  </child>
 
 		  <child>
-		    <widget class="GtkLabel" id="find_label">
+		    <widget class="GtkLabel" id="findLabel">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Press to find text.</property>
 		      <property name="use_underline">False</property>
@@ -528,327 +517,4 @@
   </child>
 </widget>
 
-<widget class="GtkDialog" id="about_box">
-  <property name="title" translatable="yes">About</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">True</property>
-  <signal name="delete_event" handler="on_about_close_clicked" last_modification_time="Mon, 28 Jun 2004 23:42:53 GMT"/>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox1">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area1">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="about_close">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-7</property>
-	      <signal name="clicked" handler="on_about_close_clicked" last_modification_time="Sat, 22 Feb 2003 14:35:51 GMT"/>
-	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkImage" id="about_image">
-	  <property name="visible">True</property>
-	  <property name="xalign">0.5</property>
-	  <property name="yalign">0.5</property>
-	  <property name="xpad">0</property>
-	  <property name="ypad">0</property>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkTable" id="table1">
-	  <property name="visible">True</property>
-	  <property name="n_rows">3</property>
-	  <property name="n_columns">2</property>
-	  <property name="homogeneous">False</property>
-	  <property name="row_spacing">0</property>
-	  <property name="column_spacing">0</property>
-
-	  <child>
-	    <widget class="GtkLabel" id="label7">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Version:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="versionlabel">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">False</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes">x.x.x</property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label5">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Website:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry6">
-	      <property name="width_request">363</property>
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">False</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes">http://unihedron.com/projects/gonvert/gonvert.php</property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkLabel" id="label6">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="yes">Author:</property>
-	      <property name="use_underline">False</property>
-	      <property name="use_markup">False</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">1</property>
-	      <property name="yalign">0.5</property>
-	      <property name="xpad">0</property>
-	      <property name="ypad">0</property>
-	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-	      <property name="width_chars">-1</property>
-	      <property name="single_line_mode">False</property>
-	      <property name="angle">0</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkEntry" id="entry7">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">False</property>
-	      <property name="visibility">True</property>
-	      <property name="max_length">0</property>
-	      <property name="text" translatable="yes">Anthony Tekatch    anthony@unihedron.com</property>
-	      <property name="has_frame">True</property>
-	      <property name="invisible_char">*</property>
-	      <property name="activates_default">False</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">1</property>
-	      <property name="right_attach">2</property>
-	      <property name="top_attach">2</property>
-	      <property name="bottom_attach">3</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="msgbox">
-  <property name="title" translatable="yes">message box</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="dialog-vbox2">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-	<widget class="GtkHButtonBox" id="dialog-action_area2">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-	  <child>
-	    <widget class="GtkButton" id="okbutton1">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-ok</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="focus_on_click">True</property>
-	      <property name="response_id">-5</property>
-	      <signal name="clicked" handler="on_messagebox_ok_clicked" last_modification_time="Mon, 24 Feb 2003 03:40:09 GMT"/>
-	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	  <property name="pack_type">GTK_PACK_END</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkScrolledWindow" id="scrolledwindow6">
-	  <property name="width_request">300</property>
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	  <property name="shadow_type">GTK_SHADOW_NONE</property>
-	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	  <child>
-	    <widget class="GtkTextView" id="msgboxtext">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">False</property>
-	      <property name="overwrite">False</property>
-	      <property name="accepts_tab">True</property>
-	      <property name="justification">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap_mode">GTK_WRAP_WORD</property>
-	      <property name="cursor_visible">False</property>
-	      <property name="pixels_above_lines">0</property>
-	      <property name="pixels_below_lines">0</property>
-	      <property name="pixels_inside_wrap">0</property>
-	      <property name="left_margin">0</property>
-	      <property name="right_margin">0</property>
-	      <property name="indent">0</property>
-	      <property name="text" translatable="yes"></property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
 </glade-interface>