[gnome-terminal] prefs: Remove dark theme pref



commit 5f6c514a8840a5d1b87a8c399defee3b5052ec18
Author: Christian Persch <chpe gnome org>
Date:   Thu Jan 8 14:08:43 2015 +0100

    prefs: Remove dark theme pref
    
    It's more trouble than it's worth.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=707206
    https://bugzilla.gnome.org/show_bug.cgi?id=742040
    https://bugzilla.gnome.org/show_bug.cgi?id=742333
    https://bugzilla.gnome.org/show_bug.cgi?id=649358

 src/org.gnome.Terminal.gschema.xml |    5 -----
 src/preferences.ui                 |   16 ----------------
 src/terminal-app.c                 |    4 ----
 src/terminal-prefs.c               |    9 +--------
 src/terminal-schemas.h             |    1 -
 5 files changed, 1 insertions(+), 34 deletions(-)
---
diff --git a/src/org.gnome.Terminal.gschema.xml b/src/org.gnome.Terminal.gschema.xml
index c7d0edb..6a4ddb6 100644
--- a/src/org.gnome.Terminal.gschema.xml
+++ b/src/org.gnome.Terminal.gschema.xml
@@ -632,11 +632,6 @@
       <summary>Whether to show the menubar in new windows</summary>
     </key>
 
-    <key name="dark-theme" type="b">
-      <default>false</default>
-      <summary>Whether to use a dark theme variant</summary>
-    </key>
-
     <key name="new-terminal-mode" enum="org.gnome.Terminal.NewTerminalMode">
       <default>'window'</default>
       <summary>Whether to open new terminals as windows or tabs</summary>
diff --git a/src/preferences.ui b/src/preferences.ui
index df82508..f64a11b 100644
--- a/src/preferences.ui
+++ b/src/preferences.ui
@@ -139,22 +139,6 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkCheckButton" id="dark-theme-checkbutton">
-                    <property name="label" translatable="yes">Use _dark theme variant</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</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">3</property>
-                  </packing>
-                </child>
-                <child>
                   <object class="GtkBox" id="hbox140">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
diff --git a/src/terminal-app.c b/src/terminal-app.c
index 95302c5..8a9434f 100644
--- a/src/terminal-app.c
+++ b/src/terminal-app.c
@@ -362,10 +362,6 @@ terminal_app_init (TerminalApp *app)
 
   /* Terminal global settings */
   app->global_settings = g_settings_new (TERMINAL_SETTING_SCHEMA);
-  g_settings_bind (app->global_settings, TERMINAL_SETTING_DARK_THEME_KEY,
-                   gtk_settings_get_default (),
-                   "gtk-application-prefer-dark-theme",
-                   G_SETTINGS_BIND_GET);
 
   /* Check if we need to migrate from gconf to dconf */
   maybe_migrate_settings (app);
diff --git a/src/terminal-prefs.c b/src/terminal-prefs.c
index a57dde6..97f6c33 100644
--- a/src/terminal-prefs.c
+++ b/src/terminal-prefs.c
@@ -562,7 +562,7 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
   GtkWidget *show_menubar_button, *disable_mnemonics_button, *disable_menu_accel_button;
   GtkWidget *disable_shortcuts_button;
   GtkWidget *tree_view_container, *new_button, *edit_button, *clone_button, *remove_button;
-  GtkWidget *dark_theme_button, *new_terminal_mode_combo;
+  GtkWidget *new_terminal_mode_combo;
   GtkWidget *default_hbox, *default_label;
   GtkTreeSelection *selection;
   GSettings *settings;
@@ -583,7 +583,6 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
                                        "preferences-dialog",
                                        "preferences-dialog", &dialog,
                                        "default-show-menubar-checkbutton", &show_menubar_button,
-                                       "dark-theme-checkbutton", &dark_theme_button,
                                        "new-terminal-mode-combobox", &new_terminal_mode_combo,
                                        "disable-mnemonics-checkbutton", &disable_mnemonics_button,
                                        "disable-shortcuts-checkbutton", &disable_shortcuts_button,
@@ -614,12 +613,6 @@ terminal_prefs_show_preferences (GtkWindow *transient_parent,
                    G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
 
   g_settings_bind (settings,
-                   TERMINAL_SETTING_DARK_THEME_KEY,
-                   dark_theme_button,
-                   "active",
-                   G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET);
-
-  g_settings_bind (settings,
                    TERMINAL_SETTING_NEW_TERMINAL_MODE_KEY,
                    new_terminal_mode_combo,
                    "active-id",
diff --git a/src/terminal-schemas.h b/src/terminal-schemas.h
index 90cc5a0..ba04203 100644
--- a/src/terminal-schemas.h
+++ b/src/terminal-schemas.h
@@ -65,7 +65,6 @@ G_BEGIN_DECLS
 
 #define TERMINAL_SETTING_CONFIRM_CLOSE_KEY              "confirm-close"
 #define TERMINAL_SETTING_DEFAULT_SHOW_MENUBAR_KEY       "default-show-menubar"
-#define TERMINAL_SETTING_DARK_THEME_KEY                 "dark-theme"
 #define TERMINAL_SETTING_ENABLE_MENU_BAR_ACCEL_KEY      "menu-accelerator-enabled"
 #define TERMINAL_SETTING_ENABLE_MNEMONICS_KEY           "mnemonics-enabled"
 #define TERMINAL_SETTING_ENABLE_SHORTCUTS_KEY           "shortcuts-enabled"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]