[easytag/wip/musicbrainz-support-merge: 40/75] Disable some Widgets when search is progressing and after completion enable them



commit 549e224b6fa9baf77cfd2ef66e78e2e7d64c6ad3
Author: Abhinav <abhijangda hotmail com>
Date:   Sun Jul 27 17:17:50 2014 +0530

    Disable some Widgets when search is progressing and after completion enable them

 data/musicbrainz_dialog.ui |   40 ++++++++--------
 src/musicbrainz_dialog.c   |  112 ++++++++++++++++++++++++++++----------------
 2 files changed, 92 insertions(+), 60 deletions(-)
---
diff --git a/data/musicbrainz_dialog.ui b/data/musicbrainz_dialog.ui
index 01152df..253dfe4 100755
--- a/data/musicbrainz_dialog.ui
+++ b/data/musicbrainz_dialog.ui
@@ -43,7 +43,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkComboBoxText" id="cbManualSearch">
+          <object class="GtkComboBoxText" id="cb_manual_search">
             <property name="width_request">190</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -79,7 +79,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkComboBoxText" id="cbManualSearchIn">
+          <object class="GtkComboBoxText" id="cb_manual_search_in">
             <property name="width_request">110</property>
             <property name="height_request">26</property>
             <property name="visible">True</property>
@@ -94,7 +94,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="btnManualFind">
+          <object class="GtkButton" id="btn_manual_find">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -122,7 +122,7 @@
         <property name="can_focus">False</property>
         <property name="spacing">4</property>
         <child>
-          <object class="GtkButton" id="btnSelectedFind">
+          <object class="GtkButton" id="btn_selected_find">
             <property name="label" translatable="yes">Search Selected File</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -135,7 +135,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="btnAutomaticSearch">
+          <object class="GtkButton" id="btn_automatic_search">
             <property name="label" translatable="yes">Automatic Search</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -148,7 +148,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="btnDiscFind">
+          <object class="GtkButton" id="btn_disc_find">
             <property name="label" translatable="yes">DiscID Search</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -183,12 +183,12 @@
             <property name="can_focus">False</property>
             <property name="left_padding">12</property>
             <child>
-              <object class="GtkVBox" id="centralBox">
+              <object class="GtkVBox" id="central_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="spacing">3</property>
                 <child>
-                  <object class="GtkToolbar" id="toolbar1">
+                  <object class="GtkToolbar" id="toolbar">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
@@ -213,7 +213,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <child>
-                          <object class="GtkEntry" id="entryTreeViewSearch">
+                          <object class="GtkEntry" id="entry_tree_view_search">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="invisible_char">●</property>
@@ -227,7 +227,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolButton" id="toolbtnUp">
+                      <object class="GtkToolButton" id="toolbtn_up">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
@@ -243,7 +243,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolButton" id="toolbtnDown">
+                      <object class="GtkToolButton" id="toolbtn_down">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
@@ -269,7 +269,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolButton" id="toolbtnInvertSelection">
+                      <object class="GtkToolButton" id="toolbtn_invert_selection">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
@@ -285,7 +285,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolButton" id="toolbtnSelectAll">
+                      <object class="GtkToolButton" id="toolbtn_select_all">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
@@ -301,7 +301,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolButton" id="toolbtnUnselectAll">
+                      <object class="GtkToolButton" id="toolbtn_unselect_all">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
@@ -317,7 +317,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToggleToolButton" id="toolbtnToggleRedLines">
+                      <object class="GtkToggleToolButton" id="toolbtn_toggle_red_lines">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
@@ -333,7 +333,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolButton" id="toolbtnRefresh">
+                      <object class="GtkToolButton" id="toolbtn_refresh">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="has_tooltip">True</property>
@@ -349,7 +349,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToolButton" id="btnStop">
+                      <object class="GtkToolButton" id="btn_stop">
                         <property name="visible">True</property>
                         <property name="sensitive">False</property>
                         <property name="can_focus">False</property>
