Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
ardublockly
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
ardublockly
Commits
8c6e9ba0
Commit
8c6e9ba0
authored
Jun 01, 2015
by
carlosperate
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CEF GUI: Minor change to consolidate OS detection.
parent
92d482b1
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
.gitmodules
.gitmodules
+3
-0
package/pyinstaller
package/pyinstaller
+1
-0
start_cef.py
start_cef.py
+4
-4
No files found.
.gitmodules
View file @
8c6e9ba0
...
@@ -4,3 +4,6 @@
...
@@ -4,3 +4,6 @@
[submodule "package/ardublocklydocs/ardublockly.wiki"]
[submodule "package/ardublocklydocs/ardublockly.wiki"]
path = package/ardublocklydocs/ardublockly.wiki
path = package/ardublocklydocs/ardublockly.wiki
url = https://github.com/carlosperate/ardublockly.wiki.git
url = https://github.com/carlosperate/ardublockly.wiki.git
[submodule "package/pyinstaller"]
path = package/pyinstaller
url = https://github.com/pyinstaller/pyinstaller.git
pyinstaller
@
32bbb954
Subproject commit 32bbb954b355937ccfe377afbe56979db79a7b30
start_cef.py
View file @
8c6e9ba0
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
#
#
# Changes are copyright (c) 2015 carlosperate https://github.com/carlosperate/
# Changes are copyright (c) 2015 carlosperate https://github.com/carlosperate/
#
#
import
sys
# In Mac cefpython library must be the very first library imported. This is
# In Mac cefpython library must be the very first library imported. This is
# because CEF was compiled with the tcmalloc memory allocator which hooks
# because CEF was compiled with the tcmalloc memory allocator which hooks
# globally and replaces the default malloc allocator. If memory was allocated
# globally and replaces the default malloc allocator. If memory was allocated
...
@@ -26,10 +26,10 @@ try:
...
@@ -26,10 +26,10 @@ try:
import
wx
import
wx
import
wx.lib.agw.flatmenu
as
FM
import
wx.lib.agw.flatmenu
as
FM
except
ImportError
:
except
ImportError
:
print
(
"You need to have ce fpython3, and wx installed!"
)
raise
SystemExit
(
"You need to have cefpython3, and wx installed!"
)
sys
.
exit
(
1
)
import
os
import
os
import
re
import
re
import
sys
import
time
import
time
import
codecs
import
codecs
import
inspect
import
inspect
...
@@ -83,7 +83,7 @@ def GetApplicationPath(file=None):
...
@@ -83,7 +83,7 @@ def GetApplicationPath(file=None):
if
not
file
.
startswith
(
"/"
)
and
not
file
.
startswith
(
"
\\
"
)
and
(
if
not
file
.
startswith
(
"/"
)
and
not
file
.
startswith
(
"
\\
"
)
and
(
not
re
.
search
(
r"^[\w-]+:"
,
file
)):
not
re
.
search
(
r"^[\w-]+:"
,
file
)):
path
=
GetApplicationPath
.
dir
+
os
.
sep
+
file
path
=
GetApplicationPath
.
dir
+
os
.
sep
+
file
if
platform
.
system
()
==
"W
indows"
:
if
g_platform_os
==
"w
indows"
:
path
=
re
.
sub
(
r"[/\\]+"
,
re
.
escape
(
os
.
sep
),
path
)
path
=
re
.
sub
(
r"[/\\]+"
,
re
.
escape
(
os
.
sep
),
path
)
path
=
re
.
sub
(
r"[/\\]+$"
,
""
,
path
)
path
=
re
.
sub
(
r"[/\\]+$"
,
""
,
path
)
return
path
return
path
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment