Merge lp:~cszikszoy/docky/mmv3 into lp:docky

[Chris S.]

[lp:~cszikszoy/docky/mmv3]

378. By Chris S. on 2009-11-01

simplify CheckButtons code

=== modified file 'Docky/Docky/ConfigurationWindow.cs'
--- Docky/Docky/ConfigurationWindow.cs	2009-10-31 06:57:19 +0000
+++ Docky/Docky/ConfigurationWindow.cs	2009-11-01 21:05:19 +0000
@@ -151,11 +151,15 @@
 	
 		protected virtual void OnDeleteDockButtonClicked (object sender, System.EventArgs e)
 		{
+			if (!(Docky.Controller.Docks.Count () > 1))
+				return;
+			
 			if (ActiveDock != null) {
 				Docky.Controller.DeleteDock (ActiveDock);
 				ActiveDock = null;
 				SetupConfigAlignment ();
 			}
+			CheckButtons ();
 		}
 		
 		protected virtual void OnNewDockButtonClicked (object sender, System.EventArgs e)
@@ -168,6 +172,24 @@
 				ActiveDock = newDock;
 				SetupConfigAlignment ();
 			}
+			CheckButtons ();
+		}
+		
+		void CheckButtons ()
+		{
+			new_dock_button.Sensitive = true;
+			delete_dock_button.Sensitive = true;
+			if (Docky.Controller.Docks.Count () == 1) {
+				delete_dock_button.Sensitive = false;
+				new_dock_button.Sensitive = true;
+			}
+			int spotsAvailable = 0;
+			for (int i = 0; i < Screen.Default.NMonitors; i++)
+				spotsAvailable += Docky.Controller.PositionsAvailableForDock (i).Count ();
+			if (spotsAvailable == 0) {
+				delete_dock_button.Sensitive = true;
+				new_dock_button.Sensitive = false;
+			}
 		}
 
 		string AutoStartDir {

=== modified file 'Docky/Docky/DockController.cs'
--- Docky/Docky/DockController.cs	2009-10-31 16:05:10 +0000
+++ Docky/Docky/DockController.cs	2009-11-01 21:05:19 +0000
@@ -31,7 +31,13 @@
 
 namespace Docky
 {
-
+	
+	class DockMonitor
+	{
+		public Rectangle Geo { get; set; }
+		public int MonitorNumber { get; set; }
+		public IEnumerable<DockPosition> PossiblePositions { get; set; }
+	}
 
 	internal class DockController : IDisposable
 	{
@@ -50,6 +56,21 @@
 			get { return DockNames.Count (); }
 		}
 		
+		List<DockMonitor> DockMonitors { get; set; }
+
+		public IEnumerable<DockPosition> PositionsAvailableForDock (int monitorNum)
+		{
+			foreach (DockPosition position in DockMonitors.Where (d => d.MonitorNumber == monitorNum).First ().PossiblePositions) {
+				if (!DocksForMonitor (monitorNum).Any (dock => dock.Preferences.Position == position))
+					yield return position;
+			}
+		}
+
+		public IEnumerable<Dock> DocksForMonitor (int monitorNumber)
+		{
+			return docks.Where (d => d.Preferences.MonitorNumber == monitorNumber);
+		}
+		
 		IEnumerable<string> ThemeContainerFolders {
 			get {
 				yield return Path.Combine (DockServices.System.SystemDataFolder, "themes");
@@ -111,6 +132,7 @@
 		{
 			docks = new List<Dock> ();
 			prefs = DockServices.Preferences.Get<DockController> ();
+			DetectMonitors ();
 			CreateDocks ();
 			
 			GLib.Timeout.Add (500, delegate {
@@ -119,6 +141,41 @@
 			});
 		}
 		
+		void DetectMonitors ()
+		{
+			DockMonitors = new List<DockMonitor> ();
+			
+			// first add all of the screens and their geometries
+			for (int i = 0; i < Screen.Default.NMonitors; i++) {
+				DockMonitor mon = new DockMonitor ();
+				mon.MonitorNumber = i;
+				mon.Geo = Screen.Default.GetMonitorGeometry (i);
+				DockMonitors.Add (mon);
+			}
+			
+			int topDockVal = DockMonitors.OrderBy (d => d.Geo.Top).First ().Geo.Top;
+			int bottomDockVal = DockMonitors.OrderByDescending (d => d.Geo.Bottom).First ().Geo.Bottom;
+			int leftDockVal = DockMonitors.OrderBy (d => d.Geo.Left).First ().Geo.Left;
+			int rightDockVal = DockMonitors.OrderByDescending (d => d.Geo.Right).First ().Geo.Right;
+			
+			// now build the list of available positions for a given screen.
+			for (int i = 0; i < DockMonitors.Count (); i++) {
+				List<DockPosition> positions = new List<DockPosition> ();
+				DockMonitor mon = DockMonitors.Where (d => d.MonitorNumber == i).First ();
+				
+				if (mon.Geo.Left == leftDockVal)
+					positions.Add (DockPosition.Left);
+				if (mon.Geo.Right == rightDockVal)
+					positions.Add (DockPosition.Right);
+				if (mon.Geo.Top == topDockVal)
+					positions.Add (DockPosition.Top);
+				if (mon.Geo.Bottom == bottomDockVal)
+					positions.Add (DockPosition.Bottom);
+				
+				mon.PossiblePositions = positions;
+			}
+		}
+		
 		string FolderForTheme (string theme)
 		{
 			foreach (string dir in ThemeContainerFolders) {
@@ -146,8 +203,13 @@
 		
 		public Dock CreateDock ()
 		{
-			if (docks.Count >= 4)
-				return null;
+			int mon;
+			for (mon = 0; mon < Screen.Default.NMonitors; mon++) {
+				if (PositionsAvailableForDock (mon).Any ())
+					break;
+				if (mon == Screen.Default.NMonitors - 1)
+					return null;
+			}
 			
 			string name = "Dock" + 1;
 			for (int i = 2; DockNames.Contains (name); i++)
@@ -155,7 +217,7 @@
 			
 			DockNames = DockNames.Concat (new [] { name });
 			
-			DockPreferences dockPrefs = new DockPreferences (name);
+			DockPreferences dockPrefs = new DockPreferences (name, mon);
 			Dock dock = new Dock (dockPrefs);
 			docks.Add (dock);
 			
@@ -172,7 +234,6 @@
 			dock.Dispose ();
 			DockNames = DockNames.Where (s => s != dock.Preferences.GetName ());
 			
-			EnsurePluginState ();
 			return true;
 		}
 		

=== modified file 'Docky/Docky/Interface/DockPreferences.cs'
--- Docky/Docky/Interface/DockPreferences.cs	2009-10-31 16:05:10 +0000
+++ Docky/Docky/Interface/DockPreferences.cs	2009-11-01 21:05:19 +0000
@@ -128,13 +128,9 @@
 			set {
 				if (position == value)
 					return;
-				Dock other_dock = null;
-				if (Docky.Controller.Docks.Any (d => d.Preferences.Position == value))
-					other_dock = Docky.Controller.Docks.Where (d => d.Preferences.Position == value).First();
-				DockPosition old_position = position;
 				position = value;
-				if (other_dock != null)
-					other_dock.Preferences.Position = old_position;
+				if (!Docky.Controller.PositionsAvailableForDock (MonitorNumber).Contains (value))
+					position = Docky.Controller.PositionsAvailableForDock (MonitorNumber).First ();
 				SetOption<string> ("Position", position.ToString ());
 				OnPositionChanged ();
 			}
@@ -195,7 +191,7 @@
 			get {
 				if (!zoom_percent.HasValue)
 					zoom_percent = GetOption<double?> ("ZoomPercent", 2.0);
-				return zoom_percent.Value; 
+				return zoom_percent.Value;
 			}
 			set {
 				value = Clamp (value, 4, 1);
@@ -207,6 +203,21 @@
 				OnZoomPercentChanged ();
 			}
 		}
+		
+		int? monitor_number;
+		public int MonitorNumber {
+			get {
+				if (!monitor_number.HasValue)
+					monitor_number = GetOption<int?> ("MonitorNumber", 0);
+				return monitor_number.Value;
+			}
+			set {
+				if (monitor_number == value)
+					return;
+				monitor_number = value;
+				SetOption<int?> ("MonitorNumber", monitor_number.Value);
+			}
+		}
 		#endregion
 		
 		bool? window_manager;
@@ -248,8 +259,15 @@
 			set { prefs.Set<bool> ("FirstRun", value); }
 		}
 		
+		public DockPreferences (string dockName, int monitorNumber) : this(dockName)
+		{
+			MonitorNumber = monitorNumber;
+		}
+		
 		public DockPreferences (string dockName)
 		{
+			prefs = DockServices.Preferences.Get<DockPreferences> ();
+			
 			// ensures position actually gets set
 			position = (DockPosition) 100;
 			
@@ -264,8 +282,6 @@
 			
 			name = dockName;
 			
-			prefs = DockServices.Preferences.Get<DockPreferences> ();
-			
 			BuildItemProviders ();
 			BuildOptions ();
 			
@@ -435,13 +451,8 @@
 			DockPosition position = (DockPosition) Enum.Parse (typeof(DockPosition), 
 			                                                   GetOption ("Position", DockPosition.Bottom.ToString ()));
 			
-			while (Docky.Controller.Docks.Any ((Dock d) => d.Preferences.Position == position)) {
-				Log<DockPreferences>.Error ("Dock position already in use: " + position.ToString ());
-				position = (DockPosition) ((((int) position) + 1) % 4);
-			}
 			Position = position;
 			
-			
 			if (WindowManager)
 				DefaultProvider.SetWindowManager ();
 			

=== modified file 'Docky/Docky/Interface/DockWindow.cs'
--- Docky/Docky/Interface/DockWindow.cs	2009-11-01 21:03:51 +0000
+++ Docky/Docky/Interface/DockWindow.cs	2009-11-01 21:05:20 +0000
@@ -344,7 +344,7 @@
 		
 		//fixme
 		int Monitor {
-			get { return 0; }
+			get { return Preferences.MonitorNumber; }
 		}
 		
 		internal DockPosition Position {

=== modified file 'Docky/Docky/Interface/IDockPreferences.cs'
--- Docky/Docky/Interface/IDockPreferences.cs	2009-10-31 03:57:40 +0000
+++ Docky/Docky/Interface/IDockPreferences.cs	2009-11-01 21:05:20 +0000
@@ -62,6 +62,8 @@
 				
 		double ZoomPercent { get; set; }
 		
+		int MonitorNumber { get; set; }
+		
 		bool SetName (string name);
 		
 		string GetName ();

=== modified file 'Docky/gtk-gui/gui.stetic'
--- Docky/gtk-gui/gui.stetic	2009-10-31 06:37:25 +0000
+++ Docky/gtk-gui/gui.stetic	2009-11-01 21:05:20 +0000
@@ -7,11 +7,8 @@
   <import>
     <widget-library name="Mono.Addins.Gui, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
     <widget-library name="wnck-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <widget-library name="../../Docky.Services/bin/Debug/Docky.Services.dll" />
-    <widget-library name="../../Docky.Items/bin/Debug/Docky.Items.dll" />
-    <widget-library name="../../Docky.Windowing/bin/Debug/Docky.Windowing.dll" />
+    <widget-library name="gnomedesktop-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <widget-library name="../bin/Debug/Docky.exe" internal="true" />
-    <widget-library name="gnomedesktop-sharp, Version=2.20.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </import>
   <widget class="Gtk.Bin" id="Docky.Interface.DockPreferences" design-size="368 331">
     <property name="MemberName" />