[gthumb] extension preferences dialogs: use a header-bar
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb] extension preferences dialogs: use a header-bar
- Date: Sat, 26 Dec 2015 21:18:34 +0000 (UTC)
commit 4339c008f9c6fcc1faa02d0968278e91f54a77ed
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sat Dec 26 11:51:25 2015 +0100
extension preferences dialogs: use a header-bar
.../comments/data/ui/comments-preferences.ui | 87 +++-----------
extensions/comments/dlg-comments-preferences.c | 19 +++-
.../data/ui/media-viewer-preferences.ui | 117 ++++++--------------
.../gstreamer_tools/dlg-media-viewer-preferences.c | 19 +++-
gthumb/gth-request-dialog.c | 2 +-
5 files changed, 83 insertions(+), 161 deletions(-)
---
diff --git a/extensions/comments/data/ui/comments-preferences.ui
b/extensions/comments/data/ui/comments-preferences.ui
index 59f2ac5..79120a2 100644
--- a/extensions/comments/data/ui/comments-preferences.ui
+++ b/extensions/comments/data/ui/comments-preferences.ui
@@ -1,76 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.19.0 -->
<interface>
- <requires lib="gtk+" version="3.10"/>
- <object class="GtkDialog" id="preferences_dialog">
+ <requires lib="gtk+" version="3.16"/>
+ <object class="GtkBox" id="dialog_content">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Preferences</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox7">
+ <property name="border_width">15</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkCheckButton" id="sync_checkbutton">
+ <property name="label" translatable="yes">_Synchronize with the embedded metadata</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">8</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="close_button">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkCheckButton" id="sync_checkbutton">
- <property name="label" translatable="yes">_Synchronize with the embedded metadata</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0.5</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
</child>
- <action-widgets>
- <action-widget response="0">close_button</action-widget>
- </action-widgets>
</object>
</interface>
diff --git a/extensions/comments/dlg-comments-preferences.c b/extensions/comments/dlg-comments-preferences.c
index 4099945..08a6be2 100644
--- a/extensions/comments/dlg-comments-preferences.c
+++ b/extensions/comments/dlg-comments-preferences.c
@@ -64,7 +64,20 @@ dlg_comments_preferences (GtkWindow *parent)
/* Get the widgets. */
- data->dialog = _gtk_builder_get_widget (data->builder, "preferences_dialog");
+ data->dialog = g_object_new (GTK_TYPE_DIALOG,
+ "title", _("Preferences"),
+ "transient-for", GTK_WINDOW (parent),
+ "modal", TRUE,
+ "destroy-with-parent", FALSE,
+ "use-header-bar", _gtk_settings_get_dialogs_use_header (),
+ NULL);
+ gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (data->dialog))),
+ _gtk_builder_get_widget (data->builder, "dialog_content"));
+ gtk_dialog_add_buttons (GTK_DIALOG (data->dialog),
+ _GTK_LABEL_OK, GTK_RESPONSE_CLOSE,
+ NULL);
+ gtk_style_context_add_class (gtk_widget_get_style_context (gtk_dialog_get_widget_for_response
(GTK_DIALOG (data->dialog), GTK_RESPONSE_CLOSE)),
+ GTK_STYLE_CLASS_SUGGESTED_ACTION);
/* Set widgets data. */
@@ -77,7 +90,7 @@ dlg_comments_preferences (GtkWindow *parent)
"destroy",
G_CALLBACK (destroy_cb),
data);
- g_signal_connect_swapped (gtk_builder_get_object (data->builder, "close_button"),
+ g_signal_connect_swapped (gtk_dialog_get_widget_for_response (GTK_DIALOG (data->dialog),
GTK_RESPONSE_CLOSE),
"clicked",
G_CALLBACK (gtk_widget_destroy),
G_OBJECT (data->dialog));
@@ -88,7 +101,5 @@ dlg_comments_preferences (GtkWindow *parent)
/* run dialog. */
- gtk_window_set_transient_for (GTK_WINDOW (data->dialog), parent);
- gtk_window_set_modal (GTK_WINDOW (data->dialog), TRUE);
gtk_widget_show (data->dialog);
}
diff --git a/extensions/gstreamer_tools/data/ui/media-viewer-preferences.ui
b/extensions/gstreamer_tools/data/ui/media-viewer-preferences.ui
index 47d334c..fbe0685 100644
--- a/extensions/gstreamer_tools/data/ui/media-viewer-preferences.ui
+++ b/extensions/gstreamer_tools/data/ui/media-viewer-preferences.ui
@@ -1,93 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.19.0 -->
<interface>
- <requires lib="gtk+" version="3.10"/>
- <object class="GtkDialog" id="preferences_dialog">
+ <requires lib="gtk+" version="3.16"/>
+ <object class="GtkBox" id="dialog_content">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Preferences</property>
- <property name="type_hint">dialog</property>
- <child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox7">
+ <property name="border_width">15</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">8</property>
- <child internal-child="action_area">
- <object class="GtkButtonBox" id="dialog-action_area7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="close_button">
- <property name="label">gtk-close</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="box1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">0</property>
- <property name="orientation">vertical</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkLabel" id="label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Screenshots location:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">screenshots_filechooserbutton</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFileChooserButton" id="screenshots_filechooserbutton">
- <property name="width_request">300</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action">select-folder</property>
- <property name="local_only">False</property>
- <property name="title" translatable="yes"/>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">_Screenshots location:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">screenshots_filechooserbutton</property>
+ <property name="xalign">0</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFileChooserButton" id="screenshots_filechooserbutton">
+ <property name="width_request">300</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action">select-folder</property>
+ <property name="local_only">False</property>
+ <property name="title" translatable="yes"/>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
- <action-widgets>
- <action-widget response="0">close_button</action-widget>
- </action-widgets>
</object>
</interface>
diff --git a/extensions/gstreamer_tools/dlg-media-viewer-preferences.c
b/extensions/gstreamer_tools/dlg-media-viewer-preferences.c
index b7ecdb5..39d3b32 100644
--- a/extensions/gstreamer_tools/dlg-media-viewer-preferences.c
+++ b/extensions/gstreamer_tools/dlg-media-viewer-preferences.c
@@ -73,7 +73,20 @@ dlg_media_viewer_preferences (GtkWindow *parent)
/* Get the widgets. */
- data->dialog = _gtk_builder_get_widget (data->builder, "preferences_dialog");
+ data->dialog = g_object_new (GTK_TYPE_DIALOG,
+ "title", _("Preferences"),
+ "transient-for", GTK_WINDOW (parent),
+ "modal", TRUE,
+ "destroy-with-parent", FALSE,
+ "use-header-bar", _gtk_settings_get_dialogs_use_header (),
+ NULL);
+ gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (data->dialog))),
+ _gtk_builder_get_widget (data->builder, "dialog_content"));
+ gtk_dialog_add_buttons (GTK_DIALOG (data->dialog),
+ _GTK_LABEL_OK, GTK_RESPONSE_CLOSE,
+ NULL);
+ gtk_style_context_add_class (gtk_widget_get_style_context (gtk_dialog_get_widget_for_response
(GTK_DIALOG (data->dialog), GTK_RESPONSE_CLOSE)),
+ GTK_STYLE_CLASS_SUGGESTED_ACTION);
/* Set widgets data. */
@@ -87,14 +100,12 @@ dlg_media_viewer_preferences (GtkWindow *parent)
"destroy",
G_CALLBACK (destroy_cb),
data);
- g_signal_connect_swapped (gtk_builder_get_object (data->builder, "close_button"),
+ g_signal_connect_swapped (gtk_dialog_get_widget_for_response (GTK_DIALOG (data->dialog),
GTK_RESPONSE_CLOSE),
"clicked",
G_CALLBACK (gtk_widget_destroy),
G_OBJECT (data->dialog));
/* run dialog. */
- gtk_window_set_transient_for (GTK_WINDOW (data->dialog), parent);
- gtk_window_set_modal (GTK_WINDOW (data->dialog), TRUE);
gtk_widget_show (data->dialog);
}
diff --git a/gthumb/gth-request-dialog.c b/gthumb/gth-request-dialog.c
index 579ead1..d121c8c 100644
--- a/gthumb/gth-request-dialog.c
+++ b/gthumb/gth-request-dialog.c
@@ -86,7 +86,7 @@ _gth_request_dialog_construct (GthRequestDialog *self,
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
vbox_entry = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
- gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
+ gtk_container_set_border_width (GTK_CONTAINER (hbox), 15);
gtk_box_set_spacing (GTK_BOX (hbox), 12);
gtk_box_set_spacing (GTK_BOX (vbox), 6);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
