April 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r47043 - /branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp
by aschnell＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: aschnell Date: Thu Apr 24 18:30:59 2008 New Revision: 47043 URL: http://svn.opensuse.org/viewcvs/yast?rev=47043&view=rev Log: - stricter type Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/modules/TreePanel.ycp Thu Apr 24 18:30:59 2008 @@ -70,7 +70,7 @@ /** * Update the contents of the Tree widget. */ - global void Update(map<any, map> d, list tree, any new_item) + global void Update(map<any, map> d, list<term> tree, any new_item) { any old_item = current_item; -- 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] r47042 - in /trunk/ncurses-pkg/src: NCPackageSelector.cc NCPackageSelector.h NCPkgFilterContainer.cc NCPkgFilterContainer.h
by kmachalkova＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: kmachalkova Date: Thu Apr 24 18:21:37 2008 New Revision: 47042 URL: http://svn.opensuse.org/viewcvs/yast?rev=47042&view=rev Log: s/FilterContainer/FilterPattern/g Removed: trunk/ncurses-pkg/src/NCPkgFilterContainer.cc trunk/ncurses-pkg/src/NCPkgFilterContainer.h Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc trunk/ncurses-pkg/src/NCPackageSelector.h Modified: trunk/ncurses-pkg/src/NCPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.cc (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.cc Thu Apr 24 18:21:37 2008 @@ -29,7 +29,8 @@ #include "NCPopupInfo.h" #include "NCSelectionBox.h" #include "NCMenuButton.h" -#include "NCPkgFilterContainer.h" +#include "NCPkgFilterPattern.h" +#include "NCPkgFilterLocale.h" #include "NCPkgFilterRepo.h" #include "NCPkgPopupDeps.h" #include "NCPkgPopupDiskspace.h" @@ -173,10 +174,10 @@ if ( !youMode ) { // create the patterns popup - //patternPopup = new NCPkgFilterContainer( , this, NCPkgFilterContainer::S_Pattern ); + //patternPopup = new NCPkgFilterPattern( , this, NCPkgFilterPattern::S_Pattern ); // create language popup - //languagePopup = new NCPkgFilterContainer( wpos( 1,1 ), this, NCPkgFilterContainer::S_Language ); + //languagePopup = new NCPkgFilterPattern( wpos( 1,1 ), this, NCPkgFilterPattern::S_Language ); // create repository popup //repoPopup = new NCPkgRepoTable( wpos( 1,1), this ); @@ -830,7 +831,7 @@ case Patterns: { YTableHeader *hhh = new YTableHeader (); - patternPopup = new NCPkgFilterContainer( replPoint, hhh, this, NCPkgFilterContainer::S_Pattern ); + patternPopup = new NCPkgFilterPattern( replPoint, hhh, this, NCPkgFilterPattern::S_Pattern ); patternPopup->setSize( oldSize.Sze.W, oldSize.Sze.H ); patternPopup->Redraw(); patternPopup->showContainerPackages(); @@ -839,10 +840,10 @@ case Languages: { YTableHeader *hhh = new YTableHeader (); - languagePopup = new NCPkgFilterContainer( replPoint, hhh, this, NCPkgFilterContainer::S_Language ); + languagePopup = new NCPkgLocaleTable( replPoint, hhh, this ); languagePopup->setSize( oldSize.Sze.W, oldSize.Sze.H ); languagePopup->Redraw(); - languagePopup->showContainerPackages(); + //languagePopup->showContainerPackages(); break; } case Repositories: @@ -1607,7 +1608,7 @@ replPoint = YUI::widgetFactory()->createReplacePoint( vv ); YTableHeader *hhh = new YTableHeader(); - patternPopup = new NCPkgFilterContainer( replPoint, hhh, this, NCPkgFilterContainer::S_Pattern ); + patternPopup = new NCPkgFilterPattern( replPoint, hhh, this, NCPkgFilterPattern::S_Pattern ); YAlignment *l1 = YUI::widgetFactory()->createLeft( vbox_left ); patternLabel = new NCLabel( l1, " " ); Modified: trunk/ncurses-pkg/src/NCPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPackageSelecto… ============================================================================== --- trunk/ncurses-pkg/src/NCPackageSelector.h (original) +++ trunk/ncurses-pkg/src/NCPackageSelector.h Thu Apr 24 18:21:37 2008 @@ -55,7 +55,8 @@ #include "NCPkgSelMapper.h" -class NCPkgFilterContainer; +class NCPkgFilterPattern; +class NCPkgLocaleTable; class NCPkgRepoTable; class LangCode; class NCPkgPopupDeps; @@ -111,8 +112,8 @@ NCPkgPopupDeps * depsPopup; // the package dependeny popup - NCPkgFilterContainer * patternPopup; // the pattern popup - NCPkgFilterContainer * languagePopup; // language popup + NCPkgFilterPattern * patternPopup; // the pattern popup + NCPkgLocaleTable * languagePopup; // language popup NCPkgRepoTable * repoPopup; NCPkgPopupDiskspace * diskspacePopup; // the popup showing the disk usage -- 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] r47041 - in /trunk/ncurses-pkg/src: Makefile.am NCPkgFilterLocale.cc NCPkgFilterLocale.h NCPkgFilterPattern.cc NCPkgFilterPattern.h
by kmachalkova＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: kmachalkova Date: Thu Apr 24 18:19:09 2008 New Revision: 47041 URL: http://svn.opensuse.org/viewcvs/yast?rev=47041&view=rev Log: new class, renamed class Added: trunk/ncurses-pkg/src/NCPkgFilterLocale.cc trunk/ncurses-pkg/src/NCPkgFilterLocale.h trunk/ncurses-pkg/src/NCPkgFilterPattern.cc - copied, changed from r47021, trunk/ncurses-pkg/src/NCPkgFilterContainer.cc trunk/ncurses-pkg/src/NCPkgFilterPattern.h - copied, changed from r47021, trunk/ncurses-pkg/src/NCPkgFilterContainer.h Modified: trunk/ncurses-pkg/src/Makefile.am Modified: trunk/ncurses-pkg/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/Makefile.am?rev=… ============================================================================== --- trunk/ncurses-pkg/src/Makefile.am (original) +++ trunk/ncurses-pkg/src/Makefile.am Thu Apr 24 18:19:09 2008 @@ -36,7 +36,8 @@ NCPkgFilterRepo.h \ NCPkgFilterSearch.h \ NCPkgSearchSettings.h \ - NCPkgFilterContainer.h \ + NCPkgFilterPattern.h \ + NCPkgFilterLocale.h \ NCPkgFilterRPMGroups.h \ NCPkgStrings.h \ NCZypp.h @@ -64,7 +65,8 @@ NCPkgFilterRepo.cc \ NCPkgFilterSearch.cc \ NCPkgSearchSettings.cc \ - NCPkgFilterContainer.cc \ + NCPkgFilterPattern.cc \ + NCPkgFilterLocale.cc \ NCPkgFilterRPMGroups.cc \ NCPkgStrings.cc Added: trunk/ncurses-pkg/src/NCPkgFilterLocale.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterLocal… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterLocale.cc (added) +++ trunk/ncurses-pkg/src/NCPkgFilterLocale.cc Thu Apr 24 18:19:09 2008 @@ -0,0 +1,152 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: NCPkgFilterLocale.cc + + Author: Bubli <kmachalkova(a)suse.cz> + +/-*/ +#define YUILogComponent "ncurses-pkg" +#include <YUILog.h> + +#include "NCPkgFilterLocale.h" + +NCPkgLocaleTag::NCPkgLocaleTag ( zypp::sat::LocaleSupport loc) + : YTableCell(string(" ")) + , locale ( loc ) +{ + +} + +NCPkgLocaleTable::NCPkgLocaleTable( YWidget *parent, YTableHeader *tableHeader, NCPackageSelector *pkg ) + :NCTable( parent, tableHeader ) + ,packager(pkg) +{ + fillHeader(); + fillLocaleList(); +} + +void NCPkgLocaleTable::fillHeader() +{ + vector <string> header; + + header.reserve(4); + header.push_back( "L" + NCPkgStrings::PkgStatus() ); + header.push_back( "L" + NCPkgStrings::LangCode() ); + header.push_back( "L" + NCPkgStrings::LangName() ); + + setHeader( header); +} + +void NCPkgLocaleTable::addLine ( zypp::sat::LocaleSupport l, const vector <string> & cols ) +{ + //use default ctor, add cell in the next step + YTableItem *tabItem = new YTableItem(); + + //place tag (with repo reference) to the 0th column + tabItem->addCell( new NCPkgLocaleTag ( l ) ); + + // and append the rest (name, URL and stuff) + for ( unsigned i = 1; i < cols.size() + 1; ++i ) { + tabItem->addCell( cols[ i-1 ]); + } + + // this is NCTable::addItem( tabItem ); + //it actually appends the line to the table + addItem( tabItem ); + +} + +void NCPkgLocaleTable::fillLocaleList() +{ + vector <string> oneLine; + + const zypp::LocaleSet & available_locales( zypp::ResPool::instance().getAvailableLocales() ); + for_( it, available_locales.begin(), available_locales.end() ) + { + oneLine.clear(); + zypp::sat::LocaleSupport myLocale( *it ); + oneLine.push_back( myLocale.locale().code() ); + oneLine.push_back( myLocale.locale().name() ); + addLine( myLocale, oneLine); + } +} + +NCPkgLocaleTag* NCPkgLocaleTable::getTag (const int & index ) +{ + NCTableLine *line = myPad()->ModifyLine( index ); + if ( !line ) + { + return 0; + } + + YTableItem *it = dynamic_cast<YTableItem*> (line->origItem() ); + + YTableCell *tcell = it->cell(0); + NCPkgLocaleTag *tag = static_cast<NCPkgLocaleTag *>( tcell ); + + return tag; +} + +zypp::sat::LocaleSupport NCPkgLocaleTable::getLocale( int index ) +{ + NCPkgLocaleTag *t = getTag( index ); + + return t->getLocale(); +} + +void NCPkgLocaleTable::showLocalePackages() +{ + int index = getCurrentItem(); + zypp::sat::LocaleSupport myLocale = getLocale( index ); + + NCPkgTable * packageList = packager->PackageList(); + packageList->itemsCleared(); + + yuiMilestone() << "Packages supporting locale '" << myLocale.locale() << "':" << endl; + for_( it, myLocale.selectableBegin(), myLocale.selectableEnd() ) + { + //yuiMilestone() << (*it).name() << endl;i + ZyppPkg zyppPkg = tryCastToZyppPkg( (*it)->theObj() ); + packageList->createListEntry( zyppPkg, *it ); + } + + packageList->setCurrentItem( 0 ); + packageList->drawList(); + packageList->showInformation(); +} + +NCursesEvent NCPkgLocaleTable::wHandleInput( wint_t ch ) +{ + NCursesEvent ret = NCursesEvent::none; + handleInput( ch ); + + switch ( ch ) + { + case KEY_UP: + case KEY_DOWN: + case KEY_NPAGE: + case KEY_PPAGE: + case KEY_END: + case KEY_HOME: { + ret = NCursesEvent::handled; + showLocalePackages(); + break; + } + + default: + ret = NCTable::wHandleInput( ch ) ; + } + + return ret; +} + Added: trunk/ncurses-pkg/src/NCPkgFilterLocale.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterLocal… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterLocale.h (added) +++ trunk/ncurses-pkg/src/NCPkgFilterLocale.h Thu Apr 24 18:19:09 2008 @@ -0,0 +1,69 @@ +/*---------------------------------------------------------------------\ +| | +| __ __ ____ _____ ____ | +| \ \ / /_ _/ ___|_ _|___ \ | +| \ V / _` \___ \ | | __) | | +| | | (_| |___) || | / __/ | +| |_|\__,_|____/ |_| |_____| | +| | +| core system | +| (C) SuSE GmbH | +\----------------------------------------------------------------------/ + + File: NCPkgPopupRepo.h + + Author: Bubli <kmachalkova(a)suse.cz> + +/-*/ + +#ifndef NCPkgFilterLocale_h +#define NCPkgFilterLocale_h + +#include <vector> +#include "NCTable.h" +#include "NCPackageSelector.h" +#include "NCZypp.h" +#include <zypp/sat/LocaleSupport.h> + +class NCPkgLocaleTag : public YTableCell +{ + +private: + + zypp::sat::LocaleSupport locale; + +public: + + NCPkgLocaleTag ( zypp::sat::LocaleSupport locale); + + ~NCPkgLocaleTag() { }; + + zypp::sat::LocaleSupport getLocale() const { return locale; } + +}; + +class NCPkgLocaleTable : public NCTable +{ +private: + + NCPkgLocaleTable & operator=( const NCPkgLocaleTable & ); + NCPkgLocaleTable ( const NCPkgLocaleTable & ); + + NCPackageSelector *packager; +public: + + NCPkgLocaleTable ( YWidget *parent, YTableHeader *tableHeader, NCPackageSelector *pkg); + + virtual ~NCPkgLocaleTable() {}; + + void fillHeader(); + void addLine ( zypp::sat::LocaleSupport, const vector <string> & cols ); + void fillLocaleList(); + void showLocalePackages(); + + NCPkgLocaleTag* getTag (const int & index ); + zypp::sat::LocaleSupport getLocale( int index ); + NCursesEvent wHandleInput( wint_t ch ); +}; + +#endif Copied: trunk/ncurses-pkg/src/NCPkgFilterPattern.cc (from r47021, trunk/ncurses-pkg/src/NCPkgFilterContainer.cc) URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterPatte… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterContainer.cc (original) +++ trunk/ncurses-pkg/src/NCPkgFilterPattern.cc Thu Apr 24 18:19:09 2008 @@ -10,7 +10,7 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: NCPkgFilterContainer.cc + File: NCPkgFilterPattern.cc Author: Gabriele Strattner <gs(a)suse.de> Maintainer: Michael Andres <ma(a)suse.de> @@ -19,7 +19,7 @@ #define YUILogComponent "ncurses-pkg" #include <YUILog.h> -#include "NCPkgFilterContainer.h" +#include "NCPkgFilterPattern.h" #include "YDialog.h" #include "NCLayoutBox.h" @@ -28,6 +28,7 @@ #include "NCPkgTable.h" #include "NCPkgStatusStrategy.h" #include <zypp/ui/PatternContents.h> +#include <zypp/sat/LocaleSupport.h> #include "NCZypp.h" #include "NCi18n.h" @@ -45,12 +46,12 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgFilterContainer::NCPkgFilterContainer +// METHOD NAME : NCPkgFilterPattern::NCPkgFilterPattern // METHOD TYPE : Constructor // // DESCRIPTION : // -NCPkgFilterContainer::NCPkgFilterContainer( YWidget *parent, YTableHeader *header, NCPackageSelector * pkg, SelType type ) +NCPkgFilterPattern::NCPkgFilterPattern( YWidget *parent, YTableHeader *header, NCPackageSelector * pkg, SelType type ) : NCPkgTable( parent, header ) , packager( pkg ) , type( type ) @@ -76,12 +77,12 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgFilterContainer::~NCPkgFilterContainer +// METHOD NAME : NCPkgFilterPattern::~NCPkgFilterPattern // METHOD TYPE : Destructor // // DESCRIPTION : // -NCPkgFilterContainer::~NCPkgFilterContainer() +NCPkgFilterPattern::~NCPkgFilterPattern() { } @@ -89,12 +90,12 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgFilterContainer::createLayout +// METHOD NAME : NCPkgFilterPattern::createLayout // METHOD TYPE : void // // DESCRIPTION : // -void NCPkgFilterContainer::createLayout( YWidget *parent, const string & label ) +void NCPkgFilterPattern::createLayout( YWidget *parent, const string & label ) { YTableHeader * tableHeader = new YTableHeader(); @@ -127,7 +128,7 @@ // NCursesEvent & showSelectionPopup () // // -void NCPkgFilterContainer::showContainerPackages( ) +void NCPkgFilterPattern::showContainerPackages( ) { int index = getCurrentItem(); ZyppObj objPtr = getDataPointer( index ); @@ -225,7 +226,7 @@ // returns the currently selected list item (may be "really" selected // or not) // -string NCPkgFilterContainer::getCurrentLine( ) +string NCPkgFilterPattern::getCurrentLine( ) { //if ( !sel ) // return ""; @@ -236,7 +237,7 @@ return ( selPtr?selPtr->summary(LOCALE):"" ); } -string NCPkgFilterContainer::showDescription( ZyppObj objPtr ) +string NCPkgFilterPattern::showDescription( ZyppObj objPtr ) { switch (type) { @@ -265,7 +266,7 @@ // // DESCRIPTION : // -NCursesEvent NCPkgFilterContainer::wHandleInput( wint_t ch ) +NCursesEvent NCPkgFilterPattern::wHandleInput( wint_t ch ) { NCursesEvent ret = NCursesEvent::none; @@ -326,12 +327,12 @@ /////////////////////////////////////////////////////////////////// // // -// METHOD NAME : NCPkgFilterContainer::fillContainerList +// METHOD NAME : NCPkgFilterPattern::fillContainerList // METHOD TYPE : bool // // DESCRIPTION : // -bool NCPkgFilterContainer::fillContainerList( SelType type ) +bool NCPkgFilterPattern::fillContainerList( SelType type ) { // if ( !sel ) // return false; @@ -356,30 +357,23 @@ yuiMilestone() << resPtr->kind () <<": " << resPtr->name() << ", initial status: " << (*i)->status() << endl; +// pkgLine.push_back( resPtr->summary(LOCALE) ); // the description slbList.push_back (*i); } } slbList.sort( orderPattern ); break; } - #if 0 case S_Language: { - for (i = zyppLangBegin (); i != zyppLangEnd (); ++i ) - { - ZyppObj resPtr = (*i)->theObj(); - - ZyppLang langPtr = tryCastToZyppLang (resPtr); - - yuiMilestone() << resPtr->kind () <<": " << resPtr->name() - << ", initial status: " << (*i)->status() << endl; - slbList.push_back (*i); - - } - slbList.sort( orderLang ); + const zypp::LocaleSet & available_locales( zypp::ResPool::instance().getAvailableLocales() ); + for_( it, available_locales.begin(), available_locales.end() ) + { + zypp::sat::LocaleSupport myLocale( *it ); + yuiMilestone() << myLocale.locale().name() << " " << myLocale.locale().code() << endl; + } break; } - #endif default: yuiError() << "Container type not handled: " << type << endl; } Copied: trunk/ncurses-pkg/src/NCPkgFilterPattern.h (from r47021, trunk/ncurses-pkg/src/NCPkgFilterContainer.h) URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses-pkg/src/NCPkgFilterPatte… ============================================================================== --- trunk/ncurses-pkg/src/NCPkgFilterContainer.h (original) +++ trunk/ncurses-pkg/src/NCPkgFilterPattern.h Thu Apr 24 18:19:09 2008 @@ -10,14 +10,14 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: NCPkgFilterContainer.h + File: NCPkgFilterPattern.h Author: Gabriele Strattner <gs(a)suse.de> Maintainer: Michael Andres <ma(a)suse.de> /-*/ -#ifndef NCPkgFilterContainer_h -#define NCPkgFilterContainer_h +#ifndef NCPkgFilterPattern_h +#define NCPkgFilterPattern_h #include <iosfwd> @@ -31,14 +31,14 @@ /////////////////////////////////////////////////////////////////// // -// CLASS NAME : NCPkgFilterContainer +// CLASS NAME : NCPkgFilterPattern // // DESCRIPTION : // -class NCPkgFilterContainer : public NCPkgTable { +class NCPkgFilterPattern : public NCPkgTable { - NCPkgFilterContainer & operator=( const NCPkgFilterContainer & ); - NCPkgFilterContainer ( const NCPkgFilterContainer & ); + NCPkgFilterPattern & operator=( const NCPkgFilterPattern & ); + NCPkgFilterPattern ( const NCPkgFilterPattern & ); private: @@ -58,8 +58,8 @@ S_Unknown }; - NCPkgFilterContainer( YWidget *parent, YTableHeader *header, NCPackageSelector * pkg, SelType type ); - virtual ~NCPkgFilterContainer(); + NCPkgFilterPattern( YWidget *parent, YTableHeader *header, NCPackageSelector * pkg, SelType type ); + virtual ~NCPkgFilterPattern(); void createLayout( YWidget *parent, const string & label ); @@ -85,4 +85,4 @@ /////////////////////////////////////////////////////////////////// -#endif // NCPkgFilterContainer_h +#endif // NCPkgFilterPattern_h -- 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] r47040 - /tags/stable-2_16_18/printer/
by mzugec＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: mzugec Date: Thu Apr 24 16:05:28 2008 New Revision: 47040 URL: http://svn.opensuse.org/viewcvs/yast?rev=47040&view=rev Log: Created tag stable-2_16_18 for printer Added: tags/stable-2_16_18/printer/ - copied from r47039, trunk/printer/ -- 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] r47039 - in /trunk/printer: VERSION data/printers_support package/yast2-printer.changes
by mzugec＠svn.opensuse.org 24 Apr '08

