From b11a786cf9f0066f6fd472645736e4fe742f7db3 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Mon, 26 Mar 2018 15:55:00 -0300 Subject: More GUI updates --- Project/base/MainFrameBase.cpp | 4 +++ Project/base/MainFrameBase.h | 58 ++++++++++++++++++++++-------------------- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/Project/base/MainFrameBase.cpp b/Project/base/MainFrameBase.cpp index bcac269..ac91ff5 100644 --- a/Project/base/MainFrameBase.cpp +++ b/Project/base/MainFrameBase.cpp @@ -83,6 +83,8 @@ MainFrameBase::MainFrameBase(wxWindow* parent, wxWindowID id, const wxString& ti m_ribbonButtonBarProjects->AddButton(ID_RIBBON_OPEN, _("Open"), wxXmlResource::Get()->LoadBitmap(wxT("open32")), _("Open saved project"), wxRIBBON_BUTTON_NORMAL); + m_ribbonButtonBarProjects->AddButton(ID_RIBBON_IMPORT, _("Import"), wxXmlResource::Get()->LoadBitmap(wxT("imp32")), _("Open saved project"), wxRIBBON_BUTTON_NORMAL); + m_ribbonButtonBarProjects->AddButton(ID_RIBBON_GENSETTINGS, _("General Settings"), wxXmlResource::Get()->LoadBitmap(wxT("settings32")), _("Opens a dialog to set the main settings of the program"), wxRIBBON_BUTTON_NORMAL); m_ribbonButtonBarProjects->AddButton(ID_RIBBON_EXIT, _("Exit"), wxXmlResource::Get()->LoadBitmap(wxT("exit32")), _("Closes the application"), wxRIBBON_BUTTON_NORMAL); @@ -238,6 +240,7 @@ MainFrameBase::MainFrameBase(wxWindow* parent, wxWindowID id, const wxString& ti // Connect events m_ribbonButtonBarProjects->Connect(ID_RIBBON_NEW, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnNewClick), NULL, this); m_ribbonButtonBarProjects->Connect(ID_RIBBON_OPEN, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnOpenClick), NULL, this); + m_ribbonButtonBarProjects->Connect(ID_RIBBON_IMPORT, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnImportClick), NULL, this); m_ribbonButtonBarProjects->Connect(ID_RIBBON_GENSETTINGS, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnGeneralSettingsClick), NULL, this); m_ribbonButtonBarProjects->Connect(ID_RIBBON_EXIT, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnExitClick), NULL, this); m_ribbonButtonBarCProject->Connect(ID_RIBBON_SAVE, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnSaveClick), NULL, this); @@ -276,6 +279,7 @@ MainFrameBase::~MainFrameBase() { m_ribbonButtonBarProjects->Disconnect(ID_RIBBON_NEW, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnNewClick), NULL, this); m_ribbonButtonBarProjects->Disconnect(ID_RIBBON_OPEN, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnOpenClick), NULL, this); + m_ribbonButtonBarProjects->Disconnect(ID_RIBBON_IMPORT, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnImportClick), NULL, this); m_ribbonButtonBarProjects->Disconnect(ID_RIBBON_GENSETTINGS, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnGeneralSettingsClick), NULL, this); m_ribbonButtonBarProjects->Disconnect(ID_RIBBON_EXIT, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnExitClick), NULL, this); m_ribbonButtonBarCProject->Disconnect(ID_RIBBON_SAVE, wxEVT_COMMAND_RIBBONBUTTON_CLICKED, wxRibbonButtonBarEventHandler(MainFrameBase::OnSaveClick), NULL, this); diff --git a/Project/base/MainFrameBase.h b/Project/base/MainFrameBase.h index 1886036..cdb9a7f 100644 --- a/Project/base/MainFrameBase.h +++ b/Project/base/MainFrameBase.h @@ -46,34 +46,35 @@ public: ID_RIBBON_FAULT = 10002, ID_RIBBON_RUNSTAB = 10003, ID_RIBBON_POWERFLOW = 10004, - ID_RIBBON_RESETVOLT = 10005, - ID_RIBBON_DISABLESOL = 10006, - ID_RIBBON_ENABLESOL = 10007, - ID_RIBBON_CHARTS = 10008, - ID_RIBBON_COPY = 10009, - ID_RIBBON_ABOUT = 10010, - ID_RIBBON_SNAPSHOT = 10011, - ID_RIBBON_PASTE = 10012, - ID_RIBBON_ADDELEMENT = 10013, - ID_RIBBON_GUIDE = 10014, - ID_RIBBON_CLOSE = 10015, - ID_RIBBON_SAVEAS = 10016, - ID_RIBBON_OPEN = 10017, - ID_RIBBON_GENSETTINGS = 10018, - ID_RIBBON_FIT = 10019, - ID_RIBBON_SIMULSETTINGS = 10020, - ID_RIBBON_UNDO = 10021, - ID_RIBBON_REDO = 10022, - ID_RIBBON_ROTATECC = 10023, - ID_RIBBON_EXIT = 10024, - ID_RIBBON_DRAG = 10025, - ID_RIBBON_SAVE = 10026, - ID_RIBBON_NEW = 10027, - ID_RIBBON_MOVE = 10028, - ID_RIBBON_PROJSETTINGS = 10029, - ID_RIBBON_DELETE = 10030, - ID_RIBBON_ROTATEC = 10031, - ID_RIBBON_DATAREPORT = 10032, + ID_RIBBON_DISABLESOL = 10005, + ID_RIBBON_ENABLESOL = 10006, + ID_RIBBON_SNAPSHOT = 10007, + ID_RIBBON_PROJSETTINGS = 10008, + ID_RIBBON_CHARTS = 10009, + ID_RIBBON_ROTATEC = 10010, + ID_RIBBON_SIMULSETTINGS = 10011, + ID_RIBBON_DATAREPORT = 10012, + ID_RIBBON_FIT = 10013, + ID_RIBBON_MOVE = 10014, + ID_RIBBON_DRAG = 10015, + ID_RIBBON_ADDELEMENT = 10016, + ID_RIBBON_DELETE = 10017, + ID_RIBBON_REDO = 10018, + ID_RIBBON_UNDO = 10019, + ID_RIBBON_PASTE = 10020, + ID_RIBBON_ABOUT = 10021, + ID_RIBBON_GUIDE = 10022, + ID_RIBBON_CLOSE = 10023, + ID_RIBBON_SAVEAS = 10024, + ID_RIBBON_SAVE = 10025, + ID_RIBBON_EXIT = 10026, + ID_RIBBON_GENSETTINGS = 10027, + ID_RIBBON_ROTATECC = 10028, + ID_RIBBON_COPY = 10029, + ID_RIBBON_IMPORT = 10030, + ID_RIBBON_OPEN = 10031, + ID_RIBBON_RESETVOLT = 10032, + ID_RIBBON_NEW = 10033, }; protected: wxRibbonBar* m_ribbonBar; @@ -102,6 +103,7 @@ protected: protected: virtual void OnNewClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnOpenClick(wxRibbonButtonBarEvent& event) { event.Skip(); } + virtual void OnImportClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnGeneralSettingsClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnExitClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnSaveClick(wxRibbonButtonBarEvent& event) { event.Skip(); } -- cgit