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

Proposed by Danielle Foré
Status: Merged
Merged at revision: 154
Proposed branch: lp:~elementary-os/elementaryos/default-settings-loki-plank
Merge into: lp:~elementary-os/elementaryos/default-settings-loki
Diff against target: 44 lines (+6/-26)
2 files modified
debian/elementary-default-settings.gsettings-override (+6/-0)
plank/dock1/settings (+0/-26)
To merge this branch: bzr merge lp:~elementary-os/elementaryos/default-settings-loki-plank
Reviewer Review Type Date Requested Status
elementary OS team Pending
Review via email: mp+277171@code.launchpad.net

Commit message

Update plank settings

To post a comment you must log in.
155. By Danielle Foré

add dock items

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/elementary-default-settings.gsettings-override'
2--- debian/elementary-default-settings.gsettings-override 2015-11-02 12:04:27 +0000
3+++ debian/elementary-default-settings.gsettings-override 2015-11-10 19:37:28 +0000
4@@ -1,3 +1,9 @@
5+[net.launchpad.plank.docks.dock1]
6+dock-items=['gala-multitaskingview.dockitem','midori.dockitem','geary.dockitem','maya-calendar.dockitem','noise.dockitem','audience.dockitem','shotwell.dockitem','switchboard.dockitem','softwarecenter.dockitem']
7+hide-mode=dodge-maximized
8+show-dock-item=false
9+theme=Gtk+
10+
11 [org.gnome.desktop.background]
12 draw-background=true
13 picture-options='zoom'
14
15=== removed file 'plank/dock1/settings'
16--- plank/dock1/settings 2015-10-26 15:28:35 +0000
17+++ plank/dock1/settings 1970-01-01 00:00:00 +0000
18@@ -1,26 +0,0 @@
19-
20-[PlankDockPreferences]
21-#Whether to show only windows of the current workspace.
22-CurrentWorkspaceOnly=false
23-#The size of dock icons (in pixels).
24-IconSize=48
25-#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.
26-HideMode=3
27-#Time (in ms) to wait before unhiding the dock.
28-UnhideDelay=0
29-#The monitor number for the dock. Use -1 to keep on the primary monitor.
30-Monitor=-1
31-#List of *.dockitem files on this dock. DO NOT MODIFY
32-DockItems=gala-multitaskingview.dockitem;;midori.dockitem;;geary.dockitem;;maya-calendar.dockitem;;noise.dockitem;;audience.dockitem;;shotwell.dockitem;;switchboard.dockitem;;softwarecenter.dockitem
33-#The position for the dock on the monitor.
34-Position=3
35-#The dock's position offset from center (in percent).
36-Offset=0
37-#The name of the dock's theme to use.
38-Theme=Gtk+
39-#The alignment for the dock on the monitor's edge.
40-Alignment=3
41-#The alignment of the items in this dock.
42-ItemsAlignment=3
43-#Whether to show the item for the dock itself.
44-ShowDockItem=false

Subscribers

People subscribed via source and target branches

to all changes: