Xubuntu Default Settings

Merge lp:~ochosi/xubuntu-default-settings/panel_terminal_powerman into lp:~xubuntu-dev/xubuntu-default-settings/trunk

  1. panel_terminal_powerman
  2. Merge into trunk
Proposed by Simon Steinbeiß
Status: Merged
Merged at revision: 459
Proposed branch: lp:~ochosi/xubuntu-default-settings/panel_terminal_powerman
Merge into: lp:~xubuntu-dev/xubuntu-default-settings/trunk
Diff against target: 200 lines (+18/-121)
4 files modified
etc/xdg/xdg-xubuntu/xfce4/panel/default.xml (+5/-120)
etc/xdg/xdg-xubuntu/xfce4/panel/whiskermenu-1.rc (+5/-0)
etc/xdg/xdg-xubuntu/xfce4/terminal/terminalrc (+1/-1)
etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml (+7/-0)
To merge this branch: bzr merge lp:~ochosi/xubuntu-default-settings/panel_terminal_powerman
Reviewer Review Type Date Requested Status
Pasi Lallinaho (community) community Approve
Xubuntu Developers Pending
Review via email: mp+207074@code.launchpad.net

Description of the change

This merge-request implements three features.
1) It updates the default panel-layout to match the one discussed and voted (https://wiki.ubuntu.com/Xubuntu/Roadmap/Specifications/Trusty/Whiskermenu), and adds two obvious options for the whiskermenu-plugin (others will be discussed and added later)
2) It updates the terminal-font to be Dejavu Sans Mono (instead of Liberation Mono)
3) It sets xfce4-powermanager's trayicon to "always hide" (instead of "visible when battery is present"), because we use indicator-power now and we don't want two battery symbols in the panel

To post a comment you must log in.
Revision history for this message
Pasi Lallinaho (knome) wrote :

Approve with my Xubuntu Project lead hat on.

