Merge pull request #87 from Toufool/avasam-complete

Merge Avasam-Complete to Master

.gitignore

@@ -16,5 +16,3 @@ dist/
 
 # Dev settings
 *.pkl
-# Defaut settings
-!src/settings.pkl

.vscode/extensions.json

@@ -1,8 +1,14 @@
 {
   "recommendations": [
-    "ms-pyright.pyright",
+    "ms-python.vscode-pylance",
     "ms-python.python",
     "sonarsource.sonarlint-vscode",
-    "davidanson.vscode-markdownlint"
+    "davidanson.vscode-markdownlint",
+    "shardulm94.trailing-spaces",
+    "eamodio.gitlens"
+  ],
+  "unwantedRecommendations": [
+    "ms-pyright.pyright",
+    "esbenp.prettier-vscode"
   ]
 }

.vscode/settings.json

@@ -13,36 +13,56 @@
   "[python]": {
     "editor.tabSize": 4,
     "editor.rulers": [
-      72,
       79,
+      100,
       120,
     ]
   },
-  "[py]": {
-    "editor.tabSize": 4,
-    "editor.rulers": [
-      72,
-      79,
-      120,
-    ]
-  },
-  "//1": "Keeping autoformat to false for now to keep minimal changes",
+  // Keeping autoformat to false for now to keep minimal changes
   "editor.formatOnSave": false,
   "editor.codeActionsOnSave": {
     "source.fixAll": false,
   },
+  "python.linting.enabled": true,
+  "python.analysis.typeCheckingMode": "basic",
+  "python.analysis.diagnosticSeverityOverrides": {
+    // Too many false positives with pywin32 (all functions have 0 arguments in type stub)
+    "reportGeneralTypeIssues":"none"
+  },
+  // https://code.visualstudio.com/docs/python/linting#_specific-linters
+  // Maybe consider PyLint once all Flake8 linting is fixed
   "python.linting.pylintEnabled": false,
-  "//2": "Using flake8 as other linters are incomplete or have too many false positives last I tried",
   "python.linting.flake8Enabled": true,
-  "python.linting.enabled": true,
+  "python.linting.mypyEnabled": true,
+  // Flake8 is already a pycodestyle wrapper
   "python.linting.pycodestyleEnabled": false,
+  "python.linting.pylintArgs": [
+    "--disable=no-member",
+    "--max-line-length=120"
+  ],
+  "python.linting.flake8CategorySeverity.E": "Warning",
   "python.linting.flake8Args": [
     "--max-line-length=120"
   ],
-  "python.linting.flake8CategorySeverity.F": "Warning",
+  "python.linting.mypyArgs": [
+    "--max-line-length=120"
+  ],
   "python.formatting.autopep8Args": [
     "--max-line-length=120"
   ],
-  "python.pythonPath": "",
   "files.insertFinalNewline": true,
+  "trailing-spaces.deleteModifiedLinesOnly": true,
+  "trailing-spaces.includeEmptyLines": true,
+  "trailing-spaces.trimOnSave": true,
+  "trailing-spaces.syntaxIgnore": [
+    "markdown"
+  ],
+  "files.associations": {
+    "*.qrc": "xml",
+    "*.ui": "xml"
+  },
+  "markdownlint.config": {
+    "default": true,
+    "MD025": false,
+  },
 }

res/about.ui

@@ -6,22 +6,27 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>276</width>
-    <height>249</height>
+    <width>264</width>
+    <height>250</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>276</width>
-    <height>249</height>
+    <width>264</width>
+    <height>250</height>
    </size>
   </property>
   <property name="maximumSize">
    <size>
-    <width>276</width>
-    <height>249</height>
+    <width>264</width>
+    <height>250</height>
    </size>
   </property>
+  <property name="font">
+   <font>
+    <pointsize>9</pointsize>
+   </font>
+  </property>
   <property name="windowTitle">
    <string>About AutoSplit</string>
   </property>
@@ -32,10 +37,10 @@
   <widget class="QPushButton" name="okButton">
    <property name="geometry">
     <rect>
-     <x>190</x>
+     <x>180</x>
      <y>220</y>
-     <width>71</width>
-     <height>21</height>
+     <width>75</width>
+     <height>24</height>
     </rect>
    </property>
    <property name="text">
@@ -47,52 +52,55 @@
     <rect>
      <x>10</x>
      <y>44</y>
-     <width>151</width>
-     <height>16</height>
+     <width>161</width>
+     <height>32</height>
     </rect>
    </property>
    <property name="text">
-    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Created by &lt;a href=&quot;https://twitter.com/toufool&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Toufool&lt;/span&gt;&lt;/a&gt; and &lt;a href=&quot;https://twitter.com/faschz&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Faschz&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Created by &lt;a href=&quot;https://twitter.com/toufool&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Toufool&lt;/span&gt;&lt;/a&gt; and &lt;a href=&quot;https://twitter.com/faschz&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Faschz&lt;/span&gt;&lt;/a&gt;&lt;br/&gt;Maintained by &lt;a href=&quot;https://twitter.com/Avasam06&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Avasam&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
   </widget>
   <widget class="QLabel" name="versionLabel">
    <property name="geometry">
     <rect>
      <x>10</x>
      <y>21</y>
-     <width>71</width>
+     <width>161</width>
      <height>16</height>
     </rect>
    </property>
    <property name="text">
-    <string>Version: 1.2.0</string>
+    <string>Version: </string>
    </property>
   </widget>
   <widget class="QLabel" name="donatetextLabel">
    <property name="geometry">
     <rect>
-     <x>46</x>
+     <x>30</x>
      <y>95</y>
-     <width>191</width>
-     <height>41</height>
+     <width>204</width>
+     <height>32</height>
     </rect>
    </property>
    <property name="text">
     <string>If you enjoy using this program, please
-       consider donating. Thank you!</string>
+consider donating. Thank you!</string>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
    </property>
   </widget>
   <widget class="QLabel" name="donatebuttonLabel">
    <property name="geometry">
     <rect>
-     <x>52</x>
-     <y>127</y>
-     <width>171</width>
-     <height>91</height>
+     <x>60</x>
+     <y>150</y>
+     <width>147</width>
+     <height>47</height>
     </rect>
    </property>
    <property name="text">
-    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;business=BYRHQG69YRHBA&amp;item_name=AutoSplit+development&amp;currency_code=USD&amp;source=url&quot;&gt;&lt;img src=&quot;:/resources/donatebutton.png&quot;/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://www.paypal.com/cgi-bin/webscr?cmd=_donations&amp;amp;business=BYRHQG69YRHBA&amp;amp;item_name=AutoSplit+development&amp;amp;currency_code=USD&amp;amp;source=url&quot;&gt;&lt;img src=&quot;:/resources/btn_donateCC_LG.png&quot;/&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
    </property>
    <property name="alignment">
     <set>Qt::AlignCenter</set>