Commit e90cc8ad authored by jean-pierre charras's avatar jean-pierre charras
Browse files

All: added a standard exit dialog called by int DisplayExitDialog( wxWindow*... 

All: added a standard exit dialog called by int DisplayExitDialog( wxWindow* aParent, const wxString& aMessage )
Called when closing pcbnew, cvpcb and eeschema.
Minor code cleaning: remove duplicate or not used strings (mainly file extensions and wildcards)
parent 5e5ec6f1

common/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ set(COMMON_ABOUT_DLG_SRCS 
    dialog_about/dialog_about.cpp

    dialog_about/dialog_about_base.cpp

    dialogs/dialog_display_info_HTML_base.cpp

    dialogs/dialog_exit_base.cpp

    dialogs/dialog_image_editor.cpp

    dialogs/dialog_image_editor_base.cpp

    dialogs/dialog_get_component.cpp

common/confirm.cpp

+28 −0
Original line number Diff line number Diff line
@@ -8,7 +8,35 @@ 
#include <wx/wx.h>

#include <wx/html/htmlwin.h>

#include <html_messagebox.h>

#include <dialog_exit_base.h>

#include <bitmaps.h>



class DIALOG_EXIT: public DIALOG_EXIT_BASE

{

public:

    DIALOG_EXIT( wxWindow * parent, const wxString& aMessage ) :

        DIALOG_EXIT_BASE( parent )

    {

        m_bitmap->SetBitmap( KiBitmap( cancel_xpm ) );

        if( ! aMessage.IsEmpty() )

            m_TextInfo->SetLabel( aMessage );

        GetSizer()->Fit( this );

        GetSizer()->SetSizeHints( this );

    };



private:

	void OnSaveAndExit( wxCommandEvent& event ) { EndModal( wxID_OK ); }

	void OnCancel( wxCommandEvent& event ) { EndModal( wxID_CANCEL ); }

	void OnExitNoSave( wxCommandEvent& event ) { EndModal( wxID_NO ); }

};



int DisplayExitDialog( wxWindow* parent, const wxString& aMessage )

{

    DIALOG_EXIT dlg( parent, aMessage );



    int ret = dlg.ShowModal();

    return ret;

}



void DisplayError( wxWindow* parent, const wxString& text, int displaytime )

{

common/dialogs/dialog_exit_base.cpp

0 → 100644
+96 −0
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Feb  9 2012)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!

///////////////////////////////////////////////////////////////////////////



#include "dialog_exit_base.h"



///////////////////////////////////////////////////////////////////////////



DIALOG_EXIT_BASE::DIALOG_EXIT_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( wxDefaultSize, wxDefaultSize );

	

	wxBoxSizer* bSizerMain;

	bSizerMain = new wxBoxSizer( wxVERTICAL );

	

	wxBoxSizer* bSizerUpper;

	bSizerUpper = new wxBoxSizer( wxHORIZONTAL );

	

	wxBoxSizer* bSizerBitmap;

	bSizerBitmap = new wxBoxSizer( wxVERTICAL );

	

	m_bitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );

	bSizerBitmap->Add( m_bitmap, 0, wxALL, 5 );

	

	

	bSizerUpper->Add( bSizerBitmap, 0, 0, 5 );

	

	wxBoxSizer* bSizerMessages;

	bSizerMessages = new wxBoxSizer( wxVERTICAL );

	

	m_TextInfo = new wxStaticText( this, wxID_ANY, _("Save the changes before closing?"), wxDefaultPosition, wxDefaultSize, 0 );

	m_TextInfo->Wrap( -1 );

	m_TextInfo->SetFont( wxFont( 8, 74, 90, 92, false, wxT("MS Shell Dlg 2") ) );

	

	bSizerMessages->Add( m_TextInfo, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );

	

	

	bSizerMessages->Add( 10, 10, 0, 0, 5 );

	

	m_staticText2 = new wxStaticText( this, wxID_ANY, _("If you don't save, all your changes will be permanently lost."), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText2->Wrap( -1 );

	bSizerMessages->Add( m_staticText2, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );

	

	

	bSizerUpper->Add( bSizerMessages, 1, wxEXPAND, 5 );

	

	

	bSizerMain->Add( bSizerUpper, 1, wxEXPAND, 5 );

	

	wxBoxSizer* bSizerLower;

	bSizerLower = new wxBoxSizer( wxVERTICAL );

	

	m_staticline = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

	bSizerLower->Add( m_staticline, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );

	

	wxBoxSizer* bSizerButtons;

	bSizerButtons = new wxBoxSizer( wxHORIZONTAL );

	

	m_buttonSaveAndExit = new wxButton( this, wxID_ANY, _("Save and Exit"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizerButtons->Add( m_buttonSaveAndExit, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );

	

	m_buttonExitNoSave = new wxButton( this, wxID_ANY, _("Exit without Save"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizerButtons->Add( m_buttonExitNoSave, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );

	

	m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizerButtons->Add( m_buttonCancel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );

	

	

	bSizerLower->Add( bSizerButtons, 0, wxALIGN_RIGHT, 5 );

	

	

	bSizerMain->Add( bSizerLower, 0, wxEXPAND, 5 );

	

	

	this->SetSizer( bSizerMain );

	this->Layout();

	

	this->Centre( wxBOTH );

	

	// Connect Events

	m_buttonSaveAndExit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXIT_BASE::OnSaveAndExit ), NULL, this );

	m_buttonExitNoSave->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXIT_BASE::OnExitNoSave ), NULL, this );

	m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXIT_BASE::OnCancel ), NULL, this );

}



