Menu
▾
▴
[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Removed unused preferences setting
|
From: <hug...@li...> - 2011-09-15 16:57:29
|
branch: 2011.2 details: http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/e84e95a8546d changeset: 5566:e84e95a8546d user: tmodes date: Thu Sep 15 17:37:46 2011 +0200 description: Removed unused preferences setting diffstat: src/hugin1/hugin/MainFrame.cpp | 23 +---------------------- src/hugin1/hugin/PreferencesDialog.cpp | 24 ------------------------ src/hugin1/hugin/config_defaults.h | 3 --- src/hugin1/hugin/xrc/main_menu.xrc | 2 +- src/hugin1/hugin/xrc/pref_dialog.xrc | 28 +++------------------------- 5 files changed, 5 insertions(+), 75 deletions(-) diffs (170 lines): diff -r 5aec6a8b7c00 -r e84e95a8546d src/hugin1/hugin/MainFrame.cpp --- a/src/hugin1/hugin/MainFrame.cpp Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/hugin/MainFrame.cpp Thu Sep 15 17:37:46 2011 +0200 @@ -283,21 +283,6 @@ SetMenuBar(wxXmlResource::Get()->LoadMenuBar(this, wxT("main_menubar"))); #ifdef HUGIN_HSI - - // if the folder for the storage of custom plugins does not exist, create it - wxString p; - if(!wxConfigBase::Get()->Read(wxT("/pythonScriptPath"), &p)) - { - // is it really necessary to try to create the dir at each startup? - if(wxConfigBase::Get()->Read(wxT("PluginPythonDir"), &p)) - { - if(!p.IsEmpty()) - { - wxFileName::Mkdir(p,0700,wxPATH_MKDIR_FULL); - }; - }; - } - wxMenuBar* menubar=GetMenuBar(); // the plugin menu will be generated dynamically wxMenu *pluginMenu=new wxMenu(); @@ -1707,13 +1692,7 @@ wxConfigBase::Get()->Read(wxT("/lensPath"),wxT("")), wxT(""), _("Python script (*.py)|*.py|All files (*.*)|*.*"), wxFD_OPEN, wxDefaultPosition); - - wxString p; - if(!wxConfigBase::Get()->Read(wxT("/pythonScriptPath"), &p)) - { - wxConfigBase::Get()->Read(wxT("PluginPythonDir"), &p); - } - dlg.SetDirectory(p); + dlg.SetDirectory(wxConfigBase::Get()->Read(wxT("/pythonScriptPath"),wxT(""))); if (dlg.ShowModal() == wxID_OK) { wxString filename = dlg.GetPath(); diff -r 5aec6a8b7c00 -r e84e95a8546d src/hugin1/hugin/PreferencesDialog.cpp --- a/src/hugin1/hugin/PreferencesDialog.cpp Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/hugin/PreferencesDialog.cpp Thu Sep 15 17:37:46 2011 +0200 @@ -31,10 +31,6 @@ #include "base_wx/wxPlatform.h" -#include <wx/utils.h> -#include <wx/filename.h> -#include <wx/stdpaths.h> - #include "hugin/huginApp.h" #include "hugin/config_defaults.h" #include "hugin/PreferencesDialog.h" @@ -470,15 +466,6 @@ // tempdir MY_STR_VAL("prefs_misc_tempdir", cfg->Read(wxT("tempDir"),wxT(""))); - // python plugin dir - XRCCTRL(*this, "prefs_misc_plugins_python_dir", wxTextCtrl)->SetValue( - cfg->Read(wxT("PluginPythonDir"), -#ifdef __WXGTK__ - wxGetHomeDir() -#else - wxStandardPaths::Get().GetUserDataDir() -#endif - +wxFileName::GetPathSeparator()+wxT(HUGIN_PLUGIN_PYTHON_DIR))); } @@ -684,15 +671,6 @@ cfg->Write(wxT("smartUndo"), HUGIN_SMART_UNDO); // projection hints cfg->Write(wxT("/GLPreviewFrame/ShowProjectionHints"), HUGIN_SHOW_PROJECTION_HINTS); - // python plugin dir - cfg->Write(wxT("PluginPythonDir"), -#ifdef __WXGTK__ - wxGetHomeDir() -#else - wxStandardPaths::Get().GetUserDataDir() -#endif - +wxFileName::GetPathSeparator()+wxT(HUGIN_PLUGIN_PYTHON_DIR)); - } if (noteb->GetSelection() == 1) { cfg->Write(wxT("/Assistant/autoAlign"), HUGIN_ASS_AUTO_ALIGN); @@ -851,8 +829,6 @@ // cfg->Write(wxT("/CPImageCtrl/CursorType"), MY_G_SPIN_VAL("prefs_cp_CursorType")); // tempdir cfg->Write(wxT("tempDir"),MY_G_STR_VAL("prefs_misc_tempdir")); - // python plugin dir - cfg->Write(wxT("PluginPythonDir"),MY_G_STR_VAL("prefs_misc_plugins_python_dir")); ///// /// AUTOPANO cpdetector_config_edit.Write(cfg); diff -r 5aec6a8b7c00 -r e84e95a8546d src/hugin1/hugin/config_defaults.h --- a/src/hugin1/hugin/config_defaults.h Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/hugin/config_defaults.h Thu Sep 15 17:37:46 2011 +0200 @@ -170,9 +170,6 @@ #endif -// personal python plugin folder (relative to user home folder) -#define HUGIN_PLUGIN_PYTHON_DIR "hugin_python_plugins" - // enblend args #define HUGIN_ENBLEND_ARGS "" #define HUGIN_ENFUSE_ARGS "" diff -r 5aec6a8b7c00 -r e84e95a8546d src/hugin1/hugin/xrc/main_menu.xrc --- a/src/hugin1/hugin/xrc/main_menu.xrc Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/hugin/xrc/main_menu.xrc Thu Sep 15 17:37:46 2011 +0200 @@ -88,7 +88,7 @@ <help>Add another image to the current project</help> </object> <object class="wxMenuItem" name="action_python_script"> - <label>Run User &Python script</label> + <label>Run &Python script</label> <help>Run a python script</help> </object> </object> diff -r 5aec6a8b7c00 -r e84e95a8546d src/hugin1/hugin/xrc/pref_dialog.xrc --- a/src/hugin1/hugin/xrc/pref_dialog.xrc Sat Aug 27 13:29:19 2011 +0200 +++ b/src/hugin1/hugin/xrc/pref_dialog.xrc Thu Sep 15 17:37:46 2011 +0200 @@ -186,7 +186,8 @@ <label>File Options</label> <orient>wxVERTICAL</orient> <object class="sizeritem"> - <object class="wxFlexGridSizer"> + <object class="wxBoxSizer"> + <orient>wxHORIZONTAL</orient> <object class="sizeritem"> <object class="wxStaticText"> <label>Temporary dir:</label> @@ -207,29 +208,6 @@ <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> <border>5</border> </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>Plugin dir:</label> - </object> - <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxTextCtrl" name="prefs_misc_plugins_python_dir"/> - <option>1</option> - <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <object class="sizeritem"> - <object class="wxStaticText"> - <label>(where you store your customized plugins)</label> - </object> - <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag> - <border>5</border> - </object> - <cols>3</cols> - <rows>2</rows> - <growablecols>1</growablecols> </object> <flag>wxEXPAND</flag> </object> @@ -1414,4 +1392,4 @@ </object> </object> </object> -</resource> +</resource> \ No newline at end of file |