review: Approve (community)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'etc/xdg/xdg-xubuntu/xfce4/panel/default.xml'
--- etc/xdg/xdg-xubuntu/xfce4/panel/default.xml 2012-09-17 19:16:12 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/panel/default.xml 2014-02-19 00:46:41 +0000
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
22
3<channel name="xfce4-panel" version="1.0">3<channel name="xfce4-panel" version="1.0">
4 <property name="panels" type="uint" value="2">4 <property name="panels" type="uint" value="1">
5 <property name="panel-0" type="empty">5 <property name="panel-0" type="empty">
6 <property name="position" type="string" value="p=6;x=0;y=0"/>6 <property name="position" type="string" value="p=6;x=0;y=0"/>
7 <property name="length" type="uint" value="100"/>7 <property name="length" type="uint" value="100"/>
@@ -14,13 +14,9 @@
14 <value type="int" value="5"/>14 <value type="int" value="5"/>
15 <value type="int" value="6"/>15 <value type="int" value="6"/>
16 <value type="int" value="7"/>16 <value type="int" value="7"/>
17 <value type="int" value="8"/>
18 <value type="int" value="26"/>
19 <value type="int" value="27"/>
20 <value type="int" value="9"/>
21 </property>17 </property>
22 <property name="background-style" type="uint" value="0"/>18 <property name="background-style" type="uint" value="0"/>
23 <property name="background-alpha" type="uint" value="100"/>19 <property name="background-alpha" type="uint" value="80"/>
24 <property name="size" type="uint" value="24"/>20 <property name="size" type="uint" value="24"/>
25 <property name="autohide" type="bool" value="false"/>21 <property name="autohide" type="bool" value="false"/>
26 <property name="length-adjust" type="bool" value="true"/>22 <property name="length-adjust" type="bool" value="true"/>
@@ -29,42 +25,9 @@
29 <property name="leave-opacity" type="uint" value="100"/>25 <property name="leave-opacity" type="uint" value="100"/>
30 <property name="mode" type="uint" value="0"/>26 <property name="mode" type="uint" value="0"/>
31 </property>27 </property>
32 <property name="panel-1" type="empty">
33 <property name="position" type="string" value="p=8;x=960;y=1176"/>
34 <property name="size" type="uint" value="46"/>
35 <property name="position-locked" type="bool" value="true"/>
36 <property name="plugin-ids" type="array">
37 <value type="int" value="10"/>
38 <value type="int" value="11"/>
39 <value type="int" value="12"/>
40 <value type="int" value="13"/>
41 <value type="int" value="14"/>
42 <value type="int" value="15"/>
43 <value type="int" value="16"/>
44 <value type="int" value="17"/>
45 <value type="int" value="18"/>
46 <value type="int" value="19"/>
47 <value type="int" value="20"/>
48 <value type="int" value="24"/>
49 <value type="int" value="22"/>
50 <value type="int" value="23"/>
51 <value type="int" value="25"/>
52 </property>
53 <property name="autohide" type="bool" value="true"/>
54 <property name="length" type="uint" value="100"/>
55 <property name="length-adjust" type="bool" value="true"/>
56 <property name="leave-opacity" type="uint" value="100"/>
57 <property name="background-alpha" type="uint" value="15"/>
58 <property name="enter-opacity" type="uint" value="100"/>
59 <property name="mode" type="uint" value="0"/>
60 </property>
61 </property>28 </property>
62 <property name="plugins" type="empty">29 <property name="plugins" type="empty">
63 <property name="plugin-1" type="string" value="applicationsmenu">30 <property name="plugin-1" type="string" value="whiskermenu"/>
64 <property name="show-tooltips" type="bool" value="true"/>
65 <property name="button-icon" type="string" value="xubuntu-logo-menu"/>
66 <property name="show-button-title" type="bool" value="false"/>
67 </property>
68 <property name="plugin-2" type="string" value="tasklist">31 <property name="plugin-2" type="string" value="tasklist">
69 <property name="flat-buttons" type="bool" value="true"/>32 <property name="flat-buttons" type="bool" value="true"/>
70 </property>33 </property>
@@ -80,92 +43,14 @@
80 <property name="plugin-5" type="string" value="indicator">43 <property name="plugin-5" type="string" value="indicator">
81 <property name="blacklist" type="array">44 <property name="blacklist" type="array">
82 <value type="string" value="libappmenu.so"/>45 <value type="string" value="libappmenu.so"/>
83 <value type="string" value="libdatetime.so"/>
84 <value type="string" value="libme.so"/>
85 <value type="string" value="libsession.so"/>
86 </property>46 </property>
87 </property>47 </property>
88 <property name="plugin-6" type="string" value="separator">48 <property name="plugin-6" type="string" value="separator">
89 <property name="style" type="uint" value="0"/>49 <property name="style" type="uint" value="0"/>
50 <property name="expand" type="bool" value="false"/>
90 </property>51 </property>
91 <property name="plugin-7" type="string" value="clock">52 <property name="plugin-7" type="string" value="clock">
92 <property name="digital-format" type="string" value="%a, %d %b %Y %H:%M"/>53 <property name="digital-format" type="string" value="%d %b, %H:%M"/>
93 </property>
94 <property name="plugin-8" type="string" value="separator">
95 <property name="style" type="uint" value="0"/>
96 </property>
97 <property name="plugin-26" type="string" value="pager">
98 <property name="rows" type="uint" value="1"/>
99 <property name="show-names" type="bool" value="false"/>
100 <property name="workspace-scrolling" type="bool" value="false"/>
101 <property name="miniature-view" type="bool" value="true"/>
102 </property>
103 <property name="plugin-27" type="string" value="separator">
104 <property name="style" type="uint" value="0"/>
105 </property>
106 <property name="plugin-9" type="string" value="actions"/>
107 <property name="plugin-10" type="string" value="separator">
108 <property name="expand" type="bool" value="true"/>
109 <property name="style" type="uint" value="0"/>
110 </property>
111 <property name="plugin-11" type="string" value="showdesktop"/>
112 <property name="plugin-12" type="string" value="separator">
113 <property name="style" type="uint" value="1"/>
114 </property>
115 <property name="plugin-13" type="string" value="launcher">
116 <property name="items" type="array">
117 <value type="string" value="exo-web-browser.desktop"/>
118 </property>
119 </property>
120 <property name="plugin-14" type="string" value="launcher">
121 <property name="items" type="array">
122 <value type="string" value="exo-mail-reader.desktop"/>
123 </property>
124 </property>
125 <property name="plugin-15" type="string" value="launcher">
126 <property name="items" type="array">
127 <value type="string" value="exo-terminal-emulator.desktop"/>
128 </property>
129 </property>
130 <property name="plugin-16" type="string" value="launcher">
131 <property name="items" type="array">
132 <value type="string" value="xfce-settings-manager.desktop"/>
133 </property>
134 </property>
135 <property name="plugin-17" type="string" value="launcher">
136 <property name="items" type="array">
137 <value type="string" value="xfce4-appfinder.desktop"/>
138 </property>
139 </property>
140 <property name="plugin-18" type="string" value="launcher">
141 <property name="items" type="array">
142 <value type="string" value="ubuntu-software-center.desktop"/>
143 </property>
144 </property>
145 <property name="plugin-19" type="string" value="launcher">
146 <property name="items" type="array">
147 <value type="string" value="abiword.desktop"/>
148 </property>
149 </property>
150 <property name="plugin-20" type="string" value="launcher">
151 <property name="items" type="array">
152 <value type="string" value="gmusicbrowser.desktop"/>
153 </property>
154 </property>
155 <property name="plugin-24" type="string" value="launcher">
156 <property name="items" type="array">
157 <value type="string" value="catfish.desktop"/>
158 </property>
159 </property>
160 <property name="plugin-22" type="string" value="separator">
161 <property name="style" type="uint" value="1"/>
162 </property>
163 <property name="plugin-23" type="string" value="directorymenu">
164 <property name="base-directory" type="empty"/>
165 </property>
166 <property name="plugin-25" type="string" value="separator">
167 <property name="expand" type="bool" value="true"/>
168 <property name="style" type="uint" value="0"/>
169 </property>54 </property>
170 </property>55 </property>
171 <property name="configver" type="int" value="2"/>56 <property name="configver" type="int" value="2"/>
17257
=== added file 'etc/xdg/xdg-xubuntu/xfce4/panel/whiskermenu-1.rc'
--- etc/xdg/xdg-xubuntu/xfce4/panel/whiskermenu-1.rc 1970-01-01 00:00:00 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/panel/whiskermenu-1.rc 2014-02-19 00:46:41 +0000
@@ -0,0 +1,5 @@
1button-title=Applications Menu
2button-icon=xubuntu-logo-menu
3show-button-title=false
4show-button-icon=true
5load-hierarchy=true
0\ No newline at end of file6\ No newline at end of file
17
=== modified file 'etc/xdg/xdg-xubuntu/xfce4/terminal/terminalrc'
--- etc/xdg/xdg-xubuntu/xfce4/terminal/terminalrc 2012-08-28 23:46:46 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/terminal/terminalrc 2014-02-19 00:46:41 +0000
@@ -1,5 +1,5 @@
1[Configuration]1[Configuration]
2FontName=Liberation Mono 102FontName=DejaVu Sans Mono 9
3ColorForeground=#b3b3b3b3b3b33ColorForeground=#b3b3b3b3b3b3
4ColorBackground=#1333199926664ColorBackground=#133319992666
5ColorCursor=#0f0f494999995ColorCursor=#0f0f49499999
66
=== added file 'etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml'
--- etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml 1970-01-01 00:00:00 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml 2014-02-19 00:46:41 +0000
@@ -0,0 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?>
2
3<channel name="xfce4-power-manager" version="1.0">
4 <property name="xfce4-power-manager" type="empty">
5 <property name="show-tray-icon" type="uint" value="3"/>
6 </property>
7</channel>

Subscribers

People subscribed via source and target branches

to status/vote changes: