diff --git a/common/dialog_load_error.cpp b/common/dialog_load_error.cpp
index 1a1c82be8d..9f3fb9b282 100644
--- a/common/dialog_load_error.cpp
+++ b/common/dialog_load_error.cpp
@@ -2,12 +2,13 @@
DIALOG_LOAD_ERROR::DIALOG_LOAD_ERROR( wxWindow* parent )
:
-DIALOG_LOAD_ERROR_BASE( parent )
+DIALOG_DISPLAY_HTML_TEXT_BASE( parent, wxID_ANY, _("Load Error!"),wxDefaultPosition, wxSize( 450,250 ) )
{
-
+ SetFocus();
+ ListClear();
}
-void DIALOG_LOAD_ERROR::OnOkClick( wxCommandEvent& event )
+void DIALOG_LOAD_ERROR::OnCloseButtonClick( wxCommandEvent& event )
{
Destroy();
}
@@ -15,18 +16,38 @@ void DIALOG_LOAD_ERROR::OnOkClick( wxCommandEvent& event )
void DIALOG_LOAD_ERROR::ListClear(void)
{
- TextCtrlList->Clear();
+ m_htmlWindow->SetPage(wxEmptyString);
}
+/** Function ListSet
+ * Add a list of items.
+ * @param list = a pointer on a string containing items. Items are separated by '\n'
+ */
void DIALOG_LOAD_ERROR::ListSet(wxString *list)
{
- wxString list_value = *list;
- TextCtrlList->SetValue(list_value);
+ wxArrayString* wxStringSplit( wxString txt, wxChar splitter );
+
+ wxArrayString* strings_list = wxStringSplit( *list, wxChar('\n') );
+ m_htmlWindow->AppendToPage(wxT("") );
+ for ( unsigned ii = 0; ii < strings_list->GetCount(); ii ++ )
+ {
+ m_htmlWindow->AppendToPage(wxT("- ") );
+ m_htmlWindow->AppendToPage( strings_list->Item(ii) );
+ m_htmlWindow->AppendToPage(wxT("
") );
+ }
+ m_htmlWindow->AppendToPage(wxT("
") );
+
+ delete strings_list;
}
+/** Function MessageSet
+ * Add a message (in bold) to message list.
+ * @param message = a pointer to the message
+ */
void DIALOG_LOAD_ERROR::MessageSet(wxString *message)
{
- wxString message_value = *message;
- StaticTextMessage->SetLabel(message_value);
+ wxString message_value;
+ message_value.Printf(wxT("%s
"), message->GetData() );
+ m_htmlWindow->AppendToPage( message_value );
}
diff --git a/common/dialog_load_error.h b/common/dialog_load_error.h
deleted file mode 100644
index 63a1795998..0000000000
--- a/common/dialog_load_error.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#ifndef __dialog_load_error__
-#define __dialog_load_error__
-
-/**
-@file
-Subclass of DIALOG_LOAD_ERROR_BASE, which is generated by wxFormBuilder.
-*/
-
-#include "dialog_load_error_base.h"
-
-/** Implementing DIALOG_LOAD_ERROR_BASE */
-class DIALOG_LOAD_ERROR : public DIALOG_LOAD_ERROR_BASE
-{
-protected:
- // Handlers for DIALOG_LOAD_ERROR_BASE events.
- void OnOkClick( wxCommandEvent& event );
-
-public:
- /** Constructor */
- DIALOG_LOAD_ERROR( wxWindow* parent );
- void ListSet(wxString *list);
- void ListClear();
- void MessageSet(wxString *message);
-};
-
-#endif // __dialog_load_error__
diff --git a/common/dialog_load_error_base.cpp b/common/dialog_load_error_base.cpp
deleted file mode 100644
index fd611ce60c..0000000000
--- a/common/dialog_load_error_base.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec 19 2008)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include "dialog_load_error_base.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-DIALOG_LOAD_ERROR_BASE::DIALOG_LOAD_ERROR_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
-{
- this->SetSizeHints( wxSize( 320,240 ), wxDefaultSize );
-
- wxBoxSizer* MainSizer;
- MainSizer = new wxBoxSizer( wxVERTICAL );
-
- wxBoxSizer* MessageSizer;
- MessageSizer = new wxBoxSizer( wxVERTICAL );
-
- StaticTextMessage = new wxStaticText( this, wxID_ANY, _("message dummy"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT );
- StaticTextMessage->Wrap( -1 );
- MessageSizer->Add( StaticTextMessage, 0, wxALIGN_LEFT|wxALIGN_TOP|wxALL|wxEXPAND, 5 );
-
- MainSizer->Add( MessageSizer, 0, wxALIGN_BOTTOM|wxALIGN_LEFT|wxALIGN_RIGHT|wxALIGN_TOP|wxEXPAND, 5 );
-
- wxBoxSizer* ListSizer;
- ListSizer = new wxBoxSizer( wxVERTICAL );
-
- TextCtrlList = new wxTextCtrl( this, wxID_ANY, _("list dummy"), wxPoint( 0,0 ), wxSize( -1,-1 ), wxTE_DONTWRAP|wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL|wxNO_BORDER|wxVSCROLL );
- ListSizer->Add( TextCtrlList, 1, wxALIGN_BOTTOM|wxALIGN_CENTER_HORIZONTAL|wxALIGN_TOP|wxEXPAND|wxALL, 5 );
-
- MainSizer->Add( ListSizer, 1, wxEXPAND, 5 );
-
- wxBoxSizer* bSizer5;
- bSizer5 = new wxBoxSizer( wxVERTICAL );
-
- OkButton = new wxButton( this, wxID_ANY, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 );
- OkButton->SetDefault();
- bSizer5->Add( OkButton, 0, wxALIGN_RIGHT|wxALL, 5 );
-
- MainSizer->Add( bSizer5, 0, wxEXPAND, 5 );
-
- this->SetSizer( MainSizer );
- this->Layout();
- MainSizer->Fit( this );
-
- this->Centre( wxBOTH );
-
- // Connect Events
- OkButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LOAD_ERROR_BASE::OnOkClick ), NULL, this );
-}
-
-DIALOG_LOAD_ERROR_BASE::~DIALOG_LOAD_ERROR_BASE()
-{
- // Disconnect Events
- OkButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_LOAD_ERROR_BASE::OnOkClick ), NULL, this );
-}
diff --git a/common/dialog_load_error_base.fbp b/common/dialog_load_error_base.fbp
deleted file mode 100644
index f7d3e12374..0000000000
--- a/common/dialog_load_error_base.fbp
+++ /dev/null
@@ -1,272 +0,0 @@
-
-
-
-
-
diff --git a/common/dialog_load_error_base.h b/common/dialog_load_error_base.h
deleted file mode 100644
index bc05069053..0000000000
--- a/common/dialog_load_error_base.h
+++ /dev/null
@@ -1,49 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Dec 19 2008)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __dialog_load_error_base__
-#define __dialog_load_error_base__
-
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-///////////////////////////////////////////////////////////////////////////
-
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_LOAD_ERROR_BASE
-///////////////////////////////////////////////////////////////////////////////
-class DIALOG_LOAD_ERROR_BASE : public wxDialog
-{
- private:
-
- protected:
- wxStaticText* StaticTextMessage;
- wxTextCtrl* TextCtrlList;
- wxButton* OkButton;
-
- // Virtual event handlers, overide them in your derived class
- virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
-
-
- public:
- DIALOG_LOAD_ERROR_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Load Error!"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxRESIZE_BORDER );
- ~DIALOG_LOAD_ERROR_BASE();
-
-};
-
-#endif //__dialog_load_error_base__
diff --git a/cvpcb/CMakeLists.txt b/cvpcb/CMakeLists.txt
index 88748206eb..d9ec507de9 100644
--- a/cvpcb/CMakeLists.txt
+++ b/cvpcb/CMakeLists.txt
@@ -4,7 +4,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${Boost_INCLUDE_DIR}
../3d-viewer
../pcbnew
- ../polygon)
+ ../polygon
+ ${CMAKE_SOURCE_DIR}/common)
set(CVPCB_SRCS
autosel.cpp
diff --git a/cvpcb/listlib.cpp b/cvpcb/listlib.cpp
index 2e8426344a..e67661c277 100644
--- a/cvpcb/listlib.cpp
+++ b/cvpcb/listlib.cpp
@@ -19,7 +19,9 @@
#include "cvpcb.h"
#include "protos.h"
-/* MDC file strings */
+#include "dialog_load_error.h"
+
+/* MDC file strings */
wxString mdc_files_not_found;
wxString mdc_files_invalid;
@@ -54,7 +56,7 @@ bool LoadFootprintFiles( const wxArrayString& libNames,
if( !list.empty() )
list.clear();
- /* Check if there are footprint libraries in project file */
+ /* Check if there are footprint libraries in project file */
if( libNames.GetCount() == 0 )
{
wxMessageBox( _( "No PCB foot print libraries are listed in the current project file." ),
@@ -169,7 +171,7 @@ bool LoadFootprintFiles( const wxArrayString& libNames,
}
-/**
+/**
* Routine de lecture du fichier Doc associe a la librairie ModLibName.
* Cree en memoire la chaine liste des docs pointee par MList
* ModLibName = full file Name de la librairie Modules
diff --git a/eeschema/class_marker_sch.cpp b/eeschema/class_marker_sch.cpp
index 7f7ab9a903..db4b0379db 100644
--- a/eeschema/class_marker_sch.cpp
+++ b/eeschema/class_marker_sch.cpp
@@ -138,7 +138,7 @@ void MARKER_SCH::DisplayMarkerInfo( WinEDA_SchematicFrame* aFrame )
{
wxString msg = GetReporter().ShowHtml();
- DIALOG_DISPLAY_HTML_TEXT_BASE infodisplay( aFrame, -1, wxEmptyString,
+ DIALOG_DISPLAY_HTML_TEXT_BASE infodisplay( aFrame, -1, _("Marker Info"),
wxGetMousePosition(), wxSize( 550, 140 ) );
infodisplay.m_htmlWindow->SetPage( msg );
diff --git a/eeschema/eelibs_read_libraryfiles.cpp b/eeschema/eelibs_read_libraryfiles.cpp
index ddf05342fc..9f427581c3 100644
--- a/eeschema/eelibs_read_libraryfiles.cpp
+++ b/eeschema/eelibs_read_libraryfiles.cpp
@@ -18,6 +18,8 @@
#include "general.h"
#include "protos.h"
+#include "dialog_load_error.h"
+
/* Local Functions */
static LibEDA_BaseStruct* ReadDrawEntryItemDescription( EDA_LibComponentStruct* aParent, FILE* f,
char* Line, int* LineNum );
diff --git a/eeschema/onrightclick.cpp b/eeschema/onrightclick.cpp
index 8aaa21de2a..e0c3c1dc10 100644
--- a/eeschema/onrightclick.cpp
+++ b/eeschema/onrightclick.cpp
@@ -640,5 +640,5 @@ void AddMenusForMarkers( wxMenu* aPopMenu, MARKER_SCH* aMarker,
/**********************************************************************/
{
ADD_MENUITEM( aPopMenu, ID_POPUP_SCH_DELETE, _( "Delete Marker" ), delete_xpm );
- ADD_MENUITEM( aPopMenu, ID_POPUP_SCH_GETINFO_MARKER, _( "About this Marker" ), info_xpm );
+ ADD_MENUITEM( aPopMenu, ID_POPUP_SCH_GETINFO_MARKER, _( "Marker Error Info" ), info_xpm );
}
diff --git a/include/common.h b/include/common.h
index 969cfed080..e4f0cb24fb 100644
--- a/include/common.h
+++ b/include/common.h
@@ -9,9 +9,6 @@
#include "wx/confbase.h"
#include "wx/fileconf.h"
-/* TODO how do i else need to include a common dialog ? */
-#include "../common/dialog_load_error.h"
-
class wxAboutDialogInfo;
class BASE_SCREEN;
class WinEDA_DrawFrame;
diff --git a/include/dialog_load_error.h b/include/dialog_load_error.h
new file mode 100644
index 0000000000..b44eaf7d2c
--- /dev/null
+++ b/include/dialog_load_error.h
@@ -0,0 +1,34 @@
+#ifndef __dialog_load_error_h_
+#define __dialog_load_error_h_
+
+/**
+@file
+Subclass of DIALOG_DISPLAY_HTML_TEXT_BASE, which is generated by wxFormBuilder.
+*/
+
+#include "dialog_display_info_HTML_base.h"
+
+/** Implementing DIALOG_LOAD_ERROR */
+class DIALOG_LOAD_ERROR : public DIALOG_DISPLAY_HTML_TEXT_BASE
+{
+protected:
+ // Handlers for DIALOG_LOAD_ERROR_BASE events.
+ void OnCloseButtonClick( wxCommandEvent& event );
+
+public:
+ /** Constructor */
+ DIALOG_LOAD_ERROR( wxWindow* parent );
+ /** Function ListSet
+ * Add a list of items.
+ * @param list = a pointer on a string containing items. Items are separated by '\n'
+ */
+ void ListSet(wxString *list);
+ void ListClear();
+ /** Function MessageSet
+ * Add a message (in bold) to message list.
+ * @param message = a pointer to the message
+ */
+ void MessageSet(wxString *message);
+};
+
+#endif // __dialog_load_error_h_