Mercurial > audlegacy-plugins

changeset 2650:a975b098485c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use stock Gtk+2 buttons in configuration dialog, it's nicer.; Added descriptions of SID-specific Tuplez fields.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 27 May 2008 15:04:24 +0300
parents d891ba4be5a5
children 61763acee0b8
files src/sid/xmms-sid.glade src/sid/xs_interface.c
diffstat 2 files changed, 299 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/src/sid/xmms-sid.glade	Sun May 25 23:04:33 2008 +0300
+++ b/src/sid/xmms-sid.glade	Tue May 27 15:04:24 2008 +0300
@@ -2328,11 +2328,73 @@
 			      <property name="visible">True</property>
 			      <property name="tooltip" translatable="yes">Browse for song length-database file</property>
 			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Browse</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="xs_cfg_sldb_browse"/>
+
+			      <child>
+				<widget class="GtkAlignment" id="alignment1">
+				  <property name="visible">True</property>
+				  <property name="xalign">0.5</property>
+				  <property name="yalign">0.5</property>
+				  <property name="xscale">0</property>
+				  <property name="yscale">0</property>
+				  <property name="top_padding">0</property>
+				  <property name="bottom_padding">0</property>
+				  <property name="left_padding">0</property>
+				  <property name="right_padding">0</property>
+
+				  <child>
+				    <widget class="GtkHBox" id="hbox1">
+				      <property name="visible">True</property>
+				      <property name="homogeneous">False</property>
+				      <property name="spacing">2</property>
+
+				      <child>
+					<widget class="GtkImage" id="image1">
+					  <property name="visible">True</property>
+					  <property name="stock">gtk-open</property>
+					  <property name="icon_size">4</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">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+
+				      <child>
+					<widget class="GtkLabel" id="label30">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">Browse</property>
+					  <property name="use_underline">True</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">0.5</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="padding">0</property>
+					  <property name="expand">False</property>
+					  <property name="fill">False</property>
+					</packing>
+				      </child>
+				    </widget>
+				  </child>
+				</widget>
+			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
@@ -2474,14 +2536,22 @@
 		      <child>
 			<widget class="GtkLabel" id="cfg_ftitle_descs">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">Descriptions of &lt;i&gt;SID-specific&lt;/i&gt; Tuplez fields go here. &lt;b&gt;:D&lt;/b&gt;</property>
+			  <property name="label" translatable="yes">&lt;u&gt;SID-specific Tuplez fields:&lt;/u&gt;
+
+&lt;b&gt;sid-format&lt;/b&gt;		- Specific fileformat
+&lt;b&gt;sid-model&lt;/b&gt;		- 6581 or 8580
+&lt;b&gt;sid-speed&lt;/b&gt;		- Timing or speed: PAL/NTSC/etc.
+
+&lt;u&gt;Other &quot;special&quot; fields set:&lt;/u&gt;
+
+&lt;b&gt;subsong-num, subsong-id&lt;/b&gt;</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-			  <property name="wrap">True</property>
+			  <property name="wrap">False</property>
 			  <property name="selectable">False</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
+			  <property name="xalign">0</property>
+			  <property name="yalign">0</property>
 			  <property name="xpad">8</property>
 			  <property name="ypad">8</property>
 			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
@@ -2853,11 +2923,73 @@
 				  <property name="visible">True</property>
 				  <property name="tooltip" translatable="yes">Browse for STIL-database file</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Browse</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="xs_cfg_stil_browse"/>
