Fix margins and drawing

MahBoiDeveloper · Apr 20, 2024 · 137703d · 137703d
1 parent f4fc397
commit 137703d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/src/GUI/GreetingWidget.cpp b/src/GUI/GreetingWidget.cpp
@@ -20,8 +20,6 @@ GreetingWidget::GreetingWidget(Config::Languages language, QWidget* parent) : QW
     QVBoxLayout* ltMain         = nullptr;
 
     // Makes greeting window unresizeable
-    // setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-    // setFixedSize(800, 600);
 
     // Add "New Project" and "Load Project" buttons to the window
     btnNewProject = new QPushButton(tr("New Project"));
@@ -79,13 +77,10 @@ GreetingWidget::GreetingWidget(Config::Languages language, QWidget* parent) : QW
 
     ltMain = new QVBoxLayout();
     ltMain->setSpacing(50);
-    ltMain->setContentsMargins(50, 50, 50, 86);
+    ltMain->setContentsMargins(60, 60, 60, 86);
     ltMain->addLayout(ltContent);
 
     setLayout(ltMain);
-
-    // LOGMSG(QString("Width = ") +  QString::number(this->width()));
-    // LOGMSG(QString("Height = ") + QString::number(this->height()));
 }
 
 /// @brief Calculate size of long description text block.

diff --git a/src/GUI/LaunchWidget.cpp b/src/GUI/LaunchWidget.cpp
@@ -26,7 +26,6 @@ LaunchWidget::LaunchWidget(Config::Languages lngType, QWidget* parent) : QStacke
     qApp->setWindowIcon(QIcon(QPixmap::fromImage(GUIConfig::DecodeEditorWebpIcon())));
 
     // MainLaunchWidget settings
-    // setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     setFixedSize(795, 440);
     setWindowFlags(windowFlags() |  Qt::MSWindowsFixedSizeDialogHint);
     setWindowFlags(windowFlags() & ~Qt::WindowMaximizeButtonHint &

diff --git a/src/GUI/QtSources/mainStyleSheet.css b/src/GUI/QtSources/mainStyleSheet.css
@@ -44,12 +44,12 @@ QComboBox:checked
 
 QComboBox QAbstractItemView
 {
-    border-width: 3px;
-    border-color: #b1b7ff;
+    border-width: 2px;
     border-radius: 3px;
     border-style: outset;
-    color: black;
-    selection-background-color: #181d5a;
+    border-color: #b1b7ff;
+    background-color: #181d5a;
+    selection-background-color: #3543e7;
 }
 
 QComboBox::drop-down

diff --git a/src/GUI/translations/ru.ts b/src/GUI/translations/ru.ts
@@ -46,22 +46,22 @@
         <translation type="vanished">Загрузить проект</translation>
     </message>
     <message>
-        <location filename="../GreetingWidget.cpp" line="27"/>
+        <location filename="../GreetingWidget.cpp" line="25"/>
         <source>New Project</source>
         <translation>Новый проект</translation>
     </message>
     <message>
-        <location filename="../GreetingWidget.cpp" line="34"/>
+        <location filename="../GreetingWidget.cpp" line="32"/>
         <source>Load Project</source>
         <translation>Загрузить проект</translation>
     </message>
     <message>
-        <location filename="../GreetingWidget.cpp" line="41"/>
+        <location filename="../GreetingWidget.cpp" line="39"/>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
     <message>
-        <location filename="../GreetingWidget.cpp" line="64"/>
+        <location filename="../GreetingWidget.cpp" line="62"/>
         <source>Greetings, %username%. You have launched the hotkey editing program for the game Command and Conquer: Generals and Command and Conquer: Generals — Zero Hour. At the moment, the program supports in test mode only the creation of hotkey maps based on pre-prepared hotkeys. We hope that you will like the program.</source>
         <translation>Приветствую тебя, %username%. Ты запустил программу редактирования горячих клавиш для игры Command and Conquer: Generals и Command and  Conquer: Generals — Zero Hour. На текущий момент программа поддерживает в тестовом режиме только создание карт горячих клавиш на основе заранее подготовленных горячих клавиш. Надеемся, что программа тебе понравится.</translation>
     </message>