rbeesoft 1.0.3__py3-none-any.whl → 1.0.5__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- rbeesoft/ui/mainwindow.py +17 -4
- rbeesoft/ui/panels/logpanel.py +4 -4
- rbeesoft/ui/panels/mainpanel.py +6 -6
- rbeesoft/ui/panels/settingspanel.py +5 -5
- rbeesoft/ui/settings.py +6 -6
- {rbeesoft-1.0.3.dist-info → rbeesoft-1.0.5.dist-info}/METADATA +1 -1
- {rbeesoft-1.0.3.dist-info → rbeesoft-1.0.5.dist-info}/RECORD +10 -10
- {rbeesoft-1.0.3.dist-info → rbeesoft-1.0.5.dist-info}/LICENSE +0 -0
- {rbeesoft-1.0.3.dist-info → rbeesoft-1.0.5.dist-info}/WHEEL +0 -0
- {rbeesoft-1.0.3.dist-info → rbeesoft-1.0.5.dist-info}/entry_points.txt +0 -0
rbeesoft/ui/mainwindow.py
CHANGED
|
@@ -15,20 +15,33 @@ from rbeesoft.ui.utils import resource_path, version
|
|
|
15
15
|
|
|
16
16
|
|
|
17
17
|
class MainWindow(QMainWindow):
|
|
18
|
-
def __init__(self):
|
|
18
|
+
def __init__(self, title, app_name, icon):
|
|
19
19
|
super(MainWindow, self).__init__()
|
|
20
|
+
self._title = title
|
|
21
|
+
self._app_name = app_name
|
|
22
|
+
self._icon = icon
|
|
20
23
|
self._settings = None
|
|
21
24
|
self.init_window()
|
|
22
25
|
|
|
23
26
|
def init_window(self):
|
|
24
|
-
self.setWindowTitle(f'{
|
|
25
|
-
self.setWindowIcon(QIcon(resource_path(os.path.join(
|
|
26
|
-
|
|
27
|
+
self.setWindowTitle(f'{self.title()} {version(self.app_name())}')
|
|
28
|
+
# self.setWindowIcon(QIcon(resource_path(os.path.join(
|
|
29
|
+
# Constants.RBEESOFT_RESOURCES_IMAGES_ICONS_DIR, Constants.RBEESOFT_RESOURCES_ICON))))
|
|
30
|
+
self.setWindowIcon(self.icon())
|
|
27
31
|
if not self.load_geometry_and_state():
|
|
28
32
|
self.set_default_size_and_position()
|
|
29
33
|
|
|
30
34
|
# GETTERS
|
|
31
35
|
|
|
36
|
+
def title(self):
|
|
37
|
+
return self._title
|
|
38
|
+
|
|
39
|
+
def app_name(self):
|
|
40
|
+
return self._app_name
|
|
41
|
+
|
|
42
|
+
def icon(self):
|
|
43
|
+
return self._icon
|
|
44
|
+
|
|
32
45
|
def settings(self):
|
|
33
46
|
if not self._settings:
|
|
34
47
|
self._settings = Settings()
|
rbeesoft/ui/panels/logpanel.py
CHANGED
|
@@ -7,7 +7,7 @@ from PySide6.QtWidgets import (
|
|
|
7
7
|
QLabel,
|
|
8
8
|
)
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
from rbeesoft.ui.constants import Constants
|
|
11
11
|
|
|
12
12
|
from rbeesoft.core.utils.logmanagerlistener import LogManagerListener
|
|
13
13
|
|
|
@@ -21,7 +21,7 @@ class LogPanel(QDockWidget, LogManagerListener):
|
|
|
21
21
|
|
|
22
22
|
def title_label(self):
|
|
23
23
|
if not self._title_label:
|
|
24
|
-
self._title_label = QLabel(
|
|
24
|
+
self._title_label = QLabel(Constants.RBEESOFT_LOG_PANEL_TITLE)
|
|
25
25
|
return self._title_label
|
|
26
26
|
|
|
27
27
|
def text_edit(self):
|
|
@@ -30,7 +30,7 @@ class LogPanel(QDockWidget, LogManagerListener):
|
|
|
30
30
|
return self._text_edit
|
|
31
31
|
|
|
32
32
|
def init_layout(self):
|
|
33
|
-
clear_logs_button = QPushButton(
|
|
33
|
+
clear_logs_button = QPushButton(Constants.RBEESOFT_LOG_PANEL_CLEAR_LOGS_BUTTON)
|
|
34
34
|
clear_logs_button.clicked.connect(self.handle_clear_logs_button)
|
|
35
35
|
layout = QVBoxLayout()
|
|
36
36
|
# layout.addWidget(self.title_label())
|
|
@@ -38,7 +38,7 @@ class LogPanel(QDockWidget, LogManagerListener):
|
|
|
38
38
|
layout.addWidget(clear_logs_button)
|
|
39
39
|
container = QWidget()
|
|
40
40
|
container.setLayout(layout)
|
|
41
|
-
self.setObjectName(
|
|
41
|
+
self.setObjectName(Constants.RBEESOFT_LOG_PANEL_NAME)
|
|
42
42
|
self.setWindowTitle(self.title_label().text())
|
|
43
43
|
self.setWidget(container)
|
|
44
44
|
|
rbeesoft/ui/panels/mainpanel.py
CHANGED
|
@@ -8,7 +8,7 @@ from PySide6.QtWidgets import (
|
|
|
8
8
|
QDockWidget,
|
|
9
9
|
)
|
|
10
10
|
|
|
11
|
-
|
|
11
|
+
from rbeesoft.ui.constants import Constants
|
|
12
12
|
|
|
13
13
|
from rbeesoft.ui.settings import Settings
|
|
14
14
|
from rbeesoft.ui.panels.stackedpanel import StackedPanel
|
|
@@ -34,7 +34,7 @@ class MainPanel(QDockWidget):
|
|
|
34
34
|
layout.addWidget(self.stacked_panel())
|
|
35
35
|
container = QWidget()
|
|
36
36
|
container.setLayout(layout)
|
|
37
|
-
self.setObjectName(
|
|
37
|
+
self.setObjectName(Constants.RBEESOFT_MAIN_PANEL_NAME)
|
|
38
38
|
self.setWidget(container)
|
|
39
39
|
|
|
40
40
|
# GETTERS
|
|
@@ -47,13 +47,13 @@ class MainPanel(QDockWidget):
|
|
|
47
47
|
def title_label(self):
|
|
48
48
|
if not self._title_label:
|
|
49
49
|
self._title_label = QLabel('')
|
|
50
|
-
self._title_label.setStyleSheet(
|
|
50
|
+
self._title_label.setStyleSheet(Constants.RBEESOFT_MAIN_PANEL_NAME_TITLE_LABEL_STYLESHEET)
|
|
51
51
|
return self._title_label
|
|
52
52
|
|
|
53
53
|
def donate_button(self):
|
|
54
54
|
if not self._donate_button:
|
|
55
|
-
self._donate_button = QPushButton(
|
|
56
|
-
self._donate_button.setStyleSheet(
|
|
55
|
+
self._donate_button = QPushButton(Constants.RBEESOFT_DONATE_BUTTON_TEXT)
|
|
56
|
+
self._donate_button.setStyleSheet(Constants.RBEESOFT_DONATE_BUTTON_STYLESHEET)
|
|
57
57
|
self._donate_button.clicked.connect(self.handle_donate_button)
|
|
58
58
|
return self._donate_button
|
|
59
59
|
|
|
@@ -78,4 +78,4 @@ class MainPanel(QDockWidget):
|
|
|
78
78
|
# EVENT HANDLERS
|
|
79
79
|
|
|
80
80
|
def handle_donate_button(self):
|
|
81
|
-
webbrowser.open(
|
|
81
|
+
webbrowser.open(Constants.RBEESOFT_DONATE_URL)
|
|
@@ -7,7 +7,7 @@ from PySide6.QtWidgets import (
|
|
|
7
7
|
)
|
|
8
8
|
from PySide6.QtCore import Qt
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
from rbeesoft.ui.constants import Constants
|
|
11
11
|
|
|
12
12
|
from rbeesoft.ui.settings import Settings
|
|
13
13
|
from rbeesoft.ui.panels.defaultpanel import DefaultPanel
|
|
@@ -16,7 +16,7 @@ from rbeesoft.ui.panels.defaultpanel import DefaultPanel
|
|
|
16
16
|
class SettingsPanel(DefaultPanel):
|
|
17
17
|
def __init__(self):
|
|
18
18
|
super(SettingsPanel, self).__init__()
|
|
19
|
-
self.set_title(
|
|
19
|
+
self.set_title(Constants.RBEESOFT_SETTINGS_PANEL_TITLE)
|
|
20
20
|
self._title_label = None
|
|
21
21
|
self._settings = None
|
|
22
22
|
self._settings_table_widget = None
|
|
@@ -44,12 +44,12 @@ class SettingsPanel(DefaultPanel):
|
|
|
44
44
|
if isinstance(value, str) or isinstance(value, int) or isinstance(value, bool) or isinstance(value, float):
|
|
45
45
|
self._settings_table_widget.setItem(row_index, 1, QTableWidgetItem(str(value)))
|
|
46
46
|
else:
|
|
47
|
-
self._settings_table_widget.setItem(row_index, 1, QTableWidgetItem(
|
|
47
|
+
self._settings_table_widget.setItem(row_index, 1, QTableWidgetItem(Constants.RBEESOFT_SETTINGS_PANEL_CANNOT_DISPLAY_MESSAGE))
|
|
48
48
|
row_index += 1
|
|
49
49
|
self._settings_table_widget.resizeColumnsToContents()
|
|
50
50
|
self._settings_table_widget.sortItems(0, Qt.AscendingOrder)
|
|
51
51
|
self._settings_table_widget.setHorizontalHeaderLabels([
|
|
52
|
-
|
|
52
|
+
Constants.RBEESOFT_SETTINGS_PANEL_NAME_COLUMN_NAME, Constants.RBEESOFT_SETTINGS_PANEL_VALUE_COLUMN_NAME])
|
|
53
53
|
self._settings_table_widget.horizontalHeader().setSectionResizeMode(QHeaderView.Interactive)
|
|
54
54
|
self._settings_table_widget.horizontalHeader().setSectionResizeMode(1, QHeaderView.Stretch)
|
|
55
55
|
self._settings_table_widget.horizontalHeader().setDefaultAlignment(Qt.AlignLeft | Qt.AlignVCenter)
|
|
@@ -59,4 +59,4 @@ class SettingsPanel(DefaultPanel):
|
|
|
59
59
|
layout = QVBoxLayout()
|
|
60
60
|
layout.addWidget(self.settings_table_widget())
|
|
61
61
|
self.setLayout(layout)
|
|
62
|
-
self.setObjectName(
|
|
62
|
+
self.setObjectName(Constants.RBEESOFT_SETTINGS_PANEL_NAME)
|
rbeesoft/ui/settings.py
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
from PySide6.QtCore import QSettings
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
from rbeesoft.ui.constants import Constants
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
class Settings(QSettings):
|
|
@@ -8,19 +8,19 @@ class Settings(QSettings):
|
|
|
8
8
|
super(Settings, self).__init__(
|
|
9
9
|
QSettings.IniFormat,
|
|
10
10
|
QSettings.UserScope,
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
Constants.RBEESOFT_BUNDLE_IDENTIFIER,
|
|
12
|
+
Constants.RBEESOFT_NAME,
|
|
13
13
|
)
|
|
14
14
|
|
|
15
15
|
def prepend_bundle_identifier_and_name(self, name):
|
|
16
16
|
return '{}.{}.{}'.format(
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
Constants.RBEESOFT_BUNDLE_IDENTIFIER,
|
|
18
|
+
Constants.RBEESOFT_NAME,
|
|
19
19
|
name,
|
|
20
20
|
)
|
|
21
21
|
|
|
22
22
|
def get(self, name, default=None):
|
|
23
|
-
if not name.startswith(
|
|
23
|
+
if not name.startswith(Constants.RBEESOFT_BUNDLE_IDENTIFIER):
|
|
24
24
|
name = self.prepend_bundle_identifier_and_name(name)
|
|
25
25
|
value = self.value(name)
|
|
26
26
|
if value is None or value == '':
|
|
@@ -14,17 +14,17 @@ rbeesoft/ui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
|
14
14
|
rbeesoft/ui/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
15
15
|
rbeesoft/ui/components/splashscreen.py,sha256=yEsB4LRho84O2JwVwPX6BoQZ3IK3iwFWrL6G7sRn0JE,4872
|
|
16
16
|
rbeesoft/ui/constants.py,sha256=joQSsHIXiy21l6SRZz-kjp9kFVCNZjlg4bzHwdt1oIs,2028
|
|
17
|
-
rbeesoft/ui/mainwindow.py,sha256=
|
|
17
|
+
rbeesoft/ui/mainwindow.py,sha256=UiXRpZ2NuJjkSP-3o3yQUCJsKgE-V9r9Yqktu4PNflI,2533
|
|
18
18
|
rbeesoft/ui/panels/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
19
19
|
rbeesoft/ui/panels/defaultpanel.py,sha256=eZpieFy9S1NStsCT7DhLHlmZchD-cZ3EJKkH9uTxat8,290
|
|
20
|
-
rbeesoft/ui/panels/logpanel.py,sha256=
|
|
21
|
-
rbeesoft/ui/panels/mainpanel.py,sha256=
|
|
22
|
-
rbeesoft/ui/panels/settingspanel.py,sha256=
|
|
20
|
+
rbeesoft/ui/panels/logpanel.py,sha256=JcBuqreih-7QxB9iJNfgPaqVpT98YrkC9U0rOOg6VHk,1639
|
|
21
|
+
rbeesoft/ui/panels/mainpanel.py,sha256=e-sT6JSQjKRaic36clJtPIFozsYvfs2IYVypEuzzk4E,2449
|
|
22
|
+
rbeesoft/ui/panels/settingspanel.py,sha256=laBOH0C3X5XZkYxlEQijJCNc9SMNVUka0T9C0JBh3r8,3000
|
|
23
23
|
rbeesoft/ui/panels/stackedpanel.py,sha256=dK1YWuHUzxRhVb5gP0Lu9rAiW4XagjcHmGF__5Lpufk,657
|
|
24
|
-
rbeesoft/ui/settings.py,sha256=
|
|
24
|
+
rbeesoft/ui/settings.py,sha256=V-u1bXaSv1jdZnTqh_4Sw-EoMi2-IoFIoVDidc099qY,1008
|
|
25
25
|
rbeesoft/ui/utils.py,sha256=udZZs8iy2T6k9e7ADGzhYQ1caig-Zpm0AKy6woxRcqc,797
|
|
26
|
-
rbeesoft-1.0.
|
|
27
|
-
rbeesoft-1.0.
|
|
28
|
-
rbeesoft-1.0.
|
|
29
|
-
rbeesoft-1.0.
|
|
30
|
-
rbeesoft-1.0.
|
|
26
|
+
rbeesoft-1.0.5.dist-info/entry_points.txt,sha256=TxyAieXCBttKeq8DjKk6o15iqnWpjj9FOtGknE5wKI0,46
|
|
27
|
+
rbeesoft-1.0.5.dist-info/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
|
|
28
|
+
rbeesoft-1.0.5.dist-info/METADATA,sha256=__xIT43djh-iOdiesCb4ansD4dvG_QbvFjyNt0N8iYQ,588
|
|
29
|
+
rbeesoft-1.0.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
|
|
30
|
+
rbeesoft-1.0.5.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
|
File without changes
|