+
+				  <child>
+				    <widget class="GtkAlignment" id="alignment2">
+				      <property name="visible">True</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xscale">0</property>
+				      <property name="yscale">0</property>
+				      <property name="top_padding">0</property>
+				      <property name="bottom_padding">0</property>
+				      <property name="left_padding">0</property>
+				      <property name="right_padding">0</property>
+
+				      <child>
+					<widget class="GtkHBox" id="hbox2">
+					  <property name="visible">True</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">2</property>
+
+					  <child>
+					    <widget class="GtkImage" id="image2">
+					      <property name="visible">True</property>
+					      <property name="stock">gtk-open</property>
+					      <property name="icon_size">4</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">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkLabel" id="label31">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes">Browse</property>
+					      <property name="use_underline">True</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">0.5</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="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+					</widget>
+				      </child>
+				    </widget>
+				  </child>
 				</widget>
 			      </child>
 			    </widget>
@@ -2959,11 +3091,73 @@
 				  <property name="visible">True</property>
 				  <property name="tooltip" translatable="yes">Browse for HVSC path</property>
 				  <property name="can_focus">True</property>
-				  <property name="label" translatable="yes">Browse</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="xs_cfg_hvsc_browse"/>
+
+				  <child>
+				    <widget class="GtkAlignment" id="alignment3">
+				      <property name="visible">True</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xscale">0</property>
+				      <property name="yscale">0</property>
+				      <property name="top_padding">0</property>
+				      <property name="bottom_padding">0</property>
+				      <property name="left_padding">0</property>
+				      <property name="right_padding">0</property>
+
+				      <child>
+					<widget class="GtkHBox" id="hbox3">
+					  <property name="visible">True</property>
+					  <property name="homogeneous">False</property>
+					  <property name="spacing">2</property>
+
+					  <child>
+					    <widget class="GtkImage" id="image3">
+					      <property name="visible">True</property>
+					      <property name="stock">gtk-open</property>
+					      <property name="icon_size">4</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">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+
+					  <child>
+					    <widget class="GtkLabel" id="label32">
+					      <property name="visible">True</property>
+					      <property name="label" translatable="yes">Browse</property>
+					      <property name="use_underline">True</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">0.5</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="padding">0</property>
+					      <property name="expand">False</property>
+					      <property name="fill">False</property>
+					    </packing>
+					  </child>
+					</widget>
+				      </child>
+				    </widget>
+				  </child>
 				</widget>
 			      </child>
 			    </widget>
@@ -3063,8 +3257,8 @@
 	      <property name="tooltip" translatable="yes">Accept and update changes</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">OK</property>
-	      <property name="use_underline">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>
 	      <signal name="clicked" handler="xs_cfg_ok"/>
@@ -3077,8 +3271,8 @@
 	      <property name="tooltip" translatable="yes">Cancel any changes</property>
 	      <property name="can_default">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">Cancel</property>
-	      <property name="use_underline">True</property>
+	      <property name="label">gtk-cancel</property>
+	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
 	      <signal name="clicked" handler="xs_cfg_cancel"/>
--- a/src/sid/xs_interface.c	Sun May 25 23:04:33 2008 +0300
+++ b/src/sid/xs_interface.c	Tue May 27 15:04:24 2008 +0300
@@ -171,6 +171,10 @@
   GtkWidget *cfg_sld_label1;
   GtkWidget *cfg_sld_dbpath;
   GtkWidget *cfg_sld_dbbrowse;
+  GtkWidget *alignment1;
+  GtkWidget *hbox1;
+  GtkWidget *image1;
+  GtkWidget *label30;
   GtkWidget *label17;
   GtkWidget *w_label26;
   GtkWidget *frame1;
@@ -201,12 +205,20 @@
   GtkWidget *cfg_stil_dbpath;
   GtkWidget *w_alignment1;
   GtkWidget *cfg_stil_browse;
+  GtkWidget *alignment2;
+  GtkWidget *hbox2;
+  GtkWidget *image2;
+  GtkWidget *label31;
   GtkWidget *cfg_stil_box2;
   GtkWidget *cfg_hvsc_label1;
   GtkWidget *w_alignment6;
   GtkWidget *cfg_hvsc_path;
   GtkWidget *w_alignment7;
   GtkWidget *cfg_hvsc_browse;
