summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Niklaus <marex@opencompositing.org>2007-06-05 17:59:49 +0200
committerPatrick Niklaus <marex@opencompositing.org>2007-06-05 17:59:49 +0200
commitde61ba28b91d25e67cd319482658197156a2ff1a (patch)
tree2bd5356488424f2086aae5c6916790d6f82210e6
parent351bde23050e64c8175f98b85c7d9dac82e6622a (diff)
downloadccsm-de61ba28b91d25e67cd319482658197156a2ff1a.tar.gz
ccsm-de61ba28b91d25e67cd319482658197156a2ff1a.tar.bz2
Display options in the same order as in metadata
-rwxr-xr-xccsm.in24
-rw-r--r--images/category-accessibility.svg11
2 files changed, 22 insertions, 13 deletions
diff --git a/ccsm.in b/ccsm.in
index 325e1dd..2c9cde4 100755
--- a/ccsm.in
+++ b/ccsm.in
@@ -589,11 +589,19 @@ def MakeSetting(setting):
raise TypeError, "Unhandled list type %s for %s"%(setting.Info[0], setting.Name)
return None
-def SettingSortCompare(v1, v2):
- if v1.Type != v2.Type:
- return cmp(v1.Type, v2.Type)
- else:
- return cmp(v1.ShortDesc, v2.ShortDesc)
+
+#def SettingSortCompare(v1, v2):
+# if v1.Type != v2.Type:
+# # XXX Work-a-round for range widgets
+# t1 = v1.Type
+# t2 = v2.Type
+# if t1 == 'Float' or t1 == 'Int':
+# t1 = 'CRange'
+# if t2 == 'Float' or t2 == 'Int':
+# t2 = 'CRange'
+# return cmp(t1, t2)
+# else:
+# return cmp(v1.ShortDesc, v2.ShortDesc)
def HasOnlyType(subGroup, type):
empty = True
@@ -627,7 +635,8 @@ class SubGroupArea:
self.Empty = True
row = 0
- for setting in sorted(sum((v.values() for v in [subGroup.Display]+[subGroup.Screens[CurrentScreenNum]]), []), SettingSortCompare):
+ #for setting in sorted(sum((v.values() for v in [subGroup.Display]+[subGroup.Screens[CurrentScreenNum]]), []), SettingSortCompare):
+ for setting in sum((v.values() for v in [subGroup.Display]+[subGroup.Screens[CurrentScreenNum]]), []):
if not setting.Name == '____plugin_enabled':
set = MakeSetting(setting)
if set is not None:
@@ -658,6 +667,7 @@ class Page(object):
self.Empty = True
+
class GroupPage(Page):
def __init__(self, name, group):
super(GroupPage, self).__init__(name)
@@ -668,7 +678,7 @@ class GroupPage(Page):
self.SetContainer.pack_start(sga.Widget, False, False)
self.Empty = False
- for subGroup in group:
+ for subGroup in group.keys():
if not subGroup == '':
sga = SubGroupArea(subGroup, group[subGroup])
if not sga.Empty:
diff --git a/images/category-accessibility.svg b/images/category-accessibility.svg
index a68f72c..a4242b9 100644
--- a/images/category-accessibility.svg
+++ b/images/category-accessibility.svg
@@ -23,14 +23,13 @@
<defs
id="defs3">
<linearGradient
- inkscape:collect="always"
id="linearGradient3546">
<stop
- style="stop-color:#9dbae7;stop-opacity:1;"
+ style="stop-color:#b4cbed;stop-opacity:1;"
offset="0"
id="stop3548" />
<stop
- style="stop-color:#9dbae7;stop-opacity:0;"
+ style="stop-color:#bcd0ef;stop-opacity:0;"
offset="1"
id="stop3550" />
</linearGradient>
@@ -130,8 +129,8 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.99999996"
- inkscape:cx="29.00342"
- inkscape:cy="7.9155825"
+ inkscape:cx="23.160342"
+ inkscape:cy="37.486652"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:grid-bbox="true"
@@ -140,7 +139,7 @@
inkscape:window-width="906"
inkscape:window-height="662"
inkscape:window-x="61"
- inkscape:window-y="44"
+ inkscape:window-y="49"
showguides="true"
inkscape:guide-bbox="true" />
<metadata