From f7e409519d8f40f466dd550d513d97c3d10f4bc4 Mon Sep 17 00:00:00 2001 From: defnax Date: Sun, 7 Mar 2021 00:31:05 +0100 Subject: [PATCH] Wiki Editor and stylesheets fixes --- .../src/gui/WikiPoos/WikiEditDialog.cpp | 13 +++++++------ .../src/gui/WikiPoos/WikiEditDialog.ui | 15 ++++++++++++--- retroshare-gui/src/gui/icons.qrc | 1 + .../src/gui/icons/png/history-clock-blue.png | Bin 0 -> 3056 bytes .../src/gui/icons/png/history-clock-white.png | Bin 0 -> 2644 bytes .../src/gui/qss/stylesheet/Standard.qss | 17 +++++++++++++++++ retroshare-gui/src/qss/qdarkstyle-v2.qss | 2 +- retroshare-gui/src/qss/qdarkstyle.qss | 4 ++-- 8 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 retroshare-gui/src/gui/icons/png/history-clock-blue.png create mode 100644 retroshare-gui/src/gui/icons/png/history-clock-white.png diff --git a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp index 1918df882..077641621 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp +++ b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.cpp @@ -88,6 +88,7 @@ WikiEditDialog::WikiEditDialog(QWidget *parent) ui.toolButton_Show->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/down-arrow.png"))); ui.toolButton_Hide->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/up-arrow.png"))); ui.pushButton_Preview->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/search.png"))); + ui.pushButton_History->setIcon(FilesDefs::getIconFromQtResourcePath(QString(":/icons/png/history-clock-white.png"))); ui.checkBox_OldHistory->setChecked(false); mOldHistoryEnabled = false; @@ -294,12 +295,12 @@ void WikiEditDialog::historyToggle() if (ui.groupBox_History->isHidden()) { ui.groupBox_History->show(); - ui.pushButton_History->setText(tr("Hide Edit History")); + ui.pushButton_History->setToolTip(tr("Hide Edit History")); } else { ui.groupBox_History->hide(); - ui.pushButton_History->setText(tr("Show Edit History")); + ui.pushButton_History->setToolTip(tr("Show Edit History")); } } @@ -409,7 +410,7 @@ void WikiEditDialog::setPreviousPage(RsWikiSnapshot &page) void WikiEditDialog::setNewPage() { mNewPage = true; - mRepublishMode = false; + mRepublishMode = false; mHistoryLoaded = false; ui.lineEdit_Page->setText(""); ui.lineEdit_PrevVersion->setText(""); @@ -418,14 +419,14 @@ void WikiEditDialog::setNewPage() redrawPage(); ui.treeWidget_History->clear(); ui.groupBox_History->hide(); - ui.pushButton_History->setText(tr("Show Edit History")); + ui.pushButton_History->setToolTip(tr("Show Edit History")); - ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/addpage.png")); + ui.headerFrame->setHeaderImage(FilesDefs::getPixmapFromQtResourcePath(":/images/addpage.png")); ui.headerFrame->setHeaderText(tr("Create New Wiki Page")); setWindowTitle(tr("Create New Wiki Page")); /* No need for for REQUIRED ID */ - ui.comboBox_IdChooser->loadIds(0, RsGxsId()); + ui.comboBox_IdChooser->loadIds(0, RsGxsId()); textReset(); } diff --git a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui index 04ce626fa..9181c9eb6 100644 --- a/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui +++ b/retroshare-gui/src/gui/WikiPoos/WikiEditDialog.ui @@ -14,10 +14,19 @@ - + 0 - + + 0 + + + 0 + + + 0 + + 0 @@ -246,7 +255,7 @@ - Show Edit History + History diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc index 995157b69..48071b201 100644 --- a/retroshare-gui/src/gui/icons.qrc +++ b/retroshare-gui/src/gui/icons.qrc @@ -93,6 +93,7 @@ icons/png/forums.png icons/png/fullscreen_arrows.png icons/png/highlight.png + icons/png/history-clock-white.png icons/png/help.png icons/png/home.png icons/png/info.png diff --git a/retroshare-gui/src/gui/icons/png/history-clock-blue.png b/retroshare-gui/src/gui/icons/png/history-clock-blue.png new file mode 100644 index 0000000000000000000000000000000000000000..562667468bf253dd23ed61ed4a7932532344f1c1 GIT binary patch literal 3056 zcmZ`)XIN9q79A40fQ_z(NxuC?zCOii!b2uu`OVK`&ATLF7q` z^cGYE6;M>JG^x^*eoqqh`F_0bn=`X#@3q%nd**!ST(`9`<6swL2LNzbm>b(eD~bBB z!l8NjQ~VmVFrG2AHUyv|cGspm6SNmQZEkN3K&T9aiv(buik}4FJPLrXZUAVd0>F>U zd}gNu04&AU%E1HzfV3Wv+y_!#g5++H*#?RRsGjsLkWQf*Y2CCLGJcJ8$bdrKAe90# zIss`1kL{o7)Y5fJ2&qj$7fNHMSA?7p z_-Chdsq~pHfL^+ndXhgAdq7qTjU4LncOmF4f-2HVL$&CFp(wRzH^}YkFhw>b*fxr8M4GBYV0i+I@lesz7WF*VR!9Jb5!YSZ_nCwLT}XXSK} zBdhhsLY^^$;PtOVvKc=@I5$aq!j~sb>JL6&yT+nELXo<(@@4Vp?ut?^5rnXzcU(=v z%dvE4|jM;tHhC?2_V(7ECGjrmsLytpkGI&^;8G{%m5p!t6hBJ32 z0KnNoeHfAyIE5f53(>;bgk=oQ%+GXC);WX-dDJY74IP4qW;3?XJSNEYi3J4e8)p=J z)PyI2jOKAQH#AgbdbX^?)r>%g#J8l_8rv;$xOVJLv})<^v$C9xvaftxqG+kx$WGL}9lnb@f4%Fn+u5$W?9qLFX0;n+ zz0+1Qu@?9b$e;j$#!^T}&w^3p-KC^|#>U+i4`z`V;t%i+#Ilic5l_i6n zcXWAJbs6`proL!%O7+WTPPW|GqpxYsdsoW_nK>HC&Z$Q|4dPZy${Qy%v2PYM2i*zv z;^FwEOG`KT6U+6vcQJ`x{T>q9&}VWm(e6eqzie{*Ye|V^L8;2`PKy$Xj@VZFtnIes z+L8o545sZ)VcET%hPvd0$pIvWP5P>Ov;{2wrXJs;Pnow17j=z$@ zo6)jrd-`wu;Ko2)jf*9@2+nI@iNG9gQ|Al#wCb2tVKF-h=8ZEBA^^MJ&_I zM)or2&a`V))+gVZn;0!scH{>~FEVSNvyIhY<#cl<#2lkAds}!-%uFh_Dhr)&3?HM6 zGa>WuzUBe!P3ugudS^Uf!u=Uz>2QMpk2G1gw@x4_dRZl%(ZFf`<)IT5M*(u)n3%+Y0mUYe3bce(2R*o#kwbR<-|Sxa z|D)N3@eP*zYx?;-PVBo*BH#wz114(gd&eSJ{N>tT zRU=MC#fh0Fk})SYG)r&0MhvRkqYpMqxW>T5`W>v-URCp93j!EDHQdq;wz7FQ$&20n zCa}rQmoBGH5dYG=KC5uc9!JjW)hJ;k&y|W@$IQSE@X20bEp&{3SBgP(f5zBKhcHjw zi>Od0Hl&=wbC{M7NL*2Gh|hU&l&EyP)MV?0`rbk;AXCYctJ+urhQ6_(8Xf}RK;240N>cMCkdKE)|pE6Wtx^>Q+`R;er*l7Y zH7@K)*4%U9k!`%gxF6d^OxB4nn-eq1OO8qMflZBb&#LN+uFYsDUo?xt>^!-?J}mCG z6Wik|WPaW;wIphjs4%;=*p|FFEc;Q^t)kvlq@e3R+x~xr^%m-Fu((ZR2{B)hyMAOp z=bXZK61K%kDNw~<*P~VZ-iq#Pd~9vVfnv?Nrz-5nm-q(mSL+HAtg>xtKkW0I@~~-K zU(tWvcx;E*s*7*4g8r$}L=z{Xr#sP0>ondAT7U{lMOhK0s)#z|prWdUQq%fNT>*vC zLZJ}c4F~=w!7sqm2OIML6Wnc>f$G literal 0 HcmV?d00001 diff --git a/retroshare-gui/src/gui/icons/png/history-clock-white.png b/retroshare-gui/src/gui/icons/png/history-clock-white.png new file mode 100644 index 0000000000000000000000000000000000000000..95e93d7ae418304c633a7058bd2e475e51e84eaa GIT binary patch literal 2644 zcmZ`*X*kpi7ysLhX{PK9*~yw=s$uNgFc`8%%5KDD9ZN#STq#TTHCvIb>}2R_3^KB2 z33aVEYc9!JyyQ+F-Vg7G_j%4azq9;)&-rwo=OkRWFotlzH~;{EU`!0H=}7$T?9BA& zgRIu21GBdtRu2FgQ^6;0Ec9B;!^9d30QY6+yf^?jrniXe01yfXfDKmwK;;1de_-Jo zD^2=<(cR405CC32kyNEupgaNI7i)6o2y>pVxuIqxGvc*m)ZCrfrP&+@y=QpX-%rBv_@kay^ zscy`rK|@iDc)sp-t@kTV1&MPWwA%N;aEtAe!O||>Hn!#Hx3ybd;?dE2&6%RZz9ZiH zl-`#P1Cx}9FbhiD;_*k$s$0D@K~e*g}8H{(Ca* zTaUhlI_5$x-xctp7(L?mWVh-`JF&Vu{DY<%tQ)K#SQ^h>9E@%um__p~PnNXvXKR`}#nmVQ0 z%wvQd=Jggn_#-sFfxKQ~cAW8UOMEU!lJEsI`kW6gCG`<@fB7jzN+sS@p)Pawf+aER zHIeva3a)U1HNQU4S@UT=T;Or2ysi-F9u?+ZuDm4?Lj_6A|x>Ij55Bg8G~O^Nx=8g701ofll-zZD85onnF8Q6Ofia8 zOm!#aQeBpc4(FXTzB({oQB~j@`d0Ka@#>AyE&}yFc;3qg{N2_(FCQePLfuWi?&pY2 z6sH!qy?X7)A-2N{UM*jBw_<5~xBTe>f>*amQ&F^1R*Avc1c2iiOciZpbg;%m80$(s zzy*Ht{s)Z4#L4pbO6-OnaX!cK)y#~GkaD1N^63y?;dC=Cb5BDH)((M_E1%~?L(R6o4^=)^| za=e)MS+l%GX-9J{%HPhd1IFujtx0nzoEie<$3Rbktt*AFObQSo7pr|u_`@^SUm5mVBju79Oa@8lNtne^WM{`jpPL%>G~W<03{4qAG62^Q zGVL+O47cWm`rCm~s{GOyqmDZjxwYKpo8EG|14t$oT7pWdpDsg5yhW>@xi=g8jRN1N z$Yc7&SjPERX!R}iN3sr_o435jtD7OvRq*`4Ri~L7-9EVd8F?mi5AlgxUcaaOfA;rc_SyI_kl`aEm1zg&GUIy_tf>|X)y%|ovh3#%1j)EAOBv;+g*Q*o8`QF zUW8*#LtqEzN*c@TjBVfztnP76W7lFzf@qH%M>NhrS_X%|znQry5g<4a@FogN(S(w3 zHrTn0OBA&_+kR7x)J?B|S@`V@s|ugIu2J#-P!)n_Yg=&mL*^mBi1F*ce>4{+z$Y87 zP6v^jf+9|?%-v2bXniLdC|{hyJa-iINGq{kBj;+TSmW4mS2K-+2VZdiE+^~WpVyEE zNT(D$+$~OZ>@8#9APWf?xG#%K* z=!{{_2lD%7O6NaWq6wk=xX4+gm89?9f_>j&)yVu+ltwNaC>doCmAYc-#5-413*Fp( zN~t1rFexEM4zhZK+IuCsI2PjSsW1of$NH4DeQ464+0Nk;FBz%?cnVdQ^v@x0(u_^i z7;?+L&_;3Y8fe~e5j^!m?mx1J*xMNbeIW3_uHja8P}tjYmCfyp9d~NYM843{Hnj@c2ZT=D#P`ovH1Ukw+C0=-wz5a<_uWLWQKc&`rH=D# zkj1&O5b|sLl{X8tiN@pLsoXj7F5is0RdhFZ!>7M?819;eBA{N+eOh1mehxn)Rq zjl{uB1_%m*h8vBn@LlYCD?TSe9W&oe4lXf(jd%xh$z|Pwd{oTT4%1q85u;2~ z9JxA)r%ZLjNvfYq!KLirDObBgcG#Uqht<~Es1Wr=)!5@#CFm9z`;=dKZ;cipDKc(6 zw@J>L+!4!(8Wr-*4xazolJB-7hf8 zTaoL3!1Cj0bzVYGG)MZR__{6L)$W&PGoH&$tushOLR$K)sWMeQE)kw=CpaBekg2&w@8^Lwz}urt^ByqO%g1S$3nRk z?O&f;;nU@}GDkH9a$(+3yv{{?b&?E7?q;O`AK r0l1KGw_q