From a90a577ee11cb2b30dee21ec5f527e0c124fec56 Mon Sep 17 00:00:00 2001 From: Kyle Kneitinger Date: Sat, 24 Nov 2018 14:30:55 -0800 Subject: [PATCH] Add favicon fetch button next to entry's url edit textbox (#2439) When WITH_XC_NETWORKING is defined, create a QToolButton beside the Edit Entry -> Entry -> URL, which when pressed, acts as though the Edit Entry -> Icon -> Download Favicon button is pressed. This button is disabled (grayed-out) when the URL text is empty, and enabled when the text is present. Fixes #936 * Add favicon download button * Remove the progress dialog that appears when downloading an entry's URL's favicon since (when working correctly) it disappears before it can be read. When downloading icons from the button located next to the URL text box, display a message panel that confirms the download was a success. * Do not show successful icon download msg if icon alread exists --- COPYING | 6 ++++ .../16x16/actions/favicon-download.png | Bin 0 -> 755 bytes .../22x22/actions/favicon-download.png | Bin 0 -> 1054 bytes .../32x32/actions/favicon-download.png | Bin 0 -> 1618 bytes src/gui/EditWidgetIcons.cpp | 34 ++---------------- src/gui/EditWidgetIcons.h | 12 ------- src/gui/entry/EditEntryWidget.cpp | 21 +++++++++++ src/gui/entry/EditEntryWidget.h | 3 ++ src/gui/entry/EditEntryWidgetMain.ui | 14 ++++++-- 9 files changed, 44 insertions(+), 46 deletions(-) create mode 100644 share/icons/application/16x16/actions/favicon-download.png create mode 100644 share/icons/application/22x22/actions/favicon-download.png create mode 100644 share/icons/application/32x32/actions/favicon-download.png diff --git a/COPYING b/COPYING index b91037658..b3eddd766 100644 --- a/COPYING +++ b/COPYING @@ -151,6 +151,12 @@ Copyright: 2003-2004, David Vignoni License: LGPL-2.1 Comment: based on Nuvola icon theme +Files: share/icons/application/*/actions/favicon-download.png +Copyright: 2003-2004, David Vignoni + 2018, Kyle Kneitinger +License: LGPL-2.1 +Comment: based on Nuvola icon theme + Files: share/icons/application/*/actions/application-exit.png share/icons/application/*/actions/chronometer.png share/icons/application/*/actions/configure.png diff --git a/share/icons/application/16x16/actions/favicon-download.png b/share/icons/application/16x16/actions/favicon-download.png new file mode 100644 index 0000000000000000000000000000000000000000..80bc4a65dcc7178850d20dcd9b3575b873aec980 GIT binary patch literal 755 zcmVg^Lr^cRe zy0(<_dww8G1(nY!hW$RmOO^rt!`ix=BT>!2oww4H0!6O7Kt5HfZ;Y@S&;Vr`6MLZsX zwF@BW(>3$>fp&K;@y39)@4KONZyMjDlW29z`2G6M*MR4kElf?+IQM6IG}ldG7&@k@ zV;DNw8JTo9KPBsV0YoGolfPu^5b21;oR;YejEAp_`uh53X=!N(l~TB_yXnMrU3#a# z7VT^FWoDOp0Z7FpAMedXotI;0h%9t%I1+&UFIiu5y}UT@*{v){ud7PXYJ=X(GE002ovPDHLkV1i|YPL%)v literal 0 HcmV?d00001 diff --git a/share/icons/application/22x22/actions/favicon-download.png b/share/icons/application/22x22/actions/favicon-download.png new file mode 100644 index 0000000000000000000000000000000000000000..96596c4bd6bf5220c395bc24af9ed38ce9d0298f GIT binary patch literal 1054 zcmV+(1mXLMP)3OoElCrSB{AA)ZB5M@1;swthp6~s zt<^r{!9YYT6p;iJ#LFr^Dp(C@ZNWlpY5Nc@#27Ti%R?yIhqkE-R!f#fVk0K$CQWve z-Lsc-nekzhxZ7+uh=2GP24;SI^Ua+95z%OLA`*$TYOVRNvMfst4-daKHa7MVHc(;0qD=~=G+KjF8qh2ARTVb-{ZbAN4(fe$cCH|RSN7e@le-@S5P)3g7(fWkq}@!*t{!SONkTpl0vr$0SxstDk)3l% z%z7+LJ0#*Be@}mgUbSAP%)%h3s+DYRlGIm2&;%*K_8^rL%m)ml0m=g>ugF;%Dc6}S z=NM{2g62A?4?)2E*KxHUObM zRglg@x>gdbkp!zHQi_cogTOQ(=!4ce#oe_U$5Ck4A~t@Ng^bJ4q5T+*?c^*)&QhFQ zoMv=mb4-g3t;i|7M8eAHIdWe+P5>71YPp z99;%3GYNZcZ9?m(7+Kmw(!RvJ^&J#Fllb^3hkBmo%*Y@IPkl?w^6~knZ<9*dELbzh z1`{bLFDVesK7kP1)`r|JbIQ->N6q>2zEOlmO z%lUvr-r4Z7*c$Hk=5i<3q9}%Ht?@jMaXCTLa{(GR$^i&>_-WV~Zi^3OT9;2R{~!y; zErn{Wd3484j_f@^qF*C33cpE388*y(V&#{=j=#t3!n>x{nyRY6THh_s_VI@wVdVDX zbRFoW=J_na=JJilzOJ}>FuRl;n|+hS(ow(_ot>Qn!C>&g;y;5@3Z)bPN-1)VEzd3e zwI%XWV;~#}l|Yk!=J~mAdM5YlR4=K_2%w0zR{C%Zc5uKGf0PaT@>= z7vr3M|NIp@Hnopz_S}XSQK5uvZ#&lc@r(MIBfZ+VXZu-T`~Lx!R_nGXceL~ax7=*W YKi7`zc6e9Jp8x;=07*qoM6N<$f>fU5t^fc4 literal 0 HcmV?d00001 diff --git a/share/icons/application/32x32/actions/favicon-download.png b/share/icons/application/32x32/actions/favicon-download.png new file mode 100644 index 0000000000000000000000000000000000000000..2f838d9d759ae341f505e65ca2210658b1ffb7ff GIT binary patch literal 1618 zcmV-Y2CeytP)1bUdv~_uI2Q-1q$Q3_aUr-QSVcuu zvDy!PQKd>nLRHmTEkZOZf>te&p!7|Bp{N9ilJ1PUk>6qQJEFs4)_5~!t3 zaAG_4IgTCY?D$@HcV_xw@6G0poFm#tnw{I(+4=wH|2*^Dvtnpy=+OH0>%S(10Ki(i ztQlh(j$f*2tx2cTM-Cr8{6!#Iq=7l>)~);M!w>JO0|Kxs`U-*C??!$7`<~}=#~rs1 zI*#-CFbt10B_O55T1zfhq*Mx*Em}|FQsedDN=dr9BuXi)wHum&12~mMFJ8>^%ilai zCL4kPAwfX-0$8vBCIT`Rtg%=FMpIQM)hYSK13Nzq^MeEcq!f%!IDG8O4-s#dcnN{y z3Y3Z%7;OoBi(jx5bB6qqA-8DAW(-Ri&Ceix_aRp%C(A(ASafI!eGNbq(6#|wQw1ziLd;WibxPJGpv?o<0jInf zZJ`uGt^}?lQRN55SacAn6BI4XgOu_z6>y=e4b~(e8H2b3O4bnw%Bm<32#l75fh8ze zN(DuglvQ9aVQ>?Ik`uYcw&sD_DUebS zbD%92fhS_n)2`VZFA-?V$(+ZmAMp(h_&Rb&J|S`AhFDw@a}9wMmlFd30wutUMLS&| zw+y60bSTi;uw4~6y4a4kg1ClLqX(IoJV9*Z0NDjYKBMt-hCoa)eC&1NagV8mS?q@7 zHoD?V2;S$Pb7M^v5JDgXC=tn?N`RwOH4S)Z-g)%^BS&82D|bK0!RPP6-=bil&fgxe z6~6u4XmpZ%)EsM@upTkkx`eOb-EjfXNjKL_wIDndH#!dngqHX3m`Ecsfgepa`|# ziG7c8Vd@NLXEhtM3y3wUb#Q=og;h=h=&mPFj&TbJg4_&aN1x>6u@S~jmw5j1AM>s6 zevi>Pg_VZF(s{1v%JcU_`;k)Mlut#gZAEggDFD&gUA!3ZpDCZt4F!6)c;qi;ID34Q z9iQ7odz(jLDT~6V;7udN#%h*q)q)1;q3Qx5VB+03F`?yr`V{8@C;=I$UdwhR#APif zv}_F$R5cZYK*i#iFlcElDa5K3SfPH6KqUyT?(JnUn@5O7Q)^TgV*!+7;3FXbP%8P1 z3=da}iVCq>Un@v{`_x|c*#jS)0svvC2?AYL`9z@Bf-#yCljHcI55V-?EUFt~t0W+V zly+mPk1N(1V3Fge#;P%}yzHutf#tCm_VdWAPvUgd5Ie7NSM7pCpPR6s?EVvgKdsT5 zQg>Hlpc%NeaAV)~I4>$v-*ib{?KD~b(zfXb?Eoyk=`;IpKf{Gwewm1kz^%1>=DHhr z_TERxJ|oE;3s;?hs!c-XFFxn?<)-Y(^!?9c z1_pQb(3WyPFz@`S9K*ZDb#d(6e$q3)1KwXbr&e!7ZS~f>`L2$ux_^D!{Wm#RZt1KJ zpLpvmFa7cDLNGq{D6sE(+jo4!vh`DwB$KxT$^Q>{#rigH=BkhH#c{p_#9Ddfzo|47D|DA5 QJOBUy07*qoM6N<$f`6C!e*gdg literal 0 HcmV?d00001 diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp index 61bffe701..09aafbf11 100644 --- a/src/gui/EditWidgetIcons.cpp +++ b/src/gui/EditWidgetIcons.cpp @@ -39,25 +39,6 @@ IconStruct::IconStruct() { } -UrlFetchProgressDialog::UrlFetchProgressDialog(const QUrl &url, QWidget *parent) - : QProgressDialog(parent) -{ - setWindowTitle(tr("Download Progress")); - setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); - setLabelText(tr("Downloading %1.").arg(url.toDisplayString())); - setMinimumDuration(0); - setMinimumSize(QSize(400, 75)); -} - -void UrlFetchProgressDialog::networkReplyProgress(qint64 bytesRead, qint64 totalBytes) -{ - if (totalBytes > 0) { - setValue(static_cast(bytesRead / totalBytes)); - } else { - setValue(0); - } -} - EditWidgetIcons::EditWidgetIcons(QWidget* parent) : QWidget(parent) , m_ui(new Ui::EditWidgetIcons()) @@ -268,14 +249,14 @@ void EditWidgetIcons::fetchFinished() // No redirect, and we theoretically have some icon data now. image.loadFromData(m_bytesReceived); } - } else { - UrlFetchProgressDialog *progress = findChild(url.toString()); - progress->close(); } if (!image.isNull()) { if (!addCustomIcon(image)) { emit messageEditEntry(tr("Custom icon already exists"), MessageWidget::Information); + } else if (!this->isVisible()) { + // Show confirmation message if triggered from Entry tab download button + emit messageEditEntry(tr("Custom icon successfully downloaded"), MessageWidget::Positive); } } else if (!m_urlsToTry.empty()) { m_redirects = 0; @@ -316,15 +297,6 @@ void EditWidgetIcons::startFetchFavicon(const QUrl& url) m_reply = m_netMgr.get(request); connect(m_reply, &QNetworkReply::finished, this, &EditWidgetIcons::fetchFinished); connect(m_reply, &QIODevice::readyRead, this, &EditWidgetIcons::fetchReadyRead); - - UrlFetchProgressDialog *progress = new UrlFetchProgressDialog(url, this); - progress->setObjectName(url.toString()); - progress->setAttribute(Qt::WA_DeleteOnClose); - connect(m_reply, &QNetworkReply::finished, progress, &QProgressDialog::hide); - connect(m_reply, &QNetworkReply::downloadProgress, progress, &UrlFetchProgressDialog::networkReplyProgress); - connect(progress, &QProgressDialog::canceled, this, &EditWidgetIcons::fetchCanceled); - - progress->show(); #else Q_UNUSED(url); #endif diff --git a/src/gui/EditWidgetIcons.h b/src/gui/EditWidgetIcons.h index d00e064af..677cbebef 100644 --- a/src/gui/EditWidgetIcons.h +++ b/src/gui/EditWidgetIcons.h @@ -20,7 +20,6 @@ #define KEEPASSX_EDITWIDGETICONS_H #include -#include #include #include #include @@ -50,17 +49,6 @@ struct IconStruct int number; }; -class UrlFetchProgressDialog : public QProgressDialog -{ - Q_OBJECT - -public: - explicit UrlFetchProgressDialog(const QUrl &url, QWidget *parent = nullptr); - -public slots: - void networkReplyProgress(qint64 bytesRead, qint64 totalBytes); -}; - class EditWidgetIcons : public QWidget { Q_OBJECT diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp index a19a89332..72d09c9ff 100644 --- a/src/gui/entry/EditEntryWidget.cpp +++ b/src/gui/entry/EditEntryWidget.cpp @@ -121,8 +121,19 @@ void EditEntryWidget::setupMain() m_mainUi->togglePasswordButton->setIcon(filePath()->onOffIcon("actions", "password-show")); m_mainUi->togglePasswordGeneratorButton->setIcon(filePath()->icon("actions", "password-generator")); +#ifdef WITH_XC_NETWORKING + m_mainUi->fetchFaviconButton->setIcon(filePath()->icon("actions", "favicon-download")); + m_mainUi->fetchFaviconButton->setDisabled(true); +#else + m_mainUi->fetchFaviconButton->setVisible(false); +#endif + + connect(m_mainUi->togglePasswordButton, SIGNAL(toggled(bool)), m_mainUi->passwordEdit, SLOT(setShowPassword(bool))); connect(m_mainUi->togglePasswordGeneratorButton, SIGNAL(toggled(bool)), SLOT(togglePasswordGeneratorButton(bool))); +#ifdef WITH_XC_NETWORKING + connect(m_mainUi->fetchFaviconButton, SIGNAL(clicked()), m_iconsWidget, SLOT(downloadFavicon())); +#endif connect(m_mainUi->expireCheck, SIGNAL(toggled(bool)), m_mainUi->expireDatePicker, SLOT(setEnabled(bool))); connect(m_mainUi->notesEnabled, SIGNAL(toggled(bool)), this, SLOT(toggleHideNotes(bool))); m_mainUi->passwordRepeatEdit->enableVerifyMode(m_mainUi->passwordEdit); @@ -241,6 +252,9 @@ void EditEntryWidget::setupEntryUpdate() connect(m_mainUi->passwordEdit, SIGNAL(textChanged(QString)), this, SLOT(setUnsavedChanges())); connect(m_mainUi->passwordRepeatEdit, SIGNAL(textChanged(QString)), this, SLOT(setUnsavedChanges())); connect(m_mainUi->urlEdit, SIGNAL(textChanged(QString)), this, SLOT(setUnsavedChanges())); +#ifdef WITH_XC_NETWORKING + connect(m_mainUi->urlEdit, SIGNAL(textChanged(const QString&)), this, SLOT(updateFaviconButtonEnable(const QString&))); +#endif connect(m_mainUi->expireCheck, SIGNAL(stateChanged(int)), this, SLOT(setUnsavedChanges())); connect(m_mainUi->notesEnabled, SIGNAL(stateChanged(int)), this, SLOT(setUnsavedChanges())); connect(m_mainUi->expireDatePicker, SIGNAL(dateTimeChanged(QDateTime)), this, SLOT(setUnsavedChanges())); @@ -995,6 +1009,13 @@ void EditEntryWidget::setGeneratedPassword(const QString& password) m_mainUi->togglePasswordGeneratorButton->setChecked(false); } +#ifdef WITH_XC_NETWORKING +void EditEntryWidget::updateFaviconButtonEnable(const QString& url) +{ + m_mainUi->fetchFaviconButton->setDisabled(url.isEmpty()); +} +#endif + void EditEntryWidget::insertAttribute() { Q_ASSERT(!m_history); diff --git a/src/gui/entry/EditEntryWidget.h b/src/gui/entry/EditEntryWidget.h index d45b29726..b0f5d8c94 100644 --- a/src/gui/entry/EditEntryWidget.h +++ b/src/gui/entry/EditEntryWidget.h @@ -79,6 +79,9 @@ private slots: void cancel(); void togglePasswordGeneratorButton(bool checked); void setGeneratedPassword(const QString& password); +#ifdef WITH_XC_NETWORKING + void updateFaviconButtonEnable(const QString& url); +#endif void insertAttribute(); void editCurrentAttribute(); void removeCurrentAttribute(); diff --git a/src/gui/entry/EditEntryWidgetMain.ui b/src/gui/entry/EditEntryWidgetMain.ui index dc07603aa..3e759fec7 100644 --- a/src/gui/entry/EditEntryWidgetMain.ui +++ b/src/gui/entry/EditEntryWidgetMain.ui @@ -19,6 +19,17 @@ + + + + + + + + + + + @@ -155,9 +166,6 @@ - - -