FreshRSS
/
rssguard
mirror of https://github.com/martinrotter/rssguard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added missing icon, simpler dialog.

This commit is contained in:
Martin Rotter 2020-06-08 08:47:05 +02:00
parent 3ff45878b3
commit 1fcc0b1f29
5 changed files with 66 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
resources/graphics/Faenza/actions/64/document-edit.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

1
resources/icons.qrc
View File

@ -4,6 +4,7 @@
<file>./graphics/Faenza/actions/64/back.png</file> <file>./graphics/Faenza/actions/64/back.png</file>
<file>./graphics/Faenza/actions/64/call-start.png</file> <file>./graphics/Faenza/actions/64/call-start.png</file>
<file>./graphics/Faenza/actions/64/dialog-yes.png</file> <file>./graphics/Faenza/actions/64/dialog-yes.png</file>
<file>./graphics/Faenza/actions/64/document-edit.png</file>
<file>./graphics/Faenza/actions/64/document-export.png</file> <file>./graphics/Faenza/actions/64/document-export.png</file>
<file>./graphics/Faenza/actions/64/document-import.png</file> <file>./graphics/Faenza/actions/64/document-import.png</file>
<file>./graphics/Faenza/actions/64/document-new.png</file> <file>./graphics/Faenza/actions/64/document-new.png</file>

1
resources/initial_feeds/feeds-en.opml
View File

