forked from Boria138/PortProtonQt
		
	Compare commits
	
		
			6 Commits
		
	
	
		
			d0eea92139
			...
			37b108f689
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						
						
							
						
						37b108f689
	
				 | 
					
					
						|||
| 78f5118709 | |||
| 1f14dd7fdf | |||
| 3d3bdd8f98 | |||
| 9d7c674544 | |||
| e6c90508ab | 
@@ -17,6 +17,10 @@
 | 
				
			|||||||
- Дублирование обводки выделения карточек при быстром перемешении мыши
 | 
					- Дублирование обводки выделения карточек при быстром перемешении мыши
 | 
				
			||||||
- Завершение приложения при закритие окна
 | 
					- Завершение приложения при закритие окна
 | 
				
			||||||
- Использование системной палитры в темах
 | 
					- Использование системной палитры в темах
 | 
				
			||||||
 | 
					- Ошибки темы в нативном пакете
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					### Contributors
 | 
				
			||||||
 | 
					- @Dervart
 | 
				
			||||||
 | 
					
 | 
				
			||||||
---
 | 
					---
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -95,6 +95,7 @@ class AddGameDialog(QDialog):
 | 
				
			|||||||
        self.setStyleSheet(self.theme.MAIN_WINDOW_STYLE + self.theme.MESSAGE_BOX_STYLE)
 | 
					        self.setStyleSheet(self.theme.MAIN_WINDOW_STYLE + self.theme.MESSAGE_BOX_STYLE)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        layout = QFormLayout(self)
 | 
					        layout = QFormLayout(self)
 | 
				
			||||||
 | 
					        layout.setLabelAlignment(Qt.AlignmentFlag.AlignLeft)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # Game name
 | 
					        # Game name
 | 
				
			||||||
        self.nameEdit = QLineEdit(self)
 | 
					        self.nameEdit = QLineEdit(self)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -40,6 +40,7 @@ from typing import cast
 | 
				
			|||||||
from collections.abc import Callable
 | 
					from collections.abc import Callable
 | 
				
			||||||
from concurrent.futures import ThreadPoolExecutor
 | 
					from concurrent.futures import ThreadPoolExecutor
 | 
				
			||||||
from datetime import datetime
 | 
					from datetime import datetime
 | 
				
			||||||
 | 
					from PySide6.QtWidgets import QSizePolicy
 | 
				
			||||||
 | 
					
 | 
				
			||||||
logger = get_logger(__name__)
 | 
					logger = get_logger(__name__)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -954,9 +955,11 @@ class MainWindow(QMainWindow):
 | 
				
			|||||||
        formLayout = QFormLayout()
 | 
					        formLayout = QFormLayout()
 | 
				
			||||||
        formLayout.setContentsMargins(0, 10, 0, 0)
 | 
					        formLayout.setContentsMargins(0, 10, 0, 0)
 | 
				
			||||||
        formLayout.setSpacing(10)
 | 
					        formLayout.setSpacing(10)
 | 
				
			||||||
 | 
					        formLayout.setLabelAlignment(Qt.AlignmentFlag.AlignLeft)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        # 1. Time detail_level
 | 
					        # 1. Time detail_level
 | 
				
			||||||
        self.timeDetailCombo = QComboBox()
 | 
					        self.timeDetailCombo = QComboBox()
 | 
				
			||||||
 | 
					        self.timeDetailCombo.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
 | 
				
			||||||
        self.time_keys = ["detailed", "brief"]
 | 
					        self.time_keys = ["detailed", "brief"]
 | 
				
			||||||
        self.time_labels = [_("detailed"), _("brief")]
 | 
					        self.time_labels = [_("detailed"), _("brief")]
 | 
				
			||||||
        self.timeDetailCombo.addItems(self.time_labels)
 | 
					        self.timeDetailCombo.addItems(self.time_labels)
 | 
				
			||||||
@@ -975,6 +978,7 @@ class MainWindow(QMainWindow):
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        # 2. Games sort_method
 | 
					        # 2. Games sort_method
 | 
				
			||||||
        self.gamesSortCombo = QComboBox()
 | 
					        self.gamesSortCombo = QComboBox()
 | 
				
			||||||
 | 
					        self.gamesSortCombo.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
 | 
				
			||||||
        self.sort_keys = ["last_launch", "playtime", "alphabetical", "favorites"]
 | 
					        self.sort_keys = ["last_launch", "playtime", "alphabetical", "favorites"]
 | 
				
			||||||
        self.sort_labels = [_("last launch"), _("playtime"), _("alphabetical"), _("favorites")]
 | 
					        self.sort_labels = [_("last launch"), _("playtime"), _("alphabetical"), _("favorites")]
 | 
				
			||||||
        self.gamesSortCombo.addItems(self.sort_labels)
 | 
					        self.gamesSortCombo.addItems(self.sort_labels)
 | 
				
			||||||
