Author: tgoettlicher Date: Wed Jan 5 15:20:03 2011 New Revision: 63095 URL: http://svn.opensuse.org/viewcvs/yast?rev=63095&view=rev Log: - Fixed incompatibilities causes by checkboxes for treewidgeet - V 2.20.2 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/NCTree.cc trunk/ncurses/src/NCTree.h trunk/ncurses/src/NCWidgetFactory.cc trunk/ncurses/src/NCWidgetFactory.h trunk/ncurses/src/lang2encoding.cc trunk/ncurses/yast2-ncurses.spec.in Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=63095&r1=63094&r2=63095&view=diff ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Wed Jan 5 15:20:03 2011 @@ -1 +1 @@ -2.20.1 +2.20.2 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.changes?rev=63095&r1=63094&r2=63095&view=diff ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Wed Jan 5 15:20:03 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 5 15:08:58 CET 2011 - tgoettlicher@suse.de + +- Fixed incompatibilities causes by checkboxes for treewidgeet +- V 2.20.2 + +------------------------------------------------------------------- Thu Nov 25 16:37:09 CET 2010 - gs@suse.de - Correct color for keyboard shortcut, visible cursor in multi line Modified: trunk/ncurses/src/NCTree.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTree.cc?rev=63095&r1=63094&r2=63095&view=diff ============================================================================== --- trunk/ncurses/src/NCTree.cc (original) +++ trunk/ncurses/src/NCTree.cc Wed Jan 5 15:20:03 2011 @@ -235,8 +235,8 @@ -NCTree::NCTree( YWidget * parent, const string & nlabel ) - : YTree( parent, nlabel ) +NCTree::NCTree( YWidget * parent, const string & nlabel, bool multiselection ) + : YTree( parent, nlabel, multiselection ) , NCPadWidget( parent ) { yuiDebug() << endl; Modified: trunk/ncurses/src/NCTree.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTree.h?rev=63095&r1=63094&r2=63095&view=diff ============================================================================== --- trunk/ncurses/src/NCTree.h (original) +++ trunk/ncurses/src/NCTree.h Wed Jan 5 15:20:03 2011 @@ -57,7 +57,7 @@ public: - NCTree( YWidget * parent, const string & label ); + NCTree( YWidget * parent, const string & label, bool multiselection ); virtual ~NCTree(); virtual int preferredWidth(); Modified: trunk/ncurses/src/NCWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCWidgetFactory.cc?rev=63095&r1=63094&r2=63095&view=diff ============================================================================== --- trunk/ncurses/src/NCWidgetFactory.cc (original) +++ trunk/ncurses/src/NCWidgetFactory.cc Wed Jan 5 15:20:03 2011 @@ -153,9 +153,9 @@ NCTree * -NCWidgetFactory::createTree( YWidget * parent, const string & label ) +NCWidgetFactory::createTree( YWidget * parent, const string & label, bool multiselection ) { - NCTree * tree = new NCTree( parent, label ); + NCTree * tree = new NCTree( parent, label, multiselection ); YUI_CHECK_NEW( tree ); return tree; Modified: trunk/ncurses/src/NCWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCWidgetFactory.h?rev=63095&r1=63094&r2=63095&view=diff ============================================================================== --- trunk/ncurses/src/NCWidgetFactory.h (original) +++ trunk/ncurses/src/NCWidgetFactory.h Wed Jan 5 15:20:03 2011 @@ -93,7 +93,7 @@ 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 NCTree * createTree ( YWidget * parent, const string & label, bool multiselection = false ); 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 ); Modified: trunk/ncurses/src/lang2encoding.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/lang2encoding.cc?rev=63095&r1=63094&r2=63095&view=diff ============================================================================== --- trunk/ncurses/src/lang2encoding.cc (original) +++ trunk/ncurses/src/lang2encoding.cc Wed Jan 5 15:20:03 2011 @@ -5,27 +5,24 @@ std::string language2encoding( std::string lang ) { - using std::string; - lang = ":" + lang + ":"; - - if ( string( ":ca:da:de:en:es:fi:fr:gl:is:it:nl:no:pt:sv:" ).find( lang ) != string::npos ) - return "ISO-8859-1"; - else if ( string( ":lt:" ).find( lang ) != string::npos ) - return "ISO-8859-13"; - else if ( string( ":cs:hr:hu:pl:ro:sk:sl:" ).find( lang ) != string::npos ) - return "ISO-8859-2"; - else if ( string( ":ru:" ).find( lang ) != string::npos ) - return "ISO-8859-5"; - else if ( string( ":el:" ).find( lang ) != string::npos ) - return "ISO-8859-7"; - else if ( string( ":iw:" ).find( lang ) != string::npos ) - return "ISO-8859-8"; - else if ( string( ":tr:" ).find( lang ) != string::npos ) - return "ISO-8859-9"; - else if ( string( ":ja:" ).find( lang ) != string::npos ) - return "eucJP"; - - return ""; + using std::string; + lang = ":" + lang + ":"; + if ( string( ":ca:da:de:en:es:fi:fr:gl:is:it:nl:no:pt:sv:" ).find( lang ) != string::npos ) + return "ISO-8859-1"; + else if ( string( ":lt:" ).find( lang ) != string::npos ) + return "ISO-8859-13"; + else if ( string( ":cs:hr:hu:pl:ro:sk:sl:" ).find( lang ) != string::npos ) + return "ISO-8859-2"; + else if ( string( ":ru:" ).find( lang ) != string::npos ) + return "ISO-8859-5"; + else if ( string( ":el:" ).find( lang ) != string::npos ) + return "ISO-8859-7"; + else if ( string( ":iw:" ).find( lang ) != string::npos ) + return "ISO-8859-8"; + else if ( string( ":tr:" ).find( lang ) != string::npos ) + return "ISO-8859-9"; + else if ( string( ":ja:" ).find( lang ) != string::npos ) + return "eucJP"; + return ""; } - //----------------------------------------------------------------- Modified: trunk/ncurses/yast2-ncurses.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/yast2-ncurses.spec.in?rev=63095&r1=63094&r2=63095&view=diff ============================================================================== --- trunk/ncurses/yast2-ncurses.spec.in (original) +++ trunk/ncurses/yast2-ncurses.spec.in Wed Jan 5 15:20:03 2011 @@ -10,8 +10,8 @@ Summary: YaST2 - Character Based User Interface Provides: yast2_ui Requires: glibc-locale -BuildRequires: yast2-libyui-devel >= 2.18.4 -Requires: yast2-libyui >= 2.18.4 +BuildRequires: yast2-libyui-devel >= 2.19.2 +Requires: yast2-libyui >= 2.19.2 Recommends: yast2-ncurses-pkg %description This package contains the character based (ncurses) user interface -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org