[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [krusader/plasma] krusader/KViewer: [krusader/KViewer] done with KViewer submodule
From:       Davide Gianforte <davide () gengisdave ! org>
Date:       2015-03-31 15:12:23
Message-ID: E1Ycxq3-0004Ws-Uz () scm ! kde ! org
[Download RAW message or body]

Git commit 74efd7622fdd3afb21c8ba8957f77a96608e7ba8 by Davide Gianforte.
Committed on 31/03/2015 at 12:28.
Pushed by gengisdave into branch 'plasma'.

[krusader/KViewer] done with KViewer submodule

all clear here

M  +4    -0    krusader/KViewer/CMakeLists.txt
M  +5    -4    krusader/KViewer/kimagefilepreview.cpp
M  +8    -7    krusader/KViewer/krviewer.cpp
M  +4    -2    krusader/KViewer/krviewer.h
M  +3    -1    krusader/KViewer/lister.cpp
M  +1    -0    krusader/KViewer/panelviewer.cpp

http://commits.kde.org/krusader/74efd7622fdd3afb21c8ba8957f77a96608e7ba8

diff --git a/krusader/KViewer/CMakeLists.txt b/krusader/KViewer/CMakeLists.txt
index 113ad57..9cba6db 100644
--- a/krusader/KViewer/CMakeLists.txt
+++ b/krusader/KViewer/CMakeLists.txt
@@ -1,3 +1,5 @@
+include_directories(${KF5_INCLUDES_DIRS} ${QT_INCLUDES})
+
 set(KViewer_SRCS
     krviewer.cpp
     kimagefilepreview.cpp
@@ -6,3 +8,5 @@ set(KViewer_SRCS
     lister.cpp)
 
 add_library(KViewer STATIC ${KViewer_SRCS})
+
+target_link_libraries(KViewer KF5::Parts KF5::IconThemes KF5::KDELibs4Support \
KF5::Html) \ No newline at end of file
diff --git a/krusader/KViewer/kimagefilepreview.cpp \
b/krusader/KViewer/kimagefilepreview.cpp index b08bf58..0567917 100644
--- a/krusader/KViewer/kimagefilepreview.cpp
+++ b/krusader/KViewer/kimagefilepreview.cpp
@@ -27,9 +27,10 @@
 #include <KDE/KDebug>
 #include <KDE/KLocale>
 #include <KDE/KFileDialog>
+#include <KDE/KDialog>
 
 #include <KIconThemes/KIconLoader>
-#include <KIO/KFileItem>
+#include <KIOCore/KFileItem>
 #include <KIO/PreviewJob>
 
 KrusaderImageFilePreview::KrusaderImageFilePreview(QWidget *parent)
@@ -109,7 +110,7 @@ QSize KrusaderImageFilePreview::sizeHint() const
 
 KIO::PreviewJob * KrusaderImageFilePreview::createJob(const KUrl& url, int w, int h)
 {
-#if KDE_IS_VERSION(4,7,0)
+/*#if KDE_IS_VERSION(4,7,0)
     KFileItemList fileItemList;
     fileItemList.append(KFileItem(KFileItem::Unknown,KFileItem::Unknown, url, \
true));  QStringList allPlugins = KIO::PreviewJob::availablePlugins();
@@ -118,11 +119,11 @@ KIO::PreviewJob * KrusaderImageFilePreview::createJob(const \
KUrl& url, int w, in  job->setOverlayIconSize(0);
         job->setScaleType(KIO::PreviewJob::Scaled);
     return job;
-#else
+#else*/
     KUrl::List urls;
     urls.append(url);
     return KIO::filePreview(urls, w, h, 0, 0, true, false);	
-#endif
+//#endif
 }
 
 void KrusaderImageFilePreview::gotPreview(const KFileItem& item, const QPixmap& pm)
diff --git a/krusader/KViewer/krviewer.cpp b/krusader/KViewer/krviewer.cpp
index 8ebfec1..2a6801f 100644
--- a/krusader/KViewer/krviewer.cpp
+++ b/krusader/KViewer/krviewer.cpp
@@ -36,13 +36,14 @@
 #include <KIO/JobClasses>
 #include <KIO/Job>
 #include <kde_file.h>
+#include <KDE/KStandardAction>
 
 #include <KParts/Part>
-#include <KParts/ComponentFactory>
+//#include <KParts/ComponentFactory> // missing?
 #include <KWidgetsAddons/KMessageBox>
-#include <KHtml/KHtmlPart>
+#include <KHtml/KHTMLPart>
 #include <KCoreAddons/KProcess>
-#include <KIO/KFileItem>
+#include <KIOCore/KFileItem>
 #include <KXmlGui/KToolBar>
 #include <KConfigWidgets/KStandardAction>
 #include <KCoreAddons/KShell>
@@ -110,17 +111,17 @@ KrViewer::KrViewer(QWidget *parent) :
     QList<QAction *> actList = menuBar()->actions();
     bool hasPrint = false, hasCopy = false;
     foreach(QAction *a, actList) {
-        if (a->shortcut().matches(printAction->shortcut().primary()) != \
QKeySequence::NoMatch) +        if (a->shortcut().matches(printAction->shortcut()) != \
QKeySequence::NoMatch)  hasPrint = true;
-        if (a->shortcut().matches(copyAction->shortcut().primary()) != \
QKeySequence::NoMatch) +        if (a->shortcut().matches(copyAction->shortcut()) != \
QKeySequence::NoMatch)  hasCopy = true;
     }
     QAction *printAct = viewerMenu->addAction(printAction->icon(), \
printAction->text(), this, SLOT(print()));  if (hasPrint)
-        printAct->setShortcut(printAction->shortcut().primary());
+        printAct->setShortcut(printAction->shortcut());
     QAction *copyAct = viewerMenu->addAction(copyAction->icon(), copyAction->text(), \
this, SLOT(copy()));  if (hasCopy)
-        copyAct->setShortcut(copyAction->shortcut().primary());
+        copyAct->setShortcut(copyAction->shortcut());
     viewerMenu->addSeparator();
     (tabClose = viewerMenu->addAction(i18n("&Close Current Tab"), this, \
                SLOT(tabCloseRequest())))->setShortcut(Qt::Key_Escape);
     (closeAct = viewerMenu->addAction(i18n("&Quit"), this, \
                SLOT(close())))->setShortcut(Qt::CTRL + Qt::Key_Q);
diff --git a/krusader/KViewer/krviewer.h b/krusader/KViewer/krviewer.h
index d177fce..5ddb40d 100644
--- a/krusader/KViewer/krviewer.h
+++ b/krusader/KViewer/krviewer.h
@@ -30,6 +30,8 @@
 // TODO KF5 - these headers are from deprecated KDE4LibsSupport : remove them
 #include <KDE/KTemporaryFile>
 #include <KDE/KTabWidget>
+#include <KDE/KUrl>
+#include <KDE/KAction>
 
 #include <KParts/MainWindow>
 #include <KParts/PartManager>
@@ -116,8 +118,8 @@ private:
 
     QAction *detachAction;
 
-    KAction *printAction;
-    KAction *copyAction;
+    QAction *printAction;
+    QAction *copyAction;
 
     QAction *tabClose;
     QAction *closeAct;
diff --git a/krusader/KViewer/lister.cpp b/krusader/KViewer/lister.cpp
index 51fbd5b..a5b17d6 100644
--- a/krusader/KViewer/lister.cpp
+++ b/krusader/KViewer/lister.cpp
@@ -62,7 +62,9 @@
 #include <KIO/Job>
 #include <KIO/CopyJob>
 #include <KIO/JobUiDelegate>
+#include <KDE/KIcon>
 
+#include <KParts/GUIActivateEvent>
 #include <KJobWidgets/KUiServerJobTracker>
 #include <KConfigWidgets/KColorScheme>
 #include <KWidgetsAddons/KMessageBox>
@@ -1286,7 +1288,7 @@ void Lister::slotFileFinished(KJob *job)
     _tempFile->flush();
     if (job->error()) {   /* any error occurred? */
         KIO::TransferJob *kioJob = (KIO::TransferJob *)job;
-        KMessageBox::error(_textArea, i18n("Error reading file %1.", \
kioJob->url().pathOrUrl())); +        KMessageBox::error(_textArea, i18n("Error \
reading file %1.", kioJob->url().toDisplayString()));  }
     _downloading = false;
 }
diff --git a/krusader/KViewer/panelviewer.cpp b/krusader/KViewer/panelviewer.cpp
index bfd4f1c..a3a47d6 100644
--- a/krusader/KViewer/panelviewer.cpp
+++ b/krusader/KViewer/panelviewer.cpp
@@ -32,6 +32,7 @@
 #include <kde_file.h>
 
 #include <KParts/BrowserExtension>
+#include <KParts/ReadWritePart>
 #include <KWidgetsAddons/KMessageBox>
 #include <KService/KServiceTypeProfile>
 #include <KService/KMimeTypeTrader>


[prev in list] [next in list] [prev in thread] [next in thread]