Skip to content

Commit d80c1ad

Browse files
committed
Modified qt-settings.py
1 parent 7a250d6 commit d80c1ad

File tree

1 file changed

+36
-36
lines changed

1 file changed

+36
-36
lines changed

src/bitmessageqt/settings.py

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def __init__(self, parent=None, firstrun=False):
8080
)
8181
QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self))
8282

83-
def adjust_from_config(self, config):
83+
def adjust_from_config(self, config_):
8484
"""Adjust all widgets state according to config settings"""
8585
# pylint: disable=too-many-branches,too-many-statements
8686
if not self.parent.tray.isSystemTrayAvailable():
@@ -89,31 +89,31 @@ def adjust_from_config(self, config):
8989
"MainWindow", "Tray (not available in your system)"))
9090
for setting in (
9191
'minimizetotray', 'trayonclose', 'startintray'):
92-
config.set('bitmessagesettings', setting, 'false')
92+
config_.set('bitmessagesettings', setting, 'false')
9393
else:
9494
self.checkBoxMinimizeToTray.setChecked(
95-
config.getboolean('bitmessagesettings', 'minimizetotray'))
95+
config_.getboolean('bitmessagesettings', 'minimizetotray'))
9696
self.checkBoxTrayOnClose.setChecked(
97-
config.safeGetBoolean('bitmessagesettings', 'trayonclose'))
97+
config_.safeGetBoolean('bitmessagesettings', 'trayonclose'))
9898
self.checkBoxStartInTray.setChecked(
99-
config.getboolean('bitmessagesettings', 'startintray'))
99+
config_.getboolean('bitmessagesettings', 'startintray'))
100100

101101
self.checkBoxHideTrayConnectionNotifications.setChecked(
102-
config.getboolean(
102+
config_.getboolean(
103103
'bitmessagesettings', 'hidetrayconnectionnotifications'))
104104
self.checkBoxShowTrayNotifications.setChecked(
105-
config.getboolean('bitmessagesettings', 'showtraynotifications'))
105+
config_.getboolean('bitmessagesettings', 'showtraynotifications'))
106106

107107
self.checkBoxStartOnLogon.setChecked(
108-
config.getboolean('bitmessagesettings', 'startonlogon'))
108+
config_.getboolean('bitmessagesettings', 'startonlogon'))
109109

110110
self.checkBoxWillinglySendToMobile.setChecked(
111-
config.safeGetBoolean(
111+
config_.safeGetBoolean(
112112
'bitmessagesettings', 'willinglysendtomobile'))
113113
self.checkBoxUseIdenticons.setChecked(
114-
config.safeGetBoolean('bitmessagesettings', 'useidenticons'))
114+
config_.safeGetBoolean('bitmessagesettings', 'useidenticons'))
115115
self.checkBoxReplyBelow.setChecked(
116-
config.safeGetBoolean('bitmessagesettings', 'replybelow'))
116+
config_.safeGetBoolean('bitmessagesettings', 'replybelow'))
117117

118118
if state.appdata == paths.lookupExeFolder():
119119
self.checkBoxPortableMode.setChecked(True)
@@ -142,17 +142,17 @@ def adjust_from_config(self, config):
142142

143143
# On the Network settings tab:
144144
self.lineEditTCPPort.setText(str(
145-
config.get('bitmessagesettings', 'port')))
145+
config_.get('bitmessagesettings', 'port')))
146146
self.checkBoxUPnP.setChecked(
147-
config.safeGetBoolean('bitmessagesettings', 'upnp'))
147+
config_.safeGetBoolean('bitmessagesettings', 'upnp'))
148148
self.checkBoxUDP.setChecked(
149-
config.safeGetBoolean('bitmessagesettings', 'udp'))
149+
config_.safeGetBoolean('bitmessagesettings', 'udp'))
150150
self.checkBoxAuthentication.setChecked(
151-
config.getboolean('bitmessagesettings', 'socksauthentication'))
151+
config_.getboolean('bitmessagesettings', 'socksauthentication'))
152152
self.checkBoxSocksListen.setChecked(
153-
config.getboolean('bitmessagesettings', 'sockslisten'))
153+
config_.getboolean('bitmessagesettings', 'sockslisten'))
154154
self.checkBoxOnionOnly.setChecked(
155-
config.safeGetBoolean('bitmessagesettings', 'onionservicesonly'))
155+
config_.safeGetBoolean('bitmessagesettings', 'onionservicesonly'))
156156

