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

Adjust appearance of Version/ResourcePack buttons.

Browse Source
This commit is contained in:
David Vierra 2015-09-08 12:11:30 -10:00
parent daf729eedb
commit ef5fa310ab
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mcedit2/editorapp.py
View File

@ -510,9 +510,15 @@ class MCEditApp(QtGui.QApplication):
self.mainWindow.panelsToolBar.addSeparator() self.mainWindow.panelsToolBar.addSeparator()
for action in session.panelActions: for action in session.panelActions:
if action is None:
self.mainWindow.panelsToolBar.addSeparator()
else:
self.mainWindow.panelsToolBar.addAction(action) self.mainWindow.panelsToolBar.addAction(action)
for action in session.toolActions: for action in session.toolActions:
if action is None:
self.mainWindow.toolsToolBar.addSeparator()
else:
self.mainWindow.toolsToolBar.addAction(action) self.mainWindow.toolsToolBar.addAction(action)

30
src/mcedit2/editorsession.py
View File

@ -368,24 +368,28 @@ class EditorSession(QtCore.QObject):
dimButton.setPopupMode(QtGui.QToolButton.InstantPopup) dimButton.setPopupMode(QtGui.QToolButton.InstantPopup)
self.panelActions.append(dimAction) self.panelActions.append(dimAction)
self.panelActions.append(None)
# --- Versions/Resource Packs ---
versionRPAction = self.versionRPAction = QtGui.QWidgetAction(self)
mcVersionButton = self.changeMCVersionButton = QtGui.QToolButton() mcVersionButton = self.changeMCVersionButton = QtGui.QToolButton(autoRaise=True)
mcVersionButton.setText(self.minecraftVersionLabel()) mcVersionButton.setText(self.minecraftVersionLabel())
mcVersionAction = self.changeMCVersionAction = QtGui.QWidgetAction(self)
mcVersionAction.setDefaultWidget(mcVersionButton)
self.mcVersionMenu = QtGui.QMenu() self.mcVersionMenu = QtGui.QMenu()
mcVersionButton.setMenu(self.mcVersionMenu) mcVersionButton.setMenu(self.mcVersionMenu)
mcVersionButton.setPopupMode(QtGui.QToolButton.InstantPopup) mcVersionButton.setPopupMode(QtGui.QToolButton.InstantPopup)
self.panelActions.append(mcVersionAction)
resourcePackButton = self.changeResourcePackButton = QtGui.QToolButton() resourcePackButton = self.changeResourcePackButton = QtGui.QToolButton(autoRaise=True)
resourcePackButton.setText(self.resourcePackLabel()) resourcePackButton.setText(self.resourcePackLabel())
resourcePackAction = self.changeResourcePackAction = QtGui.QWidgetAction(self)
resourcePackAction.setDefaultWidget(resourcePackButton)
self.resourcePackMenu = QtGui.QMenu() self.resourcePackMenu = QtGui.QMenu()
resourcePackButton.setMenu(self.resourcePackMenu) resourcePackButton.setMenu(self.resourcePackMenu)
resourcePackButton.setPopupMode(QtGui.QToolButton.InstantPopup) resourcePackButton.setPopupMode(QtGui.QToolButton.InstantPopup)
self.panelActions.append(resourcePackAction)
versionRPColumn = Column(mcVersionButton, resourcePackButton)
versionRPWidget = QtGui.QWidget()
versionRPWidget.setLayout(versionRPColumn)
versionRPAction.setDefaultWidget(versionRPWidget)
self.panelActions.append(versionRPAction)
self._updateVersionsAndResourcePacks() self._updateVersionsAndResourcePacks()
@ -421,12 +425,12 @@ class EditorSession(QtCore.QObject):
log.info("Update progressMax to %d, please.", progress.progressCount) log.info("Update progressMax to %d, please.", progress.progressCount)
def minecraftVersionLabel(self): def minecraftVersionLabel(self):
version = minecraftinstall.currentVersionOption.value() version = minecraftinstall.currentVersionOption.value() or self.tr("(Not set)")
return "Minecraft Version: %s" % version return self.tr("Minecraft Version: %s") % version
def resourcePackLabel(self): def resourcePackLabel(self):
resourcePack = minecraftinstall.currentResourcePackOption.value() resourcePack = minecraftinstall.currentResourcePackOption.value() or self.tr("(Default)")
return "Resource Pack: %s" % resourcePack return self.tr("Resource Pack: %s") % resourcePack
def _updateVersionsAndResourcePacks(self): def _updateVersionsAndResourcePacks(self):
@ -438,7 +442,7 @@ class EditorSession(QtCore.QObject):
self.mcVersionMenu.clear() self.mcVersionMenu.clear()
self.resourcePackMenu.clear() self.resourcePackMenu.clear()
defaultAction = self.resourcePackMenu.addAction(self.tr("(No resource pack)")) defaultAction = self.resourcePackMenu.addAction(self.tr("(Default)"))
defaultAction.triggered.connect(self.resourcePackMapper.map) defaultAction.triggered.connect(self.resourcePackMapper.map)
self.resourcePackMapper.setMapping(defaultAction, "") self.resourcePackMapper.setMapping(defaultAction, "")