X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxGimmickSettings.cpp;h=683ec5e7af2d01c1c86076fdc82b06bbd1d874fe;hb=46d6077cd663d529fb3f083001e9fee330da7fb8;hp=eefd4f5de6b0e6a290ab91d66bc3fc0b3a5302aa;hpb=d1b114808351682efa318e81fc64d2a27055b424;p=creaImageIO.git

diff --git a/src/creaImageIOWxGimmickSettings.cpp b/src/creaImageIOWxGimmickSettings.cpp
index eefd4f5..683ec5e 100644
--- a/src/creaImageIOWxGimmickSettings.cpp
+++ b/src/creaImageIOWxGimmickSettings.cpp
@@ -188,7 +188,8 @@ namespace creaImageIO
   //================================================================
 
   //================================================================
-  WxGimmickSettingsDialog::WxGimmickSettingsDialog(wxWindow *parent)
+  WxGimmickSettingsDialog::WxGimmickSettingsDialog(wxWindow *parent,
+						   WxGimmickSettings* settings)
     : 
     wxDialog( parent, 
 	      -1, 
@@ -201,10 +202,13 @@ namespace creaImageIO
 	      wxMAXIMIZE_BOX | 
 	      wxMINIMIZE_BOX | 
 	      wxCAPTION  
-	      )
+	      ),
+    mSettings(settings)
   {
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
     
+    
+
     wxSizer* bsizer = CreateSeparatedButtonSizer(wxOK|wxCANCEL);
     mOkButton = (wxButton*)FindWindowById(GetAffirmativeId(), this);
     mCancelButton = (wxButton*)FindWindowById(GetEscapeId(), this);
@@ -229,9 +233,10 @@ namespace creaImageIO
   //================================================================
 
   //================================================================
-  WxGimmickHelpWindow::WxGimmickHelpWindow(wxWindow *parent)
+  WxGimmickHelp::WxGimmickHelp(wxWindow *parent)
     : 
-    wxDialog( parent, 
+    wxPanel( parent, -1)
+			      /*
 	      -1, 
 	      _T("Gimmick! Help"),
 	      wxDefaultPosition,
@@ -252,8 +257,9 @@ namespace creaImageIO
 	      
 
 	      )
+			      */
   {
-    SetBackgroundColour(*wxBLUE);
+    //    SetBackgroundColour(*wxBLUE);
 
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
     
@@ -276,30 +282,30 @@ namespace creaImageIO
                                    wxFONTWEIGHT_NORMAL,
                                    false);
     
-    wxTextAttr mwxInputTextAttr;
-    mwxInputTextAttr.SetFont(*FixedFont);
-    mwxInputTextAttr.SetBackgroundColour(*wxBLUE);
-    mwxInputTextAttr.SetTextColour(*wxWHITE);
-    mText->SetDefaultStyle(mwxInputTextAttr);
-    mText->SetBackgroundColour(*wxBLUE);
+    //    wxTextAttr mwxInputTextAttr;
+    //    mwxInputTextAttr.SetFont(*FixedFont);
+    //    mwxInputTextAttr.SetBackgroundColour(*wxBLUE);
+    //    mwxInputTextAttr.SetTextColour(*wxWHITE);
+    //    mText->SetDefaultStyle(mwxInputTextAttr);
+    //    mText->SetBackgroundColour(*wxBLUE);
 
     std::string tip("\n");
-    tip += "                          Welcome to Gimmick !\n\n";
-    tip += "                   ( Give me my medical images quick ! )\n\n\n";
-    tip += "  You do not have any image collection yet\n\n";
-    tip += "  To create one :\n";
+    tip += "           Welcome to Gimmick !\n";
+    tip += "    ( Give me my medical images quick ! )\n\n\n";
+    tip += "  To start you must create a 'Collection' :\n";
     tip += "     1) Right click on 'Collection'\n";
     tip += "     2) Select 'New collection'\n";
     tip += "     3) Enter the collection file name and the collection name\n\n";
     tip += "  To add images to your collection :\n";
     tip += "     1) Right click on your collection\n";
     tip += "     2) Select 'Add image(s) to collection'\n";
-    tip += "     3) Select 'Scan Directory' to add all images of a directory or\n";
-    tip += "        Select 'Select File(s)' to add only some selected images\n";
+    tip += "     3) Select :\n";
+    tip += "        * 'Scan Directory' to add all images of a directory or\n";
+    tip += "        * 'Select File(s)' to add only some selected images\n";
     tip += "     4) Select the directory or the files to add\n";
     tip += "\n\n";
-    tip += "  Remember then that *ALL* actions in Gimmick! are accessible\n";
-    tip += "  by right clicking on the elements of the view\n";
+    tip += "  Remember then that *ALL ACTIONS* in Gimmick!\n";
+    tip += "  are done by right clicking on the DICOM tree elements\n";
     tip += "\n";
     tip += "                                Enjoy!\n";
 
@@ -308,12 +314,12 @@ namespace creaImageIO
 
     sizer->Add(mText,1,wxGROW);
  
-
+    /*
     wxSizer* bsizer = CreateSeparatedButtonSizer(wxOK);
     mOkButton = (wxButton*)FindWindowById(GetAffirmativeId(), this);
-
+    
     sizer->Add ( bsizer, 0, wxGROW );
-
+    */
 
     SetSizer(sizer);
     SetAutoLayout(true);
@@ -325,7 +331,7 @@ namespace creaImageIO
   //================================================================
     
   //================================================================
-  WxGimmickHelpWindow::~WxGimmickHelpWindow()
+  WxGimmickHelp::~WxGimmickHelp()
   {
   }
   //================================================================