Hello community,
here is the log from the commit of package yast2-ycp-ui-bindings for
openSUSE:Factory
checked in at Wed Apr 20 13:53:26 CEST 2011.
--------
--- yast2-ycp-ui-bindings/yast2-ycp-ui-bindings.changes 2011-02-11
15:58:21.000000000 +0100
+++
/mounts/work_src_done/STABLE/yast2-ycp-ui-bindings/yast2-ycp-ui-bindings.changes
2011-04-19 12:19:31.000000000 +0200
@@ -1,0 +2,12 @@
+Tue Apr 19 12:13:02 CEST 2011 - tgoettlic...@suse.de
+
+- version bump
+- V 2.21.1
+
+-------------------------------------------------------------------
+Fri Apr 15 16:18:41 CEST 2011 - tgoettlic...@suse.de
+
+- Added support for recursive selection in tree widgets
+- V 2.20.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-ycp-ui-bindings-2.20.3.tar.bz2
New:
----
yast2-ycp-ui-bindings-2.21.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ycp-ui-bindings.spec ++++++
--- /var/tmp/diff_new_pack.cyUCMY/_old 2011-04-20 13:53:15.000000000 +0200
+++ /var/tmp/diff_new_pack.cyUCMY/_new 2011-04-20 13:53:15.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-ycp-ui-bindings
-Version: 2.20.3
+Version: 2.21.1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ycp-ui-bindings-2.20.3.tar.bz2
+Source0: yast2-ycp-ui-bindings-2.21.1.tar.bz2
Prefix: /usr
@@ -45,8 +45,8 @@
# libycp includes crypto built-ins
BuildRequires: libxcrypt-devel
-Requires: yast2-libyui >= 2.20.1
-BuildRequires: yast2-libyui-devel >= 2.20.1
+Requires: yast2-libyui >= 2.21.1
+BuildRequires: yast2-libyui-devel >= 2.21.1
# libyui ImplPtr
BuildRequires: boost-devel
@@ -79,7 +79,7 @@
language in which most YaST2 modules are written).
%prep
-%setup -n yast2-ycp-ui-bindings-2.20.3
+%setup -n yast2-ycp-ui-bindings-2.21.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -124,4 +124,5 @@
%{prefix}/include/YaST2
%{_libdir}/pkgconfig/yast2-ycp-ui-bindings.pc
%doc %{prefix}/share/doc/packages/yast2-ycp-ui-bindings
+
%changelog
++++++ yast2-ycp-ui-bindings-2.20.3.tar.bz2 ->
yast2-ycp-ui-bindings-2.21.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ycp-ui-bindings-2.20.3/VERSION
new/yast2-ycp-ui-bindings-2.21.1/VERSION
--- old/yast2-ycp-ui-bindings-2.20.3/VERSION 2011-02-11 16:01:05.000000000
+0100
+++ new/yast2-ycp-ui-bindings-2.21.1/VERSION 2011-04-19 12:12:52.000000000
+0200
@@ -1 +1 @@
-2.20.3
+2.21.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ycp-ui-bindings-2.20.3/configure
new/yast2-ycp-ui-bindings-2.21.1/configure
--- old/yast2-ycp-ui-bindings-2.20.3/configure 2011-02-11 16:01:26.000000000
+0100
+++ new/yast2-ycp-ui-bindings-2.21.1/configure 2011-04-19 12:19:10.000000000
+0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for yast2-ycp-ui-bindings 2.20.3.
+# Generated by GNU Autoconf 2.65 for yast2-ycp-ui-bindings 2.21.1.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -701,8 +701,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ycp-ui-bindings'
PACKAGE_TARNAME='yast2-ycp-ui-bindings'
-PACKAGE_VERSION='2.20.3'
-PACKAGE_STRING='yast2-ycp-ui-bindings 2.20.3'
+PACKAGE_VERSION='2.21.1'
+PACKAGE_STRING='yast2-ycp-ui-bindings 2.21.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1485,7 +1485,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-ycp-ui-bindings 2.20.3 to adapt to many kinds of
systems.
+\`configure' configures yast2-ycp-ui-bindings 2.21.1 to adapt to many kinds of
systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1557,7 +1557,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ycp-ui-bindings
2.20.3:";;
+ short | recursive ) echo "Configuration of yast2-ycp-ui-bindings
2.21.1:";;
esac
cat <<\_ACEOF
@@ -1670,7 +1670,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ycp-ui-bindings configure 2.20.3
+yast2-ycp-ui-bindings configure 2.21.1
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2162,7 +2162,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-ycp-ui-bindings $as_me 2.20.3, which was
+It was created by yast2-ycp-ui-bindings $as_me 2.21.1, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -3085,7 +3085,7 @@
# Define the identity of the package.
PACKAGE='yast2-ycp-ui-bindings'
- VERSION='2.20.3'
+ VERSION='2.21.1'
cat >>confdefs.h <<_ACEOF
@@ -3207,7 +3207,7 @@
-VERSION="2.20.3"
+VERSION="2.21.1"
RPMNAME="yast2-ycp-ui-bindings"
MAINTAINER="Thomas Goettlicher <tgoettlic...@suse.de>"
@@ -16837,7 +16837,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-ycp-ui-bindings $as_me 2.20.3, which was
+This file was extended by yast2-ycp-ui-bindings $as_me 2.21.1, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16903,7 +16903,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-ycp-ui-bindings config.status 2.20.3
+yast2-ycp-ui-bindings config.status 2.21.1
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ycp-ui-bindings-2.20.3/configure.in
new/yast2-ycp-ui-bindings-2.21.1/configure.in
--- old/yast2-ycp-ui-bindings-2.20.3/configure.in 2011-02-11
16:01:16.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.21.1/configure.in 2011-04-19
12:19:02.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ycp-ui-bindings, 2.20.3, http://bugs.opensuse.org/,
yast2-ycp-ui-bindings)
+AC_INIT(yast2-ycp-ui-bindings, 2.21.1, http://bugs.opensuse.org/,
yast2-ycp-ui-bindings)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.20.3"
+VERSION="2.21.1"
RPMNAME="yast2-ycp-ui-bindings"
MAINTAINER="Thomas Goettlicher <tgoettlic...@suse.de>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-ycp-ui-bindings-2.20.3/examples/MultiSelectionBox4.ycp
new/yast2-ycp-ui-bindings-2.21.1/examples/MultiSelectionBox4.ycp
--- old/yast2-ycp-ui-bindings-2.20.3/examples/MultiSelectionBox4.ycp
2011-02-09 14:25:47.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.21.1/examples/MultiSelectionBox4.ycp
2011-02-23 15:05:22.000000000 +0100
@@ -10,7 +10,7 @@
term contents = `HBox (`VSpacing (20), `VBox (`HSpacing(70),
`VSpacing (0.2),
- `MultiSelectionBox (`id(`tree), `opt(`notify), "tree", items),
+ `MultiSelectionBox (`id(`multisel), `opt(`notify),
"Multiselection", items),
`HBox (
`PushButton (`id (`ok), `opt (`default), Label::OKButton()),
`PushButton(`id (`cancel), `opt (`key_F9),
Label::CancelButton())
@@ -19,21 +19,28 @@
));
UI::OpenDialog (`opt (`decorated), contents);
- UI::ChangeWidget (`tree, `CurrentItem, nil);
+ UI::ChangeWidget (`multisel, `CurrentItem, nil);
+
+ UI::ChangeWidget(`multisel, `SelectedItems, ["a", "x" ] );
+ UI::ChangeWidget(`multisel, `SelectedItems, ["y", "z" ] );
+
+ list selected_items = (list) UI::QueryWidget( `id(`multisel),
`SelectedItems );
+ y2milestone( "Selected items: %1", selected_items );
+ y2milestone( "Current item: %1", (string) UI::QueryWidget
(`id(`multisel),`CurrentItem));
while (true)
{
map event = UI::WaitForEvent ();
any ret = event["ID"]:nil;
- if (ret == `tree)
+ if (ret == `multisel)
{
- string current = (string) UI::QueryWidget
(`id(`tree),`CurrentItem);
+ string current = (string) UI::QueryWidget
(`id(`multisel),`CurrentItem);
y2internal ("current: %1", current);
}
if (ret == `ok || ret == `cancel)
break;
}
- string current = (string) UI::QueryWidget (`id(`tree),`CurrentItem);
+ string current = (string) UI::QueryWidget (`id(`multisel),`CurrentItem);
y2internal ("current before leaving: %1", current );
UI::CloseDialog ();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-ycp-ui-bindings-2.20.3/examples/Tree-Checkbox2.ycp
new/yast2-ycp-ui-bindings-2.21.1/examples/Tree-Checkbox2.ycp
--- old/yast2-ycp-ui-bindings-2.20.3/examples/Tree-Checkbox2.ycp
2011-02-09 14:25:47.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.21.1/examples/Tree-Checkbox2.ycp
2011-04-19 10:45:27.000000000 +0200
@@ -14,8 +14,8 @@
),
`item(`id( "mouse" ), `icon( "yast-mouse.png"
), "Mouse" ),
`item(`id( "lan" ), `icon( "yast-lan.png"
), "Network" ),
- `item(`id( `xmas ), `icon( "yast-software.png" ),
"Merry X-Mas" ),
- `item(`id( `newyear ), `icon( "yast-software.png"
), "Happy New Year" )
+ `item(`id( "xmas" ), `icon( "yast-software.png"
), "Merry X-Mas" ),
+ `item(`id( "newyear" ), `icon( "yast-software.png"
), "Happy New Year" )
] ),
`HBox(`PushButton(`id(`ok), `opt(`default), "&OK"),
`PushButton(`id(`deselect), "&Log selected" )
@@ -23,13 +23,16 @@
)
);
- UI::ChangeWidget(`mod, `SelectedItems, ["keyboard", `xmas, `newyear ] );
+ UI::ChangeWidget(`mod, `SelectedItems, ["keyboard", "xmas", "newyear" ] );
any id = nil;
-
+ string current = (string) UI::QueryWidget( `id(`mod), `CurrentItem );
+ y2milestone( "Current item: %1", current );
repeat
{
id = UI::UserInput();
list selected_items = (list) UI::QueryWidget( `id(`mod), `SelectedItems
);
y2milestone( "Selected items: %1", selected_items );
+ current = (string) UI::QueryWidget( `id(`mod), `CurrentItem );
+ y2milestone( "Current item: %1", current );
} until (id == `ok);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-ycp-ui-bindings-2.20.3/examples/Tree-Checkbox4.ycp
new/yast2-ycp-ui-bindings-2.21.1/examples/Tree-Checkbox4.ycp
--- old/yast2-ycp-ui-bindings-2.20.3/examples/Tree-Checkbox4.ycp
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.21.1/examples/Tree-Checkbox4.ycp
2011-04-19 10:45:30.000000000 +0200
@@ -0,0 +1,84 @@
+// Tree with recursive multi selection
+{
+
+ string formatEvent( map<string, any> event )
+ {
+ string html = "Event:";
+ foreach (string key, any value, event, ``{
+ html = html + " " + key + ": " + tostring (value) + "";
+ });
+
+ return html;
+ };
+
+
+
+ UI::OpenDialog(
+ `VBox(
+ `Heading( "YaST2 Mini Control Center" ),
+ `Tree(`id(`mod), `opt(`multiSelection, `notify,
`immediate, `recursiveSelection),
+ "Modules",
+ [
+
+ `item(`id( "unselected" ), "Unseleted" ),
+ `item(`id( "country" ), "Localization", true,
+ [
+ `item(`id( "keyboard" ), "Keyboard" ),
+ `item(`id( "timezone" ), "Time zone",
true,
+ [ `item(`id( `europe ), "Europe" ),
+ `item(`id( `asia ), "Asia" )
+ ] )
+ ]
+ ),
+ `item(`id( `mouse ), "Mouse" ),
+ `item(`id( `lan ), "Network" ),
+ `item(`id( `xmas ), "Merry X-Mas" ),
+ `item(`id( `newyear ), "Happy New Year" )
+ ] ),
+ `PushButton(`id(`ok), `opt(`default), "&OK")
+ )
+ );
+
+ UI::ChangeWidget(`mod, `SelectedItems, [`lan, `mouse ] );
+ UI::ChangeWidget(`mod, `SelectedItems, [`xmas, `newyear ] );
+
+ list selected_items = (list) UI::QueryWidget( `id(`mod), `SelectedItems );
+ y2warning( "Selected items: %1", selected_items );
+
+
+ any id = nil;
+
+ map <string, any> event = $[];
+
+
+ repeat
+ {
+ event = UI::WaitForEvent( 1000 * 100 );
+
+ if( event["EventReason"]:nil == "SelectionChanged" )
+ {
+ y2error( "Selection Changed Event" );
+ }
+
+ if( event["EventReason"]:nil == "ValueChanged" )
+ {
+ y2error( "Value Changed Event" );
+ }
+
+ if ( event["EventType"]:nil == "TimeoutEvent" )
+ {
+
+ y2error( "Timeout Event" );
+ }
+
+ if ( event != nil )
+ {
+ y2error( formatEvent( event ) );
+ }
+
+ id = event["ID"]:nil ;
+ y2milestone("Selected items: %1", (list)UI::QueryWidget(`id(`mod),
`SelectedItems ));
+
+ } until (id == `ok);
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-ycp-ui-bindings-2.20.3/src/YCPDialogParser.cc
new/yast2-ycp-ui-bindings-2.21.1/src/YCPDialogParser.cc
--- old/yast2-ycp-ui-bindings-2.20.3/src/YCPDialogParser.cc 2011-02-07
16:15:38.000000000 +0100
+++ new/yast2-ycp-ui-bindings-2.21.1/src/YCPDialogParser.cc 2011-04-15
14:29:47.000000000 +0200
@@ -2173,7 +2173,7 @@
{
int numArgs = term->size() - argnr;
- if ( numArgs < 1 || numArgs > 2
+ if ( numArgs < 1 || numArgs > 3
|| ! term->value( argnr )->isString()
|| ( numArgs >= 2 && ! term->value( argnr+1 )->isList() ) )
{
@@ -2182,17 +2182,19 @@
bool immediate = false;
bool multiSelection = false;
+ bool recursiveSelection = false;
for ( int o=0; o < optList->size(); o++ )
{
- if ( optList->value(o)->isSymbol() &&
optList->value(o)->asSymbol()->symbol() == YUIOpt_immediate ) immediate =
true;
- else if ( optList->value(o)->isSymbol() &&
optList->value(o)->asSymbol()->symbol() == YUIOpt_multiSelection )
multiSelection = true;
+ if ( optList->value(o)->isSymbol() &&
optList->value(o)->asSymbol()->symbol() == YUIOpt_immediate )
immediate = true;
+ else if ( optList->value(o)->isSymbol() &&
optList->value(o)->asSymbol()->symbol() == YUIOpt_multiSelection )
multiSelection = true;
+ else if ( optList->value(o)->isSymbol() &&
optList->value(o)->asSymbol()->symbol() == YUIOpt_recursiveSelection )
recursiveSelection = true;
else logUnknownOption( term, optList->value(o) );
}
string label = term->value ( argnr )->asString()->value();
- YTree * tree = YUI::widgetFactory()->createTree( parent, label,
multiSelection );
+ YTree * tree = YUI::widgetFactory()->createTree( parent, label,
multiSelection, recursiveSelection );
if ( numArgs > 1 )
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
