From 7924c492b3c034cfae2f4160d834538f5873d58e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Jastrz=C4=99bski?= Date: Sun, 8 Feb 2015 12:49:22 +0100 Subject: [PATCH] Updated OSX and Linux GUI --- gui/KCC-Linux.ui | 33 ++++- gui/KCC-OSX.ui | 35 ++++- gui/MetaEditor-Linux.ui | 226 +++++++++++++++++++++++++++++++++ gui/MetaEditor-OSX.ui | 223 ++++++++++++++++++++++++++++++++ kcc/KCC_MetaEditor_ui_linux.py | 148 +++++++++++++++++++++ kcc/KCC_MetaEditor_ui_osx.py | 148 +++++++++++++++++++++ kcc/KCC_gui.py | 7 +- kcc/KCC_ui_linux.py | 22 +++- kcc/KCC_ui_osx.py | 20 ++- 9 files changed, 845 insertions(+), 17 deletions(-) create mode 100644 gui/MetaEditor-Linux.ui create mode 100644 gui/MetaEditor-OSX.ui create mode 100644 kcc/KCC_MetaEditor_ui_linux.py create mode 100644 kcc/KCC_MetaEditor_ui_osx.py diff --git a/gui/KCC-Linux.ui b/gui/KCC-Linux.ui index edf8fa4..3a26ad0 100644 --- a/gui/KCC-Linux.ui +++ b/gui/KCC-Linux.ui @@ -478,7 +478,7 @@ 10 10 - 195 + 141 32 @@ -498,9 +498,9 @@ - 217 + 260 10 - 195 + 151 32 @@ -767,6 +767,32 @@ + + + + 160 + 10 + 91 + 32 + + + + + DejaVu Sans + 9 + + + + Qt::NoFocus + + + Editor + + + + :/Other/icons/editor.png:/Other/icons/editor.png + + OptionsAdvanced DeviceBox FormatBox @@ -780,6 +806,7 @@ AdvModeButton OptionsAdvancedGamma OptionsExpert + EditorButton ProgressBar diff --git a/gui/KCC-OSX.ui b/gui/KCC-OSX.ui index 77a9079..dffdd76 100644 --- a/gui/KCC-OSX.ui +++ b/gui/KCC-OSX.ui @@ -477,7 +477,7 @@ 5 10 - 210 + 156 41 @@ -499,9 +499,9 @@ - 207 + 260 10 - 210 + 156 41 @@ -782,9 +782,34 @@ + + + + 160 + 10 + 101 + 41 + + + + + Lucida Grande + 12 + + + + Qt::NoFocus + + + Editor + + + + :/Other/icons/editor.png:/Other/icons/editor.png + + BasicModeButton AdvModeButton - ProgressBar JobList OptionsAdvanced DeviceBox @@ -796,6 +821,8 @@ OptionsBasic OptionsAdvancedGamma OptionsExpert + EditorButton + ProgressBar diff --git a/gui/MetaEditor-Linux.ui b/gui/MetaEditor-Linux.ui new file mode 100644 index 0000000..b071434 --- /dev/null +++ b/gui/MetaEditor-Linux.ui @@ -0,0 +1,226 @@ + + + MetaEditorDialog + + + + 0 + 0 + 400 + 320 + + + + + 400 + 320 + + + + + 400 + 320 + + + + Metadata editor + + + + :/Icon/icons/comic2ebook.png:/Icon/icons/comic2ebook.png + + + + + 10 + 280 + 381 + 31 + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: rgb(255, 0, 0); + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Save + + + + :/Other/icons/convert.png:/Other/icons/convert.png + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Cancel + + + + :/Other/icons/clear.png:/Other/icons/clear.png + + + + + + + + + 10 + 10 + 381 + 271 + + + + + + 0 + 0 + 381 + 266 + + + + + + + Series: + + + + + + + + + + Volume: + + + + + + + + + + Number: + + + + + + + + + + Writer: + + + + + + + + + + Penciller: + + + + + + + + + + Inker: + + + + + + + + + + Colorist: + + + + + + + + + + <html><head/><body><p><a href="https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support"><span style=" text-decoration: underline; color:#0000ff;">MUid:</span></a></p></body></html> + + + Qt::RichText + + + true + + + + + + + + + + horizontalLayoutWidget + EditorFrame + StatusLabel + + + + + + diff --git a/gui/MetaEditor-OSX.ui b/gui/MetaEditor-OSX.ui new file mode 100644 index 0000000..681e1c0 --- /dev/null +++ b/gui/MetaEditor-OSX.ui @@ -0,0 +1,223 @@ + + + MetaEditorDialog + + + + 0 + 0 + 400 + 295 + + + + + 400 + 295 + + + + + 400 + 295 + + + + Metadata editor + + + + :/Icon/icons/comic2ebook.png:/Icon/icons/comic2ebook.png + + + + + 10 + 260 + 381 + 32 + + + + + + + + 0 + 0 + + + + + 10 + 75 + true + + + + color: rgb(255, 0, 0); + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Save + + + + :/Other/icons/convert.png:/Other/icons/convert.png + + + + + + + + 0 + 0 + + + + + 75 + true + + + + Cancel + + + + :/Other/icons/clear.png:/Other/icons/clear.png + + + + + + + + + 10 + 10 + 381 + 251 + + + + + + 0 + 0 + 381 + 250 + + + + + + + Series: + + + + + + + + + + Volume: + + + + + + + + + + Number: + + + + + + + + + + Writer: + + + + + + + + + + Penciller: + + + + + + + + + + Inker: + + + + + + + + + + Colorist: + + + + + + + + + + <html><head/><body><p><a href="https://github.com/ciromattia/kcc/wiki/Manga-Cover-Database-support"><span style=" text-decoration: underline; color:#0000ff;">MUid:</span></a></p></body></html> + + + Qt::RichText + + + true + + + + + + + + + + + + + + + diff --git a/kcc/KCC_MetaEditor_ui_linux.py b/kcc/KCC_MetaEditor_ui_linux.py new file mode 100644 index 0000000..0a2edfc --- /dev/null +++ b/kcc/KCC_MetaEditor_ui_linux.py @@ -0,0 +1,148 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file 'gui/MetaEditor.ui' +# +# Created: Sun Feb 8 03:24:23 2015 +# by: PyQt5 UI code generator 5.2.1 +# +# WARNING! All changes made in this file will be lost! + +from PyQt5 import QtCore, QtGui, QtWidgets + +class Ui_MetaEditorDialog(object): + def setupUi(self, MetaEditorDialog): + MetaEditorDialog.setObjectName("MetaEditorDialog") + MetaEditorDialog.resize(400, 320) + MetaEditorDialog.setMinimumSize(QtCore.QSize(400, 320)) + MetaEditorDialog.setMaximumSize(QtCore.QSize(400, 320)) + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + MetaEditorDialog.setWindowIcon(icon) + self.horizontalLayoutWidget = QtWidgets.QWidget(MetaEditorDialog) + self.horizontalLayoutWidget.setGeometry(QtCore.QRect(10, 280, 381, 31)) + self.horizontalLayoutWidget.setObjectName("horizontalLayoutWidget") + self.horizontalLayout = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget) + self.horizontalLayout.setContentsMargins(0, 0, 0, 0) + self.horizontalLayout.setObjectName("horizontalLayout") + self.StatusLabel = QtWidgets.QLabel(self.horizontalLayoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.StatusLabel.sizePolicy().hasHeightForWidth()) + self.StatusLabel.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setPointSize(10) + font.setBold(True) + font.setWeight(75) + self.StatusLabel.setFont(font) + self.StatusLabel.setStyleSheet("color: rgb(255, 0, 0);") + self.StatusLabel.setObjectName("StatusLabel") + self.horizontalLayout.addWidget(self.StatusLabel) + self.OKButton = QtWidgets.QPushButton(self.horizontalLayoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.OKButton.sizePolicy().hasHeightForWidth()) + self.OKButton.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.OKButton.setFont(font) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.OKButton.setIcon(icon1) + self.OKButton.setObjectName("OKButton") + self.horizontalLayout.addWidget(self.OKButton) + self.CancelButton = QtWidgets.QPushButton(self.horizontalLayoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.CancelButton.sizePolicy().hasHeightForWidth()) + self.CancelButton.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.CancelButton.setFont(font) + icon2 = QtGui.QIcon() + icon2.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.CancelButton.setIcon(icon2) + self.CancelButton.setObjectName("CancelButton") + self.horizontalLayout.addWidget(self.CancelButton) + self.EditorFrame = QtWidgets.QFrame(MetaEditorDialog) + self.EditorFrame.setGeometry(QtCore.QRect(10, 10, 381, 271)) + self.EditorFrame.setObjectName("EditorFrame") + self.formLayoutWidget = QtWidgets.QWidget(self.EditorFrame) + self.formLayoutWidget.setGeometry(QtCore.QRect(0, 0, 381, 266)) + self.formLayoutWidget.setObjectName("formLayoutWidget") + self.formLayout = QtWidgets.QFormLayout(self.formLayoutWidget) + self.formLayout.setContentsMargins(0, 0, 0, 0) + self.formLayout.setObjectName("formLayout") + self.label = QtWidgets.QLabel(self.formLayoutWidget) + self.label.setObjectName("label") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label) + self.SeriesLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.SeriesLine.setObjectName("SeriesLine") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.SeriesLine) + self.label_2 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_2.setObjectName("label_2") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_2) + self.VolumeLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.VolumeLine.setObjectName("VolumeLine") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.VolumeLine) + self.label_3 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_3.setObjectName("label_3") + self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_3) + self.NumberLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.NumberLine.setObjectName("NumberLine") + self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.NumberLine) + self.label_4 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_4.setObjectName("label_4") + self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_4) + self.WriterLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.WriterLine.setObjectName("WriterLine") + self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.WriterLine) + self.label_5 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_5.setObjectName("label_5") + self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_5) + self.PencillerLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.PencillerLine.setObjectName("PencillerLine") + self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.PencillerLine) + self.label_6 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_6.setObjectName("label_6") + self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_6) + self.InkerLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.InkerLine.setObjectName("InkerLine") + self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.InkerLine) + self.label_7 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_7.setObjectName("label_7") + self.formLayout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.label_7) + self.ColoristLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.ColoristLine.setObjectName("ColoristLine") + self.formLayout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.ColoristLine) + self.label_8 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_8.setTextFormat(QtCore.Qt.RichText) + self.label_8.setOpenExternalLinks(True) + self.label_8.setObjectName("label_8") + self.formLayout.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.label_8) + self.MUidLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.MUidLine.setObjectName("MUidLine") + self.formLayout.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.MUidLine) + + self.retranslateUi(MetaEditorDialog) + QtCore.QMetaObject.connectSlotsByName(MetaEditorDialog) + + def retranslateUi(self, MetaEditorDialog): + _translate = QtCore.QCoreApplication.translate + MetaEditorDialog.setWindowTitle(_translate("MetaEditorDialog", "Metadata editor")) + self.OKButton.setText(_translate("MetaEditorDialog", "Save")) + self.CancelButton.setText(_translate("MetaEditorDialog", "Cancel")) + self.label.setText(_translate("MetaEditorDialog", "Series:")) + self.label_2.setText(_translate("MetaEditorDialog", "Volume:")) + self.label_3.setText(_translate("MetaEditorDialog", "Number:")) + self.label_4.setText(_translate("MetaEditorDialog", "Writer:")) + self.label_5.setText(_translate("MetaEditorDialog", "Penciller:")) + self.label_6.setText(_translate("MetaEditorDialog", "Inker:")) + self.label_7.setText(_translate("MetaEditorDialog", "Colorist:")) + self.label_8.setText(_translate("MetaEditorDialog", "