+  GtkWidget *alignment3;
+  GtkWidget *hbox3;
+  GtkWidget *image3;
+  GtkWidget *label32;
   GtkWidget *label18;
   GtkWidget *w_label3;
   GtkWidget *hbuttonbox1;
@@ -1007,12 +1019,32 @@
   gtk_tooltips_set_tip (tooltips, cfg_sld_dbpath, _("Database path and filename"), NULL);
   gtk_entry_set_invisible_char (GTK_ENTRY (cfg_sld_dbpath), 9679);
 
-  cfg_sld_dbbrowse = gtk_button_new_with_mnemonic (_("Browse"));
+  cfg_sld_dbbrowse = gtk_button_new ();
   gtk_widget_set_name (cfg_sld_dbbrowse, "cfg_sld_dbbrowse");
   gtk_widget_show (cfg_sld_dbbrowse);
   gtk_box_pack_start (GTK_BOX (cfg_sld_box), cfg_sld_dbbrowse, FALSE, FALSE, 0);
   gtk_tooltips_set_tip (tooltips, cfg_sld_dbbrowse, _("Browse for song length-database file"), NULL);
 
+  alignment1 = gtk_alignment_new (0.5, 0.5, 0, 0);
+  gtk_widget_set_name (alignment1, "alignment1");
+  gtk_widget_show (alignment1);
+  gtk_container_add (GTK_CONTAINER (cfg_sld_dbbrowse), alignment1);
+
+  hbox1 = gtk_hbox_new (FALSE, 2);
+  gtk_widget_set_name (hbox1, "hbox1");
+  gtk_widget_show (hbox1);
+  gtk_container_add (GTK_CONTAINER (alignment1), hbox1);
+
+  image1 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_name (image1, "image1");
+  gtk_widget_show (image1);
+  gtk_box_pack_start (GTK_BOX (hbox1), image1, FALSE, FALSE, 0);
+
+  label30 = gtk_label_new_with_mnemonic (_("Browse"));
+  gtk_widget_set_name (label30, "label30");
+  gtk_widget_show (label30);
+  gtk_box_pack_start (GTK_BOX (hbox1), label30, FALSE, FALSE, 0);
+
   label17 = gtk_label_new (_("Song length database:"));
   gtk_widget_set_name (label17, "label17");
   gtk_widget_show (label17);
@@ -1054,12 +1086,12 @@
   gtk_tooltips_set_tip (tooltips, cfg_ftitle_format, _("Tuplez format string for SID-files"), NULL);
   gtk_entry_set_invisible_char (GTK_ENTRY (cfg_ftitle_format), 9679);
 
-  cfg_ftitle_descs = gtk_label_new (_("Descriptions of <i>SID-specific</i> Tuplez fields go here. <b>:D</b>"));
+  cfg_ftitle_descs = gtk_label_new (_("<u>SID-specific Tuplez fields:</u>\n\n<b>sid-format</b>\t\t- Specific fileformat\n<b>sid-model</b>\t\t- 6581 or 8580\n<b>sid-speed</b>\t\t- Timing or speed: PAL/NTSC/etc.\n\n<u>Other \"special\" fields set:</u>\n\n<b>subsong-num, subsong-id</b>"));
   gtk_widget_set_name (cfg_ftitle_descs, "cfg_ftitle_descs");
   gtk_widget_show (cfg_ftitle_descs);
   gtk_box_pack_start (GTK_BOX (cfg_ftitle_box), cfg_ftitle_descs, TRUE, TRUE, 0);
   gtk_label_set_use_markup (GTK_LABEL (cfg_ftitle_descs), TRUE);
-  gtk_label_set_line_wrap (GTK_LABEL (cfg_ftitle_descs), TRUE);
+  gtk_misc_set_alignment (GTK_MISC (cfg_ftitle_descs), 0, 0);
   gtk_misc_set_padding (GTK_MISC (cfg_ftitle_descs), 8, 8);
 
   label29 = gtk_label_new (_("Song title format:"));
