From 369dcbb5a1e1ca0267a73eec19ef3aab01fac654 Mon Sep 17 00:00:00 2001
From: beville <beville@6c5673fe-1810-88d6-992b-cd32ca31540c>
Date: Tue, 5 Feb 2013 06:37:04 +0000
Subject: [PATCH] Tweaked the pagebrowser layout Added arrow icons for some
 buttons

git-svn-id: http://comictagger.googlecode.com/svn/trunk@424 6c5673fe-1810-88d6-992b-cd32ca31540c
---
 coverimagewidget.py |   3 ++
 coverimagewidget.ui |  20 ++++++++++---
 graphics/left.png   | Bin 0 -> 1216 bytes
 graphics/right.png  | Bin 0 -> 1206 bytes
 pagebrowser.py      |   9 ++++++
 pagebrowser.ui      |  70 +++++++++++++++++++++++++++++++++++++++++---
 6 files changed, 94 insertions(+), 8 deletions(-)
 create mode 100644 graphics/left.png
 create mode 100644 graphics/right.png

diff --git a/coverimagewidget.py b/coverimagewidget.py
index be3da17..efb760d 100644
--- a/coverimagewidget.py
+++ b/coverimagewidget.py
@@ -71,6 +71,9 @@ class CoverImageWidget(QWidget):
 		self.comicVine = ComicVineTalker()
 		self.page_loader = None
 		self.showControls = True
