Wikia

Sawfish

Drop *.jl.gnome

773pages on
this wiki
Talk0
Browse all patches

Author Edit

Sir Raorn (ALT-Linux/Original Patch)

Christopher Bratusek (Dropping *.jl.gnome/Additional Work)

Synopsis Edit

This patch fully drops *.jl.gnome. Currently sawfish's configure script knows --enable-gnome-widgets, which will load *.jl.gnome instead of *.jl.gtk (icon.jl.gnome instead of icon.jl.gtk for example), since *.jl.gnome depends on rep-libgnome, rep-libgnomeui, rep-libgnomecanvas (part of rep-gtk) which depend on deprecated libs, I want to drop those files. Instead make the *.jl.gtk default, also remove the .gtk suffix, which is unnessacary then, if there's only one possibility. I want to drop libgnome/libgnomeui/libgnomecanvas from rep-gtk, but I first need to drop those files from sawfish.

Patch testing Edit

  1. Copy/paste the patch listed below into some file, eg. TEST.diff.
  2. If you don't have sawfish sources yet, have one, as described get it from GIT repo.
  3. Go into the directory where sawfish sources reside, eg. cd sawfish
  4. Test if the patch applies cleanly with this command:
    patch -p1 --ignore-whitespace --dry-run < TEST.diff
    in case of problems try also: -p0 or -p2
  5. If it applies cleanly, then remove the --dry-run from above command and run it again, otherwise ask on the mailing list.
  6. Compile sawfish: ./autogen.sh && make
  7. Install it for testing, but it depends on your linux distribution.
    1. It is always better to install sawfish as your distribution package, but it is different for each distribution.
    2. So you may try make install, which will install sawifish in /usr/local/share/sawfish/ (if you have write access). But then make sure that you run the correct version and delete it from that directory afterwards, to avoid any conflicts.
  8. Se also

PS: edit this template if you feel that those instructions can be improved.

Patch Edit

Index: lisp/sawfish/wm/gnome/menus.jl
===================================================================
--- lisp/sawfish/wm/gnome/menus.jl	(Revision 4325)
+++ lisp/sawfish/wm/gnome/menus.jl	(Arbeitskopie)
@@ -36,29 +36,13 @@
 
 ;;; variables
 
