image overwriter improved

2018-07-21 18:33:08 +02:00 · 2018-07-21 18:33:08 +02:00 · 193bb60caa
commit 193bb60caa
parent 414867f13e
12 changed files with 658 additions and 456 deletions
--- a/res/gta5sync_zh_TW.ts
+++ b/res/gta5sync_zh_TW.ts
@ -176,6 +176,7 @@ Pictures and Savegames</source>
    <name>ImageEditorDialog</name>
    <message>
        <location filename="../ImageEditorDialog.ui" line="14"/>
+        <location filename="../ImportDialog.cpp" line="465"/>
        <source>Overwrite Image...</source>
        <translation>修改圖片...</translation>
    </message>
@ -191,37 +192,49 @@ Pictures and Savegames</source>
    </message>
    <message>
        <location filename="../ImageEditorDialog.ui" line="82"/>
+        <location filename="../ImportDialog.cpp" line="467"/>
        <source>Apply changes</source>
        <translation type="unfinished">套用變更</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.ui" line="85"/>
+        <location filename="../ImportDialog.cpp" line="466"/>
        <source>&amp;Overwrite</source>
        <translation>修改(&amp;O)</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.ui" line="92"/>
+        <location filename="../ImportDialog.cpp" line="469"/>
        <source>Discard changes</source>
        <translation type="unfinished">捨棄變更</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.ui" line="95"/>
+        <location filename="../ImportDialog.cpp" line="468"/>
        <source>&amp;Close</source>
        <translation>關閉(&amp;C)</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="193"/>
        <location filename="../ImageEditorDialog.cpp" line="200"/>
+        <location filename="../PictureDialog.cpp" line="975"/>
+        <location filename="../PictureDialog.cpp" line="982"/>
+        <location filename="../SnapmaticWidget.cpp" line="346"/>
+        <location filename="../SnapmaticWidget.cpp" line="353"/>
        <source>Snapmatic Image Editor</source>
        <translation>Snapmatic 圖片編輯器</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="193"/>
+        <location filename="../PictureDialog.cpp" line="975"/>
+        <location filename="../SnapmaticWidget.cpp" line="346"/>
        <source>Patching of Snapmatic Image failed because of I/O Error</source>
        <translation>I/O 錯誤，Snapmatic 圖片更新失敗</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="200"/>
+        <location filename="../PictureDialog.cpp" line="982"/>
+        <location filename="../SnapmaticWidget.cpp" line="353"/>
        <source>Patching of Snapmatic Image failed because of Image Error</source>
        <translation>圖片錯誤，Snapmatic 圖片更新失敗</translation>
    </message>
@ -261,8 +274,8 @@ Pictures and Savegames</source>
    </message>
    <message>
        <location filename="../ImportDialog.ui" line="150"/>
-        <location filename="../ImportDialog.cpp" line="85"/>
-        <location filename="../ImportDialog.cpp" line="491"/>
+        <location filename="../ImportDialog.cpp" line="86"/>
+        <location filename="../ImportDialog.cpp" line="553"/>
        <source>Background Colour: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</source>
        <translation>背景顏色: &lt;span style=&quot;color: %1&quot;&gt;%1&lt;/span&gt;</translation>
    </message>
@ -279,8 +292,8 @@ Pictures and Savegames</source>
    </message>
    <message>
        <location filename="../ImportDialog.ui" line="203"/>
-        <location filename="../ImportDialog.cpp" line="86"/>
-        <location filename="../ImportDialog.cpp" line="571"/>
+        <location filename="../ImportDialog.cpp" line="87"/>
+        <location filename="../ImportDialog.cpp" line="633"/>
        <source>Background Image:</source>
        <translation>背景圖片:</translation>
    </message>
@ -335,67 +348,67 @@ Pictures and Savegames</source>
        <translation>取消(&amp;C)</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="111"/>
+        <location filename="../ImportDialog.cpp" line="112"/>
        <source>&amp;Import new Picture...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="112"/>
+        <location filename="../ImportDialog.cpp" line="113"/>
        <source>&amp;Crop Picture...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="185"/>
+        <location filename="../ImportDialog.cpp" line="186"/>
        <location filename="../ProfileInterface.cpp" line="668"/>
        <source>Custom Avatar</source>
        <comment>Custom Avatar Description in SC, don&apos;t use Special Character!</comment>
        <translation>自訂大頭貼</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="212"/>
+        <location filename="../ImportDialog.cpp" line="213"/>
        <location filename="../ProfileInterface.cpp" line="687"/>
        <source>Custom Picture</source>
        <comment>Custom Picture Description in SC, don&apos;t use Special Character!</comment>
        <translation>自訂圖片</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="265"/>