MUid:

")) + +from . import KCC_rc diff --git a/kcc/KCC_MetaEditor_ui_osx.py b/kcc/KCC_MetaEditor_ui_osx.py new file mode 100644 index 0000000..3bcf74d --- /dev/null +++ b/kcc/KCC_MetaEditor_ui_osx.py @@ -0,0 +1,148 @@ +# -*- coding: utf-8 -*- + +# Form implementation generated from reading ui file '/Users/pawelj/Documents/KCC/gui/MetaEditor.ui' +# +# Created: Sun Feb 8 12:47:09 2015 +# by: PyQt5 UI code generator 5.4 +# +# WARNING! All changes made in this file will be lost! + +from PyQt5 import QtCore, QtGui, QtWidgets + +class Ui_MetaEditorDialog(object): + def setupUi(self, MetaEditorDialog): + MetaEditorDialog.setObjectName("MetaEditorDialog") + MetaEditorDialog.resize(400, 295) + MetaEditorDialog.setMinimumSize(QtCore.QSize(400, 295)) + MetaEditorDialog.setMaximumSize(QtCore.QSize(400, 295)) + icon = QtGui.QIcon() + icon.addPixmap(QtGui.QPixmap(":/Icon/icons/comic2ebook.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + MetaEditorDialog.setWindowIcon(icon) + self.horizontalLayoutWidget = QtWidgets.QWidget(MetaEditorDialog) + self.horizontalLayoutWidget.setGeometry(QtCore.QRect(10, 260, 381, 32)) + self.horizontalLayoutWidget.setObjectName("horizontalLayoutWidget") + self.horizontalLayout = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget) + self.horizontalLayout.setContentsMargins(0, 0, 0, 0) + self.horizontalLayout.setObjectName("horizontalLayout") + self.StatusLabel = QtWidgets.QLabel(self.horizontalLayoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.MinimumExpanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.StatusLabel.sizePolicy().hasHeightForWidth()) + self.StatusLabel.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setPointSize(10) + font.setBold(True) + font.setWeight(75) + self.StatusLabel.setFont(font) + self.StatusLabel.setStyleSheet("color: rgb(255, 0, 0);") + self.StatusLabel.setObjectName("StatusLabel") + self.horizontalLayout.addWidget(self.StatusLabel) + self.OKButton = QtWidgets.QPushButton(self.horizontalLayoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.OKButton.sizePolicy().hasHeightForWidth()) + self.OKButton.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.OKButton.setFont(font) + icon1 = QtGui.QIcon() + icon1.addPixmap(QtGui.QPixmap(":/Other/icons/convert.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.OKButton.setIcon(icon1) + self.OKButton.setObjectName("OKButton") + self.horizontalLayout.addWidget(self.OKButton) + self.CancelButton = QtWidgets.QPushButton(self.horizontalLayoutWidget) + sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Minimum) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.CancelButton.sizePolicy().hasHeightForWidth()) + self.CancelButton.setSizePolicy(sizePolicy) + font = QtGui.QFont() + font.setBold(True) + font.setWeight(75) + self.CancelButton.setFont(font) + icon2 = QtGui.QIcon() + icon2.addPixmap(QtGui.QPixmap(":/Other/icons/clear.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.CancelButton.setIcon(icon2) + self.CancelButton.setObjectName("CancelButton") + self.horizontalLayout.addWidget(self.CancelButton) + self.EditorFrame = QtWidgets.QFrame(MetaEditorDialog) + self.EditorFrame.setGeometry(QtCore.QRect(10, 10, 381, 251)) + self.EditorFrame.setObjectName("EditorFrame") + self.formLayoutWidget = QtWidgets.QWidget(self.EditorFrame) + self.formLayoutWidget.setGeometry(QtCore.QRect(0, 0, 381, 250)) + self.formLayoutWidget.setObjectName("formLayoutWidget") + self.formLayout = QtWidgets.QFormLayout(self.formLayoutWidget) + self.formLayout.setContentsMargins(0, 0, 0, 0) + self.formLayout.setObjectName("formLayout") + self.label = QtWidgets.QLabel(self.formLayoutWidget) + self.label.setObjectName("label") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label) + self.SeriesLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.SeriesLine.setObjectName("SeriesLine") + self.formLayout.setWidget(1, QtWidgets.QFormLayout.FieldRole, self.SeriesLine) + self.label_2 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_2.setObjectName("label_2") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_2) + self.VolumeLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.VolumeLine.setObjectName("VolumeLine") + self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.VolumeLine) + self.label_3 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_3.setObjectName("label_3") + self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_3) + self.NumberLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.NumberLine.setObjectName("NumberLine") + self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.NumberLine) + self.label_4 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_4.setObjectName("label_4") + self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_4) + self.WriterLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.WriterLine.setObjectName("WriterLine") + self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.WriterLine) + self.label_5 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_5.setObjectName("label_5") + self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_5) + self.PencillerLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.PencillerLine.setObjectName("PencillerLine") + self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.PencillerLine) + self.label_6 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_6.setObjectName("label_6") + self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_6) + self.InkerLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.InkerLine.setObjectName("InkerLine") + self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.InkerLine) + self.label_7 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_7.setObjectName("label_7") + self.formLayout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.label_7) + self.ColoristLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.ColoristLine.setObjectName("ColoristLine") + self.formLayout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.ColoristLine) + self.label_8 = QtWidgets.QLabel(self.formLayoutWidget) + self.label_8.setTextFormat(QtCore.Qt.RichText) + self.label_8.setOpenExternalLinks(True) + self.label_8.setObjectName("label_8") + self.formLayout.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.label_8) + self.MUidLine = QtWidgets.QLineEdit(self.formLayoutWidget) + self.MUidLine.setObjectName("MUidLine") + self.formLayout.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.MUidLine) + + self.retranslateUi(MetaEditorDialog) + QtCore.QMetaObject.connectSlotsByName(MetaEditorDialog) + + def retranslateUi(self, MetaEditorDialog): + _translate = QtCore.QCoreApplication.translate + MetaEditorDialog.setWindowTitle(_translate("MetaEditorDialog", "Metadata editor")) + self.OKButton.setText(_translate("MetaEditorDialog", "Save")) + self.CancelButton.setText(_translate("MetaEditorDialog", "Cancel")) + self.label.setText(_translate("MetaEditorDialog", "Series:")) + self.label_2.setText(_translate("MetaEditorDialog", "Volume:")) + self.label_3.setText(_translate("MetaEditorDialog", "Number:")) + self.label_4.setText(_translate("MetaEditorDialog", "Writer:")) + self.label_5.setText(_translate("MetaEditorDialog", "Penciller:")) + self.label_6.setText(_translate("MetaEditorDialog", "Inker:")) + self.label_7.setText(_translate("MetaEditorDialog", "Colorist:")) + self.label_8.setText(_translate("MetaEditorDialog", "

MUid:

")) + +from . import KCC_rc diff --git a/kcc/KCC_gui.py b/kcc/KCC_gui.py index 9c3d859..0f53788 100644 --- a/kcc/KCC_gui.py +++ b/kcc/KCC_gui.py @@ -39,13 +39,18 @@ from . import __version__ from . import comic2ebook from . import KCC_rc_web from . import metadata -from . import KCC_MetaEditor_ui if sys.platform.startswith('darwin'): from . import KCC_ui_osx as KCC_ui elif sys.platform.startswith('linux'): from . import KCC_ui_linux as KCC_ui else: from . import KCC_ui +if sys.platform.startswith('darwin'): + from . import KCC_MetaEditor_ui_osx as KCC_MetaEditor_ui +elif sys.platform.startswith('linux'): + from . import KCC_MetaEditor_ui_linux as KCC_MetaEditor_ui +else: + from . import KCC_MetaEditor_ui class QApplicationMessaging(QtWidgets.QApplication): diff --git a/kcc/KCC_ui_linux.py b/kcc/KCC_ui_linux.py index eabddc6..de449db 100644 --- a/kcc/KCC_ui_linux.py +++ b/kcc/KCC_ui_linux.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'KCC-Linux.ui' +# Form implementation generated from reading ui file 'gui/KCC-Linux.ui' # -# Created: Sun Jan 4 10:06:14 2015 -# by: PyQt5 UI code generator 5.4 +# Created: Sun Feb 8 03:10:09 2015 +# by: PyQt5 UI code generator 5.2.1 # # WARNING! All changes made in this file will be lost! @@ -187,7 +187,7 @@ class Ui_KCC(object): self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) self.JobList.setObjectName("JobList") self.BasicModeButton = QtWidgets.QPushButton(self.Form) - self.BasicModeButton.setGeometry(QtCore.QRect(10, 10, 195, 32)) + self.BasicModeButton.setGeometry(QtCore.QRect(10, 10, 141, 32)) font = QtGui.QFont() font.setFamily("DejaVu Sans") font.setPointSize(9) @@ -195,7 +195,7 @@ class Ui_KCC(object): self.BasicModeButton.setFocusPolicy(QtCore.Qt.NoFocus) self.BasicModeButton.setObjectName("BasicModeButton") self.AdvModeButton = QtWidgets.QPushButton(self.Form) - self.AdvModeButton.setGeometry(QtCore.QRect(217, 10, 195, 32)) + self.AdvModeButton.setGeometry(QtCore.QRect(260, 10, 151, 32)) font = QtGui.QFont() font.setFamily("DejaVu Sans") font.setPointSize(9) @@ -302,6 +302,17 @@ class Ui_KCC(object): self.customHeight.setMaxLength(4) self.customHeight.setObjectName("customHeight") self.gridLayout_2.addWidget(self.customHeight, 0, 3, 1, 1) + self.EditorButton = QtWidgets.QPushButton(self.Form) + self.EditorButton.setGeometry(QtCore.QRect(160, 10, 91, 32)) + font = QtGui.QFont() + font.setFamily("DejaVu Sans") + font.setPointSize(9) + self.EditorButton.setFont(font) + self.EditorButton.setFocusPolicy(QtCore.Qt.NoFocus) + icon5 = QtGui.QIcon() + icon5.addPixmap(QtGui.QPixmap(":/Other/icons/editor.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.EditorButton.setIcon(icon5) + self.EditorButton.setObjectName("EditorButton") KCC.setCentralWidget(self.Form) self.statusBar = QtWidgets.QStatusBar(KCC) font = QtGui.QFont() @@ -370,6 +381,7 @@ class Ui_KCC(object): self.hLabel.setText(_translate("KCC", "Custom height: ")) self.customHeight.setToolTip(_translate("KCC", "

Resolution of target device.

")) self.customHeight.setInputMask(_translate("KCC", "0000")) + self.EditorButton.setText(_translate("KCC", "Editor")) self.ActionBasic.setText(_translate("KCC", "Basic")) self.ActionAdvanced.setText(_translate("KCC", "Advanced")) diff --git a/kcc/KCC_ui_osx.py b/kcc/KCC_ui_osx.py index 775ecc8..2be3f7f 100644 --- a/kcc/KCC_ui_osx.py +++ b/kcc/KCC_ui_osx.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file 'KCC-OSX.ui' +# Form implementation generated from reading ui file '/Users/pawelj/Documents/KCC/gui/KCC-OSX.ui' # -# Created: Sun Jan 4 10:26:09 2015 +# Created: Sun Feb 8 12:37:33 2015 # by: PyQt5 UI code generator 5.4 # # WARNING! All changes made in this file will be lost! @@ -193,7 +193,7 @@ class Ui_KCC(object): self.JobList.setHorizontalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) self.JobList.setObjectName("JobList") self.BasicModeButton = QtWidgets.QPushButton(self.Form) - self.BasicModeButton.setGeometry(QtCore.QRect(5, 10, 210, 41)) + self.BasicModeButton.setGeometry(QtCore.QRect(5, 10, 156, 41)) font = QtGui.QFont() font.setFamily("Lucida Grande") font.setPointSize(12) @@ -203,7 +203,7 @@ class Ui_KCC(object): self.BasicModeButton.setFocusPolicy(QtCore.Qt.NoFocus) self.BasicModeButton.setObjectName("BasicModeButton") self.AdvModeButton = QtWidgets.QPushButton(self.Form) - self.AdvModeButton.setGeometry(QtCore.QRect(207, 10, 210, 41)) + self.AdvModeButton.setGeometry(QtCore.QRect(260, 10, 156, 41)) font = QtGui.QFont() font.setFamily("Lucida Grande") font.setPointSize(12) @@ -324,6 +324,17 @@ class Ui_KCC(object): self.customHeight.setMaxLength(4) self.customHeight.setObjectName("customHeight") self.gridLayout_2.addWidget(self.customHeight, 0, 3, 1, 1) + self.EditorButton = QtWidgets.QPushButton(self.Form) + self.EditorButton.setGeometry(QtCore.QRect(160, 10, 101, 41)) + font = QtGui.QFont() + font.setFamily("Lucida Grande") + font.setPointSize(12) + self.EditorButton.setFont(font) + self.EditorButton.setFocusPolicy(QtCore.Qt.NoFocus) + icon5 = QtGui.QIcon() + icon5.addPixmap(QtGui.QPixmap(":/Other/icons/editor.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off) + self.EditorButton.setIcon(icon5) + self.EditorButton.setObjectName("EditorButton") KCC.setCentralWidget(self.Form) self.statusBar = QtWidgets.QStatusBar(KCC) font = QtGui.QFont() @@ -393,6 +404,7 @@ class Ui_KCC(object): self.hLabel.setText(_translate("KCC", "Custom height: ")) self.customHeight.setToolTip(_translate("KCC", "

Resolution of target device.

")) self.customHeight.setInputMask(_translate("KCC", "0000")) + self.EditorButton.setText(_translate("KCC", "Editor")) self.ActionBasic.setText(_translate("KCC", "Basic")) self.ActionAdvanced.setText(_translate("KCC", "Advanced"))