-  (defvar gnome-share-directory
-    ;; search $PATH for a known GNOME binary..
-    (catch 'out
-      (let ((path (getenv "PATH"))
-	    (point 0)
-	    end tem)
-	(while (< point (length path))
-	  (setq end (if (string-match ":" path point)
-			(match-start)
-		      (length path)))
-	  (setq tem (substring path point end))
-	  (when (file-exists-p (expand-file-name "gnome-session" tem))
-	    (throw 'out (expand-file-name "../share/gnome" tem)))
-	  (setq point (1+ end))))
-      ;; default to /usr/share/gnome, better than nothing at all
-      "/usr/share/gnome"))
-
-  (defvar gnome-menu-lang (let ((lang (or (getenv "LANGUAGE")
-					  (getenv "LC_ALL")
+  (defvar gnome-menu-lang (let ((lang (or (getenv "LC_ALL")
 					  (getenv "LC_MESSAGES")
 					  (getenv "LANG")))
 				(all '()))
-			    (when (and lang (not (string= lang "en")))
+			    (when (and lang (not (or (string= lang "C")
+						     (string= lang "POSIX")
+						     (string= lang "en"))))
 			      (setq all (cons lang all))
 			      (when (string-match "[.@]" lang)
 				(setq lang (substring lang 0 (match-start)))
@@ -69,12 +53,9 @@
 			    all)
     "List of language codes used when constructing GNOME menus.")
 
-  (defvar gnome-menu-roots (list (expand-file-name
-				  "apps" gnome-share-directory)
-				 "/etc/X11/applnk"	;on RedHat systems
-				 "/usr/share/applications"
-				 "/var/lib/menu-xdg/applications/menu-xdg"
-				 "~/.gnome/apps")
+  (defvar gnome-menu-roots (list "/etc/X11/applnk"	;on RedHat systems
+  				"/usr/share/applications"
+    				"~/.local/share/applications")
     "List of directories to read GNOME menu entries from.")
 
   ;; previously read menus
Index: lisp/sawfish/gtk/Makefile.in
===================================================================
--- lisp/sawfish/gtk/Makefile.in	(Revision 4325)
+++ lisp/sawfish/gtk/Makefile.in	(Arbeitskopie)
@@ -27,7 +27,6 @@
 srcdir=@srcdir@
 VPATH=@srcdir@:@top_srcdir@
 
-REP_GTK_GNOME=@REP_GTK_GNOME@
 REP_ENVIRON:=$(REP_ENVIRON) REP_LOAD_PATH=$(top_srcdir)/lisp
 
 SRCS :=	color-preview.jl	\
@@ -51,20 +50,11 @@
 ALL_SRCS := $(SRCS) $(W_SRCS)
 ALL_OBJS := $(OBJS) $(W_OBJS)
 
-ifeq ($(REP_GTK_GNOME),yes)
-STOCK_SRC := stock.jl.gnome
-else
-STOCK_SRC := stock.jl.gtk
-endif
-
 %.jlc : %.jl
 	$(REP_ENVIRON) rep compiler -f compile-batch $<
 
 all : $(ALL_SRCS) $(ALL_OBJS)
 
-stock.jl : $(STOCK_SRC) ./Makefile
-	cp $< $@
-
 install : all installdirs
 	set -e; for p in $(SRCS) $(OBJS); do \
 	  $(INSTALL_DATA) $$p $(DESTDIR)${lispdir}/sawfish/gtk; \
@@ -90,6 +80,6 @@
 	rm -f widgets/*~ widgets/*.jlc
 
 realclean distclean : clean
-	rm -f Makefile stock.jl
+	rm -f Makefile
 
 .PHONY: all install uninstall clean realclean distclean
Index: lisp/sawfish/gtk/stock.jl
===================================================================
--- lisp/sawfish/gtk/stock.jl	(Revision 0)
+++ lisp/sawfish/gtk/stock.jl	(Revision 0)
@@ -0,0 +1,113 @@
+#| nokogiri-no-gnome.jl -- workaround lack of GNOME widgets -*- lisp -*-
+
+   $Id: stock.jl.gtk,v 1.9 2003/01/12 20:30:43 jsh Exp $
+
+   Copyright (C) 2000 John Harper <john@dcs.warwick.ac.uk>
+
+   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.gtk.stock
+
+    (export stock-button
+	    simple-dialog
+	    about-dialog
+	    make-url-widget)
+
+    (open rep
+	  gui.gtk-2.gtk
+	  sawfish.gtk.widget)
+
+  ;; same as in gnome now
+  (define (stock-button type)
+    (gtk-button-new-from-stock
+     (case type
+       ((ok) "gtk-ok")
+       ((cancel) "gtk-cancel")
+       ((revert) "gtk-revert-to-saved")
+       ((apply) "gtk-apply")
+       ((yes) "gtk-yes")
+       ((no) "gtk-no")
+       ((close) "gtk-close")
+       ((help) "gtk-help"))))
+
+  (define (simple-dialog title widget #!optional ok-callback main-window)
+
+    (let ((window (gtk-window-new 'toplevel))
+	  (vbox (gtk-vbox-new nil box-spacing))
+	  (hbbox (gtk-hbutton-box-new))
+	  (ok (stock-button 'ok))
+	  (cancel (and ok-callback (stock-button 'cancel))))
+
+      (define (on-cancel)
+	(gtk-widget-destroy window))
+
+      (define (on-ok)
+	(ok-callback)
+	(gtk-widget-destroy window))
+	  
+      (gtk-window-set-title window title)
+      (gtk-window-set-wmclass window "ok_cancel_dialog" "Nokogiri")
+      (gtk-container-set-border-width window box-border)
+      (when main-window
+	(gtk-window-set-transient-for window main-window))
+
+      (gtk-box-set-spacing hbbox button-box-spacing)
+      (gtk-button-box-set-layout hbbox 'end)
+      (when cancel
+	(gtk-box-pack-end hbbox cancel))
+      (gtk-box-pack-end hbbox ok)
+      (gtk-box-pack-end vbox hbbox)
+      (gtk-container-add window vbox)
+      (gtk-widget-show-all vbox)
+
+      (gtk-container-add vbox widget)
+
+      (when cancel
+	(g-signal-connect cancel "clicked" on-cancel))
+      (g-signal-connect ok "clicked" (if ok-callback on-ok on-cancel))
+      (g-signal-connect window "delete_event" on-cancel)
+
+      (gtk-widget-show window)
+      (gtk-window-set-modal window t)
+      (gtk-widget-grab-focus widget)
+
+      window))
+
+  (define (about-dialog title version copyright
+			authors comments #!key logo extra)
+    (declare (unused logo))
+    (let* ((box (gtk-vbox-new nil 4))
+	   (text-view (gtk-text-view-new))
+	   (text-buffer (gtk-text-view-get-buffer text-view)))
+      (define (insert s)
+	(gtk-text-buffer-insert-at-cursor text-buffer s (length s)))
+      (insert (format nil "%s %s\n" title version))
+      (insert (format nil "%s\n\n" copyright))
+      (when authors
+	(insert "Authors:\n")
+	(mapc (lambda (x) (insert (format nil "    %s\n" x))) authors))
+      (insert (format nil "\n%s\n" comments))
+      (gtk-text-view-set-editable text-view nil)
+      (gtk-container-add box text-view)
+      (when extra
+	(gtk-box-pack-end box extra))
+      (gtk-widget-show-all box)
+      (simple-dialog "About" box)))
+
+  (define (make-url-widget url label)
+    (gtk-label-new (format nil "%s <%s>" label url))))

Eigenschaftsänderungen: lisp/sawfish/gtk/stock.jl
___________________________________________________________________
Hinzugefügt: svn:mergeinfo

Index: lisp/sawfish/gtk/stock.jl.gnome
===================================================================
--- lisp/sawfish/gtk/stock.jl.gnome	(Revision 4325)
+++ lisp/sawfish/gtk/stock.jl.gnome	(Arbeitskopie)
@@ -1,81 +0,0 @@
-#| nokogiri-gnome.jl -- some code to use GNOME widgets -*- lisp -*-
-
-   $Id: stock.jl.gnome,v 1.8 2003/01/12 20:30:43 jsh Exp $
-
-   Copyright (C) 2000 John Harper <john@dcs.warwick.ac.uk>
-
-   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.gtk.stock
-
-    (export stock-button
-	    simple-dialog
-	    about-dialog
-	    make-url-widget)
-
-    (open rep
-	  gui.gtk-2.gtk
-	  gui.gtk-2.gnome-ui)
-
-  ;; same as in gtk now
-  (define (stock-button type)
-    (gtk-button-new-from-stock
-     (case type
-       ((ok) "gtk-ok")
-       ((cancel) "gtk-cancel")
-       ((revert) "gtk-revert-to-saved")
-       ((apply) "gtk-apply")
-       ((yes) "gtk-yes")
-       ((no) "gtk-no")
-       ((close) "gtk-close")
-       ((help) "gtk-help"))))
-
-  (define (simple-dialog title widget #!optional ok-callback main-window)
-
-    (let ((window (gnome-dialog-new title (if ok-callback
-					      '(ok cancel)
-					    '(ok)))))
-
-      (gtk-window-set-wmclass window "ok_cancel_dialog" "Nokogiri")
-      (when main-window
-	(gnome-dialog-set-parent window main-window))
-      (gtk-container-add (gnome-dialog-vbox window) widget)
-
-      (g-signal-connect window "clicked"
-			(lambda (w button)
-			  (if (and (= button 0) ok-callback)
-			      (ok-callback))
-			  (gtk-widget-destroy w)))
-      (g-signal-connect window "delete_event" gtk-widget-destroy)
-
-      (gtk-widget-show window)
-      (gtk-window-set-modal window t)
-      (gtk-widget-grab-focus widget)
-
-      window))
-
-  (define (about-dialog title version copyright
-			authors comments #!key logo extra)
-    (let ((widget (gnome-about-new title version copyright
-				   authors comments logo)))
-      (when extra
-	(gtk-box-pack-start (gnome-dialog-vbox widget) extra t))
-      (gtk-widget-show widget)
-      widget))
-
-  (define (make-url-widget url label) (gnome-href-new url label)))
Index: lisp/sawfish/gtk/stock.jl.gtk
===================================================================
--- lisp/sawfish/gtk/stock.jl.gtk	(Revision 4325)
+++ lisp/sawfish/gtk/stock.jl.gtk	(Arbeitskopie)
@@ -1,113 +0,0 @@
-#| nokogiri-no-gnome.jl -- workaround lack of GNOME widgets -*- lisp -*-
-
-   $Id: stock.jl.gtk,v 1.9 2003/01/12 20:30:43 jsh Exp $
-
-   Copyright (C) 2000 John Harper <john@dcs.warwick.ac.uk>
-
-   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.gtk.stock
-
-    (export stock-button
-	    simple-dialog
-	    about-dialog
-	    make-url-widget)
-
-    (open rep
-	  gui.gtk-2.gtk
-	  sawfish.gtk.widget)
-
-  ;; same as in gnome now
-  (define (stock-button type)
-    (gtk-button-new-from-stock
-     (case type
-       ((ok) "gtk-ok")
-       ((cancel) "gtk-cancel")
-       ((revert) "gtk-revert-to-saved")
-       ((apply) "gtk-apply")
-       ((yes) "gtk-yes")
-       ((no) "gtk-no")
-       ((close) "gtk-close")
-       ((help) "gtk-help"))))
-
-  (define (simple-dialog title widget #!optional ok-callback main-window)
-
-    (let ((window (gtk-window-new 'toplevel))
-	  (vbox (gtk-vbox-new nil box-spacing))
-	  (hbbox (gtk-hbutton-box-new))
-	  (ok (stock-button 'ok))
-	  (cancel (and ok-callback (stock-button 'cancel))))
-
-      (define (on-cancel)
-	(gtk-widget-destroy window))
-
-      (define (on-ok)
-	(ok-callback)
-	(gtk-widget-destroy window))
-	  
-      (gtk-window-set-title window title)
-      (gtk-window-set-wmclass window "ok_cancel_dialog" "Nokogiri")
-      (gtk-container-set-border-width window box-border)
-      (when main-window
-	(gtk-window-set-transient-for window main-window))
-
-      (gtk-box-set-spacing hbbox button-box-spacing)
-      (gtk-button-box-set-layout hbbox 'end)
-      (when cancel
-	(gtk-box-pack-end hbbox cancel))
-      (gtk-box-pack-end hbbox ok)
-      (gtk-box-pack-end vbox hbbox)
-      (gtk-container-add window vbox)
-      (gtk-widget-show-all vbox)
-
-      (gtk-container-add vbox widget)
-
-      (when cancel
-	(g-signal-connect cancel "clicked" on-cancel))
-      (g-signal-connect ok "clicked" (if ok-callback on-ok on-cancel))
-      (g-signal-connect window "delete_event" on-cancel)
-
-      (gtk-widget-show window)
-      (gtk-window-set-modal window t)
-      (gtk-widget-grab-focus widget)
-
-      window))
-
-  (define (about-dialog title version copyright
-			authors comments #!key logo extra)
-    (declare (unused logo))
-    (let* ((box (gtk-vbox-new nil 4))
-	   (text-view (gtk-text-view-new))
-	   (text-buffer (gtk-text-view-get-buffer text-view)))
-      (define (insert s)
-	(gtk-text-buffer-insert-at-cursor text-buffer s (length s)))
-      (insert (format nil "%s %s\n" title version))
-      (insert (format nil "%s\n\n" copyright))
-      (when authors
-	(insert "Authors:\n")
-	(mapc (lambda (x) (insert (format nil "    %s\n" x))) authors))
-      (insert (format nil "\n%s\n" comments))
-      (gtk-text-view-set-editable text-view nil)
-      (gtk-container-add box text-view)
-      (when extra
-	(gtk-box-pack-end box extra))
-      (gtk-widget-show-all box)
-      (simple-dialog "About" box)))
-
-  (define (make-url-widget url label)
-    (gtk-label-new (format nil "%s <%s>" label url))))
Index: lisp/sawfish/ui/Makefile.in
===================================================================
--- lisp/sawfish/ui/Makefile.in	(Revision 4325)
+++ lisp/sawfish/ui/Makefile.in	(Arbeitskopie)
@@ -27,15 +27,8 @@
 srcdir=@srcdir@
 VPATH=@srcdir@:@top_srcdir@
 
-REP_GTK_GNOME=@REP_GTK_GNOME@
 REP_ENVIRON:=$(REP_ENVIRON) REP_LOAD_PATH=$(top_srcdir)/lisp
 
-ifeq ($(REP_GTK_GNOME),yes)
- GNOME:=
-else
- GNOME:=gtk/
-endif
-
 SRCS :=	apply.jl		\
 	config.jl		\
 	group.jl		\
@@ -52,8 +45,8 @@
 	widgets/keymap.jl	\
 	widgets/match-window.jl \
 	widgets/modifier-list.jl \
-	widgets/$(GNOME)workspace-geometry.jl \
-	widgets/$(GNOME)icon.jl
+	widgets/workspace-geometry.jl \
+	widgets/icon.jl		
 
 L_SRCS := layouts/keymaps.jl
 
Index: lisp/sawfish/ui/widgets/workspace-geometry.jl
===================================================================
--- lisp/sawfish/ui/widgets/workspace-geometry.jl	(Revision 4325)
+++ lisp/sawfish/ui/widgets/workspace-geometry.jl	(Arbeitskopie)
@@ -1,6 +1,6 @@
 #| nokogiri-widgets/workspace-geometry.jl
 
-   $Id: workspace-geometry.jl,v 1.9 2003/01/12 20:30:49 jsh Exp $
+   $Id: workspace-geometry.jl,v 1.1 2000/09/01 20:03:29 john Exp $
 
    Copyright (C) 2000 John Harper <john@dcs.warwick.ac.uk>
 
@@ -21,131 +21,16 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-;; GNOME version of this widget
+;; GNOME-less version of this widget
 
 (define-structure sawfish.ui.widgets.workspace-geometry ()
 
     (open rep
-	  gui.gtk-2.gtk
-	  gui.gtk-2.gnome-canvas
-	  rep.io.files
-	  sawfish.gtk.widget
-	  sawfish.ui.layout)
+	  sawfish.gtk.widget)
 
-  (defconst canvas-width 100)
-  (defconst canvas-height 100)
-
-  (define (locate-file filename dirs)
-    (let loop ((rest dirs))
-      (cond ((null rest) nil)
-	    ((file-exists-p (expand-file-name filename (car rest)))
-	     (expand-file-name filename (car rest)))
-	    (t (loop (cdr rest))))))
-
-  (define monitor-pixbuf-file
-    (local-file-name (locate-file "../monitor.png" load-path)))
-
-  (define monitor-pixbuf (gdk-pixbuf-new-from-file monitor-pixbuf-file))
-
-  (define (make-workspace-geometry-item changed-callback #!optional doc)
-    (let* ((canvas (gnome-canvas-new))
-	   (vbox (gtk-vbox-new nil box-spacing))
-	   (hbox (gtk-hbox-new nil box-spacing))
-	   canvas-items widget)
-
-      (define (erase-canvas)
-	(mapc gtk-object-destroy canvas-items)
-	(setq canvas-items '()))
-
-      (define (draw-line x1 y1 x2 y2)
-	(let ((item (gnome-canvas-item-new (gnome-canvas-root canvas)
-					   'GnomeCanvasLine
-					   `(points ,(list x1 y1 x2 y2)
-					     fill_color "black"
-					     line_style on-off-dash))))
-	  (setq canvas-items (cons item canvas-items))
-	  item))
-
-      (define (draw-rect x1 y1 x2 y2)
-	(let ((item (gnome-canvas-item-new (gnome-canvas-root canvas)
-					   'GnomeCanvasRect
-					   (list 'x1 x1 'y1 y1
-						 'x2 x2 'y2 y2
-						 'fill_color "grey90"
-						 'outline_color "black"))))
-	  (setq canvas-items (cons item canvas-items))
-	  item))
-
-      (define (draw-image pixbuf x y)
-	(let ((item (gnome-canvas-item-new (gnome-canvas-root canvas)
-					   'GnomeCanvasPixbuf
-					   (list 'pixbuf pixbuf
-						 'x x 'y y))))
-	  (setq canvas-items (cons item canvas-items))
-	  item))
-
-      (define (draw-canvas)
-	(let* ((dims (widget-ref widget))
-	       (spaces (car dims))
-	       (port-dims (cdr dims)))
-	  (let* ((space-step 10)
-		 (space-size (- canvas-width (* (1- spaces) space-step)))
-		 (x-step (floor (/ space-size (car port-dims))))
-		 (y-step (floor (/ space-size (cdr port-dims)))))
-	    (do ((i (1- spaces) (1- i)))
-		((< i 0))
-	      (draw-rect (* i space-step)
-			 (* i space-step)
-			 (+ (* i space-step) space-size)
-			 (+ (* i space-step) space-size)))
-	    (do ((i 1 (1+ i)))
-		((= i (car port-dims)))
-	      (draw-line (* i x-step) 0
-			 (* i x-step) space-size))
-	    (do ((i 1 (1+ i)))
-		((= i (cdr port-dims)))
-	      (draw-line 0 (* i y-step)
-			 space-size (* i y-step)))
-	    (draw-image (gdk-pixbuf-scale-simple monitor-pixbuf
-						 (- x-step 4) (- y-step 4)
-						 'bilinear) 2 2))))
-
-      (define (update-canvas)
-	(erase-canvas)
-	(draw-canvas))
-
-      (define (changed)
-	(call-callback changed-callback)
-	(update-canvas))
-
-      (setq widget (make-widget
-		    `(pair (labelled ,(_ "Workspaces:")
-				     (number 1))
-			   (pair (labelled ,(_ "Columns:") (number 1))
-				 (labelled ,(_ "Rows:") (number 1))) t)
-		    changed))
-
-      (gtk-widget-set-usize canvas (+ canvas-width 10) (+ canvas-height 10))
-      (gnome-canvas-set-scroll-region canvas 0 0 canvas-width canvas-height)
-
-      (when doc
-	(gtk-container-add vbox (make-label (remove-newlines doc))))
-      (gtk-container-add vbox (widget-gtk-widget widget))
-      (gtk-container-add hbox vbox)
-      (gtk-container-add hbox canvas)
-      (gtk-widget-show-all hbox)
-      (draw-canvas)
-
-      (lambda (op)
-	(case op
-	  ((gtk-widget) hbox)
-	  ((set) (lambda (x)
-		   (widget-set widget x)
-		   (update-canvas)))
-	  ((clear) (lambda (x)
-		     (widget-clear widget)
-		     (update-canvas)))
-	  (t (widget op))))))
-
-  (define-widget-type 'workspace-geometry make-workspace-geometry-item)
-  (widget-accepts-doc-string 'workspace-geometry))
+  (define-widget-type 'workspace-geometry
+    (lambda (changed)
+      (make-widget `(pair (labelled ,(_ "Workspaces:") (number 1))
+			  (pair (labelled ,(_ "Columns:") (number 1))
+				(labelled ,(_ "Rows:") (number 1))) t)
+		   changed))))

Eigenschaftsänderungen: lisp/sawfish/ui/widgets/workspace-geometry.jl
___________________________________________________________________
Hinzugefügt: svn:mergeinfo

Index: lisp/sawfish/ui/widgets/icon.jl
===================================================================
--- lisp/sawfish/ui/widgets/icon.jl	(Revision 4325)
+++ lisp/sawfish/ui/widgets/icon.jl	(Arbeitskopie)
@@ -1,6 +1,6 @@
 #| nokogiri-widgets/icon.jl -- GNOME icon entry widget
 
-   $Id: icon.jl,v 1.6 2003/01/12 20:30:49 jsh Exp $
+   $Id: icon.jl,v 1.1 2000/09/01 20:03:29 john Exp $
 
    Originally written by Bruce Miller <docmad@md.prestige.net>
 
@@ -21,38 +21,11 @@
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 |#
 
-;; GNOME version of this widget
+;; GNOME-less version of this widget
 
 (define-structure sawfish.ui.widgets.icon ()
 
     (open rep
-	  gui.gtk-2.gtk
-	  gui.gtk-2.gnome-ui
-	  rep.io.files
 	  sawfish.gtk.widget)
 
-  (define (make-icon-item changed-callback)
-    (let* ((widget (gnome-icon-entry-new "IconEntry" (_ "Select Icon"))))
-      (when changed-callback
-	(g-signal-connect (gnome-icon-entry-gtk-entry widget) "changed"
-			    (make-signal-callback changed-callback)))
-      (gtk-widget-show widget)
-      (lambda (op)
-	(case op
-	  ((set) (lambda (x)
-		   (if x
-		       (gnome-icon-entry-set-icon widget x)
-		     (gtk-entry-set-text
-		      (gnome-icon-entry-gtk-entry widget) ""))))
-	  ((clear) (lambda ()
-		     (gtk-entry-set-text
-		      (gnome-icon-entry-gtk-entry widget) "")))
-	  ((ref) (lambda ()
-		   (let ((file (gtk-entry-get-text
-				(gnome-icon-entry-gtk-entry widget))))
-		     (and (file-regular-p file) file))))
-	  ((gtk-widget) widget)
-	  ((validp) (lambda (x) (and (stringp x)
-				     (file-exists-p x))))))))
-
-  (define-widget-type 'icon make-icon-item))
+  (define-widget-type 'icon (lambda (changed) (make-widget 'file changed))))

Eigenschaftsänderungen: lisp/sawfish/ui/widgets/icon.jl
___________________________________________________________________
Hinzugefügt: svn:mergeinfo

Index: configure.in
===================================================================
--- configure.in	(Revision 4325)
+++ configure.in	(Arbeitskopie)
@@ -239,26 +239,6 @@
     AC_DEFINE(HAVE_ESD,1,[Have ESD])
 fi
 
-AC_ARG_ENABLE(gnome-widgets,
- [  --enable-gnome-widgets  Use GNOME widgets in places [default]
-  --disable-gnome-widgets Don't use GNOME widgets], [],
- [enable_gnome_widgets=no])
-
-if test "$enable_gnome_widgets" != "no"; then
-  AC_MSG_CHECKING([for rep-gtk GNOME wrappers])
-  if REP_GTK_DONT_INITIALIZE=1 rep --batch -l gui.gtk-2.gnome-ui 2>&5; then 
-    AC_MSG_RESULT([yes])
-    REP_GTK_GNOME=yes
-  else 
-    AC_MSG_RESULT([no])
-    REP_GTK_GNOME=no
-    AC_MSG_WARN([Can't load rep's gnome wrappers])
-  fi
-else
-  REP_GTK_GNOME=no
-fi
-AC_SUBST(REP_GTK_GNOME)
-
 dnl Check for Doug Lea's malloc in libc
 doug_lea_malloc=yes
 AC_CHECK_FUNC(malloc_get_state, , doug_lea_malloc=no)

Community's reasons for inclusion or rejection Edit

Patch submitters, please vote also! Yes, obviously your vote will be positive, but it's the place to give your explanation why this patch is good for all Sawfish users, and why it is correct - good reasons for inclusion.

When voting anonymously please write your name, so that it can be associated with your posts on the mailing list. If you are logged in you can sign yourself by typing four tilda characters: ~~~~.

  • Please vote with: Yes vote: yes., No vote: no., Try vote: let's try in experimental., Wtf vote: pondering. or Suspend wait for next release.

Around Wikia's network

Random Wiki