Commit: 36a0f3bb798bd62b4687681f96ceb29542756dda - trjp_sawfish (git)

Japanese translation of message catalog for Sawfish Window-Manager

Commit MetaInfo

• Revision: 36a0f3bb798bd62b4687681f96ceb29542756dda (tree)
• Time: 2012-04-06 05:24:32
• Author: Christopher Roy Bratusek <nano@tuxf...>
• Commiter: Christopher Roy Bratusek

Log Message

Merge branch 'misc-1.9' into local-master

Conflicts:
ChangeLog

Change Summary

• modified: ChangeLog
• modified: lisp/sawfish/cfg/shell.jl
• modified: lisp/sawfish/wm/tabs/tabgroup.jl

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,8 @@
 	* scripts/sawfish-about.jl.in: update copyright notice // show
 	codename in the about-dialog
 
+	* lisp/sawfish/cfg/shell.jl: re-align buttons
+
 2012-03-26  Christopher Roy Bratusek <[e-mail]>
 	* lisp/sawfish/wm/ext/match-window.jl
 	* lisp/sawfish/wm/ext/window-history.jl

--- a/lisp/sawfish/cfg/shell.jl
+++ b/lisp/sawfish/cfg/shell.jl
@@ -57,13 +57,15 @@
 
   (define (initialize-shell)
     (let ((vbox (gtk-vbox-new nil box-spacing))
-	  (hbox (gtk-hbutton-box-new))
+	  (hbox-a (gtk-hbutton-box-new))
+	  (hbox-b (gtk-hbutton-box-new))
 	  (s-scroller (gtk-scrolled-window-new))
 	  root-container)
 
       (setq main-window (gtk-window-new 'toplevel))
 
-      (gtk-box-set-homogeneous hbox nil)
+      (gtk-box-set-homogeneous hbox-a nil)
+      (gtk-box-set-homogeneous hbox-b nil)
       (gtk-window-set-resizable main-window t)
       (gtk-window-set-icon-name main-window "sawfish-config")
       (gtk-window-set-default-size main-window 550 400)
@@ -120,9 +122,13 @@
 
       (g-signal-connect main-window "delete_event" on-quit)
 
-	(gtk-box-set-spacing hbox button-box-spacing)
-	(gtk-button-box-set-layout hbox 'center)
-	(gtk-box-pack-end vbox hbox)
+	(gtk-box-set-spacing hbox-a button-box-spacing)
+	(gtk-button-box-set-layout hbox-a 'center)
+	(gtk-box-pack-end vbox hbox-a)
+
+	(gtk-box-set-spacing hbox-b button-box-spacing)
+	(gtk-button-box-set-layout hbox-b 'center)
+	(gtk-box-pack-end vbox hbox-b)
 	
 	(g-signal-connect ok-widget "clicked" on-ok)
 	(g-signal-connect revert-widget "clicked" on-revert)
@@ -154,14 +160,14 @@
 			   (copy-file file (concat "~/.sawfish/themes/" filex))
 			 (sawfish-config-display-info "Only tar-archives can be installed at the moment." nil)))))
 
-	(gtk-container-add hbox wiki-button)
-	(gtk-container-add hbox install-theme-label)
-	(gtk-container-add hbox install-theme-button)
-	(gtk-container-add hbox doc-button)
-	(gtk-container-add hbox edit-button)
-	(gtk-container-add hbox about-button)
-	(gtk-container-add hbox revert-widget)
-	(gtk-container-add hbox ok-widget)
+	(gtk-container-add hbox-a wiki-button)
+	(gtk-container-add hbox-b install-theme-label)
+	(gtk-container-add hbox-b install-theme-button)
+	(gtk-container-add hbox-b doc-button)
+	(gtk-container-add hbox-b edit-button)
+	(gtk-container-add hbox-a about-button)
+	(gtk-container-add hbox-a revert-widget)
+	(gtk-container-add hbox-a ok-widget)
 
       (gtk-container-add root-container vbox)
       (gtk-widget-show-all main-window)

--- a/lisp/sawfish/wm/tabs/tabgroup.jl
+++ b/lisp/sawfish/wm/tabs/tabgroup.jl
@@ -276,9 +276,11 @@ sticky, unsticky, fixed-position."
             (setq release-window t)
             (tab-delete-window-from-tab-groups w)
             (setq release-window nil))
+          (if (window-get win 'iconified) (uniconify-window win))
+          (if (window-get win 'shaded) (unshade-window win))
           (setq tab-refresh-lock nil)
+          (if (window-get w 'iconified) (uniconify-window w))
           (if (window-get w 'shaded) (unshade-window w))
-          (if (window-get win 'shaded) (unshade-window win))
           (window-put w 'frame-style group-frame-style)
           (window-put w 'type group-frame-type)
           (window-put w 'focus-mode group-frame-focus-mode)