@ -7,7 +7,6 @@
<body> <body>
<outline description="Technology is something some people might love." text="Technology"> <outline description="Technology is something some people might love." text="Technology">
<outline version="RSS" description="Linux Today - Linux News on Internet Time." title="Linux Today" xmlUrl="http://feeds.feedburner.com/linuxtoday/linux?format=xml" rssguard:icon="AAAAIgBRAFAAaQB4AG0AYQBwAEkAYwBvAG4ARQBuAGcAaQBuAGUAAAABAAAAAYlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgCAAAAkJFoNgAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAXpJREFUKJGV0k9LG0EcxvHvjLsbcMH0kB4MBIl7CEEMBHIIvfSYi+/AsxZ8HQEpHj3pW+ilkC54Eikl0EOhBAIrCTGHVEUCLWV3bbK7Mx42iFmkrc9thvnw+8MI9k94SQxAn+z/52vx7lQ+PbfbbSFEs9n8i1kCvV4PKBaL/2gpTRRFw+EQcBwH0EmYTL8k159kftvc3HumwmQyGQwGQKVSAeIfH+8/t+bDY4xVAHQWuK7r+76UslqtAurnt/R+fnkUXrz983U3C/r9PmDbdrlc1nEQ37iAMNeIA/Xru9Z6aQalVAocxykUCjrwVHAFmM5BbvtQJ6EQ5lKFMAxHo1EKLMtSwRVqDsh8DRArq8hlMB6Pp9MpsBjgtwcgrZX8VmatC+B53mw2A1qtFhDfngFCWhhr6BgVZUG60FKpVK/XAT27A3Tsh+dvfHcjmnzIgm63CzQaDdu2gVztvczXhPkKnYAUudePYLGlTqfztFFjfcdY3+G5iJd+7wdysI9hnZlHjQAAAABJRU5ErkJggv////8AAAAQAAAAEAAAAAAAAAAB" text="Linux Today" encoding="UTF-8"/> <outline version="RSS" description="Linux Today - Linux News on Internet Time." title="Linux Today" xmlUrl="http://feeds.feedburner.com/linuxtoday/linux?format=xml" rssguard:icon="AAAAIgBRAFAAaQB4AG0AYQBwAEkAYwBvAG4ARQBuAGcAaQBuAGUAAAABAAAAAYlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgCAAAAkJFoNgAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAXpJREFUKJGV0k9LG0EcxvHvjLsbcMH0kB4MBIl7CEEMBHIIvfSYi+/AsxZ8HQEpHj3pW+ilkC54Eikl0EOhBAIrCTGHVEUCLWV3bbK7Mx42iFmkrc9thvnw+8MI9k94SQxAn+z/52vx7lQ+PbfbbSFEs9n8i1kCvV4PKBaL/2gpTRRFw+EQcBwH0EmYTL8k159kftvc3HumwmQyGQwGQKVSAeIfH+8/t+bDY4xVAHQWuK7r+76UslqtAurnt/R+fnkUXrz983U3C/r9PmDbdrlc1nEQ37iAMNeIA/Xru9Z6aQalVAocxykUCjrwVHAFmM5BbvtQJ6EQ5lKFMAxHo1EKLMtSwRVqDsh8DRArq8hlMB6Pp9MpsBjgtwcgrZX8VmatC+B53mw2A1qtFhDfngFCWhhr6BgVZUG60FKpVK/XAT27A3Tsh+dvfHcjmnzIgm63CzQaDdu2gVztvczXhPkKnYAUudePYLGlTqfztFFjfcdY3+G5iJd+7wdysI9hnZlHjQAAAABJRU5ErkJggv////8AAAAQAAAAEAAAAAAAAAAB" text="Linux Today" encoding="UTF-8"/>
<outline version="RSS" description="LinuxInsider -- &quot;Linux News &amp; Information from Around the World&quot;" title="LinuxInsider" xmlUrl="http://www.linuxinsider.com/perl/syndication/rssfull.pl" rssguard:icon="AAAAIgBRAFAAaQB4AG0AYQBwAEkAYwBvAG4ARQBuAGcAaQBuAGUAAAABAAAAAYlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgCAAAAkJFoNgAAAAlwSFlzAAAOxAAADsQBlSsOGwAAAFtJREFUKJFjNM8OYiAFsDAwMJyYspZI1RY5wSwQFiMjIwMDw////+FyEBFkAJFlIsk9UCdhBRDzMG0m2YZRDcQAlHiAx+7///+RYxo5Nsi1ATkucYlAbSM1eQMA4PEdCz0mjK8AAAAASUVORK5CYIL/////AAAAEAAAABAAAAAAAAAAAQ==" text="LinuxInsider" encoding="ISO-8859-1"/>
<outline version="RSS" description="TechCrunch is a group-edited blog that profiles the companies, products and events defining and transforming the new web." title="TechCrunch" xmlUrl="http://feeds.feedburner.com/techcrunch" rssguard:icon="AAAAIgBRAFAAaQB4AG0AYQBwAEkAYwBvAG4ARQBuAGcAaQBuAGUAAAABAAAAAYlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAAAH/P/YQAAAAlwSFlzAAAOxAAADsQBlSsOGwAAARpJREFUOI2dk71Ow0AQhL9xTgTLgIRyvCkFFQUSDQV08JIgJAhSHCKG4nzxXexQsI33f3dmz4ov/GDEP8TCDQABELbwscQyZqWRMgoA7MCiXiMXGOlgw2xbOKQc2O4mMARwErAE2++hCAiCRVNsoIA/v+ZxrjqE8Memhrc6Kxq8rsHXniVSTzI9+KaO61GOLYThArPkAfB+NAIk/lm1oAeZDfg2TdL9MPmusNuxMLaJkwYSlqsLxPKg/WWh94xnKq4SsmLndoMs6l55kywDB2qqrD8aHBPF5/qFva2THjtU2nUVxC5BCZXfKHbQ74bnanR+SnUjA6HZq1QN8ntfhpGkZZieuHRMNiiyVH1rBHtpJsFw6JmRxfh3/gIp6mgF9TXHlAAAAABJRU5ErkJggv////8AAAAQAAAAEAAAAAAAAAAB" text="TechCrunch" encoding="UTF-8"/> <outline version="RSS" description="TechCrunch is a group-edited blog that profiles the companies, products and events defining and transforming the new web." title="TechCrunch" xmlUrl="http://feeds.feedburner.com/techcrunch" rssguard:icon="AAAAIgBRAFAAaQB4AG0AYQBwAEkAYwBvAG4ARQBuAGcAaQBuAGUAAAABAAAAAYlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAAAH/P/YQAAAAlwSFlzAAAOxAAADsQBlSsOGwAAARpJREFUOI2dk71Ow0AQhL9xTgTLgIRyvCkFFQUSDQV08JIgJAhSHCKG4nzxXexQsI33f3dmz4ov/GDEP8TCDQABELbwscQyZqWRMgoA7MCiXiMXGOlgw2xbOKQc2O4mMARwErAE2++hCAiCRVNsoIA/v+ZxrjqE8Memhrc6Kxq8rsHXniVSTzI9+KaO61GOLYThArPkAfB+NAIk/lm1oAeZDfg2TdL9MPmusNuxMLaJkwYSlqsLxPKg/WWh94xnKq4SsmLndoMs6l55kywDB2qqrD8aHBPF5/qFva2THjtU2nUVxC5BCZXfKHbQ74bnanR+SnUjA6HZq1QN8ntfhpGkZZieuHRMNiiyVH1rBHtpJsFw6JmRxfh3/gIp6mgF9TXHlAAAAABJRU5ErkJggv////8AAAAQAAAAEAAAAAAAAAAB" text="TechCrunch" encoding="UTF-8"/>
</outline> </outline>
<outline description="News and updates on RSS Guard." text="RSS Guard"> <outline description="News and updates on RSS Guard." text="RSS Guard">

2
src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp
View File

