From: Pablo d'A. <da...@us...> - 2005-08-05 19:54:09
|
Update of /cvsroot/hugin/hugin/src/hugin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4139/hugin Modified Files: LensPanel.cpp MainFrame.cpp PreferencesDialog.cpp Log Message: fixed bug #1242310 (cannot see files with no extension in file dialog), replaced all *.* by * Removed Cursor selection from preferences, wasn't working anyway added Russian to the language list. Index: PreferencesDialog.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/PreferencesDialog.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- PreferencesDialog.cpp 18 Jul 2005 07:48:11 -0000 1.29 +++ PreferencesDialog.cpp 5 Aug 2005 19:53:23 -0000 1.30 @@ -111,6 +111,7 @@ lang_choice->Append(_("Polish"), (void *) wxLANGUAGE_POLISH); lang_choice->Append(_("Italian"), (void *) wxLANGUAGE_ITALIAN); lang_choice->Append(_("Japanese"), (void *) wxLANGUAGE_JAPANESE); + lang_choice->Append(_("Russian"), (void *) wxLANGUAGE_RUSSIAN); lang_choice->SetSelection(0); // Load configuration values from wxConfig @@ -514,8 +515,8 @@ MY_SPIN_VAL("prefs_cache_UpperBound", mem >> 20); // cursor setting - mem = cfg->Read(wxT("/CPImageCtrl/CursorType"), HUGIN_CP_CURSOR); - MY_SPIN_VAL("prefs_cp_CursorType", mem); +// mem = cfg->Read(wxT("/CPImageCtrl/CursorType"), HUGIN_CP_CURSOR); +// MY_SPIN_VAL("prefs_cp_CursorType", mem); // tempdir MY_STR_VAL("prefs_misc_tempdir", cfg->Read(wxT("tempDir"),wxT(""))); @@ -609,7 +610,7 @@ cfg->Write(wxT("language"), (long)((int) lang->GetClientData(lang->GetSelection()))); // cursor - cfg->Write(wxT("/CPImageCtrl/CursorType"), MY_G_SPIN_VAL("prefs_cp_CursorType")); +// cfg->Write(wxT("/CPImageCtrl/CursorType"), MY_G_SPIN_VAL("prefs_cp_CursorType")); // tempdir cfg->Write(wxT("tempDir"),MY_G_STR_VAL("prefs_misc_tempdir")); // druid Index: LensPanel.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/LensPanel.cpp,v retrieving revision 1.83 retrieving revision 1.84 diff -u -d -r1.83 -r1.84 --- LensPanel.cpp 18 Jul 2005 21:22:14 -0000 1.83 +++ LensPanel.cpp 5 Aug 2005 19:53:22 -0000 1.84 @@ -698,7 +698,7 @@ wxFileDialog dlg(this, _("Save lens parameters file"), wxConfigBase::Get()->Read(wxT("lensPath"),wxT("")), wxT(""), - _("Lens Project Files (*.ini)|*.ini|All files (*.*)|*.*"), + _("Lens Project Files (*.ini)|*.ini|All files (*)|*"), wxSAVE, wxDefaultPosition); if (dlg.ShowModal() == wxID_OK) { fname = dlg.GetPath(); Index: MainFrame.cpp =================================================================== RCS file: /cvsroot/hugin/hugin/src/hugin/MainFrame.cpp,v retrieving revision 1.156 retrieving revision 1.157 diff -u -d -r1.156 -r1.157 --- MainFrame.cpp 9 Jun 2005 09:55:05 -0000 1.156 +++ MainFrame.cpp 5 Aug 2005 19:53:22 -0000 1.157 @@ -344,10 +344,10 @@ Move(0, 44); } } - + // set progress display for image cache. ImageCache::getInstance().setProgressDisplay(this); - + #ifdef __WXMAC__ wxApp::s_macAboutMenuItemId = XRCID("action_show_about"); wxApp::s_macPreferencesMenuItemId = XRCID("action_show_prefs"); @@ -400,7 +400,7 @@ } else { config->Write(wxT("/MainFrame/maximized"), 1l); } - + config->Flush(); DEBUG_TRACE("dtor end"); @@ -438,7 +438,7 @@ { if (pano.isDirty()) { int answer = wxMessageBox(_("The panorama has been changed\nSave changes?"), _("Save Panorama?"), - cnacelable? (wxYES_NO | wxCANCEL | wxICON_EXCLAMATION):(wxYES_NO | wxICON_EXCLAMATION), + cnacelable? (wxYES_NO | wxCANCEL | wxICON_EXCLAMATION):(wxYES_NO | wxICON_EXCLAMATION), this); switch (answer){ case wxYES: @@ -509,7 +509,7 @@ wxFileDialog dlg(this, _("Save project file"), wxConfigBase::Get()->Read(wxT("actualPath"),wxT("")), wxT(""), - _("Project files (*.pto)|*.pto|All files (*.*)|*.*"), + _("Project files (*.pto)|*.pto|All files (*)|*"), wxSAVE, wxDefaultPosition); if (dlg.ShowModal() == wxID_OK) { m_filename = dlg.GetPath(); @@ -583,7 +583,7 @@ void MainFrame::MacOnOpenFile(const wxString & filename) { if(!CloseProject(true)) return; //if closing old project is canceled do nothing. - + ImageCache::getInstance().flush(); LoadProjectFile(filename); } @@ -601,12 +601,12 @@ wxFileDialog dlg(this, _("Open project file"), config->Read(wxT("actualPath"),wxT("")), wxT(""), - _("Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files (*.*)|*.*"), + _("Project files (*.pto,*.ptp,*.pts,*.oto)|*.pto;*.ptp;*.pts;*.oto;|All files (*)|*"), wxOPEN, wxDefaultPosition); if (dlg.ShowModal() == wxID_OK) { // remove old images from cache ImageCache::getInstance().flush(); - + wxString filename = dlg.GetPath(); LoadProjectFile(filename); return; @@ -620,7 +620,7 @@ void MainFrame::OnNewProject(wxCommandEvent & e) { if(!CloseProject(true)) return; //if closing current project is canceled - + m_filename = wxT(""); GlobalCmdHist::getInstance().addCommand( new NewPanoCmd(pano)); // remove old images from cache @@ -637,7 +637,7 @@ // get the global config object wxConfigBase* config = wxConfigBase::Get(); - wxString wildcard (_("All Image files|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff|JPEG files (*.jpg)|*.jpg;*.JPG|All files (*.*)|*.*")); + wxString wildcard (_("All Image files|*.jpg;*.JPG;*.tif;*.TIF;*.tiff;*.TIFF;*.png;*.PNG;*.bmp;*.BMP;*.gif;*.GIF;*.pnm;*.PNM;*.sun;*.viff|JPEG files (*.jpg)|*.jpg;*.JPG|All files (*)|*")); wxFileDialog dlg(this,_("Add images"), config->Read(wxT("actualPath"),wxT("")), wxT(""), wildcard, wxOPEN|wxMULTIPLE , wxDefaultPosition); @@ -901,7 +901,7 @@ bool bHelpExists = false; wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("help_dlg")); - + #ifndef __WXMAC__ //if the language is not default, load custom FAQ file (if exists) langCode = huginApp::Get()->GetLocale().GetName().Left(2).Lower(); @@ -935,7 +935,7 @@ wxConfigBase * config = wxConfigBase::Get(); nValue = config->Read(wxT("/MainFrame/ShowStartTip"),1l); - + #ifndef __WXMAC__ //if the language is not default, load custom tip file (if exists) langCode = huginApp::Get()->GetLocale().GetName().Left(2).Lower(); @@ -1011,7 +1011,7 @@ bool bFAQExists = false; wxXmlResource::Get()->LoadDialog(&dlg, this, wxT("help_dlg")); - + #ifndef __WXMAC__ //if the language is not default, load custom FAQ file (if exists) langCode = huginApp::Get()->GetLocale().GetName().Left(2).Lower(); |