X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOWxGimmickView.cpp;h=9ece06de714dc60ebb13b918bcbb5de7f186a4ff;hb=0f8bba59f6ae7a2cfa7e87d351ff8e13f2cf1a1e;hp=4381a6e1a38e422714d0d6fa19c93fd093555108;hpb=8b74b6a37dfc8b8a3ebb4f9f8e4b46429da0e4c7;p=creaImageIO.git diff --git a/src2/creaImageIOWxGimmickView.cpp b/src2/creaImageIOWxGimmickView.cpp index 4381a6e..9ece06d 100644 --- a/src2/creaImageIOWxGimmickView.cpp +++ b/src2/creaImageIOWxGimmickView.cpp @@ -12,6 +12,8 @@ using namespace crea; #include "icons/create-database.xpm" #include "icons/help.xpm" #include "icons/synchronize.xpm" +#include "icons/settings.xpm" +#include "icons/tools.xpm" #include #include @@ -30,13 +32,15 @@ namespace creaImageIO TOOL_ADDDATABASE_ID = 4, TOOL_REMOVE_ID = 5, TOOL_SYNCHRONIZE_ID = 6, - TOOL_HELP_ID = 7 + TOOL_HELP_ID = 7, + TOOL_SETTINGS_ID = 8, + TOOL_TOOLS_ID = 9 }; //====================================================================== //================================================================ // - const int icon_number = 9; + const int icon_number = 11; // Icon ids typedef enum { @@ -48,7 +52,9 @@ namespace creaImageIO Icon_database_add, Icon_remove, Icon_synchronize, - Icon_help + Icon_help, + Icon_settings, + Icon_tools } icon_id; //================================================================ @@ -214,6 +220,16 @@ namespace creaImageIO mIcon->GetBitmap(Icon_help), _T("Open help window") ); + mToolSettings = mToolBar->AddTool( TOOL_SETTINGS_ID, + _T("System settings"), + mIcon->GetBitmap(Icon_settings), + _T("Allows the modification of various system settings") + ); + mToolTools = mToolBar->AddTool( TOOL_TOOLS_ID, + _T("Tools"), + mIcon->GetBitmap(Icon_tools), + _T("Applies tools to images") + ); //const wxBitmap& bitmap1, const wxString& shortHelpString = "", wxItemKind kind = wxITEM_NORMAL) mToolBar->Realize(); @@ -283,6 +299,8 @@ namespace creaImageIO icons[Icon_help] = wxIcon(help_xpm); icons[Icon_synchronize] = wxIcon(synchronize_xpm); icons[Icon_create_database] = wxIcon(create_database_xpm); + icons[Icon_settings] = wxIcon(settings_xpm); + icons[Icon_tools] = wxIcon(tools_xpm); // unsigned int NbIcons = 8; // Make an image list containing small icons @@ -611,6 +629,13 @@ namespace creaImageIO GetTreeViewMap()[crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))]->UpdateLevel(1); } + //================================================= + void WxGimmickView::CopyFiles(const std::vector& filenames) + { + mGimmick->CopyFiles(filenames, crea::wx2std(mNotebook->GetPageText(mNotebook->GetSelection()))); + wxMessageBox(std2wx("The selected files have been copied"),_T("Copy files"),wxOK,this); + } + //================================================= void WxGimmickView::OnSynchronize(wxCommandEvent& event) { @@ -645,6 +670,51 @@ namespace creaImageIO } //================================================= + //================================================= + void WxGimmickView::OnSettings(wxCommandEvent& event) + { + wxDialog* dial= new wxDialog (this,-1,"System Settings",wxDefaultPosition, wxSize(450,600)); + wxBoxSizer *siz = new wxBoxSizer(wxVERTICAL); + // Notebook + wxNotebook* nb= new wxNotebook(dial, + -1,wxDefaultPosition, wxDefaultSize, 0); + + siz->Add( nb,1,wxGROW ,0); + CreateSettingsDialog(nb); + dial->SetSizer(siz); + dial->ShowModal(); + } + //================================================= + + //================================================= + //AndresDonadio + void WxGimmickView::OnTools(wxCommandEvent& event) + { + wxDialog* dial= new wxDialog (this,-1,"Tools",wxDefaultPosition, wxDefaultSize); + wxBoxSizer *siz = new wxBoxSizer(wxVERTICAL); + dial->SetSizer(siz); + dial->ShowModal(); + } + //================================================= + + void WxGimmickView::CreateSettingsDialog(wxNotebook* nb) + { + //First page: Customization of configurations + wxPanel* customConfig=new wxPanel(nb); + nb->AddPage( customConfig, crea::std2wx("Customize Configuration") ); + //Second page: Creation of Databases + wxPanel* databaseCreation=new wxPanel(nb); + nb->AddPage( databaseCreation, crea::std2wx("Create Database") ); + //Third page: CD/DVD Watch + wxPanel* cdWatch=new wxPanel(nb); + nb->AddPage( cdWatch, crea::std2wx("CD/DVD") ); + //Fourth page: Selection of attributes to show (edit) + wxPanel* attSelection=new wxPanel(nb); + nb->AddPage( attSelection, crea::std2wx("Selection of Attributes") ); + + } + + //================================================= /// AddProgress Gimmick callback void WxGimmickView::OnAddProgress( Gimmick::AddProgress& p) @@ -786,6 +856,8 @@ namespace creaImageIO EVT_TOOL(TOOL_ADDDATABASE_ID, WxGimmickView::OnAddDB) EVT_TOOL(TOOL_REMOVE_ID, WxGimmickView::OnRemove) EVT_TOOL(TOOL_SYNCHRONIZE_ID, WxGimmickView::OnSynchronize) + EVT_TOOL(TOOL_SETTINGS_ID, WxGimmickView::OnSettings) + EVT_TOOL(TOOL_TOOLS_ID, WxGimmickView::OnTools) END_EVENT_TABLE() //=================================================