@ -19,7 +19,6 @@ FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget* parent)
m_ui->m_lblTestResult->label()->setWordWrap(true); m_ui->m_lblTestResult->label()->setWordWrap(true);
m_ui->m_lblServerSideUpdateInformation->setText(tr("Leaving this option on causes that updates " m_ui->m_lblServerSideUpdateInformation->setText(tr("Leaving this option on causes that updates "
"of feeds will be probably much slower and may time-out often.")); "of feeds will be probably much slower and may time-out often."));
m_ui->m_lblDescription->setText(tr("Note that at least version %1 is required.").arg(OWNCLOUD_MIN_VERSION));
m_ui->m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your ownCloud account")); m_ui->m_txtPassword->lineEdit()->setPlaceholderText(tr("Password for your ownCloud account"));
m_ui->m_txtUsername->lineEdit()->setPlaceholderText(tr("Username for your ownCloud account")); m_ui->m_txtUsername->lineEdit()->setPlaceholderText(tr("Username for your ownCloud account"));
m_ui->m_txtUrl->lineEdit()->setPlaceholderText(tr("URL of your ownCloud server, without any API path")); m_ui->m_txtUrl->lineEdit()->setPlaceholderText(tr("URL of your ownCloud server, without any API path"));
@ -41,7 +40,6 @@ FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget* parent)
GuiUtilities::setLabelAsNotice(*m_ui->m_lblLimitMessages, false); GuiUtilities::setLabelAsNotice(*m_ui->m_lblLimitMessages, false);
GuiUtilities::setLabelAsNotice(*m_ui->m_lblServerSideUpdateInformation, false); GuiUtilities::setLabelAsNotice(*m_ui->m_lblServerSideUpdateInformation, false);
GuiUtilities::setLabelAsNotice(*m_ui->m_lblDescription, false);
setTabOrder(m_ui->m_txtUrl->lineEdit(), m_ui->m_checkServerSideUpdate); setTabOrder(m_ui->m_txtUrl->lineEdit(), m_ui->m_checkServerSideUpdate);
setTabOrder(m_ui->m_checkServerSideUpdate, m_ui->m_spinLimitMessages); setTabOrder(m_ui->m_checkServerSideUpdate, m_ui->m_spinLimitMessages);

127
src/librssguard/services/owncloud/gui/formeditowncloudaccount.ui
View File

@ -16,21 +16,48 @@
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<layout class="QFormLayout" name="formLayout"> <layout class="QFormLayout" name="formLayout">
<item row="2" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="m_lblTitle">
<property name="text">
<string>URL</string>
</property>
<property name="buddy">
<cstring>m_txtUrl</cstring>
</property>
</widget>
</item>
<item>
<widget class="LineEditWithStatus" name="m_txtUrl" native="true"/>
</item>
</layout>
</item>
<item row="1" column="0" colspan="2">
<widget class="QCheckBox" name="m_checkServerSideUpdate"> <widget class="QCheckBox" name="m_checkServerSideUpdate">
<property name="text"> <property name="text">
<string>Force execution of server-side update when updating feeds from RSS Guard</string> <string>Force execution of server-side update when updating feeds from RSS Guard</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="2" column="0" colspan="2">
<widget class="QLabel" name="m_lblServerSideUpdateInformation">
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="text"> <property name="text">
<string>Limit number of downloaded messages per feed</string> <string>Limit number of downloaded messages per feed</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="3" column="1">
<widget class="QSpinBox" name="m_spinLimitMessages"> <widget class="QSpinBox" name="m_spinLimitMessages">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -52,31 +79,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="0" colspan="2"> <item row="4" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <widget class="QLabel" name="m_lblLimitMessages">
<item> <property name="text">
<widget class="QPushButton" name="m_btnTestSetup"> <string/>
<property name="text"> </property>
<string>&amp;Test setup</string> <property name="wordWrap">
</property> <bool>true</bool>
</widget> </property>
</item> </widget>
<item>
<widget class="LabelWithStatus" name="m_lblTestResult" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="6" column="0" colspan="2"> <item row="5" column="0" colspan="2">
<widget class="QGroupBox" name="m_gbAuthentication"> <widget class="QGroupBox" name="m_gbAuthentication">
<property name="toolTip"> <property name="toolTip">
<string>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</string> <string>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</string>
@ -127,52 +140,42 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2"> <item row="6" column="0" colspan="2">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item> <item>
<widget class="QLabel" name="m_lblTitle"> <widget class="QPushButton" name="m_btnTestSetup">
<property name="text"> <property name="text">
<string>URL</string> <string>&amp;Test setup</string>
</property>
<property name="buddy">
<cstring>m_txtUrl</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="LineEditWithStatus" name="m_txtUrl" native="true"/> <widget class="LabelWithStatus" name="m_lblTestResult" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="7" column="0" colspan="2">
<widget class="QLabel" name="m_lblDescription"> <spacer name="verticalSpacer">
<property name="text"> <property name="orientation">
<string/> <enum>Qt::Vertical</enum>
</property> </property>
<property name="wordWrap"> <property name="sizeHint" stdset="0">
<bool>true</bool> <size>
<width>20</width>
<height>40</height>
</size>
</property> </property>
</widget> </spacer>
</item>
<item row="5" column="0" colspan="2">
<widget class="QLabel" name="m_lblLimitMessages">
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QLabel" name="m_lblServerSideUpdateInformation">
<property name="text">
<string/>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item> </item>
</layout> </layout>
</item> </item>