Skip to content

Commit 780a429

Browse files
author
arch
committed
add open docs button
1 parent d3caf9b commit 780a429

File tree

5 files changed

+167
-143
lines changed

5 files changed

+167
-143
lines changed

‎funscript_editor/definitions.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
CONFIG_DIR = os.path.join(ROOT_DIR, 'config')
1616
UI_DIR = os.path.join(ROOT_DIR, 'ui')
1717
ICON_PATH = os.path.join(CONFIG_DIR, 'icon.png')
18+
DOCS_URL = "https://github.com/michael-mueller-git/Python-Funscript-Editor/tree/{tag}/docs/app/docs"
1819

1920
if os.path.exists(os.path.join(ROOT_DIR, '..', 'docs')):
2021
APP_DOCUMENTATION_DIR = os.path.join(ROOT_DIR, '..', 'docs', 'app', 'site')

‎funscript_editor/ui/funscript_editor_view.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Form implementation generated from reading ui file 'funscript_editor_view.ui'
44
#
5-
# Created by: PyQt5 UI code generator 5.15.4
5+
# Created by: PyQt5 UI code generator 5.15.6
66
#
77
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
88
# run again. Do not edit this file unless you know what you are doing.

‎funscript_editor/ui/settings_dialog.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
""" Settings Dialog for the Funscript Generator """
22
import json
33
import os
4+
import webbrowser
45

56
import funscript_editor.ui.settings_view as settings_view
7+
import funscript_editor.definitions as definitions
8+
import funscript_editor.utils.config as config
69

710
from funscript_editor.utils.config import PROJECTION
811
from funscript_editor.definitions import CONFIG_DIR
@@ -108,6 +111,15 @@ def __setup_ui_bindings(self):
108111
self.ui.processingSpeedComboBox.currentTextChanged.connect(lambda value: self.__set_str_setting('skipFrames', value))
109112
self.ui.topPointOffsetSpinBox.valueChanged.connect(lambda value: self.__set_number_setting("topPointOffset", value))
110113
self.ui.bottomPointOffsetSpinBox.valueChanged.connect(lambda value: self.__set_number_setting("bottomPointOffset", value))
114+
self.ui.docsButton.clicked.connect(self.__open_documentation)
115+
116+
117+
def __open_documentation(self):
118+
try:
119+
browser = webbrowser.get()
120+
browser.open_new(definitions.DOCS_URL.format(tag=str('main' if config.VERSION == '0.0.0' else 'v'+config.VERSION)))
121+
except:
122+
pass
111123

112124

113125
def __setup_combo_boxes(self):

‎funscript_editor/ui/settings_view.py‎

