[dconf-editor] Disable themes for this release.
- From: Arnaud Bonatti <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf-editor] Disable themes for this release.
- Date: Wed, 31 Aug 2016 04:57:44 +0000 (UTC)
commit 8b464c4bbe58887f7240b2861079b27f174f8cc3
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Wed Aug 31 06:57:25 2016 +0200
Disable themes for this release.
editor/ca.desrt.dconf-editor.gschema.xml | 8 ++++----
editor/dconf-editor.css | 24 ++++++++++++------------
editor/dconf-window.vala | 12 ++++++------
3 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/editor/ca.desrt.dconf-editor.gschema.xml b/editor/ca.desrt.dconf-editor.gschema.xml
index 0071b49..4943a3a 100644
--- a/editor/ca.desrt.dconf-editor.gschema.xml
+++ b/editor/ca.desrt.dconf-editor.gschema.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<schemalist gettext-domain='dconf'>
- <enum id="ca.desrt.dconf-editor.Themes">
+ <!-- enum id="ca.desrt.dconf-editor.Themes">
<value value="0" nick="three-twenty-two"/>
<value value="1" nick="non-symbolic-keys-list"/>
- </enum>
+ </enum -->
<enum id="ca.desrt.dconf-editor.Behaviour">
<value value="0" nick="unsafe"/>
<value value="1" nick="safe"/>
@@ -58,11 +58,11 @@
<summary>A flag to enable small rows for bookmarks list</summary>
<description>If 'true', the bookmarks list use smaller rows.</description>
</key>
- <key name="theme" enum="ca.desrt.dconf-editor.Themes">
+ <!-- key name="theme" enum="ca.desrt.dconf-editor.Themes">
<default>'three-twenty-two'</default>
<summary>The theme of the navigation list</summary>
<description>The themes are defined by the application, you cannot add one. The theme
'three-twenty-two' will remain as close as possible to the default theme of the 3.22 release.</description>
- </key>
+ </key -->
<key name="behaviour" enum="ca.desrt.dconf-editor.Behaviour">
<default>'always-confirm-implicit'</default>
<summary>Change the behaviour of a key value change request</summary>
diff --git a/editor/dconf-editor.css b/editor/dconf-editor.css
index 94cc238..5bb5e3c 100644
--- a/editor/dconf-editor.css
+++ b/editor/dconf-editor.css
@@ -57,8 +57,8 @@ window > popover.menu {
.keys-list > row > .folder > grid {
background-image:-gtk-icontheme("folder-symbolic"); }
.keys-list > row:active > .folder > grid {
background-image:-gtk-icontheme("folder-open-symbolic"); }
- .non-symbolic .keys-list > row > .folder > grid {
background-image:-gtk-icontheme("folder"); }
- .non-symbolic .keys-list > row:active > .folder > grid {
background-image:-gtk-icontheme("folder-open"); }
+/* .non-symbolic .keys-list > row > .folder > grid {
background-image:-gtk-icontheme("folder"); } */
+/* .non-symbolic .keys-list > row:active > .folder > grid {
background-image:-gtk-icontheme("folder-open"); } */
/* visual padding */
.keys-list:dir(ltr) > row > .key > grid { padding-left:
10px; } /* looks cool */
@@ -69,34 +69,34 @@ window > popover.menu {
/* icon sizing */
.keys-list > row > .folder > grid {
background-size:1.5rem; }
- .non-symbolic .keys-list > row > .folder > grid {
background-size:1.75rem; }
+/* .non-symbolic .keys-list > row > .folder > grid {
background-size:1.75rem; } */
.small-keys-list-rows .keys-list > row > .folder > grid,
- .non-symbolic.small-keys-list-rows .keys-list > row > .folder > grid {
background-size:1rem; }
+/* .non-symbolic.small-keys-list-rows .keys-list > row > .folder > grid {
background-size:1rem; } */
/* technical padding: icon visual padding + icon size + some padding */
.keys-list:dir(ltr) > row > .folder > grid { padding-left:
3rem; }
- .non-symbolic .keys-list:dir(ltr) > row > .folder > grid { padding-left:
3.25rem; }
+/* .non-symbolic .keys-list:dir(ltr) > row > .folder > grid { padding-left:
3.25rem; } */
.small-keys-list-rows .keys-list:dir(ltr) > row > .folder > grid,
- .non-symbolic.small-keys-list-rows .keys-list:dir(ltr) > row > .folder > grid { padding-left:
2.25rem; }
+/* .non-symbolic.small-keys-list-rows .keys-list:dir(ltr) > row > .folder > grid { padding-left:
2.25rem; } */
.keys-list:dir(rtl) > row > .folder > grid { padding-right:
3rem; }
- .non-symbolic .keys-list:dir(rtl) > row > .folder > grid { padding-right:
3.25rem; }
+/* .non-symbolic .keys-list:dir(rtl) > row > .folder > grid {
padding-right: 3.25rem; } */
.small-keys-list-rows .keys-list:dir(rtl) > row > .folder > grid,
- .non-symbolic.small-keys-list-rows .keys-list:dir(rtl) > row > .folder > grid { padding-right:
2.25rem; }
+/* .non-symbolic.small-keys-list-rows .keys-list:dir(rtl) > row > .folder > grid {
padding-right: 2.25rem; } */
/* technical labels placing */
.keys-list > row label.key-name {
transition:min-width 0.3s; }
.keys-list > row > .key > grid label.key-name {
min-width: 222px; }
.keys-list > row > .folder > grid label.key-name {
min-width:calc(222px + 10px - 3rem); }
- .non-symbolic .keys-list > row > .folder > grid label.key-name {
min-width:calc(222px + 10px - 3.25rem); }
+/* .non-symbolic .keys-list > row > .folder > grid label.key-name
{ min-width:calc(222px + 10px - 3.25rem); } */
.small-keys-list-rows .keys-list > row > .folder > grid label.key-name,
- .non-symbolic.small-keys-list-rows .keys-list > row > .folder > grid label.key-name {
min-width:calc(222px + 10px - 2.25rem); }
+/* .non-symbolic.small-keys-list-rows .keys-list > row > .folder > grid label.key-name
{ min-width:calc(222px + 10px - 2.25rem); } */
.large-window .keys-list > row > .key > grid label.key-name {
min-width: 250px; }
.large-window .keys-list > row > .folder > grid label.key-name {
min-width:calc(250px + 10px - 3rem); }
-.large-window.non-symbolic .keys-list > row > .folder > grid label.key-name {
min-width:calc(250px + 10px - 3.25rem); }
+/*.large-window.non-symbolic .keys-list > row > .folder > grid label.key-name
{ min-width:calc(250px + 10px - 3.25rem); } */
.large-window .small-keys-list-rows .keys-list > row > .folder > grid label.key-name,
-.large-window.non-symbolic.small-keys-list-rows .keys-list > row > .folder > grid label.key-name {
min-width:calc(250px + 10px - 2.25rem); }
+/*.large-window.non-symbolic.small-keys-list-rows .keys-list > row > .folder > grid label.key-name
{ min-width:calc(250px + 10px - 2.25rem); } */
.keys-list > row > .key > grid > grid {
min-width:400px; transition:min-width 0.3s; }
.large-window .keys-list > row > .key > grid > grid {
min-width:450px; }
diff --git a/editor/dconf-window.vala b/editor/dconf-window.vala
index fbb1449..2d0264a 100644
--- a/editor/dconf-window.vala
+++ b/editor/dconf-window.vala
@@ -53,7 +53,7 @@ class DConfWindow : ApplicationWindow
[GtkChild] private Label notification_label;
private ulong behaviour_changed_handler = 0;
- private ulong theme_changed_handler = 0;
+/* private ulong theme_changed_handler = 0; */
private ulong small_keys_list_rows_handler = 0;
private ulong small_bookmarks_rows_handler = 0;
@@ -68,14 +68,14 @@ class DConfWindow : ApplicationWindow
maximize ();
StyleContext context = get_style_context ();
- theme_changed_handler = settings.changed ["theme"].connect (() => {
+/* theme_changed_handler = settings.changed ["theme"].connect (() => {
string theme = settings.get_string ("theme");
if (theme == "non-symbolic-keys-list")
{
if (!context.has_class ("non-symbolic")) context.add_class ("non-symbolic");
}
else if (context.has_class ("non-symbolic")) context.remove_class ("non-symbolic");
- });
+ }); */
small_keys_list_rows_handler = settings.changed ["small-keys-list-rows"].connect (() => {
if (settings.get_boolean ("small-keys-list-rows"))
{
@@ -90,8 +90,8 @@ class DConfWindow : ApplicationWindow
}
else if (context.has_class ("small-bookmarks-rows")) context.remove_class
("small-bookmarks-rows");
});
- if (settings.get_string ("theme") == "non-symbolic-keys-list")
- context.add_class ("non-symbolic");
+/* if (settings.get_string ("theme") == "non-symbolic-keys-list")
+ context.add_class ("non-symbolic"); */
if (settings.get_boolean ("small-keys-list-rows"))
context.add_class ("small-keys-list-rows");
if (settings.get_boolean ("small-bookmarks-rows"))
@@ -201,7 +201,7 @@ class DConfWindow : ApplicationWindow
((ConfigurationEditor) get_application ()).clean_copy_notification ();
settings.disconnect (behaviour_changed_handler);
- settings.disconnect (theme_changed_handler);
+/* settings.disconnect (theme_changed_handler); */
settings.disconnect (small_keys_list_rows_handler);
settings.disconnect (small_bookmarks_rows_handler);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]