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

Rework layout of widgets and add status bar #98

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Rework layout of widgets and add status bar #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be9f95d
Rwork layout of widgets and add status bar
goanpeca Aug 9, 2024
df083f2
Reorganizing
goanpeca Aug 9, 2024
e01c253
Layout clean
goanpeca Aug 9, 2024
9d24f6f
Reorganize widgets
goanpeca Aug 9, 2024
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
135 changes: 79 additions & 56 deletions napari_plugin_manager/qt_plugin_dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
QPushButton,
QSizePolicy,
QSplitter,
QStatusBar,
QTextEdit,
QVBoxLayout,
QWidget,
Expand Down Expand Up @@ -990,7 +991,6 @@
def _on_installer_all_finished(self, exit_codes):
self.working_indicator.hide()
self.cancel_all_btn.setVisible(False)
self.close_btn.setDisabled(False)
self.refresh_button.setDisabled(False)

if not self.isVisible():
Expand Down Expand Up @@ -1080,7 +1080,11 @@
self.installed_list.scrollToItem(item)
self.installed_list.setCurrentItem(item)
if widget.npe_version != 1:
_show_message(widget)
self._show_status_message(

Check warning on line 1083 in napari_plugin_manager/qt_plugin_dialog.py

View check run for this annotation

Codecov / codecov/patch

napari_plugin_manager/qt_plugin_dialog.py#L1083 

Added line #L1083 was not covered by tests
'When (un)installing npe2 plugins, you must restart napari for UI changes to take effect.',
10000,
)
# _show_message(widget)
break

def _fetch_available_plugins(self, clear_cache: bool = False):
Expand All @@ -1101,23 +1105,20 @@

def _setup_ui(self):
"""Defines the layout for the PluginDialog."""
self.resize(900, 600)
vlay_1 = QVBoxLayout(self)
self.h_splitter = QSplitter(self)
vlay_1.addWidget(self.h_splitter)
self.h_splitter.setOrientation(Qt.Orientation.Horizontal)
self.v_splitter = QSplitter(self.h_splitter)
# Widgets
self.v_splitter = QSplitter(self)
self.v_splitter.setOrientation(Qt.Orientation.Vertical)
self.v_splitter.setMinimumWidth(500)
self.v_splitter.setStretchFactor(1, 2)

installed = QWidget(self.v_splitter)
lay = QVBoxLayout(installed)
lay.setContentsMargins(0, 2, 0, 2)

self.installed_label = QLabel(trans._("Installed Plugins"))

self.packages_filter = QLineEdit()
self.packages_filter.setPlaceholderText(trans._("filter..."))
self.packages_filter.setMaximumWidth(350)
self.packages_filter.setClearButtonEnabled(True)
self.packages_filter.setFocus()
self.packages_filter.textChanged.connect(self._filter_timer.start)

self.refresh_button = QPushButton(trans._('Refresh'), self)
Expand All @@ -1129,40 +1130,22 @@
)
self.refresh_button.clicked.connect(self._refresh_and_clear_cache)

mid_layout = QVBoxLayout()
horizontal_mid_layout = QHBoxLayout()
horizontal_mid_layout.addWidget(self.packages_filter)
horizontal_mid_layout.addStretch()
horizontal_mid_layout.addWidget(self.refresh_button)
mid_layout.addLayout(horizontal_mid_layout)
# mid_layout.addWidget(self.packages_filter)
mid_layout.addWidget(self.installed_label)
lay.addLayout(mid_layout)
uninstalled = QWidget(self.v_splitter)

self.installed_list = QPluginList(installed, self.installer)
lay.addWidget(self.installed_list)

uninstalled = QWidget(self.v_splitter)
lay = QVBoxLayout(uninstalled)
lay.setContentsMargins(0, 2, 0, 2)
self.avail_label = QLabel(trans._("Available Plugins"))
mid_layout = QHBoxLayout()
mid_layout.addWidget(self.avail_label)
mid_layout.addStretch()
lay.addLayout(mid_layout)
self.available_list = QPluginList(uninstalled, self.installer)
lay.addWidget(self.available_list)

self.stdout_text = QTextEdit(self.v_splitter)
self.stdout_text = QTextEdit(self)
self.stdout_text.setReadOnly(True)
self.stdout_text.setObjectName("plugin_manager_process_status")
self.stdout_text.hide()

buttonBox = QHBoxLayout()
self.working_indicator = QLabel(trans._("loading ..."), self)
sp = self.working_indicator.sizePolicy()
sp.setRetainSizeWhenHidden(True)
self.working_indicator.setSizePolicy(sp)

self.process_error_indicator = QLabel(self)
self.process_error_indicator.setObjectName("error_label")
self.process_error_indicator.hide()
Expand All @@ -1188,39 +1171,75 @@

