Hello community, here is the log from the commit of package yast2-ncurses checked in at Wed Jul 16 22:47:28 CEST 2008. -------- --- yast2-ncurses/yast2-ncurses.changes 2008-06-26 10:49:02.000000000 +0200 +++ yast2-ncurses/yast2-ncurses.changes 2008-07-16 14:48:03.847971000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 16 12:25:11 CEST 2008 - sh@suse.de + +- Added API for fate #303492: Multi selection for table widget + (just API, not really supporting multi selection yet) +- V 2.17.3 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-2.17.2.tar.bz2 New: ---- yast2-ncurses-2.17.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses.spec ++++++ --- /var/tmp/diff_new_pack.x14645/_old 2008-07-16 22:46:58.000000000 +0200 +++ /var/tmp/diff_new_pack.x14645/_new 2008-07-16 22:46:58.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ncurses (Version 2.17.2) +# spec file for package yast2-ncurses (Version 2.17.3) # # 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-ncurses -Version: 2.17.2 +Version: 2.17.3 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-2.17.2.tar.bz2 +Source0: yast2-ncurses-2.17.3.tar.bz2 Prefix: /usr BuildRequires: dejagnu doxygen gcc-c++ yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel @@ -49,7 +49,7 @@ %prep -%setup -n yast2-ncurses-2.17.2 +%setup -n yast2-ncurses-2.17.3 %build %{prefix}/bin/y2tool y2autoconf @@ -85,8 +85,11 @@ %dir %{prefix}/include/YaST2 %{prefix}/include/YaST2/ncurses/ %doc %{prefix}/share/doc/packages/yast2-ncurses - %changelog +* Wed Jul 16 2008 sh@suse.de +- Added API for fate #303492: Multi selection for table widget + (just API, not really supporting multi selection yet) +- V 2.17.3 * Thu Jun 26 2008 gs@suse.de - Improved NCDumbTab widget V 2.17.2 ++++++ yast2-ncurses-2.17.2.tar.bz2 -> yast2-ncurses-2.17.3.tar.bz2 ++++++ ++++ 4169 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-ncurses-2.17.2/configure.in new/yast2-ncurses-2.17.3/configure.in --- old/yast2-ncurses-2.17.2/configure.in 2008-07-02 09:52:26.000000000 +0200 +++ new/yast2-ncurses-2.17.3/configure.in 2008-07-01 11:10:31.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ncurses dnl -dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses, 2.17.2, http://bugs.opensuse.org/, yast2-ncurses) +AC_INIT(yast2-ncurses, 2.17.1, http://bugs.opensuse.org/, yast2-ncurses) 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.17.2" +VERSION="2.17.1" RPMNAME="yast2-ncurses" 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-ncurses-2.17.2/src/NCDumbTab.cc new/yast2-ncurses-2.17.3/src/NCDumbTab.cc --- old/yast2-ncurses-2.17.2/src/NCDumbTab.cc 2008-07-02 09:51:24.000000000 +0200 +++ new/yast2-ncurses-2.17.3/src/NCDumbTab.cc 2008-07-16 12:28:25.000000000 +0200 @@ -22,6 +22,7 @@ #include "NCDialog.h" #include "NCurses.h" #include "NCDumbTab.h" +#include "NCPopupList.h" NCDumbTab::NCDumbTab( YWidget * parent ) @@ -44,12 +45,15 @@ { defsze.W = firstChild()->preferredWidth(); - vector<NClabel>::iterator listIt = tabList.begin(); + YItemIterator listIt = itemsBegin(); + unsigned int tabBarWidth = 0; + NClabel tabLabel; - while ( listIt != tabList.end() ) + while ( listIt != itemsEnd() ) { - tabBarWidth += (*listIt).width() + 1; + tabLabel = NClabel( (*listIt)->label() ); + tabBarWidth += tabLabel.width() + 1; ++listIt; } ++tabBarWidth; @@ -59,6 +63,9 @@ defsze.W += framedim.Sze.W; + if ( defsze.W > NCurses::cols() ) + defsze.W = NCurses::cols(); + return defsze.W; } @@ -96,7 +103,8 @@ switch ( key ) { case KEY_LEFT: - if ( currentIndex > 0 && currentIndex <= tabList.size() -1 ) + if ( currentIndex > 0 && + currentIndex <= (unsigned)itemsCount() -1 ) { currentIndex--; wRedraw(); @@ -106,7 +114,8 @@ break; case KEY_RIGHT: - if ( currentIndex < tabList.size()-1 && currentIndex >= 0 ) + if ( currentIndex < (unsigned)itemsCount()-1 && + currentIndex >= 0 ) { currentIndex++; wRedraw(); @@ -115,6 +124,9 @@ } break; + case KEY_HOTKEY: + setCurrentTab( hotKey ); + case KEY_RETURN: ret = createMenuEvent( currentIndex ); break; @@ -124,6 +136,28 @@ return ret; } +void NCDumbTab::setCurrentTab( wint_t key ) +{ + + YItemIterator listIt = itemsBegin(); + NClabel tablabel; + unsigned int i = 0; + + while ( listIt != itemsEnd() ) + { + tablabel = NCstring( (*listIt)->label() ); + tablabel.stripHotkey(); + yuiMilestone() << "HOTkey: " << tablabel.hotkey() << " key: " << key << endl; + if ( tablabel.hotkey() == key ) + { + currentIndex = i; + break; + } + ++listIt; + ++i; + } +} + NCursesEvent NCDumbTab::createMenuEvent( unsigned int index ) { NCursesEvent ret = NCursesEvent::menu; @@ -143,9 +177,8 @@ { YDumbTab::addItem( item ); - NClabel tabLabel = NClabel( item->label() ); + NClabel tabLabel = NCstring( item->label() ); yuiDebug() << "Add item: " << item->label() << endl; - tabList.push_back( tabLabel ); if ( item->selected() ) currentIndex = item->index(); @@ -164,28 +197,43 @@ wRedraw(); } +void NCDumbTab::shortcutChanged() +{ + // Any of the items might have its keyboard shortcut changed, but we don't + // know which one. So let's simply set all tab labels again. + + wRedraw(); +} + void NCDumbTab::wRedraw() { if ( !win ) return; - + const NCstyle::StWidget & style( widgetStyle(true) ); win->bkgd( style.plain ); win->box(); - vector<NClabel>::iterator listIt = tabList.begin(); + YItemIterator listIt = itemsBegin(); + int winWidth = win->width() - 2; - int labelPos = 1; + unsigned int labelPos = 1; unsigned int i = 0; bool nonActive = false; + NClabel tablabel; - while ( listIt != tabList.end() ) + while ( listIt != itemsEnd() ) { + tablabel = NCstring( (*listIt)->label() ); + tablabel.stripHotkey(); + hotlabel = &tablabel; + nonActive = (i == currentIndex)?false:true; + if ( GetState() == NC::WSactive ) { - (*listIt).drawAt( *win, + tablabel.drawAt( *win, NCstyle::StWidget( widgetStyle( nonActive) ), wpos( 0, labelPos ), wsze( 1, winWidth ), @@ -195,7 +243,7 @@ { if ( !nonActive ) { - (*listIt).drawAt( *win, + tablabel.drawAt( *win, widgetStyle( ).data, widgetStyle( ).data, wpos( 0, labelPos ), @@ -204,7 +252,7 @@ } else { - (*listIt).drawAt( *win, + tablabel.drawAt( *win, NCstyle::StWidget( frameStyle() ), wpos( 0, labelPos ), wsze( 1, winWidth ), @@ -212,14 +260,14 @@ } } - labelPos += (*listIt).width() + 2; + labelPos += tablabel.width() + 2; ++listIt; ++i; - if ( listIt != tabList.end() ) + if ( listIt != itemsEnd() ) { - winWidth -= (*listIt).width() -1; + winWidth -= tablabel.width() -1; } }; @@ -231,7 +279,31 @@ redrawChilds( firstChild() ); } - } +} + +bool NCDumbTab::HasHotkey( int key ) +{ + bool ret = false; + + YItemIterator listIt = itemsBegin(); + NClabel tablabel; + + while ( listIt != itemsEnd() ) + { + tablabel = NCstring( (*listIt)->label() ); + tablabel.stripHotkey(); + if ( tablabel.hasHotkey() && tablabel.hotkey() == key ) + { + hotKey = key; + ret = true; + } + ++listIt; + } + + yuiMilestone() << "Has hot key: " << key << " " << (ret?"yes":"no") << endl; + + return ret; +} void NCDumbTab::redrawChilds( YWidget *widget ) { 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-ncurses-2.17.2/src/NCDumbTab.h new/yast2-ncurses-2.17.3/src/NCDumbTab.h --- old/yast2-ncurses-2.17.2/src/NCDumbTab.h 2008-07-02 09:51:24.000000000 +0200 +++ new/yast2-ncurses-2.17.3/src/NCDumbTab.h 2008-07-16 12:28:25.000000000 +0200 @@ -34,9 +34,9 @@ NCDumbTab & operator=( const NCDumbTab & ); NCDumbTab( const NCDumbTab & ); - vector <NClabel> tabList; unsigned int currentIndex; - + wint_t hotKey; + protected: virtual const char * location() const { return "NCDumbTab"; } @@ -61,6 +61,10 @@ virtual void setEnabled( bool do_bv ); + virtual void shortcutChanged(); + + virtual bool HasHotkey( int key ); + virtual bool setKeyboardFocus() { if ( !grabFocus() ) @@ -70,6 +74,8 @@ } NCursesEvent createMenuEvent( unsigned int index); + + void setCurrentTab( wint_t key ); }; 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-ncurses-2.17.2/src/NCPushButton.cc new/yast2-ncurses-2.17.3/src/NCPushButton.cc --- old/yast2-ncurses-2.17.2/src/NCPushButton.cc 2008-06-12 10:46:51.000000000 +0200 +++ new/yast2-ncurses-2.17.3/src/NCPushButton.cc 2008-07-16 12:28:25.000000000 +0200 @@ -29,7 +29,6 @@ , NCWidget( parent ) { yuiDebug() << endl; - setWidgetRep( this ); setLabel( nlabel ); hotlabel = &label; } 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-ncurses-2.17.2/src/NCTable.cc new/yast2-ncurses-2.17.3/src/NCTable.cc --- old/yast2-ncurses-2.17.2/src/NCTable.cc 2008-06-11 11:58:20.000000000 +0200 +++ new/yast2-ncurses-2.17.3/src/NCTable.cc 2008-07-16 12:22:53.000000000 +0200 @@ -24,10 +24,12 @@ #include "YTypes.h" -NCTable::NCTable( YWidget * parent, YTableHeader *tableHeader ) - : YTable( parent, tableHeader ) - , NCPadWidget( parent ) - , biglist( false ) +NCTable::NCTable( YWidget * parent, YTableHeader *tableHeader, bool multiSelection ) +// FIXME : YTable( parent, tableHeader, multiSelection ) + : YTable( parent, tableHeader, + false ) // multiSelection - not supported yet + , NCPadWidget( parent ) + , biglist( false ) { yuiDebug() << endl; @@ -47,6 +49,8 @@ } hasHeadline = myPad()->SetHeadline( _header ); + +#warning FIXME: Handle multi selection } @@ -100,7 +104,7 @@ -// Set table header all at once +// Set all table headers all at once void NCTable::setHeader( vector<string> head ) { 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-ncurses-2.17.2/src/NCTable.h new/yast2-ncurses-2.17.3/src/NCTable.h --- old/yast2-ncurses-2.17.2/src/NCTable.h 2008-06-11 11:58:20.000000000 +0200 +++ new/yast2-ncurses-2.17.3/src/NCTable.h 2008-07-16 12:22:30.000000000 +0200 @@ -28,45 +28,9 @@ class NCTable : public YTable, public NCPadWidget { - - friend std::ostream & operator<<( std::ostream & STREAM, const NCTable & OBJ ); - - NCTable & operator=( const NCTable & ); - NCTable( const NCTable & ); - -private: - - vector<NCstring> _header; - -protected: - - /** - * Overload myPad to narrow the type - */ - virtual NCTablePad * myPad() const - { return dynamic_cast<NCTablePad*>( NCPadWidget::myPad() ); } - - bool biglist; - -protected: - - virtual const char * location() const { return "NCTable"; } - - virtual NCPad * CreatePad(); - - virtual void cellChanged( int index, int colnum, const string & newtext ); - virtual void cellChanged( const YTableCell *cell ); - - -protected: - - virtual void startMultipleChanges() { startMultidraw(); } - - virtual void doneMultipleChanges() { stopMultidraw(); } - public: - NCTable( YWidget * parent, YTableHeader *tableHeader ); + NCTable( YWidget * parent, YTableHeader *tableHeader, bool multiSelection = false ); virtual ~NCTable(); @@ -116,6 +80,41 @@ } void stripHotkeys() { myPad()->stripHotkeys(); } + + +protected: + + /** + * Overload myPad to narrow the type + */ + virtual NCTablePad * myPad() const + { return dynamic_cast<NCTablePad*>( NCPadWidget::myPad() ); } + + bool biglist; + + +protected: + + virtual const char * location() const { return "NCTable"; } + + virtual NCPad * CreatePad(); + + virtual void cellChanged( int index, int colnum, const string & newtext ); + virtual void cellChanged( const YTableCell *cell ); + + virtual void startMultipleChanges() { startMultidraw(); } + virtual void doneMultipleChanges() { stopMultidraw(); } + + +private: + + vector<NCstring> _header; + + friend std::ostream & operator<<( std::ostream & STREAM, const NCTable & OBJ ); + + NCTable & operator=( const NCTable & ); + NCTable( const NCTable & ); + }; 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-ncurses-2.17.2/src/NCWidget.cc new/yast2-ncurses-2.17.3/src/NCWidget.cc --- old/yast2-ncurses-2.17.2/src/NCWidget.cc 2008-06-11 11:58:20.000000000 +0200 +++ new/yast2-ncurses-2.17.3/src/NCWidget.cc 2008-07-16 12:28:25.000000000 +0200 @@ -495,7 +495,7 @@ -bool NCWidget::HasHotkey( int key ) const +bool NCWidget::HasHotkey( int key ) { if ( key < 0 || UCHAR_MAX < key ) return false; 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-ncurses-2.17.2/src/NCWidgetFactory.cc new/yast2-ncurses-2.17.3/src/NCWidgetFactory.cc --- old/yast2-ncurses-2.17.2/src/NCWidgetFactory.cc 2008-06-12 10:46:51.000000000 +0200 +++ new/yast2-ncurses-2.17.3/src/NCWidgetFactory.cc 2008-07-16 12:21:39.000000000 +0200 @@ -164,9 +164,9 @@ NCTable * -NCWidgetFactory::createTable( YWidget * parent, YTableHeader * tableHeader ) +NCWidgetFactory::createTable( YWidget * parent, YTableHeader * tableHeader, bool multiSelection ) { - NCTable *table = new NCTable( parent, tableHeader ); + NCTable *table = new NCTable( parent, tableHeader, multiSelection ); YUI_CHECK_NEW( table ); return table; 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-ncurses-2.17.2/src/NCWidgetFactory.h new/yast2-ncurses-2.17.3/src/NCWidgetFactory.h --- old/yast2-ncurses-2.17.2/src/NCWidgetFactory.h 2008-06-11 11:58:20.000000000 +0200 +++ new/yast2-ncurses-2.17.3/src/NCWidgetFactory.h 2008-07-16 12:20:11.000000000 +0200 @@ -1,18 +1,18 @@ /*---------------------------------------------------------------------\ -| | -| __ __ ____ _____ ____ | -| \ \ / /_ _/ ___|_ _|___ \ | -| \ V / _` ___ \ | | __) | | -| | | (_| |___) || | / __/ | -| |_|__,_|____/ |_| |_____| | -| | -| core system | -| (C) SuSE GmbH | +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` ___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | ----------------------------------------------------------------------/ - File: NCWidgetFactory.h + File: NCWidgetFactory.h - Author: Gabriele Mohr <gs@suse.de> + Author: Gabriele Mohr <gs@suse.de> /-*/ @@ -71,129 +71,73 @@ // Dialogs // - virtual NCDialog * createDialog ( YDialogType dialogType, YDialogColorMode colorMode = YDialogNormalColor ); + virtual NCDialog * createDialog ( YDialogType dialogType, YDialogColorMode colorMode = YDialogNormalColor ); // // Layout Boxes // - virtual NCLayoutBox * createLayoutBox ( YWidget * parent, YUIDimension dim ); + virtual NCLayoutBox * createLayoutBox ( YWidget * parent, YUIDimension dim ); + // // Common Leaf Widgets // - virtual NCPushButton * createPushButton ( YWidget * parent, - const string & label ); - - virtual NCLabel * createLabel ( YWidget * parent, - const string & text, - bool isHeading = false, - bool isOutputField = false ); - - virtual NCInputField * createInputField ( YWidget * parent, - const string & label, - bool passwordMode = false ); - - virtual NCCheckBox * createCheckBox ( YWidget * parent, - const string & label, - bool isChecked = false ); - - virtual NCRadioButton * createRadioButton ( YWidget * parent, - const string & label, - bool isChecked = false ); - - virtual NCComboBox * createComboBox ( YWidget * parent, - const string & label, - bool editable = false ); - - virtual NCSelectionBox * createSelectionBox ( YWidget * parent, - const string & label ); - - virtual NCTree * createTree ( YWidget * parent, - const string & label ); - - virtual NCTable * createTable ( YWidget * parent, - YTableHeader * tableHeader ); - - virtual NCProgressBar * createProgressBar ( YWidget * parent, - const string & label, - int maxValue = 100 ); - virtual NCBusyIndicator * createBusyIndicator ( YWidget *parent, - const string & label, - int timeout = 1000 ); - - virtual NCRichText * createRichText ( YWidget * parent, - const string & text = string(), - bool plainTextMode = false ); - - virtual NCIntField * createIntField ( YWidget * parent, - const string & label, - int minVal, - int maxVal, - int initialVal ); - - virtual NCMenuButton * createMenuButton ( YWidget * parent, - const string & label ); - - virtual NCMultiLineEdit * createMultiLineEdit ( YWidget * parent, - const string & label ); - virtual NCImage * createImage ( YWidget * parent, - const string & imagePath, - bool animated = false ); - - virtual NCLogView * createLogView ( YWidget * parent, - const string & label, - int visibleLines, - int storedLines = 0 ); - - virtual NCMultiSelectionBox * createMultiSelectionBox ( YWidget * parent, - const string & label ); - - virtual YPackageSelector * createPackageSelector ( YWidget * parent, - long ModeFlags = 0 ); + virtual NCPushButton * createPushButton ( YWidget * parent, const string & label ); + virtual NCLabel * createLabel ( YWidget * parent, const string & text, bool isHeading = false, bool isOutputField = false ); + virtual NCInputField * createInputField ( YWidget * parent, const string & label, bool passwordMode = false ); + virtual NCCheckBox * createCheckBox ( YWidget * parent, const string & label, bool isChecked = false ); + virtual NCRadioButton * createRadioButton ( YWidget * parent, const string & label, bool isChecked = false ); + virtual NCComboBox * createComboBox ( YWidget * parent, const string & label, bool editable = false ); + virtual NCSelectionBox * createSelectionBox ( YWidget * parent, const string & label ); + virtual NCTree * createTree ( YWidget * parent, const string & label ); + virtual NCTable * createTable ( YWidget * parent, YTableHeader * tableHeader, bool multiSelection = false ); + virtual NCProgressBar * createProgressBar ( YWidget * parent, const string & label, int maxValue = 100 ); + virtual NCRichText * createRichText ( YWidget * parent, const string & text = string(), bool plainTextMode = false ); + + + // + // Less Common Leaf Widgets + // + + virtual NCIntField * createIntField ( YWidget * parent, const string & label, int minVal, int maxVal, int initialVal ); + virtual NCMenuButton * createMenuButton ( YWidget * parent, const string & label ); + virtual NCMultiLineEdit * createMultiLineEdit ( YWidget * parent, const string & label ); + virtual NCImage * createImage ( YWidget * parent, const string & imagePath, bool animated = false ); + virtual NCLogView * createLogView ( YWidget * parent, const string & label, int visibleLines, int storedLines = 0 ); + virtual NCMultiSelectionBox*createMultiSelectionBox ( YWidget * parent, const string & label ); + virtual YPackageSelector * createPackageSelector ( YWidget * parent, long ModeFlags = 0 ); + virtual NCBusyIndicator * createBusyIndicator ( YWidget * parent, const string & label, int timeout = 1000 ); // NCurses only - virtual YWidget * createPkgSpecial ( YWidget * parent, - const string & subwidgetName ); - + virtual YWidget * createPkgSpecial ( YWidget * parent, const string & subwidgetName ); + // // Layout Helpers // - virtual NCSpacing * createSpacing ( YWidget * parent, - YUIDimension dim, - bool stretchable = false, - YLayoutSize_t size = 0.0 ); - - virtual NCEmpty * createEmpty ( YWidget * parent ); - - virtual NCAlignment * createAlignment ( YWidget * parent, - YAlignmentType horAlignment, - YAlignmentType vertAlignment ); - - virtual NCSquash * createSquash ( YWidget * parent, - bool horSquash, - bool vertSquash ); + virtual NCSpacing * createSpacing ( YWidget * parent, YUIDimension dim, bool stretchable = false, YLayoutSize_t size = 0.0 ); + virtual NCEmpty * createEmpty ( YWidget * parent ); + virtual NCAlignment * createAlignment ( YWidget * parent, YAlignmentType horAlignment, YAlignmentType vertAlignment ); + virtual NCSquash * createSquash ( YWidget * parent, bool horSquash, bool vertSquash ); + // // Visual Grouping // - virtual NCFrame * createFrame ( YWidget * parent, - const string & label ); - - virtual NCCheckBoxFrame * createCheckBoxFrame ( YWidget * parent, - const string & label, - bool checked ); + virtual NCFrame * createFrame ( YWidget * parent, const string & label ); + virtual NCCheckBoxFrame * createCheckBoxFrame ( YWidget * parent, const string & label, bool checked ); + // // Logical Grouping // - virtual NCRadioButtonGroup *createRadioButtonGroup ( YWidget * parent ); - virtual NCReplacePoint * createReplacePoint ( YWidget * parent ); + virtual NCRadioButtonGroup *createRadioButtonGroup ( YWidget * parent ); + virtual NCReplacePoint * createReplacePoint ( YWidget * parent ); protected: @@ -208,7 +152,7 @@ NCWidgetFactory(); /** - * Destructory. + * Destructor. **/ virtual ~NCWidgetFactory(); 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-ncurses-2.17.2/src/NCWidget.h new/yast2-ncurses-2.17.3/src/NCWidget.h --- old/yast2-ncurses-2.17.2/src/NCWidget.h 2008-06-11 11:58:20.000000000 +0200 +++ new/yast2-ncurses-2.17.3/src/NCWidget.h 2008-07-16 12:28:25.000000000 +0200 @@ -166,7 +166,7 @@ **/ virtual void setEnabled( bool do_bv ) = 0; - virtual bool HasHotkey( int key ) const; + virtual bool HasHotkey( int key ); virtual bool HasFunctionHotkey( int key ) const; virtual NCursesEvent wHandleHotkey( wint_t key ); 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-ncurses-2.17.2/VERSION new/yast2-ncurses-2.17.3/VERSION --- old/yast2-ncurses-2.17.2/VERSION 2008-07-02 09:51:41.000000000 +0200 +++ new/yast2-ncurses-2.17.3/VERSION 2008-07-16 12:29:25.000000000 +0200 @@ -1 +1 @@ -2.17.2 +2.17.3 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org