From 743748e3771e0ab5c201a37582d7848a84ae205f Mon Sep 17 00:00:00 2001 From: Nick Gammon Date: Sat, 17 Jul 2010 13:20:16 +1000 Subject: [PATCH] Added extra options for defaults in adding triggers etc. --- dialogs/world_prefs/prefspropertypages.cpp | 26 +++++++++++----------- doc.h | 9 ++++++++ scriptingoptions.cpp | 10 ++++++++- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/dialogs/world_prefs/prefspropertypages.cpp b/dialogs/world_prefs/prefspropertypages.cpp index dbe8e4c2..2caf7cdd 100644 --- a/dialogs/world_prefs/prefspropertypages.cpp +++ b/dialogs/world_prefs/prefspropertypages.cpp @@ -2593,19 +2593,19 @@ void CPrefsP7::InitDialog (CDialog * pDlg) dlg->m_pDoc = m_doc; - dlg->m_bIgnoreCase = FALSE; + dlg->m_bIgnoreCase = m_doc->m_bDefaultIgnoreCase; dlg->m_bEnabled = TRUE; - dlg->m_bExpandVariables = FALSE; + dlg->m_bExpandVariables = m_doc->m_bDefaultExpandVariables; dlg->m_bOmitFromLogFile = FALSE; - dlg->m_bRegexp = FALSE; - dlg->m_iSequence = DEFAULT_ALIAS_SEQUENCE; - dlg->m_bKeepEvaluating = FALSE; + dlg->m_bRegexp = m_doc->m_bDefaultRegexp; + dlg->m_iSequence = m_doc->m_iDefaultSequence; + dlg->m_bKeepEvaluating = m_doc->m_bDefaultKeepEvaluating; dlg->m_bOneShot = FALSE; dlg->m_bEchoAlias = FALSE; dlg->m_bOmitFromCommandHistory = FALSE; dlg->m_bTemporary = FALSE; // dlg->m_bDelayed = FALSE; - dlg->m_iSendTo = eSendToWorld; + dlg->m_iSendTo = m_doc->m_iDefaultSendTo; dlg->m_pAliasMap = &m_doc->m_AliasMap; dlg->m_current_alias = NULL; @@ -3367,22 +3367,22 @@ void CPrefsP8::InitDialog (CDialog * pDlg) dlg->m_pDoc = m_doc; dlg->m_bUTF_8 = m_doc->m_bUTF_8; - dlg->m_ignore_case = FALSE; + dlg->m_ignore_case = m_doc->m_bDefaultIgnoreCase; dlg->m_colour = 0; // no change dlg->m_sound_pathname = NOSOUNDLIT; dlg->m_omit_from_log = FALSE; dlg->m_pTriggerMap = &m_doc->m_TriggerMap; dlg->m_current_trigger = NULL; dlg->m_bOmitFromOutput = FALSE; - dlg->m_bKeepEvaluating = FALSE; + dlg->m_bKeepEvaluating = m_doc->m_bDefaultKeepEvaluating; dlg->m_bOneShot = FALSE; dlg->m_bEnabled = TRUE; dlg->m_iClipboardArg = 0; - dlg->m_iSendTo = eSendToWorld; - dlg->m_bRegexp = FALSE; + dlg->m_iSendTo = m_doc->m_iDefaultSendTo; + dlg->m_bRegexp = m_doc->m_bDefaultRegexp; dlg->m_bRepeat = FALSE; - dlg->m_bExpandVariables = FALSE; - dlg->m_iSequence = DEFAULT_TRIGGER_SEQUENCE; + dlg->m_bExpandVariables = m_doc->m_bDefaultExpandVariables; + dlg->m_iSequence = m_doc->m_iDefaultSequence; dlg->m_iMatchTextColour = 0; // any dlg->m_iMatchBackColour = 0; // any dlg->m_iMatchBold = 2; // any @@ -5828,7 +5828,7 @@ void CPrefsP16::InitDialog (CDialog * pDlg) dlg->m_pTimerMap = &m_doc->m_TimerMap; dlg->m_current_timer = NULL; - dlg->m_iSendTo = eSendToWorld; + dlg->m_iSendTo = m_doc->m_iDefaultSendTo; } // end of CPrefsP16::InitDialog diff --git a/doc.h b/doc.h index d84355a2..b356d5d4 100644 --- a/doc.h +++ b/doc.h @@ -843,6 +843,15 @@ class CMUSHclientDoc : public CDocument unsigned short m_bDoNotAddMacrosToCommandHistory; // macros not into command history unsigned short m_bSendKeepAlives; // set the socket option SO_KEEPALIVE on the TCP/IP connections + // version 4.54 + + unsigned short m_iDefaultSendTo; // default send-to location for triggers/aliases/timers + unsigned short m_iDefaultSequence; // default sequence for triggers/aliases + unsigned short m_bDefaultRegexp; // default regular expression flag for triggers/aliases + unsigned short m_bDefaultExpandVariables; // default expand-variables flag for triggers/aliases + unsigned short m_bDefaultKeepEvaluating; // default keep-evaluating flag for triggers/aliases + unsigned short m_bDefaultIgnoreCase; // default ignore-case flag for triggers/aliases + // end of stuff saved to disk ************************************************************** // stuff from pre version 11, read from disk but not saved diff --git a/scriptingoptions.cpp b/scriptingoptions.cpp index 54363dfe..be62d66d 100644 --- a/scriptingoptions.cpp +++ b/scriptingoptions.cpp @@ -71,7 +71,15 @@ tConfigurationNumericOption OptionsTable [] = { {"ctrl_n_goes_to_next_command", false, O(m_bCtrlNGoesToNextCommand)}, {"ctrl_p_goes_to_previous_command", false, O(m_bCtrlPGoesToPreviousCommand)}, {"ctrl_z_goes_to_end_of_buffer", false, O(m_bCtrlZGoesToEndOfBuffer)}, -{"custom_16_is_default_colour", false, O(m_bCustom16isDefaultColour), 0, 0, OPT_UPDATE_VIEWS}, +{"custom_16_is_default_colour", false, O(m_bCustom16isDefaultColour), 0, 0, OPT_UPDATE_VIEWS}, + +{"default_send_to", eSendToWorld, O(m_iDefaultSendTo), eSendToWorld, eSendToLast - 1}, +{"default_sequence", DEFAULT_TRIGGER_SEQUENCE, O(m_iDefaultSequence), 0, 10000}, +{"default_regexp", false, O(m_bDefaultRegexp)}, +{"default_expand_variables", false, O(m_bDefaultExpandVariables)}, +{"default_keep_evaluating", false, O(m_bDefaultKeepEvaluating)}, +{"default_ignore_case", false, O(m_bDefaultIgnoreCase)}, + {"detect_pueblo", true, O(m_bPueblo)}, {"do_not_add_macros_to_command_history",false, O(m_bDoNotAddMacrosToCommandHistory)}, {"do_not_show_outstanding_lines", false, O(m_bDoNotShowOutstandingLines)},