Commits

Anonymous committed 9901106

lxde-common fix pkg to not conflict with default settings set by lxpanel and pcmanfm packages

  • Participants
  • Parent commits 3705ab3

Comments (0)

Files changed (5)

var/vabs/lxde-common/src/configs/lxpanel/LXDE/config

+[Command]
+FileManager=pcmanfm %s
+Terminal=lxterminal -e %s
+Logout=lxde-logout

var/vabs/lxde-common/src/configs/lxpanel/LXDE/panels/panel

+# lxpanel <profile> config file. Manually editing is not recommended.
+# Use preference dialog in lxpanel to adjust config when you can.
+
+Global {
+    edge=bottom
+    allign=left
+    margin=0
+    widthtype=percent
+    width=100
+    height=26
+    transparent=0
+    tintcolor=#000000
+    alpha=0
+    autohide=0
+    heightwhenhidden=2
+    setdocktype=1
+    setpartialstrut=1
+    usefontcolor=0
+    fontsize=10
+    fontcolor=#ffffff
+    usefontsize=0
+    background=0
+    backgroundfile=/usr/share/lxpanel/images/background.png
+    iconsize=24
+    loglevel=2
+}
+
+Plugin {
+    type = space
+    Config {
+        Size=2
+    }
+}
+
+Plugin {
+    type = menu
+    Config {
+        image=/usr/share/pixmaps/menu5.png
+        system {
+        }
+        separator {
+        }
+        item {
+            command=run
+        }
+        separator {
+        }
+        item {
+            image=gnome-logout
+            command=logout
+        }
+    }
+}
+
+Plugin {
+    type = launchbar
+    Config {
+        Button {
+            id=firefox.desktop
+        }
+        Button {
+            id=pcmanfm.desktop
+        }
+        Button {
+            id=/usr/share/applications/lxterminal.desktop
+        }
+    }
+}
+
+Plugin {
+    type = space
+    Config {
+        Size=4
+    }
+}
+
+Plugin {
+    type = wincmd
+    Config {
+        image=window-manager
+        Button1=iconify
+        Button2=shade
+        Toggle=0
+    }
+}
+
+Plugin {
+    type = space
+    Config {
+        Size=4
+    }
+}
+
+Plugin {
+    type = space
+    Config {
+        Size=4
+    }
+}
+
+Plugin {
+    type = taskbar
+    expand=1
+    Config {
+        tooltips=1
+        IconsOnly=0
+        ShowAllDesks=0
+        UseMouseWheel=1
+        UseUrgencyHint=1
+        FlatButton=0
+        MaxTaskWidth=150
+        spacing=1
+        GroupedTasks=0
+    }
+}
+
+Plugin {
+    type = pager
+}
+
+Plugin {
+    type = tray
+}
+
+Plugin {
+    type = dclock
+    Config {
+        ClockFmt=%l:%M %p
+        TooltipFmt=%A %x
+        BoldFont=0
+        IconOnly=0
+        CenterText=0
+    }
+}
+

var/vabs/lxde-common/src/configs/pcmanfm/LXDE/pcmanfm.conf

+[config]
+bm_open_method=0
+su_cmd=gksu '%s'
+
+[volume]
+mount_on_startup=1
+mount_removable=1
+autorun=1
+
+[desktop]
+wallpaper_mode=1
+wallpaper_common=1
+wallpaper=/usr/share/wallpapers/VL-WildEyeWave.png
+desktop_bg=#000000
+desktop_fg=#ffffff
+desktop_shadow=#000000
+desktop_font=Sans 12
+show_wm_menu=0
+sort_type=0
+sort_by=7
+
+[ui]
+always_show_tabs=0
+max_tab_chars=32
+win_width=640
+win_height=480
+splitter_pos=150
+side_pane_mode=1
+view_mode=0
+show_hidden=0
+sort_type=0
+sort_by=0

var/vabs/lxde-common/src/configs/pcmanfm/default/pcmanfm.conf

+[config]
+bm_open_method=0
+su_cmd=gksu '%s'
+
+[volume]
+mount_on_startup=1
+mount_removable=1
+autorun=1
+
+[desktop]
+wallpaper_mode=1
+wallpaper_common=1
+wallpaper=/usr/share/wallpapers/VL-WildEyeWave.png
+desktop_bg=#000000
+desktop_fg=#ffffff
+desktop_shadow=#000000
+desktop_font=Sans 12
+show_wm_menu=0
+sort_type=0
+sort_by=7
+
+[ui]
+always_show_tabs=0
+max_tab_chars=32
+win_width=640
+win_height=480
+splitter_pos=150
+side_pane_mode=1
+view_mode=0
+show_hidden=0
+sort_type=0
+sort_by=0

var/vabs/lxde-common/src/lxde-common.SlackBuild

 
 # Use VL own theme panel config
 mkdir -p $PKG/usr/share/lxpanel/profile/LXDE/panels/
-cp $CWD/panel $PKG/usr/share/lxpanel/profile/LXDE/panels/
+mkdir -p $PKG/etc/xdg
+
+# Install panel default config
+cp -arx $CWD/configs/lxpanel $PKG/etc/xdg/
+cat $CWD/configs/lxpanel/LXDE/panels/panel > $PKG/usr/share/lxpanel/profile/LXDE/panels/panel
+
+# Install pcmanfm default config
+cp -arx $CWD/configs/pcmanfm $PKG/etc/xdg/
 
 mkdir -p $PKG/usr/share/applications
 cp lxde-logout.desktop $PKG/usr/share/applications
 sed -i -e 's#nuoveXT2#Tango#' $PKG/etc/xdg/lxsession/LXDE/desktop.conf
 
 # Patch pcmanfm.conf to use gksu-polkit instead of xdg-su
-#sed -i -e "s|su_cmd.*|su_cmd=gksu-polkit '%s'|" $PKG/etc/xdg/pcmanfm/LXDE/pcmanfm.conf
+# sed -i -e "s|su_cmd.*|su_cmd=gksu-polkit '%s'|" $PKG/etc/xdg/pcmanfm/LXDE/pcmanfm.conf
 sed -i -e "s|su_cmd.*|su_cmd=gksu '%s'|" $PKG/etc/xdg/pcmanfm/LXDE/pcmanfm.conf
 
 # Patch pcmanfm.conf to use VL theme wallpaper
-sed -i -e "s|wallpaper=/usr/share/lxde/wallpapers/lxde_blue.jpg|wallpaper=/usr/share/wallpapers/VL-Nightly.png|" \
-	$PKG/etc/xdg/pcmanfm/LXDE/pcmanfm.conf
+#sed -i -e "s|wallpaper=/usr/share/lxde/wallpapers/lxde_blue.jpg|wallpaper=/usr/share/wallpapers/VL-Nightly.png|" \
+#	$PKG/etc/xdg/pcmanfm/LXDE/pcmanfm.conf
+## ^^ M0E-lnx:  The lxde-meta package defines the default desktop background
 
 # Patch lxpanel config to use lxterminal with the correct parameters
 sed -i -e "s|lxterminal|lxterminal -e %s|" $PKG/usr/share/lxpanel/profile/LXDE/config