summaryrefslogtreecommitdiff
path: root/src/utilities/trigger.vala
diff options
context:
space:
mode:
authorAlessandro Ghedini <al3xbio@gmail.com>2012-01-21 19:14:06 +0100
committerAlessandro Ghedini <al3xbio@gmail.com>2012-01-21 19:19:46 +0100
commitc05883f47c498be4e11893e5178c5bc37ffd9f4a (patch)
treedbd3cd7ad3d7771405ad63af2f1e9d14d4ae5a35 /src/utilities/trigger.vala
parent31539042f11bc210a29e923f45586779c3ad46b2 (diff)
parent60560a030fda3c539ff9dc1563b9926414a193da (diff)
Merge commit 'upstream/0.4.0'
Diffstat (limited to 'src/utilities/trigger.vala')
-rw-r--r--src/utilities/trigger.vala36
1 files changed, 28 insertions, 8 deletions
diff --git a/src/utilities/trigger.vala b/src/utilities/trigger.vala
index 1f6fcfe..4b6167b 100644
--- a/src/utilities/trigger.vala
+++ b/src/utilities/trigger.vala
@@ -81,6 +81,12 @@ public class Trigger : GLib.Object {
public bool delayed { get; private set; default=false; }
/////////////////////////////////////////////////////////////////////
+ /// True if the pie opens in the middle of the screen.
+ /////////////////////////////////////////////////////////////////////
+
+ public bool centered { get; private set; default=false; }
+
+ /////////////////////////////////////////////////////////////////////
/// C'tor, creates a new, "unbound" Trigger.
/////////////////////////////////////////////////////////////////////
@@ -93,7 +99,7 @@ public class Trigger : GLib.Object {
/// in this format: "[option(s)]<modifier(s)>button" where
/// "<modifier>" is something like "<Alt>" or "<Control>", "button"
/// something like "s", "F4" or "button0" and "[option]" is either
- /// "[turbo]" or "["delayed"]".
+ /// "[turbo]", "[centered]" or "["delayed"]".
/////////////////////////////////////////////////////////////////////
public Trigger.from_string(string trigger) {
@@ -105,9 +111,12 @@ public class Trigger : GLib.Object {
/////////////////////////////////////////////////////////////////////
public Trigger.from_values(uint key_sym, Gdk.ModifierType modifiers,
- bool with_mouse, bool turbo, bool delayed ) {
+ bool with_mouse, bool turbo, bool delayed,
+ bool centered ) {
- string trigger = (turbo ? "[turbo]" : "") + (delayed ? "[delayed]" : "");
+ string trigger = (turbo ? "[turbo]" : "")
+ + (delayed ? "[delayed]" : "")
+ + (centered ? "[centered]" : "");
if (with_mouse) {
trigger += Gtk.accelerator_name(0, modifiers) + "button%u".printf(key_sym);
@@ -123,7 +132,7 @@ public class Trigger : GLib.Object {
/// in this format: "[option(s)]<modifier(s)>button" where
/// "<modifier>" is something like "<Alt>" or "<Control>", "button"
/// something like "s", "F4" or "button0" and "[option]" is either
- /// "[turbo]" or "["delayed"]".
+ /// "[turbo]", "[centered]" or "["delayed"]".
/////////////////////////////////////////////////////////////////////
public void parse_string(string trigger) {
@@ -135,10 +144,12 @@ public class Trigger : GLib.Object {
this.turbo = check_string.contains("[turbo]");
this.delayed = check_string.contains("[delayed]");
+ this.centered = check_string.contains("[centered]");
// remove optional arguments
check_string = check_string.replace("[turbo]", "");
check_string = check_string.replace("[delayed]", "");
+ check_string = check_string.replace("[centered]", "");
int button = this.get_mouse_button(check_string);
if (button > 0) {
@@ -177,12 +188,20 @@ public class Trigger : GLib.Object {
this.label_with_specials = this.label;
- if (this.turbo && this.delayed)
- this.label_with_specials += ("\n<small><span weight='light'>" + _("Turbo") + " | " + _("Delayed") + "</span></small>");
+ if (this.turbo && this.delayed && this.centered)
+ this.label_with_specials += (" <small><span weight='light'>[ " + _("Turbo") + " | " + _("Delayed") + " | " + _("Centered") + " ]</span></small>");
+ else if (this.turbo && this.centered)
+ this.label_with_specials += (" <small><span weight='light'>[ " + _("Turbo") + " | " + _("Centered") + " ]</span></small>");
+ else if (this.turbo && this.delayed)
+ this.label_with_specials += (" <small><span weight='light'>[ " + _("Turbo") + " | " + _("Delayed") + " ]</span></small>");
+ else if (this.centered && this.delayed)
+ this.label_with_specials += (" <small><span weight='light'>[ " + _("Delayed") + " | " + _("Centered") + " ]</span></small>");
else if (this.turbo)
- this.label_with_specials += ("\n<small><span weight='light'>" + _("Turbo") + "</span></small>");
+ this.label_with_specials += (" <small><span weight='light'>[ " + _("Turbo") + " ]</span></small>");
else if (this.delayed)
- this.label_with_specials += ("\n<small><span weight='light'>" + _("Delayed") + "</span></small>");
+ this.label_with_specials += (" <small><span weight='light'>[ " + _("Delayed") + " ]</span></small>");
+ else if (this.centered)
+ this.label_with_specials += (" <small><span weight='light'>[ " + _("Centered") + " ]</span></small>");
} else {
this.set_unbound();
@@ -216,6 +235,7 @@ public class Trigger : GLib.Object {
// remove optional arguments
check_string = check_string.replace("[turbo]", "");
check_string = check_string.replace("[delayed]", "");
+ check_string = check_string.replace("[centered]", "");
if (this.get_mouse_button(check_string) > 0) {
// it seems to be a valid mouse-trigger so replace button part,