Hello community,
here is the log from the commit of package kapptemplate for openSUSE:Factory checked in at 2018-04-27 16:02:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kapptemplate (Old)
and /work/SRC/openSUSE:Factory/.kapptemplate.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kapptemplate"
Fri Apr 27 16:02:30 2018 rev:58 rq:599004 version:18.04.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kapptemplate/kapptemplate.changes 2018-03-22 12:00:07.908399012 +0100
+++ /work/SRC/openSUSE:Factory/.kapptemplate.new/kapptemplate.changes 2018-04-27 16:02:37.121046423 +0200
@@ -1,0 +2,22 @@
+Wed Apr 18 07:48:50 CEST 2018 - lbeltrame@kde.org
+
+- Update to 18.04.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-18.04.0.php
+- Changes since 18.03.90:
+ * None
+
+-------------------------------------------------------------------
+Fri Apr 06 07:08:59 CEST 2018 - lbeltrame@kde.org
+
+- Update to 18.03.90
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-18.03.90.php
+- Changes since 17.12.3:
+ * Remove Base suffix from UI class names in templates
+ * Add ki18n_install/kdoctools_install to KF5 app templates
+ * Bump (min) versions used in templates
+
+-------------------------------------------------------------------
Old:
----
kapptemplate-17.12.3.tar.xz
New:
----
kapptemplate-18.04.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kapptemplate.spec ++++++
--- /var/tmp/diff_new_pack.MUFgRW/_old 2018-04-27 16:02:37.645027195 +0200
+++ /var/tmp/diff_new_pack.MUFgRW/_new 2018-04-27 16:02:37.649027048 +0200
@@ -19,7 +19,7 @@
%bcond_without lang
Name: kapptemplate
-Version: 17.12.3
+Version: 18.04.0
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
++++++ kapptemplate-17.12.3.tar.xz -> kapptemplate-18.04.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/po/ca/kapptemplate.po new/kapptemplate-18.04.0/po/ca/kapptemplate.po
--- old/kapptemplate-17.12.3/po/ca/kapptemplate.po 2018-03-06 01:23:25.000000000 +0100
+++ new/kapptemplate-18.04.0/po/ca/kapptemplate.po 2018-04-13 02:11:10.000000000 +0200
@@ -330,3 +330,29 @@
msgstr ""
"Aquesta adreça de correu electrònic està al costat del nom en el crèdit del "
"«copyright» dels fitxers del projecte."
+
+#~ msgctxt "Do not translate"
+#~ msgid "Preview"
+#~ msgstr "Preview"
+
+#~ msgctxt "Do not translate"
+#~ msgid "Description"
+#~ msgstr "Description"
+
+#~ msgid ""
+#~ "The extraction of your personal information in file %1 was not successful"
+#~ msgstr ""
+#~ "No s'ha pogut fer l'extracció de la vostra informació personal del fitxer "
+#~ "%1"
+
+#~ msgid "The file %1 cannot be created."
+#~ msgstr "No s'ha pogut crear el fitxer %1."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "The file %1 cannot be created."
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "No s'ha pogut crear el fitxer %1."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/po/ca@valencia/kapptemplate.po new/kapptemplate-18.04.0/po/ca@valencia/kapptemplate.po
--- old/kapptemplate-17.12.3/po/ca@valencia/kapptemplate.po 2018-03-06 01:23:25.000000000 +0100
+++ new/kapptemplate-18.04.0/po/ca@valencia/kapptemplate.po 2018-04-13 02:11:10.000000000 +0200
@@ -146,9 +146,9 @@
"You will be able to start developing your own software using Qt and KDE "
"technologies from this template."
msgstr ""
-"Este assistent vos ajudarà a generar un projecte nou.\n"
+"Aquest assistent vos ajudarà a generar un projecte nou.\n"
"Podreu començar a desenvolupar el vostre propi programari utilitzant les Qt "
-"i les tecnologies del KDE a partir d'esta plantilla."
+"i les tecnologies del KDE a partir d'aquesta plantilla."
#: src/application/kapptemplate.cpp:36
#, kde-format
@@ -307,7 +307,7 @@
#: src/application/properties.ui:89
#, kde-format
msgid "This will set the copyright to this name"
-msgstr "Això establirà el «copyright» a este nom"
+msgstr "Això establirà el «copyright» a aquest nom"
#. i18n: ectx: property (text), widget (QLabel, emailLabel)
#: src/application/properties.ui:102
@@ -328,5 +328,31 @@
"This email address will be next to your name in the copyright credit of the "
"project files."
msgstr ""
-"Esta adreça de correu electrònic està al costat del nom en el crèdit del "
+"Aquesta adreça de correu electrònic està al costat del nom en el crèdit del "
"«copyright» dels fitxers del projecte."
+
+#~ msgctxt "Do not translate"
+#~ msgid "Preview"
+#~ msgstr "Preview"
+
+#~ msgctxt "Do not translate"
+#~ msgid "Description"
+#~ msgstr "Description"
+
+#~ msgid ""
+#~ "The extraction of your personal information in file %1 was not successful"
+#~ msgstr ""
+#~ "No s'ha pogut fer l'extracció de la vostra informació personal del fitxer "
+#~ "%1"
+
+#~ msgid "The file %1 cannot be created."
+#~ msgstr "No s'ha pogut crear el fitxer %1."
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "The file %1 cannot be created."
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "No s'ha pogut crear el fitxer %1."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/po/en_GB/kapptemplate.po new/kapptemplate-18.04.0/po/en_GB/kapptemplate.po
--- old/kapptemplate-17.12.3/po/en_GB/kapptemplate.po 2018-03-06 01:23:25.000000000 +0100
+++ new/kapptemplate-18.04.0/po/en_GB/kapptemplate.po 2018-04-13 02:11:10.000000000 +0200
@@ -8,7 +8,7 @@
"Project-Id-Version: kapptemplate\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-08-03 03:16+0200\n"
-"PO-Revision-Date: 2017-11-26 21:13+0000\n"
+"PO-Revision-Date: 2017-11-26 14:19+0000\n"
"Last-Translator: Steve Allewell \n"
"Language-Team: British English \n"
"Language: en_GB\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/po/gl/kapptemplate.po new/kapptemplate-18.04.0/po/gl/kapptemplate.po
--- old/kapptemplate-17.12.3/po/gl/kapptemplate.po 2018-03-06 01:23:26.000000000 +0100
+++ new/kapptemplate-18.04.0/po/gl/kapptemplate.po 2018-04-13 02:11:10.000000000 +0200
@@ -85,7 +85,7 @@
#: src/application/generatepage.cpp:79
#, kde-format
msgid "Path %1 could not be created."
-msgstr "Non foi posíbel crear a ruta %1."
+msgstr "Non se puido crear a ruta %1."
#: src/application/generatepage.cpp:91
#, kde-format
@@ -99,7 +99,7 @@
#: src/application/generatepage.cpp:98
#, kde-format
msgid "Could not copy template file to %1."
-msgstr "Non foi posíbel copiar o ficheiro de modelo a %1."
+msgstr "Non se puido copiar o ficheiro de modelo a %1."
#: src/application/generatepage.cpp:132
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/po/zh_CN/kapptemplate.po new/kapptemplate-18.04.0/po/zh_CN/kapptemplate.po
--- old/kapptemplate-17.12.3/po/zh_CN/kapptemplate.po 2018-03-06 01:23:26.000000000 +0100
+++ new/kapptemplate-18.04.0/po/zh_CN/kapptemplate.po 2018-04-13 02:11:11.000000000 +0200
@@ -9,7 +9,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-08-03 03:16+0200\n"
-"PO-Revision-Date: 2018-02-28 02:30-0500\n"
+"PO-Revision-Date: 2018-04-05 09:43-0400\n"
"Last-Translator: guoyunhebrave \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/src/application/org.kde.kapptemplate.appdata.xml new/kapptemplate-18.04.0/src/application/org.kde.kapptemplate.appdata.xml
--- old/kapptemplate-17.12.3/src/application/org.kde.kapptemplate.appdata.xml 2018-03-05 01:44:38.000000000 +0100
+++ new/kapptemplate-18.04.0/src/application/org.kde.kapptemplate.appdata.xml 2018-03-13 03:25:56.000000000 +0100
@@ -264,7 +264,7 @@
<li xml:lang="zh-TW">特別是 KDE 開發使用的樣本(如Plasma, KOffice, KTextEditor, KRunner, Akonadi 等)</li>
<li>It is easy to create new templates using space holders and a simple CMake-command</li>
<li xml:lang="ca">És fàcil crear plantilles noves usant espais variables i una ordre CMake senzilla</li>
- <li xml:lang="ca-valencia">És fàcil crear plantilles noves usant espais variables i una orde CMake senzilla</li>
+ <li xml:lang="ca-valencia">És fàcil crear plantilles noves usant espais variables i una ordre CMake senzilla</li>
<li xml:lang="de">Neue Vorlagen können leicht mit Platzhaltern und einfachen CMake-Befehlen erstellt werden</li>
<li xml:lang="el">Είναι εύκολο να δημιουργήσετε νέα πρότυπα χρησιμοποιώντας space holders και μία απλή CMake-εντολή</li>
<li xml:lang="en-GB">It is easy to create new templates using space holders and a simple CMake-command</li>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/CMakeLists.txt new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/CMakeLists.txt
--- old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/CMakeLists.txt 2018-03-05 01:44:38.000000000 +0100
+++ new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/CMakeLists.txt 2018-03-13 03:25:56.000000000 +0100
@@ -1,9 +1,12 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0)
project(%{APPNAMELC})
-find_package(ECM 1.0.0 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+set(QT_MIN_VERSION "5.9.0")
+set(KF_MIN_VERSION "5.37.0")
+
+find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(KDEInstallDirs)
include(KDECMakeSettings)
@@ -12,11 +15,9 @@
include(ECMQtDeclareLoggingCategory)
include(FeatureSummary)
-set(QT_MIN_VERSION "5.5.0")
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets)
-set(REQUIRED_KF5_VERSION "5.37.0")
-find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED COMPONENTS
+find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS
ConfigWidgets
CoreAddons
Crash
@@ -26,8 +27,12 @@
XmlGui
)
-feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
-
add_subdirectory(doc)
add_subdirectory(src)
add_subdirectory(icons)
+
+# Make it possible to use the po files fetched by the fetch-translations step
+ki18n_install(po)
+kdoctools_install(po)
+
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}ViewBase.ui new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}ViewBase.ui
--- old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}ViewBase.ui 2018-03-05 01:44:38.000000000 +0100
+++ new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}ViewBase.ui 1970-01-01 01:00:00.000000000 +0100
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>%{APPNAMELC}ViewBase</class>
- <widget class="QWidget" name="%{APPNAMELC}ViewBase">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>315</width>
- <height>233</height>
- </rect>
- </property>
- <property name="autoFillBackground">
- <bool>true</bool>
- </property>
- <layout class="QGridLayout">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="templateLabel">
- <property name="palette">
- <palette>
- <active>
- <colorrole role="WindowText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Button">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Base">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Window">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="AlternateBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- </active>
- <inactive>
- <colorrole role="WindowText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>255</red>
- <green>255</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Button">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Base">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Window">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="AlternateBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- </inactive>
- <disabled>
- <colorrole role="WindowText">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>119</red>
- <green>119</green>
- <blue>119</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Button">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Base">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Window">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="AlternateBase">
- <brush brushstyle="SolidPattern">
- <color alpha="255">
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- </disabled>
- </palette>
- </property>
- <property name="font">
- <font>
- <family>Sans Serif</family>
- <pointsize>12</pointsize>
- </font>
- </property>
- <property name="autoFillBackground">
- <bool>true</bool>
- </property>
- <property name="text">
- <string>hello, world</string>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- <property name="alignment">
- <set>Qt::AlignCenter</set>
- </property>
- <property name="wordWrap">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.h new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.h
--- old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.h 2018-03-05 01:44:38.000000000 +0100
+++ new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.h 2018-03-13 03:25:56.000000000 +0100
@@ -21,7 +21,7 @@
#ifndef %{APPNAMEUC}VIEW_H
#define %{APPNAMEUC}VIEW_H
-#include "ui_%{APPNAMELC}ViewBase.h"
+#include "ui_%{APPNAMELC}view.h"
/**
@@ -53,7 +53,7 @@
private:
// this is the name of the root widget inside our Ui file
// you can rename it in designer and then change it here
- Ui::%{APPNAMELC}ViewBase m_ui;
+ Ui::%{APPNAME}View m_ui;
};
#endif // %{APPNAMEUC}VIEW_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.ui new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.ui
--- old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.ui 1970-01-01 01:00:00.000000000 +0100
+++ new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}view.ui 2018-03-13 03:25:56.000000000 +0100
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>%{APPNAME}View</class>
+ <widget class="QWidget" name="%{APPNAME}View">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>315</width>
+ <height>233</height>
+ </rect>
+ </property>
+ <property name="autoFillBackground">
+ <bool>true</bool>
+ </property>
+ <layout class="QGridLayout">
+ <property name="leftMargin">
+ <number>0</number>
+ </property>
+ <property name="topMargin">
+ <number>0</number>
+ </property>
+ <property name="rightMargin">
+ <number>0</number>
+ </property>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="templateLabel">
+ <property name="palette">
+ <palette>
+ <active>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>255</red>
+ <green>255</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Button">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Base">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Window">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="AlternateBase">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </active>
+ <inactive>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>255</red>
+ <green>255</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Button">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Base">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Window">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="AlternateBase">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </inactive>
+ <disabled>
+ <colorrole role="WindowText">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>119</red>
+ <green>119</green>
+ <blue>119</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Button">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Base">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="Window">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ <colorrole role="AlternateBase">
+ <brush brushstyle="SolidPattern">
+ <color alpha="255">
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ </color>
+ </brush>
+ </colorrole>
+ </disabled>
+ </palette>
+ </property>
+ <property name="font">
+ <font>
+ <family>Sans Serif</family>
+ <pointsize>12</pointsize>
+ </font>
+ </property>
+ <property name="autoFillBackground">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>hello, world</string>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignCenter</set>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}window.cpp new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}window.cpp
--- old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}window.cpp 2018-03-05 01:44:38.000000000 +0100
+++ new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}window.cpp 2018-03-13 03:25:56.000000000 +0100
@@ -72,7 +72,7 @@
KConfigDialog *dialog = new KConfigDialog(this, QStringLiteral("settings"), %{APPNAME}Settings::self());
QWidget *generalSettingsPage = new QWidget;
- settingsBase.setupUi(generalSettingsPage);
+ m_settings.setupUi(generalSettingsPage);
dialog->addPage(generalSettingsPage, i18n("General"), QStringLiteral("package_setting"));
connect(dialog, &KConfigDialog::settingsChanged, m_%{APPNAMELC}View, &%{APPNAME}View::handleSettingsChanged);
dialog->setAttribute(Qt::WA_DeleteOnClose);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}window.h new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}window.h
--- old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}window.h 2018-03-05 01:44:38.000000000 +0100
+++ new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/%{APPNAMELC}window.h 2018-03-13 03:25:56.000000000 +0100
@@ -23,7 +23,7 @@
#include <KXmlGuiWindow>
-#include "ui_settingsBase.h"
+#include "ui_settings.h"
#include "%{APPNAME}Settings.h"
class %{APPNAME}View;
@@ -64,7 +64,7 @@
private:
// this is the name of the root widget inside our Ui file
// you can rename it in designer and then change it here
- Ui::settingsBase settingsBase;
+ Ui::Settings m_settings;
QAction *m_switchAction;
%{APPNAME}View *m_%{APPNAMELC}View;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/CMakeLists.txt new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/CMakeLists.txt
--- old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/CMakeLists.txt 2018-03-05 01:44:38.000000000 +0100
+++ new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/CMakeLists.txt 2018-03-13 03:25:56.000000000 +0100
@@ -11,8 +11,8 @@
)
kconfig_add_kcfg_files(%{APPNAMELC}_SRCS %{APPNAME}Settings.kcfgc)
ki18n_wrap_ui(%{APPNAMELC}_SRCS
- %{APPNAMELC}ViewBase.ui
- settingsBase.ui
+ %{APPNAMELC}view.ui
+ settings.ui
)
add_executable(%{APPNAMELC} ${%{APPNAMELC}_SRCS})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/settings.ui new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/settings.ui
--- old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/settings.ui 1970-01-01 01:00:00.000000000 +0100
+++ new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/settings.ui 2018-03-13 03:25:56.000000000 +0100
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Settings</class>
+ <widget class="QWidget" name="Settings">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>374</width>
+ <height>200</height>
+ </rect>
+ </property>
+ <layout class="QFormLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="backgroundLabel">
+ <property name="text">
+ <string>Background color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="KColorButton" name="kcfg_colorBackground">
+ <property name="toolTip">
+ <string>Choose a new background color</string>
+ </property>
+ <property name="whatsThis">
+ <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'DejaVu Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Change the <span style=" font-weight:600;">background</span> color by clicking here and choose the new <span style=" color:#ff0000;">color</span> in the <span style=" font-style:italic;">color dialog</span>.</p></body></html></string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="foregroundLabel">
+ <property name="text">
+ <string>Foreground color:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="KColorButton" name="kcfg_colorForeground">
+ <property name="toolTip">
+ <string>Choose a new foreground color</string>
+ </property>
+ <property name="whatsThis">
+ <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
+p, li { white-space: pre-wrap; }
+</style></head><body style=" font-family:'DejaVu Serif'; font-size:9pt; font-weight:400; font-style:normal;">
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Change the <span style=" font-weight:600;">foreground</span> color by clicking here and choose the new <span style=" color:#ff0000;">color</span> in the <span style=" font-style:italic;">color dialog</span>.</p></body></html></string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="projectLabel">
+ <property name="text">
+ <string>Project age:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QSpinBox" name="kcfg_ageInDays">
+ <property name="toolTip">
+ <string>Set the project age (in days)</string>
+ </property>
+ <property name="whatsThis">
+ <string>Change the project age (in days) by choosing a new number of days.</string>
+ </property>
+ <property name="minimum">
+ <number>1</number>
+ </property>
+ <property name="value">
+ <number>2</number>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <customwidgets>
+ <customwidget>
+ <class>KColorButton</class>
+ <extends>QPushButton</extends>
+ <header>kcolorbutton.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/settingsBase.ui new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/settingsBase.ui
--- old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5/src/settingsBase.ui 2018-03-05 01:44:38.000000000 +0100
+++ new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5/src/settingsBase.ui 1970-01-01 01:00:00.000000000 +0100
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>settingsBase</class>
- <widget class="QWidget" name="settingsBase">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>374</width>
- <height>200</height>
- </rect>
- </property>
- <layout class="QFormLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="backgroundLabel">
- <property name="text">
- <string>Background color:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="KColorButton" name="kcfg_colorBackground">
- <property name="toolTip">
- <string>Choose a new background color</string>
- </property>
- <property name="whatsThis">
- <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'DejaVu Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Change the <span style=" font-weight:600;">background</span> color by clicking here and choose the new <span style=" color:#ff0000;">color</span> in the <span style=" font-style:italic;">color dialog</span>.</p></body></html></string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="foregroundLabel">
- <property name="text">
- <string>Foreground color:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="KColorButton" name="kcfg_colorForeground">
- <property name="toolTip">
- <string>Choose a new foreground color</string>
- </property>
- <property name="whatsThis">
- <string><html><head><meta name="qrichtext" content="1" /><style type="text/css">
-p, li { white-space: pre-wrap; }
-</style></head><body style=" font-family:'DejaVu Serif'; font-size:9pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Change the <span style=" font-weight:600;">foreground</span> color by clicking here and choose the new <span style=" color:#ff0000;">color</span> in the <span style=" font-style:italic;">color dialog</span>.</p></body></html></string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="projectLabel">
- <property name="text">
- <string>Project age:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QSpinBox" name="kcfg_ageInDays">
- <property name="toolTip">
- <string>Set the project age (in days)</string>
- </property>
- <property name="whatsThis">
- <string>Change the project age (in days) by choosing a new number of days.</string>
- </property>
- <property name="minimum">
- <number>1</number>
- </property>
- <property name="value">
- <number>2</number>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>KColorButton</class>
- <extends>QPushButton</extends>
- <header>kcolorbutton.h</header>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5-simple/CMakeLists.txt new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5-simple/CMakeLists.txt
--- old/kapptemplate-17.12.3/src/templates/C++/kde-frameworks5-simple/CMakeLists.txt 2018-03-05 01:44:38.000000000 +0100
+++ new/kapptemplate-18.04.0/src/templates/C++/kde-frameworks5-simple/CMakeLists.txt 2018-03-13 03:25:56.000000000 +0100
@@ -1,9 +1,12 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0)
project(%{APPNAMELC})
-find_package(ECM 1.0.0 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+set(QT_MIN_VERSION "5.9.0")
+set(KF_MIN_VERSION "5.35.0")
+
+find_package(ECM ${KF_MIN_VERSION} REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(KDEInstallDirs)
include(KDECMakeSettings)
@@ -11,16 +14,17 @@
include(ECMInstallIcons)
include(FeatureSummary)
-set(QT_MIN_VERSION "5.4.0")
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets)
-set(REQUIRED_KF5_VERSION "5.18.0")
-find_package(KF5 ${REQUIRED_KF5_VERSION} REQUIRED COMPONENTS
+find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS
CoreAddons
I18n
)
-feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
-
add_subdirectory(src)
add_subdirectory(icons)
+
+# Make it possible to use the po files fetched by the fetch-translations step
+ki18n_install(po)
+
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)