From: <ip...@us...> - 2008-08-21 04:43:16
|
Revision: 3345 http://hugin.svn.sourceforge.net/hugin/?rev=3345&view=rev Author: ippei Date: 2008-08-21 04:43:10 +0000 (Thu, 21 Aug 2008) Log Message: ----------- Minimum size for Mac and Windows reverted. Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/MainFrame.cpp Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2008-08-21 04:42:42 UTC (rev 3344) +++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2008-08-21 04:43:10 UTC (rev 3345) @@ -336,10 +336,14 @@ pano.addObserver(this); // Set sizing characteristics + //set minumum size +#if defined __WXMAC__ || defined __WXMSW__ // a minimum nice looking size; smaller than this would clutter the layout. - //SetSizeHints(900, 675); //set minumum size + SetSizeHints(900, 675); +#else // For ASUS eeePc SetSizeHints(780, 455); //set minumum size +#endif #if 0 bool maximized = config->Read(wxT("/MainFrame/maximized"), 0l) != 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ip...@us...> - 2008-08-29 04:33:13
|
Revision: 3373 http://hugin.svn.sourceforge.net/hugin/?rev=3373&view=rev Author: ippei Date: 2008-08-29 04:33:12 +0000 (Fri, 29 Aug 2008) Log Message: ----------- Image info dialog position Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/MainFrame.cpp Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2008-08-29 04:14:23 UTC (rev 3372) +++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2008-08-29 04:33:12 UTC (rev 3373) @@ -1519,6 +1519,7 @@ { // display lens dialog HFOVDialog dlg(parent, srcImg, focalLength, cropFactor); + dlg.CenterOnParent(); int ret = dlg.ShowModal(); if (ret == wxID_OK) { // assume a cancel dialog. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2009-05-23 08:30:58
|
Revision: 3876 http://hugin.svn.sourceforge.net/hugin/?rev=3876&view=rev Author: tmodes Date: 2009-05-23 08:30:47 +0000 (Sat, 23 May 2009) Log Message: ----------- Use ProgressReporterDialog for Fine-Tuning, prevents crash, when translation contains wide char (e. g. Chinese) Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/MainFrame.cpp Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2009-05-22 21:14:54 UTC (rev 3875) +++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2009-05-23 08:30:47 UTC (rev 3876) @@ -1295,10 +1295,8 @@ HUGIN_FT_CURV_THRESHOLD); { - MyProgressDialog pdisp(_("Fine-tuning all points"), wxT(""), NULL, wxPD_ELAPSED_TIME | wxPD_AUTO_HIDE | wxPD_APP_MODAL ); + ProgressReporterDialog progress(unoptimized.size(),_("Fine-tuning all points"),_("Finetuning"),this); - pdisp.pushTask(ProgressTask((const char *)wxString(_("Finetuning")).mb_str(wxConvLocal),"",1.0/unoptimized.size())); - ImageCache & imgCache = ImageCache::getInstance(); // do not process the control points in random order, @@ -1311,7 +1309,7 @@ while (it != unoptimized.end()) { if (cps[*it].image1Nr == imgNr || cps[*it].image2Nr == imgNr) { - pdisp.increase(); + progress.increaseProgress(1); if (cps[*it].mode == ControlPoint::X_Y) { // finetune only normal points DEBUG_DEBUG("fine tuning point: " << *it); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2009-07-27 05:23:41
|
Revision: 4110 http://hugin.svn.sourceforge.net/hugin/?rev=4110&view=rev Author: tmodes Date: 2009-07-27 05:23:32 +0000 (Mon, 27 Jul 2009) Log Message: ----------- Set correctly window title of hugin [2824137] Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/MainFrame.cpp Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2009-07-27 05:21:53 UTC (rev 4109) +++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2009-07-27 05:23:32 UTC (rev 4110) @@ -561,10 +561,10 @@ makefile, tmpDir); } + SetStatusText(wxString::Format(_("saved project %s"), m_filename.c_str()),0); + this->SetTitle(scriptName.GetName() + wxT(".") + scriptName.GetExt() + wxT(" - ") + _("Hugin - Panorama Tools Frontend")); + pano.clearDirty(); } - SetStatusText(wxString::Format(_("saved project %s"), m_filename.c_str()),0); - this->SetTitle(scriptName.GetName() + wxT(".") + scriptName.GetExt() + wxT(" - hugin")); - pano.clearDirty(); } catch (std::exception & e) { wxString err(e.what(), wxConvLocal); wxMessageBox(err, wxT("Exception during saving project file")); @@ -653,7 +653,7 @@ DEBUG_DEBUG("project contains " << pano.getNrOfImages() << " after load"); opt_panel->setModeCustom(); SetStatusText(_("Project opened")); - this->SetTitle(fname.GetName() + wxT(".") + fname.GetExt() + wxT(" - hugin")); + this->SetTitle(fname.GetName() + wxT(".") + fname.GetExt() + wxT(" - ") + _("Hugin - Panorama Tools Frontend")); if (! (fname.GetExt() == wxT("pto"))) { // do not remember filename if its not a hugin project // to avoid overwriting the original project with an @@ -737,7 +737,7 @@ GlobalCmdHist::getInstance().addCommand( new NewPanoCmd(pano)); // remove old images from cache ImageCache::getInstance().flush(); - this->SetTitle(wxT("hugin")); + this->SetTitle(_("Hugin - Panorama Tools Frontend")); pano.clearDirty(); // Setup pano with options from preferences This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <st...@us...> - 2009-09-29 18:07:35
|
Revision: 4516 http://hugin.svn.sourceforge.net/hugin/?rev=4516&view=rev Author: stativ Date: 2009-09-29 18:07:26 +0000 (Tue, 29 Sep 2009) Log Message: ----------- Added missing "delete splash;" Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/MainFrame.cpp Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2009-09-29 13:43:34 UTC (rev 4515) +++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2009-09-29 18:07:26 UTC (rev 4516) @@ -383,6 +383,7 @@ if(splash) { splash->Close(); + delete splash; } wxYield(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2009-10-16 19:25:03
|
Revision: 4640 http://hugin.svn.sourceforge.net/hugin/?rev=4640&view=rev Author: tmodes Date: 2009-10-16 19:24:52 +0000 (Fri, 16 Oct 2009) Log Message: ----------- Fixes warning in MainFrame.cpp Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/MainFrame.cpp Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2009-10-16 08:06:19 UTC (rev 4639) +++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2009-10-16 19:24:52 UTC (rev 4640) @@ -1653,7 +1653,7 @@ else { m_mruFiles.RemoveFileFromHistory(index); - wxMessageBox(wxString::Format(_("File \"%s\" not found.\nMaybe file was renamed, moved or deleted."),f), + wxMessageBox(wxString::Format(_("File \"%s\" not found.\nMaybe file was renamed, moved or deleted."),f.c_str()), _("Error!"),wxOK | wxICON_INFORMATION ); }; }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2010-04-05 11:17:40
|
Revision: 5106 http://hugin.svn.sourceforge.net/hugin/?rev=5106&view=rev Author: tmodes Date: 2010-04-05 11:17:34 +0000 (Mon, 05 Apr 2010) Log Message: ----------- Improved warning if saving of project file failed (e.g. read-only file or folder) Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/MainFrame.cpp Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2010-04-04 10:24:11 UTC (rev 5105) +++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2010-04-05 11:17:34 UTC (rev 5106) @@ -539,6 +539,7 @@ std::string path = getPathPrefix(std::string(scriptName.GetFullPath().mb_str(HUGIN_CONV_FILENAME))); DEBUG_DEBUG("stripping " << path << " from image filenames"); std::ofstream script(scriptName.GetFullPath().mb_str(HUGIN_CONV_FILENAME)); + script.exceptions ( std::ofstream::eofbit | std::ofstream::failbit | std::ofstream::badbit ); PT::OptimizeVector optvec = opt_panel->getOptimizeVector(); PT::UIntSet all; if (pano.getNrOfImages() > 0) { @@ -554,6 +555,7 @@ if (createMakefile && pano.getNrOfImages() > 0) { wxString makefn = scriptName.GetFullPath() + wxT(".mk"); std::ofstream makefile(makefn.mb_str(HUGIN_CONV_FILENAME)); + makefile.exceptions ( std::ofstream::eofbit | std::ofstream::failbit | std::ofstream::badbit ); wxString ptoFnWX = scriptName.GetFullPath(); std::string ptoFn(ptoFnWX.mb_str(HUGIN_CONV_FILENAME)); wxString bindir = huginApp::Get()->GetUtilsBinDir(); @@ -581,7 +583,7 @@ } } catch (std::exception & e) { wxString err(e.what(), wxConvLocal); - wxMessageBox(err, wxT("Exception during saving project file")); + wxMessageBox(wxString::Format(_("Could not save project file \"%s\".\nMaybe the file or the folder is read-only.\n\n(Error code: %s)"),m_filename.c_str(),err.c_str()),_("Error"),wxOK|wxICON_ERROR); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2010-04-09 16:17:21
|
Revision: 5108 http://hugin.svn.sourceforge.net/hugin/?rev=5108&view=rev Author: tmodes Date: 2010-04-09 16:17:14 +0000 (Fri, 09 Apr 2010) Log Message: ----------- Extended warn message if saving failed Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/MainFrame.cpp Modified: hugin/trunk/src/hugin1/hugin/MainFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2010-04-06 21:10:59 UTC (rev 5107) +++ hugin/trunk/src/hugin1/hugin/MainFrame.cpp 2010-04-09 16:17:14 UTC (rev 5108) @@ -529,6 +529,7 @@ void MainFrame::OnSaveProject(wxCommandEvent & e) { DEBUG_TRACE(""); + bool savedProjectFile=false; try { wxFileName scriptName = m_filename; if (m_filename == wxT("")) { @@ -547,6 +548,7 @@ } pano.printPanoramaScript(script, optvec, pano.getOptions(), all, false, path); script.close(); + savedProjectFile=true; int createMakefile = 1; #if defined __WXMAC__ && defined MAC_SELF_CONTAINED_BUNDLE @@ -583,7 +585,14 @@ } } catch (std::exception & e) { wxString err(e.what(), wxConvLocal); - wxMessageBox(wxString::Format(_("Could not save project file \"%s\".\nMaybe the file or the folder is read-only.\n\n(Error code: %s)"),m_filename.c_str(),err.c_str()),_("Error"),wxOK|wxICON_ERROR); + if(savedProjectFile) + { + wxMessageBox(wxString::Format(_("Could not save project makefile \"%s\".\nBut the project file was saved.\nMaybe the file or the folder is read-only.\n\n(Error code: %s)"),(m_filename+wxT(".mk")).c_str(),err.c_str()),_("Warning"),wxOK|wxICON_INFORMATION); + } + else + { + wxMessageBox(wxString::Format(_("Could not save project file \"%s\".\nMaybe the file or the folder is read-only.\n\n(Error code: %s)"),m_filename.c_str(),err.c_str()),_("Error"),wxOK|wxICON_ERROR); + }; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |