Author: dmacvicar
Date: Fri Dec 14 18:16:54 2007
New Revision: 43092
URL: http://svn.opensuse.org/viewcvs/yast?rev=43092&view=rev
Log:
- start fixing repository list and versions view
Modified:
trunk/qt/src/pkg/YQPkgRepoList.cc
trunk/qt/src/pkg/YQPkgVersionsView.cc
Modified: trunk/qt/src/pkg/YQPkgRepoList.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgRepoList.cc?rev=43092&r1=43091&r2=43092&view=diff
==============================================================================
--- trunk/qt/src/pkg/YQPkgRepoList.cc (original)
+++ trunk/qt/src/pkg/YQPkgRepoList.cc Fri Dec 14 18:16:54 2007
@@ -45,20 +45,23 @@
_urlCol = -1;
int numCol = 0;
-#if FIXME
+
+ QStringList headers;
+
// Column headers for repository list
- addColumn( _( "Name" ) ); _nameCol = numCol++;
- addColumn( _( "URL" ) ); _urlCol = numCol++;
+ headers << _( "Name"); _nameCol = numCol++;
+ headers << _( "URL"); _urlCol = numCol++;
+
+ setHeaderLabels(headers);
- setAllColumnsShowFocus( true );
- setSelectionMode( Q3ListView::Extended ); // allow multi-selection with Ctrl-mouse
+ //setAllColumnsShowFocus( true );
+ //setSelectionMode( Q3ListView::Extended ); // allow multi-selection with Ctrl-mouse
- connect( this, SIGNAL( currentItemChanged() ),
+ connect( this, SIGNAL( currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *) ),
this, SLOT ( filterIfVisible()) );
fillList();
selectSomething();
-#endif
y2debug( "Creating repository list done" );
}
@@ -105,7 +108,6 @@
void
YQPkgRepoList::filter()
{
-#if FIXME
emit filterStart();
y2milestone( "Collecting packages in selected repositories..." );
@@ -120,45 +122,46 @@
set<ZyppSel> exactMatches;
set<ZyppSel> nearMatches;
- Q3ListViewItem * item = firstChild(); // take multi selection into account
+
- while ( item )
- {
- if ( item->isSelected() )
- {
- YQPkgRepoListItem * repoItem = dynamic_cast (item);
+ QTreeWidgetItem * item;
+
+ QList items = selectedItems();
+ QListIterator it(items);
- if ( repoItem )
- {
- ZyppRepo currentRepo = repoItem->zyppRepo();
-
- for ( ZyppPoolIterator sel_it = zyppPkgBegin();
- sel_it != zyppPkgEnd();
- ++sel_it )
- {
- if ( (*sel_it)->candidateObj() &&
- (*sel_it)->candidateObj()->repository() == currentRepo )
- {
- exactMatches.insert( *sel_it );
- }
- else
- {
- zypp::ui::Selectable::available_iterator pkg_it = (*sel_it)->availableBegin();
-
- while ( pkg_it != (*sel_it)->availableEnd() )
- {
- if ( (*pkg_it)->repository() == currentRepo )
- nearMatches.insert( *sel_it );
-
- ++pkg_it;
- }
- }
- }
+ while ( it.hasNext() )
+ {
+ item = it.next();
+ YQPkgRepoListItem * repoItem = dynamic_cast (item);
- }
- }
+ if ( repoItem )
+ {
+ ZyppRepo currentRepo = repoItem->zyppRepo();
+
+ for ( ZyppPoolIterator sel_it = zyppPkgBegin();
+ sel_it != zyppPkgEnd();
+ ++sel_it )
+ {
+ if ( (*sel_it)->candidateObj() &&
+ (*sel_it)->candidateObj()->repository() == currentRepo )
+ {
+ exactMatches.insert( *sel_it );
+ }
+ else
+ {
+ zypp::ui::Selectable::available_iterator pkg_it = (*sel_it)->availableBegin();
+
+ while ( pkg_it != (*sel_it)->availableEnd() )
+ {
+ if ( (*pkg_it)->repository() == currentRepo )
+ nearMatches.insert( *sel_it );
+
+ ++pkg_it;
+ }
+ }
+ }
- item = item->nextSibling();
+ }
}
@@ -193,7 +196,6 @@
y2debug( "Packages sent to package list. Elapsed time: %f sec", stopWatch.elapsed() / 1000.0 );
emit filterFinished();
-#endif
}
@@ -207,16 +209,12 @@
YQPkgRepoListItem *
YQPkgRepoList::selection() const
{
-#if FIXME
- Q3ListViewItem * item = selectedItem();
+ QTreeWidgetItem * item = currentItem();
if ( ! item )
return 0;
return dynamic_cast (item);
-#else
- return 0;
-#endif
}
Modified: trunk/qt/src/pkg/YQPkgVersionsView.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/pkg/YQPkgVersionsView.cc?rev=43092&r1=43091&r2=43092&view=diff
==============================================================================
--- trunk/qt/src/pkg/YQPkgVersionsView.cc (original)
+++ trunk/qt/src/pkg/YQPkgVersionsView.cc Fri Dec 14 18:16:54 2007
@@ -50,14 +50,15 @@
_nameCol = -42;
_summaryCol = -42;
-#if FIXME
+ QStringList headers;
int numCol = 0;
- addColumn( _( "Version" ) ); _versionCol = numCol++;
- addColumn( _( "Arch." ) ); _archCol = numCol++;
- addColumn( _( "Product" ) ); _productCol = numCol++;
- addColumn( _( "Repository" ) ); _repoCol = numCol++;
- addColumn( _( "URL" ) ); _urlCol = numCol++;
-#endif
+ headers << _( "Version" ); _versionCol = numCol++;
+ headers << _( "Arch." ); _archCol = numCol++;
+ headers << _( "Product" ); _productCol = numCol++;
+ headers << _( "Repository" ); _repoCol = numCol++;
+ headers << _( "URL" ); _urlCol = numCol++;
+
+ setHeaderLabels(headers);
_statusCol = _productCol;
_nameCol = _versionCol;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
dmacvicar＠svn.opensuse.org