- YaST Commits

[yast-commit] r41640 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes
by kmachalkova＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: kmachalkova Date: Tue Oct 30 13:56:20 2007 New Revision: 41640 URL: http://svn.opensuse.org/viewcvs/yast?rev=41640&view=rev Log: version 2.16.1 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=41640&r1=416… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Tue Oct 30 13:56:20 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Tue Oct 30 13:56:20 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Oct 30 13:52:59 CET 2007 - kmachalkova(a)suse.cz + +- Explicitely set foreground (font) color to white for rxvt theme + (do not display black font on black background) (#336060) +- 2.16.1 + +------------------------------------------------------------------- Tue Oct 23 15:18:39 CEST 2007 - kmachalkova(a)suse.cz - Added missing includes to compile with gcc 4.3 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41639 - /trunk/ncurses/src/NCstyle.rxvt.h
by kmachalkova＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: kmachalkova Date: Tue Oct 30 13:51:27 2007 New Revision: 41639 URL: http://svn.opensuse.org/viewcvs/yast?rev=41639&view=rev Log: Explicitely set foreground (font) color to white for rxvt theme (do not display black font on black background) (#336060) Modified: trunk/ncurses/src/NCstyle.rxvt.h Modified: trunk/ncurses/src/NCstyle.rxvt.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCstyle.rxvt.h?rev=4… ============================================================================== --- trunk/ncurses/src/NCstyle.rxvt.h (original) +++ trunk/ncurses/src/NCstyle.rxvt.h Tue Oct 30 13:51:27 2007 @@ -79,7 +79,11 @@ attrset->setAttr( NCstyle::ListActiveSelLabel, 7936 ); attrset->setAttr( NCstyle::ListActiveSelData, 7936|A_BOLD ); attrset->setAttr( NCstyle::ListActiveSelHint, 6144|A_BOLD ); - attrset->setAttr( NCstyle::RichTextPlain, 0 ); + attrset->setAttr( NCstyle::RichTextPlain, 1792 ); + //Need to set foreground color explicitely, otherwise urxvt will display + //black font on black background. This solution sucks, but cannot find + //any better (#336060) + attrset->setFg ( NCstyle::RichTextPlain, 7 ); attrset->setAttr( NCstyle::RichTextTitle, 512 ); attrset->setAttr( NCstyle::RichTextLink, 768 ); attrset->setAttr( NCstyle::RichTextArmedlink, 768|A_BOLD ); @@ -143,6 +147,7 @@ attrset->setAttr( NCstyle::ListActiveSelData, 0|A_BOLD ); attrset->setAttr( NCstyle::ListActiveSelHint, 0|A_BOLD ); attrset->setAttr( NCstyle::RichTextPlain, 0 ); + attrset->setFg ( NCstyle::RichTextPlain, 7 ); attrset->setAttr( NCstyle::RichTextTitle, 15360|A_BOLD ); attrset->setAttr( NCstyle::RichTextLink, 768 ); attrset->setAttr( NCstyle::RichTextArmedlink, 768|A_BOLD ); @@ -206,6 +211,7 @@ attrset->setAttr( NCstyle::ListActiveSelData, 0|A_BOLD ); attrset->setAttr( NCstyle::ListActiveSelHint, 0|A_BOLD ); attrset->setAttr( NCstyle::RichTextPlain, 0 ); + attrset->setFg ( NCstyle::RichTextPlain, 7 ); attrset->setAttr( NCstyle::RichTextTitle, 15360|A_BOLD ); attrset->setAttr( NCstyle::RichTextLink, 768 ); attrset->setAttr( NCstyle::RichTextArmedlink, 768|A_BOLD ); @@ -269,6 +275,7 @@ attrset->setAttr( NCstyle::ListActiveSelData, 1536|A_BOLD ); attrset->setAttr( NCstyle::ListActiveSelHint, 1536|A_BOLD ); attrset->setAttr( NCstyle::RichTextPlain, 0 ); + attrset->setFg ( NCstyle::RichTextPlain, 7 ); attrset->setAttr( NCstyle::RichTextTitle, 15360|A_BOLD ); attrset->setAttr( NCstyle::RichTextLink, 768 ); attrset->setAttr( NCstyle::RichTextArmedlink, 768|A_BOLD ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41638 - in /branches/tmp/sh/mod-ui/ncurses/src: NCTable.cc NCTable.h
by sh-sh-sh＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: sh-sh-sh Date: Tue Oct 30 13:39:48 2007 New Revision: 41638 URL: http://svn.opensuse.org/viewcvs/yast?rev=41638&view=rev Log: removed duplicate members Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc branches/tmp/sh/mod-ui/ncurses/src/NCTable.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc Tue Oct 30 13:39:48 2007 @@ -41,7 +41,6 @@ , biglist( false ) { WIDDBG << endl; - immediate = immediateMode(); InitPad(); // !!! head is UTF8 encoded, thus should be vector<NCstring> @@ -114,21 +113,6 @@ } -///////////////////////////////////////////////////////////////// -// -// -// METHOD NAME : NCTable::setKeepSorting -// METHOD TYPE : void -// -// DESCRIPTION : set flag according to `opt(`keepSorting) -// - -void NCTable::setKeepSorting ( bool keepSorting ) -{ - YTable::setKeepSorting( keepSorting ); - sortable = keepSorting; -} - /////////////////////////////////////////////////////////////////// // // @@ -182,6 +166,8 @@ string s; switch ( al ) { + case YAlignUnchanged: s = 'L' ; break; + case YAlignBegin: s = 'L' ; break; case YAlignCenter: s = 'C' ; break; case YAlignEnd: s = 'R' ; break; @@ -266,7 +252,7 @@ { if ( !myPad()->Lines() ) return -1; - return sortable ? myPad()->GetLine( myPad()->CurPos().L )->getIndex () + return ( ! keepSorting() ) ? myPad()->GetLine( myPad()->CurPos().L )->getIndex () : myPad()->CurPos().L; } @@ -530,7 +516,7 @@ selectCurrentItem(); - if ( notify() && immediate && citem != getCurrentItem() ) + if ( notify() && immediateMode() && citem != getCurrentItem() ) { ret = NCursesEvent::SelectionChanged; } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTable.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTable.h Tue Oct 30 13:39:48 2007 @@ -43,9 +43,6 @@ private: - bool immediate; - bool sortable; - vector<NCstring> _header; protected: @@ -80,9 +77,6 @@ bool bigList() const { return biglist; } - bool isImmediate() const { return immediate; } // addey by gs - void setKeepSorting( bool keepSorting ); - void setHeader( int col, const string & text ); // added by gs void setHeader ( vector<string> header ); virtual void setAlignment ( int col, YAlignmentType al ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41637 - in /branches/tmp/sh/mod-ui/core/libyui/src: YTable.cc YTable.h
by sh-sh-sh＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: sh-sh-sh Date: Tue Oct 30 13:26:21 2007 New Revision: 41637 URL: http://svn.opensuse.org/viewcvs/yast?rev=41637&view=rev Log: added function for derived classes Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc branches/tmp/sh/mod-ui/core/libyui/src/YTable.h Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTable.cc Tue Oct 30 13:26:21 2007 @@ -64,6 +64,19 @@ } +void +YTable::setTableHeader( YTableHeader * newHeader ) +{ + YUI_CHECK_PTR( newHeader ); + + if ( priv->header->columns() != newHeader->columns() ) + deleteAllItems(); + + delete priv->header; + priv->header = newHeader; +} + + int YTable::columns() const { Modified: branches/tmp/sh/mod-ui/core/libyui/src/YTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src… ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YTable.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YTable.h Tue Oct 30 13:26:21 2007 @@ -180,6 +180,17 @@ const char *userInputProperty() { return YUIProperty_CurrentItem; } +protected: + + /** + * Exchange the previous table header with a new one. This will delete the + * old YTableHeader object. + * + * If the new header has a different number of columns than the old one, + * all items will implicitly be deleted. + **/ + void setTableHeader( YTableHeader * newHeader ); + private: /** -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41636 - in /branches/tmp/sh/mod-ui/ncurses/src: NCAskForDirectory.cc NCAskForFile.cc NCFileSelection.cc NCFileSelection.h
by gs＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: gs Date: Tue Oct 30 12:01:36 2007 New Revision: 41636 URL: http://svn.opensuse.org/viewcvs/yast?rev=41636&view=rev Log: adapt to new YTable API Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc Tue Oct 30 12:01:36 2007 @@ -134,9 +134,17 @@ //hSplit->addChild( new NCSpacing( hSplit, opt, 0.1, true, false ) ); new NCSpacing( hSplit, YD_HORIZ, true, 0.1 ); // stretchable = true + + // create table header for table type T_Overview + YTableHeader * tableHeader = new YTableHeader(); + tableHeader->addColumn( 'L' + string(" ") ); + tableHeader->addColumn( 'L' + _( "Directory Name" ) ); // add the list of directories - dirList = new NCDirectoryTable( split, NCFileTable::T_Overview, iniDir ); + dirList = new NCDirectoryTable( split, + tableHeader, + NCFileTable::T_Overview, + iniDir ); YStringWidgetID * dirListID = new YStringWidgetID( idDirList ); dirList->setId( dirListID ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Tue Oct 30 12:01:36 2007 @@ -182,16 +182,32 @@ // HBox for the lists NCLayoutBox * hSplit1 = new NCLayoutBox( split, YD_HORIZ ); + // create table header for table type T_Overview + YTableHeader * dirHeader = new YTableHeader(); + dirHeader->addColumn( 'L' + " " ); + dirHeader->addColumn( 'L' + _("Directory name") ); + // add the list of directories opt.keyEvents.setValue( true ); - dirList = new NCDirectoryTable( hSplit1, NCFileSelection::T_Overview, YCPString(startDir) ); + dirList = new NCDirectoryTable( hSplit1, + dirHeader, + NCFileSelection::T_Overview, + YCPString(startDir) ); - YStringWidgetID * dirListID = new YStringWidgetID( idDirList ); dirList->setId( dirListID ); + + // create table header for table type T_Overview + YTableHeader * fileHeader = new YTableHeader(); + fileHeader->addColumn( 'L' + " " ); + fileHeader->addColumn( 'L' + _("File name") ); // add the list of files - fileList = new NCFileTable( hSplit1, NCFileSelection::T_Overview, filter, YCPString(startDir) ); + fileList = new NCFileTable( hSplit1, + fileHeader, + NCFileSelection::T_Overview, + filter, + YCPString(startDir) ); YStringWidgetID * dirFileID = new YStringWidgetID( idFileList ); fileList->setId( dirFileID ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCF… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc Tue Oct 30 12:01:36 2007 @@ -182,9 +182,10 @@ // DESCRIPTION : // NCFileSelection::NCFileSelection( YWidget * parent, + YTableHeader * tableHeader, NCFileSelectionType type, const YCPString & iniDir ) - : NCTable( parent, 0 ) + : NCTable( parent, tableHeader ) , startDir( iniDir->value() ) , currentDir( iniDir->value() ) , tableType( type ) @@ -457,12 +458,13 @@ // DESCRIPTION : // NCFileTable::NCFileTable( YWidget * parent, + YTableHeader * tableHeader, NCFileSelectionType type, const YCPString & filter, const YCPString & iniDir ) - : NCFileSelection( parent, type, iniDir ) + : NCFileSelection( parent, tableHeader, type, iniDir ) { - fillHeader(); + //fillHeader(); string filterStr = filter->value(); const string delims( " \t" ); @@ -716,11 +718,12 @@ // DESCRIPTION : // NCDirectoryTable::NCDirectoryTable( YWidget * parent, + YTableHeader * tableHeader, NCFileSelectionType type, const YCPString & iniDir ) - : NCFileSelection( parent, type, iniDir ) + : NCFileSelection( parent, tableHeader, type, iniDir ) { - fillHeader(); + //fillHeader(); } /////////////////////////////////////////////////////////////////// Modified: branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCF… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.h Tue Oct 30 12:01:36 2007 @@ -132,6 +132,7 @@ * Constructor */ NCFileSelection( YWidget * parent, + YTableHeader * tableHeader, NCFileSelectionType type, const YCPString & iniDir ); @@ -224,6 +225,7 @@ * Constructor */ NCFileTable( YWidget * parent, + YTableHeader * tableHeader, NCFileSelectionType type, const YCPString & filter, const YCPString & iniDir ); @@ -259,6 +261,7 @@ * Constructor */ NCDirectoryTable( YWidget * parent, + YTableHeader * tableHeader, NCFileSelectionType type, const YCPString & iniDir ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41635 - /branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDiskspace.cc
by gs＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: gs Date: Tue Oct 30 11:27:20 2007 New Revision: 41635 URL: http://svn.opensuse.org/viewcvs/yast?rev=41635&view=rev Log: create YTableHeader Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDiskspace.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDiskspace.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDiskspace.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDiskspace.cc Tue Oct 30 11:27:20 2007 @@ -108,17 +108,16 @@ head = new NCLabel( split, "", true, false ); // isHeading = true - vector<string> header; - header.reserve(5); - header.push_back( "L" + NCPkgNames::Partition() ); - header.push_back( "L" + NCPkgNames::UsedSpace() ); - header.push_back( "L" + NCPkgNames::FreeSpace() ); - header.push_back( "L" + NCPkgNames::TotalSpace() ); - header.push_back( "L% "); - + YTableHeader * tableHeader = new YTableHeader(); + tableHeader->addColumn( "L" + NCPkgNames::Partition() ); + tableHeader->addColumn( "L" + NCPkgNames::UsedSpace() ); + tableHeader->addColumn( "L" + NCPkgNames::FreeSpace() ); + tableHeader->addColumn( "L" + NCPkgNames::TotalSpace() ); + tableHeader->addColumn( "L% "); + // add the partition table //partitions = new NCTable( split, opt, header, false ); - partitions = new NCTable( split, 5 ); // 5 columns + partitions = new NCTable( split, tableHeader ); // add the ok button opt.key_Fxx.setValue( 10 ); okButton = new NCPushButton( split, NCPkgNames::OKLabel() ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41634 - in /branches/tmp/sh/mod-ui/ncurses/src: NCAskForDirectory.cc NCAskForFile.cc
by gs＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: gs Date: Tue Oct 30 11:26:48 2007 New Revision: 41634 URL: http://svn.opensuse.org/viewcvs/yast?rev=41634&view=rev Log: remove addChild for table widget Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForDirectory.cc Tue Oct 30 11:26:48 2007 @@ -138,11 +138,6 @@ // add the list of directories dirList = new NCDirectoryTable( split, NCFileTable::T_Overview, iniDir ); - // FIXME - remove this - will be obsolete when NCTable is migrated - dirList->setParent( split ); - split->addChild( dirList ); - // remove this - YStringWidgetID * dirListID = new YStringWidgetID( idDirList ); dirList->setId( dirListID ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCA… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCAskForFile.cc Tue Oct 30 11:26:48 2007 @@ -186,10 +186,6 @@ opt.keyEvents.setValue( true ); dirList = new NCDirectoryTable( hSplit1, NCFileSelection::T_Overview, YCPString(startDir) ); - // FIXME - remove this - will be obsolete when NCTable is migrated - dirList->setParent( hSplit1 ); - hSplit1->addChild( dirList ); - // remove this YStringWidgetID * dirListID = new YStringWidgetID( idDirList ); dirList->setId( dirListID ); @@ -197,11 +193,6 @@ // add the list of files fileList = new NCFileTable( hSplit1, NCFileSelection::T_Overview, filter, YCPString(startDir) ); - // FIXME - remove this - will be obsolete when NCTable is migrated - fileList->setParent( hSplit1 ); - hSplit1->addChild( fileList ); - // remove this - YStringWidgetID * dirFileID = new YStringWidgetID( idFileList ); fileList->setId( dirFileID ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41633 - in /branches/tmp/sh/mod-ui/ncurses/src: NCPopupTable.cc NCPopupTable.h
by gs＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: gs Date: Tue Oct 30 11:26:05 2007 New Revision: 41633 URL: http://svn.opensuse.org/viewcvs/yast?rev=41633&view=rev Log: add method getCurrentItemPointer Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc Tue Oct 30 11:26:05 2007 @@ -61,7 +61,9 @@ if ( sellist ) return ; - sellist = new NCTable( this, row.size() ); + YTableHeader * tableHeader = new YTableHeader(); + // sellist = new NCTable( this, row.size() ); + sellist = new NCTable( this, tableHeader ); YUI_CHECK_NEW( sellist ); sellist->setBigList( true ); @@ -120,6 +122,14 @@ return sellist->getCurrentItem(); } +YItem * NCPopupTable::getCurrentItemPointer( ) const +{ + if ( !sellist ) + return 0; + + return sellist->getCurrentItemPointer( ); +} + /////////////////////////////////////////////////////////////////// // // Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.h Tue Oct 30 11:26:05 2007 @@ -26,10 +26,10 @@ using namespace std; #include "NCPopup.h" -#include "YItem.h" +#include "YTableItem.h" class NCTable; -class YCPValue; + /////////////////////////////////////////////////////////////////// // @@ -54,7 +54,8 @@ void setCurrentItem( int index ); int getCurrentItem() const; - + YItem * getCurrentItemPointer( ) const; + virtual NCursesEvent wHandleHotkey( wint_t ch ); protected: -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41632 - in /branches/tmp/sh/mod-ui/ncurses/src: NCMenuButton.cc NCPopupMenu.cc NCPopupMenu.h
by gs＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: gs Date: Tue Oct 30 11:25:19 2007 New Revision: 41632 URL: http://svn.opensuse.org/viewcvs/yast?rev=41632&view=rev Log: add map to store table/menu item Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCM… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCMenuButton.cc Tue Oct 30 11:25:19 2007 @@ -189,7 +189,6 @@ { wpos at( ScreenPos() + wpos( win->height(), 0 ) ); NCPopupMenu * dialog = new NCPopupMenu( at, - this, itemsBegin(), itemsEnd() ); YUI_CHECK_NEW( dialog ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc Tue Oct 30 11:25:19 2007 @@ -30,25 +30,28 @@ // // DESCRIPTION : // -NCPopupMenu::NCPopupMenu( const wpos at, NCMenuButton * menuButton, YItemIterator begin, YItemIterator end ) +NCPopupMenu::NCPopupMenu( const wpos at, YItemIterator begin, YItemIterator end ) : NCPopupTable( at ) - , menu( menuButton ) - , startIndex( 0 ) + , itemsMap() { vector<string> row( 2 ); createList( row ); YMenuItem * startItem = dynamic_cast<YMenuItem *> (*begin); YUI_CHECK_PTR( startItem ); - startIndex = startItem->index(); for ( YItemIterator it = begin; it != end; ++it ) { YMenuItem * item = dynamic_cast<YMenuItem *> (*it); YUI_CHECK_PTR( item ); + row[0] = item->label(); row[1] = item->hasChildren() ? "..." : ""; - YItem *tableItem = new YTableItem( row[0], row[1] ); + + YTableItem *tableItem = new YTableItem( row[0], row[1] ); + NCMIL << "Add to map: TableItem: " << tableItem << " Menu item: " << item << endl; + addItem( tableItem ); + itemsMap[tableItem] = item; } stripHotkeys(); } @@ -63,6 +66,7 @@ // NCPopupMenu::~NCPopupMenu() { + itemsMap.clear(); } /////////////////////////////////////////////////////////////////// @@ -79,7 +83,11 @@ switch ( ch ) { case KEY_RIGHT: { - YMenuItem * item = menu->findItem( startIndex + getCurrentItem() ); + NCMIL << "CurrentItem: " << getCurrentItem() << endl; + YTableItem * tableItem = dynamic_cast<YTableItem *>( getCurrentItemPointer() ); + NCMIL << "TableItem: " << tableItem << endl; + YMenuItem * item = itemsMap[ tableItem ]; + NCMIL << "MenuItem: " << item << endl; if ( item && item->hasChildren() ) ret = NCursesEvent::button; break; @@ -109,18 +117,21 @@ bool again = false; int selection = ( postevent == NCursesEvent::button ) ? getCurrentItem() : -1; - YMenuItem * item = menu->findItem( startIndex + selection ); - + NCMIL << "Index: " << selection << endl; + YTableItem * tableItem = dynamic_cast<YTableItem *>( getCurrentItemPointer() ); + if ( tableItem ) + NCMIL << "Table item: " << tableItem->label() << endl; + YMenuItem * item = itemsMap[ tableItem ]; + if ( !item ) - return again; - + return true; + NCMIL << "Menu item: " << item->label() << endl; if ( selection != -1 ) { if ( item->hasChildren() ) { // post submenu wpos at( ScreenPos() + wpos( selection, inparent.Sze.W - 1 ) ); NCPopupMenu * dialog = new NCPopupMenu( at, - menu, item->childrenBegin(), item->childrenEnd() ); YUI_CHECK_NEW( dialog ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.h Tue Oct 30 11:25:19 2007 @@ -40,8 +40,7 @@ private: - NCMenuButton * menu; - int startIndex; + std::map<YTableItem *, YMenuItem *> itemsMap; protected: @@ -51,7 +50,6 @@ public: NCPopupMenu( const wpos at, - NCMenuButton * menu, YItemIterator begin, YItemIterator end); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r41631 - in /branches/tmp/sh/mod-ui/ncurses/src: NCTable.cc NCTable.h NCWidgetFactory.cc NCWidgetFactory.h
by gs＠svn.opensuse.org 30 Oct '07

