fixed several dialogs to be activateable using Enter key

6 files changed, 13 insertions, 3 deletions

diff --git a/plugins/gtkui/ddbtabstrip.c b/plugins/gtkui/ddbtabstrip.c
index 6e538df6..3fd063d0 100644
--- a/plugins/gtkui/ddbtabstrip.c
+++ b/plugins/gtkui/ddbtabstrip.c
@@ -530,6 +530,8 @@ on_rename_playlist1_activate           (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
     GtkWidget *dlg = create_editplaylistdlg ();
+    gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
+    gtk_window_set_title (GTK_WINDOW (dlg), "Edit playlist");
     GtkWidget *e = lookup_widget (dlg, "title");
     char t[100];
     deadbeef->plt_get_title (tab_clicked, t, sizeof (t));
diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade
index 88a260da..7f15644c 100644
--- a/plugins/gtkui/deadbeef.glade
+++ b/plugins/gtkui/deadbeef.glade
@@ -3695,7 +3695,7 @@ SOCKS5_HOSTNAME</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
   <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
+  <property name="destroy_with_parent">True</property>
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
   <property name="skip_pager_hint">False</property>
@@ -3993,7 +3993,7 @@ SOCKS5_HOSTNAME</property>
 	      <property name="text" translatable="yes"></property>
 	      <property name="has_frame">True</property>
 	      <property name="invisible_char">•</property>
-	      <property name="activates_default">False</property>
+	      <property name="activates_default">True</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c
index 8c011a5a..536db8ab 100644
--- a/plugins/gtkui/gtkui.c
+++ b/plugins/gtkui/gtkui.c
@@ -554,7 +554,8 @@ void
 on_add_location_activate               (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
-    GtkWidget *dlg= create_addlocationdlg ();
+    GtkWidget *dlg = create_addlocationdlg ();
+    gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
     int res = gtk_dialog_run (GTK_DIALOG (dlg));
     if (res == GTK_RESPONSE_OK) {
         GtkEntry *entry = GTK_ENTRY (lookup_widget (dlg, "addlocation_entry"));
diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c
index dfadf2b8..eef9fe1b 100644
--- a/plugins/gtkui/interface.c
+++ b/plugins/gtkui/interface.c
@@ -2134,6 +2134,7 @@ create_editplaylistdlg (void)
   editplaylistdlg = gtk_dialog_new ();
   gtk_container_set_border_width (GTK_CONTAINER (editplaylistdlg), 8);
   gtk_window_set_title (GTK_WINDOW (editplaylistdlg), "editplaylistdlg");
+  gtk_window_set_destroy_with_parent (GTK_WINDOW (editplaylistdlg), TRUE);
   gtk_window_set_type_hint (GTK_WINDOW (editplaylistdlg), GDK_WINDOW_TYPE_HINT_DIALOG);
 
   dialog_vbox3 = GTK_DIALOG (editplaylistdlg)->vbox;
@@ -2295,6 +2296,7 @@ create_addlocationdlg (void)
   gtk_box_pack_start (GTK_BOX (hbox34), addlocation_entry, TRUE, TRUE, 0);
   gtk_widget_set_size_request (addlocation_entry, 297, -1);
   gtk_entry_set_invisible_char (GTK_ENTRY (addlocation_entry), 8226);
+  gtk_entry_set_activates_default (GTK_ENTRY (addlocation_entry), TRUE);
 
   addlocation_actionarea = GTK_DIALOG (addlocationdlg)->action_area;
   gtk_widget_show (addlocation_actionarea);
diff --git a/plugins/gtkui/plcommon.c b/plugins/gtkui/plcommon.c
index eed3858a..ca08d8ac 100644
--- a/plugins/gtkui/plcommon.c
+++ b/plugins/gtkui/plcommon.c
@@ -388,6 +388,7 @@ on_add_column_activate                 (GtkMenuItem     *menuitem,
                                         gpointer         user_data)
 {
     GtkWidget *dlg = create_editcolumndlg ();
+    gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
     gtk_window_set_title (GTK_WINDOW (dlg), "Add column");
     gtk_combo_box_set_active (GTK_COMBO_BOX (lookup_widget (dlg, "id")), 0);
     gtk_combo_box_set_active (GTK_COMBO_BOX (lookup_widget (dlg, "align")), 0);
@@ -418,6 +419,7 @@ on_edit_column_activate                (GtkMenuItem     *menuitem,
     if (active_column == -1)
         return;
     GtkWidget *dlg = create_editcolumndlg ();
+    gtk_dialog_set_default_response (GTK_DIALOG (dlg), GTK_RESPONSE_OK);
     gtk_window_set_title (GTK_WINDOW (dlg), "Edit column");
 
     const char *title;
diff --git a/plugins/gtkui/pluginconf.c b/plugins/gtkui/pluginconf.c
index 6b96244f..298b710b 100644
--- a/plugins/gtkui/pluginconf.c
+++ b/plugins/gtkui/pluginconf.c
@@ -128,6 +128,7 @@ plugin_configure (GtkWidget *parentwin, DB_plugin_t *p) {
     char title[200];
     snprintf (title, sizeof (title), "Setup %s", p->name);
     GtkWidget *win = gtk_dialog_new_with_buttons (title, GTK_WINDOW (parentwin), GTK_DIALOG_MODAL, GTK_STOCK_APPLY, GTK_RESPONSE_APPLY, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+    gtk_dialog_set_default_response (GTK_DIALOG (win), GTK_RESPONSE_OK);
     gtk_window_set_type_hint (GTK_WINDOW (win), GDK_WINDOW_TYPE_HINT_DIALOG);
     gtk_container_set_border_width (GTK_CONTAINER(win), 12);
 
@@ -188,6 +189,7 @@ plugin_configure (GtkWidget *parentwin, DB_plugin_t *p) {
             label = gtk_label_new (labeltext);
             gtk_widget_show (label);
             prop = gtk_entry_new ();
+            gtk_entry_set_activates_default (GTK_ENTRY (prop), TRUE);
             g_signal_connect (G_OBJECT (prop), "changed", G_CALLBACK (prop_changed), win);
             gtk_widget_show (prop);
             gtk_entry_set_text (GTK_ENTRY (prop), deadbeef->conf_get_str (key, def));
@@ -205,6 +207,7 @@ plugin_configure (GtkWidget *parentwin, DB_plugin_t *p) {
             cont = gtk_hbox_new (FALSE, 2);
             gtk_widget_show (cont);
             prop = gtk_entry_new ();
+            gtk_entry_set_activates_default (GTK_ENTRY (prop), TRUE);
             g_signal_connect (G_OBJECT (prop), "changed", G_CALLBACK (prop_changed), win);
             gtk_widget_show (prop);
             gtk_editable_set_editable (GTK_EDITABLE (prop), FALSE);