DIALOG_EXIT_BASE::~DIALOG_EXIT_BASE()

{

	// Disconnect Events

	m_buttonSaveAndExit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXIT_BASE::OnSaveAndExit ), NULL, this );

	m_buttonExitNoSave->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXIT_BASE::OnExitNoSave ), NULL, this );

	m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EXIT_BASE::OnCancel ), NULL, this );

	

}

common/dialogs/dialog_exit_base.fbp

0 → 100644
+804 −0

File added.

Preview size limit exceeded, changes collapsed.

common/dialogs/dialog_exit_base.h

0 → 100644
+61 −0
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Feb  9 2012)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!

///////////////////////////////////////////////////////////////////////////



#ifndef __DIALOG_EXIT_BASE_H__

#define __DIALOG_EXIT_BASE_H__



#include <wx/artprov.h>

#include <wx/xrc/xmlres.h>

#include <wx/intl.h>

#include <wx/bitmap.h>

#include <wx/image.h>

#include <wx/icon.h>

#include <wx/statbmp.h>

#include <wx/string.h>

#include <wx/gdicmn.h>

#include <wx/font.h>

#include <wx/colour.h>

#include <wx/settings.h>

#include <wx/sizer.h>

#include <wx/stattext.h>

#include <wx/statline.h>

#include <wx/button.h>

#include <wx/dialog.h>



///////////////////////////////////////////////////////////////////////////





///////////////////////////////////////////////////////////////////////////////

/// Class DIALOG_EXIT_BASE

///////////////////////////////////////////////////////////////////////////////

class DIALOG_EXIT_BASE : public wxDialog 

{

	private:

	

	protected:

		wxStaticBitmap* m_bitmap;

		wxStaticText* m_TextInfo;

		wxStaticText* m_staticText2;

		wxStaticLine* m_staticline;

		wxButton* m_buttonSaveAndExit;

		wxButton* m_buttonExitNoSave;

		wxButton* m_buttonCancel;

		

		// Virtual event handlers, overide them in your derived class

		virtual void OnSaveAndExit( wxCommandEvent& event ) { event.Skip(); }

		virtual void OnExitNoSave( wxCommandEvent& event ) { event.Skip(); }

		virtual void OnCancel( wxCommandEvent& event ) { event.Skip(); }

		

	

	public:

		

		DIALOG_EXIT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 345,155 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		~DIALOG_EXIT_BASE();

	

};



#endif //__DIALOG_EXIT_BASE_H__