diff --git a/.reuse/dep5 b/.reuse/dep5 deleted file mode 100644 index 6730005f..00000000 --- a/.reuse/dep5 +++ /dev/null @@ -1,70 +0,0 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: deepin-diskmanager -Upstream-Contact: UnionTech Software Technology Co., Ltd. <> -Source: https://github.com/linuxdeepin/deepin-diskmanager - - -# README -Files: README.md README.zh_CN.md -Copyright: None -License: CC-BY-4.0 - -# cmake file -Files: CMakeLists.txt application/CMakeLists.txt log/CMakeLists.txt service/CMakeLists.txt test/CMakeLists.txt tests/CMakeLists.txt cmake/* -Copyright: None -License: CC0-1.0 - -#qrc -Files:application/assets/appicons.qrc application/assets/resource.qrc service/diskoperation/filesystems/filesystems.pri -Copyright: None -License: CC0-1.0 - -# translation -Files: application/translations/* application/.tx/* -Copyright: UnionTech Software Technology Co., Ltd. -License: CC0-1.0 - -#assets -Files: application/assets/deepin-diskmanager/* -Copyright: UnionTech Software Technology Co., Ltd. -License: CC0-1.0 - -# png svg -Files: application/assets/icons/deepin/* application/assets/icons application/assets/icons/deepin-diskmanager.svg -Copyright: UnionTech Software Technology Co., Ltd. -License: GPL-3.0-only - -# sh -Files: service/udev/*.sh -Copyright: UnionTech Software Technology Co., Ltd. -License: GPL-3.0-only - -# proxy -Files: service/udev/deepin-diskmanager-authenticateProxy -Copyright: Curtis Gedak -License: GPL-2.0-or-later - -#config -Files: service/assets/data/* application/assets/deepin-diskmanager.desktop application/assets/environments.h.in service/policy/com.deepin.diskmanager.policy service/udev/99-diskmanager.rules -Copyright: UnionTech Software Technology Co., Ltd. -License: CC0-1.0 - -# gitignore -Files: .gitignore -Copyright: None -License: CC0-1.0 - -# ci -Files: .github/* .project.json .obs/workflows.yml -Copyright: None -License: CC0-1.0 - -# debian rpm -Files: debian/* rpm/* -Copyright: None -License: CC0-1.0 - -# third party -Files: service/diskoperation/blockspecial.* service/diskoperation/supportedfilesystems.* service/diskoperation/filesystems/linuxswap.* -Copyright: None -License: CC0-1.0 diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 00000000..9a103837 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,82 @@ +version = 1 +SPDX-PackageName = "deepin-diskmanager" +SPDX-PackageSupplier = "UnionTech Software Technology Co., Ltd. <>" +SPDX-PackageDownloadLocation = "https://github.com/linuxdeepin/deepin-diskmanager" + +[[annotations]] +path = ["README.md", "README.zh_CN.md"] +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC-BY-4.0" + +[[annotations]] +path = ["CMakeLists.txt", "application/CMakeLists.txt", "log/CMakeLists.txt", "service/CMakeLists.txt", "test/CMakeLists.txt", "tests/CMakeLists.txt", "cmake/**"] +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = ["application/assets/appicons.qrc", "application/assets/resource.qrc", "service/diskoperation/filesystems/filesystems.pri"] +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = ["application/translations/**", "application/.tx/**"] +precedence = "aggregate" +SPDX-FileCopyrightText = "UnionTech Software Technology Co., Ltd." +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = "application/assets/deepin-diskmanager/**" +precedence = "aggregate" +SPDX-FileCopyrightText = "UnionTech Software Technology Co., Ltd." +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = ["application/assets/icons/deepin/**", "application/assets/icons", "application/assets/icons/deepin-diskmanager.svg"] +precedence = "aggregate" +SPDX-FileCopyrightText = "UnionTech Software Technology Co., Ltd." +SPDX-License-Identifier = "GPL-3.0-only" + +[[annotations]] +path = "service/udev/**.sh" +precedence = "aggregate" +SPDX-FileCopyrightText = "UnionTech Software Technology Co., Ltd." +SPDX-License-Identifier = "GPL-3.0-only" + +[[annotations]] +path = "service/udev/deepin-diskmanager-authenticateProxy" +precedence = "aggregate" +SPDX-FileCopyrightText = "Curtis Gedak" +SPDX-License-Identifier = "GPL-2.0-or-later" + +[[annotations]] +path = ["service/assets/data/**", "application/assets/deepin-diskmanager.desktop", "application/assets/environments.h.in", "service/policy/com.deepin.pkexec.deepin-diskmanager.policy", "service/udev/99-diskmanager.rules"] +precedence = "aggregate" +SPDX-FileCopyrightText = "UnionTech Software Technology Co., Ltd." +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = ".gitignore" +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = [".github/**", ".project.json", ".obs/workflows.yml"] +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = ["debian/**", "rpm/**"] +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC0-1.0" + +[[annotations]] +path = ["service/diskoperation/blockspecial.**", "service/diskoperation/supportedfilesystems.**", "service/diskoperation/filesystems/linuxswap.**"] +precedence = "aggregate" +SPDX-FileCopyrightText = "None" +SPDX-License-Identifier = "CC0-1.0" diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt index b2e78d9c..09f1f615 100644 --- a/application/CMakeLists.txt +++ b/application/CMakeLists.txt @@ -37,7 +37,7 @@ set(LINK_LIBS #common resource names set(APP_RES_DIR "assets") -set(APP_DESKTOP "${APP_RES_DIR}/deepin-diskmanager.desktop") +set(APP_DESKTOP "deepin-diskmanager.desktop") set(APP_QRC "${APP_RES_DIR}/appicons.qrc") set(APP_ICONPATH "${APP_RES_DIR}/icons/deepin-diskmanager.svg") @@ -88,13 +88,20 @@ target_link_libraries(${PROJECT_NAME} ${LINK_LIBS} basestruct) set(CMAKE_INSTALL_PREFIX /usr) +find_program(DESKTOP_TS_CONV deepin-desktop-ts-convert REQUIRED) +add_custom_target(APP_DESKTOP + ALL + COMMAND ${DESKTOP_TS_CONV} ts2desktop ${CMAKE_CURRENT_SOURCE_DIR}/assets/${APP_DESKTOP} ${CMAKE_CURRENT_SOURCE_DIR}/translations/desktop ${APP_DESKTOP}.tmp + COMMAND mv ${APP_DESKTOP}.tmp ${APP_DESKTOP} +) + # Install files install(TARGETS ${PROJECT_NAME} DESTINATION bin) #file(GLOB APP_QM_FILES "translations/*.qm") #install(FILES ${APP_QM_FILES} DESTINATION share/${PROJECT_NAME}/translations) install(FILES ${DTNG_QM_FILES} DESTINATION share/${PROJECT_NAME}/translations) install(FILES ${APP_ICONPATH} DESTINATION share/icons/hicolor/scalable/apps) -install(FILES ${APP_DESKTOP} DESTINATION share/applications) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APP_DESKTOP} DESTINATION share/applications) install(DIRECTORY ${APP_RES_DIR}/deepin-diskmanager DESTINATION /usr/share/deepin-manual/manual-assets/application) diff --git a/application/assets/deepin-diskmanager.desktop b/application/assets/deepin-diskmanager.desktop index acaa0040..06cbf404 100644 --- a/application/assets/deepin-diskmanager.desktop +++ b/application/assets/deepin-diskmanager.desktop @@ -9,72 +9,4 @@ TryExec=deepin-diskmanager Type=Application X-Deepin-Vendor=deepin -# Translations: -# Do not manually modify! -GenericName[az]=Disk yardımçısı -GenericName[bo]=སྡུད་སྡེར་དོ་དམ་ཆས། -GenericName[ca]=Utilitat de disc -GenericName[cs]=Nástroj pro správu disku -GenericName[de]=Festplatten-Dienstprogramm -GenericName[en_US]=Disk Utility -GenericName[es]=Administrador de discos -GenericName[fi]=Levytyökalu -GenericName[fr]=Utilitaire de disque -GenericName[gl_ES]=Utilidade de disco -GenericName[hi_IN]=डिस्क साधन -GenericName[hu]=Lemezkezelő -GenericName[id]=Utilitas Diska -GenericName[it]=Gestore Dischi -GenericName[ja]=ディスク ユーティリティ -GenericName[ko]=디스크 유틸리티 -GenericName[lo]=ເຄື່ອງມືຈັດການດິສ -GenericName[ms]=Utiliti Cakera -GenericName[nl]=Schijfhulpprogramma -GenericName[pl]=Narzędzie dyskowe -GenericName[pt]=Utilitário do Disco -GenericName[pt_BR]=Utilitário de Disco -GenericName[ro]=Utilitar Disc -GenericName[ru]=Дисковая Утилита -GenericName[sl]=Diskovno orodja -GenericName[sq]=Mjet Për Disqe -GenericName[sr]=Диск -GenericName[tr]=Disk Yardımcısı -GenericName[ug]=دىسكا باشقۇرغۇچىسى -GenericName[uk]=Дисковий додаток -GenericName[zh_CN]=磁盘管理器 -GenericName[zh_HK]=磁盤管理器 -GenericName[zh_TW]=磁碟管理器 -Name[az]=Deepin Disk Aləti -Name[bo]=གཏིང་ཟབ་སྡུད་སྡེར་དོ་དམ་ཆས། -Name[ca]=Utilitat de disc del Deepin -Name[cs]=Nástroj pro správu disku -Name[de]=Deepin Festplatten-Dienstprogramm -Name[en_US]=Deepin Disk Utility -Name[es]=Administrador de discos -Name[fi]=Deepin levytyökalu -Name[fr]=Utilitaire de disque Deepin -Name[gl_ES]=Deepin Disk Utility -Name[hi_IN]=दीपिन डिस्क साधन -Name[hu]=Deepin® Lemezkezelő -Name[id]=Utilitas Diska Deepin -Name[it]=Gestore Dischi di Deepin -Name[ja]=Deepin ディスク ユーティリティ -Name[ko]=Deepin 디스크 유틸리티 -Name[lo]=ເຄື່ອງມືຈັດການດິສ -Name[ms]=Utiliti Cakera Deepin -Name[nl]=Deepin Schijfhulpprogramma -Name[pl]=Narzędzie dyskowe Deepin -Name[pt]=Utilitário do Disco Deepin -Name[pt_BR]=deepin Utilitário de Disco -Name[ro]=Utilitar Disc Deepin -Name[ru]=Дисковая Утилита Deepin -Name[sl]=Deepin diskovno orodje -Name[sq]=Mjet Deepin Për Disqe -Name[sr]=Дипин Диск -Name[tr]=Deepin Disk Yardımcısı -Name[ug]=Deepin دىسكا باشقۇرغۇچىسى -Name[uk]=Дисковий додаток Deepin -Name[zh_CN]=深度磁盘管理器 -Name[zh_HK]=Deepin 磁盤管理器 -Name[zh_TW]=Deepin 磁碟管理器 - +# Automatically generate translations diff --git a/application/translations/policy/policy.ts b/application/translations/policy/policy.ts index 9fda4221..a450ba9f 100644 --- a/application/translations/policy/policy.ts +++ b/application/translations/policy/policy.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Authentication is required to read disk information - + Run Disk Manager Need Authentication Run Disk Manager Need Authentication diff --git a/application/translations/policy/policy_ar.ts b/application/translations/policy/policy_ar.ts index 44d18ef1..256ef22c 100644 --- a/application/translations/policy/policy_ar.ts +++ b/application/translations/policy/policy_ar.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information المصادقة مطلوبة لقراءة معلومات القرص - + Run Disk Manager Need Authentication إن تشغيل مدير الأقرص يحتاج إلى مصادقة diff --git a/application/translations/policy/policy_az.ts b/application/translations/policy/policy_az.ts index 34ace01e..5459f569 100644 --- a/application/translations/policy/policy_az.ts +++ b/application/translations/policy/policy_az.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Disk məlumatlarını oxumaq üçün kimlik doğrulaması tələb olunur - + Run Disk Manager Need Authentication Disk İdarəetməsini başlatmaq Kimlik Doğrulaması tələb edir diff --git a/application/translations/policy/policy_bo.ts b/application/translations/policy/policy_bo.ts index 282a2ae6..419ce091 100644 --- a/application/translations/policy/policy_bo.ts +++ b/application/translations/policy/policy_bo.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information སྡུད་སྡེར་གྱི་ཆ་འཕྲིན་ཀློག་ལེན་བྱེད་པར་དཔང་དཔྱད་བྱེད་དགོས། - + Run Disk Manager Need Authentication Run Disk Manager Need Authentication diff --git a/application/translations/policy/policy_ca.ts b/application/translations/policy/policy_ca.ts index 91f68aff..9396fc8b 100644 --- a/application/translations/policy/policy_ca.ts +++ b/application/translations/policy/policy_ca.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Cal autenticació per llegir la informació del disc - + Run Disk Manager Need Authentication Per executar el gestor de discs cal autenticació diff --git a/application/translations/policy/policy_cs.ts b/application/translations/policy/policy_cs.ts index 22451ae0..81107471 100644 --- a/application/translations/policy/policy_cs.ts +++ b/application/translations/policy/policy_cs.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Pro čtení informací o disku je zapotřebí ověření se - + Run Disk Manager Need Authentication Spuštění Správy disků vyžaduje ověření se diff --git a/application/translations/policy/policy_es.ts b/application/translations/policy/policy_es.ts index 722e9970..b8932b6b 100644 --- a/application/translations/policy/policy_es.ts +++ b/application/translations/policy/policy_es.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Se necesita autenticación para leer la información del disco - + Run Disk Manager Need Authentication Se necesita autenticación para ejecutar el Administrador de discos diff --git a/application/translations/policy/policy_fi.ts b/application/translations/policy/policy_fi.ts index 3bf2e2b4..56c5202c 100644 --- a/application/translations/policy/policy_fi.ts +++ b/application/translations/policy/policy_fi.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Levyn tietojen lukeminen edellyttää todennusta - + Run Disk Manager Need Authentication Levynhallinta tarvitsee todennusta diff --git a/application/translations/policy/policy_fr.ts b/application/translations/policy/policy_fr.ts index 1514c213..6950c23c 100644 --- a/application/translations/policy/policy_fr.ts +++ b/application/translations/policy/policy_fr.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information L'authentification est requise pour lire les informations du disque - + Run Disk Manager Need Authentication Gestionnaire de disque a besoin d'une authentification diff --git a/application/translations/policy/policy_hu.ts b/application/translations/policy/policy_hu.ts index dbbb73ff..cee5dfb5 100644 --- a/application/translations/policy/policy_hu.ts +++ b/application/translations/policy/policy_hu.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Hitelesítés szükséges a lemezinformációk olvasásához - + Run Disk Manager Need Authentication Hitelesítés szükséges a Lemezkezelő futtatásához diff --git a/application/translations/policy/policy_id.ts b/application/translations/policy/policy_id.ts index cb2cafce..c90b34f3 100644 --- a/application/translations/policy/policy_id.ts +++ b/application/translations/policy/policy_id.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Diperlukan autentikasi untuk membaca informasi diska - + Run Disk Manager Need Authentication Menjalankan manajer diska membutuhkan autentikasi diff --git a/application/translations/policy/policy_it.ts b/application/translations/policy/policy_it.ts index 961c13e6..7ccdd917 100644 --- a/application/translations/policy/policy_it.ts +++ b/application/translations/policy/policy_it.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Autenticazione richiesta per la lettura delle info del Disco - + Run Disk Manager Need Authentication Run Disk Manager Need Authentication diff --git a/application/translations/policy/policy_ja.ts b/application/translations/policy/policy_ja.ts index e5dd002e..6d42a81a 100644 --- a/application/translations/policy/policy_ja.ts +++ b/application/translations/policy/policy_ja.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information ディスク情報の読み取りには認証が必要です - + Run Disk Manager Need Authentication ディスク マネージャーの実行には認証が必要です diff --git a/application/translations/policy/policy_ms.ts b/application/translations/policy/policy_ms.ts index c5e64d69..f81e62dc 100644 --- a/application/translations/policy/policy_ms.ts +++ b/application/translations/policy/policy_ms.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Pengesahihan diperlukan untuk membaca maklumat cakera - + Run Disk Manager Need Authentication Pengurus Cakera yang Dijalankan Memerlukan Pengesahihan diff --git a/application/translations/policy/policy_nl.ts b/application/translations/policy/policy_nl.ts index b4b3df1f..7f173421 100644 --- a/application/translations/policy/policy_nl.ts +++ b/application/translations/policy/policy_nl.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Voer je wachtwoord in om schijfinformatie uit te lezen - + Run Disk Manager Need Authentication Run Disk Manager Need Authentication diff --git a/application/translations/policy/policy_pl.ts b/application/translations/policy/policy_pl.ts index 0e027b64..f86b732f 100644 --- a/application/translations/policy/policy_pl.ts +++ b/application/translations/policy/policy_pl.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Wymagane jest uwierzytelnienie do odczytywania informacji o dyskach - + Run Disk Manager Need Authentication Run Disk Manager Need Authentication diff --git a/application/translations/policy/policy_pt.ts b/application/translations/policy/policy_pt.ts index 836f47e0..2211f221 100644 --- a/application/translations/policy/policy_pt.ts +++ b/application/translations/policy/policy_pt.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information É necessária a autenticação para ler as informações do disco - + Run Disk Manager Need Authentication Run Disk Manager Need Authentication diff --git a/application/translations/policy/policy_pt_BR.ts b/application/translations/policy/policy_pt_BR.ts index cf76a9a1..5b74b2e0 100644 --- a/application/translations/policy/policy_pt_BR.ts +++ b/application/translations/policy/policy_pt_BR.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information A autenticação é necessária para ler as informações do disco - + Run Disk Manager Need Authentication Run Disk Manager Need Authentication diff --git a/application/translations/policy/policy_ro.ts b/application/translations/policy/policy_ro.ts index c669df58..ed01786d 100644 --- a/application/translations/policy/policy_ro.ts +++ b/application/translations/policy/policy_ro.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Autentificare necesară pentru citire informații disc - + Run Disk Manager Need Authentication Rularea Manager Disc Necesită Autentificare diff --git a/application/translations/policy/policy_ru.ts b/application/translations/policy/policy_ru.ts index b84bb6a3..fc088637 100644 --- a/application/translations/policy/policy_ru.ts +++ b/application/translations/policy/policy_ru.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Аутентификация необходима для чтения информации с диска - + Run Disk Manager Need Authentication Для запуская диспетчера дисков требуется аутентификация diff --git a/application/translations/policy/policy_sl.ts b/application/translations/policy/policy_sl.ts index 890a1ae8..8c3f0739 100644 --- a/application/translations/policy/policy_sl.ts +++ b/application/translations/policy/policy_sl.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Za branje podatkov o disku je potrebna overitev - + Run Disk Manager Need Authentication Zagon upravljalca diskov zahteva overitev diff --git a/application/translations/policy/policy_sq.ts b/application/translations/policy/policy_sq.ts index be3a2697..942fe94f 100644 --- a/application/translations/policy/policy_sq.ts +++ b/application/translations/policy/policy_sq.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Për të lexuar të dhëna disku lypset mirëfilltësim - + Run Disk Manager Need Authentication Xhirimi i Përgjegjësit të Disqeve Lyp Mirëfilltësim diff --git a/application/translations/policy/policy_sr.ts b/application/translations/policy/policy_sr.ts index 8da0ee9d..52a23d8b 100644 --- a/application/translations/policy/policy_sr.ts +++ b/application/translations/policy/policy_sr.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Идентификација је неопходна за читање података о диску - + Run Disk Manager Need Authentication Run Disk Manager Need Authentication diff --git a/application/translations/policy/policy_tr.ts b/application/translations/policy/policy_tr.ts index b26126d8..74456006 100644 --- a/application/translations/policy/policy_tr.ts +++ b/application/translations/policy/policy_tr.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Disk bilgilerini okumak için kimlik doğrulaması gerekli - + Run Disk Manager Need Authentication Disk Yöneticisi Kimlik Doğrulaması Gerekli diff --git a/application/translations/policy/policy_ug.ts b/application/translations/policy/policy_ug.ts index 53afe20a..137b5d09 100644 --- a/application/translations/policy/policy_ug.ts +++ b/application/translations/policy/policy_ug.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information دىسكا ئۇچۇرلىرىنى ئوقۇش دەلىللەشنى تەلەپ قىلىدۇ - + Run Disk Manager Need Authentication دىسكا باشقۇرغۇچىنى دەلىللەش لازىم diff --git a/application/translations/policy/policy_uk.ts b/application/translations/policy/policy_uk.ts index be4a38a1..3cb4e0d0 100644 --- a/application/translations/policy/policy_uk.ts +++ b/application/translations/policy/policy_uk.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information Для читання відомостей щодо диска слід пройти розпізнавання - + Run Disk Manager Need Authentication Запуск керування дисками потребує розпізнавання diff --git a/application/translations/policy/policy_zh_CN.ts b/application/translations/policy/policy_zh_CN.ts index bf528124..a319989d 100644 --- a/application/translations/policy/policy_zh_CN.ts +++ b/application/translations/policy/policy_zh_CN.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information 读取磁盘信息需要认证 - + Run Disk Manager Need Authentication Run Disk Manager Need Authentication diff --git a/application/translations/policy/policy_zh_HK.ts b/application/translations/policy/policy_zh_HK.ts index 7a65a632..47f41b1d 100644 --- a/application/translations/policy/policy_zh_HK.ts +++ b/application/translations/policy/policy_zh_HK.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information 讀取磁盤訊息需要認證 - + Run Disk Manager Need Authentication Run Disk Manager Need Authentication diff --git a/application/translations/policy/policy_zh_TW.ts b/application/translations/policy/policy_zh_TW.ts index 3ef15805..d3aff409 100644 --- a/application/translations/policy/policy_zh_TW.ts +++ b/application/translations/policy/policy_zh_TW.ts @@ -2,12 +2,12 @@ policy - + Authentication is required to read disk information 讀取磁碟訊息需要認證 - + Run Disk Manager Need Authentication Run Disk Manager Need Authentication diff --git a/debian/control b/debian/control index 71f76d80..209d0762 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,29 @@ Source: deepin-diskmanager -Section: tools +Section: admin Priority: optional Maintainer: deepin -Build-Depends: debhelper (>= 11), cmake, pkg-config, libc6-dev, qt6-tools-dev, qt6-base-dev, libx11-dev, libdtk6widget-dev,qt6-tools-dev-tools,qt6-base-private-dev, libparted-dev,libparted-fs-resize0, libpolkit-qt6-1-dev, libgtest-dev, libgmock-dev +Build-Depends: + debhelper (>= 11), + cmake, + pkg-config, + libc6-dev, + qt6-tools-dev, + qt6-base-dev, + libx11-dev, + libdtk6widget-dev, + qt6-tools-dev-tools, + qt6-base-private-dev, + libparted-dev, + libparted-fs-resize0, + libpolkit-qt6-1-dev, + libgtest-dev, + libgmock-dev, + deepin-gettext-tools Standards-Version: 4.1.3 Package: deepin-diskmanager Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, smartmontools, exfat-fuse +Depends: ${shlibs:Depends}, ${misc:Depends}, smartmontools, exfat-fuse, pkexec Description: Disk Utility is a disk management tool for creating, reorganizing and formatting partitions. Disk Utility is a disk management tool for disk. diff --git a/rpm/deepin-diskmanager.spec b/rpm/deepin-diskmanager.spec index ba9919e5..e37fb44f 100644 --- a/rpm/deepin-diskmanager.spec +++ b/rpm/deepin-diskmanager.spec @@ -49,12 +49,10 @@ export PATH=%{_qt5_bindir}:$PATH %{_datadir}/applications/%{repo}.desktop %{_datadir}/icons/hicolor/scalable/apps/%{repo}.svg %{_datadir}/deepin-manual/manual-assets/application/deepin-diskmanager/* -/usr/lib/libbasestruct.a -/usr/lib/libddmlog.a /usr/lib/deepin-daemon/deepin-diskmanager-service /lib/udev/rules.d/99-diskmanager.rules -%{_libexecdir}/openconnect/USBadd.sh -%{_libexecdir}/openconnect/USBremove.sh +%{_libexecdir}/deepin-diskmanager/USBadd.sh +%{_libexecdir}/deepin-diskmanager/USBremove.sh %{_datadir}/dbus-1/system-services/com.deepin.diskmanager.service %{_datadir}/dbus-1/system.d/com.deepin.diskmanager.conf %{_datadir}/polkit-1/actions/com.deepin.diskmanager.policy diff --git a/service/CMakeLists.txt b/service/CMakeLists.txt index ac537494..2dadab60 100644 --- a/service/CMakeLists.txt +++ b/service/CMakeLists.txt @@ -18,11 +18,12 @@ set(APP_UDEV_FILES "${APP_EDEV_DIR}/99-diskmanager.rules") set(APP_USBADD_FILES "${APP_EDEV_DIR}/USBadd.sh") set(APP_USBREMOVE_FILES "${APP_EDEV_DIR}/USBremove.sh") set(APP_DEEPIN_DISKMANAGER_SERVICE_BIN "${APP_EDEV_DIR}/deepin-diskmanager-authenticateProxy") -set(APP_POLICY_DIR "policy") -set(APP_POLICY_FILES "${APP_POLICY_DIR}/com.deepin.diskmanager.policy") +set(APP_POLICY_FILE "com.deepin.pkexec.deepin-diskmanager.policy") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIE") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIE") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") + # Find the library find_package(PkgConfig REQUIRED) find_package(Dtk${DTK_VERSION}Gui REQUIRED) @@ -69,16 +70,22 @@ target_include_directories(${PROJECT_NAME} PUBLIC target_link_libraries(${PROJECT_NAME} ${LINK_LIBS} basestruct) target_link_libraries(${PROJECT_NAME} ${LINK_LIBS} ddmlog) +find_program(POLICY_TS_CONV deepin-policy-ts-convert REQUIRED) +add_custom_target(APP_POLICY_FILE + ALL + COMMAND ${POLICY_TS_CONV} ts2policy ${CMAKE_CURRENT_SOURCE_DIR}/policy/${APP_POLICY_FILE} ${CMAKE_SOURCE_DIR}/application/translations/policy/ ${APP_POLICY_FILE}.tmp + COMMAND mv ${APP_POLICY_FILE}.tmp ${APP_POLICY_FILE} +) set(CMAKE_INSTALL_PREFIX /usr) # Install files install(TARGETS ${PROJECT_NAME} DESTINATION lib/deepin-daemon/) install(FILES ${APP_SERVICE} DESTINATION share/dbus-1/system-services/) -install(FILES ${SYSTEMD_SERVICE} DESTINATION /lib/systemd/system/) +install(FILES ${SYSTEMD_SERVICE} DESTINATION lib/systemd/system/) install(FILES ${APP_CONFIG} DESTINATION share/dbus-1/system.d/) -install(PROGRAMS ${APP_USBADD_FILES} DESTINATION libexec/openconnect/) -install(PROGRAMS ${APP_USBREMOVE_FILES} DESTINATION libexec/openconnect/) -install(FILES ${APP_UDEV_FILES} DESTINATION /lib/udev/rules.d/) -install(FILES ${APP_POLICY_FILES} DESTINATION share/polkit-1/actions) +install(PROGRAMS ${APP_USBADD_FILES} DESTINATION libexec/deepin-diskmanager/) +install(PROGRAMS ${APP_USBREMOVE_FILES} DESTINATION libexec/deepin-diskmanager/) +install(FILES ${APP_UDEV_FILES} DESTINATION lib/udev/rules.d/) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APP_POLICY_FILE} DESTINATION share/polkit-1/actions) install(PROGRAMS ${APP_DEEPIN_DISKMANAGER_SERVICE_BIN} DESTINATION bin/) diff --git a/service/assets/data/com.deepin.diskmanager.conf b/service/assets/data/com.deepin.diskmanager.conf index 487be7e2..9a53fcc1 100755 --- a/service/assets/data/com.deepin.diskmanager.conf +++ b/service/assets/data/com.deepin.diskmanager.conf @@ -12,7 +12,6 @@ - - - - deepin-diskmanager - - Run Disk Manager Need Authentication - Authentication is required to read disk information - - no - no - auth_admin_keep - - /usr/bin/deepin-diskmanager-authenticateProxy - true - Run Disk Manager Need Authentication - Voer je wachtwoord in om schijfinformatie uit te lezen - Run Disk Manager Need Authentication - སྡུད་སྡེར་གྱི་ཆ་འཕྲིན་ཀློག་ལེན་བྱེད་པར་དཔང་དཔྱད་བྱེད་དགོས། - Для запуская диспетчера дисков требуется аутентификация - Аутентификация необходима для чтения информации с диска - Spuštění Správy disků vyžaduje ověření se - Pro čtení informací o disku je zapotřebí ověření se - Run Disk Manager Need Authentication - 讀取磁盤訊息需要認證 - إن تشغيل مدير الأقرص يحتاج إلى مصادقة - المصادقة مطلوبة لقراءة معلومات القرص - Pengurus Cakera yang Dijalankan Memerlukan Pengesahihan - Pengesahihan diperlukan untuk membaca maklumat cakera - Hitelesítés szükséges a Lemezkezelő futtatásához - Hitelesítés szükséges a lemezinformációk olvasásához - Levynhallinta tarvitsee todennusta - Levyn tietojen lukeminen edellyttää todennusta - Run Disk Manager Need Authentication - A autenticação é necessária para ler as informações do disco - Run Disk Manager Need Authentication - Идентификација је неопходна за читање података о диску - Menjalankan manajer diska membutuhkan autentikasi - Diperlukan autentikasi untuk membaca informasi diska - Запуск керування дисками потребує розпізнавання - Для читання відомостей щодо диска слід пройти розпізнавання - دىسكا باشقۇرغۇچىنى دەلىللەش لازىم - دىسكا ئۇچۇرلىرىنى ئوقۇش دەلىللەشنى تەلەپ قىلىدۇ - Run Disk Manager Need Authentication - 读取磁盘信息需要认证 - Disk İdarəetməsini başlatmaq Kimlik Doğrulaması tələb edir - Disk məlumatlarını oxumaq üçün kimlik doğrulaması tələb olunur - Disk Yöneticisi Kimlik Doğrulaması Gerekli - Disk bilgilerini okumak için kimlik doğrulaması gerekli - Rularea Manager Disc Necesită Autentificare - Autentificare necesară pentru citire informații disc - ディスク マネージャーの実行には認証が必要です - ディスク情報の読み取りには認証が必要です - Run Disk Manager Need Authentication - Wymagane jest uwierzytelnienie do odczytywania informacji o dyskach - Xhirimi i Përgjegjësit të Disqeve Lyp Mirëfilltësim - Për të lexuar të dhëna disku lypset mirëfilltësim - Run Disk Manager Need Authentication - É necessária a autenticação para ler as informações do disco - Zagon upravljalca diskov zahteva overitev - Za branje podatkov o disku je potrebna overitev - Run Disk Manager Need Authentication - 讀取磁碟訊息需要認證 - Gestionnaire de disque a besoin d'une authentification - L'authentification est requise pour lire les informations du disque - Se necesita autenticación para ejecutar el Administrador de discos - Se necesita autenticación para leer la información del disco - Per executar el gestor de discs cal autenticació - Cal autenticació per llegir la informació del disc - Run Disk Manager Need Authentication - Autenticazione richiesta per la lettura delle info del Disco - ການເຮັດວຽກກັບຜູ້ຈັດການດິສກ໌ຕ້ອງການການຢືນຢັນ - ຕ້ອງການການຢືນຢັນເພື່ອອ່ານຂໍ້ມູນດິດ - - diff --git a/service/policy/com.deepin.pkexec.deepin-diskmanager.policy b/service/policy/com.deepin.pkexec.deepin-diskmanager.policy new file mode 100755 index 00000000..3cbd428a --- /dev/null +++ b/service/policy/com.deepin.pkexec.deepin-diskmanager.policy @@ -0,0 +1,17 @@ + + + + deepin-diskmanager + + Run Disk Manager Need Authentication + Authentication is required to read disk information + + no + no + auth_admin_keep + + /usr/bin/deepin-diskmanager-authenticateProxy + true + + diff --git a/service/udev/99-diskmanager.rules b/service/udev/99-diskmanager.rules index 2ad48236..a8aed9d8 100644 --- a/service/udev/99-diskmanager.rules +++ b/service/udev/99-diskmanager.rules @@ -1,6 +1,6 @@ -#ENV{DEVTYPE}=="usb_device", ACTION=="add",RUN+="/usr/libexec/openconnect/USBadd.sh" -#ENV{DEVTYPE}=="usb_device", ACTION=="remove", RUN+="/usr/libexec/openconnect/USBremove.sh" +#ENV{DEVTYPE}=="usb_device", ACTION=="add",RUN+="/usr/libexec/deepin-diskmanager/USBadd.sh" +#ENV{DEVTYPE}=="usb_device", ACTION=="remove", RUN+="/usr/libexec/deepin-diskmanager/USBremove.sh" -ENV{DEVTYPE}=="disk", ENV{ID_BUS}!="", ACTION=="add",RUN+="/usr/libexec/openconnect/USBadd.sh" -ENV{DEVTYPE}=="disk", ENV{ID_BUS}!="", ACTION=="remove", RUN+="/usr/libexec/openconnect/USBremove.sh" +ENV{DEVTYPE}=="disk", ENV{ID_BUS}!="", ACTION=="add",RUN+="/usr/libexec/deepin-diskmanager/USBadd.sh" +ENV{DEVTYPE}=="disk", ENV{ID_BUS}!="", ACTION=="remove", RUN+="/usr/libexec/deepin-diskmanager/USBremove.sh"