Hello community, here is the log from the commit of package gwenview5 for openSUSE:Factory checked in at 2016-08-29 14:33:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gwenview5 (Old) and /work/SRC/openSUSE:Factory/.gwenview5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gwenview5" Changes: -------- --- /work/SRC/openSUSE:Factory/gwenview5/gwenview5.changes 2016-07-21 07:42:41.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gwenview5.new/gwenview5.changes 2016-08-29 14:33:20.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 12 10:03:34 UTC 2016 - [email protected] + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:36:00 UTC 2016 - [email protected] + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- gwenview-16.04.3.tar.xz New: ---- gwenview-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gwenview5.spec ++++++ --- /var/tmp/diff_new_pack.ztWgQh/_old 2016-08-29 14:33:21.000000000 +0200 +++ /var/tmp/diff_new_pack.ztWgQh/_new 2016-08-29 14:33:21.000000000 +0200 @@ -18,7 +18,7 @@ %define rname gwenview Name: gwenview5 -Version: 16.04.3 +Version: 16.08.0 Release: 0 Summary: Simple Image Viewer for KDE License: GPL-2.0+ ++++++ gwenview-16.04.3.tar.xz -> gwenview-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/CMakeLists.txt new/gwenview-16.08.0/CMakeLists.txt --- old/gwenview-16.04.3/CMakeLists.txt 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/CMakeLists.txt 2016-08-10 01:05:11.000000000 +0200 @@ -2,8 +2,8 @@ # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") -set (KDE_APPLICATIONS_VERSION_MINOR "04") -set (KDE_APPLICATIONS_VERSION_MICRO "3") +set (KDE_APPLICATIONS_VERSION_MINOR "08") +set (KDE_APPLICATIONS_VERSION_MICRO "0") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ) @@ -107,6 +107,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) add_definitions(-DTRANSLATION_DOMAIN="gwenview") +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) ## dirs to build add_subdirectory(lib) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/app/CMakeLists.txt new/gwenview-16.08.0/app/CMakeLists.txt --- old/gwenview-16.04.3/app/CMakeLists.txt 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/app/CMakeLists.txt 2016-08-10 01:05:11.000000000 +0200 @@ -84,6 +84,22 @@ target_link_libraries(gwenview KF5::Kipi) endif() +if (APPLE) + # own plist template + set_target_properties (gwenview PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/MacOSXBundleInfo.plist.in) + # the MacOSX bundle display name property (CFBundleDisplayName) is not currently supported by cmake, + # so has to be set for all targets in this cmake file + set(MACOSX_BUNDLE_DISPLAY_NAME Gwenview5) + set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.gwenview") + set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Gwenview5") + set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_DISPLAY_NAME "Gwenview5") + set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_INFO_STRING "Gwenview, KDE Image Viewer") + set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_LONG_VERSION_STRING "Gwenview ${KDE_APPLICATIONS_VERSION}") + set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}") + set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_BUNDLE_VERSION "${KDE_APPLICATIONS_VERSION}") + set_target_properties(gwenview PROPERTIES MACOSX_BUNDLE_COPYRIGHT "2002-2016 The Gwenview Authors") +endif (APPLE) + install(TARGETS gwenview ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/app/folderviewcontextmanageritem.cpp new/gwenview-16.08.0/app/folderviewcontextmanageritem.cpp --- old/gwenview-16.04.3/app/folderviewcontextmanageritem.cpp 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/app/folderviewcontextmanageritem.cpp 2016-08-10 01:05:11.000000000 +0200 @@ -232,8 +232,7 @@ void FolderViewContextManagerItem::slotCurrentDirUrlChanged(const QUrl &url) { if (url.isValid() && d->mUrlToSelect != url) { - d->mUrlToSelect = QDir::cleanPath(url.path()); - d->mUrlToSelect = d->mUrlToSelect.adjusted(QUrl::StripTrailingSlash); + d->mUrlToSelect = url.adjusted(QUrl::StripTrailingSlash | QUrl::NormalizePathSegments); d->mExpandingIndex = QModelIndex(); } if (!d->mView->isVisible()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/app/imagemetainfodialog.cpp new/gwenview-16.08.0/app/imagemetainfodialog.cpp --- old/gwenview-16.04.3/app/imagemetainfodialog.cpp 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/app/imagemetainfodialog.cpp 2016-08-10 01:05:11.000000000 +0200 @@ -111,7 +111,7 @@ struct ImageMetaInfoDialogPrivate { - std::auto_ptr<PreferredImageMetaInfoModel> mModel; + std::unique_ptr<PreferredImageMetaInfoModel> mModel; QTreeView* mTreeView; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/app/kipiinterface.cpp new/gwenview-16.08.0/app/kipiinterface.cpp --- old/gwenview-16.04.3/app/kipiinterface.cpp 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/app/kipiinterface.cpp 2016-08-10 01:05:11.000000000 +0200 @@ -468,7 +468,7 @@ return NULL; } -#if Kipi_VERSION_MAJOR == 5 && Kipi_VERSION_MINOR == 0 +#ifdef GWENVIEW_KIPI_WITH_CREATE_RAW_PROCESSOR KIPI::RawProcessor* KIPIInterface::createRawProcessor() const { return NULL; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/app/kipiinterface.h new/gwenview-16.08.0/app/kipiinterface.h --- old/gwenview-16.04.3/app/kipiinterface.h 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/app/kipiinterface.h 2016-08-10 01:05:11.000000000 +0200 @@ -35,6 +35,9 @@ #endif #if KIPI_VERSION_MAJOR >= 5 #define GWENVIEW_KIPI_WITH_CREATE_METHODS +#if KIPI_VERSION_MINOR == 0 +# define GWENVIEW_KIPI_WITH_CREATE_RAW_PROCESSOR +#endif #endif namespace Gwenview @@ -71,7 +74,7 @@ #ifdef GWENVIEW_KIPI_WITH_CREATE_METHODS virtual KIPI::FileReadWriteLock* createReadWriteLock(const QUrl& url) const; virtual KIPI::MetadataProcessor* createMetadataProcessor() const; -#if Kipi_VERSION_MAJOR == 5 && Kipi_VERSION_MINOR == 0 +#ifdef GWENVIEW_KIPI_WITH_CREATE_RAW_PROCESSOR virtual KIPI::RawProcessor* createRawProcessor() const; #endif #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/app/main.cpp new/gwenview-16.08.0/app/main.cpp --- old/gwenview-16.04.3/app/main.cpp 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/app/main.cpp 2016-08-10 01:05:11.000000000 +0200 @@ -112,8 +112,8 @@ QUrl mUrl; bool mFullScreen; bool mSlideShow; - std::auto_ptr<QTemporaryDir> mMultipleUrlsDir; - std::auto_ptr<Gwenview::MainWindow> mMainWindow; + std::unique_ptr<QTemporaryDir> mMultipleUrlsDir; + std::unique_ptr<Gwenview::MainWindow> mMainWindow; }; int main(int argc, char *argv[]) @@ -127,11 +127,12 @@ aboutData->setShortDescription(i18n("An Image Viewer")); QApplication app(argc, argv); + app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); KAboutData::setApplicationData(*aboutData); app.setApplicationName(aboutData.data()->componentName()); app.setApplicationDisplayName(aboutData.data()->displayName()); app.setOrganizationDomain(aboutData.data()->organizationDomain()); - QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("gwenview"))); + QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("gwenview"), app.windowIcon())); QCommandLineParser parser; aboutData.data()->setupCommandLine(&parser); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/app/mainwindow.cpp new/gwenview-16.08.0/app/mainwindow.cpp --- old/gwenview-16.04.3/app/mainwindow.cpp 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/app/mainwindow.cpp 2016-08-10 01:05:11.000000000 +0200 @@ -32,6 +32,9 @@ #include <QVBoxLayout> #include <QMenuBar> #include <QUrl> +#ifdef Q_OS_OSX +#include <QFileOpenEvent> +#endif // KDE #include <KIO/NetAccess> @@ -794,6 +797,9 @@ d->mKIPIExportAction->setKIPIInterface(d->mKIPIInterface); #endif setAutoSaveSettings(); +#ifdef Q_OS_OSX + qApp->installEventFilter(this); +#endif } MainWindow::~MainWindow() @@ -1542,6 +1548,21 @@ } } +bool MainWindow::eventFilter(QObject *obj, QEvent *event) +{ +#ifdef Q_OS_OSX + /** + * handle Mac OS X file open events (only exist on OS X) + */ + if (event->type() == QEvent::FileOpen) { + QFileOpenEvent *fileOpenEvent = static_cast<QFileOpenEvent*>(event); + openUrl(fileOpenEvent->url()); + return true; + } +#endif + return false; +} + void MainWindow::setDistractionFreeMode(bool value) { d->mFullScreenContent->setDistractionFreeMode(value); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/app/mainwindow.h new/gwenview-16.08.0/app/mainwindow.h --- old/gwenview-16.04.3/app/mainwindow.h 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/app/mainwindow.h 2016-08-10 01:05:11.000000000 +0200 @@ -78,6 +78,7 @@ virtual void resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE; virtual void saveProperties(KConfigGroup&) Q_DECL_OVERRIDE; virtual void readProperties(const KConfigGroup&) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *); private Q_SLOTS: void setActiveViewModeAction(QAction* action); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/app/org.kde.gwenview.desktop new/gwenview-16.08.0/app/org.kde.gwenview.desktop --- old/gwenview-16.04.3/app/org.kde.gwenview.desktop 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/app/org.kde.gwenview.desktop 2016-08-10 01:05:11.000000000 +0200 @@ -84,6 +84,7 @@ GenericName[fr]=Afficheur d'images de KDE GenericName[ga]=Amharcán Íomhánna KDE GenericName[gl]=Visor de imaxes de KDE +GenericName[he]=מציג תמונות של KDE GenericName[hu]=KDE képnézegető GenericName[ia]=Visor de imagine de KDE GenericName[id]=Penampil Gambar KDE @@ -137,6 +138,7 @@ Comment[fr]=Un afficheur simple d'images Comment[ga]=Amharcán simplí íomhánna Comment[gl]=Un visor de imaxes sinxelo +Comment[he]=מציג תמונות פשוט Comment[hi]=एक सरल चित्र प्रदर्शक Comment[hne]=एक सरल फोटू प्रदर्सक Comment[hr]=Jednostavni preglednik slika diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/app/semanticinfocontextmanageritem.cpp new/gwenview-16.08.0/app/semanticinfocontextmanageritem.cpp --- old/gwenview-16.04.3/app/semanticinfocontextmanageritem.cpp 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/app/semanticinfocontextmanageritem.cpp 2016-08-10 01:05:11.000000000 +0200 @@ -38,6 +38,7 @@ #include <KRatingPainter> #include <KIconLoader> #include <KSharedConfig> +#include <KWindowConfig> // Local #include "viewmainpage.h" @@ -71,13 +72,13 @@ mainWidget->layout()->setMargin(0); setWindowTitle(mainWidget->windowTitle()); - restoreDialogSize(configGroup()); + KWindowConfig::restoreWindowSize(windowHandle(), configGroup()); } ~SemanticInfoDialog() { KConfigGroup group = configGroup(); - saveDialogSize(group); + KWindowConfig::saveWindowSize(windowHandle(), group); } KConfigGroup configGroup() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/doc/index.docbook new/gwenview-16.08.0/doc/index.docbook --- old/gwenview-16.04.3/doc/index.docbook 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/doc/index.docbook 2016-08-10 01:05:11.000000000 +0200 @@ -1,7 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN" "dtd/kdedbx45.dtd" [ - <!ENTITY kappname "<application>Gwenview</application>"> <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE"><!-- change language only here --> ]> @@ -40,7 +39,7 @@ <date>2015-08-04</date> <releaseinfo>Applications 15.08</releaseinfo> <abstract> -<para>&kappname; is an image and video viewer.</para> +<para>&gwenview; is an image and video viewer.</para> </abstract> <keywordset> <keyword>KDE</keyword> @@ -57,14 +56,14 @@ <title>Introduction</title> <sect1 id="what-is-gwenview"> -<title>What is &kappname;</title> +<title>What is &gwenview;</title> <para> -&kappname; is a fast and easy to use image and video viewer. +&gwenview; is a fast and easy to use image and video viewer. </para> <para> -Gwenview features two main modes: Browse and View. Both modes can be used +&gwenview; features two main modes: Browse and View. Both modes can be used in a normal application window and Full Screen. Browse Mode lets you navigate through your computer showing thumbnails of your images, View Mode lets you view images one at a time, and Full Screen lets you make quick @@ -72,14 +71,14 @@ folders and &URL;s as well as your places and tags. </para> -<para>Image loading is handled by the Qt library, so &kappname; supports all -image formats your Qt installation supports. &kappname; correctly displays images +<para>Image loading is handled by the &Qt; library, so &gwenview; supports all +image formats your &Qt; installation supports. &gwenview; correctly displays images with an alpha channel (transparency) as well as animations.</para> -<para>&kappname; supports the displaying and editing of EXIF comments in JPEG +<para>&gwenview; supports the displaying and editing of EXIF comments in JPEG images. Lossless JPEG transforms such as rotations and mirroring are also supported.</para> -<para>&kappname; can read embedded color profiles from PNG and JPEG files. +<para>&gwenview; can read embedded color profiles from PNG and JPEG files. It can use the image color profile together with the display color profile to output correct colors on the screen.</para> </sect1> @@ -104,8 +103,8 @@ </sect1> <sect1 id='image_operations'><title>Image Operations</title> -<para>&kappname; has a few features which are available in both Browse, View, and -Full Screen view. &kappname; has the capability to do basic alteration of your +<para>&gwenview; has a few features which are available in both Browse, View, and +Full Screen view. &gwenview; has the capability to do basic alteration of your images.</para> <itemizedlist> <listitem><para>Rotate: A rotate operation will rotate the image either to the left @@ -177,7 +176,7 @@ <tip><para>If you have installed the Kipi Plugins, a <guimenu>Plugins</guimenu> menu will be available that will allow you to perform many additional operations on your images. For more information, see the -<ulink url="help:kipi-plugins">Kipi Plugins documentation</ulink>.</para></tip> +<ulink url="help:/kipi-plugins">Kipi Plugins documentation</ulink>.</para></tip> </sect1> <sect1 id='browse_mode'><title>Browse Mode</title> @@ -271,7 +270,7 @@ the image using the mouse and the arrow keys. The bird-eye view automatically hides itself after a short delay, showing back only while zooming or scrolling.</para> -<para>You can define what happens when going to image B after having zoomed in on an area of image A using the options in the <guilabel>Zoom mode</guilabel> group on the <guimenuitem>Image View</guimenuitem> page of the &kappname; configuration window which can be reached using the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &kappname;...</guimenuitem></menuchoice>.</para> +<para>You can define what happens when going to image B after having zoomed in on an area of image A using the options in the <guilabel>Zoom mode</guilabel> group on the <guimenuitem>Image View</guimenuitem> page of the &gwenview; configuration window which can be reached using the <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure &gwenview;...</guimenuitem></menuchoice>.</para> <itemizedlist> <listitem><para>If set to <guilabel>Autofit each image</guilabel>, image B is zoomed out to fit the screen.</para></listitem> @@ -279,7 +278,7 @@ <listitem><para>If set to <guilabel>Per image zoom and position</guilabel>, all images remember their own zoom and position: image B is initially set to the same zoom parameters as image A, but will then remember its own zoom and position (if these are changed, image A will <emphasis>not</emphasis> be displayed with the updated zoom and position).</para></listitem> </itemizedlist> -<tip><para>You can start directly in View mode by starting &kappname; from a +<tip><para>You can start directly in View mode by starting &gwenview; from a context menu like <guimenuitem>Open With</guimenuitem> in another program or by launching it from the command line with an image as an argument.</para> </tip> @@ -375,7 +374,7 @@ mouse to the top of the screen. If the mouse cursor is over the top bar, it will not autohide. Most of the buttons on the bar are the same as the ones on the toolbar in Browse or View Modes, except for the <guiicon>Exit Full -Screen Mode</guiicon> button which returns you to the &kappname; window, the +Screen Mode</guiicon> button which returns you to the &gwenview; window, the <guiicon>Start/Stop Slideshow</guiicon> button, and the <guiicon>Configure Full Screen Mode</guiicon> button which shows a small settings dialog that allows you to easily and quickly configure the @@ -383,7 +382,7 @@ <itemizedlist> <listitem><para>The <guilabel>Interval</guilabel> slider controls how long - &kappname; will show an image before it move to the next one.</para></listitem> + &gwenview; will show an image before it move to the next one.</para></listitem> <listitem><para>If the <guilabel>Loop</guilabel> check box is checked, when the end of the slideshow is reached, it will continue from the beginning instead of stopping. </para></listitem> @@ -453,15 +452,15 @@ </chapter> <!--FIXME no importer in kf5 <chapter id="importer"> -<title>&kappname; Importer</title> +<title>&gwenview; Importer</title> <sect1> <title>Introduction</title> -<para>The &kappname; Importer allows you to import images from a digital camera or -removable media. To launch it, select <guilabel>Download Photos with &kappname;</guilabel> +<para>The &gwenview; Importer allows you to import images from a digital camera or +removable media. To launch it, select <guilabel>Download Photos with &gwenview;</guilabel> in the &kde; Device Notifier after connecting a supported device.</para> -<para>When you plug in a device the &kappname; importer recursively lists all images and videos. +<para>When you plug in a device the &gwenview; importer recursively lists all images and videos. </para> <para>This is not always what you expect, ⪚ plugging a smartphone you do not want to list all medias of the device; but only the pictures you took, which are usually in a special subfolder. @@ -475,7 +474,7 @@ </imageobject> </mediaobject> </screenshot> -<para>It is possible to select the root folder to list, and &kappname; Importer will remember the +<para>It is possible to select the root folder to list, and &gwenview; Importer will remember the last root folder for each device. This way, next time you plug a device in, only the relevant pictures and videos should be listed. </para> @@ -484,7 +483,7 @@ <title>Importing Images</title> <screenshot> - <screeninfo>&kappname; Importer Screenshot</screeninfo> + <screeninfo>&gwenview; Importer Screenshot</screeninfo> <mediaobject> <imageobject> <imagedata fileref="importer.png" format="PNG" /> @@ -503,7 +502,7 @@ <sect2> <title>Automatic Renaming</title> -<para>&kappname; Importer can rename your files according to a specified pattern. +<para>&gwenview; Importer can rename your files according to a specified pattern. To configure this, select the <guibutton>Settings</guibutton> in the lower left corner. You may turn this feature on or off using the check box at the top. The <guilabel>Rename Format</guilabel> supports several special parameters, which will @@ -549,9 +548,9 @@ shows that image.</para></listitem> <listitem><para>When in Browse mode, scrolling the mouse wheel will scroll up or down the thumbnail view area.</para></listitem> - <listitem><para>If the <guilabel>Mouse Behavior</guilabel> option in + <listitem><para>If the <guilabel>Mouse wheel behavior</guilabel> option in <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure - &kappname;</guimenuitem></menuchoice> + &gwenview;</guimenuitem></menuchoice> is set to Browse, scrolling the mouse wheel while in View Mode will move you through the images in the folder.</para></listitem> </itemizedlist> @@ -560,7 +559,7 @@ <sect1 id="keybindings"> <title>Key bindings</title> -<para>&kappname; comes with a range of keyboard shortcuts, all of which can be +<para>&gwenview; comes with a range of keyboard shortcuts, all of which can be viewed and remapped by selecting <menuchoice><guimenu>Settings</guimenu><guimenuitem>Configure Shortcuts...</guimenuitem></menuchoice>. Note that in the Files and Folders @@ -687,13 +686,13 @@ <sect1 id="advanced-configuration"> <title>Advanced Configuration Options</title> <para> - Some notes on hidden &kappname; options can be found on + Some notes on hidden &gwenview; options can be found on <ulink url="http://userbase.kde.org/Special:myLanguage/Gwenview/Hidden_Configuration_Options";>this page</ulink>. </para> <important> <para> The options described on the above-mentioned page may help you - tune &kappname; for specific needs, but please keep in mind + tune &gwenview; for specific needs, but please keep in mind there is no warranty they will continue working from one version to another. </para> @@ -704,7 +703,7 @@ <chapter id="credits"> <title>Credits and Copyright</title> -<para>&kappname; is currently maintained by Aurélien Gâteau</para> +<para>&gwenview; is currently maintained by Aurélien Gâteau</para> <para>This document was written by Christopher Martin</para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/lib/cms/cmsprofile.h new/gwenview-16.08.0/lib/cms/cmsprofile.h --- old/gwenview-16.04.3/lib/cms/cmsprofile.h 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/lib/cms/cmsprofile.h 2016-08-10 01:05:11.000000000 +0200 @@ -25,10 +25,8 @@ // Local -// KDE -#include <KSharedPtr> - // Qt +#include <QExplicitlySharedDataPointer> #include <QSharedData> // Exiv2 @@ -52,7 +50,7 @@ class GWENVIEWLIB_EXPORT Profile : public QSharedData { public: - typedef KSharedPtr<Profile> Ptr; + typedef QExplicitlySharedDataPointer<Profile> Ptr; Profile(); ~Profile(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/lib/document/loadingdocumentimpl.cpp new/gwenview-16.08.0/lib/document/loadingdocumentimpl.cpp --- old/gwenview-16.04.3/lib/document/loadingdocumentimpl.cpp 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/lib/document/loadingdocumentimpl.cpp 2016-08-10 01:05:11.000000000 +0200 @@ -101,7 +101,7 @@ QByteArray mFormat; QSize mImageSize; Exiv2::Image::AutoPtr mExiv2Image; - std::auto_ptr<JpegContent> mJpegContent; + std::unique_ptr<JpegContent> mJpegContent; QImage mImage; Cms::Profile::Ptr mCmsProfile; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/lib/print/printhelper.cpp new/gwenview-16.08.0/lib/print/printhelper.cpp --- old/gwenview-16.04.3/lib/print/printhelper.cpp 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/lib/print/printhelper.cpp 2016-08-10 01:05:11.000000000 +0200 @@ -123,7 +123,7 @@ PrintOptionsPage* optionsPage = new PrintOptionsPage(doc->size()); optionsPage->loadConfig(); - std::auto_ptr<QPrintDialog> dialog( + std::unique_ptr<QPrintDialog> dialog( KdePrint::createPrintDialog(&printer, QList<QWidget*>() << optionsPage, d->mParent) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/lib/thumbnailview/thumbnailbarview.cpp new/gwenview-16.08.0/lib/thumbnailview/thumbnailbarview.cpp --- old/gwenview-16.04.3/lib/thumbnailview/thumbnailbarview.cpp 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/lib/thumbnailview/thumbnailbarview.cpp 2016-08-10 01:05:11.000000000 +0200 @@ -123,7 +123,6 @@ void updateHoverUi(const QModelIndex& index) { - QModelIndex oldIndex = mIndexUnderCursor; mIndexUnderCursor = index; if (mIndexUnderCursor.isValid()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/lib/thumbnailview/thumbnailview.cpp new/gwenview-16.08.0/lib/thumbnailview/thumbnailview.cpp --- old/gwenview-16.04.3/lib/thumbnailview/thumbnailview.cpp 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/lib/thumbnailview/thumbnailview.cpp 2016-08-10 01:05:11.000000000 +0200 @@ -577,7 +577,6 @@ // Special case for videos because our kde install may come without // support for video thumbnails so we show the mimetype icon instead of // a broken image icon - ThumbnailGroup::Enum group = ThumbnailGroup::fromPixelSize(d->mThumbnailSize.height()); QPixmap pix = KIconLoader::global()->loadMimeTypeIcon(item.iconName(), KIconLoader::Desktop, d->mThumbnailSize.height()); thumbnail.initAsIcon(pix); } else if (kind == MimeTypeUtils::KIND_DIR) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/tests/CMakeLists.txt new/gwenview-16.08.0/tests/CMakeLists.txt --- old/gwenview-16.04.3/tests/CMakeLists.txt 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/tests/CMakeLists.txt 2016-08-10 01:05:11.000000000 +0200 @@ -5,6 +5,8 @@ return() endif() +add_custom_target(buildtests) + add_subdirectory(auto) add_subdirectory(manual) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/tests/auto/CMakeLists.txt new/gwenview-16.08.0/tests/auto/CMakeLists.txt --- old/gwenview-16.04.3/tests/auto/CMakeLists.txt 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/tests/auto/CMakeLists.txt 2016-08-10 01:05:11.000000000 +0200 @@ -3,6 +3,7 @@ macro(gv_add_unit_test _test) set(_src ${_test}.cpp ${ARGN}) add_executable(${_test} ${_src}) + add_dependencies(buildtests ${_test}) add_test( ${_test} ${_test} ) ecm_mark_as_test(${_test}) target_link_libraries(${_test} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/tests/auto/cmsprofiletest.cpp new/gwenview-16.08.0/tests/auto/cmsprofiletest.cpp --- old/gwenview-16.04.3/tests/auto/cmsprofiletest.cpp 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/tests/auto/cmsprofiletest.cpp 2016-08-10 01:05:11.000000000 +0200 @@ -47,7 +47,7 @@ data = file.readAll(); } Cms::Profile::Ptr ptr = Cms::Profile::loadFromImageData(data, format); - QVERIFY(!ptr.isNull()); + QVERIFY(ptr); } #define NEW_ROW(fileName, format) QTest::newRow(fileName) << fileName << QByteArray(format) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/tests/auto/testutils.cpp new/gwenview-16.08.0/tests/auto/testutils.cpp --- old/gwenview-16.04.3/tests/auto/testutils.cpp 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/tests/auto/testutils.cpp 2016-08-10 01:05:11.000000000 +0200 @@ -38,9 +38,9 @@ return QUrl(); } - QUrl baseUrl = QString::fromLocal8Bit(qgetenv("GV_REMOTE_TESTS_BASE_URL")); + QUrl baseUrl(QString::fromLocal8Bit(qgetenv("GV_REMOTE_TESTS_BASE_URL"))); baseUrl = baseUrl.adjusted(QUrl::StripTrailingSlash); - baseUrl.setPath(baseUrl.path() + '/' + "gwenview-remote-tests"); + baseUrl.setPath(baseUrl.path() + "/gwenview-remote-tests"); if (KIO::NetAccess::exists(baseUrl, KIO::NetAccess::DestinationSide, authWindow)) { KIO::NetAccess::del(baseUrl, authWindow); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gwenview-16.04.3/tests/manual/CMakeLists.txt new/gwenview-16.08.0/tests/manual/CMakeLists.txt --- old/gwenview-16.04.3/tests/manual/CMakeLists.txt 2016-07-02 17:59:48.000000000 +0200 +++ new/gwenview-16.08.0/tests/manual/CMakeLists.txt 2016-08-10 01:05:11.000000000 +0200 @@ -8,6 +8,7 @@ ) add_executable(slidecontainertest ${slidecontainertest_SRCS}) +add_dependencies(buildtests slidecontainertest) ecm_mark_as_test(slidecontainertest) target_link_libraries(slidecontainertest @@ -21,6 +22,7 @@ ) add_executable(imageloadbench ${imageloadbench_SRCS}) +add_dependencies(buildtests imageloadbench) ecm_mark_as_test(imageloadbench) target_link_libraries(imageloadbench @@ -35,6 +37,7 @@ ) add_executable(thumbnailgen ${thumbnailgen_SRCS}) +add_dependencies(buildtests thumbnailgen) ecm_mark_as_test(thumbnailgen) target_link_libraries(thumbnailgen
