Skip to content

Commit

Permalink
Warning if AutoSplit is already open + Build number + Splash Screen +…
Browse files Browse the repository at this point in the history 
… Doc update + Fixes (#161)

* Doc + Setup update

* typings update

* Warning if AutoSplit is already open + Build number + Splash Screen

* Target the right repository/fork

* Fix #155

* Actions shortcut and prevent double open window
Closes #154

* ImageHash hotfix
  • Loading branch information
@Avasam
Avasam authored Sep 3, 2022
1 parent 3b39fa1 commit 537f8bf
Show file tree
Hide file tree
Showing 36 changed files with 1,296 additions and 523 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -50,7 +50,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -64,4 +64,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v2
141 changes: 75 additions & 66 deletions README.md
View file

Large diffs are not rendered by default.

14 changes: 10 additions & 4 deletions res/about.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<rect>
<x>10</x>
<y>44</y>
<width>161</width>
<width>171</width>
<height>32</height>
</rect>
</property>
Expand Down Expand Up @@ -112,10 +112,10 @@ consider donating. Thank you!</string>
<widget class="QLabel" name="icon_label">
<property name="geometry">
<rect>
<x>190</x>
<x>181</x>
<y>17</y>
<width>62</width>
<height>71</height>
<width>64</width>
<height>64</height>
</rect>
</property>
<property name="text">
Expand All @@ -124,7 +124,13 @@ consider donating. Thank you!</string>
<property name="pixmap">
<pixmap resource="resources.qrc">:/resources/icon.ico</pixmap>
</property>
<property name="scaledContents">
<bool>true</bool>
</property>
</widget>
<zorder>icon_label</zorder>
<zorder>version_label</zorder>
<zorder>created_by_label</zorder>
</widget>
<resources>
<include location="resources.qrc"/>
Expand Down
128 changes: 68 additions & 60 deletions res/design.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,6 @@
<iconset resource="resources.qrc">
<normaloff>:/resources/icon.ico</normaloff>:/resources/icon.ico</iconset>
</property>
<property name="whatsThis">
<string/>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<widget class="QWidget" name="central_widget">
<widget class="QLabel" name="x_label">
<property name="geometry">
Expand Down Expand Up @@ -172,7 +166,7 @@
<property name="geometry">
<rect>
<x>92</x>
<y>255</y>
<y>254</y>
<width>20</width>
<height>20</height>
</rect>
Expand All @@ -184,8 +178,8 @@
<widget class="QLabel" name="live_image">
<property name="geometry">
<rect>
<x>119</x>
<y>68</y>
<x>120</x>
<y>67</y>
<width>320</width>
<height>240</height>
</rect>
Expand All @@ -212,8 +206,8 @@
<widget class="QLabel" name="current_split_image">
<property name="geometry">
<rect>
<x>450</x>
<y>68</y>
<x>449</x>
<y>67</y>
<width>320</width>
<height>240</height>
</rect>
Expand All @@ -231,7 +225,7 @@
<widget class="QLabel" name="current_image_label">
<property name="geometry">
<rect>
<x>451</x>
<x>449</x>
<y>31</y>
<width>318</width>
<height>20</height>
Expand Down Expand Up @@ -274,7 +268,7 @@
<property name="geometry">
<rect>
<x>65</x>
<y>255</y>
<y>254</y>
<width>26</width>
<height>20</height>
</rect>
Expand All @@ -289,9 +283,12 @@
<x>11</x>
<y>200</y>
<width>44</width>
<height>22</height>
<height>24</height>
</rect>
</property>
<property name="correctionMode">
<enum>QAbstractSpinBox::CorrectToNearestValue</enum>
</property>
<property name="minimum">
<number>1</number>
</property>
Expand All @@ -308,9 +305,12 @@
<x>66</x>
<y>200</y>
<width>44</width>
<height>22</height>
<height>24</height>
</rect>
</property>
<property name="correctionMode">
<enum>QAbstractSpinBox::CorrectToNearestValue</enum>
</property>
<property name="minimum">
<number>1</number>
</property>
Expand All @@ -324,9 +324,9 @@
<widget class="QLabel" name="capture_region_label">
<property name="geometry">
<rect>
<x>119</x>
<x>120</x>
<y>31</y>
<width>319</width>
<width>318</width>
<height>20</height>
</rect>
</property>
Expand All @@ -340,7 +340,7 @@
<widget class="QLabel" name="current_image_file_label">
<property name="geometry">
<rect>
<x>478</x>
<x>477</x>
<y>49</y>
<width>264</width>
<height>20</height>
Expand Down Expand Up @@ -375,15 +375,15 @@
<x>11</x>
<y>160</y>
<width>44</width>
<height>22</height>
<height>24</height>
</rect>
</property>
<property name="readOnly">
<bool>false</bool>
</property>
<property name="buttonSymbols">
<enum>QAbstractSpinBox::UpDownArrows</enum>
</property>
<property name="correctionMode">
<enum>QAbstractSpinBox::CorrectToNearestValue</enum>
</property>
<property name="minimum">
<number>0</number>
</property>
Expand All @@ -403,14 +403,11 @@
<x>66</x>
<y>160</y>
<width>44</width>
<height>22</height>
<height>24</height>
</rect>
</property>
<property name="readOnly">
<bool>false</bool>
</property>
<property name="buttonSymbols">
<enum>QAbstractSpinBox::UpDownArrows</enum>
<property name="correctionMode">
<enum>QAbstractSpinBox::CorrectToNearestValue</enum>
</property>
<property name="minimum">
<number>0</number>
Expand Down Expand Up @@ -813,7 +810,7 @@
<rect>
<x>449</x>
<y>344</y>
<width>98</width>
<width>101</width>
<height>16</height>
</rect>
</property>
Expand All @@ -824,7 +821,7 @@
<widget class="QLabel" name="start_image_status_value_label">
<property name="geometry">
<rect>
<x>550</x>
<x>560</x>
<y>344</y>
<width>98</width>
<height>16</height>
Expand Down Expand Up @@ -853,7 +850,7 @@
</property>
<property name="geometry">
<rect>
<x>449</x>
<x>448</x>
<y>49</y>
<width>27</width>
<height>18</height>
Expand All @@ -875,7 +872,7 @@
</property>
<property name="geometry">
<rect>
<x>744</x>
<x>743</x>
<y>49</y>
<width>27</width>
<height>18</height>
Expand Down Expand Up @@ -944,7 +941,10 @@
<addaction name="action_view_help"/>
<addaction name="action_check_for_updates"/>
<addaction name="action_check_for_updates_on_open"/>
<addaction name="separator"/>
<addaction name="action_about"/>
<addaction name="action_about_qt"/>
<addaction name="action_about_qt_for_python"/>
</widget>
<widget class="QMenu" name="menu_file">
<property name="title">
Expand All @@ -963,75 +963,83 @@
<property name="text">
<string>View Help</string>
</property>
<property name="shortcut">
<string>F1</string>
</property>
</action>
<action name="action_about">
<property name="text">
<string>About</string>
<string>About AutoSplit</string>
</property>
</action>
<action name="actionSplit_Settings">
<property name="text">
<string>Split Image Settings</string>
<property name="menuRole">
<enum>QAction::AboutRole</enum>
</property>
</action>
<action name="action_save_profile">
<property name="text">
<string>Save Profile</string>
</property>
<property name="shortcut">
<string>Ctrl+S</string>
</property>
</action>
<action name="action_load_profile">
<property name="text">
<string>Load Profile</string>
</property>
<property name="shortcut">
<string>Ctrl+O</string>
</property>
</action>
<action name="action_save_profile_as">
<property name="text">
<string>Save Profile As...</string>
</property>
<property name="shortcut">
<string>Ctrl+Shift+S</string>
</property>
</action>
<action name="action_check_for_updates">
<property name="text">
<string>Check For Updates</string>
</property>
</action>
<action name="actionCheck_for_Updates_on_Open">
<action name="action_settings">
<property name="text">
<string>Settings</string>
</property>
<property name="shortcut">
<string>Ctrl+,</string>
</property>
<property name="menuRole">
<enum>QAction::PreferencesRole</enum>
</property>
</action>
<action name="action_check_for_updates_on_open">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Check for Updates on Open</string>
</property>
</action>
<action name="actionAuto_Start_On_Reset">
<property name="text">
<string>Check For Updates On Open</string>
</property>
</action>
<action name="actionGroup_dummy_splits_when_undoing_skipping">
<action name="action_about_qt">
<property name="text">
<string>Dummy Splits When Undoing/Skipping</string>
<string>About Qt</string>
</property>
</action>
<action name="action_settings">
<property name="text">
<string>Settings</string>
<property name="menuRole">
<enum>QAction::AboutQtRole</enum>
</property>
</action>
<action name="action_check_for_updates_on_open">
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>true</bool>
</property>
<action name="action_about_qt_for_python">
<property name="text">
<string>Check For Updates On Open</string>
<string>About Qt for Python</string>
</property>
<property name="menuRole">
<enum>QAction::AboutQtRole</enum>
</property>
</action>
</widget>
Expand Down
Binary file modified res/icon.ico
View file
Binary file not shown.
Loading

0 comments on commit 537f8bf

Please sign in to comment.