提交: 2e74ada9cdd651edd3c4bd7d0090a2c43dcd6405 - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• 修訂: 2e74ada9cdd651edd3c4bd7d0090a2c43dcd6405 (tree)
• 時間: 2012-04-06 04:23:01
• 作者: Christopher Roy Bratusek <nano@tuxf...>
• Commiter: Christopher Roy Bratusek

Log Message

Merge branch 'master' into local-master

Change Summary

• modified: lisp/sawfish/wm/commands/launcher.jl
• modified: lisp/sawfish/wm/integration/gnome.jl
• modified: lisp/sawfish/wm/integration/kde.jl
• add: lisp/sawfish/wm/integration/lxde.jl
• modified: lisp/sawfish/wm/integration/mate.jl
• modified: lisp/sawfish/wm/integration/razor.jl
• modified: lisp/sawfish/wm/integration/xfce.jl
• modified: lisp/sawfish/wm/user.jl

差異

--- a/lisp/sawfish/wm/commands/launcher.jl
+++ b/lisp/sawfish/wm/commands/launcher.jl
@@ -22,7 +22,8 @@
 (define-structure sawfish.wm.commands.launcher
 
     (export xterm
-	    browser)
+	    browser
+	    filemanager)
 
     (open rep
 	  rep.system
@@ -47,6 +48,12 @@
     :type string
     :group (misc apps))
 
+
+  (defcustom filemanager-program ""
+    "The program launched by the 'filemanager' function. Interpreted by shell."
+    :type string
+    :group (misc apps))
+
   (define (xterm #!optional command)
     "Start a new terminal specified by the option `xterm-program'.
 
@@ -69,15 +76,24 @@ passed."
       (system (format nil "%s %s >/dev/null 2>&1 </dev/null &"
                       browser-program url))))
 
+  (define (filemanager #!optional url)
+    "Start a new filemanager instance."
+    (if (not url)
+        (system (format nil "%s >/dev/null 2>&1 </dev/null &"
+			filemanager-program))
+      (system (format nil "%s %s >/dev/null 2>&1 </dev/null &"
+                      filemanager-program url))))
+
   ;;###autoload
   (define-command 'xterm xterm
     #:spec "sCommand:"
     #:type `(and (labelled ,(_ "Command:") string))
-    #:doc "Start a terminal. Optional command is passed with -e. The terminal is specified by variable `xterm-program' in Config -> Misc -> External Applications."
-    )
+    #:doc "Start a terminal. Optional command is passed with -e. The terminal is specified by variable `xterm-program' in Config -> Misc -> External Applications.")
   (define-command 'browser browser
     #:spec "sUrl:"
     #:type `(and (labelled ,(_ "url:") string))
-    #:doc "Start browser. Url is optional. Browser program is specified by variable `browser-program' in Config -> Misc -> External Applications."
-    )
-  )
+    #:doc "Start browser. Url is optional. Browser program is specified by variable `browser-program' in Config -> Misc -> External Applications.")
+  (define-command 'filemanager filemanager
+    #:spec "sUrl:"
+    #:type `(and (labelled ,(_ "url:") string))
+    #:doc "Start filemanager. Url is optional. filemanager program is specified by variable `filemanager-program' in Config -> Misc -> External Applications."))

--- a/lisp/sawfish/wm/integration/gnome.jl
+++ b/lisp/sawfish/wm/integration/gnome.jl
@@ -45,6 +45,10 @@
       (unless (variable-customized-p 'browser-program)
 	(setq browser-program "gnome-www-browser"))
 
+      ;; use the GNOME filemanager
+      (unless (variable-customized-p 'filemanager-program)
+	(setq filemanager-program "nautilus"))
+
       ;; add some GNOME menu-entries
       (when (setq menu (assoc (_ "_Help") root-menu))
 	(nconc menu `(()
@@ -68,6 +72,7 @@
   ;; Returns nil if gnome is not found.
   ;; If detected, returns t, and do also gnome support init.
   (define (detect-gnome)
-    (when (getenv "GNOME_DESKTOP_SESSION_ID")
+    (when (or (equal (getenv "XDG_CURRENT_DESKTOP") "GNOME")
+              (getenv "GNOME_DESKTOP_SESSION_ID"))
       (init)
       t)))

--- a/lisp/sawfish/wm/integration/kde.jl
+++ b/lisp/sawfish/wm/integration/kde.jl
@@ -52,6 +52,10 @@
       (unless (variable-customized-p 'browser-program)
 	(setq browser-program "konqueror"))
 
+      ;; use the KDE filemanager
+      (unless (variable-customized-p 'filemanager-program)
+	(setq filemanager-program "dolphin"))
+
       ;; add some KDE help menus
       (when (setq menu (assoc (_ "_Help") root-menu))
 	(nconc menu `(()
@@ -80,11 +84,12 @@
 			(system "qdbus org.kde.kded /org/freedesktop/PowerManagement Suspend &"))
 		      (,(_ "_Hibernate from KDE")
 			(system "qdbus org.kde.kded /org/freedesktop/PowerManagement Hibernate &")))))))
