Make UI smaller for ubuntu (#1210)

* Make UI smaller for ubuntu * Make UI smaller
firoorg · May 17, 2023 · 0ce0cfc · 0ce0cfc
1 parent f492160
commit 0ce0cfc
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 93 deletions.
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include
@@ -424,8 +424,7 @@ RES_ICONS = \
   qt/res/icons/ext_add_light.png
 
 RES_CSS = \
-  qt/res/css/firo.css \
-  qt/res/css/firo_low.css
+  qt/res/css/firo.css
 
 RES_FONTS = \
   qt/res/fonts/Saira_SemiCondensed-Bold.ttf \

diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc
@@ -154,9 +154,6 @@
     <qresource prefix="/css">
         <file alias="firoTheme">res/css/firo.css</file>
     </qresource>
-    <qresource prefix="/css">
-        <file alias="firoLowTheme">res/css/firo_low.css</file>
-    </qresource>
     <qresource prefix="/fonts">
         <file alias="Saira_SemiCondensed-Bold">res/fonts/Saira_SemiCondensed-Bold.ttf</file>
         <file alias="SourceSansPro-Regular">res/fonts/SourceSansPro-Regular.ttf</file>

diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
@@ -52,7 +52,6 @@
 #include <QAction>
 #include <QApplication>
 #include <QDateTime>
-#include <QDesktopWidget>
 #include <QDragEnterEvent>
 #include <QIcon>
 #include <QLabel>
@@ -62,6 +61,7 @@
 #include <QMessageBox>
 #include <QMimeData>
 #include <QProgressDialog>
+#include <QScreen>
 #include <QSettings>
 #include <QShortcut>
 #include <QStackedWidget>
@@ -151,7 +151,11 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle *
     // load stylesheet
     GUIUtil::loadTheme();
 
-    GUIUtil::restoreWindowGeometry("nWindow", QSize(850, 550), this);
+    QSettings settings;
+    if (!restoreGeometry(settings.value("nWindow").toByteArray())) {
+        // Restore failed (perhaps missing setting), center the window
+        move(QGuiApplication::primaryScreen()->availableGeometry().center() - frameGeometry().center());
+    }
 
     QString windowTitle = tr(PACKAGE_NAME) + " - ";
 #ifdef ENABLE_WALLET
@@ -306,7 +310,8 @@ BitcoinGUI::~BitcoinGUI()
     // Unsubscribe from notifications from core
     unsubscribeFromCoreSignals();
 
-    GUIUtil::saveWindowGeometry("nWindow", this);
+    QSettings settings;
+    settings.setValue("nWindow", saveGeometry());
     if(trayIcon) // Hide tray icon, as deleting will let it linger until quit (on Ubuntu)
         trayIcon->hide();
 #ifdef Q_OS_MAC

diff --git a/src/qt/forms/blanksigmadialog.ui b/src/qt/forms/blanksigmadialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>835</width>
-    <height>593</height>
+    <width>770</width>
+    <height>395</height>
    </rect>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_1">

diff --git a/src/qt/forms/coincontroldialog.ui b/src/qt/forms/coincontroldialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1000</width>
-    <height>500</height>
+    <width>781</width>
+    <height>358</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/src/qt/forms/elyassetsdialog.ui b/src/qt/forms/elyassetsdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>664</width>
-    <height>474</height>
+    <height>362</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/src/qt/forms/lelantusdialog.ui b/src/qt/forms/lelantusdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>914</width>
-    <height>815</height>
+    <height>699</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -582,10 +582,13 @@
      <item>
       <layout class="QGridLayout" name="gridLayout_2">
        <property name="leftMargin">
-        <number>10</number>
+        <number>5</number>
        </property>
        <property name="topMargin">
-        <number>10</number>
+        <number>1</number>
+       </property>
+       <property name="spacing">
+        <number>3</number>
        </property>
        <item row="5" column="0">
         <widget class="QLabel" name="spendableText">
@@ -764,6 +767,9 @@
        </item>
        <item row="4" column="0">
         <widget class="QLabel" name="labelYourAnoymizedCoinsText">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
          <property name="font">
           <font>
            <weight>75</weight>
@@ -773,6 +779,12 @@
          <property name="text">
           <string>Your Anonymized Coins</string>
          </property>
+         <property name="alignment">
+          <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+         </property>
+         <property name="margin">
+          <number>0</number>
+         </property>
         </widget>
        </item>
        <item row="5" column="1">
@@ -952,8 +964,7 @@
          </widget>
         </item>
         <item>
-         <widget class="BitcoinAmountField" name="anonymizeAmount">
-         </widget>
+         <widget class="BitcoinAmountField" name="anonymizeAmount"/>
         </item>
         <item>
          <widget class="QLabel" name="anonymizeUnit">
@@ -1627,7 +1638,7 @@
  </resources>
  <connections/>
  <buttongroups>
-  <buttongroup name="groupFee"/>
   <buttongroup name="groupCustomFee"/>
+  <buttongroup name="groupFee"/>
  </buttongroups>
 </ui>
diff --git a/src/qt/forms/receiverequestdialog.ui b/src/qt/forms/receiverequestdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>487</width>
-    <height>597</height>
+    <height>426</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">

diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>850</width>
-    <height>578</height>
+    <height>535</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/src/qt/forms/sigmacoincontroldialog.ui b/src/qt/forms/sigmacoincontroldialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1000</width>
-    <height>500</height>
+    <width>748</width>
+    <height>319</height>
    </rect>
   </property>
   <property name="windowTitle">

diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -86,7 +86,6 @@ namespace GUIUtil {
 
 static QString stylesheetDirectory = ":css";
 static QString firoTheme = "firoTheme";
-static QString firoLowTheme = "firoLowTheme";
 static CCriticalSection cs_css;
 
 QString dateTimeStr(const QDateTime &date)
@@ -847,29 +846,6 @@ bool SetStartOnSystemStartup(bool fAutoStart) { return false; }
 
 #endif
 
-void saveWindowGeometry(const QString& strSetting, QWidget *parent)
-{
-    QSettings settings;
-    settings.setValue(strSetting + "Pos", parent->pos());
-    settings.setValue(strSetting + "Size", parent->size());
-}
-
-void restoreWindowGeometry(const QString& strSetting, const QSize& defaultSize, QWidget *parent)
-{
-    QSettings settings;
-    QPoint pos = settings.value(strSetting + "Pos").toPoint();
-    QSize size = settings.value(strSetting + "Size", defaultSize).toSize();
-
-    if (!pos.x() && !pos.y()) {
-        QRect screen = QApplication::desktop()->screenGeometry();
-        pos.setX((screen.width() - size.width()) / 2);
-        pos.setY((screen.height() - size.height()) / 2);
-    }
-
-    parent->resize(size);
-    parent->move(pos);
-}
-
 void setClipboard(const QString& str)
 {
     QApplication::clipboard()->setText(str, QClipboard::Clipboard);
@@ -1039,17 +1015,6 @@ void loadTheme()
 
     stylesheet->append(strStyle);
 
-    if (QApplication::desktop()->screenGeometry().height() <= 800) {
-        fileName = stylesheetDirectory + "/" + firoLowTheme;
-        QFile qFile_(fileName);
-        if (!qFile_.open(QFile::ReadOnly)) {
-            throw std::runtime_error(strprintf("%s: Failed to open file: %s", __func__, fileName.toStdString()));
-        }
-
-        QString strLowStyle = QLatin1String(qFile_.readAll());
-        stylesheet->append(strLowStyle);
-    }
-
     qApp->setStyleSheet(*stylesheet);
 }
 

diff --git a/src/qt/guiutil.h b/src/qt/guiutil.h
@@ -179,11 +179,6 @@ namespace GUIUtil
     bool GetStartOnSystemStartup();
     bool SetStartOnSystemStartup(bool fAutoStart);
 
-    /** Save window size and position */
-    void saveWindowGeometry(const QString& strSetting, QWidget *parent);
-    /** Restore window size and position */
-    void restoreWindowGeometry(const QString& strSetting, const QSize &defaultSizeIn, QWidget *parent);
-
     /* load stylesheet */
     void loadTheme();
 

diff --git a/src/qt/res/css/firo_low.css b/src/qt/res/css/firo_low.css
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
@@ -32,6 +32,7 @@
 #include <QKeyEvent>
 #include <QMenu>
 #include <QMessageBox>
+#include <QScreen>
 #include <QScrollBar>
 #include <QSettings>
 #include <QThread>
@@ -420,7 +421,11 @@ RPCConsole::RPCConsole(const PlatformStyle *_platformStyle, QWidget *parent) :
     consoleFontSize(0)
 {
     ui->setupUi(this);
-    GUIUtil::restoreWindowGeometry("nRPCConsoleWindow", this->size(), this);
+    QSettings settings;
+    if (!restoreGeometry(settings.value("nRPCConsoleWindow").toByteArray())) {
+        // Restore failed (perhaps missing setting), center the window
+        move(QGuiApplication::primaryScreen()->availableGeometry().center() - frameGeometry().center());
+    }
 
     ui->openDebugLogfileButton->setToolTip(ui->openDebugLogfileButton->toolTip().arg(tr(PACKAGE_NAME)));
 
@@ -458,14 +463,14 @@ RPCConsole::RPCConsole(const PlatformStyle *_platformStyle, QWidget *parent) :
     ui->detailWidget->hide();
     ui->peerHeading->setText(tr("Select a peer to view detailed information."));
 
-    QSettings settings;
     consoleFontSize = settings.value(fontSizeSettingsKey, QFontInfo(QFont()).pointSize()).toInt();
     clear();
 }
 
 RPCConsole::~RPCConsole()
 {
-    GUIUtil::saveWindowGeometry("nRPCConsoleWindow", this);
+    QSettings settings;
+    settings.setValue("nRPCConsoleWindow", saveGeometry());
     RPCUnsetTimerInterface(rpcTimerInterface);
     delete rpcTimerInterface;
     delete ui;