Merge lp:~elementary-os/elementaryos/default-settings-loki-plank into lp:~elementary-os/elementaryos/default-settings-loki

[Danielle Foré]

Update plank settings

[lp:~elementary-os/elementaryos/default-settings-loki-plank]

155. By Danielle Foré on 2015-11-10

add dock items

=== modified file 'debian/elementary-default-settings.gsettings-override'
--- debian/elementary-default-settings.gsettings-override	2015-11-02 12:04:27 +0000
+++ debian/elementary-default-settings.gsettings-override	2015-11-10 19:37:28 +0000
@@ -1,3 +1,9 @@
+[net.launchpad.plank.docks.dock1]
+dock-items=['gala-multitaskingview.dockitem','midori.dockitem','geary.dockitem','maya-calendar.dockitem','noise.dockitem','audience.dockitem','shotwell.dockitem','switchboard.dockitem','softwarecenter.dockitem']
+hide-mode=dodge-maximized
+show-dock-item=false
+theme=Gtk+
+
 [org.gnome.desktop.background]
 draw-background=true
 picture-options='zoom'
 
=== removed file 'plank/dock1/settings'
--- plank/dock1/settings	2015-10-26 15:28:35 +0000
+++ plank/dock1/settings	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-
-[PlankDockPreferences]
-#Whether to show only windows of the current workspace.
-CurrentWorkspaceOnly=false
-#The size of dock icons (in pixels).
-IconSize=48
-#If 0, the dock won't hide.  If 1, the dock intelligently hides.  If 2, the dock auto-hides. If 3, the dock elementary-hides.
-HideMode=3
-#Time (in ms) to wait before unhiding the dock.
-UnhideDelay=0
-#The monitor number for the dock. Use -1 to keep on the primary monitor.
-Monitor=-1
-#List of *.dockitem files on this dock. DO NOT MODIFY
-DockItems=gala-multitaskingview.dockitem;;midori.dockitem;;geary.dockitem;;maya-calendar.dockitem;;noise.dockitem;;audience.dockitem;;shotwell.dockitem;;switchboard.dockitem;;softwarecenter.dockitem
-#The position for the dock on the monitor.
-Position=3
-#The dock's position offset from center (in percent).
-Offset=0
-#The name of the dock's theme to use.
-Theme=Gtk+
-#The alignment for the dock on the monitor's edge.
-Alignment=3
-#The alignment of the items in this dock.
-ItemsAlignment=3
-#Whether to show the item for the dock itself.
-ShowDockItem=false