From 095fb87503a5bb85eb924f82c148efaf42f5f817 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Dec 2023 13:05:19 +1000 Subject: [PATCH 1/8] Fix search appearance on more themes --- felt/gui/recent_maps_list_view.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/felt/gui/recent_maps_list_view.py b/felt/gui/recent_maps_list_view.py index a9cdec0..1a859c3 100644 --- a/felt/gui/recent_maps_list_view.py +++ b/felt/gui/recent_maps_list_view.py @@ -342,8 +342,11 @@ def __init__(self, parent: Optional[QWidget] = None): QgsFilterLineEdit{ border-top: 1px solid #bdbdbd; border-right: 1px solid #bdbdbd; border-left: 1px solid #bdbdbd; + border-bottom: none; border-top-right-radius: 2px; border-top-left-radius: 2px; + border-bottom-right-radius: 0px; + border-bottom-left-radius: 0px; }""" def _update_filter_stylesheet(): From 86c7f3a90264a33ebc2d310af986c577269235df Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Dec 2023 13:14:19 +1000 Subject: [PATCH 2/8] Fix maps list appearance on more themes --- felt/gui/recent_maps_list_view.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/felt/gui/recent_maps_list_view.py b/felt/gui/recent_maps_list_view.py index 1a859c3..2c53f83 100644 --- a/felt/gui/recent_maps_list_view.py +++ b/felt/gui/recent_maps_list_view.py @@ -363,7 +363,17 @@ def _update_filter_stylesheet(): self._view = RecentMapsListView() self._view.setStyleSheet(""" - QListView { border: 1px solid #bdbdbd; } + QListView { + border: 1px solid #bdbdbd; + border-top-right-radius: 0px; + border-top-left-radius: 0px; + border-bottom-right-radius: 2px; + border-bottom-left-radius: 2px; + background: white! important; + } + QListView::item::selected { + background-color: #fed9e3; + } """) vl.addWidget(self._view, 1) From 50927c2735da9d7ed49d9ebf02e0317ba54a5fce Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Dec 2023 13:27:10 +1000 Subject: [PATCH 3/8] Use basic combo box appearance to avoid dark theme issues --- felt/gui/create_map_dialog.py | 39 +++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/felt/gui/create_map_dialog.py b/felt/gui/create_map_dialog.py index 591f60a..771f994 100644 --- a/felt/gui/create_map_dialog.py +++ b/felt/gui/create_map_dialog.py @@ -229,6 +229,45 @@ def upload_raster_as_styled_toggled(): self.maps_widget = RecentMapsWidget() self.workspace_combo = WorkspacesComboBox() self.workspace_combo.workspace_changed.connect(self._workspace_changed) + self.workspace_combo.setFixedHeight( + int(QFontMetrics(self.workspace_combo.font()).height() * 1.5) + ) + self.workspace_combo.setStyleSheet( + """ + QComboBox{ + background: white; + color: black; + selection-background-color: #fed9e3 !important; + selection-color: black !important; + border: 1px solid #bdbdbd; + border-top-right-radius: 2px; + border-top-left-radius: 2px; + border-bottom-right-radius: 2px; + border-bottom-left-radius: 2px; + } + QComboBox:hover { + background: white; + color: black; + selection-background-color: #fed9e3 !important; + selection-color: black !important; + } + QComboBox:on { + background: white; + color: black; + selection-background-color: #fed9e3 !important; + selection-color: black !important; + } + QComboBox QAbstractItemView, QComboBox QListView { + background: white; + color: black; + selection-background-color: #fed9e3 !important; + selection-color: black !important; + } + QComboBox::drop-down:editable:hover { + background-color: @darkalternativegradient; + } + """ + ) maps_layout = QVBoxLayout() maps_layout.setContentsMargins(0, 0, 0, 0) From 3b03a0a11232ee2c85c35897253ea8445f1e0789 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Dec 2023 13:29:30 +1000 Subject: [PATCH 4/8] Fix button alignment --- felt/ui/create_map.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/felt/ui/create_map.ui b/felt/ui/create_map.ui index c30bf42..dac5629 100644 --- a/felt/ui/create_map.ui +++ b/felt/ui/create_map.ui @@ -171,7 +171,7 @@ - + From 2acb145fb62c66caaa81aed17d49e5f709834ad3 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Dec 2023 13:30:52 +1000 Subject: [PATCH 5/8] Improve settings button appearance --- felt/gui/create_map_dialog.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/felt/gui/create_map_dialog.py b/felt/gui/create_map_dialog.py index 771f994..ec90590 100644 --- a/felt/gui/create_map_dialog.py +++ b/felt/gui/create_map_dialog.py @@ -202,7 +202,10 @@ def upload_raster_as_styled_toggled(): self.setting_button.setPopupMode(QToolButton.InstantPopup) self.setting_button.setStyleSheet( """QToolButton::menu-indicator { image: none } - QToolButton { border: 1px solid red; border-radius: 2px; } + QToolButton { + background: #f9f9f9; + border: 1px solid #242424; + border-radius: 2px; } """ ) self.setting_button.setFixedHeight( From e0aaa31bc118b241b35dd67597a8b7fd7812790e Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Dec 2023 13:31:16 +1000 Subject: [PATCH 6/8] Try to fix Close button appearance on mac --- felt/gui/gui_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/felt/gui/gui_utils.py b/felt/gui/gui_utils.py index 97b46d0..d38dbea 100644 --- a/felt/gui/gui_utils.py +++ b/felt/gui/gui_utils.py @@ -53,8 +53,8 @@ } QPushButton { - background: solid #3d521e; - color: white; + background: solid #3d521e !important; + color: white !important; } QLineEdit { From b90577420ac8bac355cf515f979bcce6ddf27c5a Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 5 Dec 2023 13:33:40 +1000 Subject: [PATCH 7/8] Remove trailing whitespace --- felt/gui/create_map_dialog.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/felt/gui/create_map_dialog.py b/felt/gui/create_map_dialog.py index ec90590..c0ec632 100644 --- a/felt/gui/create_map_dialog.py +++ b/felt/gui/create_map_dialog.py @@ -202,7 +202,7 @@ def upload_raster_as_styled_toggled(): self.setting_button.setPopupMode(QToolButton.InstantPopup) self.setting_button.setStyleSheet( """QToolButton::menu-indicator { image: none } - QToolButton { + QToolButton { background: #f9f9f9; border: 1px solid #242424; border-radius: 2px; } @@ -237,7 +237,7 @@ def upload_raster_as_styled_toggled(): ) self.workspace_combo.setStyleSheet( """ - QComboBox{ + QComboBox{ background: white; color: black; selection-background-color: #fed9e3 !important; @@ -248,19 +248,19 @@ def upload_raster_as_styled_toggled(): border-bottom-right-radius: 2px; border-bottom-left-radius: 2px; } - QComboBox:hover { + QComboBox:hover { background: white; color: black; selection-background-color: #fed9e3 !important; selection-color: black !important; } - QComboBox:on { + QComboBox:on { background: white; color: black; selection-background-color: #fed9e3 !important; selection-color: black !important; } - QComboBox QAbstractItemView, QComboBox QListView { + QComboBox QAbstractItemView, QComboBox QListView { background: white; color: black; selection-background-color: #fed9e3 !important; From 6c9c261e52058bab6614b0c5d30ed03323a7b333 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Wed, 6 Dec 2023 08:25:50 +1000 Subject: [PATCH 8/8] Use lighter background color for settings button --- felt/gui/create_map_dialog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/felt/gui/create_map_dialog.py b/felt/gui/create_map_dialog.py index c0ec632..e635941 100644 --- a/felt/gui/create_map_dialog.py +++ b/felt/gui/create_map_dialog.py @@ -204,7 +204,7 @@ def upload_raster_as_styled_toggled(): """QToolButton::menu-indicator { image: none } QToolButton { background: #f9f9f9; - border: 1px solid #242424; + border: 1px solid #bdbdbd; border-radius: 2px; } """ )