[Pymoul-svn] SF.net SVN: pymoul: [66] pymoul/trunk/src/moul
Status: Alpha
Brought to you by:
tiran
Menu
▾
▴
[Pymoul-svn] SF.net SVN: pymoul: [66] pymoul/trunk/src/moul
|
From: <ti...@us...> - 2007-01-24 16:16:20
|
Revision: 66
http://pymoul.svn.sourceforge.net/pymoul/?rev=66&view=rev
Author: tiran
Date: 2007-01-24 08:16:05 -0800 (Wed, 24 Jan 2007)
Log Message:
-----------
Now parses audio.ini and displays shadow setting
Modified Paths:
--------------
pymoul/trunk/src/moul/file/wdysini.py
pymoul/trunk/src/moul/log.py
pymoul/trunk/src/moul/osdependent/win32/__init__.py
pymoul/trunk/src/moul/qt/mainwindow.py
pymoul/trunk/src/moul/qt/ui/mainwindow.py
pymoul/trunk/src/moul/qt/ui/mainwindow.ui
Modified: pymoul/trunk/src/moul/file/wdysini.py
===================================================================
--- pymoul/trunk/src/moul/file/wdysini.py 2007-01-24 00:42:26 UTC (rev 65)
+++ pymoul/trunk/src/moul/file/wdysini.py 2007-01-24 16:16:05 UTC (rev 66)
@@ -26,7 +26,10 @@
from moul.crypt.whatdoyousee import decryptWDYS
from moul.crypt.whatdoyousee import encryptWDYS
+from moul.log import getLogger
+LOG = getLogger('moul.file.wdysini')
+
class BoolStringError(ValueError):
pass
@@ -147,6 +150,12 @@
def __repr__(self):
return str(self)
+class QuotedString(str):
+ """String with extra quotes around it
+ """
+ # TODO: write me
+ pass
+
class Constrain(object):
"""Constrain for configuration values
@@ -342,6 +351,7 @@
self.clear()
if isinstance(fd_name, basestring):
fd = open(fd_name, 'rb')
+ LOG.debug("Parsing encrypted file %s" % fd_name)
close = True
else:
fd = fd_name
@@ -379,7 +389,13 @@
raise ValueError(line)
self._newdata = self._filedata.copy()
-
+ self.parserDoneHook()
+
+ def parserDoneHook(self):
+ """Hook called after the data is read and parsed
+ """
+ pass
+
def isChanged(self):
"""Check if the data was changed
"""
@@ -418,7 +434,7 @@
fd.close()
def _get(self, name):
- """get descriptor helper
+ """get descriptor helper
"""
return self._newdata[name]
@@ -426,7 +442,19 @@
"""set descriptor helper
"""
self._newdata[name] = value
+
+ def _getp(self, name):
+ """get descriptor helper for % sliders
+
+ The slider must have values between 0 and 100
+ """
+ return int(self._newdata[name] * 100.0)
+ def _setp(self, name, value):
+ """set descriptor helper for % sliders
+ """
+ self._newdata[name] = float(value / 100.0)
+
class AudioIni(ConfFile):
_filename = 'audio.ini'
_options = {
@@ -439,10 +467,81 @@
'Audio.SetChannelVolume Ambience' : (FloatString, MinMax(0.0, 1.0)),
'Audio.SetChannelVolume NPCVoice' : (FloatString, MinMax(0.0, 1.0)),
'Audio.EnableVoiceRecording' : (int, MinMax(0, 1)),
- 'Audio.SetDeviceName' : (str, Constrain()),
+ 'Audio.SetDeviceName' : (QuotedString, Constrain()), # TODO: add check
'Audio.SetChannelVolume GUI' : (FloatString, MinMax(0.0, 1.0)),
}
+ _devices = ['Generic Software', 'Generic Hardware']
+ # plus maybe a custom OpenAL v1.1 device
+
+ def parserDoneHook(self):
+ """Hook called after the data is read and parsed
+ """
+ # check for OpenAL device
+ name = self._get('Audio.SetDeviceName')
+ if name not in self._devices:
+ LOG.debug("Device added: %s" % name)
+ self._devices.append(name)
+
+ def getDeviceIdx(self, name):
+ """Get index by device name
+ """
+ return self._devices.index(name)
+ def getDeviceName(self, idx):
+ """Get index by device name
+ """
+ return self._devices[idx]
+
+ def _setFx(self, value):
+ """Set property helper: SoundFX also changes GUI
+ """
+ self._setp('Audio.SetChannelVolume SoundFX', value)
+ self._setp('Audio.SetChannelVolume GUI', value)
+
+ def _getDevice(self):
+ """Get property helpe for device
+ """
+ name = self._get('Audio.SetDeviceName')
+ return self.getDeviceIdx(name)
+
+ def _setDevice(self, idx):
+ """Set property helpe for device
+ """
+ name = self.getDeviceName(idx)
+ self._set('Audio.SetDeviceName', name)
+
+ def numberOfDevices(self):
+ """Number of devices
+ """
+ return len(self._devices)
+
+ eax = property(lambda self: self._get('Audio.UseEAX'),
+ lambda self, v: self._set('Audio.UseEAX', v),
+ )
+ mute = property(lambda self: self._get('Audio.MuteAll'),
+ lambda self, v: self._set('Audio.MuteAll', v),
+ )
+ priority = property(lambda self: self._get('Audio.SetPriorityCutoff'),
+ lambda self, v: self._set('Audio.SetPriorityCutoff', v),
+ )
+ enablevoice = property(lambda self: self._get('Audio.EnableVoiceRecording'),
+ lambda self, v: self._set('Audio.EnableVoiceRecording', v),
+ )
+ device = property(_getDevice, _setDevice)
+ fx = property(lambda self: self._getp('Audio.SetChannelVolume SoundFX'),
+ _setFx,
+ )
+ music = property(lambda self: self._getp('Audio.SetChannelVolume BgndMusic'),
+ lambda self, v: self._setp('Audio.SetChannelVolume BgndMusic', v),
+ )
+ ambience = property(lambda self: self._getp('Audio.SetChannelVolume Ambience'),
+ lambda self, v: self._setp('Audio.SetChannelVolume Ambience', v),
+ )
+ npc = property(lambda self: self._getp('Audio.SetChannelVolume NPCVoice'),
+ lambda self, v: self._setp('Audio.SetChannelVolume NPCVoice', v),
+ )
+ # TODO: microphon needs an extra handler. The mic slider changes the OS mixer.
+
class GraphicsIni(ConfFile):
_filename = 'graphics.ini'
_options = {
@@ -489,10 +588,9 @@
shadow_enabled = property(lambda self: self._get('Graphics.Shadow.Enable'),
lambda self, v: self._set('Graphics.Shadow.Enable', v),
)
- # XXX: shadows
- #shadow = property(lambda self: self._get('Graphics.Shadow.VisibleDistance'),
- # lambda self, v: self._set('Graphics.Shadow.VisibleDistance', v),
- # )
+ shadow = property(lambda self: self._getp('Graphics.Shadow.VisibleDistance'),
+ lambda self, v: self._setp('Graphics.Shadow.VisibleDistance', v),
+ )
vsync = property(lambda self: self._get('Graphics.EnableVSync'),
lambda self, v: self._set('Graphics.EnableVSync', v),
)
Modified: pymoul/trunk/src/moul/log.py
===================================================================
--- pymoul/trunk/src/moul/log.py 2007-01-24 00:42:26 UTC (rev 65)
+++ pymoul/trunk/src/moul/log.py 2007-01-24 16:16:05 UTC (rev 66)
@@ -57,6 +57,7 @@
repr(args[1:]), repr(kwargs)))
return func(*args, **kwargs)
logwrapper.__name__ = func.__name__
+ logwrapper.__doc__ = func.__doc__
return logwrapper
else:
return func
Modified: pymoul/trunk/src/moul/osdependent/win32/__init__.py
===================================================================
--- pymoul/trunk/src/moul/osdependent/win32/__init__.py 2007-01-24 00:42:26 UTC (rev 65)
+++ pymoul/trunk/src/moul/osdependent/win32/__init__.py 2007-01-24 16:16:05 UTC (rev 66)
@@ -24,7 +24,6 @@
import os
#from moul.osdependent.win32.miniwinshell import my_documents
#from moul.osdependent.win32.miniwinshell import application_data
-#from win32com.directsound import directsound
from moul.osdependent.win32.winpath import get_homedir
from moul.osdependent.win32.winpath import get_appdata
@@ -52,18 +51,10 @@
def _startMOUL(installdir, *args):
"""Start MOUL
"""
+ # TODO: use subprocess module
# P_DETACH is similar to P_NOWAIT, but the new process is detached from
# the console of the calling process.
mode = os.P_DETACH
path = os.path.join(installdir, EXEC_NAME)
args = (EXEC_NAME,) + args
return os.spawnv(mode, path, args)
-
-#def enumSoundDevices():
-# """
-# """
-# names = []
-# for iid, name, driver in directsound.DirectSoundEnumerate():
-# if iid is not None:
-# names.append(name)
-# return names
Modified: pymoul/trunk/src/moul/qt/mainwindow.py
===================================================================
--- pymoul/trunk/src/moul/qt/mainwindow.py 2007-01-24 00:42:26 UTC (rev 65)
+++ pymoul/trunk/src/moul/qt/mainwindow.py 2007-01-24 16:16:05 UTC (rev 66)
@@ -33,7 +33,7 @@
from moul.qt.ui.mainwindow import Ui_MainWindow
from moul.config import lookupDir
-#from moul.file.wdysini import AudioIni
+from moul.file.wdysini import AudioIni
from moul.file.wdysini import GraphicsIni
from moul.file.wdysini import videoModes
from moul.log import getLogger
@@ -56,6 +56,7 @@
# init handlers
self._timezone_init()
self._graphics_init()
+ self._audio_init()
self._ping_init()
self._systray_init()
@@ -95,7 +96,8 @@
self.systemtray.setVisible(False)
# ************************************************************************
- # graphics
+ # graphics settings
+
def _graphics_init(self):
"""init graphics tab
"""
@@ -123,7 +125,8 @@
self.sl_gra_texture.setValue(gini.texture)
self.sl_gra_antialias.setValue(gini.antialias)
self.sl_gra_anisotropic.setValue(gini.anisotropic)
- # TODO: self.sl_gra_shadow.setValue(gini.shadow)
+ self.sl_gra_shadow.setValue(gini.shadow)
+ print gini.shadow
self.cb_gra_windowed.setChecked(gini.windowed)
self.cb_gra_vsync.setChecked(gini.vsync)
self.cb_gra_shadow.setChecked(gini.shadow_enabled)
@@ -193,6 +196,57 @@
"""
# ************************************************************************
+ # audio settings
+
+ def _audio_init(self):
+ """init graphics tab
+ """
+ inipath = lookupDir('ini')
+ self._audio_ini = aini = AudioIni()
+ try:
+ aini.open(inipath)
+ except Exception, msg:
+ LOG.exception("Something bad happened while parsing the audio.ini file")
+ QtGui.QMessageBox.critical(None,
+ self.trUtf8("Error opening audio.ini"),
+ self.trUtf8("""Something bad happend while opening the audio.ini\n%s""" % msg))
+ return
+
+ self.sl_aud_device.setMaximum(aini.numberOfDevices()-1)
+
+ self.on_audioini_loaded(aini) # XXX: hard coded for testing purpose
+
+ def on_audioini_loaded(self, aini):
+ """SIGNAL: graphicsIniLoaded(file)
+ """
+ self.sl_aud_npc.setValue(aini.npc)
+ self.sl_aud_music.setValue(aini.music)
+ self.sl_aud_fx.setValue(aini.fx)
+ self.sl_aud_ambience.setValue(aini.ambience)
+ self.sl_aud_priority.setValue(aini.priority)
+ self.sl_aud_device.setValue(aini.device)
+ self.cb_aud_eax.setChecked(aini.eax)
+ self.cb_aud_mute.setChecked(aini.mute)
+ self.cb_aud_voicechat.setChecked(aini.enablevoice)
+
+ @signalLogDecorator(LOG)
+ @pyqtSignature("int")
+ def on_sl_aud_device_valueChanged(self, idx):
+ """SIGNAL: valueChanged (int)
+ """
+ # TODO: fixme
+ txt = self._audio_ini.getDeviceName(idx)
+ self.lb_aud_device.setText(QtCore.QString(txt))
+
+ @signalLogDecorator(LOG)
+ @pyqtSignature("int")
+ def on_sl_aud_device_sliderMoved(self, idx):
+ """SIGNAL: sliderMoved(int)
+ """
+ txt = self._audio_ini.getDeviceName(idx)
+ self.lb_aud_device.setText(QtCore.QString(txt))
+
+ # ************************************************************************
# time zones
def _timezone_init(self):
Modified: pymoul/trunk/src/moul/qt/ui/mainwindow.py
===================================================================
--- pymoul/trunk/src/moul/qt/ui/mainwindow.py 2007-01-24 00:42:26 UTC (rev 65)
+++ pymoul/trunk/src/moul/qt/ui/mainwindow.py 2007-01-24 16:16:05 UTC (rev 66)
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'src\moul\qt\ui\mainwindow.ui'
#
-# Created: Wed Jan 24 01:37:39 2007
+# Created: Wed Jan 24 16:49:25 2007
# by: PyQt4 UI code generator 4.1.1
#
# WARNING! All changes made in this file will be lost!
@@ -232,14 +232,15 @@
self.vboxlayout3.addWidget(self.label_15)
self.sl_gra_shadow = QtGui.QSlider(self.verticalLayout_8)
- self.sl_gra_shadow.setMinimum(1)
- self.sl_gra_shadow.setMaximum(3)
- self.sl_gra_shadow.setPageStep(1)
- self.sl_gra_shadow.setSliderPosition(1)
+ self.sl_gra_shadow.setMinimum(0)
+ self.sl_gra_shadow.setMaximum(100)
+ self.sl_gra_shadow.setPageStep(10)
+ self.sl_gra_shadow.setProperty("value",QtCore.QVariant(0))
+ self.sl_gra_shadow.setSliderPosition(0)
self.sl_gra_shadow.setTracking(False)
self.sl_gra_shadow.setOrientation(QtCore.Qt.Horizontal)
self.sl_gra_shadow.setTickPosition(QtGui.QSlider.TicksBelow)
- self.sl_gra_shadow.setTickInterval(1)
+ self.sl_gra_shadow.setTickInterval(25)
self.sl_gra_shadow.setObjectName("sl_gra_shadow")
self.vboxlayout3.addWidget(self.sl_gra_shadow)
@@ -415,46 +416,19 @@
self.sl_aud_npc.setObjectName("sl_aud_npc")
self.vboxlayout8.addWidget(self.sl_aud_npc)
- self.verticalLayout_11 = QtGui.QWidget(self.groupBox_aud_level)
- self.verticalLayout_11.setGeometry(QtCore.QRect(20,80,179,43))
- self.verticalLayout_11.setObjectName("verticalLayout_11")
+ self.verticalLayout_9 = QtGui.QWidget(self.groupBox_aud_level)
+ self.verticalLayout_9.setGeometry(QtCore.QRect(20,30,179,43))
+ self.verticalLayout_9.setObjectName("verticalLayout_9")
- self.vboxlayout9 = QtGui.QVBoxLayout(self.verticalLayout_11)
+ self.vboxlayout9 = QtGui.QVBoxLayout(self.verticalLayout_9)
self.vboxlayout9.setMargin(0)
self.vboxlayout9.setSpacing(6)
self.vboxlayout9.setObjectName("vboxlayout9")
- self.label_30 = QtGui.QLabel(self.verticalLayout_11)
- self.label_30.setAlignment(QtCore.Qt.AlignCenter)
- self.label_30.setObjectName("label_30")
- self.vboxlayout9.addWidget(self.label_30)
-
- self.sl_aud_music = QtGui.QSlider(self.verticalLayout_11)
- self.sl_aud_music.setMinimum(0)
- self.sl_aud_music.setMaximum(100)
- self.sl_aud_music.setPageStep(10)
- self.sl_aud_music.setProperty("value",QtCore.QVariant(0))
- self.sl_aud_music.setSliderPosition(0)
- self.sl_aud_music.setTracking(False)
- self.sl_aud_music.setOrientation(QtCore.Qt.Horizontal)
- self.sl_aud_music.setTickPosition(QtGui.QSlider.TicksBelow)
- self.sl_aud_music.setTickInterval(25)
- self.sl_aud_music.setObjectName("sl_aud_music")
- self.vboxlayout9.addWidget(self.sl_aud_music)
-
- self.verticalLayout_9 = QtGui.QWidget(self.groupBox_aud_level)
- self.verticalLayout_9.setGeometry(QtCore.QRect(20,30,179,43))
- self.verticalLayout_9.setObjectName("verticalLayout_9")
-
- self.vboxlayout10 = QtGui.QVBoxLayout(self.verticalLayout_9)
- self.vboxlayout10.setMargin(0)
- self.vboxlayout10.setSpacing(6)
- self.vboxlayout10.setObjectName("vboxlayout10")
-
self.label_28 = QtGui.QLabel(self.verticalLayout_9)
self.label_28.setAlignment(QtCore.Qt.AlignCenter)
self.label_28.setObjectName("label_28")
- self.vboxlayout10.addWidget(self.label_28)
+ self.vboxlayout9.addWidget(self.label_28)
self.sl_aud_fx = QtGui.QSlider(self.verticalLayout_9)
self.sl_aud_fx.setMinimum(0)
@@ -467,75 +441,66 @@
self.sl_aud_fx.setTickPosition(QtGui.QSlider.TicksBelow)
self.sl_aud_fx.setTickInterval(25)
self.sl_aud_fx.setObjectName("sl_aud_fx")
- self.vboxlayout10.addWidget(self.sl_aud_fx)
+ self.vboxlayout9.addWidget(self.sl_aud_fx)
self.verticalLayout_10 = QtGui.QWidget(self.groupBox_aud_level)
self.verticalLayout_10.setGeometry(QtCore.QRect(230,30,179,43))
self.verticalLayout_10.setObjectName("verticalLayout_10")
- self.vboxlayout11 = QtGui.QVBoxLayout(self.verticalLayout_10)
- self.vboxlayout11.setMargin(0)
- self.vboxlayout11.setSpacing(6)
- self.vboxlayout11.setObjectName("vboxlayout11")
+ self.vboxlayout10 = QtGui.QVBoxLayout(self.verticalLayout_10)
+ self.vboxlayout10.setMargin(0)
+ self.vboxlayout10.setSpacing(6)
+ self.vboxlayout10.setObjectName("vboxlayout10")
self.label_29 = QtGui.QLabel(self.verticalLayout_10)
self.label_29.setAlignment(QtCore.Qt.AlignCenter)
self.label_29.setObjectName("label_29")
- self.vboxlayout11.addWidget(self.label_29)
+ self.vboxlayout10.addWidget(self.label_29)
- self.sl_aud_ambient = QtGui.QSlider(self.verticalLayout_10)
- self.sl_aud_ambient.setMinimum(0)
- self.sl_aud_ambient.setMaximum(100)
- self.sl_aud_ambient.setPageStep(10)
- self.sl_aud_ambient.setProperty("value",QtCore.QVariant(0))
- self.sl_aud_ambient.setSliderPosition(0)
- self.sl_aud_ambient.setTracking(False)
- self.sl_aud_ambient.setOrientation(QtCore.Qt.Horizontal)
- self.sl_aud_ambient.setTickPosition(QtGui.QSlider.TicksBelow)
- self.sl_aud_ambient.setTickInterval(25)
- self.sl_aud_ambient.setObjectName("sl_aud_ambient")
- self.vboxlayout11.addWidget(self.sl_aud_ambient)
+ self.sl_aud_ambience = QtGui.QSlider(self.verticalLayout_10)
+ self.sl_aud_ambience.setMinimum(0)
+ self.sl_aud_ambience.setMaximum(100)
+ self.sl_aud_ambience.setPageStep(10)
+ self.sl_aud_ambience.setProperty("value",QtCore.QVariant(0))
+ self.sl_aud_ambience.setSliderPosition(0)
+ self.sl_aud_ambience.setTracking(False)
+ self.sl_aud_ambience.setOrientation(QtCore.Qt.Horizontal)
+ self.sl_aud_ambience.setTickPosition(QtGui.QSlider.TicksBelow)
+ self.sl_aud_ambience.setTickInterval(25)
+ self.sl_aud_ambience.setObjectName("sl_aud_ambience")
+ self.vboxlayout10.addWidget(self.sl_aud_ambience)
- self.cb_aud_mute = QtGui.QCheckBox(self.groupBox_aud_level)
- self.cb_aud_mute.setGeometry(QtCore.QRect(180,10,70,19))
- self.cb_aud_mute.setObjectName("cb_aud_mute")
+ self.verticalLayout_11 = QtGui.QWidget(self.groupBox_aud_level)
+ self.verticalLayout_11.setGeometry(QtCore.QRect(20,80,179,43))
+ self.verticalLayout_11.setObjectName("verticalLayout_11")
- self.groupBox_voicechat = QtGui.QGroupBox(self.tab_audio)
- self.groupBox_voicechat.setEnabled(True)
- self.groupBox_voicechat.setGeometry(QtCore.QRect(10,150,431,71))
- self.groupBox_voicechat.setObjectName("groupBox_voicechat")
+ self.vboxlayout11 = QtGui.QVBoxLayout(self.verticalLayout_11)
+ self.vboxlayout11.setMargin(0)
+ self.vboxlayout11.setSpacing(6)
+ self.vboxlayout11.setObjectName("vboxlayout11")
- self.verticalLayout_13 = QtGui.QWidget(self.groupBox_voicechat)
- self.verticalLayout_13.setGeometry(QtCore.QRect(20,20,179,43))
- self.verticalLayout_13.setObjectName("verticalLayout_13")
+ self.label_30 = QtGui.QLabel(self.verticalLayout_11)
+ self.label_30.setAlignment(QtCore.Qt.AlignCenter)
+ self.label_30.setObjectName("label_30")
+ self.vboxlayout11.addWidget(self.label_30)
- self.vboxlayout12 = QtGui.QVBoxLayout(self.verticalLayout_13)
- self.vboxlayout12.setMargin(0)
- self.vboxlayout12.setSpacing(6)
- self.vboxlayout12.setObjectName("vboxlayout12")
+ self.sl_aud_music = QtGui.QSlider(self.verticalLayout_11)
+ self.sl_aud_music.setMinimum(0)
+ self.sl_aud_music.setMaximum(100)
+ self.sl_aud_music.setPageStep(10)
+ self.sl_aud_music.setProperty("value",QtCore.QVariant(0))
+ self.sl_aud_music.setSliderPosition(0)
+ self.sl_aud_music.setTracking(False)
+ self.sl_aud_music.setOrientation(QtCore.Qt.Horizontal)
+ self.sl_aud_music.setTickPosition(QtGui.QSlider.TicksBelow)
+ self.sl_aud_music.setTickInterval(25)
+ self.sl_aud_music.setObjectName("sl_aud_music")
+ self.vboxlayout11.addWidget(self.sl_aud_music)
- self.label_33 = QtGui.QLabel(self.verticalLayout_13)
- self.label_33.setAlignment(QtCore.Qt.AlignCenter)
- self.label_33.setObjectName("label_33")
- self.vboxlayout12.addWidget(self.label_33)
+ self.cb_aud_mute = QtGui.QCheckBox(self.groupBox_aud_level)
+ self.cb_aud_mute.setGeometry(QtCore.QRect(180,10,70,19))
+ self.cb_aud_mute.setObjectName("cb_aud_mute")
- self.sl_aud_voicechat = QtGui.QSlider(self.verticalLayout_13)
- self.sl_aud_voicechat.setMinimum(0)
- self.sl_aud_voicechat.setMaximum(100)
- self.sl_aud_voicechat.setPageStep(10)
- self.sl_aud_voicechat.setProperty("value",QtCore.QVariant(0))
- self.sl_aud_voicechat.setSliderPosition(0)
- self.sl_aud_voicechat.setTracking(False)
- self.sl_aud_voicechat.setOrientation(QtCore.Qt.Horizontal)
- self.sl_aud_voicechat.setTickPosition(QtGui.QSlider.TicksBelow)
- self.sl_aud_voicechat.setTickInterval(25)
- self.sl_aud_voicechat.setObjectName("sl_aud_voicechat")
- self.vboxlayout12.addWidget(self.sl_aud_voicechat)
-
- self.cb_aud_voicechat = QtGui.QCheckBox(self.groupBox_voicechat)
- self.cb_aud_voicechat.setGeometry(QtCore.QRect(250,30,111,19))
- self.cb_aud_voicechat.setObjectName("cb_aud_voicechat")
-
self.groupBox_aud_hardware = QtGui.QGroupBox(self.tab_audio)
self.groupBox_aud_hardware.setEnabled(True)
self.groupBox_aud_hardware.setGeometry(QtCore.QRect(10,230,431,101))
@@ -545,45 +510,45 @@
self.verticalLayout_14.setGeometry(QtCore.QRect(230,40,179,43))
self.verticalLayout_14.setObjectName("verticalLayout_14")
- self.vboxlayout13 = QtGui.QVBoxLayout(self.verticalLayout_14)
- self.vboxlayout13.setMargin(0)
- self.vboxlayout13.setSpacing(6)
- self.vboxlayout13.setObjectName("vboxlayout13")
+ self.vboxlayout12 = QtGui.QVBoxLayout(self.verticalLayout_14)
+ self.vboxlayout12.setMargin(0)
+ self.vboxlayout12.setSpacing(6)
+ self.vboxlayout12.setObjectName("vboxlayout12")
self.label_34 = QtGui.QLabel(self.verticalLayout_14)
self.label_34.setAlignment(QtCore.Qt.AlignCenter)
self.label_34.setObjectName("label_34")
- self.vboxlayout13.addWidget(self.label_34)
+ self.vboxlayout12.addWidget(self.label_34)
self.sl_aud_priority = QtGui.QSlider(self.verticalLayout_14)
- self.sl_aud_priority.setMaximum(2)
+ self.sl_aud_priority.setMaximum(9)
self.sl_aud_priority.setPageStep(1)
self.sl_aud_priority.setSliderPosition(0)
self.sl_aud_priority.setTracking(False)
self.sl_aud_priority.setOrientation(QtCore.Qt.Horizontal)
self.sl_aud_priority.setTickPosition(QtGui.QSlider.TicksBelow)
- self.sl_aud_priority.setTickInterval(1)
+ self.sl_aud_priority.setTickInterval(3)
self.sl_aud_priority.setObjectName("sl_aud_priority")
- self.vboxlayout13.addWidget(self.sl_aud_priority)
+ self.vboxlayout12.addWidget(self.sl_aud_priority)
self.verticalLayout_15 = QtGui.QWidget(self.groupBox_aud_hardware)
self.verticalLayout_15.setGeometry(QtCore.QRect(20,20,179,63))
self.verticalLayout_15.setObjectName("verticalLayout_15")
- self.vboxlayout14 = QtGui.QVBoxLayout(self.verticalLayout_15)
- self.vboxlayout14.setMargin(0)
- self.vboxlayout14.setSpacing(6)
- self.vboxlayout14.setObjectName("vboxlayout14")
+ self.vboxlayout13 = QtGui.QVBoxLayout(self.verticalLayout_15)
+ self.vboxlayout13.setMargin(0)
+ self.vboxlayout13.setSpacing(6)
+ self.vboxlayout13.setObjectName("vboxlayout13")
self.label_35 = QtGui.QLabel(self.verticalLayout_15)
self.label_35.setAlignment(QtCore.Qt.AlignCenter)
self.label_35.setObjectName("label_35")
- self.vboxlayout14.addWidget(self.label_35)
+ self.vboxlayout13.addWidget(self.label_35)
- self.label_3 = QtGui.QLabel(self.verticalLayout_15)
- self.label_3.setAlignment(QtCore.Qt.AlignCenter)
- self.label_3.setObjectName("label_3")
- self.vboxlayout14.addWidget(self.label_3)
+ self.lb_aud_device = QtGui.QLabel(self.verticalLayout_15)
+ self.lb_aud_device.setAlignment(QtCore.Qt.AlignCenter)
+ self.lb_aud_device.setObjectName("lb_aud_device")
+ self.vboxlayout13.addWidget(self.lb_aud_device)
self.sl_aud_device = QtGui.QSlider(self.verticalLayout_15)
self.sl_aud_device.setMaximum(2)
@@ -594,11 +559,49 @@
self.sl_aud_device.setTickPosition(QtGui.QSlider.TicksBelow)
self.sl_aud_device.setTickInterval(1)
self.sl_aud_device.setObjectName("sl_aud_device")
- self.vboxlayout14.addWidget(self.sl_aud_device)
+ self.vboxlayout13.addWidget(self.sl_aud_device)
self.cb_aud_eax = QtGui.QCheckBox(self.groupBox_aud_hardware)
self.cb_aud_eax.setGeometry(QtCore.QRect(260,10,111,19))
self.cb_aud_eax.setObjectName("cb_aud_eax")
+
+ self.groupBox_voicechat = QtGui.QGroupBox(self.tab_audio)
+ self.groupBox_voicechat.setEnabled(True)
+ self.groupBox_voicechat.setGeometry(QtCore.QRect(10,150,431,71))
+ self.groupBox_voicechat.setObjectName("groupBox_voicechat")
+
+ self.cb_aud_voicechat = QtGui.QCheckBox(self.groupBox_voicechat)
+ self.cb_aud_voicechat.setGeometry(QtCore.QRect(250,30,111,19))
+ self.cb_aud_voicechat.setObjectName("cb_aud_voicechat")
+
+ self.verticalLayout_13 = QtGui.QWidget(self.groupBox_voicechat)
+ self.verticalLayout_13.setGeometry(QtCore.QRect(20,20,179,43))
+ self.verticalLayout_13.setObjectName("verticalLayout_13")
+
+ self.vboxlayout14 = QtGui.QVBoxLayout(self.verticalLayout_13)
+ self.vboxlayout14.setMargin(0)
+ self.vboxlayout14.setSpacing(6)
+ self.vboxlayout14.setObjectName("vboxlayout14")
+
+ self.label_33 = QtGui.QLabel(self.verticalLayout_13)
+ self.label_33.setEnabled(False)
+ self.label_33.setAlignment(QtCore.Qt.AlignCenter)
+ self.label_33.setObjectName("label_33")
+ self.vboxlayout14.addWidget(self.label_33)
+
+ self.sl_aud_microphon = QtGui.QSlider(self.verticalLayout_13)
+ self.sl_aud_microphon.setEnabled(False)
+ self.sl_aud_microphon.setMinimum(0)
+ self.sl_aud_microphon.setMaximum(100)
+ self.sl_aud_microphon.setPageStep(10)
+ self.sl_aud_microphon.setProperty("value",QtCore.QVariant(0))
+ self.sl_aud_microphon.setSliderPosition(0)
+ self.sl_aud_microphon.setTracking(False)
+ self.sl_aud_microphon.setOrientation(QtCore.Qt.Horizontal)
+ self.sl_aud_microphon.setTickPosition(QtGui.QSlider.TicksBelow)
+ self.sl_aud_microphon.setTickInterval(25)
+ self.sl_aud_microphon.setObjectName("sl_aud_microphon")
+ self.vboxlayout14.addWidget(self.sl_aud_microphon)
self.tab_graphics.addTab(self.tab_audio,"")
self.tab_time = QtGui.QWidget()
@@ -710,7 +713,7 @@
MainWindow.setStatusBar(self.statusbar)
self.retranslateUi(MainWindow)
- self.tab_graphics.setCurrentIndex(2)
+ self.tab_graphics.setCurrentIndex(0)
QtCore.QObject.connect(self.buttonbox_rresavcl,QtCore.SIGNAL("rejected()"),MainWindow.close)
QtCore.QMetaObject.connectSlotsByName(MainWindow)
@@ -746,18 +749,18 @@
self.tab_graphics.setTabText(self.tab_graphics.indexOf(self.tab_graphics1), QtGui.QApplication.translate("MainWindow", "Graphics", None, QtGui.QApplication.UnicodeUTF8))
self.groupBox_aud_level.setTitle(QtGui.QApplication.translate("MainWindow", "Level", None, QtGui.QApplication.UnicodeUTF8))
self.label_31.setText(QtGui.QApplication.translate("MainWindow", "NPC Voices", None, QtGui.QApplication.UnicodeUTF8))
+ self.label_28.setText(QtGui.QApplication.translate("MainWindow", "Sound FX", None, QtGui.QApplication.UnicodeUTF8))
+ self.label_29.setText(QtGui.QApplication.translate("MainWindow", "Ambience Sound", None, QtGui.QApplication.UnicodeUTF8))
self.label_30.setText(QtGui.QApplication.translate("MainWindow", "Music", None, QtGui.QApplication.UnicodeUTF8))
- self.label_28.setText(QtGui.QApplication.translate("MainWindow", "Sound FX", None, QtGui.QApplication.UnicodeUTF8))
- self.label_29.setText(QtGui.QApplication.translate("MainWindow", "Ambient Sounds", None, QtGui.QApplication.UnicodeUTF8))
self.cb_aud_mute.setText(QtGui.QApplication.translate("MainWindow", "Mute all", None, QtGui.QApplication.UnicodeUTF8))
- self.groupBox_voicechat.setTitle(QtGui.QApplication.translate("MainWindow", "Voice chat", None, QtGui.QApplication.UnicodeUTF8))
- self.label_33.setText(QtGui.QApplication.translate("MainWindow", "Microphon Level", None, QtGui.QApplication.UnicodeUTF8))
- self.cb_aud_voicechat.setText(QtGui.QApplication.translate("MainWindow", "Enable Voice Chat", None, QtGui.QApplication.UnicodeUTF8))
self.groupBox_aud_hardware.setTitle(QtGui.QApplication.translate("MainWindow", "Hardware", None, QtGui.QApplication.UnicodeUTF8))
self.label_34.setText(QtGui.QApplication.translate("MainWindow", "Sound Priority", None, QtGui.QApplication.UnicodeUTF8))
self.label_35.setText(QtGui.QApplication.translate("MainWindow", "Audio Modes", None, QtGui.QApplication.UnicodeUTF8))
- self.label_3.setText(QtGui.QApplication.translate("MainWindow", "Generic Software", None, QtGui.QApplication.UnicodeUTF8))
+ self.lb_aud_device.setText(QtGui.QApplication.translate("MainWindow", "Generic Software", None, QtGui.QApplication.UnicodeUTF8))
self.cb_aud_eax.setText(QtGui.QApplication.translate("MainWindow", "Enable EAX", None, QtGui.QApplication.UnicodeUTF8))
+ self.groupBox_voicechat.setTitle(QtGui.QApplication.translate("MainWindow", "Voice chat", None, QtGui.QApplication.UnicodeUTF8))
+ self.cb_aud_voicechat.setText(QtGui.QApplication.translate("MainWindow", "Enable Voice Chat", None, QtGui.QApplication.UnicodeUTF8))
+ self.label_33.setText(QtGui.QApplication.translate("MainWindow", "Microphon Level", None, QtGui.QApplication.UnicodeUTF8))
self.tab_graphics.setTabText(self.tab_graphics.indexOf(self.tab_audio), QtGui.QApplication.translate("MainWindow", "Audio", None, QtGui.QApplication.UnicodeUTF8))
self.gb_caverntime.setTitle(QtGui.QApplication.translate("MainWindow", "Time zones", None, QtGui.QApplication.UnicodeUTF8))
self.label_4.setText(QtGui.QApplication.translate("MainWindow", "Cavern time:", None, QtGui.QApplication.UnicodeUTF8))
Modified: pymoul/trunk/src/moul/qt/ui/mainwindow.ui
===================================================================
--- pymoul/trunk/src/moul/qt/ui/mainwindow.ui 2007-01-24 00:42:26 UTC (rev 65)
+++ pymoul/trunk/src/moul/qt/ui/mainwindow.ui 2007-01-24 16:16:05 UTC (rev 66)
@@ -129,7 +129,7 @@
<enum>QTabWidget::North</enum>
</property>
<property name="currentIndex" >
- <number>2</number>
+ <number>0</number>
</property>
<widget class="QWidget" name="tab_graphics" >
<attribute name="title" >
@@ -448,16 +448,19 @@
<item>
<widget class="QSlider" name="sl_gra_shadow" >
<property name="minimum" >
- <number>1</number>
+ <number>0</number>
</property>
<property name="maximum" >
- <number>3</number>
+ <number>100</number>
</property>
<property name="pageStep" >
- <number>1</number>
+ <number>10</number>
</property>
+ <property name="value" >
+ <number>0</number>
+ </property>
<property name="sliderPosition" >
- <number>1</number>
+ <number>0</number>
</property>
<property name="tracking" >
<bool>false</bool>
@@ -469,7 +472,7 @@
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval" >
- <number>1</number>
+ <number>25</number>
</property>
</widget>
</item>
@@ -838,11 +841,11 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="verticalLayout_11" >
+ <widget class="QWidget" name="verticalLayout_9" >
<property name="geometry" >
<rect>
<x>20</x>
- <y>80</y>
+ <y>30</y>
<width>179</width>
<height>43</height>
</rect>
@@ -855,9 +858,9 @@
<number>6</number>
</property>
<item>
- <widget class="QLabel" name="label_30" >
+ <widget class="QLabel" name="label_28" >
<property name="text" >
- <string>Music</string>
+ <string>Sound FX</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
@@ -865,7 +868,7 @@
</widget>
</item>
<item>
- <widget class="QSlider" name="sl_aud_music" >
+ <widget class="QSlider" name="sl_aud_fx" >
<property name="minimum" >
<number>0</number>
</property>
@@ -897,10 +900,10 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="verticalLayout_9" >
+ <widget class="QWidget" name="verticalLayout_10" >
<property name="geometry" >
<rect>
- <x>20</x>
+ <x>230</x>
<y>30</y>
<width>179</width>
<height>43</height>
@@ -914,9 +917,9 @@
<number>6</number>
</property>
<item>
- <widget class="QLabel" name="label_28" >
+ <widget class="QLabel" name="label_29" >
<property name="text" >
- <string>Sound FX</string>
+ <string>Ambience Sound</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
@@ -924,7 +927,7 @@
</widget>
</item>
<item>
- <widget class="QSlider" name="sl_aud_fx" >
+ <widget class="QSlider" name="sl_aud_ambience" >
<property name="minimum" >
<number>0</number>
</property>
@@ -956,11 +959,11 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="verticalLayout_10" >
+ <widget class="QWidget" name="verticalLayout_11" >
<property name="geometry" >
<rect>
- <x>230</x>
- <y>30</y>
+ <x>20</x>
+ <y>80</y>
<width>179</width>
<height>43</height>
</rect>
@@ -973,9 +976,9 @@
<number>6</number>
</property>
<item>
- <widget class="QLabel" name="label_29" >
+ <widget class="QLabel" name="label_30" >
<property name="text" >
- <string>Ambient Sounds</string>
+ <string>Music</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
@@ -983,7 +986,7 @@
</widget>
</item>
<item>
- <widget class="QSlider" name="sl_aud_ambient" >
+ <widget class="QSlider" name="sl_aud_music" >
<property name="minimum" >
<number>0</number>
</property>
@@ -1029,26 +1032,26 @@
</property>
</widget>
</widget>
- <widget class="QGroupBox" name="groupBox_voicechat" >
+ <widget class="QGroupBox" name="groupBox_aud_hardware" >
<property name="enabled" >
<bool>true</bool>
</property>
<property name="geometry" >
<rect>
<x>10</x>
- <y>150</y>
+ <y>230</y>
<width>431</width>
- <height>71</height>
+ <height>101</height>
</rect>
</property>
<property name="title" >
- <string>Voice chat</string>
+ <string>Hardware</string>
</property>
- <widget class="QWidget" name="verticalLayout_13" >
+ <widget class="QWidget" name="verticalLayout_14" >
<property name="geometry" >
<rect>
- <x>20</x>
- <y>20</y>
+ <x>230</x>
+ <y>40</y>
<width>179</width>
<height>43</height>
</rect>
@@ -1061,9 +1064,9 @@
<number>6</number>
</property>
<item>
- <widget class="QLabel" name="label_33" >
+ <widget class="QLabel" name="label_34" >
<property name="text" >
- <string>Microphon Level</string>
+ <string>Sound Priority</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
@@ -1071,19 +1074,13 @@
</widget>
</item>
<item>
- <widget class="QSlider" name="sl_aud_voicechat" >
- <property name="minimum" >
- <number>0</number>
- </property>
+ <widget class="QSlider" name="sl_aud_priority" >
<property name="maximum" >
- <number>100</number>
+ <number>9</number>
</property>
<property name="pageStep" >
- <number>10</number>
+ <number>1</number>
</property>
- <property name="value" >
- <number>0</number>
- </property>
<property name="sliderPosition" >
<number>0</number>
</property>
@@ -1097,48 +1094,19 @@
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval" >
- <number>25</number>
+ <number>3</number>
</property>
</widget>
</item>
</layout>
</widget>
- <widget class="QCheckBox" name="cb_aud_voicechat" >
+ <widget class="QWidget" name="verticalLayout_15" >
<property name="geometry" >
<rect>
- <x>250</x>
- <y>30</y>
- <width>111</width>
- <height>19</height>
- </rect>
- </property>
- <property name="text" >
- <string>Enable Voice Chat</string>
- </property>
- </widget>
- </widget>
- <widget class="QGroupBox" name="groupBox_aud_hardware" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="geometry" >
- <rect>
- <x>10</x>
- <y>230</y>
- <width>431</width>
- <height>101</height>
- </rect>
- </property>
- <property name="title" >
- <string>Hardware</string>
- </property>
- <widget class="QWidget" name="verticalLayout_14" >
- <property name="geometry" >
- <rect>
- <x>230</x>
- <y>40</y>
+ <x>20</x>
+ <y>20</y>
<width>179</width>
- <height>43</height>
+ <height>63</height>
</rect>
</property>
<layout class="QVBoxLayout" >
@@ -1149,9 +1117,9 @@
<number>6</number>
</property>
<item>
- <widget class="QLabel" name="label_34" >
+ <widget class="QLabel" name="label_35" >
<property name="text" >
- <string>Sound Priority</string>
+ <string>Audio Modes</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
@@ -1159,7 +1127,17 @@
</widget>
</item>
<item>
- <widget class="QSlider" name="sl_aud_priority" >
+ <widget class="QLabel" name="lb_aud_device" >
+ <property name="text" >
+ <string>Generic Software</string>
+ </property>
+ <property name="alignment" >
+ <set>Qt::AlignCenter</set>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QSlider" name="sl_aud_device" >
<property name="maximum" >
<number>2</number>
</property>
@@ -1185,13 +1163,55 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="verticalLayout_15" >
+ <widget class="QCheckBox" name="cb_aud_eax" >
<property name="geometry" >
<rect>
+ <x>260</x>
+ <y>10</y>
+ <width>111</width>
+ <height>19</height>
+ </rect>
+ </property>
+ <property name="text" >
+ <string>Enable EAX</string>
+ </property>
+ </widget>
+ </widget>
+ <widget class="QGroupBox" name="groupBox_voicechat" >
+ <property name="enabled" >
+ <bool>true</bool>
+ </property>
+ <property name="geometry" >
+ <rect>
+ <x>10</x>
+ <y>150</y>
+ <width>431</width>
+ <height>71</height>
+ </rect>
+ </property>
+ <property name="title" >
+ <string>Voice chat</string>
+ </property>
+ <widget class="QCheckBox" name="cb_aud_voicechat" >
+ <property name="geometry" >
+ <rect>
+ <x>250</x>
+ <y>30</y>
+ <width>111</width>
+ <height>19</height>
+ </rect>
+ </property>
+ <property name="text" >
+ <string>Enable Voice Chat</string>
+ </property>
+ </widget>
+ <widget class="QWidget" name="verticalLayout_13" >
+ <property name="geometry" >
+ <rect>
<x>20</x>
<y>20</y>
<width>179</width>
- <height>63</height>
+ <height>43</height>
</rect>
</property>
<layout class="QVBoxLayout" >
@@ -1202,9 +1222,12 @@
<number>6</number>
</property>
<item>
- <widget class="QLabel" name="label_35" >
+ <widget class="QLabel" name="label_33" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
<property name="text" >
- <string>Audio Modes</string>
+ <string>Microphon Level</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
@@ -1212,23 +1235,22 @@
</widget>
</item>
<item>
- <widget class="QLabel" name="label_3" >
- <property name="text" >
- <string>Generic Software</string>
+ <widget class="QSlider" name="sl_aud_microphon" >
+ <property name="enabled" >
+ <bool>false</bool>
</property>
- <property name="alignment" >
- <set>Qt::AlignCenter</set>
+ <property name="minimum" >
+ <number>0</number>
</property>
- </widget>
- </item>
- <item>
- <widget class="QSlider" name="sl_aud_device" >
<property name="maximum" >
- <number>2</number>
+ <number>100</number>
</property>
<property name="pageStep" >
- <number>1</number>
+ <number>10</number>
</property>
+ <property name="value" >
+ <number>0</number>
+ </property>
<property name="sliderPosition" >
<number>0</number>
</property>
@@ -1242,25 +1264,12 @@
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval" >
- <number>1</number>
+ <number>25</number>
</property>
</widget>
</item>
</layout>
</widget>
- <widget class="QCheckBox" name="cb_aud_eax" >
- <property name="geometry" >
- <rect>
- <x>260</x>
- <y>10</y>
- <width>111</width>
- <height>19</height>
- </rect>
- </property>
- <property name="text" >
- <string>Enable EAX</string>
- </property>
- </widget>
</widget>
</widget>
<widget class="QWidget" name="tab_time" >
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
