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 @@ Form + + 0 + + + 4 + 0 - 0 + 2 - + 0 0 @@ -37,7 +43,7 @@ - << + @@ -59,6 +65,12 @@ + + + 0 + 0 + + 30 @@ -66,7 +78,7 @@ - >> + diff --git a/graphics/left.png b/graphics/left.png new file mode 100644 index 0000000..1f1f58d Binary files /dev/null and b/graphics/left.png differ diff --git a/graphics/right.png b/graphics/right.png new file mode 100644 index 0000000..c9c3afb Binary files /dev/null and b/graphics/right.png differ 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 @@ 0 0 - 429 - 637 + 369 + 582 @@ -20,8 +20,29 @@ Page Browser + + 0 + + + 0 + + + 0 + + + 4 + + + 0 + + + 2 + + + 0 + @@ -40,18 +61,43 @@ + + 20 + QLayout::SetMaximumSize + + 4 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - << + + + + 0 + 0 + + Qt::Horizontal @@ -66,10 +112,26 @@ - >> + + + + false + + + + Qt::Horizontal + + + + 40 + 20 + + + +