? gok/keyboard-geometry
? gok/test-focus-reject
? gok/test-gok-wordcomplete
Index: gok.glade2
===================================================================
RCS file: /cvs/gnome/gok/gok.glade2,v
retrieving revision 1.11
diff -u -r1.11 gok.glade2
--- gok.glade2	30 Sep 2003 13:29:09 -0000	1.11
+++ gok.glade2	9 Jan 2004 16:56:45 -0000
@@ -843,8 +843,8 @@
 		      <property name="xpad">12</property>
 		      <property name="ypad">0</property>
 		      <accessibility>
-			<atkrelation target="radiobuttonTypeValuator" type="label-for"/>
 			<atkrelation target="radiobuttonTypeSwitch" type="label-for"/>
+			<atkrelation target="radiobuttonTypeValuator" type="label-for"/>
 		      </accessibility>
 		    </widget>
 		    <packing>
@@ -2777,6 +2777,86 @@
 			  <property name="fill">True</property>
 			</packing>
 		      </child>
+
+		      <child>
+			<placeholder/>
+		      </child>
+
+		      <child>
+			<widget class="GtkHSeparator" id="hseparator8">
+			  <property name="visible">True</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkCheckButton" id="checkExtraWordList">
+			  <property name="visible">True</property>
+			  <property name="can_focus">True</property>
+			  <property name="label" translatable="yes">Use _extra word list file</property>
+			  <property name="use_underline">True</property>
+			  <property name="relief">GTK_RELIEF_NORMAL</property>
+			  <property name="active">False</property>
+			  <property name="inconsistent">False</property>
+			  <property name="draw_indicator">True</property>
+			  <signal name="toggled" handler="on_checkExtraWordList_toggled" last_modification_time="Fri, 09 Jan 2004 14:47:25 GMT"/>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkTable" id="table3">
+			  <property name="visible">True</property>
+			  <property name="n_rows">1</property>
+			  <property name="n_columns">1</property>
+			  <property name="homogeneous">False</property>
+			  <property name="row_spacing">0</property>
+			  <property name="column_spacing">0</property>
+
+			  <child>
+			    <widget class="GnomeFileEntry" id="fileentry1">
+			      <property name="visible">True</property>
+			      <property name="max_saved">10</property>
+			      <property name="directory_entry">False</property>
+			      <property name="modal">False</property>
+
+			      <child internal-child="entry">
+				<widget class="GtkEntry" id="combo-entry7">
+				  <property name="visible">True</property>
+				  <property name="can_focus">True</property>
+				  <property name="editable">True</property>
+				  <property name="visibility">True</property>
+				  <property name="max_length">0</property>
+				  <property name="text" translatable="yes"></property>
+				  <property name="has_frame">True</property>
+				  <property name="invisible_char" translatable="yes">*</property>
+				  <property name="activates_default">False</property>
+				</widget>
+			      </child>
+			    </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="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>
 
Index: gok/callbacks.c
===================================================================
RCS file: /cvs/gnome/gok/gok/callbacks.c,v
retrieving revision 1.47
diff -u -r1.47 callbacks.c
--- gok/callbacks.c	11 Dec 2003 13:52:58 -0000	1.47
+++ gok/callbacks.c	9 Jan 2004 16:56:45 -0000
@@ -900,3 +900,11 @@
 	gok_page_actions_set_is_corepointer (
 		!gtk_toggle_button_get_active (togglebutton));
 }
+
+void
+on_checkExtraWordList_toggled          (GtkToggleButton *togglebutton,
+                                        gpointer         user_data)
+{
+	gok_page_wordcomplete_toggle_wordlist (gtk_toggle_button_get_active (togglebutton));
+}
+
Index: gok/callbacks.h
===================================================================
RCS file: /cvs/gnome/gok/gok/callbacks.h,v
retrieving revision 1.22
diff -u -r1.22 callbacks.h
--- gok/callbacks.h	13 May 2003 15:56:05 -0000	1.22
+++ gok/callbacks.h	9 Jan 2004 16:56:45 -0000
@@ -804,3 +804,8 @@
 void
 on_buttonDeleteAction_clicked          (GtkButton       *button,
                                         gpointer         user_data);
+
+
+void
+on_checkExtraWordList_toggled          (GtkToggleButton *togglebutton,
+                                        gpointer         user_data);
Index: gok/gok-page-wordcomplete.c
===================================================================
RCS file: /cvs/gnome/gok/gok/gok-page-wordcomplete.c,v
retrieving revision 1.7
diff -u -r1.7 gok-page-wordcomplete.c
--- gok/gok-page-wordcomplete.c	30 Sep 2003 13:29:11 -0000	1.7
+++ gok/gok-page-wordcomplete.c	9 Jan 2004 16:56:45 -0000
@@ -36,10 +36,17 @@
 /* settings for the page */
 static gboolean m_WordCompleteOnOff;
 static int m_NumberPredictions;
+static gboolean m_bUseAuxDicts = FALSE;
+static gchar *m_AuxDicts = NULL;
 
 /* backup of the page data */
 static gboolean m_WordCompleteOnOffBackup;
 static int m_NumberPredictionsBackup;
+static gboolean m_bUseAuxDictsBackup = FALSE;
+static gchar *m_AuxDictsBackup = NULL;
+
+/* privates */
+void gok_page_wordcomplete_initialize_auxwordlist_control(const char* file);
 
 /**
 * gok-page-wordcomplete-initialize
@@ -52,26 +59,34 @@
 **/
 gboolean gok_page_wordcomplete_initialize (GtkWidget* pWindowSettings)
 {
-	GtkWidget* pCheckboxOnOff;
-	GtkWidget* pSpinNumberPredictions;
+	GtkWidget* pWidget;
 	
 	g_assert (pWindowSettings != NULL);
 		
 	m_pWindowSettings = pWindowSettings;
 	
-	/* store the current values */
 	m_WordCompleteOnOff = gok_data_get_wordcomplete();
 	m_NumberPredictions = gok_data_get_num_predictions();
-	gok_page_wordcomplete_backup();
+	m_bUseAuxDicts = gok_data_get_use_aux_dictionaries();
+	m_AuxDicts = g_strdup (gok_data_get_aux_dictionaries());
 	
+	/* store the current values */
+	gok_page_wordcomplete_backup();
+
 	/* update the controls */
-	pCheckboxOnOff = lookup_widget (m_pWindowSettings, "checkWordCompletion");
-	g_assert (pCheckboxOnOff != NULL);
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(pCheckboxOnOff), gok_data_get_wordcomplete());
-
-	pSpinNumberPredictions = lookup_widget (m_pWindowSettings, "spinNumberPredictions");
-	g_assert (pSpinNumberPredictions != NULL);
-	gtk_spin_button_set_value (GTK_SPIN_BUTTON(pSpinNumberPredictions), gok_data_get_num_predictions());
+	pWidget = lookup_widget (m_pWindowSettings, "checkWordCompletion");
+	g_assert (pWidget != NULL);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(pWidget), gok_data_get_wordcomplete());
+
+	pWidget = lookup_widget (m_pWindowSettings, "spinNumberPredictions");
+	g_assert (pWidget != NULL);
+	gtk_spin_button_set_value (GTK_SPIN_BUTTON(pWidget), gok_data_get_num_predictions());
+	
+	pWidget = lookup_widget (m_pWindowSettings, "checkExtraWordList");
+	g_assert (pWidget != NULL);
+	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(pWidget), gok_data_get_use_aux_dictionaries());
+
+	gok_page_wordcomplete_initialize_auxwordlist_control((const char*)m_AuxDicts);
 	
 	return TRUE;
 }
