Drop subtitles from settings dialogs (Fixes #239)

The subtitles don't add much to the value to the dialog, take up extra
space in the window decoration (while at the same time being squeezed
in) and oftentimes actually contained pretty much the same string as the
window title.

11 files changed, 5 insertions, 27 deletions

diff --git a/dialogs/accessibility-settings/accessibility-dialog.glade b/dialogs/accessibility-settings/accessibility-dialog.glade
index 68828c55..18306ec0 100644
--- a/dialogs/accessibility-settings/accessibility-dialog.glade
+++ b/dialogs/accessibility-settings/accessibility-dialog.glade
@@ -69,7 +69,6 @@
     <property name="default_height">600</property>
     <property name="icon_name">org.xfce.settings.accessibility</property>
     <property name="type_hint">dialog</property>
-    <property name="subtitle" translatable="yes">Configure keyboard and mouse accessibility</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/dialogs/appearance-settings/appearance-dialog.glade b/dialogs/appearance-settings/appearance-dialog.glade
index f4cd64cd..59234a0b 100644
--- a/dialogs/appearance-settings/appearance-dialog.glade
+++ b/dialogs/appearance-settings/appearance-dialog.glade
@@ -110,7 +110,6 @@
     <property name="default_height">540</property>
     <property name="icon_name">org.xfce.settings.appearance</property>
     <property name="type_hint">dialog</property>
-    <property name="subtitle" translatable="yes">Customize the look of your desktop</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/dialogs/color-settings/color-dialog.glade b/dialogs/color-settings/color-dialog.glade
index 2e2bbe90..e9f1f856 100644
--- a/dialogs/color-settings/color-dialog.glade
+++ b/dialogs/color-settings/color-dialog.glade
@@ -49,7 +49,6 @@
     <property name="default_height">400</property>
     <property name="icon_name">org.xfce.settings.color</property>
     <property name="type_hint">dialog</property>
-    <property name="subtitle" translatable="yes">Configure color profiles for your devices</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
@@ -516,7 +515,6 @@
     <property name="icon_name">xfce4-color-settings</property>
     <property name="type_hint">dialog</property>
     <property name="transient_for">dialog</property>
-    <property name="subtitle" translatable="yes">Add a Color Profile to your Device</property>
     <child internal-child="vbox">
       <object class="GtkBox">
         <property name="can_focus">False</property>
diff --git a/dialogs/color-settings/main.c b/dialogs/color-settings/main.c
index f240c08a..fe494564 100644
--- a/dialogs/color-settings/main.c
+++ b/dialogs/color-settings/main.c
@@ -513,7 +513,6 @@ color_settings_profile_add_cb (GtkButton *button, ColorSettings *settings)
     window_title = g_strdup_printf ("Add Color Profile to %s",
                                     color_device_get_kind (settings->current_device) ? color_device_get_kind (settings->current_device) : "Device");
     gtk_window_set_title (GTK_WINDOW (settings->dialog_assign), window_title);
-    xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (settings->dialog_assign), color_device_get_title (settings->current_device));
     g_free (window_title);
 
     response = gtk_dialog_run (GTK_DIALOG (settings->dialog_assign));
diff --git a/dialogs/display-settings/display-dialog.glade b/dialogs/display-settings/display-dialog.glade
index 0eff9a81..a6d5c718 100644
--- a/dialogs/display-settings/display-dialog.glade
+++ b/dialogs/display-settings/display-dialog.glade
@@ -226,7 +226,6 @@
     <property name="default_height">400</property>
     <property name="icon_name">video-display</property>
     <property name="type_hint">dialog</property>
-    <property name="subtitle" translatable="yes">Configure screen settings and layout</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/dialogs/keyboard-settings/keyboard-dialog.glade b/dialogs/keyboard-settings/keyboard-dialog.glade
index 8053afa3..19a9a5f4 100644
--- a/dialogs/keyboard-settings/keyboard-dialog.glade
+++ b/dialogs/keyboard-settings/keyboard-dialog.glade
@@ -55,7 +55,6 @@
     <property name="default_height">300</property>
     <property name="icon_name">org.xfce.settings.keyboard</property>
     <property name="type_hint">dialog</property>