@@ -1179,12 +1211,32 @@
   gtk_box_pack_end (GTK_BOX (cfg_stil_box1), w_alignment1, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (w_alignment1), 4);
 
-  cfg_stil_browse = gtk_button_new_with_mnemonic (_("Browse"));
+  cfg_stil_browse = gtk_button_new ();
   gtk_widget_set_name (cfg_stil_browse, "cfg_stil_browse");
   gtk_widget_show (cfg_stil_browse);
   gtk_container_add (GTK_CONTAINER (w_alignment1), cfg_stil_browse);
   gtk_tooltips_set_tip (tooltips, cfg_stil_browse, _("Browse for STIL-database file"), NULL);
 
+  alignment2 = gtk_alignment_new (0.5, 0.5, 0, 0);
+  gtk_widget_set_name (alignment2, "alignment2");
+  gtk_widget_show (alignment2);
+  gtk_container_add (GTK_CONTAINER (cfg_stil_browse), alignment2);
+
+  hbox2 = gtk_hbox_new (FALSE, 2);
+  gtk_widget_set_name (hbox2, "hbox2");
+  gtk_widget_show (hbox2);
+  gtk_container_add (GTK_CONTAINER (alignment2), hbox2);
+
+  image2 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_name (image2, "image2");
+  gtk_widget_show (image2);
+  gtk_box_pack_start (GTK_BOX (hbox2), image2, FALSE, FALSE, 0);
+
+  label31 = gtk_label_new_with_mnemonic (_("Browse"));
+  gtk_widget_set_name (label31, "label31");
+  gtk_widget_show (label31);
+  gtk_box_pack_start (GTK_BOX (hbox2), label31, FALSE, FALSE, 0);
+
   cfg_stil_box2 = gtk_hbox_new (FALSE, 0);
   gtk_widget_set_name (cfg_stil_box2, "cfg_stil_box2");
   gtk_widget_show (cfg_stil_box2);
@@ -1215,12 +1267,32 @@
   gtk_box_pack_end (GTK_BOX (cfg_stil_box2), w_alignment7, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (w_alignment7), 4);
 
-  cfg_hvsc_browse = gtk_button_new_with_mnemonic (_("Browse"));
+  cfg_hvsc_browse = gtk_button_new ();
   gtk_widget_set_name (cfg_hvsc_browse, "cfg_hvsc_browse");
   gtk_widget_show (cfg_hvsc_browse);
   gtk_container_add (GTK_CONTAINER (w_alignment7), cfg_hvsc_browse);
   gtk_tooltips_set_tip (tooltips, cfg_hvsc_browse, _("Browse for HVSC path"), NULL);
 
+  alignment3 = gtk_alignment_new (0.5, 0.5, 0, 0);
+  gtk_widget_set_name (alignment3, "alignment3");
+  gtk_widget_show (alignment3);
+  gtk_container_add (GTK_CONTAINER (cfg_hvsc_browse), alignment3);
+
+  hbox3 = gtk_hbox_new (FALSE, 2);
+  gtk_widget_set_name (hbox3, "hbox3");
+  gtk_widget_show (hbox3);
+  gtk_container_add (GTK_CONTAINER (alignment3), hbox3);
+
+  image3 = gtk_image_new_from_stock ("gtk-open", GTK_ICON_SIZE_BUTTON);
+  gtk_widget_set_name (image3, "image3");
+  gtk_widget_show (image3);
+  gtk_box_pack_start (GTK_BOX (hbox3), image3, FALSE, FALSE, 0);
+
+  label32 = gtk_label_new_with_mnemonic (_("Browse"));
+  gtk_widget_set_name (label32, "label32");
+  gtk_widget_show (label32);
+  gtk_box_pack_start (GTK_BOX (hbox3), label32, FALSE, FALSE, 0);
+
   label18 = gtk_label_new (_("SID Tune Information List (STIL) database:"));
   gtk_widget_set_name (label18, "label18");
   gtk_widget_show (label18);
@@ -1240,14 +1312,14 @@
   gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_END);
   gtk_box_set_spacing (GTK_BOX (hbuttonbox1), 8);
 
-  cfg_ok = gtk_button_new_with_mnemonic (_("OK"));
+  cfg_ok = gtk_button_new_from_stock ("gtk-ok");
   gtk_widget_set_name (cfg_ok, "cfg_ok");
   gtk_widget_show (cfg_ok);
   gtk_container_add (GTK_CONTAINER (hbuttonbox1), cfg_ok);
   GTK_WIDGET_SET_FLAGS (cfg_ok, GTK_CAN_DEFAULT);
   gtk_tooltips_set_tip (tooltips, cfg_ok, _("Accept and update changes"), NULL);
 
-  cfg_cancel = gtk_button_new_with_mnemonic (_("Cancel"));
+  cfg_cancel = gtk_button_new_from_stock ("gtk-cancel");
   gtk_widget_set_name (cfg_cancel, "cfg_cancel");
   gtk_widget_show (cfg_cancel);
   gtk_container_add (GTK_CONTAINER (hbuttonbox1), cfg_cancel);
@@ -1460,6 +1532,10 @@
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sld_label1, "cfg_sld_label1");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sld_dbpath, "cfg_sld_dbpath");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_sld_dbbrowse, "cfg_sld_dbbrowse");
+  GLADE_HOOKUP_OBJECT (xs_configwin, alignment1, "alignment1");
+  GLADE_HOOKUP_OBJECT (xs_configwin, hbox1, "hbox1");
+  GLADE_HOOKUP_OBJECT (xs_configwin, image1, "image1");
+  GLADE_HOOKUP_OBJECT (xs_configwin, label30, "label30");
   GLADE_HOOKUP_OBJECT (xs_configwin, label17, "label17");
   GLADE_HOOKUP_OBJECT (xs_configwin, w_label26, "w_label26");
   GLADE_HOOKUP_OBJECT (xs_configwin, frame1, "frame1");
@@ -1489,12 +1565,20 @@
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_stil_dbpath, "cfg_stil_dbpath");
   GLADE_HOOKUP_OBJECT (xs_configwin, w_alignment1, "w_alignment1");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_stil_browse, "cfg_stil_browse");
+  GLADE_HOOKUP_OBJECT (xs_configwin, alignment2, "alignment2");
+  GLADE_HOOKUP_OBJECT (xs_configwin, hbox2, "hbox2");
+  GLADE_HOOKUP_OBJECT (xs_configwin, image2, "image2");
+  GLADE_HOOKUP_OBJECT (xs_configwin, label31, "label31");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_stil_box2, "cfg_stil_box2");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_hvsc_label1, "cfg_hvsc_label1");
   GLADE_HOOKUP_OBJECT (xs_configwin, w_alignment6, "w_alignment6");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_hvsc_path, "cfg_hvsc_path");
   GLADE_HOOKUP_OBJECT (xs_configwin, w_alignment7, "w_alignment7");
   GLADE_HOOKUP_OBJECT (xs_configwin, cfg_hvsc_browse, "cfg_hvsc_browse");
+  GLADE_HOOKUP_OBJECT (xs_configwin, alignment3, "alignment3");
+  GLADE_HOOKUP_OBJECT (xs_configwin, hbox3, "hbox3");
+  GLADE_HOOKUP_OBJECT (xs_configwin, image3, "image3");
+  GLADE_HOOKUP_OBJECT (xs_configwin, label32, "label32");
   GLADE_HOOKUP_OBJECT (xs_configwin, label18, "label18");
   GLADE_HOOKUP_OBJECT (xs_configwin, w_label3, "w_label3");
   GLADE_HOOKUP_OBJECT (xs_configwin, hbuttonbox1, "hbuttonbox1");