emdee/toxygen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'python3' into develop

Browse source
This commit is contained in:
ingvar1995 2016-06-25 22:29:43 +03:00
commit fc2b53d4a5
33 changed files with 225 additions and 209 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/menu.py
View file

@ -258,7 +258,7 @@ class ProfileSettings(CenteredWidget):
def closeEvent(self, event):
profile = Profile.get_instance()
profile.set_name(self.nick.text().encode('utf-8'))
profile.set_name(self.nick.text())
profile.set_status_message(self.status_message.text().encode('utf-8'))
profile.set_status(self.status.currentIndex())
@ -306,7 +306,7 @@ class NetworkSettings(CenteredWidget):
self.udp.setChecked(settings['udp_enabled'])
self.proxy.setChecked(settings['proxy_type'])
self.proxyip.setText(settings['proxy_host'])
self.proxyport.setText(unicode(settings['proxy_port']))
self.proxyport.setText(str(settings['proxy_port']))
self.http.setChecked(settings['proxy_type'] == 1)
self.warning = QtGui.QLabel(self)
self.warning.setGeometry(QtCore.QRect(5, 270, 290, 60))
@ -650,13 +650,13 @@ class AudioSettings(CenteredWidget):
p = pyaudio.PyAudio()
settings = Settings.get_instance()
self.in_indexes, self.out_indexes = [], []
for i in xrange(p.get_device_count()):
for i in range(p.get_device_count()):
device = p.get_device_info_by_index(i)
if device["maxInputChannels"]:
self.input.addItem(unicode(device["name"]))
self.input.addItem(str(device["name"]))
self.in_indexes.append(i)
if device["maxOutputChannels"]:
self.output.addItem(unicode(device["name"]))
self.output.addItem(str(device["name"]))
self.out_indexes.append(i)
self.input.setCurrentIndex(self.in_indexes.index(settings.audio['input']))
self.output.setCurrentIndex(self.out_indexes.index(settings.audio['output']))
@ -728,7 +728,7 @@ class PluginsSettings(CenteredWidget):
def update_list(self):
self.comboBox.clear()
data = self.pl_loader.get_plugins_list()
self.comboBox.addItems(map(lambda x: x[0], data))
self.comboBox.addItems(list(map(lambda x: x[0], data)))
self.data = data
def show_data(self):