From 3f265951986ca862eac9b240042fd541183fd3f0 Mon Sep 17 00:00:00 2001 From: Kilian Valkhof Date: Tue, 23 Mar 2010 15:57:54 +0100 Subject: [PATCH] show images as well --- runner/trimage | 3 +- trimage.py | 133 +------------------------------------------------ ui.py | 11 ++-- 3 files changed, 10 insertions(+), 137 deletions(-) diff --git a/runner/trimage b/runner/trimage index 596d061..e79e089 100644 --- a/runner/trimage +++ b/runner/trimage @@ -1,8 +1,7 @@ #!/usr/bin/env python -import trimage import subprocess import os, sys if __name__ == "__main__": - path = os.path.join(os.path.dirname(trimage.__file__), "trimage.py") + path = "/usr/local/share/trimage/trimage.py" subprocess.call([sys.executable, path] + sys.argv[1:]) diff --git a/trimage.py b/trimage.py index dd0f51e..20c7efd 100755 --- a/trimage.py +++ b/trimage.py @@ -148,7 +148,7 @@ class StartQT4(QMainWindow): if self.checkname(image): delegatorlist.append((image, QIcon(image))) self.imagelist.append(("Compressing...", "", "", "", image, - QIcon(QPixmap("pixmaps/compressing.gif")))) + QIcon(QPixmap(self.ui.get_image("pixmaps/compressing.gif"))))) else: sys.stderr.write("[error] %s not an image file" % image) @@ -361,137 +361,6 @@ class TrimageTableView(QTableView): files[i] = QUrl(QString(file)).toLocalFile() self.emit(SIGNAL("fileDropEvent"), (files)) - -class Ui_trimage(object): - def setupUi(self, trimage): - trimage.setObjectName("trimage") - trimage.resize(600, 170) - trimage.setWindowIcon(QIcon("pixmaps/trimage-icon.png")) - - self.centralwidget = QWidget(trimage) - self.centralwidget.setObjectName("centralwidget") - - self.gridLayout_2 = QGridLayout(self.centralwidget) - self.gridLayout_2.setMargin(0) - self.gridLayout_2.setSpacing(0) - self.gridLayout_2.setObjectName("gridLayout_2") - - self.widget = QWidget(self.centralwidget) - self.widget.setEnabled(True) - sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred) - sizePolicy.setHorizontalStretch(1) - sizePolicy.setVerticalStretch(1) - sizePolicy.setHeightForWidth( - self.widget.sizePolicy().hasHeightForWidth()) - self.widget.setSizePolicy(sizePolicy) - self.widget.setObjectName("widget") - - self.verticalLayout = QVBoxLayout(self.widget) - self.verticalLayout.setSpacing(0) - self.verticalLayout.setMargin(0) - self.verticalLayout.setObjectName("verticalLayout") - - self.frame = QFrame(self.widget) - self.frame.setObjectName("frame") - - self.verticalLayout_2 = QVBoxLayout(self.frame) - self.verticalLayout_2.setSpacing(0) - self.verticalLayout_2.setMargin(0) - self.verticalLayout_2.setObjectName("verticalLayout_2") - - self.horizontalLayout = QHBoxLayout() - self.horizontalLayout.setSpacing(0) - self.horizontalLayout.setMargin(10) - self.horizontalLayout.setObjectName("horizontalLayout") - - self.addfiles = QPushButton(self.frame) - font = QFont() - font.setPointSize(9) - self.addfiles.setFont(font) - self.addfiles.setCursor(Qt.PointingHandCursor) - icon = QIcon() - icon.addPixmap(QPixmap("pixmaps/list-add.png"), QIcon.Normal, QIcon.Off) - self.addfiles.setIcon(icon) - self.addfiles.setObjectName("addfiles") - self.addfiles.setAcceptDrops(True) - self.horizontalLayout.addWidget(self.addfiles) - - self.label = QLabel(self.frame) - font = QFont() - font.setPointSize(8) - self.label.setFont(font) - self.label.setFrameShadow(QFrame.Plain) - self.label.setMargin(1) - self.label.setIndent(10) - self.label.setObjectName("label") - self.horizontalLayout.addWidget(self.label) - - spacerItem = QSpacerItem(498, 20, QSizePolicy.Expanding, - QSizePolicy.Minimum) - self.horizontalLayout.addItem(spacerItem) - self.recompress = QPushButton(self.frame) - font = QFont() - font.setPointSize(9) - self.recompress.setFont(font) - self.recompress.setCursor(Qt.PointingHandCursor) - - icon1 = QIcon() - icon1.addPixmap(QPixmap("pixmaps/view-refresh.png"), QIcon.Normal, QIcon.Off) - - self.recompress.setIcon(icon1) - self.recompress.setCheckable(False) - self.recompress.setObjectName("recompress") - self.horizontalLayout.addWidget(self.recompress) - self.verticalLayout_2.addLayout(self.horizontalLayout) - - self.processedfiles = TrimageTableView(self.frame) - self.processedfiles.setEnabled(True) - self.processedfiles.setFrameShape(QFrame.NoFrame) - self.processedfiles.setFrameShadow(QFrame.Plain) - self.processedfiles.setLineWidth(0) - self.processedfiles.setMidLineWidth(0) - self.processedfiles.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff) - self.processedfiles.setTabKeyNavigation(True) - self.processedfiles.setAlternatingRowColors(True) - self.processedfiles.setTextElideMode(Qt.ElideRight) - self.processedfiles.setShowGrid(True) - self.processedfiles.setGridStyle(Qt.NoPen) - self.processedfiles.setSortingEnabled(False) - self.processedfiles.setObjectName("processedfiles") - self.processedfiles.resizeColumnsToContents() - self.processedfiles.setSelectionMode(QAbstractItemView.NoSelection) - self.verticalLayout_2.addWidget(self.processedfiles) - self.verticalLayout.addWidget(self.frame) - self.gridLayout_2.addWidget(self.widget, 0, 0, 1, 1) - trimage.setCentralWidget(self.centralwidget) - - self.retranslateUi(trimage) - QMetaObject.connectSlotsByName(trimage) - - def retranslateUi(self, trimage): - trimage.setWindowTitle(QApplication.translate("trimage", - "Trimage image compressor", None, QApplication.UnicodeUTF8)) - self.addfiles.setToolTip(QApplication.translate("trimage", - "Add file to the compression list", None, - QApplication.UnicodeUTF8)) - self.addfiles.setText(QApplication.translate("trimage", - "&Add and compress", None, QApplication.UnicodeUTF8)) - self.addfiles.setShortcut(QApplication.translate("trimage", - "Alt+A", None, QApplication.UnicodeUTF8)) - self.label.setText(QApplication.translate("trimage", - "Drag and drop images onto the table", None, - QApplication.UnicodeUTF8)) - self.recompress.setToolTip(QApplication.translate("trimage", - "Recompress selected images", None, QApplication.UnicodeUTF8)) - self.recompress.setText(QApplication.translate("trimage", - "&Recompress", None, QApplication.UnicodeUTF8)) - self.recompress.setShortcut(QApplication.translate("trimage", - "Alt+R", None, QApplication.UnicodeUTF8)) - self.processedfiles.setToolTip(QApplication.translate("trimage", - "Drag files in here", None, QApplication.UnicodeUTF8)) - self.processedfiles.setWhatsThis(QApplication.translate("trimage", - "Drag files in here", None, QApplication.UnicodeUTF8)) - if __name__ == "__main__": app = QApplication(sys.argv) myapp = StartQT4() diff --git a/ui.py b/ui.py index 3594c23..0788c4f 100644 --- a/ui.py +++ b/ui.py @@ -1,5 +1,6 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * +from os import path class TrimageTableView(QTableView): """Init the table drop event.""" @@ -24,10 +25,14 @@ class TrimageTableView(QTableView): class Ui_trimage(object): + def get_image(self, image): + imagelink = path.join(path.dirname(path.dirname(path.realpath(__file__))), "trimage/" + image) + return imagelink + def setupUi(self, trimage): trimage.setObjectName("trimage") trimage.resize(600, 170) - trimage.setWindowIcon(QIcon("pixmaps/trimage-icon.png")) + trimage.setWindowIcon(QIcon(self.get_image("pixmaps/trimage-icon.png"))) self.centralwidget = QWidget(trimage) self.centralwidget.setObjectName("centralwidget") @@ -71,7 +76,7 @@ class Ui_trimage(object): self.addfiles.setFont(font) self.addfiles.setCursor(Qt.PointingHandCursor) icon = QIcon() - icon.addPixmap(QPixmap("pixmaps/list-add.png"), QIcon.Normal, QIcon.Off) + icon.addPixmap(QPixmap(self.get_image("pixmaps/list-add.png")), QIcon.Normal, QIcon.Off) self.addfiles.setIcon(icon) self.addfiles.setObjectName("addfiles") self.addfiles.setAcceptDrops(True) @@ -97,7 +102,7 @@ class Ui_trimage(object): self.recompress.setCursor(Qt.PointingHandCursor) icon1 = QIcon() - icon1.addPixmap(QPixmap("pixmaps/view-refresh.png"), QIcon.Normal, QIcon.Off) + icon1.addPixmap(QPixmap(self.get_image("pixmaps/view-refresh.png")), QIcon.Normal, QIcon.Off) self.recompress.setIcon(icon1) self.recompress.setCheckable(False)