@@ -95,22 +110,24 @@
 **/
 gboolean gok_page_wordcomplete_apply ()
 {
-	GtkWidget* pCheckboxOnOff;
-	GtkWidget* pSpinNumberPredictions;
+	GtkWidget* pWidget;
 	gboolean bDataChanged;
-
+	gchar* text;
+	
 	g_assert (m_pWindowSettings != NULL);
 	
 	bDataChanged = FALSE;
 
-	pCheckboxOnOff = lookup_widget (m_pWindowSettings, "checkWordCompletion");
-	g_assert (pCheckboxOnOff != NULL);
-	m_WordCompleteOnOff = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(pCheckboxOnOff));
-
-	pSpinNumberPredictions = lookup_widget (m_pWindowSettings, "spinNumberPredictions");
-	g_assert (pSpinNumberPredictions != NULL);
-	m_NumberPredictions = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(pSpinNumberPredictions));
+	pWidget = lookup_widget (m_pWindowSettings, "checkWordCompletion");
+	g_assert (pWidget != NULL);
+	m_WordCompleteOnOff = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(pWidget));
+
+	pWidget = lookup_widget (m_pWindowSettings, "spinNumberPredictions");
+	g_assert (pWidget != NULL);
+	m_NumberPredictions = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON(pWidget));
 
+	gok_page_wordcomplete_update_auxwordlist_from_control();
+	
 	/* update the gok data with any new settings */
 	if (gok_data_get_wordcomplete() != m_WordCompleteOnOff)
 	{
@@ -126,6 +143,18 @@
 		gok_keyslotter_change_number_predictions (m_NumberPredictions, KEYTYPE_WORDCOMPLETE);
 	}
 
+	if (gok_data_get_use_aux_dictionaries() != m_bUseAuxDicts) {
+		bDataChanged = TRUE;
+		gok_data_set_use_aux_dictionaries ( m_bUseAuxDicts );
+		/* TODO call rebuild internal word completion list */
+	}
+	
+	if (strcmp(gok_data_get_aux_dictionaries(), m_AuxDicts) != 0) {
+		bDataChanged = TRUE;
+		gok_data_set_aux_dictionaries ( m_AuxDicts );
+		/* TODO call rebuild internal word completion list */
+	}
+	
 	return bDataChanged;
 }
 
@@ -139,8 +168,7 @@
 **/
 gboolean gok_page_wordcomplete_revert ()
 {
-	GtkWidget* pCheckboxOnOff;
-	GtkWidget* pSpinNumberPredictions;
+	GtkWidget* pWidget;
 	gboolean bDataChanged;
 
 	bDataChanged = FALSE;
@@ -153,9 +181,9 @@
 		gok_data_set_wordcomplete (m_WordCompleteOnOff);
 		gok_keyslotter_on (m_WordCompleteOnOff, KEYTYPE_WORDCOMPLETE);
 
-		pCheckboxOnOff = lookup_widget (m_pWindowSettings, "checkWordCompletion");
-		g_assert (pCheckboxOnOff != NULL);
-		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(pCheckboxOnOff), m_WordCompleteOnOff);
+		pWidget = lookup_widget (m_pWindowSettings, "checkWordCompletion");
+		g_assert (pWidget != NULL);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(pWidget), m_WordCompleteOnOff);
 
 	}
 
@@ -166,9 +194,35 @@
 		gok_data_set_num_predictions (m_NumberPredictions);
 		gok_keyslotter_change_number_predictions (m_NumberPredictions, KEYTYPE_WORDCOMPLETE);
 
-		pSpinNumberPredictions = lookup_widget (m_pWindowSettings, "spinNumberPredictions");
-		g_assert (pSpinNumberPredictions != NULL);
-		gtk_spin_button_set_value (GTK_SPIN_BUTTON(pSpinNumberPredictions), m_NumberPredictions);
+		pWidget = lookup_widget (m_pWindowSettings, "spinNumberPredictions");
+		g_assert (pWidget != NULL);
+		gtk_spin_button_set_value (GTK_SPIN_BUTTON(pWidget), m_NumberPredictions);
+	}
+	
+	if (m_bUseAuxDicts != m_bUseAuxDictsBackup) {
+		bDataChanged = TRUE;
+		m_bUseAuxDicts = m_bUseAuxDictsBackup;
+		gok_data_set_use_aux_dictionaries (m_bUseAuxDicts);
+		/* TODO call rebuild internal dictionary */
+		gok_log ("TODO: Call to rebuild word completion model");
+
+		pWidget = lookup_widget (m_pWindowSettings, "checkExtraWordList");
+		g_assert (pWidget != NULL);
+		gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(pWidget), m_bUseAuxDicts);
+	}
+	
+	if (m_AuxDicts != m_AuxDictsBackup) {
+		bDataChanged = TRUE;
+		g_free(m_AuxDicts);
+		m_AuxDicts = g_strdup(m_AuxDictsBackup);
+		gok_data_set_aux_dictionaries (m_AuxDicts);
+		/* TODO call rebuild internal word completion list */
+		gok_log ("TODO: Call to rebuild word completion model");
+		
+		pWidget = lookup_widget (m_pWindowSettings, "fileentry1");
+		g_assert (pWidget != NULL);
+		gnome_file_entry_set_filename ((GnomeFileEntry*)pWidget,m_AuxDicts); 
+		
 	}
 
 	return bDataChanged;
