Author: tgoettlicher Date: Wed Jun 6 12:10:00 2007 New Revision: 5682 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5682&view=rev Log: Enabled main window and dummy plugin to communicate patches with each other. Modified: trunk/updater-kde/updater/CMakeLists.txt trunk/updater-kde/updater/MainWindow.cpp trunk/updater-kde/updater/MainWindow.h trunk/updater-kde/updater/Updater.h trunk/updater-kde/updater/UpdaterApplication.cpp trunk/updater-kde/updater/dummy/DummyUpdater.cpp trunk/updater-kde/updater/dummy/DummyUpdater.h Modified: trunk/updater-kde/updater/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/CMakeLists.txt?rev=5682&r1=5681&r2=5682&view=diff ============================================================================== --- trunk/updater-kde/updater/CMakeLists.txt (original) +++ trunk/updater-kde/updater/CMakeLists.txt Wed Jun 6 12:10:00 2007 @@ -1,5 +1,5 @@ #ADD_SUBDIRECTORY( zmd ) -ADD_SUBDIRECTORY( zypp ) +#ADD_SUBDIRECTORY( zypp ) ADD_SUBDIRECTORY( dummy ) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/kxmlrpcclient ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} ) Modified: trunk/updater-kde/updater/MainWindow.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.cpp?rev=5682&r1=5681&r2=5682&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.cpp (original) +++ trunk/updater-kde/updater/MainWindow.cpp Wed Jun 6 12:10:00 2007 @@ -224,8 +224,8 @@ connect(patchList, SIGNAL(clicked(QListViewItem*)), this, SLOT(slotPackageClicked(QListViewItem*))); - connect(patchList, SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&, int)), - this, SLOT(slotPackageRightClicked(QListViewItem*, const QPoint&, int))); +// connect(patchList, SIGNAL(contextMenuRequested(QListViewItem*, const QPoint&, int)), +// this, SLOT(slotPackageRightClicked(QListViewItem*, const QPoint&, int))); connect(patchList, SIGNAL(selectionChanged()), this, SLOT(slotPackageSelectionChanged())); @@ -507,20 +507,20 @@ updateButtons(); - emit(populateUpdateList(patchList, packageList)); + emit(populateLists(patchList, packageList)); } //Selection/Fetch Description slots -void MainWindow::slotPackageSelected(QListViewItem *packageSelected) +void MainWindow::slotPackageSelected(QListViewItem *package) { updateButtons(); - emit(packageSelected(packageSelected)); + emit(packageSelected(package)); } -void MainWindow::slotPatchSelected(QListViewItem *patchSelected) +void MainWindow::slotPatchSelected(QListViewItem *patch) { updateButtons(); - emit(patchSelected(patchSelected)); + emit(patchSelected(patch)); } void MainWindow::slotPatchSelectionChanged() { Modified: trunk/updater-kde/updater/MainWindow.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/MainWindow.h?rev=5682&r1=5681&r2=5682&view=diff ============================================================================== --- trunk/updater-kde/updater/MainWindow.h (original) +++ trunk/updater-kde/updater/MainWindow.h Wed Jun 6 12:10:00 2007 @@ -92,7 +92,7 @@ @param patchList our QListView we want the backend to pack. */ - void populateUpdateList(QListView* patchList); + void populateLists(QListView* patchList, QListView* packageList); /** Signal we send to our current backend requesting the start of @@ -216,10 +216,13 @@ private slots: void slotExit(); - void slotPackageSelected(QListViewItem *packageSelected); - void slotPackageRightClicked(QListViewItem*, const QPoint&, int); + void slotPackageSelected(QListViewItem *package); + void slotPatchSelected(QListViewItem *path); +// void slotPackageRightClicked(QListViewItem*, const QPoint&, int); void slotPackageClicked(QListViewItem *); + void slotPatchClicked(QListViewItem *); void slotPackageSelectionChanged(); + void slotPatchSelectionChanged(); void configButtonClicked(); Modified: trunk/updater-kde/updater/Updater.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/Updater.h?rev=5682&r1=5681&r2=5682&view=diff ============================================================================== --- trunk/updater-kde/updater/Updater.h (original) +++ trunk/updater-kde/updater/Updater.h Wed Jun 6 12:10:00 2007 @@ -146,7 +146,9 @@ @param updateList the QListView we will be loading with updates. **/ - virtual void populateUpdateList(QListView* updateList) = 0; + // todo +// virtual void populateUpdateList(QListView* updateList) = 0; + virtual void populateLists(QListView* patchList, QListView* packageList ) = 0; /** This slot is signaled when an update is selected and Modified: trunk/updater-kde/updater/UpdaterApplication.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/UpdaterApplication.cpp?rev=5682&r1=5681&r2=5682&view=diff ============================================================================== --- trunk/updater-kde/updater/UpdaterApplication.cpp (original) +++ trunk/updater-kde/updater/UpdaterApplication.cpp Wed Jun 6 12:10:00 2007 @@ -170,7 +170,8 @@ connect(_main, SIGNAL(configureUpdater()), updater, SLOT(configureUpdater())); //Start update list populate, makes backend check for updates - connect(_main, SIGNAL(populateUpdateList(QListView*)), updater, SLOT(populateUpdateList(QListView*))); +// connect(_main, SIGNAL(populateUpdateList(QListView*)), updater, SLOT(populateUpdateList(QListView*))); + connect(_main, SIGNAL(populateLists(QListView*, QListView*)), updater, SLOT(populateLists(QListView*, QListView*))); //Signal to inform the mainwindow of new updates in the list connect(updater, SIGNAL(populateDone()), _main, SLOT(populateDone())); Modified: trunk/updater-kde/updater/dummy/DummyUpdater.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/dummy/DummyUpdater.cpp?rev=5682&r1=5681&r2=5682&view=diff ============================================================================== --- trunk/updater-kde/updater/dummy/DummyUpdater.cpp (original) +++ trunk/updater-kde/updater/dummy/DummyUpdater.cpp Wed Jun 6 12:10:00 2007 @@ -167,10 +167,10 @@ } -void DummyUpdater::populateUpdateList(QListView *updateList) +void DummyUpdater::populateLists(QListView *patchList, QListView *packageList) { kdDebug() << "got populate UI request..." << endl; - _list_view = updateList; + _list_view = patchList; emit(updateApplet(APPLET_NO_UPDATES, 0)); doCheckForUpdates(); } Modified: trunk/updater-kde/updater/dummy/DummyUpdater.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-kde/updater/dummy/DummyUpdater.h?rev=5682&r1=5681&r2=5682&view=diff ============================================================================== --- trunk/updater-kde/updater/dummy/DummyUpdater.h (original) +++ trunk/updater-kde/updater/dummy/DummyUpdater.h Wed Jun 6 12:10:00 2007 @@ -65,7 +65,7 @@ @param updateList the list on the main window */ - void populateUpdateList(QListView* updateList); + void populateLists(QListView* patchList, QListView* packageList); /** Slot which gets called when the user selects an update. -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org