Merge branch 'master' of https://github.com/clockworkpi/launchergo

awesome/rc.lua

@@ -180,6 +180,8 @@ local function set_wallpaper(s)
     -- Wallpaper
     if beautiful.wallpaper then
         local wallpaper = beautiful.wallpaper
+	local wallpaperpc = beautiful.wallpaperpc
+
         -- If wallpaper is a function, call it with the screen
         if type(wallpaper) == "function" then
             wallpaper = wallpaper(s)
@@ -187,8 +189,8 @@ local function set_wallpaper(s)
 
 				-- wallpaper only in PC
         if s.geometry.width > 320 then
-	        gears.wallpaper.centered(wallpaper, s, 1)
-	      end
+		gears.wallpaper.centered(wallpaperpc, s, 1)
+	end
 
     end
 end

awesome/themes/default/theme.lua

@@ -77,7 +77,8 @@ theme.titlebar_maximized_button_focus_inactive  = "/usr/share/awesome/themes/def
 theme.titlebar_maximized_button_normal_active = "/usr/share/awesome/themes/default/titlebar/maximized_normal_active.png"
 theme.titlebar_maximized_button_focus_active  = "/usr/share/awesome/themes/default/titlebar/maximized_focus_active.png"
 
-theme.wallpaper = "~/launcher/sys.py/gameshell/wallpaper/loading.png"
+theme.wallpaper = "~/launchergo/sysgo/gameshell/wallpaper/loading.png"
+theme.wallpaperpc = "~/launchergo/sysgo/gameshell/wallpaper/desktopbg.jpg"
 
 -- You can use your own layout icons like this:
 theme.layout_fairh = "/usr/share/awesome/themes/default/layouts/fairhw.png"

md5sum.log

@@ -1 +1 @@
-bc5d3392459e7c849e41c8879039f0c2 main
+5d133185096a0ca9e833990434198670 main