Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Exclusion Filters #705

Merged
merged 23 commits into from
Dec 29, 2020
+1,544 −81
Merged

Add Exclusion Filters #705

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
470307a
Ignore path and filename based on regex
glubsy Jul 26, 2020
a26de27
Implement dialog and base classes for model/view
glubsy Jul 28, 2020
2eaf7e7
Implement exclude list dialog on the Qt side
glubsy Aug 17, 2020
9f223f3
Concatenate regexes prio to compilation
glubsy Aug 20, 2020
3382bd5
Fix crash when recreating Results window/tab
glubsy Aug 20, 2020
26d1894
Fix tab indices not aligned with stackwidget's
glubsy Aug 23, 2020
4a1641e
Add test suite, fix bugs
glubsy Aug 29, 2020
584e9c9
Fix duplicate items in menubar
glubsy Aug 31, 2020
ea11a56
Highlight rows when testing regex string
glubsy Sep 1, 2020
18c933b
Prevent widget from stretching in layout
glubsy Sep 2, 2020
a55e02b
Fix table maximum size being off by a few pixels
glubsy Sep 2, 2020
424d34a
Add desktop.ini to filter list
glubsy Sep 3, 2020
680cb58
Merge branch 'master' into exclude_list
glubsy Oct 28, 2020
7f19647
Remove unused lines
glubsy Dec 28, 2020
07eba09
Fix error after merging branches
glubsy Dec 29, 2020
4b4cc04
Fix directories tests on Windows
glubsy Dec 29, 2020
e533a39
Remove redundant check
glubsy Dec 29, 2020
90c7c06
Merge branch 'master' into exclude_list
glubsy Dec 29, 2020
f0d3dec
Fix exclude tests
glubsy Dec 29, 2020
b5f59d2
Brighten up validation color
glubsy Dec 29, 2020
b76e866
Tweak green color on exclude table
glubsy Dec 29, 2020
39d353d
Add comment about Win7 bug
glubsy Dec 29, 2020
a93bd3a
Add missing translation hooks
glubsy Dec 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Prevent widget from stretching in layout 
* In some themes, the color picker widgets get stretched, while the color picker for the details dialog group doesn't.
This should keep them a bit more consistent across themes.
  • Loading branch information
@glubsy
glubsy committed Sep 2, 2020
commit 18c933b4bf7fca844436e3152a3479dde532d36e
26 changes: 15 additions & 11 deletions qt/preferences_dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,25 +161,28 @@ def _setupDisplayPage(self):
self.ui_groupbox.setLayout(layout)
self.displayVLayout.addWidget(self.ui_groupbox)

gridlayout = QFormLayout()
gridlayout = QGridLayout()
gridlayout.setColumnStretch(2, 2)
formlayout = QFormLayout()
result_groupbox = QGroupBox("&Result Table")
self.fontSizeSpinBox = QSpinBox()
self.fontSizeSpinBox.setMinimum(5)
gridlayout.addRow(tr("Font size:"), self.fontSizeSpinBox)
formlayout.addRow(tr("Font size:"), self.fontSizeSpinBox)
self._setupAddCheckbox("reference_bold_font",
tr("Use bold font for references"))
gridlayout.addRow(self.reference_bold_font)
formlayout.addRow(self.reference_bold_font)

self.result_table_ref_foreground_color = ColorPickerButton(self)
gridlayout.addRow(tr("Reference foreground color:"),
formlayout.addRow(tr("Reference foreground color:"),
self.result_table_ref_foreground_color)
self.result_table_delta_foreground_color = ColorPickerButton(self)
gridlayout.addRow(tr("Delta foreground color:"),
formlayout.addRow(tr("Delta foreground color:"),
self.result_table_delta_foreground_color)
gridlayout.setLabelAlignment(Qt.AlignLeft)
formlayout.setLabelAlignment(Qt.AlignLeft)

# Keep same vertical spacing as parent layout for consistency
gridlayout.setVerticalSpacing(self.displayVLayout.spacing())
formlayout.setVerticalSpacing(self.displayVLayout.spacing())
gridlayout.addLayout(formlayout, 0, 0)
result_groupbox.setLayout(gridlayout)
self.displayVLayout.addWidget(result_groupbox)

Expand All @@ -202,12 +205,13 @@ def _setupDisplayPage(self):
self.details_dialog_titlebar_enabled.stateChanged.connect(
self.details_dialog_vertical_titlebar.setEnabled)
gridlayout = QGridLayout()
self.details_table_delta_foreground_color_label = QLabel(tr("Delta foreground color:"))
gridlayout.addWidget(self.details_table_delta_foreground_color_label, 4, 0)
formlayout = QFormLayout()
self.details_table_delta_foreground_color = ColorPickerButton(self)
gridlayout.addWidget(self.details_table_delta_foreground_color, 4, 2, 1, 1, Qt.AlignLeft)
# Padding on the right side and space between label and widget to keep it somewhat consistent across themes
gridlayout.setColumnStretch(1, 1)
gridlayout.setColumnStretch(3, 4)
formlayout.setHorizontalSpacing(50)
formlayout.addRow(tr("Delta foreground color:"), self.details_table_delta_foreground_color)
gridlayout.addLayout(formlayout, 0, 0)
self.details_groupbox_layout.addLayout(gridlayout)
details_groupbox.setLayout(self.details_groupbox_layout)
self.displayVLayout.addWidget(details_groupbox)
Expand Down