self.show_status_btn = QPushButton(trans._("Show Status"), self)
self.show_status_btn.setFixedWidth(100)
self.show_status_btn.setCheckable(True)
self.show_status_btn.setChecked(False)
self.show_status_btn.toggled.connect(self.toggle_status)

self.cancel_all_btn = QPushButton(trans._("cancel all actions"), self)
self.cancel_all_btn.setObjectName("remove_button")
self.cancel_all_btn.setVisible(False)
self.cancel_all_btn.clicked.connect(self.installer.cancel_all)

self.close_btn = QPushButton(trans._("Close"), self)
self.close_btn.clicked.connect(self.accept)
self.close_btn.setObjectName("close_button")

buttonBox.addWidget(self.show_status_btn)
buttonBox.addWidget(self.working_indicator)
buttonBox.addWidget(self.direct_entry_edit)
buttonBox.addWidget(self.direct_entry_btn)
if not visibility_direct_entry:
buttonBox.addStretch()
buttonBox.addWidget(self.process_success_indicator)
buttonBox.addWidget(self.process_error_indicator)
buttonBox.addSpacing(20)
buttonBox.addWidget(self.cancel_all_btn)
buttonBox.addSpacing(20)
buttonBox.addWidget(self.close_btn)
buttonBox.setContentsMargins(0, 0, 4, 0)
vlay_1.addLayout(buttonBox)
sizePolicy = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
sizePolicy.setRetainSizeWhenHidden(True)
self.cancel_all_btn.setSizePolicy(sizePolicy)

self.status_bar = QStatusBar(self)
self.status_bar.setObjectName("plugin_manager_status_bar")
self.status_bar.addPermanentWidget(self.process_success_indicator)
self.status_bar.addPermanentWidget(self.process_error_indicator)
self.status_bar.addPermanentWidget(self.working_indicator)
self.status_bar.setSizeGripEnabled(True)
self.status_bar.addPermanentWidget(self.show_status_btn)
# layout_bottom.addWidget(self.working_indicator)

# Layout
top_layout = QHBoxLayout()
top_layout.addWidget(self.packages_filter)
top_layout.addStretch()
top_layout.addWidget(self.refresh_button)

layout_installed = QVBoxLayout(installed)
layout_installed.setContentsMargins(0, 2, 0, 2)
layout_installed.addWidget(self.installed_label)
layout_installed.addWidget(self.installed_list)

layout_uninstalled = QVBoxLayout(uninstalled)
layout_uninstalled.setContentsMargins(0, 2, 0, 2)
layout_uninstalled.addWidget(self.avail_label)
layout_uninstalled.addWidget(self.available_list)

self.show_status_btn.setCheckable(True)
self.show_status_btn.setChecked(False)
self.show_status_btn.toggled.connect(self.toggle_status)
layout_bottom = QHBoxLayout()
layout_bottom.addWidget(self.direct_entry_edit)
layout_bottom.addWidget(self.direct_entry_btn)

self.v_splitter.setStretchFactor(1, 2)
self.h_splitter.setStretchFactor(0, 2)
if not visibility_direct_entry:
layout_bottom.addStretch()

# layout_bottom.addWidget(self.working_indicator)
# layout_bottom.addWidget(self.process_success_indicator)
# layout_bottom.addWidget(self.process_error_indicator)
layout_bottom.addSpacing(20)
layout_bottom.addWidget(self.cancel_all_btn)
layout_bottom.setContentsMargins(0, 0, 4, 0)

main_layout = QVBoxLayout(self)
main_layout.addLayout(top_layout)
main_layout.addWidget(self.v_splitter)
main_layout.addLayout(layout_bottom)
main_layout.addWidget(self.stdout_text)
# main_layout.addWidget(self.show_status_btn)
main_layout.addSpacing(20)
main_layout.addWidget(self.status_bar)
margins = main_layout.contentsMargins()
main_layout.setContentsMargins(
margins.left(),
margins.top(),
margins.right(),
margins.bottom() // 2,
)

self.packages_filter.setFocus()
self.resize(900, 600)

def _update_plugin_count(self):
"""Update count labels for both installed and available plugin lists.
Expand Down Expand Up @@ -1368,6 +1387,10 @@
def _refresh_and_clear_cache(self):
self.refresh(clear_cache=True)

def _show_status_message(self, message, timeout=0):
self.status_bar.showMessage(message, timeout)
self.process_success_indicator.show()

Check warning on line 1392 in napari_plugin_manager/qt_plugin_dialog.py

View check run for this annotation

Codecov / codecov/patch

napari_plugin_manager/qt_plugin_dialog.py#L1391-L1392 

Added lines #L1391 - L1392 were not covered by tests

# endregion - Private methods

# region - Qt overrides
Expand Down
5 changes: 5 additions & 0 deletions napari_plugin_manager/styles.qss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,3 +350,8 @@ QtLayerList::indicator:checked {
min-height: 36px;
min-width: 36px;
}

#plugin_manager_status_bar {
background-color: {{ background }};
font-size: 11px;
}