From: corredor <>
Date: Mon, 3 May 2010 09:15:38 +0000 (+0000)
Subject: New Execute icon
X-Git-Tag: v1_0_0~89
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=4652c0c7dc4ac373306b3e529a49073d72ed96b3;p=bbtkGEditor.git

New Execute icon
---

diff --git a/data/icons/wxart_run.xpm b/data/icons/wxart_run.xpm
new file mode 100644
index 0000000..0f9b6f5
--- /dev/null
+++ b/data/icons/wxart_run.xpm
@@ -0,0 +1,20 @@
+/* XPM */
+static const char * run_xpm[] = {
+"15 13 3 1",
+" 	c None",
+".	c #000000",
+"+	c #25A40F",
+" ..            ",
+" .+.           ",
+" .+++.         ",
+" .+++++.       ",
+" .+++++++.     ",
+" .+++++++++.   ",
+" .++++++++++.  ",
+" .+++++++++.   ",
+" .+++++++.     ",
+" .+++++.       ",
+" .+++.         ",
+" .+.           ",
+" ..            ",
+};
diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 77caf45..ea40403 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -87,12 +87,13 @@ namespace bbtk
 	{	
 		//std::string filename= _dataDir + "/data/icons/wxart_new.xpm";   
 		wxBitmap bmp_new(new_xpm);
+		wxBitmap bmp_run(run_xpm);
 
 		wxToolBar  *_toolbar = new wxToolBar(this, wxID_ANY);
 
 		//Adds a tool btn to the toolbar
 		_toolbar->AddTool(1000,_T("New"),bmp_new, wxNullBitmap, wxITEM_NORMAL,_T("New tab"), _T("Create a new panel tab"));
-		_toolbar->AddTool(1001,_T("Execute"),bmp_new, wxNullBitmap, wxITEM_NORMAL,_T("Execute actual diagram"), _T("Execute actual diagram"));
+		_toolbar->AddTool(1001,_T("Execute"),bmp_run, wxNullBitmap, wxITEM_NORMAL,_T("Execute actual diagram"), _T("Execute actual diagram"));
 
 		_toolbar->SetMargins( 2, 2 );
 		_toolbar->Realize();
diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h
index 8fe1506..80d02cb 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h
@@ -49,6 +49,7 @@
 #include "wxVtkSceneManager.h"
 //#include "C:\RaC\CREATIS\bbtkGEditor\data\icons\wxart_new.xpm" // JPR
 #include "wxart_new.xpm" // JPR
+#include "wxart_run.xpm"
 
 //Includes creaMaracasVisu
 
diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
index 9428913..87f95d3 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
@@ -40,7 +40,7 @@ namespace bbtk
 {
 	//=========================================================================
 
-	wxBlackBoxEditionDialog::wxBlackBoxEditionDialog(wxGUIEditorGraphicBBS *parent,GBlackBoxModel *model):wxDialog(parent,wxID_ANY,_T(""), wxDefaultPosition, wxSize(480, 640))
+	wxBlackBoxEditionDialog::wxBlackBoxEditionDialog(wxGUIEditorGraphicBBS *parent,GBlackBoxModel *model):wxDialog(parent,wxID_ANY,_T(""), wxDefaultPosition, wxSize(480, 640),wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
 	{
 		_model=model;
 		std::string title("BlackBox Editing - Name:");
@@ -79,7 +79,7 @@ namespace bbtk
 		for(int i = 0;i<lstInputs.size();i++)
 		{
 			GPortModel* port = lstInputs[i];
-			wxStaticText *lblName = new wxStaticText(this, -1, std2wx(port->getBBTKName()),wxDefaultPosition,wxSize(100,30));
+			wxStaticText *lblName = new wxStaticText(this, -1, std2wx(port->getBBTKName()),wxDefaultPosition,wxSize(80,30));
 			wxStaticText *lblType = new wxStaticText(this, -1, std2wx(port->getBBTKType()),wxDefaultPosition,wxSize(150,30));
 			wxTextCtrl *txtValue = new wxTextCtrl(this, -1, _T(""),wxDefaultPosition,wxSize(50,15));