@@ -390,7 +390,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkCheckButton" id="chkUseDLM">
+      <object class="GtkCheckButton" id="chk_use_dlm">
         <property name="label" translatable="yes">Match lines with the Levenshtein algorithm</property>
         <property name="visible">True</property>
         <property name="can_focus">True</property>
@@ -410,7 +410,7 @@
         <property name="can_focus">False</property>
         <property name="spacing">4</property>
         <child>
-          <object class="GtkButton" id="btnClose">
+          <object class="GtkButton" id="btn_close">
             <property name="label" translatable="yes">Close</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
@@ -424,7 +424,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButton" id="btnApplyChanges">
+          <object class="GtkButton" id="btn_apply_changes">
             <property name="label" translatable="yes">Apply Tag Changes</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
diff --git a/src/musicbrainz_dialog.c b/src/musicbrainz_dialog.c
index 8bb9c2f..780834f 100755
--- a/src/musicbrainz_dialog.c
+++ b/src/musicbrainz_dialog.c
@@ -409,6 +409,7 @@ manual_search_callback (GObject *source, GAsyncResult *res,
     {
         g_object_unref (res);
         g_slice_free (ManualSearchThreadData, user_data);
+        et_music_brainz_dialog_stop_set_sensitive (FALSE);
 
         if (mb_dialog_priv)
         {
@@ -425,7 +426,7 @@ manual_search_callback (GObject *source, GAsyncResult *res,
                         "statusbar")), 0, _("Searching Completed"));
     g_object_unref (res);
     combo_box = GTK_COMBO_BOX_TEXT (gtk_builder_get_object (builder,
-                                                            "cbManualSearch"));
+                                                            "cb_manual_search"));
     gtk_combo_box_text_append_text (combo_box,
                                     gtk_combo_box_text_get_active_text (combo_box));
     et_music_brainz_dialog_stop_set_sensitive (FALSE);
@@ -516,7 +517,7 @@ manual_search_thread_func (GSimpleAsyncResult *res, GObject *obj,
  * @btn: GtkButton
  * @user_data: User data
  *
- * Signal Handler for "clicked" signal of btnManualFind.
+ * Signal Handler for "clicked" signal of btn_manual_find.
  */
 static void
 btn_manual_find_clicked (GtkWidget *btn, gpointer user_data)
@@ -529,7 +530,7 @@ btn_manual_find_clicked (GtkWidget *btn, gpointer user_data)
 
     mb_dialog_priv = ET_MUSICBRAINZ_DIALOG_GET_PRIVATE (ET_MUSICBRAINZ_DIALOG (mbDialog));
     cb_manual_search_in = GTK_WIDGET (gtk_builder_get_object (builder,
-                                                              "cbManualSearchIn"));
+                                                              "cb_manual_search_in"));
     type = gtk_combo_box_get_active (GTK_COMBO_BOX (cb_manual_search_in));
 
     if (type == -1)
@@ -545,7 +546,7 @@ btn_manual_find_clicked (GtkWidget *btn, gpointer user_data)
  
     et_mb_entity_view_clear_all (ET_MB_ENTITY_VIEW (mb_dialog_priv->entityView));
     cb_manual_search = GTK_WIDGET (gtk_builder_get_object (builder,
-                                                           "cbManualSearch"));
+                                                           "cb_manual_search"));
     thread_data = g_slice_new (ManualSearchThreadData);
     thread_data->type = type;
     thread_data->text_to_search = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (cb_manual_search));
@@ -567,7 +568,7 @@ btn_manual_find_clicked (GtkWidget *btn, gpointer user_data)
  * @btn: GtkButton
  * @user_data: User data
  *
- * Signal Handler for "clicked" signal of toolbtnToggleRedLines.
+ * Signal Handler for "clicked" signal of toolbtn_toggle_red_lines.
  */
 static void
 tool_btn_toggle_red_lines_clicked (GtkWidget *btn, gpointer user_data)
