diff options
author | daid <daid303@gmail.com> | 2014-02-20 12:42:57 +0400 |
---|---|---|
committer | daid <daid303@gmail.com> | 2014-02-20 12:42:57 +0400 |
commit | e7c147b743448a2f04f76a7fc00f7d9a6f7fed5e (patch) | |
tree | de98973834ffde452d6135f91ec670002d4f0b33 | |
parent | 9581c1386152df375fba1618b4b3f325522afeab (diff) | |
parent | 20cac56ecebd8b6f87d128ebb289b283d68a2e62 (diff) |
Merge branch 'SteamEngine' of github.com:daid/Cura into SteamEngine
-rw-r--r-- | Cura/gui/mainWindow.py | 10 | ||||
-rw-r--r-- | scripts/darwin/STLQuickLook.qlgenerator.dSYM/Contents/Resources/DWARF/STLQuickLook | bin | 208200 -> 137755 bytes | |||
-rw-r--r-- | scripts/darwin/STLQuickLook.qlgenerator/Contents/Info.plist | 14 | ||||
-rwxr-xr-x | scripts/darwin/STLQuickLook.qlgenerator/Contents/MacOS/STLQuickLook | bin | 166492 -> 103884 bytes |
4 files changed, 17 insertions, 7 deletions
diff --git a/Cura/gui/mainWindow.py b/Cura/gui/mainWindow.py index e105056a77..714fc8ea91 100644 --- a/Cura/gui/mainWindow.py +++ b/Cura/gui/mainWindow.py @@ -3,6 +3,8 @@ __copyright__ = "Copyright (C) 2013 David Braam - Released under terms of the AG import wx import os import webbrowser +import sys + from Cura.gui import configBase from Cura.gui import expertConfig @@ -31,6 +33,14 @@ class mainWindow(wx.Frame): # allow dropping any file, restrict later self.SetDropTarget(dropTarget.FileDropTarget(self.OnDropFiles)) + # TODO: wxWidgets 2.9.4 has a bug when NSView does not register for dragged types when wx drop target is set. It was fixed in 2.9.5 + if sys.platform.startswith('darwin'): + import Cocoa + import objc + nswindow = objc.objc_object(c_void_p=self.MacGetTopLevelWindowRef()) + view = nswindow.contentView() + view.registerForDraggedTypes_([Cocoa.NSFilenamesPboardType]) + self.normalModeOnlyItems = [] mruFile = os.path.join(profile.getBasePath(), 'mru_filelist.ini') diff --git a/scripts/darwin/STLQuickLook.qlgenerator.dSYM/Contents/Resources/DWARF/STLQuickLook b/scripts/darwin/STLQuickLook.qlgenerator.dSYM/Contents/Resources/DWARF/STLQuickLook Binary files differindex f2dec2f2ac..2d04cd685e 100644 --- a/scripts/darwin/STLQuickLook.qlgenerator.dSYM/Contents/Resources/DWARF/STLQuickLook +++ b/scripts/darwin/STLQuickLook.qlgenerator.dSYM/Contents/Resources/DWARF/STLQuickLook diff --git a/scripts/darwin/STLQuickLook.qlgenerator/Contents/Info.plist b/scripts/darwin/STLQuickLook.qlgenerator/Contents/Info.plist index 44f52f4553..8e917c02d1 100644 --- a/scripts/darwin/STLQuickLook.qlgenerator/Contents/Info.plist +++ b/scripts/darwin/STLQuickLook.qlgenerator/Contents/Info.plist @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>BuildMachineOSBuild</key> - <string>12C60</string> + <string>13B42</string> <key>CFBundleDevelopmentRegion</key> <string>English</string> <key>CFBundleDocumentTypes</key> @@ -48,19 +48,19 @@ <key>CFPlugInUnloadFunction</key> <string></string> <key>DTCompiler</key> - <string></string> + <string>com.apple.compilers.llvm.clang.1_0</string> <key>DTPlatformBuild</key> - <string>4G2008a</string> + <string>5A3005</string> <key>DTPlatformVersion</key> <string>GM</string> <key>DTSDKBuild</key> - <string>12C37</string> + <string>13A595</string> <key>DTSDKName</key> - <string>macosx10.8</string> + <string>macosx10.9</string> <key>DTXcode</key> - <string>0452</string> + <string>0502</string> <key>DTXcodeBuild</key> - <string>4G2008a</string> + <string>5A3005</string> <key>QLNeedsToBeRunInMainThread</key> <false/> <key>QLPreviewHeight</key> diff --git a/scripts/darwin/STLQuickLook.qlgenerator/Contents/MacOS/STLQuickLook b/scripts/darwin/STLQuickLook.qlgenerator/Contents/MacOS/STLQuickLook Binary files differindex 02dbebaece..a6981b545d 100755 --- a/scripts/darwin/STLQuickLook.qlgenerator/Contents/MacOS/STLQuickLook +++ b/scripts/darwin/STLQuickLook.qlgenerator/Contents/MacOS/STLQuickLook |