packages: XcursorTheme/XcursorTheme-cursorconfig, XcursorTheme/XcursorTheme...

[gotar]

Author: gotar                        Date: Fri Jul 17 20:15:16 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to new (alternate) dialog, without --one-column and stdin instead
  stdout

---- Files affected:
packages/XcursorTheme:
   XcursorTheme-cursorconfig (1.3 -> 1.4) , XcursorTheme.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: packages/XcursorTheme/XcursorTheme-cursorconfig
diff -u packages/XcursorTheme/XcursorTheme-cursorconfig:1.3 packages/XcursorTheme/XcursorTheme-cursorconfig:1.4
--- packages/XcursorTheme/XcursorTheme-cursorconfig:1.3	Thu Apr  1 22:02:41 2004
+++ packages/XcursorTheme/XcursorTheme-cursorconfig	Fri Jul 17 22:15:10 2009
@@ -2,16 +2,16 @@
 
 alias nls='gettext -d cursorconfig'
 file=~/.icons/default/index.theme
-themes="core `ls -d /usr/share/icons/*/cursors | sed -e 's,/usr/share/icons/,,;s,/cursors,,'`"
+themes="core theme `ls -d /usr/share/icons/*/cursors | sed -e 's,/usr/share/icons/,,;s,/cursors,,' -e 's/$/ theme/'`"
 default=`grep -s Inherits $file | cut -f2 -d=`
-[ -z $default ] || default="($default)"
+[ -z "$default" ] || default="(core)"
 
 theme=`dialog --title 'Cursorconfig' \
 	--backtitle "$(nls 'PLD Linux X Cursor Configuration Utility')" \
-	--one-column \
-	--menu "$(nls 'Available themes:') $default" $(($(echo $themes | wc -w)+7)) 60 0 \
-	$themes`
-[ -z $theme ] && exit 0
+	--output-fd 3 \
+	--menu "$(nls 'Available themes:') $default" $((($(echo $themes | wc -w)+7)/2)) 60 0 \
+	$themes 3>&1 >&2`
+[ -z "$theme" ] && exit 0
 
 mkdir -p ~/.icons/default || exit 1
 [ -f $file ] && mv -f $file{,.old}

================================================================
Index: packages/XcursorTheme/XcursorTheme.spec
diff -u packages/XcursorTheme/XcursorTheme.spec:1.9 packages/XcursorTheme/XcursorTheme.spec:1.10
--- packages/XcursorTheme/XcursorTheme.spec:1.9	Mon Feb 12 22:23:45 2007
+++ packages/XcursorTheme/XcursorTheme.spec	Fri Jul 17 22:15:11 2009
@@ -1,8 +1,4 @@
 # $Revision$, $Date$
-#
-# TODO: cursorconfig doesn't work on TH dialog
-#	(removing unsupported --one-column option doesn't help)
-#
 Summary:	X cursor packs from kde-look
 Summary(pl.UTF-8):	Motywy kursorów X z kde-look
 Name:		XcursorTheme
@@ -218,7 +214,6 @@
 %doc doc/Silver/*
 %{_icondir}/Silver
 
-
 %files setup -f cursorconfig.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cursorconfig
@@ -229,6 +224,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2009/07/17 20:15:11  gotar
+- updated to new (alternate) dialog, without --one-column and stdin instead
+  stdout
+
 Revision 1.9  2007/02/12 21:23:45  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/XcursorTheme/XcursorTheme-cursorconfig?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/XcursorTheme/XcursorTheme.spec?r1=1.9&r2=1.10&f=u