Add appearance page

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

launcher/Application.cpp

@@ -137,6 +137,7 @@
 
 #if defined(Q_OS_LINUX)
 #include <sys/statvfs.h>
+#include <ui/pages/global/AppearancePage.h>
 #endif
 
 #if defined(Q_OS_FREEBSD) || defined(Q_OS_OPENBSD)
@@ -798,6 +799,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
         {
             m_globalSettingsProvider = std::make_shared<GenericPageProvider>(tr("Settings"));
             m_globalSettingsProvider->addPage<LauncherPage>();
+            m_globalSettingsProvider->addPage<AppearancePage>();
             m_globalSettingsProvider->addPage<MinecraftPage>();
             m_globalSettingsProvider->addPage<JavaPage>();
             m_globalSettingsProvider->addPage<LanguagePage>();

launcher/CMakeLists.txt

@@ -937,6 +937,8 @@ SET(LAUNCHER_SOURCES
     ui/pages/global/MinecraftPage.h
     ui/pages/global/LauncherPage.cpp
     ui/pages/global/LauncherPage.h
+    ui/pages/global/AppearancePage.cpp
+    ui/pages/global/AppearancePage.h
     ui/pages/global/ProxyPage.cpp
     ui/pages/global/ProxyPage.h
     ui/pages/global/APIPage.cpp
@@ -1177,6 +1179,7 @@ qt_wrap_ui(LAUNCHER_UI
     ui/pages/global/AccountListPage.ui
     ui/pages/global/JavaPage.ui
     ui/pages/global/LauncherPage.ui
+    ui/pages/global/AppearancePage.ui
     ui/pages/global/APIPage.ui
     ui/pages/global/ProxyPage.ui
     ui/pages/global/ExternalToolsPage.ui

launcher/ui/pages/global/AppearancePage.cpp

@@ -0,0 +1,104 @@
+#include "AppearancePage.h"
+#include "ui_AppearancePage.h"
+
+#include <BuildConfig.h>
+#include <ui/themes/ITheme.h>
+#include <ui/themes/ThemeManager.h>
+
+AppearancePage::AppearancePage(QWidget* parent) : QWidget(parent), m_ui(new Ui::AppearancePage)
+{
+    m_ui->setupUi(this);
+
+    defaultFormat = new QTextCharFormat(m_ui->fontPreview->currentCharFormat());
+
+    loadSettings();
+    connect(m_ui->fontSizeBox, QOverload<int>::of(&QSpinBox::valueChanged), this, &AppearancePage::updateFontPreview);
+    connect(m_ui->consoleFont, &QFontComboBox::currentFontChanged, this, &AppearancePage::updateFontPreview);
+    connect(m_ui->themeCustomizationWidget, &ThemeCustomizationWidget::currentWidgetThemeChanged, this, &AppearancePage::updateFontPreview);
+    connect(m_ui->themeCustomizationWidget, &ThemeCustomizationWidget::currentCatChanged, APPLICATION, &Application::currentCatChanged);
+}
+
+AppearancePage::~AppearancePage()
+{
+    delete m_ui;
+}
+
+bool AppearancePage::apply()
+{
+    applySettings();
+    return true;
+}
+
+void AppearancePage::retranslate()
+{
+    m_ui->retranslateUi(this);
+}
+
+void AppearancePage::applySettings()
+{
+    SettingsObjectPtr settings = APPLICATION->settings();
+    QString consoleFontFamily = m_ui->consoleFont->currentFont().family();
+    settings->set("ConsoleFont", consoleFontFamily);
+    settings->set("ConsoleFontSize", m_ui->fontSizeBox->value());
+}
+
+void AppearancePage::loadSettings()
+{
+    QString fontFamily = APPLICATION->settings()->get("ConsoleFont").toString();
+    QFont consoleFont(fontFamily);
+    m_ui->consoleFont->setCurrentFont(consoleFont);
+
+    bool conversionOk = true;
+    int fontSize = APPLICATION->settings()->get("ConsoleFontSize").toInt(&conversionOk);
+    if (!conversionOk) {
+        fontSize = 11;
+    }
+    m_ui->fontSizeBox->setValue(fontSize);
+
+    updateFontPreview();
+}
+
+void AppearancePage::updateFontPreview()
+{
+    const LogColors& colors = APPLICATION->themeManager()->getLogColors();
+
+    int fontSize = m_ui->fontSizeBox->value();
+    QString fontFamily = m_ui->consoleFont->currentFont().family();
+    m_ui->fontPreview->clear();
+    defaultFormat->setFont(QFont(fontFamily, fontSize));
+
+    auto print = [this, colors](const QString& message, MessageLevel::Enum level) {
+        QTextCharFormat format(*defaultFormat);
+
+        QColor bg = colors.background.value(level);
+        QColor fg = colors.foreground.value(level);
+
+        if (bg.isValid())
+            format.setBackground(bg);
+
+        if (fg.isValid())
+            format.setForeground(fg);
+
+        // append a paragraph/line
+        auto workCursor = m_ui->fontPreview->textCursor();
+        workCursor.movePosition(QTextCursor::End);
+        workCursor.insertText(message, format);
+        workCursor.insertBlock();
+    };
+
+    print(QString("%1 version: %2 (%3)\n")
+              .arg(BuildConfig.LAUNCHER_DISPLAYNAME, BuildConfig.printableVersionString(), BuildConfig.BUILD_PLATFORM),
+          MessageLevel::Launcher);
+
+    QDate today = QDate::currentDate();
+
+    if (today.month() == 10 && today.day() == 31)
+        print(tr("[Test/ERROR] OOoooOOOoooo! A spooky error!"), MessageLevel::Error);
+    else
+        print(tr("[Test/ERROR] A spooky error!"), MessageLevel::Error);
+
+    print(tr("[Test/INFO] A harmless message..."), MessageLevel::Info);
+    print(tr("[Test/WARN] A not so spooky warning."), MessageLevel::Warning);
+    print(tr("[Test/DEBUG] A secret debugging message..."), MessageLevel::Debug);
+    print(tr("[Test/FATAL] A terrifying fatal error!"), MessageLevel::Fatal);
+}

launcher/ui/pages/global/AppearancePage.h

@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+#pragma once
+
+#include <QDialog>
+#include <memory>
+
+#include <Application.h>
+#include <translations/TranslationsModel.h>
+#include "java/JavaChecker.h"
+#include "ui/pages/BasePage.h"
+
+class QTextCharFormat;
+class SettingsObject;
+
+namespace Ui {
+class AppearancePage;
+}
+
+class AppearancePage : public QWidget, public BasePage {
+    Q_OBJECT
+
+   public:
+    explicit AppearancePage(QWidget* parent = 0);
+    ~AppearancePage();
+
+    QString displayName() const override { return tr("Appearance"); }
+    QIcon icon() const override { return APPLICATION->getThemedIcon("resourcepacks"); }
+    QString id() const override { return "appearance-settings"; }
+    QString helpPage() const override { return "Launcher-settings"; }
+    bool apply() override;
+    void retranslate() override;
+
+   private:
+    void applySettings();
+    void loadSettings();
+    void updateFontPreview();
+
+   private:
+    Ui::AppearancePage* m_ui;
+    QTextCharFormat* defaultFormat;
+};

launcher/ui/pages/global/AppearancePage.ui

@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AppearancePage</class>
+ <widget class="QWidget" name="AppearancePage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>600</width>
+    <height>700</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1">
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Theme</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="ThemeCustomizationWidget" name="themeCustomizationWidget" native="true"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="themeBox_2">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>&amp;Fonts</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="1" column="1">
+       <widget class="QFontComboBox" name="consoleFont">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QSpinBox" name="fontSizeBox">
+        <property name="minimum">
+         <number>5</number>
+        </property>
+        <property name="maximum">
+         <number>16</number>
+        </property>
+        <property name="value">
+         <number>11</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Monospace Font</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Preview</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>Icons</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QPushButton" name="icon1">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset theme="new">
+            <normaloff>.</normaloff>.</iconset>
+          </property>
+          <property name="flat">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="icon2">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset theme="centralmods">
+            <normaloff>.</normaloff>.</iconset>
+          </property>
+          <property name="flat">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="icon3">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset theme="viewfolder">
+            <normaloff>.</normaloff>.</iconset>
+          </property>
+          <property name="flat">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="icon4">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset theme="launch">
+            <normaloff>.</normaloff>.</iconset>
+          </property>
+          <property name="flat">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="icon5">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset theme="copy">
+            <normaloff>.</normaloff>.</iconset>
+          </property>
+          <property name="flat">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="icon6">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset theme="export">
+            <normaloff>.</normaloff>.</iconset>
+          </property>
+          <property name="flat">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="icon7">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset theme="delete">
+            <normaloff>.</normaloff>.</iconset>
+          </property>
+          <property name="flat">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="icon8">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset theme="about">
+            <normaloff>.</normaloff>.</iconset>
+          </property>
+          <property name="flat">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="icon9">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset theme="settings">
+            <normaloff>.</normaloff>.</iconset>
+          </property>
+          <property name="flat">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="icon10">
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset theme="cat">
+            <normaloff>.</normaloff>.</iconset>
+          </property>
+          <property name="flat">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <widget class="Line" name="line">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="label_3">
+        <property name="text">
+         <string>Console</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QTextEdit" name="fontPreview">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="horizontalScrollBarPolicy">
+         <enum>Qt::ScrollBarAsNeeded</enum>
+        </property>
+        <property name="undoRedoEnabled">
+         <bool>false</bool>
+        </property>
+        <property name="textInteractionFlags">
+         <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ThemeCustomizationWidget</class>
+   <extends>QWidget</extends>
+   <header>ui/widgets/ThemeCustomizationWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>

launcher/ui/widgets/ThemeCustomizationWidget.ui

@@ -13,180 +13,125 @@
   <property name="windowTitle">
    <string notr="true">Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QGridLayout" name="gridLayout">
-   <property name="sizeConstraint">
+   <item row="0" column="2">
-    <enum>QLayout::SetMinimumSize</enum>
+    <widget class="QPushButton" name="iconsFolder">
-   </property>
+     <property name="toolTip">
-   <property name="leftMargin">
+      <string>View icon themes folder.</string>
-    <number>0</number>
+     </property>
-   </property>
+     <property name="text">
-   <property name="topMargin">
+      <string>Open Folder</string>
-    <number>0</number>
+     </property>
-   </property>
+    </widget>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <layout class="QFormLayout" name="formLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="iconsLabel">
-       <property name="text">
-        <string>&amp;Icons</string>
-       </property>
-       <property name="buddy">
-        <cstring>iconsComboBox</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1">
-      <layout class="QHBoxLayout" name="iconsLayout">
-       <item>
-        <widget class="QComboBox" name="iconsComboBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="focusPolicy">
-          <enum>Qt::StrongFocus</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="iconsFolder">
-         <property name="toolTip">
-          <string>View icon themes folder.</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="icon">
-          <iconset theme="viewfolder"/>
-         </property>
-         <property name="flat">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="widgetStyleLabel">
-       <property name="text">
-        <string>&amp;Widgets</string>
-       </property>
-       <property name="buddy">
-        <cstring>widgetStyleComboBox</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <layout class="QHBoxLayout" name="widgetStyleLayout">
-       <item>
-        <widget class="QComboBox" name="widgetStyleComboBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="focusPolicy">
-          <enum>Qt::StrongFocus</enum>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="widgetStyleFolder">
-         <property name="toolTip">
-          <string>View widget themes folder.</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="icon">
-          <iconset theme="viewfolder"/>
-         </property>
-         <property name="flat">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="backgroundCatLabel">
-       <property name="toolTip">
-        <string>The cat appears in the background and is not shown by default. It is only made visible when pressing the Cat button in the Toolbar.</string>
-       </property>
-       <property name="text">
-        <string>C&amp;at</string>
-       </property>
-       <property name="buddy">
-        <cstring>backgroundCatComboBox</cstring>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1">
-      <layout class="QHBoxLayout" name="catLayout">
-       <item>
-        <widget class="QComboBox" name="backgroundCatComboBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="focusPolicy">
-          <enum>Qt::StrongFocus</enum>
-         </property>
-         <property name="toolTip">
-          <string>The cat appears in the background and is not shown by default. It is only made visible when pressing the Cat button in the Toolbar.</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="catPackFolder">
-         <property name="toolTip">
-          <string>View cat packs folder.</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="icon">
-          <iconset theme="viewfolder"/>
-         </property>
-         <property name="flat">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
    </item>
-   <item>
+   <item row="2" column="0">
-    <layout class="QHBoxLayout" name="refreshLayout">
+    <widget class="QLabel" name="backgroundCatLabel">
+     <property name="toolTip">
+      <string>The cat appears in the background and is not shown by default. It is only made visible when pressing the Cat button in the Toolbar.</string>
+     </property>
+     <property name="text">
+      <string>C&amp;at</string>
+     </property>
+     <property name="buddy">
+      <cstring>backgroundCatComboBox</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <widget class="QPushButton" name="catPackFolder">
+     <property name="toolTip">
+      <string>View cat packs folder.</string>
+     </property>
+     <property name="text">
+      <string>Open Folder</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="iconsLabel">
+     <property name="text">
+      <string>&amp;Icons</string>
+     </property>
+     <property name="buddy">
+      <cstring>iconsComboBox</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="widgetStyleComboBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="widgetStyleLabel">
+     <property name="text">
+      <string>&amp;Widgets</string>
+     </property>
+     <property name="buddy">
+      <cstring>widgetStyleComboBox</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2">
+    <widget class="QPushButton" name="widgetStyleFolder">
+     <property name="toolTip">
+      <string>View widget themes folder.</string>
+     </property>
+     <property name="text">
+      <string>Open Folder</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QComboBox" name="backgroundCatComboBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
+     </property>
+     <property name="toolTip">
+      <string>The cat appears in the background and is not shown by default. It is only made visible when pressing the Cat button in the Toolbar.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="iconsComboBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="3">
+    <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
       </spacer>
      </item>
      <item>
       <widget class="QPushButton" name="refreshButton">
        <property name="text">
-        <string>Refresh all</string>
+        <string>Refresh All</string>
        </property>
       </widget>
      </item>
@@ -195,12 +140,6 @@
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
       </spacer>
      </item>
     </layout>