@@ -583,7 +584,7 @@ tool_btn_toggle_red_lines_clicked (GtkWidget *btn, gpointer user_data)
  * @btn: GtkButton
  * @user_data: User data
  *
- * Signal Handler for "clicked" signal of toolbtnUp.
+ * Signal Handler for "clicked" signal of toolbtn_up.
  */
 static void
 tool_btn_up_clicked (GtkWidget *btn, gpointer user_data)
@@ -599,7 +600,7 @@ tool_btn_up_clicked (GtkWidget *btn, gpointer user_data)
  * @btn: GtkButton
  * @user_data: User data
  *
- * Signal Handler for "clicked" signal of toolbtnDown.
+ * Signal Handler for "clicked" signal of toolbtn_down.
  */
 static void
 tool_btn_down_clicked (GtkWidget *btn, gpointer user_data)
@@ -615,7 +616,7 @@ tool_btn_down_clicked (GtkWidget *btn, gpointer user_data)
  * @btn: GtkButton
  * @user_data: User data
  *
- * Signal Handler for "clicked" signal of toolbtnInvertSelection.
+ * Signal Handler for "clicked" signal of toolbtn_invert_selection.
  */
 static void
 tool_btn_invert_selection_clicked (GtkWidget *btn, gpointer user_data)
@@ -631,7 +632,7 @@ tool_btn_invert_selection_clicked (GtkWidget *btn, gpointer user_data)
  * @btn: GtkButton
  * @user_data: User data
  *
- * Signal Handler for "clicked" signal of toolbtnSelectAll.
+ * Signal Handler for "clicked" signal of toolbtn_select_all.
  */
 static void
 tool_btn_select_all_clicked (GtkWidget *btn, gpointer user_data)
@@ -647,7 +648,7 @@ tool_btn_select_all_clicked (GtkWidget *btn, gpointer user_data)
  * @btn: GtkButton
  * @user_data: User data
  *
- * Signal Handler for "clicked" signal of toolbtnUnselectAll.
+ * Signal Handler for "clicked" signal of toolbtn_unselect_all.
  */
 static void
 tool_btn_unselect_all_clicked (GtkWidget *btn, gpointer user_data)
@@ -695,9 +696,9 @@ tool_btn_refresh_clicked (GtkWidget *btn, gpointer user_data)
         et_mb_entity_view_clear_all (ET_MB_ENTITY_VIEW (mb_dialog_priv->entityView));
         free_mb_tree (&mb_dialog_priv->mb_tree_root);
         mb_dialog_priv->mb_tree_root = g_node_new (NULL);
-        entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (builder, "cbManualSearch")));
+        entry = gtk_bin_get_child (GTK_BIN (gtk_builder_get_object (builder, "cb_manual_search")));
         gtk_entry_set_text (GTK_ENTRY (entry), manual_search->to_search);
-        gtk_combo_box_set_active (GTK_COMBO_BOX (gtk_builder_get_object (builder, "cbManualSearchIn")),
+        gtk_combo_box_set_active (GTK_COMBO_BOX (gtk_builder_get_object (builder, "cb_manual_search_in")),
                                   manual_search->to_search_type);
         btn_manual_find_clicked (NULL, NULL);
     }
@@ -738,7 +739,7 @@ btn_manual_stop_clicked (GtkWidget *btn, gpointer user_data)
  * @editable: GtkEditable for which handler is called
  * @user_data: User data
  *
- * Signal Handler for "changed" signal of entryTreeViewSearch.
+ * Signal Handler for "changed" signal of entry_tree_view_search.
  */
 static void
 entry_tree_view_search_changed (GtkEditable *editable, gpointer user_data)
