[easytag/wip/future-gtk: 28/31] Use default property with action-widget responses
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [easytag/wip/future-gtk: 28/31] Use default property with action-widget responses
- Date: Tue, 26 Jan 2016 10:28:04 +0000 (UTC)
commit 97ae91d9069ccd3808f9aad8cca713abf2954a08
Author: David King <amigadave amigadave com>
Date: Wed May 13 23:44:12 2015 +0700
Use default property with action-widget responses
data/browser_dialogs.ui | 7 ++++---
data/image_properties_dialog.ui | 4 ++--
data/load_files_dialog.ui | 2 +-
data/playlist_dialog.ui | 2 +-
data/preferences_dialog.ui | 2 +-
data/scan_dialog.ui | 2 +-
src/browser.c | 6 ------
src/load_files_dialog.c | 2 --
src/playlist_dialog.c | 2 --
src/preferences_dialog.c | 2 --
src/scan_dialog.c | 2 --
src/tag_area.c | 3 ---
12 files changed, 10 insertions(+), 26 deletions(-)
---
diff --git a/data/browser_dialogs.ui b/data/browser_dialogs.ui
index 0c5adb8..d81d449 100644
--- a/data/browser_dialogs.ui
+++ b/data/browser_dialogs.ui
@@ -1,4 +1,5 @@
<interface domain="easytag">
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkDialog" id="open_directory_dialog">
<property name="border-width">12</property>
<property name="destroy-with-parent">True</property>
@@ -73,7 +74,7 @@
</object>
</child>
<action-widgets>
- <action-widget response="-5">open_directory_execute_button</action-widget>
+ <action-widget response="-5" default="yes">open_directory_execute_button</action-widget>
<action-widget response="-6">open_directory_cancel_button</action-widget>
</action-widgets>
</object>
@@ -151,7 +152,7 @@
</object>
</child>
<action-widgets>
- <action-widget response="-5">open_files_execute_button</action-widget>
+ <action-widget response="-5" default="yes">open_files_execute_button</action-widget>
<action-widget response="-6">open_files_cancel_button</action-widget>
</action-widgets>
</object>
@@ -259,7 +260,7 @@
</object>
</child>
<action-widgets>
- <action-widget response="-10">rename_button</action-widget>
+ <action-widget response="-10" default="yes">rename_button</action-widget>
<action-widget response="-6">cancel_button</action-widget>
</action-widgets>
</object>
diff --git a/data/image_properties_dialog.ui b/data/image_properties_dialog.ui
index e7af316..4e31550 100644
--- a/data/image_properties_dialog.ui
+++ b/data/image_properties_dialog.ui
@@ -1,5 +1,5 @@
<interface domain="easytag">
- <requires lib="gtk+" version="3.4"/>
+ <requires lib="gtk+" version="3.12"/>
<object class="GtkDialog" id="image_properties_dialog">
<property name="border-width">12</property>
<property name="destroy-with-parent">True</property>
@@ -77,7 +77,7 @@
</object>
</child>
<action-widgets>
- <action-widget response="-3">accept_button</action-widget>
+ <action-widget response="-3" default="yes">accept_button</action-widget>
<action-widget response="-2">cancel_button</action-widget>
</action-widgets>
</object>
diff --git a/data/load_files_dialog.ui b/data/load_files_dialog.ui
index 0e0e44b..2b27264 100644
--- a/data/load_files_dialog.ui
+++ b/data/load_files_dialog.ui
@@ -332,7 +332,7 @@
</child>
<action-widgets>
<action-widget response="-7">close_button</action-widget>
- <action-widget response="-10">apply_button</action-widget>
+ <action-widget response="-10" default="yes">apply_button</action-widget>
</action-widgets>
</template>
</interface>
diff --git a/data/playlist_dialog.ui b/data/playlist_dialog.ui
index 4566391..8b9998b 100644
--- a/data/playlist_dialog.ui
+++ b/data/playlist_dialog.ui
@@ -171,7 +171,7 @@
</child>
<action-widgets>
<action-widget response="-7">close_button</action-widget>
- <action-widget response="-5">save_button</action-widget>
+ <action-widget response="-5" default="yes">save_button</action-widget>
</action-widgets>
</template>
</interface>
diff --git a/data/preferences_dialog.ui b/data/preferences_dialog.ui
index 10bc070..14d8eb8 100644
--- a/data/preferences_dialog.ui
+++ b/data/preferences_dialog.ui
@@ -1543,7 +1543,7 @@
</object>
</child>
<action-widgets>
- <action-widget response="-7">close_button</action-widget>
+ <action-widget response="-7" default="yes">close_button</action-widget>
</action-widgets>
</template>
</interface>
diff --git a/data/scan_dialog.ui b/data/scan_dialog.ui
index d609979..c370596 100644
--- a/data/scan_dialog.ui
+++ b/data/scan_dialog.ui
@@ -923,7 +923,7 @@ Use ‘/’ to make directories. If the first character is ‘/’, it is an abs
</child>
<action-widgets>
<action-widget response="-7">close_button</action-widget>
- <action-widget response="-10">scan_button</action-widget>
+ <action-widget response="-10" default="yes">scan_button</action-widget>
</action-widgets>
</template>
</interface>
diff --git a/src/browser.c b/src/browser.c
index b3c380e..277f494 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -4091,8 +4091,6 @@ et_browser_show_rename_directory_dialog (EtBrowser *self)
gtk_window_set_transient_for (GTK_WINDOW (priv->rename_directory_dialog),
GTK_WINDOW (MainWindow));
- gtk_dialog_set_default_response (GTK_DIALOG (priv->rename_directory_dialog),
- GTK_RESPONSE_APPLY);
/* We attach useful data to the combobox */
g_object_set_data_full (G_OBJECT (priv->rename_directory_dialog),
@@ -4502,8 +4500,6 @@ et_browser_show_open_directory_with_dialog (EtBrowser *self)
gtk_window_set_transient_for (GTK_WINDOW (priv->open_directory_with_dialog),
GTK_WINDOW (MainWindow));
- gtk_dialog_set_default_response (GTK_DIALOG (priv->open_directory_with_dialog),
- GTK_RESPONSE_OK);
g_signal_connect (priv->open_directory_with_dialog, "response",
G_CALLBACK (et_run_program_tree_on_response), self);
@@ -4712,8 +4708,6 @@ et_browser_show_open_files_with_dialog (EtBrowser *self)
priv->open_files_with_dialog = GTK_WIDGET (gtk_builder_get_object (builder,
"open_files_dialog"));
- gtk_dialog_set_default_response (GTK_DIALOG (priv->open_files_with_dialog),
- GTK_RESPONSE_OK);
gtk_window_set_transient_for (GTK_WINDOW (priv->open_files_with_dialog),
GTK_WINDOW (MainWindow));
g_signal_connect ((priv->open_files_with_dialog), "response",
diff --git a/src/load_files_dialog.c b/src/load_files_dialog.c
index 7d414c2..75f007f 100644
--- a/src/load_files_dialog.c
+++ b/src/load_files_dialog.c
@@ -993,8 +993,6 @@ create_load_files_dialog (EtLoadFilesDialog *self)
priv = et_load_files_dialog_get_instance_private (self);
- gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_APPLY);
-
/* Initial value. */
gtk_file_chooser_set_current_folder_file (GTK_FILE_CHOOSER (priv->file_chooser),
et_application_window_get_current_path (ET_APPLICATION_WINDOW
(MainWindow)),
diff --git a/src/playlist_dialog.c b/src/playlist_dialog.c
index 1848b31..746d25d 100644
--- a/src/playlist_dialog.c
+++ b/src/playlist_dialog.c
@@ -655,8 +655,6 @@ create_playlist_dialog (EtPlaylistDialog *self)
priv = et_playlist_dialog_get_instance_private (self);
- gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
-
/* Playlist name */
g_settings_bind (MainSettings, "playlist-filename-mask",
priv->name_mask_entry, "text", G_SETTINGS_BIND_DEFAULT);
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index df409d4..45610f2 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -275,8 +275,6 @@ create_preferences_dialog (EtPreferencesDialog *self)
priv = et_preferences_dialog_get_instance_private (self);
- gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_CLOSE);
-
/* Browser. */
on_default_path_changed (MainSettings, "default-path",
GTK_FILE_CHOOSER_BUTTON (priv->default_path_button));
diff --git a/src/scan_dialog.c b/src/scan_dialog.c
index f48b592..5739800 100644
--- a/src/scan_dialog.c
+++ b/src/scan_dialog.c
@@ -2317,8 +2317,6 @@ create_scan_dialog (EtScanDialog *self)
priv = et_scan_dialog_get_instance_private (self);
- gtk_dialog_set_default_response (GTK_DIALOG (self), GTK_RESPONSE_APPLY);
-
g_settings_bind_with_mapping (MainSettings, "scan-mode", priv->notebook,
"page", G_SETTINGS_BIND_DEFAULT,
et_settings_enum_get, et_settings_enum_set,
diff --git a/src/tag_area.c b/src/tag_area.c
index 9570844..50e8c75 100644
--- a/src/tag_area.c
+++ b/src/tag_area.c
@@ -1686,9 +1686,6 @@ on_picture_properties_button_clicked (GObject *object,
gtk_window_set_transient_for (GTK_WINDOW (PictureTypesWindow),
parent_window);
- gtk_dialog_set_default_response (GTK_DIALOG (PictureTypesWindow),
- GTK_RESPONSE_ACCEPT);
-
store = gtk_list_store_new (PICTURE_TYPE_COLUMN_COUNT, G_TYPE_STRING,
G_TYPE_INT);
type = GTK_WIDGET (gtk_builder_get_object (builder, "types_view"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]