Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-24 02:42:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove gwenview kactivities support

Browse source
This commit is contained in:
Ivailo Monev 2014-12-09 00:15:33 +00:00
parent e20fee7e7c
commit 745697a3d7
2 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gwenview/CMakeLists.txt
View file

@ -28,9 +28,6 @@ macro_log_feature(LCMS2_FOUND "LittleCMS" "Color management engine" "http://www.
find_package(LibKonq) find_package(LibKonq)
macro_log_feature(LIBKONQ_FOUND "libkonq" "Standard file management features" "http://www.kde.org" TRUE) macro_log_feature(LIBKONQ_FOUND "libkonq" "Standard file management features" "http://www.kde.org" TRUE)
find_package(KActivities 6.1.0)
macro_log_feature(KActivities_FOUND "KActivities" "Activities interface library" "https://projects.kde.org/projects/kde/kdelibs/kactivities" TRUE "6.1.0")
find_package(Kdcraw 2.4.2) find_package(Kdcraw 2.4.2)
macro_log_feature(KDCRAW_FOUND "libkdcraw" "KDE Dcraw library" "http://www.kde.org" TRUE "2.4.2") macro_log_feature(KDCRAW_FOUND "libkdcraw" "KDE Dcraw library" "http://www.kde.org" TRUE "2.4.2")

14
gwenview/app/viewmainpage.cpp
View file

@ -37,7 +37,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include <KMessageBox> #include <KMessageBox>
#include <KModelIndexProxyMapper> #include <KModelIndexProxyMapper>
#include <KToggleAction> #include <KToggleAction>
#include <KActivities/ResourceInstance>
// Local // Local
#include "fileoperations.h" #include "fileoperations.h"
@ -155,10 +154,7 @@ struct ViewMainPagePrivate
KToggleAction* mSynchronizeAction; KToggleAction* mSynchronizeAction;
QCheckBox* mSynchronizeCheckBox; QCheckBox* mSynchronizeCheckBox;
// Activity Resource events reporting needs to be above KPart, QHash<DocumentView*;
// in the shell itself, to avoid problems with other MDI applications
// that use this KPart
QHash<DocumentView*, KActivities::ResourceInstance*> mActivityResources;
bool mFullScreenMode; bool mFullScreenMode;
bool mCompareMode; bool mCompareMode;
@ -270,7 +266,6 @@ struct ViewMainPagePrivate
mSlideShow, SLOT(resumeAndGoToNextUrl())); mSlideShow, SLOT(resumeAndGoToNextUrl()));
mDocumentViews << view; mDocumentViews << view;
mActivityResources.insert(view, new KActivities::ResourceInstance(q->window()->winId(), view));
return view; return view;
} }
@ -289,7 +284,6 @@ struct ViewMainPagePrivate
QObject::disconnect(view, 0, mSlideShow, 0); QObject::disconnect(view, 0, mSlideShow, 0);
mDocumentViews.removeOne(view); mDocumentViews.removeOne(view);
mActivityResources.remove(view);
mDocumentViewContainer->deleteView(view); mDocumentViewContainer->deleteView(view);
} }
@ -354,8 +348,6 @@ struct ViewMainPagePrivate
} }
if (oldView) { if (oldView) {
oldView->setCurrent(false); oldView->setCurrent(false);
Q_ASSERT(mActivityResources.contains(oldView));
mActivityResources.value(oldView)->notifyFocusedOut();
} }
view->setCurrent(true); view->setCurrent(true);
mDocumentViewController->setView(view); mDocumentViewController->setView(view);
@ -368,9 +360,6 @@ struct ViewMainPagePrivate
// *before* listing /foo (because it matters less to the user) // *before* listing /foo (because it matters less to the user)
mThumbnailBar->selectionModel()->setCurrentIndex(index, QItemSelectionModel::Current); mThumbnailBar->selectionModel()->setCurrentIndex(index, QItemSelectionModel::Current);
} }
Q_ASSERT(mActivityResources.contains(view));
mActivityResources.value(view)->notifyFocusedIn();
} }
QModelIndex indexForView(DocumentView* view) const QModelIndex indexForView(DocumentView* view) const
@ -688,7 +677,6 @@ void ViewMainPage::openUrls(const KUrl::List& allUrls, const KUrl& currentUrl)
DocumentView* view = it.value(); DocumentView* view = it.value();
DocumentView::Setup savedSetup = d->mDocumentViewContainer->savedSetup(url); DocumentView::Setup savedSetup = d->mDocumentViewContainer->savedSetup(url);
view->openUrl(url, savedSetup.valid ? savedSetup : setup); view->openUrl(url, savedSetup.valid ? savedSetup : setup);
d->mActivityResources.value(view)->setUri(url);
} }
// Init views // Init views