Lines changed: 58 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Form implementation generated from reading ui file 'settings_view.ui'
44
#
5-
# Created by: PyQt5 UI code generator 5.15.4
5+
# Created by: PyQt5 UI code generator 5.15.6
66
#
77
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
88
# run again. Do not edit this file unless you know what you are doing.
@@ -21,9 +21,22 @@ def setupUi(self, Form):
2121
self.gridLayout_4.setSpacing(6)
2222
self.gridLayout_4.setObjectName("gridLayout_4")
2323
spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
24-
self.gridLayout_4.addItem(spacerItem, 2, 0, 1, 1)
24+
self.gridLayout_4.addItem(spacerItem, 0, 0, 1, 1)
2525
self.formLayout = QtWidgets.QFormLayout()
2626
self.formLayout.setObjectName("formLayout")
27+
self.label_4 = QtWidgets.QLabel(Form)
28+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
29+
sizePolicy.setHorizontalStretch(0)
30+
sizePolicy.setVerticalStretch(0)
31+
sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
32+
self.label_4.setSizePolicy(sizePolicy)
33+
font = QtGui.QFont()
34+
font.setPointSize(18)
35+
font.setBold(True)
36+
font.setWeight(75)
37+
self.label_4.setFont(font)
38+
self.label_4.setObjectName("label_4")
39+
self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_4)
2740
self.label = QtWidgets.QLabel(Form)
2841
self.label.setObjectName("label")
2942
self.formLayout.setWidget(1, QtWidgets.QFormLayout.LabelRole, self.label)
@@ -38,9 +51,6 @@ def setupUi(self, Form):
3851
self.label_2 = QtWidgets.QLabel(Form)
3952
self.label_2.setObjectName("label_2")
4053
self.formLayout.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.label_2)
41-
self.label_3 = QtWidgets.QLabel(Form)
42-
self.label_3.setObjectName("label_3")
43-
self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_3)
4454
self.trackingMetricComboBox = QtWidgets.QComboBox(Form)
4555
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
4656
sizePolicy.setHorizontalStretch(0)
@@ -49,6 +59,9 @@ def setupUi(self, Form):
4959
self.trackingMetricComboBox.setSizePolicy(sizePolicy)
5060
self.trackingMetricComboBox.setObjectName("trackingMetricComboBox")
5161
self.formLayout.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.trackingMetricComboBox)
62+
self.label_3 = QtWidgets.QLabel(Form)
63+
self.label_3.setObjectName("label_3")
64+
self.formLayout.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.label_3)
5265
self.trackingMethodComboBox = QtWidgets.QComboBox(Form)
5366
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
5467
sizePolicy.setHorizontalStretch(0)
@@ -57,27 +70,20 @@ def setupUi(self, Form):
5770
self.trackingMethodComboBox.setSizePolicy(sizePolicy)
5871
self.trackingMethodComboBox.setObjectName("trackingMethodComboBox")
5972
self.formLayout.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.trackingMethodComboBox)
60-
self.horizontalLayout = QtWidgets.QHBoxLayout()
61-
self.horizontalLayout.setObjectName("horizontalLayout")
62-
spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
63-
self.horizontalLayout.addItem(spacerItem1)
64-
self.okButton = QtWidgets.QPushButton(Form)
65-
self.okButton.setObjectName("okButton")
66-
self.horizontalLayout.addWidget(self.okButton)
67-
self.formLayout.setLayout(10, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout)
68-
self.label_4 = QtWidgets.QLabel(Form)
69-
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
73+
self.label_10 = QtWidgets.QLabel(Form)
74+
self.label_10.setObjectName("label_10")
75+
self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_10)
76+
self.processingSpeedComboBox = QtWidgets.QComboBox(Form)
77+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
7078
sizePolicy.setHorizontalStretch(0)
7179
sizePolicy.setVerticalStretch(0)
72-
sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
73-
self.label_4.setSizePolicy(sizePolicy)
74-
font = QtGui.QFont()
75-
font.setPointSize(18)
76-
font.setBold(True)
77-
font.setWeight(75)
78-
self.label_4.setFont(font)
79-
self.label_4.setObjectName("label_4")
80-
self.formLayout.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.label_4)
80+
sizePolicy.setHeightForWidth(self.processingSpeedComboBox.sizePolicy().hasHeightForWidth())
81+
self.processingSpeedComboBox.setSizePolicy(sizePolicy)
82+
self.processingSpeedComboBox.setObjectName("processingSpeedComboBox")
83+
self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.processingSpeedComboBox)
84+
self.label_5 = QtWidgets.QLabel(Form)
85+
self.label_5.setObjectName("label_5")
86+
self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_5)
8187
self.numberOfTrackerComboBox = QtWidgets.QComboBox(Form)
8288
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
8389
sizePolicy.setHorizontalStretch(0)
@@ -86,9 +92,9 @@ def setupUi(self, Form):
8692
self.numberOfTrackerComboBox.setSizePolicy(sizePolicy)
8793
self.numberOfTrackerComboBox.setObjectName("numberOfTrackerComboBox")
8894
self.formLayout.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.numberOfTrackerComboBox)
89-
self.label_5 = QtWidgets.QLabel(Form)
90-
self.label_5.setObjectName("label_5")
91-
self.formLayout.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.label_5)
95+
self.label_6 = QtWidgets.QLabel(Form)
96+
self.label_6.setObjectName("label_6")
97+
self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_6)
9298
self.pointsComboBox = QtWidgets.QComboBox(Form)
9399
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
94100
sizePolicy.setHorizontalStretch(0)
@@ -97,6 +103,9 @@ def setupUi(self, Form):
97103
self.pointsComboBox.setSizePolicy(sizePolicy)
98104
self.pointsComboBox.setObjectName("pointsComboBox")
99105
self.formLayout.setWidget(6, QtWidgets.QFormLayout.FieldRole, self.pointsComboBox)
106+
self.label_7 = QtWidgets.QLabel(Form)
107+
self.label_7.setObjectName("label_7")
108+
self.formLayout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.label_7)
100109
self.additionalPointsComboBox = QtWidgets.QComboBox(Form)
101110
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
102111
sizePolicy.setHorizontalStretch(0)
@@ -105,12 +114,9 @@ def setupUi(self, Form):
105114
self.additionalPointsComboBox.setSizePolicy(sizePolicy)
106115
self.additionalPointsComboBox.setObjectName("additionalPointsComboBox")
107116
self.formLayout.setWidget(7, QtWidgets.QFormLayout.FieldRole, self.additionalPointsComboBox)
108-
self.label_6 = QtWidgets.QLabel(Form)
109-
self.label_6.setObjectName("label_6")
110-
self.formLayout.setWidget(6, QtWidgets.QFormLayout.LabelRole, self.label_6)
111-
self.label_7 = QtWidgets.QLabel(Form)
112-
self.label_7.setObjectName("label_7")
113-
self.formLayout.setWidget(7, QtWidgets.QFormLayout.LabelRole, self.label_7)
117+
self.label_8 = QtWidgets.QLabel(Form)
118+
self.label_8.setObjectName("label_8")
119+
self.formLayout.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.label_8)
114120
self.topPointOffsetSpinBox = QtWidgets.QSpinBox(Form)
115121
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
116122
sizePolicy.setHorizontalStretch(0)
@@ -124,6 +130,9 @@ def setupUi(self, Form):
124130
self.topPointOffsetSpinBox.setProperty("value", 10)
125131
self.topPointOffsetSpinBox.setObjectName("topPointOffsetSpinBox")
126132
self.formLayout.setWidget(8, QtWidgets.QFormLayout.FieldRole, self.topPointOffsetSpinBox)
133+
self.label_9 = QtWidgets.QLabel(Form)
134+
self.label_9.setObjectName("label_9")
135+
self.formLayout.setWidget(9, QtWidgets.QFormLayout.LabelRole, self.label_9)
127136
self.bottomPointOffsetSpinBox = QtWidgets.QSpinBox(Form)
128137
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
129138
sizePolicy.setHorizontalStretch(0)
@@ -135,41 +144,36 @@ def setupUi(self, Form):
135144
self.bottomPointOffsetSpinBox.setProperty("value", -10)
136145
self.bottomPointOffsetSpinBox.setObjectName("bottomPointOffsetSpinBox")
137146
self.formLayout.setWidget(9, QtWidgets.QFormLayout.FieldRole, self.bottomPointOffsetSpinBox)
138-
self.label_8 = QtWidgets.QLabel(Form)
139-
self.label_8.setObjectName("label_8")
140-
self.formLayout.setWidget(8, QtWidgets.QFormLayout.LabelRole, self.label_8)
141-
self.label_9 = QtWidgets.QLabel(Form)
142-
self.label_9.setObjectName("label_9")
143-
self.formLayout.setWidget(9, QtWidgets.QFormLayout.LabelRole, self.label_9)
144-
self.processingSpeedComboBox = QtWidgets.QComboBox(Form)
145-
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.MinimumExpanding, QtWidgets.QSizePolicy.Fixed)
146-
sizePolicy.setHorizontalStretch(0)
147-
sizePolicy.setVerticalStretch(0)
148-
sizePolicy.setHeightForWidth(self.processingSpeedComboBox.sizePolicy().hasHeightForWidth())
149-
self.processingSpeedComboBox.setSizePolicy(sizePolicy)
150-
self.processingSpeedComboBox.setObjectName("processingSpeedComboBox")
151-
self.formLayout.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.processingSpeedComboBox)
152-
self.label_10 = QtWidgets.QLabel(Form)
153-
self.label_10.setObjectName("label_10")
154-
self.formLayout.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.label_10)
147+
self.horizontalLayout = QtWidgets.QHBoxLayout()
148+
self.horizontalLayout.setObjectName("horizontalLayout")
149+
spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
150+
self.horizontalLayout.addItem(spacerItem1)
151+
self.docsButton = QtWidgets.QPushButton(Form)
152+
self.docsButton.setObjectName("docsButton")
153+
self.horizontalLayout.addWidget(self.docsButton)
154+
self.okButton = QtWidgets.QPushButton(Form)
155+
self.okButton.setObjectName("okButton")
156+
self.horizontalLayout.addWidget(self.okButton)
157+
self.formLayout.setLayout(10, QtWidgets.QFormLayout.FieldRole, self.horizontalLayout)
155158
self.gridLayout_4.addLayout(self.formLayout, 1, 0, 1, 1)
156159
spacerItem2 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding)
157-
self.gridLayout_4.addItem(spacerItem2, 0, 0, 1, 1)
160+
self.gridLayout_4.addItem(spacerItem2, 2, 0, 1, 1)
158161

