X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/daf3246330c8ae7b4536cd1f6deef733a405cecd..6ce8b8484654b5ab073951373c93d9bdd8221881:/samples/dialogs/dialogs.cpp?ds=sidebyside diff --git a/samples/dialogs/dialogs.cpp b/samples/dialogs/dialogs.cpp index 598fe7f515..4d5786113b 100644 --- a/samples/dialogs/dialogs.cpp +++ b/samples/dialogs/dialogs.cpp @@ -9,11 +9,6 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma implementation -#pragma interface -#endif - // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" @@ -25,8 +20,11 @@ #include "wx/wx.h" #endif +#include "../sample.xpm" + #include "wx/datetime.h" #include "wx/image.h" +#include "wx/bookctrl.h" #if wxUSE_COLOURDLG #include "wx/colordlg.h" @@ -41,6 +39,10 @@ #endif // wxUSE_STARTUP_TIPS #if wxUSE_PROGRESSDLG +#if wxUSE_STOPWATCH && wxUSE_LONGLONG + #include // wxDateTime +#endif + #include "wx/progdlg.h" #endif // wxUSE_PROGRESSDLG @@ -68,6 +70,12 @@ #include "wx/fdrepdlg.h" #endif // wxUSE_FINDREPLDLG +#if wxUSE_SPINCTRL +#include "wx/spinctrl.h" +#endif + +#include "wx/propdlg.h" + #include "dialogs.h" #if USE_COLOURDLG_GENERIC @@ -181,6 +189,12 @@ BEGIN_EVENT_TABLE(MyFrame, wxFrame) EVT_FIND_CLOSE(wxID_ANY, MyFrame::OnFindDialog) #endif // wxUSE_FINDREPLDLG +#if USE_SETTINGS_DIALOG + EVT_MENU(DIALOGS_PROPERTY_SHEET, MyFrame::OnPropertySheet) +#endif + + EVT_MENU(DIALOGS_REQUEST, MyFrame::OnRequestUserAttention) + EVT_MENU(wxID_EXIT, MyFrame::OnExit) END_EVENT_TABLE() @@ -206,10 +220,6 @@ bool MyApp::OnInit() wxInitAllImageHandlers(); #endif -#if defined(__WXGTK__) && defined(wxUSE_UNICODE) - wxConvCurrent = &wxConvLibc; -#endif - m_canvasTextColour = wxColour(_T("BLACK")); m_canvasFont = *wxNORMAL_FONT; @@ -222,130 +232,135 @@ bool MyApp::OnInit() file_menu->Append(DIALOGS_MESSAGE_BOX, _T("&Message box\tCtrl-M")); - #if wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG +#if wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG - wxMenu *choices_menu = new wxMenu; + wxMenu *choices_menu = new wxMenu; - #if wxUSE_COLOURDLG - choices_menu->Append(DIALOGS_CHOOSE_COLOUR, _T("&Choose colour")); - #endif // wxUSE_COLOURDLG + #if wxUSE_COLOURDLG + choices_menu->Append(DIALOGS_CHOOSE_COLOUR, _T("&Choose colour")); + #endif // wxUSE_COLOURDLG - #if wxUSE_FONTDLG - choices_menu->Append(DIALOGS_CHOOSE_FONT, _T("Choose &font")); - #endif // wxUSE_FONTDLG + #if wxUSE_FONTDLG + choices_menu->Append(DIALOGS_CHOOSE_FONT, _T("Choose &font")); + #endif // wxUSE_FONTDLG - #if wxUSE_CHOICEDLG - choices_menu->Append(DIALOGS_SINGLE_CHOICE, _T("&Single choice\tCtrl-C")); - choices_menu->Append(DIALOGS_MULTI_CHOICE, _T("M&ultiple choice\tCtrl-U")); - #endif // wxUSE_CHOICEDLG + #if wxUSE_CHOICEDLG + choices_menu->Append(DIALOGS_SINGLE_CHOICE, _T("&Single choice\tCtrl-C")); + choices_menu->Append(DIALOGS_MULTI_CHOICE, _T("M&ultiple choice\tCtrl-U")); + #endif // wxUSE_CHOICEDLG - #if USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC - choices_menu->AppendSeparator(); - #endif // USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC + #if USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC + choices_menu->AppendSeparator(); + #endif // USE_COLOURDLG_GENERIC || USE_FONTDLG_GENERIC - #if USE_COLOURDLG_GENERIC - choices_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, _T("&Choose colour (generic)")); - #endif // USE_COLOURDLG_GENERIC + #if USE_COLOURDLG_GENERIC + choices_menu->Append(DIALOGS_CHOOSE_COLOUR_GENERIC, _T("&Choose colour (generic)")); + #endif // USE_COLOURDLG_GENERIC - #if USE_FONTDLG_GENERIC - choices_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, _T("Choose &font (generic)")); - #endif // USE_FONTDLG_GENERIC + #if USE_FONTDLG_GENERIC + choices_menu->Append(DIALOGS_CHOOSE_FONT_GENERIC, _T("Choose &font (generic)")); + #endif // USE_FONTDLG_GENERIC - file_menu->Append(wxID_ANY,_T("Choices and selectors"),choices_menu); + file_menu->Append(wxID_ANY,_T("&Choices and selectors"),choices_menu); +#endif // wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG - #endif // wxUSE_COLOURDLG || wxUSE_FONTDLG || wxUSE_CHOICEDLG +#if wxUSE_TEXTDLG || wxUSE_NUMBERDLG - #if wxUSE_TEXTDLG || wxUSE_NUMBERDLG + wxMenu *entry_menu = new wxMenu; - wxMenu *entry_menu = new wxMenu; + #if wxUSE_TEXTDLG + entry_menu->Append(DIALOGS_TEXT_ENTRY, _T("Text &entry\tCtrl-E")); + entry_menu->Append(DIALOGS_PASSWORD_ENTRY, _T("&Password entry\tCtrl-P")); + #endif // wxUSE_TEXTDLG - #if wxUSE_TEXTDLG - entry_menu->Append(DIALOGS_TEXT_ENTRY, _T("Text &entry\tCtrl-E")); - entry_menu->Append(DIALOGS_PASSWORD_ENTRY, _T("&Password entry\tCtrl-P")); - #endif // wxUSE_TEXTDLG + #if wxUSE_NUMBERDLG + entry_menu->Append(DIALOGS_NUM_ENTRY, _T("&Numeric entry\tCtrl-N")); + #endif // wxUSE_NUMBERDLG - #if wxUSE_NUMBERDLG - entry_menu->Append(DIALOGS_NUM_ENTRY, _T("&Numeric entry\tCtrl-N")); - #endif // wxUSE_NUMBERDLG + file_menu->Append(wxID_ANY,_T("&Entry dialogs"),entry_menu); - file_menu->Append(wxID_ANY,_T("Entry dialogs"),entry_menu); +#endif // wxUSE_TEXTDLG || wxUSE_NUMBERDLG - #endif // wxUSE_TEXTDLG || wxUSE_NUMBERDLG +#if wxUSE_FILEDLG - #if wxUSE_FILEDLG + wxMenu *filedlg_menu = new wxMenu; + filedlg_menu->Append(DIALOGS_FILE_OPEN, _T("&Open file\tCtrl-O")); + filedlg_menu->Append(DIALOGS_FILE_OPEN2, _T("&Second open file\tCtrl-2")); + filedlg_menu->Append(DIALOGS_FILES_OPEN, _T("Open &files\tCtrl-Q")); + filedlg_menu->Append(DIALOGS_FILE_SAVE, _T("Sa&ve file\tCtrl-S")); - wxMenu *filedlg_menu = new wxMenu; - filedlg_menu->Append(DIALOGS_FILE_OPEN, _T("&Open file\tCtrl-O")); - filedlg_menu->Append(DIALOGS_FILE_OPEN2, _T("&Second open file\tCtrl-2")); - filedlg_menu->Append(DIALOGS_FILES_OPEN, _T("Open &files\tCtrl-Q")); - filedlg_menu->Append(DIALOGS_FILE_SAVE, _T("Sa&ve file\tCtrl-S")); + #if USE_FILEDLG_GENERIC + filedlg_menu->AppendSeparator(); + filedlg_menu->Append(DIALOGS_FILE_OPEN_GENERIC, _T("&Open file (generic)")); + filedlg_menu->Append(DIALOGS_FILES_OPEN_GENERIC, _T("Open &files (generic)")); + filedlg_menu->Append(DIALOGS_FILE_SAVE_GENERIC, _T("Sa&ve file (generic)")); + #endif // USE_FILEDLG_GENERIC - #if USE_FILEDLG_GENERIC - filedlg_menu->AppendSeparator(); - filedlg_menu->Append(DIALOGS_FILE_OPEN_GENERIC, _T("&Open file (generic)")); - filedlg_menu->Append(DIALOGS_FILES_OPEN_GENERIC, _T("Open &files (generic)")); - filedlg_menu->Append(DIALOGS_FILE_SAVE_GENERIC, _T("Sa&ve file (generic)")); - #endif // USE_FILEDLG_GENERIC + file_menu->Append(wxID_ANY,_T("&File operations"),filedlg_menu); - file_menu->Append(wxID_ANY,_T("File operations"),filedlg_menu); +#endif // wxUSE_FILEDLG - #endif // wxUSE_FILEDLG +#if wxUSE_DIRDLG + wxMenu *dir_menu = new wxMenu; - #if wxUSE_DIRDLG - wxMenu *dir_menu = new wxMenu; + dir_menu->Append(DIALOGS_DIR_CHOOSE, _T("&Choose a directory\tCtrl-D")); + dir_menu->Append(DIALOGS_DIRNEW_CHOOSE, _T("Choose a directory (with \"Ne&w\" button)\tShift-Ctrl-D")); + file_menu->Append(wxID_ANY,_T("&Directory operations"),dir_menu); - dir_menu->Append(DIALOGS_DIR_CHOOSE, _T("&Choose a directory\tCtrl-D")); - dir_menu->Append(DIALOGS_DIRNEW_CHOOSE, _T("Choose a directory (with \"Ne&w\" button)\tShift-Ctrl-D")); - file_menu->Append(wxID_ANY,_T("Directory operations"),dir_menu); + #if USE_DIRDLG_GENERIC + dir_menu->AppendSeparator(); + dir_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE, _T("&Choose a directory (generic)")); + #endif // USE_DIRDLG_GENERIC - #if USE_DIRDLG_GENERIC - dir_menu->AppendSeparator(); - dir_menu->Append(DIALOGS_GENERIC_DIR_CHOOSE, _T("&Choose a directory (generic)")); - #endif // USE_DIRDLG_GENERIC +#endif // wxUSE_DIRDLG - #endif // wxUSE_DIRDLG +#if wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG - #if wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG + wxMenu *info_menu = new wxMenu; - wxMenu *info_menu = new wxMenu; + #if wxUSE_STARTUP_TIPS + info_menu->Append(DIALOGS_TIP, _T("&Tip of the day\tCtrl-T")); + #endif // wxUSE_STARTUP_TIPS - #if wxUSE_STARTUP_TIPS - info_menu->Append(DIALOGS_TIP, _T("&Tip of the day\tCtrl-T")); - #endif // wxUSE_STARTUP_TIPS + #if wxUSE_PROGRESSDLG + info_menu->Append(DIALOGS_PROGRESS, _T("Pro&gress dialog\tCtrl-G")); + #endif // wxUSE_PROGRESSDLG - #if wxUSE_PROGRESSDLG - info_menu->Append(DIALOGS_PROGRESS, _T("Pro&gress dialog\tCtrl-G")); - #endif // wxUSE_PROGRESSDLG + #if wxUSE_BUSYINFO + info_menu->Append(DIALOGS_BUSYINFO, _T("&Busy info dialog\tCtrl-B")); + #endif // wxUSE_BUSYINFO - #if wxUSE_BUSYINFO - info_menu->Append(DIALOGS_BUSYINFO, _T("&Busy info dialog\tCtrl-B")); - #endif // wxUSE_BUSYINFO + #if wxUSE_LOG_DIALOG + info_menu->Append(DIALOGS_LOG_DIALOG, _T("&Log dialog\tCtrl-L")); + #endif // wxUSE_LOG_DIALOG - #if wxUSE_LOG_DIALOG - info_menu->Append(DIALOGS_LOG_DIALOG, _T("&Log dialog\tCtrl-L")); - #endif // wxUSE_LOG_DIALOG + file_menu->Append(wxID_ANY,_T("&Informative dialogs"),info_menu); - file_menu->Append(wxID_ANY,_T("Informative dialogs"),info_menu); +#endif // wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG - #endif // wxUSE_STARTUP_TIPS || wxUSE_PROGRESSDLG || wxUSE_BUSYINFO || wxUSE_LOG_DIALOG +#if wxUSE_FINDREPLDLG + wxMenu *find_menu = new wxMenu; + find_menu->AppendCheckItem(DIALOGS_FIND, _T("&Find dialog\tCtrl-F")); + find_menu->AppendCheckItem(DIALOGS_REPLACE, _T("Find and &replace dialog\tShift-Ctrl-F")); + file_menu->Append(wxID_ANY,_T("&Searching"),find_menu); +#endif // wxUSE_FINDREPLDLG - #if wxUSE_FINDREPLDLG - wxMenu *find_menu = new wxMenu; - find_menu->AppendCheckItem(DIALOGS_FIND, _T("&Find dialog\tCtrl-F")); - find_menu->AppendCheckItem(DIALOGS_REPLACE, _T("Find and &replace dialog\tShift-Ctrl-F")); - file_menu->Append(wxID_ANY,_T("Searching"),find_menu); - #endif // wxUSE_FINDREPLDLG +#if USE_MODAL_PRESENTATION + wxMenu *modal_menu = new wxMenu; + modal_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W")); + modal_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z")); + file_menu->Append(wxID_ANY,_T("&Modal/Modeless"),modal_menu); +#endif // USE_MODAL_PRESENTATION + +#if USE_SETTINGS_DIALOG + file_menu->Append(DIALOGS_PROPERTY_SHEET, _T("&Property Sheet Dialog\tCtrl-P")); +#endif - #if USE_MODAL_PRESENTATION - wxMenu *modal_menu = new wxMenu; - modal_menu->Append(DIALOGS_MODAL, _T("Mo&dal dialog\tCtrl-W")); - modal_menu->AppendCheckItem(DIALOGS_MODELESS, _T("Modeless &dialog\tCtrl-Z")); - file_menu->Append(wxID_ANY,_T("Modal/Modeless"),modal_menu); - #endif // USE_MODAL_PRESENTATION + file_menu->Append(DIALOGS_REQUEST, _T("&Request user attention\tCtrl-R")); file_menu->AppendSeparator(); file_menu->Append(wxID_EXIT, _T("E&xit\tAlt-X")); @@ -372,6 +387,8 @@ MyFrame::MyFrame(wxWindow *parent, const wxString& title) : wxFrame(parent, wxID_ANY, title) { + SetIcon(sample_xpm); + #if USE_MODAL_PRESENTATION m_dialog = (MyModelessDialog *)NULL; #endif // USE_MODAL_PRESENTATION @@ -385,13 +402,16 @@ MyFrame::MyFrame(wxWindow *parent, m_clrData.SetChooseFull(true); for (int i = 0; i < 16; i++) { - m_clrData.SetCustomColour(i, wxColour(i*16, i*16, i*16)); + m_clrData.SetCustomColour( + i, + wxColour( + (unsigned char)(i*16), + (unsigned char)(i*16), + (unsigned char)(i*16) + ) + ); } #endif // wxUSE_COLOURDLG - -#if wxUSE_STATUSBAR - CreateStatusBar(); -#endif // wxUSE_STATUSBAR } #if wxUSE_COLOURDLG @@ -411,6 +431,36 @@ void MyFrame::ChooseColour(wxCommandEvent& WXUNUSED(event) ) } #endif // wxUSE_COLOURDLG +#if USE_COLOURDLG_GENERIC +void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event)) +{ + m_clrData.SetColour(myCanvas->GetBackgroundColour()); + + //FIXME:TODO:This has no effect... + m_clrData.SetChooseFull(true); + + for (int i = 0; i < 16; i++) + { + wxColour colour( + (unsigned char)(i*16), + (unsigned char)(i*16), + (unsigned char)(i*16) + ); + m_clrData.SetCustomColour(i, colour); + } + + wxGenericColourDialog *dialog = new wxGenericColourDialog(this, &m_clrData); + if (dialog->ShowModal() == wxID_OK) + { + m_clrData = dialog->GetColourData(); + myCanvas->SetBackgroundColour(m_clrData.GetColour()); + myCanvas->ClearBackground(); + myCanvas->Refresh(); + } + dialog->Destroy(); +} +#endif // USE_COLOURDLG_GENERIC + #if wxUSE_FONTDLG void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) ) { @@ -436,31 +486,6 @@ void MyFrame::ChooseFont(wxCommandEvent& WXUNUSED(event) ) } #endif // wxUSE_FONTDLG -#if USE_COLOURDLG_GENERIC -void MyFrame::ChooseColourGeneric(wxCommandEvent& WXUNUSED(event)) -{ - wxColourData data; - data.SetChooseFull(true); - for (int i = 0; i < 16; i++) - { - wxColour colour(i*16, i*16, i*16); - data.SetCustomColour(i, colour); - } - - wxGenericColourDialog *dialog = new wxGenericColourDialog(this, &data); - if (dialog->ShowModal() == wxID_OK) - { - wxColourData retData = dialog->GetColourData(); - wxColour col = retData.GetColour(); -// wxBrush *brush = wxTheBrushList->FindOrCreateBrush(&col, wxSOLID); - myCanvas->SetBackgroundColour(col); - myCanvas->ClearBackground(); - myCanvas->Refresh(); - } - dialog->Destroy(); -} -#endif // USE_COLOURDLG_GENERIC - #if USE_FONTDLG_GENERIC void MyFrame::ChooseFontGeneric(wxCommandEvent& WXUNUSED(event) ) { @@ -560,7 +585,7 @@ void MyFrame::PasswordEntry(wxCommandEvent& WXUNUSED(event)) _T("Password entry dialog"), wxEmptyString, this); - if ( !!pwd ) + if ( !pwd.empty() ) { wxMessageBox(wxString::Format(wxT("Your password is '%s'"), pwd.c_str()), _T("Got password"), wxOK | wxICON_INFORMATION, this); @@ -652,6 +677,7 @@ void MyFrame::FileOpen(wxCommandEvent& WXUNUSED(event) ) ); dialog.SetDirectory(wxGetHomeDir()); + dialog.CentreOnParent(); if (dialog.ShowModal() == wxID_OK) { @@ -677,7 +703,12 @@ void MyFrame::FileOpen2(wxCommandEvent& WXUNUSED(event) ) _T("Select the file to load"), wxEmptyString, wxEmptyString, s_extDef, - _T("Waveform (*.wav)|*.wav|Plain text (*.txt)|*.txt|All files (*.*)|*.*"), + wxString::Format + ( + _T("Waveform (*.wav)|*.wav|Plain text (*.txt)|*.txt|All files (%s)|%s"), + wxFileSelectorDefaultWildcardStr, + wxFileSelectorDefaultWildcardStr + ), wxCHANGE_DIR, this ); @@ -698,7 +729,12 @@ void MyFrame::FilesOpen(wxCommandEvent& WXUNUSED(event) ) #ifdef __WXMOTIF__ _T("C++ files (*.cpp)|*.cpp"); #else - _T("All files (*.*)|*.*|C++ files (*.cpp;*.h)|*.cpp;*.h"); + wxString::Format + ( + _T("All files (%s)|%s|C++ files (*.cpp;*.h)|*.cpp;*.h"), + wxFileSelectorDefaultWildcardStr, + wxFileSelectorDefaultWildcardStr + ); #endif wxFileDialog dialog(this, _T("Testing open multiple file dialog"), wxEmptyString, wxEmptyString, wildcards, @@ -890,7 +926,14 @@ void MyFrame::ModelessDlg(wxCommandEvent& event) } else // hide { - m_dialog->Hide(); + // If m_dialog is NULL, then possibly the system + // didn't report the checked menu item status correctly. + // It should be true just after the menu item was selected, + // if there was no modeless dialog yet. + + wxASSERT( m_dialog != NULL ); + if (m_dialog) + m_dialog->Hide(); } } #endif // USE_MODAL_PRESENTATION @@ -924,6 +967,23 @@ void MyFrame::ShowTip(wxCommandEvent& WXUNUSED(event)) } #endif // wxUSE_STARTUP_TIPS +#if USE_SETTINGS_DIALOG +void MyFrame::OnPropertySheet(wxCommandEvent& WXUNUSED(event)) +{ + SettingsDialog dialog(this); + dialog.ShowModal(); +} +#endif // USE_SETTINGS_DIALOG + +void MyFrame::OnRequestUserAttention(wxCommandEvent& WXUNUSED(event)) +{ + wxLogStatus(_T("Sleeping for 3 seconds to allow you to switch to another window")); + + wxSleep(3); + + RequestUserAttention(wxUSER_ATTENTION_ERROR); +} + void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event) ) { Close(true); @@ -933,35 +993,91 @@ void MyFrame::OnExit(wxCommandEvent& WXUNUSED(event) ) void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) ) { + #if wxUSE_STOPWATCH && wxUSE_LONGLONG + // check the performance + int countrandomnumbers = 0, count = 0; + wxTimeSpan tsTest(0,0,0,250); + wxDateTime DT2, DT1 = wxDateTime::UNow(); + srand(0); + while(1) + { + rand(); + ++countrandomnumbers; + if ( countrandomnumbers == 1000 ) + { + srand(0); + countrandomnumbers = 0; + ++count; + DT2 = wxDateTime::UNow(); + wxTimeSpan ts = DT2.Subtract( DT1 ); + if ( ts.IsLongerThan( tsTest ) ) + { + break; + } + } + } + const int max = 40 * count; + #else static const int max = 10; + #endif // wxUSE_STOPWATCH && wxUSE_LONGLONG wxProgressDialog dialog(_T("Progress dialog example"), _T("An informative message"), max, // range this, // parent wxPD_CAN_ABORT | + wxPD_CAN_SKIP | wxPD_APP_MODAL | // wxPD_AUTO_HIDE | -- try this as well wxPD_ELAPSED_TIME | wxPD_ESTIMATED_TIME | - wxPD_REMAINING_TIME); + wxPD_REMAINING_TIME | + wxPD_SMOOTH); bool cont = true; - for ( int i = 0; i <= max; i++ ) + bool skip = false; + // each skip will move progress about quarter forward + for ( int i = 0; i <= max; i = wxMin(i+(skip?int(max/4):1), max+1), skip = false ) { + #if wxUSE_STOPWATCH && wxUSE_LONGLONG + // do (almost) the same operations as we did for the performance test + srand(0); + for ( int j = 0; j < 1000; j++ ) + { + rand(); + if ( j == 999 ) + { + DT2 = wxDateTime::UNow(); + wxTimeSpan ts = DT2.Subtract( DT1 ); + if ( ts.IsLongerThan( tsTest ) ) + { + // nothing to do + } + } + } + #else wxSleep(1); + #endif + + wxString msg; + if ( i == max ) { - cont = dialog.Update(i, _T("That's all, folks!")); + msg = _T("That's all, folks!"); } - else if ( i == max / 2 ) + else if ( i > max / 2 ) { - cont = dialog.Update(i, _T("Only a half left (very long message)!")); + msg = _T("Only a half left (very long message)!"); } - else + +#if wxUSE_STOPWATCH && wxUSE_LONGLONG + if ( (i % (max/100)) == 0 ) // // only 100 updates, this makes it much faster { - cont = dialog.Update(i); + cont = dialog.Update(i, msg, &skip); } +#else + cont = dialog.Update(i, msg, &skip); +#endif if ( !cont ) { @@ -970,6 +1086,7 @@ void MyFrame::ShowProgress( wxCommandEvent& WXUNUSED(event) ) wxYES_NO | wxICON_QUESTION) == wxYES ) break; + cont = true; dialog.Resume(); } } @@ -1244,3 +1361,145 @@ void MyModalDialog::OnButton(wxCommandEvent& event) #endif // USE_MODAL_PRESENTATION +#if USE_SETTINGS_DIALOG +// ---------------------------------------------------------------------------- +// SettingsDialog +// ---------------------------------------------------------------------------- + +IMPLEMENT_CLASS(SettingsDialog, wxPropertySheetDialog) + +BEGIN_EVENT_TABLE(SettingsDialog, wxPropertySheetDialog) +END_EVENT_TABLE() + +SettingsDialog::SettingsDialog(wxWindow* win) +{ + SetExtraStyle(wxDIALOG_EX_CONTEXTHELP|wxWS_EX_VALIDATE_RECURSIVELY); + + Create(win, wxID_ANY, _("Preferences"), wxDefaultPosition, wxDefaultSize, + wxDEFAULT_DIALOG_STYLE +#ifndef __WXWINCE__ + |wxRESIZE_BORDER +#endif + ); + CreateButtons(wxOK|wxCANCEL|wxHELP); + + wxBookCtrlBase* notebook = GetBookCtrl(); + + wxPanel* generalSettings = CreateGeneralSettingsPage(notebook); + wxPanel* aestheticSettings = CreateAestheticSettingsPage(notebook); + + notebook->AddPage(generalSettings, _("General")); + notebook->AddPage(aestheticSettings, _("Aesthetics")); + + LayoutDialog(); +} + +wxPanel* SettingsDialog::CreateGeneralSettingsPage(wxWindow* parent) +{ + wxPanel* panel = new wxPanel(parent, wxID_ANY); + + wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL ); + + //// LOAD LAST FILE + + wxBoxSizer* itemSizer3 = new wxBoxSizer( wxHORIZONTAL ); + wxCheckBox* checkBox3 = new wxCheckBox(panel, ID_LOAD_LAST_PROJECT, _("&Load last project on startup"), wxDefaultPosition, wxDefaultSize); + itemSizer3->Add(checkBox3, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); + item0->Add(itemSizer3, 0, wxGROW|wxALL, 0); + + //// AUTOSAVE + + wxString autoSaveLabel = _("&Auto-save every"); + wxString minsLabel = _("mins"); + + wxBoxSizer* itemSizer12 = new wxBoxSizer( wxHORIZONTAL ); + wxCheckBox* checkBox12 = new wxCheckBox(panel, ID_AUTO_SAVE, autoSaveLabel, wxDefaultPosition, wxDefaultSize); + +#if wxUSE_SPINCTRL + wxSpinCtrl* spinCtrl12 = new wxSpinCtrl(panel, ID_AUTO_SAVE_MINS, wxEmptyString, + wxDefaultPosition, wxSize(40, wxDefaultCoord), wxSP_ARROW_KEYS, 1, 60, 1); +#endif + + itemSizer12->Add(checkBox12, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); +#if wxUSE_SPINCTRL + itemSizer12->Add(spinCtrl12, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); +#endif + itemSizer12->Add(new wxStaticText(panel, wxID_STATIC, minsLabel), 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); + item0->Add(itemSizer12, 0, wxGROW|wxALL, 0); + + //// TOOLTIPS + + wxBoxSizer* itemSizer8 = new wxBoxSizer( wxHORIZONTAL ); + wxCheckBox* checkBox6 = new wxCheckBox(panel, ID_SHOW_TOOLTIPS, _("Show &tooltips"), wxDefaultPosition, wxDefaultSize); + itemSizer8->Add(checkBox6, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); + item0->Add(itemSizer8, 0, wxGROW|wxALL, 0); + + topSizer->Add( item0, 1, wxGROW|wxALIGN_CENTRE|wxALL, 5 ); + + panel->SetSizer(topSizer); + topSizer->Fit(panel); + + return panel; +} + +wxPanel* SettingsDialog::CreateAestheticSettingsPage(wxWindow* parent) +{ + wxPanel* panel = new wxPanel(parent, wxID_ANY); + + wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer *item0 = new wxBoxSizer( wxVERTICAL ); + + //// PROJECT OR GLOBAL + wxString globalOrProjectChoices[2]; + globalOrProjectChoices[0] = _("&New projects"); + globalOrProjectChoices[1] = _("&This project"); + + wxRadioBox* projectOrGlobal = new wxRadioBox(panel, ID_APPLY_SETTINGS_TO, _("&Apply settings to:"), + wxDefaultPosition, wxDefaultSize, 2, globalOrProjectChoices); + item0->Add(projectOrGlobal, 0, wxGROW|wxALL, 5); + + projectOrGlobal->SetSelection(0); + + //// BACKGROUND STYLE + wxArrayString backgroundStyleChoices; + backgroundStyleChoices.Add(wxT("Colour")); + backgroundStyleChoices.Add(wxT("Image")); + wxStaticBox* staticBox3 = new wxStaticBox(panel, wxID_ANY, _("Background style:")); + + wxBoxSizer* styleSizer = new wxStaticBoxSizer( staticBox3, wxVERTICAL ); + item0->Add(styleSizer, 0, wxGROW|wxALL, 5); + + wxBoxSizer* itemSizer2 = new wxBoxSizer( wxHORIZONTAL ); + + wxChoice* choice2 = new wxChoice(panel, ID_BACKGROUND_STYLE, wxDefaultPosition, wxDefaultSize, backgroundStyleChoices); + + itemSizer2->Add(new wxStaticText(panel, wxID_ANY, _("&Window:")), 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); + itemSizer2->Add(5, 5, 1, wxALL, 0); + itemSizer2->Add(choice2, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5); + + styleSizer->Add(itemSizer2, 0, wxGROW|wxALL, 5); + +#if wxUSE_SPINCTRL + //// FONT SIZE SELECTION + + wxStaticBox* staticBox1 = new wxStaticBox(panel, wxID_ANY, _("Tile font size:")); + wxBoxSizer* itemSizer5 = new wxStaticBoxSizer( staticBox1, wxHORIZONTAL ); + + wxSpinCtrl* spinCtrl = new wxSpinCtrl(panel, ID_FONT_SIZE, wxEmptyString, wxDefaultPosition, + wxSize(80, wxDefaultCoord)); + itemSizer5->Add(spinCtrl, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL, 5); + + item0->Add(itemSizer5, 0, wxGROW|wxLEFT|wxRIGHT, 5); +#endif + + topSizer->Add( item0, 1, wxGROW|wxALIGN_CENTRE|wxALL, 5 ); + topSizer->AddSpacer(5); + + panel->SetSizer(topSizer); + topSizer->Fit(panel); + + return panel; +} + +#endif // USE_SETTINGS_DIALOG