@@ -183,6 +237,52 @@
 {
 	m_WordCompleteOnOffBackup = m_WordCompleteOnOff;
 	m_NumberPredictionsBackup = m_NumberPredictions;
+	m_bUseAuxDictsBackup = m_bUseAuxDicts;
+	m_AuxDictsBackup = g_strdup(m_AuxDicts);
+}
+
+
+void 
+gok_page_wordcomplete_toggle_wordlist (gboolean on)
+{
+	gok_log ("Use aux wordlist toggled");	
+	m_bUseAuxDicts = on;
+	/* TODO: enable/disable controls, but wait until 
+	   implemented this for other cases too (for consistency)*/
+}
+
+void 
+gok_page_wordcomplete_update_auxwordlist_from_control ()
+{
+	GtkWidget* pWidget; 
+	gchar* text;
+	
+	gok_log_enter();
+	pWidget = lookup_widget (m_pWindowSettings, "fileentry1");
+	g_assert (pWidget != NULL);
+	text = gnome_file_entry_get_full_path ( (GnomeFileEntry*)pWidget, FALSE);
+	/* TODO call format check on this word list */
+	/* TODO call rebuild internal word completion list */
+	gok_log_x ("TODO: Call to check file for expected format on file [%s]", text);
+	
+	g_free (m_AuxDicts);
+	m_AuxDicts = text;
+	gok_log_leave();
+}
+
+void 
+gok_page_wordcomplete_initialize_auxwordlist_control (const char* file)
+{
+	GtkWidget* pWidget; 
+	
+	gok_log_enter();
+	pWidget = lookup_widget (m_pWindowSettings, "fileentry1");
+	g_assert (pWidget != NULL);
+	gnome_file_entry_set_modal ((GnomeFileEntry*)pWidget, FALSE);
+	gnome_file_entry_set_title ((GnomeFileEntry*)pWidget, _("Select extra word list file"));
+	gnome_file_entry_set_directory_entry ((GnomeFileEntry*)pWidget, FALSE);
+	gnome_file_entry_set_filename ( (GnomeFileEntry*)pWidget, file);
+	gok_log_leave();
 }
 
 
Index: gok/gok-page-wordcomplete.h
===================================================================
RCS file: /cvs/gnome/gok/gok/gok-page-wordcomplete.h,v
retrieving revision 1.3
diff -u -r1.3 gok-page-wordcomplete.h
--- gok/gok-page-wordcomplete.h	11 Oct 2002 19:00:04 -0000	1.3
+++ gok/gok-page-wordcomplete.h	9 Jan 2004 16:56:45 -0000
@@ -26,4 +26,5 @@
 gboolean gok_page_wordcomplete_apply (void);
 gboolean gok_page_wordcomplete_revert (void);
 void gok_page_wordcomplete_backup (void);
-
+void gok_page_wordcomplete_update_auxwordlist_from_control ();
+void gok_page_wordcomplete_toggle_wordlist (gboolean on);
Index: gok/interface.c
===================================================================
RCS file: /cvs/gnome/gok/gok/interface.c,v
retrieving revision 1.35
diff -u -r1.35 interface.c
--- gok/interface.c	28 Jun 2003 16:10:29 -0000	1.35
+++ gok/interface.c	9 Jan 2004 16:56:45 -0000
@@ -231,6 +231,11 @@
   GtkWidget *label36;
   GtkObject *spinNumberPredictions_adj;
   GtkWidget *spinNumberPredictions;
+  GtkWidget *hseparator8;
+  GtkWidget *checkExtraWordList;
+  GtkWidget *table3;
+  GtkWidget *fileentry1;
+  GtkWidget *combo_entry7;
   GtkWidget *label34;
   GtkWidget *frame12;
   GtkWidget *vbox12;
@@ -308,28 +313,24 @@
   gtk_table_attach (GTK_TABLE (table1), label10, 0, 1, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label10), GTK_JUSTIFY_LEFT);
 
   label11 = gtk_label_new_with_mnemonic (_("_Spacing:"));
   gtk_widget_show (label11);
   gtk_table_attach (GTK_TABLE (table1), label11, 0, 1, 2, 3,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label11), GTK_JUSTIFY_LEFT);
 
   label9 = gtk_label_new_with_mnemonic (_("Key _width:"));
   gtk_widget_show (label9);
   gtk_table_attach (GTK_TABLE (table1), label9, 0, 1, 0, 1,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label9), GTK_JUSTIFY_LEFT);
 
   label107 = gtk_label_new (_("pixels"));
   gtk_widget_show (label107);
   gtk_table_attach (GTK_TABLE (table1), label107, 2, 3, 0, 1,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label107), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (label107), 0, 0.5);
 
   label108 = gtk_label_new (_("pixels"));
@@ -337,7 +338,6 @@
   gtk_table_attach (GTK_TABLE (table1), label108, 2, 3, 1, 2,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label108), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (label108), 0, 0.5);
 
   label109 = gtk_label_new (_("pixels"));
@@ -345,14 +345,12 @@
   gtk_table_attach (GTK_TABLE (table1), label109, 2, 3, 2, 3,
                     (GtkAttachOptions) (GTK_FILL),
                     (GtkAttachOptions) (0), 0, 0);
-  gtk_label_set_justify (GTK_LABEL (label109), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (label109), 0, 0.5);
 
   label6 = gtk_label_new (_("<b>Key Size and Spacing Controls</b>"));
   gtk_widget_show (label6);
   gtk_frame_set_label_widget (GTK_FRAME (frame1), label6);
   gtk_label_set_use_markup (GTK_LABEL (label6), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label6), GTK_JUSTIFY_LEFT);
 
   frame2 = gtk_frame_new (NULL);
   gtk_widget_show (frame2);
@@ -369,7 +367,6 @@
   gtk_widget_show (label7);
   gtk_frame_set_label_widget (GTK_FRAME (frame2), label7);
   gtk_label_set_use_markup (GTK_LABEL (label7), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label7), GTK_JUSTIFY_LEFT);
 
   frame3 = gtk_frame_new (NULL);
   gtk_widget_show (frame3);
