From f0ae67919454f572f39541b11ddd74b4fda0d12e Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 16:46:15 +0200 Subject: 1.3 --- ui/SmallDialogs.h | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'ui/SmallDialogs.h') diff --git a/ui/SmallDialogs.h b/ui/SmallDialogs.h index 77da9eac..c41ca2b8 100644 --- a/ui/SmallDialogs.h +++ b/ui/SmallDialogs.h @@ -1,7 +1,7 @@ #ifndef SMALLDIALOGS_H_INCLUDED #define SMALLDIALOGS_H_INCLUDED -#include "MainDialog.h" +#include "mainDialog.h" class MainDialog; @@ -13,7 +13,7 @@ public: private: void OnClose(wxCloseEvent& event); - void AboutDlg::OnOK(wxCommandEvent& event); + void OnOK(wxCommandEvent& event); }; @@ -35,24 +35,43 @@ public: FilterDlg(MainDialog* window); ~FilterDlg(); + static const int OkayButtonPressed = 25; + private: void OnDefault(wxCommandEvent& event); void OnOK(wxCommandEvent& event); + void OnCancel(wxCommandEvent& event); void OnClose(wxCloseEvent& event); MainDialog* mainDialog; }; +class DeleteDialog : public DeleteDialogGenerated +{ +public: + DeleteDialog(const wxString& headerText, const wxString& messageText, wxWindow* main); + ~DeleteDialog(); + + static const int OkayButtonPressed = 35; + static const int CancelButtonPressed = 45; + +private: + void OnOK(wxCommandEvent& event); + void OnCancel(wxCommandEvent& event); + void OnClose(wxCloseEvent& event); +}; + + class ErrorDlg : public ErrorDlgGenerated { public: ErrorDlg(const wxString messageText, bool& suppressErrormessages); ~ErrorDlg(); - static const int ContinueButtonPressed = 35; - static const int RetryButtonPressed = 45; - static const int AbortButtonPressed = 55; + static const int ContinueButtonPressed = 35; + static const int RetryButtonPressed = 45; + static const int AbortButtonPressed = 55; private: void OnClose(wxCloseEvent& event); @@ -87,7 +106,7 @@ private: bool currentProcessIsRunning; //gauge variables - double totalElements; //each element represents one byte for proper progress indicator scaling + double totalElements; //each element represents one byte for proper progress indicator scaling double currentElements; double scalingFactor; //nr of elements has to be normalized to smaller nr. because of range of int limitation -- cgit