@@ -995,6 +999,7 @@ class MainWindow(QMainWindow):
 | 
				
			|||||||
        self.filter_keys = ["all", "steam", "portproton", "favorites", "epic"]
 | 
					        self.filter_keys = ["all", "steam", "portproton", "favorites", "epic"]
 | 
				
			||||||
        self.filter_labels = [_("all"), "steam", "portproton", _("favorites")]
 | 
					        self.filter_labels = [_("all"), "steam", "portproton", _("favorites")]
 | 
				
			||||||
        self.gamesDisplayCombo = QComboBox()
 | 
					        self.gamesDisplayCombo = QComboBox()
 | 
				
			||||||
 | 
					        self.gamesDisplayCombo.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
 | 
				
			||||||
        self.gamesDisplayCombo.addItems(self.filter_labels)
 | 
					        self.gamesDisplayCombo.addItems(self.filter_labels)
 | 
				
			||||||
        self.gamesDisplayCombo.setStyleSheet(self.theme.SETTINGS_COMBO_STYLE)
 | 
					        self.gamesDisplayCombo.setStyleSheet(self.theme.SETTINGS_COMBO_STYLE)
 | 
				
			||||||
        self.gamesDisplayCombo.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
 | 
					        self.gamesDisplayCombo.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -190,13 +190,6 @@ SEARCH_EDIT_STYLE = """
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
"""
 | 
					"""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SETTINGS_CHECKBOX_STYLE = """
 | 
					 | 
				
			||||||
    QCheckBox:focus {
 | 
					 | 
				
			||||||
            border: 2px solid #409EFF;
 | 
					 | 
				
			||||||
            background: #404554;
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
"""
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
# ОТКЛЮЧАЕМ РАМКУ У QScrollArea
 | 
					# ОТКЛЮЧАЕМ РАМКУ У QScrollArea
 | 
				
			||||||
SCROLL_AREA_STYLE = """
 | 
					SCROLL_AREA_STYLE = """
 | 
				
			||||||
    QWidget {
 | 
					    QWidget {
 | 
				
			||||||
@@ -703,7 +696,8 @@ SETTINGS_COMBO_STYLE = f"""
 | 
				
			|||||||
    }}
 | 
					    }}
 | 
				
			||||||
    QComboBox:on {{
 | 
					    QComboBox:on {{
 | 
				
			||||||
        background: #373a43;
 | 
					        background: #373a43;
 | 
				
			||||||
        border: 1px solid #409EFF;
 | 
					        border: 2px solid #409EFF;
 | 
				
			||||||
 | 
					        border-bottom-style: none;
 | 
				
			||||||
        border-top-left-radius: 10px;
 | 
					        border-top-left-radius: 10px;
 | 
				
			||||||
        border-top-right-radius: 10px;
 | 
					        border-top-right-radius: 10px;
 | 
				
			||||||
        border-bottom-left-radius: 0px;
 | 
					        border-bottom-left-radius: 0px;
 | 
				
			||||||
@@ -741,15 +735,20 @@ SETTINGS_COMBO_STYLE = f"""
 | 
				
			|||||||
    /* Список при открытом комбобоксе */
 | 
					    /* Список при открытом комбобоксе */
 | 
				
			||||||
    QComboBox QAbstractItemView {{
 | 
					    QComboBox QAbstractItemView {{
 | 
				
			||||||
        outline: none;
 | 
					        outline: none;
 | 
				
			||||||
        border: 1px solid #409EFF;
 | 
					        border: 2px solid #409EFF;
 | 
				
			||||||
        border-top-style: none;
 | 
					        border-top-style: none;
 | 
				
			||||||
 | 
					        border-top-left-radius: 0px;
 | 
				
			||||||
 | 
					        border-top-right-radius: 0px;
 | 
				
			||||||
 | 
					        border-bottom-left-radius: 10px;
 | 
				
			||||||
 | 
					        border-bottom-right-radius: 10px;
 | 
				
			||||||
    }}
 | 
					    }}
 | 
				
			||||||
    QListView {{
 | 
					    QListView {{
 | 
				
			||||||
        background: #3f424d;
 | 
					        background: #3f424d;
 | 
				
			||||||
    }}
 | 
					    }}
 | 
				
			||||||
    QListView::item {{
 | 
					    QListView::item {{
 | 
				
			||||||
        padding: 7px 7px 7px 12px;
 | 
					        padding: 7px 7px 7px 12px;
 | 
				
			||||||
        border-radius: 0px;
 | 
					        margin: 0px 3px 3px 3px;
 | 
				
			||||||
 | 
					        border-radius: 10px;
 | 
				
			||||||
        color: #ffffff;
 | 
					        color: #ffffff;
 | 
				
			||||||
    }}
 | 
					    }}
 | 
				
			||||||
    QListView::item:hover {{
 | 
					    QListView::item:hover {{
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user