amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-13 05:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed filename bug (linux); disabled hover buttons on welcome window (linux)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@193 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2007-01-31 20:38:31 +00:00
parent 2291fe4405
commit ed5ac758f9
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/welcome_window.cpp
+10 -4
View File
@@ -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&) {
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
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
+3 -1
View File
@@ -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?