@@ -392,18 +389,15 @@
   gtk_widget_show (label99);
   gtk_box_pack_start (GTK_BOX (vbox3), label99, FALSE, FALSE, 0);
   gtk_label_set_use_markup (GTK_LABEL (label99), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label99), GTK_JUSTIFY_LEFT);
 
   label8 = gtk_label_new (_("<b>Theme</b>"));
   gtk_widget_show (label8);
   gtk_frame_set_label_widget (GTK_FRAME (frame3), label8);
   gtk_label_set_use_markup (GTK_LABEL (label8), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label8), GTK_JUSTIFY_LEFT);
 
   label1 = gtk_label_new (_("Appearance"));
   gtk_widget_show (label1);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 0), label1);
-  gtk_label_set_justify (GTK_LABEL (label1), GTK_JUSTIFY_LEFT);
 
   vbox4 = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (vbox4);
@@ -429,7 +423,6 @@
   labelActionName = gtk_label_new_with_mnemonic (_("_Name:"));
   gtk_widget_show (labelActionName);
   gtk_box_pack_start (GTK_BOX (hbox78), labelActionName, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (labelActionName), GTK_JUSTIFY_LEFT);
 
   comboActionNames = gtk_combo_new ();
   g_object_set_data (G_OBJECT (GTK_COMBO (comboActionNames)->popwin),
@@ -467,7 +460,6 @@
   label101 = gtk_label_new_with_mnemonic (_("_Add"));
   gtk_widget_show (label101);
   gtk_box_pack_start (GTK_BOX (hbox83), label101, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label101), GTK_JUSTIFY_LEFT);
 
   buttonDeleteAction = gtk_button_new ();
   gtk_widget_show (buttonDeleteAction);
@@ -489,7 +481,6 @@
   label102 = gtk_label_new_with_mnemonic (_("_Delete"));
   gtk_widget_show (label102);
   gtk_box_pack_start (GTK_BOX (hbox84), label102, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label102), GTK_JUSTIFY_LEFT);
 
   buttonChangeName = gtk_button_new ();
   gtk_widget_show (buttonChangeName);
@@ -511,13 +502,11 @@
   label103 = gtk_label_new_with_mnemonic (_("_Rename"));
   gtk_widget_show (label103);
   gtk_box_pack_start (GTK_BOX (hbox85), label103, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label103), GTK_JUSTIFY_LEFT);
 
   label92 = gtk_label_new (_("<b>Define Actions</b>"));
   gtk_widget_show (label92);
   gtk_frame_set_label_widget (GTK_FRAME (frame30), label92);
   gtk_label_set_use_markup (GTK_LABEL (label92), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label92), GTK_JUSTIFY_LEFT);
 
   hseparator7 = gtk_hseparator_new ();
   gtk_widget_show (hseparator7);
@@ -531,7 +520,6 @@
   labelActionType = gtk_label_new (_("Action Type:"));
   gtk_widget_show (labelActionType);
   gtk_box_pack_start (GTK_BOX (hbox72), labelActionType, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (labelActionType), GTK_JUSTIFY_LEFT);
   gtk_misc_set_padding (GTK_MISC (labelActionType), 12, 0);
 
   hbox73 = gtk_hbox_new (FALSE, 18);
@@ -613,7 +601,6 @@
   gtk_widget_show (label87);
   gtk_frame_set_label_widget (GTK_FRAME (frameSwitch), label87);
   gtk_label_set_use_markup (GTK_LABEL (label87), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label87), GTK_JUSTIFY_LEFT);
 
   vbox26 = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (vbox26);
@@ -647,7 +634,6 @@
   gtk_widget_show (label88);
   gtk_frame_set_label_widget (GTK_FRAME (frame27), label88);
   gtk_label_set_use_markup (GTK_LABEL (label88), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label88), GTK_JUSTIFY_LEFT);
 
   frame28 = gtk_frame_new (NULL);
   gtk_widget_show (frame28);
@@ -669,19 +655,16 @@
   label90 = gtk_label_new_with_mnemonic (_("_100ths of a second"));
   gtk_widget_show (label90);
   gtk_box_pack_start (GTK_BOX (hbox75), label90, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label90), GTK_JUSTIFY_LEFT);
   gtk_misc_set_padding (GTK_MISC (label90), 6, 0);
 
   _ = gtk_label_new (_("<b>Delay Before Activation</b>"));
   gtk_widget_show (_);
   gtk_frame_set_label_widget (GTK_FRAME (frame28), _);
   gtk_label_set_use_markup (GTK_LABEL (_), TRUE);
-  gtk_label_set_justify (GTK_LABEL (_), GTK_JUSTIFY_LEFT);
 
   label84 = gtk_label_new (_("label84"));
   gtk_widget_show (label84);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (action_type_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (action_type_notebook), 0), label84);
-  gtk_label_set_justify (GTK_LABEL (label84), GTK_JUSTIFY_LEFT);
 
   table2 = gtk_table_new (2, 2, FALSE);
   gtk_widget_show (table2);
@@ -725,7 +708,6 @@
   gtk_widget_show (label95);
   gtk_frame_set_label_widget (GTK_FRAME (frameValuator), label95);
   gtk_label_set_use_markup (GTK_LABEL (label95), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label95), GTK_JUSTIFY_LEFT);
 
   timer_frame = gtk_frame_new (NULL);
   gtk_widget_show (timer_frame);
@@ -752,7 +734,6 @@
   label98 = gtk_label_new_with_mnemonic (_("_100ths of a second"));
   gtk_widget_show (label98);
   gtk_box_pack_start (GTK_BOX (hbox82), label98, FALSE, FALSE, 6);
-  gtk_label_set_justify (GTK_LABEL (label98), GTK_JUSTIFY_LEFT);
 
   checkKeyAverage = gtk_check_button_new_with_mnemonic (_("Use _key averaging"));
   gtk_widget_show (checkKeyAverage);
@@ -762,7 +743,6 @@
   gtk_widget_show (label97);
   gtk_frame_set_label_widget (GTK_FRAME (timer_frame), label97);
   gtk_label_set_use_markup (GTK_LABEL (label97), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label97), GTK_JUSTIFY_LEFT);
 
   activation_type_frame = gtk_frame_new (NULL);
   gtk_widget_show (activation_type_frame);
@@ -800,12 +780,10 @@
   gtk_frame_set_label_widget (GTK_FRAME (activation_type_frame), label96);
   GTK_WIDGET_SET_FLAGS (label96, GTK_CAN_DEFAULT);
   gtk_label_set_use_markup (GTK_LABEL (label96), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label96), GTK_JUSTIFY_LEFT);
 
   label85 = gtk_label_new (_("label85"));
   gtk_widget_show (label85);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (action_type_notebook), gtk_notebook_get_nth_page (GTK_NOTEBOOK (action_type_notebook), 1), label85);
