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
e809c95a
Commit
e809c95a
authored
May 31, 2008
by
twanvl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disabled "check updates" button on welcome window; also fixed transparency of check updates image
parent
a77fc522
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletion
+8
-1
src/gui/welcome_window.cpp
src/gui/welcome_window.cpp
+8
-1
src/resource/common/welcome_updates.png
src/resource/common/welcome_updates.png
+0
-0
No files found.
src/gui/welcome_window.cpp
View file @
e809c95a
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
// ----------------------------------------------------------------------------- : WelcomeWindow
// ----------------------------------------------------------------------------- : WelcomeWindow
WelcomeWindow
::
WelcomeWindow
()
WelcomeWindow
::
WelcomeWindow
()
:
Frame
(
nullptr
,
wxID_ANY
,
_TITLE_
(
"magic set editor"
),
wxDefaultPosition
,
wxSize
(
48
0
,
380
),
wxDEFAULT_DIALOG_STYLE
|
wxTAB_TRAVERSAL
|
wxCLIP_CHILDREN
)
:
Frame
(
nullptr
,
wxID_ANY
,
_TITLE_
(
"magic set editor"
),
wxDefaultPosition
,
wxSize
(
52
0
,
380
),
wxDEFAULT_DIALOG_STYLE
|
wxTAB_TRAVERSAL
|
wxCLIP_CHILDREN
)
,
logo
(
load_resource_image
(
_
(
"about"
)))
,
logo
(
load_resource_image
(
_
(
"about"
)))
,
logo2
(
load_resource_image
(
_
(
"two_beta"
)))
,
logo2
(
load_resource_image
(
_
(
"two_beta"
)))
{
{
...
@@ -35,12 +35,16 @@ WelcomeWindow::WelcomeWindow()
...
@@ -35,12 +35,16 @@ WelcomeWindow::WelcomeWindow()
#ifdef USE_HOVERBUTTON
#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"
));
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"
));
wxControl
*
updates
=
new
HoverButtonExt
(
this
,
ID_FILE_CHECK_UPDATES
,
load_resource_image
(
_
(
"welcome_updates"
)),
_BUTTON_
(
"check updates"
),
_HELP_
(
"check updates"
));
#endif
#else
#else
wxControl
*
new_set
=
new
wxButton
(
this
,
ID_FILE_NEW
,
_BUTTON_
(
"new set"
));
wxControl
*
new_set
=
new
wxButton
(
this
,
ID_FILE_NEW
,
_BUTTON_
(
"new set"
));
wxControl
*
open_set
=
new
wxButton
(
this
,
ID_FILE_OPEN
,
_BUTTON_
(
"open set"
));
wxControl
*
open_set
=
new
wxButton
(
this
,
ID_FILE_OPEN
,
_BUTTON_
(
"open set"
));
#if !USE_OLD_STYLE_UPDATE_CHECKER
wxControl
*
updates
=
new
wxButton
(
this
,
ID_FILE_CHECK_UPDATES
,
_BUTTON_
(
"check updates"
));
wxControl
*
updates
=
new
wxButton
(
this
,
ID_FILE_CHECK_UPDATES
,
_BUTTON_
(
"check updates"
));
#endif
#endif
#endif
wxControl
*
open_last
=
nullptr
;
wxControl
*
open_last
=
nullptr
;
if
(
!
settings
.
recent_sets
.
empty
())
{
if
(
!
settings
.
recent_sets
.
empty
())
{
wxFileName
n
(
settings
.
recent_sets
.
front
());
wxFileName
n
(
settings
.
recent_sets
.
front
());
...
@@ -58,7 +62,9 @@ WelcomeWindow::WelcomeWindow()
...
@@ -58,7 +62,9 @@ WelcomeWindow::WelcomeWindow()
s2
->
AddSpacer
(
100
);
s2
->
AddSpacer
(
100
);
s2
->
Add
(
new_set
,
0
,
wxALL
,
2
);
s2
->
Add
(
new_set
,
0
,
wxALL
,
2
);
s2
->
Add
(
open_set
,
0
,
wxALL
,
2
);
s2
->
Add
(
open_set
,
0
,
wxALL
,
2
);
#if !USE_OLD_STYLE_UPDATE_CHECKER
s2
->
Add
(
updates
,
0
,
wxALL
,
2
);
s2
->
Add
(
updates
,
0
,
wxALL
,
2
);
#endif
if
(
open_last
)
s2
->
Add
(
open_last
,
0
,
wxALL
,
2
);
if
(
open_last
)
s2
->
Add
(
open_last
,
0
,
wxALL
,
2
);
s2
->
AddStretchSpacer
();
s2
->
AddStretchSpacer
();
s1
->
Add
(
s2
);
s1
->
Add
(
s2
);
...
@@ -108,6 +114,7 @@ void WelcomeWindow::onOpenLast(wxCommandEvent&) {
...
@@ -108,6 +114,7 @@ void WelcomeWindow::onOpenLast(wxCommandEvent&) {
}
}
void
WelcomeWindow
::
onCheckUpdates
(
wxCommandEvent
&
)
{
void
WelcomeWindow
::
onCheckUpdates
(
wxCommandEvent
&
)
{
Show
(
false
);
// hide, so the PackagesWindow will not use this window as its parent
(
new
PackagesWindow
(
nullptr
))
->
Show
();
(
new
PackagesWindow
(
nullptr
))
->
Show
();
Close
();
Close
();
}
}
...
...
src/resource/common/welcome_updates.png
View replaced file @
a77fc522
View file @
e809c95a
1009 Bytes
|
W:
|
H:
1.69 KB
|
W:
|
H:
2-up
Swipe
Onion skin
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