Skip to content
GitLab
Commit 223fde91 authored by Eugene Popov's avatar Eugene Popov 🇺🇦 Committed by Christoph Cullmann
Browse files

[WelcomeView] Slightly improve UI 

* use a dynamic font size instead of a hardcoded one
* dynamically adjust button width
* align panel headers to the bottom
parent 3ec635a9
Pipeline #248465 passed with stage
in 12 minutes and 26 seconds
Hide whitespace changes
Inline Side-by-side
apps/lib/welcomeview/welcomeview.cpp
View file @ 223fde91
......@@ -35,10 +35,6 @@ public:
setAlignment(Qt::AlignCenter);
setMargin(20);
setWordWrap(true);
// To match the size of a level 2 Heading/KTitleWidget
QFont placeholderFont = font();
placeholderFont.setPointSize(qRound(placeholderFont.pointSize() * 1.3));
setFont(placeholderFont);
// Match opacity of QML placeholder label component
QGraphicsOpacityEffect *opacityEffect = new QGraphicsOpacityEffect;
opacityEffect->setOpacity(0.5);
......@@ -57,18 +53,18 @@ WelcomeView::WelcomeView(KateViewManager *viewManager, QWidget *parent)
labelDescription->setText(aboutData.shortDescription());
labelIcon->setPixmap(aboutData.programLogo().value<QIcon>().pixmap(KIconLoader::SizeEnormous));
Placeholder *placeholderRecentFiles = new Placeholder;
placeholderRecentFiles->setText(i18n("No recent files"));
m_placeholderRecentFiles = new Placeholder;
m_placeholderRecentFiles->setText(i18n("No recent files"));
QVBoxLayout *layoutPlaceholderRecentFiles = new QVBoxLayout;
layoutPlaceholderRecentFiles->addWidget(placeholderRecentFiles);
layoutPlaceholderRecentFiles->addWidget(m_placeholderRecentFiles);
listViewRecentFiles->setLayout(layoutPlaceholderRecentFiles);
m_recentItemsModel = new RecentItemsModel(this);
connect(m_recentItemsModel, &RecentItemsModel::modelReset, this, [this, placeholderRecentFiles]() {
connect(m_recentItemsModel, &RecentItemsModel::modelReset, this, [this]() {
const bool noRecentFiles = m_recentItemsModel->rowCount() == 0;
buttonClearRecentFiles->setDisabled(noRecentFiles);
placeholderRecentFiles->setVisible(noRecentFiles);
m_placeholderRecentFiles->setVisible(noRecentFiles);
});
KRecentFilesAction *recentFilesAction = m_viewManager->mainWindow()->recentFilesAction();
......@@ -105,17 +101,17 @@ WelcomeView::WelcomeView(KateViewManager *viewManager, QWidget *parent)
if (KateApp::isKWrite()) {
widgetSavedSessions->hide();
} else {
Placeholder *placeholderSavedSessions = new Placeholder;
placeholderSavedSessions->setText(i18n("No saved sessions"));
m_placeholderSavedSessions = new Placeholder;
m_placeholderSavedSessions->setText(i18n("No saved sessions"));
QVBoxLayout *layoutPlaceholderSavedSessions = new QVBoxLayout;
layoutPlaceholderSavedSessions->addWidget(placeholderSavedSessions);
layoutPlaceholderSavedSessions->addWidget(m_placeholderSavedSessions);
listViewSavedSessions->setLayout(layoutPlaceholderSavedSessions);
m_savedSessionsModel = new SavedSessionsModel(this);
connect(m_savedSessionsModel, &SavedSessionsModel::modelReset, this, [this, placeholderSavedSessions]() {
connect(m_savedSessionsModel, &SavedSessionsModel::modelReset, this, [this]() {
const bool noSavedSession = m_savedSessionsModel->rowCount() == 0;
placeholderSavedSessions->setVisible(noSavedSession);
m_placeholderSavedSessions->setVisible(noSavedSession);
});
KateSessionManager *sessionManager = KateApp::self()->sessionManager();
......@@ -139,22 +135,6 @@ WelcomeView::WelcomeView(KateViewManager *viewManager, QWidget *parent)
});
}
// properly layout the buttons
QVector<QPushButton*> buttons {
buttonNewFile,
buttonOpenFile,
buttonOpenFolder
};
if (KateApp::isKate()) {
buttons << buttonNewSession << buttonManageSessions;
}
const int maxWidth = std::accumulate(buttons.cbegin(), buttons.cend(), 0, [](int maxWidth, const QPushButton *button) {
return std::max(maxWidth, button->sizeHint().width());
});
for (QPushButton *button : std::as_const(buttons)) {
button->setFixedWidth(maxWidth);
}
static const char showForNewWindowKey[] = "Open untitled document for new window";
KConfigGroup configGroup = KSharedConfig::openConfig()->group("General");
checkBoxShowForNewWindow->setChecked(!configGroup.readEntry(showForNewWindowKey, false));
......@@ -165,14 +145,25 @@ WelcomeView::WelcomeView(KateViewManager *viewManager, QWidget *parent)
connect(KateApp::self(), &KateApp::configurationChanged, this, [this, configGroup]() {
checkBoxShowForNewWindow->setChecked(!configGroup.readEntry(showForNewWindowKey, false));
});
updateFonts();
updateButtons();
}
bool WelcomeView::event(QEvent *event)
{
if (event->type() == QEvent::Resize) {
switch (event->type()) {
case QEvent::FontChange:
updateFonts();
updateButtons();
break;
case QEvent::Resize:
if (updateLayout()) {
return true;
}
break;
default:
break;
}
return QScrollArea::event(event);
......@@ -240,6 +231,44 @@ void WelcomeView::onRecentFilesContextMenuRequested(const QPoint &pos)
contextMenu.exec(listViewRecentFiles->mapToGlobal(pos));
}
void WelcomeView::updateButtons()
{
QVector<QPushButton*> buttons {
buttonNewFile,
buttonOpenFile,
buttonOpenFolder
};
if (KateApp::isKate()) {
buttons << buttonNewSession << buttonManageSessions;
}
const int maxWidth = std::accumulate(buttons.cbegin(), buttons.cend(), 0, [](int maxWidth, const QPushButton *button) {
return std::max(maxWidth, button->sizeHint().width());
});
for (QPushButton *button : std::as_const(buttons)) {
button->setFixedWidth(maxWidth);
}
}
void WelcomeView::updateFonts()
{
QFont titleFont = font();
titleFont.setPointSize(titleFont.pointSize() + 6);
titleFont.setWeight(QFont::Bold);
labelTitle->setFont(titleFont);
QFont panelTitleFont = font();
panelTitleFont.setPointSize(panelTitleFont.pointSize() + 2);
labelRecentItems->setFont(panelTitleFont);
labelSavedSessions->setFont(panelTitleFont);
QFont placeholderFont = font();
placeholderFont.setPointSize(qRound(placeholderFont.pointSize() * 1.3));
m_placeholderRecentFiles->setFont(placeholderFont);
if (m_placeholderSavedSessions) {
m_placeholderSavedSessions->setFont(placeholderFont);
}
}
bool WelcomeView::updateLayout()
{
// show/hide widgetHeader depending on the view height
......
apps/lib/welcomeview/welcomeview.h
View file @ 223fde91
......@@ -11,6 +11,7 @@
#include "ui_welcomeview.h"
class KateViewManager;
class Placeholder;
class RecentItemsModel;
class SavedSessionsModel;
......@@ -30,11 +31,15 @@ private Q_SLOTS:
void onRecentFilesContextMenuRequested(const QPoint &pos);
private:
void updateButtons();
void updateFonts();
bool updateLayout();
KateViewManager *m_viewManager = nullptr;
RecentItemsModel *m_recentItemsModel = nullptr;
SavedSessionsModel *m_savedSessionsModel = nullptr;
Placeholder *m_placeholderRecentFiles = nullptr;
Placeholder *m_placeholderSavedSessions = nullptr;
};
#endif // WELCOMEVIEW_H
apps/lib/welcomeview/welcomeview.ui
View file @ 223fde91
......@@ -144,15 +144,7 @@
<number>0</number>
</property>
<item>
<widget class="QLabel" name="labelTitle">
<property name="font">
<font>
<pointsize>16</pointsize>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
</widget>
<widget class="QLabel" name="labelTitle"/>
</item>
<item>
<widget class="QLabel" name="labelDescription"/>
......@@ -208,13 +200,8 @@
</property>
</widget>
</item>
<item row="0" column="1">
<item row="0" column="1" alignment="Qt::AlignBottom">
<widget class="QLabel" name="labelRecentItems">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Recent Documents</string>
</property>
......@@ -291,13 +278,8 @@
<property name="horizontalSpacing">
<number>20</number>
</property>
<item row="0" column="1">
<item row="0" column="1" alignment="Qt::AlignBottom">
<widget class="QLabel" name="labelSavedSessions">
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Saved Sessions</string>
</property>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment