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

[Simon Steinbeiß]

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

[Pasi Lallinaho (knome)]

Approve with my Xubuntu Project lead hat on.

review: Approve (community)

=== 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <channel name="xfce4-panel" version="1.0">
-  <property name="panels" type="uint" value="2">
+  <property name="panels" type="uint" value="1">
     <property name="panel-0" type="empty">
       <property name="position" type="string" value="p=6;x=0;y=0"/>
       <property name="length" type="uint" value="100"/>
@@ -14,13 +14,9 @@
         <value type="int" value="5"/>
         <value type="int" value="6"/>
         <value type="int" value="7"/>
-        <value type="int" value="8"/>
-        <value type="int" value="26"/>
-        <value type="int" value="27"/>
-        <value type="int" value="9"/>
       </property>
       <property name="background-style" type="uint" value="0"/>
-      <property name="background-alpha" type="uint" value="100"/>
+      <property name="background-alpha" type="uint" value="80"/>
       <property name="size" type="uint" value="24"/>
       <property name="autohide" type="bool" value="false"/>
       <property name="length-adjust" type="bool" value="true"/>
@@ -29,42 +25,9 @@
       <property name="leave-opacity" type="uint" value="100"/>
       <property name="mode" type="uint" value="0"/>
     </property>
-    <property name="panel-1" type="empty">
-      <property name="position" type="string" value="p=8;x=960;y=1176"/>
-      <property name="size" type="uint" value="46"/>
-      <property name="position-locked" type="bool" value="true"/>
-      <property name="plugin-ids" type="array">
-        <value type="int" value="10"/>
-        <value type="int" value="11"/>
-        <value type="int" value="12"/>
-        <value type="int" value="13"/>
-        <value type="int" value="14"/>
-        <value type="int" value="15"/>
-        <value type="int" value="16"/>
-        <value type="int" value="17"/>
-        <value type="int" value="18"/>
-        <value type="int" value="19"/>
-        <value type="int" value="20"/>
-        <value type="int" value="24"/>
-        <value type="int" value="22"/>
-        <value type="int" value="23"/>
-        <value type="int" value="25"/>
-      </property>
-      <property name="autohide" type="bool" value="true"/>
-      <property name="length" type="uint" value="100"/>
-      <property name="length-adjust" type="bool" value="true"/>
-      <property name="leave-opacity" type="uint" value="100"/>
-      <property name="background-alpha" type="uint" value="15"/>
-      <property name="enter-opacity" type="uint" value="100"/>
-      <property name="mode" type="uint" value="0"/>
-    </property>
   </property>
   <property name="plugins" type="empty">
-    <property name="plugin-1" type="string" value="applicationsmenu">
-      <property name="show-tooltips" type="bool" value="true"/>
-      <property name="button-icon" type="string" value="xubuntu-logo-menu"/>
-      <property name="show-button-title" type="bool" value="false"/>
-    </property>
+    <property name="plugin-1" type="string" value="whiskermenu"/>
     <property name="plugin-2" type="string" value="tasklist">
       <property name="flat-buttons" type="bool" value="true"/>
     </property>
@@ -80,92 +43,14 @@
     <property name="plugin-5" type="string" value="indicator">
       <property name="blacklist" type="array">
         <value type="string" value="libappmenu.so"/>
-        <value type="string" value="libdatetime.so"/>
-        <value type="string" value="libme.so"/>
-        <value type="string" value="libsession.so"/>
       </property>
     </property>
     <property name="plugin-6" type="string" value="separator">
       <property name="style" type="uint" value="0"/>
+      <property name="expand" type="bool" value="false"/>
     </property>
     <property name="plugin-7" type="string" value="clock">
-      <property name="digital-format" type="string" value="%a, %d %b %Y %H:%M"/>
-    </property>
-    <property name="plugin-8" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-26" type="string" value="pager">
-      <property name="rows" type="uint" value="1"/>
-      <property name="show-names" type="bool" value="false"/>
-      <property name="workspace-scrolling" type="bool" value="false"/>
-      <property name="miniature-view" type="bool" value="true"/>
-    </property>
-    <property name="plugin-27" type="string" value="separator">
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-9" type="string" value="actions"/>
-    <property name="plugin-10" type="string" value="separator">
-      <property name="expand" type="bool" value="true"/>
-      <property name="style" type="uint" value="0"/>
-    </property>
-    <property name="plugin-11" type="string" value="showdesktop"/>
-    <property name="plugin-12" type="string" value="separator">
-      <property name="style" type="uint" value="1"/>
-    </property>
-    <property name="plugin-13" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="exo-web-browser.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-14" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="exo-mail-reader.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-15" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="exo-terminal-emulator.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-16" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="xfce-settings-manager.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-17" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="xfce4-appfinder.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-18" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="ubuntu-software-center.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-19" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="abiword.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-20" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="gmusicbrowser.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-24" type="string" value="launcher">
-      <property name="items" type="array">
-        <value type="string" value="catfish.desktop"/>
-      </property>
-    </property>
-    <property name="plugin-22" type="string" value="separator">
-      <property name="style" type="uint" value="1"/>
-    </property>
-    <property name="plugin-23" type="string" value="directorymenu">
-      <property name="base-directory" type="empty"/>
-    </property>
-    <property name="plugin-25" type="string" value="separator">
-      <property name="expand" type="bool" value="true"/>
-      <property name="style" type="uint" value="0"/>
+      <property name="digital-format" type="string" value="%d %b, %H:%M"/>
     </property>
   </property>
   <property name="configver" type="int" value="2"/>

=== 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 @@
+button-title=Applications Menu
+button-icon=xubuntu-logo-menu
+show-button-title=false
+show-button-icon=true
+load-hierarchy=true
\ No newline at end of file

=== 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 @@
 [Configuration]
-FontName=Liberation Mono 10
+FontName=DejaVu Sans Mono 9
 ColorForeground=#b3b3b3b3b3b3
 ColorBackground=#133319992666
 ColorCursor=#0f0f49499999

=== 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<channel name="xfce4-power-manager" version="1.0">
+  <property name="xfce4-power-manager" type="empty">
+    <property name="show-tray-icon" type="uint" value="3"/>
+  </property>
+</channel>