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
6858d3aa
Commit
6858d3aa
authored
Jan 31, 2007
by
twanvl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed filename bug (linux); disabled hover buttons on welcome window (linux)
parent
ba518d58
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
5 deletions
+13
-5
src/gui/welcome_window.cpp
src/gui/welcome_window.cpp
+10
-4
src/util/io/package_manager.cpp
src/util/io/package_manager.cpp
+3
-1
No files found.
src/gui/welcome_window.cpp
View file @
6858d3aa
...
@@ -26,8 +26,14 @@ WelcomeWindow::WelcomeWindow()
...
@@ -26,8 +26,14 @@ WelcomeWindow::WelcomeWindow()
SetIcon
(
load_resource_icon
(
_
(
"app"
)));
SetIcon
(
load_resource_icon
(
_
(
"app"
)));
// init controls
// init controls
wxButton
*
new_set
=
new
HoverButtonExt
(
this
,
ID_FILE_NEW
,
load_resource_image
(
_
(
"welcome_new"
)),
_BUTTON_
(
"new set"
),
_HELP_
(
"new set"
));
#ifdef __WXMSW__
wxButton
*
open_set
=
new
HoverButtonExt
(
this
,
ID_FILE_OPEN
,
load_resource_image
(
_
(
"welcome_open"
)),
_BUTTON_
(
"open set"
),
_HELP_
(
"open set"
));
wxButton
*
new_set
=
new
HoverButtonExt
(
this
,
ID_FILE_NEW
,
load_resource_image
(
_
(
"welcome_new"
)),
_BUTTON_
(
"new set"
),
_HELP_
(
"new set"
));
wxButton
*
open_set
=
new
HoverButtonExt
(
this
,
ID_FILE_OPEN
,
load_resource_image
(
_
(
"welcome_open"
)),
_BUTTON_
(
"open set"
),
_HELP_
(
"open set"
));
#else
// For now, hover buttons don't work on GTK
wxButton
*
new_set
=
new
wxButton
(
this
,
ID_FILE_NEW
,
_BUTTON_
(
"new set"
));
wxButton
*
open_set
=
new
wxButton
(
this
,
ID_FILE_OPEN
,
_BUTTON_
(
"open set"
));
#endif
wxButton
*
open_last
=
0
;
wxButton
*
open_last
=
0
;
if
(
!
settings
.
recent_sets
.
empty
())
{
if
(
!
settings
.
recent_sets
.
empty
())
{
wxFileName
n
(
settings
.
recent_sets
.
front
());
wxFileName
n
(
settings
.
recent_sets
.
front
());
...
@@ -74,7 +80,7 @@ void WelcomeWindow::onNewSet(wxCommandEvent&) {
...
@@ -74,7 +80,7 @@ void WelcomeWindow::onNewSet(wxCommandEvent&) {
close
(
new_set_window
(
this
));
close
(
new_set_window
(
this
));
}
}
// MOVEME
//
TODO:
MOVEME
template
<
typename
T
>
template
<
typename
T
>
shared_ptr
<
T
>
open_package
(
const
String
&
filename
)
{
shared_ptr
<
T
>
open_package
(
const
String
&
filename
)
{
shared_ptr
<
T
>
package
(
new
T
);
shared_ptr
<
T
>
package
(
new
T
);
...
@@ -115,7 +121,7 @@ HoverButtonExt::HoverButtonExt(Window* parent, int id, const wxImage& icon, cons
...
@@ -115,7 +121,7 @@ HoverButtonExt::HoverButtonExt(Window* parent, int id, const wxImage& icon, cons
void
HoverButtonExt
::
draw
(
DC
&
dc
)
{
void
HoverButtonExt
::
draw
(
DC
&
dc
)
{
// draw button
// draw button
HoverButton
::
draw
(
dc
);
//
HoverButton::draw(dc);
// icon
// icon
if
(
icon
.
Ok
())
dc
.
DrawBitmap
(
icon
,
7
,
7
);
if
(
icon
.
Ok
())
dc
.
DrawBitmap
(
icon
,
7
,
7
);
// text
// text
...
...
src/util/io/package_manager.cpp
View file @
6858d3aa
...
@@ -58,7 +58,9 @@ void PackageManager::init() {
...
@@ -58,7 +58,9 @@ void PackageManager::init() {
}
}
PackagedP
PackageManager
::
openAny
(
const
String
&
name
)
{
PackagedP
PackageManager
::
openAny
(
const
String
&
name
)
{
wxFileName
fn
(
data_directory
+
_
(
"/"
)
+
name
);
wxFileName
fn
(
(
wxFileName
(
name
).
IsRelative
()
?
data_directory
+
_
(
"/"
)
:
wxString
(
wxEmptyString
))
+
name
);
fn
.
Normalize
();
fn
.
Normalize
();
String
filename
=
fn
.
GetFullPath
();
String
filename
=
fn
.
GetFullPath
();
// Is this package already loaded?
// Is this package already loaded?
...
...
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