[easytag/wip/application-window: 89/105] Move UI and misc preferences pages to GtkBuilder
- From: David King <davidk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [easytag/wip/application-window: 89/105] Move UI and misc preferences pages to GtkBuilder
- Date: Fri, 22 Aug 2014 15:10:55 +0000 (UTC)
commit f478607a9faad22025ebe99f6002bf255edfca9a
Author: David King <amigadave amigadave com>
Date: Sat Aug 16 08:37:38 2014 +0100
Move UI and misc preferences pages to GtkBuilder
Unify the UI settings in a single User Interface page.
data/preferences_dialog.ui | 164 ++++++++++++++++++++++++++++++++++++++++++
src/preferences_dialog.c | 168 ++++++++++++-------------------------------
2 files changed, 211 insertions(+), 121 deletions(-)
---
diff --git a/data/preferences_dialog.ui b/data/preferences_dialog.ui
index f92b297..7dfcb7b 100644
--- a/data/preferences_dialog.ui
+++ b/data/preferences_dialog.ui
@@ -1,5 +1,169 @@
<interface domain="easytag">
<requires lib="gtk+" version="3.4"/>
+ <object class="GtkAdjustment" id="log_lines_adjustment">
+ <property name="lower">10.0</property>
+ <property name="step-increment">10.0</property>
+ <property name="upper">1500.0</property>
+ </object>
+ <object class="GtkGrid" id="ui_grid">
+ <property name="border-width">12</property>
+ <property name="orientation">vertical</property>
+ <property name="row-spacing">6</property>
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="browser_label">
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Browser</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox" id="default_path_box">
+ <property name="margin-left">12</property>
+ <property name="spacing">12</property>
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="default_path_label">
+ <property name="label" translatable="yes">Default Directory:</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkFileChooserButton" id="default_path_button">
+ <property name="action">select-folder</property>
+ <property name="tooltip-text" translatable="yes">The default path to search for
music files</property>
+ <property name="width-chars">30</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="browser_startup_check">
+ <property name="label" translatable="yes">Load on startup the default directory or the
directory passed as argument</property>
+ <property name="margin-left">12</property>
+ <property name="tooltip-text" translatable="yes">Whether to load the default path (or the
path passed as an argument) on application startup</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="browser_subdirs_check">
+ <property name="label" translatable="yes">Browse subdirectories</property>
+ <property name="margin-left">12</property>
+ <property name="tooltip-text" translatable="yes">Whether to search subdirectories for audio
files when reading a path in the browser</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="browser_expand_subdirs_check">
+ <property name="label" translatable="yes">Expand the subdirectories of the selected
path</property>
+ <property name="margin-left">12</property>
+ <property name="tooltip-text" translatable="yes">Whether to expand the subdirectories of a
node in the directory browser when selecting it</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="browser_hidden_check">
+ <property name="label" translatable="yes">Search hidden directories</property>
+ <property name="margin-left">12</property>
+ <property name="tooltip-text" translatable="yes">Whether to show hidden directories when
showing a path in the browser</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="browser_case_check">
+ <property name="label" translatable="yes">Sort files case-sensitively</property>
+ <property name="margin-left">12</property>
+ <property name="tooltip-text" translatable="yes">Whether file sorting is
case-sensitive</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="log_label">
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Log</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="log_show_check">
+ <property name="label" translatable="yes">Show the log</property>
+ <property name="margin-left">12</property>
+ <property name="tooltip-text" translatable="yes">Whether to show the log in the main
window</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox" id="log_lines_box">
+ <property name="margin-left">12</property>
+ <property name="spacing">12</property>
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="log_lines_label">
+ <property name="label" translatable="yes">Maximum number of lines:</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="log_lines_button">
+ <property name="adjustment">log_lines_adjustment</property>
+ <property name="tooltip-text" translatable="yes">The maximum number of lines to keep
in the log</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel" id="general_label">
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">General</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="header_show_check">
+ <property name="label" translatable="yes">Show audio file header summary</property>
+ <property name="margin-left">12</property>
+ <property name="tooltip-text" translatable="yes">Whether to show header information, such as
bit rate and duration, for audio files</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox" id="general_list_box">
+ <property name="margin-left">12</property>
+ <property name="spacing">12</property>
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="list_label">
+ <property name="label" translatable="yes">Display changed files in list
using:</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="list_red_radio">
+ <property name="label" translatable="yes">Red color</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="list_bold_radio">
+ <property name="group">list_red_radio</property>
+ <property name="label" translatable="yes">Bold style</property>
+ <property name="visible">True</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
<object class="GtkGrid" id="scanner_grid">
<property name="border-width">12</property>
<property name="orientation">vertical</property>
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index 09c6b3a..90f7ab9 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -223,14 +223,13 @@ create_preferences_dialog (EtPreferencesDialog *self)
GtkWidget *Frame;
GtkWidget *Table;
GtkWidget *VBox, *vbox;
- GtkWidget *HBox, *hbox, *id3v1v2hbox;
+ GtkWidget *hbox, *id3v1v2hbox;
GtkWidget *Separator;
GtkWidget *LoadOnStartup;
GtkWidget *BrowseSubdir;
GtkWidget *OpenSelectedBrowserNode;
GtkWidget *BrowseHiddendir;
GtkWidget *ShowHeaderInfos;
- GtkWidget *ChangedFilesDisplayedToRed;
GtkWidget *ChangedFilesDisplayedToBold;
GtkWidget *SortingFileCaseSensitive;
GtkWidget *ShowLogView;
@@ -326,26 +325,25 @@ create_preferences_dialog (EtPreferencesDialog *self)
gtk_notebook_set_scrollable(GTK_NOTEBOOK(priv->options_notebook),TRUE);
gtk_box_pack_start(GTK_BOX(OptionsVBox),priv->options_notebook,TRUE,TRUE,0);
-
-
/*
* Browser
*/
- Label = gtk_label_new(_("Browser"));
- vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, BOX_SPACING);
- gtk_notebook_append_page (GTK_NOTEBOOK (priv->options_notebook), vbox, Label);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), BOX_SPACING);
-
- /* Default directory */
- HBox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BOX_SPACING);
- gtk_box_pack_start(GTK_BOX(vbox),HBox,FALSE,FALSE,0);
+ Label = gtk_label_new(_("Interface"));
+ builder = gtk_builder_new ();
+ gtk_builder_add_from_resource (builder,
+ "/org/gnome/EasyTAG/preferences_dialog.ui",
+ &error);
- /* Label. */
- Label = gtk_label_new(_("Default directory:"));
- gtk_box_pack_start(GTK_BOX(HBox),Label,FALSE,FALSE,0);
+ if (error != NULL)
+ {
+ g_error ("Unable to get scanner page from resource: %s",
+ error->message);
+ }
- default_path_button = gtk_file_chooser_button_new (_("Default Browser Path"),
- GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+ vbox = GTK_WIDGET (gtk_builder_get_object (builder, "ui_grid"));
+ gtk_notebook_append_page (GTK_NOTEBOOK (priv->options_notebook), vbox, Label);
+ default_path_button = GTK_WIDGET (gtk_builder_get_object (builder,
+ "default_path_button"));
on_default_path_changed (MainSettings, "changed::default-path",
GTK_FILE_CHOOSER_BUTTON (default_path_button));
/* Connecting to current-folder-changed does not work if the user selects
@@ -357,127 +355,66 @@ create_preferences_dialog (EtPreferencesDialog *self)
g_signal_connect (MainSettings, "changed::default-path",
G_CALLBACK (on_default_path_changed),
default_path_button);
- gtk_box_pack_start (GTK_BOX (HBox), default_path_button, TRUE, TRUE, 0);
- gtk_file_chooser_button_set_width_chars (GTK_FILE_CHOOSER_BUTTON (default_path_button),
- 30);
- gtk_widget_set_tooltip_text (default_path_button,
- _("The default path to search for music files"));
/* Load directory on startup */
- LoadOnStartup = gtk_check_button_new_with_label(_("Load on startup the default directory or the
directory passed as argument"));
- gtk_box_pack_start(GTK_BOX(vbox),LoadOnStartup,FALSE,FALSE,0);
+ LoadOnStartup = GTK_WIDGET (gtk_builder_get_object (builder,
+ "browser_startup_check"));
g_settings_bind (MainSettings, "load-on-startup", LoadOnStartup, "active",
G_SETTINGS_BIND_DEFAULT);
- gtk_widget_set_tooltip_text (LoadOnStartup,
- _("Whether to load the default path (or the path passed as an argument) on
application startup"));
/* Browse subdirectories */
- BrowseSubdir = gtk_check_button_new_with_label (_("Browse subdirectories"));
- gtk_box_pack_start(GTK_BOX(vbox),BrowseSubdir,FALSE,FALSE,0);
+ BrowseSubdir = GTK_WIDGET (gtk_builder_get_object (builder,
+ "browser_subdirs_check"));
g_settings_bind (MainSettings, "browse-subdir", BrowseSubdir, "active",
G_SETTINGS_BIND_DEFAULT);
- gtk_widget_set_tooltip_text (BrowseSubdir,
- _("Whether to search subdirectories for audio files when reading a path in
the browser"));
/* Open the node to show subdirectories */
- OpenSelectedBrowserNode = gtk_check_button_new_with_label (_("Expand the subdirectories of the selected
path"));
- gtk_box_pack_start(GTK_BOX(vbox),OpenSelectedBrowserNode,FALSE,FALSE,0);
+ OpenSelectedBrowserNode = GTK_WIDGET (gtk_builder_get_object (builder,
+ "browser_expand_subdirs_check"));
g_settings_bind (MainSettings, "browse-expand-children",
OpenSelectedBrowserNode, "active",
G_SETTINGS_BIND_DEFAULT);
- gtk_widget_set_tooltip_text (OpenSelectedBrowserNode,
- _("Whether to expand the subdirectories of a node in the directory browser
when selecting it"));
/* Browse hidden directories */
- BrowseHiddendir = gtk_check_button_new_with_label(_("Search hidden directories"));
+ BrowseHiddendir = GTK_WIDGET (gtk_builder_get_object (builder,
+ "browser_hidden_check"));
g_settings_bind (MainSettings, "browse-show-hidden", BrowseHiddendir,
"active", G_SETTINGS_BIND_DEFAULT);
- gtk_widget_set_tooltip_text (BrowseHiddendir,
- _("Whether to show hidden directories when showing a path in the browser"));
-
-
- /*
- * Misc
- */
- Label = gtk_label_new (_("Misc"));
- VBox = gtk_box_new (GTK_ORIENTATION_VERTICAL, BOX_SPACING);
- gtk_notebook_append_page (GTK_NOTEBOOK (priv->options_notebook), VBox, Label);
- gtk_container_set_border_width (GTK_CONTAINER (VBox), BOX_SPACING);
-
- /* User interface */
- Frame = gtk_frame_new (_("User Interface"));
- gtk_box_pack_start(GTK_BOX(VBox),Frame,FALSE,FALSE,0);
- vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, BOX_SPACING);
- gtk_container_add(GTK_CONTAINER(Frame),vbox);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), BOX_SPACING);
-
- // Show header infos
- ShowHeaderInfos = gtk_check_button_new_with_label (_("Show audio file header summary"));
- gtk_box_pack_start(GTK_BOX(vbox),ShowHeaderInfos,FALSE,FALSE,0);
- g_settings_bind (MainSettings, "file-show-header", ShowHeaderInfos, "active",
- G_SETTINGS_BIND_DEFAULT);
- gtk_widget_set_tooltip_text (ShowHeaderInfos,
- _("Whether to show header information, such as bitrate and duration, for
audio files"));
-
- // Display color mode for changed files in list
- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BOX_SPACING);
- gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,0);
- Label = gtk_label_new(_("Display changed files in list using:"));
- gtk_box_pack_start(GTK_BOX(hbox),Label,FALSE,FALSE,0);
-
- ChangedFilesDisplayedToRed = gtk_radio_button_new_with_label(NULL,_("Red color"));
- gtk_box_pack_start(GTK_BOX(hbox),ChangedFilesDisplayedToRed,FALSE,FALSE,4);
-
- // Set "new" Gtk+-2.0ish black/bold style for changed items
- ChangedFilesDisplayedToBold = gtk_radio_button_new_with_label(
- gtk_radio_button_get_group(GTK_RADIO_BUTTON(ChangedFilesDisplayedToRed)),_("Bold style"));
- gtk_box_pack_start(GTK_BOX(hbox),ChangedFilesDisplayedToBold,FALSE,FALSE,2);
- g_settings_bind (MainSettings, "file-changed-bold",
- ChangedFilesDisplayedToBold, "active",
- G_SETTINGS_BIND_DEFAULT);
- g_signal_connect_swapped (ChangedFilesDisplayedToBold, "notify::active",
- G_CALLBACK (et_application_window_browser_refresh_list),
- MainWindow);
-
- /* Sorting List Options */
- Frame = gtk_frame_new (_("Sorting List Options"));
- gtk_box_pack_start(GTK_BOX(VBox),Frame,FALSE,FALSE,0);
-
- SortingFileCaseSensitive = gtk_check_button_new_with_label(_("Sort files case-sensitively"));
- gtk_container_add (GTK_CONTAINER (Frame), SortingFileCaseSensitive);
+ SortingFileCaseSensitive = GTK_WIDGET (gtk_builder_get_object (builder,
+ "browser_case_check"));
g_settings_bind (MainSettings, "sort-case-sensitive",
SortingFileCaseSensitive, "active",
G_SETTINGS_BIND_DEFAULT);
- gtk_widget_set_tooltip_text (SortingFileCaseSensitive,
- _("Whether file sorting is case-sensitive"));
-
- /* Log options */
- Frame = gtk_frame_new (_("Log Options"));
- gtk_box_pack_start(GTK_BOX(VBox),Frame,FALSE,FALSE,0);
- vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, BOX_SPACING);
- gtk_container_add(GTK_CONTAINER(Frame),vbox);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), BOX_SPACING);
- // Show / hide log view
- ShowLogView = gtk_check_button_new_with_label (_("Show the log"));
- gtk_box_pack_start(GTK_BOX(vbox),ShowLogView,FALSE,FALSE,0);
+ /* Show / hide log view. */
+ ShowLogView = GTK_WIDGET (gtk_builder_get_object (builder,
+ "log_show_check"));
g_settings_bind (MainSettings, "log-show", ShowLogView, "active",
G_SETTINGS_BIND_DEFAULT);
- gtk_widget_set_tooltip_text (ShowLogView,
- _("Whether to show the log in the main window"));
- // Max number of lines
- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, BOX_SPACING);
- gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,0);
- Label = gtk_label_new (_("Max number of lines:"));
- gtk_box_pack_start(GTK_BOX(hbox),Label,FALSE,FALSE,0);
-
- LogMaxLinesSpinButton = gtk_spin_button_new_with_range(10.0,1500.0,10.0);
- gtk_box_pack_start(GTK_BOX(hbox),LogMaxLinesSpinButton,FALSE,FALSE,0);
+ /* Max number of lines. */
+ LogMaxLinesSpinButton = GTK_WIDGET (gtk_builder_get_object (builder,
+ "log_lines_button"));
g_settings_bind (MainSettings, "log-lines", LogMaxLinesSpinButton,
"value", G_SETTINGS_BIND_DEFAULT);
+ /* Show header informantion. */
+ ShowHeaderInfos = GTK_WIDGET (gtk_builder_get_object (builder,
+ "header_show_check"));
+ g_settings_bind (MainSettings, "file-show-header", ShowHeaderInfos,
+ "active", G_SETTINGS_BIND_DEFAULT);
+
+ /* Display color mode for changed files in list. */
+ /* Set "new" Gtk+-2.0ish black/bold style for changed items. */
+ ChangedFilesDisplayedToBold = GTK_WIDGET (gtk_builder_get_object (builder,
+ "list_bold_radio"));
+ g_settings_bind (MainSettings, "file-changed-bold",
+ ChangedFilesDisplayedToBold, "active",
+ G_SETTINGS_BIND_DEFAULT);
+ g_signal_connect_swapped (ChangedFilesDisplayedToBold, "notify::active",
+ G_CALLBACK (et_application_window_browser_refresh_list),
+ MainWindow);
/*
* File Settings
@@ -1150,17 +1087,6 @@ create_preferences_dialog (EtPreferencesDialog *self)
* Scanner
*/
Label = gtk_label_new (_("Scanner"));
- builder = gtk_builder_new ();
- gtk_builder_add_from_resource (builder,
- "/org/gnome/EasyTAG/preferences_dialog.ui",
- &error);
-
- if (error != NULL)
- {
- g_error ("Unable to get scanner page from resource: %s",
- error->message);
- }
-
VBox = GTK_WIDGET (gtk_builder_get_object (builder, "scanner_grid"));
gtk_notebook_append_page (GTK_NOTEBOOK(priv->options_notebook), VBox, Label);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