+        <location filename="../ImportDialog.cpp" line="271"/>
        <source>Crop Picture...</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="287"/>
+        <location filename="../ImportDialog.cpp" line="313"/>
        <source>&amp;Crop</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="288"/>
+        <location filename="../ImportDialog.cpp" line="314"/>
        <source>Crop Picture</source>
        <translation type="unfinished"></translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="438"/>
+        <location filename="../ImportDialog.cpp" line="500"/>
        <source>Snapmatic Avatar Zone</source>
        <translation>Snapmatic 大頭貼區域</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="438"/>
+        <location filename="../ImportDialog.cpp" line="500"/>
        <source>Are you sure to use a square image outside of the Avatar Zone?
 When you want to use it as Avatar the image will be detached!</source>
        <translation>你確定要在大頭貼區域以外的地方使用方形圖片嗎? 作為大頭貼的圖片將被分離!</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="487"/>
+        <location filename="../ImportDialog.cpp" line="549"/>
        <source>Select Colour...</source>
        <translation>選擇顏色...</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="556"/>
+        <location filename="../ImportDialog.cpp" line="618"/>
        <source>Background Image: %1</source>
        <translation>背景圖片: %1</translation>
    </message>
    <message>
-        <location filename="../ImportDialog.cpp" line="556"/>
+        <location filename="../ImportDialog.cpp" line="618"/>
        <source>File</source>
        <comment>Background Image: File</comment>
        <translation>文件</translation>
@ -859,43 +872,43 @@ Y: %2</translation>
        <translation>關閉(&amp;C)</translation>
    </message>
    <message>
-        <location filename="../PictureDialog.cpp" line="152"/>
+        <location filename="../PictureDialog.cpp" line="153"/>
        <location filename="../ProfileInterface.cpp" line="1434"/>
        <source>Export as &amp;Picture...</source>
        <translation>匯出成圖片(&amp;P)...</translation>
    </message>
    <message>
-        <location filename="../PictureDialog.cpp" line="153"/>
+        <location filename="../PictureDialog.cpp" line="154"/>
        <location filename="../ProfileInterface.cpp" line="1435"/>
        <source>Export as &amp;Snapmatic...</source>
        <translation>匯出成 Snapmatic(&amp;S)...</translation>
    </message>
    <message>
-        <location filename="../PictureDialog.cpp" line="155"/>
+        <location filename="../PictureDialog.cpp" line="156"/>
        <location filename="../ProfileInterface.cpp" line="1428"/>
        <source>&amp;Edit Properties...</source>
        <translation>編輯屬性(&amp;E) ...</translation>
    </message>
    <message>
-        <location filename="../PictureDialog.cpp" line="156"/>
+        <location filename="../PictureDialog.cpp" line="157"/>
        <location filename="../ProfileInterface.cpp" line="1429"/>
        <source>&amp;Overwrite Image...</source>
        <translation>修改圖片(&amp;O)...</translation>
    </message>
    <message>
-        <location filename="../PictureDialog.cpp" line="158"/>
+        <location filename="../PictureDialog.cpp" line="159"/>
        <location filename="../ProfileInterface.cpp" line="1431"/>
        <source>Open &amp;Map Viewer...</source>
        <translation>開啟地圖檢視器(&amp;M)...</translation>
    </message>
    <message>
-        <location filename="../PictureDialog.cpp" line="160"/>
+        <location filename="../PictureDialog.cpp" line="161"/>
        <location filename="../ProfileInterface.cpp" line="1432"/>
        <source>Open &amp;JSON Editor...</source>
        <translation>開啟 JSON 編輯器(&amp;J)...</translation>
    </message>
    <message>
-        <location filename="../PictureDialog.cpp" line="557"/>
+        <location filename="../PictureDialog.cpp" line="558"/>
        <source>Key 1 - Avatar Preview Mode
 Key 2 - Toggle Overlay
 Arrow Keys - Navigate</source>
@ -904,37 +917,37 @@ Arrow Keys - Navigate</source>
 方向鍵 - 導覽</translation>
    </message>
    <message>
-        <location filename="../PictureDialog.cpp" line="618"/>
-        <location filename="../PictureDialog.cpp" line="644"/>
+        <location filename="../PictureDialog.cpp" line="619"/>
+        <location filename="../PictureDialog.cpp" line="645"/>
        <source>Snapmatic Picture Viewer</source>
        <translation>Snapmatic 圖片檢視器</translation>
    </message>
    <message>
-        <location filename="../PictureDialog.cpp" line="618"/>
-        <location filename="../PictureDialog.cpp" line="644"/>
+        <location filename="../PictureDialog.cpp" line="619"/>
+        <location filename="../PictureDialog.cpp" line="645"/>
        <source>Failed at %1</source>
        <translation>失敗: %1</translation>
    </message>
    <message>
