.gitlab-ci.yml

@@ -3,9 +3,6 @@ image: python:3.10
 variables:
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
   PIPENV_VENV_IN_PROJECT: 1
-  UPDATE_WINDOWS_DEPS:
-    description: "Set to \"1\" to update windows deps"
-    value: "0"
 
 cache:
   paths:
@@ -45,15 +42,11 @@ update_windows_deps:
   rules:
     - if: $CI_COMMIT_TAG
       when: never
-    - if: $UPDATE_WINDOWS_DEPS == "1"
-      when: always
     - if: $CI_COMMIT_BRANCH == "main"
       changes:
         - Pipfile
         - Pipfile.lock
       when: always
-  needs:
-    - prepare
   before_script:
     - Import-Module "$env:ChocolateyInstall\helpers\chocolateyProfile.psm1"
     - choco install python --version=$PYTHON_VERSION -y --no-progress
@@ -71,11 +64,11 @@ commit_windows_deps:
   rules:
     - if: $CI_COMMIT_TAG
       when: never
-    - if: $UPDATE_WINDOWS_DEPS == "1"
     - if: $CI_COMMIT_BRANCH == "main"
       changes:
         - Pipfile
         - Pipfile.lock
+      when: always
   needs:
     - update_windows_deps
   image: alpine

Pipfile

@@ -11,9 +11,9 @@ packaging = "~=21.3"
 loguru = "~=0.6"
 
 [dev-packages]
-pyinstaller = "~=5.6"
+pyinstaller = "~=5.5"
 # wheel packaging on linux is sufficient
-build = {version = "~=0.9", sys_platform = "== 'linux'" }
+build = {version = "~=0.8", sys_platform = "== 'linux'" }
 
 [requires]
 python_version = "3.10"

Pipfile.lock

@@ -1,7 +1,7 @@
 {
     "_meta": {
         "hash": {
-            "sha256": "b3226463013276ac1b097bc308aef4d54f2a68a96ad6badb67aa06950166abd4"
+            "sha256": "7b346cc0523538d1942c5ad163fe0ae1dfe5ff270803205e6b8342548b952587"
         },
         "pipfile-spec": 6,
         "requires": {
@@ -34,11 +34,11 @@
         },
         "colorama": {
             "hashes": [
-                "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44",
+                "sha256:854bf444933e37f5824ae7bfc1e98d5bce2ebe4160d46b5edf346a89358e99da",
-                "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6"
+                "sha256:e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4"
             ],
             "markers": "sys_platform == 'win32'",
-            "version": "==0.4.6"
+            "version": "==0.4.5"
         },
         "idna": {
             "hashes": [
@@ -74,39 +74,39 @@
         },
         "pyside6": {
             "hashes": [
-                "sha256:1821f3f06357961ddf63db1bd73b3d91b5d7a57ce27994bf8ba910a930a411c9",
+                "sha256:1b388e3fc87ebcad7ecaad751c5560625425efea4e56d553a4caa07032865c86",
-                "sha256:3dae6611f425da55fcc2ed0494496a07812751a89c2f9801f6072a3349106a62",
+                "sha256:5df15003f0b12ed5c4c4f321ffa381784a2425441b2bd6c671d824bb03efdf2a",
-                "sha256:90bb074469c37155c69fbfe85d85d23e52973df784bf7bc0d36c646ebdf985a4",
+                "sha256:d7824b1f0c346e8db03870fa8dc5e13b18bc746a9dfabbc69c85529e85903408",
-                "sha256:a45ea81fa4d1fdb7aeb7250508b07fa209e6bfb26becf5b24751d3769cade292",
+                "sha256:e8702ff398b7fe395a3b9f0020b8d2910ab4fcea50f259f93e936409fd367c4b",
-                "sha256:ab4f5913cf3a97ed2a5a388b781887e50750142b847e57b52ffa15bb0510af9d",
+                "sha256:eeed99066628c44113c21ba5eccd6c229d8f7ee65834a7fc45c64b0e636c606d",
-                "sha256:e255f9cb5fa13c4f4c8a1e90f3e6619336787d8700f476b8bb3d432917c68ed6"
+                "sha256:f5220d57db6890546adf81669129da6bb46546a01bf618ec58fa1e7a69d0b52c"
             ],
             "index": "pypi",
-            "version": "==6.4.0.1"
+            "version": "==6.4.0"
         },
         "pyside6-addons": {
             "hashes": [
-                "sha256:43d21d7cfb2e507e293cced61b13e1d125212c6b650a61ab97ce7fe9a758008e",
+                "sha256:236b0dbaefc03114fc1deeee0041808d64a76650b643cf9ee9d8587e3ba9059a",
-                "sha256:4bcf6e86d53f0ac92092bb66a6a3ee40fa8ff9e46f8418bdec9d6d95256211f4",
+                "sha256:59b3507db48b67707971b163aa8832beab902688288c64ffbfb2be6c487f5ec4",
-                "sha256:a9f55608e4b1ff8a35305e2d4341f5f735ad3eafa042dff7381792b84e0c50c8",
+                "sha256:804f2a73560dffb390f91a1fbd6f33440b1f96ce8d74e19cc893952e2e8c8966",
-                "sha256:d5e4f11efc360be8f93cd9a8837019f6ea79cd63e0770c3c2917d7c4b44bc55c",
+                "sha256:aceb568a684b88114c8928247019a9ffc3e133c4fe7722c7ce62224db338b335",
-                "sha256:ed9653074e33b417ec51dfae4852cbf4aaeda1856ce877f85d58854784baa3dc",
+                "sha256:e9c108184094c54f1c7cd456ed5294a9da696d036b7079c07b2ee4a52aa0980c",
-                "sha256:fc993a682a290ec63ba3f8b4cf66de8185b076bb6e77756e8d256b643b74cf41"
+                "sha256:f060df71d64bc6d88651fc51b081de26de6a1c9308f14b021943056d70e20552"
             ],
-            "markers": "python_version < '3.12' and python_version >= '3.7'",
+            "markers": "python_version < '3.11' and python_version >= '3.6'",
-            "version": "==6.4.0.1"
+            "version": "==6.4.0"
         },
         "pyside6-essentials": {
             "hashes": [
-                "sha256:0c1f968699c4c1d2e131fd5c690228170f764324e6dc0e1b80f978fbc29923de",
+                "sha256:3b82f238c015f13840eb0e61167a3f776ce62fa4704ba2f329658a35c46daacb",
-                "sha256:1ba1c475568392db633da032799ff84e4b1c8e0ba863e88118b4f5ae0c312fb1",
+                "sha256:526434fb2ca94e54d07a7605716e4fb2e1b642440bce32c80a39e847e1710e65",
-                "sha256:3ea3b8b7bb792ad6a58d1186606ff6a3a782b09007dc4517649fe300d7beaf51",
+                "sha256:576704ff198a4aa4748bc99ac1e3fcd2425d7651f44214e93cd99be37cf4d305",
-                "sha256:6950ad5d946a61a879634d14cb1bb0205f157b9d270fdc536049d1444aeb14d0",
+                "sha256:6e11d3a7fe013bb5b259066755983378d4ae2f582e5935fd5950c3dcfa0c3ec6",
-                "sha256:7f1d2d3b1aa5f2ababc6a25d0c0748fc41f6aa0d79626f98e0c86d1805928a1a",
+                "sha256:f7aa59dbf3aa1349f7559f5aa99f2e6e4845a3fc5af0ee602b4e5f1f666cf47f",
-                "sha256:8cbc5cb78e78f6c2dfe225ce997c198e8a95a19b3f44b8d3ccc14a324d6b6e9c"
+                "sha256:ff744c614e5fb8e536c632ab51811a5e27641ef546364b7bdd2d0320b4115d83"
             ],
-            "markers": "python_version < '3.12' and python_version >= '3.7'",
+            "markers": "python_version < '3.11' and python_version >= '3.6'",
-            "version": "==6.4.0.1"
+            "version": "==6.4.0"
         },
         "requests": {
             "hashes": [
@@ -126,15 +126,15 @@
         },
         "shiboken6": {
             "hashes": [
-                "sha256:09f27c7425ecd2ce6debdf7771a56b2fbc36527b6097b3a1b21339c61287f842",
+                "sha256:30bbd06fc6564a57552792e3fc9e7c85c0881d0036c5f0f0daee3054e3d727b9",
-                "sha256:3031d769ced7018bcc96cced81e2a79afc5424071fbf819802c48aafe4d2da1d",
+                "sha256:679870d97665b21fca018b05023c7b90b895e886adba754d8cc5d06d571a2139",
-                "sha256:491f3394c771e6da85b89ec39394da76b4e11d4ff697250f8ea26f0a08eb2471",
+                "sha256:67b4731c55f5d74a72bede9a84691d64664cf7e1e76b606f58b39c8a61ea563d",
-                "sha256:8056529749dcad1f0f9b4b1113898de0f39f8b83cd09a38eaf9252f3fef681ad",
+                "sha256:76ba24af98eb15cbdfb483142696c5ae22537d2df84c06b44eb1ab66280b29b4",
-                "sha256:e7f91a1f88ec27b2039df1ea4c92eb89cf7c93d80f93363db66f7a226dad9439",
+                "sha256:a572a5782c65c1f77ba1da92955e25f0af56c27832cf405eae246aee0e4c1575",
-                "sha256:edd3c3abcff8fee7fc6051d0c63a72fcfc1451e0fd60094430d35aa1720000bf"
+                "sha256:cfd5f6c64793ecae2617f9bdbe726376583f56db1ab62ebaef43442e5695425a"
             ],
-            "markers": "python_version < '3.12' and python_version >= '3.7'",
+            "markers": "python_version < '3.11' and python_version >= '3.6'",
-            "version": "==6.4.0.1"
+            "version": "==6.4.0"
         },
         "urllib3": {
             "hashes": [
@@ -163,12 +163,12 @@
         },
         "build": {
             "hashes": [
-                "sha256:1a07724e891cbd898923145eb7752ee7653674c511378eb9c7691aab1612bc3c",
+                "sha256:19b0ed489f92ace6947698c3ca8436cb0556a66e2aa2d34cd70e2a5d27cd0437",
-                "sha256:38a7a2b7a0bdc61a42a0a67509d88c71ecfc37b393baba770fae34e20929ff69"
+                "sha256:887a6d471c901b1a6e6574ebaeeebb45e5269a79d095fe9a8f88d6614ed2e5f0"
             ],
             "index": "pypi",
             "markers": "sys_platform == 'linux'",
-            "version": "==0.9.0"
+            "version": "==0.8.0"
         },
         "future": {
             "hashes": [
@@ -202,28 +202,28 @@
         },
         "pyinstaller": {
             "hashes": [
-                "sha256:04ecf805bde2ef25b8e3642410871e6747c22fa7254107f155b8cd179c2a13b6",
+                "sha256:2a2fc8755b00cc1ea4d89bb81f8ada8c2afe0d13a7f7b35020e8a694d6882c9e",
-                "sha256:05df5d2b9ca645cc6ef61d8a85451d2aabe5501997f1f50cd94306fd6bc0485d",
+                "sha256:47a63d42ceb73355bf3afec51109ee3f5b3893f068be821a6735cada229ab680",
-                "sha256:0d167d57036219914188f1400427dd297b975707e78c32a5511191e607be920a",
+                "sha256:5f8834af70a6e080ab4fe53ec2b8b4fdfcc0106bd8db7cc27da9a8973ecffe05",
-                "sha256:181856ade585b090379ae26b7017dc2c30620e36e3a804b381417a6dc3b2a82b",
+                "sha256:838e0a385355e55833f2ac62e75290f345d0b57bad53f08742c28a7cb96e91c8",
-                "sha256:1b1e3b37a22fb36555d917f0c3dfb998159ff4af6d8fa7cc0074d630c6fe81ad",
+                "sha256:88993dfc6429dce8dd1f9a73c08e259af71dd3a227d3002ccb8e959151757dc3",
-                "sha256:32727232f446aa96e394f01b0c35b3de0dc3513c6ba3e26d1ef64c57edb1e9e5",
+                "sha256:91c0947063f49b21476e374662f62b00d0cf5a97ad6851c12124280409aebbd1",
-                "sha256:77888f52b61089caa0bee70809bbce9e9b1c613c88b6cb0742ff2a45f1511cbb",
+                "sha256:94e947980c7d9b7e422f4af9885f12560cb546ee2017fb0f2c8af5a9a309c63f",
-                "sha256:865025b6809d777bb0f66d8f8ab50cc97dc3dbe0ff09a1ef1f2fd646432714fc",
+                "sha256:9e8950c599847d15e7d7b8c18073fab267d7d3d41650a64c46278b97655076d3",
-                "sha256:d888db9afedff290d362ee296d30eb339abeba707ca1565916ce1cd5947131c3",
+                "sha256:c7326298be50adcdf799e9b3f880543b925be7341cb1ac2a1e5b1a47b9dc3183",
-                "sha256:e026adc92c60158741d0bfca27eefaa2414801f61328cb84d0c88241fe8c2087",
+                "sha256:d06378354b8d3d08309fddb230c813fc750848d71156274c15afdfedd56f57cf",
-                "sha256:eb083c25f711769af0898852ea30dcb727ba43990bbdf9ffbaa9c77a7bd0d720"
+                "sha256:d902a9b669f90665a3abe5d0f176784fc3f2e1320d6c98df0bd1457c77ca706a"
             ],
             "index": "pypi",
-            "version": "==5.6.2"
+            "version": "==5.5"
         },
         "pyinstaller-hooks-contrib": {
             "hashes": [
-                "sha256:91ecb30db757a8db8b6661d91d5df99e0998245f05f5cfaade0550922c7030a3",
+                "sha256:d1dd6ea059dc30e77813cc12a5efa8b1d228e7da8f5b884fe11775f946db1784",
-                "sha256:e06d0881e599d94dc39c6ed1917f0ad9b1858a2478b9892faac18bd48bcdc2de"
+                "sha256:e5edd4094175e78c178ef987b61be19efff6caa23d266ade456fc753e847f62e"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==2022.13"
+            "version": "==2022.10"
         },
         "pyparsing": {
             "hashes": [
@@ -243,11 +243,11 @@
         },
         "setuptools": {
             "hashes": [
-                "sha256:d0b9a8433464d5800cbe05094acf5c6d52a91bfac9b52bcfc4d41382be5d5d31",
+                "sha256:512e5536220e38146176efb833d4a62aa726b7bbff82cfbc8ba9eaa3996e0b17",
-                "sha256:e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f"
+                "sha256:f62ea9da9ed6289bfe868cd6845968a2c854d1427f8548d52cae02a42b4f0356"
             ],
             "markers": "python_version >= '3.7'",
-            "version": "==65.5.1"
+            "version": "==65.5.0"
         },
         "tomli": {
             "hashes": [

src/fime/import_task.py

@@ -28,9 +28,6 @@ class ImportTask(QtWidgets.QDialog):
         self.completer.running.connect(self.spin)
         self.completer.stopped.connect(self.no_spin)
 
-        self.auto_change_task_check_box = QtWidgets.QCheckBox()
-        self.auto_change_task_check_box.setText("Set as active task after import")
-
         ok_button = QtWidgets.QPushButton()
         ok_button.setText("OK")
         ok_button.setIcon(get_icon("dialog-ok"))
@@ -60,7 +57,6 @@ class ImportTask(QtWidgets.QDialog):
 
         blayout = QtWidgets.QHBoxLayout()
         blayout.addSpacing(300)
-        blayout.addWidget(self.auto_change_task_check_box)
         blayout.addWidget(cancel_button)
         blayout.addWidget(ok_button)
 
@@ -82,12 +78,7 @@ class ImportTask(QtWidgets.QDialog):
     def task_text(self):
         return self.line_edit.text()
 
-    @property
-    def change_task(self):
-        return self.auto_change_task_check_box.isChecked()
-
     def showEvent(self, _):
-        self.auto_change_task_check_box.setChecked(self.config.import_auto_change_task)
         # pick up config changes
         self.completer.update_urls()
         self.line_edit.setText("")

src/fime/main.py

@@ -79,7 +79,7 @@ class App:
     def new_task_imported(self):
         if self.import_task.task_text:
             self.tasks.add_jira_task(self.import_task.task_text)
-            if self.import_task.change_task:
+            if self.config.import_auto_change_task:
                 self.change_task(self.import_task.task_text)
             self.update_tray_menu()
 

src/fime/settings.py

@@ -51,7 +51,8 @@ class Settings(QtWidgets.QDialog):
         settings_layout.addWidget(self.flip_menu_check_box, 3, 1, QtCore.Qt.AlignRight)
 
         import_auto_change_task_label = QtWidgets.QLabel()
-        import_auto_change_task_label.setText("Automatically select task as active task\nafter task import")
+        import_auto_change_task_label.setText("Automatically select as active task\n after task import")
+        #import_auto_change_task_label.setTextFormat(QtCore.Qt.)
         settings_layout.addWidget(import_auto_change_task_label, 4, 0)
         self.import_auto_change_task_check_box = QtWidgets.QCheckBox()
         settings_layout.addWidget(self.import_auto_change_task_check_box, 4, 1, QtCore.Qt.AlignRight)