[gedit: 4/4] spell-checker-dialog: move init code to the .ui file



commit 512dc7c573a30a028722f3ccf07a28d53dec889e
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Sat Jul 25 15:58:00 2015 +0200

    spell-checker-dialog: move init code to the .ui file

 plugins/spell/gedit-spell-checker-dialog.c  |   19 ++-----------------
 plugins/spell/resources/ui/spell-checker.ui |    9 +++++++++
 2 files changed, 11 insertions(+), 17 deletions(-)
---
diff --git a/plugins/spell/gedit-spell-checker-dialog.c b/plugins/spell/gedit-spell-checker-dialog.c
index 72e540a..d8150c3 100644
--- a/plugins/spell/gedit-spell-checker-dialog.c
+++ b/plugins/spell/gedit-spell-checker-dialog.c
@@ -483,17 +483,6 @@ gedit_spell_checker_dialog_init (GeditSpellCheckerDialog *dialog)
 
        gtk_widget_init_template (GTK_WIDGET (dialog));
 
-       gtk_label_set_label (dialog->misspelled_word_label, "");
-       gtk_widget_set_sensitive (GTK_WIDGET (dialog->word_entry), FALSE);
-       gtk_widget_set_sensitive (dialog->check_word_button, FALSE);
-       gtk_widget_set_sensitive (dialog->ignore_button, FALSE);
-       gtk_widget_set_sensitive (dialog->ignore_all_button, FALSE);
-       gtk_widget_set_sensitive (dialog->change_button, FALSE);
-       gtk_widget_set_sensitive (dialog->change_all_button, FALSE);
-       gtk_widget_set_sensitive (dialog->add_word_button, FALSE);
-
-       gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-
        /* Suggestion list */
        store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING);
        gtk_tree_view_set_model (dialog->suggestions_view, GTK_TREE_MODEL (store));
@@ -513,12 +502,6 @@ gedit_spell_checker_dialog_init (GeditSpellCheckerDialog *dialog)
 
        gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
 
-       /* Set default button */
-       gtk_widget_set_can_default (dialog->change_button, TRUE);
-       gtk_widget_grab_default (dialog->change_button);
-
-       gtk_entry_set_activates_default (dialog->word_entry, TRUE);
-
        /* Connect signals */
        g_signal_connect (dialog->word_entry,
                          "changed",
@@ -565,6 +548,8 @@ gedit_spell_checker_dialog_init (GeditSpellCheckerDialog *dialog)
                          "row-activated",
                          G_CALLBACK (suggestions_row_activated_handler),
                          dialog);
+
+       gtk_widget_grab_default (dialog->change_button);
 }
 
 GtkWidget *
diff --git a/plugins/spell/resources/ui/spell-checker.ui b/plugins/spell/resources/ui/spell-checker.ui
index e4e91ea..90a09f6 100644
--- a/plugins/spell/resources/ui/spell-checker.ui
+++ b/plugins/spell/resources/ui/spell-checker.ui
@@ -80,6 +80,8 @@
                   <object class="GtkEntry" id="word_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="activates_default">True</property>
                   </object>
                   <packing>
                     <property name="expand">True</property>
@@ -95,6 +97,7 @@
                     <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
+                    <property name="sensitive">False</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -193,6 +196,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
+                        <property name="sensitive">False</property>
                       </object>
                       <packing>
                         <property name="y_options">GTK_EXPAND</property>
@@ -204,8 +208,10 @@
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="can_default">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
+                        <property name="sensitive">False</property>
                       </object>
                       <packing>
                         <property name="top_attach">1</property>
@@ -221,6 +227,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
+                        <property name="sensitive">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -236,6 +243,7 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
+                        <property name="sensitive">False</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -286,6 +294,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
+                            <property name="sensitive">False</property>
                           </object>
                           <packing>
                             <property name="expand">True</property>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]