@@ -748,7 +749,7 @@ entry_tree_view_search_changed (GtkEditable *editable, gpointer user_data)
     mb_dialog_priv = ET_MUSICBRAINZ_DIALOG_GET_PRIVATE (ET_MUSICBRAINZ_DIALOG (mbDialog));
     et_mb_entity_view_search_in_results (ET_MB_ENTITY_VIEW (mb_dialog_priv->entityView),
                                          gtk_entry_get_text (GTK_ENTRY (gtk_builder_get_object (builder,
-                                                                        "entryTreeViewSearch"))));
+                                                                        "entry_tree_view_search"))));
 }
 
 /*
@@ -771,6 +772,7 @@ selected_find_callback (GObject *source, GAsyncResult *res,
     {
         g_object_unref (res);
         g_hash_table_destroy (((SelectedFindThreadData *)user_data)->hash_table);
+        et_music_brainz_dialog_stop_set_sensitive (FALSE);
         g_slice_free (SelectedFindThreadData, user_data);
         free_mb_tree (&mb_dialog_priv->mb_tree_root);
         mb_dialog_priv->mb_tree_root = g_node_new (NULL);
@@ -1040,6 +1042,7 @@ discid_search_callback (GObject *source, GAsyncResult *res,
         g_object_unref (res);
         free_mb_tree (&mb_dialog_priv->mb_tree_root);
         mb_dialog_priv->mb_tree_root = g_node_new (NULL);
+        et_music_brainz_dialog_stop_set_sensitive (FALSE);
         return;
     }
 
@@ -1153,7 +1156,7 @@ btn_discid_search_clicked (GtkWidget *button, gpointer data)
  * @button: GtkButton
  * @data: User data
  *
- * Signal Handler for "clicked" signal of btnClose.
+ * Signal Handler for "clicked" signal of btn_close.
  */
 static void
 btn_close_clicked (GtkWidget *button, gpointer data)
@@ -1183,6 +1186,7 @@ freedbid_search_callback (GObject *source, GAsyncResult *res,
         free_mb_tree (&mb_dialog_priv->mb_tree_root);
         mb_dialog_priv->mb_tree_root = g_node_new (NULL);
         g_free (user_data);
+        et_music_brainz_dialog_stop_set_sensitive (FALSE);
         return;
     }
 
@@ -1253,7 +1257,7 @@ freedbid_search_thread_func (GSimpleAsyncResult *res, GObject *obj,
  * @btn: GtkButton
  * @user_data: User data
  *
- * Signal Handler for "clicked" signal of btnAutomaticSearch.
+ * Signal Handler for "clicked" signal of btn_automatic_search.
  */
 static void
 btn_automatic_search_clicked (GtkWidget *btn, gpointer data)
@@ -1422,7 +1426,7 @@ et_set_file_tag (ET_File *et_file, gchar *title, gchar *artist,
  * @btn: GtkButton
  * @user_data: User data
  *
- * Signal Handler for "clicked" signal of btnApplyChanges.
+ * Signal Handler for "clicked" signal of btn_apply_changes.
  */
 static void
 btn_apply_changes_clicked (GtkWidget *btn, gpointer data)
@@ -1466,7 +1470,7 @@ btn_apply_changes_clicked (GtkWidget *btn, gpointer data)
         return;
     }
 
-    if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "chkUseDLM"))))
+    if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object (builder, "chk_use_dlm"))))
     {
         EtMbEntity *et_entity;
         EtMbEntity *album_entity;
@@ -1826,7 +1830,8 @@ et_show_status_msg_in_idle (gchar *message)
  * et_music_brainz_dialog_stop_set_sensitive:
  * @sensitive: gboolean
  *
- * Set btnStop and mb_dialog_priv->entityView as sensitive according to @sensitive.
+ * Set btn_stop, EtMbEntityView and other widgets as sensitive 
+ * according to @sensitive.
  */
 void
 et_music_brainz_dialog_stop_set_sensitive (gboolean sensitive)
@@ -1834,9 +1839,36 @@ et_music_brainz_dialog_stop_set_sensitive (gboolean sensitive)
     EtMusicBrainzDialogPrivate *mb_dialog_priv;
 
     mb_dialog_priv = ET_MUSICBRAINZ_DIALOG_GET_PRIVATE (ET_MUSICBRAINZ_DIALOG (mbDialog));
-    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "btnStop")),
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "btn_stop")),
                               sensitive);
     gtk_widget_set_sensitive (mb_dialog_priv->entityView, !sensitive);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "btn_manual_find")), TRUE);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "btn_manual_find")),
