From 4214daaa5fa8d9327b2a567efcd295371f69f223 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sun, 17 Mar 2013 10:48:22 +0100 Subject: [PATCH] Initial commit for QLubuntu --- debian/changelog | 6 + debian/control | 34 +- debian/qlubuntu-default-session.postinst | 15 + debian/qlubuntu-default-session.postrm | 16 + debian/rules | 0 etc/xdg/lxsession/QLubuntu/desktop.conf | 114 +++ usr/bin/startlubuntu-q | 83 ++ usr/share/lubuntu/openbox/menu.xml | 2 +- usr/share/lubuntu/openbox/qlubuntu.xml | 215 +++++ usr/share/lubuntu/openbox/qt-rc.xml | 947 +++++++++++++++++++++++ usr/share/xsessions/qlubuntu.desktop | 6 + 11 files changed, 1427 insertions(+), 11 deletions(-) create mode 100644 debian/qlubuntu-default-session.postinst create mode 100644 debian/qlubuntu-default-session.postrm mode change 100644 => 100755 debian/rules create mode 100644 etc/xdg/lxsession/QLubuntu/desktop.conf create mode 100644 usr/bin/startlubuntu-q create mode 100644 usr/share/lubuntu/openbox/qlubuntu.xml create mode 100644 usr/share/lubuntu/openbox/qt-rc.xml create mode 100644 usr/share/xsessions/qlubuntu.desktop diff --git a/debian/changelog b/debian/changelog index b8f9509..9ae01f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lubuntu-default-settings (0.32) UNRELEASING; urgency=low + + * Add a new QLubuntu session, by using only Qt applications + + -- Julien Lavergne Sun, 17 Mar 2013 10:48:02 +0100 + lubuntu-default-settings (0.31) raring; urgency=low * Add a new Lubuntu-Nexus7 session. diff --git a/debian/control b/debian/control index df8059e..eee1c5f 100644 --- a/debian/control +++ b/debian/control @@ -16,36 +16,41 @@ Depends: ${misc:Depends}, lxsession (>= 0.4.1), lubuntu-artwork (>= 0.4), lubuntu-icon-theme, - pcmanfm (>= 0.9.5), + pcmanfm (>= 0.9.5) | pcmanfm-qt, ttf-ubuntu-font-family, - lightdm-gtk-greeter (>= 1.3.0) + lightdm Suggests: amixer, - scrot, - galculator, - xscreensaver, - dmz-cursor-theme -Provides: lightdm-gtk-greeter-config + scrot, + galculator, + xscreensaver, + dmz-cursor-theme Description: default settings for Lubuntu Various system settings tailored for Lubuntu. Package: lxgames-default-session Architecture: all Depends: ${misc:Depends}, - lubuntu-default-settings + lubuntu-default-settings, + lightdm-gtk-greeter (>= 1.3.0) +Provides: lightdm-gtk-greeter-config Description: Set default session to lxgames This package sets the default session to lxgames by default. Package: lubuntu-default-session Architecture: all Depends: ${misc:Depends}, - lubuntu-default-settings + lubuntu-default-settings, + lightdm-gtk-greeter (>= 1.3.0) +Provides: lightdm-gtk-greeter-config Description: Set default session to Lubuntu This package sets the default session to Lubuntu by default. Package: lubuntu-nexus7-default-session Architecture: all Depends: ${misc:Depends}, - lubuntu-default-settings + lubuntu-default-settings, + lightdm-gtk-greeter (>= 1.3.0) +Provides: lightdm-gtk-greeter-config Description: Set default session to Lubuntu Nexus7 version This package sets the default session to Lubuntu Nexus7 version by default. @@ -55,3 +60,12 @@ Depends: ${misc:Depends}, lubuntu-default-settings Description: Extra files for the nexus7 session This package contents extra files for the nexus7 session. + +Package: qlubuntu-default-session +Architecture: all +Depends: ${misc:Depends}, + lubuntu-default-settings, + lightdm-kde-greeter (>= 1.3.0) +Provides: lightdm-kde-greeter-config +Description: Set default session to QLubuntu version + This package sets the default session to QLubuntu version by default. diff --git a/debian/qlubuntu-default-session.postinst b/debian/qlubuntu-default-session.postinst new file mode 100644 index 0000000..6077905 --- /dev/null +++ b/debian/qlubuntu-default-session.postinst @@ -0,0 +1,15 @@ +#!/bin/sh -e + +set -e + +case "$1" in + configure|upgrade) + if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then + /usr/lib/lightdm/lightdm-set-defaults --keep-old --session=qlubuntu || true + /usr/lib/lightdm/lightdm-set-defaults --keep-old --greeter=lightdm-kde-greeter || true + fi + ;; +esac + +#DEBHELPER# +exit 0 diff --git a/debian/qlubuntu-default-session.postrm b/debian/qlubuntu-default-session.postrm new file mode 100644 index 0000000..dc53c20 --- /dev/null +++ b/debian/qlubuntu-default-session.postrm @@ -0,0 +1,16 @@ +#!/bin/sh -e + +set -e + +case "$1" in + remove|purge) + if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then + /usr/lib/lightdm/lightdm-set-defaults --remove --session=qlubuntu || true + /usr/lib/lightdm/lightdm-set-defaults --remove --greeter=lightdm-kde-greeter || true + fi + ;; +esac + + +#DEBHELPER# +exit 0 diff --git a/debian/rules b/debian/rules old mode 100644 new mode 100755 diff --git a/etc/xdg/lxsession/QLubuntu/desktop.conf b/etc/xdg/lxsession/QLubuntu/desktop.conf new file mode 100644 index 0000000..1899c0a --- /dev/null +++ b/etc/xdg/lxsession/QLubuntu/desktop.conf @@ -0,0 +1,114 @@ +[Session] +# Window manager : Advanced mode to launch the window manager (with session, usefull for launching openbox with specific arguments (like configuration file) and extras commands) +window_manager/program=openbox +window_manager/session= +window_manager/extras=--config-file $XDG_CONFIG_HOME/openbox/qt-rc.xml + +# Panel and its session (if necessary) +panel/program= +panel/session= + +# Screensaver +screensaver/program= + +# Power management +power-manager/program= + +# File manager (session if necessary, extras commands if necessary) +file-manager/program=pcmanfm-qt +file-manager/session= +file-manager/extras= + +# Polkit agent (use lxpolkit to use build-in support if enable at build time) +polkit= + +# Network GUI manager (auto to try to guess the best choice) +network_gui= + +# Audio preferences (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.AudioManagerLaunch) +audio_manager= + +# Logout dialog (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.QuitManagerLaunch) +quit_manager= + +# Workspace manager (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.WorkspaceManagerLaunch) +workspace_manager= + +# Launcher to launch applications (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.LauncherManagerLaunch) +launcher_manager= + +# Terminal by default (dbus-send --session --print-reply --dest="org.lxde.SessionManager" /org/lxde/SessionManager org.lxde.SessionManager.TerminalManagerLaunch) +terminal_manager= + +# Clipboard support (use lxclipboard to use build-in support if enable at build time) +clipboard= + +# Use a standalone composite manager (with possibility to autostart it) +composite_manager/command= +composite_manager/autostart= + +# Disable autostart of applications in system and home autostart directory +disable_autostart=true + +# Default web browser (desktop is the corresponding desktop file) +webbrowser/command= +webbrowser/desktop= + +[State] +# unknown if untested, yes if on laptop, no if not +laptop_mode=unknown + +[Dbus] +# Default Dbus interfaces, should be always true +lxde=true +# Implement gnome-session Dbus API +gnome=false + +[Keymap] +# Read configuration from : user (this file) or system +mode= +# Keyboard configuration for user mode, all 4 should be present +model= +layout= +variant= +options= + +[XRandr] +# Mode command only available +mode= +# Command to launch for configuring Xrandr ex: xrandr --mode ... +command= + +[Security] +# Default Keyring program +keyring=gnome-all + +[a11y] +# Accessibility options +# Activate or not the following options +activate=no +# Type of accessibility to enable (GNOME, KDE or other). Only GNOME supported now. +type= + +[GTK] +sNet/ThemeName=Lubuntu-default +sNet/IconThemeName=lubuntu +sGtk/FontName=Ubuntu 11 +iGtk/ToolbarStyle=3 +iGtk/ButtonImages=1 +iGtk/MenuImages=1 +iGtk/CursorThemeSize=18 +iXft/Antialias=1 +iXft/Hinting=1 +sXft/HintStyle=hintslight +sXft/RGBA=rgb +sGtk/CursorThemeName=DMZ-White + +[Mouse] +AccFactor=20 +AccThreshold=10 +LeftHanded=0 + +[Keyboard] +Delay=500 +Interval=30 diff --git a/usr/bin/startlubuntu-q b/usr/bin/startlubuntu-q new file mode 100644 index 0000000..0264814 --- /dev/null +++ b/usr/bin/startlubuntu-q @@ -0,0 +1,83 @@ +#!/bin/sh + +#Workaround to disable rgba, because lxpanel in Lubuntu doesn't support it +#(see bug #589763) +# +#export XLIB_SKIP_ARGB_VISUALS=1 + +if [ -z "$XDG_CONFIG_HOME" ]; then + export XDG_CONFIG_HOME="$HOME/.config" +fi + +#Allow custom configuration files in /etc/xdg/lubuntu +#Patch stolen from Xubuntu +if test "x$XDG_CONFIG_DIRS" = "x" +then + XDG_CONFIG_DIRS="/etc/xdg/lubuntu:/etc/xdg" +else + XDG_CONFIG_DIRS="/etc/xdg/lubuntu/:$XDG_CONFIG_DIRS" +fi +export XDG_CONFIG_DIRS + +if test "x$XDG_DATA_DIRS" = "x" +then + XDG_DATA_DIRS="/etc/xdg/lubuntu:/usr/local/share:/usr/share:/usr/share/gdm:/var/lib/menu-xdg" + else + XDG_DATA_DIRS="/etc/xdg/lubuntu:$XDG_DATA_DIRS:/usr/share:/usr/share/gdm:/var/lib/menu-xdg" +fi +export XDG_DATA_DIRS + +# Ensure the existance of openbox config file +OPENBOX_CONF_DIR="$XDG_CONFIG_HOME/openbox" +if [ ! -f "$OPENBOX_CONF_DIR/lubuntu-rc.xml" ]; then + mkdir -p "$OPENBOX_CONF_DIR" + cp /usr/share/lubuntu/openbox/rc.xml "$OPENBOX_CONF_DIR/lubuntu-rc.xml" +fi + +# Install custom QT configuration if no one is already installed +if [ ! -f "$XDG_CONFIG_HOME/Trolltech.conf" ]; then + cp /usr/share/lubuntu/qt/Trolltech.conf "$XDG_CONFIG_HOME/Trolltech.conf" +fi + +# Install custom configuration for leafpad +LEAFPAD_CONF_DIR="$XDG_CONFIG_HOME/leafpad" +if [ ! -f "$LEAFPAD_CONF_DIR/leafpadrc" ]; then + mkdir -p "$LEAFPAD_CONF_DIR" + cp /usr/share/lubuntu/leafpad/leafpadrc "$LEAFPAD_CONF_DIR/leafpadrc" +fi + +# Install custom configuration for xscreensaver +if [ ! -f "$HOME/.xscreensaver" ]; then + cp /usr/share/lubuntu/xscreensaver/xscreensaver "$HOME/.xscreensaver" +fi + +# Install custom lxterminal configuration if no one is already installed +if [ ! -f "$XDG_CONFIG_HOME/lxterminal/lxterminal.conf" ]; then + cp /etc/xdg/lubuntu/lxterminal/lxterminal.conf "$XDG_CONFIG_HOME/lxterminal/lxterminal.conf" +fi + +# Clean up after GDM (GDM sets the number of desktops to one) +xprop -root -remove _NET_NUMBER_OF_DESKTOPS -remove _NET_DESKTOP_NAMES -remove _NET_CURRENT_DESKTOP 2> /dev/null + +#Ensure the menu prefix +export XDG_MENU_PREFIX="lxde-" + +# Enable GTK+2 integration for OpenOffice.org, if available. +export SAL_USE_VCLPLUGIN=gtk + +# Launch DBus if needed +if which dbus-launch >/dev/null && test -z "$DBUS_SESSION_BUS_ADDRESS"; then + eval "$(dbus-launch --sh-syntax --exit-with-session)" +fi + +# Start SSH agent, require since 3.5 +# (see https://wiki.archlinux.org/index.php/Openbox#SSH_agent_no_longer_starting) +SSHAGENT="/usr/bin/ssh-agent" +SSHAGENTARGS="-s" +if [ -z "$SSH_AUTH_SOCK" -a -x "$SSHAGENT" ]; then + eval `$SSHAGENT $SSHAGENTARGS` + trap "kill $SSH_AGENT_PID" 0 +fi + +# Start the LXDE session +exec /usr/bin/lxsession -s QLubuntu -e LXDE diff --git a/usr/share/lubuntu/openbox/menu.xml b/usr/share/lubuntu/openbox/menu.xml index 73abcc6..7028b2a 100644 --- a/usr/share/lubuntu/openbox/menu.xml +++ b/usr/share/lubuntu/openbox/menu.xml @@ -175,7 +175,7 @@ - lxterminal + xterm yes diff --git a/usr/share/lubuntu/openbox/qlubuntu.xml b/usr/share/lubuntu/openbox/qlubuntu.xml new file mode 100644 index 0000000..6042d8b --- /dev/null +++ b/usr/share/lubuntu/openbox/qlubuntu.xml @@ -0,0 +1,215 @@ + + + + + + + + + + + + + transmission-qt + + yes + + + + + + + + + + + + + smplayer + + yes + + + + + + smplayer + + yes + + + + + + + + + + pcmanfm-qt --desktop-pref + yes + + + + + obconf + yes + + + + + + + + + + + + + + + + pcmanfm-qt + + yes + + + + + + qterminal + + yes + + + + + + chromium-browser + + yes + + + + + + + + + + + + + + lubuntu-logout + + + + + diff --git a/usr/share/lubuntu/openbox/qt-rc.xml b/usr/share/lubuntu/openbox/qt-rc.xml new file mode 100644 index 0000000..2cac548 --- /dev/null +++ b/usr/share/lubuntu/openbox/qt-rc.xml @@ -0,0 +1,947 @@ + + + + + 10 + 20 + + + yes + + no + + yes + + no + + 200 + + no + + + + Smart + +
yes
+ + Mouse + + Mouse + + + + Lubuntu-default + NLIMC + + yes + yes + + Ubuntu Medium + 11 + + bold + + normal + + + + Ubuntu Medium + 11 + + bold + + normal + + + + Ubuntu + 11 + + normal + + normal + + + + Ubuntu + 11 + + normal + + normal + + + + Ubuntu Medium + 11 + + bold + + normal + + + + Ubuntu Medium + 11 + + bold + + normal + + + + + + 2 + 1 + + + + 875 + + + + no + Nonpixel + + Center + + + + 10 + + 10 + + + + + + 0 + 0 + 0 + 0 + + + TopLeft + + 0 + 0 + no + Above + + Vertical + + no + 300 + + 300 + + Middle + + + + C-g + + + + left + no + + + + + right + no + + + + + up + no + + + + + down + no + + + + + left + no + + + + + right + no + + + + + up + no + + + + + down + no + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + + + + + + + + + + + + + client-menu + + + + + + scrot -u -b + + + + + + icons + + + + + + + + + + + + + + + + + + + yes + yes + + + + + + + + + + + right + + + + + left + + + + + up + + + + + down + + + + # HalfLeftScreen + + + 0 + 0 + 97% + 50% + + + # HalfRightScreen + + + -0 + 0 + 97% + 50% + + + # HalfUpperScreen + + + 0 + 0 + 100% + 50% + + + # HalfLowerScreen + + + 0 + -0 + 100% + 50% + + + + + + + true + PCManFM + + pcmanfm-qt + + + + + + lxpanelctl run + + + + + lxpanelctl run + + + + + + lxpanelctl menu + + + + + lxpanelctl menu + + + + + + + + + + lxtask + + + + + + x-terminal-emulator + + + + + + + true + PCManFM + + pcmanfm-qt + + + + + + xscreensaver-command -lock + + + + + + amixer -q sset Master 3%+ unmute + + + + + amixer -q sset Master 3%- unmute + + + + + amixer -q sset Master toggle + + + + + + x-terminal-emulator + + + + + x-terminal-emulator + + + + + + galculator + + + + + + pcmanfm-qt + + + + + + sleep 2;xset dpms force off + + + + + xbacklight -dec 10 + + + + + xbacklight -inc 10 + + + + + + scrot + + + + + + lubuntu-logout + + + + + 8 + + 200 + + 400 + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + + + + + + no + + + + + + + + + + + yes + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + + + top + + + + + + + left + + + + + + + right + + + + + + + bottom + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + client-menu + + + + + + + client-menu + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + vertical + + + + + horizontal + + + + + + + + + + + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + + + + + + + + + client-list-combined-menu + + + + + root-menu + + + + + + + previous + + + + + next + + + + + previous + + + + + next + + + + + + + + /usr/share/lubuntu/openbox/qlubuntu-menu.xml + qlubuntu--menu.xml + + 200 + + no + + 100 + + 400 + + yes + + yes + + yes + + + + + + + + + diff --git a/usr/share/xsessions/qlubuntu.desktop b/usr/share/xsessions/qlubuntu.desktop new file mode 100644 index 0000000..d5370ac --- /dev/null +++ b/usr/share/xsessions/qlubuntu.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Name=Lubuntu Qt session +Comment=A specific Lubuntu session using Qt +Exec=/usr/bin/startlubuntu-q +# Icon= +Type=Application