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/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 343b808..b1bd309 100644 --- a/HanoiTowers/client/menu/LocalUsersTable.qml +++ b/HanoiTowers/client/menu/LocalUsersTable.qml @@ -59,7 +59,14 @@ Item { id: loginPopUp lognViewModel: userLogin // exampleLogin - this is inited model in main.cpp - width: 7 * controlPtMaterial + height: 12 * fontMetrics.height + width: 15 * fontMetrics.height + singleColumn: true + FontMetrics { + id: fontMetrics + font.capitalization: Font.AllUppercase + font.bold: true + } Connections { target: backEnd; function onShowOnlinePage () { 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 0000000..416830b Binary files /dev/null and b/HanoiTowers/client/res/TowerBlockSound_18.wav differ diff --git a/submodules/QMLLoginView b/submodules/QMLLoginView index 97b3cc4..d999706 160000 --- a/submodules/QMLLoginView +++ b/submodules/QMLLoginView @@ -1 +1 @@ -Subproject commit 97b3cc41f4112af67bb3250e2a46395e09fefaa5 +Subproject commit d999706ca9fcfac6acf41a11b99d19632d78e516