[gedit] EncodingsDialog: more consistent attribute names



commit b7a304821230f9bd52ab4b544a7804176698cf60
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Mon Aug 11 20:20:38 2014 +0200

    EncodingsDialog: more consistent attribute names
    
    For auto-completion it's nice to type "liststore_" and see the
    proposals for the two different liststores.

 gedit/gedit-encodings-dialog.c               |   36 +++++++++++++-------------
 gedit/resources/ui/gedit-encodings-dialog.ui |   16 ++++++------
 2 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/gedit/gedit-encodings-dialog.c b/gedit/gedit-encodings-dialog.c
index 6cbb40d..4d9b62c 100644
--- a/gedit/gedit-encodings-dialog.c
+++ b/gedit/gedit-encodings-dialog.c
@@ -37,12 +37,12 @@ struct _GeditEncodingsDialogPrivate
 {
        GSettings       *enc_settings;
 
-       GtkListStore    *available_liststore;
+       GtkListStore    *liststore_available;
+       GtkListStore    *liststore_displayed;
        GtkTreeModel    *sort_available;
-       GtkListStore    *displayed_liststore;
        GtkTreeModel    *sort_displayed;
-       GtkWidget       *available_treeview;
-       GtkWidget       *displayed_treeview;
+       GtkWidget       *treeview_available;
+       GtkWidget       *treeview_displayed;
        GtkWidget       *add_button;
        GtkWidget       *remove_button;
 
@@ -119,11 +119,11 @@ gedit_encodings_dialog_class_init (GeditEncodingsDialogClass *klass)
                                                     "/org/gnome/gedit/ui/gedit-encodings-dialog.ui");
        gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, add_button);
        gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, remove_button);
-       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, available_treeview);
-       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, 
available_liststore);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, treeview_available);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, 
liststore_available);
        gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, sort_available);
-       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, displayed_treeview);
-       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, 
displayed_liststore);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, treeview_displayed);
+       gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, 
liststore_displayed);
        gtk_widget_class_bind_template_child_private (widget_class, GeditEncodingsDialog, sort_displayed);
 }
 
