Merge lp:~vikoadi/gala/independent-custom-command into lp:gala

[Viko Adi Rahmawan]

use its own custom command for each hotcorner side, break one command for all side custom command

[Rico Tzschichholz (ricotz)]

As discussed this is unlikely to happen.

review: Disapprove

Unmerged revisions

399. By Viko Adi Rahmawan on 2014-07-21

use its own custom command for each side, break previous configuration

=== modified file 'data/org.pantheon.desktop.gala.gschema.xml.in.in'
--- data/org.pantheon.desktop.gala.gschema.xml.in.in	2014-04-19 12:57:09 +0000
+++ data/org.pantheon.desktop.gala.gschema.xml.in.in	2014-07-21 07:07:06 +0000
@@ -41,15 +41,25 @@
 			<summary>Action for the bottom right corner</summary>
 			<description></description>
 		</key>
-		<key type="s" name="hotcorner-custom-command">
-			<default>''</default>
-			<summary>The command that will be executed for the hotcorner action 'custom-command' or multiple</summary>
-			<description>If you just put a single command, it will be used for every hotcorner assigned to 
-				'custom-command'. If you instead use the pattern
-				'hotcorner-topleft:command;;hotcorner-bottomright:command' the specific commands will be used
-				per hotcorner. Possible identifiers are 'hotcorner-[topleft; topright; bottomleft; bottomright]'
-				followed by a ':' and then the command. ';;' is used as delimiter between command defintions.
-			</description>
+		<key type="s" name="custom-command-topleft">
+			<default>''</default>
+			<summary>The command that will be executed for the topleft hotcorner action 'custom-command'</summary>
+			<description></description>
+		</key>
+		<key type="s" name="custom-command-topright">
+			<default>''</default>
+			<summary>The command that will be executed for the topright hotcorner action 'custom-command' or multiple</summary>
+			<description></description>
+		</key>
+		<key type="s" name="custom-command-bottomleft">
+			<default>''</default>
+			<summary>The command that will be executed for the bottomleft hotcorner action 'custom-command' or multiple</summary>
+			<description></description>
+		</key>
+		<key type="s" name="custom-command-bottomright">
+			<default>''</default>
+			<summary>The command that will be executed for the bottomright hotcorner action 'custom-command' or multiple</summary>
+			<description></description>
 		</key>
 		<key type="b" name="edge-tiling">
 			<default>true</default>
@@ -213,4 +223,4 @@
 			<description>See normal-focused</description>
 		</key>
 	</schema>
-</schemalist>
+</schemalist>
\ No newline at end of file

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2014-04-19 12:57:09 +0000
+++ src/Settings.vala	2014-07-21 07:07:06 +0000
@@ -24,7 +24,10 @@
 		public string panel_main_menu_action { get; set; }
 		public string toggle_recording_action { get; set; }
 		public string overlay_action { get; set; }
-		public string hotcorner_custom_command { get; set; }
+		public string custom_command_topleft { get; set; }
+		public string custom_command_topright { get; set; }
+		public string custom_command_bottomleft { get; set; }
+		public string custom_command_bottomright { get; set; }
 		public string[] dock_names { get; set; }
 
 		public WindowOverviewType window_overview_type { get; set; }
@@ -177,4 +180,4 @@
 			return instance;
 		}
 	}
-}
+}
\ No newline at end of file

=== modified file 'src/WindowManager.vala'
--- src/WindowManager.vala	2014-07-16 22:47:36 +0000
+++ src/WindowManager.vala	2014-07-21 07:07:06 +0000
@@ -490,24 +490,21 @@
 					break;
 				case ActionType.CUSTOM_COMMAND:
 					string command = "";
-					var line = BehaviorSettings.get_default ().hotcorner_custom_command;
-					if (line == "")
-						return;
-
-					var parts = line.split (";;");
-					// keep compatibility to old version where only one command was possible
-					if (parts.length == 1) {
-						command = line;
-					} else {
-						// find specific actions
-						var search = last_hotcorner.name;
-
-						foreach (var part in parts) {
-							var details = part.split (":");
-							if (details[0] == search) {
-								command = details[1];
-							}
-						}
+					switch (last_hotcorner.name){
+						case "hotcorner-topleft":
+							command = BehaviorSettings.get_default ().custom_command_topleft;
+							break;
+						case "hotcorner-topright":
+							command = BehaviorSettings.get_default ().custom_command_topright;
+							break;
+						case "hotcorner-bottomleft":
+							command = BehaviorSettings.get_default ().custom_command_bottomleft;
+							break;
+						case "hotcorner-bottomright":
+							command = BehaviorSettings.get_default ().custom_command_bottomright;
+							break;
+						default:
+							return;
 					}
 
 					try {
@@ -1196,4 +1193,4 @@
 	public extern int x_handle_event (X.Event xevent);
 	[CCode (cname="clutter_x11_get_stage_window")]
 	public extern X.Window x_get_stage_window (Clutter.Actor stage);
-}
+}
\ No newline at end of file