159162
self.retranslateUi(Form)
160163
QtCore.QMetaObject.connectSlotsByName(Form)
161164

162165
def retranslateUi(self, Form):
163166
_translate = QtCore.QCoreApplication.translate
164167
Form.setWindowTitle(_translate("Form", "Form"))
168+
self.label_4.setText(_translate("Form", " MTFG Settings"))
165169
self.label.setText(_translate("Form", "Video Type:"))
166170
self.label_2.setText(_translate("Form", "Tracking Metric:"))
167171
self.label_3.setText(_translate("Form", "Tracking Method:"))
168-
self.okButton.setText(_translate("Form", "OK"))
169-
self.label_4.setText(_translate("Form", " MTFG Settings"))
172+
self.label_10.setText(_translate("Form", "Processing Speed:"))
170173
self.label_5.setText(_translate("Form", "Number of Tracker:"))
171174
self.label_6.setText(_translate("Form", "Points:"))
172175
self.label_7.setText(_translate("Form", "Additional Points:"))
173176
self.label_8.setText(_translate("Form", "Top Points Offset:"))
174177
self.label_9.setText(_translate("Form", "Bottom Points Offset:"))
175-
self.label_10.setText(_translate("Form", "Processing Speed:"))
178+
self.docsButton.setText(_translate("Form", "Documentation"))
179+
self.okButton.setText(_translate("Form", "OK"))

0 commit comments

Comments
 (0)