From: <yu...@us...> - 2009-03-04 19:14:23
|
Revision: 3704 http://hugin.svn.sourceforge.net/hugin/?rev=3704&view=rev Author: yuv Date: 2009-03-04 19:14:20 +0000 (Wed, 04 Mar 2009) Log Message: ----------- cleanup redundancy MainFrame::Get()->GetXRCPath() - huginApp::Get()->GetXRCPath(). may still have clean up potential in MainFrame.cpp and MainFrame.h Modified Paths: -------------- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp hugin/trunk/src/hugin1/hugin/CPListFrame.cpp hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp hugin/trunk/src/hugin1/hugin/PanoDruid.cpp hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp hugin/trunk/src/hugin1/hugin/PreviewFrame.cpp hugin/trunk/src/hugin1/hugin/ResetDialog.cpp hugin/trunk/src/hugin1/hugin/RunStitcherFrame.cpp Modified: hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-03-04 19:04:22 UTC (rev 3703) +++ hugin/trunk/src/hugin1/hugin/AssistantPanel.cpp 2009-03-04 19:14:20 UTC (rev 3704) @@ -425,7 +425,7 @@ string modelfile = buf; #else char buf[100]; - strcpy( buf, (const char*)MainFrame::Get()->GetXRCPath().mb_str(wxConvUTF8) ); + strcpy( buf, (const char*)huginApp::Get()->GetXRCPath().mb_str(wxConvUTF8) ); // Will this slash work on Windows? strcat( buf, "data/"); strcat( buf, HUGIN_CELESTE_MODEL); Modified: hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-03-04 19:04:22 UTC (rev 3703) +++ hugin/trunk/src/hugin1/hugin/CPEditorPanel.cpp 2009-03-04 19:14:20 UTC (rev 3704) @@ -2183,7 +2183,7 @@ string modelfile = buf; #else char buf[100]; - strcpy( buf, (const char*)MainFrame::Get()->GetXRCPath().mb_str(wxConvUTF8) ); + strcpy( buf, (const char*)huginApp::Get()->GetXRCPath().mb_str(wxConvUTF8) ); // Will this slash work on Windows? strcat( buf, "data/"); strcat( buf, HUGIN_CELESTE_MODEL); Modified: hugin/trunk/src/hugin1/hugin/CPListFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/CPListFrame.cpp 2009-03-04 19:04:22 UTC (rev 3703) +++ hugin/trunk/src/hugin1/hugin/CPListFrame.cpp 2009-03-04 19:14:20 UTC (rev 3704) @@ -272,9 +272,9 @@ this->SetBackgroundColour(XRCCTRL(*this, "cp_list_select", wxButton)->GetBackgroundColour()); #endif #ifdef __WXMSW__ - wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO); + wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO); #else - wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG); + wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG); #endif SetIcon(myIcon); Modified: hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp 2009-03-04 19:04:22 UTC (rev 3703) +++ hugin/trunk/src/hugin1/hugin/GLPreviewFrame.cpp 2009-03-04 19:14:20 UTC (rev 3704) @@ -386,9 +386,9 @@ // set the minimize icon #ifdef __WXMSW__ - wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO); + wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO); #else - wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG); + wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG); #endif SetIcon(myIcon); Modified: hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-03-04 19:04:22 UTC (rev 3703) +++ hugin/trunk/src/hugin1/hugin/ImagesPanel.cpp 2009-03-04 19:14:20 UTC (rev 3704) @@ -139,7 +139,7 @@ XRCCTRL(*this, "images_text_roll", wxTextCtrl)->PushEventHandler(new TextKillFocusHandler(this)); XRCCTRL(*this, "images_text_pitch", wxTextCtrl)->PushEventHandler(new TextKillFocusHandler(this)); - m_empty.LoadFile(MainFrame::Get()->GetXRCPath() + + m_empty.LoadFile(huginApp::Get()->GetXRCPath() + wxT("data/") + wxT("druid.images.128.png"), wxBITMAP_TYPE_PNG); wxStaticBitmap * bmp = XRCCTRL(*this, "images_selected_image", wxStaticBitmap); @@ -752,7 +752,7 @@ string modelfile = buf; #else char buf[100]; - strcpy( buf, (const char*)MainFrame::Get()->GetXRCPath().mb_str(wxConvUTF8) ); + strcpy( buf, (const char*)huginApp::Get()->GetXRCPath().mb_str(wxConvUTF8) ); // Will this slash work on Windows? strcat( buf, "data/"); strcat( buf, HUGIN_CELESTE_MODEL); Modified: hugin/trunk/src/hugin1/hugin/PanoDruid.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/PanoDruid.cpp 2009-03-04 19:04:22 UTC (rev 3703) +++ hugin/trunk/src/hugin1/hugin/PanoDruid.cpp 2009-03-04 19:14:20 UTC (rev 3704) @@ -29,6 +29,7 @@ #include "panoinc.h" #include "hugin/PanoDruid.h" #include "hugin/MainFrame.h" +#include "hugin/huginApp.h" ///////////////////////////////////////////////////////////////////////////// @@ -277,7 +278,7 @@ wxHORIZONTAL ); m_advice = -1; - m_bitmap.LoadFile(MainFrame::Get()->GetXRCPath() + + m_bitmap.LoadFile(huginApp::Get()->GetXRCPath() + wxT("data/") + wxT("druid.stitch.128.png"), wxBITMAP_TYPE_PNG); m_graphic = new wxStaticBitmap(this, -1, m_bitmap, wxPoint(0,0)); @@ -353,7 +354,7 @@ full += '\n'; full += wxGetTranslation(sm_advice[hint]->text); m_text->SetLabel(full); - m_bitmap.LoadFile(MainFrame::Get()->GetXRCPath() + + m_bitmap.LoadFile(huginApp::Get()->GetXRCPath() + wxT("data/") + sm_advice[hint]->graphic, wxBITMAP_TYPE_PNG); m_graphic->SetBitmap(m_bitmap); Modified: hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp 2009-03-04 19:04:22 UTC (rev 3703) +++ hugin/trunk/src/hugin1/hugin/PreferencesDialog.cpp 2009-03-04 19:14:20 UTC (rev 3704) @@ -102,9 +102,9 @@ wxXmlResource::Get()->LoadDialog(this, parent, wxT("pref_dialog")); #ifdef __WXMSW__ - wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO); + wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO); #else - wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG); + wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG); #endif SetIcon(myIcon); Modified: hugin/trunk/src/hugin1/hugin/PreviewFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/PreviewFrame.cpp 2009-03-04 19:04:22 UTC (rev 3703) +++ hugin/trunk/src/hugin1/hugin/PreviewFrame.cpp 2009-03-04 19:14:20 UTC (rev 3704) @@ -362,9 +362,9 @@ // set the minimize icon #ifdef __WXMSW__ - wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO); + wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO); #else - wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG); + wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG); #endif SetIcon(myIcon); Modified: hugin/trunk/src/hugin1/hugin/ResetDialog.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/ResetDialog.cpp 2009-03-04 19:04:22 UTC (rev 3703) +++ hugin/trunk/src/hugin1/hugin/ResetDialog.cpp 2009-03-04 19:14:20 UTC (rev 3704) @@ -15,9 +15,9 @@ wxXmlResource::Get()->LoadDialog(this, parent, wxT("reset_dialog")); #ifdef __WXMSW__ - wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO); + wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO); #else - wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG); + wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG); #endif SetIcon(myIcon); //set parameters Modified: hugin/trunk/src/hugin1/hugin/RunStitcherFrame.cpp =================================================================== --- hugin/trunk/src/hugin1/hugin/RunStitcherFrame.cpp 2009-03-04 19:04:22 UTC (rev 3703) +++ hugin/trunk/src/hugin1/hugin/RunStitcherFrame.cpp 2009-03-04 19:14:20 UTC (rev 3704) @@ -66,9 +66,9 @@ assert(ok); #if defined __WXMSW__ - wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO); + wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/icon.ico"),wxBITMAP_TYPE_ICO); #else - wxIcon myIcon(MainFrame::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG); + wxIcon myIcon(huginApp::Get()->GetXRCPath() + wxT("data/icon.png"),wxBITMAP_TYPE_PNG); #endif SetIcon(myIcon); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |