From: <hug...@li...> - 2012-11-14 19:53:36
|
branch: details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgroot/hugin/hugin/rev/3bb0964389df changeset: 6033:3bb0964389df user: tmodes date: Wed Nov 14 20:53:26 2012 +0100 description: Removed not fully working / commented out code diffstat: src/hugin1/hugin/MainFrame.cpp | 26 -------------------------- src/hugin1/hugin/huginApp.cpp | 35 ----------------------------------- 2 files changed, 0 insertions(+), 61 deletions(-) diffs (81 lines): diff -r 1ed99a2338c5 -r 3bb0964389df src/hugin1/hugin/MainFrame.cpp --- a/src/hugin1/hugin/MainFrame.cpp Wed Nov 14 20:49:21 2012 +0100 +++ b/src/hugin1/hugin/MainFrame.cpp Wed Nov 14 20:53:26 2012 +0100 @@ -513,32 +513,6 @@ SetSizeHints(780, 455); //set minumum size #endif -#if 0 - bool maximized = config->Read(wxT("/MainFrame/maximized"), 0l) != 0; - if (maximized) { - this->Maximize(); - // explicitly layout after maximize - this->Layout(); - } else { - //size - int w = config->Read(wxT("/MainFrame/width"),-1l); - int h = config->Read(wxT("/MainFrame/height"),-1l); - if (w >0) { - SetClientSize(w,h); - } else { - Fit(); - } - //position - int x = config->Read(wxT("/MainFrame/positionX"),-1l); - int y = config->Read(wxT("/MainFrame/positionY"),-1l); - if ( y > 0) { - Move(x, y); - } else { - Move(0, 44); - } - } -#endif - // set progress display for image cache. ImageCache::getInstance().setProgressDisplay(this); #if defined __WXMSW__ diff -r 1ed99a2338c5 -r 3bb0964389df src/hugin1/hugin/huginApp.cpp --- a/src/hugin1/hugin/huginApp.cpp Wed Nov 14 20:49:21 2012 +0100 +++ b/src/hugin1/hugin/huginApp.cpp Wed Nov 14 20:53:26 2012 +0100 @@ -228,41 +228,6 @@ // set the name of locale recource to look for locale.AddCatalog(wxT("hugin")); - /** - * Here we check the version of the preferences stored on the computer against the version of the Hugin binary. - * Please notify the user here of important changes. - * You can also implement changes such as new preferences, but please notify the user / give him the possibility - * to abort before making changes. Prevent surprises. - */ - // read version number of last Hugin binary to use these preferences - wxString last_version = config->Read(wxT("/version"),wxT("")); - - // upgrade - if (checkVersion(last_version,wxT(HUGIN_API_VERSION))) - { - wxMessageBox(wxString::Format(_("I am Hugin version %s. I have found preferences from an older version %s. I might not be compatible with the older preferences. If you experience malfunction, please select \"Preferences\" from the menu and in each tab hit the 'Load Defaults' button"),wxString(HUGIN_API_VERSION,wxConvLocal).c_str(),last_version.c_str()), -#ifdef _WINDOWS - _("Hugin"), -#else - wxT(""), -#endif - wxOK | wxICON_INFORMATION); - config->Write(wxT("/version"), wxT(HUGIN_API_VERSION)); - config->Flush(); - }; - - // downgrade - if (checkVersion(wxT(HUGIN_API_VERSION),last_version)) - { - wxMessageBox(wxString::Format(_("I am Hugin version %s. I have found preferences from a newer version %s. I might not be compatible with the newer preferences. If you experience malfunction, please select \"Preferences\" from the menu and in each tab hit the 'Load Defaults' button"),wxString(HUGIN_API_VERSION,wxConvLocal).c_str(),last_version.c_str()), -#ifdef _WINDOWS - _("Hugin"), -#else - wxT(""), -#endif - wxOK | wxICON_INFORMATION); - }; - // initialize image handlers wxInitAllImageHandlers(); |