Menu
▾
▴
[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: 3 new changesets
|
From: <hug...@li...> - 2010-09-10 06:33:50
|
details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/2c15e1c853dc changeset: 4328:2c15e1c853dc user: tmodes date: Fri Sep 10 07:49:48 2010 +0200 description: More info for info target details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/c5b7df549f2d changeset: 4329:c5b7df549f2d user: tmodes date: Fri Sep 10 08:28:41 2010 +0200 description: Added system information to About screen details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/fc38b89e608e changeset: 4330:fc38b89e608e user: tmodes date: Fri Sep 10 08:33:26 2010 +0200 description: Disable send to batch button (on assistant tab) if project contains less than 2 images diffstat: src/hugin1/hugin/AboutDialog.cpp | 54 ++++++++++ src/hugin1/hugin/AboutDialog.h | 2 + src/hugin1/hugin/AssistantPanel.cpp | 5 + src/hugin1/hugin/AssistantPanel.h | 1 + src/hugin1/hugin/xrc/about.xrc | 24 ++++- src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp | 36 ++++++- 6 files changed, 119 insertions(+), 3 deletions(-) diffs (206 lines): diff -r 781e333ae8d6 -r fc38b89e608e src/hugin1/hugin/AboutDialog.cpp --- a/src/hugin1/hugin/AboutDialog.cpp Thu Sep 09 21:31:11 2010 +0200 +++ b/src/hugin1/hugin/AboutDialog.cpp Fri Sep 10 08:33:26 2010 +0200 @@ -94,6 +94,7 @@ strFile = huginApp::Get()->GetXRCPath() + wxT("data/upstream.txt"); textCtrl->SetFont(font); textCtrl->LoadFile(strFile); + GetSystemInformation(&font); // load the appropriate icon (.ico for Windows, .png for other systems) #ifdef __WXMSW__ @@ -119,3 +120,56 @@ { return; } + +void AboutDialog::GetSystemInformation(wxFont *font) +{ + wxTextCtrl* infoText=XRCCTRL(*this,"system_txt",wxTextCtrl); + infoText->SetFont(*font); + wxString text; + text=wxString::Format(_("Operating System: %s"),wxGetOsDescription().c_str()); + wxString is64; + if(wxIsPlatform64Bit()) + is64=_("64 bit"); + else + is64=_("32 bit"); + text=text+wxT("\n")+wxString::Format(_("Architecture: %s"),is64.c_str()); + text=text+wxT("\n")+wxString::Format(_("Free memory: %d kiB"),wxGetFreeMemory().GetValue()/1024); +#ifdef _WINDOWS + UINT cp=GetACP(); + text=text+wxT("\n")+wxString::Format(_("Active Codepage: %d"),cp); + switch(cp) + { + case 1250: + text=text+wxT(" (Central European Windows)"); + break; + case 1251: + text=text+wxT(" (Cyrillic Windows)"); + break; + case 1252: + text=text+wxT(" (Western European Windows)"); + break; + case 1253: + text=text+wxT(" (Greek Windows)"); + break; + case 1254: + text=text+wxT(" (Turkish Windows)"); + break; + case 1255: + text=text+wxT(" (Hebrew Windows)"); + break; + case 1256: + text=text+wxT(" (Arabic Windows)"); + break; + case 1257: + text=text+wxT(" (Baltic Windows)"); + break; + case 1258: + text=text+wxT(" (Vietnamese Windows)"); + break; + }; +#endif + text=text+wxT("\n\nHugin\n")+wxString::Format(_("Version: %s"),wxString(DISPLAY_VERSION,wxConvLocal).c_str()); + text=text+wxT("\n")+wxString::Format(_("Path to ressources: %s"),huginApp::Get()->GetXRCPath().c_str()); + text=text+wxT("\n")+wxString::Format(_("Path to data: %s"),huginApp::Get()->GetDataPath().c_str()); + infoText->SetValue(text); +} \ No newline at end of file diff -r 781e333ae8d6 -r fc38b89e608e src/hugin1/hugin/AboutDialog.h --- a/src/hugin1/hugin/AboutDialog.h Thu Sep 09 21:31:11 2010 +0200 +++ b/src/hugin1/hugin/AboutDialog.h Fri Sep 10 08:33:26 2010 +0200 @@ -53,6 +53,8 @@ /** button to fill the space */ void OnAboutMe(wxCommandEvent & e); + /** retrieves the system informations */ + void GetSystemInformation(wxFont *font); }; diff -r 781e333ae8d6 -r fc38b89e608e src/hugin1/hugin/AssistantPanel.cpp --- a/src/hugin1/hugin/AssistantPanel.cpp Thu Sep 09 21:31:11 2010 +0200 +++ b/src/hugin1/hugin/AssistantPanel.cpp Fri Sep 10 08:33:26 2010 +0200 @@ -139,6 +139,10 @@ DEBUG_ASSERT(m_alignButton); m_alignButton->Disable(); + m_alignBatchButton = XRCCTRL(*this, "ass_align_batch_button", wxButton); + DEBUG_ASSERT(m_alignBatchButton); + m_alignBatchButton->Disable(); + m_alignText = XRCCTRL(*this, "ass_align_text", wxStaticText); DEBUG_ASSERT(m_alignText); @@ -209,6 +213,7 @@ m_variable_groups->update(); m_alignButton->Enable(pano.getNrOfImages() > 1); + m_alignBatchButton->Enable(pano.getNrOfImages() > 1); if (pano.getNrOfImages() == 0) { m_createButton->Disable(); diff -r 781e333ae8d6 -r fc38b89e608e src/hugin1/hugin/AssistantPanel.h --- a/src/hugin1/hugin/AssistantPanel.h Thu Sep 09 21:31:11 2010 +0200 +++ b/src/hugin1/hugin/AssistantPanel.h Fri Sep 10 08:33:26 2010 +0200 @@ -83,6 +83,7 @@ wxPanel * m_panel; wxStaticText * m_imagesText; wxButton * m_alignButton; + wxButton * m_alignBatchButton; wxStaticText * m_alignText; wxButton * m_createButton; wxCheckBox * m_exifToggle; diff -r 781e333ae8d6 -r fc38b89e608e src/hugin1/hugin/xrc/about.xrc --- a/src/hugin1/hugin/xrc/about.xrc Thu Sep 09 21:31:11 2010 +0200 +++ b/src/hugin1/hugin/xrc/about.xrc Fri Sep 10 08:33:26 2010 +0200 @@ -146,6 +146,28 @@ </object> <label>License</label> </object> + <object class="notebookpage"> + <label>System</label> + <object class="wxPanel" name="system_tab"> + <object class="wxBoxSizer"> + <orient>wxVERTICAL</orient> + <object class="sizeritem"> + <object class="wxTextCtrl" name="system_txt"> + <font> + <size>8</size> + <size platform="mac">10</size> + <family>modern</family> + </font> + <style platform="win">wxTE_MULTILINE|wxTE_READONLY</style> + <style platform="unix|mac">wxTE_MULTILINE|wxTE_READONLY|wxNO_BORDER</style> + </object> + <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag> + <option>1</option> + <border platform="unix|mac">0</border> + </object> + </object> + </object> + </object> </object> <flag>wxALL|wxEXPAND|wxALIGN_LEFT|wxALIGN_TOP</flag> <border>8</border> @@ -161,4 +183,4 @@ </object> </object> </object> -</resource> +</resource> \ No newline at end of file diff -r 781e333ae8d6 -r fc38b89e608e src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp --- a/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp Thu Sep 09 21:31:11 2010 +0200 +++ b/src/hugin_base/algorithms/panorama_makefile/PanoramaMakefilelibExport.cpp Fri Sep 10 08:33:26 2010 +0200 @@ -54,8 +54,6 @@ #ifdef __APPLE__ #include <CoreFoundation/CoreFoundation.h> #else -#include <sys/utsname.h> -#include <sys/sysinfo.h> #endif #endif /// Automates an very often occuring sequence @@ -1202,6 +1200,40 @@ infostream << freeBytes/(1024*1024) << " MiB"; echoInfo(inforule,"Free space on disc: " + infostream.str()); }; + infostream.str(""); + UINT cp=GetACP(); + infostream << cp; + switch(cp) + { + case 1250: + infostream << " (Central European Windows)"; + break; + case 1251: + infostream << " (Cyrillic Windows)"; + break; + case 1252: + infostream << " (Western European Windows)"; + break; + case 1253: + infostream << " (Greek Windows)"; + break; + case 1254: + infostream << " (Turkish Windows)"; + break; + case 1255: + infostream << " (Hebrew Windows)"; + break; + case 1256: + infostream << " (Arabic Windows)"; + break; + case 1257: + infostream << " (Baltic Windows)"; + break; + case 1258: + infostream << " (Vietnamese Windows)"; + break; + }; + echoInfo(inforule,"Active codepage: " + infostream.str()); #else #ifdef __APPLE__ infostream.str(""); |