Hello community, here is the log from the commit of package krdc for openSUSE:Factory checked in at 2013-12-11 14:36:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krdc (Old) and /work/SRC/openSUSE:Factory/.krdc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "krdc" Changes: -------- --- /work/SRC/openSUSE:Factory/krdc/krdc.changes 2013-12-02 12:36:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.krdc.new/krdc.changes 2013-12-11 14:37:00.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Nov 29 08:46:33 UTC 2013 - [email protected] + +- Update to 4.11.97 + * KDE 4.12 RC 1 release + * See http://www.kde.org/announcements/announce-4.12-rc.php + +------------------------------------------------------------------- +Sat Nov 23 23:00:54 UTC 2013 - [email protected] + +- Update to 4.11.95 + * KDE 4.12 Beta 3 release + * See http://www.kde.org/announcements/announce-4.12-beta3.php + +------------------------------------------------------------------- Old: ---- krdc-4.11.90.tar.xz New: ---- krdc-4.11.97.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krdc.spec ++++++ --- /var/tmp/diff_new_pack.rnIKxS/_old 2013-12-11 14:37:02.000000000 +0100 +++ /var/tmp/diff_new_pack.rnIKxS/_new 2013-12-11 14:37:02.000000000 +0100 @@ -25,7 +25,7 @@ BuildRequires: pkgconfig(TelepathyQt4) %endif BuildRequires: oxygen-icon-theme-large -Version: 4.11.90 +Version: 4.11.97 Release: 0 Summary: Remote Desktop Connection License: GPL-2.0+ ++++++ krdc-4.11.90.tar.xz -> krdc-4.11.97.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krdc-4.11.90/bookmarkmanager.cpp new/krdc-4.11.97/bookmarkmanager.cpp --- old/krdc-4.11.90/bookmarkmanager.cpp 2013-11-07 10:47:57.000000000 +0100 +++ new/krdc-4.11.97/bookmarkmanager.cpp 2013-11-27 21:36:28.000000000 +0100 @@ -114,8 +114,9 @@ QString BookmarkManager::currentUrl() const { - if (m_mainWindow->currentRemoteView() >= 0) - return urlForView(m_mainWindow->remoteViewList().at(m_mainWindow->currentRemoteView())); + RemoteView *view = m_mainWindow->currentRemoteView(); + if (view) + return urlForView(view); else return QString(); } @@ -146,10 +147,10 @@ { QList<QPair<QString, QString> > list; - QListIterator<RemoteView *> iter(m_mainWindow->remoteViewList()); + QMapIterator<QWidget *, RemoteView *> iter(m_mainWindow->remoteViewList()); while (iter.hasNext()) { - RemoteView *next = iter.next(); + RemoteView *next = iter.next().value(); const QString url = next->url().prettyUrl(KUrl::RemoveTrailingSlash); list << QPair<QString, QString>(url, url); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krdc-4.11.90/mainwindow.cpp new/krdc-4.11.97/mainwindow.cpp --- old/krdc-4.11.90/mainwindow.cpp 2013-11-07 10:47:57.000000000 +0100 +++ new/krdc-4.11.97/mainwindow.cpp 2013-11-27 21:36:28.000000000 +0100 @@ -334,8 +334,6 @@ connect(view, SIGNAL(statusChanged(RemoteView::RemoteStatus)), this, SLOT(statusChanged(RemoteView::RemoteStatus))); connect(view, SIGNAL(disconnected()), this, SLOT(disconnectHost())); - m_remoteViewList.append(view); - QScrollArea *scrollArea = createScrollArea(m_tabWidget, view); const int indexOfNewConnectionWidget = m_tabWidget->indexOf(m_newConnectionWidget); @@ -344,6 +342,7 @@ const int newIndex = m_tabWidget->addTab(scrollArea, KIcon("krdc"), tabName.isEmpty() ? url.prettyUrl(KUrl::RemoveTrailingSlash) : tabName); m_tabWidget->setCurrentIndex(newIndex); + m_remoteViewMap.insert(m_tabWidget->widget(newIndex), view); tabChanged(newIndex); // force to update m_currentRemoteView (tabChanged is not emitted when start page has been disabled) view->start(); @@ -356,12 +355,13 @@ if (!urlString.isEmpty()) { const KUrl url(urlString); // first check if url has already been opened; in case show the tab - for (int i = 0; i < m_remoteViewList.count(); ++i) { - if (m_remoteViewList.at(i)->url() == url) { - m_tabWidget->setCurrentIndex(i); + foreach (QWidget *widget, m_remoteViewMap.keys()) { + if (m_remoteViewMap.value(widget)->url() == url) { + m_tabWidget->setCurrentWidget(widget); return; } } + newConnection(url, false, nameString); } } @@ -463,7 +463,7 @@ void MainWindow::takeScreenshot() { - const QPixmap snapshot = m_remoteViewList.at(m_currentRemoteView)->takeScreenshot(); + const QPixmap snapshot = currentRemoteView()->takeScreenshot(); QApplication::clipboard()->setPixmap(snapshot); } @@ -485,8 +485,8 @@ restoreGeometry(m_mainWindowGeometry); if (m_systemTrayIcon) m_systemTrayIcon->setAssociatedWidget(this); - foreach(RemoteView *currentView, m_remoteViewList) { - currentView->enableScaling(currentView->hostPreferences()->windowedScale()); + foreach (RemoteView * view, m_remoteViewMap.values()) { + view->enableScaling(view->hostPreferences()->windowedScale()); } if (m_toolBar) { @@ -512,7 +512,7 @@ m_tabWidget->setTabBarHidden(true); m_tabWidget->setDocumentMode(true); - foreach(RemoteView *currentView, m_remoteViewList) { + foreach(RemoteView *currentView, m_remoteViewMap) { currentView->enableScaling(currentView->hostPreferences()->fullscreenScale()); } @@ -566,10 +566,11 @@ QWidget *widgetToDelete; if (view) { widgetToDelete = (QWidget*) view->parent()->parent(); - m_remoteViewList.removeOne(view); + m_remoteViewMap.remove(m_remoteViewMap.key(view)); } else { widgetToDelete = m_tabWidget->currentWidget(); - view = m_remoteViewList.takeAt(m_currentRemoteView); + view = currentRemoteView(); + m_remoteViewMap.remove(m_remoteViewMap.key(view)); } saveHostPrefs(view); @@ -594,12 +595,10 @@ void MainWindow::closeTab(QWidget *widget) { bool isNewConnectionPage = widget == m_newConnectionWidget; - const int index = m_tabWidget->indexOf(widget); - - kDebug(5010) << index; if (!isNewConnectionPage) { - RemoteView *view = m_remoteViewList.takeAt(index); + RemoteView *view = m_remoteViewMap.value(widget); + m_remoteViewMap.remove(m_remoteViewMap.key(view)); view->startQuitting(); #ifdef TELEPATHY_SUPPORT m_tubesManager->closeTube(view->url()); @@ -740,7 +739,7 @@ { kDebug(5010) << showLocalCursor; - RemoteView* view = m_remoteViewList.at(m_currentRemoteView); + RemoteView* view = currentRemoteView(); view->showDotCursor(showLocalCursor ? RemoteView::CursorOn : RemoteView::CursorOff); view->hostPreferences()->setShowLocalCursor(showLocalCursor); saveHostPrefs(view); @@ -750,7 +749,7 @@ { kDebug(5010) << viewOnly; - RemoteView* view = m_remoteViewList.at(m_currentRemoteView); + RemoteView* view = currentRemoteView(); view->setViewOnly(viewOnly); view->hostPreferences()->setViewOnly(viewOnly); saveHostPrefs(view); @@ -760,7 +759,7 @@ { kDebug(5010); - RemoteView* view = m_remoteViewList.at(m_currentRemoteView); + RemoteView* view = currentRemoteView(); view->setGrabAllKeys(grabAllKeys); view->hostPreferences()->setGrabAllKeys(grabAllKeys); saveHostPrefs(view); @@ -770,7 +769,7 @@ { kDebug(5010); - RemoteView* view = m_remoteViewList.at(m_currentRemoteView); + RemoteView* view = currentRemoteView(); view->enableScaling(scale); if (m_fullscreenWindow) view->hostPreferences()->setFullscreenScale(scale); @@ -848,7 +847,7 @@ if (m_tabWidget->currentWidget() == m_newConnectionWidget) enabled = false; - RemoteView* view = (m_currentRemoteView >= 0 && enabled) ? m_remoteViewList.at(m_currentRemoteView) : 0; + RemoteView* view = (m_currentRemoteView >= 0 && enabled) ? currentRemoteView() : 0; actionCollection()->action("take_screenshot")->setEnabled(enabled); actionCollection()->action("disconnect")->setEnabled(enabled); @@ -928,15 +927,15 @@ } // Send update configuration message to all views - for (int i = 0; i < m_remoteViewList.count(); ++i) { - m_remoteViewList.at(i)->updateConfiguration(); + foreach (RemoteView *view, m_remoteViewMap.values()) { + view->updateConfiguration(); } } void MainWindow::quit(bool systemEvent) { - const bool haveRemoteConnections = !m_remoteViewList.isEmpty(); + const bool haveRemoteConnections = !m_remoteViewMap.isEmpty(); if (systemEvent || !haveRemoteConnections || KMessageBox::warningContinueCancel(this, i18n("Are you sure you want to quit the KDE Remote Desktop Client?"), i18n("Confirm Quit"), @@ -945,17 +944,17 @@ if (Settings::rememberSessions()) { // remember open remote views for next startup QStringList list; - for (int i = 0; i < m_remoteViewList.count(); ++i) { - kDebug(5010) << m_remoteViewList.at(i)->url(); - list.append(m_remoteViewList.at(i)->url().prettyUrl(KUrl::RemoveTrailingSlash)); + foreach (RemoteView *view, m_remoteViewMap.values()) { + kDebug(5010) << view->url(); + list.append(view->url().prettyUrl(KUrl::RemoveTrailingSlash)); } Settings::setOpenSessions(list); } saveHostPrefs(); - for (int i = 0; i < m_remoteViewList.count(); ++i) { - m_remoteViewList.at(i)->startQuitting(); + foreach (RemoteView *view, m_remoteViewMap.values()) { + view->startQuitting(); } Settings::self()->writeConfig(); @@ -1011,9 +1010,9 @@ void MainWindow::saveHostPrefs() { - for (int i = 0; i < m_remoteViewList.count(); ++i) { - saveHostPrefs(m_remoteViewList.at(i)); - m_remoteViewList.at(i)->startQuitting(); + foreach (RemoteView *view, m_remoteViewMap.values()) { + saveHostPrefs(view); + view->startQuitting(); } } @@ -1159,9 +1158,9 @@ m_addressInput->setFocus(); } -QList<RemoteView *> MainWindow::remoteViewList() const +QMap<QWidget *, RemoteView *> MainWindow::remoteViewList() const { - return m_remoteViewList; + return m_remoteViewMap; } QList<RemoteViewFactory *> MainWindow::remoteViewFactoriesList() const @@ -1169,9 +1168,13 @@ return m_remoteViewFactories.values(); } -int MainWindow::currentRemoteView() const +RemoteView* MainWindow::currentRemoteView() const { - return m_currentRemoteView; + if (m_currentRemoteView >= 0) { + return m_remoteViewMap.value(m_tabWidget->widget(m_currentRemoteView)); + } else { + return 0; + } } void MainWindow::createDockWidget() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krdc-4.11.90/mainwindow.h new/krdc-4.11.97/mainwindow.h --- old/krdc-4.11.90/mainwindow.h 2013-11-07 10:47:57.000000000 +0100 +++ new/krdc-4.11.97/mainwindow.h 2013-11-27 21:36:28.000000000 +0100 @@ -59,9 +59,9 @@ explicit MainWindow(QWidget *parent = 0); ~MainWindow(); - QList<RemoteView *> remoteViewList() const; + QMap<QWidget *, RemoteView *> remoteViewList() const; QList<RemoteViewFactory *> remoteViewFactoriesList() const; - int currentRemoteView() const; + RemoteView* currentRemoteView() const; public slots: void newConnection(const KUrl &newUrl = KUrl(), bool switchFullscreenWhenConnected = false, const QString &tabName = QString()); @@ -122,7 +122,7 @@ BookmarkManager *m_bookmarkManager; - QList<RemoteView *> m_remoteViewList; + QMap<QWidget *, RemoteView *> m_remoteViewMap; QMap<int, RemoteViewFactory *> m_remoteViewFactories; int m_currentRemoteView; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
