aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt9
-rw-r--r--qml/pages/MainPage.qml4
-rw-r--r--translations/harbour-passfish-de.qmbin0 -> 23077 bytes
-rw-r--r--translations/harbour-passfish-de.ts (renamed from translations/Passwordsailor-de.ts)2
-rw-r--r--translations/harbour-passfish.qmbin0 -> 21417 bytes
-rw-r--r--translations/harbour-passfish.ts (renamed from translations/Passwordsailor.ts)2
6 files changed, 14 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d4d67f..8bcd2ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,6 +70,13 @@ add_custom_command(
)
add_custom_target(rust_target DEPENDS "${RUST_LIB}")
+add_custom_command(
+ OUTPUT translations/harbour-passfish.qm translations/harbour-passfish-de.qm
+ COMMAND lrelease translations/harbour-passfish.ts translations/harbour-passfish-de.ts
+ WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+)
+add_custom_target(translations_target DEPENDS translations/harbour-passfish.qm translations/harbour-passfish-de.qm)
+
add_executable(
harbour-passfish
src/PassFish.cpp
@@ -77,7 +84,7 @@ add_executable(
src/pwm_qhash.cpp
src/GraphemeCountValidator.cpp
)
-add_dependencies(harbour-passfish rust_target)
+add_dependencies(harbour-passfish rust_target translations_target)
target_compile_definitions(harbour-passfish PRIVATE
$<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:QT_QML_DEBUG>
)
diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml
index b860e67..1195ef8 100644
--- a/qml/pages/MainPage.qml
+++ b/qml/pages/MainPage.qml
@@ -120,6 +120,7 @@ Page {
inputMethodHints: Qt.ImhNoPredictiveText | Qt.ImhNoAutoUppercase
label: qsTr("Used Text")
+ hideLabelOnEmptyField: passwordmaker.used_text === ""
onFocusChanged: if(focus) text = passwordmaker.used_text
onPlaceholderTextChanged: if(!focus) text = ""
placeholderText: passwordmaker.used_text === "" ? qsTr("Used Text") : passwordmaker.used_text
@@ -177,6 +178,8 @@ Page {
onFocusChanged: if(focus) text = passwordmaker.generated_password; else text = "";
placeholderColor: color
+ /*
+ //Commented out for now. This is anyhow never visible, and causes log spam on Sailfish 3.
BusyIndicator {
id: busy
parent: null
@@ -190,6 +193,7 @@ Page {
rightItem: busy
}
}
+ */
}
IconButton{
id: copyToClipboard
diff --git a/translations/harbour-passfish-de.qm b/translations/harbour-passfish-de.qm
new file mode 100644
index 0000000..abbfafa
--- /dev/null
+++ b/translations/harbour-passfish-de.qm
Binary files differ
diff --git a/translations/Passwordsailor-de.ts b/translations/harbour-passfish-de.ts
index bf7d564..a0fad6d 100644
--- a/translations/Passwordsailor-de.ts
+++ b/translations/harbour-passfish-de.ts
@@ -149,7 +149,7 @@
</message>
<message>
<source>Pass Ready</source>
- <translation>Pass Bereit</translation>
+ <translation>Passwort Bereit</translation>
</message>
<message>
<source>Input Needed</source>
diff --git a/translations/harbour-passfish.qm b/translations/harbour-passfish.qm
new file mode 100644
index 0000000..2d1b29c
--- /dev/null
+++ b/translations/harbour-passfish.qm
Binary files differ
diff --git a/translations/Passwordsailor.ts b/translations/harbour-passfish.ts
index 46805ca..4258996 100644
--- a/translations/Passwordsailor.ts
+++ b/translations/harbour-passfish.ts
@@ -142,7 +142,7 @@
</message>
<message>
<source>Pass Ready</source>
- <translation>Pass Ready</translation>
+ <translation>Password Ready</translation>
</message>
<message>
<source>Input Needed</source>