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

[Chris S.]

[Chris S. (cszikszoy)]

This round, MultiMonitor V2 adds support for MultiMonitors again. Also, DanRabbit's awesome UI idea is fully implemented in this branch. There's no more "add dock" or "delete dock". Upon opening the preferences widget, all docks slide in (for me this is 6 docks, 3 on each screen, for others with 1 screen that would be 4 docks) allowing you to add addins to any dock. Upon closing the preferences, empty docks are removed.

[Robert Dyer (psybers)]

One problem I already see is that 'on closing prefs all empty docks are removed'. Good idea... *except* what if I want a dock with only launchers (and no plugins)??? I would have to add a plugin, close it and add a launcher, then reopen and remove the plugin! Tisk Tisk. :-)

review: Needs Fixing

Unmerged revisions

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

another multi-monitor implementation. Also, fully implement DanRabbit's awesome preferences UI idea.

=== modified file 'Docky/Docky/ConfigurationWindow.cs'
--- Docky/Docky/ConfigurationWindow.cs	2009-10-31 06:57:19 +0000
+++ Docky/Docky/ConfigurationWindow.cs	2009-11-01 01:20:25 +0000
@@ -68,7 +68,7 @@
 					theme_combo.Active = i;
 				}
 				i++;
-			}
+			}	
 			
 			SetupConfigAlignment ();
 			
@@ -108,16 +108,19 @@
 
 		protected override void OnShown ()
 		{
+			for (int mon = 0; mon < Screen.Default.NMonitors; mon++) {
+				Dock dock;
+				while ((dock = Docky.Controller.CreateDock (mon)) != null) {
+					dock.ConfigurationClick += HandleDockConfigurationClick;
+					dock.EnterConfigurationMode ();
+				}
+			}
+			
 			foreach (Dock dock in Docky.Controller.Docks) {
 				dock.EnterConfigurationMode ();
 				dock.ConfigurationClick += HandleDockConfigurationClick;
 			}
 			
-			if (Docky.Controller.Docks.Count () == 1) {
-				ActiveDock = Docky.Controller.Docks.First ();
-				SetupConfigAlignment ();
-			}
-			
 			KeepAbove = true;
 			Stick ();
 			
@@ -136,11 +139,20 @@
 
 		protected override void OnHidden ()
 		{
+			// first delete the empty docks
+			Docky.Controller.Docks.ToList ().ForEach (dock =>
+			{
+				if (!dock.Preferences.ItemProviders.Any (provider => provider.Items.Count () > 0))
+					Docky.Controller.DeleteDock (dock);
+			});
+			
+			// for any remaining docks, exit configuration mode
 			foreach (Dock dock in Docky.Controller.Docks) {
 				dock.ConfigurationClick -= HandleDockConfigurationClick;
 				dock.LeaveConfigurationMode ();
 				dock.UnsetActiveGlow ();
 			}
+			
 			base.OnHidden ();
 		}
 
@@ -148,27 +160,6 @@
 		{
 			Docky.Controller.DockTheme = theme_combo.ActiveText;
 		}
-	
-		protected virtual void OnDeleteDockButtonClicked (object sender, System.EventArgs e)
-		{
-			if (ActiveDock != null) {
-				Docky.Controller.DeleteDock (ActiveDock);
-				ActiveDock = null;
-				SetupConfigAlignment ();
-			}
-		}
-		
-		protected virtual void OnNewDockButtonClicked (object sender, System.EventArgs e)
-		{
-			Dock newDock = Docky.Controller.CreateDock ();
-			
-			if (newDock != null) {
-				newDock.ConfigurationClick += HandleDockConfigurationClick;
-				newDock.EnterConfigurationMode ();
-				ActiveDock = newDock;
-				SetupConfigAlignment ();
-			}
-		}
 
 		string AutoStartDir {
 			get { return System.IO.Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.ApplicationData), "autostart"); }

=== modified file 'Docky/Docky/DockController.cs'
--- Docky/Docky/DockController.cs	2009-10-31 16:05:10 +0000
+++ Docky/Docky/DockController.cs	2009-11-01 01:20:25 +0000
@@ -32,7 +32,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
 	{
 		const string DefaultTheme = "Classic";
@@ -50,6 +56,23 @@
 			get { return DockNames.Count (); }
 		}
 		
