From 5585a93cfd3abfc8ac04f76306804f79337268de Mon Sep 17 00:00:00 2001 From: Doug Massay Date: Thu, 3 Aug 2023 15:37:05 -0400 Subject: [PATCH] Get latest KU Update [deploy] --- .github/workflows/build-release.yml | 8 ++++---- plugin.xml | 2 +- plugin_utils.py | 32 ++++++++++++++--------------- setup_tools/getkucore.py | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index 4d154a3..448988e 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -19,15 +19,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Get tag name if: startswith( github.ref, 'refs/tags/') id: get_tag_name - run: echo ::set-output name=TAGNAME::${GITHUB_REF/refs\/tags\//} + run: echo "TAGNAME=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT - name: Set up Python 3.8 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.8 @@ -50,7 +50,7 @@ jobs: - name: Upload Artifact if: "contains(github.event.head_commit.message, '[deploy]')" - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: kindleimport-artifact path: ./*.zip diff --git a/plugin.xml b/plugin.xml index 7446152..c821c4f 100644 --- a/plugin.xml +++ b/plugin.xml @@ -6,7 +6,7 @@ Open Kindle files for editing in Sigil python3.4 python2.7 - 0.83.1 + 0.83.6 osx,unx,win true true diff --git a/plugin_utils.py b/plugin_utils.py index c172106..5c9a871 100644 --- a/plugin_utils.py +++ b/plugin_utils.py @@ -265,22 +265,22 @@ def match_sigil_darkmode(self): disabled_color = QtGui.QColor(127, 127, 127) dark_link_color = QtGui.QColor(108, 180, 238) text_color = QtGui.QColor(sigil_colors("Text")) - p.setColor(p.Window, dark_color) - p.setColor(p.WindowText, text_color) - p.setColor(p.Base, QtGui.QColor(sigil_colors("Base"))) - p.setColor(p.AlternateBase, dark_color) - p.setColor(p.ToolTipBase, dark_color) - p.setColor(p.ToolTipText, text_color) - p.setColor(p.Text, text_color) - p.setColor(p.Disabled, p.Text, disabled_color) - p.setColor(p.Button, dark_color) - p.setColor(p.ButtonText, text_color) - p.setColor(p.Disabled, p.ButtonText, disabled_color) - p.setColor(p.BrightText, Qt.red) - p.setColor(p.Link, dark_link_color) - p.setColor(p.Highlight, QtGui.QColor(sigil_colors("Highlight"))) - p.setColor(p.HighlightedText, QtGui.QColor(sigil_colors("HighlightedText"))) - p.setColor(p.Disabled, p.HighlightedText, disabled_color) + p.setColor(QtGui.QPalette.Window, dark_color) + p.setColor(QtGui.QPalette.WindowText, text_color) + p.setColor(QtGui.QPalette.Base, QtGui.QColor(sigil_colors("Base"))) + p.setColor(QtGui.QPalette.AlternateBase, dark_color) + p.setColor(QtGui.QPalette.ToolTipBase, dark_color) + p.setColor(QtGui.QPalette.ToolTipText, text_color) + p.setColor(QtGui.QPalette.Text, text_color) + p.setColor(QtGui.QPalette.Disabled, QtGui.QPalette.Text, disabled_color) + p.setColor(QtGui.QPalette.Button, dark_color) + p.setColor(QtGui.QPalette.ButtonText, text_color) + p.setColor(QtGui.QPalette.Disabled, QtGui.QPalette.ButtonText, disabled_color) + p.setColor(QtGui.QPalette.BrightText, Qt.red) + p.setColor(QtGui.QPalette.Link, dark_link_color) + p.setColor(QtGui.QPalette.Highlight, QtGui.QColor(sigil_colors("Highlight"))) + p.setColor(QtGui.QPalette.HighlightedText, QtGui.QColor(sigil_colors("HighlightedText"))) + p.setColor(QtGui.QPalette.Disabled, QtGui.QPalette.HighlightedText, disabled_color) self.setStyle(QtWidgets.QStyleFactory.create("Fusion")) self.setPalette(p) diff --git a/setup_tools/getkucore.py b/setup_tools/getkucore.py index 27621f7..5089148 100644 --- a/setup_tools/getkucore.py +++ b/setup_tools/getkucore.py @@ -19,7 +19,7 @@ SCRIPT_DIR = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))) SOURCE_DIR = os.path.dirname(SCRIPT_DIR) -COMMIT_SHA = 'c8be31a196fd92803f78ad34a3f18d40319bbac5' +COMMIT_SHA = 'f90cd5d2a9ee49094c4d99b732ad214c9ee2fc7e' # REMOTE_URL = 'https://github.com/kevinhendricks/KindleUnpack/archive/master.zip' REMOTE_URL = 'https://github.com/kevinhendricks/KindleUnpack/archive/{}.zip'.format(COMMIT_SHA) # FILE_NAME = os.path.join(SCRIPT_DIR, REMOTE_URL.split('/')[-1])