summaryrefslogtreecommitdiff
path: root/src/themes
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2015-11-04 08:56:36 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2015-11-04 08:56:36 +0100
commit33ca80da0e3dffe7af9cadbd911bb3a3ebf9c221 (patch)
treeaf327ebb4863c7dedd7dfd652c47e61ffa68ab19 /src/themes
parent7390c07caf75c9b3d04748bf46477fa572ae267c (diff)
parentf8726defb71d6b1777a38887524adc99638f0d09 (diff)
Merge tag 'upstream/0.6.8'
Upstream version 0.6.8
Diffstat (limited to 'src/themes')
-rw-r--r--src/themes/centerLayer.vala13
-rw-r--r--src/themes/theme.vala26
2 files changed, 35 insertions, 4 deletions
diff --git a/src/themes/centerLayer.vala b/src/themes/centerLayer.vala
index 59f37ed..34d473e 100644
--- a/src/themes/centerLayer.vala
+++ b/src/themes/centerLayer.vala
@@ -26,12 +26,17 @@ public class CenterLayer : GLib.Object {
/////////////////////////////////////////////////////////////////////
/// Possible rotation modes.
- /// AUTO: Turns the layer continously.
- /// TO_MOUSE: Turns the layer always to the pointer.
- /// TO_ACTIVE: Turns the layer to the active slice.
+ /// AUTO: Turns the layer continously.
+ /// TO_MOUSE: Turns the layer always to the pointer.
+ /// TO_ACTIVE: Turns the layer to the active slice.
+ /// TO_HOUR_12: Turns the layer to the position of the current hour.
+ /// TO_HOUR_24: Turns the layer to the position of the current hour.
+ /// TO_MINUTE: Turns the layer to the position of the current minute.
+ /// TO_SECOND: Turns the layer to the position of the current second.
/////////////////////////////////////////////////////////////////////
- public enum RotationMode {AUTO, TO_MOUSE, TO_ACTIVE}
+ public enum RotationMode {AUTO, TO_MOUSE, TO_ACTIVE, TO_HOUR_12,
+ TO_HOUR_24, TO_MINUTE, TO_SECOND}
/////////////////////////////////////////////////////////////////////
/// Information on the contained image.
diff --git a/src/themes/theme.vala b/src/themes/theme.vala
index 2e256f9..ccf38c2 100644
--- a/src/themes/theme.vala
+++ b/src/themes/theme.vala
@@ -424,6 +424,19 @@ public class Theme : GLib.Object {
case "turn_to_mouse":
active_rotation_mode = CenterLayer.RotationMode.TO_MOUSE;
break;
+ case "turn_to_hour":
+ case "turn_to_hour_12":
+ active_rotation_mode = CenterLayer.RotationMode.TO_HOUR_12;
+ break;
+ case "turn_to_hour_24":
+ active_rotation_mode = CenterLayer.RotationMode.TO_HOUR_24;
+ break;
+ case "turn_to_minute":
+ active_rotation_mode = CenterLayer.RotationMode.TO_MINUTE;
+ break;
+ case "turn_to_second":
+ active_rotation_mode = CenterLayer.RotationMode.TO_SECOND;
+ break;
default:
warning("Invalid value \"" + attr_content + "\" for attribute \"" + attr_name + "\" in <center_layer> element!");
break;
@@ -452,6 +465,19 @@ public class Theme : GLib.Object {
case "turn_to_mouse":
inactive_rotation_mode = CenterLayer.RotationMode.TO_MOUSE;
break;
+ case "turn_to_hour":
+ case "turn_to_hour_12":
+ inactive_rotation_mode = CenterLayer.RotationMode.TO_HOUR_12;
+ break;
+ case "turn_to_hour_24":
+ inactive_rotation_mode = CenterLayer.RotationMode.TO_HOUR_24;
+ break;
+ case "turn_to_minute":
+ inactive_rotation_mode = CenterLayer.RotationMode.TO_MINUTE;
+ break;
+ case "turn_to_second":
+ inactive_rotation_mode = CenterLayer.RotationMode.TO_SECOND;
+ break;
default:
warning("Invalid value \"" + attr_content + "\" for attribute \"" + attr_name + "\" in <center_layer> element!");
break;