提交: 307be684bdf19f12b47485c30ac6a390b5ec3af0 - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• 修訂: 307be684bdf19f12b47485c30ac6a390b5ec3af0 (tree)
• 時間: 2012-04-06 04:50:28
• 作者: Christopher Roy Bratusek <nano@tuxf...>
• Commiter: Christopher Roy Bratusek

Log Message

Merge branch 'master' into local-master

Conflicts:
ChangeLog

Change Summary

• modified: ChangeLog
• modified: configure.in
• modified: lisp/sawfish/wm/integration/kde.jl
• modified: lisp/sawfish/wm/integration/lxde.jl
• modified: lisp/sawfish/wm/menus.jl
• modified: lisp/sawfish/wm/user.jl

差異

--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,24 @@
 	* lisp/sawfish/wm/ext/expose.jl
 	* lisp/sawfish/wm/edge/misc.jl: fixup expose action
 
+	* lisp/sawfish/wm/commands/launcher.jl: add filemanager launcher
+
+	* lisp/sawfish/wm/menus.jl
+	* lisp/sawfish/wm/user.jl: if filemanager is set, provide 'Open Home'
+	entry in Sawfish's root-menu
+
+	* lisp/sawfish/wm/integration/mate.jl
+	* lisp/sawfish/wm/integration/razor-qt.jl
+	* lisp/sawfish/wm/integration/kde.jl
+	* lisp/sawfish/wm/integration/gnome.jl
+	* lisp/sawfish/wm/integration/xfce.jl: try to match against
+	XDG_CURRENT_DESKTOP to detect desktop -- add desktop specific entries
+	for filemanager launcher
+
+	* lisp/sawfish/wm/integration/lxde.jl: LXDE integration module
+
+	* configure.in: bump version to 1.8.99 "Housenation"
+
 2012-03-26  Christopher Roy Bratusek <[e-mail]>
 	* lisp/sawfish/wm/ext/match-window.jl
 	* lisp/sawfish/wm/ext/window-history.jl

--- a/configure.in
+++ b/configure.in
@@ -27,9 +27,9 @@ AC_CONFIG_MACRO_DIR([m4])
 AM_PROG_LIBTOOL
 
 dnl Release versioning info
-version="1.8.92"
+version="1.8.99"
 subversion=""
-codename="Coldwater Canyon"
+codename="Housenation"
 
 VERSION=${version}
 

--- a/lisp/sawfish/wm/integration/kde.jl
+++ b/lisp/sawfish/wm/integration/kde.jl
@@ -88,7 +88,7 @@
   ;; Returns nil if kde is not found.
   ;; If detected, returns t, and do also kde support init.
   (define (detect-kde)
-    (when (or (equal (getenv "XDG_CURRENT_DESKTOP") KDE)
+    (when (or (equal (getenv "XDG_CURRENT_DESKTOP") "KDE")
               (getenv "KDE_FULL_SESSION"))
       (init)
       t))

--- a/lisp/sawfish/wm/integration/lxde.jl
+++ b/lisp/sawfish/wm/integration/lxde.jl
@@ -62,7 +62,7 @@
       ;; add lxde-logout and customize menu-entries
       (when (setq menu (assoc (_ "Sessi_on") root-menu))
 	(nconc menu `(()
-		      (,(_ "_LXSession Logout") (system "lxsession-logout &")))))
+		      (,(_ "_LXSession Logout") (system "lxsession-logout &")))))))
 
   ;; Returns nil if lxde is not found.
   ;; If detected, returns t, and do also lxde support init.

--- a/lisp/sawfish/wm/menus.jl
+++ b/lisp/sawfish/wm/menus.jl
@@ -181,9 +181,7 @@ before killing it.")
        (,(_ "Sawfish _Wiki") help:show-homepage)
        (,(_ "Sawfish _Manual") help:show-programmer-manual)
        ()
-       (,(_ "_About Sawfish") help:about))
-      ()
-      (,(_ "_Kill Window") (system "xkill &"))))
+       (,(_ "_About Sawfish") help:about))))
 
   (defvar apps-menu)
 

--- a/lisp/sawfish/wm/user.jl
+++ b/lisp/sawfish/wm/user.jl
@@ -50,7 +50,8 @@
 	   sawfish.wm.edge.conf
 	   sawfish.wm.edge.actions
 	   sawfish.wm.frames
-	   sawfish.wm.menus)
+	   sawfish.wm.menus
+	   sawfish.wm.commands.launcher)
      (access sawfish.wm.integration.kde
 	     sawfish.wm.integration.gnome
 	     sawfish.wm.integration.xfce
@@ -61,7 +62,7 @@
      (set-binds))
 
   ;; "none" looks ugly, but if you are to change it to "", fix
-  ;; apps-menu, too, or it will break. 
+  ;; apps-menu, too, or it will break.
   (defvar desktop-environment "none"
     "Running desktop environment, detected by Sawfish.
 Possible values are \"kde\", \"gnome\", \"mate\", \"xfce\", \"razor\", \"lxde\" or \"none\".")
@@ -158,6 +159,15 @@ Possible values are \"kde\", \"gnome\", \"mate\", \"xfce\", \"razor\", \"lxde\"
   (when (equal desktop-environment "kde")
     (sawfish.wm.integration.kde#kde-late-init))
 
+  (if (equal filemanager "")
+      (let ((menu root-menu))
+        (nconc menu `(()
+                      (,(_ "_Kill Window") (system "xkill &")))))
+    (let ((menu root-menu))
+      (nconc menu `(()
+                    (,(_ "_Open Home") (filemanager "~"))
+                    (,(_ "_Kill Window") (system "xkill &"))))))
+
   ;; generate apps-menu from *.desktop files
   (unless batch-mode
     (init-apps-menu))