From 1fcc0b1f29481e8dd1b4cd11449c180004464344 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Mon, 8 Jun 2020 08:47:05 +0200 Subject: [PATCH] Added missing icon, simpler dialog. --- .../Faenza/actions/64/document-edit.png | Bin 0 -> 2257 bytes resources/icons.qrc | 1 + resources/initial_feeds/feeds-en.opml | 1 - .../owncloud/gui/formeditowncloudaccount.cpp | 2 - .../owncloud/gui/formeditowncloudaccount.ui | 127 +++++++++--------- 5 files changed, 66 insertions(+), 65 deletions(-) create mode 100755 resources/graphics/Faenza/actions/64/document-edit.png diff --git a/resources/graphics/Faenza/actions/64/document-edit.png b/resources/graphics/Faenza/actions/64/document-edit.png new file mode 100755 index 0000000000000000000000000000000000000000..dfa585630d386b9d5534d917c13d41eaf685fcbd GIT binary patch literal 2257 zcmV;?2rl=DP)g}zvq-T&;mx{&W35t8h0B8L{x+Tn~V|k z#eFyOO6gwCd2uF7n`#k4 zmKkF|GsgY~U=F}1&bg!?*8mVgwgA`;V6Pwur#a_&P{QX+5FvyFWm&!r;Aa3!oby#c ztpn72w*n}klzz`Sw=l-O6z2heQ%WtA((f5#9snUi$O`A2Yx%9^eJOz5jIpehG+k1C z+6~3WJSaZv6&!^Epb$zVe5tZR@v#7^??wO?09&(Du8e9c6kkmMv^HPJQlT;_t!XE~ z=5OPZ*8c$*J`;Q$Kuq2HufgG%3I~v?2Oj~sTcMhKjQTW~#Le@EhKBwO04*&olK=w9 z;V!ii07Y^sK>!p?OiVO2Ha6M-U}9n-|HO$Ce+A%2?m#g4Y3v6iBLbkn<#ILE*Vo%Z zp%6l$5bEpeZ7!Fq2};i^*Txl0{QwfSPxMA6=NV&QjO8i>lds7(g9Jc<)9GxgtE;m~ zlB7GYZIUFRuCC7JbUJedLQ0##Jcq;4P+MCY(Rm|;+S*#%vuDq81%j?*0c;gTk*ut& zM0GwK!ua@jPC*DyfkX?n+S%FpV|RD=oZs(X7eX)?#Noq-vkk%IXR;k33Bc0Dix;PQ zdV1o9aOlt>+ta5{vjxHQd&vTj0r&uTE?v4b<#0IShH&uULEDojPqG0aDu9io0APS{ z`SRtd-rn9^hY&RdHVObRKxk`gn{qfDb3UIBvMk5k{C+?7@855G^ypD0Aw&eA8x;^~Dtlfj|J&)z!9#4sTq$&b5=@2?QJH^|#Z_fn+fpsDHd_GiGR@z2KN7Dr%W(1^KI)rQ2t|bJaqN2h! zGBVN(WfmuGbwav^#EjA*T)%!@ymRMHq7aTDwGd+V1k)uQ!i^g@#JhLz#s$Ia^`gAI z+%`NsoN5TVG7$lqbO>EtUE;la_u__7R#s*k8X8I!gs2gaiPvFt2sdxu6z|`^zb*t> zmf`h!VYl0DgM)(_gk)qI_({c(SfbJ)ba!`)gM))HA-sS8UV8K9P4L5q53t+qww9I_ zJCd8kjX5NisUDaPp{J)u92y#m3c>Amds|yu|K8Qr^`GVCWgI_#d@qs*kP|aQIs}Kq zAr21@n;(xwY9amJs!`l=H}+Tqobp@Y@$vZ$+GG7DgW}){fMoz5d_LbVPN!2md-m)PP@*K>%KS4QwG=3ZngW6#RLQa& z4^92`+FiSLeFFe)xBESmW(x`0Bc(trQ7DdEphQkwFJTCRKxA1qroeJ|3MBIHbM=Q8 z-EQ}aY7410M6d_dYa*SWX!vSTA+2{}1Vw#CW+QKiXib*@bzuV5obh9=axyk|+WF!3 zOex|UB5Ox!!hItSrLqclhGDHD;}Omex2Ii^e9M)dVAhn$5usdB?AhTBq`;<;>RUtr z+^|oiTe;a}tfx4z20*LLB>;iEyu2?i6;z)BP<-@3{iC&Ja20?Tz)C0-D#*{zht+DO zvMd7%DFOh>(jrrBN+Q@mDK(uR?V50@3%EF7p2^h~b}_>`Chd5nYYZ#lH~=CD0s!zp zAW#6MN9k34)&Yc6<4=sS-vqS5Cr{P zqR3=dzw0D8=bSMH&N(>eT$W`prmS@|95dOCds&wC^R#o-5oIpRvK$J9AW70T#@G~q zpHyE%fO*-R1;Doe$^cXV_zplZlf8=^apkU$00000NkvXXu0mjf(-;xY literal 0 HcmV?d00001 diff --git a/resources/icons.qrc b/resources/icons.qrc index 6a56a573d..4c1509a08 100644 --- a/resources/icons.qrc +++ b/resources/icons.qrc @@ -4,6 +4,7 @@ ./graphics/Faenza/actions/64/back.png ./graphics/Faenza/actions/64/call-start.png ./graphics/Faenza/actions/64/dialog-yes.png + ./graphics/Faenza/actions/64/document-edit.png ./graphics/Faenza/actions/64/document-export.png ./graphics/Faenza/actions/64/document-import.png ./graphics/Faenza/actions/64/document-new.png diff --git a/resources/initial_feeds/feeds-en.opml b/resources/initial_feeds/feeds-en.opml index 1a56a21ba..e04bef0d2 100644 --- a/resources/initial_feeds/feeds-en.opml +++ b/resources/initial_feeds/feeds-en.opml @@ -7,7 +7,6 @@ - diff --git a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp index 07e7c054d..3ec1fbe5e 100644 --- a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp +++ b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.cpp @@ -19,7 +19,6 @@ FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget* parent) m_ui->m_lblTestResult->label()->setWordWrap(true); 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.")); - 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_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")); @@ -41,7 +40,6 @@ FormEditOwnCloudAccount::FormEditOwnCloudAccount(QWidget* parent) GuiUtilities::setLabelAsNotice(*m_ui->m_lblLimitMessages, 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_checkServerSideUpdate, m_ui->m_spinLimitMessages); diff --git a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.ui b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.ui index ca8303762..abad18e63 100644 --- a/src/librssguard/services/owncloud/gui/formeditowncloudaccount.ui +++ b/src/librssguard/services/owncloud/gui/formeditowncloudaccount.ui @@ -16,21 +16,48 @@ - + + + + + + URL + + + m_txtUrl + + + + + + + + + Force execution of server-side update when updating feeds from RSS Guard - + + + + + + + true + + + + Limit number of downloaded messages per feed - + @@ -52,31 +79,17 @@ - - - - - - &Test setup - - - - - - - - 0 - 0 - - - - Qt::RightToLeft - - - - + + + + + + + true + + - + Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported. @@ -127,52 +140,42 @@ - - + + - + - URL - - - m_txtUrl + &Test setup - + + + + 0 + 0 + + + + Qt::RightToLeft + + - - - - + + + + Qt::Vertical - - true + + + 20 + 40 + - - - - - - - - - true - - - - - - - - - - true - - +