From d50597ee7c936430cccea6000b7c530822e85df3 Mon Sep 17 00:00:00 2001 From: EndrII Date: Sat, 15 May 2021 17:23:59 +0300 Subject: [PATCH 1/4] ref #78 "fix dialog size " --- HanoiTowers/client/languages/en.ts | 22 ++++++++++----------- HanoiTowers/client/languages/ja.ts | 22 ++++++++++----------- HanoiTowers/client/languages/ru.ts | 22 ++++++++++----------- HanoiTowers/client/languages/tr.ts | 22 ++++++++++----------- HanoiTowers/client/languages/uk.ts | 22 ++++++++++----------- HanoiTowers/client/menu/LocalUsersTable.qml | 4 +++- submodules/QMLLoginView | 2 +- 7 files changed, 59 insertions(+), 57 deletions(-) diff --git a/HanoiTowers/client/languages/en.ts b/HanoiTowers/client/languages/en.ts index c803683..0a1cbe6 100644 --- a/HanoiTowers/client/languages/en.ts +++ b/HanoiTowers/client/languages/en.ts @@ -302,32 +302,32 @@ User with this id already registered. If it you then use please the login form. - + Create user error User create error - + Failed to create a new user, The name %0 alredy used. Failed to create a new user, This name %0 alredy used. - + Remove online error Remove online error - + current profile not online! Current profile is offline! - + Remove Local user Remove Local user - + Failed to remove the local user data Failed to remove the local user data @@ -567,27 +567,27 @@ Return to main menu - + Welcom to Hanoi Towers Welcom to Hanoi Towers - + Profiles Profiles - + This are the main settings This are the main settings - + About Page About Page - + World Of Hanoi Towers World Of Hanoi Towers diff --git a/HanoiTowers/client/languages/ja.ts b/HanoiTowers/client/languages/ja.ts index 1da6d92..38318e1 100644 --- a/HanoiTowers/client/languages/ja.ts +++ b/HanoiTowers/client/languages/ja.ts @@ -320,32 +320,32 @@ このIDのユーザーはすでに登録されています。 それを使用する場合は、ログインフォームを使用してください。 - + Create user error ユーザーエラーの作成 - + Failed to create a new user, The name %0 alredy used. 新しいユーザーの作成に失敗しました。名前 %0 はすでに使用されています。 - + Remove online error オンラインユーザーデータの削除中にエラーが発生しました - + current profile not online! 現在のプロファイルはオフラインです！ - + Remove Local user ローカルユーザーを削除する - + Failed to remove the local user data ローカルユーザーデータの削除に失敗しました @@ -616,27 +616,27 @@ メインメニューへ戻る - + Welcom to Hanoi Towers ハノイタワー - + Profiles プロファイル - + This are the main settings これはメインの設定です - + About Page ページに関して - + World Of Hanoi Towers ハノイタワーズワールド diff --git a/HanoiTowers/client/languages/ru.ts b/HanoiTowers/client/languages/ru.ts index fb6adc2..5ae0162 100644 --- a/HanoiTowers/client/languages/ru.ts +++ b/HanoiTowers/client/languages/ru.ts @@ -327,32 +327,32 @@ Пользователь с этим id уже зарегистрирован. Если это вы, пожалуйста используйте форму входа. - + Create user error Ошибка создания пользователя - + Failed to create a new user, The name %0 alredy used. Не удалось создать пользователя. Данное имя %0 уже используется - + Remove online error Ошибка удаления онлайн аккаунта - + current profile not online! Текущий профиль не в сети! - + Remove Local user Удалить локального.пользователя - + Failed to remove the local user data Ошибка удаления локального пользователя @@ -619,27 +619,27 @@ Вернутся в главное меню - + Welcom to Hanoi Towers Добро пожаловать в Hanoi Towers - + Profiles Профили - + This are the main settings Основные настройки - + About Page Справка - + World Of Hanoi Towers Мир Ханойских башен diff --git a/HanoiTowers/client/languages/tr.ts b/HanoiTowers/client/languages/tr.ts index 8aa42dd..31518f0 100644 --- a/HanoiTowers/client/languages/tr.ts +++ b/HanoiTowers/client/languages/tr.ts @@ -328,32 +328,32 @@ Bu seviye için minimum adımlar: %2 Bu kimliğe sahip kullanıcı zaten kayıtlı. Eğer öyleyse, lütfen giriş formunu kullanın. - + Create user error Kullanıcı hatası oluştur - + Failed to create a new user, The name %0 alredy used. Yeni bir kullanıcı oluşturulamadı, %0 adı kullanıldı. - + Remove online error Çevrimiçi kullanıcı verilerini kaldırma hatası - + current profile not online! Mevcut profil çevrimdışı! - + Remove Local user Yerel kullanıcıyı kaldır - + Failed to remove the local user data Yerel kullanıcı verileri kaldırılamadı @@ -620,27 +620,27 @@ Bu seviye için minimum adımlar: %2 Ana menüye dön - + Welcom to Hanoi Towers Hanoi Kuleleri'ne hoş geldiniz - + Profiles Profiller - + This are the main settings Bu ana ayarlar - + About Page Sayfa Hakkında - + World Of Hanoi Towers Hanoi Kuleleri Dünyası diff --git a/HanoiTowers/client/languages/uk.ts b/HanoiTowers/client/languages/uk.ts index 4b970f4..0e1f27f 100644 --- a/HanoiTowers/client/languages/uk.ts +++ b/HanoiTowers/client/languages/uk.ts @@ -330,32 +330,32 @@ Користувач з цим ідентифікатором вже зареєстрований. Якщо ви використовуєте його, будь ласка, увійдіть у форму для входу. - + Create user error Помилка створення користувача - + Failed to create a new user, The name %0 alredy used. Не вдалося створити нового користувача, ім’я %0 вже використовується. - + Remove online error Помилка видалення онлайн даних користувачів - + current profile not online! Поточний профіль офлайн! - + Remove Local user Видалити локального користувача - + Failed to remove the local user data Не вдалося видалити локальні дані користувача @@ -622,27 +622,27 @@ Головне меню - + Welcom to Hanoi Towers Ласкаво просимо до Ханойських веж - + Profiles Профілі - + This are the main settings Це основні налаштування - + About Page Довідка - + World Of Hanoi Towers Світ Ханойських веж diff --git a/HanoiTowers/client/menu/LocalUsersTable.qml b/HanoiTowers/client/menu/LocalUsersTable.qml index 343b808..57135b7 100644 --- a/HanoiTowers/client/menu/LocalUsersTable.qml +++ b/HanoiTowers/client/menu/LocalUsersTable.qml @@ -59,7 +59,9 @@ Item { id: loginPopUp lognViewModel: userLogin // exampleLogin - this is inited model in main.cpp - width: 7 * controlPtMaterial + width: 20 * fontPoints + height: 15 * fontPoints + Connections { target: backEnd; function onShowOnlinePage () { diff --git a/submodules/QMLLoginView b/submodules/QMLLoginView index 97b3cc4..c271817 160000 --- a/submodules/QMLLoginView +++ b/submodules/QMLLoginView @@ -1 +1 @@ -Subproject commit 97b3cc41f4112af67bb3250e2a46395e09fefaa5 +Subproject commit c27181745fb4c10c7299583dcab829f0c0a50a2a From 317601b00c179f6c1735c2df2c6c7198cd20b259 Mon Sep 17 00:00:00 2001 From: EndrII Date: Sat, 15 May 2021 18:22:12 +0300 Subject: [PATCH 2/4] ref #78 --- HanoiTowers/client/Game.qml | 8 +++++++- HanoiTowers/client/menu/LocalUsersTable.qml | 10 ++++++++-- HanoiTowers/client/res.qrc | 3 +++ HanoiTowers/client/res/TowerBlockSound_18.wav | Bin 0 -> 44164 bytes 4 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 HanoiTowers/client/res/TowerBlockSound_18.wav diff --git a/HanoiTowers/client/Game.qml b/HanoiTowers/client/Game.qml index 8b6e1e6..36faf84 100644 --- a/HanoiTowers/client/Game.qml +++ b/HanoiTowers/client/Game.qml @@ -10,7 +10,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Dialogs 1.3 import QtQuick.Layouts 1.15 - +import QtMultimedia 5.15 Item { visible: true @@ -124,6 +124,8 @@ Item { function trigered(obj) { + clickSound.play() + stateWidget.tumbler.visible = false; let objectPlate = null; if (upPlate) { @@ -247,4 +249,8 @@ Item { id: help } + SoundEffect { + id: clickSound + source: "qrc:/sound/blockSound" + } } diff --git a/HanoiTowers/client/menu/LocalUsersTable.qml b/HanoiTowers/client/menu/LocalUsersTable.qml index 57135b7..ce530bb 100644 --- a/HanoiTowers/client/menu/LocalUsersTable.qml +++ b/HanoiTowers/client/menu/LocalUsersTable.qml @@ -59,8 +59,14 @@ Item { id: loginPopUp lognViewModel: userLogin // exampleLogin - this is inited model in main.cpp - width: 20 * fontPoints - height: 15 * fontPoints + height: 13 * fontMetrics.height + width: 15 * fontMetrics.height + + FontMetrics { + id: fontMetrics + font.capitalization: Font.AllUppercase + font.bold: true + } Connections { target: backEnd; diff --git a/HanoiTowers/client/res.qrc b/HanoiTowers/client/res.qrc index 3540957..a706b7c 100644 --- a/HanoiTowers/client/res.qrc +++ b/HanoiTowers/client/res.qrc @@ -12,4 +12,7 @@ sql/database.sql + + res/TowerBlockSound_18.wav + diff --git a/HanoiTowers/client/res/TowerBlockSound_18.wav b/HanoiTowers/client/res/TowerBlockSound_18.wav new file mode 100644 index 0000000000000000000000000000000000000000..416830b0f94453734197d97a6d5579f707c688cc GIT binary patch literal 44164 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 literal 0 HcmV?d00001 From 140d42fb134395d29ec0848d5f42ddf2d7d0a2bc Mon Sep 17 00:00:00 2001 From: EndrII Date: Sat, 15 May 2021 18:39:17 +0300 Subject: [PATCH 3/4] fix dialog size --- HanoiTowers/client/menu/LocalUsersTable.qml | 9 ++++----- submodules/QMLLoginView | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/HanoiTowers/client/menu/LocalUsersTable.qml b/HanoiTowers/client/menu/LocalUsersTable.qml index ce530bb..4519488 100644 --- a/HanoiTowers/client/menu/LocalUsersTable.qml +++ b/HanoiTowers/client/menu/LocalUsersTable.qml @@ -59,13 +59,12 @@ Item { id: loginPopUp lognViewModel: userLogin // exampleLogin - this is inited model in main.cpp - height: 13 * fontMetrics.height - width: 15 * fontMetrics.height + height: 6 * fontMetrics.height + width: 5 * fontMetrics.height - FontMetrics { + TextField { id: fontMetrics - font.capitalization: Font.AllUppercase - font.bold: true + visible: false } Connections { diff --git a/submodules/QMLLoginView b/submodules/QMLLoginView index c271817..73ca7f0 160000 --- a/submodules/QMLLoginView +++ b/submodules/QMLLoginView @@ -1 +1 @@ -Subproject commit c27181745fb4c10c7299583dcab829f0c0a50a2a +Subproject commit 73ca7f05751503c3d31e2bd1235b6946df1c6287 From f77e7acab36293e19b3ecae872ce664c997ec824 Mon Sep 17 00:00:00 2001 From: EndrII Date: Sat, 15 May 2021 19:24:20 +0300 Subject: [PATCH 4/4] update dialog s view --- HanoiTowers/client/languages/en.ts | 16 ++++++++-------- HanoiTowers/client/languages/ja.ts | 16 ++++++++-------- HanoiTowers/client/languages/ru.ts | 16 ++++++++-------- HanoiTowers/client/languages/tr.ts | 16 ++++++++-------- HanoiTowers/client/languages/uk.ts | 16 ++++++++-------- HanoiTowers/client/menu/LocalUsersTable.qml | 12 ++++++------ submodules/QMLLoginView | 2 +- 7 files changed, 47 insertions(+), 47 deletions(-) diff --git a/HanoiTowers/client/languages/en.ts b/HanoiTowers/client/languages/en.ts index 0a1cbe6..e6186f5 100644 --- a/HanoiTowers/client/languages/en.ts +++ b/HanoiTowers/client/languages/en.ts @@ -149,38 +149,38 @@ Minimum steps for this lvl: %1 - - + + Congratulations! You have passed the level %0 Congratulations! You have passed the level %0 - + You got <b>%0</b> points for this level and unlocked the level <b>%1</b>! You got <b>%0</b> points for this level and unlocked the level <b>%1</b>! - + <br><br> Totally <b>%2</b> steps. <br><br> Totally <b>%2</b> steps. - + <br> The minimum number of steps for this level : <b>%3</b> <br> The minimum number of steps for this level : <b>%3</b> - + You got <b>%0</b> points for this level! You got <b>%0</b> points for this level! - + <br><br> Totally <b>%1</b> steps. <br><br> Totally <b>%1</b> steps. - + <br> The minimum number of steps for this level : <b>%2</b> <br> The minimum number of steps for this level : <b>%2</b> diff --git a/HanoiTowers/client/languages/ja.ts b/HanoiTowers/client/languages/ja.ts index 38318e1..8df2956 100644 --- a/HanoiTowers/client/languages/ja.ts +++ b/HanoiTowers/client/languages/ja.ts @@ -167,38 +167,38 @@ このLVLの最小ステップ： %1 - - + + Congratulations! You have passed the level %0 おめでとう！ レベル %0 に合格しました - + You got <b>%0</b> points for this level and unlocked the level <b>%1</b>! あなたが得た <b>%0</b> このレベルのポイントとレベルのロック解除 <b>%1</b>! - + <br><br> Totally <b>%2</b> steps. <br><br> 完全に <b>%2</b> ステップ. - + <br> The minimum number of steps for this level : <b>%3</b> <br> このレベルの最小ステップ数 : <b>%3</b> - + You got <b>%0</b> points for this level! このレベルで <b>%0</b> ポイント獲得しました！ - + <br><br> Totally <b>%1</b> steps. <br><br> 完全に <b>%1</b> ステップ. - + <br> The minimum number of steps for this level : <b>%2</b> <br> このレベルの最小ステップ数 : <b>%2</b> diff --git a/HanoiTowers/client/languages/ru.ts b/HanoiTowers/client/languages/ru.ts index 5ae0162..c61f8d9 100644 --- a/HanoiTowers/client/languages/ru.ts +++ b/HanoiTowers/client/languages/ru.ts @@ -174,38 +174,38 @@ Минимальные шаги для этого уровня:%1 - - + + Congratulations! You have passed the level %0 Поздравляем! Вы прошли уровень %0 - + You got <b>%0</b> points for this level and unlocked the level <b>%1</b>! Вы набрали <b>%0</b> баллов за этот уровень и разблокировали уровень <b>%1</b>! - + <br><br> Totally <b>%2</b> steps. <br><br> Всего <b>%2</b> ходов. - + <br> The minimum number of steps for this level : <b>%3</b> <br> Минимально количество ходов для уровня: <b>%3</b> - + You got <b>%0</b> points for this level! Вы набрали <b>%0</b> баллов за этот уровень! - + <br><br> Totally <b>%1</b> steps. <br><br> Всего <b>%1</b> ходов. - + <br> The minimum number of steps for this level : <b>%2</b> <br> Минимальное количиство ходов для уровня : <b>%2</b> diff --git a/HanoiTowers/client/languages/tr.ts b/HanoiTowers/client/languages/tr.ts index 31518f0..6310ea1 100644 --- a/HanoiTowers/client/languages/tr.ts +++ b/HanoiTowers/client/languages/tr.ts @@ -175,38 +175,38 @@ Bu seviye için minimum adımlar: %2 Bu seviye için minimum adımlar: %1 - - + + Congratulations! You have passed the level %0 Tebrikler! %0 seviyesini geçtiniz - + You got <b>%0</b> points for this level and unlocked the level <b>%1</b>! Bu seviye için <b>%0</b> puan aldınız ve <b>%1</b> seviyesinin kilidini açtınız! - + <br><br> Totally <b>%2</b> steps. <br><br> Tamamen <b>%2</b> adım. - + <br> The minimum number of steps for this level : <b>%3</b> <br> Bu seviye için minimum adım sayısı : <b>%3</b> - + You got <b>%0</b> points for this level! Bu seviye için <b>%0</b> puan aldınız! - + <br><br> Totally <b>%1</b> steps. <br><br> Tamamen <b>%1</b> adım. - + <br> The minimum number of steps for this level : <b>%2</b> <br> Bu seviye için minimum adım sayısı : <b>%2</b> diff --git a/HanoiTowers/client/languages/uk.ts b/HanoiTowers/client/languages/uk.ts index 0e1f27f..f89d5c1 100644 --- a/HanoiTowers/client/languages/uk.ts +++ b/HanoiTowers/client/languages/uk.ts @@ -177,38 +177,38 @@ Мінімальні кроки для цього рівня: %1 - - + + Congratulations! You have passed the level %0 Вітаємо! Ви пройшли рівень %0 - + You got <b>%0</b> points for this level and unlocked the level <b>%1</b>! Ви отримали <b>%0</b> балів за цей рівень і розблокували рівень <b>%1</b>! - + <br><br> Totally <b>%2</b> steps. <br><br>Повністю<b>%2</b> кроків. - + <br> The minimum number of steps for this level : <b>%3</b> <br> Мінімальна кількість кроків для цього рівня: <b>%3</b> - + You got <b>%0</b> points for this level! Ви отримали <b>%0</b> балів за цей рівень! - + <br><br> Totally <b>%1</b> steps. <br> <br> Повністю <b>%1</b> кроків. - + <br> The minimum number of steps for this level : <b>%2</b> <br> Мінімальна кількість кроків для цього рівня: <b>%2</b> diff --git a/HanoiTowers/client/menu/LocalUsersTable.qml b/HanoiTowers/client/menu/LocalUsersTable.qml index 4519488..b1bd309 100644 --- a/HanoiTowers/client/menu/LocalUsersTable.qml +++ b/HanoiTowers/client/menu/LocalUsersTable.qml @@ -59,14 +59,14 @@ Item { id: loginPopUp lognViewModel: userLogin // exampleLogin - this is inited model in main.cpp - height: 6 * fontMetrics.height - width: 5 * fontMetrics.height - - TextField { + height: 12 * fontMetrics.height + width: 15 * fontMetrics.height + singleColumn: true + FontMetrics { id: fontMetrics - visible: false + font.capitalization: Font.AllUppercase + font.bold: true } - Connections { target: backEnd; function onShowOnlinePage () { diff --git a/submodules/QMLLoginView b/submodules/QMLLoginView index 73ca7f0..d999706 160000 --- a/submodules/QMLLoginView +++ b/submodules/QMLLoginView @@ -1 +1 @@ -Subproject commit 73ca7f05751503c3d31e2bd1235b6946df1c6287 +Subproject commit d999706ca9fcfac6acf41a11b99d19632d78e516