October 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r41392 - /branches/tmp/sh/mod-ui/ncurses/src/
by kmachalkova＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: kmachalkova Date: Thu Oct 11 17:35:25 2007 New Revision: 41392 URL: http://svn.opensuse.org/viewcvs/yast?rev=41392&view=rev Log: Ported NCTable, part I 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 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/NCPopupList.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupMenu.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.cc branches/tmp/sh/mod-ui/ncurses/src/NCPopupTable.h 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/NCTableItem.cc branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.h branches/tmp/sh/mod-ui/ncurses/src/NCTablePad.h branches/tmp/sh/mod-ui/ncurses/src/NCWidgetFactory.cc branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.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 Thu Oct 11 17:35:25 2007 @@ -136,7 +136,7 @@ new NCSpacing( hSplit, YD_HORIZ, true, 0.1 ); // stretchable = true // add the list of directories - dirList = new NCDirectoryTable( split, opt, NCFileTable::T_Overview, iniDir ); + dirList = new NCDirectoryTable( split, NCFileTable::T_Overview, iniDir ); // FIXME - remove this - will be obsolete when NCTable is migrated dirList->setParent( split ); 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 Thu Oct 11 17:35:25 2007 @@ -184,7 +184,7 @@ // add the list of directories opt.keyEvents.setValue( true ); - dirList = new NCDirectoryTable( hSplit1, opt, NCFileSelection::T_Overview, YCPString(startDir) ); + dirList = new NCDirectoryTable( hSplit1, NCFileSelection::T_Overview, YCPString(startDir) ); // FIXME - remove this - will be obsolete when NCTable is migrated dirList->setParent( hSplit1 ); @@ -195,7 +195,7 @@ dirList->setId( dirListID ); // add the list of files - fileList = new NCFileTable( hSplit1, opt, NCFileSelection::T_Overview, filter, YCPString(startDir) ); + fileList = new NCFileTable( hSplit1, NCFileSelection::T_Overview, filter, YCPString(startDir) ); // FIXME - remove this - will be obsolete when NCTable is migrated fileList->setParent( hSplit1 ); 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 Thu Oct 11 17:35:25 2007 @@ -182,10 +182,9 @@ // DESCRIPTION : // NCFileSelection::NCFileSelection( YWidget * parent, - const YWidgetOpt & opt, NCFileSelectionType type, const YCPString & iniDir ) - : NCTable( parent, opt, vector<string> (), false ) + : NCTable( parent, 0 ) , startDir( iniDir->value() ) , currentDir( iniDir->value() ) , tableType( type ) @@ -320,14 +319,14 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCFileSelection::itemsCleared +// METHOD NAME : NCFileSelection::deleteAllItems // METHOD TYPE : void // // DESCRIPTION : // -void NCFileSelection::itemsCleared() +void NCFileSelection::deleteAllItems() { - return NCTable::itemsCleared(); + return NCTable::deleteAllItems(); } /////////////////////////////////////////////////////////////////// @@ -458,11 +457,10 @@ // DESCRIPTION : // NCFileTable::NCFileTable( YWidget * parent, - const YWidgetOpt & opt, NCFileSelectionType type, const YCPString & filter, const YCPString & iniDir ) - : NCFileSelection( parent, opt, type, iniDir ) + : NCFileSelection( parent, type, iniDir ) { fillHeader(); @@ -644,7 +642,7 @@ if ( ( diskDir = opendir( currentDir.c_str() ) ) ) { - itemsCleared(); + deleteAllItems(); while ( ( entry = readdir( diskDir ) ) ) { string entryName = entry->d_name; @@ -718,10 +716,9 @@ // DESCRIPTION : // NCDirectoryTable::NCDirectoryTable( YWidget * parent, - const YWidgetOpt & opt, NCFileSelectionType type, const YCPString & iniDir ) - : NCFileSelection( parent, opt, type, iniDir ) + : NCFileSelection( parent, type, iniDir ) { fillHeader(); } @@ -787,7 +784,7 @@ if ( ( diskDir = opendir( currentDir.c_str() ) ) ) { - itemsCleared(); + deleteAllItems(); while ( ( entry = readdir( diskDir ) ) ) { string entryName = entry->d_name; 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 Thu Oct 11 17:35:25 2007 @@ -132,7 +132,6 @@ * Constructor */ NCFileSelection( YWidget * parent, - const YWidgetOpt & opt, NCFileSelectionType type, const YCPString & iniDir ); @@ -175,7 +174,7 @@ /** * Clears the package list */ - virtual void itemsCleared(); + virtual void deleteAllItems(); /** * Fills the header of the table @@ -225,7 +224,6 @@ * Constructor */ NCFileTable( YWidget * parent, - const YWidgetOpt & opt, NCFileSelectionType type, const YCPString & filter, const YCPString & iniDir ); @@ -261,7 +259,6 @@ * Constructor */ NCDirectoryTable( YWidget * parent, - const YWidgetOpt & opt, NCFileSelectionType type, const YCPString & iniDir ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPackageSelectorPlugin.cc Thu Oct 11 17:35:25 2007 @@ -97,9 +97,7 @@ NCDBG << "Creating a NCPkgTable" << endl; try { - // FIXME - remove YWidgetOpt() after NCTable is ported - YWidgetOpt * opt = new YWidgetOpt(); - w = new NCPkgTable( parent, *opt ); + w = new NCPkgTable( parent ); } 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/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.cc Thu Oct 11 17:35:25 2007 @@ -113,8 +113,8 @@ // // DESCRIPTION : // -NCPkgTable::NCPkgTable( YWidget * parent, const YWidgetOpt & opt ) - : NCTable( parent, opt, vector<string> (), false ) +NCPkgTable::NCPkgTable( YWidget * parent ) + : NCTable( parent, 0 ) , packager ( 0 ) , statusStrategy( new PackageStatStrategy ) // default strategy: packages , tableType ( T_Packages ) // default type: packages @@ -173,14 +173,14 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgTable::itemsCleared +// METHOD NAME : NCPkgTable::deleteAllItems // METHOD TYPE : void // // DESCRIPTION : // void NCPkgTable::itemsCleared() { - return NCTable::itemsCleared(); + return NCTable::deleteAllItems(); } @@ -192,7 +192,7 @@ // // DESCRIPTION : // -void NCPkgTable::cellChanged( int index, int colnum, const YCPString & newtext ) +void NCPkgTable::cellChanged( int index, int colnum, const string & newtext ) { return NCTable::cellChanged( index, colnum, newtext ); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPkgTable.h Thu Oct 11 17:35:25 2007 @@ -135,7 +135,7 @@ /** * Constructor */ - NCPkgTable( YWidget * parent, const YWidgetOpt & opt ); + NCPkgTable( YWidget * parent ); virtual ~NCPkgTable(); @@ -170,7 +170,7 @@ * @param newtext The new text * @eturn void */ - virtual void cellChanged( int index, int colnum, const YCPString & newtext ); + virtual void cellChanged( int index, int colnum, const string & newtext ); /** * Returns the contents of a certain cell in table Modified: branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCP… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCPopupList.cc Thu Oct 11 17:35:25 2007 @@ -18,6 +18,7 @@ /-*/ #include "Y2Log.h" #include "NCPopupList.h" +#include "YTableItem.h" #include <ycp/YCPString.h> @@ -35,18 +36,10 @@ int index ) : NCPopupTable( at ) { - NCMIL << "Constructor NCPopupList" << endl; NCMIL << "CurrentDialog: " << dynamic_cast<NCDialog *>(currentDialog()) << endl; -#if 0 - vector<string> row( 1 ); - createList( row ); - for ( list<string>::const_iterator entry = deflist.begin(); - entry != deflist.end(); ++entry ) { - row[0] = (*entry); - addItem( YCPNull(), row ); - } - setCurrentItem( index ); -#endif + NCMIL << "CurrentDialog: " << dynamic_cast<NCDialog *>(currentDialog()) << endl; + + createEntries( deflist, index); } /////////////////////////////////////////////////////////////////// @@ -68,9 +61,9 @@ createList( row ); for ( list<string>::const_iterator entry = deflist.begin(); entry != deflist.end(); ++entry ) { - row[0] = (*entry); - NCMIL << "Adding item: " << *entry << endl; - addItem( YCPNull(), row ); + //row[0] = (*entry); + YItem *item = new YTableItem( (*entry )); + addItem( item ); } setCurrentItem( index ); } 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 Thu Oct 11 17:35:25 2007 @@ -40,7 +40,7 @@ entry != menu.itemList().end(); ++entry ) { row[0] = (*entry)->getLabel()->value(); row[1] = (*entry)->hasChildren() ? "..." : ""; - addItem( (*entry)->getId(), row ); + /*addItem( (*entry)->getId(), row );*/ } stripHotkeys(); } 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 Thu Oct 11 17:35:25 2007 @@ -59,29 +59,17 @@ void NCPopupTable::createList( vector<string> & row ) { if ( sellist ) - return; - - // FIXME: remove opt - will be obsolete once YTable is migrated - YWidgetOpt opt; - opt.notifyMode.setValue( true ); + return ; - sellist= new NCTable( this, opt, row, false ); + sellist = new NCTable( this, row.size() ); sellist->setBigList( true ); sellist->SetSepChar( ' ' ); sellist->SetSepWidht( 0 ); sellist->SetHotCol( 0 ); sellist->setNotify( true ); - - // TO DO: This will be obsolete once YTable is migrated - // TO DO: This will be obsolete once YTable is migrated - // TO DO: This will be obsolete once YTable is migrated - sellist->setParent( this ); - addChild( sellist ); - // TO DO: This will be obsolete once YTable is migrated - // TO DO: This will be obsolete once YTable is migrated - // TO DO: This will be obsolete once YTable is migrated currentDialog()->dumpWidgetTree(); + } /////////////////////////////////////////////////////////////////// @@ -92,12 +80,12 @@ // // DESCRIPTION : // -void NCPopupTable::addItem( const YCPValue & id, vector<string> & row ) +void NCPopupTable::addItem( YItem *yitem ) { - if ( !sellist ) + if ( !yitem ) return; - sellist->addItem( id, row ); + sellist->addItem( yitem ); } /////////////////////////////////////////////////////////////////// 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 Thu Oct 11 17:35:25 2007 @@ -26,6 +26,7 @@ using namespace std; #include "NCPopup.h" +#include "YItem.h" class NCTable; class YCPValue; @@ -49,7 +50,7 @@ void createList( vector<string> & row ); - void addItem( const YCPValue & id, vector<string> & row ); + void addItem( YItem *yitem ); void setCurrentItem( int index ); int getCurrentItem() const; 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 Thu Oct 11 17:35:25 2007 @@ -34,23 +34,21 @@ // // DESCRIPTION : // -NCTable::NCTable( YWidget * parent, const YWidgetOpt & opt, - vector<string> head, bool sort ) - : YTable( opt, head.size() ) +NCTable::NCTable( YWidget * parent, int columns ) + : YTable( parent, columns ) , NCPadWidget( parent ) - , immediate ( opt.immediateMode.value() ) - , sortable (sort) - , header (head) , biglist( false ) { WIDDBG << endl; + immediate = immediateMode(); + InitPad(); // !!! head is UTF8 encoded, thus should be vector<YCPstring> - vector<NCstring> headline( head.size() ); - for ( unsigned i = 0; i < head.size(); ++i ) { - headline[i] = NCstring( head[i] ); - } - hasHeadline = myPad()->SetHeadline( headline ); + header.assign( columns, NCstring("") ); + /*for ( unsigned i = 0; i < head.size(); ++i ) { + setHeader( i, head[i] ); + }*/ + hasHeadline = myPad()->SetHeadline( header ); } /////////////////////////////////////////////////////////////////// @@ -134,16 +132,38 @@ // // DESCRIPTION : // -void NCTable::setHeader( const vector<string> & head ) +void NCTable::setHeader( int col, const string & text ) +{ + YTable::setHeader( col, text ); + + if ( hasColumn( col )) + { + header[ col ] = NCstring( text ) ; + } + + hasHeadline = myPad()->SetHeadline( header ); +} + +void NCTable::setHeader( vector<string> head ) { - header = head; - vector<NCstring> headline( head.size() ); - for ( unsigned i = 0; i < head.size(); ++i ) { - headline[i] = NCstring( head[i] ); + for (unsigned int i = 0; i < head.size(); i++) { + setHeader( i, head[i] ); } - hasHeadline = myPad()->SetHeadline( headline ); } +void NCTable::setAlignment ( int col, YTable::Alignment al ) +{ + //FIXME: need something better than just dumb calling parent + // method - ncurses doesn't seem to support alignments natively + YTable::setAlignment( col, al ); + +} + +void NCTable::setKeepSorting ( bool keepSorting ) +{ + YTable::setKeepSorting( keepSorting ); + sortable = keepSorting; +} /////////////////////////////////////////////////////////////////// // // @@ -189,34 +209,46 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCTable::itemAdded +// METHOD NAME : NCTable::addItem // METHOD TYPE : void // // DESCRIPTION : // -void NCTable::itemAdded( vector<string> elements, int index ) +void NCTable::addItem( YItem *yitem ) { - vector<NCTableCol*> Items( elements.size(), 0 ); - for ( unsigned i = 0; i < elements.size(); ++i ) { + YTableItem *item = dynamic_cast<YTableItem *>(yitem); + YTable::addItem( item ); + + vector<NCTableCol*> Items( item->cellCount() ); + unsigned int i = 0; + for ( YTableCellIterator it = item->cellsBegin(); + it != item->cellsEnd(); + ++it ){ // use YCPString to enforce recoding from 'utf8' - Items[i] = new NCTableCol( YCPString( elements[i] ) ); + Items[i] = new NCTableCol( NCstring( (*it)->label() ) ); + i++; } - myPad()->Append( Items, index ); + NCTableLine *newline = new NCTableLine( Items ); + newline->setOrigItem( item ); + + myPad()->Append( newline ); + //myPad()->Append( Items, myPad()->Lines() ); DrawPad(); } /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCTable::itemsCleared +// METHOD NAME : NCTable::deleteAllItems // METHOD TYPE : void // // DESCRIPTION : // -void NCTable::itemsCleared() +void NCTable::deleteAllItems() { myPad()->ClearTable(); DrawPad(); + YTable::deleteAllItems(); } /////////////////////////////////////////////////////////////////// @@ -227,15 +259,15 @@ // // DESCRIPTION : // -void NCTable::cellChanged( int index, int colnum, const YCPString & newtext ) +void NCTable::cellChanged( int index, int colnum, const string & newtext ) { NCTableLine * cl = myPad()->ModifyLine( index ); if ( !cl ) { - NCINT << "No such line: " << wpos( index, colnum ) << newtext->value() << endl; + NCINT << "No such line: " << wpos( index, colnum ) << newtext << endl; } else { NCTableCol * cc = cl->GetCol( colnum ); if ( !cc ) { - NCINT << "No such colnum: " << wpos( index, colnum ) << newtext->value() << endl; + NCINT << "No such colnum: " << wpos( index, colnum ) << newtext << endl; } else { // use YCPString to enforce recoding from 'utf8' cc->SetLabel( NCstring( newtext ) ); @@ -244,6 +276,12 @@ } } +void NCTable::cellChanged( const YTableCell *cell ) { + + cellChanged( cell->itemIndex(), cell->column(), cell->label() ); + +} + /////////////////////////////////////////////////////////////////// // // @@ -277,7 +315,8 @@ if ( ! handleInput( key ) ) { switch ( key ) { - case CTRL('o'): + /*FIXME: once YMenuButton is ported + case CTRL('o'): { if ( ! sortable ) break; @@ -304,7 +343,7 @@ myPad ()->setOrder (column); return NCursesEvent::none; - } + }*/ case KEY_SPACE: case KEY_RETURN: if ( notify() && citem != -1 ) 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 Thu Oct 11 17:35:25 2007 @@ -22,6 +22,7 @@ #include <iosfwd> #include "YTable.h" + #include "NCPadWidget.h" #include "NCTablePad.h" @@ -45,7 +46,7 @@ bool immediate; bool sortable; - vector<string> header; + vector<NCstring> header; protected: @@ -62,7 +63,8 @@ virtual NCPad * CreatePad(); - virtual void cellChanged( int index, int colnum, const YCPString & newtext ); + virtual void cellChanged( int index, int colnum, const string & newtext ); + virtual void cellChanged( const YTableCell *cell ); protected: @@ -72,22 +74,25 @@ public: - NCTable( YWidget * parent, const YWidgetOpt & opt, - vector<string> header, bool sort ); + NCTable( YWidget * parent, int columns ); + virtual ~NCTable(); bool bigList() const { return biglist; } bool isImmediate() const { return immediate; } // addey by gs - void setHeader( const vector<string> & head ); // added by gs - virtual void itemsCleared(); + void setHeader( int col, const string & text ); // added by gs + void setHeader ( vector<string> header ); + void setAlignment ( int col, YTable::Alignment al ); + void setKeepSorting( bool keepSorting ); + virtual void deleteAllItems( ); void setBigList( const bool big ) { biglist = big; } void SetSepChar( const chtype colSepchar ) { myPad()->SetSepChar( colSepchar ); } void SetSepWidht( const unsigned sepwidth ) { myPad()->SetSepWidht( sepwidth ); } void SetHotCol( const int hcol ) { myPad()->SetHotCol( hcol ); } - virtual void itemAdded( vector<string> elements, int index ); + virtual void addItem( YItem *yitem ); virtual long nicesize( YUIDimension dim ); Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.cc Thu Oct 11 17:35:25 2007 @@ -137,6 +137,11 @@ { } +void NCTableLine::setOrigItem (YTableItem *it) +{ + origItem = it; + origItem->setData(this); +} /////////////////////////////////////////////////////////////////// // // Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTableItem.h Thu Oct 11 17:35:25 2007 @@ -26,6 +26,7 @@ #include "position.h" #include "NCWidget.h" +#include "YTableItem.h" class NCTableStyle; class NCTableCol; @@ -62,6 +63,8 @@ int index; + YTableItem *origItem; + protected: mutable STATE vstate; @@ -73,6 +76,7 @@ NCTableLine( unsigned cols, int index = -1, const unsigned s = S_NORMAL ); NCTableLine( vector<NCTableCol*> & nItems, int index = -1, const unsigned s = S_NORMAL ); + void setOrigItem( YTableItem *it); virtual ~NCTableLine(); unsigned Cols() const { return Items.size(); } Modified: branches/tmp/sh/mod-ui/ncurses/src/NCTablePad.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/NCT… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/NCTablePad.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/NCTablePad.h Thu Oct 11 17:35:25 2007 @@ -114,7 +114,10 @@ void ClearTable() { SetLines( 0 ); } void Append( NCTableLine * item ) { AddLine( Lines(), item ); } - void Append( vector<NCTableCol*> & nItems, int index = -1 ) { AddLine( Lines(), new NCTableLine( nItems, index ) ); } + void Append( vector<NCTableCol*> & nItems, int index = -1 ) + { + AddLine( Lines(), new NCTableLine( nItems, index ) ); + } void AddLine( unsigned idx, NCTableLine * item ); void DelLine( unsigned idx ); 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 Thu Oct 11 17:35:25 2007 @@ -167,7 +167,10 @@ NCTable * NCWidgetFactory::createTable( YWidget * parent, int columns ) { - return 0; // FIXME: TO DO + NCTable *table = new NCTable( parent, columns ); + YUI_CHECK_NEW( table ); + + return table; } Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/YNC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc (original) +++ branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.cc Thu Oct 11 17:35:25 2007 @@ -363,15 +363,6 @@ } -YWidget * YNCursesUI::createTable( YWidget * parent, YWidgetOpt & opt, - vector<string> header ) -{ - ONCREATE; - NCMIL << "CreateTable" << endl; - return new NCTable( parent, opt, header, true ); -} - - YWidget * YNCursesUI::createIntField( YWidget * parent, YWidgetOpt & opt, const YCPString & label, int minValue, int maxValue, Modified: branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/ncurses/src/YNC… ============================================================================== --- branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h (original) +++ branches/tmp/sh/mod-ui/ncurses/src/YNCursesUI.h Thu Oct 11 17:35:25 2007 @@ -156,9 +156,9 @@ /** * Creates a table widget - */ virtual YWidget * createTable( YWidget * parent, YWidgetOpt & opt, vector<string> header ); +*/ /** * Creates an IntField widget. -- 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] r41391 - in /trunk/live-installer: package/yast2-live-installer.changes src/live-installer.ycp src/live_save_config_finish.ycp
by jsrain＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: jsrain Date: Thu Oct 11 16:42:54 2007 New Revision: 41391 URL: http://svn.opensuse.org/viewcvs/yast?rev=41391&view=rev Log: save X11 keyboard configuration (#310517) Modified: trunk/live-installer/package/yast2-live-installer.changes trunk/live-installer/src/live-installer.ycp trunk/live-installer/src/live_save_config_finish.ycp Modified: trunk/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/package/yast2-liv… ============================================================================== --- trunk/live-installer/package/yast2-live-installer.changes (original) +++ trunk/live-installer/package/yast2-live-installer.changes Thu Oct 11 16:42:54 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Oct 11 15:02:18 CEST 2007 - jsrain(a)suse.cz + +- save X11 keyboard configuration (#310517) + +------------------------------------------------------------------- Wed Oct 10 12:46:18 CEST 2007 - jsrain(a)suse.cz - added registration to the live installation workflow (#325560) Modified: trunk/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live-installe… ============================================================================== --- trunk/live-installer/src/live-installer.ycp (original) +++ trunk/live-installer/src/live-installer.ycp Thu Oct 11 16:42:54 2007 @@ -14,7 +14,6 @@ import "LiveInstaller"; import "Misc"; import "Installation"; - import "Storage"; import "Product"; import "CommandLine"; import "Popup"; @@ -32,6 +31,7 @@ Wizard::OpenNextBackStepsDialog(); Installation::destdir = "/mnt"; Installation::scr_destdir = "/mnt"; + import "Storage"; // do several checks because of DMRAID problems - bug #328388 map out = (map)SCR::Execute (.target.bash_output, " Modified: trunk/live-installer/src/live_save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/live-installer/src/live_save_con… ============================================================================== --- trunk/live-installer/src/live_save_config_finish.ycp (original) +++ trunk/live-installer/src/live_save_config_finish.ycp Thu Oct 11 16:42:54 2007 @@ -19,6 +19,7 @@ import "Progress"; import "Timezone"; import "Keyboard"; +import "Installation"; any ret = nil; string func = ""; @@ -47,6 +48,10 @@ // progress step title Progress::Title (_("Saving keyboard configuration...")); Keyboard::Save(true); + // to save also X11 configuration + Keyboard::xf86_update(); + // unfortunatelly it is saved to local system instead the target, therefore need to copy + WFM::Execute (.local.bash, sformat ("/bin/cp /etc/X11/xorg.conf %1/etc/X11/xorg.conf", Installation::destdir)); Progress::NextStep (); // progress step title Progress::Title (_("Saving time zone...")); -- 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] r41390 - /tags/branch-Linux-10_3-2_15_15/live-installer/
by jsrain＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: jsrain Date: Thu Oct 11 16:40:59 2007 New Revision: 41390 URL: http://svn.opensuse.org/viewcvs/yast?rev=41390&view=rev Log: Created tag branch-Linux-10_3-2_15_15 for live-installer Added: tags/branch-Linux-10_3-2_15_15/live-installer/ - copied from r41389, branches/SuSE-Linux-10_3-Branch/live-installer/ -- 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] r41389 - /tags/branch-Linux-10_3-2_15_15/
by jsrain＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: jsrain Date: Thu Oct 11 16:40:50 2007 New Revision: 41389 URL: http://svn.opensuse.org/viewcvs/yast?rev=41389&view=rev Log: Created tag branch-Linux-10_3-2_15_15 Added: tags/branch-Linux-10_3-2_15_15/ -- 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] r41388 - in /branches/SuSE-Linux-10_3-Branch/live-installer: VERSION package/yast2-live-installer.changes src/live-installer.ycp src/live_save_config_finish.ycp
by jsrain＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: jsrain Date: Thu Oct 11 16:40:44 2007 New Revision: 41388 URL: http://svn.opensuse.org/viewcvs/yast?rev=41388&view=rev Log: save X11 keyboard configuration (#310517) Modified: branches/SuSE-Linux-10_3-Branch/live-installer/VERSION branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes branches/SuSE-Linux-10_3-Branch/live-installer/src/live-installer.ycp branches/SuSE-Linux-10_3-Branch/live-installer/src/live_save_config_finish.ycp Modified: branches/SuSE-Linux-10_3-Branch/live-installer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-i… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/VERSION (original) +++ branches/SuSE-Linux-10_3-Branch/live-installer/VERSION Thu Oct 11 16:40:44 2007 @@ -1 +1 @@ -2.15.14 +2.15.15 Modified: branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-i… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes (original) +++ branches/SuSE-Linux-10_3-Branch/live-installer/package/yast2-live-installer.changes Thu Oct 11 16:40:44 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Oct 11 15:02:18 CEST 2007 - jsrain(a)suse.cz + +- save X11 keyboard configuration (#310517) +- 2.15.15 + +------------------------------------------------------------------- Wed Oct 10 12:46:18 CEST 2007 - jsrain(a)suse.cz - added registration to the live installation workflow (#325560) Modified: branches/SuSE-Linux-10_3-Branch/live-installer/src/live-installer.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-i… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/src/live-installer.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/live-installer/src/live-installer.ycp Thu Oct 11 16:40:44 2007 @@ -14,7 +14,6 @@ import "LiveInstaller"; import "Misc"; import "Installation"; - import "Storage"; import "Product"; import "CommandLine"; import "Popup"; @@ -32,6 +31,7 @@ Wizard::OpenNextBackStepsDialog(); Installation::destdir = "/mnt"; Installation::scr_destdir = "/mnt"; + import "Storage"; // do several checks because of DMRAID problems - bug #328388 map out = (map)SCR::Execute (.target.bash_output, " Modified: branches/SuSE-Linux-10_3-Branch/live-installer/src/live_save_config_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-10_3-Branch/live-i… ============================================================================== --- branches/SuSE-Linux-10_3-Branch/live-installer/src/live_save_config_finish.ycp (original) +++ branches/SuSE-Linux-10_3-Branch/live-installer/src/live_save_config_finish.ycp Thu Oct 11 16:40:44 2007 @@ -19,6 +19,7 @@ import "Progress"; import "Timezone"; import "Keyboard"; +import "Installation"; any ret = nil; string func = ""; @@ -47,6 +48,10 @@ // progress step title Progress::Title (_("Saving keyboard configuration...")); Keyboard::Save(true); + // to save also X11 configuration + Keyboard::xf86_update(); + // unfortunatelly it is saved to local system instead the target, therefore need to copy + WFM::Execute (.local.bash, sformat ("/bin/cp /etc/X11/xorg.conf %1/etc/X11/xorg.conf", Installation::destdir)); Progress::NextStep (); // progress step title Progress::Title (_("Saving time zone...")); -- 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] r41387 - /tags/stable-2_16_1/pkg-bindings/
by lslezak＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: lslezak Date: Thu Oct 11 16:14:17 2007 New Revision: 41387 URL: http://svn.opensuse.org/viewcvs/yast?rev=41387&view=rev Log: Created tag stable-2_16_1 for pkg-bindings Added: tags/stable-2_16_1/pkg-bindings/ - copied from r41386, trunk/pkg-bindings/ -- 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] r41386 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Source.cc
by lslezak＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: lslezak Date: Thu Oct 11 16:14:01 2007 New Revision: 41386 URL: http://svn.opensuse.org/viewcvs/yast?rev=41386&view=rev Log: - fixed Pkg::SourceLoad() - don't load resolvables from repositories deleted by Pkg::SourceDelete() - 2.16.1 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Source.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=41386&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Thu Oct 11 16:14:01 2007 @@ -1 +1 @@ -2.16.0 +2.16.1 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Thu Oct 11 16:14:01 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 11 15:59:43 CEST 2007 - lslezak(a)suse.cz + +- fixed Pkg::SourceLoad() - don't load resolvables from + repositories deleted by Pkg::SourceDelete() +- 2.16.1 + +------------------------------------------------------------------- Mon Sep 24 17:43:01 CEST 2007 - lslezak(a)suse.cz - set path to metadata files when registering a new repository, Modified: trunk/pkg-bindings/src/Source.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Source.cc?rev=4… ============================================================================== --- trunk/pkg-bindings/src/Source.cc (original) +++ trunk/pkg-bindings/src/Source.cc Thu Oct 11 16:14:01 2007 @@ -402,8 +402,8 @@ for (std::vector<YRepo_Ptr>::iterator it = repos.begin(); it != repos.end(); ++it) { - // load resolvables only from enabled repos - if ((*it)->repoInfo().enabled()) + // load resolvables only from enabled repos which are not deleted + if ((*it)->repoInfo().enabled() && !(*it)->isDeleted()) { if (AnyResolvableFrom((*it)->repoInfo().alias())) { -- 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] r41385 - in /trunk/yast2: library/control/src/ProductControl.ycp library/control/src/WorkflowManager.ycp package/yast2.changes
by locilka＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: locilka Date: Thu Oct 11 15:37:27 2007 New Revision: 41385 URL: http://svn.opensuse.org/viewcvs/yast?rev=41385&view=rev Log: Merging control-file texts in WorkflowManager as well (#271608). Modified: trunk/yast2/library/control/src/ProductControl.ycp trunk/yast2/library/control/src/WorkflowManager.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/control/src/ProductControl.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/Produc… ============================================================================== --- trunk/yast2/library/control/src/ProductControl.ycp (original) +++ trunk/yast2/library/control/src/ProductControl.ycp Thu Oct 11 15:37:27 2007 @@ -39,9 +39,6 @@ // modules to be offered to clone configuration at the end of installation global list<string> clone_modules = []; -// texts which are product specific -map<string,map<string, string> > texts = $[]; - // Location of a custom control file global string custom_control_file = ""; @@ -146,7 +143,7 @@ clone_modules = productControl["clone_modules"]:[]; foreach (string section, - ["software", "globals", "network", "partitioning"], + ["software", "globals", "network", "partitioning", "texts"], { if (haskey (productControl, section)) { @@ -164,16 +161,7 @@ ProductFeatures::SetFeature ("partitioning", "FlexiblePartitioning", partitioning); } - string textdom = productControl["textdomain"]:"control"; - texts = mapmap (string key, map<string,string> text, - productControl["texts"]:$[], - { - string label = text["label"]:""; - return $[ key : $[ - "label" : label, - "textdomain" : textdom, - ] ]; - }); + return true; } @@ -744,14 +732,16 @@ } global string GetTranslatedText (string key) { - map<string,string> text = texts[key]:$[]; + map <string, any> controlfile_texts = ProductFeatures::GetSection ("texts"); + map <string,string> text = (map <string,string>) controlfile_texts[key]:$[]; + string label = text["label"]:""; if (label == "") { y2error ("The requested label %1 does not exist", key); return ""; } - string domain = text["textdomain"]:""; + string domain = text["textdomain"]:productControl["textdomain"]:"control"; if (domain == "") { y2error ("The text domain for label %1 not set", key); Modified: trunk/yast2/library/control/src/WorkflowManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/control/src/Workfl… ============================================================================== --- trunk/yast2/library/control/src/WorkflowManager.ycp (original) +++ trunk/yast2/library/control/src/WorkflowManager.ycp Thu Oct 11 15:37:27 2007 @@ -957,18 +957,49 @@ * @return boolean true on success */ boolean UpdateProductInfo (map update_file) { + // merging all 'map <string, any>' type foreach (string section, ["globals", "software", "partitioning", "network"], { map <string, any> sect = ProductFeatures::GetSection (section); map <string, any> addon = update_file[section]:$[]; - sect = (map<string,any>)union (sect, addon); + sect = (map <string,any>) union (sect, addon); ProductFeatures::SetSection (section, sect); }); + // merging 'clone_modules' list <string> addon_clone = update_file["clone_modules"]:[]; - ProductControl::clone_modules = (list <string>) merge (ProductControl::clone_modules, addon_clone); + // merging texts + + /** + * @struct $[ + * "congratulate" : $[ + * "label" : "some text", + * ], + * "congratulate2" : $[ + * "label" : "some other text", + * "textdomain" : "control-2", // (optionally) + * ], + * ]; + */ + map <string, any> controlfile_texts = ProductFeatures::GetSection ("texts"); + map <string, map <string, string> > update_file_texts = update_file["texts"]:$[]; + string update_file_textdomain = update_file["textdomain"]:""; + + // if textdomain is different to the base one + // we have to put it into the map + if (update_file_textdomain != nil && update_file_textdomain != "") { + update_file_texts = mapmap (string text_ident, map <string, string> text_def, update_file_texts, { + text_def["textdomain"] = update_file_textdomain; + + return $[ text_ident : text_def ]; + }); + } + + controlfile_texts = (map <string, any>) union (controlfile_texts, update_file_texts); + ProductFeatures::SetSection ("texts", controlfile_texts); + return true; } @@ -1007,7 +1038,7 @@ name, update_file["textdomain"]:"control" )) { - y2error ("Failed to udpate installation workflow"); + y2error ("Failed to update installation workflow"); return false; } @@ -1044,13 +1075,17 @@ string GenerateWorkflowIdent (string workflow_filename) { string file_md5sum = FileUtils::MD5sum (workflow_filename); - if (file_md5sum == nil || file_md5sum == "") + if (file_md5sum == nil || file_md5sum == "") { + y2error ("MD5 sum of file %1 is %2", workflow_filename, file_md5sum); return nil; + } integer file_size = FileUtils::GetSize (workflow_filename); - if (file_size < 0) + if (file_size < 0) { + y2error ("File size %1 is %2", workflow_filename, file_size); return nil; + } return sformat ("%1-%2", file_md5sum, file_size); } @@ -1080,8 +1115,10 @@ if (workflow_ident != nil && contains (already_merged_workflows, workflow_ident)) { y2milestone ("The very same workflow has been already merged, skipping..."); return; - } else { + } else if (workflow_ident != nil) { already_merged_workflows = add (already_merged_workflows, workflow_ident); + } else { + y2error ("Workflow ident is: %1", workflow_ident); } if (! IntegrateWorkflow (one_workflow)) { Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Oct 11 15:37:27 2007 @@ -5,6 +5,7 @@ - Merging every single workflow only once, skipping duplicate additional workflows even if provided by a different file name (#332436). +- Merging control-file texts in WorkflowManager as well (#271608). ------------------------------------------------------------------- Thu Oct 4 16:29:01 CEST 2007 - jsrain(a)suse.cz -- 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] r41384 - /tags/branch-Linux-10_3-2_15_55/installation/
by jsrain＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: jsrain Date: Thu Oct 11 15:25:46 2007 New Revision: 41384 URL: http://svn.opensuse.org/viewcvs/yast?rev=41384&view=rev Log: Created tag branch-Linux-10_3-2_15_55 for installation Added: tags/branch-Linux-10_3-2_15_55/installation/ - copied from r41383, branches/SuSE-Linux-10_3-Branch/installation/ -- 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] r41383 - /tags/branch-Linux-10_3-2_15_55/
by jsrain＠svn.opensuse.org 11 Oct '07

11 Oct '07

Author: jsrain Date: Thu Oct 11 15:25:37 2007 New Revision: 41383 URL: http://svn.opensuse.org/viewcvs/yast?rev=41383&view=rev Log: Created tag branch-Linux-10_3-2_15_55 Added: tags/branch-Linux-10_3-2_15_55/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0