+		List<DockMonitor> DockMonitors { get; set; }
+
+		// this represents the possible PHYSICALLY availabe positions
+		// it doesn't take into account whether or not a doc is already at a given position
+		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 +134,7 @@
 		{
 			docks = new List<Dock> ();
 			prefs = DockServices.Preferences.Get<DockController> ();
+			DetectMonitors ();
 			CreateDocks ();
 			
 			GLib.Timeout.Add (500, delegate {
@@ -119,6 +143,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) {
@@ -144,9 +203,9 @@
 			return def + "@" + System.Reflection.Assembly.GetExecutingAssembly ().FullName;
 		}
 		
-		public Dock CreateDock ()
+		public Dock CreateDock (int monitorNum)
 		{
-			if (docks.Count >= 4)
+			if (!PositionsAvailableForDock (monitorNum).Any ())
 				return null;
 			
 			string name = "Dock" + 1;
@@ -155,7 +214,7 @@
 			
 			DockNames = DockNames.Concat (new [] { name });
 			
-			DockPreferences dockPrefs = new DockPreferences (name);
+			DockPreferences dockPrefs = new DockPreferences (name, monitorNum);
 			Dock dock = new Dock (dockPrefs);
 			docks.Add (dock);
 			
@@ -172,7 +231,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 01:20:25 +0000
@@ -126,15 +126,17 @@
 		public DockPosition Position {
 			get { return position; }
 			set {
+				int monitor = 0;
+				if (monitor_number.HasValue)
+					monitor = MonitorNumber;
+				
 				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 (monitor).Contains (value))
+					position = Docky.Controller.PositionsAvailableForDock (monitor).First ();
+
 				SetOption<string> ("Position", position.ToString ());
 				OnPositionChanged ();
 			}
@@ -195,7 +197,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 +209,22 @@
 				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);
+				//OnIndicatorSettingChanged ();
+			}
+		}
 		#endregion
 		
 		bool? window_manager;
@@ -248,6 +266,11 @@
 			set { prefs.Set<bool> ("FirstRun", value); }
 		}
 		