-  gtk_label_set_justify (GTK_LABEL (label85), GTK_JUSTIFY_LEFT);
 
   event_source_frame = gtk_frame_new (NULL);
   gtk_widget_show (event_source_frame);
@@ -820,7 +798,7 @@
 
   core_pointer_button = gtk_radio_button_new_with_mnemonic (NULL, _("C_ore pointer"));
   gtk_widget_show (core_pointer_button);
-  gtk_box_pack_start (GTK_BOX (vbox29), core_pointer_button, FALSE, FALSE, 2);
+  gtk_box_pack_start (GTK_BOX (vbox29), core_pointer_button, FALSE, FALSE, 0);
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (core_pointer_button), core_pointer_button_group);
   core_pointer_button_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (core_pointer_button));
 
@@ -830,7 +808,7 @@
 
   xinput_device_button = gtk_radio_button_new_with_mnemonic (NULL, _("Other _input device:"));
   gtk_widget_show (xinput_device_button);
-  gtk_box_pack_start (GTK_BOX (hbox76), xinput_device_button, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (hbox76), xinput_device_button, FALSE, FALSE, 1);
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (xinput_device_button), core_pointer_button_group);
   core_pointer_button_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (xinput_device_button));
 
@@ -845,7 +823,7 @@
 
   joystick_button = gtk_radio_button_new_with_mnemonic (NULL, _("_Joystick"));
   gtk_widget_show (joystick_button);
-  gtk_box_pack_start (GTK_BOX (vbox29), joystick_button, FALSE, FALSE, 0);
+  gtk_box_pack_start (GTK_BOX (vbox29), joystick_button, FALSE, FALSE, 2);
   gtk_radio_button_set_group (GTK_RADIO_BUTTON (joystick_button), core_pointer_button_group);
   core_pointer_button_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (joystick_button));
 
@@ -853,12 +831,10 @@
   gtk_widget_show (label91);
   gtk_frame_set_label_widget (GTK_FRAME (event_source_frame), label91);
   gtk_label_set_use_markup (GTK_LABEL (label91), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label91), GTK_JUSTIFY_LEFT);
 
   label2 = gtk_label_new (_("Actions"));
   gtk_widget_show (label2);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 1), label2);
-  gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT);
 
   vbox7 = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (vbox7);
@@ -884,7 +860,6 @@
   feedback_name_label = gtk_label_new_with_mnemonic (_("_Name:"));
   gtk_widget_show (feedback_name_label);
   gtk_box_pack_start (GTK_BOX (hbox79), feedback_name_label, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (feedback_name_label), GTK_JUSTIFY_LEFT);
 
   comboFeedback = gtk_combo_new ();
   g_object_set_data (G_OBJECT (GTK_COMBO (comboFeedback)->popwin),
@@ -921,7 +896,6 @@
   label104 = gtk_label_new_with_mnemonic (_("_Add"));
   gtk_widget_show (label104);
   gtk_box_pack_start (GTK_BOX (hbox86), label104, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label104), GTK_JUSTIFY_LEFT);
 
   buttonDeleteFeedback = gtk_button_new ();
   gtk_widget_show (buttonDeleteFeedback);
@@ -943,7 +917,6 @@
   label105 = gtk_label_new_with_mnemonic (_("_Delete"));
   gtk_widget_show (label105);
   gtk_box_pack_start (GTK_BOX (hbox87), label105, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label105), GTK_JUSTIFY_LEFT);
 
   buttonChangeFeedbackName = gtk_button_new ();
   gtk_widget_show (buttonChangeFeedbackName);
@@ -965,13 +938,11 @@
   label106 = gtk_label_new_with_mnemonic (_("_Rename"));
   gtk_widget_show (label106);
   gtk_box_pack_start (GTK_BOX (hbox88), label106, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label106), GTK_JUSTIFY_LEFT);
 
   label100 = gtk_label_new (_("<b>Define Feedback</b>"));
   gtk_widget_show (label100);
   gtk_frame_set_label_widget (GTK_FRAME (frame31), label100);
   gtk_label_set_use_markup (GTK_LABEL (label100), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label100), GTK_JUSTIFY_LEFT);
 
   frame8 = gtk_frame_new (NULL);
   gtk_widget_show (frame8);
@@ -999,7 +970,6 @@
   label29 = gtk_label_new_with_mnemonic (_("Number of _flashes:"));
   gtk_widget_show (label29);
   gtk_box_pack_start (GTK_BOX (hbox20), label29, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label29), GTK_JUSTIFY_LEFT);
 
   spinKeyFlashing_adj = gtk_adjustment_new (4, 1, 15, 1, 3, 3);
   spinKeyFlashing = gtk_spin_button_new (GTK_ADJUSTMENT (spinKeyFlashing_adj), 1, 0);
@@ -1010,7 +980,6 @@
   gtk_widget_show (label27);
   gtk_frame_set_label_widget (GTK_FRAME (frame8), label27);
   gtk_label_set_use_markup (GTK_LABEL (label27), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label27), GTK_JUSTIFY_LEFT);
 
   frame9 = gtk_frame_new (NULL);
   gtk_widget_show (frame9);
@@ -1038,7 +1007,6 @@
   label30 = gtk_label_new_with_mnemonic (_("So_und:"));
   gtk_widget_show (label30);
   gtk_box_pack_start (GTK_BOX (hbox21), label30, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label30), GTK_JUSTIFY_LEFT);
 
   comboSoundName = gtk_combo_new ();
   g_object_set_data (G_OBJECT (GTK_COMBO (comboSoundName)->popwin),
@@ -1057,12 +1025,10 @@
   gtk_widget_show (label28);
   gtk_frame_set_label_widget (GTK_FRAME (frame9), label28);
   gtk_label_set_use_markup (GTK_LABEL (label28), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label28), GTK_JUSTIFY_LEFT);
 
   label3 = gtk_label_new (_("Feedback"));
   gtk_widget_show (label3);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label3);
-  gtk_label_set_justify (GTK_LABEL (label3), GTK_JUSTIFY_LEFT);
 
   vboxMain = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (vboxMain);
