Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
magicseteditor
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
magicseteditor
Commits
c7e3a98d
Commit
c7e3a98d
authored
Aug 04, 2008
by
twanvl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't check for updates from CLI mode
parent
89eecc3c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
6 deletions
+12
-6
src/main.cpp
src/main.cpp
+12
-6
No files found.
src/main.cpp
View file @
c7e3a98d
...
@@ -41,6 +41,8 @@ class MSE : public wxApp {
...
@@ -41,6 +41,8 @@ class MSE : public wxApp {
* Also, OnExit is always run.
* Also, OnExit is always run.
*/
*/
int
OnRun
();
int
OnRun
();
/// Actually start the GUI mainloop
int
runGUI
();
/// On exit: write the settings to the config file
/// On exit: write the settings to the config file
int
OnExit
();
int
OnExit
();
/// On exception: display error message
/// On exception: display error message
...
@@ -108,7 +110,6 @@ int MSE::OnRun() {
...
@@ -108,7 +110,6 @@ int MSE::OnRun() {
package_manager
.
init
();
package_manager
.
init
();
settings
.
read
();
settings
.
read
();
the_locale
=
Locale
::
byName
(
settings
.
locale
);
the_locale
=
Locale
::
byName
(
settings
.
locale
);
check_updates
();
nag_about_ascii_version
();
nag_about_ascii_version
();
// interpret command line
// interpret command line
...
@@ -121,12 +122,12 @@ int MSE::OnRun() {
...
@@ -121,12 +122,12 @@ int MSE::OnRun() {
// Show the symbol editor
// Show the symbol editor
Window
*
wnd
=
new
SymbolWindow
(
nullptr
,
argv
[
1
]);
Window
*
wnd
=
new
SymbolWindow
(
nullptr
,
argv
[
1
]);
wnd
->
Show
();
wnd
->
Show
();
return
wxApp
::
OnRun
();
return
runGUI
();
}
else
if
(
f
.
GetExt
()
==
_
(
"mse-set"
)
||
f
.
GetExt
()
==
_
(
"mse"
)
||
f
.
GetExt
()
==
_
(
"set"
))
{
}
else
if
(
f
.
GetExt
()
==
_
(
"mse-set"
)
||
f
.
GetExt
()
==
_
(
"mse"
)
||
f
.
GetExt
()
==
_
(
"set"
))
{
// Show the set window
// Show the set window
Window
*
wnd
=
new
SetWindow
(
nullptr
,
import_set
(
argv
[
1
]));
Window
*
wnd
=
new
SetWindow
(
nullptr
,
import_set
(
argv
[
1
]));
wnd
->
Show
();
wnd
->
Show
();
return
wxApp
::
OnRun
();
return
runGUI
();
}
else
if
(
f
.
GetExt
()
==
_
(
"mse-installer"
))
{
}
else
if
(
f
.
GetExt
()
==
_
(
"mse-installer"
))
{
// Installer; install it
// Installer; install it
InstallType
type
=
settings
.
install_type
;
InstallType
type
=
settings
.
install_type
;
...
@@ -143,7 +144,7 @@ int MSE::OnRun() {
...
@@ -143,7 +144,7 @@ int MSE::OnRun() {
}
else
if
(
arg
==
_
(
"--symbol-editor"
))
{
}
else
if
(
arg
==
_
(
"--symbol-editor"
))
{
Window
*
wnd
=
new
SymbolWindow
(
nullptr
);
Window
*
wnd
=
new
SymbolWindow
(
nullptr
);
wnd
->
Show
();
wnd
->
Show
();
return
wxApp
::
OnRun
();
return
runGUI
();
}
else
if
(
arg
==
_
(
"--create-installer"
))
{
}
else
if
(
arg
==
_
(
"--create-installer"
))
{
// create an installer
// create an installer
Installer
inst
;
Installer
inst
;
...
@@ -174,7 +175,7 @@ int MSE::OnRun() {
...
@@ -174,7 +175,7 @@ int MSE::OnRun() {
cli
<<
_
(
"
\n
\t
Load the set file in the MSE user interface."
);
cli
<<
_
(
"
\n
\t
Load the set file in the MSE user interface."
);
cli
<<
_
(
"
\n\n
"
)
<<
PARAM
<<
_
(
"FILE"
)
<<
FILE_EXT
<<
_
(
".mse-symbol"
)
<<
NORMAL
;
cli
<<
_
(
"
\n\n
"
)
<<
PARAM
<<
_
(
"FILE"
)
<<
FILE_EXT
<<
_
(
".mse-symbol"
)
<<
NORMAL
;
cli
<<
_
(
"
\n
\t
Load the symbol into the MSE symbol editor."
);
cli
<<
_
(
"
\n
\t
Load the symbol into the MSE symbol editor."
);
cli
<<
_
(
"
\n\n
"
)
<<
BRIGHT
<<
_
(
"FILE"
)
<<
FILE_EXT
<<
_
(
".mse-installer"
)
cli
<<
_
(
"
\n\n
"
)
<<
PARAM
<<
_
(
"FILE"
)
<<
FILE_EXT
<<
_
(
".mse-installer"
)
<<
NORMAL
<<
_
(
" ["
)
<<
BRIGHT
<<
_
(
"--local"
)
<<
NORMAL
<<
_
(
"]"
);
<<
NORMAL
<<
_
(
" ["
)
<<
BRIGHT
<<
_
(
"--local"
)
<<
NORMAL
<<
_
(
"]"
);
cli
<<
_
(
"
\n
\t
Install the packages from the installer."
);
cli
<<
_
(
"
\n
\t
Install the packages from the installer."
);
cli
<<
_
(
"
\n
\t
If the "
)
<<
BRIGHT
<<
_
(
"--local"
)
<<
NORMAL
<<
_
(
" flag is passed, install packages for this user only."
);
cli
<<
_
(
"
\n
\t
If the "
)
<<
BRIGHT
<<
_
(
"--local"
)
<<
NORMAL
<<
_
(
" flag is passed, install packages for this user only."
);
...
@@ -236,12 +237,17 @@ int MSE::OnRun() {
...
@@ -236,12 +237,17 @@ int MSE::OnRun() {
// no command line arguments, or error, show welcome window
// no command line arguments, or error, show welcome window
(
new
WelcomeWindow
())
->
Show
();
(
new
WelcomeWindow
())
->
Show
();
return
wxApp
::
OnRun
();
return
runGUI
();
}
CATCH_ALL_ERRORS
(
true
);
}
CATCH_ALL_ERRORS
(
true
);
return
EXIT_FAILURE
;
return
EXIT_FAILURE
;
}
}
int
MSE
::
runGUI
()
{
check_updates
();
return
wxApp
::
OnRun
();
}
// ----------------------------------------------------------------------------- : Exit
// ----------------------------------------------------------------------------- : Exit
int
MSE
::
OnExit
()
{
int
MSE
::
OnExit
()
{
...
...
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