fix: install() path for asset file, add ts files for .pro file

BLumia · Dec 25, 2020 · dc17e1d · dc17e1d
1 parent 7782ed0
commit dc17e1d
Show file tree

Hide file tree

Showing 8 changed files with 359 additions and 333 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -182,7 +182,7 @@ elseif (UNIX)
 
     # install icon
     install (
-        FILES icons/app-icon.svg
+        FILES assets/icons/app-icon.svg
         DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/48x48/apps"
         RENAME pineapple-pictures.svg
     )

diff --git a/pineapple-pictures.pro b/pineapple-pictures.pro
@@ -49,7 +49,11 @@ HEADERS += \
 
 TRANSLATIONS = \
     translations/PineapplePictures.ts \
-    translations/PineapplePictures_zh_CN.ts
+    translations/PineapplePictures_zh_CN.ts \
+    translations/PineapplePictures_de.ts \
+    translations/PineapplePictures_fr.ts \
+    translations/PineapplePictures_nb_NO.ts \
+    translations/PineapplePictures_ru.ts
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin

diff --git a/translations/PineapplePictures.ts b/translations/PineapplePictures.ts
@@ -4,157 +4,158 @@
 <context>
     <name>AboutDialog</name>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="22"/>
+        <location filename="../app/aboutdialog.cpp" line="23"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="25"/>
+        <location filename="../app/aboutdialog.cpp" line="26"/>
         <source>Launch application with image file path as argument to load the file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="26"/>
+        <location filename="../app/aboutdialog.cpp" line="27"/>
         <source>Drag and drop image file onto the window is also supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="27"/>
+        <location filename="../app/aboutdialog.cpp" line="28"/>
         <source>Context menu option explanation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="31"/>
+        <location filename="../app/aboutdialog.cpp" line="32"/>
         <source>Make window stay on top of all other windows.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="35"/>
+        <location filename="../app/aboutdialog.cpp" line="36"/>
         <source>Avoid close window accidentally. (eg. by double clicking the window)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="44"/>
+        <location filename="../app/aboutdialog.cpp" line="45"/>
         <source>Version: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="47"/>
+        <location filename="../app/aboutdialog.cpp" line="48"/>
         <source>Copyright (c) 2020 %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="49"/>
+        <location filename="../app/aboutdialog.cpp" line="50"/>
         <source>Logo designed by %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="51"/>
+        <location filename="../app/aboutdialog.cpp" line="52"/>
         <source>Built with Qt %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="52"/>
+        <location filename="../app/aboutdialog.cpp" line="53"/>
         <source>Source code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="58"/>
+        <location filename="../app/aboutdialog.cpp" line="63"/>
         <source>Contributors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="60"/>
+        <location filename="../app/aboutdialog.cpp" line="65"/>
         <source>List of contributors on GitHub</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="61"/>
+        <location filename="../app/aboutdialog.cpp" line="66"/>
         <source>Thanks to all people who contributed to this project.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="65"/>
+        <location filename="../app/aboutdialog.cpp" line="70"/>
         <source>Translators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="66"/>
+        <location filename="../app/aboutdialog.cpp" line="71"/>
         <source>I would like to thank the following people who volunteered to translate this application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="134"/>
+        <location filename="../app/aboutdialog.cpp" line="115"/>
+        <source>%1 is built on the following free software libraries:</source>
+        <comment>Free as in freedom</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../app/aboutdialog.cpp" line="139"/>
         <source>&amp;Special Thanks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="136"/>
+        <location filename="../app/aboutdialog.cpp" line="141"/>
         <source>&amp;Third-party Libraries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="72"/>
+        <location filename="../app/aboutdialog.cpp" line="77"/>
         <source>Your Rights</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="74"/>
+        <location filename="../app/aboutdialog.cpp" line="79"/>
         <source>%1 is released under the MIT License.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="75"/>
+        <location filename="../app/aboutdialog.cpp" line="80"/>
         <source>This license grants people a number of freedoms:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="76"/>
+        <location filename="../app/aboutdialog.cpp" line="81"/>
         <source>You are free to use %1, for any purpose</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="77"/>
+        <location filename="../app/aboutdialog.cpp" line="82"/>
         <source>You are free to distribute %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="78"/>