@@ -1078,7 +1044,6 @@
   label33 = gtk_label_new_with_mnemonic (_("_Method:"));
   gtk_widget_show (label33);
   gtk_box_pack_start (GTK_BOX (hbox24), label33, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label33), GTK_JUSTIFY_LEFT);
 
   comboAccessMethods = gtk_combo_new ();
   g_object_set_data (G_OBJECT (GTK_COMBO (comboAccessMethods)->popwin),
@@ -1105,7 +1070,6 @@
   labelAmDescription = gtk_label_new ("");
   gtk_widget_show (labelAmDescription);
   gtk_box_pack_start (GTK_BOX (hbox23), labelAmDescription, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (labelAmDescription), GTK_JUSTIFY_LEFT);
   gtk_misc_set_alignment (GTK_MISC (labelAmDescription), 0, 0.1);
   gtk_misc_set_padding (GTK_MISC (labelAmDescription), 5, 5);
 
@@ -1113,12 +1077,10 @@
   gtk_widget_show (label31);
   gtk_frame_set_label_widget (GTK_FRAME (frame10), label31);
   gtk_label_set_use_markup (GTK_LABEL (label31), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label31), GTK_JUSTIFY_LEFT);
 
   label4 = gtk_label_new (_("Access Methods"));
   gtk_widget_show (label4);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 3), label4);
-  gtk_label_set_justify (GTK_LABEL (label4), GTK_JUSTIFY_LEFT);
 
   vbox10 = gtk_vbox_new (FALSE, 0);
   gtk_widget_show (vbox10);
@@ -1147,18 +1109,37 @@
   label36 = gtk_label_new_with_mnemonic (_("_Number of predictions:"));
   gtk_widget_show (label36);
   gtk_box_pack_start (GTK_BOX (hbox25), label36, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label36), GTK_JUSTIFY_LEFT);
 
   spinNumberPredictions_adj = gtk_adjustment_new (5, 2, 12, 1, 3, 3);
   spinNumberPredictions = gtk_spin_button_new (GTK_ADJUSTMENT (spinNumberPredictions_adj), 1, 0);
   gtk_widget_show (spinNumberPredictions);
   gtk_box_pack_start (GTK_BOX (hbox25), spinNumberPredictions, FALSE, FALSE, 0);
 
+  hseparator8 = gtk_hseparator_new ();
+  gtk_widget_show (hseparator8);
+  gtk_box_pack_start (GTK_BOX (vbox11), hseparator8, TRUE, TRUE, 0);
+
+  checkExtraWordList = gtk_check_button_new_with_mnemonic (_("Use _extra word list file"));
+  gtk_widget_show (checkExtraWordList);
+  gtk_box_pack_start (GTK_BOX (vbox11), checkExtraWordList, FALSE, FALSE, 0);
+
+  table3 = gtk_table_new (1, 1, FALSE);
+  gtk_widget_show (table3);
+  gtk_box_pack_start (GTK_BOX (vbox11), table3, TRUE, TRUE, 0);
+
+  fileentry1 = gnome_file_entry_new (NULL, NULL);
+  gtk_widget_show (fileentry1);
+  gtk_table_attach (GTK_TABLE (table3), fileentry1, 0, 1, 0, 1,
+                    (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                    (GtkAttachOptions) (0), 0, 0);
+
+  combo_entry7 = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (fileentry1));
+  gtk_widget_show (combo_entry7);
+
   label34 = gtk_label_new (_("<b>Word Completion</b>"));
   gtk_widget_show (label34);
   gtk_frame_set_label_widget (GTK_FRAME (frame11), label34);
   gtk_label_set_use_markup (GTK_LABEL (label34), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label34), GTK_JUSTIFY_LEFT);
 
   frame12 = gtk_frame_new (NULL);
   gtk_widget_show (frame12);
@@ -1182,7 +1163,6 @@
   label37 = gtk_label_new_with_mnemonic (_("Number of _predictions:"));
   gtk_widget_show (label37);
   gtk_box_pack_start (GTK_BOX (hbox26), label37, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label37), GTK_JUSTIFY_LEFT);
 
   spinNumberCommandPredictions_adj = gtk_adjustment_new (5, 2, 12, 1, 3, 3);
   spinNumberCommandPredictions = gtk_spin_button_new (GTK_ADJUSTMENT (spinNumberCommandPredictions_adj), 1, 0);
@@ -1193,12 +1173,10 @@
   gtk_widget_show (label35);
   gtk_frame_set_label_widget (GTK_FRAME (frame12), label35);
   gtk_label_set_use_markup (GTK_LABEL (label35), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label35), GTK_JUSTIFY_LEFT);
 
   label5 = gtk_label_new (_("Prediction"));
   gtk_widget_show (label5);
   gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 4), label5);
-  gtk_label_set_justify (GTK_LABEL (label5), GTK_JUSTIFY_LEFT);
 
   hboxStockButtons = gtk_hbutton_box_new ();
   gtk_widget_show (hboxStockButtons);
@@ -1323,6 +1301,9 @@
   g_signal_connect ((gpointer) entryAccessMethodName, "changed",
                     G_CALLBACK (on_entryName_changed),
                     NULL);
+  g_signal_connect ((gpointer) checkExtraWordList, "toggled",
+                    G_CALLBACK (on_checkExtraWordList_toggled),
+                    NULL);
 
   gtk_label_set_mnemonic_widget (GTK_LABEL (label10), spinKeyHeight);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label11), spinKeySpacing);
@@ -1411,8 +1392,8 @@
 
   atko = gtk_widget_get_accessible (labelActionType);
   tmp_relation_set = atk_object_ref_relation_set (atko);
-  labelActionType_relation_targets[0] = gtk_widget_get_accessible (radiobuttonTypeValuator);
-  labelActionType_relation_targets[1] = gtk_widget_get_accessible (radiobuttonTypeSwitch);
+  labelActionType_relation_targets[0] = gtk_widget_get_accessible (radiobuttonTypeSwitch);
+  labelActionType_relation_targets[1] = gtk_widget_get_accessible (radiobuttonTypeValuator);
   tmp_relationship = atk_relation_type_for_name ("label-for");
   tmp_relation = atk_relation_new (labelActionType_relation_targets, 2, tmp_relationship);
   atk_relation_set_add (tmp_relation_set, tmp_relation);
@@ -1641,6 +1622,11 @@
   GLADE_HOOKUP_OBJECT (dialogSettings, hbox25, "hbox25");
   GLADE_HOOKUP_OBJECT (dialogSettings, label36, "label36");
   GLADE_HOOKUP_OBJECT (dialogSettings, spinNumberPredictions, "spinNumberPredictions");
