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
04ba8492
Commit
04ba8492
authored
Jan 21, 2011
by
twanvl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no longer use the "beta" logo, in preparation of 2.0.0 release
parent
6f1af630
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
5 deletions
+15
-5
src/gui/about_window.cpp
src/gui/about_window.cpp
+5
-1
src/gui/about_window.hpp
src/gui/about_window.hpp
+6
-3
src/gui/welcome_window.hpp
src/gui/welcome_window.hpp
+4
-1
No files found.
src/gui/about_window.cpp
View file @
04ba8492
...
...
@@ -17,7 +17,9 @@
AboutWindow
::
AboutWindow
(
Window
*
parent
)
:
wxDialog
(
parent
,
wxID_ANY
,
_TITLE_
(
"about"
),
wxDefaultPosition
,
wxSize
(
510
,
340
),
wxCLIP_CHILDREN
|
wxDEFAULT_DIALOG_STYLE
|
wxTAB_TRAVERSAL
)
,
logo
(
load_resource_image
(
_
(
"about"
)))
#if USE_BETA_LOGO
,
logo2
(
load_resource_image
(
_
(
"two_beta"
)))
#endif
{
// init controls
wxControl
*
ok_button
=
new
HoverButton
(
this
,
wxID_OK
,
_
(
"btn_ok"
));
...
...
@@ -38,7 +40,9 @@ void AboutWindow::draw(DC& dc) {
dc
.
DrawRectangle
(
0
,
0
,
ws
.
GetWidth
(),
ws
.
GetHeight
());
// draw logo
dc
.
DrawBitmap
(
logo
,
(
ws
.
GetWidth
()
-
logo
.
GetWidth
())
/
2
,
5
);
dc
.
DrawBitmap
(
logo2
,
ws
.
GetWidth
()
-
logo2
.
GetWidth
(),
ws
.
GetHeight
()
-
logo2
.
GetHeight
());
#if USE_BETA_LOGO
dc
.
DrawBitmap
(
logo2
,
ws
.
GetWidth
()
-
logo2
.
GetWidth
(),
ws
.
GetHeight
()
-
logo2
.
GetHeight
());
#endif
// draw version box
dc
.
SetPen
(
wxPen
(
Color
(
184
,
29
,
19
),
2
));
dc
.
SetBrush
(
Color
(
114
,
197
,
224
));
...
...
src/gui/about_window.hpp
View file @
04ba8492
...
...
@@ -20,9 +20,12 @@ class AboutWindow : public wxDialog {
private:
DECLARE_EVENT_TABLE
();
// graphics
Bitmap
logo
,
logo2
;
// MSE logos
Bitmap
logo
;
#if USE_BETA_LOGO
Bitmap
logo2
;
#endif
void
onPaint
(
wxPaintEvent
&
);
void
draw
(
DC
&
dc
);
...
...
src/gui/welcome_window.hpp
View file @
04ba8492
...
...
@@ -32,7 +32,10 @@ class WelcomeWindow : public Frame {
DECLARE_EVENT_TABLE
();
// MSE logos
Bitmap
logo
,
logo2
;
Bitmap
logo
;
#if USE_BETA_LOGO
Bitmap
logo2
;
#endif
void
onPaint
(
wxPaintEvent
&
);
void
draw
(
DC
&
dc
);
...
...
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