diff --git a/panels/notification/CMakeLists.txt b/panels/notification/CMakeLists.txt index dc7bc1b2c..ef63cc90b 100644 --- a/panels/notification/CMakeLists.txt +++ b/panels/notification/CMakeLists.txt @@ -42,6 +42,7 @@ target_link_libraries(ds-notification-shared PUBLIC install(TARGETS ds-notification-shared DESTINATION "${LIB_INSTALL_DIR}") ds_install_package(PACKAGE org.deepin.ds.notification TARGET ds-notification) +ds_handle_package_translation(PACKAGE org.deepin.ds.notification QML_FILES ${CMAKE_CURRENT_SOURCE_DIR}/plugin/NotifyItemContent.qml) add_subdirectory(plugin) add_subdirectory(bubble) diff --git a/panels/notification/plugin/NotifyItemContent.qml b/panels/notification/plugin/NotifyItemContent.qml index 965556f6d..5fe098629 100644 --- a/panels/notification/plugin/NotifyItemContent.qml +++ b/panels/notification/plugin/NotifyItemContent.qml @@ -8,6 +8,7 @@ import QtQuick.Layouts import org.deepin.dtk 1.0 import org.deepin.dtk.style 1.0 as DStyle import org.deepin.ds.notification +import org.deepin.ds.notificationcenter NotifyItem { id: root @@ -60,11 +61,13 @@ NotifyItem { Loader { focus: true + anchors.right: parent.right active: !(root.strongInteractive && root.actions.length > 0) && (root.closeVisible || closePlaceHolder.hovered || activeFocus) - sourceComponent: SettingActionButton { + sourceComponent: AnimationSettingButton { id: closeBtn objectName: "closeNotify-" + root.appName icon.name: "clean-alone" + text: qsTr("Clear alone") padding: 2 forcusBorderVisible: visualFocus onClicked: function () { diff --git a/panels/notification/translations/org.deepin.ds.notification.ts b/panels/notification/translations/org.deepin.ds.notification.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_ar.ts b/panels/notification/translations/org.deepin.ds.notification_ar.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_ar.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_az.ts b/panels/notification/translations/org.deepin.ds.notification_az.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_az.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_bo.ts b/panels/notification/translations/org.deepin.ds.notification_bo.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_bo.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_ca.ts b/panels/notification/translations/org.deepin.ds.notification_ca.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_ca.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_de.ts b/panels/notification/translations/org.deepin.ds.notification_de.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_de.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_es.ts b/panels/notification/translations/org.deepin.ds.notification_es.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_es.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_fi.ts b/panels/notification/translations/org.deepin.ds.notification_fi.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_fi.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_fr.ts b/panels/notification/translations/org.deepin.ds.notification_fr.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_fr.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_hu.ts b/panels/notification/translations/org.deepin.ds.notification_hu.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_hu.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_it.ts b/panels/notification/translations/org.deepin.ds.notification_it.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_it.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_ja.ts b/panels/notification/translations/org.deepin.ds.notification_ja.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_ja.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_ko.ts b/panels/notification/translations/org.deepin.ds.notification_ko.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_ko.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_lo.ts b/panels/notification/translations/org.deepin.ds.notification_lo.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_lo.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_nb_NO.ts b/panels/notification/translations/org.deepin.ds.notification_nb_NO.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_nb_NO.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_pl.ts b/panels/notification/translations/org.deepin.ds.notification_pl.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_pl.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_pt_BR.ts b/panels/notification/translations/org.deepin.ds.notification_pt_BR.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_pt_BR.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_ru.ts b/panels/notification/translations/org.deepin.ds.notification_ru.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_ru.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_sq.ts b/panels/notification/translations/org.deepin.ds.notification_sq.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_sq.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_uk.ts b/panels/notification/translations/org.deepin.ds.notification_uk.ts new file mode 100644 index 000000000..19d4e34fd --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_uk.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_zh_CN.ts b/panels/notification/translations/org.deepin.ds.notification_zh_CN.ts new file mode 100644 index 000000000..eb3a558ac --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_zh_CN.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + 清除单个 + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_zh_HK.ts b/panels/notification/translations/org.deepin.ds.notification_zh_HK.ts new file mode 100644 index 000000000..447afb3f0 --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_zh_HK.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + 清除單個 + + + diff --git a/panels/notification/translations/org.deepin.ds.notification_zh_TW.ts b/panels/notification/translations/org.deepin.ds.notification_zh_TW.ts new file mode 100644 index 000000000..51f8cbc0a --- /dev/null +++ b/panels/notification/translations/org.deepin.ds.notification_zh_TW.ts @@ -0,0 +1,11 @@ + + + + + NotifyItemContent + + Clear alone + 清除單個 + + +