-        <location filename="../PictureDialog.cpp" line="643"/>
-        <location filename="../PictureDialog.cpp" line="783"/>
+        <location filename="../PictureDialog.cpp" line="644"/>
+        <location filename="../PictureDialog.cpp" line="784"/>
        <location filename="../SnapmaticEditor.cpp" line="240"/>
        <source>No Players</source>
        <translation>無</translation>
    </message>
    <message>
-        <location filename="../PictureDialog.cpp" line="643"/>
-        <location filename="../PictureDialog.cpp" line="763"/>
+        <location filename="../PictureDialog.cpp" line="644"/>
+        <location filename="../PictureDialog.cpp" line="764"/>
        <source>No Crew</source>
        <translation>無</translation>
    </message>
    <message>
-        <location filename="../PictureDialog.cpp" line="643"/>
+        <location filename="../PictureDialog.cpp" line="644"/>
        <source>Unknown Location</source>
        <translation>未知地點</translation>
    </message>
    <message>
-        <location filename="../PictureDialog.cpp" line="729"/>
+        <location filename="../PictureDialog.cpp" line="730"/>
        <source>Avatar Preview Mode
 Press 1 for Default View</source>
        <translation>大頭貼預覽模式
@ -1144,8 +1157,8 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="109"/>
-        <location filename="../ImportDialog.cpp" line="316"/>
-        <location filename="../ImportDialog.cpp" line="510"/>
+        <location filename="../ImportDialog.cpp" line="342"/>
+        <location filename="../ImportDialog.cpp" line="572"/>
        <location filename="../ProfileInterface.cpp" line="482"/>
        <location filename="../ProfileInterface.cpp" line="548"/>
        <location filename="../ProfileInterface.cpp" line="857"/>
@ -1156,12 +1169,12 @@ Press 1 for Default View</source>
        <location filename="../ImageEditorDialog.cpp" line="110"/>
        <location filename="../ImageEditorDialog.cpp" line="141"/>
        <location filename="../ImageEditorDialog.cpp" line="150"/>
-        <location filename="../ImportDialog.cpp" line="317"/>
-        <location filename="../ImportDialog.cpp" line="348"/>
-        <location filename="../ImportDialog.cpp" line="357"/>
-        <location filename="../ImportDialog.cpp" line="511"/>
-        <location filename="../ImportDialog.cpp" line="542"/>
-        <location filename="../ImportDialog.cpp" line="551"/>
+        <location filename="../ImportDialog.cpp" line="343"/>
+        <location filename="../ImportDialog.cpp" line="374"/>
+        <location filename="../ImportDialog.cpp" line="383"/>
+        <location filename="../ImportDialog.cpp" line="573"/>
+        <location filename="../ImportDialog.cpp" line="604"/>
+        <location filename="../ImportDialog.cpp" line="613"/>
        <location filename="../ProfileInterface.cpp" line="483"/>
        <location filename="../ProfileInterface.cpp" line="527"/>
        <location filename="../ProfileInterface.cpp" line="582"/>
@ -1181,16 +1194,16 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="120"/>
-        <location filename="../ImportDialog.cpp" line="327"/>
-        <location filename="../ImportDialog.cpp" line="521"/>
+        <location filename="../ImportDialog.cpp" line="353"/>
+        <location filename="../ImportDialog.cpp" line="583"/>
        <location filename="../ProfileInterface.cpp" line="502"/>
        <source>All image files (%1)</source>
        <translation>所有圖片 (%1)</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="121"/>
-        <location filename="../ImportDialog.cpp" line="328"/>
-        <location filename="../ImportDialog.cpp" line="522"/>
+        <location filename="../ImportDialog.cpp" line="354"/>
+        <location filename="../ImportDialog.cpp" line="584"/>
        <location filename="../ProfileInterface.cpp" line="503"/>
        <location filename="../UserInterface.cpp" line="463"/>
        <source>All files (**)</source>
@ -1198,16 +1211,16 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="141"/>
-        <location filename="../ImportDialog.cpp" line="348"/>
-        <location filename="../ImportDialog.cpp" line="542"/>
+        <location filename="../ImportDialog.cpp" line="374"/>
+        <location filename="../ImportDialog.cpp" line="604"/>
        <location filename="../ProfileInterface.cpp" line="725"/>
        <source>Can&apos;t import %1 because file can&apos;t be open</source>
        <translation>無法匯入 %1，因為檔案無法開啟</translation>
    </message>
    <message>
        <location filename="../ImageEditorDialog.cpp" line="150"/>
