pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

test UI redesign

Browse source
This commit is contained in:
Martin Rotter 2021-09-22 09:10:36 +02:00
parent 855cafb766
commit cfdd6f0b1d
16 changed files with 39 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/librssguard/gui/dialogs/formsettings.cpp
View file

@ -19,6 +19,9 @@
#include "gui/settings/settingsnotifications.h" #include "gui/settings/settingsnotifications.h"
#include "gui/settings/settingsshortcuts.h" #include "gui/settings/settingsshortcuts.h"
#include <QPainter>
#include <QScrollBar>
FormSettings::FormSettings(QWidget& parent) FormSettings::FormSettings(QWidget& parent)
: QDialog(&parent), m_settings(*qApp->settings()) { : QDialog(&parent), m_settings(*qApp->settings()) {
m_ui.setupUi(this); m_ui.setupUi(this);
@ -131,16 +134,33 @@ void FormSettings::cancelSettings() {
} }
} }
class Scr : public QScrollBar {
public:
explicit Scr(QWidget* parent) : QScrollBar(parent) {}
protected:
virtual void paintEvent(QPaintEvent* event) {
QScrollBar::paintEvent(event);
QPainter p(this);
p.setPen(QPen(Qt::GlobalColor::gray, 0.7));
p.drawRect(rect().marginsRemoved(QMargins(0, 0, 1, 1)));
}
};
void FormSettings::addSettingsPanel(SettingsPanel* panel) { void FormSettings::addSettingsPanel(SettingsPanel* panel) {
m_ui.m_listSettings->addItem(panel->title()); m_ui.m_listSettings->addItem(panel->title());
m_panels.append(panel); m_panels.append(panel);
QScrollArea* scr = new QScrollArea(m_ui.m_stackedSettings); QScrollArea* scr = new QScrollArea(m_ui.m_stackedSettings);
//scr->setHorizontalScrollBar(new Scr(scr));
//scr->setVerticalScrollBar(new Scr(scr));
scr->setWidgetResizable(true); scr->setWidgetResizable(true);
scr->setFrameShape(QFrame::Shape::NoFrame); scr->setFrameShape(QFrame::Shape::Box);
//panel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
scr->setWidget(panel); scr->setWidget(panel);
m_ui.m_stackedSettings->addWidget(scr); m_ui.m_stackedSettings->addWidget(scr);

2
src/librssguard/gui/feedmessageviewer.cpp
View file

@ -50,8 +50,6 @@ FeedMessageViewer::FeedMessageViewer(QWidget* parent) : TabContent(parent), m_to
m_messagesBrowser(new MessagePreviewer(false, this)) { m_messagesBrowser(new MessagePreviewer(false, this)) {
initialize(); initialize();
initializeViews(); initializeViews();
//loadMessageViewerFonts();
createConnections(); createConnections();
} }

6
src/librssguard/gui/messagebrowser.cpp
View file

@ -104,10 +104,14 @@ MessageBrowser::MessageBrowser(bool should_resize_to_fit, QWidget* parent)
reloadFontSettings(); reloadFontSettings();
} }
void MessageBrowser::clear() { void MessageBrowser::clear(bool also_hide) {
m_txtBrowser->clear(); m_txtBrowser->clear();
m_pictures.clear(); m_pictures.clear();
m_searchWidget->hide(); m_searchWidget->hide();
if (also_hide) {
hide();
}
} }
QString MessageBrowser::prepareHtmlForMessage(const Message& message) { QString MessageBrowser::prepareHtmlForMessage(const Message& message) {

2
src/librssguard/gui/messagebrowser.h
View file

@ -26,7 +26,7 @@ class MessageBrowser : public QWidget {
public slots: public slots:
void setVerticalScrollBarPosition(double pos); void setVerticalScrollBarPosition(double pos);
void clear(); void clear(bool also_hide);
void reloadFontSettings(); void reloadFontSettings();
void loadMessage(const Message& message, RootItem* root); void loadMessage(const Message& message, RootItem* root);

5
src/librssguard/gui/messagepreviewer.cpp
View file

@ -70,8 +70,6 @@ MessagePreviewer::MessagePreviewer(bool should_resize_to_fit, QWidget* parent)
createConnections(); createConnections();
m_actionSwitchImportance->setCheckable(true); m_actionSwitchImportance->setCheckable(true);
//reloadFontSettings();
clear(); clear();
} }
@ -99,9 +97,8 @@ WebBrowser* MessagePreviewer::webBrowser() const {
void MessagePreviewer::clear() { void MessagePreviewer::clear() {
updateLabels(true); updateLabels(true);
m_txtMessage->clear(); m_txtMessage->clear(false);
hide(); hide();
m_root.clear(); m_root.clear();
m_message = Message(); m_message = Message();
} }

12
src/librssguard/gui/settings/settingsbrowsermail.ui
View file

@ -11,18 +11,6 @@
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QTabWidget" name="m_tabBrowserProxy"> <widget class="QTabWidget" name="m_tabBrowserProxy">
<property name="currentIndex"> <property name="currentIndex">

12
src/librssguard/gui/settings/settingsdatabase.ui
View file

@ -11,18 +11,6 @@
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="m_checkUseTransactions"> <widget class="QCheckBox" name="m_checkUseTransactions">
<property name="toolTip"> <property name="toolTip">

12
src/librssguard/gui/settings/settingsdownloads.ui
View file

@ -11,18 +11,6 @@
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="m_checkOpenManagerWhenDownloadStarts"> <widget class="QCheckBox" name="m_checkOpenManagerWhenDownloadStarts">
<property name="text"> <property name="text">

12
src/librssguard/gui/settings/settingsfeedsmessages.ui
View file

@ -11,18 +11,6 @@
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QTabWidget" name="m_tabFeedsMessages"> <widget class="QTabWidget" name="m_tabFeedsMessages">
<property name="currentIndex"> <property name="currentIndex">

14
src/librssguard/gui/settings/settingsgeneral.ui
View file

@ -10,19 +10,7 @@
<height>148</height> <height>148</height>
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="m_checkAutostart"> <widget class="QCheckBox" name="m_checkAutostart">
<property name="text"> <property name="text">

12
src/librssguard/gui/settings/settingsgui.ui
View file

@ -17,18 +17,6 @@
</sizepolicy> </sizepolicy>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QTabWidget" name="m_tabUi"> <widget class="QTabWidget" name="m_tabUi">
<property name="currentIndex"> <property name="currentIndex">

12
src/librssguard/gui/settings/settingslocalization.ui
View file

@ -11,18 +11,6 @@
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QTreeWidget" name="m_treeLanguages"> <widget class="QTreeWidget" name="m_treeLanguages">
<property name="editTriggers"> <property name="editTriggers">

12
src/librssguard/gui/settings/settingsnotifications.ui
View file

@ -11,18 +11,6 @@
</rect> </rect>
</property> </property>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="1" column="0" colspan="2"> <item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="m_checkEnableNotifications"> <widget class="QCheckBox" name="m_checkEnableNotifications">
<property name="text"> <property name="text">

16
src/librssguard/gui/settings/settingsshortcuts.ui
View file

@ -11,18 +11,6 @@
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QScrollArea" name="m_scrollShortcuts"> <widget class="QScrollArea" name="m_scrollShortcuts">
<property name="frameShape"> <property name="frameShape">
@ -36,8 +24,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>785</width> <width>767</width>
<height>526</height> <height>508</height>
</rect> </rect>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">

7
src/librssguard/gui/webbrowser.cpp
View file

@ -136,10 +136,13 @@ void WebBrowser::resetZoom() {
m_webView->resetWebPageZoom(true); m_webView->resetWebPageZoom(true);
} }
void WebBrowser::clear() { void WebBrowser::clear(bool also_hide) {
m_webView->clear(); m_webView->clear();
m_messages.clear(); m_messages.clear();
hide();
if (also_hide) {
hide();
}
} }
void WebBrowser::loadUrl(const QString& url) { void WebBrowser::loadUrl(const QString& url) {

2
src/librssguard/gui/webbrowser.h
View file

@ -44,7 +44,7 @@ class WebBrowser : public TabContent {
void decreaseZoom(); void decreaseZoom();
void resetZoom(); void resetZoom();
void clear(); void clear(bool also_hide);
void loadUrl(const QString& url); void loadUrl(const QString& url);
void loadUrl(const QUrl& url); void loadUrl(const QUrl& url);
void loadMessages(const QList<Message>& messages, RootItem* root); void loadMessages(const QList<Message>& messages, RootItem* root);