From ca78601ada535f222198838f4d59c62bc8a8f95d Mon Sep 17 00:00:00 2001
From: user <user>
Date: Fri, 18 Dec 2020 02:00:57 +0800
Subject: [PATCH 1/2] qt: visual fixes

---
 qt/i2pd_qt/mainwindow.cpp | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/qt/i2pd_qt/mainwindow.cpp b/qt/i2pd_qt/mainwindow.cpp
index de2c9fb8..3d0dc551 100644
--- a/qt/i2pd_qt/mainwindow.cpp
+++ b/qt/i2pd_qt/mainwindow.cpp
@@ -997,30 +997,33 @@ void MainWindow::backClickedFromChild() {
 }
 
 void MainWindow::adjustSizesAccordingToWrongLabel() {
+    constexpr auto HEIGHT = 581;
+    constexpr auto WIDTH = 707;
     if(ui->wrongInputLabel->isVisible()) {
         int dh = ui->wrongInputLabel->height()+ui->verticalLayout_7->layout()->spacing();
         ui->verticalLayout_7->invalidate();
         ui->wrongInputLabel->adjustSize();
         ui->stackedWidget->adjustSize();
-        ui->stackedWidget->setFixedHeight(531-dh);
-        ui->settingsPage->setFixedHeight(531-dh);
-        ui->verticalLayoutWidget_4->setGeometry(QRect(0, 0, 711, 531-dh));
-        ui->stackedWidget->setFixedHeight(531-dh);
-        ui->settingsScrollArea->setFixedHeight(531-dh-settingsTitleLabelNominalHeight-ui->verticalLayout_4->spacing());
+        const auto height = HEIGHT - dh;
+        ui->stackedWidget->setFixedHeight(height);
+        ui->settingsPage->setFixedHeight(height);
+        ui->verticalLayoutWidget_4->setGeometry(QRect(0, 0, WIDTH, height));
+        ui->stackedWidget->setFixedHeight(height);
+        ui->settingsScrollArea->setFixedHeight(height-settingsTitleLabelNominalHeight-ui->verticalLayout_4->spacing());
         ui->settingsTitleLabel->setFixedHeight(settingsTitleLabelNominalHeight);
-        ui->tunnelsScrollArea->setFixedHeight(531-dh-settingsTitleLabelNominalHeight-ui->horizontalLayout_42->geometry().height()-2*ui->verticalLayout_4->spacing());
+        ui->tunnelsScrollArea->setFixedHeight(height-settingsTitleLabelNominalHeight-ui->horizontalLayout_42->geometry().height()-2*ui->verticalLayout_4->spacing());
         ui->tunnelsTitleLabel->setFixedHeight(settingsTitleLabelNominalHeight);
     }else{
         ui->verticalLayout_7->invalidate();
         ui->wrongInputLabel->adjustSize();
         ui->stackedWidget->adjustSize();
-        ui->stackedWidget->setFixedHeight(531);
-        ui->settingsPage->setFixedHeight(531);
-        ui->verticalLayoutWidget_4->setGeometry(QRect(0, 0, 711, 531));
-        ui->stackedWidget->setFixedHeight(531);
-        ui->settingsScrollArea->setFixedHeight(531-settingsTitleLabelNominalHeight-ui->verticalLayout_4->spacing());
+        ui->stackedWidget->setFixedHeight(HEIGHT);
+        ui->settingsPage->setFixedHeight(HEIGHT);
+        ui->verticalLayoutWidget_4->setGeometry(QRect(0, 0, WIDTH, HEIGHT));
+        ui->stackedWidget->setFixedHeight(HEIGHT);
+        ui->settingsScrollArea->setFixedHeight(HEIGHT-settingsTitleLabelNominalHeight-ui->verticalLayout_4->spacing());
         ui->settingsTitleLabel->setFixedHeight(settingsTitleLabelNominalHeight);
-        ui->tunnelsScrollArea->setFixedHeight(531-settingsTitleLabelNominalHeight-ui->horizontalLayout_42->geometry().height()-2*ui->verticalLayout_4->spacing());
+        ui->tunnelsScrollArea->setFixedHeight(HEIGHT-settingsTitleLabelNominalHeight-ui->horizontalLayout_42->geometry().height()-2*ui->verticalLayout_4->spacing());
         ui->tunnelsTitleLabel->setFixedHeight(settingsTitleLabelNominalHeight);
     }
 }

From 9c6e3ff1d774948c77e31478742a6f4096235f0d Mon Sep 17 00:00:00 2001
From: user <user>
Date: Fri, 18 Dec 2020 03:39:08 +0800
Subject: [PATCH 2/2] qt: fixes #1582

---
 qt/i2pd_qt/generalsettingswidget.ui | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/qt/i2pd_qt/generalsettingswidget.ui b/qt/i2pd_qt/generalsettingswidget.ui
index 7a35c0a5..e81d6f1e 100644
--- a/qt/i2pd_qt/generalsettingswidget.ui
+++ b/qt/i2pd_qt/generalsettingswidget.ui
@@ -495,6 +495,11 @@ QGroupBox::title {
           </item>
           <item>
            <widget class="QComboBox" name="logLevelComboBox">
+            <item>
+             <property name="text">
+              <string>None</string>
+             </property>
+            </item>
             <item>
              <property name="text">
               <string>Error</string>