#52 [GUI => DEV] Music && font small upgrades

Merged
Endevir merged 1 commits from GooseHouse/gui into GooseHouse/dev 6 years ago

BIN
assets/main_menu/main_menu_music_1.mp3


BIN
assets/main_menu/main_menu_music_1.ogg


+ 8 - 8
client.pro

@@ -177,17 +177,17 @@ debug {
 #CONFIG += console
 
 RESOURCES +=                                    \
-    res/hotseat_intro.qrc                       \
-    res/hotseat_recruitment.qrc                 \
+    #res/hotseat_intro.qrc                       \
+    #res/hotseat_recruitment.qrc                 \
     #res/hotseat_prebattle.qrc                   \
     #res/hotseat_game.qrc                        \
-    res/main_menu.qrc                           \
-    res/hotseat_intro.qrc                       \
+    #res/main_menu.qrc                           \
+    #res/hotseat_intro.qrc                       \
                                                 \
-    res/effect_data.qrc                         \
-    res/spell_data.qrc                          \
-    res/unit_data.qrc                           \
-    res/common_data.qrc
+    #res/effect_data.qrc                         \
+    #res/spell_data.qrc                          \
+    #res/unit_data.qrc                           \
+    #res/common_data.qrc
 #    res/all_data.qrc
 }
 

+ 1 - 1
ui/hotseat_recruitment/iconhint.cpp

@@ -6,7 +6,7 @@ IconHint::IconHint(QWidget *parent) :
     QLabel(parent)
 {
     setObjectName("hint");
-    setStyleSheet("border-image: url(:/assets/common/window/frame.png);\nbackground-color: rgb(0, 0, 0);\ncolor: rgb(255, 255, 255);");
+    setStyleSheet("border-image: url(:/assets/common/window/frame.png);\nbackground-color: rgb(0, 0, 0);\ncolor: rgb(255, 255, 255);\nfont: 8pt \"D-determination (RUS BY LYAJKA)\";");
     setIndent(10);
     setWordWrap(true);
     setAlignment(Qt::AlignCenter);

+ 1 - 3
ui/hotseat_recruitment/recruitmentscene.cpp

@@ -394,7 +394,7 @@ bool UnitIconEventListener::eventFilter(QObject *watched, QEvent *event) {
                     return false;
                 form->setTitle("Набор юнита " + unit->getUnitName());
                 form->setShowCancel(false);
-                form->setText("Не могу нанять юнита.. Проверьте, возможно он слишком дорогой или для него нет места в отряде?");
+                form->setText("Не могу нанять юнита. Проверьте, возможно он слишком дорогой или для него нет места в отряде?");
                 GuiSceneManager::getInstance().show("dialog_form");
                 form->exec();
                 GuiSceneManager::getInstance().hide("dialog_form");
@@ -438,8 +438,6 @@ bool UnitIconEventListener::eventFilter(QObject *watched, QEvent *event) {
                 if (scene_->childAt(QCursor::pos()) == icon) {
                     QEvent *event = new QEvent(QEvent::Enter);
                     QCoreApplication::postEvent(icon, event);
-                } else {
-                    qDebug() << "FUUUUUUUUUUUUUUUUUUUUU";
                 }
             }
         }