Author: gs Date: Wed Oct 31 13:39:59 2007 New Revision: 41679 URL: http://svn.opensuse.org/viewcvs/yast?rev=41679&view=rev Log: add YTableHeader to NCPkgTable constructor Modified: branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.h branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDescr.cc branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupSelection.cc branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTable.cc Modified: branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc?rev=41679&r1=41678&r2=41679&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCFileSelection.cc Wed Oct 31 13:39:59 2007 @@ -638,6 +638,7 @@ list<string> tmpList; list<string>::iterator it; + // FIXME - set the new header //fillHeader(); // create the column headers DIR * diskDir = opendir( currentDir.c_str() ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc?rev=41679&r1=41678&r2=41679&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc Wed Oct 31 13:39:59 2007 @@ -92,12 +92,14 @@ YWidget * NCPackageSelectorPlugin::createPkgSpecial( YWidget *parent, const string &subwidget ) { YWidget * w = 0; + YTableHeader * tableHeader = new YTableHeader(); + if ( subwidget == "pkgTable" ) { NCDBG << "Creating a NCPkgTable" << endl; try { - w = new NCPkgTable( parent ); + w = new NCPkgTable( parent, tableHeader ); } catch (const std::exception & e) { Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc?rev=41679&r1=41678&r2=41679&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc Wed Oct 31 13:39:59 2007 @@ -113,8 +113,8 @@ // // DESCRIPTION : // -NCPkgTable::NCPkgTable( YWidget * parent ) - : NCTable( parent, 0 ) +NCPkgTable::NCPkgTable( YWidget * parent, YTableHeader * tableHeader ) + : NCTable( parent, tableHeader ) , packager ( 0 ) , statusStrategy( new PackageStatStrategy ) // default strategy: packages , tableType ( T_Packages ) // default type: packages Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.h?rev=41679&r1=41678&r2=41679&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.h Wed Oct 31 13:39:59 2007 @@ -135,7 +135,7 @@ /** * Constructor */ - NCPkgTable( YWidget * parent ); + NCPkgTable( YWidget * parent, YTableHeader * tableHeader ); virtual ~NCPkgTable(); Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDescr.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDescr.cc?rev=41679&r1=41678&r2=41679&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDescr.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupDescr.cc Wed Oct 31 13:39:59 2007 @@ -100,8 +100,10 @@ //split->addChild( new NCSpacing( split, opt, 0.6, false, true ) ); new NCSpacing( split, YD_VERT, true, 0.6 ); // stretchable = true + YTableHeader * tableHeader = new YTableHeader(); + // add the package table (use default type T_Packages) - pkgTable = new NCPkgTable( split ); + pkgTable = new NCPkgTable( split, tableHeader ); pkgTable->setPackager( packager ); pkgTable->fillHeader(); Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupSelection.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupSelection.cc?rev=41679&r1=41678&r2=41679&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupSelection.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupSelection.cc Wed Oct 31 13:39:59 2007 @@ -105,8 +105,10 @@ //NCLabel * head = new NCLabel( split, opt, label ); new NCLabel( split, label, true, false ); // isHeading = true + YTableHeader * tableHeader = new YTableHeader(); + // add the selection list - sel = new NCPkgTable( split ); + sel = new NCPkgTable( split, tableHeader ); sel->setPackager( packager ); // set status strategy NCPkgStatusStrategy * strat = new SelectionStatStrategy(); Modified: branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTable.cc?rev=41679&r1=41678&r2=41679&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/pkg/NCPkgPopupTable.cc Wed Oct 31 13:39:59 2007 @@ -103,9 +103,10 @@ //NCLabel * lb2 = new NCLabel( split, opt, YCPString(NCPkgNames::AutoChangeText2()) ); // text part2 of popup with automatic changes new NCLabel( split, _( "packages have been changed to resolve dependencies:" ), false, false ); - + + YTableHeader * tableHeader = new YTableHeader(); // add the package table (use default type T_Packages) - pkgTable = new NCPkgTable( split ); + pkgTable = new NCPkgTable( split, tableHeader ); pkgTable->setPackager( packager ); pkgTable->fillHeader(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org