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/settingsshortcuts.h"
#include <QPainter>
#include <QScrollBar>
FormSettings::FormSettings(QWidget& parent)
: QDialog(&parent), m_settings(*qApp->settings()) {
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) {
m_ui.m_listSettings->addItem(panel->title());
m_panels.append(panel);
QScrollArea* scr = new QScrollArea(m_ui.m_stackedSettings);
//scr->setHorizontalScrollBar(new Scr(scr));
//scr->setVerticalScrollBar(new Scr(scr));
scr->setWidgetResizable(true);
scr->setFrameShape(QFrame::Shape::NoFrame);
//panel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
scr->setFrameShape(QFrame::Shape::Box);
scr->setWidget(panel);
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)) {
initialize();
initializeViews();
//loadMessageViewerFonts();
createConnections();
}

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

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

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

@ -26,7 +26,7 @@ class MessageBrowser : public QWidget {
public slots:
void setVerticalScrollBarPosition(double pos);
void clear();
void clear(bool also_hide);
void reloadFontSettings();
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();
m_actionSwitchImportance->setCheckable(true);
//reloadFontSettings();
clear();
}
@ -99,9 +97,8 @@ WebBrowser* MessagePreviewer::webBrowser() const {
void MessagePreviewer::clear() {
updateLabels(true);
m_txtMessage->clear();
m_txtMessage->clear(false);
hide();
m_root.clear();
m_message = Message();
}

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

@ -11,18 +11,6 @@
</rect>
</property>
<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>
<widget class="QTabWidget" name="m_tabBrowserProxy">
<property name="currentIndex">

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

@ -11,18 +11,6 @@
</rect>
</property>
<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">
<widget class="QCheckBox" name="m_checkUseTransactions">
<property name="toolTip">

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

@ -11,18 +11,6 @@
</rect>
</property>
<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">
<widget class="QCheckBox" name="m_checkOpenManagerWhenDownloadStarts">
<property name="text">

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

@ -11,18 +11,6 @@
</rect>
</property>
<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>
<widget class="QTabWidget" name="m_tabFeedsMessages">
<property name="currentIndex">

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

@ -10,19 +10,7 @@
<height>148</height>
</rect>
</property>
<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>
<layout class="QFormLayout">
<item row="0" column="0">
<widget class="QCheckBox" name="m_checkAutostart">
<property name="text">

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

@ -17,18 +17,6 @@
</sizepolicy>
</property>
<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>
<widget class="QTabWidget" name="m_tabUi">
<property name="currentIndex">

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

@ -11,18 +11,6 @@
</rect>
</property>
<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>
<widget class="QTreeWidget" name="m_treeLanguages">
<property name="editTriggers">

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

@ -11,18 +11,6 @@
</rect>
</property>
<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">
<widget class="QCheckBox" name="m_checkEnableNotifications">
<property name="text">

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

@ -11,18 +11,6 @@
</rect>
</property>
<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>
<widget class="QScrollArea" name="m_scrollShortcuts">
<property name="frameShape">
@ -36,8 +24,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>785</width>
<height>526</height>
<width>767</width>
<height>508</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_4">

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

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

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

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