Updated missing German translates and its time to release it with min…

…or changes
SFENX-Group · Oct 27, 2024 · 20611b9 · 20611b9
1 parent 2366a3b
commit 20611b9
Show file tree

Hide file tree

Showing 13 changed files with 89 additions and 32 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -73,7 +73,7 @@ jobs:
 
       - name: Build AppImage
         run: |
-          ./linuxdeployqt.AppImage AppDir/usr/share/applications/xpwm.desktop -bundle-non-qt-libs -appimage
+          ./linuxdeployqt.AppImage AppDir/usr/share/applications/XPwm.desktop -bundle-non-qt-libs -appimage
 
       - name: Remove linuxdeployqt and rename AppImage
         run: |

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 
-project(XPwm VERSION 1.0.7 LANGUAGES CXX)
+project(XPwm VERSION 1.1.0 LANGUAGES CXX)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 

diff --git a/README.md b/README.md
@@ -3,8 +3,8 @@
 </h1>
 
 <p align="center">
-  <a href="https://github.com/xaprier/XPwm/blob/main/LICENSE" target="blank">
-    <img src="https://img.shields.io/github/license/xaprier/XPwm" alt="license" />
+  <a href="https://github.com/SFENX-Group/XPwm/blob/main/LICENSE" target="blank">
+    <img src="https://img.shields.io/github/license/SFENX-Group/XPwm" alt="license" />
   </a>
 </p>
 
@@ -15,7 +15,7 @@
 Clone the repository to your directory
 
 ```sh
-git clone --recursive https://github.com/xaprier/XPwm.git
+git clone --recursive https://github.com/SFENX-Group/XPwm.git
 ```
 
 Enter the directory of the source code
@@ -50,7 +50,7 @@ There is an install script named `install.sh` that can be used for Arch-based an
 Clone the repository to your directory
 
 ```sh
-git clone --recursive https://github.com/xaprier/XPwm.git
+git clone --recursive https://github.com/SFENX-Group/XPwm.git
 ```
 
 Enter the directory of the source code
@@ -74,3 +74,14 @@ You can search the application `Password Manager`
 - Qt(GUI and Core libraries, 5.15.2 and later)
 - OpenSSL(Library for encryption, 1.1 and later)
 - Git(Just for cloning repository)
