Merge branch 'master' into multiple_apis

.drone.yml

@@ -4,11 +4,13 @@ name: default
 steps:
     - name: build
       image: einar/kde
+      privileged: true
       pull: if-not-exists
       commands:
         - mkdir build
-        - cmake -B build
+        - cd build
-        - make -C build -j2
+        - cmake ../
+        - make
       when:
         event:
             - push

CMakeLists.txt

@@ -1,5 +1,5 @@
 project(danbooru_client)
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
 
 set(danbooru_client_VERSION_MAJOR 0)
 set(danbooru_client_VERSION_MINOR 3)
@@ -44,6 +44,7 @@ find_package(KF5 ${KF5_VERSION} REQUIRED
              CoreAddons         # Caches
              TextWidgets        # Spin boxes
              GuiAddons          # Image cache
+             Config            # Configuration
              Completion         # KComboBox
              XmlGui             # User interface
              ConfigWidgets      # Handling of configuration
@@ -57,7 +58,7 @@ find_package(KF5 ${KF5_VERSION} REQUIRED
 
 include(ECMInstallIcons)
 include(KDEInstallDirs)
-include(KDECompilerSettings)
+include(KDECompilerSettings NO_POLICY_SCOPE)
 include(KDECMakeSettings)
 include(FeatureSummary)
 

README.md

@@ -2,9 +2,11 @@
 
 This is a (work in progress) C++ port from the original [Danbooru Client](http://kde-apps.org/content/show.php?content=114343).
 
+[![Build Status](https://drone.dennogumi.org/api/badges/KDE/danbooru-client/status.svg)](https://drone.dennogumi.org/KDE/danbooru-client)
+
 Current features:
 
-- Supports most Danbooru image boards
+- Supports Moebooru image boards (yande.re, konachan.net, and similar boards)
 - Search by one or multiple tags
 - Filter out posts with unwanted tags
 - View or download posts
@@ -13,7 +15,7 @@ Current features:
 
 ### Requirements
 
-[KDE Frameworks](https://community.kde.org/Frameworks) 5.7 or newer (needed for some features from KDeclarative), and Qt 5.4.
+[KDE Frameworks](https://community.kde.org/Frameworks) 5.25 or newer, and Qt 5.9.
 
 In particular, Danbooru Client makes use of the following Frameworks:
 
@@ -22,10 +24,12 @@ In particular, Danbooru Client makes use of the following Frameworks:
 - KGuiAddons (cache handling)
 - KCompletion (Combo box widgets)
 - KXmlGui (main window UI)
+- KConfig (configuration handling)
 - KConfigWidgets (configuration handling)
 - KIO (network operation handling)
 - KWallet (password handling)
 - KDeclarative (thumbnail view)
+- KFileMetaData (for tagging)
 
 At minimum, the following Qt 5.4 components are required as well:
 
@@ -73,4 +77,4 @@ Notice that Danbooru Client does **not** implement the Gelbooru API at the momen
 
 ### License
 
-This is Free Software, licensed under the GNU GPL v3 or later. See the LICENSE file for more details.
+This is Free Software, licensed under the GNU GPL v3 or later. See the LICENSE file for more details.

src/libdanbooru/CMakeLists.txt

@@ -1,4 +1,3 @@
-cmake_policy(SET CMP0048 OLD)
 project(libdanbooru)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)