157157
self._proxy_type = getSOCKSProxyType(config)
158158
self.comboBoxProxyType.setCurrentIndex(
@@ -161,38 +161,38 @@ def adjust_from_config(self, config):
161161
self.comboBoxProxyTypeChanged(self.comboBoxProxyType.currentIndex())
162162

163163
self.lineEditSocksHostname.setText(
164-
config.get('bitmessagesettings', 'sockshostname'))
164+
config_.get('bitmessagesettings', 'sockshostname'))
165165
self.lineEditSocksPort.setText(str(
166-
config.get('bitmessagesettings', 'socksport')))
166+
config_.get('bitmessagesettings', 'socksport')))
167167
self.lineEditSocksUsername.setText(
168-
config.get('bitmessagesettings', 'socksusername'))
168+
config_.get('bitmessagesettings', 'socksusername'))
169169
self.lineEditSocksPassword.setText(
170-
config.get('bitmessagesettings', 'sockspassword'))
170+
config_.get('bitmessagesettings', 'sockspassword'))
171171

172172
self.lineEditMaxDownloadRate.setText(str(
173-
config.get('bitmessagesettings', 'maxdownloadrate')))
173+
config_.get('bitmessagesettings', 'maxdownloadrate')))
174174
self.lineEditMaxUploadRate.setText(str(
175-
config.get('bitmessagesettings', 'maxuploadrate')))
175+
config_.get('bitmessagesettings', 'maxuploadrate')))
176176
self.lineEditMaxOutboundConnections.setText(str(
177-
config.get('bitmessagesettings', 'maxoutboundconnections')))
177+
config_.get('bitmessagesettings', 'maxoutboundconnections')))
178178

179179
# Demanded difficulty tab
180180
self.lineEditTotalDifficulty.setText(str((float(
181-
config.getint(
181+
config_.getint(
182182
'bitmessagesettings', 'defaultnoncetrialsperbyte')
183183
) / defaults.networkDefaultProofOfWorkNonceTrialsPerByte)))
184184
self.lineEditSmallMessageDifficulty.setText(str((float(
185-
config.getint(
185+
config_.getint(
186186
'bitmessagesettings', 'defaultpayloadlengthextrabytes')
187187
) / defaults.networkDefaultPayloadLengthExtraBytes)))
188188

189189
# Max acceptable difficulty tab
190190
self.lineEditMaxAcceptableTotalDifficulty.setText(str((float(
191-
config.getint(
191+
config_.getint(
192192
'bitmessagesettings', 'maxacceptablenoncetrialsperbyte')
193193
) / defaults.networkDefaultProofOfWorkNonceTrialsPerByte)))
194194
self.lineEditMaxAcceptableSmallMessageDifficulty.setText(str((float(
195-
config.getint(
195+
config_.getint(
196196
'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes')
197197
) / defaults.networkDefaultPayloadLengthExtraBytes)))
198198

@@ -203,21 +203,21 @@ def adjust_from_config(self, config):
203203
self.comboBoxOpenCL.addItems(openclpow.vendors)
204204
self.comboBoxOpenCL.setCurrentIndex(0)
205205
for i in range(self.comboBoxOpenCL.count()):
206-
if self.comboBoxOpenCL.itemText(i) == config.safeGet(
206+
if self.comboBoxOpenCL.itemText(i) == config_.safeGet(
207207
'bitmessagesettings', 'opencl'):
208208
self.comboBoxOpenCL.setCurrentIndex(i)
209209
break
210210

211211
# Namecoin integration tab
212-
nmctype = config.get('bitmessagesettings', 'namecoinrpctype')
212+
nmctype = config_.get('bitmessagesettings', 'namecoinrpctype')
213213
self.lineEditNamecoinHost.setText(
214-
config.get('bitmessagesettings', 'namecoinrpchost'))
214+
config_.get('bitmessagesettings', 'namecoinrpchost'))
215215
self.lineEditNamecoinPort.setText(str(
216-
config.get('bitmessagesettings', 'namecoinrpcport')))
216+
config_.get('bitmessagesettings', 'namecoinrpcport')))
217217
self.lineEditNamecoinUser.setText(
218-
config.get('bitmessagesettings', 'namecoinrpcuser'))
218+
config_.get('bitmessagesettings', 'namecoinrpcuser'))
219219
self.lineEditNamecoinPassword.setText(
220-
config.get('bitmessagesettings', 'namecoinrpcpassword'))
220+
config_.get('bitmessagesettings', 'namecoinrpcpassword'))
221221

222222
if nmctype == "namecoind":
223223
self.radioButtonNamecoinNamecoind.setChecked(True)
@@ -232,9 +232,9 @@ def adjust_from_config(self, config):
232232

233233
# Message Resend tab
234234
self.lineEditDays.setText(str(
235-
config.get('bitmessagesettings', 'stopresendingafterxdays')))
235+
config_.get('bitmessagesettings', 'stopresendingafterxdays')))
236236
self.lineEditMonths.setText(str(
237-
config.get('bitmessagesettings', 'stopresendingafterxmonths')))
237+
config_.get('bitmessagesettings', 'stopresendingafterxmonths')))
238238

239239
def comboBoxProxyTypeChanged(self, comboBoxIndex):
240240
"""A callback for currentIndexChanged event of comboBoxProxyType"""

0 commit comments

Comments
 (0)