[gnome-tweak-tool] Convert tweak_test to new TweakGroup API
- From: John Stowers <jstowers src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-tweak-tool] Convert tweak_test to new TweakGroup API
- Date: Sun, 18 Aug 2013 19:49:29 +0000 (UTC)
commit acc5019d7be35fd53a1ab024a83d7479fe3bd037
Author: John Stowers <john stowers gmail com>
Date: Tue Aug 6 12:13:15 2013 +0200
Convert tweak_test to new TweakGroup API
* port to the new simpler notifications
gtweak/tweakmodel.py | 11 ++---
.../tweaks/{tweak_test.py => tweak_group_test.py} | 53 ++++++-------------
2 files changed, 21 insertions(+), 43 deletions(-)
---
diff --git a/gtweak/tweakmodel.py b/gtweak/tweakmodel.py
index 6f91126..1741f6e 100644
--- a/gtweak/tweakmodel.py
+++ b/gtweak/tweakmodel.py
@@ -101,16 +101,13 @@ class TweakModel(Gtk.ListStore):
return (row[TweakModel.COLUMN_TWEAK] for row in self)
def load_tweaks(self):
- if 1:
- tweak_files = [
- os.path.splitext(os.path.split(f)[-1])[0]
- for f in glob.glob(os.path.join(self._tweak_dir, "tweak_group_*.py"))]
- else:
- tweak_files = ["tweak_test"]
+ tweak_files = [
+ os.path.splitext(os.path.split(f)[-1])[0]
+ for f in glob.glob(os.path.join(self._tweak_dir, "tweak_group_*.py"))]
if not gtweak.ENABLE_TEST:
try:
- tweak_files.remove("tweak_test")
+ tweak_files.remove("tweak_group_test")
except ValueError:
pass
diff --git a/gtweak/tweaks/tweak_test.py b/gtweak/tweaks/tweak_group_test.py
similarity index 58%
rename from gtweak/tweaks/tweak_test.py
rename to gtweak/tweaks/tweak_group_test.py
index afcb0c2..b5aa035 100644
--- a/gtweak/tweaks/tweak_test.py
+++ b/gtweak/tweaks/tweak_group_test.py
@@ -19,8 +19,8 @@ from __future__ import print_function
from gi.repository import Gtk
-from gtweak.tweakmodel import Tweak, TweakGroup
-from gtweak.widgets import build_label_beside_widget
+from gtweak.tweakmodel import Tweak
+from gtweak.widgets import ListBoxTweakGroup, build_label_beside_widget
class _TestInfoTweak(Gtk.Box, Tweak):
def __init__(self, name, description, **options):
@@ -48,45 +48,26 @@ class _TestButtonTweak(Gtk.Box, Tweak):
widget.connect("clicked", self._on_click)
self.add(widget)
self._need_action = options.get("_need_action")
- self._action_error = options.get("_action_error")
self._need_logout = options.get("_need_logout")
def _on_click(self, sender):
if self._need_action:
- self.notify_action_required(
- self.name,
- Gtk.STOCK_OK,
- lambda : print("GOT CALLBACK"))
+ self.notify_information(self.name)
elif self._need_logout:
- self.notify_action_required(
- self.name,
- Gtk.STOCK_OK,
- func=None,
- need_logout=True,
- )
- else:
- if self._action_error:
- self.notify_error(self.name)
- else:
- self.notify_info(self.name)
+ self.notify_logout()
-TWEAK_GROUPS = (
- TweakGroup(
- "Test Settings Group",
+TWEAK_GROUPS = [
+ ListBoxTweakGroup(
+ "Test Many Settings",
*[_TestTweak("name: " + str(d), "desc: " + str(d)) for d in range(50)]),
-)
-
-group_name = "Test Settings"
-
-TWEAKS = (
- _TestTweak("foo bar", "does foo bar", group_name=group_name),
- _TestTweak("foo baz", "does foo baz", group_name=group_name),
- _TestInfoTweak("long string "*10, "long description "*10,
_test_button_name="short",group_name=group_name),
- _TestInfoTweak("foo info", "info widget", _tweak_info="Information", group_name=group_name),
- _TestInfoTweak("foo warning", "info widget", _tweak_warning="Warning", group_name=group_name),
- _TestButtonTweak("Need Action", "foo bar", _need_action=True, group_name=group_name),
- _TestButtonTweak("Report Error", "foo baz", _action_error=True, group_name=group_name),
- _TestButtonTweak("Report Info", "foo bob", _action_error=False, group_name=group_name),
- _TestButtonTweak("Need Log Out", "foo bar log", _need_logout=True, group_name=group_name),
-)
+ ListBoxTweakGroup(
+ "Test Settings",
+ _TestTweak("foo bar", "does foo bar"),
+ _TestTweak("foo baz", "does foo baz"),
+ _TestInfoTweak("long string "*10, "long description "*10, _test_button_name="short"),
+ _TestInfoTweak("foo info", "info widget", _tweak_info="Information"),
+ _TestInfoTweak("foo warning", "info widget", _tweak_warning="Warning"),
+ _TestButtonTweak("Notify Information", "foo bar", _need_action=True),
+ _TestButtonTweak("Notify Logout", "foo bar log", _need_logout=True))
+]
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]