xubuntu-dev team mailing list archive

[Simon Steinbeiß <ochosi@xxxxxxxxxxxxxxxxxx>]

Simon Steinbeiß has proposed merging lp:~ochosi/xubuntu-default-settings/whiskermenu_defaults into lp:xubuntu-default-settings.

Requested reviews:
  Xubuntu Developers (xubuntu-dev)
  Pasi Lallinaho (knome): community
Related bugs:
  Bug #1285440 in xfce4-whiskermenu-plugin (Ubuntu): "xfce4-whiskermenu-plugin "Switch Users" functionality"
  https://bugs.launchpad.net/ubuntu/+source/xfce4-whiskermenu-plugin/+bug/1285440
  Bug #1286846 in xubuntu-default-settings (Ubuntu): "wiskers menu search/button placement"
  https://bugs.launchpad.net/ubuntu/+source/xubuntu-default-settings/+bug/1286846

For more details, see:
https://code.launchpad.net/~ochosi/xubuntu-default-settings/whiskermenu_defaults/+merge/211714

This branch puts the whiskermenu default-settings-file in the correct place (thanks for the hint, Graeme Gott!) and contains the full set of default settings we want in Xubuntu 14.04.

This also addresses bug LP #1277938 and replaces the gdmflexiserver script (which no longer exists in Ubuntu, but is still recommended upstream) with "dm-tool switch-to-greeter". Switching users will still be hidden by default because of the security concerns mentioned in the bugreport, providing a command that works over one that doesn't exist anymore doesn't hurt though.

Also updated/fixed the missing mentions in the changelog for rev459.
-- 
https://code.launchpad.net/~ochosi/xubuntu-default-settings/whiskermenu_defaults/+merge/211714
Your team Xubuntu Developers is requested to review the proposed merge of lp:~ochosi/xubuntu-default-settings/whiskermenu_defaults into lp:xubuntu-default-settings.

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-20 13:59:50 +0000
+++ debian/changelog	2014-03-19 12:42:25 +0000
@@ -7,6 +7,11 @@
   * debian/xubuntu-live-settings.install
   * debian/light-locker.desktop
     - Prevent autostart of light-locker in live session (see LP: #1281323)
+  * Update xfce4-panel layout
+  * Update keyboard-shortcuts
+  * Update default greeter settings
+  * New default terminal font: DejaVu Sans Mono 9
+  * Hide xfce4-powermanager's trayicon by default
 
  -- Sean Davis <smd.seandavis@xxxxxxxxx>  Tue, 18 Feb 2014 22:42:17 -0500
 

=== removed file 'etc/xdg/xdg-xubuntu/xfce4/panel/whiskermenu-1.rc'
--- etc/xdg/xdg-xubuntu/xfce4/panel/whiskermenu-1.rc	2014-02-19 00:40:43 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/panel/whiskermenu-1.rc	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-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

=== added directory 'usr/share/xfce4'
=== added directory 'usr/share/xfce4/whiskermenu'
=== added file 'usr/share/xfce4/whiskermenu/defaults.rc'
--- usr/share/xfce4/whiskermenu/defaults.rc	1970-01-01 00:00:00 +0000
+++ usr/share/xfce4/whiskermenu/defaults.rc	2014-03-19 12:42:25 +0000
@@ -0,0 +1,49 @@
+favorites=exo-web-browser.desktop,exo-mail-reader.desktop,exo-file-manager.desktop,abiword.desktop,gnumeric.desktop,pidgin.desktop,gmusicbrowser.desktop,ubuntu-software-center.desktop,exo-terminal-emulator.desktop,xfhelp4.desktop
+button-title=Applications Menu
+button-icon=xubuntu-logo-menu
+show-button-title=false
+show-button-icon=true
+load-hierarchy=true
+launcher-show-name=true
+launcher-show-description=false
+item-icon-size=1
+category-icon-size=0
+hover-switch-category=false
+favorites-in-recent=true
+display-recent-default=false
+position-search-alternate=true
+command-switchuser=dm-tool switch-to-greeter
+show-command-switchuser=false
+command-settings=xfce4-settings-manager
+show-command-settings=true
+command-menueditor=menulibre
+show-command-menueditor=true
+command-lockscreen=xflock4
+show-command-lockscreen=true
+command-logout=xfce4-session-logout
+show-command-logout=true
+
+[action0]
+name=Man Pages
+pattern=#
+command=exo-open --launch TerminalEmulator man %s
+regex=false
+
+[action1]
+name=Wikipedia
+pattern=!w
+command=exo-open --launch WebBrowser http://en.wikipedia.org/wiki/%u
+regex=false
+
+[action2]
+name=Run in Terminal
+pattern=!
+command=exo-open --launch TerminalEmulator %s
+regex=false
+
+[action3]
+name=Open URI
+pattern=^(file|http|https):\\/\\/(.*)$
+command=exo-open \\0
+regex=true
+