30 Oct '07

Author: gs Date: Tue Oct 30 11:24:13 2007 New Revision: 41631 URL: http://svn.opensuse.org/viewcvs/yast?rev=41631&view=rev Log: adapt to new YTable API Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc branches/tmp/sh/mod-ui/ncurses/src/NCTable.h branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.h Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTable.cc Tue Oct 30 11:24:13 2007 @@ -20,6 +20,7 @@ #include "NCTable.h" #include "NCPopupMenu.h" #include <yui/YMenuButton.h> +#include "YTypes.h" #if 0 #undef DBG_CLASS @@ -34,8 +35,8 @@ // // DESCRIPTION : // -NCTable::NCTable( YWidget * parent, int columns ) - : YTable( parent, columns ) +NCTable::NCTable( YWidget * parent, YTableHeader *tableHeader ) + : YTable( parent, tableHeader ) , NCPadWidget( parent ) , biglist( false ) { @@ -43,8 +44,17 @@ immediate = immediateMode(); InitPad(); - // !!! head is UTF8 encoded, thus should be vector<YCPstring> - header.assign( columns, NCstring("") ); + // !!! head is UTF8 encoded, thus should be vector<NCstring> + _header.assign( columns(), NCstring("") ); + + for ( int col = 0; col < columns(); col++ ) + { + if ( hasColumn( col ) ) + { + _header[ col ] += NCstring( header( col ) ) ; + } + } + hasHeadline = myPad()->SetHeadline( _header ); } ///////////////////////////////////////////////////////////////// @@ -130,13 +140,13 @@ void NCTable::setHeader( int col, const string & text ) { - YTable::setHeader( col, text ); + //YTable::setHeader( col, text ); if ( hasColumn( col )) { - header[ col ] += NCstring( text ) ; + _header[ col ] += NCstring( text ) ; } - hasHeadline = myPad()->SetHeadline( header ); + hasHeadline = myPad()->SetHeadline( _header ); } /////////////////////////////////////////////////////////////////// @@ -167,18 +177,18 @@ // letter - setHeader will append the rest // -void NCTable::setAlignment ( int col, YTable::Alignment al ) +void NCTable::setAlignment ( int col, YAlignmentType al ) { string s; switch ( al ) { - case YTable::Left: s = 'L' ; break; - case YTable::Center: s = 'C' ; break; - case YTable::Right: s = 'R' ; break; + case YAlignBegin: s = 'L' ; break; + case YAlignCenter: s = 'C' ; break; + case YAlignEnd: s = 'R' ; break; } - header[ col ] = NCstring( s ); - YTable::setAlignment( col, al ); + _header[ col ] = NCstring( s ); + //YTable::setAlignment( col, al ); } /////////////////////////////////////////////////////////////////// @@ -264,6 +274,21 @@ /////////////////////////////////////////////////////////////////// // // +// METHOD NAME : NCTable::getCurrentItemPointer +// METHOD TYPE : YItem * +// +// DESCRIPTION : Return origin pointer of currently selected table item +// + +YItem * NCTable::getCurrentItemPointer() +{ + const NCTableLine *cline = myPad()->GetLine( myPad()->CurPos().L ); + return cline->origItem(); +} + +/////////////////////////////////////////////////////////////////// +// +// // METHOD NAME : NCTable::setCurrentItem // METHOD TYPE : void // Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTable.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTable.h Tue Oct 30 11:24:13 2007 @@ -46,7 +46,7 @@ bool immediate; bool sortable; - vector<NCstring> header; + vector<NCstring> _header; protected: @@ -74,7 +74,7 @@ public: - NCTable( YWidget * parent, int columns ); + NCTable( YWidget * parent, YTableHeader *header ); virtual ~NCTable(); @@ -85,7 +85,7 @@ void setHeader( int col, const string & text ); // added by gs void setHeader ( vector<string> header ); - virtual void setAlignment ( int col, YTable::Alignment al ); + virtual void setAlignment ( int col, YAlignmentType al ); void setBigList( const bool big ) { biglist = big; } void SetSepChar( const chtype colSepchar ) { myPad()->SetSepChar( colSepchar ); } @@ -96,6 +96,8 @@ virtual void deleteAllItems( ); virtual int getCurrentItem(); + YItem * getCurrentItemPointer(); + virtual void setCurrentItem( int index ); virtual void selectItem( YItem *yitem, bool selected ); void selectCurrentItem(); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCW… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc Tue Oct 30 11:24:13 2007 @@ -165,9 +165,9 @@ NCTable * -NCWidgetFactory::createTable( YWidget * parent, int columns ) +NCWidgetFactory::createTable( YWidget * parent, YTableHeader * tableHeader ) { - NCTable *table = new NCTable( parent, columns ); + NCTable *table = new NCTable( parent, tableHeader ); YUI_CHECK_NEW( table ); return table; Modified: branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCW… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.h Tue Oct 30 11:24:13 2007 @@ -117,7 +117,7 @@ const string & label ); virtual NCTable * createTable ( YWidget * parent, - int columns ); + YTableHeader * tableHeader ); virtual NCProgressBar * createProgressBar ( YWidget * parent, const string & label, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0