@@ -224,7 +224,7 @@ add_button_clicked_callback (GtkWidget            *button,
        GSList *encodings;
        GSList *tmp;
 
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->priv->available_treeview));
+       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->priv->treeview_available));
 
        encodings = NULL;
        gtk_tree_selection_selected_foreach (selection,
@@ -245,7 +245,7 @@ add_button_clicked_callback (GtkWidget            *button,
 
        g_slist_free (encodings);
 
-       update_shown_in_menu_tree_model (GTK_LIST_STORE (dialog->priv->displayed_liststore),
+       update_shown_in_menu_tree_model (GTK_LIST_STORE (dialog->priv->liststore_displayed),
                                         dialog->priv->show_in_menu_list);
 }
 
@@ -257,7 +257,7 @@ remove_button_clicked_callback (GtkWidget            *button,
        GSList *encodings;
        GSList *tmp;
 
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->priv->displayed_treeview));
+       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->priv->treeview_displayed));
 
        encodings = NULL;
        gtk_tree_selection_selected_foreach (selection,
@@ -275,7 +275,7 @@ remove_button_clicked_callback (GtkWidget            *button,
 
        g_slist_free (encodings);
 
-       update_shown_in_menu_tree_model (GTK_LIST_STORE (dialog->priv->displayed_liststore),
+       update_shown_in_menu_tree_model (GTK_LIST_STORE (dialog->priv->liststore_displayed),
                                         dialog->priv->show_in_menu_list);
 }
 
@@ -299,9 +299,9 @@ init_shown_in_menu_tree_model (GeditEncodingsDialog *dialog)
                dialog->priv->show_in_menu_list = g_slist_prepend (dialog->priv->show_in_menu_list,
                                                                   tmp->data);
 
-               gtk_list_store_append (dialog->priv->displayed_liststore,
+               gtk_list_store_append (dialog->priv->liststore_displayed,
                                       &iter);
-               gtk_list_store_set (dialog->priv->displayed_liststore,
+               gtk_list_store_set (dialog->priv->liststore_displayed,
                                    &iter,
                                    COLUMN_CHARSET,
                                    gtk_source_encoding_get_charset (enc),
@@ -324,9 +324,9 @@ insert_encoding_foreach_cb (const GtkSourceEncoding *encoding,
                return;
        }
 
-       gtk_list_store_append (dlg->priv->available_liststore, &iter);
+       gtk_list_store_append (dlg->priv->liststore_available, &iter);
 
-       gtk_list_store_set (dlg->priv->available_liststore,
+       gtk_list_store_set (dlg->priv->liststore_available,
                            &iter,
                            COLUMN_CHARSET, gtk_source_encoding_get_charset (encoding),
                            COLUMN_NAME, gtk_source_encoding_get_name (encoding),
@@ -367,7 +367,7 @@ gedit_encodings_dialog_init (GeditEncodingsDialog *dlg)
                                              COLUMN_NAME,
                                              GTK_SORT_ASCENDING);
 
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->available_treeview));
+       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->treeview_available));
 
        available_selection_changed_callback (selection, dlg);
        g_signal_connect (selection,
@@ -385,7 +385,7 @@ gedit_encodings_dialog_init (GeditEncodingsDialog *dlg)
                                              COLUMN_NAME,
                                              GTK_SORT_ASCENDING);
 
-       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->displayed_treeview));
+       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dlg->priv->treeview_displayed));
 
        displayed_selection_changed_callback (selection, dlg);
        g_signal_connect (selection,
diff --git a/gedit/resources/ui/gedit-encodings-dialog.ui b/gedit/resources/ui/gedit-encodings-dialog.ui
index 7f0ef60..41c4f1e 100644
--- a/gedit/resources/ui/gedit-encodings-dialog.ui
+++ b/gedit/resources/ui/gedit-encodings-dialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.8 -->
-  <object class="GtkListStore" id="available_liststore">
+  <object class="GtkListStore" id="liststore_available">
     <columns>
       <!-- column-name name -->
       <column type="gchararray"/>
@@ -9,7 +9,7 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <object class="GtkListStore" id="displayed_liststore">
+  <object class="GtkListStore" id="liststore_displayed">
     <columns>
       <!-- column-name name -->
       <column type="gchararray"/>
@@ -18,10 +18,10 @@
     </columns>
   </object>
   <object class="GtkTreeModelSort" id="sort_available">
-    <property name="model">available_liststore</property>
+    <property name="model">liststore_available</property>
   </object>
   <object class="GtkTreeModelSort" id="sort_displayed">
-    <property name="model">displayed_liststore</property>
+    <property name="model">liststore_displayed</property>
   </object>
   <template class="GeditEncodingsDialog" parent="GtkDialog">
     <property name="width_request">650</property>
@@ -133,7 +133,7 @@
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">A_vailable encodings:</property>
                 <property name="use_underline">True</property>
-                <property name="mnemonic_widget">available_treeview</property>
+                <property name="mnemonic_widget">treeview_available</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -152,7 +152,7 @@
                 <property name="vexpand">True</property>
                 <property name="shadow_type">etched-in</property>
                 <child>
-                  <object class="GtkTreeView" id="available_treeview">
+                  <object class="GtkTreeView" id="treeview_available">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_focus">False</property>
@@ -246,7 +246,7 @@
                 <property name="is_focus">False</property>
                 <property name="shadow_type">etched-in</property>
                 <child>
-                  <object class="GtkTreeView" id="displayed_treeview">
+                  <object class="GtkTreeView" id="treeview_displayed">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="has_focus">False</property>
@@ -304,7 +304,7 @@
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">E_ncodings shown in menu:</property>
                 <property name="use_underline">True</property>
-                <property name="mnemonic_widget">displayed_treeview</property>
+                <property name="mnemonic_widget">treeview_displayed</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>


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