+		public DockPreferences (string dockName, int monitorNumber) : this(dockName)
+		{
+			MonitorNumber = monitorNumber;
+		}
+		
 		public DockPreferences (string dockName)
 		{
 			// ensures position actually gets set
@@ -435,7 +458,7 @@
 			DockPosition position = (DockPosition) Enum.Parse (typeof(DockPosition), 
 			                                                   GetOption ("Position", DockPosition.Bottom.ToString ()));
 			
-			while (Docky.Controller.Docks.Any ((Dock d) => d.Preferences.Position == position)) {
+			while (Docky.Controller.DocksForMonitor (MonitorNumber).Any ((Dock d) => d.Preferences.Position == position)) {
 				Log<DockPreferences>.Error ("Dock position already in use: " + position.ToString ());
 				position = (DockPosition) ((((int) position) + 1) % 4);
 			}
@@ -712,9 +735,9 @@
 		{
 			OnItemProvidersChanged (null, item_providers);
 			
-			foreach (AbstractDockItemProvider adip in item_providers.Where (adip => adip != DefaultProvider)) {
+			foreach (AbstractDockItemProvider adip in item_providers.Where (adip => adip != DefaultProvider))
 				PluginManager.Disable (adip);
-			}
+
 			item_providers = new List<AbstractDockItemProvider> ();
 			
 			SyncPlugins ();

=== modified file 'Docky/Docky/Interface/DockWindow.cs'
--- Docky/Docky/Interface/DockWindow.cs	2009-10-31 09:39:54 +0000
+++ Docky/Docky/Interface/DockWindow.cs	2009-11-01 01:20:25 +0000
@@ -343,7 +343,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 01:20:25 +0000
@@ -62,6 +62,8 @@
 				
 		double ZoomPercent { get; set; }
 		
+		int MonitorNumber { get; set; }
+		
 		bool SetName (string name);
 		
 		string GetName ();

=== modified file 'Docky/gtk-gui/Docky.ConfigurationWindow.cs'
--- Docky/gtk-gui/Docky.ConfigurationWindow.cs	2009-10-31 06:37:25 +0000
+++ Docky/gtk-gui/Docky.ConfigurationWindow.cs	2009-11-01 01:20:25 +0000
@@ -42,10 +42,6 @@
         
         private Gtk.HBox hbox3;
         
-        private Gtk.Button new_dock_button;
-        
-        private Gtk.Button delete_dock_button;
-        
         private Gtk.VBox vbox4;
         
         private Gtk.Button close_button;
@@ -159,69 +155,15 @@
             this.hbox3.Name = "hbox3";
             this.hbox3.Spacing = 6;
             // Container child hbox3.Gtk.Box+BoxChild
-            this.new_dock_button = new Gtk.Button();
-            this.new_dock_button.CanFocus = true;
-            this.new_dock_button.Name = "new_dock_button";
-            this.new_dock_button.UseUnderline = true;
-            this.new_dock_button.BorderWidth = ((uint)(5));
-            // Container child new_dock_button.Gtk.Container+ContainerChild
-            Gtk.Alignment w11 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-            // Container child GtkAlignment.Gtk.Container+ContainerChild
-            Gtk.HBox w12 = new Gtk.HBox();
-            w12.Spacing = 2;
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Image w13 = new Gtk.Image();
-            w13.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-add", Gtk.IconSize.Menu, 16);
-            w12.Add(w13);
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Label w15 = new Gtk.Label();
-            w15.LabelProp = Mono.Unix.Catalog.GetString("New Dock");
-            w15.UseUnderline = true;
-            w12.Add(w15);
-            w11.Add(w12);
-            this.new_dock_button.Add(w11);
-            this.hbox3.Add(this.new_dock_button);
-            Gtk.Box.BoxChild w19 = ((Gtk.Box.BoxChild)(this.hbox3[this.new_dock_button]));
-            w19.Position = 0;
-            w19.Expand = false;
-            w19.Fill = false;
-            // Container child hbox3.Gtk.Box+BoxChild
-            this.delete_dock_button = new Gtk.Button();
-            this.delete_dock_button.CanFocus = true;
-            this.delete_dock_button.Name = "delete_dock_button";
-            this.delete_dock_button.UseUnderline = true;
-            this.delete_dock_button.BorderWidth = ((uint)(5));
-            // Container child delete_dock_button.Gtk.Container+ContainerChild
-            Gtk.Alignment w20 = new Gtk.Alignment(0.5F, 0.5F, 0F, 0F);
-            // Container child GtkAlignment.Gtk.Container+ContainerChild
-            Gtk.HBox w21 = new Gtk.HBox();
-            w21.Spacing = 2;
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Image w22 = new Gtk.Image();
-            w22.Pixbuf = Stetic.IconLoader.LoadIcon(this, "gtk-delete", Gtk.IconSize.Menu, 16);
-            w21.Add(w22);
-            // Container child GtkHBox.Gtk.Container+ContainerChild
-            Gtk.Label w24 = new Gtk.Label();
-            w24.LabelProp = Mono.Unix.Catalog.GetString("Delete Dock");
-            w24.UseUnderline = true;
-            w21.Add(w24);
-            w20.Add(w21);
-            this.delete_dock_button.Add(w20);
-            this.hbox3.Add(this.delete_dock_button);
-            Gtk.Box.BoxChild w28 = ((Gtk.Box.BoxChild)(this.hbox3[this.delete_dock_button]));
-            w28.Position = 1;
-            w28.Expand = false;
-            w28.Fill = false;
-            // Container child hbox3.Gtk.Box+BoxChild
             this.vbox4 = new Gtk.VBox();
             this.vbox4.Name = "vbox4";
             this.vbox4.Spacing = 6;
             this.hbox3.Add(this.vbox4);
-            Gtk.Box.BoxChild w29 = ((Gtk.Box.BoxChild)(this.hbox3[this.vbox4]));
-            w29.Position = 2;
+            Gtk.Box.BoxChild w11 = ((Gtk.Box.BoxChild)(this.hbox3[this.vbox4]));
+            w11.Position = 2;
             this.hbox2.Add(this.hbox3);
-            Gtk.Box.BoxChild w30 = ((Gtk.Box.BoxChild)(this.hbox2[this.hbox3]));
-            w30.Position = 0;
+            Gtk.Box.BoxChild w12 = ((Gtk.Box.BoxChild)(this.hbox2[this.hbox3]));
+            w12.Position = 0;
             // Container child hbox2.Gtk.Box+BoxChild
             this.close_button = new Gtk.Button();
             this.close_button.CanFocus = true;
@@ -231,15 +173,15 @@
             this.close_button.BorderWidth = ((uint)(5));
             this.close_button.Label = "gtk-close";
             this.hbox2.Add(this.close_button);
-            Gtk.Box.BoxChild w31 = ((Gtk.Box.BoxChild)(this.hbox2[this.close_button]));
-            w31.Position = 1;
-            w31.Expand = false;
-            w31.Fill = false;
+            Gtk.Box.BoxChild w13 = ((Gtk.Box.BoxChild)(this.hbox2[this.close_button]));
+            w13.Position = 1;
+            w13.Expand = false;
+            w13.Fill = false;
             this.vbox1.Add(this.hbox2);
-            Gtk.Box.BoxChild w32 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbox2]));
-            w32.Position = 1;
-            w32.Expand = false;
-            w32.Fill = false;
+            Gtk.Box.BoxChild w14 = ((Gtk.Box.BoxChild)(this.vbox1[this.hbox2]));
+            w14.Position = 1;
+            w14.Expand = false;
+            w14.Fill = false;
             this.Add(this.vbox1);
             if ((this.Child != null)) {
                 this.Child.ShowAll();
@@ -249,8 +191,6 @@
             this.Show();
             this.start_with_computer_checkbutton.Toggled += new System.EventHandler(this.OnStartWithComputerCheckbuttonToggled);
             this.theme_combo.Changed += new System.EventHandler(this.OnThemeComboChanged);
-            this.new_dock_button.Clicked += new System.EventHandler(this.OnNewDockButtonClicked);
-            this.delete_dock_button.Clicked += new System.EventHandler(this.OnDeleteDockButtonClicked);
             this.close_button.Clicked += new System.EventHandler(this.OnCloseButtonClicked);
         }
     }