-    <property name="subtitle" translatable="yes">Select keyboard layout and variant</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox2">
         <property name="visible">True</property>
@@ -164,7 +163,6 @@
     <property name="default_height">600</property>
     <property name="icon_name">preferences-desktop-keyboard</property>
     <property name="type_hint">dialog</property>
-    <property name="subtitle" translatable="yes">Edit keyboard settings and application shortcuts</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/dialogs/mime-settings/xfce-mime-window.c b/dialogs/mime-settings/xfce-mime-window.c
index caacbcaf..194ddfab 100644
--- a/dialogs/mime-settings/xfce-mime-window.c
+++ b/dialogs/mime-settings/xfce-mime-window.c
@@ -187,8 +187,6 @@ xfce_mime_window_init (XfceMimeWindow *window)
     gtk_window_set_title (GTK_WINDOW (window), _("Default Applications"));
     gtk_window_set_icon_name (GTK_WINDOW (window), "org.xfce.settings.default-applications");
     gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_NORMAL);
-    xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (window),
-        _("Associate preferred applications with MIME types"));
     xfce_titled_dialog_create_action_area (XFCE_TITLED_DIALOG (window));
     button = xfce_titled_dialog_add_button (XFCE_TITLED_DIALOG (window), _("_Close"), GTK_RESPONSE_CLOSE);
     image = gtk_image_new_from_icon_name ("window-close-symbolic", GTK_ICON_SIZE_BUTTON);
diff --git a/dialogs/mouse-settings/mouse-dialog.glade b/dialogs/mouse-settings/mouse-dialog.glade
index 3d217bb7..3db91f6d 100644
--- a/dialogs/mouse-settings/mouse-dialog.glade
+++ b/dialogs/mouse-settings/mouse-dialog.glade
@@ -141,7 +141,6 @@
     <property name="window_position">center-on-parent</property>
     <property name="icon_name">org.xfce.settings.mouse</property>
     <property name="type_hint">dialog</property>
-    <property name="subtitle" translatable="yes">Configure pointer device behavior and appearance</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
diff --git a/xfce4-settings-editor/main.c b/xfce4-settings-editor/main.c
index 465b83fa..0b9ba307 100644
--- a/xfce4-settings-editor/main.c
+++ b/xfce4-settings-editor/main.c
@@ -166,9 +166,6 @@ main(gint argc, gchar **argv)
 					"window-close-symbolic", _("_Close"), GTK_RESPONSE_OK,
 					NULL);
 
-		xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog),
-										 _("Customize settings stored by Xfconf"));
-
 		gtk_window_set_icon_name (GTK_WINDOW (dialog), "org.xfce.settings.editor");
 		gtk_window_set_type_hint (GTK_WINDOW (dialog), GDK_WINDOW_TYPE_HINT_NORMAL);
 		gtk_window_set_default_size (GTK_WINDOW (dialog),
diff --git a/xfce4-settings-editor/xfce-settings-editor-box.c b/xfce4-settings-editor/xfce-settings-editor-box.c
index 60079063..dad0f219 100644
--- a/xfce4-settings-editor/xfce-settings-editor-box.c
+++ b/xfce4-settings-editor/xfce-settings-editor-box.c
@@ -959,8 +959,6 @@ xfce_settings_editor_box_channel_monitor (XfceSettingsEditorBox *self)
     gtk_window_set_icon_name (GTK_WINDOW (window), "utilities-system-monitor");
     gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
     gtk_window_set_type_hint (GTK_WINDOW (window), GDK_WINDOW_TYPE_HINT_NORMAL);
-    xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (window),
-        _("Watch an Xfconf channel for property changes"));
     gtk_dialog_add_buttons (GTK_DIALOG (window),
                             _("Clear"), GTK_RESPONSE_REJECT,
                             _("Close"), GTK_RESPONSE_CLOSE, NULL);
