diff --git a/interfaces/ListMenu/ListMenu.py b/interfaces/ListMenu/ListMenu.py
index e787a9a..eaf5a85 100644
--- a/interfaces/ListMenu/ListMenu.py
+++ b/interfaces/ListMenu/ListMenu.py
@@ -53,6 +53,9 @@ class Interface(clutter.Group):
menu.item_gap = int(themeMgr.find_child_value(element, "item_gap"))
menu.displayMax = int(themeMgr.find_child_value(element, "num_visible_elements"))
+ colour = themeMgr.get_colour(element, "menu", subnode=True)
+ if not colour is None: self.stage.set_color(colour)
+
#Grab the font
font_node = themeMgr.get_subnode(element, "font")
fontString = themeMgr.get_font("main", font_node)
diff --git a/themes/Gloxygen/background.png b/themes/Gloxygen/background.png
index 0ed0c77..c575897 100755
Binary files a/themes/Gloxygen/background.png and b/themes/Gloxygen/background.png differ
diff --git a/themes/Gloxygen/main.xml b/themes/Gloxygen/main.xml
index 9026dd6..3d4b6a8 100644
--- a/themes/Gloxygen/main.xml
+++ b/themes/Gloxygen/main.xml
@@ -9,6 +9,12 @@
30
25
+
+
+ 180
+ 180
+ 180
+
40%
diff --git a/themes/Gloxygen/music/music.png b/themes/Gloxygen/music/music.png
index b77e301..0832aff 100755
Binary files a/themes/Gloxygen/music/music.png and b/themes/Gloxygen/music/music.png differ
diff --git a/themes/Gloxygen/video_player/videos.svg b/themes/Gloxygen/video_player/videos.svg
index 80fdc25..64ce2b8 100644
--- a/themes/Gloxygen/video_player/videos.svg
+++ b/themes/Gloxygen/video_player/videos.svg
@@ -13,11 +13,11 @@
height="128"
id="svg2606"
sodipodi:version="0.32"
- inkscape:version="0.45+devel"
+ inkscape:version="0.45.1"
version="1.0"
- sodipodi:docname="video.svg"
+ sodipodi:docname="videos.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:docbase="/home/david/Progetti/sandbox/svg/mimetypes">
+ sodipodi:docbase="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player">
-
-
-
-
-
+ gradientTransform="matrix(1.1639317,-0.3118745,0.3118745,1.1639317,-69.2591,-11.961)" />
+ gradientTransform="matrix(1.1639317,-0.3118745,0.3118745,1.1639317,-69.2591,-11.961)" />
+ gradientTransform="matrix(1.1639317,-0.3118745,0.3118745,1.1639317,-69.2591,-11.961)" />
+ gradientTransform="matrix(1.1639317,-0.3118745,0.3118745,1.1639317,-69.2591,-11.961)" />
@@ -995,7 +969,8 @@
y1="50.379852"
x2="68.75"
y2="41.686016"
- gradientUnits="userSpaceOnUse" />
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2049908,0,0,1.2049908,-12.13845,-5.9690272)" />
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2049908,0,0,1.2049908,-12.13845,-5.9690272)" />
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.2049908,0,0,1.2049908,-12.13845,-5.9690272)" />
+ inkscape:window-x="1"
+ inkscape:window-y="42" />
@@ -1056,42 +1033,35 @@
inkscape:groupmode="layer"
id="layer1">
-
-
-
+ sodipodi:type="arc"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ x="26.421265"
+ y="56.148029"
+ width="77.1194"
+ height="58.382027"
+ id="rect2483"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ transform="matrix(0.6024954,0,0,0.8566962,3.3354397,23.044605)"
+ style="opacity:0.8"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322">
+ transform="matrix(0.6024954,0,0,0.8566962,9.804433,23.044229)"
+ style="opacity:0.8"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322">
+ transform="matrix(0.8509166,0,0,0.6024954,-13.573522,36.136962)"
+ style="opacity:0.8"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322">
+ d="M 27.626247,57.242725 L 27.626247,93.39245 C 38.420332,91.077597 51.531445,87.307974 67.089696,81.293207 C 79.750058,76.398753 91.611949,72.191474 102.33568,68.601953 L 102.33568,57.242725 L 27.626247,57.242725 z "
+ id="rect12614"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ x="26.421265"
+ y="47.050564"
+ width="77.1194"
+ height="9.6399269"
+ id="rect2490"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ transform="matrix(0.8382544,0,0,0.8319904,-0.4028759,21.34714)"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ d="M 67.344018,56.690489 L 80.249377,56.690489 L 86.670797,47.050562 L 73.827956,47.050562 L 67.344018,56.690489 z "
+ style="fill:url(#linearGradient2943);fill-opacity:1"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ transform="matrix(1.1639317,-0.3118745,0.3118745,1.1639317,-12.13845,-3.5590456)"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ sodipodi:nodetypes="ccccc"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ x="13.316005"
+ y="42.820415"
+ width="77.119377"
+ height="9.6399231"
+ id="rect10998"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ sodipodi:nodetypes="ccccc"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ d="M 84.636582,31.63266 L 72.170966,34.972813 L 63.473351,27.323346 L 75.878586,23.999374 L 84.636582,31.63266 z "
+ style="fill:url(#linearGradient14576);fill-opacity:1"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ sodipodi:nodetypes="ccccc"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ sodipodi:nodetypes="ccccc"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ sodipodi:nodetypes="ccccc"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ x="26.421265"
+ y="57.036747"
+ width="76.947517"
+ height="2.495971"
+ id="rect2534"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ transform="matrix(0.8509164,0,0,0.6024954,-13.57351,43.621761)"
+ style="opacity:0.8"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322">
+ transform="matrix(0.8509164,0,0,0.6024954,-13.57351,47.193354)"
+ style="opacity:0.8"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322">
+ transform="matrix(0.6024954,0,0,0.9535477,10.327315,15.562731)"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322">
+ transform="matrix(1.0582162,0,0,0.9545112,-31.27502,17.199503)"
+ id="g2684"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322">
+ transform="matrix(1.0823595,0,0,0.9709185,-39.794466,16.023575)"
+ id="g2688"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322">
+ transform="matrix(1.0565461,0,0,0.9548893,-43.410982,16.934632)"
+ id="g2692"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322">
-
-
-
-
-
-
-
-
+ transform="matrix(1.2049908,0,0,1.7452159,-12.13845,-35.317692)"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ sodipodi:nodetypes="cccccc"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
+ transform="matrix(0.8319904,0,0,0.8319904,0.3738615,21.347143)"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322">
+ transform="matrix(0.8382544,0,0,0.8319904,-0.4028759,21.347143)"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322">
+ transform="matrix(0.8382544,0,0,0.8319904,-2.0793916,21.347143)"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322">
-
-
+ style="opacity:0.2;fill:#ffffff;filter:url(#filter14155)"
+ inkscape:export-filename="/home/josh/eclipse/gloss-mc/themes/Gloxygen/video_player/videos.png"
+ inkscape:export-xdpi="2322"
+ inkscape:export-ydpi="2322" />
diff --git a/utils/InputQueue.py b/utils/InputQueue.py
index afd512b..e7bc8d1 100644
--- a/utils/InputQueue.py
+++ b/utils/InputQueue.py
@@ -21,6 +21,7 @@ class InputQueue(gobject.GObject):
}
accelerating = False
+ use_acceleration = True
current_acceleration_factor = 1
acceleration_factor_base = 10 #Timelines will run at regular speed times this when accelerated
acceleration_threshold = 3 #The queue size at which accleration kicks in (Make this higher to increase the delay before acceleration takes place)
@@ -127,6 +128,7 @@ class InputQueue(gobject.GObject):
absolute_queue_size = self.queue_north + self.queue_east + self.queue_south + self.queue_west
if absolute_queue_size > self.acceleration_threshold:
if not self.accelerating:
+ self.accelerating = True
self.accelerate()
#print "Queue Size: N=%s E=%s S=%s W=%s" % (self.queue_north, self.queue_east, self.queue_south, self.queue_west)
@@ -164,6 +166,9 @@ class InputQueue(gobject.GObject):
return False
def accelerate(self):
+ if not self.accelerating:
+ return False
+
self.accelerating = True
if self.current_acceleration_step < self.acceleration_steps:
self.current_acceleration_step +=1