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

Move several .ui files to ui/dialogs and ui/widgets

Browse Source
This commit is contained in:
David Vierra 2015-11-18 02:59:56 -10:00
parent c1bab59e71
commit d6049cabd5
11 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mcedit2/dialogs/configure_blocks.py
View File

@ -257,7 +257,7 @@ class ConfigureBlocksItemModel(QtCore.QAbstractItemModel):
class ConfigureBlocksDialog(QtGui.QDialog): class ConfigureBlocksDialog(QtGui.QDialog):
def __init__(self, parent): def __init__(self, parent):
super(ConfigureBlocksDialog, self).__init__(parent) super(ConfigureBlocksDialog, self).__init__(parent)
load_ui("configure_blocks_dialog.ui", baseinstance=self) load_ui("dialogs/configure_blocks.ui", baseinstance=self)
self.okButton.clicked.connect(self.accept) self.okButton.clicked.connect(self.accept)
self.texListNameProxyModel = None self.texListNameProxyModel = None

2
src/mcedit2/dialogs/error_dialog.py
View File

@ -33,7 +33,7 @@ class ErrorDialog(QtGui.QDialog):
super(ErrorDialog, self).__init__() super(ErrorDialog, self).__init__()
self.setModal(True) self.setModal(True)
load_ui("error_dialog.ui", baseinstance=self) load_ui("dialogs/error_dialog.ui", baseinstance=self)
exc_type, exc_value, exc_tb = exc_info exc_type, exc_value, exc_tb = exc_info

2
src/mcedit2/dialogs/plugins_dialog.py
View File

@ -99,7 +99,7 @@ class PluginsTableModel(QtCore.QAbstractTableModel):
class PluginsDialog(QtGui.QDialog): class PluginsDialog(QtGui.QDialog):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(PluginsDialog, self).__init__(*args, **kwargs) super(PluginsDialog, self).__init__(*args, **kwargs)
load_ui("plugins.ui", baseinstance=self) load_ui("dialogs/plugins.ui", baseinstance=self)
def exec_(self): def exec_(self):
self.model = PluginsTableModel() self.model = PluginsTableModel()

0
src/mcedit2/ui/configure_blocks_dialog.ui → src/mcedit2/ui/dialogs/configure_blocks.ui
View File

0
src/mcedit2/ui/error_dialog.ui → src/mcedit2/ui/dialogs/error_dialog.ui
View File

0
src/mcedit2/ui/plugins.ui → src/mcedit2/ui/dialogs/plugins.ui
View File

0
src/mcedit2/ui/block_picker.ui → src/mcedit2/ui/widgets/block_picker.ui
View File

0
src/mcedit2/ui/block_picker_multiple.ui → src/mcedit2/ui/widgets/block_picker_multiple.ui
View File

0
src/mcedit2/ui/coord_widget.ui → src/mcedit2/ui/widgets/coord_widget.ui
View File

4
src/mcedit2/widgets/blockpicker.py
View File

@ -417,9 +417,9 @@ class BlockTypePicker(QtGui.QDialog):
self.multipleSelect = multipleSelect self.multipleSelect = multipleSelect
if self.multipleSelect: if self.multipleSelect:
load_ui("block_picker_multiple.ui", baseinstance=self) load_ui("widgets/block_picker_multiple.ui", baseinstance=self)
else: else:
load_ui("block_picker.ui", baseinstance=self) load_ui("widgets/block_picker.ui", baseinstance=self)
self.selectButton.clicked.connect(self.accept) self.selectButton.clicked.connect(self.accept)
self.cancelButton.clicked.connect(self.reject) self.cancelButton.clicked.connect(self.reject)

2
src/mcedit2/widgets/coord_widget.py
View File

@ -14,7 +14,7 @@ log = logging.getLogger(__name__)
class CoordinateWidget(QtGui.QWidget): class CoordinateWidget(QtGui.QWidget):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(CoordinateWidget, self).__init__(*args, **kwargs) super(CoordinateWidget, self).__init__(*args, **kwargs)
load_ui("coord_widget.ui", baseinstance=self) load_ui("widgets/coord_widget.ui", baseinstance=self)
self.xInput.valueChanged.connect(self.setX) self.xInput.valueChanged.connect(self.setX)
self.yInput.valueChanged.connect(self.setY) self.yInput.valueChanged.connect(self.setY)