Author: sh-sh-sh Date: Mon Jul 23 17:39:56 2007 New Revision: 39613 URL: http://svn.opensuse.org/viewcvs/yast?rev=39613&view=rev Log: consistent naming: inst source -> repo Added: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.cc - copied, changed from r39262, branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcFilterView.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.h - copied, changed from r39262, branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcFilterView.h branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.cc - copied, changed from r39608, branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcList.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.h - copied, changed from r39608, branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcList.h Removed: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcFilterView.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcFilterView.h branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcList.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcList.h Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/PackageSelector-multi-src.ycp branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.cc branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.h branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h branches/tmp/sh/mod-ui/qt/src/pkg/Makefile.am branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.h branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.h Modified: branches/tmp/sh/mod-ui/core/libyui/doc/examples/PackageSelector-multi-src.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/doc/examples/PackageSelector-multi-src.ycp?rev=39613&r1=39612&r2=39613&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/doc/examples/PackageSelector-multi-src.ycp (original) +++ branches/tmp/sh/mod-ui/core/libyui/doc/examples/PackageSelector-multi-src.ycp Mon Jul 23 17:39:56 2007 @@ -7,7 +7,7 @@ Pkg::TargetInit( "/", false ); // installed system UI::OpenDialog(`opt(`defaultsize), - `PackageSelector(`id(`selector), `opt(`instSourcesMode), + `PackageSelector(`id(`selector), `opt(`repoMode), // `opt(`testMode), "/dev/fd0" ) ); any input = UI::RunPkgSelection(`id(`selector) ); Modified: branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc?rev=39613&r1=39612&r2=39613&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YCPDialogParser.cc Mon Jul 23 17:39:56 2007 @@ -2387,7 +2387,7 @@ * @option updateMode start in update mode * @option searchMode start with the "search" filter view * @option summaryMode start with the "installation summary" filter view - * @option instSourcesMode start with the "installation sources" filter view + * @option repoMode start with the "repositories" filter view * @usage `PackageSelector() * * @examples PackageSelector.ycp @@ -2439,7 +2439,7 @@ else if ( sym == YUIOpt_updateMode ) modeFlags |= YPkg_UpdateMode; else if ( sym == YUIOpt_searchMode ) modeFlags |= YPkg_SearchMode; else if ( sym == YUIOpt_summaryMode ) modeFlags |= YPkg_SummaryMode; - else if ( sym == YUIOpt_instSourcesMode ) modeFlags |= YPkg_InstSourcesMode; + else if ( sym == YUIOpt_repoMode ) modeFlags |= YPkg_RepoMode; else if ( sym == YUIOpt_testMode ) modeFlags |= YPkg_TestMode; else logUnknownOption( term, optList->value(o) ); } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.cc?rev=39613&r1=39612&r2=39613&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.cc (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YMultiProgressMeter.cc Mon Jul 23 17:39:56 2007 @@ -121,7 +121,7 @@ void YMultiProgressMeter::setCurrentValues( const vector<float> & values ) { - for ( int i=0; i < values.size(); i++ ) + for ( int i=0; i < (int) values.size(); i++ ) { setCurrentValue( i, values[i] ); } Modified: branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.h?rev=39613&r1=39612&r2=39613&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YPackageSelector.h Mon Jul 23 17:39:56 2007 @@ -29,7 +29,7 @@ #define YPkg_UpdateMode 1 << 2 #define YPkg_SearchMode 1 << 3 #define YPkg_SummaryMode 1 << 4 -#define YPkg_InstSourcesMode 1 << 5 +#define YPkg_RepoMode 1 << 5 class YPackageSelector : public YWidget @@ -58,7 +58,7 @@ bool updateMode() const { return _modeFlags & YPkg_UpdateMode; } bool searchMode() const { return _modeFlags & YPkg_SearchMode; } bool summaryMode() const { return _modeFlags & YPkg_SummaryMode; } - bool instSourcesMode() const { return _modeFlags & YPkg_InstSourcesMode; } + bool repoMode() const { return _modeFlags & YPkg_RepoMode; } protected: long _modeFlags; Modified: branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h?rev=39613&r1=39612&r2=39613&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h (original) +++ branches/tmp/sh/mod-ui/core/libyui/src/YUISymbols.h Mon Jul 23 17:39:56 2007 @@ -190,7 +190,6 @@ #define YUIOpt_hvstretch "hvstretch" #define YUIOpt_immediate "immediate" #define YUIOpt_infocolor "infocolor" -#define YUIOpt_instSourcesMode "instSourcesMode" #define YUIOpt_invertAutoEnable "invertAutoEnable" #define YUIOpt_keepSorting "keepSorting" #define YUIOpt_keyEvents "keyEvents" @@ -198,6 +197,7 @@ #define YUIOpt_notify "notify" #define YUIOpt_outputField "outputField" #define YUIOpt_plainText "plainText" +#define YUIOpt_repoMode "repoMode" #define YUIOpt_scaleToFit "scaleToFit" #define YUIOpt_searchMode "searchMode" #define YUIOpt_shrinkable "shrinkable" Modified: branches/tmp/sh/mod-ui/qt/src/pkg/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/Makefile.am?rev=39613&r1=39612&r2=39613&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/Makefile.am (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/Makefile.am Mon Jul 23 17:39:56 2007 @@ -48,8 +48,8 @@ YQPkgDiskUsageWarningDialog.cc \ YQPkgFileListView.cc \ YQPkgGenericDetailsView.cc \ - YQPkgInstSrcFilterView.cc \ - YQPkgInstSrcList.cc \ + YQPkgRepoFilterView.cc \ + YQPkgRepoList.cc \ YQPkgLangList.cc \ YQPkgList.cc \ YQPkgObjList.cc \ @@ -86,8 +86,8 @@ YQPkgDiskUsageWarningDialog.moc \ YQPkgFileListView.moc \ YQPkgGenericDetailsView.moc \ - YQPkgInstSrcFilterView.moc \ - YQPkgInstSrcList.moc \ + YQPkgRepoFilterView.moc \ + YQPkgRepoList.moc \ YQPkgLangList.moc \ YQPkgList.moc \ YQPkgObjList.moc \ @@ -124,8 +124,8 @@ YQPkgDiskUsageWarningDialog.o YQPkgDiskUsageWarningDialog.lo: YQPkgDiskUsageWarningDialog.moc YQPkgFileListView.o YQPkgFileListView.lo: YQPkgFileListView.moc YQPkgGenericDetailsView.o YQPkgGenericDetailsView.lo: YQPkgGenericDetailsView.moc -YQPkgInstSrcFilterView.o YQPkgInstSrcFilterView.lo: YQPkgInstSrcFilterView.moc -YQPkgInstSrcList.o YQPkgInstSrcList.lo: YQPkgInstSrcList.moc +YQPkgRepoFilterView.o YQPkgRepoFilterView.lo: YQPkgRepoFilterView.moc +YQPkgRepoList.o YQPkgRepoList.lo: YQPkgRepoList.moc YQPkgLangList.o YQPkgLangList.lo: YQPkgLangList.moc YQPkgList.o YQPkgList.lo: YQPkgList.moc YQPkgObjList.o YQPkgObjList.lo: YQPkgObjList.moc @@ -161,8 +161,8 @@ YQPkgDiskUsageWarningDialog.moc: YQPkgDiskUsageWarningDialog.h YQPkgFileListView.moc: YQPkgFileListView.h YQPkgGenericDetailsView.moc: YQPkgGenericDetailsView.h -YQPkgInstSrcFilterView.moc: YQPkgInstSrcFilterView.h -YQPkgInstSrcList.moc: YQPkgInstSrcList.h +YQPkgRepoFilterView.moc: YQPkgRepoFilterView.h +YQPkgRepoList.moc: YQPkgRepoList.h YQPkgLangList.moc: YQPkgLangList.h YQPkgList.moc: YQPkgList.h YQPkgObjList.moc: YQPkgObjList.h Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.cc?rev=39613&r1=39612&r2=39613&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.cc Mon Jul 23 17:39:56 2007 @@ -59,8 +59,8 @@ #include "YQPkgDiskUsageList.h" #include "YQPkgDiskUsageWarningDialog.h" #include "YQPkgFileListView.h" -#include "YQPkgInstSrcFilterView.h" -#include "YQPkgInstSrcList.h" +#include "YQPkgRepoFilterView.h" +#include "YQPkgRepoList.h" #include "YQPkgLangList.h" #include "YQPkgList.h" #include "YQPkgPatchFilterView.h" @@ -106,7 +106,7 @@ _detailsViews = 0; _diskUsageList = 0; _filters = 0; - _instSrcFilterView = 0; + _repoFilterView = 0; _langList = 0; _patternList = 0; _pkgChangeLogView = 0; @@ -147,12 +147,12 @@ _patchList->filter(); } } - else if ( _instSrcFilterView && instSourcesMode() ) + else if ( _repoFilterView && repoMode() ) { - if ( YQPkgInstSrcList::countEnabledSources() > 1 ) + if ( YQPkgRepoList::countEnabledSources() > 1 ) { - _filters->showPage( _instSrcFilterView ); - _instSrcFilterView->filter(); + _filters->showPage( _repoFilterView ); + _repoFilterView->filter(); } else if ( _searchFilterView ) { @@ -366,9 +366,9 @@ // Repository view // - _instSrcFilterView = new YQPkgInstSrcFilterView( parent ); - CHECK_PTR( _instSrcFilterView ); - _filters->addPage( _( "Repositories" ), _instSrcFilterView ); + _repoFilterView = new YQPkgRepoFilterView( parent ); + CHECK_PTR( _repoFilterView ); + _filters->addPage( _( "Repositories" ), _repoFilterView ); // @@ -838,7 +838,7 @@ connectFilter( _updateProblemFilterView, _pkgList, false ); connectFilter( _patternList, _pkgList ); connectFilter( _selList, _pkgList ); - connectFilter( _instSrcFilterView, _pkgList, false ); + connectFilter( _repoFilterView, _pkgList, false ); connectFilter( _rpmGroupTagsFilterView, _pkgList, false ); connectFilter( _langList, _pkgList ); connectFilter( _statusFilterView, _pkgList, false ); @@ -850,9 +850,9 @@ _pkgList, SLOT ( message( const QString & ) ) ); } - if ( _instSrcFilterView && _pkgList ) + if ( _repoFilterView && _pkgList ) { - connect( _instSrcFilterView, SIGNAL( filterNearMatch ( ZyppSel, ZyppPkg ) ), + connect( _repoFilterView, SIGNAL( filterNearMatch ( ZyppSel, ZyppPkg ) ), _pkgList, SLOT ( addPkgItemDimmed ( ZyppSel, ZyppPkg ) ) ); } Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.h?rev=39613&r1=39612&r2=39613&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.h (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPackageSelector.h Mon Jul 23 17:39:56 2007 @@ -45,7 +45,7 @@ class YQPkgDescriptionView; class YQPkgDiskUsageList; class YQPkgFileListView; -class YQPkgInstSrcFilterView; +class YQPkgRepoFilterView; class YQPkgLangList; class YQPkgList; class YQPkgPatternList; @@ -299,7 +299,7 @@ YQPkgDependenciesView * _pkgDependenciesView; YQPkgDescriptionView * _pkgDescriptionView; YQPkgFileListView * _pkgFileListView; - YQPkgInstSrcFilterView * _instSrcFilterView; + YQPkgRepoFilterView * _repoFilterView; YQPkgLangList * _langList; YQPkgList * _pkgList; YQPkgPatternList * _patternList; Copied: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.cc (from r39262, branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcFilterView.cc) URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.cc?p2=branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.cc&p1=branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcFilterView.cc&r1=39262&r2=39613&rev=39613&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcFilterView.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.cc Mon Jul 23 17:39:56 2007 @@ -10,7 +10,7 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: YQPkgInstSrcFilterView.cc + File: YQPkgRepoFilterView.cc Author: Stefan Hundhammer @@ -26,8 +26,8 @@ #include "QY2ComboTabWidget.h" #include "QY2LayoutUtils.h" -#include "YQPkgInstSrcFilterView.h" -#include "YQPkgInstSrcList.h" +#include "YQPkgRepoFilterView.h" +#include "YQPkgRepoList.h" #include "YQPkgRpmGroupTagsFilterView.h" #include "YQPkgSearchFilterView.h" #include "YQPkgStatusFilterView.h" @@ -36,16 +36,16 @@ #define MARGIN 4 -YQPkgInstSrcFilterView::YQPkgInstSrcFilterView( QWidget * parent ) +YQPkgRepoFilterView::YQPkgRepoFilterView( QWidget * parent ) : QVBox( parent ) { QSplitter * splitter = new QSplitter( QSplitter::Vertical, this ); CHECK_PTR( splitter ); QVBox * upper_vbox = new QVBox( splitter ); - _instSrcList = new YQPkgInstSrcList( upper_vbox ); - CHECK_PTR( _instSrcList ); - _instSrcList->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Expanding ) );// hor/vert + _repoList = new YQPkgRepoList( upper_vbox ); + CHECK_PTR( _repoList ); + _repoList->setSizePolicy( QSizePolicy( QSizePolicy::Ignored, QSizePolicy::Expanding ) );// hor/vert addVSpacing( upper_vbox, MARGIN ); @@ -53,19 +53,19 @@ // Directly propagate signals filterStart() and filterFinished() // from primary filter to the outside - connect( _instSrcList, SIGNAL( filterStart() ), + connect( _repoList, SIGNAL( filterStart() ), this, SIGNAL( filterStart() ) ); - connect( _instSrcList, SIGNAL( filterFinished() ), + connect( _repoList, SIGNAL( filterFinished() ), this, SIGNAL( filterFinished() ) ); // Redirect filterMatch() and filterNearMatch() signals to secondary filter - connect( _instSrcList, SIGNAL( filterMatch ( ZyppSel, ZyppPkg ) ), + connect( _repoList, SIGNAL( filterMatch ( ZyppSel, ZyppPkg ) ), this, SLOT ( primaryFilterMatch ( ZyppSel, ZyppPkg ) ) ); - connect( _instSrcList, SIGNAL( filterNearMatch ( ZyppSel, ZyppPkg ) ), + connect( _repoList, SIGNAL( filterNearMatch ( ZyppSel, ZyppPkg ) ), this, SLOT ( primaryFilterNearMatch ( ZyppSel, ZyppPkg ) ) ); #if 0 @@ -74,20 +74,20 @@ layoutSecondaryFilters( splitter ); #if 0 - splitter->setResizeMode( _instSrcList, QSplitter::Stretch ); + splitter->setResizeMode( _repoList, QSplitter::Stretch ); splitter->setResizeMode( secondary_filters, QSplitter::FollowSizeHint ); #endif } -YQPkgInstSrcFilterView::~YQPkgInstSrcFilterView() +YQPkgRepoFilterView::~YQPkgRepoFilterView() { // NOP } QWidget * -YQPkgInstSrcFilterView::layoutSecondaryFilters( QWidget * parent ) +YQPkgRepoFilterView::layoutSecondaryFilters( QWidget * parent ) { QVBox *vbox = new QVBox( parent ); CHECK_PTR( vbox ); @@ -123,7 +123,7 @@ _secondaryFilters->addPage( _( "Package Groups" ), _rpmGroupTagsFilterView ); connect( _rpmGroupTagsFilterView, SIGNAL( filterStart() ), - _instSrcList, SLOT ( filter() ) ); + _repoList, SLOT ( filter() ) ); // @@ -135,7 +135,7 @@ _secondaryFilters->addPage( _( "Search" ), _searchFilterView ); connect( _searchFilterView, SIGNAL( filterStart() ), - _instSrcList, SLOT ( filter() ) ); + _repoList, SLOT ( filter() ) ); connect( _secondaryFilters, SIGNAL( currentChanged( QWidget * ) ), this, SLOT ( filter() ) ); @@ -150,26 +150,26 @@ _secondaryFilters->addPage( _( "Installation Summary" ), _statusFilterView ); connect( _statusFilterView, SIGNAL( filterStart() ), - _instSrcList, SLOT ( filter() ) ); + _repoList, SLOT ( filter() ) ); return _secondaryFilters; } -void YQPkgInstSrcFilterView::filter() +void YQPkgRepoFilterView::filter() { - _instSrcList->filter(); + _repoList->filter(); } -void YQPkgInstSrcFilterView::filterIfVisible() +void YQPkgRepoFilterView::filterIfVisible() { - _instSrcList->filterIfVisible(); + _repoList->filterIfVisible(); } -void YQPkgInstSrcFilterView::primaryFilterMatch( ZyppSel selectable, +void YQPkgRepoFilterView::primaryFilterMatch( ZyppSel selectable, ZyppPkg pkg ) { if ( secondaryFilterMatch( selectable, pkg ) ) @@ -177,7 +177,7 @@ } -void YQPkgInstSrcFilterView::primaryFilterNearMatch( ZyppSel selectable, +void YQPkgRepoFilterView::primaryFilterNearMatch( ZyppSel selectable, ZyppPkg pkg ) { if ( secondaryFilterMatch( selectable, pkg ) ) @@ -186,7 +186,7 @@ bool -YQPkgInstSrcFilterView::secondaryFilterMatch( ZyppSel selectable, +YQPkgRepoFilterView::secondaryFilterMatch( ZyppSel selectable, ZyppPkg pkg ) { if ( _allPackages->isVisible() ) @@ -216,4 +216,4 @@ -#include "YQPkgInstSrcFilterView.moc" +#include "YQPkgRepoFilterView.moc" Copied: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.h (from r39262, branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcFilterView.h) URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.h?p2=branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.h&p1=branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcFilterView.h&r1=39262&r2=39613&rev=39613&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcFilterView.h (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoFilterView.h Mon Jul 23 17:39:56 2007 @@ -10,28 +10,28 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: YQPkgInstSrcFilterView.h + File: YQPkgRepoFilterView.h Author: Stefan Hundhammer /-*/ -#ifndef YQPkgInstSrcFilterView_h -#define YQPkgInstSrcFilterView_h +#ifndef YQPkgRepoFilterView_h +#define YQPkgRepoFilterView_h #include "YQZypp.h" #include -class YQPkgInstSrcList; +class YQPkgRepoList; class QY2ComboTabWidget; class YQPkgRpmGroupTagsFilterView; class YQPkgSearchFilterView; class YQPkgStatusFilterView; -class YQPkgInstSrcFilterView : public QVBox +class YQPkgRepoFilterView : public QVBox { Q_OBJECT @@ -40,12 +40,12 @@ /** * Constructor **/ - YQPkgInstSrcFilterView( QWidget * parent ); + YQPkgRepoFilterView( QWidget * parent ); /** * Destructor **/ - virtual ~YQPkgInstSrcFilterView(); + virtual ~YQPkgRepoFilterView(); signals: @@ -126,7 +126,7 @@ // Data members - YQPkgInstSrcList * _instSrcList; + YQPkgRepoList * _repoList; QY2ComboTabWidget * _secondaryFilters; QWidget * _allPackages; YQPkgRpmGroupTagsFilterView * _rpmGroupTagsFilterView; @@ -136,4 +136,4 @@ -#endif // ifndef YQPkgInstSrcFilterView_h +#endif // ifndef YQPkgRepoFilterView_h Copied: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.cc (from r39608, branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcList.cc) URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.cc?p2=branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.cc&p1=branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcList.cc&r1=39608&r2=39613&rev=39613&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcList.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.cc Mon Jul 23 17:39:56 2007 @@ -10,7 +10,7 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: YQPkgInstSrcList.cc + File: YQPkgRepoList.cc Author: Stefan Hundhammer @@ -24,7 +24,7 @@ #include #include "YQi18n.h" #include "utf8.h" -#include "YQPkgInstSrcList.h" +#include "YQPkgRepoList.h" #include #include <algorithm> @@ -34,7 +34,7 @@ -YQPkgInstSrcList::YQPkgInstSrcList( QWidget * parent ) +YQPkgRepoList::YQPkgRepoList( QWidget * parent ) : QY2ListView( parent ) { y2debug( "Creating repository list" ); @@ -61,14 +61,14 @@ } -YQPkgInstSrcList::~YQPkgInstSrcList() +YQPkgRepoList::~YQPkgRepoList() { // NOP } void -YQPkgInstSrcList::fillList() +YQPkgRepoList::fillList() { clear(); y2debug( "Filling repository list" ); @@ -85,14 +85,14 @@ int -YQPkgInstSrcList::countEnabledSources() +YQPkgRepoList::countEnabledSources() { return zyppPool().knownRepositoriesSize(); } void -YQPkgInstSrcList::filterIfVisible() +YQPkgRepoList::filterIfVisible() { if ( isVisible() ) filter(); @@ -100,7 +100,7 @@ void -YQPkgInstSrcList::filter() +YQPkgRepoList::filter() { emit filterStart(); @@ -122,11 +122,11 @@ { if ( item->isSelected() ) { - YQPkgInstSrcListItem * instSrcItem = dynamic_cast (item); + YQPkgRepoListItem * repoItem = dynamic_cast (item); - if ( instSrcItem ) + if ( repoItem ) { - ZyppSrc currentSrc = instSrcItem->zyppSrc(); + ZyppSrc currentSrc = repoItem->zyppSrc(); for ( ZyppPoolIterator sel_it = zyppPkgBegin(); sel_it != zyppPkgEnd(); @@ -193,21 +193,21 @@ void -YQPkgInstSrcList::addInstSrc( ZyppSrc src ) +YQPkgRepoList::addInstSrc( ZyppSrc src ) { - new YQPkgInstSrcListItem( this, src ); + new YQPkgRepoListItem( this, src ); } -YQPkgInstSrcListItem * -YQPkgInstSrcList::selection() const +YQPkgRepoListItem * +YQPkgRepoList::selection() const { QListViewItem * item = selectedItem(); if ( ! item ) return 0; - return dynamic_cast (item); + return dynamic_cast (item); } @@ -215,10 +215,10 @@ -YQPkgInstSrcListItem::YQPkgInstSrcListItem( YQPkgInstSrcList * instSrcList, +YQPkgRepoListItem::YQPkgRepoListItem( YQPkgRepoList * repoList, ZyppSrc src ) - : QY2ListViewItem( instSrcList ) - , _instSrcList( instSrcList ) + : QY2ListViewItem( repoList ) + , _repoList( repoList ) , _zyppSrc( src ) { if ( nameCol() >= 0 ) @@ -248,14 +248,14 @@ -YQPkgInstSrcListItem::~YQPkgInstSrcListItem() +YQPkgRepoListItem::~YQPkgRepoListItem() { // NOP } ZyppProduct -YQPkgInstSrcListItem::singleProduct( ZyppSrc zyppSrc ) +YQPkgRepoListItem::singleProduct( ZyppSrc zyppSrc ) { ZyppProduct product; @@ -297,4 +297,4 @@ -#include "YQPkgInstSrcList.moc" +#include "YQPkgRepoList.moc" Copied: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.h (from r39608, branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcList.h) URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.h?p2=branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.h&p1=branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcList.h&r1=39608&r2=39613&rev=39613&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgInstSrcList.h (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgRepoList.h Mon Jul 23 17:39:56 2007 @@ -10,15 +10,15 @@ | (C) SuSE GmbH | \----------------------------------------------------------------------/ - File: YQPkgInstSrcList.h + File: YQPkgRepoList.h Author: Stefan Hundhammer /-*/ -#ifndef YQPkgInstSrcList_h -#define YQPkgInstSrcList_h +#ifndef YQPkgRepoList_h +#define YQPkgRepoList_h #include "YQZypp.h" #include "QY2ListView.h" @@ -26,7 +26,7 @@ #include -class YQPkgInstSrcListItem; +class YQPkgRepoListItem; typedef zypp::Repository ZyppSrc; @@ -34,7 +34,7 @@ /** * @short Display a list of zypp::Selection objects. **/ -class YQPkgInstSrcList : public QY2ListView +class YQPkgRepoList : public QY2ListView { Q_OBJECT @@ -43,12 +43,12 @@ /** * Constructor **/ - YQPkgInstSrcList( QWidget * parent ); + YQPkgRepoList( QWidget * parent ); /** * Destructor **/ - virtual ~YQPkgInstSrcList(); + virtual ~YQPkgRepoList(); /** * Returns the number of enabled installation sources. @@ -89,7 +89,7 @@ /** * Returns the currently selected item or 0 if there is none. **/ - YQPkgInstSrcListItem * selection() const; + YQPkgRepoListItem * selection() const; signals: @@ -141,19 +141,19 @@ -class YQPkgInstSrcListItem: public QY2ListViewItem +class YQPkgRepoListItem: public QY2ListViewItem { public: /** * Constructor **/ - YQPkgInstSrcListItem( YQPkgInstSrcList *parentList, ZyppSrc src ); + YQPkgRepoListItem( YQPkgRepoList *parentList, ZyppSrc src ); /** * Destructor **/ - virtual ~YQPkgInstSrcListItem(); + virtual ~YQPkgRepoListItem(); /** * Returns the ZYPP source this item corresponds to @@ -163,7 +163,7 @@ /** * Returns the parent list **/ - const YQPkgInstSrcList * instSrcList() const { return _instSrcList; } + const YQPkgRepoList * repoList() const { return _repoList; } /** * Returns the product on a source if it has one single product @@ -174,16 +174,16 @@ // Columns - int nameCol() const { return _instSrcList->nameCol(); } - int urlCol() const { return _instSrcList->urlCol(); } + int nameCol() const { return _repoList->nameCol(); } + int urlCol() const { return _repoList->urlCol(); } protected: // Data members - YQPkgInstSrcList * _instSrcList; + YQPkgRepoList * _repoList; ZyppSrc _zyppSrc; }; -#endif // ifndef YQPkgInstSrcList_h +#endif // ifndef YQPkgRepoList_h Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc?rev=39613&r1=39612&r2=39613&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.cc Mon Jul 23 17:39:56 2007 @@ -28,7 +28,7 @@ #include #include "YQPkgVersionsView.h" -#include "YQPkgInstSrcList.h" +#include "YQPkgRepoList.h" #include "YQIconPool.h" #include "YQi18n.h" #include "utf8.h" @@ -45,7 +45,7 @@ _archCol = -42; _productCol = -42; _urlCol = -42; - _instSrcCol = -42; + _repoCol = -42; _statusCol = -42; _nameCol = -42; _summaryCol = -42; @@ -54,12 +54,12 @@ addColumn( _( "Version" ) ); _versionCol = numCol++; addColumn( _( "Arch." ) ); _archCol = numCol++; addColumn( _( "Product" ) ); _productCol = numCol++; - addColumn( _( "Repository" ) ); _instSrcCol = numCol++; + addColumn( _( "Repository" ) ); _repoCol = numCol++; addColumn( _( "URL" ) ); _urlCol = numCol++; _statusCol = _productCol; _nameCol = _versionCol; - _summaryCol = _instSrcCol; + _summaryCol = _repoCol; // saveColumnWidths(); // Minimize column widths // header()->hide(); @@ -248,10 +248,10 @@ if ( versionCol() >= 0 ) setText( versionCol(), zyppObj->edition().asString().c_str() ); if ( archCol() >= 0 ) setText( archCol(), zyppObj->arch().asString().c_str() ); - if ( instSrcCol() >= 0 ) setText( instSrcCol(), zyppObj->repository().info().alias().c_str() ); + if ( repoCol() >= 0 ) setText( repoCol(), zyppObj->repository().info().alias().c_str() ); if ( productCol() >= 0 ) { - ZyppProduct product = YQPkgInstSrcListItem::singleProduct( zyppObj->repository() ); + ZyppProduct product = YQPkgRepoListItem::singleProduct( zyppObj->repository() ); if ( product ) setText( productCol(), product->summary() ); Modified: branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.h?rev=39613&r1=39612&r2=39613&view=diff ============================================================================== --- branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.h (original) +++ branches/tmp/sh/mod-ui/qt/src/pkg/YQPkgVersionsView.h Mon Jul 23 17:39:56 2007 @@ -64,7 +64,7 @@ int archCol() const { return _archCol; } int productCol() const { return _productCol; } int urlCol() const { return _urlCol; } - int instSrcCol() const { return _instSrcCol; } + int repoCol() const { return _repoCol; } int nameCol() const { return _nameCol; } int summaryCol() const { return _summaryCol; } int statusCol() const { return _statusCol; } @@ -122,7 +122,7 @@ int _archCol; int _productCol; int _urlCol; - int _instSrcCol; + int _repoCol; int _nameCol; int _summaryCol; int _statusCol; @@ -185,7 +185,7 @@ int versionCol() const { return _pkgVersionList->versionCol(); } int productCol() const { return _pkgVersionList->productCol(); } int urlCol() const { return _pkgVersionList->urlCol(); } - int instSrcCol() const { return _pkgVersionList->instSrcCol(); } + int repoCol() const { return _pkgVersionList->repoCol(); } int statusCol() const { return _pkgVersionList->statusCol(); } int archCol() const { return _pkgVersionList->archCol(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org