Hello community, here is the log from the commit of package kcm5-fcitx for openSUSE:Factory checked in at 2020-09-29 19:01:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcm5-fcitx (Old) and /work/SRC/openSUSE:Factory/.kcm5-fcitx.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcm5-fcitx" Tue Sep 29 19:01:31 2020 rev:12 rq:838151 version:0.5.6 Changes: -------- --- /work/SRC/openSUSE:Factory/kcm5-fcitx/kcm5-fcitx.changes 2020-02-22 19:08:31.962596953 +0100 +++ /work/SRC/openSUSE:Factory/.kcm5-fcitx.new.4249/kcm5-fcitx.changes 2020-09-29 19:01:57.673784991 +0200 @@ -1,0 +2,8 @@ +Mon Sep 28 04:27:56 UTC 2020 - Marguerite Su <[email protected]> + +- update version 0.5.6 + * [kcm] try qt5 wrapper before qt4 + * [kcm] use non neg value as role +- drop kcm5-fcitx-po.patch, no more kcm-fcitx + +------------------------------------------------------------------- Old: ---- kcm-fcitx-0.5.5.tar.xz kcm5-fcitx-po.patch New: ---- kcm-fcitx-0.5.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcm5-fcitx.spec ++++++ --- /var/tmp/diff_new_pack.X1VuM8/_old 2020-09-29 19:01:58.565786075 +0200 +++ /var/tmp/diff_new_pack.X1VuM8/_new 2020-09-29 19:01:58.565786075 +0200 @@ -18,7 +18,7 @@ %define pkgname kf5-kcm-fcitx Name: kcm5-fcitx -Version: 0.5.5 +Version: 0.5.6 Release: 0 Summary: KF5 control module for Fcitx License: GPL-2.0-or-later @@ -26,8 +26,6 @@ URL: http://github.com/fcitx/kcm-fcitx Source: http://download.fcitx-im.org/kcm-fcitx/kcm-fcitx-%{version}.tar.xz Source1: input-keyboard.svg -#PATCH-FIX-OPENSUSE rename po to kcm5_fcitx to avoid conflict w/ kcm_fcitx -Patch0: %{name}-po.patch BuildRequires: cmake BuildRequires: extra-cmake-modules BuildRequires: fcitx-devel @@ -94,7 +92,6 @@ %prep %setup -q -n kcm-fcitx-%{version} -%patch0 -p1 %build %cmake_kf5 -d build @@ -111,20 +108,19 @@ rsvg-convert -h $i -w $i %{SOURCE1} -o %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/devices/input-keyboard.png done -%find_lang kcm5_fcitx +%find_lang kcm_fcitx %{kf5_post_install} %post -n %{pkgname} -p /sbin/ldconfig %postun -n %{pkgname} -p /sbin/ldconfig -%files -n %{pkgname} -f kcm5_fcitx.lang +%files -n %{pkgname} -f kcm_fcitx.lang %defattr(-,root,root,-) -%config %{_sysconfdir}/xdg/fcitx-skin.knsrc %{_bindir}/kbd-layout-viewer %{_libdir}/qt5/plugins/kcm_fcitx.so %{_datadir}/kservices5/kcm_fcitx.desktop -%{_datadir}/kservices5/kbd-layout-viewer.desktop +%{_datadir}/applications/kbd-layout-viewer.desktop %files -n %{pkgname}-icons %defattr(-,root,root,-) ++++++ kcm-fcitx-0.5.5.tar.xz -> kcm-fcitx-0.5.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/CMakeLists.txt new/kcm-fcitx-0.5.6/CMakeLists.txt --- old/kcm-fcitx-0.5.5/CMakeLists.txt 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/CMakeLists.txt 2020-06-01 23:50:20.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.3 FATAL_ERROR) project(kcm-fcitx) -set(QT_MIN_VERSION "5.3.0") +set(QT_MIN_VERSION "5.11.0") 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) include(KDEInstallDirs) @@ -12,14 +12,13 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui Widgets X11Extras) -find_package(KF5 REQUIRED COMPONENTS +find_package(KF5 5.64 REQUIRED COMPONENTS CoreAddons WidgetsAddons ConfigWidgets ItemViews I18n KIO - NewStuff ) find_package(FcitxQt5DBusAddons 1.1.0 REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/layout/CMakeLists.txt new/kcm-fcitx-0.5.6/layout/CMakeLists.txt --- old/kcm-fcitx-0.5.5/layout/CMakeLists.txt 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/layout/CMakeLists.txt 2020-06-01 23:50:20.000000000 +0200 @@ -19,4 +19,4 @@ kbd-layout-viewer.desktop.in "${CMAKE_CURRENT_BINARY_DIR}/kbd-layout-viewer.desktop") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kbd-layout-viewer.desktop" - DESTINATION ${CMAKE_INSTALL_KSERVICES5DIR}) + DESTINATION ${CMAKE_INSTALL_APPDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/layout/keyboardlayoutwidget.cpp new/kcm-fcitx-0.5.6/layout/keyboardlayoutwidget.cpp --- old/kcm-fcitx-0.5.5/layout/keyboardlayoutwidget.cpp 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/layout/keyboardlayoutwidget.cpp 2020-06-01 23:50:20.000000000 +0200 @@ -480,7 +480,7 @@ } } - qSort(keyboardItems.begin(), keyboardItems.end(), DrawingItemCompare()); + std::sort(keyboardItems.begin(), keyboardItems.end(), DrawingItemCompare()); } void KeyboardLayoutWidget::initColors() @@ -1168,14 +1168,14 @@ if (syms[BOTTOMLEFT] == syms[BOTTOMRIGHT] || syms[BOTTOMRIGHT].isNull()) { - syms[BOTTOMRIGHT] = QString::null; + syms[BOTTOMRIGHT] = QString(); end[BOTTOMLEFT] = BOTTOMRIGHT; end[BOTTOMRIGHT] = -1; } if (syms[TOPLEFT] == syms[TOPRIGHT] || syms[TOPRIGHT].isNull()) { - syms[TOPRIGHT] = QString::null; + syms[TOPRIGHT] = QString(); end[TOPLEFT] = TOPRIGHT; end[TOPRIGHT] = -1; } @@ -1184,13 +1184,13 @@ syms[TOPLEFT].isNull()) && ((end[BOTTOMLEFT] == BOTTOMLEFT && end[TOPLEFT] == TOPLEFT) || (end[BOTTOMLEFT] == BOTTOMRIGHT && end[TOPLEFT] == TOPRIGHT))) { - syms[TOPLEFT] = QString::null; + syms[TOPLEFT] = QString(); end[BOTTOMLEFT] = end[TOPLEFT]; end[TOPLEFT] = -1; } if (!syms[BOTTOMRIGHT].isNull() && (syms[BOTTOMRIGHT] == syms[TOPRIGHT] || (syms[TOPRIGHT].isNull() && end[TOPRIGHT] != -1))) { - syms[TOPRIGHT] = QString::null; + syms[TOPRIGHT] = QString(); end[BOTTOMRIGHT] = TOPRIGHT; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/layout/keyboardlayoutwidget.h new/kcm-fcitx-0.5.6/layout/keyboardlayoutwidget.h --- old/kcm-fcitx-0.5.5/layout/keyboardlayoutwidget.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/layout/keyboardlayoutwidget.h 2020-06-01 23:50:20.000000000 +0200 @@ -3,6 +3,7 @@ #ifndef KEYBOARDLAYOUTWIDGET_H #define KEYBOARDLAYOUTWIDGET_H +#include <QPainterPath> #include <QWidget> #include <QMap> #include <QAbstractNativeEventFilter> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/CMakeLists.txt new/kcm-fcitx-0.5.6/po/CMakeLists.txt --- old/kcm-fcitx-0.5.5/po/CMakeLists.txt 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/CMakeLists.txt 2020-06-01 23:50:20.000000000 +0200 @@ -1,5 +1,7 @@ -set(PO_LANGS de zh_CN zh_TW ja vi) -foreach(lang ${PO_LANGS}) - fcitx_translate_add_po_file("${lang}" "${lang}.po") +file(GLOB PO_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *.po) + +foreach(po_file ${PO_FILES}) + string(REPLACE ".po" "" po_lang "${po_file}") + fcitx_translate_add_po_file("${po_lang}" "${po_file}") endforeach() fcitx_translate_set_pot_target(pot kcm_fcitx kcm_fcitx.pot) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/ca.po new/kcm-fcitx-0.5.6/po/ca.po --- old/kcm-fcitx-0.5.5/po/ca.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/ca.po 2020-06-01 23:50:20.000000000 +0200 @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: +# Robert Antoni Buj Gelonch <[email protected]>, 2017 # Walter Garcia-Fontes <[email protected]>, 2017 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2017-06-09 08:49-0700\n" -"PO-Revision-Date: 2017-07-13 06:44+0000\n" -"Last-Translator: Walter Garcia-Fontes <[email protected]>\n" +"PO-Revision-Date: 2017-12-20 05:52+0000\n" +"Last-Translator: Robert Antoni Buj Gelonch <[email protected]>\n" "Language-Team: Catalan (http://www.transifex.com/fcitx/fcitx/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -71,17 +72,17 @@ #: src/configwidget.cpp:450 #, kde-format msgid "<b>Other</b>" -msgstr "<b>Altre</b>" +msgstr "<b>Altres</b>" #: src/configwidget.cpp:560 src/impage.cpp:69 #, kde-format msgid "Other" -msgstr "Altre" +msgstr "Altres" #: src/erroroverlay.cpp:43 #, kde-format msgid "Cannot connect to Fcitx by DBus, is Fcitx running?" -msgstr "No es pot connectar al fcitx per DBus, s'està executant el fcitx?" +msgstr "No es pot connectar a fcitx amb DBus, està fcitx en execució?" #: src/imconfigdialog.cpp:42 #, kde-format @@ -127,17 +128,17 @@ #: src/module.cpp:83 #, kde-format msgid "Fcitx Configuration Module" -msgstr "Mòdul de configuració del fcitx" +msgstr "Mòdul de configuració de fcitx" #: src/module.cpp:85 #, kde-format msgid "Configure Fcitx" -msgstr "Configura el fcitx" +msgstr "Configura fcitx" #: src/module.cpp:87 #, kde-format msgid "Copyright 2012 Xuetian Weng" -msgstr "Copyright 2012 Xuetian Weng" +msgstr "Drets d'autor (c) 2012 Xuetian Weng" #: src/module.cpp:91 #, kde-format @@ -182,7 +183,7 @@ #: src/skinpage.cpp:221 #, kde-format msgid "Other candidate" -msgstr "Una altra candidata" +msgstr "Altres candidats" #: src/skinpage.cpp:390 #, kde-format @@ -219,7 +220,7 @@ #: src/uipage.cpp:16 #, kde-format msgid "Cannot load currently used user interface info" -msgstr "No es pot carregar la informació d'interfície d'usuari usada actualment" +msgstr "No es pot carregar la informació de la interfície d'usuari utilitzada actualment" #: src/uipage.cpp:45 #, kde-format @@ -259,17 +260,17 @@ "Options listed here might be overridden by specific input method, usually " "including candidate number, hotkey of previous page and next page. You may " "need go to configuration of corresponding input method to change them." -msgstr "Les opcions que es llisten aquí poden ser anul·lades per mètodes d'entrada específics, generalment incloent-hi el nombre de candidates, la drecera de teclat de pàgina prèvia i pàgina següent. Potser heu d'anar a la configuració del mètode d'entrada corresponent per canviar-les." +msgstr "Les opcions que es llisten aquí poden ser anul·lades per mètodes d'entrada específics, generalment incloent-hi el nombre de candidates, la drecera de teclat Re Pàg i Av Pàg. Potser heu d'anar a la configuració del mètode d'entrada corresponent per canviar-les." #. i18n: file: src/fontbutton.ui:51 #. i18n: ectx: property (text), widget (QPushButton, fontSelectButton) msgid "Select &Font..." -msgstr "Seleccioneu el &tipus de lletra" +msgstr "Selecciona la &lletra..." #. i18n: file: src/impage.ui:38 #. i18n: ectx: property (toolTip), widget (QPushButton, defaultLayoutButton) msgid "Keyboard layout to use when no input method active" -msgstr "Disposició de teclat a usar quan no hi ha cap mètode d'entrada actiu" +msgstr "Disposició de teclat que s'ha d'utilitzar quan no hi ha cap mètode d'entrada actiu" #. i18n: file: src/impage.ui:41 #. i18n: ectx: property (text), widget (QPushButton, defaultLayoutButton) @@ -333,7 +334,7 @@ "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Notice:</span></p>\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">You need to use Classic UI to use skin function.</p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\";>\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Notice:</span></p>\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">He d'usar la interfície d'usuari clàssica per usar la funció d'aparença.</p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\";>\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Avís:</span></p>\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Heu d'utilitzar la interfície d'usuari clàssica per utilitzar la funció de l'aparença.</p></body></html>" msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/da.po new/kcm-fcitx-0.5.6/po/da.po --- old/kcm-fcitx-0.5.5/po/da.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/da.po 2020-06-01 23:50:20.000000000 +0200 @@ -3,13 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# scootergrisen, 2017 +# scootergrisen, 2017,2019 +# scootergrisen, 2017,2019-2020 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2017-06-09 08:49-0700\n" -"PO-Revision-Date: 2017-09-03 14:18+0000\n" +"PO-Revision-Date: 2020-04-04 07:42+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/fcitx/fcitx/language/da/)\n" "MIME-Version: 1.0\n" @@ -81,7 +82,7 @@ #: src/erroroverlay.cpp:43 #, kde-format msgid "Cannot connect to Fcitx by DBus, is Fcitx running?" -msgstr "Kan ikke oprette forbindelse til Fcitx med DBus. Kører Fcitx?" +msgstr "Kan ikke oprette forbindelse til Fcitx med DBus - kører Fcitx?" #: src/imconfigdialog.cpp:42 #, kde-format @@ -167,7 +168,7 @@ #: src/module.cpp:129 #, kde-format msgid "Addon Config" -msgstr "Tilføjelse-konfiguration" +msgstr "Tilføjelseskonfiguration" #: src/module.cpp:178 #, kde-format @@ -194,7 +195,7 @@ msgid "" "User config doesn't exisits, do you want to open system file or copy system " "file to user file?" -msgstr "Brugerkonfigurationen findes ikke. Vil du åbne systemfilen eller kopiere systemfilen til brugerfilen?" +msgstr "Brugerkonfigurationen findes ikke - vil du åbne systemfilen eller kopiere systemfilen til brugerfilen?" #: src/subconfigwidget.cpp:231 #, kde-format @@ -204,7 +205,7 @@ #: src/subconfigwidget.cpp:232 #, kde-format msgid "Copy" -msgstr "Kopi" +msgstr "Kopiér" #: src/subconfigwidget.cpp:233 #, kde-format @@ -219,7 +220,7 @@ #: src/uipage.cpp:16 #, kde-format msgid "Cannot load currently used user interface info" -msgstr "Kan ikke indlæse nuværende brugte brugerfladeinfo" +msgstr "Kan ikke indlæse information om brugergrænseflade som bruges i øjeblikket" #: src/uipage.cpp:45 #, kde-format @@ -264,7 +265,7 @@ #. i18n: file: src/fontbutton.ui:51 #. i18n: ectx: property (text), widget (QPushButton, fontSelectButton) msgid "Select &Font..." -msgstr "Vælg &skrifttype..." +msgstr "Vælg &skrifttype ..." #. i18n: file: src/impage.ui:38 #. i18n: ectx: property (toolTip), widget (QPushButton, defaultLayoutButton) @@ -322,7 +323,7 @@ #. i18n: file: src/skinpage.ui:58 #. i18n: ectx: property (text), widget (QPushButton, installSkinButton) msgid "Get New &Skin..." -msgstr "Hent nyt &skin..." +msgstr "Hent nyt &skin ..." #. i18n: file: src/skinpage.ui:72 #. i18n: ectx: property (text), widget (QLabel, label) @@ -333,7 +334,7 @@ "</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Notice:</span></p>\n" "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">You need to use Classic UI to use skin function.</p></body></html>" -msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\";>\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Notice:</span></p>\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Du skal bruge klassisk brugerflade for at bruge skin-funktion.</p></body></html>" +msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\";>\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Bemærk:</span></p>\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Du skal bruge klassisk brugerflade for at bruge skin-funktion.</p></body></html>" msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/de.po new/kcm-fcitx-0.5.6/po/de.po --- old/kcm-fcitx-0.5.5/po/de.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/de.po 2020-06-01 23:50:20.000000000 +0200 @@ -5,15 +5,15 @@ # Translators: # csslayer <[email protected]>, 2014 # mar well <[email protected]>, 2012-2013 -# mar well <[email protected]>, 2014,2017 +# mar well <[email protected]>, 2014,2017-2018 # csslayer <[email protected]>, 2014 # csslayer <[email protected]>, 2014 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2017-07-28 04:02-0700\n" -"PO-Revision-Date: 2017-07-28 10:58+0000\n" +"POT-Creation-Date: 2020-01-13 00:01-0800\n" +"PO-Revision-Date: 2018-06-25 23:36+0000\n" "Last-Translator: mar well <[email protected]>\n" "Language-Team: German (http://www.transifex.com/fcitx/fcitx/language/de/)\n" "Language: de\n" @@ -258,10 +258,11 @@ "including candidate number, hotkey of previous page and next page. You may " "need go to configuration of corresponding input method to change them." msgstr "" -"Die aufgelisteten Optionen werden möglicherweise wegen Einstellungen der " -"gewählten Eingabemethode außer Kraft gesetzt, wie Anzahl der Kandidaten, " -"Tasten für vorherige oder nächste Kandidaten. Diese Einstellungen müssen " -"möglicherweise in den Einstellungen der Eingabemethode festgelegt werden." +"Die aufgelisteten Optionen - z.B. Anzahl der Kandidaten, Tasten für " +"vorherige oder nächste Kandidaten - werden möglicherweise wegen " +"Einstellungen der gewählten Eingabemethode außer Kraft gesetzt. Diese " +"Einstellungen müssen dann in den Einstellungen der Eingabemethode festgelegt " +"werden." #: src/configwidget.cpp:560 src/impage.cpp:69 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/ja.po new/kcm-fcitx-0.5.6/po/ja.po --- old/kcm-fcitx-0.5.5/po/ja.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/ja.po 2020-06-01 23:50:20.000000000 +0200 @@ -5,15 +5,16 @@ # Translators: # しろう <>, 2013 # csslayer <[email protected]>, 2014 +# あわしろいくや <[email protected]>, 2017 # csslayer <[email protected]>, 2014 # csslayer <[email protected]>, 2014 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2017-06-09 11:02-0700\n" -"PO-Revision-Date: 2017-06-09 17:50+0000\n" -"Last-Translator: csslayer <[email protected]>\n" +"POT-Creation-Date: 2020-01-13 00:01-0800\n" +"PO-Revision-Date: 2017-10-28 08:07+0000\n" +"Last-Translator: あわしろいくや <[email protected]>\n" "Language-Team: Japanese (http://www.transifex.com/fcitx/fcitx/language/ja/)\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -25,7 +26,7 @@ #, kde-format msgctxt "%1 is language name, %2 is country name" msgid "%1 (%2)" -msgstr "" +msgstr "%1 (%2)" #. i18n: file: src/skinpage.ui:41 #. i18n: ectx: property (text), widget (QPushButton, configureSkinButton) @@ -111,7 +112,7 @@ #: src/module.cpp:91 #, kde-format msgid "Author" -msgstr "" +msgstr "作者" #. i18n: file: src/impage.ui:83 #. i18n: ectx: property (text), widget (QLabel, label) @@ -202,7 +203,7 @@ #: layout/main.cpp:44 #, kde-format msgid "Keyboard <layout>" -msgstr "" +msgstr "キーボード <layout>" #: layout/main.cpp:74 #, kde-format @@ -212,12 +213,12 @@ #: layout/main.cpp:41 #, kde-format msgid "Keyboard layout <group> (0-3)" -msgstr "" +msgstr "キーボードレイアウト <group> (0-3)" #: layout/main.cpp:47 #, kde-format msgid "Keyboard layout <variant>" -msgstr "" +msgstr "キーボードレイアウト <variant>" #. i18n: file: src/impage.ui:38 #. i18n: ectx: property (toolTip), widget (QPushButton, defaultLayoutButton) @@ -349,7 +350,7 @@ #: layout/main.cpp:42 #, kde-format msgid "group" -msgstr "" +msgstr "グループ" #: src/kcm_fcitx.desktop.in:14 msgid "keyboard,input,im,fcitx" @@ -362,7 +363,7 @@ #: layout/main.cpp:45 #, kde-format msgid "layout" -msgstr "" +msgstr "レイアウト" #: layout/main.cpp:48 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/ko.po new/kcm-fcitx-0.5.6/po/ko.po --- old/kcm-fcitx-0.5.5/po/ko.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/ko.po 2020-06-01 23:50:20.000000000 +0200 @@ -4,13 +4,14 @@ # # Translators: # Bon Keun Seo <[email protected]>, 2017 +# MarongHappy <[email protected]>, 2020 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2017-06-09 08:49-0700\n" -"PO-Revision-Date: 2017-07-15 12:42+0000\n" -"Last-Translator: Bon Keun Seo <[email protected]>\n" +"PO-Revision-Date: 2020-03-24 16:55+0000\n" +"Last-Translator: MarongHappy <[email protected]>\n" "Language-Team: Korean (http://www.transifex.com/fcitx/fcitx/language/ko/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,12 +22,12 @@ #: layout/main.cpp:37 #, kde-format msgid "A general keyboard layout viewer" -msgstr "일반 키보드 배열 보이기" +msgstr "일반 키보드 자판 보기도구" #: layout/main.cpp:41 #, kde-format msgid "Keyboard layout <group> (0-3)" -msgstr "키보드 배열 <그룹> (0-3)" +msgstr "키보드 자판 <그룹> (0-3)" #: layout/main.cpp:42 #, kde-format @@ -36,17 +37,17 @@ #: layout/main.cpp:44 #, kde-format msgid "Keyboard <layout>" -msgstr "키보드 <배열>" +msgstr "키보드 <자판>" #: layout/main.cpp:45 #, kde-format msgid "layout" -msgstr "배열" +msgstr "자판" #: layout/main.cpp:47 #, kde-format msgid "Keyboard layout <variant>" -msgstr "키보드 배열 <변형>" +msgstr "키보드 자판 <변형>" #: layout/main.cpp:48 #, kde-format @@ -56,7 +57,7 @@ #: layout/main.cpp:74 #, kde-format msgid "Keyboard Layout viewer" -msgstr "키보드 배열 보이기" +msgstr "키보드 자판 보기도구" #: src/addonselector.cpp:375 #, kde-format @@ -66,7 +67,7 @@ #: src/addonselector.cpp:382 src/configwidget.cpp:606 #, kde-format msgid "Show &Advance option" -msgstr "추가 설정 보이기(&A)" +msgstr "고급 옵션 표시(&A)" #: src/configwidget.cpp:450 #, kde-format @@ -86,7 +87,7 @@ #: src/imconfigdialog.cpp:42 #, kde-format msgid "<b>Keyboard Layout:</b>" -msgstr "<b>키보드 배열:</b>" +msgstr "<b>키보드 자판:</b>" #: src/imconfigdialog.cpp:47 #, kde-format @@ -127,7 +128,7 @@ #: src/module.cpp:83 #, kde-format msgid "Fcitx Configuration Module" -msgstr "Fcitx 설정 모듈" +msgstr "Fcitx 환경설정 모듈" #: src/module.cpp:85 #, kde-format @@ -209,7 +210,7 @@ #: src/subconfigwidget.cpp:233 #, kde-format msgid "View system" -msgstr "시스템 파일 보기" +msgstr "시스템 보기" #: src/subconfigwidget.cpp:245 #, kde-format @@ -224,15 +225,15 @@ #: src/uipage.cpp:45 #, kde-format msgid "No configuration options for %1." -msgstr "%1 에 대한 설정이 없음" +msgstr "%1 에 대한 환경설정이 없음" #: layout/kbd-layout-viewer.desktop.in:6 msgid "Keyboard layout viewer" -msgstr "키보드 배열 표시기" +msgstr "키보드 자판 보기도구" #: layout/kbd-layout-viewer.desktop.in:7 msgid "View keyboard layout" -msgstr "키보드 배열 보이기" +msgstr "키보드 자판 보기" #: layout/kbd-layout-viewer.desktop.in:9 msgid "keyboard;input;im" @@ -259,7 +260,7 @@ "Options listed here might be overridden by specific input method, usually " "including candidate number, hotkey of previous page and next page. You may " "need go to configuration of corresponding input method to change them." -msgstr "표시된 옵션은 입력기에 의해 덮어씌워질 수 있습니다. 대체로 후보 개수, 이전 혹은 다음 페이지의 단축기 등이 해당됩니다. 그냥 당연한 거 같아요.해당 입력기의 설정 페이지에서 변경 가능합니다." +msgstr "표시된 옵션은 입력기에 의해 덮어씌워질 수 있습니다. 대체로 후보 개수, 이전 혹은 다음 페이지의 단축기 등이 해당됩니다. 그냥 당연한 거 같아요.해당 입력기의 환경설정 페이지에서 변경 가능합니다." #. i18n: file: src/fontbutton.ui:51 #. i18n: ectx: property (text), widget (QPushButton, fontSelectButton) @@ -269,12 +270,12 @@ #. i18n: file: src/impage.ui:38 #. i18n: ectx: property (toolTip), widget (QPushButton, defaultLayoutButton) msgid "Keyboard layout to use when no input method active" -msgstr "활성 입력기가 없을 때 사용할 키보드 배열" +msgstr "활성 입력기가 없을 때 사용할 키보드 자판" #. i18n: file: src/impage.ui:41 #. i18n: ectx: property (text), widget (QPushButton, defaultLayoutButton) msgid "Select default keyboard layout" -msgstr "기본 키보드 배열 선택" +msgstr "기본 키보드 자판 선택" #. i18n: file: src/impage.ui:83 #. i18n: ectx: property (text), widget (QLabel, label) @@ -285,7 +286,7 @@ #. i18n: ectx: property (text), widget (QCheckBox, #. onlyCurrentLanguageCheckBox) msgid "Only &Show Current Language" -msgstr "현재 언어만 보이기(&S)" +msgstr "현재 언어만 표시(&S)" #. i18n: file: src/impage.ui:176 #. i18n: ectx: property (text), widget (QLabel, label_2) @@ -297,12 +298,12 @@ msgid "" "The first input method will be inactive state. Usually you need to put " "<b>Keyboard</b> or <b>Keyboard - <i>layout name</i></b> in the first place." -msgstr "첫 입력 방법이 비활성화 상태입니다. 대체로 <b>키보드</b> 또는 <b>키보드 - <i> 배열명 </i> </b>를 첫 항목으로 하여야 합니다." +msgstr "첫번째 입력기가 비활성화 상태입니다. 대체로 <b>키보드</b> 또는 <b>키보드 - <i> 자판명 </i> </b>을 첫 항목으로 하여야 합니다." #. i18n: file: src/impage.ui:292 #. i18n: ectx: property (text), widget (QLabel, label_3) msgid "<b>Default keyboard layout:</b>" -msgstr "<b>기본 키보드 배열:</b>" +msgstr "<b>기본 키보드 자판:</b>" #. i18n: file: src/impage.ui:302 #. i18n: ectx: property (text), widget (QLabel, label_4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/ru.po new/kcm-fcitx-0.5.6/po/ru.po --- old/kcm-fcitx-0.5.5/po/ru.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/ru.po 2020-06-01 23:50:20.000000000 +0200 @@ -4,14 +4,14 @@ # # Translators: # TotalCaesar659 <[email protected]>, 2016 -# TotalCaesar659 <[email protected]>, 2016 +# TotalCaesar659 <[email protected]>, 2016-2017 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2017-06-09 08:49-0700\n" -"PO-Revision-Date: 2017-06-09 17:50+0000\n" -"Last-Translator: csslayer <[email protected]>\n" +"PO-Revision-Date: 2017-10-05 14:02+0000\n" +"Last-Translator: TotalCaesar659 <[email protected]>\n" "Language-Team: Russian (http://www.transifex.com/fcitx/fcitx/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,32 +27,32 @@ #: layout/main.cpp:41 #, kde-format msgid "Keyboard layout <group> (0-3)" -msgstr "" +msgstr "Раскладка клавиатуры <group> (0-3)" #: layout/main.cpp:42 #, kde-format msgid "group" -msgstr "" +msgstr "группа" #: layout/main.cpp:44 #, kde-format msgid "Keyboard <layout>" -msgstr "" +msgstr "Клавиатура <layout>" #: layout/main.cpp:45 #, kde-format msgid "layout" -msgstr "" +msgstr "раскладка" #: layout/main.cpp:47 #, kde-format msgid "Keyboard layout <variant>" -msgstr "" +msgstr "Раскладка клавиатуры <variant>" #: layout/main.cpp:48 #, kde-format msgid "variant" -msgstr "" +msgstr "вариант" #: layout/main.cpp:74 #, kde-format @@ -118,7 +118,7 @@ #, kde-format msgctxt "%1 is language name, %2 is country name" msgid "%1 (%2)" -msgstr "" +msgstr "%1 (%2)" #: src/impage.cpp:481 #, kde-format @@ -148,7 +148,7 @@ #: src/module.cpp:91 #, kde-format msgid "Author" -msgstr "" +msgstr "Автор" #: src/module.cpp:104 src/kcm_fcitx.desktop.in:11 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/tr.po new/kcm-fcitx-0.5.6/po/tr.po --- old/kcm-fcitx-0.5.5/po/tr.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/tr.po 2020-06-01 23:50:20.000000000 +0200 @@ -4,7 +4,8 @@ # # Translators: # しろう <>, 2013 -# csslayer <[email protected]>, 2014 +# abc Def <[email protected]>, 2020 +# csslayer <[email protected]>, 2014,2017 # Gökhan Kalayci <[email protected]>, 2017 # csslayer <[email protected]>, 2017 msgid "" @@ -12,8 +13,8 @@ "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2017-06-09 08:49-0700\n" -"PO-Revision-Date: 2017-06-09 18:01+0000\n" -"Last-Translator: csslayer <[email protected]>\n" +"PO-Revision-Date: 2020-05-09 22:00+0000\n" +"Last-Translator: abc Def <[email protected]>\n" "Language-Team: Turkish (http://www.transifex.com/fcitx/fcitx/language/tr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -59,12 +60,12 @@ #: layout/main.cpp:74 #, kde-format msgid "Keyboard Layout viewer" -msgstr "" +msgstr "Klavye Serilimi görüntüleyici" #: src/addonselector.cpp:375 #, kde-format msgid "Search Addons" -msgstr "" +msgstr "Eklentileri Ara" #: src/addonselector.cpp:382 src/configwidget.cpp:606 #, kde-format @@ -150,7 +151,7 @@ #: src/module.cpp:91 #, kde-format msgid "Author" -msgstr "" +msgstr "Yazar" #: src/module.cpp:104 src/kcm_fcitx.desktop.in:11 #, kde-format @@ -235,7 +236,7 @@ #: layout/kbd-layout-viewer.desktop.in:7 msgid "View keyboard layout" -msgstr "" +msgstr "Klavye serilimini görüntüler" #: layout/kbd-layout-viewer.desktop.in:9 msgid "keyboard;input;im" @@ -243,7 +244,7 @@ #: src/kcm_fcitx.desktop.in:12 msgid "Configure Input Method" -msgstr "" +msgstr "Giriş Yöntemini Yapılandır" #: src/kcm_fcitx.desktop.in:14 msgid "keyboard,input,im,fcitx" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/vi.po new/kcm-fcitx-0.5.6/po/vi.po --- old/kcm-fcitx-0.5.5/po/vi.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/vi.po 2020-06-01 23:50:20.000000000 +0200 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2017-06-09 11:02-0700\n" -"PO-Revision-Date: 2017-06-09 17:51+0000\n" +"POT-Creation-Date: 2020-01-13 00:01-0800\n" +"PO-Revision-Date: 2017-09-19 12:28+0000\n" "Last-Translator: csslayer <[email protected]>\n" "Language-Team: Vietnamese (http://www.transifex.com/fcitx/fcitx/language/"; "vi/)\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/zh_CN.po new/kcm-fcitx-0.5.6/po/zh_CN.po --- old/kcm-fcitx-0.5.5/po/zh_CN.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/zh_CN.po 2020-06-01 23:50:20.000000000 +0200 @@ -4,7 +4,7 @@ # # Translators: # Christopher Meng <[email protected]>, 2012 -# csslayer <[email protected]>, 2011,2014 +# csslayer <[email protected]>, 2011,2014,2017 # marguerite su <[email protected]>, 2014 # Ukyoi <[email protected]>, 2011 # csslayer <[email protected]>, 2014,2017 @@ -18,8 +18,8 @@ msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2017-06-09 11:13-0700\n" -"PO-Revision-Date: 2017-06-09 18:04+0000\n" +"POT-Creation-Date: 2020-01-13 00:01-0800\n" +"PO-Revision-Date: 2017-09-19 10:47+0000\n" "Last-Translator: csslayer <[email protected]>\n" "Language-Team: Chinese (China) (http://www.transifex.com/fcitx/fcitx/"; "language/zh_CN/)\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/po/zh_TW.po new/kcm-fcitx-0.5.6/po/zh_TW.po --- old/kcm-fcitx-0.5.5/po/zh_TW.po 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/po/zh_TW.po 2020-06-01 23:50:20.000000000 +0200 @@ -8,16 +8,17 @@ # csslayer <[email protected]>, 2014 # PHLin <[email protected]>, 2017 # Gerald Du <[email protected]>, 2015 -# Jeff Huang <[email protected]>, 2015 +# 黃柏諺 <[email protected]>, 2015,2017 +# PHLin <[email protected]>, 2017 # csslayer <[email protected]>, 2014 # csslayer <[email protected]>, 2012-2013 msgid "" msgstr "" "Project-Id-Version: fcitx\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2017-07-12 10:02-0700\n" -"PO-Revision-Date: 2017-07-12 16:38+0000\n" -"Last-Translator: PHLin <[email protected]>\n" +"POT-Creation-Date: 2020-01-13 00:01-0800\n" +"PO-Revision-Date: 2017-11-24 13:52+0000\n" +"Last-Translator: 黃柏諺 <[email protected]>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/fcitx/fcitx/"; "language/zh_TW/)\n" "Language: zh_TW\n" @@ -207,7 +208,7 @@ #: layout/main.cpp:44 #, kde-format msgid "Keyboard <layout>" -msgstr "" +msgstr "鍵盤 <layout>" #: layout/main.cpp:74 #, kde-format @@ -355,7 +356,7 @@ #: layout/main.cpp:42 #, kde-format msgid "group" -msgstr "" +msgstr "群組" #: src/kcm_fcitx.desktop.in:14 msgid "keyboard,input,im,fcitx" @@ -373,4 +374,4 @@ #: layout/main.cpp:48 #, kde-format msgid "variant" -msgstr "" +msgstr "變體" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/CMakeLists.txt new/kcm-fcitx-0.5.6/src/CMakeLists.txt --- old/kcm-fcitx-0.5.5/src/CMakeLists.txt 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/CMakeLists.txt 2020-06-01 23:50:20.000000000 +0200 @@ -40,7 +40,6 @@ KF5::I18n KF5::KIOCore KF5::KIOWidgets - KF5::NewStuff FcitxQt5::WidgetsAddons FcitxQt5::DBusAddons ${FCITX4_FCITX_UTILS_LIBRARIES} @@ -57,10 +56,6 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kcm_fcitx.desktop" DESTINATION ${CMAKE_INSTALL_KSERVICES5DIR}) -message("GHNS DIR : ${CONFIG_INSTALL_DIR}") - -install(FILES fcitx-skin.knsrc DESTINATION ${CONFIG_INSTALL_DIR}) - if(ENABLE_TEST) add_subdirectory(test) endif(ENABLE_TEST) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/addonselector.cpp new/kcm-fcitx-0.5.6/src/addonselector.cpp --- old/kcm-fcitx-0.5.5/src/addonselector.cpp 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/addonselector.cpp 2020-06-01 23:50:20.000000000 +0200 @@ -272,7 +272,7 @@ QFont font = titleFont(option.font); QFontMetrics fmTitle(font); - return QSize(fmTitle.width(index.model()->data(index, Qt::DisplayRole).toString()) + + return QSize(fmTitle.horizontalAdvance(index.model()->data(index, Qt::DisplayRole).toString()) + 0 + MARGIN * i + pushButton->sizeHint().width() * j, fmTitle.height() + option.fontMetrics.height() + MARGIN * 2); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/addonselector_p.h new/kcm-fcitx-0.5.6/src/addonselector_p.h --- old/kcm-fcitx-0.5.5/src/addonselector_p.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/addonselector_p.h 2020-06-01 23:50:20.000000000 +0200 @@ -87,10 +87,10 @@ AddonModel(AddonSelector::Private *addonSelector_d, QObject* parent = 0); virtual ~AddonModel(); - virtual QModelIndex index(int row, int column = 0, const QModelIndex& parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; - virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole); - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; + QModelIndex index(int row, int column = 0, const QModelIndex& parent = QModelIndex()) const override; + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; void addAddon(FcitxAddon* addon); private: @@ -108,8 +108,8 @@ virtual ~ProxyModel(); protected: - virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const; - virtual bool subSortLessThan(const QModelIndex& left, const QModelIndex& right) const; + bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const override; + bool subSortLessThan(const QModelIndex& left, const QModelIndex& right) const override; private: AddonSelector::Private* addonSelector_d; @@ -124,16 +124,16 @@ AddonDelegate(AddonSelector::Private *addonSelector_d, QObject* parent = 0); virtual ~AddonDelegate(); - virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const; - virtual QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const; + void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override; + QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override; Q_SIGNALS: void changed(bool hasChanged); void configCommitted(const QByteArray& addonName); protected: - virtual QList< QWidget* > createItemWidgets(const QModelIndex &index) const; - virtual void updateItemWidgets(const QList< QWidget* > widgets, const QStyleOptionViewItem& option, const QPersistentModelIndex& index) const; + QList< QWidget* > createItemWidgets(const QModelIndex &index) const override; + void updateItemWidgets(const QList< QWidget* > widgets, const QStyleOptionViewItem& option, const QPersistentModelIndex& index) const override; private Q_SLOTS: void slotStateChanged(bool state); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/erroroverlay.h new/kcm-fcitx-0.5.6/src/erroroverlay.h --- old/kcm-fcitx-0.5.5/src/erroroverlay.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/erroroverlay.h 2020-06-01 23:50:20.000000000 +0200 @@ -32,7 +32,7 @@ void onConnectStatusChanged(bool connected); protected: - bool eventFilter(QObject *object, QEvent *event); + bool eventFilter(QObject *object, QEvent *event) override; private: void reposition(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/impage.cpp new/kcm-fcitx-0.5.6/src/impage.cpp --- old/kcm-fcitx-0.5.5/src/impage.cpp 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/impage.cpp 2020-06-01 23:50:20.000000000 +0200 @@ -633,7 +633,7 @@ for (int i = 0; i < m_list.size(); i ++) { if (uniqueName == m_list[i].uniqueName()) { m_list[i].setEnabled(true); - qStableSort(m_list.begin(), m_list.end()); + std::stable_sort(m_list.begin(), m_list.end()); emit updateIMList(m_list, uniqueName); emit changed(); break; @@ -649,7 +649,7 @@ for (int i = 0; i < m_list.size(); i ++) { if (uniqueName == m_list[i].uniqueName()) { m_list[i].setEnabled(false); - qStableSort(m_list.begin(), m_list.end()); + std::stable_sort(m_list.begin(), m_list.end()); emit updateIMList(m_list, uniqueName); emit changed(); break; @@ -674,8 +674,8 @@ } if (curIMIdx >= 0 && nextIMIdx >= 0 && curIMIdx != nextIMIdx) { - m_list.swap(curIMIdx, nextIMIdx); - qStableSort(m_list.begin(), m_list.end()); + m_list.swapItemsAt(curIMIdx, nextIMIdx); + std::stable_sort(m_list.begin(), m_list.end()); emit updateIMList(m_list, curIndex.data(FcitxIMUniqueNameRole).toString()); emit changed(); } @@ -720,8 +720,8 @@ } if (curIMIdx >= 0 && nextIMIdx >= 0 && curIMIdx != nextIMIdx) { - m_list.swap(curIMIdx, nextIMIdx); - qStableSort(m_list.begin(), m_list.end()); + m_list.swapItemsAt(curIMIdx, nextIMIdx); + std::stable_sort(m_list.begin(), m_list.end()); emit updateIMList(m_list, curIndex.data(FcitxIMUniqueNameRole).toString()); emit changed(); } @@ -738,7 +738,7 @@ { if (Global::instance()->inputMethodProxy()) { m_list = Global::instance()->inputMethodProxy()->iMList(); - qStableSort(m_list.begin(), m_list.end()); + std::stable_sort(m_list.begin(), m_list.end()); emit updateIMList(m_list, QString()); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/impage_p.h new/kcm-fcitx-0.5.6/src/impage_p.h --- old/kcm-fcitx-0.5.5/src/impage_p.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/impage_p.h 2020-06-01 23:50:20.000000000 +0200 @@ -179,9 +179,9 @@ IMModel(QObject* parent = 0); virtual ~IMModel(); - virtual QModelIndex index(int row, int column = 0, const QModelIndex& parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; + QModelIndex index(int row, int column = 0, const QModelIndex& parent = QModelIndex()) const override; + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; Q_SIGNALS: void select(QModelIndex index); public Q_SLOTS: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/module.cpp new/kcm-fcitx-0.5.6/src/module.cpp --- old/kcm-fcitx-0.5.5/src/module.cpp 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/module.cpp 2020-06-01 23:50:20.000000000 +0200 @@ -207,7 +207,7 @@ configDialog->setAttribute(Qt::WA_DeleteOnClose); configDialog->open(); } - m_arg = QString::null; + m_arg = QString(); } if (m_imPage) @@ -239,7 +239,7 @@ if (m_imPage) { m_imPage->defaults(); } - changed(); + markAsChanged(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/module.h new/kcm-fcitx-0.5.6/src/module.h --- old/kcm-fcitx-0.5.5/src/module.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/module.h 2020-06-01 23:50:20.000000000 +0200 @@ -72,17 +72,17 @@ /** * Overloading the KCModule load() function. */ - void load(); + void load() override; /** * Overloading the KCModule save() function. */ - void save(); + void save() override; /** * Overloading the KCModule defaults() function. */ - void defaults(); + void defaults() override; FcitxAddon* findAddonByName(const QString& name); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/skinpage.cpp new/kcm-fcitx-0.5.6/src/skinpage.cpp --- old/kcm-fcitx-0.5.5/src/skinpage.cpp 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/skinpage.cpp 2020-06-01 23:50:20.000000000 +0200 @@ -25,9 +25,6 @@ #include <QPointer> #include <QLineEdit> -// KDE -#include <KNS3/DownloadDialog> - // Fcitx #include <fcitx-config/xdg.h> @@ -167,7 +164,7 @@ endRemoveRows(); QStringList sortedList = list; - qSort(sortedList); + std::sort(sortedList.begin(), sortedList.end()); Q_FOREACH(const QString & im, sortedList) { beginInsertRows(QModelIndex(), m_skins.size(), m_skins.size()); @@ -254,8 +251,8 @@ else resizeHeight = skin.inputbar.iOutputPos; for (int i = 0; i < 2; i++) { - resizeWidth += metrics.width(numberStr[i]); - resizeWidth += metrics.width(candStr[i]); + resizeWidth += metrics.horizontalAdvance(numberStr[i]); + resizeWidth += metrics.horizontalAdvance(candStr[i]); }; int totalWidth = marginLeft + marginRight + resizeWidth; int totalHeight = marginTop + marginBottom + resizeHeight; @@ -286,23 +283,23 @@ QColor otherColor = ConvertColor(skin.inputbar.otherColor); textPainter.setPen(inputColor); - textPainter.drawText(marginLeft, inputPos, metrics.width(inputExample), fontHeight, Qt::AlignVCenter, inputExample); + textPainter.drawText(marginLeft, inputPos, metrics.horizontalAdvance(inputExample), fontHeight, Qt::AlignVCenter, inputExample); // Draw candidate number: textPainter.setPen(indexColor); for (int i = 0; i < 2; i++) { - textPainter.drawText(offset, outputPos, metrics.width(numberStr[i]), fontHeight, Qt::AlignVCenter, numberStr[i]); - offset = offset + metrics.width(numberStr[i]) + metrics.width(candStr[i]) + metrics.width(spaceStr); + textPainter.drawText(offset, outputPos, metrics.horizontalAdvance(numberStr[i]), fontHeight, Qt::AlignVCenter, numberStr[i]); + offset = offset + metrics.horizontalAdvance(numberStr[i]) + metrics.horizontalAdvance(candStr[i]) + metrics.horizontalAdvance(spaceStr); } - offset = marginLeft + metrics.width(numberStr[0]); + offset = marginLeft + metrics.horizontalAdvance(numberStr[0]); textPainter.setPen(firstCandColor); - textPainter.drawText(offset, outputPos, metrics.width(candStr[0]), fontHeight, Qt::AlignVCenter, candStr[0]); - offset = offset + metrics.width(candStr[0]) + metrics.width(spaceStr) + metrics.width(numberStr[1]); + textPainter.drawText(offset, outputPos, metrics.horizontalAdvance(candStr[0]), fontHeight, Qt::AlignVCenter, candStr[0]); + offset = offset + metrics.horizontalAdvance(candStr[0]) + metrics.horizontalAdvance(spaceStr) + metrics.horizontalAdvance(numberStr[1]); textPainter.setPen(otherColor); - textPainter.drawText(offset, outputPos, metrics.width(candStr[1]), fontHeight, Qt::AlignVCenter, candStr[1]); + textPainter.drawText(offset, outputPos, metrics.horizontalAdvance(candStr[1]), fontHeight, Qt::AlignVCenter, candStr[1]); textPainter.end(); @@ -388,7 +385,7 @@ QFont inputFont(qApp->font()); QFontMetrics fm(inputFont); QString errmsg = i18n("Skin %1 Cannot be loaded").arg(skinName); - int w = fm.width(errmsg); + int w = fm.horizontalAdvance(errmsg); QPixmap destPixmap(w, fm.height()); destPixmap.fill(Qt::transparent); @@ -704,7 +701,7 @@ delete m_subConfig; m_subConfig = m_parser.getSubConfig("Skin"); - skinModel->setSkinList(m_subConfig->fileList().toList()); + skinModel->setSkinList(m_subConfig->fileList().values()); QString skinName = skinField->text(); @@ -824,7 +821,6 @@ { m_ui->setupUi(this); - m_ui->installSkinButton->setIcon(QIcon::fromTheme("get-hot-new-stuff")); d->configureSkinButton = m_ui->configureSkinButton; d->deleteSkinButton = m_ui->deleteSkinButton; @@ -836,7 +832,6 @@ d->skinView->setItemDelegate(d->skinDelegate); d->module = module; - connect(m_ui->installSkinButton, SIGNAL(clicked()), this, SLOT(installButtonClicked())); connect(d->deleteSkinButton, SIGNAL(clicked(bool)), d, SLOT(deleteSkin())); connect(d->configureSkinButton, SIGNAL(clicked(bool)), d, SLOT(configureSkin())); connect(d->skinView->selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), d, SLOT(currentSkinChanged())); @@ -873,15 +868,4 @@ } } -void SkinPage::installButtonClicked() -{ - QPointer<KNS3::DownloadDialog> dialog(new KNS3::DownloadDialog("fcitx-skin.knsrc")); - dialog->exec(); - foreach(const KNS3::Entry & e, dialog->changedEntries()) { - qDebug() << "Changed Entry: " << e.name(); - } - delete dialog; - load(); -} - } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/skinpage.h new/kcm-fcitx-0.5.6/src/skinpage.h --- old/kcm-fcitx-0.5.5/src/skinpage.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/skinpage.h 2020-06-01 23:50:20.000000000 +0200 @@ -44,8 +44,6 @@ void save(); Q_SIGNALS: void changed(); -protected Q_SLOTS: - void installButtonClicked(); private: class Private; Module* m_module; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/skinpage.ui new/kcm-fcitx-0.5.6/src/skinpage.ui --- old/kcm-fcitx-0.5.5/src/skinpage.ui 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/skinpage.ui 2020-06-01 23:50:20.000000000 +0200 @@ -52,13 +52,6 @@ </property> </widget> </item> - <item> - <widget class="QPushButton" name="installSkinButton"> - <property name="text"> - <string>Get New &Skin...</string> - </property> - </widget> - </item> </layout> </item> <item> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/skinpage_p.h new/kcm-fcitx-0.5.6/src/skinpage_p.h --- old/kcm-fcitx-0.5.5/src/skinpage_p.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/skinpage_p.h 2020-06-01 23:50:20.000000000 +0200 @@ -101,7 +101,7 @@ { enum { PixmapRole = 0x4532efd3, - PathRole = 0x8F213873 + PathRole = 0x3F213873 }; Q_OBJECT @@ -138,10 +138,10 @@ Q_OBJECT public: SkinModel(Private* d, QObject* parent = 0); - virtual QModelIndex index(int row, int column = 0, const QModelIndex& parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; - virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole); + QModelIndex index(int row, int column = 0, const QModelIndex& parent = QModelIndex()) const override; + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; + bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override; void setSkinList(const QStringList& list); const QList<SkinInfo>& skinList() const; private: @@ -175,8 +175,8 @@ SkinDelegate(QObject* parent = 0); ~SkinDelegate(); - virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const; - virtual QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const; + void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const override; + QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override; signals: void regeneratePreview(const QModelIndex& index, const QSize& size) const; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/subconfig.cpp new/kcm-fcitx-0.5.6/src/subconfig.cpp --- old/kcm-fcitx-0.5.5/src/subconfig.cpp 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/subconfig.cpp 2020-06-01 23:50:20.000000000 +0200 @@ -137,7 +137,7 @@ } QFileInfo info(program); if (!info.isExecutable()) - program = QString::null; + program = QString(); m_progam = program; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/subconfigwidget_p.h new/kcm-fcitx-0.5.6/src/subconfigwidget_p.h --- old/kcm-fcitx-0.5.5/src/subconfigwidget_p.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/subconfigwidget_p.h 2020-06-01 23:50:20.000000000 +0200 @@ -41,9 +41,9 @@ public: ConfigFileItemModel(QObject* parent = 0); virtual ~ConfigFileItemModel(); - virtual QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const; - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; + QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; void addConfigFile(ConfigFile* configfile); private: QList<ConfigFile*> m_files; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kcm-fcitx-0.5.5/src/verticalscrollarea.h new/kcm-fcitx-0.5.6/src/verticalscrollarea.h --- old/kcm-fcitx-0.5.5/src/verticalscrollarea.h 2017-09-15 08:09:08.000000000 +0200 +++ new/kcm-fcitx-0.5.6/src/verticalscrollarea.h 2020-06-01 23:50:20.000000000 +0200 @@ -29,8 +29,8 @@ explicit VerticalScrollArea(QWidget* parent = 0); void setWidget(QWidget *widget); protected: - virtual bool eventFilter(QObject* o, QEvent* e); + bool eventFilter(QObject* o, QEvent* e) override; }; } -#endif // VERTICALSCROLLAREA_H \ No newline at end of file +#endif // VERTICALSCROLLAREA_H