+
+		self.btnLeft.setIcon(QIcon(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/left.png' )))
+		self.btnRight.setIcon(QIcon(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/right.png' )))
 		
 		self.btnLeft.clicked.connect( self.decrementImage )
 		self.btnRight.clicked.connect( self.incrementImage )
diff --git a/coverimagewidget.ui b/coverimagewidget.ui
index 51e91a2..2c9c5bb 100644
--- a/coverimagewidget.ui
+++ b/coverimagewidget.ui
@@ -14,18 +14,24 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="horizontalSpacing">
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing">
+    <number>4</number>
+   </property>
    <property name="margin">
     <number>0</number>
    </property>
    <item row="1" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="spacing">
-      <number>0</number>
+      <number>2</number>
      </property>
      <item>
       <widget class="QPushButton" name="btnLeft">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -37,7 +43,7 @@
         </size>
        </property>
        <property name="text">
-        <string>&lt;&lt;</string>
+        <string/>
        </property>
       </widget>
      </item>
@@ -59,6 +65,12 @@
      </item>
      <item>
       <widget class="QPushButton" name="btnRight">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="maximumSize">
         <size>
          <width>30</width>
@@ -66,7 +78,7 @@
         </size>
        </property>
        <property name="text">
-        <string>&gt;&gt;</string>
+        <string/>
        </property>
       </widget>
      </item>
diff --git a/graphics/left.png b/graphics/left.png
new file mode 100644
index 0000000000000000000000000000000000000000..1f1f58db722fc38fe25f7dc75f68b23a82198bcf
GIT binary patch
literal 1216
zcmV;x1V8(UP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01glU01glV`Or`~00007bV*G`2i*b%
z1_&V7P|$Gz00cluL_t(Y$E8(oY*SSfKj*&p`r5bG*Oqm(+ZdLyg$Zne`y+}>hLB*w
z2QXVq)S(G+W{Ha${-}sEV=x>{gTXHvjD{$QiJ2N9!Ux^J$l~ZC3}iaoWMgYtySCf<
zXI)?4JAOb6vJJNJ`*Lqi&ON_-e&^hK5atTo&Uui~?7*=oh@2PvjXI?72Jklg&yCG0
zXvW(&SJP|j)3WBdtEwOWbIrQkKHezQ0ssIa%pJFar|v3rtY{2h=(<50Km1+Kd9#DW
z-2DXUyR)Y{HuDTT`vL546xy5?_n`w%%iF&7(W%Z5B5x!?kpVQ_H75dG@XpPR^!f&y
z)7rY{-OccMcal1K!swI*;=Nvs`GbBm2tUu7K*-(;G*AyP|E)qx_Wb6$hI0ASD=PhT
zIfzbyz!nbU)z-G4uBz*3pkDn?#@jD=uM9X>U15r1bXQhyfFA~ddWXi*rmK`X9>HtB
z{ua;@i3+-2-!fGPO`CzT^6<aG_iixTEv-*gmO;xfPrd#LG{++(4SCVi*%d^f3c6n3
z!WPy}85{tBztdnXJ^~}>YanHLQ=!ppYA!8*R6aYTlXonNDFGiyBOx3Mjs$^dt=dz2
zNyx4PU<~x>YB=Q^D*3388F=^N(gL^|=P49X(ct%y?DwIbPy@QARg87K+9Ks2g4m^<
zcbE81L)z+(vr#mhwXDpO21%q)G>NRgpG+PP@;o0zpo)?6H7&}+haqxt`#rmRl0=MS
zPl#Dg%P=$2SR{dFNdS&%D9F+%GF;>P<>f23k|O|YW>0967bl8A)HE%w>R?OZAzk4i
zx3mE4i!&?+Nvd4(!uJ?zuK`<D#*7FiNu(?*@5Mwi-^g&8B~2lxMZk2cfwC5*f*M!X
z1U%t%XHn(pp076RvnE)u={O9Ycutpd%bSf1awHxLGBXu&T1CvT8Q_6MsW3jF7X^G#
zhrD>x$&6K15V-i|%q1E)@hkuUh$%+RWKp)phNIt%dBZ4+j2wyq(-Z+8D$b(xMfNIl
zYT5zOCL;hqLG_vGznZ(TFWq)pPO5M$cZq$=W5o{AiSWj#N`3w~^mPXiW9lby!dJSF
zmZ>wY!7b#ycnZ2c+nBJgc>e2HoN_{uWC0p^3dS@H#gY)x8N^j8vhvKKEPdvrYh4X^
z+m6nhVEDop005A=`Xw@1EZ>cU;`vdP9*k%@1tLitjwaC?Cz1rA$SO<Z{@{@_vzF*~
zl<Yb$6R=}Rk!|UZsWcKxqNWi!%o4gp1dcJsxqSt`ISrhm9qrJ5usEV8wF(pR$8C&9
zjgWxjP>6(y<2eA1Ip;jl+)X7nyGu4{CaZPp!c?W%6&poETN^O12RT9LIajy5^S&gy
z9c2f5&4R#hpO{D#aXi<LfDJ$Ha1E61`vcDI$%FgC+V}nf0Dx7sm*L5#zfJ4kzs3Ln
e${Ks7^#2Fa&8_k@1TY=|0000<MNUMnLSTXctv0j(

literal 0
HcmV?d00001

diff --git a/graphics/right.png b/graphics/right.png
new file mode 100644
index 0000000000000000000000000000000000000000..c9c3afb078c66b1a3b67b2ff720b68620f5bf52a
GIT binary patch
literal 1206
zcmV;n1WEgeP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01glU01glV`Or`~00007bV*G`2i*b%
z1voF2??p-g00cHkL_t(Y$E}rHY*bYkh1Y*Bb2%KQGaaU#0@K!p0uQJ_FAxx+Tp}i#
zSQDb6jwYHKq7R4yhFiUGky`?x>JtfxNndKL2DJnqst`d-OSC8g+A>($Y3X#P?VP!F
z&OX1dN{hYVdR!0t%U)~$`zPG3f*nA3Kj7OgAtMSPtZA^x5yTEhF$GDZ93lXK;!yXj
zSY3LnX450reSzFoI5)2a0L<Kp`&Yq^5_{=Bp7Tx{uRs2q_4Dt&oWJm39NukZlZ8lQ
zy22_}T{=i{@R{})z4FB!K78P5-Q&+`#f<G`=-GFF0J5p)ll{?tB^)Ndu5w#PoKD>^
zc~|XI@c7-|L3?u@0MP8+;{xPS&di-a_g;&&<xPX#z0b}n$kP;?f-Ajgx}A}E>kA9*
z7cSqb&Y<!v!u!H%$@{Qk&G!V*Jvsow`$2)-RkF?2P`qT3cfhH0Oj4;N-^q{90)6_)
zw@3`9%SEWRZE`mN0OLHQ!ad-w4?=Qo)um)~@JW{{X;5YE%PN#m9K5_NKwUTcH)d_i
zT6wU!)3xXrGQDRe2mqk?)<Sl#LbkIur25u1WmD;AG+}CB3q8U{QK9gPrN#EXu7PUF
zz51-tz9sCgIDvFe(*z>=hqMO|BY9;jTxG|rBw22dY^vAr<?)Cwk371{r4Exi&b7lD
zG0S5uZ?sLUgS+Hfd<?^vHzRlHM^z*%pN*u_xrw|ywu*|#qpR%6rfB$=8v|sD%Kjf-
z>l}X$?#|Js!c%zy(H~!LmQ{I$L)V5}lA!6Df|xNv5y`<?z@H<@(#la$PXyoz%tU8H
zHRio^niBo-7pLdv<mmGP7)qH?h>^%xAR&Zow@0T0=xnG)>2qJIMkHA`t7JyaoW(_)
zHW`jMk!69Mkvqgj@-#W*Zzc_x7i@wNjnGI&)RitMs9CbCkQJE_O$f3q=D|>etaPeA
zV<Fi6_48u(6ZN?L)yDBVcxco2006s3r|Dkbfr1BS)I3}fV4q8+e3y-MyTrrcI3**A
zMrV#IXrJZ~0RDCOxUXpLtIeu|xQ;corf9C0i+m3Fb5xRu_`;<=`r~?}QBe`Rdh#*j
zp7S)8S+?aT7||H%4y7&%s!?1{HbyK&43kV@@n1KGsi)hhC*t7Mlk3I&m(SqZsr8fi
zivU!-)lwTX`Q46;V6U!_-=)H<D@-XtgMFz+`!wf<)X<P<|9Itpb~q+r*{=3HVOf2l
z45KfeWLYM1YYG=?Dk&MOkzfT|4pkUaUpTVlmlYYR5ogFU2`2VP3OPxsw@k62<xquD
z{&vgM7tV$E7PQN%+98E|$ae7}ijzZB=yiSWbi0Fg-6;T|^+@G}0HY#$bni8s+ch6+
zj)Z12c!w}Wq1|q4&1TJ`&D%=i_&-#2umb?F_Gn02bL6IT>7HK!0INRybJA!14Z3u=
UTIxjF{Qv*}07*qoM6N<$f<E>`mjD0&

literal 0
HcmV?d00001

diff --git a/pagebrowser.py b/pagebrowser.py
index 4508e04..5ce727c 100644
--- a/pagebrowser.py
+++ b/pagebrowser.py
@@ -18,6 +18,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+import platform
 import sys
 from PyQt4 import QtCore, QtGui, uic
 import os
@@ -46,6 +47,14 @@ class PageBrowserWindow(QtGui.QDialog):
 		self.current_page_num = 0
 		self.metadata = metadata
 		
+		self.buttonBox.button(QtGui.QDialogButtonBox.Close).setDefault(True)	
+		if platform.system() == "Darwin":
+			self.btnPrev.setText("<<")
+			self.btnNext.setText(">>")
+		else:
+			self.btnPrev.setIcon(QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/left.png' )))
+			self.btnNext.setIcon(QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/right.png' )))
+		
 		self.btnNext.clicked.connect( self.nextPage )
 		self.btnPrev.clicked.connect( self.prevPage )
 		self.show()
diff --git a/pagebrowser.ui b/pagebrowser.ui
index e3ea04d..f4584cd 100644
--- a/pagebrowser.ui
+++ b/pagebrowser.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>429</width>
-    <height>637</height>
+    <width>369</width>
+    <height>582</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -20,8 +20,29 @@
    <string>Page Browser</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>4</number>
+   </property>
+   <property name="horizontalSpacing">
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing">
+    <number>2</number>
+   </property>
    <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
      <item>
       <widget class="QWidget" name="pageContainer" native="true">
        <property name="sizePolicy">
@@ -40,18 +61,43 @@
      </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="spacing">
+        <number>20</number>
+       </property>
        <property name="sizeConstraint">
         <enum>QLayout::SetMaximumSize</enum>
        </property>
+       <property name="topMargin">
+        <number>4</number>
+       </property>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item>
         <widget class="QPushButton" name="btnPrev">
          <property name="text">
-          <string>&lt;&lt;</string>
+          <string/>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QDialogButtonBox" name="buttonBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -66,10 +112,26 @@
        <item>
         <widget class="QPushButton" name="btnNext">
          <property name="text">
-          <string>&gt;&gt;</string>
+          <string/>
+         </property>
+         <property name="autoDefault">
+          <bool>false</bool>
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </item>
     </layout>