From: Tomasz Pala <gotar@pld-linux.org>
Date: Fri, 17 Jul 2009 20:15:11 +0000 (+0000)
Subject: - updated to new (alternate) dialog, without --one-column and stdin instead
X-Git-Tag: auto/th/XcursorTheme-1_0-9
X-Git-Url: http://git.pld-linux.org/?p=packages%2FXcursorTheme.git;a=commitdiff_plain;h=b016bd3136730e30331a9ed8f2b4d63cff7d8091

- updated to new (alternate) dialog, without --one-column and stdin instead
  stdout

Changed files:
    XcursorTheme-cursorconfig -> 1.4
    XcursorTheme.spec -> 1.10
---

diff --git a/XcursorTheme-cursorconfig b/XcursorTheme-cursorconfig
index 6217af7..1c0c9e7 100644
--- a/XcursorTheme-cursorconfig
+++ b/XcursorTheme-cursorconfig
@@ -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}
diff --git a/XcursorTheme.spec b/XcursorTheme.spec
index 65953d8..c7f4a56 100644
--- a/XcursorTheme.spec
+++ b/XcursorTheme.spec
@@ -1,7 +1,3 @@
-#
-# 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
@@ -217,7 +213,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/Silver/*
 %{_icondir}/Silver
 
-
 %files setup -f cursorconfig.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/cursorconfig