From: Ferdi van der Werf Date: Thu, 12 Apr 2012 22:05:09 +0000 (+0200) Subject: Flip renamed to Mirror, need to propagate to variables X-Git-Tag: RC3~68^2~3^2^2~6 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=44c4085881068be82184c75c8a5b3b1235ea3bb7;p=cura.git Flip renamed to Mirror, need to propagate to variables --- diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py index eb8b819e..951dd9ac 100644 --- a/Cura/gui/preview3d.py +++ b/Cura/gui/preview3d.py @@ -75,33 +75,33 @@ class previewPanel(wx.Panel): self.toolbar2 = wx.ToolBar( self, -1, style = wx.TB_HORIZONTAL | wx.NO_BORDER | wx.TB_FLAT ) self.toolbar2.SetToolBitmapSize( ( 21, 21 ) ) - self.flipX = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-flip-x.png'), size=(20,20)) - self.flipX.SetBezelWidth(1) - self.flipX.SetUseFocusIndicator(False) - self.flipX.SetToolTip(wx.ToolTip('Flip X')) - self.flipX.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay) - self.flipX.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide) - self.flipX.SetValue(profile.getProfileSetting('flip_x') == 'True') - self.toolbar2.AddControl(self.flipX) - self.Bind(wx.EVT_BUTTON, self.OnFlipXClick, self.flipX) - self.flipY = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-flip-y.png'), size=(20,20)) - self.flipY.SetBezelWidth(1) - self.flipY.SetUseFocusIndicator(False) - self.flipY.SetToolTip(wx.ToolTip('Flip Y')) - self.flipY.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay) - self.flipY.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide) - self.flipY.SetValue(profile.getProfileSetting('flip_y') == 'True') - self.toolbar2.AddControl(self.flipY) - self.Bind(wx.EVT_BUTTON, self.OnFlipYClick, self.flipY) - self.flipZ = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-flip-z.png'), size=(20,20)) - self.flipZ.SetBezelWidth(1) - self.flipZ.SetUseFocusIndicator(False) - self.flipZ.SetToolTip(wx.ToolTip('Flip Z')) - self.flipZ.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay) - self.flipZ.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide) - self.flipZ.SetValue(profile.getProfileSetting('flip_z') == 'True') - self.toolbar2.AddControl(self.flipZ) - self.Bind(wx.EVT_BUTTON, self.OnFlipZClick, self.flipZ) + self.mirrorX = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-mirror-x.png'), size=(20,20)) + self.mirrorX.SetBezelWidth(1) + self.mirrorX.SetUseFocusIndicator(False) + self.mirrorX.SetToolTip(wx.ToolTip('Mirror X')) + self.mirrorX.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay) + self.mirrorX.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide) + self.mirrorX.SetValue(profile.getProfileSetting('flip_x') == 'True') + self.toolbar2.AddControl(self.mirrorX) + self.Bind(wx.EVT_BUTTON, self.OnFlipXClick, self.mirrorX) + self.mirrorY = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-mirror-y.png'), size=(20,20)) + self.mirrorY.SetBezelWidth(1) + self.mirrorY.SetUseFocusIndicator(False) + self.mirrorY.SetToolTip(wx.ToolTip('Mirror Y')) + self.mirrorY.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay) + self.mirrorY.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide) + self.mirrorY.SetValue(profile.getProfileSetting('flip_y') == 'True') + self.toolbar2.AddControl(self.mirrorY) + self.Bind(wx.EVT_BUTTON, self.OnFlipYClick, self.mirrorY) + self.mirrorZ = buttons.GenBitmapToggleButton(self.toolbar2, -1, wx.Bitmap('Cura/images/object-mirror-z.png'), size=(20,20)) + self.mirrorZ.SetBezelWidth(1) + self.mirrorZ.SetUseFocusIndicator(False) + self.mirrorZ.SetToolTip(wx.ToolTip('Mirror Z')) + self.mirrorZ.Bind(wx.EVT_ENTER_WINDOW, self.OnPopupDisplay) + self.mirrorZ.Bind(wx.EVT_LEAVE_WINDOW, self.OnPopupHide) + self.mirrorZ.SetValue(profile.getProfileSetting('flip_z') == 'True') + self.toolbar2.AddControl(self.mirrorZ) + self.Bind(wx.EVT_BUTTON, self.OnFlipZClick, self.mirrorZ) self.toolbar2.AddSeparator() @@ -183,15 +183,15 @@ class previewPanel(wx.Panel): self.popup.SetPosition((x, y+sy)) def OnFlipXClick(self, e): - profile.putProfileSetting('flip_x', str(self.flipX.GetValue())) + profile.putProfileSetting('flip_x', str(self.mirrorX.GetValue())) self.updateModelTransform() def OnFlipYClick(self, e): - profile.putProfileSetting('flip_y', str(self.flipY.GetValue())) + profile.putProfileSetting('flip_y', str(self.mirrorY.GetValue())) self.updateModelTransform() def OnFlipZClick(self, e): - profile.putProfileSetting('flip_z', str(self.flipZ.GetValue())) + profile.putProfileSetting('flip_z', str(self.mirrorZ.GetValue())) self.updateModelTransform() def OnSwapXZClick(self, e): diff --git a/Cura/images/object-flip-x.png b/Cura/images/object-mirror-x.png similarity index 100% rename from Cura/images/object-flip-x.png rename to Cura/images/object-mirror-x.png diff --git a/Cura/images/object-flip-y.png b/Cura/images/object-mirror-y.png similarity index 100% rename from Cura/images/object-flip-y.png rename to Cura/images/object-mirror-y.png diff --git a/Cura/images/object-flip-z.png b/Cura/images/object-mirror-z.png similarity index 100% rename from Cura/images/object-flip-z.png rename to Cura/images/object-mirror-z.png