arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2026-01-22 06:37:17 +00:00
Code Releases Wiki Activity

Merge pull request #1089 from arsenetar/as/pre-commit

Browse Source 
feat: Add pre-commit, include python 3.11 in tests
This commit is contained in:
Andrew Senetar
2023-01-09 23:18:13 -06:00
committed by GitHub
parent a5e31f15f0 78f4145910
commit 1e651a1603
85 changed files with 295 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qt/exclude_list_dialog.py
View File

@@ -165,8 +165,8 @@ Directores will also have their <strong>default state</strong> set to Excluded \
in the Directories tab if their name happens to match one of the selected regular expressions.<br>\
For each file collected, two tests are performed to determine whether or not to completely ignore it:<br>\
<li>1. Regular expressions with no path separator in them will be compared to the file name only.</li>
<li>2. Regular expressions with at least one path separator in them will be compared to the full path to the file.</li><br>
Example: if you want to filter out .PNG files from the "My Pictures" directory only:<br>\
<li>2. Regular expressions with at least one path separator in them will be compared to the full path to the file.</li>\
<br>Example: if you want to filter out .PNG files from the "My Pictures" directory only:<br>\
<code>.*My\\sPictures\\\\.*\\.png</code><br><br>\
You can test the regular expression with the "test string" button after pasting a fake path in the test field:<br>\
<code>C:\\\\User\\My Pictures\\test.png</code><br><br>

2
qt/pe/modules/block.c
View File

@@ -163,4 +163,4 @@ PyObject *PyInit__block_qt(void) {
return NULL;
}
return m;
}
}

5
qt/pe/photo.py
View File

@@ -31,7 +31,10 @@ class File(PhotoBase):
image = image.convertToFormat(QImage.Format_RGB888)
if type(orientation) != int:
logging.warning(
"Orientation for file '%s' was a %s '%s', not an int.", str(self.path), type(orientation), orientation
"Orientation for file '%s' was a %s '%s', not an int.",
str(self.path),
type(orientation),
orientation,
)
try:
orientation = int(orientation)

6
qt/preferences_dialog.py
View File

@@ -146,7 +146,8 @@ On MacOS, the tab bar will fill up the window's width instead."
)
self.use_native_dialogs.setToolTip(
tr(
"For actions such as file/folder selection use the OS native dialogs.\nSome native dialogs have limited functionality."
"For actions such as file/folder selection use the OS native dialogs.\n\
Some native dialogs have limited functionality."
)
)
layout.addWidget(self.use_native_dialogs)
@@ -217,7 +218,8 @@ use the modifier key to drag the floating window around"
def _setup_advanced_page(self):
tab_label = QLabel(
tr(
"These options are for advanced users or for very specific situations, most users should not have to modify these."
"These options are for advanced users or for very specific situations, \
most users should not have to modify these."
),
wordWrap=True,
)