diff -Nru ukui-window-switch-4.10.1.10/debian/changelog ukui-window-switch-4.10.1.10/debian/changelog --- ukui-window-switch-4.10.1.10/debian/changelog 2025-01-03 17:52:20.000000000 +0800 +++ ukui-window-switch-4.10.1.10/debian/changelog 2025-01-03 17:52:20.000000000 +0800 @@ -1,3 +1,10 @@ +ukui-window-switch (4.10.1.10-ok1.6) nile; urgency=medium + + * Issue:无 + * 其他:增加阿越翻译文件 + + -- Kevin Duan <duankaiwen@kylinos.cn> Fri, 03 Jan 2025 17:52:20 +0800 + ukui-window-switch (4.10.1.10-ok1.5) nile; urgency=medium * Issue:无 diff -Nru ukui-window-switch-4.10.1.10/debian/patches/0007-Added-translation-using-Weblate-Arabic.patch ukui-window-switch-4.10.1.10/debian/patches/0007-Added-translation-using-Weblate-Arabic.patch --- ukui-window-switch-4.10.1.10/debian/patches/0007-Added-translation-using-Weblate-Arabic.patch 1970-01-01 08:00:00.000000000 +0800 +++ ukui-window-switch-4.10.1.10/debian/patches/0007-Added-translation-using-Weblate-Arabic.patch 2025-01-03 17:52:20.000000000 +0800 @@ -0,0 +1,77 @@ +From: KevinDuan <duankaiwen@kylinos.cn> +Date: Mon, 17 Feb 2025 09:36:23 +0800 +Subject: Added translation using Weblate (Arabic) + +--- + windowsview/ukui-window-switch_ar.ts | 62 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 62 insertions(+) + create mode 100644 windowsview/ukui-window-switch_ar.ts + +diff --git a/windowsview/ukui-window-switch_ar.ts b/windowsview/ukui-window-switch_ar.ts +new file mode 100644 +index 0000000..3538253 +--- /dev/null ++++ b/windowsview/ukui-window-switch_ar.ts +@@ -0,0 +1,62 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="ar" sourcelanguage="en_US"> ++<context> ++ <name>DesktopArea</name> ++ <message> ++ <source>Desktop</source> ++ <translatorcomment>工作区</translatorcomment> ++ <translation type="vanished">工作区</translation> ++ </message> ++ <message> ++ <source>New Desktop</source> ++ <translatorcomment>新建工作区</translatorcomment> ++ <translation type="vanished">新建工作区</translation> ++ </message> ++</context> ++<context> ++ <name>NewDesktopButton</name> ++ <message> ++ <location filename="qml/NewDesktopButton.qml" line="104"/> ++ <source>New Desktop</source> ++ <translation type="unfinished"></translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewClearAllWindowButton</name> ++ <message> ++ <source>Clear</source> ++ <translatorcomment>清除</translatorcomment> ++ <translation type="vanished">清除</translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewMain</name> ++ <message> ++ <location filename="qml/TabletViewMain.qml" line="174"/> ++ <source>No recent tasks</source> ++ <translation type="unfinished"></translation> ++ </message> ++ <message> ++ <location filename="qml/TabletViewMain.qml" line="357"/> ++ <source>Clear</source> ++ <translation type="unfinished"></translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewRootWindow</name> ++ <message> ++ <source>No recent tasks</source> ++ <translatorcomment>无应用开启</translatorcomment> ++ <translation type="vanished">无应用开启</translation> ++ </message> ++</context> ++<context> ++ <name>VirtualDesktopWindow</name> ++ <message> ++ <location filename="qml/VirtualDesktopWindow.qml" line="187"/> ++ <source>Desktop</source> ++ <translation type="unfinished"></translation> ++ </message> ++</context> ++</TS> diff -Nru ukui-window-switch-4.10.1.10/debian/patches/0008-Added-translation-using-Weblate-Vietnamese.patch ukui-window-switch-4.10.1.10/debian/patches/0008-Added-translation-using-Weblate-Vietnamese.patch --- ukui-window-switch-4.10.1.10/debian/patches/0008-Added-translation-using-Weblate-Vietnamese.patch 1970-01-01 08:00:00.000000000 +0800 +++ ukui-window-switch-4.10.1.10/debian/patches/0008-Added-translation-using-Weblate-Vietnamese.patch 2025-01-03 17:52:20.000000000 +0800 @@ -0,0 +1,77 @@ +From: KevinDuan <duankaiwen@kylinos.cn> +Date: Mon, 17 Feb 2025 15:02:04 +0800 +Subject: Added translation using Weblate (Vietnamese) + +--- + windowsview/ukui-window-switch_vi.ts | 62 ++++++++++++++++++++++++++++++++++++ + 1 file changed, 62 insertions(+) + create mode 100644 windowsview/ukui-window-switch_vi.ts + +diff --git a/windowsview/ukui-window-switch_vi.ts b/windowsview/ukui-window-switch_vi.ts +new file mode 100644 +index 0000000..259ee5d +--- /dev/null ++++ b/windowsview/ukui-window-switch_vi.ts +@@ -0,0 +1,62 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="vi" sourcelanguage="en_US"> ++<context> ++ <name>DesktopArea</name> ++ <message> ++ <source>Desktop</source> ++ <translatorcomment>工作区</translatorcomment> ++ <translation type="vanished">工作区</translation> ++ </message> ++ <message> ++ <source>New Desktop</source> ++ <translatorcomment>新建工作区</translatorcomment> ++ <translation type="vanished">新建工作区</translation> ++ </message> ++</context> ++<context> ++ <name>NewDesktopButton</name> ++ <message> ++ <location filename="qml/NewDesktopButton.qml" line="104"/> ++ <source>New Desktop</source> ++ <translation type="unfinished"></translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewClearAllWindowButton</name> ++ <message> ++ <source>Clear</source> ++ <translatorcomment>清除</translatorcomment> ++ <translation type="vanished">清除</translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewMain</name> ++ <message> ++ <location filename="qml/TabletViewMain.qml" line="174"/> ++ <source>No recent tasks</source> ++ <translation type="unfinished"></translation> ++ </message> ++ <message> ++ <location filename="qml/TabletViewMain.qml" line="357"/> ++ <source>Clear</source> ++ <translation type="unfinished"></translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewRootWindow</name> ++ <message> ++ <source>No recent tasks</source> ++ <translatorcomment>无应用开启</translatorcomment> ++ <translation type="vanished">无应用开启</translation> ++ </message> ++</context> ++<context> ++ <name>VirtualDesktopWindow</name> ++ <message> ++ <location filename="qml/VirtualDesktopWindow.qml" line="187"/> ++ <source>Desktop</source> ++ <translation type="unfinished"></translation> ++ </message> ++</context> ++</TS> diff -Nru ukui-window-switch-4.10.1.10/debian/patches/0009-Translated-using-Weblate-Vietnamese.patch ukui-window-switch-4.10.1.10/debian/patches/0009-Translated-using-Weblate-Vietnamese.patch --- ukui-window-switch-4.10.1.10/debian/patches/0009-Translated-using-Weblate-Vietnamese.patch 1970-01-01 08:00:00.000000000 +0800 +++ ukui-window-switch-4.10.1.10/debian/patches/0009-Translated-using-Weblate-Vietnamese.patch 2025-01-03 17:52:20.000000000 +0800 @@ -0,0 +1,87 @@ +From: KevinDuan <duankaiwen@kylinos.cn> +Date: Mon, 17 Feb 2025 09:20:36 +0000 +Subject: Translated using Weblate (Vietnamese) + +Currently translated at 100.0% (4 of 4 strings) + +Translation: openkylin-nile-new/ukui-window-switch +Translate-URL: http://weblate.openkylin.top/projects/openkylin-nile-new/ukui-window-switch/vi/ +--- + windowsview/ukui-window-switch_ar.ts | 8 ++++---- + windowsview/ukui-window-switch_vi.ts | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/windowsview/ukui-window-switch_ar.ts b/windowsview/ukui-window-switch_ar.ts +index 3538253..bf0b6c9 100644 +--- a/windowsview/ukui-window-switch_ar.ts ++++ b/windowsview/ukui-window-switch_ar.ts +@@ -19,7 +19,7 @@ + <message> + <location filename="qml/NewDesktopButton.qml" line="104"/> + <source>New Desktop</source> +- <translation type="unfinished"></translation> ++ <translation>سطح مكتب جديد</translation> + </message> + </context> + <context> +@@ -35,12 +35,12 @@ + <message> + <location filename="qml/TabletViewMain.qml" line="174"/> + <source>No recent tasks</source> +- <translation type="unfinished"></translation> ++ <translation>لا توجد مهام حديثة</translation> + </message> + <message> + <location filename="qml/TabletViewMain.qml" line="357"/> + <source>Clear</source> +- <translation type="unfinished"></translation> ++ <translation>واضح</translation> + </message> + </context> + <context> +@@ -56,7 +56,7 @@ + <message> + <location filename="qml/VirtualDesktopWindow.qml" line="187"/> + <source>Desktop</source> +- <translation type="unfinished"></translation> ++ <translation>سطح المكتب</translation> + </message> + </context> + </TS> +diff --git a/windowsview/ukui-window-switch_vi.ts b/windowsview/ukui-window-switch_vi.ts +index 259ee5d..d673d4a 100644 +--- a/windowsview/ukui-window-switch_vi.ts ++++ b/windowsview/ukui-window-switch_vi.ts +@@ -19,7 +19,7 @@ + <message> + <location filename="qml/NewDesktopButton.qml" line="104"/> + <source>New Desktop</source> +- <translation type="unfinished"></translation> ++ <translation>Máy tính để bàn mới</translation> + </message> + </context> + <context> +@@ -35,12 +35,12 @@ + <message> + <location filename="qml/TabletViewMain.qml" line="174"/> + <source>No recent tasks</source> +- <translation type="unfinished"></translation> ++ <translation>Không có nhiệm vụ gần đây</translation> + </message> + <message> + <location filename="qml/TabletViewMain.qml" line="357"/> + <source>Clear</source> +- <translation type="unfinished"></translation> ++ <translation>Trong</translation> + </message> + </context> + <context> +@@ -56,7 +56,7 @@ + <message> + <location filename="qml/VirtualDesktopWindow.qml" line="187"/> + <source>Desktop</source> +- <translation type="unfinished"></translation> ++ <translation>Bàn làm việc</translation> + </message> + </context> + </TS> diff -Nru ukui-window-switch-4.10.1.10/debian/patches/0010-perf-CMakeLists.txt.patch ukui-window-switch-4.10.1.10/debian/patches/0010-perf-CMakeLists.txt.patch --- ukui-window-switch-4.10.1.10/debian/patches/0010-perf-CMakeLists.txt.patch 1970-01-01 08:00:00.000000000 +0800 +++ ukui-window-switch-4.10.1.10/debian/patches/0010-perf-CMakeLists.txt.patch 2025-01-03 17:52:20.000000000 +0800 @@ -0,0 +1,1954 @@ +From: iaom <zhangpengfei@kylinos.cn> +Date: Thu, 20 Feb 2025 13:41:55 +0800 +Subject: =?utf-8?b?cGVyZjrkvJjljJZDTWFrZUxpc3RzLnR4dOe7k+aehCAxLuWIoOmZpA==?= + =?utf-8?b?6YOo5YiG5YaX5L2Z5YaZ5rOV77yM6LCD5pW06YOo5YiG57uT5p6EIDIu6LCD5pW0?= + =?utf-8?b?57+76K+R5paH5Lu255Sf5oiQ5LiO5a6J6KOF5py65Yi2?= + +--- + .gitignore | 1 - + CMakeLists.txt | 11 +- + windowsview/CMakeLists.txt | 71 ++---------- + windowsview/data.qrc | 10 -- + windowsview/multitaskviewmodel.h | 5 +- + windowsview/translations/ukui-window-switch_ar.ts | 33 ++++++ + .../translations/ukui-window-switch_bo_CN.ts | 33 ++++++ + windowsview/translations/ukui-window-switch_de.ts | 33 ++++++ + windowsview/translations/ukui-window-switch_es.ts | 33 ++++++ + windowsview/translations/ukui-window-switch_fr.ts | 33 ++++++ + windowsview/translations/ukui-window-switch_kk.ts | 33 ++++++ + windowsview/translations/ukui-window-switch_ky.ts | 33 ++++++ + windowsview/translations/ukui-window-switch_mn.ts | 33 ++++++ + windowsview/translations/ukui-window-switch_ug.ts | 33 ++++++ + windowsview/translations/ukui-window-switch_vi.ts | 33 ++++++ + .../translations/ukui-window-switch_zh_CN.ts | 33 ++++++ + .../translations/ukui-window-switch_zh_Hant.ts | 33 ++++++ + windowsview/ukui-window-switch | 2 +- + .../ukui-window-switch-kwineffect/CMakeLists.txt | 104 ++++-------------- + .../multitaskviewmanager.cpp | 2 +- + .../ukui-window-switch-wlcom/CMakeLists.txt | 119 +++++---------------- + windowsview/ukui-window-switch-wlcom/main.cpp | 9 +- + .../multitaskviewmanagerbywlcom.cpp | 3 +- + .../multitaskviewmodelbywlcomhandler.cpp | 2 + + .../multitaskviewmodelbywlcomhandler.h | 3 - + windowsview/ukui-window-switch_ar.ts | 62 ----------- + windowsview/ukui-window-switch_bo_CN.ts | 62 ----------- + windowsview/ukui-window-switch_de.ts | 62 ----------- + windowsview/ukui-window-switch_es.ts | 62 ----------- + windowsview/ukui-window-switch_fr.ts | 62 ----------- + windowsview/ukui-window-switch_kk.ts | 62 ----------- + windowsview/ukui-window-switch_ky.ts | 62 ----------- + windowsview/ukui-window-switch_mn.ts | 62 ----------- + windowsview/ukui-window-switch_ug.ts | 62 ----------- + windowsview/ukui-window-switch_vi.ts | 62 ----------- + windowsview/ukui-window-switch_zh_CN.ts | 62 ----------- + windowsview/ukui-window-switch_zh_Hant.ts | 62 ----------- + 37 files changed, 472 insertions(+), 1010 deletions(-) + create mode 100644 windowsview/translations/ukui-window-switch_ar.ts + create mode 100644 windowsview/translations/ukui-window-switch_bo_CN.ts + create mode 100644 windowsview/translations/ukui-window-switch_de.ts + create mode 100644 windowsview/translations/ukui-window-switch_es.ts + create mode 100644 windowsview/translations/ukui-window-switch_fr.ts + create mode 100644 windowsview/translations/ukui-window-switch_kk.ts + create mode 100644 windowsview/translations/ukui-window-switch_ky.ts + create mode 100644 windowsview/translations/ukui-window-switch_mn.ts + create mode 100644 windowsview/translations/ukui-window-switch_ug.ts + create mode 100644 windowsview/translations/ukui-window-switch_vi.ts + create mode 100644 windowsview/translations/ukui-window-switch_zh_CN.ts + create mode 100644 windowsview/translations/ukui-window-switch_zh_Hant.ts + delete mode 100644 windowsview/ukui-window-switch_ar.ts + delete mode 100644 windowsview/ukui-window-switch_bo_CN.ts + delete mode 100644 windowsview/ukui-window-switch_de.ts + delete mode 100644 windowsview/ukui-window-switch_es.ts + delete mode 100644 windowsview/ukui-window-switch_fr.ts + delete mode 100644 windowsview/ukui-window-switch_kk.ts + delete mode 100644 windowsview/ukui-window-switch_ky.ts + delete mode 100644 windowsview/ukui-window-switch_mn.ts + delete mode 100644 windowsview/ukui-window-switch_ug.ts + delete mode 100644 windowsview/ukui-window-switch_vi.ts + delete mode 100644 windowsview/ukui-window-switch_zh_CN.ts + delete mode 100644 windowsview/ukui-window-switch_zh_Hant.ts + +diff --git a/.gitignore b/.gitignore +index dd3e4fa..8f1db95 100644 +--- a/.gitignore ++++ b/.gitignore +@@ -5,7 +5,6 @@ + *.user + *.qm + CMakeLists.txt.user* +-windowsview/globalconfig.h + + # debian files + obj-*-linux-gnu/ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index bf089b5..820482c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5) ++cmake_minimum_required(VERSION 3.16) + + project(ukui-window-switch) + +@@ -11,18 +11,13 @@ find_package(KF5WindowSystem REQUIRED) + + get_target_property(QT_QMAKE_EXECUTABLE ${Qt5Core_QMAKE_EXECUTABLE} IMPORTED_LOCATION) + macro(query_qmake args output) +- exec_program(${QT_QMAKE_EXECUTABLE} ARGS -query ${args} OUTPUT_VARIABLE ${output} RETURN_VALUE exitCode) +- +- if(NOT ${exitCode} EQUAL 0) ++ execute_process(COMMAND ${QT_QMAKE_EXECUTABLE} -query ${args} OUTPUT_VARIABLE ${output} RESULT_VARIABLE test1 RESULT_VARIABLE result OUTPUT_STRIP_TRAILING_WHITESPACE) ++ if(NOT ${result} EQUAL 0) + message(FATAL_ERROR "exec ${QT_QMAKE_EXECUTABLE} failed, with args: ${args}, error message: ${output}") + endif() + endmacro() + + query_qmake("QT_INSTALL_PLUGINS" QT_INSTALL_PLUGINS) +-message("QT_INSTALL_PLUGINS=${QT_INSTALL_PLUGINS}") +- +-set(INSTALL_PATH "${QT_INSTALL_PLUGINS}/kwin/effects/plugins") +- + + add_subdirectory(windowsview) + add_subdirectory(windowswitchers) +diff --git a/windowsview/CMakeLists.txt b/windowsview/CMakeLists.txt +index 80342cd..ae83e94 100644 +--- a/windowsview/CMakeLists.txt ++++ b/windowsview/CMakeLists.txt +@@ -1,70 +1,19 @@ +-cmake_minimum_required(VERSION 3.5) ++cmake_minimum_required(VERSION 3.16) + +-set(CMAKE_INCLUDE_CURRENT_DIR ON) +-set(CMAKE_AUTOMOC ON) +-set(CMAKE_AUTOUIC ON) +-set(CMAKE_AUTORCC ON) +- +-set(CMAKE_CXX_STANDARD 14) +-set(CMAKE_CXX_STANDARD_REQUIRED ON) +- +-set(KF5_DEP_VERSION "5.54.0") +- +-find_package(ECM 5.54.0 NO_MODULE) +-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) +- +-find_package(X11 MODULE) +-find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER) +-message("XCB:"${X11_FOUND}, ${XCB_XCB_FOUND}, ${XCB_COMPOSITE_FOUND}, ${XCB_DAMAGE_FOUND}) +-if(X11_FOUND AND XCB_XCB_FOUND) +- set(HAVE_X11 1) +-endif() +-if(HAVE_X11 AND XCB_COMPOSITE_FOUND AND XCB_DAMAGE_FOUND) +- set(HAVE_XCB_COMPOSITE 1) +-endif() +- +-find_package(OpenGL) +- +-find_package(EGL MODULE) +-message("EGL:"${EGL_FOUND}) +-if (${EGL_FOUND}) +- set(HAVE_EGL 1) +-endif() +- +-message("OPENGL:"${OPENGL_FOUND},${Qt5Gui_OPENGL_IMPLEMENTATION}) +-if(OPENGL_FOUND AND (${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GL")) +- set(HAVE_GLX ${HAVE_X11}) +-else() +- set(HAVE_GLX 0) +-endif() +- +-message("MACRO:"${HAVE_X11},${HAVE_XCB_COMPOSITE},${HAVE_EGL},${HAVE_GLX}) +- +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/globalconfig.h.in ${CMAKE_CURRENT_SOURCE_DIR}/globalconfig.h) +- +-find_package(Qt5Quick REQUIRED) +-find_package(Qt5QuickWidgets REQUIRED) +-find_package(KF5Config REQUIRED) +-find_package(KF5GlobalAccel REQUIRED) +-find_package(KF5I18n REQUIRED) +-find_package(PkgConfig REQUIRED) +-find_package(Qt5LinguistTools REQUIRED) +-find_package(Qt5 REQUIRED NO_MODULE COMPONENTS X11Extras Concurrent) +- +-pkg_check_modules(KDK REQUIRED kysdk-sysinfo) +-pkg_check_modules(DATACOLLECT REQUIRED kysdk-datacollect) ++find_package(QT NAMES Qt6 Qt5 COMPONENTS LinguistTools REQUIRED) ++find_package(Qt${QT_VERSION_MAJOR} COMPONENTS LinguistTools REQUIRED) + +-include_directories(${KDK_INCLUDE_DIRS}) +-include_directories(${DATACOLLECT_INCLUDE_DIRS}) ++file(GLOB TS_FILES translations/*.ts) ++set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/translations) ++qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/ukui-window-switch-wlcom ${CMAKE_CURRENT_SOURCE_DIR}/ukui-window-switch-kwineffect ${CMAKE_CURRENT_SOURCE_DIR}/qml ${TS_FILES} OPTIONS -no-obsolete -no-ui-lines) + +-# 注意要链接到kwin,如果本地安装了kwin的依赖,记得注意区分 +-include_directories(/usr/include/) ++add_custom_target(generate_qm ALL DEPENDS ${QM_FILES}) + ++set(TRANSLATION_DIR "/usr/share/ukui-window-switch/translations/") ++add_compile_definitions(TRANSLATION_DIR="${TRANSLATION_DIR}") + +-# translation +-find_package(QT NAMES Qt6 Qt5 COMPONENTS LinguistTools REQUIRED) +-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS LinguistTools REQUIRED) + add_subdirectory(ukui-window-switch-kwineffect) + add_subdirectory(ukui-window-switch-wlcom) + install(FILES ukui-window-switch DESTINATION /usr/bin/) + install(FILES ukui-window-switch.desktop DESTINATION /etc/xdg/autostart/) ++install(FILES ${QM_FILES} DESTINATION ${TRANSLATION_DIR}) +diff --git a/windowsview/data.qrc b/windowsview/data.qrc +index a0a1fa6..9cb6b9e 100644 +--- a/windowsview/data.qrc ++++ b/windowsview/data.qrc +@@ -17,16 +17,6 @@ + <file>qml/TabletViewMain.qml</file> + <file>qml/TabletViewCloseButton.qml</file> + <file>qml/CloseButton.qml</file> +- <file>ukui-window-switch_zh_CN.qm</file> +- <file>ukui-window-switch_bo_CN.qm</file> +- <file>ukui-window-switch_de.qm</file> +- <file>ukui-window-switch_es.qm</file> +- <file>ukui-window-switch_fr.qm</file> +- <file>ukui-window-switch_kk.qm</file> +- <file>ukui-window-switch_ky.qm</file> +- <file>ukui-window-switch_mn.qm</file> +- <file>ukui-window-switch_ug.qm</file> +- <file>ukui-window-switch_zh_Hant.qm</file> + <file>qml/ArrowButton.qml</file> + <file>images/icon-arrow-white.svg</file> + <file>images/icon-arrow-black.svg</file> +diff --git a/windowsview/multitaskviewmodel.h b/windowsview/multitaskviewmodel.h +index 24bb5db..8cc7a01 100644 +--- a/windowsview/multitaskviewmodel.h ++++ b/windowsview/multitaskviewmodel.h +@@ -26,10 +26,13 @@ + #include <QRect> + #include <QVariantList> + #include <QString> +-#include <kwineffects.h> + #include "multitaskviewmodelhandler.h" + ++#ifdef KWINEFFECT ++#include <kwineffects.h> + using namespace KWin; ++#endif ++ + class QGSettings; + + class Window +diff --git a/windowsview/translations/ukui-window-switch_ar.ts b/windowsview/translations/ukui-window-switch_ar.ts +new file mode 100644 +index 0000000..ac74db9 +--- /dev/null ++++ b/windowsview/translations/ukui-window-switch_ar.ts +@@ -0,0 +1,33 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="ar" sourcelanguage="en_US"> ++<context> ++ <name>NewDesktopButton</name> ++ <message> ++ <location filename="../qml/NewDesktopButton.qml" line="105"/> ++ <source>New Desktop</source> ++ <translation>سطح مكتب جديد</translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewMain</name> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="176"/> ++ <source>No recent tasks</source> ++ <translation>لا توجد مهام حديثة</translation> ++ </message> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="353"/> ++ <source>Clear</source> ++ <translation>واضح</translation> ++ </message> ++</context> ++<context> ++ <name>VirtualDesktopWindow</name> ++ <message> ++ <location filename="../qml/VirtualDesktopWindow.qml" line="189"/> ++ <source>Desktop</source> ++ <translation>سطح المكتب</translation> ++ </message> ++</context> ++</TS> +diff --git a/windowsview/translations/ukui-window-switch_bo_CN.ts b/windowsview/translations/ukui-window-switch_bo_CN.ts +new file mode 100644 +index 0000000..7c2f960 +--- /dev/null ++++ b/windowsview/translations/ukui-window-switch_bo_CN.ts +@@ -0,0 +1,33 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="bo_CN" sourcelanguage="en_US"> ++<context> ++ <name>NewDesktopButton</name> ++ <message> ++ <location filename="../qml/NewDesktopButton.qml" line="105"/> ++ <source>New Desktop</source> ++ <translation type="unfinished">གསར་དུ་བཙུགས་པའི་ལས་དོན་ཁུལ།</translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewMain</name> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="176"/> ++ <source>No recent tasks</source> ++ <translation type="unfinished">ཉེ་ལམ་གྱི་ལས་འགན་གང་ཡང་མེད།</translation> ++ </message> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="353"/> ++ <source>Clear</source> ++ <translation type="unfinished">གསལ་པོར་བཤད་ན།</translation> ++ </message> ++</context> ++<context> ++ <name>VirtualDesktopWindow</name> ++ <message> ++ <location filename="../qml/VirtualDesktopWindow.qml" line="189"/> ++ <source>Desktop</source> ++ <translation type="unfinished">ལས་སྒྲུབ་ཁུལ།</translation> ++ </message> ++</context> ++</TS> +diff --git a/windowsview/translations/ukui-window-switch_de.ts b/windowsview/translations/ukui-window-switch_de.ts +new file mode 100644 +index 0000000..faae1ba +--- /dev/null ++++ b/windowsview/translations/ukui-window-switch_de.ts +@@ -0,0 +1,33 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="de" sourcelanguage="en_US"> ++<context> ++ <name>NewDesktopButton</name> ++ <message> ++ <location filename="../qml/NewDesktopButton.qml" line="105"/> ++ <source>New Desktop</source> ++ <translation type="unfinished">Neuer Desktop</translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewMain</name> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="176"/> ++ <source>No recent tasks</source> ++ <translation type="unfinished">Keine aktuellen Aufgaben</translation> ++ </message> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="353"/> ++ <source>Clear</source> ++ <translation type="unfinished">Klar</translation> ++ </message> ++</context> ++<context> ++ <name>VirtualDesktopWindow</name> ++ <message> ++ <location filename="../qml/VirtualDesktopWindow.qml" line="189"/> ++ <source>Desktop</source> ++ <translation type="unfinished">Desktop</translation> ++ </message> ++</context> ++</TS> +diff --git a/windowsview/translations/ukui-window-switch_es.ts b/windowsview/translations/ukui-window-switch_es.ts +new file mode 100644 +index 0000000..12910e8 +--- /dev/null ++++ b/windowsview/translations/ukui-window-switch_es.ts +@@ -0,0 +1,33 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="es" sourcelanguage="en_US"> ++<context> ++ <name>NewDesktopButton</name> ++ <message> ++ <location filename="../qml/NewDesktopButton.qml" line="105"/> ++ <source>New Desktop</source> ++ <translation type="unfinished">Nuevo escritorio</translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewMain</name> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="176"/> ++ <source>No recent tasks</source> ++ <translation type="unfinished">No hay tareas recientes</translation> ++ </message> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="353"/> ++ <source>Clear</source> ++ <translation type="unfinished">Claro</translation> ++ </message> ++</context> ++<context> ++ <name>VirtualDesktopWindow</name> ++ <message> ++ <location filename="../qml/VirtualDesktopWindow.qml" line="189"/> ++ <source>Desktop</source> ++ <translation type="unfinished">Escritorio</translation> ++ </message> ++</context> ++</TS> +diff --git a/windowsview/translations/ukui-window-switch_fr.ts b/windowsview/translations/ukui-window-switch_fr.ts +new file mode 100644 +index 0000000..a45c5f6 +--- /dev/null ++++ b/windowsview/translations/ukui-window-switch_fr.ts +@@ -0,0 +1,33 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="fr" sourcelanguage="en_US"> ++<context> ++ <name>NewDesktopButton</name> ++ <message> ++ <location filename="../qml/NewDesktopButton.qml" line="105"/> ++ <source>New Desktop</source> ++ <translation type="unfinished">Nouveau bureau</translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewMain</name> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="176"/> ++ <source>No recent tasks</source> ++ <translation type="unfinished">Pas de tâches récentes</translation> ++ </message> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="353"/> ++ <source>Clear</source> ++ <translation type="unfinished">Clair</translation> ++ </message> ++</context> ++<context> ++ <name>VirtualDesktopWindow</name> ++ <message> ++ <location filename="../qml/VirtualDesktopWindow.qml" line="189"/> ++ <source>Desktop</source> ++ <translation type="unfinished">Bureau</translation> ++ </message> ++</context> ++</TS> +diff --git a/windowsview/translations/ukui-window-switch_kk.ts b/windowsview/translations/ukui-window-switch_kk.ts +new file mode 100644 +index 0000000..36a1339 +--- /dev/null ++++ b/windowsview/translations/ukui-window-switch_kk.ts +@@ -0,0 +1,33 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="kk" sourcelanguage="en_US"> ++<context> ++ <name>NewDesktopButton</name> ++ <message> ++ <location filename="../qml/NewDesktopButton.qml" line="105"/> ++ <source>New Desktop</source> ++ <translation type="unfinished">Жаңа үстел</translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewMain</name> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="176"/> ++ <source>No recent tasks</source> ++ <translation type="unfinished">Соңғы тапсырмалар жоқ</translation> ++ </message> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="353"/> ++ <source>Clear</source> ++ <translation type="unfinished">Тазалау</translation> ++ </message> ++</context> ++<context> ++ <name>VirtualDesktopWindow</name> ++ <message> ++ <location filename="../qml/VirtualDesktopWindow.qml" line="189"/> ++ <source>Desktop</source> ++ <translation type="unfinished">Жұмыс үстелі</translation> ++ </message> ++</context> ++</TS> +diff --git a/windowsview/translations/ukui-window-switch_ky.ts b/windowsview/translations/ukui-window-switch_ky.ts +new file mode 100644 +index 0000000..49dbde9 +--- /dev/null ++++ b/windowsview/translations/ukui-window-switch_ky.ts +@@ -0,0 +1,33 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="ky" sourcelanguage="en_US"> ++<context> ++ <name>NewDesktopButton</name> ++ <message> ++ <location filename="../qml/NewDesktopButton.qml" line="105"/> ++ <source>New Desktop</source> ++ <translation type="unfinished">Жаңы иш столу</translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewMain</name> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="176"/> ++ <source>No recent tasks</source> ++ <translation type="unfinished">Акыркы милдеттер жок</translation> ++ </message> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="353"/> ++ <source>Clear</source> ++ <translation type="unfinished">Тазалоо</translation> ++ </message> ++</context> ++<context> ++ <name>VirtualDesktopWindow</name> ++ <message> ++ <location filename="../qml/VirtualDesktopWindow.qml" line="189"/> ++ <source>Desktop</source> ++ <translation type="unfinished">Иш столу</translation> ++ </message> ++</context> ++</TS> +diff --git a/windowsview/translations/ukui-window-switch_mn.ts b/windowsview/translations/ukui-window-switch_mn.ts +new file mode 100644 +index 0000000..c288363 +--- /dev/null ++++ b/windowsview/translations/ukui-window-switch_mn.ts +@@ -0,0 +1,33 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="mn" sourcelanguage="en_US"> ++<context> ++ <name>NewDesktopButton</name> ++ <message> ++ <location filename="../qml/NewDesktopButton.qml" line="105"/> ++ <source>New Desktop</source> ++ <translation type="unfinished">ᠱᠢᠨᠡᠪᠡᠷ ᠪᠠᠢᠭᠤᠯᠤᠭ᠍ᠰᠠᠨ ᠠᠵᠢᠯᠯᠠᠬᠤ ᠤᠷᠤᠨ</translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewMain</name> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="176"/> ++ <source>No recent tasks</source> ++ <translation type="unfinished">ᠨᠡᠬᠡᠬᠡᠬᠦ᠌ ᠬᠡᠷᠡᠭᠯᠡᠭᠡ ᠪᠠᠢᠬᠤ ᠦᠬᠡᠢ</translation> ++ </message> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="353"/> ++ <source>Clear</source> ++ <translation type="unfinished">ᠠᠷᠢᠯᠭᠠᠬᠤ</translation> ++ </message> ++</context> ++<context> ++ <name>VirtualDesktopWindow</name> ++ <message> ++ <location filename="../qml/VirtualDesktopWindow.qml" line="189"/> ++ <source>Desktop</source> ++ <translation type="unfinished">ᠠᠵᠢᠯᠯᠠᠬᠤ ᠤᠷᠤᠨ</translation> ++ </message> ++</context> ++</TS> +diff --git a/windowsview/translations/ukui-window-switch_ug.ts b/windowsview/translations/ukui-window-switch_ug.ts +new file mode 100644 +index 0000000..06db3df +--- /dev/null ++++ b/windowsview/translations/ukui-window-switch_ug.ts +@@ -0,0 +1,33 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="ug" sourcelanguage="en_US"> ++<context> ++ <name>NewDesktopButton</name> ++ <message> ++ <location filename="../qml/NewDesktopButton.qml" line="105"/> ++ <source>New Desktop</source> ++ <translation>يېڭى ئۈستەلئۈستى</translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewMain</name> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="176"/> ++ <source>No recent tasks</source> ++ <translation>يېقىنقى ۋەزىپىلەر يوق</translation> ++ </message> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="353"/> ++ <source>Clear</source> ++ <translation>تازىلاش</translation> ++ </message> ++</context> ++<context> ++ <name>VirtualDesktopWindow</name> ++ <message> ++ <location filename="../qml/VirtualDesktopWindow.qml" line="189"/> ++ <source>Desktop</source> ++ <translation>ئۈستەل يۈزى</translation> ++ </message> ++</context> ++</TS> +diff --git a/windowsview/translations/ukui-window-switch_vi.ts b/windowsview/translations/ukui-window-switch_vi.ts +new file mode 100644 +index 0000000..5650eb2 +--- /dev/null ++++ b/windowsview/translations/ukui-window-switch_vi.ts +@@ -0,0 +1,33 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="vi" sourcelanguage="en_US"> ++<context> ++ <name>NewDesktopButton</name> ++ <message> ++ <location filename="../qml/NewDesktopButton.qml" line="105"/> ++ <source>New Desktop</source> ++ <translation>Máy tính để bàn mới</translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewMain</name> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="176"/> ++ <source>No recent tasks</source> ++ <translation>Không có nhiệm vụ gần đây</translation> ++ </message> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="353"/> ++ <source>Clear</source> ++ <translation>Trong</translation> ++ </message> ++</context> ++<context> ++ <name>VirtualDesktopWindow</name> ++ <message> ++ <location filename="../qml/VirtualDesktopWindow.qml" line="189"/> ++ <source>Desktop</source> ++ <translation>Bàn làm việc</translation> ++ </message> ++</context> ++</TS> +diff --git a/windowsview/translations/ukui-window-switch_zh_CN.ts b/windowsview/translations/ukui-window-switch_zh_CN.ts +new file mode 100644 +index 0000000..68a5278 +--- /dev/null ++++ b/windowsview/translations/ukui-window-switch_zh_CN.ts +@@ -0,0 +1,33 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="zh_CN" sourcelanguage="en_US"> ++<context> ++ <name>NewDesktopButton</name> ++ <message> ++ <location filename="../qml/NewDesktopButton.qml" line="105"/> ++ <source>New Desktop</source> ++ <translation type="unfinished">新建工作区</translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewMain</name> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="176"/> ++ <source>No recent tasks</source> ++ <translation type="unfinished">无应用开启</translation> ++ </message> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="353"/> ++ <source>Clear</source> ++ <translation type="unfinished">清除</translation> ++ </message> ++</context> ++<context> ++ <name>VirtualDesktopWindow</name> ++ <message> ++ <location filename="../qml/VirtualDesktopWindow.qml" line="189"/> ++ <source>Desktop</source> ++ <translation type="unfinished">工作区</translation> ++ </message> ++</context> ++</TS> +diff --git a/windowsview/translations/ukui-window-switch_zh_Hant.ts b/windowsview/translations/ukui-window-switch_zh_Hant.ts +new file mode 100644 +index 0000000..cf3b024 +--- /dev/null ++++ b/windowsview/translations/ukui-window-switch_zh_Hant.ts +@@ -0,0 +1,33 @@ ++<?xml version="1.0" encoding="utf-8"?> ++<!DOCTYPE TS> ++<TS version="2.1" language="zh_Hant" sourcelanguage="en_US"> ++<context> ++ <name>NewDesktopButton</name> ++ <message> ++ <location filename="../qml/NewDesktopButton.qml" line="105"/> ++ <source>New Desktop</source> ++ <translation type="unfinished">新桌面</translation> ++ </message> ++</context> ++<context> ++ <name>TabletViewMain</name> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="176"/> ++ <source>No recent tasks</source> ++ <translation type="unfinished">無應用開啟</translation> ++ </message> ++ <message> ++ <location filename="../qml/TabletViewMain.qml" line="353"/> ++ <source>Clear</source> ++ <translation type="unfinished">清除</translation> ++ </message> ++</context> ++<context> ++ <name>VirtualDesktopWindow</name> ++ <message> ++ <location filename="../qml/VirtualDesktopWindow.qml" line="189"/> ++ <source>Desktop</source> ++ <translation type="unfinished">桌面</translation> ++ </message> ++</context> ++</TS> +diff --git a/windowsview/ukui-window-switch b/windowsview/ukui-window-switch +index ee703c1..153c407 100755 +--- a/windowsview/ukui-window-switch ++++ b/windowsview/ukui-window-switch +@@ -13,4 +13,4 @@ else + if [ $process_count -gt 0 ]; then + /usr/bin/ukui-window-switch-wlcom + fi +-fi ++fi +\ No newline at end of file +diff --git a/windowsview/ukui-window-switch-kwineffect/CMakeLists.txt b/windowsview/ukui-window-switch-kwineffect/CMakeLists.txt +index b572c2e..9836fdc 100644 +--- a/windowsview/ukui-window-switch-kwineffect/CMakeLists.txt ++++ b/windowsview/ukui-window-switch-kwineffect/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5) ++cmake_minimum_required(VERSION 3.16) + + # 调试多任务视图需要取消注释下面 + # add_definitions("-Wall -g") +@@ -6,7 +6,6 @@ set(PLUGIN_NAME "windowsview") + + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) +-set(CMAKE_AUTOUIC ON) + set(CMAKE_AUTORCC ON) + + set(CMAKE_CXX_STANDARD 14) +@@ -17,43 +16,14 @@ set(KF5_DEP_VERSION "5.54.0") + find_package(ECM 5.54.0 NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) + +-find_package(X11 MODULE) +-find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER) +-message("XCB:"${X11_FOUND}, ${XCB_XCB_FOUND}, ${XCB_COMPOSITE_FOUND}, ${XCB_DAMAGE_FOUND}) +-if(X11_FOUND AND XCB_XCB_FOUND) +- set(HAVE_X11 1) +-endif() +-if(HAVE_X11 AND XCB_COMPOSITE_FOUND AND XCB_DAMAGE_FOUND) +- set(HAVE_XCB_COMPOSITE 1) +-endif() +- + find_package(OpenGL) +- + find_package(EGL MODULE) +-message("EGL:"${EGL_FOUND}) +-if (${EGL_FOUND}) +- set(HAVE_EGL 1) +-endif() +- +-message("OPENGL:"${OPENGL_FOUND},${Qt5Gui_OPENGL_IMPLEMENTATION}) +-if(OPENGL_FOUND AND (${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GL")) +- set(HAVE_GLX ${HAVE_X11}) +-else() +- set(HAVE_GLX 0) +-endif() +- +-message("MACRO:"${HAVE_X11},${HAVE_XCB_COMPOSITE},${HAVE_EGL},${HAVE_GLX}) +- +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../globalconfig.h.in ${CMAKE_CURRENT_SOURCE_DIR}/../globalconfig.h) +- +-find_package(Qt5Quick REQUIRED) +-find_package(Qt5QuickWidgets REQUIRED) + find_package(KF5Config REQUIRED) + find_package(KF5GlobalAccel REQUIRED) + find_package(KF5I18n REQUIRED) + find_package(PkgConfig REQUIRED) + find_package(Qt5LinguistTools REQUIRED) +-find_package(Qt5 REQUIRED NO_MODULE COMPONENTS X11Extras Concurrent) ++find_package(Qt5 REQUIRED NO_MODULE COMPONENTS X11Extras Concurrent Quick DBus) + + pkg_check_modules(KDK REQUIRED kysdk-sysinfo) + pkg_check_modules(DATACOLLECT REQUIRED kysdk-datacollect) +@@ -61,9 +31,6 @@ pkg_check_modules(DATACOLLECT REQUIRED kysdk-datacollect) + include_directories(${KDK_INCLUDE_DIRS}) + include_directories(${DATACOLLECT_INCLUDE_DIRS}) + +-# 注意要链接到kwin,如果本地安装了kwin的依赖,记得注意区分 +-include_directories(/usr/include/) +- + add_definitions(-DKWINEFFECT=1) + + set(SRCS ../desktopbackground.cpp +@@ -76,60 +43,29 @@ set(SRCS ../desktopbackground.cpp + multitaskviewmodelbycompositehandler.cpp + ) + +-# translation +-find_package(QT NAMES Qt6 Qt5 COMPONENTS LinguistTools REQUIRED) +-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS LinguistTools REQUIRED) +- +-set(TS_FILES) +-set(QM_FILES) +- +-file(GLOB QML_FILES "../qml/*.qml") +- +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_zh_CN.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_bo_CN.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_zh_Hant.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_ug.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_mn.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_ky.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_kk.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_fr.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_es.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_de.ts) +- +-set_source_files_properties(${TS_FILES} +- PROPERTIES OUTPUT_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../) +- +-qt5_create_translation(QM_FILES ${TS_FILES} ${QML_FILES}) +- +-add_custom_target(lupdate_task DEPENDS ${TS_FILES}) +- +-add_custom_target(lrelease_task DEPENDS ${QM_FILES}) +- + qt5_add_resources(SRCS ../data.qrc) + add_library( + ${PLUGIN_NAME} MODULE + ${SRCS} +- ${QM_FILES} + ) + + target_link_libraries( +- ${PLUGIN_NAME} +- PUBLIC +- Qt5::Core +- Qt5::Gui +- Qt5::Widgets +- Qt5::Quick +- Qt5::QuickWidgets +- PRIVATE +- KF5::ConfigCore +- KF5::WindowSystem +- KF5::CoreAddons +- KF5::GlobalAccel +- Qt5::X11Extras +- Qt5::Concurrent +- ${QGSettings_LIBRARIES} +- ${KDK_LINK_LIBRARIES} +- ${DATACOLLECT_LINK_LIBRARIES} ++ ${PLUGIN_NAME} ++ PUBLIC ++ Qt5::Core ++ Qt5::Gui ++ Qt5::Quick ++ PRIVATE ++ KF5::ConfigCore ++ KF5::WindowSystem ++ KF5::CoreAddons ++ KF5::GlobalAccel ++ Qt5::X11Extras ++ Qt5::Concurrent ++ Qt5::DBus ++ ${QGSettings_LIBRARIES} ++ ${KDK_LINK_LIBRARIES} ++ ${DATACOLLECT_LINK_LIBRARIES} + ) +- +-install(TARGETS ${PLUGIN_NAME} DESTINATION ${INSTALL_PATH}) ++set(INSTALL_PATH ${QT_INSTALL_PLUGINS}/kwin/effects/plugins/) ++install(TARGETS ${PLUGIN_NAME} DESTINATION ${INSTALL_PATH}) +\ No newline at end of file +diff --git a/windowsview/ukui-window-switch-kwineffect/multitaskviewmanager.cpp b/windowsview/ukui-window-switch-kwineffect/multitaskviewmanager.cpp +index 05810dd..9c7a185 100644 +--- a/windowsview/ukui-window-switch-kwineffect/multitaskviewmanager.cpp ++++ b/windowsview/ukui-window-switch-kwineffect/multitaskviewmanager.cpp +@@ -275,7 +275,7 @@ void MultitaskViewManager::installTranslator() + { + m_translator = new QTranslator(qApp); + m_translator->load(QLocale::system(), QLatin1String("ukui-window-switch"), +- QLatin1String("_"), QLatin1String(":/")); ++ QLatin1String("_"), TRANSLATION_DIR); + QApplication::installTranslator(m_translator); + } + +diff --git a/windowsview/ukui-window-switch-wlcom/CMakeLists.txt b/windowsview/ukui-window-switch-wlcom/CMakeLists.txt +index 3128c93..ea7dbfb 100644 +--- a/windowsview/ukui-window-switch-wlcom/CMakeLists.txt ++++ b/windowsview/ukui-window-switch-wlcom/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.5) ++cmake_minimum_required(VERSION 3.16) + + # 调试多任务视图需要取消注释下面 + add_definitions("-Wall -g") +@@ -7,7 +7,6 @@ project(ukui-window-switch-wlcom) + + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) +-set(CMAKE_AUTOUIC ON) + set(CMAKE_AUTORCC ON) + + set(CMAKE_CXX_STANDARD 14) +@@ -15,55 +14,23 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) + + set(KF5_DEP_VERSION "5.54.0") + +-find_package(ECM 5.54.0 NO_MODULE) +-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) +- +-find_package(X11 MODULE) +-find_package(XCB MODULE COMPONENTS XCB COMPOSITE DAMAGE SHAPE XFIXES RENDER) +-message("XCB:"${X11_FOUND}, ${XCB_XCB_FOUND}, ${XCB_COMPOSITE_FOUND}, ${XCB_DAMAGE_FOUND}) +-if(X11_FOUND AND XCB_XCB_FOUND) +- set(HAVE_X11 1) +-endif() +-if(HAVE_X11 AND XCB_COMPOSITE_FOUND AND XCB_DAMAGE_FOUND) +- set(HAVE_XCB_COMPOSITE 1) +-endif() +- +-find_package(OpenGL) +- +-find_package(EGL MODULE) +-message("EGL:"${EGL_FOUND}) +-if (${EGL_FOUND}) +- set(HAVE_EGL 1) +-endif() +- +-message("OPENGL:"${OPENGL_FOUND},${Qt5Gui_OPENGL_IMPLEMENTATION}) +-if(OPENGL_FOUND AND (${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL "GL")) +- set(HAVE_GLX ${HAVE_X11}) +-else() +- set(HAVE_GLX 0) +-endif() +- +-message("MACRO:"${HAVE_X11},${HAVE_XCB_COMPOSITE},${HAVE_EGL},${HAVE_GLX}) +- +-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../globalconfig.h.in ${CMAKE_CURRENT_SOURCE_DIR}/../globalconfig.h) +- +-find_package(Qt5Quick REQUIRED) +-find_package(Qt5QuickWidgets REQUIRED) + find_package(KF5Config REQUIRED) + find_package(KF5GlobalAccel REQUIRED) ++find_package(KF5WindowSystem) + find_package(KF5I18n REQUIRED) + find_package(PkgConfig REQUIRED) +-find_package(Qt5LinguistTools REQUIRED) +-find_package(Qt5 REQUIRED NO_MODULE COMPONENTS X11Extras Concurrent) ++find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Concurrent Quick LinguistTools DBus) + + pkg_check_modules(KDK REQUIRED kysdk-sysinfo) + pkg_check_modules(DATACOLLECT REQUIRED kysdk-datacollect) + pkg_check_modules(KYSDKWAYLANDHELPER_PKG kysdk-waylandhelper) ++pkg_check_modules(GL REQUIRED gl) + + include_directories(${KDK_INCLUDE_DIRS}) + include_directories(${DATACOLLECT_INCLUDE_DIRS}) + include_directories(${WAYLANDHELPER_INCLUDE_DIRS}) + include_directories(${OPENGL_INCLUDE_DIR}) ++include_directories(${GL}) + + set(WLCSRCS main.cpp + log-utils.h log-utils.cpp +@@ -82,35 +49,6 @@ set(WLCSRCS main.cpp + ThumbnailItem.cpp + ) + +-# translation +-find_package(QT NAMES Qt6 Qt5 COMPONENTS LinguistTools REQUIRED) +-find_package(Qt${QT_VERSION_MAJOR} COMPONENTS LinguistTools REQUIRED) +- +-set(TS_FILES) +-set(QM_FILES) +- +-file(GLOB QML_FILES "../qml/*.qml") +- +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_zh_CN.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_bo_CN.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_zh_Hant.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_ug.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_mn.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_ky.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_kk.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_fr.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_es.ts) +-list(APPEND TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../ukui-window-switch_de.ts) +- +-set_source_files_properties(${TS_FILES} +- PROPERTIES OUTPUT_LOCATION ${CMAKE_CURRENT_SOURCE_DIR}/../) +- +-qt5_create_translation(QM_FILES ${TS_FILES} ${QML_FILES}) +- +-add_custom_target(wlupdate_task DEPENDS ${TS_FILES}) +- +-add_custom_target(wlrelease_task DEPENDS ${QM_FILES}) +- + add_subdirectory(qtsingleapplication) + include_directories(qtsingleapplication/src) + +@@ -118,35 +56,34 @@ qt5_add_resources(WLCSRCS ../data.qrc) + + add_executable(ukui-window-switch-wlcom + ${WLCSRCS} +- ${QM_FILES} + ) + + target_include_directories(ukui-window-switch-wlcom PRIVATE ${KYSDKWAYLANDHELPER_PKG_INCLUDE_DIRS}) + target_link_directories(ukui-window-switch-wlcom PRIVATE ${KYSDKWAYLANDHELPER_PKG_LIBRARY_DIRS} KF5::WindowSystem) + ++target_compile_definitions(${PROJECT_NAME} PRIVATE $<$<CONFIG:Debug>:DISABLE_LOG_FILE>) ++target_compile_definitions(${PROJECT_NAME} PRIVATE $<$<CONFIG:Debug>:QT_QML_DEBUG>) ++ + target_link_libraries( +- ukui-window-switch-wlcom +- PUBLIC +- Qt5::Core +- Qt5::GuiPrivate +- Qt5::Widgets +- Qt5::Quick +- Qt5::QuickWidgets +- PRIVATE +- KF5::ConfigCore +- KF5::WindowSystem +- KF5::CoreAddons +- KF5::GlobalAccel +- Qt5::X11Extras +- Qt5::Concurrent +- qtsingleapplication +- kywc +- ${QGSettings_LIBRARIES} +- ${KYSDKWAYLANDHELPER_PKG_LIBRARIES} +- ${KDK_LINK_LIBRARIES} +- ${DATACOLLECT_LINK_LIBRARIES} +- ${OPENGL_gl_LIBRARY} +- ${EGL_LIBRARY} ++ ukui-window-switch-wlcom ++ PUBLIC ++ Qt5::Core ++ Qt5::GuiPrivate ++ Qt5::Quick ++ PRIVATE ++ KF5::WindowSystem ++ KF5::GlobalAccel ++ Qt5::Concurrent ++ Qt5::DBus ++ qtsingleapplication ++ kywc ++ ${QGSettings_LIBRARIES} ++ ${KYSDKWAYLANDHELPER_PKG_LIBRARIES} ++ ${KDK_LINK_LIBRARIES} ++ ${DATACOLLECT_LINK_LIBRARIES} ++ ${OPENGL_gl_LIBRARY} ++ ${EGL_LIBRARY} ++ ${GL_LIBRARIES} + ) + +-install(TARGETS ukui-window-switch-wlcom ${INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS ukui-window-switch-wlcom DESTINATION /usr/bin) +diff --git a/windowsview/ukui-window-switch-wlcom/main.cpp b/windowsview/ukui-window-switch-wlcom/main.cpp +index c962097..9950d0c 100644 +--- a/windowsview/ukui-window-switch-wlcom/main.cpp ++++ b/windowsview/ukui-window-switch-wlcom/main.cpp +@@ -28,7 +28,7 @@ + + int main(int argc, char *argv[]) + { +-#ifndef PANEL_DISABLE_LOG_FILE ++#ifndef DISABLE_LOG_FILE + LogUtils::initLogFile("ukui-window-switch-wlcom"); + qInstallMessageHandler(LogUtils::messageOutput); + #endif +@@ -39,15 +39,18 @@ int main(int argc, char *argv[]) + parser.process(a); + if (a.isRunning()) + { +- if (parser.isSet("show-workspace")) { ++ if (parser.isSet(showWorkSpaceOption)) { + a.sendMessage(QApplication::arguments().length() > 1 ? QApplication::arguments().at(1) : a.applicationFilePath()); + } + return EXIT_SUCCESS; + } + + MultitaskViewManagerByWlcom m; ++ if (parser.isSet(showWorkSpaceOption)) { ++ m.open(); ++ } + QObject::connect(&a, &QtSingleApplication::messageReceived, [&m](){ + m.open(); + }); +- return a.exec(); ++ return QtSingleApplication::exec(); + } +diff --git a/windowsview/ukui-window-switch-wlcom/multitaskviewmanagerbywlcom.cpp b/windowsview/ukui-window-switch-wlcom/multitaskviewmanagerbywlcom.cpp +index d4420f1..74e54df 100644 +--- a/windowsview/ukui-window-switch-wlcom/multitaskviewmanagerbywlcom.cpp ++++ b/windowsview/ukui-window-switch-wlcom/multitaskviewmanagerbywlcom.cpp +@@ -20,7 +20,6 @@ + + // kf5 + #include <KF5/KGlobalAccel/KGlobalAccel> +-#include <KF5/KWindowSystem/KWindowSystem> + #include <KF5/KWindowSystem/KWindowEffects> + + // kysdk +@@ -369,7 +368,7 @@ void MultitaskViewManagerByWlcom::installTranslator() + { + m_translator = new QTranslator(qApp); + m_translator->load(QLocale::system(), QLatin1String("ukui-window-switch"), +- QLatin1String("_"), QLatin1String(":/")); ++ QLatin1String("_"), TRANSLATION_DIR); + QApplication::installTranslator(m_translator); + } + +diff --git a/windowsview/ukui-window-switch-wlcom/multitaskviewmodelbywlcomhandler.cpp b/windowsview/ukui-window-switch-wlcom/multitaskviewmodelbywlcomhandler.cpp +index 95f354c..8a698dd 100644 +--- a/windowsview/ukui-window-switch-wlcom/multitaskviewmodelbywlcomhandler.cpp ++++ b/windowsview/ukui-window-switch-wlcom/multitaskviewmodelbywlcomhandler.cpp +@@ -28,6 +28,8 @@ + #include <QEventLoop> + #include <qpa/qplatformnativeinterface.h> + #include <iostream> ++#include <KWindowSystem> ++ + #include "multitaskviewmanagerbywlcom.h" + using namespace std; + +diff --git a/windowsview/ukui-window-switch-wlcom/multitaskviewmodelbywlcomhandler.h b/windowsview/ukui-window-switch-wlcom/multitaskviewmodelbywlcomhandler.h +index 6f3417a..4762469 100644 +--- a/windowsview/ukui-window-switch-wlcom/multitaskviewmodelbywlcomhandler.h ++++ b/windowsview/ukui-window-switch-wlcom/multitaskviewmodelbywlcomhandler.h +@@ -26,9 +26,6 @@ + #include <QMap> + #include <QRect> + #include <QVariantList> +-#include <KWindowSystem/KWindowSystem> +-#include <KWindowSystem/KWindowInfo> +-#include <KWindowSystem/NETWM> + #include "context.h" + + class MultitaskViewModelByWlcomHandler : public MultitaskViewModelHandler +diff --git a/windowsview/ukui-window-switch_ar.ts b/windowsview/ukui-window-switch_ar.ts +deleted file mode 100644 +index bf0b6c9..0000000 +--- a/windowsview/ukui-window-switch_ar.ts ++++ /dev/null +@@ -1,62 +0,0 @@ +-<?xml version="1.0" encoding="utf-8"?> +-<!DOCTYPE TS> +-<TS version="2.1" language="ar" sourcelanguage="en_US"> +-<context> +- <name>DesktopArea</name> +- <message> +- <source>Desktop</source> +- <translatorcomment>工作区</translatorcomment> +- <translation type="vanished">工作区</translation> +- </message> +- <message> +- <source>New Desktop</source> +- <translatorcomment>新建工作区</translatorcomment> +- <translation type="vanished">新建工作区</translation> +- </message> +-</context> +-<context> +- <name>NewDesktopButton</name> +- <message> +- <location filename="qml/NewDesktopButton.qml" line="104"/> +- <source>New Desktop</source> +- <translation>سطح مكتب جديد</translation> +- </message> +-</context> +-<context> +- <name>TabletViewClearAllWindowButton</name> +- <message> +- <source>Clear</source> +- <translatorcomment>清除</translatorcomment> +- <translation type="vanished">清除</translation> +- </message> +-</context> +-<context> +- <name>TabletViewMain</name> +- <message> +- <location filename="qml/TabletViewMain.qml" line="174"/> +- <source>No recent tasks</source> +- <translation>لا توجد مهام حديثة</translation> +- </message> +- <message> +- <location filename="qml/TabletViewMain.qml" line="357"/> +- <source>Clear</source> +- <translation>واضح</translation> +- </message> +-</context> +-<context> +- <name>TabletViewRootWindow</name> +- <message> +- <source>No recent tasks</source> +- <translatorcomment>无应用开启</translatorcomment> +- <translation type="vanished">无应用开启</translation> +- </message> +-</context> +-<context> +- <name>VirtualDesktopWindow</name> +- <message> +- <location filename="qml/VirtualDesktopWindow.qml" line="187"/> +- <source>Desktop</source> +- <translation>سطح المكتب</translation> +- </message> +-</context> +-</TS> +diff --git a/windowsview/ukui-window-switch_bo_CN.ts b/windowsview/ukui-window-switch_bo_CN.ts +deleted file mode 100644 +index 210d9a1..0000000 +--- a/windowsview/ukui-window-switch_bo_CN.ts ++++ /dev/null +@@ -1,62 +0,0 @@ +-<?xml version="1.0" encoding="utf-8"?> +-<!DOCTYPE TS> +-<TS version="2.1" language="bo_CN" sourcelanguage="en_US"> +-<context> +- <name>DesktopArea</name> +- <message> +- <source>Desktop</source> +- <translatorcomment>工作区</translatorcomment> +- <translation type="vanished">ལས་སྒྲུབ་ཁུལ།</translation> +- </message> +- <message> +- <source>New Desktop</source> +- <translatorcomment>新建工作区</translatorcomment> +- <translation type="vanished">གསར་དུ་བཙུགས་པའི་ལས་དོན་ཁུལ།</translation> +- </message> +-</context> +-<context> +- <name>NewDesktopButton</name> +- <message> +- <location filename="qml/NewDesktopButton.qml" line="104"/> +- <source>New Desktop</source> +- <translation type="unfinished">གསར་དུ་བཙུགས་པའི་ལས་དོན་ཁུལ།</translation> +- </message> +-</context> +-<context> +- <name>TabletViewClearAllWindowButton</name> +- <message> +- <source>Clear</source> +- <translatorcomment>清除</translatorcomment> +- <translation type="vanished">གསལ་པོར་བཤད་ན།</translation> +- </message> +-</context> +-<context> +- <name>TabletViewMain</name> +- <message> +- <location filename="qml/TabletViewMain.qml" line="174"/> +- <source>No recent tasks</source> +- <translation type="unfinished">ཉེ་ལམ་གྱི་ལས་འགན་གང་ཡང་མེད།</translation> +- </message> +- <message> +- <location filename="qml/TabletViewMain.qml" line="357"/> +- <source>Clear</source> +- <translation type="unfinished">གསལ་པོར་བཤད་ན།</translation> +- </message> +-</context> +-<context> +- <name>TabletViewRootWindow</name> +- <message> +- <source>No recent tasks</source> +- <translatorcomment>无应用开启</translatorcomment> +- <translation type="vanished">ཉེ་ལམ་གྱི་ལས་འགན་གང་ཡང་མེད།</translation> +- </message> +-</context> +-<context> +- <name>VirtualDesktopWindow</name> +- <message> +- <location filename="qml/VirtualDesktopWindow.qml" line="187"/> +- <source>Desktop</source> +- <translation type="unfinished">ལས་སྒྲུབ་ཁུལ།</translation> +- </message> +-</context> +-</TS> +diff --git a/windowsview/ukui-window-switch_de.ts b/windowsview/ukui-window-switch_de.ts +deleted file mode 100644 +index b79eefa..0000000 +--- a/windowsview/ukui-window-switch_de.ts ++++ /dev/null +@@ -1,62 +0,0 @@ +-<?xml version="1.0" encoding="utf-8"?> +-<!DOCTYPE TS> +-<TS version="2.1" language="de" sourcelanguage="en_US"> +-<context> +- <name>DesktopArea</name> +- <message> +- <source>Desktop</source> +- <translatorcomment>工作区</translatorcomment> +- <translation type="vanished">Desktop</translation> +- </message> +- <message> +- <source>New Desktop</source> +- <translatorcomment>新建工作区</translatorcomment> +- <translation type="vanished">Neuer Desktop</translation> +- </message> +-</context> +-<context> +- <name>NewDesktopButton</name> +- <message> +- <location filename="qml/NewDesktopButton.qml" line="104"/> +- <source>New Desktop</source> +- <translation type="unfinished">Neuer Desktop</translation> +- </message> +-</context> +-<context> +- <name>TabletViewClearAllWindowButton</name> +- <message> +- <source>Clear</source> +- <translatorcomment>清除</translatorcomment> +- <translation type="vanished">Klar</translation> +- </message> +-</context> +-<context> +- <name>TabletViewMain</name> +- <message> +- <location filename="qml/TabletViewMain.qml" line="174"/> +- <source>No recent tasks</source> +- <translation type="unfinished">Keine aktuellen Aufgaben</translation> +- </message> +- <message> +- <location filename="qml/TabletViewMain.qml" line="357"/> +- <source>Clear</source> +- <translation type="unfinished">Klar</translation> +- </message> +-</context> +-<context> +- <name>TabletViewRootWindow</name> +- <message> +- <source>No recent tasks</source> +- <translatorcomment>无应用开启</translatorcomment> +- <translation type="vanished">Keine aktuellen Aufgaben</translation> +- </message> +-</context> +-<context> +- <name>VirtualDesktopWindow</name> +- <message> +- <location filename="qml/VirtualDesktopWindow.qml" line="187"/> +- <source>Desktop</source> +- <translation type="unfinished">Desktop</translation> +- </message> +-</context> +-</TS> +diff --git a/windowsview/ukui-window-switch_es.ts b/windowsview/ukui-window-switch_es.ts +deleted file mode 100644 +index f316292..0000000 +--- a/windowsview/ukui-window-switch_es.ts ++++ /dev/null +@@ -1,62 +0,0 @@ +-<?xml version="1.0" encoding="utf-8"?> +-<!DOCTYPE TS> +-<TS version="2.1" language="es" sourcelanguage="en_US"> +-<context> +- <name>DesktopArea</name> +- <message> +- <source>Desktop</source> +- <translatorcomment>工作区</translatorcomment> +- <translation type="vanished">Escritorio</translation> +- </message> +- <message> +- <source>New Desktop</source> +- <translatorcomment>新建工作区</translatorcomment> +- <translation type="vanished">Nuevo escritorio</translation> +- </message> +-</context> +-<context> +- <name>NewDesktopButton</name> +- <message> +- <location filename="qml/NewDesktopButton.qml" line="104"/> +- <source>New Desktop</source> +- <translation type="unfinished">Nuevo escritorio</translation> +- </message> +-</context> +-<context> +- <name>TabletViewClearAllWindowButton</name> +- <message> +- <source>Clear</source> +- <translatorcomment>清除</translatorcomment> +- <translation type="vanished">Claro</translation> +- </message> +-</context> +-<context> +- <name>TabletViewMain</name> +- <message> +- <location filename="qml/TabletViewMain.qml" line="174"/> +- <source>No recent tasks</source> +- <translation type="unfinished">No hay tareas recientes</translation> +- </message> +- <message> +- <location filename="qml/TabletViewMain.qml" line="357"/> +- <source>Clear</source> +- <translation type="unfinished">Claro</translation> +- </message> +-</context> +-<context> +- <name>TabletViewRootWindow</name> +- <message> +- <source>No recent tasks</source> +- <translatorcomment>无应用开启</translatorcomment> +- <translation type="vanished">No hay tareas recientes</translation> +- </message> +-</context> +-<context> +- <name>VirtualDesktopWindow</name> +- <message> +- <location filename="qml/VirtualDesktopWindow.qml" line="187"/> +- <source>Desktop</source> +- <translation type="unfinished">Escritorio</translation> +- </message> +-</context> +-</TS> +diff --git a/windowsview/ukui-window-switch_fr.ts b/windowsview/ukui-window-switch_fr.ts +deleted file mode 100644 +index bb4aac9..0000000 +--- a/windowsview/ukui-window-switch_fr.ts ++++ /dev/null +@@ -1,62 +0,0 @@ +-<?xml version="1.0" encoding="utf-8"?> +-<!DOCTYPE TS> +-<TS version="2.1" language="fr" sourcelanguage="en_US"> +-<context> +- <name>DesktopArea</name> +- <message> +- <source>Desktop</source> +- <translatorcomment>工作区</translatorcomment> +- <translation type="vanished">Bureau</translation> +- </message> +- <message> +- <source>New Desktop</source> +- <translatorcomment>新建工作区</translatorcomment> +- <translation type="vanished">Nouveau bureau</translation> +- </message> +-</context> +-<context> +- <name>NewDesktopButton</name> +- <message> +- <location filename="qml/NewDesktopButton.qml" line="104"/> +- <source>New Desktop</source> +- <translation type="unfinished">Nouveau bureau</translation> +- </message> +-</context> +-<context> +- <name>TabletViewClearAllWindowButton</name> +- <message> +- <source>Clear</source> +- <translatorcomment>清除</translatorcomment> +- <translation type="vanished">Clair</translation> +- </message> +-</context> +-<context> +- <name>TabletViewMain</name> +- <message> +- <location filename="qml/TabletViewMain.qml" line="174"/> +- <source>No recent tasks</source> +- <translation type="unfinished">Pas de tâches récentes</translation> +- </message> +- <message> +- <location filename="qml/TabletViewMain.qml" line="357"/> +- <source>Clear</source> +- <translation type="unfinished">Clair</translation> +- </message> +-</context> +-<context> +- <name>TabletViewRootWindow</name> +- <message> +- <source>No recent tasks</source> +- <translatorcomment>无应用开启</translatorcomment> +- <translation type="vanished">Pas de tâches récentes</translation> +- </message> +-</context> +-<context> +- <name>VirtualDesktopWindow</name> +- <message> +- <location filename="qml/VirtualDesktopWindow.qml" line="187"/> +- <source>Desktop</source> +- <translation type="unfinished">Bureau</translation> +- </message> +-</context> +-</TS> +diff --git a/windowsview/ukui-window-switch_kk.ts b/windowsview/ukui-window-switch_kk.ts +deleted file mode 100644 +index b70f893..0000000 +--- a/windowsview/ukui-window-switch_kk.ts ++++ /dev/null +@@ -1,62 +0,0 @@ +-<?xml version="1.0" encoding="utf-8"?> +-<!DOCTYPE TS> +-<TS version="2.1" language="kk" sourcelanguage="en_US"> +-<context> +- <name>DesktopArea</name> +- <message> +- <source>Desktop</source> +- <translatorcomment>工作区</translatorcomment> +- <translation type="vanished">Жұмыс үстелі</translation> +- </message> +- <message> +- <source>New Desktop</source> +- <translatorcomment>新建工作区</translatorcomment> +- <translation type="vanished">Жаңа үстел</translation> +- </message> +-</context> +-<context> +- <name>NewDesktopButton</name> +- <message> +- <location filename="qml/NewDesktopButton.qml" line="104"/> +- <source>New Desktop</source> +- <translation>جاڭا ئۈستەلئۈستى</translation> +- </message> +-</context> +-<context> +- <name>TabletViewClearAllWindowButton</name> +- <message> +- <source>Clear</source> +- <translatorcomment>清除</translatorcomment> +- <translation type="vanished">Тазалау</translation> +- </message> +-</context> +-<context> +- <name>TabletViewMain</name> +- <message> +- <location filename="qml/TabletViewMain.qml" line="174"/> +- <source>No recent tasks</source> +- <translation>جاقىنعى مىندەتتەر جوق</translation> +- </message> +- <message> +- <location filename="qml/TabletViewMain.qml" line="357"/> +- <source>Clear</source> +- <translation>تازالاۋ</translation> +- </message> +-</context> +-<context> +- <name>TabletViewRootWindow</name> +- <message> +- <source>No recent tasks</source> +- <translatorcomment>无应用开启</translatorcomment> +- <translation type="vanished">Соңғы тапсырмалар жоқ</translation> +- </message> +-</context> +-<context> +- <name>VirtualDesktopWindow</name> +- <message> +- <location filename="qml/VirtualDesktopWindow.qml" line="187"/> +- <source>Desktop</source> +- <translation>ئۈستەلئۈستى</translation> +- </message> +-</context> +-</TS> +diff --git a/windowsview/ukui-window-switch_ky.ts b/windowsview/ukui-window-switch_ky.ts +deleted file mode 100644 +index 77a2a21..0000000 +--- a/windowsview/ukui-window-switch_ky.ts ++++ /dev/null +@@ -1,62 +0,0 @@ +-<?xml version="1.0" encoding="utf-8"?> +-<!DOCTYPE TS> +-<TS version="2.1" language="ky" sourcelanguage="en_US"> +-<context> +- <name>DesktopArea</name> +- <message> +- <source>Desktop</source> +- <translatorcomment>工作区</translatorcomment> +- <translation type="vanished">Иш столу</translation> +- </message> +- <message> +- <source>New Desktop</source> +- <translatorcomment>新建工作区</translatorcomment> +- <translation type="vanished">Жаңы иш столу</translation> +- </message> +-</context> +-<context> +- <name>NewDesktopButton</name> +- <message> +- <location filename="qml/NewDesktopButton.qml" line="104"/> +- <source>New Desktop</source> +- <translation>جاڭى ئۈستەلئۈستى</translation> +- </message> +-</context> +-<context> +- <name>TabletViewClearAllWindowButton</name> +- <message> +- <source>Clear</source> +- <translatorcomment>清除</translatorcomment> +- <translation type="vanished">Тазалоо</translation> +- </message> +-</context> +-<context> +- <name>TabletViewMain</name> +- <message> +- <location filename="qml/TabletViewMain.qml" line="174"/> +- <source>No recent tasks</source> +- <translation>جاقىندا مٸلدەتتەر جوق</translation> +- </message> +- <message> +- <location filename="qml/TabletViewMain.qml" line="357"/> +- <source>Clear</source> +- <translation>تازالوو</translation> +- </message> +-</context> +-<context> +- <name>TabletViewRootWindow</name> +- <message> +- <source>No recent tasks</source> +- <translatorcomment>无应用开启</translatorcomment> +- <translation type="vanished">Акыркы милдеттер жок</translation> +- </message> +-</context> +-<context> +- <name>VirtualDesktopWindow</name> +- <message> +- <location filename="qml/VirtualDesktopWindow.qml" line="187"/> +- <source>Desktop</source> +- <translation>ئۈستەلئۈستى</translation> +- </message> +-</context> +-</TS> +diff --git a/windowsview/ukui-window-switch_mn.ts b/windowsview/ukui-window-switch_mn.ts +deleted file mode 100644 +index 179ef7d..0000000 +--- a/windowsview/ukui-window-switch_mn.ts ++++ /dev/null +@@ -1,62 +0,0 @@ +-<?xml version="1.0" encoding="utf-8"?> +-<!DOCTYPE TS> +-<TS version="2.1" language="mn" sourcelanguage="en_US"> +-<context> +- <name>DesktopArea</name> +- <message> +- <source>Desktop</source> +- <translatorcomment>工作区</translatorcomment> +- <translation type="vanished">ᠠᠵᠢᠯᠯᠠᠬᠤ ᠤᠷᠤᠨ</translation> +- </message> +- <message> +- <source>New Desktop</source> +- <translatorcomment>新建工作区</translatorcomment> +- <translation type="vanished">ᠱᠢᠨᠡᠪᠡᠷ ᠪᠠᠢᠭᠤᠯᠤᠭ᠍ᠰᠠᠨ ᠠᠵᠢᠯᠯᠠᠬᠤ ᠤᠷᠤᠨ</translation> +- </message> +-</context> +-<context> +- <name>NewDesktopButton</name> +- <message> +- <location filename="qml/NewDesktopButton.qml" line="104"/> +- <source>New Desktop</source> +- <translation type="unfinished">ᠱᠢᠨᠡᠪᠡᠷ ᠪᠠᠢᠭᠤᠯᠤᠭ᠍ᠰᠠᠨ ᠠᠵᠢᠯᠯᠠᠬᠤ ᠤᠷᠤᠨ</translation> +- </message> +-</context> +-<context> +- <name>TabletViewClearAllWindowButton</name> +- <message> +- <source>Clear</source> +- <translatorcomment>清除</translatorcomment> +- <translation type="vanished">ᠠᠷᠢᠯᠭᠠᠬᠤ</translation> +- </message> +-</context> +-<context> +- <name>TabletViewMain</name> +- <message> +- <location filename="qml/TabletViewMain.qml" line="174"/> +- <source>No recent tasks</source> +- <translation type="unfinished">ᠨᠡᠬᠡᠬᠡᠬᠦ᠌ ᠬᠡᠷᠡᠭᠯᠡᠭᠡ ᠪᠠᠢᠬᠤ ᠦᠬᠡᠢ</translation> +- </message> +- <message> +- <location filename="qml/TabletViewMain.qml" line="357"/> +- <source>Clear</source> +- <translation type="unfinished">ᠠᠷᠢᠯᠭᠠᠬᠤ</translation> +- </message> +-</context> +-<context> +- <name>TabletViewRootWindow</name> +- <message> +- <source>No recent tasks</source> +- <translatorcomment>无应用开启</translatorcomment> +- <translation type="vanished">ᠨᠡᠬᠡᠬᠡᠬᠦ᠌ ᠬᠡᠷᠡᠭᠯᠡᠭᠡ ᠪᠠᠢᠬᠤ ᠦᠬᠡᠢ</translation> +- </message> +-</context> +-<context> +- <name>VirtualDesktopWindow</name> +- <message> +- <location filename="qml/VirtualDesktopWindow.qml" line="187"/> +- <source>Desktop</source> +- <translation type="unfinished">ᠠᠵᠢᠯᠯᠠᠬᠤ ᠤᠷᠤᠨ</translation> +- </message> +-</context> +-</TS> +diff --git a/windowsview/ukui-window-switch_ug.ts b/windowsview/ukui-window-switch_ug.ts +deleted file mode 100644 +index f9d529f..0000000 +--- a/windowsview/ukui-window-switch_ug.ts ++++ /dev/null +@@ -1,62 +0,0 @@ +-<?xml version="1.0" encoding="utf-8"?> +-<!DOCTYPE TS> +-<TS version="2.1" language="ug" sourcelanguage="en_US"> +-<context> +- <name>DesktopArea</name> +- <message> +- <source>Desktop</source> +- <translatorcomment>工作区</translatorcomment> +- <translation type="vanished">ئۈستەلئۈستى</translation> +- </message> +- <message> +- <source>New Desktop</source> +- <translatorcomment>新建工作区</translatorcomment> +- <translation type="vanished">يېڭى ئۈستەلئۈستى</translation> +- </message> +-</context> +-<context> +- <name>NewDesktopButton</name> +- <message> +- <location filename="qml/NewDesktopButton.qml" line="104"/> +- <source>New Desktop</source> +- <translation>يېڭى ئۈستەلئۈستى</translation> +- </message> +-</context> +-<context> +- <name>TabletViewClearAllWindowButton</name> +- <message> +- <source>Clear</source> +- <translatorcomment>清除</translatorcomment> +- <translation type="vanished">تازىلاش</translation> +- </message> +-</context> +-<context> +- <name>TabletViewMain</name> +- <message> +- <location filename="qml/TabletViewMain.qml" line="174"/> +- <source>No recent tasks</source> +- <translation>يېقىنقى ۋەزىپىلەر يوق</translation> +- </message> +- <message> +- <location filename="qml/TabletViewMain.qml" line="357"/> +- <source>Clear</source> +- <translation>تازىلاش</translation> +- </message> +-</context> +-<context> +- <name>TabletViewRootWindow</name> +- <message> +- <source>No recent tasks</source> +- <translatorcomment>无应用开启</translatorcomment> +- <translation type="vanished">يېقىنقى ۋەزىپىلەر يوق</translation> +- </message> +-</context> +-<context> +- <name>VirtualDesktopWindow</name> +- <message> +- <location filename="qml/VirtualDesktopWindow.qml" line="187"/> +- <source>Desktop</source> +- <translation>ئۈستەل يۈزى</translation> +- </message> +-</context> +-</TS> +diff --git a/windowsview/ukui-window-switch_vi.ts b/windowsview/ukui-window-switch_vi.ts +deleted file mode 100644 +index d673d4a..0000000 +--- a/windowsview/ukui-window-switch_vi.ts ++++ /dev/null +@@ -1,62 +0,0 @@ +-<?xml version="1.0" encoding="utf-8"?> +-<!DOCTYPE TS> +-<TS version="2.1" language="vi" sourcelanguage="en_US"> +-<context> +- <name>DesktopArea</name> +- <message> +- <source>Desktop</source> +- <translatorcomment>工作区</translatorcomment> +- <translation type="vanished">工作区</translation> +- </message> +- <message> +- <source>New Desktop</source> +- <translatorcomment>新建工作区</translatorcomment> +- <translation type="vanished">新建工作区</translation> +- </message> +-</context> +-<context> +- <name>NewDesktopButton</name> +- <message> +- <location filename="qml/NewDesktopButton.qml" line="104"/> +- <source>New Desktop</source> +- <translation>Máy tính để bàn mới</translation> +- </message> +-</context> +-<context> +- <name>TabletViewClearAllWindowButton</name> +- <message> +- <source>Clear</source> +- <translatorcomment>清除</translatorcomment> +- <translation type="vanished">清除</translation> +- </message> +-</context> +-<context> +- <name>TabletViewMain</name> +- <message> +- <location filename="qml/TabletViewMain.qml" line="174"/> +- <source>No recent tasks</source> +- <translation>Không có nhiệm vụ gần đây</translation> +- </message> +- <message> +- <location filename="qml/TabletViewMain.qml" line="357"/> +- <source>Clear</source> +- <translation>Trong</translation> +- </message> +-</context> +-<context> +- <name>TabletViewRootWindow</name> +- <message> +- <source>No recent tasks</source> +- <translatorcomment>无应用开启</translatorcomment> +- <translation type="vanished">无应用开启</translation> +- </message> +-</context> +-<context> +- <name>VirtualDesktopWindow</name> +- <message> +- <location filename="qml/VirtualDesktopWindow.qml" line="187"/> +- <source>Desktop</source> +- <translation>Bàn làm việc</translation> +- </message> +-</context> +-</TS> +diff --git a/windowsview/ukui-window-switch_zh_CN.ts b/windowsview/ukui-window-switch_zh_CN.ts +deleted file mode 100644 +index 397f1fe..0000000 +--- a/windowsview/ukui-window-switch_zh_CN.ts ++++ /dev/null +@@ -1,62 +0,0 @@ +-<?xml version="1.0" encoding="utf-8"?> +-<!DOCTYPE TS> +-<TS version="2.1" language="zh_CN" sourcelanguage="en_US"> +-<context> +- <name>DesktopArea</name> +- <message> +- <source>Desktop</source> +- <translatorcomment>工作区</translatorcomment> +- <translation type="vanished">工作区</translation> +- </message> +- <message> +- <source>New Desktop</source> +- <translatorcomment>新建工作区</translatorcomment> +- <translation type="vanished">新建工作区</translation> +- </message> +-</context> +-<context> +- <name>NewDesktopButton</name> +- <message> +- <location filename="qml/NewDesktopButton.qml" line="104"/> +- <source>New Desktop</source> +- <translation type="unfinished">新建工作区</translation> +- </message> +-</context> +-<context> +- <name>TabletViewClearAllWindowButton</name> +- <message> +- <source>Clear</source> +- <translatorcomment>清除</translatorcomment> +- <translation type="vanished">清除</translation> +- </message> +-</context> +-<context> +- <name>TabletViewMain</name> +- <message> +- <location filename="qml/TabletViewMain.qml" line="174"/> +- <source>No recent tasks</source> +- <translation type="unfinished">无应用开启</translation> +- </message> +- <message> +- <location filename="qml/TabletViewMain.qml" line="357"/> +- <source>Clear</source> +- <translation type="unfinished">清除</translation> +- </message> +-</context> +-<context> +- <name>TabletViewRootWindow</name> +- <message> +- <source>No recent tasks</source> +- <translatorcomment>无应用开启</translatorcomment> +- <translation type="vanished">无应用开启</translation> +- </message> +-</context> +-<context> +- <name>VirtualDesktopWindow</name> +- <message> +- <location filename="qml/VirtualDesktopWindow.qml" line="187"/> +- <source>Desktop</source> +- <translation type="unfinished">工作区</translation> +- </message> +-</context> +-</TS> +diff --git a/windowsview/ukui-window-switch_zh_Hant.ts b/windowsview/ukui-window-switch_zh_Hant.ts +deleted file mode 100644 +index 35f0bda..0000000 +--- a/windowsview/ukui-window-switch_zh_Hant.ts ++++ /dev/null +@@ -1,62 +0,0 @@ +-<?xml version="1.0" encoding="utf-8"?> +-<!DOCTYPE TS> +-<TS version="2.1" language="zh_Hant" sourcelanguage="en_US"> +-<context> +- <name>DesktopArea</name> +- <message> +- <source>Desktop</source> +- <translatorcomment>工作区</translatorcomment> +- <translation type="vanished">桌面</translation> +- </message> +- <message> +- <source>New Desktop</source> +- <translatorcomment>新建工作区</translatorcomment> +- <translation type="vanished">新桌面</translation> +- </message> +-</context> +-<context> +- <name>NewDesktopButton</name> +- <message> +- <location filename="qml/NewDesktopButton.qml" line="104"/> +- <source>New Desktop</source> +- <translation type="unfinished">新桌面</translation> +- </message> +-</context> +-<context> +- <name>TabletViewClearAllWindowButton</name> +- <message> +- <source>Clear</source> +- <translatorcomment>清除</translatorcomment> +- <translation type="vanished">清除</translation> +- </message> +-</context> +-<context> +- <name>TabletViewMain</name> +- <message> +- <location filename="qml/TabletViewMain.qml" line="174"/> +- <source>No recent tasks</source> +- <translation type="unfinished">無應用開啟</translation> +- </message> +- <message> +- <location filename="qml/TabletViewMain.qml" line="357"/> +- <source>Clear</source> +- <translation type="unfinished">清除</translation> +- </message> +-</context> +-<context> +- <name>TabletViewRootWindow</name> +- <message> +- <source>No recent tasks</source> +- <translatorcomment>无应用开启</translatorcomment> +- <translation type="vanished">無應用開啟</translation> +- </message> +-</context> +-<context> +- <name>VirtualDesktopWindow</name> +- <message> +- <location filename="qml/VirtualDesktopWindow.qml" line="187"/> +- <source>Desktop</source> +- <translation type="unfinished">桌面</translation> +- </message> +-</context> +-</TS> diff -Nru ukui-window-switch-4.10.1.10/debian/patches/series ukui-window-switch-4.10.1.10/debian/patches/series --- ukui-window-switch-4.10.1.10/debian/patches/series 2025-01-03 17:52:20.000000000 +0800 +++ ukui-window-switch-4.10.1.10/debian/patches/series 2025-01-03 17:52:20.000000000 +0800 @@ -4,3 +4,7 @@ 0004-update-changelog-4.10.1.10-ok1.3.patch 0005-update-changelog-4.10.1.10-ok1.4.patch 0006-update-changelog-4.10.1.10-ok1.5.patch +0007-Added-translation-using-Weblate-Arabic.patch +0008-Added-translation-using-Weblate-Vietnamese.patch +0009-Translated-using-Weblate-Vietnamese.patch +0010-perf-CMakeLists.txt.patch