[gnome-tweak-tool] Fix tweak appearance (background color)
- From: John Stowers <jstowers src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-tweak-tool] Fix tweak appearance (background color)
- Date: Tue, 7 Aug 2012 14:13:01 +0000 (UTC)
commit 6a38f3481c0e10614815a39bac5b9b82cdf9fe04
Author: John Stowers <john stowers gmail com>
Date: Tue Aug 7 14:30:28 2012 +0200
Fix tweak appearance (background color)
NEWS | 1 +
data/shell.ui | 42 +++++++++++++++++++++++++-----------------
gtweak/tweakview.py | 49 +++++++++++++++----------------------------------
3 files changed, 41 insertions(+), 51 deletions(-)
---
diff --git a/NEWS b/NEWS
index ca6b1fa..961f42a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
3.5.4
* Update icon (bug 649359)
+ * Fix appearance of tweaks to no longer have a white background
3.5.0
* Work with new gnome shell dbus interface
diff --git a/data/shell.ui b/data/shell.ui
index b82fe5b..3a56bb7 100644
--- a/data/shell.ui
+++ b/data/shell.ui
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkWindow" id="main_window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Advanced Settings</property>
@@ -17,6 +16,7 @@
<property name="can_focus">False</property>
<child>
<object class="GtkToolItem" id="toolbutton1">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="use_action_appearance">False</property>
@@ -114,22 +114,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkImage" id="welcome_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">18</property>
- <child>
- <object class="GtkImage" id="welcome_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="stock">gtk-missing-image</property>
</object>
</child>
</object>
@@ -149,7 +137,27 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <placeholder/>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <child>
+ <object class="GtkViewport" id="tweak_viewport">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkBox" id="tweak_vbox">
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">10</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
</child>
</object>
<packing>
diff --git a/gtweak/tweakview.py b/gtweak/tweakview.py
index 7c46361..3b97454 100644
--- a/gtweak/tweakview.py
+++ b/gtweak/tweakview.py
@@ -16,6 +16,7 @@
# along with gnome-tweak-tool. If not, see <http://www.gnu.org/licenses/>.
import logging
+import datetime
from gi.repository import Gtk, Gdk, GObject
@@ -46,23 +47,18 @@ class TweakView:
"Tweak", Gtk.CellRendererText(), text=TweakModel.COLUMN_NAME))
self.treeview.get_selection().connect("changed", self._on_selection_changed)
- tweak_container = builder.get_object('tweak_container')
- tweak_box = Gtk.VBox(spacing=10)
-
- #FIXME: I may as well do this in the glade file now that
- #https://bugzilla.gnome.org/show_bug.cgi?id=644268 is fixed
- sw = Gtk.ScrolledWindow()
- sw.props.shadow_type = Gtk.ShadowType.NONE
- sw.props.hscrollbar_policy = Gtk.PolicyType.NEVER
- vp = Gtk.Viewport()
- vp.props.shadow_type = Gtk.ShadowType.NONE
- sw.add(vp)
- vp.add(tweak_box)
- tweak_container.add(sw)
+ #make sure the tweak background is the correct color
+ ctx = builder.get_object('tweak_viewport').get_style_context ()
+ provider = Gtk.CssProvider()
+ provider.load_from_data ("GtkViewport {\n"
+ " background-color: @bg_color;\n"
+ "}\n")
+ ctx.add_provider (provider,6000)
#add all tweaks
+ self._tweak_vbox = builder.get_object('tweak_vbox')
for t in self._model.tweaks:
- tweak_box.pack_start(t.widget, False, False, 0)
+ self._tweak_vbox.pack_start(t.widget, False, False, 0)
t.set_notify_cb(self._on_tweak_notify)
#dict of pending notifications, the key is the function to be called
@@ -70,15 +66,9 @@ class TweakView:
def run(self):
self._main_window.show_all()
- self.hide_tweaks(self._model.tweaks)
+ self.show_only_tweaks([])
Gtk.main()
- def show_tweaks(self, tweaks):
- map(Gtk.Widget.show_all, [t.widget for t in tweaks])
-
- def hide_tweaks(self, tweaks):
- map(Gtk.Widget.hide, [t.widget for t in tweaks])
-
def show_only_tweaks(self, tweaks):
for t in self._model.tweaks:
if t in tweaks:
@@ -135,24 +125,15 @@ class TweakView:
self._notebook.set_current_page(1)
def _on_selection_changed(self, selection):
+ t1 = datetime.datetime.now()
model, selected = selection.get_selected()
if selected:
self._on_pre_selection_change()
-
- #apparently iters do not persist over iteration, so use treepaths instead
- path_selected = model.get_path(selected)
- #hide other tweakgroups
- root = model.get_iter_first()
- while root:
- if model.get_path(root) != path_selected:
- tweakgroup = model.get_value(root, model.COLUMN_TWEAK)
- self.hide_tweaks(tweakgroup.tweaks)
- root = model.iter_next(root)
- #show selected
tweakgroup = model.get_value(selected, model.COLUMN_TWEAK)
- self.show_tweaks(tweakgroup.tweaks)
-
+ self.show_only_tweaks(tweakgroup.tweaks)
self._on_post_selection_change()
+ t2 = datetime.datetime.now()
+ #print "TTTTTT=",t2-t1
class EntryManager:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]