- 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 6217af7db1b56851599bd58bcd521e2f40b660b4..1c0c9e746e02e20aad79ee4ae1c7074f881f9c6b 100644 (file)
--- 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 65953d8806bc6c0f3c57d46a0df966c53cbb2e2e..c7f4a56a01690b16cbc51e6f716fe4ffb6d26a01 100644 (file)
--- 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