+  GLADE_HOOKUP_OBJECT (dialogSettings, hseparator8, "hseparator8");
+  GLADE_HOOKUP_OBJECT (dialogSettings, checkExtraWordList, "checkExtraWordList");
+  GLADE_HOOKUP_OBJECT (dialogSettings, table3, "table3");
+  GLADE_HOOKUP_OBJECT (dialogSettings, fileentry1, "fileentry1");
+  GLADE_HOOKUP_OBJECT (dialogSettings, combo_entry7, "combo_entry7");
   GLADE_HOOKUP_OBJECT (dialogSettings, label34, "label34");
   GLADE_HOOKUP_OBJECT (dialogSettings, frame12, "frame12");
   GLADE_HOOKUP_OBJECT (dialogSettings, vbox12, "vbox12");
@@ -1890,7 +1876,6 @@
   label40 = gtk_label_new (_("Name:"));
   gtk_widget_show (label40);
   gtk_box_pack_start (GTK_BOX (hbox30), label40, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label40), GTK_JUSTIFY_LEFT);
 
   entryKeyboardName = gtk_entry_new ();
   gtk_widget_show (entryKeyboardName);
@@ -1908,7 +1893,6 @@
   gtk_widget_show (label38);
   gtk_frame_set_label_widget (GTK_FRAME (frame13), label38);
   gtk_label_set_use_markup (GTK_LABEL (label38), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label38), GTK_JUSTIFY_LEFT);
 
   frame14 = gtk_frame_new (NULL);
   gtk_widget_show (frame14);
@@ -1944,7 +1928,6 @@
   label110 = gtk_label_new_with_mnemonic (_("Next Key"));
   gtk_widget_show (label110);
   gtk_box_pack_start (GTK_BOX (hbox89), label110, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label110), GTK_JUSTIFY_LEFT);
 
   buttonPrevious = gtk_button_new ();
   gtk_widget_show (buttonPrevious);
@@ -1965,7 +1948,6 @@
   label111 = gtk_label_new_with_mnemonic (_("Previous Key"));
   gtk_widget_show (label111);
   gtk_box_pack_start (GTK_BOX (hbox90), label111, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label111), GTK_JUSTIFY_LEFT);
 
   hseparator2 = gtk_hseparator_new ();
   gtk_widget_show (hseparator2);
@@ -1990,7 +1972,6 @@
   label112 = gtk_label_new_with_mnemonic (_("Add New Key"));
   gtk_widget_show (label112);
   gtk_box_pack_start (GTK_BOX (hbox91), label112, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label112), GTK_JUSTIFY_LEFT);
 
   buttonDeleteKey = gtk_button_new ();
   gtk_widget_show (buttonDeleteKey);
@@ -2011,7 +1992,6 @@
   label113 = gtk_label_new_with_mnemonic (_("Delete Key"));
   gtk_widget_show (label113);
   gtk_box_pack_start (GTK_BOX (hbox92), label113, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label113), GTK_JUSTIFY_LEFT);
 
   buttonDuplicate = gtk_button_new_with_mnemonic (_("Duplicate"));
   gtk_widget_show (buttonDuplicate);
@@ -2059,7 +2039,6 @@
   label46 = gtk_label_new (_("Modifier:"));
   gtk_widget_show (label46);
   gtk_box_pack_start (GTK_BOX (hbox33), label46, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label46), GTK_JUSTIFY_LEFT);
 
   combo1 = gtk_combo_new ();
   g_object_set_data (G_OBJECT (GTK_COMBO (combo1)->popwin),
@@ -2077,7 +2056,6 @@
   label47 = gtk_label_new (_("Label:"));
   gtk_widget_show (label47);
   gtk_box_pack_start (GTK_BOX (hbox34), label47, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label47), GTK_JUSTIFY_LEFT);
 
   entryLabel = gtk_entry_new ();
   gtk_widget_show (entryLabel);
@@ -2090,7 +2068,6 @@
   label48 = gtk_label_new (_("Style:"));
   gtk_widget_show (label48);
   gtk_box_pack_start (GTK_BOX (hbox35), label48, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label48), GTK_JUSTIFY_LEFT);
 
   combo2 = gtk_combo_new ();
   g_object_set_data (G_OBJECT (GTK_COMBO (combo2)->popwin),
@@ -2105,7 +2082,6 @@
   gtk_widget_show (label41);
   gtk_frame_set_label_widget (GTK_FRAME (frame15), label41);
   gtk_label_set_use_markup (GTK_LABEL (label41), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label41), GTK_JUSTIFY_LEFT);
 
   frame16 = gtk_frame_new (NULL);
   gtk_widget_show (frame16);
@@ -2124,7 +2100,6 @@
   label49 = gtk_label_new (_("Left:"));
   gtk_widget_show (label49);
   gtk_box_pack_start (GTK_BOX (hbox37), label49, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label49), GTK_JUSTIFY_LEFT);
 
   spinLeft_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10);
   spinLeft = gtk_spin_button_new (GTK_ADJUSTMENT (spinLeft_adj), 1, 0);
@@ -2138,7 +2113,6 @@
   label50 = gtk_label_new (_("Right:"));
   gtk_widget_show (label50);
   gtk_box_pack_start (GTK_BOX (hbox38), label50, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label50), GTK_JUSTIFY_LEFT);
 
   spinRight_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10);
   spinRight = gtk_spin_button_new (GTK_ADJUSTMENT (spinRight_adj), 1, 0);
@@ -2152,7 +2126,6 @@
   label51 = gtk_label_new (_("Top:"));
   gtk_widget_show (label51);
   gtk_box_pack_start (GTK_BOX (hbox39), label51, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label51), GTK_JUSTIFY_LEFT);
 
   spinTop_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10);
   spinTop = gtk_spin_button_new (GTK_ADJUSTMENT (spinTop_adj), 1, 0);
@@ -2166,7 +2139,6 @@
   label52 = gtk_label_new (_("Bottom:"));
   gtk_widget_show (label52);
   gtk_box_pack_start (GTK_BOX (hbox40), label52, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label52), GTK_JUSTIFY_LEFT);
 
   spinBottom_adj = gtk_adjustment_new (0, 0, 100, 1, 10, 10);
   spinBottom = gtk_spin_button_new (GTK_ADJUSTMENT (spinBottom_adj), 1, 0);
@@ -2177,7 +2149,6 @@
   gtk_widget_show (label42);
   gtk_frame_set_label_widget (GTK_FRAME (frame16), label42);
   gtk_label_set_use_markup (GTK_LABEL (label42), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label42), GTK_JUSTIFY_LEFT);
 
   frame17 = gtk_frame_new (NULL);
   gtk_widget_show (frame17);
