AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Start work on Prefs Dialog, add Max View Distance setting

Browse Source
This commit is contained in:
David Vierra 2016-08-25 23:30:37 -10:00
parent 05ee26430c
commit 3f7e66c533
6 changed files with 151 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/mcedit2/ui/dialogs/preferences.ui Normal file
View File

@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>preferencesDialog</class>
<widget class="QDialog" name="preferencesDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>893</width>
<height>510</height>
</rect>
</property>
<property name="windowTitle">
<string>Preferences</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="1,0">
<item>
<widget class="QSplitter" name="splitter">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<widget class="QListWidget" name="categoryList">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="baseSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
</widget>
<widget class="QStackedWidget" name="frameStack">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="frameShape">
<enum>QFrame::StyledPanel</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
</widget>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="okButton">
<property name="text">
<string>Close</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

32
src/mcedit2/ui/preferences_dialog.ui
View File

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>preferencesDialog</class>
<widget class="QDialog" name="preferencesDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>509</width>
<height>510</height>
</rect>
</property>
<property name="windowTitle">
<string>Preferences</string>
</property>
<widget class="QPushButton" name="okButton">
<property name="geometry">
<rect>
<x>370</x>
<y>450</y>
<width>75</width>
<height>23</height>
</rect>
</property>
<property name="text">
<string>OK</string>
</property>
</widget>
</widget>
<resources/>
<connections/>
</ui>

16
src/mcedit2/widgets/prefsdialog.py
View File

@ -1,16 +0,0 @@
"""
prefsdialog.py
"""
from __future__ import absolute_import, division, print_function
import logging
from PySide import QtGui
from mcedit2.ui.preferences_dialog import Ui_preferencesDialog
log = logging.getLogger(__name__)
class PrefsDialog(QtGui.QDialog, Ui_preferencesDialog):
def __init__(self, parent):
super(PrefsDialog, self).__init__(parent)
self.setupUi(self)
self.okButton.clicked.connect(self.accept)

39
src/mcedit2/widgets/prefsdialog/__init__.py Normal file
View File

@ -0,0 +1,39 @@
"""
prefsdialog
"""
from __future__ import absolute_import, division, print_function
import logging
from PySide import QtCore
from PySide import QtGui
from mcedit2.ui.dialogs.preferences import Ui_preferencesDialog
log = logging.getLogger(__name__)
from .camera import CameraPrefs
class PrefsDialog(QtGui.QDialog, Ui_preferencesDialog):
def __init__(self, parent):
super(PrefsDialog, self).__init__(parent)
self.setupUi(self)
self.okButton.clicked.connect(self.accept)
self.frames = [
CameraPrefs()
]
for i, frame in enumerate(self.frames):
item = QtGui.QListWidgetItem(frame.labelText)
item.setData(QtCore.Qt.UserRole, i)
self.categoryList.addItem(item)
self.categoryList.itemClicked.connect(self.itemWasClicked)
self.frameStack.addWidget(self.frames[0])
def itemWasClicked(self, item):
idx = item.data(QtCore.Qt.UserRole)
self.frameStack.removeWidget(self.frameStack.widget(0))
self.frameStack.addWidget(self.frames[idx])

27
src/mcedit2/widgets/prefsdialog/camera.py Normal file
View File

@ -0,0 +1,27 @@
"""
camera
"""
from __future__ import absolute_import, division, print_function, unicode_literals
import logging
from PySide import QtGui
from mcedit2.widgets.layout import Column
from mcedit2.worldview.camera import MaxViewDistanceSetting
log = logging.getLogger(__name__)
class CameraPrefs(QtGui.QWidget):
def __init__(self):
super(CameraPrefs, self).__init__()
self.labelText = self.tr("Camera View")
layout = QtGui.QFormLayout()
maxViewDistanceInput = QtGui.QSpinBox()
maxViewDistanceInput.setMinimum(0)
maxViewDistanceInput.valueChanged.connect(MaxViewDistanceSetting.setValue)
MaxViewDistanceSetting.connectAndCall(maxViewDistanceInput.setValue)
layout.addRow(self.tr("Max View Distance"), maxViewDistanceInput)
self.setLayout(Column(layout, None))

6
src/mcedit2/worldview/camera.py
View File

@ -29,6 +29,8 @@ log = logging.getLogger(__name__)
settings = Settings().getNamespace("worldview/camera")
ViewDistanceSetting = settings.getOption("view_distance", int, 12)
MaxViewDistanceSetting = settings.getOption("max_view_distance", int, 64)
PerspectiveSetting = settings.getOption("perspective", bool, True)
StickyMouselookSetting = settings.getOption("sticky_mouselook", bool, True)
@ -56,7 +58,9 @@ class CameraWorldViewFrame(QtGui.QWidget):
viewDistanceInput = QtGui.QSpinBox(minimum=2, maximum=64, singleStep=2)
viewDistanceInput.setValue(self.worldView.viewDistance)
viewDistanceInput.valueChanged.connect(ViewDistanceSetting.setValue)
MaxViewDistanceSetting.connectAndCall(viewDistanceInput.setMaximum)
PerspectiveSetting.connectAndCall(view.setPerspective)
perspectiveInput = QtGui.QCheckBox(self.tr("Perspective"))