Hello community, here is the log from the commit of package yast2-libyui checked in at Sat May 31 12:43:31 CEST 2008. -------- --- yast2-libyui/yast2-libyui.changes 2008-04-30 15:16:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-libyui/yast2-libyui.changes 2008-05-28 15:51:32.145378000 +0200 @@ -1,0 +2,6 @@ +Wed May 28 14:31:31 CEST 2008 - sh@suse.de + +- Added YWizard::wizardMode() for bnc #393040 +- V 2.16.48 + +------------------------------------------------------------------- Old: ---- yast2-libyui-2.16.47.tar.bz2 New: ---- yast2-libyui-2.16.48.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-libyui.spec ++++++ --- /var/tmp/diff_new_pack.z30983/_old 2008-05-31 12:43:10.000000000 +0200 +++ /var/tmp/diff_new_pack.z30983/_new 2008-05-31 12:43:10.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-libyui (Version 2.16.47) +# spec file for package yast2-libyui (Version 2.16.48) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yast2-libyui -Version: 2.16.47 +Version: 2.16.48 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-libyui-2.16.47.tar.bz2 +Source0: yast2-libyui-2.16.48.tar.bz2 Prefix: /usr Source1: yast2-libyui-rpmlintrc BuildRequires: gcc-c++ @@ -70,7 +70,7 @@ Stefan Hundhammer <sh@suse.de> %prep -%setup -n yast2-libyui-2.16.47 +%setup -n yast2-libyui-2.16.48 %build %{prefix}/bin/y2tool y2autoconf @@ -115,7 +115,11 @@ %dir %{_datadir}/cmake/Modules %{_datadir}/cmake/Modules/* %doc %{prefix}/share/doc/packages/yast2-libyui + %changelog +* Wed May 28 2008 sh@suse.de +- Added YWizard::wizardMode() for bnc #393040 +- V 2.16.48 * Wed Apr 30 2008 lslezak@suse.cz - added repoMgrEnabled() method to YPackageSelector widget (repository management is now optional) (bnc#381956) ++++++ yast2-libyui-2.16.47.tar.bz2 -> yast2-libyui-2.16.48.tar.bz2 ++++++ ++++ 10135 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.47/configure.in new/yast2-libyui-2.16.48/configure.in --- old/yast2-libyui-2.16.47/configure.in 2008-04-30 15:15:54.000000000 +0200 +++ new/yast2-libyui-2.16.48/configure.in 2008-05-28 15:50:45.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-libyui, 2.16.47, http://bugs.opensuse.org/, yast2-libyui) +AC_INIT(yast2-libyui, 2.16.48, http://bugs.opensuse.org/, yast2-libyui) 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.16.47" +VERSION="2.16.48" RPMNAME="yast2-libyui" MAINTAINER="Stefan Hundhammer <sh@suse.de>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.47/examples/ComboBox1.cc new/yast2-libyui-2.16.48/examples/ComboBox1.cc --- old/yast2-libyui-2.16.47/examples/ComboBox1.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-libyui-2.16.48/examples/ComboBox1.cc 2008-05-09 18:08:34.000000000 +0200 @@ -0,0 +1,141 @@ +// Simple ComboBox example. +// +// Compile with: +// +// g++ -I/usr/include/YaST2/yui -lyui ComboBox1.cc -o ComboBox1 +// or +// g++ -I/usr/include/YaST2/yui -lyui -DEDITABLE ComboBox1.cc -o ComboBox1 +// +// for an editable ComboBox. + +#define YUILogComponent "example" +#include "YUILog.h" + +#include "YUI.h" +#include "YWidgetFactory.h" +#include "YDialog.h" +#include "YLayoutBox.h" +#include "YComboBox.h" +#include "YLabel.h" +#include "YPushButton.h" +#include "YAlignment.h" +#include "YEvent.h" + + +#ifdef EDITABLE + bool editable = true; +#else + bool editable = false; +#endif + + + + + +int main( int argc, char **argv ) +{ + YUILog::setLogFileName( "/tmp/libyui-examples.log" ); + YUILog::enableDebugLogging(); + + // + // Create and open dialog + // + + YDialog * dialog = YUI::widgetFactory()->createPopupDialog(); + YLayoutBox * vbox = YUI::widgetFactory()->createVBox( dialog ); + + YComboBox * comboBox = YUI::widgetFactory()->createComboBox( vbox, "&Menu", editable ); + + YItemCollection items; + items.push_back( new YItem( "Pizza Margherita" ) ); + items.push_back( new YItem( "Pizza Capricciosa" ) ); + items.push_back( new YItem( "Pizza Funghi" ) ); + items.push_back( new YItem( "Pizza Prosciutto" ) ); + items.push_back( new YItem( "Pizza Quattro Stagioni" ) ); + items.push_back( new YItem( "Calzone" ) ); + comboBox->addItems( items ); // This is more efficient than repeatedly calling comboBox->addItem() + + + YLayoutBox * hbox = YUI::widgetFactory()->createHBox( vbox ); + YLabel * valueField = YUI::widgetFactory()->createOutputField( hbox, "<ComboBox value unknown>" ); + valueField->setStretchable( YD_HORIZ, true ); // allow stretching over entire dialog width + + YPushButton * valueButton = YUI::widgetFactory()->createPushButton( hbox, "&Value" ); + + YUI::widgetFactory()->createVSpacing( vbox, 0.3 ); + + YAlignment * rightAlignment = YUI::widgetFactory()->createRight( vbox ); + YPushButton * closeButton = YUI::widgetFactory()->createPushButton( rightAlignment, "&Close" ); + + + // + // Event loop + // + + while ( true ) + { + YEvent * event = dialog->waitForEvent(); + + if ( event ) + { + if ( event->eventType() == YEvent::CancelEvent ) // window manager "close window" button + break; // leave event loop + + valueField->setValue( "???" ); + + if ( event->widget() == closeButton ) + break; // leave event loop + + if ( event->widget() == valueButton || + event->widget() == comboBox ) // comboBox will only send events with setNotify() + { + // Get the current value of the ComboBox and display it in valueField. + // + // In normal applications, it should be clear whether or not a + // ComboBox is editable, so the following if()...else should + // not be necessary, only either the "if" branch or the "else" branch. + + if ( comboBox->editable() ) + { + // An editable ComboBox can have a selectedItem(), but the user can + // also enter any other text. YComboBox::value() will return that text or, + // if the user chose an item from the list, that item's + // label. + // + // YComboBox::setValue() OTOH will automatically select a list item + // if an item with that label exists. + // + // Semantically, an editable ComboBox is an InputField with some + // frequently used values in a drop-down list. This means that it + // makes a lot more sense to use strings and YComboBox::value() / + // YComboBox::setValue() consistently for such a ComboBox, not + // YComboBox::selectedItem() / YComboBox::selectItem(). + + valueField->setValue( comboBox->value() ); + } + else // not editable + { + // For non-editable ComboBox widgets, using items is preferred: + // YComboBox::selectedItem() / YComboBox::selectItem(). + // + // While it is possible to use YComboBox::value() and + // YComboBox::setValue(), this is not the idea behind it. + + YItem * item = comboBox->selectedItem(); + + if ( item ) + valueField->setValue( item->label() ); + else + valueField->setValue( "<none>" ); + } + } + } + } + + + // + // Clean up + // + + dialog->destroy(); +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.47/examples/ComboBox1-editable.cc new/yast2-libyui-2.16.48/examples/ComboBox1-editable.cc --- old/yast2-libyui-2.16.47/examples/ComboBox1-editable.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-libyui-2.16.48/examples/ComboBox1-editable.cc 2008-05-09 18:11:00.000000000 +0200 @@ -0,0 +1,4 @@ +// Simple editable ComboBox example + +#define EDITABLE +#include "ComboBox1.cc" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.47/examples/Makefile.am new/yast2-libyui-2.16.48/examples/Makefile.am --- old/yast2-libyui-2.16.47/examples/Makefile.am 2008-03-13 07:16:26.000000000 +0100 +++ new/yast2-libyui-2.16.48/examples/Makefile.am 2008-05-09 18:10:06.000000000 +0200 @@ -4,17 +4,25 @@ INCLUDES = -I$(top_srcdir)/src/ -noinst_PROGRAMS = \ - HelloWorld \ - SelectionBox1 \ +noinst_PROGRAMS = \ + HelloWorld \ + ComboBox1 \ + ComboBox1-editable \ + SelectionBox1 \ SelectionBox2 -HelloWorld_SOURCES = HelloWorld.cc -HelloWorld_LDADD = -L$(top_srcdir)/src -lyui +HelloWorld_SOURCES = HelloWorld.cc +HelloWorld_LDADD = -L$(top_srcdir)/src -lyui -SelectionBox1_SOURCES = SelectionBox1.cc -SelectionBox1_LDADD = -L$(top_srcdir)/src -lyui +ComboBox1_SOURCES = ComboBox1.cc +ComboBox1_LDADD = -L$(top_srcdir)/src -lyui -SelectionBox2_SOURCES = SelectionBox2.cc -SelectionBox2_LDADD = -L$(top_srcdir)/src -lyui +ComboBox1_editable_SOURCES = ComboBox1-editable.cc +ComboBox1_editable_LDADD = -L$(top_srcdir)/src -lyui + +SelectionBox1_SOURCES = SelectionBox1.cc +SelectionBox1_LDADD = -L$(top_srcdir)/src -lyui + +SelectionBox2_SOURCES = SelectionBox2.cc +SelectionBox2_LDADD = -L$(top_srcdir)/src -lyui diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.47/examples/SelectionBox2.cc new/yast2-libyui-2.16.48/examples/SelectionBox2.cc --- old/yast2-libyui-2.16.47/examples/SelectionBox2.cc 2008-04-17 07:09:20.000000000 +0200 +++ new/yast2-libyui-2.16.48/examples/SelectionBox2.cc 2008-05-08 14:14:35.000000000 +0200 @@ -180,6 +180,8 @@ else if ( event->widget() == selBox || event->widget() == valueButton ) { + yuiMilestone() << "Event widget: " << event->widget() << endl; + YItem * item = selBox->selectedItem(); if ( item ) @@ -187,6 +189,10 @@ else valueField->setValue( "<none>" ); } + else + { + yuiMilestone() << "Unknown event" << endl; + } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.47/missing new/yast2-libyui-2.16.48/missing --- old/yast2-libyui-2.16.47/missing 2008-04-30 15:16:07.000000000 +0200 +++ new/yast2-libyui-2.16.48/missing 2008-05-28 15:51:01.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2005-06-08.21 -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -33,8 +33,6 @@ fi run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' # In the cases where this matters, `missing' is being run in the # srcdir already. @@ -46,7 +44,7 @@ msg="missing on your system" -case $1 in +case "$1" in --run) # Try to run requested program, and just exit if it succeeds. run= @@ -79,7 +77,6 @@ aclocal touch file \`aclocal.m4' autoconf touch file \`configure' autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c @@ -109,7 +106,7 @@ # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect # the program). -case $1 in +case "$1" in lex|yacc) # Not GNU programs, they don't have --version. ;; @@ -138,7 +135,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case "$1" in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -167,7 +164,7 @@ test -z "$files" && files="config.h" touch_files= for f in $files; do - case $f in + case "$f" in *:*) touch_files="$touch_files "`echo "$f" | sed -e 's/^[^:]*://' -e 's/:.*//'`;; *) touch_files="$touch_files $f.in";; @@ -195,8 +192,8 @@ You can get \`$1' as part of \`Autoconf' from any GNU archive site." - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'` + test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'` if test -f "$file"; then touch $file else @@ -217,25 +214,25 @@ in order for those modifications to take effect. You can get \`Bison' from any GNU archive site." rm -f y.tab.c y.tab.h - if test $# -ne 1; then + if [ $# -ne 1 ]; then eval LASTARG="\${$#}" - case $LASTARG in + case "$LASTARG" in *.y) SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.c fi SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" y.tab.h fi ;; esac fi - if test ! -f y.tab.h; then + if [ ! -f y.tab.h ]; then echo >y.tab.h fi - if test ! -f y.tab.c; then + if [ ! -f y.tab.c ]; then echo 'main() { return 0; }' >y.tab.c fi ;; @@ -247,18 +244,18 @@ in order for those modifications to take effect. You can get \`Flex' from any GNU archive site." rm -f lex.yy.c - if test $# -ne 1; then + if [ $# -ne 1 ]; then eval LASTARG="\${$#}" - case $LASTARG in + case "$LASTARG" in *.l) SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then + if [ -f "$SRCFILE" ]; then cp "$SRCFILE" lex.yy.c fi ;; esac fi - if test ! -f lex.yy.c; then + if [ ! -f lex.yy.c ]; then echo 'main() { return 0; }' >lex.yy.c fi ;; @@ -270,9 +267,11 @@ \`Help2man' package in order for those modifications to take effect. You can get \`Help2man' from any GNU archive site." - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then touch $file else test -z "$file" || exec >$file @@ -290,17 +289,11 @@ DU, IRIX). You might want to install the \`Texinfo' package or the \`GNU make' package. Grab either from any GNU archive site." # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` if test -z "$file"; then # ... or it is the one specified with @setfilename ... infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` + file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile` # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi @@ -324,13 +317,13 @@ fi firstarg="$1" if shift; then - case $firstarg in + case "$firstarg" in *o*) firstarg=`echo "$firstarg" | sed s/o//` tar "$firstarg" "$@" && exit 0 ;; esac - case $firstarg in + case "$firstarg" in *h*) firstarg=`echo "$firstarg" | sed s/h//` tar "$firstarg" "$@" && exit 0 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.47/src/YApplication.h new/yast2-libyui-2.16.48/src/YApplication.h --- old/yast2-libyui-2.16.47/src/YApplication.h 2008-04-15 11:12:36.000000000 +0200 +++ new/yast2-libyui-2.16.48/src/YApplication.h 2008-05-13 18:09:19.000000000 +0200 @@ -32,7 +32,7 @@ /** * Class for application-wide values and functions. - * This is a singleton. Access and create it via its static functions. + * This is a singleton. Access and create it via the static functions in YUI. **/ class YApplication { @@ -310,7 +310,7 @@ const string & font, const string & screen_map, const string & unicode_map, - const string & encoding ) + const string & language ) {} /** diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.47/src/YDialog.cc new/yast2-libyui-2.16.48/src/YDialog.cc --- old/yast2-libyui-2.16.47/src/YDialog.cc 2008-04-25 09:45:02.000000000 +0200 +++ new/yast2-libyui-2.16.48/src/YDialog.cc 2008-05-09 14:31:35.000000000 +0200 @@ -434,11 +434,6 @@ } - - - - - YDialog * YDialog::currentDialog( bool doThrow ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.47/src/YLayoutBox.h new/yast2-libyui-2.16.48/src/YLayoutBox.h --- old/yast2-libyui-2.16.47/src/YLayoutBox.h 2008-02-27 08:48:21.000000000 +0100 +++ new/yast2-libyui-2.16.48/src/YLayoutBox.h 2008-05-09 11:49:46.000000000 +0200 @@ -139,6 +139,12 @@ **/ virtual void moveChild( YWidget * child, int newX, int newY ) = 0; + /** + * Check if this is a layout stretch widget in the specfied dimension, + * i.e. an empty widget that is stretchable. + **/ + static bool isLayoutStretch( YWidget * child, YUIDimension dimension ); + protected: @@ -178,12 +184,6 @@ int countLayoutStretchChildren( YUIDimension dimension ); /** - * Check if this is a layout stretch widget in the specfied dimension, - * i.e. an empty widget that is stretchable. - **/ - static bool isLayoutStretch( YWidget * child, YUIDimension dimension ); - - /** * Determine the number of the "dominating child" - the child widget that * determines the overall size with respect to its weight. * diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.47/src/YProperty.h new/yast2-libyui-2.16.48/src/YProperty.h --- old/yast2-libyui-2.16.47/src/YProperty.h 2008-02-27 08:48:21.000000000 +0100 +++ new/yast2-libyui-2.16.48/src/YProperty.h 2008-05-16 15:32:13.000000000 +0200 @@ -164,16 +164,6 @@ bool boolVal() const { return _boolVal; } YInteger integerVal() const { return _integerVal; } - /** - * Find the widget that corresponds to this property value. - * If a widget pointer is specified, return that one. - * If not and a widget ID is specified, search the current topmost dialog - * for a widget with that ID. - * - * Throws a YUIWidgetNotFoundException if there is no widget with that ID. - **/ - YWidget * findWidget(); - private: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.47/src/YShortcutManager.h new/yast2-libyui-2.16.48/src/YShortcutManager.h --- old/yast2-libyui-2.16.47/src/YShortcutManager.h 2008-02-27 08:48:21.000000000 +0100 +++ new/yast2-libyui-2.16.48/src/YShortcutManager.h 2008-05-16 14:48:01.000000000 +0200 @@ -54,7 +54,7 @@ * Returns the number of shortcut conflicts. * Valid only after checkShortcuts() or resolveAllConflicts(). **/ - int conflictCount(); + int conflictCount() { return _conflictCount; } /** * Resolve shortcut conflicts. Requires checkShortcuts() to be called first. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.47/src/YWizard.cc new/yast2-libyui-2.16.48/src/YWizard.cc --- old/yast2-libyui-2.16.47/src/YWizard.cc 2008-04-14 13:27:49.000000000 +0200 +++ new/yast2-libyui-2.16.48/src/YWizard.cc 2008-05-28 14:30:56.000000000 +0200 @@ -64,6 +64,12 @@ } +YWizardMode +YWizard::wizardMode() const +{ + return priv->wizardMode; +} + bool YWizard::nextButtonIsProtected() const { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.47/src/YWizard.h new/yast2-libyui-2.16.48/src/YWizard.h --- old/yast2-libyui-2.16.47/src/YWizard.h 2008-04-14 13:27:49.000000000 +0200 +++ new/yast2-libyui-2.16.48/src/YWizard.h 2008-05-28 14:30:25.000000000 +0200 @@ -114,6 +114,12 @@ // // Wizard basics // + + /** + * Return the wizard mode (what kind of wizard this is): + * YWizardMode_Standard, YWizardMode_Steps, YWizardMode_Tree + **/ + YWizardMode wizardMode() const; /** * Return the wizard buttons or 0 if there is no such button. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-libyui-2.16.47/VERSION new/yast2-libyui-2.16.48/VERSION --- old/yast2-libyui-2.16.47/VERSION 2008-04-30 14:54:25.000000000 +0200 +++ new/yast2-libyui-2.16.48/VERSION 2008-05-28 14:31:51.000000000 +0200 @@ -1 +1 @@ -2.16.47 +2.16.48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de