+                              !sensitive);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "btn_selected_find")),
+                              !sensitive);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "btn_automatic_search")),
+                              !sensitive);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "btn_disc_find")),
+                              !sensitive);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "entry_tree_view_search")),
+                              !sensitive);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "toolbtn_up")),
+                              !sensitive);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "toolbtn_down")),
+                              !sensitive);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "toolbtn_invert_selection")),
+                              !sensitive);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "toolbtn_select_all")),
+                              !sensitive);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "toolbtn_unselect_all")),
+                              !sensitive);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "toolbtn_toggle_red_lines")),
+                              !sensitive);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "toolbtn_refresh")),
+                              !sensitive);
+    gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "btn_apply_changes")),
+                              !sensitive);
 }
 
 /*
@@ -1948,64 +1980,64 @@ et_musicbrainz_dialog_init (EtMusicBrainzDialog *dialog)
     gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                         box, TRUE, TRUE, 2);
     gtk_widget_set_size_request (GTK_WIDGET (dialog), 660, 500);
-    gtk_box_pack_start (GTK_BOX (gtk_builder_get_object (builder, "centralBox")),
+    gtk_box_pack_start (GTK_BOX (gtk_builder_get_object (builder, "central_box")),
                         priv->entityView, TRUE, TRUE, 2);
 
     et_initialize_tag_choice_dialog (priv);
-    cb_search = GTK_WIDGET (gtk_builder_get_object (builder, "cbManualSearch"));
+    cb_search = GTK_WIDGET (gtk_builder_get_object (builder, "cb_manual_search"));
     g_signal_connect (gtk_bin_get_child (GTK_BIN (cb_search)), "activate",
                       G_CALLBACK (btn_manual_find_clicked), NULL);
-    g_signal_connect (gtk_builder_get_object (builder, "btnManualFind"),
+    g_signal_connect (gtk_builder_get_object (builder, "btn_manual_find"),
                       "clicked", G_CALLBACK (btn_manual_find_clicked),
                       NULL);
-    g_signal_connect (gtk_builder_get_object (builder, "toolbtnUp"),
+    g_signal_connect (gtk_builder_get_object (builder, "toolbtn_up"),
                       "clicked", G_CALLBACK (tool_btn_up_clicked),
                       NULL);
-    g_signal_connect (gtk_builder_get_object (builder, "toolbtnDown"),
+    g_signal_connect (gtk_builder_get_object (builder, "toolbtn_down"),
                       "clicked", G_CALLBACK (tool_btn_down_clicked),
                       NULL);
-    g_signal_connect (gtk_builder_get_object (builder, "toolbtnSelectAll"),
+    g_signal_connect (gtk_builder_get_object (builder, "toolbtn_select_all"),
                       "clicked", G_CALLBACK (tool_btn_select_all_clicked),
                       NULL);
-    g_signal_connect (gtk_builder_get_object (builder, "toolbtnUnselectAll"),
+    g_signal_connect (gtk_builder_get_object (builder, "toolbtn_unselect_all"),
                       "clicked", G_CALLBACK (tool_btn_unselect_all_clicked),
                       NULL);
-    g_signal_connect (gtk_builder_get_object (builder, "toolbtnInvertSelection"),
+    g_signal_connect (gtk_builder_get_object (builder, "toolbtn_invert_selection"),
                       "clicked", G_CALLBACK (tool_btn_invert_selection_clicked),
                       NULL);
-    g_signal_connect (gtk_builder_get_object (builder, "toolbtnToggleRedLines"),
+    g_signal_connect (gtk_builder_get_object (builder, "toolbtn_toggle_red_lines"),
                       "clicked", G_CALLBACK (tool_btn_toggle_red_lines_clicked),
                       NULL);
-    g_signal_connect (gtk_builder_get_object (builder, "toolbtnRefresh"),
+    g_signal_connect (gtk_builder_get_object (builder, "toolbtn_refresh"),
                       "clicked", G_CALLBACK (tool_btn_refresh_clicked),
                       NULL);
-    g_signal_connect (gtk_builder_get_object (builder, "btnSelectedFind"),
+    g_signal_connect (gtk_builder_get_object (builder, "btn_selected_find"),
                       "clicked", G_CALLBACK (btn_selected_find_clicked),
                       NULL);
-    g_signal_connect (gtk_builder_get_object (builder, "btnDiscFind"),
+    g_signal_connect (gtk_builder_get_object (builder, "btn_disc_find"),
                       "clicked", G_CALLBACK (btn_discid_search_clicked),
                       NULL);
-    g_signal_connect (gtk_builder_get_object (builder, "btnStop"),
+    g_signal_connect (gtk_builder_get_object (builder, "btn_stop"),
                       "clicked", G_CALLBACK (btn_manual_stop_clicked),
                       NULL);
-    g_signal_connect (gtk_builder_get_object (builder, "btnClose"),
+    g_signal_connect (gtk_builder_get_object (builder, "btn_close"),
                       "clicked", G_CALLBACK (btn_close_clicked),
                       NULL);
-    g_signal_connect (gtk_builder_get_object (builder, "btnApplyChanges"),
+    g_signal_connect (gtk_builder_get_object (builder, "btn_apply_changes"),
                       "clicked", G_CALLBACK (btn_apply_changes_clicked),
                       NULL);
  
-    g_signal_connect (gtk_builder_get_object (builder, "btnAutomaticSearch"),
+    g_signal_connect (gtk_builder_get_object (builder, "btn_automatic_search"),
                       "clicked", G_CALLBACK (btn_automatic_search_clicked),
                       NULL);
-    g_signal_connect_after (gtk_builder_get_object (builder, "entryTreeViewSearch"),
+    g_signal_connect_after (gtk_builder_get_object (builder, "entry_tree_view_search"),
                             "changed",
                             G_CALLBACK (entry_tree_view_search_changed),
                             NULL);
 
     /* Fill Values in cb_manual_search_in */
     cb_manual_search_in = GTK_WIDGET (gtk_builder_get_object (builder,
-                                                              "cbManualSearchIn"));
+                                                              "cb_manual_search_in"));
 
     gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (cb_manual_search_in), "Artist");
     gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (cb_manual_search_in), "Album");
@@ -2013,7 +2045,7 @@ et_musicbrainz_dialog_init (EtMusicBrainzDialog *dialog)
 
     gtk_combo_box_set_active (GTK_COMBO_BOX (cb_manual_search_in), 1);
 
-    /* Set the text of cbManualSearch to the album of selected file */
+    /* Set the text of cb_manual_search to the album of selected file */
     get_first_selected_file (&et_file);
 
     if (et_file && ((File_Tag *)et_file->FileTag->data)->album)
@@ -2052,7 +2084,7 @@ et_open_musicbrainz_dialog ()
     gtk_dialog_run (GTK_DIALOG (mbDialog));
 
     if (gtk_widget_get_sensitive (GTK_WIDGET (gtk_builder_get_object (builder,
-                                  "btnStop"))))
+                                  "btn_stop"))))
     {
         priv->exit_on_complete = TRUE;
         btn_manual_stop_clicked (NULL, NULL);


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