From b338e29fd3eaf700f8c8360aa0310048ba941d54 Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:12:46 +0200 Subject: 3.19 --- ui/sync_cfg.cpp | 50 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 36 insertions(+), 14 deletions(-) (limited to 'ui/sync_cfg.cpp') diff --git a/ui/sync_cfg.cpp b/ui/sync_cfg.cpp index 0bbe8809..59d4d689 100644 --- a/ui/sync_cfg.cpp +++ b/ui/sync_cfg.cpp @@ -40,6 +40,11 @@ private: virtual void OnSyncUpdate( wxCommandEvent& event); virtual void OnSyncCustom( wxCommandEvent& event); + virtual void OnSyncAutomaticDouble( wxMouseEvent& event); + virtual void OnSyncMirrorDouble( wxMouseEvent& event); + virtual void OnSyncUpdateDouble( wxMouseEvent& event); + virtual void OnSyncCustomDouble( wxMouseEvent& event); + virtual void OnExLeftSideOnly( wxCommandEvent& event); virtual void OnExRightSideOnly( wxCommandEvent& event); virtual void OnLeftNewer( wxCommandEvent& event); @@ -47,8 +52,8 @@ private: virtual void OnDifferent( wxCommandEvent& event); virtual void OnConflict( wxCommandEvent& event); - virtual void OnClose( wxCloseEvent& event); - virtual void OnCancel( wxCommandEvent& event); + virtual void OnClose( wxCloseEvent& event) { EndModal(0); } + virtual void OnCancel( wxCommandEvent& event) { EndModal(0); } virtual void OnApply( wxCommandEvent& event); void updateGui(); @@ -332,18 +337,6 @@ void SyncCfgDialog::updateGui() } -void SyncCfgDialog::OnClose(wxCloseEvent& event) -{ - EndModal(0); -} - - -void SyncCfgDialog::OnCancel(wxCommandEvent& event) -{ - EndModal(0); -} - - void SyncCfgDialog::OnApply(wxCommandEvent& event) { //write configuration to main dialog @@ -399,6 +392,35 @@ void SyncCfgDialog::OnSyncCustom(wxCommandEvent& event) } +void SyncCfgDialog::OnSyncAutomaticDouble(wxMouseEvent& event) +{ + wxCommandEvent dummy; + OnSyncAutomatic(dummy); + OnApply(dummy); +} + +void SyncCfgDialog::OnSyncMirrorDouble(wxMouseEvent& event) +{ + wxCommandEvent dummy; + OnSyncMirror(dummy); + OnApply(dummy); +} + +void SyncCfgDialog::OnSyncUpdateDouble(wxMouseEvent& event) +{ + wxCommandEvent dummy; + OnSyncUpdate(dummy); + OnApply(dummy); +} + +void SyncCfgDialog::OnSyncCustomDouble(wxMouseEvent& event) +{ + wxCommandEvent dummy; + OnSyncCustom(dummy); + OnApply(dummy); +} + + void toggleSyncDirection(SyncDirection& current) { switch (current) -- cgit