@@ -2219,7 +2190,6 @@
   label55 = gtk_label_new (_("Name:"));
   gtk_widget_show (label55);
   gtk_box_pack_start (GTK_BOX (hbox43), label55, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label55), GTK_JUSTIFY_LEFT);
 
   combo4 = gtk_combo_new ();
   g_object_set_data (G_OBJECT (GTK_COMBO (combo4)->popwin),
@@ -2254,7 +2224,6 @@
   gtk_widget_show (label53);
   gtk_frame_set_label_widget (GTK_FRAME (frame20), label53);
   gtk_label_set_use_markup (GTK_LABEL (label53), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label53), GTK_JUSTIFY_LEFT);
 
   frame21 = gtk_frame_new (NULL);
   gtk_widget_show (frame21);
@@ -2269,7 +2238,6 @@
   label56 = gtk_label_new (_("Target:"));
   gtk_widget_show (label56);
   gtk_box_pack_start (GTK_BOX (hbox44), label56, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label56), GTK_JUSTIFY_LEFT);
 
   combo5 = gtk_combo_new ();
   g_object_set_data (G_OBJECT (GTK_COMBO (combo5)->popwin),
@@ -2284,13 +2252,11 @@
   gtk_widget_show (label54);
   gtk_frame_set_label_widget (GTK_FRAME (frame21), label54);
   gtk_label_set_use_markup (GTK_LABEL (label54), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label54), GTK_JUSTIFY_LEFT);
 
   label43 = gtk_label_new (_("<b>Type</b>"));
   gtk_widget_show (label43);
   gtk_frame_set_label_widget (GTK_FRAME (frame17), label43);
   gtk_label_set_use_markup (GTK_LABEL (label43), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label43), GTK_JUSTIFY_LEFT);
 
   frame18 = gtk_frame_new (NULL);
   gtk_widget_show (frame18);
@@ -2368,7 +2334,6 @@
   label114 = gtk_label_new_with_mnemonic (_("Move Up"));
   gtk_widget_show (label114);
   gtk_box_pack_start (GTK_BOX (hbox93), label114, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label114), GTK_JUSTIFY_LEFT);
 
   button12 = gtk_button_new ();
   gtk_widget_show (button12);
@@ -2389,7 +2354,6 @@
   label115 = gtk_label_new_with_mnemonic (_("Move Down"));
   gtk_widget_show (label115);
   gtk_box_pack_start (GTK_BOX (hbox94), label115, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label115), GTK_JUSTIFY_LEFT);
 
   vseparator2 = gtk_vseparator_new ();
   gtk_widget_show (vseparator2);
@@ -2422,7 +2386,6 @@
   label116 = gtk_label_new_with_mnemonic (_("Add"));
   gtk_widget_show (label116);
   gtk_box_pack_start (GTK_BOX (hbox95), label116, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label116), GTK_JUSTIFY_LEFT);
 
   hbox49 = gtk_hbox_new (FALSE, 5);
   gtk_widget_show (hbox49);
@@ -2431,7 +2394,6 @@
   label57 = gtk_label_new (_("Keysym:"));
   gtk_widget_show (label57);
   gtk_box_pack_start (GTK_BOX (hbox49), label57, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label57), GTK_JUSTIFY_LEFT);
 
   combo6 = gtk_combo_new ();
   g_object_set_data (G_OBJECT (GTK_COMBO (combo6)->popwin),
@@ -2469,7 +2431,6 @@
   label117 = gtk_label_new_with_mnemonic (_("Add"));
   gtk_widget_show (label117);
   gtk_box_pack_start (GTK_BOX (hbox96), label117, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label117), GTK_JUSTIFY_LEFT);
 
   hbox52 = gtk_hbox_new (FALSE, 5);
   gtk_widget_show (hbox52);
@@ -2478,7 +2439,6 @@
   label58 = gtk_label_new (_("Keycode:"));
   gtk_widget_show (label58);
   gtk_box_pack_start (GTK_BOX (hbox52), label58, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label58), GTK_JUSTIFY_LEFT);
 
   combo7 = gtk_combo_new ();
   g_object_set_data (G_OBJECT (GTK_COMBO (combo7)->popwin),
@@ -2528,7 +2488,6 @@
   label118 = gtk_label_new_with_mnemonic (_("Add"));
   gtk_widget_show (label118);
   gtk_box_pack_start (GTK_BOX (hbox97), label118, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label118), GTK_JUSTIFY_LEFT);
 
   hbox54 = gtk_hbox_new (FALSE, 5);
   gtk_widget_show (hbox54);
@@ -2537,7 +2496,6 @@
   label59 = gtk_label_new (_("GOK:"));
   gtk_widget_show (label59);
   gtk_box_pack_start (GTK_BOX (hbox54), label59, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label59), GTK_JUSTIFY_LEFT);
 
   combo8 = gtk_combo_new ();
   g_object_set_data (G_OBJECT (GTK_COMBO (combo8)->popwin),
@@ -2552,7 +2510,6 @@
   gtk_widget_show (label44);
   gtk_frame_set_label_widget (GTK_FRAME (frame18), label44);
   gtk_label_set_use_markup (GTK_LABEL (label44), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label44), GTK_JUSTIFY_LEFT);
 
   frame19 = gtk_frame_new (NULL);
   gtk_widget_show (frame19);
@@ -2571,7 +2528,6 @@
   label60 = gtk_label_new (_("Font Group:"));
   gtk_widget_show (label60);
   gtk_box_pack_start (GTK_BOX (hbox57), label60, FALSE, FALSE, 0);
-  gtk_label_set_justify (GTK_LABEL (label60), GTK_JUSTIFY_LEFT);
 
   spinbutton5_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton5 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton5_adj), 1, 0);
@@ -2586,13 +2542,11 @@
   gtk_widget_show (label45);
   gtk_frame_set_label_widget (GTK_FRAME (frame19), label45);
   gtk_label_set_use_markup (GTK_LABEL (label45), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label45), GTK_JUSTIFY_LEFT);
 
   label39 = gtk_label_new (_("<b>Key</b>"));
   gtk_widget_show (label39);
   gtk_frame_set_label_widget (GTK_FRAME (frame14), label39);
   gtk_label_set_use_markup (GTK_LABEL (label39), TRUE);
-  gtk_label_set_justify (GTK_LABEL (label39), GTK_JUSTIFY_LEFT);
 
   g_signal_connect ((gpointer) buttonNext, "clicked",
                     G_CALLBACK (on_buttonNext_clicked),
