q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #43 from PyroMani/master 

Fixes #1 issue
master
daid 2012-04-08 13:49:21 -07:00
parent 7d68441d7c e2f4ce4ef6
commit b4233e092a
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -6,4 +6,6 @@
osx64-Cura-*
win32-Cura-*
linux-Cura-*
Printrun
Printrun
.idea
.DS_Store

16
Cura/gui/configBase.py
View File

@ -1,7 +1,7 @@
from __future__ import absolute_import
import __init__
import wx, os, sys, platform, types
import wx, wx.lib.stattext, os, sys, platform, types
from gui import validators
from util import profile
@ -109,8 +109,11 @@ class SettingRow():
self.configName = configName
self.panel = panel
self.type = type
self.label = wx.StaticText(panel, -1, label)
self.label = wx.lib.stattext.GenStaticText(panel, -1, label)
self.label.Bind(wx.EVT_ENTER_WINDOW, self.OnMouseEnter)
self.label.Bind(wx.EVT_LEAVE_WINDOW, self.OnMouseExit)
getSettingFunc = profile.getPreference
if self.type == 'profile':
getSettingFunc = profile.getProfileSetting
@ -129,13 +132,6 @@ class SettingRow():
sizer.Add(self.ctrl, (x,y+1), flag=wx.ALIGN_BOTTOM|wx.EXPAND)
sizer.SetRows(x+1)
if os.name == 'darwin':
self.ctrl.Bind(wx.EVT_SET_FOCUS, self.OnMouseEnter)
self.ctrl.Bind(wx.EVT_KILL_FOCUS, self.OnMouseExit)
else:
self.ctrl.Bind(wx.EVT_ENTER_WINDOW, self.OnMouseEnter)
self.ctrl.Bind(wx.EVT_LEAVE_WINDOW, self.OnMouseExit)
self.defaultBGColour = self.ctrl.GetBackgroundColour()
panel.main.settingControlList.append(self)