24 Apr '08

1 0

[yast-commit] r47038 - /tags/stable-2_16_39/installation/
by locilka＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: locilka Date: Thu Apr 24 15:52:50 2008 New Revision: 47038 URL: http://svn.opensuse.org/viewcvs/yast?rev=47038&view=rev Log: Created tag stable-2_16_39 for installation Added: tags/stable-2_16_39/installation/ - copied from r47037, trunk/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] r47037 - /branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp
by aschnell＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: aschnell Date: Thu Apr 24 15:43:18 2008 New Revision: 47037 URL: http://svn.opensuse.org/viewcvs/yast?rev=47037&view=rev Log: - set focus Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Modified: branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/aschnell/part-redesign/st… ============================================================================== --- branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp (original) +++ branches/tmp/aschnell/part-redesign/storage/src/include/ep-main.ycp Thu Apr 24 15:43:18 2008 @@ -127,13 +127,13 @@ //FIXME: find some nicer icons here tree = [ `item(`id(`all), short_hostname, open(`all), [ - `item(`id(`hd), `icon("yast-disk.png"), _("Hard Disks"), open(`hd), subtree[`hd]:[]), - `item(`id(`lvm),`icon("yast-lvm_config.png"), _("Volume Management"), open(`lvm), subtree[`lvm]:[]), - `item(`id(`md),`icon("yast-general.png"), _("RAID"), open(`md), subtree[`md]:[]), + `item(`id(`hd), `icon("yast-disk.png"), _("Hard Disks"), open(`hd), subtree[`hd]:[]), + `item(`id(`lvm), `icon("yast-lvm_config.png"), _("Volume Management"), open(`lvm), subtree[`lvm]:[]), + `item(`id(`md), `icon("yast-general.png"), _("RAID"), open(`md), subtree[`md]:[]), `item(`id(`loop), `icon("yast-general.png"), _("Crypt Files"), open(`loop), subtree[`loop]:[]), `item(`id(`dm), `icon("yast-general.png"), _("Device Mapper"), open(`dm), subtree[`dm]:[]), `item(`id(`nfs), `icon("yast-nfs.png"), _("NFS"), open(`nfs), subtree[`nfs]:[]), - `item(`id(`unused),`icon("yast-general.png"), _("Unused Devices"), open(`unused)) + `item(`id(`unused), `icon("yast-general.png"), _("Unused Devices"), open(`unused)) ]), `item(`id(`settings), `icon("yast.png"), _("Settings"), open(`settings)), `item(`id(`log), `icon("yast-messages.png"), _("Log"), open(`log)) ]; @@ -252,6 +252,7 @@ { any citem = UI::QueryWidget(`id(`table), `CurrentItem); TreePanel::SwitchToNew( citem ); + UI::SetFocus(`tree); } } until (widget == `back || widget == `abort || widget == `next); -- 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] r47036 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_deploy_image.ycp src/modules/ImageInstallation.ycp
by locilka＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: locilka Date: Thu Apr 24 15:23:39 2008 New Revision: 47036 URL: http://svn.opensuse.org/viewcvs/yast?rev=47036&view=rev Log: - New better shiny unified progress for image deployment. - Showing also the just-handled image name (bnc #381188). - 2.16.39 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_deploy_image.ycp trunk/installation/src/modules/ImageInstallation.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=47036&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Apr 24 15:23:39 2008 @@ -1 +1 @@ -2.16.38 +2.16.39 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Thu Apr 24 15:23:39 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Apr 24 14:54:53 CEST 2008 - locilka(a)suse.cz + +- New better shiny unified progress for image deployment. +- Showing also the just-handled image name (bnc #381188). +- 2.16.39 + +------------------------------------------------------------------- Wed Apr 23 15:10:24 CEST 2008 - locilka(a)suse.cz - Enabling inst_suseconfig in Automatic configuration (bnc #381751) Modified: trunk/installation/src/clients/inst_deploy_image.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_de… ============================================================================== --- trunk/installation/src/clients/inst_deploy_image.ycp (original) +++ trunk/installation/src/clients/inst_deploy_image.ycp Thu Apr 24 15:23:39 2008 @@ -5,6 +5,7 @@ import "Wizard"; import "SourceManager"; import "String"; +import "PackageCallbacks"; textdomain "installation"; @@ -14,51 +15,124 @@ return `auto; } -y2milestone ("Deploying image"); +y2milestone ("Deploying images"); list<string> images = ImageInstallation::ImageOrder (); integer last_image = nil; -/** - * Set the progress - * @param image integer the number of image - * @param percent integer the percentage of the particular image - */ -void SetProgress (integer image, integer percent) { - if (percent >= 100) - image = image + 1; - - if (image != last_image) { - last_image = image; - if (image < size (images)) { - UI::ChangeWidget ( - `id ("deploying_progress"), - `Label, - sformat (_("Deploying Images (%1/%2)..."), (image + 1), size (images)) - ); +integer _last_download_progress = -1; + +integer _current_overall_progress = 0; +integer _last_overall_progress = -1; + +integer _current_subprogress_start = 0; +integer _current_subprogress_steps = 0; +integer _current_subprogress_total = 0; + +integer _current_step_in_subprogress = 0; + +string _previous_id = nil; + +void SetProgress () { + integer percent = 100 * _current_step_in_subprogress / _current_subprogress_total; + UI::ChangeWidget (`id ("one_image"), `Value, percent); +} + +void OverallProgressHandler (string id, integer current_step) { + // new set of steps + if (_previous_id != id) { + // reset steps in subprogress + _current_step_in_subprogress = 0; + + // new settings for new step + _current_subprogress_start = ImageInstallation::GetProgressLayoutDetails (id, "steps_start_at"); + _current_subprogress_steps = ImageInstallation::GetProgressLayoutDetails (id, "steps_reserved"); + _current_subprogress_total = ImageInstallation::GetProgressLayoutDetails (id, "steps_total"); + + // div by zero! + if (_current_subprogress_total == 0) { + y2error ("steps_total=0"); + _current_subprogress_total = 100; } + + y2milestone ( + "New overall progress ID: %1 (steps_start_at: %2, steps_reserved: %3, steps_total: %4)", + id, _current_subprogress_start, _current_subprogress_steps, _current_subprogress_total + ); + + // when deploying images, label is handled separately + if (id != "deploying_images") { + string new_label = ImageInstallation::GetProgressLayoutLabel (id); + UI::ChangeWidget (`id ("one_image"), `Label, new_label); + } + + _previous_id = id; + } + + // incremental + if (current_step == nil) { + _current_step_in_subprogress = _current_step_in_subprogress + 1; + // set to exact number + } else { + _current_step_in_subprogress = current_step; + } + + if (id == "storing_user_prefs" || id == "restoring_user_prefs") { + SetProgress(); } - UI::ChangeWidget ( - `id ("deploying_progress"), - `Value, - image - ); + _current_overall_progress = _current_subprogress_start + + (_current_subprogress_steps * _current_step_in_subprogress / _current_subprogress_total); + + // update UI only if nr% has changed + if (_current_overall_progress > _last_overall_progress) { + _last_overall_progress = _current_overall_progress; + UI::ChangeWidget (`id ("deploying_progress"), `Value, _current_overall_progress); + } } -integer _last_download_progress = -1; +integer _steps_for_one_image = 100; +boolean download_handler_hit = false; boolean MyProgressDownloadHandler (integer percent, integer bps_avg, integer bps_current) { - // FIXME: remove this line - y2milestone ("PerCent: %1, AVG: %2, Spd: %3", percent, bps_avg, bps_current); + // changing settings on the fly + // ... first when download handler is hit + if (! download_handler_hit) { + y2milestone ("DownloadHandler - first hit"); + // twice more steps + ImageInstallation::AdjustProgressLayout ("deploying_images", (2 * _steps_for_one_image * size (images)), _("Deploying mages...")); + download_handler_hit = true; + } + + map <string, any> current_image = ImageInstallation::GetCurrentImageDetails(); if (_last_download_progress < percent) { - UI::ChangeWidget ( - `id ("one_image"), `Label, - sformat (_("Downloading image at speed %1/s"), String::FormatSize (bps_current)) - ); + string current_image_name = current_image["name"]:""; + if (current_image_name == "") { + UI::ChangeWidget ( + `id ("one_image"), `Label, + sformat (_("Downloading image at speed %1/s"), String::FormatSize (bps_current)) + ); + } else { + UI::ChangeWidget ( + `id ("one_image"), `Label, + sformat (_("Downloading image %1 at speed %2/s"), current_image_name, String::FormatSize (bps_current)) + ); + } + UI::ChangeWidget (`id ("one_image"), `Value, percent); + + integer current_image_nr = current_image["image_nr"]:0; + integer current_steps = 0; + + if (download_handler_hit) { + current_steps = (current_image_nr * 2 * _steps_for_one_image) + percent; + } else { + current_steps = (current_image_nr * _steps_for_one_image) + percent; + } + + OverallProgressHandler ("deploying_images", current_steps); } _last_download_progress = percent; @@ -91,7 +165,12 @@ // reset the label if (x_progress == 0) { - UI::ChangeWidget (`id ("one_image"), `Label, _("Deploying image...")); + string current_image_name = current_image["name"]:""; + if (current_image_name == "") { + UI::ChangeWidget (`id ("one_image"), `Label, _("Deploying image...")); + } else { + UI::ChangeWidget (`id ("one_image"), `Label, sformat (_("Deploying image %1..."), current_image_name)); + } // one image done } else if (x_progress == 100) { UI::ChangeWidget (`id ("one_image"), `Label, _("Image deployed")); @@ -101,45 +180,61 @@ if (x_progress > _last_progress) { UI::ChangeWidget (`id ("one_image"), `Value, x_progress); _last_progress = x_progress; + integer current_image_nr = current_image["image_nr"]:0; + integer current_steps = 0; + + if (download_handler_hit) { + current_steps = ((current_image_nr * 2 + 1) * _steps_for_one_image) + x_progress; + } else { + current_steps = (current_image_nr * _steps_for_one_image) + x_progress; + } + + OverallProgressHandler ("deploying_images", current_steps); } } ImageInstallation::SetDeployTarImageProgress (SetOneImageProgress); ImageInstallation::SetDownloadTarImageProgress (MyProgressDownloadHandler); +ImageInstallation::SetOverallDeployingProgress (OverallProgressHandler); -ImageInstallation::StoreAllChanges(); - -Pkg::TargetFinish (); +ImageInstallation::AdjustProgressLayout ("deploying_images", (_steps_for_one_image * size (images)), _("Deploying mages...")); Wizard::SetContents ( _("Deploying Installation Images"), `VBox ( `ProgressBar ( `id ("one_image"), - _("Deploying image..."), + _("Initializing..."), 100, 0 ), `ProgressBar ( `id ("deploying_progress"), _("Deploying Images..."), - size(images), + 100, 0 ) ), "", false, false ); + +ImageInstallation::StoreAllChanges(); + +Pkg::TargetFinish (); + Wizard::SetTitleIcon ("yast-inst-mode"); SourceManager::InstInitSourceMoveDownloadArea(); -ImageInstallation::DeployImages (images, Installation::destdir, SetProgress); +ImageInstallation::DeployImages (images, Installation::destdir, nil); y2milestone ("Target image for package selector prepared"); +PackageCallbacks::RegisterEmptyProgressCallbacks(); Pkg::TargetInitialize (Installation::destdir); Pkg::TargetLoad (); +PackageCallbacks::RestorePreviousProgressCallbacks(); ImageInstallation::RestoreAllChanges(); Modified: trunk/installation/src/modules/ImageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/ImageIn… ============================================================================== --- trunk/installation/src/modules/ImageInstallation.ycp (original) +++ trunk/installation/src/modules/ImageInstallation.ycp Thu Apr 24 15:23:39 2008 @@ -175,6 +175,13 @@ y2milestone ("New download_image_progress: %1", download_image_progress); } +void (string, integer) generic_set_progress = nil; + +global void SetOverallDeployingProgress (void (string, integer) odp) { + generic_set_progress = odp; + y2milestone ("New generic_set_progress: %1", generic_set_progress); +} + /** * Deploy an image of the filesystem type * @param id string the id of the image @@ -192,6 +199,7 @@ return false; } + // reset, adjust labels, etc. if (tar_image_progress != nil) tar_image_progress (0); @@ -249,6 +257,7 @@ } y2milestone ("Finished"); + // adjust labels etc. if (tar_image_progress != nil) tar_image_progress (100); @@ -334,7 +343,11 @@ // FIXME unmounting } +integer _current_image_from_imageset = -1; + void SetCurrentImageDetails (map <string,any> img) { + _current_image_from_imageset = _current_image_from_imageset + 1; + if (size (images_details) == 0) { y2warning ("Images details are empty"); } @@ -346,6 +359,7 @@ "files" : images_details[img["file"]:"","files"]:0, // 100% progress "max_progress" : tointeger (images_details[img["file"]:"","size"]:0 / _record_size), + "image_nr" : _current_image_from_imageset, ]; } @@ -498,12 +512,15 @@ Pkg::CallbackProgressDownload (download_image_progress); integer num = -1; + _current_image_from_imageset = -1; foreach (string img, images, { num = num + 1; - progress (num, 0); + if (progress != nil) + progress (num, 0); DeployImage (img, target); - progress (num, 100); + if (progress != nil) + progress (num, 100); }); // unregister downloading progress @@ -824,6 +841,40 @@ */ map <symbol, map <string, list <map> > > objects_state = $[]; + map progress_layout = $[ + "storing_user_prefs" : $[ + "steps_start_at" : 0, + "steps_reserved" : 6, + ], + "deploying_images" : $[ + "steps_start_at" : 6, + "steps_reserved" : 84, + + ], + "restoring_user_prefs" : $[ + "steps_start_at" : 90, + "steps_reserved" : 10, + ], + ]; + + global integer GetProgressLayoutDetails (string id, string details) { + return progress_layout[id, details]:0; + } + + global string GetProgressLayoutLabel (string id) { + return progress_layout[id, "label"]:_("Deploying..."); + } + + global void AdjustProgressLayout (string id, integer steps_total, string label) { + if (! haskey (progress_layout, id)) { + y2error ("Unknown key: %1", id); + return; + } + + progress_layout[id, "label"] = label; + progress_layout[id, "steps_total"] = steps_total; + } + /** * Function stores all new/requested states of all handled/supported types. * @@ -831,15 +882,13 @@ * @see objects_state */ global void StoreAllChanges () { - Progress::Simple ( - // TRANSLATORS: Dialog caption - _("Installation from Images"), - // TRANSLATORS: Dialog progress - _("Storing user preferences..."), - 4 * size (all_supported_types), - // TRANSLATORS: help text - _("<p>Installation process is just storing the user-defined selection of packages</p>") - ); + integer nr_steps = 4 * size (all_supported_types); + string id = "storing_user_prefs"; + + AdjustProgressLayout (id, nr_steps, _("Storing user preferences...")); + + if (generic_set_progress != nil) + generic_set_progress (id, 0); // Query for changed state of all knwon types // 'changed' means that they were 'installed' and 'not locked' before @@ -856,28 +905,34 @@ return (one_object["status"]:`unknown == `removed); }); objects_state[one_type, "remove"] = remove_resolvables; - Progress::NextStep(); + + if (generic_set_progress != nil) + generic_set_progress (id, nil); list <map <string, any> > install_resolvables = filter (map <string, any> one_object, resolvable_properties, { return (one_object["status"]:`unknown == `selected); }); objects_state[one_type, "install"] = install_resolvables; - Progress::NextStep(); + + if (generic_set_progress != nil) + generic_set_progress (id, nil); list <map <string, any> > taboo_resolvables = filter (map <string, any> one_object, resolvable_properties, { return (one_object["status"]:`unknown == `available && one_object["locked"]:false == true); }); objects_state[one_type, "taboo"] = taboo_resolvables; - Progress::NextStep(); + + if (generic_set_progress != nil) + generic_set_progress (id, nil); list <map <string, any> > lock_resolvables = filter (map <string, any> one_object, resolvable_properties, { return (one_object["status"]:`unknown == `installed && one_object["locked"]:false == true); }); objects_state[one_type, "lock"] = lock_resolvables; - Progress::NextStep(); - }); - Progress::Finish(); + if (generic_set_progress != nil) + generic_set_progress (id, nil); + }); } /** @@ -920,15 +975,13 @@ } global void RestoreAllChanges () { - Progress::Simple ( - // TRANSLATORS: Dialog caption - _("Installation from Images"), - // TRANSLATORS: Dialog progress - _("Restoring user preferences..."), - 4 * size (all_supported_types), - // TRANSLATORS: Dialog help - _("<p>Installaton is restoring the user preferences to install the rest of packages.</p>") - ); + integer nr_steps = 4 * size (all_supported_types); + string id = "restoring_user_prefs"; + + AdjustProgressLayout (id, nr_steps, _("Restoring user preferences...")); + + if (generic_set_progress != nil) + generic_set_progress (id, 0); foreach (symbol one_type, all_supported_types, { list <map <string, any> > resolvable_properties = Pkg::ResolvableProperties ("", one_type, ""); @@ -939,7 +992,8 @@ return (one_resolvable["status"]:`unknown == `selected); }); - Progress::NextStep(); + if (generic_set_progress != nil) + generic_set_progress (id, nil); // All packages selected to be installed // [ $[ "arch" : ... , "name" : ... , "version" : ... ], ... ] @@ -947,7 +1001,8 @@ return $[ "arch":one_resolvable["arch"]:"", "name":one_resolvable["name"]:"", "version":one_resolvable["version"]:"" ]; }); - Progress::NextStep(); + if (generic_set_progress != nil) + generic_set_progress (id, nil); // Delete all packages that are installed but should not be map <string, string> one_already_installed_resolvable = $[]; @@ -969,20 +1024,20 @@ } }); - Progress::NextStep(); + if (generic_set_progress != nil) + generic_set_progress (id, nil); // Install all packages that aren't yet foreach (map <string, any> one_to_install, to_install, { ProceedWithSelected (one_to_install, one_type); }); - Progress::NextStep(); + if (generic_set_progress != nil) + generic_set_progress (id, nil); }); // Free the memory objects_state = $[]; - - Progress::Finish(); } // <-- Storing and restoring states -- 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] r47035 - in /branches/tmp/coolo/update_yast_repo: last_rev_yast last_rev_zypp
by coolo＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: coolo Date: Thu Apr 24 14:58:17 2008 New Revision: 47035 URL: http://svn.opensuse.org/viewcvs/yast?rev=47035&view=rev Log: updated Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast branches/tmp/coolo/update_yast_repo/last_rev_zypp Modified: branches/tmp/coolo/update_yast_repo/last_rev_yast URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_yast (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_yast Thu Apr 24 14:58:17 2008 @@ -1 +1 @@ -46873 +47035 Modified: branches/tmp/coolo/update_yast_repo/last_rev_zypp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/coolo/update_yast_repo/la… ============================================================================== --- branches/tmp/coolo/update_yast_repo/last_rev_zypp (original) +++ branches/tmp/coolo/update_yast_repo/last_rev_zypp Thu Apr 24 14:58:17 2008 @@ -1 +1 @@ -9726 +9808 -- 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] r47034 - /tags/stable-2_16_19/country/
by jsuchome＠svn.opensuse.org 24 Apr '08

24 Apr '08

Author: jsuchome Date: Thu Apr 24 14:20:52 2008 New Revision: 47034 URL: http://svn.opensuse.org/viewcvs/yast?rev=47034&view=rev Log: Created tag stable-2_16_19 for country Added: tags/stable-2_16_19/country/ - copied from r47033, trunk/country/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0