-  
+
   ;; Returns nil if kde is not found.
   ;; If detected, returns t, and do also kde support init.
   (define (detect-kde)
-    (when (getenv "KDE_FULL_SESSION")
+    (when (or (equal (getenv "XDG_CURRENT_DESKTOP") KDE)
+              (getenv "KDE_FULL_SESSION"))
       (init)
       t))
 

--- /dev/null
+++ b/lisp/sawfish/wm/integration/lxde.jl
@@ -0,0 +1,73 @@
+;; lxde.jl -- LXDE integration
+
+;; Copyright (C) 2012 Christopher Roy Bratusek <[e-mail]>
+
+;; This file is part of sawfish.
+
+;; sawfish is free software; you can redistribute it and/or modify it
+;; under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; sawfish is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with sawfish; see the file COPYING.  If not, write to
+;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+
+(define-structure sawfish.wm.integration.lxde
+
+    (export detect-lxde)
+
+    (open rep
+	  rep.system
+          sawfish.wm.menus
+	  sawfish.wm.misc
+          sawfish.wm.custom
+	  sawfish.wm.windows
+          sawfish.wm.commands
+          sawfish.wm.commands.launcher)
+
+  (define-structure-alias lxde-int sawfish.wm.integration.lxde)
+
+  (define (init)
+    (let (menu)
+      (setq desktop-environment "lxde")
+      (setq want-poweroff-menu nil)
+
+      ;; invoke the LXDE terminal instead of xterm
+        (unless (variable-customized-p 'xterm-program)
+		(setq xterm-program "lxterm"))
+
+      ;; use the LXDE help browser and url launcher
+      ;;
+      ;; XXX LXDE does not come with a default browser
+      ;; XXX candidate for int: ??
+      ;;
+      ;; (unless (variable-customized-p 'browser-program)
+      ;; 	(setq browser-program "lxde-www-browser"))
+
+      ;; use the LXDE filemanager
+      (unless (variable-customized-p 'filemanager-program)
+	(setq filemanager-program "pcmanfm"))
+
+      ;; add some LXDE menu-entries
+      (when (setq menu (assoc (_ "_Help") root-menu))
+	(nconc menu `(()
+		      (,(_ "LXDE _Website") (browser "http://www.lxde.org")))))
+
+      ;; add lxde-logout and customize menu-entries
+      (when (setq menu (assoc (_ "Sessi_on") root-menu))
+	(nconc menu `(()
+		      (,(_ "_LXSession Logout") (system "lxsession-logout &")))))
+
+  ;; Returns nil if lxde is not found.
+  ;; If detected, returns t, and do also lxde support init.
+  (define (detect-lxde)
+    (when (or (equal (getenv "XDG_CURRENT_DESKTKOP") "LXDE")
+	      (equal (getenv "DESKTOP_SESSION") "LXDE"))
+      (init)
+      t)))

--- a/lisp/sawfish/wm/integration/mate.jl
+++ b/lisp/sawfish/wm/integration/mate.jl
@@ -45,6 +45,10 @@
       (unless (variable-customized-p 'browser-program)
 	(setq browser-program "mate-www-browser"))
 
+      ;; use the MATE filemanager
+      (unless (variable-customized-p 'filemanager-program)
+	(setq filemanager-program "caja"))
+
       ;; add some MATE menu-entries
       (when (setq menu (assoc (_ "_Help") root-menu))
 	(nconc menu `(()
@@ -68,6 +72,7 @@
   ;; Returns nil if mate is not found.
   ;; If detected, returns t, and do also mate support init.
   (define (detect-mate)
-    (when (getenv "MATE_DESKTOP_SESSION_ID")
+    (when (or (equal (getenv "XDG_CURRENT_DESKTOP") "MATE")
+              (getenv "MATE_DESKTOP_SESSION_ID"))
       (init)
       t)))

--- a/lisp/sawfish/wm/integration/razor.jl
+++ b/lisp/sawfish/wm/integration/razor.jl
@@ -31,7 +31,7 @@
           sawfish.wm.commands
           sawfish.wm.commands.launcher)
 
-  (define-structure-alias razor-int sawfish.wm.integration.mate)
+  (define-structure-alias razor-int sawfish.wm.integration.razor)
 
   (define (init)
     (let (menu)
@@ -54,6 +54,14 @@
       ;; (unless (variable-customized-p 'browser-program)
       ;; 	(setq browser-program "razor-www-browser"))
 
+      ;; use the Razor-Qt filemanager
+      ;;
+      ;; XXX Razor-Qt does not come with a default filemanager
+      ;; XXX candidate: ??
+      ;;
+      ;; (unless (variable-customized-p 'filemanager-program)
+      ;;   (setq filemanager-program "razor-fm"))
+
       ;; add some Razor-Qt menu-entries
       (when (setq menu (assoc (_ "_Help") root-menu))
 	(nconc menu `(()
@@ -80,7 +88,8 @@
   ;; Returns nil if razor is not found.
   ;; If detected, returns t, and do also razor support init.
   (define (detect-razor)
-    (when (or (equal (getenv "DESKTOP_SESSION") "razor")
+    (when (or (equal (getenv "XDG_CURRENT_DESKTKOP") "Razor")
+	      (equal (getenv "DESKTOP_SESSION") "razor")
 	      (get-window-by-class "Razor-desktop" #:regex t))
       (init)
       t)))

--- a/lisp/sawfish/wm/integration/xfce.jl
+++ b/lisp/sawfish/wm/integration/xfce.jl
@@ -45,6 +45,10 @@
       (unless (variable-customized-p 'browser-program)
 	(setq browser-program "midori"))
 
+      ;; use the XFCE filemanager
+      (unless (variable-customized-p 'filemanager-program)
+	(setq filemanager-program "thunar"))
+
       ;; add some XFCE help menus
       (when (setq menu (assoc (_ "_Help") root-menu))
 	(nconc menu `(()
@@ -77,6 +81,7 @@
   ;; Returns nil if xfce is not found.
   ;; If detected, returns t, and do also xfce support init.
   (define (detect-xfce)
-    (when (get-x-property 'root '_DT_SAVE_MODE)
+    (when (or (get-x-property 'root '_DT_SAVE_MODE)
+              (equal (getenv "XDG_CURRENT_DESKTOP") "XFCE"))
       (init)
       t)))

--- a/lisp/sawfish/wm/user.jl
+++ b/lisp/sawfish/wm/user.jl
@@ -55,7 +55,8 @@
 	     sawfish.wm.integration.gnome
 	     sawfish.wm.integration.xfce
 	     sawfish.wm.integration.mate
-	     sawfish.wm.integration.razor)
+	     sawfish.wm.integration.razor
+	     sawfish.wm.integration.lxde)
 
      (set-binds))
 
@@ -63,10 +64,10 @@
   ;; 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\" or \"none\".")
+Possible values are \"kde\", \"gnome\", \"mate\", \"xfce\", \"razor\", \"lxde\" or \"none\".")
 
   (defvar want-poweroff-menu t
-    "Add poweroff menu if you don't use GNOME / KDE / XFCE.")
+    "Add poweroff menu if you don't use GNOME / KDE / XFCE / Razor-Qt / LXDE.")
 
   (setq *user-structure* 'user)
 
@@ -108,7 +109,8 @@ Possible values are \"kde\", \"gnome\", \"mate\", \"xfce\", \"razor\" or \"none\
 	(sawfish.wm.integration.mate#detect-mate)
 	(sawfish.wm.integration.kde#detect-kde)
 	(sawfish.wm.integration.xfce#detect-xfce)
-	(sawfish.wm.integration.razor#detect-razor))
+	(sawfish.wm.integration.razor#detect-razor)
+	(sawfish.wm.integration.lxde#detect-lxde))
     )
 
   ;; Don't signal an error even if user "require" them. These modules