github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-21 05:53:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some Styling for macOS

Browse source
This commit is contained in:
Florian Märkl 2019-08-17 14:10:37 +02:00 • committed by Florian Märkl
commit 62a148bb76
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gui/src/mainwindow.cpp
View file

@ -79,7 +79,7 @@ class IconEngine : public QIconEngine
color_group = QPalette::ColorGroup::Normal; color_group = QPalette::ColorGroup::Normal;
break; break;
} }
painter->fillRect(rect, qApp->palette().brush(color_group, QPalette::ColorRole::ButtonText)); painter->fillRect(rect, qApp->palette().brush(color_group, QPalette::ColorRole::Text));
} }
}; };
@ -87,6 +87,8 @@ MainWindow::MainWindow(Settings *settings, QWidget *parent)
: QMainWindow(parent), : QMainWindow(parent),
settings(settings) settings(settings)
{ {
setWindowTitle(qApp->applicationName());
auto main_widget = new QWidget(this); auto main_widget = new QWidget(this);
auto layout = new QVBoxLayout(); auto layout = new QVBoxLayout();
main_widget->setLayout(layout); main_widget->setLayout(layout);
@ -100,6 +102,7 @@ MainWindow::MainWindow(Settings *settings, QWidget *parent)
auto tool_bar = new QToolBar(this); auto tool_bar = new QToolBar(this);
tool_bar->setMovable(false); tool_bar->setMovable(false);
addToolBar(tool_bar); addToolBar(tool_bar);
setUnifiedTitleAndToolBarOnMac(true);
discover_action = new QAction(tr("Automatically Search for Consoles"), this); discover_action = new QAction(tr("Automatically Search for Consoles"), this);
discover_action->setIcon(LoadIcon(":/icons/discover-24px.svg")); discover_action->setIcon(LoadIcon(":/icons/discover-24px.svg"));

2
gui/src/serveritemwidget.cpp
View file

@ -27,7 +27,7 @@
ServerItemWidget::ServerItemWidget(QWidget *parent) : QFrame(parent) ServerItemWidget::ServerItemWidget(QWidget *parent) : QFrame(parent)
{ {
setFrameStyle(QFrame::Panel | QFrame::Raised); setFrameStyle(QFrame::Panel);
auto layout = new QVBoxLayout(this); auto layout = new QVBoxLayout(this);
this->setLayout(layout); this->setLayout(layout);

2
gui/src/sessionlog.cpp
View file

@ -23,6 +23,8 @@
#include <QRegularExpression> #include <QRegularExpression>
#include <QDateTime> #include <QDateTime>
#include <QFile> #include <QFile>
#include <QPair>
#include <QVector>
static void LogCb(ChiakiLogLevel level, const char *msg, void *user); static void LogCb(ChiakiLogLevel level, const char *msg, void *user);