[dconf-editor] Remove old theming test.
- From: Arnaud Bonatti <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dconf-editor] Remove old theming test.
- Date: Tue, 12 Dec 2017 17:28:36 +0000 (UTC)
commit 8f39e2b7a962076bb7217bced6d5b884d446f01e
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Tue Dec 12 18:24:30 2017 +0100
Remove old theming test.
editor/ca.desrt.dconf-editor.gschema.xml | 9 --
editor/dconf-editor.css | 158 +++++++++++++-----------------
editor/dconf-window.vala | 12 ---
3 files changed, 70 insertions(+), 109 deletions(-)
---
diff --git a/editor/ca.desrt.dconf-editor.gschema.xml b/editor/ca.desrt.dconf-editor.gschema.xml
index 95bc529..966e701 100644
--- a/editor/ca.desrt.dconf-editor.gschema.xml
+++ b/editor/ca.desrt.dconf-editor.gschema.xml
@@ -81,10 +81,6 @@
]>
<schemalist gettext-domain='dconf-editor'>
- <!-- enum id="ca.desrt.dconf-editor.Themes">
- <value value="0" nick="three-twenty-two"/>
- <value value="1" nick="non-symbolic-keys-list"/>
- </enum -->
<enum id="ca.desrt.dconf-editor.Behaviour">
<value value="0" nick="unsafe"/>
<value value="1" nick="safe"/>
@@ -150,11 +146,6 @@
<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">
- <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 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 1b18491..f538c1b 100644
--- a/editor/dconf-editor.css
+++ b/editor/dconf-editor.css
@@ -25,43 +25,43 @@
\*/
/* row height */
- .keys-list > row { transition:min-height
0.3s,
- margin-left
0.3s, margin-right 0.3s,
- padding-left
0.3s, padding-right 0.3s,
- /* margin 0.3s,
- padding 0.3s,
these cause stuttering in the transition */
- border-radius
0.3s; } /* not for .bookmarks, as the transition will start at the popover opening */
- /* .keys-list > row:hover,
- .keys-list > row:selected{ transition:min-height
0.3s,
- margin 0.3s,
- padding 0.3s,
- border-radius
0.3s; } stuttering of a single row is almost bearable */
-
- .keys-list > .key-row { min-height:4em; }
- .keys-list > .folder-row { min-height:2em; }
- .keys-list > row { margin:0;
padding-top:0.25em; padding-bottom:0.25em; }
-.large-window .keys-list > row { margin:0.25em;
padding-top:0; padding-bottom:0; }
-
- .small-keys-list-rows .keys-list > .key-row { min-height:2.5em; }
- .small-keys-list-rows .keys-list > .folder-row { min-height:1.5em; }
- .small-keys-list-rows .keys-list > row { margin:0; padding-top:0;
padding-bottom:0; }
-.large-window.small-keys-list-rows .keys-list > row { margin:0; padding-top:0;
padding-bottom:0; }
-
- .hc-theme .keys-list > row { padding-top:0.5em;
padding-bottom:0.5em; }
- .small-keys-list-rows.hc-theme .keys-list > row { padding-top:0.4em;
padding-bottom:0.4em; }
-
- .bookmarks list > row { min-height:2.6rem; }
- .small-bookmarks-rows .bookmarks list > row { min-height:1.3rem; }
+ .keys-list > row { transition:min-height 0.3s,
+ margin-left 0.3s,
margin-right 0.3s,
+ padding-left 0.3s,
padding-right 0.3s,
+ /* margin 0.3s,
+ padding 0.3s, cause
stuttering in the transition */
+ border-radius 0.3s; } /*
not for .bookmarks, as the transition will start at the popover opening */
+ /* .keys-list > row:hover,
+ .keys-list > row:selected{ transition:min-height 0.3s,
+ margin 0.3s,
+ padding 0.3s,
+ border-radius 0.3s; }
stuttering of a single row is almost bearable */
+
+ .keys-list > .key-row { min-height:4em; }
+ .keys-list > .folder-row { min-height:2em; }
+ .keys-list > row { margin:0; padding-top:0.25em;
padding-bottom:0.25em; }
+.large-window .keys-list > row { margin:0.25em; padding-top:0;
padding-bottom:0; }
+
+ .small-keys-list-rows .keys-list > .key-row { min-height:2.5em; }
+ .small-keys-list-rows .keys-list > .folder-row { min-height:1.5em; }
+ .small-keys-list-rows .keys-list > row { margin:0; padding-top:0;
padding-bottom:0; }
+.large-window.small-keys-list-rows .keys-list > row { margin:0; padding-top:0;
padding-bottom:0; }
+
+ .hc-theme .keys-list > row { padding-top:0.5em;
padding-bottom:0.5em; }
+ .hc-theme.small-keys-list-rows .keys-list > row { padding-top:0.4em;
padding-bottom:0.4em; }
+
+ .bookmarks list > row { min-height:2.6rem; }
+ .small-bookmarks-rows .bookmarks list > row { min-height:1.3rem; }
/* round borders for large windows */
-.large-window .keys-list > row { border-radius:0.5em;
-
-gtk-outline-radius:calc(0.5em - 1px); }
-.large-window.small-keys-list-rows .keys-list > row { border-radius:0;
- -gtk-outline-radius:2px;
/* gtk+ defaults */ }
+.large-window .keys-list > row { border-radius:0.5em;
+ -gtk-outline-radius:calc(0.5em - 1px);
}
+.large-window.small-keys-list-rows .keys-list > row { border-radius:0;
+ -gtk-outline-radius:2px; /* gtk+
defaults */ }
/* bookmarks */
- .small-bookmarks-rows .bookmarks list > row > grid > button.circular.flat {
+ .small-bookmarks-rows .bookmarks list > row > grid > button.circular.flat {
min-height:0;
padding-bottom:1px;
padding-top:1px;
@@ -70,7 +70,7 @@
}
/* folder icon */
- .keys-list > row > .folder > grid {
+ .keys-list > row > .folder > grid {
background-repeat:no-repeat;
transition:background-position 0.3s,
background-size 0.3s,
@@ -78,80 +78,62 @@
padding-right 0.3s; /* warning: ltr/rtl */
}
- .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"); } */
+ .keys-list > row > .folder > grid {
background-image:-gtk-icontheme("folder-symbolic"); }
+ .keys-list > row:active > .folder > grid {
background-image:-gtk-icontheme("folder-open-symbolic"); }
/* visual padding */
- .keys-list:dir(ltr) > row > .key > grid { padding-left:
10px; padding-right:20px; } /* looks cool */
- .keys-list:dir(rtl) > row > .key > grid {
padding-right:10px; padding-left: 20px; }
- .keys-list > row > .key > grid {
transition:padding-left 0.3s, padding-right 0.3s; }
+ .keys-list:dir(ltr) > row > .key > grid { padding-left: 10px;
padding-right:20px; } /* looks cool */
+ .keys-list:dir(rtl) > row > .key > grid { padding-right:10px;
padding-left: 20px; }
+ .keys-list > row > .key > grid { transition:padding-left
0.3s, padding-right 0.3s; }
- .keys-list:dir(ltr) > row > .folder > grid {
background-position: 0.75rem center; }
- .keys-list:dir(rtl) > row > .folder > grid {
background-position:calc(100% - 0.75rem) center; }
+ .keys-list:dir(ltr) > row > .folder > grid { background-position:
0.75rem center; }
+ .keys-list:dir(rtl) > row > .folder > grid {
background-position:calc(100% - 0.75rem) center; }
- .keys-list:dir(ltr) > row > .key > grid > :last-child {
margin-left: 4em; }
- .keys-list:dir(rtl) > row > .key > grid > :last-child {
margin-right:4em; }
+ .keys-list:dir(ltr) > row > .key > grid > :last-child { margin-left:
4em; }
+ .keys-list:dir(rtl) > row > .key > grid > :last-child {
margin-right:4em; }
/* icon sizing */
- .keys-list > row > .folder > grid {
background-size:1.5rem; }
-/* .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; }
+ .keys-list > row > .folder > grid { background-size:1.5rem; }
+ .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,
- .keys-list:dir(ltr) > row > .key > grid { padding-left:
3rem; }
-
-/* .non-symbolic .keys-list:dir(ltr) > row > .folder > grid { padding-left:
3.25rem; } */
- .small-keys-list-rows .keys-list:dir(ltr) > row > .folder > grid,
- .small-keys-list-rows .keys-list:dir(ltr) > row > .key > grid /*,
- .non-symbolic.small-keys-list-rows .keys-list:dir(ltr) > row > .folder > grid */
- { padding-left:
2.25rem; }
-
- .keys-list:dir(rtl) > row > .folder > grid,
- .keys-list:dir(rtl) > row > .key > grid { padding-right:
3rem; }
-/* .non-symbolic .keys-list:dir(rtl) > row > .folder > grid {
padding-right: 3.25rem; } */
- .small-keys-list-rows .keys-list:dir(rtl) > row > .folder > grid,
- .small-keys-list-rows .keys-list:dir(rtl) > row > .key > grid /*,
- .non-symbolic.small-keys-list-rows .keys-list:dir(rtl) > row > .folder > grid */
- { padding-right:
2.25rem; }
+ .keys-list:dir(ltr) > row > .folder > grid,
+ .keys-list:dir(ltr) > row > .key > grid { padding-left: 3rem; }
+
+ .small-keys-list-rows .keys-list:dir(ltr) > row > .folder > grid,
+ .small-keys-list-rows .keys-list:dir(ltr) > row > .key > grid { padding-left: 2.25rem; }
+
+ .keys-list:dir(rtl) > row > .folder > grid,
+ .keys-list:dir(rtl) > row > .key > grid { padding-right: 3rem; }
+ .small-keys-list-rows .keys-list:dir(rtl) > row > .folder > grid,
+ .small-keys-list-rows .keys-list:dir(rtl) > row > .key > 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); } */
- .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); }
-
-.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 .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); }
+ .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); }
+ .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.small-keys-list-rows .keys-list > row > .folder > grid label.key-name {
min-width:calc(250px + 10px - 2.25rem); }
/* grid spacing and padding-end */
- .keys-list:dir(ltr) > row grid > label { padding-right:
0.5em; }
- .keys-list:dir(rtl) > row grid > label { padding-left:
0.5em; }
+ .keys-list:dir(ltr) > row grid > label { padding-right: 0.5em; }
+ .keys-list:dir(rtl) > row grid > label { padding-left: 0.5em; }
/* key icons */
- .keys-list > row > .key {
transition:background-position 0.3s,
+ .keys-list > row > .key { transition:background-position
0.3s,
background-size 0.3s;
background-repeat:no-repeat;
background-size:1.5rem; }
- .small-keys-list-rows .keys-list > row > .key {
background-size:1rem; }
+ .small-keys-list-rows .keys-list > row > .key { background-size:1rem; }
- .keys-list:dir(ltr) > row > .key {
background-position: 0.75rem center; }
- .keys-list:dir(rtl) > row > .key {
background-position:calc(100% - 0.75rem) center; }
- .small-keys-list-rows .keys-list:dir(ltr) > row > .key {
background-position: 0.75rem center; }
- .small-keys-list-rows .keys-list:dir(rtl) > row > .key {
background-position:calc(100% - 0.75rem) center; }
+ .keys-list:dir(ltr) > row > .key { background-position:
0.75rem center; }
+ .keys-list:dir(rtl) > row > .key { background-position:calc(100%
- 0.75rem) center; }
+ .small-keys-list-rows .keys-list:dir(ltr) > row > .key { background-position:
0.75rem center; }
+ .small-keys-list-rows .keys-list:dir(rtl) > row > .key { background-position:calc(100%
- 0.75rem) center; }
/* icons */
.keys-list > row > .key.delayed,
diff --git a/editor/dconf-window.vala b/editor/dconf-window.vala
index 60a33f0..cfa0141 100644
--- a/editor/dconf-window.vala
+++ b/editor/dconf-window.vala
@@ -69,7 +69,6 @@ class DConfWindow : ApplicationWindow
}
}
-/* private ulong theme_changed_handler = 0; */
private ulong small_keys_list_rows_handler = 0;
private ulong small_bookmarks_rows_handler = 0;
@@ -101,14 +100,6 @@ class DConfWindow : ApplicationWindow
maximize ();
StyleContext context = get_style_context ();
-/* 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 (() => {
bool small_rows = settings.get_boolean ("small-keys-list-rows");
if (small_rows)
@@ -125,8 +116,6 @@ 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"); */
bool small_rows = settings.get_boolean ("small-keys-list-rows");
if (small_rows)
context.add_class ("small-keys-list-rows");
@@ -311,7 +300,6 @@ class DConfWindow : ApplicationWindow
{
((ConfigurationEditor) get_application ()).clean_copy_notification ();
-/* 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]
