Skip to content

Commit 33c9951

Browse files
Filter adjustments (#75)
* Filter per default enabled, added a spacer in between the filter and the other buttons * Minor adjustment to tooltip * Removed filter not functional
1 parent 8a9ac92 commit 33c9951

2 files changed

Lines changed: 10 additions & 6 deletions

File tree

src/petab_gui/controllers/mother_controller.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ def setup_actions(self):
298298
filter_layout.setContentsMargins(0, 0, 0, 0)
299299
filter_widget.setLayout(filter_layout)
300300
self.filter_input = QLineEdit()
301-
self.filter_input.setPlaceholderText("Filter not functional yet ...")
301+
self.filter_input.setPlaceholderText("Filter...")
302302
filter_layout.addWidget(self.filter_input)
303303
for table_n, table_name in zip(
304304
["m", "p", "o", "c"],
@@ -314,7 +314,8 @@ def setup_actions(self):
314314
)
315315
tool_button.setIcon(icon)
316316
tool_button.setCheckable(True)
317-
tool_button.setToolTip(f"Filter for {table_name}")
317+
tool_button.setChecked(True)
318+
tool_button.setToolTip(f"Filter for {table_name} table")
318319
filter_layout.addWidget(tool_button)
319320
self.filter_active[table_name] = tool_button
320321
self.filter_active[table_name].toggled.connect(

src/petab_gui/views/main_view.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""Main Window View."""
2-
from PySide6.QtWidgets import (QApplication, QMainWindow, QDockWidget,
3-
QTableView, QWidget, QVBoxLayout, QPushButton, QTabWidget)
4-
from PySide6.QtCore import Qt, Signal, QSettings
2+
from PySide6.QtWidgets import (QMainWindow, QDockWidget,
3+
QWidget, QVBoxLayout, QTabWidget, QSizePolicy)
4+
from PySide6.QtCore import Qt, QSettings
55
from .sbml_view import SbmlViewer
66
from .table_view import TableViewer
77
from ..utils import FindReplaceBar
@@ -142,7 +142,9 @@ def setup_toolbar(self, actions):
142142
tb = self.addToolBar("MainToolbar")
143143
tb.setObjectName("MainToolbar")
144144
self.setUnifiedTitleAndToolBarOnMac(True)
145-
145+
# spacer for later
146+
spacer = QWidget()
147+
spacer.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred)
146148
# first the normal open / save operations
147149
tb.addAction(actions["new"])
148150
tb.addAction(actions["open"])
@@ -153,6 +155,7 @@ def setup_toolbar(self, actions):
153155
tb.addAction(actions["delete_row"])
154156
tb.addAction(actions["add_column"])
155157
tb.addAction(actions["delete_column"])
158+
tb.addWidget(spacer)
156159
tb.addWidget(actions["filter_widget"])
157160

158161
def add_menu_action(self, dock_widget, name):

0 commit comments

Comments
 (0)