[Pymoul-svn] SF.net SVN: pymoul: [68] pymoul/trunk/src/moul
Status: Alpha
Brought to you by:
tiran
From: <ti...@us...> - 2007-01-24 17:01:22
|
Revision: 68 http://pymoul.svn.sourceforge.net/pymoul/?rev=68&view=rev Author: tiran Date: 2007-01-24 09:01:15 -0800 (Wed, 24 Jan 2007) Log Message: ----------- Fixed some min/max values for sliders Added some useful comments about values Modified Paths: -------------- pymoul/trunk/src/moul/file/wdysini.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 16:16:39 UTC (rev 67) +++ pymoul/trunk/src/moul/file/wdysini.py 2007-01-24 17:01:15 UTC (rev 68) @@ -458,17 +458,18 @@ class AudioIni(ConfFile): _filename = 'audio.ini' _options = { - 'Audio.Initialize' : (BoolString, Constrain()), - 'Audio.UseEAX' : (BoolString, Constrain()), - 'Audio.SetPriorityCutoff' : (int, Constrain()), - 'Audio.MuteAll' : (int, MinMax(0, 1)), - 'Audio.SetChannelVolume SoundFX' : (FloatString, MinMax(0.0, 1.0)), - 'Audio.SetChannelVolume BgndMusic' : (FloatString, MinMax(0.0, 1.0)), - '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.Initialize' : (BoolString, Constrain()), # true/false, no ui + 'Audio.UseEAX' : (BoolString, Constrain()), # true/false + 'Audio.SetPriorityCutoff' : (int, Constrain()), # ??? + 'Audio.MuteAll' : (int, MinMax(0, 1)), # 0, 1 + 'Audio.SetChannelVolume SoundFX' : (FloatString, MinMax(0.0, 1.0)), # 0-100% + 'Audio.SetChannelVolume BgndMusic' : (FloatString, MinMax(0.0, 1.0)), # 0-100% + 'Audio.SetChannelVolume Ambience' : (FloatString, MinMax(0.0, 1.0)), # 0-100% + 'Audio.SetChannelVolume NPCVoice' : (FloatString, MinMax(0.0, 1.0)), # 0-100% + 'Audio.EnableVoiceRecording' : (int, MinMax(0, 1)), # 0, 1 'Audio.SetDeviceName' : (QuotedString, Constrain()), # TODO: add check - 'Audio.SetChannelVolume GUI' : (FloatString, MinMax(0.0, 1.0)), + 'Audio.SetChannelVolume GUI' : (FloatString, MinMax(0.0, 1.0)), # 0-100%, no ui + # microphon missing -> OS mixer } _devices = ['Generic Software', 'Generic Hardware'] # plus maybe a custom OpenAL v1.1 device @@ -547,16 +548,16 @@ _options = { 'Graphics.Width' : (int, Contains(videoModes.widths())), 'Graphics.Height' : (int, Contains(videoModes.heights())), - 'Graphics.ColorDepth' : (int, Constrain()), # no ui - 'Graphics.Windowed' : (BoolString, Constrain()), - 'Graphics.AntiAliasAmount' : (int, MinMax(1,4)), - 'Graphics.AnisotropicLevel' : (int, MinMax(1,5)), - 'Graphics.TextureQuality' : (int, MinMax(1,3)), - 'Quality.Level' : (int, MinMax(1,4)), - 'Graphics.Shadow.Enable' : (int, MinMax(0, 1)), - 'Graphics.EnablePlanarReflections' : (int, MinMax(0, 1)), # no ui - 'Graphics.EnableVSync' : (BoolString, Constrain()), - 'Graphics.Shadow.VisibleDistance' : (FloatString, MinMax(0.0, 1.0)), + 'Graphics.ColorDepth' : (int, Constrain()), # no ui, 32 + 'Graphics.Windowed' : (BoolString, Constrain()), # true/false + 'Graphics.AntiAliasAmount' : (int, MinMax(0,6)), # 0 - 6; 4 + 'Graphics.AnisotropicLevel' : (int, MinMax(1,16)), # 1 - 16; 5 + 'Graphics.TextureQuality' : (int, MinMax(0,2)), # 0-2, 3 + 'Quality.Level' : (int, MinMax(0,3)), # 0-3, 4 + 'Graphics.Shadow.Enable' : (int, MinMax(0, 1)), # 0, 1 + 'Graphics.EnablePlanarReflections' : (int, MinMax(0, 1)), # 0,1; no ui + 'Graphics.EnableVSync' : (BoolString, Constrain()), # true/false + 'Graphics.Shadow.VisibleDistance' : (FloatString, MinMax(0.0, 1.0)), # 0-1, 0-100% } def _getScreenRes(self): Modified: pymoul/trunk/src/moul/qt/ui/mainwindow.py =================================================================== --- pymoul/trunk/src/moul/qt/ui/mainwindow.py 2007-01-24 16:16:39 UTC (rev 67) +++ pymoul/trunk/src/moul/qt/ui/mainwindow.py 2007-01-24 17:01:15 UTC (rev 68) @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'src\moul\qt\ui\mainwindow.ui' # -# Created: Wed Jan 24 16:49:25 2007 +# Created: Wed Jan 24 17:55:00 2007 # by: PyQt4 UI code generator 4.1.1 # # WARNING! All changes made in this file will be lost! @@ -79,6 +79,86 @@ self.tab_graphics1 = QtGui.QWidget() self.tab_graphics1.setObjectName("tab_graphics1") + self.groupBox_gra_checkboxes = QtGui.QGroupBox(self.tab_graphics1) + self.groupBox_gra_checkboxes.setEnabled(True) + self.groupBox_gra_checkboxes.setGeometry(QtCore.QRect(240,10,201,71)) + self.groupBox_gra_checkboxes.setObjectName("groupBox_gra_checkboxes") + + self.groupBox_4 = QtGui.QGroupBox(self.groupBox_gra_checkboxes) + self.groupBox_4.setGeometry(QtCore.QRect(250,100,201,71)) + self.groupBox_4.setObjectName("groupBox_4") + + self.verticalLayout_4 = QtGui.QWidget(self.groupBox_4) + self.verticalLayout_4.setGeometry(QtCore.QRect(10,0,160,71)) + self.verticalLayout_4.setObjectName("verticalLayout_4") + + self.vboxlayout = QtGui.QVBoxLayout(self.verticalLayout_4) + self.vboxlayout.setMargin(0) + self.vboxlayout.setSpacing(6) + self.vboxlayout.setObjectName("vboxlayout") + + self.checkBox_4 = QtGui.QCheckBox(self.verticalLayout_4) + self.checkBox_4.setObjectName("checkBox_4") + self.vboxlayout.addWidget(self.checkBox_4) + + self.checkBox_5 = QtGui.QCheckBox(self.verticalLayout_4) + self.checkBox_5.setObjectName("checkBox_5") + self.vboxlayout.addWidget(self.checkBox_5) + + self.checkBox_6 = QtGui.QCheckBox(self.verticalLayout_4) + self.checkBox_6.setObjectName("checkBox_6") + self.vboxlayout.addWidget(self.checkBox_6) + + self.verticalLayout = QtGui.QWidget(self.groupBox_gra_checkboxes) + self.verticalLayout.setGeometry(QtCore.QRect(10,0,160,71)) + self.verticalLayout.setObjectName("verticalLayout") + + self.vboxlayout1 = QtGui.QVBoxLayout(self.verticalLayout) + self.vboxlayout1.setMargin(0) + self.vboxlayout1.setSpacing(6) + self.vboxlayout1.setObjectName("vboxlayout1") + + self.cb_gra_windowed = QtGui.QCheckBox(self.verticalLayout) + self.cb_gra_windowed.setObjectName("cb_gra_windowed") + self.vboxlayout1.addWidget(self.cb_gra_windowed) + + self.cb_gra_vsync = QtGui.QCheckBox(self.verticalLayout) + self.cb_gra_vsync.setObjectName("cb_gra_vsync") + self.vboxlayout1.addWidget(self.cb_gra_vsync) + + self.cb_gra_shadow = QtGui.QCheckBox(self.verticalLayout) + self.cb_gra_shadow.setObjectName("cb_gra_shadow") + self.vboxlayout1.addWidget(self.cb_gra_shadow) + + self.groupBox_screenres = QtGui.QGroupBox(self.tab_graphics1) + self.groupBox_screenres.setGeometry(QtCore.QRect(10,0,220,81)) + self.groupBox_screenres.setObjectName("groupBox_screenres") + + self.verticalLayout_2 = QtGui.QWidget(self.groupBox_screenres) + self.verticalLayout_2.setGeometry(QtCore.QRect(20,20,181,51)) + self.verticalLayout_2.setObjectName("verticalLayout_2") + + self.vboxlayout2 = QtGui.QVBoxLayout(self.verticalLayout_2) + self.vboxlayout2.setMargin(0) + self.vboxlayout2.setSpacing(6) + self.vboxlayout2.setObjectName("vboxlayout2") + + self.sl_gra_screenres = QtGui.QSlider(self.verticalLayout_2) + self.sl_gra_screenres.setMaximum(10) + self.sl_gra_screenres.setPageStep(1) + self.sl_gra_screenres.setSliderPosition(0) + self.sl_gra_screenres.setTracking(False) + self.sl_gra_screenres.setOrientation(QtCore.Qt.Horizontal) + self.sl_gra_screenres.setTickPosition(QtGui.QSlider.TicksBelow) + self.sl_gra_screenres.setTickInterval(1) + self.sl_gra_screenres.setObjectName("sl_gra_screenres") + self.vboxlayout2.addWidget(self.sl_gra_screenres) + + self.lb_screenres = QtGui.QLabel(self.verticalLayout_2) + self.lb_screenres.setAlignment(QtCore.Qt.AlignCenter) + self.lb_screenres.setObjectName("lb_screenres") + self.vboxlayout2.addWidget(self.lb_screenres) + self.groupBox_gra_quality = QtGui.QGroupBox(self.tab_graphics1) self.groupBox_gra_quality.setEnabled(True) self.groupBox_gra_quality.setGeometry(QtCore.QRect(10,79,430,261)) @@ -88,27 +168,28 @@ self.verticalLayout_7.setGeometry(QtCore.QRect(230,20,179,71)) self.verticalLayout_7.setObjectName("verticalLayout_7") - self.vboxlayout = QtGui.QVBoxLayout(self.verticalLayout_7) - self.vboxlayout.setMargin(0) - self.vboxlayout.setSpacing(6) - self.vboxlayout.setObjectName("vboxlayout") + self.vboxlayout3 = QtGui.QVBoxLayout(self.verticalLayout_7) + self.vboxlayout3.setMargin(0) + self.vboxlayout3.setSpacing(6) + self.vboxlayout3.setObjectName("vboxlayout3") self.label_20 = QtGui.QLabel(self.verticalLayout_7) self.label_20.setAlignment(QtCore.Qt.AlignCenter) self.label_20.setObjectName("label_20") - self.vboxlayout.addWidget(self.label_20) + self.vboxlayout3.addWidget(self.label_20) self.sl_gra_texture = QtGui.QSlider(self.verticalLayout_7) - self.sl_gra_texture.setMinimum(1) - self.sl_gra_texture.setMaximum(3) + self.sl_gra_texture.setMinimum(0) + self.sl_gra_texture.setMaximum(2) self.sl_gra_texture.setPageStep(1) - self.sl_gra_texture.setSliderPosition(1) + self.sl_gra_texture.setProperty("value",QtCore.QVariant(0)) + self.sl_gra_texture.setSliderPosition(0) self.sl_gra_texture.setTracking(False) self.sl_gra_texture.setOrientation(QtCore.Qt.Horizontal) self.sl_gra_texture.setTickPosition(QtGui.QSlider.TicksBelow) self.sl_gra_texture.setTickInterval(1) self.sl_gra_texture.setObjectName("sl_gra_texture") - self.vboxlayout.addWidget(self.sl_gra_texture) + self.vboxlayout3.addWidget(self.sl_gra_texture) self.hboxlayout1 = QtGui.QHBoxLayout() self.hboxlayout1.setMargin(0) @@ -123,33 +204,35 @@ self.label_22.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.label_22.setObjectName("label_22") self.hboxlayout1.addWidget(self.label_22) - self.vboxlayout.addLayout(self.hboxlayout1) + self.vboxlayout3.addLayout(self.hboxlayout1) self.verticalLayout_5 = QtGui.QWidget(self.groupBox_gra_quality) self.verticalLayout_5.setGeometry(QtCore.QRect(20,100,179,71)) self.verticalLayout_5.setObjectName("verticalLayout_5") - self.vboxlayout1 = QtGui.QVBoxLayout(self.verticalLayout_5) - self.vboxlayout1.setMargin(0) - self.vboxlayout1.setSpacing(6) - self.vboxlayout1.setObjectName("vboxlayout1") + self.vboxlayout4 = QtGui.QVBoxLayout(self.verticalLayout_5) + self.vboxlayout4.setMargin(0) + self.vboxlayout4.setSpacing(6) + self.vboxlayout4.setObjectName("vboxlayout4") self.label_13 = QtGui.QLabel(self.verticalLayout_5) self.label_13.setAlignment(QtCore.Qt.AlignCenter) self.label_13.setObjectName("label_13") - self.vboxlayout1.addWidget(self.label_13) + self.vboxlayout4.addWidget(self.label_13) self.sl_gra_antialias = QtGui.QSlider(self.verticalLayout_5) - self.sl_gra_antialias.setMinimum(1) - self.sl_gra_antialias.setMaximum(4) - self.sl_gra_antialias.setPageStep(1) - self.sl_gra_antialias.setSliderPosition(1) + self.sl_gra_antialias.setMinimum(0) + self.sl_gra_antialias.setMaximum(6) + self.sl_gra_antialias.setSingleStep(2) + self.sl_gra_antialias.setPageStep(2) + self.sl_gra_antialias.setProperty("value",QtCore.QVariant(0)) + self.sl_gra_antialias.setSliderPosition(0) self.sl_gra_antialias.setTracking(False) self.sl_gra_antialias.setOrientation(QtCore.Qt.Horizontal) self.sl_gra_antialias.setTickPosition(QtGui.QSlider.TicksBelow) - self.sl_gra_antialias.setTickInterval(1) + self.sl_gra_antialias.setTickInterval(2) self.sl_gra_antialias.setObjectName("sl_gra_antialias") - self.vboxlayout1.addWidget(self.sl_gra_antialias) + self.vboxlayout4.addWidget(self.sl_gra_antialias) self.hboxlayout2 = QtGui.QHBoxLayout() self.hboxlayout2.setMargin(0) @@ -164,33 +247,34 @@ self.label_16.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.label_16.setObjectName("label_16") self.hboxlayout2.addWidget(self.label_16) - self.vboxlayout1.addLayout(self.hboxlayout2) + self.vboxlayout4.addLayout(self.hboxlayout2) self.verticalLayout_3 = QtGui.QWidget(self.groupBox_gra_quality) self.verticalLayout_3.setGeometry(QtCore.QRect(20,20,179,71)) self.verticalLayout_3.setObjectName("verticalLayout_3") - self.vboxlayout2 = QtGui.QVBoxLayout(self.verticalLayout_3) - self.vboxlayout2.setMargin(0) - self.vboxlayout2.setSpacing(6) - self.vboxlayout2.setObjectName("vboxlayout2") + self.vboxlayout5 = QtGui.QVBoxLayout(self.verticalLayout_3) + self.vboxlayout5.setMargin(0) + self.vboxlayout5.setSpacing(6) + self.vboxlayout5.setObjectName("vboxlayout5") self.label_2 = QtGui.QLabel(self.verticalLayout_3) self.label_2.setAlignment(QtCore.Qt.AlignCenter) self.label_2.setObjectName("label_2") - self.vboxlayout2.addWidget(self.label_2) + self.vboxlayout5.addWidget(self.label_2) self.sl_gra_quality = QtGui.QSlider(self.verticalLayout_3) - self.sl_gra_quality.setMinimum(1) - self.sl_gra_quality.setMaximum(4) + self.sl_gra_quality.setMinimum(0) + self.sl_gra_quality.setMaximum(3) self.sl_gra_quality.setPageStep(1) - self.sl_gra_quality.setSliderPosition(1) + self.sl_gra_quality.setProperty("value",QtCore.QVariant(0)) + self.sl_gra_quality.setSliderPosition(0) self.sl_gra_quality.setTracking(False) self.sl_gra_quality.setOrientation(QtCore.Qt.Horizontal) self.sl_gra_quality.setTickPosition(QtGui.QSlider.TicksBelow) self.sl_gra_quality.setTickInterval(1) self.sl_gra_quality.setObjectName("sl_gra_quality") - self.vboxlayout2.addWidget(self.sl_gra_quality) + self.vboxlayout5.addWidget(self.sl_gra_quality) self.hboxlayout3 = QtGui.QHBoxLayout() self.hboxlayout3.setMargin(0) @@ -215,21 +299,21 @@ self.label_7.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.label_7.setObjectName("label_7") self.hboxlayout3.addWidget(self.label_7) - self.vboxlayout2.addLayout(self.hboxlayout3) + self.vboxlayout5.addLayout(self.hboxlayout3) self.verticalLayout_8 = QtGui.QWidget(self.groupBox_gra_quality) self.verticalLayout_8.setGeometry(QtCore.QRect(20,180,179,71)) self.verticalLayout_8.setObjectName("verticalLayout_8") - self.vboxlayout3 = QtGui.QVBoxLayout(self.verticalLayout_8) - self.vboxlayout3.setMargin(0) - self.vboxlayout3.setSpacing(6) - self.vboxlayout3.setObjectName("vboxlayout3") + self.vboxlayout6 = QtGui.QVBoxLayout(self.verticalLayout_8) + self.vboxlayout6.setMargin(0) + self.vboxlayout6.setSpacing(6) + self.vboxlayout6.setObjectName("vboxlayout6") self.label_15 = QtGui.QLabel(self.verticalLayout_8) self.label_15.setAlignment(QtCore.Qt.AlignCenter) self.label_15.setObjectName("label_15") - self.vboxlayout3.addWidget(self.label_15) + self.vboxlayout6.addWidget(self.label_15) self.sl_gra_shadow = QtGui.QSlider(self.verticalLayout_8) self.sl_gra_shadow.setMinimum(0) @@ -242,7 +326,7 @@ self.sl_gra_shadow.setTickPosition(QtGui.QSlider.TicksBelow) self.sl_gra_shadow.setTickInterval(25) self.sl_gra_shadow.setObjectName("sl_gra_shadow") - self.vboxlayout3.addWidget(self.sl_gra_shadow) + self.vboxlayout6.addWidget(self.sl_gra_shadow) self.hboxlayout4 = QtGui.QHBoxLayout() self.hboxlayout4.setMargin(0) @@ -257,33 +341,34 @@ self.label_24.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.label_24.setObjectName("label_24") self.hboxlayout4.addWidget(self.label_24) - self.vboxlayout3.addLayout(self.hboxlayout4) + self.vboxlayout6.addLayout(self.hboxlayout4) self.verticalLayout_6 = QtGui.QWidget(self.groupBox_gra_quality) self.verticalLayout_6.setGeometry(QtCore.QRect(230,100,179,73)) self.verticalLayout_6.setObjectName("verticalLayout_6") - self.vboxlayout4 = QtGui.QVBoxLayout(self.verticalLayout_6) - self.vboxlayout4.setMargin(0) - self.vboxlayout4.setSpacing(6) - self.vboxlayout4.setObjectName("vboxlayout4") + self.vboxlayout7 = QtGui.QVBoxLayout(self.verticalLayout_6) + self.vboxlayout7.setMargin(0) + self.vboxlayout7.setSpacing(6) + self.vboxlayout7.setObjectName("vboxlayout7") self.label_17 = QtGui.QLabel(self.verticalLayout_6) self.label_17.setAlignment(QtCore.Qt.AlignCenter) self.label_17.setObjectName("label_17") - self.vboxlayout4.addWidget(self.label_17) + self.vboxlayout7.addWidget(self.label_17) self.sl_gra_anisotropic = QtGui.QSlider(self.verticalLayout_6) self.sl_gra_anisotropic.setMinimum(1) - self.sl_gra_anisotropic.setMaximum(5) - self.sl_gra_anisotropic.setPageStep(1) + self.sl_gra_anisotropic.setMaximum(16) + self.sl_gra_anisotropic.setSingleStep(3) + self.sl_gra_anisotropic.setPageStep(3) self.sl_gra_anisotropic.setSliderPosition(1) self.sl_gra_anisotropic.setTracking(False) self.sl_gra_anisotropic.setOrientation(QtCore.Qt.Horizontal) self.sl_gra_anisotropic.setTickPosition(QtGui.QSlider.TicksBelow) - self.sl_gra_anisotropic.setTickInterval(1) + self.sl_gra_anisotropic.setTickInterval(5) self.sl_gra_anisotropic.setObjectName("sl_gra_anisotropic") - self.vboxlayout4.addWidget(self.sl_gra_anisotropic) + self.vboxlayout7.addWidget(self.sl_gra_anisotropic) self.hboxlayout5 = QtGui.QHBoxLayout() self.hboxlayout5.setMargin(0) @@ -298,87 +383,7 @@ self.label_19.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter) self.label_19.setObjectName("label_19") self.hboxlayout5.addWidget(self.label_19) - self.vboxlayout4.addLayout(self.hboxlayout5) - - self.groupBox_gra_checkboxes = QtGui.QGroupBox(self.tab_graphics1) - self.groupBox_gra_checkboxes.setEnabled(True) - self.groupBox_gra_checkboxes.setGeometry(QtCore.QRect(240,10,201,71)) - self.groupBox_gra_checkboxes.setObjectName("groupBox_gra_checkboxes") - - self.groupBox_4 = QtGui.QGroupBox(self.groupBox_gra_checkboxes) - self.groupBox_4.setGeometry(QtCore.QRect(250,100,201,71)) - self.groupBox_4.setObjectName("groupBox_4") - - self.verticalLayout_4 = QtGui.QWidget(self.groupBox_4) - self.verticalLayout_4.setGeometry(QtCore.QRect(10,0,160,71)) - self.verticalLayout_4.setObjectName("verticalLayout_4") - - self.vboxlayout5 = QtGui.QVBoxLayout(self.verticalLayout_4) - self.vboxlayout5.setMargin(0) - self.vboxlayout5.setSpacing(6) - self.vboxlayout5.setObjectName("vboxlayout5") - - self.checkBox_4 = QtGui.QCheckBox(self.verticalLayout_4) - self.checkBox_4.setObjectName("checkBox_4") - self.vboxlayout5.addWidget(self.checkBox_4) - - self.checkBox_5 = QtGui.QCheckBox(self.verticalLayout_4) - self.checkBox_5.setObjectName("checkBox_5") - self.vboxlayout5.addWidget(self.checkBox_5) - - self.checkBox_6 = QtGui.QCheckBox(self.verticalLayout_4) - self.checkBox_6.setObjectName("checkBox_6") - self.vboxlayout5.addWidget(self.checkBox_6) - - self.verticalLayout = QtGui.QWidget(self.groupBox_gra_checkboxes) - self.verticalLayout.setGeometry(QtCore.QRect(10,0,160,71)) - self.verticalLayout.setObjectName("verticalLayout") - - self.vboxlayout6 = QtGui.QVBoxLayout(self.verticalLayout) - self.vboxlayout6.setMargin(0) - self.vboxlayout6.setSpacing(6) - self.vboxlayout6.setObjectName("vboxlayout6") - - self.cb_gra_windowed = QtGui.QCheckBox(self.verticalLayout) - self.cb_gra_windowed.setObjectName("cb_gra_windowed") - self.vboxlayout6.addWidget(self.cb_gra_windowed) - - self.cb_gra_vsync = QtGui.QCheckBox(self.verticalLayout) - self.cb_gra_vsync.setObjectName("cb_gra_vsync") - self.vboxlayout6.addWidget(self.cb_gra_vsync) - - self.cb_gra_shadow = QtGui.QCheckBox(self.verticalLayout) - self.cb_gra_shadow.setObjectName("cb_gra_shadow") - self.vboxlayout6.addWidget(self.cb_gra_shadow) - - self.groupBox_screenres = QtGui.QGroupBox(self.tab_graphics1) - self.groupBox_screenres.setGeometry(QtCore.QRect(10,0,220,81)) - self.groupBox_screenres.setObjectName("groupBox_screenres") - - self.verticalLayout_2 = QtGui.QWidget(self.groupBox_screenres) - self.verticalLayout_2.setGeometry(QtCore.QRect(20,20,181,51)) - self.verticalLayout_2.setObjectName("verticalLayout_2") - - self.vboxlayout7 = QtGui.QVBoxLayout(self.verticalLayout_2) - self.vboxlayout7.setMargin(0) - self.vboxlayout7.setSpacing(6) - self.vboxlayout7.setObjectName("vboxlayout7") - - self.sl_gra_screenres = QtGui.QSlider(self.verticalLayout_2) - self.sl_gra_screenres.setMaximum(10) - self.sl_gra_screenres.setPageStep(1) - self.sl_gra_screenres.setSliderPosition(0) - self.sl_gra_screenres.setTracking(False) - self.sl_gra_screenres.setOrientation(QtCore.Qt.Horizontal) - self.sl_gra_screenres.setTickPosition(QtGui.QSlider.TicksBelow) - self.sl_gra_screenres.setTickInterval(1) - self.sl_gra_screenres.setObjectName("sl_gra_screenres") - self.vboxlayout7.addWidget(self.sl_gra_screenres) - - self.lb_screenres = QtGui.QLabel(self.verticalLayout_2) - self.lb_screenres.setAlignment(QtCore.Qt.AlignCenter) - self.lb_screenres.setObjectName("lb_screenres") - self.vboxlayout7.addWidget(self.lb_screenres) + self.vboxlayout7.addLayout(self.hboxlayout5) self.tab_graphics.addTab(self.tab_graphics1,"") self.tab_audio = QtGui.QWidget() @@ -720,6 +725,14 @@ def retranslateUi(self, MainWindow): MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "Tool for Myst Online", None, QtGui.QApplication.UnicodeUTF8)) self.pushButton.setText(QtGui.QApplication.translate("MainWindow", "Configure", None, QtGui.QApplication.UnicodeUTF8)) + self.checkBox_4.setText(QtGui.QApplication.translate("MainWindow", "CheckBox", None, QtGui.QApplication.UnicodeUTF8)) + self.checkBox_5.setText(QtGui.QApplication.translate("MainWindow", "CheckBox", None, QtGui.QApplication.UnicodeUTF8)) + self.checkBox_6.setText(QtGui.QApplication.translate("MainWindow", "CheckBox", None, QtGui.QApplication.UnicodeUTF8)) + self.cb_gra_windowed.setText(QtGui.QApplication.translate("MainWindow", "Windowed", None, QtGui.QApplication.UnicodeUTF8)) + self.cb_gra_vsync.setText(QtGui.QApplication.translate("MainWindow", "Vertical Sync", None, QtGui.QApplication.UnicodeUTF8)) + self.cb_gra_shadow.setText(QtGui.QApplication.translate("MainWindow", "Display Shadows", None, QtGui.QApplication.UnicodeUTF8)) + self.groupBox_screenres.setTitle(QtGui.QApplication.translate("MainWindow", "Screen Resolution", None, QtGui.QApplication.UnicodeUTF8)) + self.lb_screenres.setText(QtGui.QApplication.translate("MainWindow", "800x600 (4:3)", None, QtGui.QApplication.UnicodeUTF8)) self.groupBox_gra_quality.setTitle(QtGui.QApplication.translate("MainWindow", "Quality", None, QtGui.QApplication.UnicodeUTF8)) self.label_20.setText(QtGui.QApplication.translate("MainWindow", "Texture Quality", None, QtGui.QApplication.UnicodeUTF8)) self.label_21.setText(QtGui.QApplication.translate("MainWindow", "Low", None, QtGui.QApplication.UnicodeUTF8)) @@ -738,14 +751,6 @@ self.label_17.setText(QtGui.QApplication.translate("MainWindow", "Anisotropic-Filtering", None, QtGui.QApplication.UnicodeUTF8)) self.label_18.setText(QtGui.QApplication.translate("MainWindow", "Low", None, QtGui.QApplication.UnicodeUTF8)) self.label_19.setText(QtGui.QApplication.translate("MainWindow", "High", None, QtGui.QApplication.UnicodeUTF8)) - self.checkBox_4.setText(QtGui.QApplication.translate("MainWindow", "CheckBox", None, QtGui.QApplication.UnicodeUTF8)) - self.checkBox_5.setText(QtGui.QApplication.translate("MainWindow", "CheckBox", None, QtGui.QApplication.UnicodeUTF8)) - self.checkBox_6.setText(QtGui.QApplication.translate("MainWindow", "CheckBox", None, QtGui.QApplication.UnicodeUTF8)) - self.cb_gra_windowed.setText(QtGui.QApplication.translate("MainWindow", "Windowed", None, QtGui.QApplication.UnicodeUTF8)) - self.cb_gra_vsync.setText(QtGui.QApplication.translate("MainWindow", "Vertical Sync", None, QtGui.QApplication.UnicodeUTF8)) - self.cb_gra_shadow.setText(QtGui.QApplication.translate("MainWindow", "Display Shadows", None, QtGui.QApplication.UnicodeUTF8)) - self.groupBox_screenres.setTitle(QtGui.QApplication.translate("MainWindow", "Screen Resolution", None, QtGui.QApplication.UnicodeUTF8)) - self.lb_screenres.setText(QtGui.QApplication.translate("MainWindow", "800x600 (4:3)", None, QtGui.QApplication.UnicodeUTF8)) 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)) Modified: pymoul/trunk/src/moul/qt/ui/mainwindow.ui =================================================================== --- pymoul/trunk/src/moul/qt/ui/mainwindow.ui 2007-01-24 16:16:39 UTC (rev 67) +++ pymoul/trunk/src/moul/qt/ui/mainwindow.ui 2007-01-24 17:01:15 UTC (rev 68) @@ -135,6 +135,179 @@ <attribute name="title" > <string>Graphics</string> </attribute> + <widget class="QGroupBox" name="groupBox_gra_checkboxes" > + <property name="enabled" > + <bool>true</bool> + </property> + <property name="geometry" > + <rect> + <x>240</x> + <y>10</y> + <width>201</width> + <height>71</height> + </rect> + </property> + <property name="title" > + <string/> + </property> + <widget class="QGroupBox" name="groupBox_4" > + <property name="geometry" > + <rect> + <x>250</x> + <y>100</y> + <width>201</width> + <height>71</height> + </rect> + </property> + <property name="title" > + <string/> + </property> + <widget class="QWidget" name="verticalLayout_4" > + <property name="geometry" > + <rect> + <x>10</x> + <y>0</y> + <width>160</width> + <height>71</height> + </rect> + </property> + <layout class="QVBoxLayout" > + <property name="margin" > + <number>0</number> + </property> + <property name="spacing" > + <number>6</number> + </property> + <item> + <widget class="QCheckBox" name="checkBox_4" > + <property name="text" > + <string>CheckBox</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="checkBox_5" > + <property name="text" > + <string>CheckBox</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="checkBox_6" > + <property name="text" > + <string>CheckBox</string> + </property> + </widget> + </item> + </layout> + </widget> + </widget> + <widget class="QWidget" name="verticalLayout" > + <property name="geometry" > + <rect> + <x>10</x> + <y>0</y> + <width>160</width> + <height>71</height> + </rect> + </property> + <layout class="QVBoxLayout" > + <property name="margin" > + <number>0</number> + </property> + <property name="spacing" > + <number>6</number> + </property> + <item> + <widget class="QCheckBox" name="cb_gra_windowed" > + <property name="text" > + <string>Windowed</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="cb_gra_vsync" > + <property name="text" > + <string>Vertical Sync</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="cb_gra_shadow" > + <property name="text" > + <string>Display Shadows</string> + </property> + </widget> + </item> + </layout> + </widget> + </widget> + <widget class="QGroupBox" name="groupBox_screenres" > + <property name="geometry" > + <rect> + <x>10</x> + <y>0</y> + <width>220</width> + <height>81</height> + </rect> + </property> + <property name="title" > + <string>Screen Resolution</string> + </property> + <widget class="QWidget" name="verticalLayout_2" > + <property name="geometry" > + <rect> + <x>20</x> + <y>20</y> + <width>181</width> + <height>51</height> + </rect> + </property> + <layout class="QVBoxLayout" > + <property name="margin" > + <number>0</number> + </property> + <property name="spacing" > + <number>6</number> + </property> + <item> + <widget class="QSlider" name="sl_gra_screenres" > + <property name="maximum" > + <number>10</number> + </property> + <property name="pageStep" > + <number>1</number> + </property> + <property name="sliderPosition" > + <number>0</number> + </property> + <property name="tracking" > + <bool>false</bool> + </property> + <property name="orientation" > + <enum>Qt::Horizontal</enum> + </property> + <property name="tickPosition" > + <enum>QSlider::TicksBelow</enum> + </property> + <property name="tickInterval" > + <number>1</number> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="lb_screenres" > + <property name="text" > + <string>800x600 (4:3)</string> + </property> + <property name="alignment" > + <set>Qt::AlignCenter</set> + </property> + </widget> + </item> + </layout> + </widget> + </widget> <widget class="QGroupBox" name="groupBox_gra_quality" > <property name="enabled" > <bool>true</bool> @@ -179,16 +352,19 @@ <item> <widget class="QSlider" name="sl_gra_texture" > <property name="minimum" > - <number>1</number> + <number>0</number> </property> <property name="maximum" > - <number>3</number> + <number>2</number> </property> <property name="pageStep" > <number>1</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> @@ -262,16 +438,22 @@ <item> <widget class="QSlider" name="sl_gra_antialias" > <property name="minimum" > - <number>1</number> + <number>0</number> </property> <property name="maximum" > - <number>4</number> + <number>6</number> </property> + <property name="singleStep" > + <number>2</number> + </property> <property name="pageStep" > - <number>1</number> + <number>2</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> @@ -283,7 +465,7 @@ <enum>QSlider::TicksBelow</enum> </property> <property name="tickInterval" > - <number>1</number> + <number>2</number> </property> </widget> </item> @@ -345,16 +527,19 @@ <item> <widget class="QSlider" name="sl_gra_quality" > <property name="minimum" > - <number>1</number> + <number>0</number> </property> <property name="maximum" > - <number>4</number> + <number>3</number> </property> <property name="pageStep" > <number>1</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> @@ -537,10 +722,13 @@ <number>1</number> </property> <property name="maximum" > - <number>5</number> + <number>16</number> </property> + <property name="singleStep" > + <number>3</number> + </property> <property name="pageStep" > - <number>1</number> + <number>3</number> </property> <property name="sliderPosition" > <number>1</number> @@ -555,7 +743,7 @@ <enum>QSlider::TicksBelow</enum> </property> <property name="tickInterval" > - <number>1</number> + <number>5</number> </property> </widget> </item> @@ -589,179 +777,6 @@ </layout> </widget> </widget> - <widget class="QGroupBox" name="groupBox_gra_checkboxes" > - <property name="enabled" > - <bool>true</bool> - </property> - <property name="geometry" > - <rect> - <x>240</x> - <y>10</y> - <width>201</width> - <height>71</height> - </rect> - </property> - <property name="title" > - <string/> - </property> - <widget class="QGroupBox" name="groupBox_4" > - <property name="geometry" > - <rect> - <x>250</x> - <y>100</y> - <width>201</width> - <height>71</height> - </rect> - </property> - <property name="title" > - <string/> - </property> - <widget class="QWidget" name="verticalLayout_4" > - <property name="geometry" > - <rect> - <x>10</x> - <y>0</y> - <width>160</width> - <height>71</height> - </rect> - </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="QCheckBox" name="checkBox_4" > - <property name="text" > - <string>CheckBox</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="checkBox_5" > - <property name="text" > - <string>CheckBox</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="checkBox_6" > - <property name="text" > - <string>CheckBox</string> - </property> - </widget> - </item> - </layout> - </widget> - </widget> - <widget class="QWidget" name="verticalLayout" > - <property name="geometry" > - <rect> - <x>10</x> - <y>0</y> - <width>160</width> - <height>71</height> - </rect> - </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="QCheckBox" name="cb_gra_windowed" > - <property name="text" > - <string>Windowed</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="cb_gra_vsync" > - <property name="text" > - <string>Vertical Sync</string> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="cb_gra_shadow" > - <property name="text" > - <string>Display Shadows</string> - </property> - </widget> - </item> - </layout> - </widget> - </widget> - <widget class="QGroupBox" name="groupBox_screenres" > - <property name="geometry" > - <rect> - <x>10</x> - <y>0</y> - <width>220</width> - <height>81</height> - </rect> - </property> - <property name="title" > - <string>Screen Resolution</string> - </property> - <widget class="QWidget" name="verticalLayout_2" > - <property name="geometry" > - <rect> - <x>20</x> - <y>20</y> - <width>181</width> - <height>51</height> - </rect> - </property> - <layout class="QVBoxLayout" > - <property name="margin" > - <number>0</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item> - <widget class="QSlider" name="sl_gra_screenres" > - <property name="maximum" > - <number>10</number> - </property> - <property name="pageStep" > - <number>1</number> - </property> - <property name="sliderPosition" > - <number>0</number> - </property> - <property name="tracking" > - <bool>false</bool> - </property> - <property name="orientation" > - <enum>Qt::Horizontal</enum> - </property> - <property name="tickPosition" > - <enum>QSlider::TicksBelow</enum> - </property> - <property name="tickInterval" > - <number>1</number> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="lb_screenres" > - <property name="text" > - <string>800x600 (4:3)</string> - </property> - <property name="alignment" > - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - </layout> - </widget> - </widget> </widget> <widget class="QWidget" name="tab_audio" > <attribute name="title" > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |