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
ef464a4e
Commit
ef464a4e
authored
Jan 18, 2009
by
coppro
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed install script and set selection window crash.
parent
4c24a283
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
17 deletions
+8
-17
configure
configure
+0
-2
src/gui/welcome_window.cpp
src/gui/welcome_window.cpp
+7
-7
tools/linux-installer/install
tools/linux-installer/install
+1
-8
No files found.
configure
View file @
ef464a4e
...
...
@@ -3030,8 +3030,6 @@ else
fi
# Do not pass -O2, because that causes failures for now.
CXXFLAGS
=
-g
# Checks for libraries.
ac_ext
=
c
ac_cpp
=
'$CPP $CPPFLAGS'
...
...
src/gui/welcome_window.cpp
View file @
ef464a4e
...
...
@@ -30,10 +30,10 @@ WelcomeWindow::WelcomeWindow()
,
logo2
(
load_resource_image
(
_
(
"two_beta"
)))
{
SetIcon
(
load_resource_icon
(
_
(
"app"
)));
// init controls
#ifdef USE_HOVERBUTTON
wxControl
*
new_set
=
new
HoverButtonExt
(
this
,
ID_FILE_NEW
,
load_resource_image
(
_
(
"welcome_new"
)),
_BUTTON_
(
"new set"
),
_HELP_
(
"new set"
));
wxControl
*
new_set
=
new
HoverButtonExt
(
this
,
ID_FILE_NEW
,
load_resource_image
(
_
(
"welcome_new"
)),
_BUTTON_
(
"new set"
),
_HELP_
(
"new set"
));
wxControl
*
open_set
=
new
HoverButtonExt
(
this
,
ID_FILE_OPEN
,
load_resource_image
(
_
(
"welcome_open"
)),
_BUTTON_
(
"open set"
),
_HELP_
(
"open set"
));
#if !USE_OLD_STYLE_UPDATE_CHECKER
wxControl
*
updates
=
new
HoverButtonExt
(
this
,
ID_FILE_CHECK_UPDATES
,
load_resource_image
(
_
(
"welcome_updates"
)),
_BUTTON_
(
"check updates"
),
_HELP_
(
"check updates"
));
...
...
@@ -57,7 +57,7 @@ WelcomeWindow::WelcomeWindow()
#endif
}
}
wxSizer
*
s1
=
new
wxBoxSizer
(
wxHORIZONTAL
);
s1
->
AddSpacer
(
25
);
wxSizer
*
s2
=
new
wxBoxSizer
(
wxVERTICAL
);
...
...
@@ -97,11 +97,11 @@ void WelcomeWindow::draw(DC& dc) {
}
void
WelcomeWindow
::
onOpenSet
(
wxCommandEvent
&
)
{
wxFileDialog
dl
g
(
this
,
_TITLE_
(
"open set"
),
settings
.
default_set_dir
,
wxEmptyString
,
import_formats
(),
wxOPEN
);
if
(
dlg
.
ShowModal
()
==
wxID_OK
)
{
settings
.
default_set_dir
=
dlg
.
GetDirectory
();
wxFileDialog
*
dlg
=
new
wxFileDialo
g
(
this
,
_TITLE_
(
"open set"
),
settings
.
default_set_dir
,
wxEmptyString
,
import_formats
(),
wxOPEN
);
if
(
dlg
->
ShowModal
()
==
wxID_OK
)
{
settings
.
default_set_dir
=
dlg
->
GetDirectory
();
wxBusyCursor
wait
;
close
(
import_set
(
dlg
.
GetPath
()));
close
(
import_set
(
dlg
->
GetPath
()));
}
}
...
...
tools/linux-installer/install
View file @
ef464a4e
...
...
@@ -15,14 +15,7 @@ case $UID in
*
)
INSTALL_DIR
=
'$HOME/.magicseteditor/'
;
EXEC_SYMLINK
=
'$HOME/bin/magicseteditor'
;
esac
if
[
\"
$MSE_INSTALL_DIR
\"
!=
""
]
then
INSTALL_DIR
=
$MSE_INSTALL_DIR
fi
if
[
\"
$MSE_EXEC_SYMLINK
\"
!=
""
]
then
INSTALL_DIR
=
$MSE_EXEC_SYMLINK
fi
esac
;
echo
"Magic Set Editor version
$VERSION
Installer Script.
...
...
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