-        <location filename="../ImportDialog.cpp" line="357"/>
-        <location filename="../ImportDialog.cpp" line="551"/>
+        <location filename="../ImportDialog.cpp" line="383"/>
+        <location filename="../ImportDialog.cpp" line="613"/>
        <location filename="../ProfileInterface.cpp" line="735"/>
        <source>Can&apos;t import %1 because file can&apos;t be parsed properly</source>
        <translation>無法匯入 %1，因為檔案無法正確解析</translation>
@ -1721,9 +1734,9 @@ Press 1 for Default View</source>
        <location filename="../JsonEditorDialog.cpp" line="175"/>
        <location filename="../JsonEditorDialog.cpp" line="181"/>
        <location filename="../JsonEditorDialog.cpp" line="193"/>
-        <location filename="../PictureDialog.cpp" line="906"/>
+        <location filename="../PictureDialog.cpp" line="907"/>
        <location filename="../SnapmaticEditor.cpp" line="327"/>
-        <location filename="../SnapmaticWidget.cpp" line="357"/>
+        <location filename="../SnapmaticWidget.cpp" line="387"/>
        <source>Snapmatic Properties</source>
        <translation>Snapmatic 屬性</translation>
    </message>
@ -1804,9 +1817,9 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../JsonEditorDialog.cpp" line="181"/>
-        <location filename="../PictureDialog.cpp" line="906"/>
+        <location filename="../PictureDialog.cpp" line="907"/>
        <location filename="../SnapmaticEditor.cpp" line="327"/>
-        <location filename="../SnapmaticWidget.cpp" line="357"/>
+        <location filename="../SnapmaticWidget.cpp" line="387"/>
        <source>Patching of Snapmatic Properties failed because of I/O Error</source>
        <translation>讀寫錯誤，未能更新 Snapmatic 屬性</translation>
    </message>
@ -1998,8 +2011,8 @@ Press 1 for Default View</source>
    </message>
    <message>
        <location filename="../SnapmaticWidget.ui" line="152"/>
-        <location filename="../SnapmaticWidget.cpp" line="157"/>
-        <location filename="../SnapmaticWidget.cpp" line="166"/>
+        <location filename="../SnapmaticWidget.cpp" line="158"/>
+        <location filename="../SnapmaticWidget.cpp" line="167"/>
        <source>Delete picture</source>
        <translation>刪除圖片</translation>
    </message>
@ -2059,22 +2072,22 @@ Press 1 for Default View</source>
        <translation>取消選擇全部(&amp;D)</translation>
    </message>
    <message>
-        <location filename="../SnapmaticWidget.cpp" line="157"/>
+        <location filename="../SnapmaticWidget.cpp" line="158"/>
        <source>Are you sure to delete %1 from your Snapmatic pictures?</source>
        <translation>你確定要刪除Snapmatic 圖片 %1 嗎?</translation>
    </message>
    <message>
-        <location filename="../SnapmaticWidget.cpp" line="166"/>
+        <location filename="../SnapmaticWidget.cpp" line="167"/>
        <source>Failed at deleting %1 from your Snapmatic pictures</source>
        <translation>刪除 Snapmatic 圖片 %1 失敗</translation>
    </message>
    <message>
-        <location filename="../SnapmaticWidget.cpp" line="290"/>
+        <location filename="../SnapmaticWidget.cpp" line="291"/>
        <source>Failed to hide %1 In-game from your Snapmatic pictures</source>
        <translation>在遊戲中隱藏圖片 %1 失敗</translation>
    </message>
    <message>
-        <location filename="../SnapmaticWidget.cpp" line="298"/>
+        <location filename="../SnapmaticWidget.cpp" line="299"/>
        <source>Failed to show %1 In-game from your Snapmatic pictures</source>
        <translation>在遊戲中顯示圖片 %1 失敗</translation>
    </message>
@ -2275,14 +2288,14 @@ Press 1 for Default View</source>
    <message>
        <location filename="../ProfileInterface.cpp" line="1349"/>
        <location filename="../ProfileInterface.cpp" line="1363"/>
-        <location filename="../SnapmaticWidget.cpp" line="298"/>
+        <location filename="../SnapmaticWidget.cpp" line="299"/>
        <source>Show In-game</source>
        <translation>在遊戲中顯示</translation>
    </message>
    <message>
        <location filename="../ProfileInterface.cpp" line="1383"/>
        <location filename="../ProfileInterface.cpp" line="1397"/>
-        <location filename="../SnapmaticWidget.cpp" line="290"/>
+        <location filename="../SnapmaticWidget.cpp" line="291"/>
        <source>Hide In-game</source>
        <translation>在遊戲中隱藏</translation>
    </message>