Skip to content

Commit 4757028

Browse files
v4.52 beta
Not for use by end-user incomplete implementations of the upcoming update * new functions implemented * some typos fix
1 parent 098a59f commit 4757028

File tree

2 files changed

+369
-185
lines changed

2 files changed

+369
-185
lines changed

OptionsWin.py

Lines changed: 86 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
from PyQt5 import QtCore, QtGui, QtWidgets
2-
import os, sys
2+
import os
3+
import sys
4+
35

46
class Ui_OptionsWin(object):
57
def setupUi(self, OptionsWin):
68
self.appPath = str(os.getcwd())
79
self.tempPath = self.appPath + "\Data\prxUserMeta\\"
8-
#Settings
10+
# Settings
911
self.userFont = "Arial"
1012
self.userPort = "1337"
13+
self.userIp = ""
1114
self.userIPath = self.appPath
1215
self.userDPath = self.appPath
1316
self.userHB = "False"
1417
try:
15-
with open(self.tempPath + "pref.ini") as file:
18+
with open("Data/Pref/pref.ini") as file:
1619
content = file.readlines()
1720
self.userFont = content[0][2: -1]
1821
self.userPort = content[1][2: -1]
19-
self.userIPath = content[2][6: -1]
20-
self.userDPath = content[3][6: -1]
21-
self.userHB = (content[4][content[4].find(":")+1:])
22+
self.userIp = content[2][3: -1]
23+
self.userIPath = content[3][6: -1]
24+
self.userDPath = content[4][6: -1]
25+
self.userHB = (content[5][content[4].find(":")+1:])
2226
except:
2327
pass
2428

@@ -30,37 +34,54 @@ def setupUi(self, OptionsWin):
3034
self.font.setFamily(self.userFont)
3135
self.font.setPointSize(10)
3236
OptionsWin.setFont(self.font)
33-
self.OptionsWin = OptionsWin #For class methods to use
37+
self.OptionsWin = OptionsWin # For class methods to use
3438

3539
self.Window_btn = QtWidgets.QDialogButtonBox(OptionsWin)
36-
self.Window_btn.setGeometry(QtCore.QRect(30, 210, 156, 23))
37-
self.Window_btn.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Save)
40+
self.Window_btn.setGeometry(QtCore.QRect(30, 210, 300, 23))
41+
self.Window_btn.setStandardButtons(
42+
QtWidgets.QDialogButtonBox.Cancel | QtWidgets.QDialogButtonBox.Save)
3843
self.Window_btn.setObjectName("Window_btn")
3944

4045
self.Window_btn.accepted.connect(self.SaveOptions)
4146
self.Window_btn.rejected.connect(OptionsWin.close)
4247

48+
self.Default_btn = QtWidgets.QDialogButtonBox(OptionsWin)
49+
self.Default_btn.setGeometry(QtCore.QRect(25, 210, 110, 23))
50+
51+
self.Default_btn.setStandardButtons(
52+
QtWidgets.QDialogButtonBox.Yes)
53+
self.Default_btn.button(QtWidgets.QDialogButtonBox.Yes).setText(
54+
"Default settings")
55+
self.Default_btn.setObjectName("Default_btn")
56+
57+
self.Default_btn.accepted.connect(self.ResetDefaults)
58+
4359
self.BrowseIconPath_btn = QtWidgets.QToolButton(OptionsWin)
44-
self.BrowseIconPath_btn.setGeometry(QtCore.QRect(410, 69, 31, 24))
60+
self.BrowseIconPath_btn.setGeometry(QtCore.QRect(410, 89, 31, 24))
4561
self.BrowseIconPath_btn.setObjectName("BrowseIconPath_btn")
4662
self.BrowseDownloadPath_btn = QtWidgets.QToolButton(OptionsWin)
47-
self.BrowseDownloadPath_btn.setGeometry(QtCore.QRect(410, 99, 31, 24))
63+
self.BrowseDownloadPath_btn.setGeometry(QtCore.QRect(410, 119, 31, 24))
4864
self.BrowseDownloadPath_btn.setObjectName("BrowseDownloadPath_btn")
4965