+
+### 📸 Screenshot 
+
+![](https://raw.githubusercontent.com/SFENX-Group/XPwm/main/screenshot/#.png)
+![](https://raw.githubusercontent.com/SFENX-Group/XPwm/main/screenshot/main.png)
+
+### ✨ Contributors
+
+<a href="https://github.com/SFENX-Group/XPwm/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=SFENX-Group/XPwm" />
+</a>
diff --git a/include/DataDir.hpp b/include/DataDir.hpp
@@ -8,7 +8,7 @@
 class DataDir : public Dir {
   public:
     explicit DataDir(const QString& path = "") {
-        QDir dir;
+        QDir dir(path);
         if (!dir.exists(path)) {
             Logger::log_static(LoggingLevel::WARNING, __LINE__, __PRETTY_FUNCTION__, QObject::tr("Invalid or not exists path: %1").arg(path).toStdString());
             return;

diff --git a/include/DataDirHandlerDialog.hpp b/include/DataDirHandlerDialog.hpp
@@ -1,6 +1,7 @@
 #ifndef DATADIRHANDLER_HPP
 #define DATADIRHANDLER_HPP
 
+#include <QDebug>
 #include <QFileDialog>
 #include <QHBoxLayout>
 #include <QInputDialog>

diff --git a/include/Defines.hpp b/include/Defines.hpp
@@ -2,7 +2,7 @@
 #define DEFINES_HPP
 
 #define APPNAME "XPwm"
-#define APPVERSION "1.0.7"
+#define APPVERSION "1.1.0"
 #define ORGNAME "SFENX"
 
 #endif  // DEFINES_HPP
diff --git a/installer_script.iss b/installer_script.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "XPwm"
-#define MyAppVersion "1.0.7"
+#define MyAppVersion "1.1.0"
 #define MyAppPublisher "xaprier"
 #define MyAppURL "https://xaprier.dev"
 #define MyAppExeName "XPwm.exe"

diff --git a/lib/singleton/CMakeLists.txt b/lib/singleton/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.0...3.20)
 
 project(Singleton LANGUAGES CXX)
 
@@ -8,4 +8,24 @@ file(GLOB CPP_FILES "src/*.cpp")
 include_directories("./include")
 
 add_library(${PROJECT_NAME} SHARED ${HPP_FILES} ${CPP_FILES})
-target_include_directories(${PROJECT_NAME} PUBLIC "./include")
+target_include_directories(${PROJECT_NAME} PUBLIC 
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+  $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
+)
+
+# Installation rules
+install(TARGETS ${PROJECT_NAME}
+  EXPORT ${PROJECT_NAME}Targets
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+  RUNTIME DESTINATION .
+)
+
+if (NOT WIN32)
+    install(FILES ${HPP_FILES} DESTINATION include/${PROJECT_NAME})
+    install(EXPORT ${PROJECT_NAME}Targets
+      FILE ${PROJECT_NAME}Config.cmake
+      NAMESPACE ${PROJECT_NAME}::
+      DESTINATION lib/cmake/${PROJECT_NAME}
+    )
+endif()
diff --git a/screenshot/#.png b/screenshot/#.png
diff --git a/screenshot/main.png b/screenshot/main.png
diff --git a/src/DataDirs.cpp b/src/DataDirs.cpp
@@ -1,5 +1,7 @@
 #include "DataDirs.hpp"
 
+#include <QDebug>
+
 #include "ConfigManager.hpp"
 #include "singleton.hpp"
 

diff --git a/translations/translation_de.qm b/translations/translation_de.qm
diff --git a/translations/translation_de.ts b/translations/translation_de.ts
@@ -876,58 +876,70 @@ Bitte melden Sie sich erneut an, um fortzufahren</translation>
         <translation>Ungültiger oder nicht vorhandener Pfad: %1</translation>
     </message>
     <message>
-        <location filename="../include/DataDirHandlerDialog.hpp" line="29"/>
-        <location filename="../include/DataDirHandlerDialog.hpp" line="64"/>
+        <location filename="../include/DataDirHandlerDialog.hpp" line="30"/>
+        <location filename="../include/DataDirHandlerDialog.hpp" line="65"/>
         <source>Add Directory</source>
         <translation>Verzeichnis hinzufügen</translation>
     </message>
     <message>
-        <location filename="../include/DataDirHandlerDialog.hpp" line="30"/>
-        <location filename="../include/DataDirHandlerDialog.hpp" line="95"/>
+        <location filename="../include/DataDirHandlerDialog.hpp" line="31"/>
+        <location filename="../include/DataDirHandlerDialog.hpp" line="96"/>
         <source>Update Directory</source>
         <translation>Verzeichnis aktualisieren</translation>
     </message>
     <message>
-        <location filename="../include/DataDirHandlerDialog.hpp" line="31"/>
-        <location filename="../include/DataDirHandlerDialog.hpp" line="116"/>
+        <location filename="../include/DataDirHandlerDialog.hpp" line="32"/>
+        <location filename="../include/DataDirHandlerDialog.hpp" line="117"/>
         <source>Delete Directory</source>
         <translation>Verzeichnis löschen</translation>
     </message>
     <message>
-        <location filename="../include/DataDirHandlerDialog.hpp" line="56"/>
-        <location filename="../include/DataDirHandlerDialog.hpp" line="87"/>
+        <location filename="../include/DataDirHandlerDialog.hpp" line="57"/>
+        <location filename="../include/DataDirHandlerDialog.hpp" line="88"/>
         <source>Select Directory</source>
         <translation>Verzeichnis auswählen</translation>
     </message>
     <message>
-        <location filename="../include/DataDirHandlerDialog.hpp" line="65"/>
+        <location filename="../include/DataDirHandlerDialog.hpp" line="66"/>
         <source>Do you want to add this directory:
-    %1</source>
+%1</source>
         <translation>Möchten Sie dieses Verzeichnis hinzufügen:
+%1</translation>
+    </message>
+    <message>
+        <location filename="../include/DataDirHandlerDialog.hpp" line="118"/>
+        <source>Do you want to delete directory:
+%1</source>
+        <translation>Möchten Sie das Verzeichnis löschen:
+%1</translation>
+    </message>
+    <message>
+        <source>Do you want to add this directory:
+    %1</source>
+        <translation type="vanished">Möchten Sie dieses Verzeichnis hinzufügen:
     %1</translation>
     </message>
     <message>
-        <location filename="../include/DataDirHandlerDialog.hpp" line="80"/>
+        <source>Do you want to delete directory:
+    %1</source>
+        <translation type="vanished">Möchten Sie das Verzeichnis löschen:
+    %1</translation>
+    </message>
+    <message>
+        <location filename="../include/DataDirHandlerDialog.hpp" line="81"/>
         <source>No Selection</source>
         <translation>Keine Auswahl</translation>
     </message>
     <message>
-        <location filename="../include/DataDirHandlerDialog.hpp" line="80"/>
+        <location filename="../include/DataDirHandlerDialog.hpp" line="81"/>
         <source>No items selected, please select an item first.</source>
         <translation>Keine Elemente ausgewählt, bitte wählen Sie zuerst ein Element aus.</translation>
     </message>
     <message>
-        <location filename="../include/DataDirHandlerDialog.hpp" line="97"/>
+        <location filename="../include/DataDirHandlerDialog.hpp" line="98"/>
         <source>Do you want to update the directory?&lt;br&gt;&lt;b&gt;New: %1&lt;/b&gt;&lt;br&gt;&lt;b&gt;Old: %2&lt;/b&gt;</source>
         <translation>Möchten Sie das Verzeichnis aktualisieren?&lt;br&gt;&lt;b&gt;Neu: %1&lt;/b&gt;&lt;br&gt;&lt;b&gt;Alt: %2&lt;/b&gt;</translation>
     </message>
-    <message>
-        <location filename="../include/DataDirHandlerDialog.hpp" line="117"/>
-        <source>Do you want to delete directory:
-    %1</source>
-        <translation>Möchten Sie das Verzeichnis löschen:
-    %1</translation>
-    </message>
     <message>
         <location filename="../src/ImportDialog.cpp" line="24"/>
         <source>Add/Update/Delete Data Directories to search Encrypted Files</source>
@@ -946,9 +958,20 @@ Bitte melden Sie sich erneut an, um fortzufahren</translation>
     <message>
         <location filename="../src/OrganizationNameMigration.cpp" line="24"/>
         <source>There is old organization data in your AppData location.
+</source>
+        <comment>Do you want the copy the encrypted files to new one and delete old directory?</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>There is old organization data in your AppData location.</source>
+        <comment>Do you want the copy the encrypted files to new one and delete old directory?</comment>
+        <translation type="vanished">Es befinden sich alte Organisationsdaten in Ihrem AppData-Verzeichnis.</translation>
+    </message>
+    <message>
+        <source>There is old organization data in your AppData location.
     </source>
         <comment>Do you want the copy the encrypted files to new one and delete old directory?</comment>
-        <translation>Es gibt alte Organisationsdaten in Ihrem AppData-Verzeichnis.
+        <translation type="vanished">Es gibt alte Organisationsdaten in Ihrem AppData-Verzeichnis.
     </translation>
     </message>
     <message>