Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fcitx5-qt for openSUSE:Factory checked in at 2022-02-13 00:15:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx5-qt (Old) and /work/SRC/openSUSE:Factory/.fcitx5-qt.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-qt" Sun Feb 13 00:15:31 2022 rev:2 rq:953919 version:5.0.10 Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx5-qt/fcitx5-qt.changes 2022-02-09 20:39:39.666442141 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx5-qt.new.1956/fcitx5-qt.changes 2022-02-13 00:16:12.016252990 +0100 @@ -1,0 +2,6 @@ +Sat Feb 12 15:11:44 UTC 2022 - Marguerite Su <i...@marguerite.su> + +- update version 5.0.10 + * Fix paging button not clickable under vertical layout + +------------------------------------------------------------------- Old: ---- fcitx5-qt-5.0.9.tar.xz New: ---- fcitx5-qt-5.0.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx5-qt.spec ++++++ --- /var/tmp/diff_new_pack.ThLb6E/_old 2022-02-13 00:16:12.632254735 +0100 +++ /var/tmp/diff_new_pack.ThLb6E/_new 2022-02-13 00:16:12.636254747 +0100 @@ -1,7 +1,7 @@ # # spec file for package fcitx5-qt # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,9 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %if 0%{?suse_version} <= 1500 && 0%{?sle_version} <= 150200 %define build_qt4 1 %else @@ -28,30 +29,30 @@ %endif Name: fcitx5-qt -Version: 5.0.9 +Version: 5.0.10 Release: 0 Summary: Qt library and IM module for fcitx5 License: BSD-3-Clause AND LGPL-2.1-or-later Group: System/I18n/Chinese -Url: https://github.com/fcitx/fcitx5-qt +URL: https://github.com/fcitx/fcitx5-qt Source: https://download.fcitx-im.org/fcitx5/%{name}/%{name}-%{version}.tar.xz Patch: %{name}-5.9.patch BuildRequires: cmake -BuildRequires: gcc-c++ BuildRequires: extra-cmake-modules +BuildRequires: gcc-c++ %if %build_qt4 BuildRequires: libqt4-devel %endif BuildRequires: libqt5-qtbase-devel -BuildRequires: libqt5-qtx11extras-devel BuildRequires: libqt5-qtbase-private-headers-devel +BuildRequires: libqt5-qtx11extras-devel %if %build_qt6 BuildRequires: qt6-base-devel BuildRequires: qt6-base-private-devel %endif +BuildRequires: fcitx5-devel BuildRequires: libxcb-devel BuildRequires: libxkbcommon-devel -BuildRequires: fcitx5-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description ++++++ fcitx5-qt-5.0.9.tar.xz -> fcitx5-qt-5.0.10.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.9/CMakeLists.txt new/fcitx5-qt-5.0.10/CMakeLists.txt --- old/fcitx5-qt-5.0.9/CMakeLists.txt 2021-12-28 06:47:40.277359700 +0100 +++ new/fcitx5-qt-5.0.10/CMakeLists.txt 2022-02-02 00:50:38.895382600 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(fcitx5-qt VERSION 5.0.9) +project(fcitx5-qt VERSION 5.0.10) set(FCITX5_QT_VERSION ${PROJECT_VERSION}) set(REQUIRED_QT4_VERSION 4.8.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.9/po/ru.po new/fcitx5-qt-5.0.10/po/ru.po --- old/fcitx5-qt-5.0.9/po/ru.po 2020-04-18 23:18:48.247635400 +0200 +++ new/fcitx5-qt-5.0.10/po/ru.po 2022-02-02 00:32:08.102556000 +0100 @@ -4,14 +4,15 @@ # # Translators: # csslayer <wen...@gmail.com>, 2017 +# Dmitry <dmitrydmitry...@gmail.com>, 2022 # msgid "" msgstr "" "Project-Id-Version: fcitx5-qt\n" "Report-Msgid-Bugs-To: fcitx-...@googlegroups.com\n" -"POT-Creation-Date: 2020-04-17 22:38-0700\n" +"POT-Creation-Date: 2022-01-21 20:24+0000\n" "PO-Revision-Date: 2017-12-20 02:52+0000\n" -"Last-Translator: csslayer <wen...@gmail.com>, 2017\n" +"Last-Translator: Dmitry <dmitrydmitry...@gmail.com>, 2022\n" "Language-Team: Russian (https://www.transifex.com/fcitx/teams/12005/ru/)\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -21,187 +22,187 @@ "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n" "%100>=11 && n%100<=14)? 2 : 3);\n" -#: qt5/quickphrase-editor/editor.cpp:272 +#: qt5/quickphrase-editor/editor.cpp:260 msgid "%1 is a system file, do you want to delete all phrases instead?" msgstr "%1 ??? ?????????????????? ????????. ???????????? ???????????? ?????????? ?????????????? ?????? ???????????" #. i18n: file: qt5/quickphrase-editor/editor.ui:52 #. i18n: ectx: property (text), widget (QPushButton, addButton) -#: rc.cpp:6 +#: rc.cpp:12 #, kde-format msgid "&Add" msgstr "&????????????????" -#: qt5/guiwrapper/mainwindow.cpp:43 +#: qt5/guiwrapper/mainwindow.cpp:29 msgid "&Apply" -msgstr "" +msgstr "&??????????????????" #. i18n: file: qt5/quickphrase-editor/editor.ui:63 #. i18n: ectx: property (text), widget (QPushButton, batchEditButton) -#: rc.cpp:9 +#: rc.cpp:15 #, kde-format msgid "&Batch Edit" msgstr "&?????????????????? ????????????????????????????" -#: qt5/guiwrapper/mainwindow.cpp:45 +#: qt5/guiwrapper/mainwindow.cpp:31 msgid "&Close" msgstr "&??????????????" #. i18n: file: qt5/quickphrase-editor/editor.ui:74 #. i18n: ectx: property (text), widget (QPushButton, deleteButton) -#: rc.cpp:12 +#: rc.cpp:18 #, kde-format msgid "&Delete" msgstr "&??????????????" #. i18n: file: qt5/quickphrase-editor/editor.ui:103 #. i18n: ectx: property (text), widget (QPushButton, importButton) -#: rc.cpp:18 +#: rc.cpp:24 #, kde-format msgid "&Import" msgstr "&????????????" -#: qt5/guiwrapper/mainwindow.cpp:42 +#: qt5/guiwrapper/mainwindow.cpp:28 msgid "&Ok" -msgstr "" +msgstr "&Ok" #. i18n: file: qt5/quickphrase-editor/editor.ui:45 #. i18n: ectx: property (text), widget (QPushButton, operationButton) -#: rc.cpp:3 +#: rc.cpp:9 #, kde-format msgid "&Operation" msgstr "&????????????????" -#: qt5/guiwrapper/mainwindow.cpp:44 +#: qt5/guiwrapper/mainwindow.cpp:30 msgid "&Reset" msgstr "&????????????????????????????" -#: qt5/guiwrapper/wrapperapp.cpp:43 +#: qt5/guiwrapper/wrapperapp.cpp:29 msgid "A launcher for Fcitx Gui plugin." -msgstr "" +msgstr "???????????????? ?????????????? ?????? ?????????????? Fcitx Gui." -#: qt5/quickphrase-editor/editor.cpp:45 +#: qt5/quickphrase-editor/editor.cpp:33 msgid "Add File" msgstr "???????????????? ????????" -#: qt5/quickphrase-editor/editor.cpp:284 +#: qt5/quickphrase-editor/editor.cpp:272 msgid "Are you sure to delete %1?" msgstr "?????????????????????????? ?????????????? %1?" #. i18n: file: qt5/quickphrase-editor/batchdialog.ui:14 #. i18n: ectx: property (windowTitle), widget (QDialog, BatchDialog) -#: rc.cpp:24 +#: rc.cpp:3 #, kde-format msgid "Batch editing" -msgstr "" +msgstr "?????????????????? ????????????????????????????" -#: qt5/quickphrase-editor/editor.cpp:250 +#: qt5/quickphrase-editor/editor.cpp:238 msgid "Cannot create file %1." msgstr "???? ?????????????? ?????????????? ???????? %1." -#: qt5/quickphrase-editor/editor.cpp:271 +#: qt5/quickphrase-editor/editor.cpp:259 msgid "Cannot remove system file" msgstr "???? ?????????????? ?????????????? ?????????????????? ????????" -#: qt5/guiwrapper/wrapperapp.cpp:49 +#: qt5/guiwrapper/wrapperapp.cpp:35 msgid "Config path" -msgstr "" +msgstr "???????? ????????????????????????" -#: qt5/quickphrase-editor/editor.cpp:283 +#: qt5/quickphrase-editor/editor.cpp:271 msgid "Confirm deletion" msgstr "?????????????????????? ????????????????" -#: qt5/quickphrase-editor/editor.cpp:233 +#: qt5/quickphrase-editor/editor.cpp:221 msgid "Create new file" msgstr "?????????????? ?????????? ????????" #. i18n: file: qt5/quickphrase-editor/editor.ui:85 #. i18n: ectx: property (text), widget (QPushButton, clearButton) -#: rc.cpp:15 +#: rc.cpp:21 #, kde-format msgid "De&lete All" msgstr "????&?????????? ??????" -#: qt5/quickphrase-editor/filelistmodel.cpp:41 +#: qt5/quickphrase-editor/filelistmodel.cpp:29 msgid "Default" msgstr "???? ??????????????????" #. i18n: file: qt5/quickphrase-editor/editor.ui:114 #. i18n: ectx: property (text), widget (QPushButton, exportButton) -#: rc.cpp:21 +#: rc.cpp:27 #, kde-format msgid "E&xport" msgstr "&??????????????" -#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:283 +#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:319 msgid "Empty" msgstr "??????????" -#: qt5/quickphrase-editor/editor.cpp:292 +#: qt5/quickphrase-editor/editor.cpp:280 msgid "Error while deleting %1." msgstr "???????????? ?????? ???????????????? %1." -#: qt5/guiwrapper/mainwindow.cpp:120 +#: qt5/guiwrapper/mainwindow.cpp:106 msgid "Failed to notify Fcitx" -msgstr "" +msgstr "???? ?????????????? ?????????????????? Fcitx" -#: qt5/guiwrapper/mainwindow.cpp:121 +#: qt5/guiwrapper/mainwindow.cpp:107 msgid "Failed to notify Fcitx about the configuration change." -msgstr "" +msgstr "???? ?????????????? ?????????????????? Fcitx ???? ?????????????????? ????????????????????????." -#: qt5/quickphrase-editor/editor.cpp:249 qt5/quickphrase-editor/editor.cpp:291 +#: qt5/quickphrase-editor/editor.cpp:237 qt5/quickphrase-editor/editor.cpp:279 msgid "File Operation Failed" msgstr "???????? ???????????????? ?? ????????????" -#: qt5/quickphrase-editor/editor.cpp:238 +#: qt5/quickphrase-editor/editor.cpp:226 msgid "File name should not contain '/'." msgstr "?????? ?????????? ???? ???????????? ?????????????????? '/'." -#: qt5/quickphrase-editor/editor.cpp:237 +#: qt5/quickphrase-editor/editor.cpp:225 msgid "Invalid filename" msgstr "???????????????????????? ?????? ??????????" -#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:146 +#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:180 msgid "Key code mode" -msgstr "" +msgstr "?????????? ???????? ??????????" -#: qt5/quickphrase-editor/model.cpp:45 +#: qt5/quickphrase-editor/model.cpp:33 msgid "Keyword" msgstr "???????????????? ??????????" -#: qt5/guiwrapper/wrapperapp.cpp:46 +#: qt5/guiwrapper/wrapperapp.cpp:32 msgid "Parent window ID" -msgstr "" +msgstr "?????????????????????????? ???????????????? ????????" -#: qt5/quickphrase-editor/model.cpp:47 +#: qt5/quickphrase-editor/model.cpp:35 msgid "Phrase" msgstr "??????????" -#: qt5/quickphrase-editor/editor.cpp:233 +#: qt5/quickphrase-editor/editor.cpp:221 msgid "Please input a filename for newfile" msgstr "?????????????? ?????? ?????? ???????????? ??????????" -#: qt5/quickphrase-editor/editor.cpp:113 +#: qt5/quickphrase-editor/editor.cpp:101 msgid "Quick Phrase Editor" msgstr "?????????????? ???????????????? ????????" -#: qt5/quickphrase-editor/editor.cpp:49 +#: qt5/quickphrase-editor/editor.cpp:37 msgid "Refresh List" msgstr "???????????????? ????????????" -#: qt5/quickphrase-editor/editor.cpp:47 +#: qt5/quickphrase-editor/editor.cpp:35 msgid "Remove File" msgstr "?????????????? ????????" -#: qt5/quickphrase-editor/editor.cpp:97 +#: qt5/quickphrase-editor/editor.cpp:85 msgid "Save Changes" msgstr "?????????????????? ??????????????????" -#: qt5/guiwrapper/wrapperapp.cpp:47 +#: qt5/guiwrapper/wrapperapp.cpp:33 msgid "Test if config exists" -msgstr "" +msgstr "??????????????????, ???????????????????? ???? ????????????????????????" -#: qt5/quickphrase-editor/editor.cpp:98 +#: qt5/quickphrase-editor/editor.cpp:86 msgid "" "The content has changed.\n" "Do you want to save the changes or discard them?" @@ -209,25 +210,25 @@ "???????????????????? ????????????????????.\n" "?????????????????? ?????????????????? ?????? ???????????????? ?????" -#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:320 +#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:356 msgid "The key you just pressed is not supported by Qt." msgstr "?????????????? ?????????????? ???? ???????????????????????????? Qt." -#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:321 +#: qt5/widgetsaddons/fcitxqtkeysequencewidget.cpp:357 msgid "Unsupported Key" msgstr "?????????????? ???? ????????????????????????????" #. i18n: file: qt5/quickphrase-editor/batchdialog.ui:50 #. i18n: ectx: property (text), widget (QLabel, infoLabel) -#: rc.cpp:27 +#: rc.cpp:6 #, kde-format msgid "Use <Keyword> <Phrase> format on every line." msgstr "???????????????????????? ?????? ???????????? ???????????? ???????????? <???????????????? ??????????> <??????????>." -#: qt5/guiwrapper/wrapperapp.cpp:49 +#: qt5/guiwrapper/wrapperapp.cpp:35 msgid "path" -msgstr "" +msgstr "????????" -#: qt5/guiwrapper/wrapperapp.cpp:46 +#: qt5/guiwrapper/wrapperapp.cpp:32 msgid "winid" -msgstr "" +msgstr "winid" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.9/qt5/platforminputcontext/fcitxcandidatewindow.cpp new/fcitx5-qt-5.0.10/qt5/platforminputcontext/fcitxcandidatewindow.cpp --- old/fcitx5-qt-5.0.9/qt5/platforminputcontext/fcitxcandidatewindow.cpp 2021-12-02 03:18:29.990426300 +0100 +++ new/fcitx5-qt-5.0.10/qt5/platforminputcontext/fcitxcandidatewindow.cpp 2022-01-20 20:57:02.854456400 +0100 @@ -456,23 +456,32 @@ void FcitxCandidateWindow::mouseMoveEvent(QMouseEvent *event) { bool needRepaint = false; + + bool prevHovered = false; + bool nextHovered = false; auto oldHighlight = highlight(); hoverIndex_ = -1; - for (int idx = 0, e = candidateRegions_.size(); idx < e; idx++) { - if (candidateRegions_[idx].contains(event->pos())) { - hoverIndex_ = idx; - break; + + prevHovered = prevRegion_.contains(event->pos()); + if (!prevHovered) { + nextHovered = nextRegion_.contains(event->pos()); + if (!nextHovered) { + for (int idx = 0, e = candidateRegions_.size(); idx < e; idx++) { + if (candidateRegions_[idx].contains(event->pos())) { + hoverIndex_ = idx; + break; + } + } } } - needRepaint = needRepaint || oldHighlight != highlight(); - - auto prevHovered = prevRegion_.contains(event->pos()); - auto nextHovered = nextRegion_.contains(event->pos()); needRepaint = needRepaint || prevHovered_ != prevHovered; - needRepaint = needRepaint || nextHovered_ != nextHovered; prevHovered_ = prevHovered; + + needRepaint = needRepaint || nextHovered_ != nextHovered; nextHovered_ = nextHovered; + + needRepaint = needRepaint || oldHighlight != highlight(); if (needRepaint) { renderNow(); } @@ -482,12 +491,6 @@ if (event->button() != Qt::LeftButton) { return; } - for (int idx = 0, e = candidateRegions_.size(); idx < e; idx++) { - if (candidateRegions_[idx].contains(event->pos())) { - Q_EMIT candidateSelected(idx); - return; - } - } if (prevRegion_.contains(event->pos())) { Q_EMIT prevClicked(); @@ -496,6 +499,14 @@ if (nextRegion_.contains(event->pos())) { Q_EMIT nextClicked(); + return; + } + + for (int idx = 0, e = candidateRegions_.size(); idx < e; idx++) { + if (candidateRegions_[idx].contains(event->pos())) { + Q_EMIT candidateSelected(idx); + return; + } } }
