From 8154aac7d8780445209f16f4306c0211b2c9797c Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Mon, 23 Jan 2006 17:21:30 +0000
Subject: [PATCH] slightly improved the icon situation

---
 src/qtgui/images/d_nextpage.png | Bin 0 -> 1343 bytes
 src/qtgui/images/d_prevpage.png | Bin 0 -> 1331 bytes
 src/qtgui/rclmain.cpp           |  16 +++++++++++++++-
 src/qtgui/recoll.pro            |  22 +++++++---------------
 src/qtgui/recollmain.ui         |  10 +++++-----
 5 files changed, 27 insertions(+), 21 deletions(-)
 create mode 100644 src/qtgui/images/d_nextpage.png
 create mode 100644 src/qtgui/images/d_prevpage.png

diff --git a/src/qtgui/images/d_nextpage.png b/src/qtgui/images/d_nextpage.png
new file mode 100644
index 0000000000000000000000000000000000000000..5de60770aa5f849e728f1e3d4ace143a5107373f
GIT binary patch
literal 1343
zcmV-F1;F}=P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)&Un03LFa;ZiWB=1k6c9
zK~y-)m6hLXRM!^AKl|)+&YYP!<0P3hI>sauQIbZ%fK@~c3@Wz5)zXK)_@IS?)Q3J6
z`g9-qN7Nz|y?7rglv40PDupUuNWA`tN~(Pbxz2cWq7yR{Pv-oXbLQ+m+&Hxe)^6Bu
zdw<qi-~C;C3EpCr%VphlT@xUe%eAjuxf1`?9q|U(I^Xv{(lqTKQp#;o$~-`)(^=_s
zI=?EVE-Iydyng-qi?;^v*|X;pUDy9vC=^DwZrw_$RHCP+2c;B^MuSSF!u<R^OG``t
z>vTF_&CJZ4dn349F6%)MeACm@^Xb&o6bBC;WMpIn%d$w4gd|DmbUL(JEh?1?SFc`W
zW@d(Fv-z!MS)aWsk^U+;2!d~m#p3Z}$Bwao|9*5`XL)&<X0u5g#|R<NG!0GDD3waA
zU%#H=;bAUby!dIYRx^MTFIn=H@;@&W3SXW$ae_mK4iSbS&1RD*ifFgn*tU&Q3eWS1
z<Cq`_04NrVWHK45)#{Eyp|I>Y&VRe$-Me>hG)?on!-o%NjvP6H>$<#n@dBk3VHjfD
zHlw4X^!E1BYPE1(mn2Du<Cr8#$mjEfVMw)FeQ)E&jsJEWXH^5xH0}7NO`H15<udJd
zn?|ES9LIQ`N3+@N2GKN)EnBvb&*$-dpLV-V5Cljm85<j8aB%P)A;fV24ZtvrquaJ^
zqrbnOrKKg}IPOZ(Znt^*^eMBmvm{A^5Q6dXar*lD@H~$&3<-jOTrNkcRKhTf4*|4&
z`}XB6%NpCfc{8n6i+a6IqtU>1UE=uvk1VC+*|TTdyLS(z6ha8LZ{N<qzyQAQ6NVuG
zeSLkT)9JCjd-rb8g%EZ+owl>tEQ^baxUS2tUAyS-?`KV>u4|Gc`NO9|FgZDi=XoqH
zE~04~sZ@$|I&HVx?SgLGwlEAsD5Y3gSwRRvu~<Y(`8M57I-SP%eWEBrDTQGeLQ1LW
zQpx}b!!R_WC}MSWmCKhevth%AZe~IV;yA`MO(rHLx<MBf7Px);Hc=FH&jO*8($#CV
z+RD(-kh8L~GF~VY@O__0j~-F2R=bDSGU33116}CL&QnTZnkJg2;dvgNPRG$St)}0)
zbt@Vk9{%O=<HzHJgM*|}sn^PtQZh9)#n8|Y0FL8u?b<b@l<2yS5CUD-X*3!rrGB||
z=~Acx=(>KcQmLrb)m8HOJceOlnkJ@cBBf+xWTXpy^5hBA)6+;PNu^R4hCw!)C5j>(
z$5FbjpX+ws{rmSHPfSddlv0yxUPLK{loBarx4WJ{f6mRDH(5&tDJ7Xq23^;go13Fv
zum9`9g$rN*=@U{)eX+2xuxH)6b>lmB?C8FBk|ab?#PsxZSC*ICvMd1Z-o4AihYx>K
zN`3L#Cp0%V=k46N^XGcK{y`K)eFFmn^!D~*nr2s;R4RpKS=hFXZQBGvz@0mHc<|uC
zyb$8(`Sa%=y#@xDot=F?IXU_L^78U%tyX(CNfNTzEZJ<9OeTY6Sx6~qwOY*2&vWC(
z4IIb$AxV;t&z?Q|@U2GE$&)AF7eahyS=PQ>F4v#QWB~9y57%{<eBb{M@XeVsXMXxy
zGw<a(b?VgmBuTa?rQTWdbzRf6`O~LQKYi1^-vI-zGgYRl+(rNZ002ovPDHLkV1hK=
Bk~RPU

literal 0
HcmV?d00001

diff --git a/src/qtgui/images/d_prevpage.png b/src/qtgui/images/d_prevpage.png
new file mode 100644
index 0000000000000000000000000000000000000000..dafefa47fd914866232600e70a6780a655ed5809
GIT binary patch
literal 1331
zcmV-31<d-1P)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru)&Un06DnV=QU?G41i(o|
zK~y-)m6gqJ8$}q#pV^t&jn`i>N~P3|6I)S8tH^casHm126ao^b0tbQwJyk&If544@
zfD@-GDD;M?#HCeRPN=GcijpW*qe^y~M)4AP<Jztp*Ertp*UWODUO+$#uk;>fr1@#)
zndg}ycuAE?rHJqQBa~8IN*PEg`;^l5+S;1)qIKj2z&8MV%ouxJ)3l?EF$Msh=edsK
z)O_Fn5x~mo>gvXS0?*ISAN76zt7tU3G&MDad_IqCHj8*X4k;x%oerwiD$3<Ds@1Br
zZTo8}<>zZ_Yrp<0_{^Cz`5*|cO-@ec&YnGsQ>RWLl}bTM3E%f2r33&7A<$~Iu)4a6
zTeoh(G|jt&koWG~xnuqfTq>0^ilY29J3BjZ{``5IIB^1phlhCj^eJ4|MGyoagoLfC
zDgdBdF5~Let9bbE;awrb;$Y`=0M2AG-%d|Yzjoom1x!y*qup-f*|TR5LV!|=BS((F
z^Sp4*bzOL#hmnyH3=a=ue}6yS>-AEmY2FOMr%#`LH<?U+aqiqX6pKYPn@!lZ4d3^{
z7(*_XLn4uYrfGQe=n<rp5JEr*0pIsS{SCt?j*gE0V47xK0RTl&KAV}DL7`AUyWK{=
z--qkEpp+t;&4$NrHk)u92d?Xe?Klpkl$e;9KrWY42qB*W09#mCc!g40DijJ}jN!?X
zClEp)kw{>2auS?#0KkI>4`3JuD5W6ek2@b|uIoB7nGCAc>RSs73%VkuJQ|P3hsVao
z@c8j#wA*bcih`-BsSsML)lje3q3b$^hK9g72j?7w5ZJa2$8it@0aB?HqS5G>lyZVm
zN)z#T9E1=w8VwLaaPs6yJkJ9FAe~O**s){bI0ym&fRqv&8yl$C>!6f^bB;(PqFR<U
z!Wd&<jKT9f^m;wS<MD8(gQArFV>&6Nh(sc=EDN6JK?pH84PlJ2!-0J)%R;Bq!R_0(
zvADPx0t~}ItyY7kX$XQKY{zk67zSL|#d8xN2m()4)ecitwPD-#VXxPV>ADUf1a@|I
zz&XeK{Cp_I*47rv<uWLxp%jD=P)ebyDk!DsbUN@nuOWokqublt*74)V-%h1c*>pM$
z&-1`J4+E0PWI``@yIt6}4NcRaswz0=V2puM3Qf~snkE{J#*OROuYWi2@rq#>5JH3+
z>$(oZFtD-l`{TtJLq4AeV=Q#VpkuKZeBa0Z{ysS8--OAVnVBhjp7$nWY<zrtJiIK<
zISvjEVB0oyUB~Y3E-cFeV+@L-fKm!w*TEP=xm-r0(fIz#l`CI{;7X+u%+AiP9~>Nf
z6pcoQ(&==VHcBbF-7fa__R#P5!8wPbC{R@uu~-b8b5tr7Y;A2-Ip-g2Zf+j_<q^7n
z|9-1jEUq^ijduV<Mn^}HOeRAuRaJ$iY0xwcu~-bTSPYKiU~_X5l}cq#QIvNtU%tE>
zTJg`mym#;3FLQHqH(RY%q19@Q0|+65)KN;&@ApxyR<XXmj#{mDLs69XS5{VbUivjH
zEiKVhD)phFD4#?kk-20t8H+?B2!a5XWue>cc5U1K8Nl-L^76I+_2&)h;>C+O0Iy0Z
pM+hMSA*4wN*}in?lKG-_zX9KbGmXWc?q&c0002ovPDHLkV1h$nYEu9J

literal 0
HcmV?d00001

diff --git a/src/qtgui/rclmain.cpp b/src/qtgui/rclmain.cpp
index 395865b8..9feb4edf 100644
--- a/src/qtgui/rclmain.cpp
+++ b/src/qtgui/rclmain.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: rclmain.cpp,v 1.6 2006-01-23 13:32:06 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: rclmain.cpp,v 1.7 2006-01-23 17:21:30 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -46,6 +46,7 @@ using std::pair;
 #include <qaction.h>
 #include <qpushbutton.h>
 #include <qimage.h>
+#include <qiconset.h>
 
 #include "recoll.h"
 #include "debuglog.h"
@@ -64,6 +65,16 @@ using std::pair;
 
 extern "C" int XFlush(void *);
 
+// Taken from qt designer. Don't know why it's needed.
+static QIconSet createIconSet( const QString &name )
+{
+    QIconSet ic( QPixmap::fromMimeSource( name ) );
+    QString iname = "d_" + name;
+    ic.setPixmap(QPixmap::fromMimeSource(iname),
+		 QIconSet::Small, QIconSet::Disabled );
+    return ic;
+}
+
 void RclMain::init()
 {
     curPreview = 0;
@@ -89,6 +100,9 @@ void RclMain::init()
     m_history = new RclDHistory(historyfile);
     connect(sSearch, SIGNAL(startSearch(Rcl::AdvSearchData)), 
 		this, SLOT(startAdvSearch(Rcl::AdvSearchData)));
+
+    nextPageAction->setIconSet(createIconSet("nextpage.png"));
+    prevPageAction->setIconSet(createIconSet("prevpage.png"));
 }
 
 // We also want to get rid of the advanced search form and previews
diff --git a/src/qtgui/recoll.pro b/src/qtgui/recoll.pro
index 77774295..37815011 100644
--- a/src/qtgui/recoll.pro
+++ b/src/qtgui/recoll.pro
@@ -19,21 +19,13 @@ FORMS	= reslistb.ui \
 	uiprefs.ui \
 	ssearchb.ui
 
-IMAGES	= images/filenew \
-	images/fileopen \
-	images/filesave \
-	images/print \
-	images/undo \
-	images/redo \
-	images/editcut \
-	images/editcopy \
-	images/editpaste \
-	images/searchfind \
-	images/asearch \
-	images/history \
-	images/nextpage \
-	images/prevpage \
-	images/sortparms
+IMAGES	= images/asearch.png \
+	images/history.png \
+	images/d_nextpage.png \
+	images/nextpage.png \
+	images/d_prevpage.png \
+	images/prevpage.png \
+	images/sortparms.png
 
 unix {
   UI_DIR = .ui
diff --git a/src/qtgui/recollmain.ui b/src/qtgui/recollmain.ui
index 1740db7e..60cf6525 100644
--- a/src/qtgui/recollmain.ui
+++ b/src/qtgui/recollmain.ui
@@ -212,7 +212,7 @@
             <cstring>toolsDoc_HistoryAction</cstring>
         </property>
         <property name="iconSet">
-            <iconset>history</iconset>
+            <iconset>history.png</iconset>
         </property>
         <property name="text">
             <string>Document &amp;History</string>
@@ -229,7 +229,7 @@
             <cstring>toolsAdvanced_SearchAction</cstring>
         </property>
         <property name="iconSet">
-            <iconset>asearch</iconset>
+            <iconset>asearch.png</iconset>
         </property>
         <property name="text">
             <string>Advanced Search</string>
@@ -246,7 +246,7 @@
             <cstring>toolsSort_parametersAction</cstring>
         </property>
         <property name="iconSet">
-            <iconset>sortparms</iconset>
+            <iconset>sortparms.png</iconset>
         </property>
         <property name="text">
             <string>&amp;Sort parameters</string>
@@ -266,7 +266,7 @@
             <bool>false</bool>
         </property>
         <property name="iconSet">
-            <iconset>nextpage</iconset>
+            <iconset>nextpage.png</iconset>
         </property>
         <property name="text">
             <string>Next page</string>
@@ -283,7 +283,7 @@
             <bool>false</bool>
         </property>
         <property name="iconSet">
-            <iconset>prevpage</iconset>
+            <iconset>prevpage.png</iconset>
         </property>
         <property name="text">
             <string>Previous page</string>