diff --git a/gui/KCC.ui b/gui/KCC.ui index ea0fc7f..dbabed5 100644 --- a/gui/KCC.ui +++ b/gui/KCC.ui @@ -37,23 +37,20 @@ 0 - - + + 0 30 - - <html><head/><body><p style='white-space:pre'>Shift+Click to edit directory.</p></body></html> - - Metadata Editor + Humble Bundle Referral - :/Other/icons/editor.png:/Other/icons/editor.png + :/Brand/icons/Humble_H-Red.png:/Brand/icons/Humble_H-Red.png @@ -80,63 +77,23 @@ - - + + 0 30 + + <html><head/><body><p style='white-space:pre'>Shift+Click to edit directory.</p></body></html> + - Wiki + Metadata Editor - :/Other/icons/wiki.png:/Other/icons/wiki.png - - - - - - - - 0 - 30 - - - - YouTube - - - - - - - - 0 - 30 - - - - Humble Bundle Referral - - - - :/Brand/icons/Humble_H-Red.png:/Brand/icons/Humble_H-Red.png - - - - - - - - 0 - 30 - - - - Discord + :/Other/icons/editor.png:/Other/icons/editor.png @@ -1258,7 +1215,6 @@ Ignores most options besides JPEG quality, color mode, output folder. chunkSizeBox editorButton kofiButton - wikiButton diff --git a/kindlecomicconverter/KCC_gui.py b/kindlecomicconverter/KCC_gui.py index 7c64fd1..3eb5718 100644 --- a/kindlecomicconverter/KCC_gui.py +++ b/kindlecomicconverter/KCC_gui.py @@ -750,7 +750,6 @@ class KCCGUI(KCC_ui.Ui_mainWindow): else: status = True GUI.editorButton.setEnabled(status) - GUI.wikiButton.setEnabled(status) GUI.deviceBox.setEnabled(status) GUI.defaultOutputFolderButton.setEnabled(status) GUI.clearButton.setEnabled(status) @@ -1252,7 +1251,7 @@ class KCCGUI(KCC_ui.Ui_mainWindow): if self.windowSize == '0x0': MW.resize(500, 500) elif sys.platform.startswith('darwin'): - for element in ['editorButton', 'wikiButton', 'defaultOutputFolderButton', 'clearButton', 'fileButton', 'deviceBox', + for element in ['editorButton', 'defaultOutputFolderButton', 'clearButton', 'fileButton', 'deviceBox', 'convertButton', 'formatBox']: getattr(GUI, element).setMinimumSize(QSize(0, 0)) GUI.gridLayout.setContentsMargins(-1, -1, -1, -1) @@ -1433,8 +1432,9 @@ class KCCGUI(KCC_ui.Ui_mainWindow): link_dict = { 'README': "https://github.com/ciromattia/kcc?tab=readme-ov-file#kcc", 'FAQ': "https://github.com/ciromattia/kcc/blob/master/README.md#faq", - 'YOUTUBE': "https://youtu.be/IR2Fhcm9658?si=Z-2zzLaUFjmaEbrj", - 'COMMISSIONS': "https://github.com/ciromattia/kcc?tab=readme-ov-file#commissions", + 'WIKI': "https://github.com/ciromattia/kcc/wiki", + 'TUTORIAL': "https://youtu.be/QQ6zJcMF2Iw?si=80rfm6DU6OUJdFqa", + 'EMAIL': "https://github.com/ciromattia/kcc?tab=readme-ov-file#commissions", 'DONATE': "https://github.com/ciromattia/kcc/blob/master/README.md#issues--new-features--donations", 'FORUM': "http://www.mobileread.com/forums/showthread.php?t=207461", 'DISCORD': "https://discord.com/invite/qj7wpnUHav", @@ -1466,11 +1466,8 @@ class KCCGUI(KCC_ui.Ui_mainWindow): GUI.fileButton.clicked.connect(self.selectFile) GUI.directoryButton.clicked.connect(self.selectDir) GUI.editorButton.clicked.connect(self.selectFileMetaEditor) - GUI.wikiButton.clicked.connect(self.openWiki) GUI.kofiButton.clicked.connect(self.openKofi) GUI.humbleButton.clicked.connect(self.openHumble) - GUI.youtubeButton.clicked.connect(self.openYouTube) - GUI.discordButton.clicked.connect(self.openDiscord) GUI.convertButton.clicked.connect(self.convertStart) GUI.gammaSlider.valueChanged.connect(self.changeGamma) GUI.gammaBox.stateChanged.connect(self.togglegammaBox) diff --git a/kindlecomicconverter/KCC_ui.py b/kindlecomicconverter/KCC_ui.py index b44704a..963a510 100644 --- a/kindlecomicconverter/KCC_ui.py +++ b/kindlecomicconverter/KCC_ui.py @@ -40,14 +40,14 @@ class Ui_mainWindow(object): self.gridLayout_6 = QGridLayout(self.toolWidget) self.gridLayout_6.setObjectName(u"gridLayout_6") self.gridLayout_6.setContentsMargins(0, 0, 0, 0) - self.editorButton = QPushButton(self.toolWidget) - self.editorButton.setObjectName(u"editorButton") - self.editorButton.setMinimumSize(QSize(0, 30)) + self.humbleButton = QPushButton(self.toolWidget) + self.humbleButton.setObjectName(u"humbleButton") + self.humbleButton.setMinimumSize(QSize(0, 30)) icon1 = QIcon() - icon1.addFile(u":/Other/icons/editor.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) - self.editorButton.setIcon(icon1) + icon1.addFile(u":/Brand/icons/Humble_H-Red.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) + self.humbleButton.setIcon(icon1) - self.gridLayout_6.addWidget(self.editorButton, 0, 0, 1, 1) + self.gridLayout_6.addWidget(self.humbleButton, 0, 2, 1, 1) self.kofiButton = QPushButton(self.toolWidget) self.kofiButton.setObjectName(u"kofiButton") @@ -59,35 +59,14 @@ class Ui_mainWindow(object): self.gridLayout_6.addWidget(self.kofiButton, 0, 1, 1, 1) - self.wikiButton = QPushButton(self.toolWidget) - self.wikiButton.setObjectName(u"wikiButton") - self.wikiButton.setMinimumSize(QSize(0, 30)) + self.editorButton = QPushButton(self.toolWidget) + self.editorButton.setObjectName(u"editorButton") + self.editorButton.setMinimumSize(QSize(0, 30)) icon3 = QIcon() - icon3.addFile(u":/Other/icons/wiki.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) - self.wikiButton.setIcon(icon3) + icon3.addFile(u":/Other/icons/editor.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) + self.editorButton.setIcon(icon3) - self.gridLayout_6.addWidget(self.wikiButton, 0, 2, 1, 1) - - self.youtubeButton = QPushButton(self.toolWidget) - self.youtubeButton.setObjectName(u"youtubeButton") - self.youtubeButton.setMinimumSize(QSize(0, 30)) - - self.gridLayout_6.addWidget(self.youtubeButton, 1, 0, 1, 1) - - self.humbleButton = QPushButton(self.toolWidget) - self.humbleButton.setObjectName(u"humbleButton") - self.humbleButton.setMinimumSize(QSize(0, 30)) - icon4 = QIcon() - icon4.addFile(u":/Brand/icons/Humble_H-Red.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) - self.humbleButton.setIcon(icon4) - - self.gridLayout_6.addWidget(self.humbleButton, 1, 1, 1, 1) - - self.discordButton = QPushButton(self.toolWidget) - self.discordButton.setObjectName(u"discordButton") - self.discordButton.setMinimumSize(QSize(0, 30)) - - self.gridLayout_6.addWidget(self.discordButton, 1, 2, 1, 1) + self.gridLayout_6.addWidget(self.editorButton, 0, 0, 1, 1) self.gridLayout.addWidget(self.toolWidget, 0, 0, 1, 2) @@ -148,18 +127,18 @@ class Ui_mainWindow(object): font = QFont() font.setBold(True) self.convertButton.setFont(font) - icon5 = QIcon() - icon5.addFile(u":/Other/icons/convert.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) - self.convertButton.setIcon(icon5) + icon4 = QIcon() + icon4.addFile(u":/Other/icons/convert.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) + self.convertButton.setIcon(icon4) self.gridLayout_4.addWidget(self.convertButton, 1, 3, 1, 1) self.clearButton = QPushButton(self.buttonWidget) self.clearButton.setObjectName(u"clearButton") self.clearButton.setMinimumSize(QSize(0, 30)) - icon6 = QIcon() - icon6.addFile(u":/Other/icons/clear.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) - self.clearButton.setIcon(icon6) + icon5 = QIcon() + icon5.addFile(u":/Other/icons/clear.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) + self.clearButton.setIcon(icon5) self.gridLayout_4.addWidget(self.clearButton, 0, 3, 1, 1) @@ -172,9 +151,9 @@ class Ui_mainWindow(object): self.fileButton = QPushButton(self.buttonWidget) self.fileButton.setObjectName(u"fileButton") self.fileButton.setMinimumSize(QSize(0, 30)) - icon7 = QIcon() - icon7.addFile(u":/Other/icons/document_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) - self.fileButton.setIcon(icon7) + icon6 = QIcon() + icon6.addFile(u":/Other/icons/document_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) + self.fileButton.setIcon(icon6) self.gridLayout_4.addWidget(self.fileButton, 0, 1, 1, 1) @@ -185,9 +164,9 @@ class Ui_mainWindow(object): sizePolicy2.setVerticalStretch(0) sizePolicy2.setHeightForWidth(self.directoryButton.sizePolicy().hasHeightForWidth()) self.directoryButton.setSizePolicy(sizePolicy2) - icon8 = QIcon() - icon8.addFile(u":/Other/icons/folder_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) - self.directoryButton.setIcon(icon8) + icon7 = QIcon() + icon7.addFile(u":/Other/icons/folder_new.png", QSize(), QIcon.Mode.Normal, QIcon.State.Off) + self.directoryButton.setIcon(icon7) self.gridLayout_4.addWidget(self.directoryButton, 0, 4, 1, 1) @@ -431,7 +410,7 @@ class Ui_mainWindow(object): self.defaultOutputFolderButton = QPushButton(self.outputFolderWidget) self.defaultOutputFolderButton.setObjectName(u"defaultOutputFolderButton") self.defaultOutputFolderButton.setMinimumSize(QSize(0, 30)) - self.defaultOutputFolderButton.setIcon(icon8) + self.defaultOutputFolderButton.setIcon(icon7) self.horizontalLayout_3.addWidget(self.defaultOutputFolderButton) @@ -650,7 +629,6 @@ class Ui_mainWindow(object): QWidget.setTabOrder(self.fileFusionBox, self.chunkSizeBox) QWidget.setTabOrder(self.chunkSizeBox, self.editorButton) QWidget.setTabOrder(self.editorButton, self.kofiButton) - QWidget.setTabOrder(self.kofiButton, self.wikiButton) self.retranslateUi(mainWindow) @@ -659,15 +637,12 @@ class Ui_mainWindow(object): def retranslateUi(self, mainWindow): mainWindow.setWindowTitle(QCoreApplication.translate("mainWindow", u"Kindle Comic Converter", None)) + self.humbleButton.setText(QCoreApplication.translate("mainWindow", u"Humble Bundle Referral", None)) + self.kofiButton.setText(QCoreApplication.translate("mainWindow", u"Support me on Ko-fi", None)) #if QT_CONFIG(tooltip) self.editorButton.setToolTip(QCoreApplication.translate("mainWindow", u"

Shift+Click to edit directory.

", None)) #endif // QT_CONFIG(tooltip) self.editorButton.setText(QCoreApplication.translate("mainWindow", u"Metadata Editor", None)) - self.kofiButton.setText(QCoreApplication.translate("mainWindow", u"Support me on Ko-fi", None)) - self.wikiButton.setText(QCoreApplication.translate("mainWindow", u"Wiki", None)) - self.youtubeButton.setText(QCoreApplication.translate("mainWindow", u"YouTube", None)) - self.humbleButton.setText(QCoreApplication.translate("mainWindow", u"Humble Bundle Referral", None)) - self.discordButton.setText(QCoreApplication.translate("mainWindow", u"Discord", None)) #if QT_CONFIG(tooltip) self.preserveMarginLabel.setToolTip(QCoreApplication.translate("mainWindow", u"

After calculating the cropping boundaries, "back up" a specified percentage amount.

", None)) #endif // QT_CONFIG(tooltip)