From 6bfed45b5d78c05721a57e76b307f635e95b5113 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Fri, 4 Sep 2020 18:23:26 +0200 Subject: [PATCH] WIP: nicer icons, added bookmark button. --- src/lay/lay/images/back.png | Bin 659 -> 722 bytes src/lay/lay/images/back_16.png | Bin 450 -> 578 bytes src/lay/lay/images/bookmark.png | Bin 0 -> 1046 bytes src/lay/lay/images/bookmark_16.png | Bin 0 -> 704 bytes src/lay/lay/images/forward.png | Bin 708 -> 711 bytes src/lay/lay/images/forward_16.png | Bin 445 -> 572 bytes src/lay/lay/images/home.png | Bin 703 -> 767 bytes src/lay/lay/images/next_topic.png | Bin 528 -> 776 bytes src/lay/lay/images/prev_topic.png | Bin 585 -> 797 bytes src/lay/lay/layResources.qrc | 2 + src/laybasic/laybasic/BrowserPanel.ui | 255 +++++++++++++---------- src/laybasic/laybasic/layBrowserPanel.cc | 2 + 12 files changed, 151 insertions(+), 108 deletions(-) create mode 100644 src/lay/lay/images/bookmark.png create mode 100644 src/lay/lay/images/bookmark_16.png diff --git a/src/lay/lay/images/back.png b/src/lay/lay/images/back.png index bfd1a9f3a8fa6c83058b4a68800250b8453fc06b..f106b46a52d1843ec2b7391540494122882632d4 100644 GIT binary patch delta 638 zcmV-^0)hRL1=0nOI|~FW000Cl0RlLZ_mM^@e@{t7K~zYI)s?|((@-48zfHPyO%Y8P z8^t0Mf|nrDBwfdbu#*4EaiFgaX5 ze{f3aOUH3$IF7p(HZPPwRaJp8_QEg>V|I479TpA%(Ow%AMTyC>yqd{m#)`#ayi_V3 zGR9Jxrs>^sYPA{(B~TP4mP{rq*=#mbC=}ux$00d9#9vBXoCBkCU=&~!00n3V0LA9F zJqbX>V??^aRaF%vNqTM=#)N5_37+Qxf42oVyTC#7=*ww10(%d+YW=cL5>9ZM9m{^?Lo)eD3}}?X-_Rf5HEN z`#K6L>uh*^D^SOI1Hjn_M%cp_|3Ovd7 z_Rj6~cOTdC`P@De&H*D=`-TH2OfqnMRg4T(#;**I6&CJ_+};-~m7jK=)OMPnG%#m# zmr6Y+*^5S_;Q+Y#hSJrAhmXdJXm`@_uRnfvKHKhN082f~@6~}9s;UY@=Mxn@#g7k* zj4!`;9}q%HVRA$L4=l?%j0obbjm`GPvkz|1E52_50932h11^@h5sOBaDWz}wk(}-L Y4fj}wqO_Uk!~g&Q07*qoM6N<$f)}MQV*mgE delta 575 zcmV-F0>J&!1(OAkI|~Eo000B%0kwNlYmr7Me-KGTK~zYIwU*Cn6Hye0f2T9kG%4ho zU1`A*U%(<*tkNWtKMRqH+H~V8E&_rJ1$S=TiavpFkTjExMN+%aG@%wZK7n-SO4QDj zOeZ9hVReZox6r_O_`Tq=AmF@iyZiSRaFDvf5u2Sy1I|$6A+OSkH>d1nanLs(_C;5I7sFR z*#nn_5IgB~dfgBA?lwRcRDrYecd1lryxD^cdRlv-BUDr37`|Wn|;Um-T9RC-5WQ&|iHkt>A2gUMpf73RP zU46b7e5Bw^q8pt%pFV#*+GZzda%0z?hc|IG>97xkm0;Nz;<|7|BZzj!tb&H=AmMs8p0IUR!bNT-g3?)&eSzKK( zA7>Z40G@@(3oURY5fPR5=ad2+jZi diff --git a/src/lay/lay/images/back_16.png b/src/lay/lay/images/back_16.png index b7d8e2918f673156793685ac02a81e77580908a8..b5c926f5006b73d4e516d6144a644a2b3e69d535 100644 GIT binary patch delta 493 zcmVI8hqmE|?HP ze{I`-K?s?T(lk{>tttV*M;yP0=$8P+Xev8 z>-8?L`hETF`;W(a-}YVP7N@%oZo}gY!X}!gExq~hiTc;i9u}V{((BLPN9UJ(SBOb& zFo%JBlR^9-&4`Dq%Zl>l;M6e(LF^z!8UX)CIVIB3pWv||i1|*Za}uSC{R`c0*We>h jpAmz1oO2^icklWOb{XM@FVOum00000NkvXXu0mjfx})c@ delta 364 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 FV1jY|t^5E0 diff --git a/src/lay/lay/images/home.png b/src/lay/lay/images/home.png index eb50c31ea73ddf6cae59eec691a12a6e221cb9b1..7cee0be19f47be137800d26f13fa019a939a1ffa 100644 GIT binary patch delta 684 zcmV;d0#p6J1^)$*I|~FS000Ch0ohL-fRRQhe|$+qK~zYI)s@R@6Hye0fA=wuWD**h z$JmXg#RtWW&}`l4MyPcmxRPQ}>Pit8i4;Kxw20Qe1a}G*7Yd@FOaBBRDu^vsJ679; zX*=!2rj|hNjEj~wHZ$qOm7e8=^L^)c&m9K%muj$A*9Loat(hLu41CH;ngFmrzR;0- ze_UJ*(no{BKUoPgtdO{-koc69G=nDDF@cdytF!ak*N{Y$Lp?2was~NUi^5)Wmi9z` zbQsST%6}~|vT1d0UNcorQzI9;8FwmxJ%cI_BmZPV*uSbfN_?-#$fnh~qGpCla@qFtTZNwy2q5nWaW=8H{oTc=r&HBJ1D{_?ARLeqc=4 zD{Gz-;sKuyNmL)bafLAen0&E5c`dk3A|cm*RoJCfE8!G7Y9*u={=KM8hb5{HfA<|` zl9mAGKl}mmf^SM7A$RGVuuCgeLTpJ$Ej%PqefUI-$&%s=YAj*Mojop=OFymThJ*q@ z$qv15QJl8nV^tj3-{F#pLndm9PXYh%ex!2PQ3nRaz`xlL1Qs!%8d{tf>h7WEt3kn4r^ S1?R&60000_PmTH9;&87FZY<0$U`Cm?97pOIaEQBt~R9&_AG&x-lUH^1{H-6)6l%bfA&S5C??R zsI8FG!jPnHjv-A*Qzx})dCPh5ec%1wv!x>`CH`kAQC_yENwcR(i?WBpCa`l9|5)cW ze*m~Kv6G(rAe&+Kg-T%OC|<5}H=%JWp>eBR=dPWj_^}9ja8u)!Q@j>)9$$}{y0FT1 zHI!s*i;8&?6_?lc;EZtrs0Mtdp)mj6Z~SgK|QK=5VSr-mrfSoYm z%+D~>(5#B9){1!&kpz9XJ^&X+SJ0Dae@QqC&zO1Yq*ZanNXY>~F;8Np%3V|EmNPp9 z7skG4rk#fKvc$}UVXe5r4U+7eK@XnP`59++ujeD+gR4&*h5Pq>ud%g}&9pLuGwBNs zg%7X85^xmm&pPZ0N}~3_~O-b?26Lf z>~s`>+Vp_Ti$>U!WBWVgrx(8@*lPvAtA{D&^N*b`2Zr1$xj0dy^S7svNQZ0F&sE5G zcfZk0H67|d00`iEIJm-t5upS}RfLZg5CByRP7nbeC?KNeV-u*O;oZH5C$Ir!bb{E} zliOhg01?0f5{!ojqlQ0IB0AD7KuSqt1;<^HZWaGhe*h2j(zRTS4tW3o002ovPDHLk FV1kX*BiR4| diff --git a/src/lay/lay/images/next_topic.png b/src/lay/lay/images/next_topic.png index 63e9f391f328a3ab8fb195a61ef711dc39b29ea9..2ba1acba36fc2ee34d25dc61fcdbfba7b07a4a57 100644 GIT binary patch delta 694 zcmV;n0!jUl1c(NZI|~FS000Ch0ohL-fRRQge*%R`L_t(YiOrKgOcPNY$G>+Tg)YVr zj5f-~WEDJ1Qkd5l+th_kyxpl;ub)1kT!FO-M;CL z-irsot$6^~Ow%meTLrtgD2ge+-`^Sve}!BCpeRa3*Yz@E%$rCgR(w7m*B9OZBnNC( zljJ~4Swtsih++QJGHcm7NDUAS24BdsJP?n^>+Cl?Jd9*A2}&sdKz}*44Ip;N2BK5T z#Q0XyGV8x;klGFyV|{~zgALvu8XAHi2-}51de@Xns~Ec~y3c#Wz^UU$XaD?@f4U`e z&Ks7*Ifp3P+6pT>G7S_~fzuZO;Yh>09iS?TQrRg!Jv|M^*xonT%mbJ1z{;m_Yqm(1 zGM2WwR=A!@r7Cp*N@-Zv_44TGXhl_3sH%#Qk&%jF7zNIG=i=hx);r~G;s9`E4A$3o zh&=g7jPF#-tmk)MGO*>OmX?+Ye*pc}(p$^2!kVU~0l??;aXow-paf_;23&p!>$8H$ za@V^?Rt{A?-m4AhiMgcVQV%5qbQ2Pw@u8f#d8ASRW=3dH&_E;!OkS(lbP7 zO8bg81)vOw&K*p=DL`bFkWWA8!bY(?V47xSzkbJn<&5<{TP)Xney9LJAP_EOizIbW c@qZG(0h4claX)!`ng9R*07*qoM6N<$f_=q9&Hw-a delta 444 zcmV;t0Ymgt`by92^wCNp~0h9zr{H=%Axi1lKMi;viDc!J&;Mt?-J+q0zSaXI`Ke z?sW6ck323Z5UXV%i&Pjx?8MR(Kk4Qnqd}!o6UY2*iYsB7Z>g6@Uex4&XiLIshw} z#R6&J05J1l1wp4NSEUsmzM^cU5uO{!8V(@Gb6r2CyS3^|)0oe5trMOL&Z4^ zf3ofZ2k!Iv&ej6olR%Or!Rz%-P)d8AJbG}bt^!Gt1VTuhQYx#DhlyBRt(A|4UEy6_ zvN|$k!}V-^1Y7V9S-pRYh{fMPp-zHLcxRie-o0VN^=wr^Fc>^3ilS;+R;XNhUn-R% zb8~aws|q&Z9j&r@XK)LyXMsW%&{ucBe|ery`~Ch#MNvcmh{a;PiA3UJFc_qcq@e=d zeo9t{t`X7Lwkje_ zoNpcg(&@C3*Y)0yU%pNcK75%kF&;S5R@r@NV+Sl2iy3Zsxi;z4JkCodld+nckG)=9 z+c=xhQYS85kOjV}9r*SRDC7Xx-9Dc+plKS{($exGlgV67rBWOr#IvxlfYH%WBbiL< zjIsWurKKDIaPB2ak|dBuK7RUmf1?~7ju6km!@%?iV3`1b!1y0%n#KY4NfHEM48Xba z^hwh+BQrBIiw>_suqhD{r$;^V_`L}6kS1Vi1OVG1*h{MZi!@Cu<_+|vm(8j0(9?Wr zaTcJL_sZN|;Feq;o5&Xz696yNPvDjezWSUuipIZ&*Di1*D>=PCy=+e3HGHeD*IfYE x_hcof_kH?de%Kd*Bl)$a_i`L}rdG+m<}c>jQvQN6ZI%E4002ovPDHLkV1fp~SX2N2 delta 501 zcmVmsfLm?g9nm`Jj+95S0OC%!| z#j;-q%ZkpqDw44u+;n%J5AVJEK@q_^W24Gql8R(=Edr9tvg*eGzOP&`hqtz$wX47Z ze*hvD+CJNIob9*LzTOC$hQQ5($85G6PLQe=~fc2W4Ud07PW$2Z8N<`RY2mucIWoHp6v+ zTfoicvL1*?;s+z!I~};rtAi-{dwmzKmuMe=Z-D#hoG!>DqtN#H=dSbSLzG0m4$ozf zo{}bjE`VV=x&X2h1OPPs2PBpC=;3ke>1MmP*Q%)`ZTchzcU_1G3(BK~@g|E%U*dimages/empty_12.png images/unlocked_16.png images/locked_16.png + images/bookmark.png + images/bookmark_16.png syntax/ruby.xml diff --git a/src/laybasic/laybasic/BrowserPanel.ui b/src/laybasic/laybasic/BrowserPanel.ui index dd3c85b39..8e04d599a 100644 --- a/src/laybasic/laybasic/BrowserPanel.ui +++ b/src/laybasic/laybasic/BrowserPanel.ui @@ -29,46 +29,23 @@ 2 - - - - Forward - - - ... - - - - :/forward.png:/forward.png - - - - 24 - 24 - - - - true - - - - + Qt::Horizontal - QSizePolicy::MinimumExpanding + QSizePolicy::Fixed - 20 + 6 20 - + @@ -285,28 +262,28 @@ - - + + + + Forward + - TextLabel + ... - - - - - - Qt::Horizontal + + + :/forward.png:/forward.png - - QSizePolicy::Fixed - - + - 6 - 20 + 24 + 24 - + + true + + @@ -331,68 +308,6 @@ - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 6 - 20 - - - - - - - - Next Topic - - - ... - - - - :/next_topic.png:/next_topic.png - - - - 24 - 24 - - - - true - - - - - - - Previous Topic - - - ... - - - - :/prev_topic.png:/prev_topic.png - - - - 24 - 24 - - - - true - - - @@ -416,7 +331,99 @@ - + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 6 + 20 + + + + + + + + Previous Topic + + + ... + + + + :/prev_topic.png:/prev_topic.png + + + + 24 + 24 + + + + true + + + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 10 + 20 + + + + + + + + ... + + + + :/find.png:/find.png + + + true + + + + + + + Next Topic + + + ... + + + + :/next_topic.png:/next_topic.png + + + + 24 + 24 + + + + true + + + + @@ -429,14 +436,46 @@ + + + + Qt::Horizontal + + + QSizePolicy::MinimumExpanding + + + + 20 + 20 + + + + + + + + TextLabel + + + - + + + Bookmark this location + ... - :/find.png:/find.png + :/bookmark.png:/bookmark.png + + + + 24 + 24 + true diff --git a/src/laybasic/laybasic/layBrowserPanel.cc b/src/laybasic/laybasic/layBrowserPanel.cc index fc7855867..f9a3dd172 100644 --- a/src/laybasic/laybasic/layBrowserPanel.cc +++ b/src/laybasic/laybasic/layBrowserPanel.cc @@ -88,6 +88,7 @@ BrowserPanel::init () connect (mp_ui->forward_pb, SIGNAL (clicked ()), this, SLOT (forward ())); connect (mp_ui->next_topic_pb, SIGNAL (clicked ()), this, SLOT (next ())); connect (mp_ui->prev_topic_pb, SIGNAL (clicked ()), this, SLOT (prev ())); + connect (mp_ui->bookmark_pb, SIGNAL (clicked ()), this, SLOT (bookmark ())); connect (mp_ui->home_pb, SIGNAL (clicked ()), this, SLOT (home ())); connect (mp_ui->search_edit, SIGNAL (textEdited (const QString &)), this, SLOT (search_text_changed (const QString &))); connect (mp_ui->search_edit, SIGNAL (returnPressed ()), this, SLOT (search_edited ())); @@ -212,6 +213,7 @@ BrowserPanel::refresh_bookmark_list () for (std::list::const_iterator i = m_bookmarks.begin (); i != m_bookmarks.end (); ++i) { QTreeWidgetItem *item = new QTreeWidgetItem (mp_ui->browser_bookmark_view); item->setData (0, Qt::DisplayRole, tl::to_qstring (i->title)); + item->setData (0, Qt::DecorationRole, QIcon (":/bookmark_16.png")); } }