From: Steven Abadie <steven@alephobjects.com>
Date: Sun, 16 Nov 2014 21:48:12 +0000 (-0700)
Subject: Separated View mode and normal mode buttons
X-Git-Tag: 14.09-1.18~52
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=cbe87d1fc1179b06dbec421d86de7df0e538e738;p=cura.git

Separated View mode and normal mode buttons

Close #37
---

diff --git a/Cura/gui/sceneView.py b/Cura/gui/sceneView.py
index 8b304f71..4405b696 100644
--- a/Cura/gui/sceneView.py
+++ b/Cura/gui/sceneView.py
@@ -101,7 +101,7 @@ class SceneView(openglGui.glGuiPanel):
 		openglGui.glLabel(self.scaleForm, _("Uniform scale"), (0,8))
 		self.scaleUniform = openglGui.glCheckbox(self.scaleForm, True, (1,8), None)
 
-		self.viewSelection = openglGui.glComboButton(self, _("View mode"), [7,19,11,15,23], [_("Normal"), _("Overhang"), _("Transparent"), _("X-Ray"), _("Layers")], (-1,0), self.OnViewChange)
+		self.viewSelection = openglGui.glComboButton(self, _("View mode"), [7,26,19,11,15,23], [_("Normal"), _("Overhang"), _("Transparent"), _("X-Ray"), _("Layers")], (-1,0), self.OnViewChange)
 		self.viewSelection.setDisabled(True)
 		#self.youMagineButton = openglGui.glButton(self, 26, _("Share on YouMagine"), (2,0), lambda button: youmagineGui.youmagineManager(self.GetTopLevelParent(), self._scene))
 		#self.youMagineButton.setDisabled(True)
diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py
index 11e08a1c..c2b95ab1 100644
--- a/Cura/gui/util/openglGui.py
+++ b/Cura/gui/util/openglGui.py
@@ -599,7 +599,7 @@ class glComboButton(glButton):
 		glPushMatrix()
 		glTranslatef(pos[0]+bs*0.5, pos[1] + bs*0.5, 0)
 		glBindTexture(GL_TEXTURE_2D, self._base._glButtonsTexture)
-		for n in xrange(0, len(self._imageIDs)):
+		for n in xrange(1, len(self._imageIDs)):
 			glTranslatef(0, bs, 0)
 			glColor4ub(255,255,255,255)
 			openglHelpers.glDrawTexturedQuad(-0.85*bs,-0.8*bs,bs,bs, 0)
@@ -645,7 +645,7 @@ class glComboButton(glButton):
 			pos = self._getPixelPos()
 			if 0 <= x - pos[0] <= bs and 0 <= y - pos[1] - bs <= bs * len(self._imageIDs):
 				self._selection = int((y - pos[1] - bs) / bs)
-				self._imageID = self._imageIDs[self._selection]
+				self._imageID = self._imageIDs[(self._selection)+1]
 				self._base._focus = None
 				self._comboCallback()
 				return True