5066
self.BrowseDownloadPath_btn.clicked.connect(self.GetDownloadPath)
5167
self.BrowseIconPath_btn.clicked.connect(self.GetIconPath)
52-
68+
5369
self.Port_label = QtWidgets.QLabel(OptionsWin)
5470
self.Port_label.setGeometry(QtCore.QRect(30, 40, 120, 22))
5571
self.Port_label.setObjectName("Port_label")
72+
73+
self.IP_label = QtWidgets.QLabel(OptionsWin)
74+
self.IP_label.setObjectName("IP_Label")
75+
self.IP_label.setGeometry(QtCore.QRect(30, 59, 120, 22))
76+
5677
self.Font_label = QtWidgets.QLabel(OptionsWin)
5778
self.Font_label.setGeometry(QtCore.QRect(30, 8, 120, 22))
5879
self.Font_label.setObjectName("Font_label")
5980
self.IconPath_label = QtWidgets.QLabel(OptionsWin)
60-
self.IconPath_label.setGeometry(QtCore.QRect(30, 70, 120, 22))
81+
self.IconPath_label.setGeometry(QtCore.QRect(30, 89, 120, 22))
6182
self.IconPath_label.setObjectName("IconPath_label")
6283
self.DownloadPath_label = QtWidgets.QLabel(OptionsWin)
63-
self.DownloadPath_label.setGeometry(QtCore.QRect(30, 100, 135, 22))
84+
self.DownloadPath_label.setGeometry(QtCore.QRect(30, 119, 135, 22))
6485
self.DownloadPath_label.setObjectName("DownloadPath_label")
6586
self.ShowHB_label = QtWidgets.QLabel(OptionsWin)
6687
self.ShowHB_label.setGeometry(QtCore.QRect(30, 150, 99, 31))
@@ -73,6 +94,15 @@ def setupUi(self, OptionsWin):
7394
self.Port.setAlignment(QtCore.Qt.AlignCenter)
7495
self.Port.setClearButtonEnabled(True)
7596
self.Port.setObjectName("Port")
97+
98+
self.IP = QtWidgets.QLineEdit(OptionsWin)
99+
self.IP.setGeometry(QtCore.QRect(170, 59, 271, 22))
100+
self.IP.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
101+
self.IP.setMaxLength(28)
102+
self.IP.setAlignment(QtCore.Qt.AlignCenter)
103+
self.IP.setClearButtonEnabled(True)
104+
self.IP.setObjectName("IP")
105+
76106
self.Font = QtWidgets.QFontComboBox(OptionsWin)
77107
self.Font.setGeometry(QtCore.QRect(170, 8, 271, 22))
78108
self.Font.setFont(self.font)
@@ -81,15 +111,15 @@ def setupUi(self, OptionsWin):
81111
self.Font.setCurrentFont(self.font)
82112
self.Font.setObjectName("Font")
83113
self.IconPath = QtWidgets.QLineEdit(OptionsWin)
84-
self.IconPath.setGeometry(QtCore.QRect(170, 70, 241, 22))
114+
self.IconPath.setGeometry(QtCore.QRect(170, 89, 241, 22))
85115
self.IconPath.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
86116
self.IconPath.setText("")
87117
self.IconPath.setMaxLength(50)
88118
self.IconPath.setAlignment(QtCore.Qt.AlignCenter)
89119
self.IconPath.setReadOnly(True)
90120
self.IconPath.setObjectName("IconPath")
91121
self.DownloadPath = QtWidgets.QLineEdit(OptionsWin)
92-
self.DownloadPath.setGeometry(QtCore.QRect(170, 100, 241, 22))
122+
self.DownloadPath.setGeometry(QtCore.QRect(170, 119, 241, 22))
93123
self.DownloadPath.setCursor(QtGui.QCursor(QtCore.Qt.ArrowCursor))
94124
self.DownloadPath.setText("")
95125
self.DownloadPath.setMaxLength(50)
@@ -114,15 +144,19 @@ def setupUi(self, OptionsWin):
114144
self.plainTextEdit.setGeometry(QtCore.QRect(270, 140, 171, 51))
115145
self.plainTextEdit.setFont(self.font)
116146
self.plainTextEdit.setStyleSheet("color: rgb(255, 53, 53);")
117-
self.plainTextEdit.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
118-
self.plainTextEdit.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
147+
self.plainTextEdit.setVerticalScrollBarPolicy(
148+
QtCore.Qt.ScrollBarAlwaysOff)
149+
self.plainTextEdit.setHorizontalScrollBarPolicy(
150+
QtCore.Qt.ScrollBarAlwaysOff)
119151
self.plainTextEdit.setReadOnly(True)
120152
self.plainTextEdit.setObjectName("plainTextEdit")
121153