=== 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 01:20:25 +0000
@@ -7,11 +7,11 @@
   <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="gnomedesktop-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="../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" />
@@ -632,40 +632,10 @@
                 <property name="MemberName" />
                 <property name="Spacing">6</property>
                 <child>
-                  <widget class="Gtk.Button" id="new_dock_button">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="Type">TextAndIcon</property>
-                    <property name="Icon">stock:gtk-add Menu</property>
-                    <property name="Label" translatable="yes">New Dock</property>
-                    <property name="UseUnderline">True</property>
-                    <property name="BorderWidth">5</property>
-                    <signal name="Clicked" handler="OnNewDockButtonClicked" />
-                  </widget>
-                  <packing>
-                    <property name="Position">0</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
+                  <placeholder />
                 </child>
                 <child>
-                  <widget class="Gtk.Button" id="delete_dock_button">
-                    <property name="MemberName" />
-                    <property name="CanFocus">True</property>
-                    <property name="Type">TextAndIcon</property>
-                    <property name="Icon">stock:gtk-delete Menu</property>
-                    <property name="Label" translatable="yes">Delete Dock</property>
-                    <property name="UseUnderline">True</property>
-                    <property name="BorderWidth">5</property>
-                    <signal name="Clicked" handler="OnDeleteDockButtonClicked" />
-                  </widget>
-                  <packing>
-                    <property name="Position">1</property>
-                    <property name="AutoSize">True</property>
-                    <property name="Expand">False</property>
-                    <property name="Fill">False</property>
-                  </packing>
+                  <placeholder />
                 </child>
                 <child>
                   <widget class="Gtk.VBox" id="vbox4">