diff --git a/xfce4-settings-manager/xfce-settings-manager-dialog.c b/xfce4-settings-manager/xfce-settings-manager-dialog.c
index 27b5f311..8ac91839 100644
--- a/xfce4-settings-manager/xfce-settings-manager-dialog.c
+++ b/xfce4-settings-manager/xfce-settings-manager-dialog.c
@@ -117,8 +117,7 @@ static void     xfce_settings_manager_dialog_response        (GtkDialog
                                                               gint                       response_id);
 static void     xfce_settings_manager_dialog_set_title       (XfceSettingsManagerDialog *dialog,
                                                               const gchar               *title,
-                                                              const gchar               *icon_name,
-                                                              const gchar               *subtitle);
+                                                              const gchar               *icon_name);
 static void     xfce_settings_manager_dialog_go_back         (XfceSettingsManagerDialog *dialog);
 static void     xfce_settings_manager_show_filter_toggled    (GtkToggleButton           *button,
                                                               gpointer                   user_data);
@@ -218,7 +217,7 @@ xfce_settings_manager_dialog_init (XfceSettingsManagerDialog *dialog)
     gtk_window_set_default_size (GTK_WINDOW (dialog),
       xfconf_channel_get_int (dialog->channel, "/last/window-width", 640),
       xfconf_channel_get_int (dialog->channel, "/last/window-height", 500));
-    xfce_settings_manager_dialog_set_title (dialog, NULL, NULL, NULL);
+    xfce_settings_manager_dialog_set_title (dialog, NULL, NULL);
 
     /* Add a buttonbox (Help, All Settings, Close) at bottom of the main box */
     xfce_titled_dialog_create_action_area (XFCE_TITLED_DIALOG (dialog));
@@ -429,8 +428,7 @@ xfce_settings_manager_dialog_response (GtkDialog *widget,
 static void
 xfce_settings_manager_dialog_set_title (XfceSettingsManagerDialog *dialog,
                                         const gchar               *title,
-                                        const gchar               *icon_name,
-                                        const gchar               *subtitle)
+                                        const gchar               *icon_name)
 {
     g_return_if_fail (XFCE_IS_SETTINGS_MANAGER_DIALOG (dialog));
 
@@ -438,11 +436,8 @@ xfce_settings_manager_dialog_set_title (XfceSettingsManagerDialog *dialog,
         icon_name = "org.xfce.settings.manager";
     if (title == NULL)
         title = _("Settings");
-    if (subtitle == NULL)
-        subtitle = _("Customize your desktop");
 
     gtk_window_set_title (GTK_WINDOW (dialog), title);
-    xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog), subtitle);
     gtk_window_set_icon_name (GTK_WINDOW (dialog), icon_name);
 }
 
@@ -660,7 +655,7 @@ xfce_settings_manager_dialog_go_back (XfceSettingsManagerDialog *dialog)
     gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET(dialog)), NULL);
 
     /* reset dialog info */
-    xfce_settings_manager_dialog_set_title (dialog, NULL, NULL, NULL);
+    xfce_settings_manager_dialog_set_title (dialog, NULL, NULL);
 
     gtk_widget_show (dialog->category_scroll);
     gtk_widget_hide (dialog->socket_scroll);
@@ -839,8 +834,7 @@ xfce_settings_manager_dialog_plug_added (GtkWidget                 *socket,
     /* set dialog information from desktop file */
     xfce_settings_manager_dialog_set_title (dialog,
         garcon_menu_item_get_name (dialog->socket_item),
-        garcon_menu_item_get_icon_name (dialog->socket_item),
-        garcon_menu_item_get_comment (dialog->socket_item));
+        garcon_menu_item_get_icon_name (dialog->socket_item));
 
     /* show socket and hide the categories view */
     gtk_widget_show (dialog->socket_scroll);