122154
self.IconPath.raise_()
123155
self.Window_btn.raise_()
156+
self.Default_btn.raise_()
124157
self.BrowseIconPath_btn.raise_()
125158
self.Port_label.raise_()
159+
self.IP_label.raise_()
126160
self.Font_label.raise_()
127161
self.IconPath_label.raise_()
128162
self.Port.raise_()
@@ -144,33 +178,52 @@ def retranslateUi(self, OptionsWin):
144178
self.BrowseIconPath_btn.setText(_translate("OptionsWin", "..."))
145179
self.BrowseDownloadPath_btn.setText(_translate("OptionsWin", "..."))
146180
self.Port_label.setText(_translate("OptionsWin", "Default Port"))
181+
self.IP_label.setText(_translate("OptionsWin", "Default IP"))
147182
self.Font_label.setText(_translate("OptionsWin", "Default Font"))
148-
self.IconPath_label.setText(_translate("OptionsWin", "Default Icon Path"))
183+
self.IconPath_label.setText(_translate(
184+
"OptionsWin", "Default Icon Path"))
149185
self.ShowHB_label.setText(_translate("OptionsWin", "Show Homebrew"))
150186
self.Port.setPlaceholderText(_translate("OptionsWin", self.userPort))
151-
self.IconPath.setPlaceholderText(_translate("OptionsWin", self.userIPath))
187+
self.IP.setPlaceholderText(_translate("OptionsWin", self.userIp))
188+
self.IconPath.setPlaceholderText(
189+
_translate("OptionsWin", self.userIPath))
152190
self.Font.setCurrentText(_translate("OptionsWin", self.userFont))
153-
self.DownloadPath_label.setText(_translate("OptionsWin", "Default Download Path"))
154-
self.DownloadPath.setPlaceholderText(_translate("OptionsWin", self.userDPath))
191+
self.DownloadPath_label.setText(_translate(
192+
"OptionsWin", "Default Download Path"))
193+
self.DownloadPath.setPlaceholderText(
194+
_translate("OptionsWin", self.userDPath))
155195
self.Yes.setText(_translate("OptionsWin", "Yes"))
156196
self.No.setText(_translate("OptionsWin", "No"))
157-
self.plainTextEdit.setPlainText(_translate("OptionsWin", "Yes will allow you to change Homebrew / Applications icons\n(This will take longer to cache)"))
158-
197+
self.plainTextEdit.setPlainText(_translate(
198+
"OptionsWin", "Yes will allow you to change Homebrew / Applications icons\n(This will take longer to cache)"))
199+
200+
def ResetDefaults(self):
201+
try:
202+
with open("Data/Pref/pref.ini", "w+") as file:
203+
file.write("Set to default")
204+
except:
205+
pass
206+
159207
def SaveOptions(self):
160208
Font = self.Font.currentText()
161209
IconPath = self.IconPath.text()
162210
DownloadPath = self.DownloadPath.text()
163211
ShowHB = str(self.Yes.isChecked())
164212
Port = self.Port.text()
165-
if len(Port) == 0:
213+
IP = self.IP.text()
214+
215+
if len(Port) == 0:
166216
Port = self.userPort
167-
if len(IconPath) == 0:
217+
if len(IP) == 0:
218+
IP = self.userIp
219+
if len(IconPath) == 0:
168220
IconPath = self.userIPath
169221
if len(DownloadPath) == 0:
170222
DownloadPath = self.userDPath
171223

172-
with open(self.tempPath + "pref.ini", "w+") as file:
173-
file.write("F:" + Font + "\nP:" + str(Port) + "\nIPath:" + IconPath + "\nDPath:" + DownloadPath + "\nHB:" + ShowHB)
224+
with open("Data/Pref/pref.ini", "w+") as file:
225+
file.write("F:" + Font + "\nP:" + str(Port) + "\nIP:" + IP + "\nIPath:" +
226+
IconPath + "\nDPath:" + DownloadPath + "\nHB:" + ShowHB)
174227
self.OptionsWin.close()
175228

176229
def GetDownloadPath(self):
@@ -181,7 +234,8 @@ def GetDownloadPath(self):
181234
dialog = QFileDialog()
182235
dialog.setOptions(opt)
183236
dialog.setDirectory(self.appPath)
184-
path = QtWidgets.QFileDialog.getExistingDirectory(None, "Default Download Directory...", self.appPath , options=opt)
237+
path = QtWidgets.QFileDialog.getExistingDirectory(
238+
None, "Default Download Directory...", self.appPath, options=opt)
185239
if path:
186240
self.DownloadPath.setText(path)
187241

@@ -193,10 +247,12 @@ def GetIconPath(self):
193247
dialog = QFileDialog()
194248
dialog.setOptions(opt)
195249
dialog.setDirectory(self.appPath)
196-
path = QtWidgets.QFileDialog.getExistingDirectory(None, "Default Icon Directory...", self.appPath , options=opt)
250+
path = QtWidgets.QFileDialog.getExistingDirectory(
251+
None, "Default Icon Directory...", self.appPath, options=opt)
197252
if path:
198253
self.IconPath.setText(path)
199254

255+
200256
if __name__ == "__main__":
201257
import sys
202258
app = QtWidgets.QApplication(sys.argv)

0 commit comments

Comments
 (0)