+        <location filename="../app/aboutdialog.cpp" line="83"/>
         <source>You can study how %1 works and change it</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="79"/>
+        <location filename="../app/aboutdialog.cpp" line="84"/>
         <source>You can distribute changed versions of %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="81"/>
+        <location filename="../app/aboutdialog.cpp" line="86"/>
         <source>The MIT license guarantees you this freedom. Nobody is ever permitted to take it away.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="109"/>
+        <location filename="../app/aboutdialog.cpp" line="114"/>
         <source>Third-party Libraries used by %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="110"/>
-        <source>%1 is built on the following free software libraries:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../app/aboutdialog.cpp" line="132"/>
+        <location filename="../app/aboutdialog.cpp" line="137"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="133"/>
+        <location filename="../app/aboutdialog.cpp" line="138"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="135"/>
+        <location filename="../app/aboutdialog.cpp" line="140"/>
         <source>&amp;License</source>
         <translation type="unfinished"></translation>
     </message>
@@ -170,28 +171,28 @@
 <context>
     <name>GraphicsView</name>
     <message>
-        <location filename="../app/graphicsview.cpp" line="261"/>
+        <location filename="../app/graphicsview.cpp" line="254"/>
         <source>File url list is empty</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/graphicsview.cpp" line="53"/>
+        <location filename="../app/graphicsview.cpp" line="46"/>
         <source>File is not a valid image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/graphicsview.cpp" line="55"/>
-        <location filename="../app/graphicsview.cpp" line="59"/>
+        <location filename="../app/graphicsview.cpp" line="48"/>
+        <location filename="../app/graphicsview.cpp" line="52"/>
         <source>Image data is invalid or currently unsupported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/graphicsview.cpp" line="269"/>
+        <location filename="../app/graphicsview.cpp" line="262"/>
         <source>Image data is invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/graphicsview.cpp" line="276"/>
+        <location filename="../app/graphicsview.cpp" line="269"/>
         <source>Not supported mimedata: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -204,62 +205,62 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/mainwindow.cpp" line="417"/>
+        <location filename="../app/mainwindow.cpp" line="408"/>
         <source>&amp;Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/mainwindow.cpp" line="438"/>
+        <location filename="../app/mainwindow.cpp" line="429"/>
         <source>Copy P&amp;ixmap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/mainwindow.cpp" line="443"/>
+        <location filename="../app/mainwindow.cpp" line="434"/>
         <source>Copy &amp;File Path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/mainwindow.cpp" line="453"/>
+        <location filename="../app/mainwindow.cpp" line="444"/>
         <source>&amp;Paste Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/mainwindow.cpp" line="459"/>
+        <location filename="../app/mainwindow.cpp" line="450"/>
         <source>&amp;Paste Image File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/mainwindow.cpp" line="492"/>
+        <location filename="../app/mainwindow.cpp" line="483"/>
         <source>Properties</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="30"/>
-        <location filename="../app/mainwindow.cpp" line="464"/>
+        <location filename="../app/aboutdialog.cpp" line="31"/>
+        <location filename="../app/mainwindow.cpp" line="455"/>
         <source>Stay on top</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/aboutdialog.cpp" line="34"/>
-        <location filename="../app/mainwindow.cpp" line="471"/>
+        <location filename="../app/aboutdialog.cpp" line="35"/>
+        <location filename="../app/mainwindow.cpp" line="462"/>
         <source>Protected mode</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/mainwindow.cpp" line="478"/>
+        <location filename="../app/mainwindow.cpp" line="469"/>
         <source>Configure...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/mainwindow.cpp" line="485"/>
+        <location filename="../app/mainwindow.cpp" line="476"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MetadataDialog</name>
     <message>
-        <location filename="../app/metadatadialog.cpp" line="75"/>
+        <location filename="../app/metadatadialog.cpp" line="80"/>
         <source>Image Metadata</source>
         <translation type="unfinished"></translation>
     </message>
@@ -550,12 +551,12 @@
 <context>
     <name>main</name>
     <message>
-        <location filename="../app/main.cpp" line="27"/>
+        <location filename="../app/main.cpp" line="28"/>
         <source>Pineapple Pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../app/main.cpp" line="31"/>
+        <location filename="../app/main.cpp" line="32"/>
         <source>File list.</source>
         <translation type="unfinished"></translation>
     </message>