Skip to content

Commit 328e54d

Browse files
nickgammonnickgammon
committed
Changed defaults to be specific to triggers, aliases, timers
1 parent 743748e commit 328e54d

File tree

3 files changed

+43
-25
lines changed

3 files changed

+43
-25
lines changed

‎dialogs/world_prefs/prefspropertypages.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2593,19 +2593,19 @@ void CPrefsP7::InitDialog (CDialog * pDlg)
25932593

25942594
dlg->m_pDoc = m_doc;
25952595

2596-
dlg->m_bIgnoreCase = m_doc->m_bDefaultIgnoreCase;
2596+
dlg->m_bIgnoreCase = m_doc->m_bDefaultAliasIgnoreCase;
25972597
dlg->m_bEnabled = TRUE;
2598-
dlg->m_bExpandVariables = m_doc->m_bDefaultExpandVariables;
2598+
dlg->m_bExpandVariables = m_doc->m_bDefaultAliasExpandVariables;
25992599
dlg->m_bOmitFromLogFile = FALSE;
2600-
dlg->m_bRegexp = m_doc->m_bDefaultRegexp;
2601-
dlg->m_iSequence = m_doc->m_iDefaultSequence;
2602-
dlg->m_bKeepEvaluating = m_doc->m_bDefaultKeepEvaluating;
2600+
dlg->m_bRegexp = m_doc->m_bDefaultAliasRegexp;
2601+
dlg->m_iSequence = m_doc->m_iDefaultAliasSequence;
2602+
dlg->m_bKeepEvaluating = m_doc->m_bDefaultAliasKeepEvaluating;
26032603
dlg->m_bOneShot = FALSE;
26042604
dlg->m_bEchoAlias = FALSE;
26052605
dlg->m_bOmitFromCommandHistory = FALSE;
26062606
dlg->m_bTemporary = FALSE;
26072607
// dlg->m_bDelayed = FALSE;
2608-
dlg->m_iSendTo = m_doc->m_iDefaultSendTo;
2608+
dlg->m_iSendTo = m_doc->m_iDefaultAliasSendTo;
26092609

26102610
dlg->m_pAliasMap = &m_doc->m_AliasMap;
26112611
dlg->m_current_alias = NULL;
@@ -3367,22 +3367,22 @@ void CPrefsP8::InitDialog (CDialog * pDlg)
33673367
dlg->m_pDoc = m_doc;
33683368

33693369
dlg->m_bUTF_8 = m_doc->m_bUTF_8;
3370-
dlg->m_ignore_case = m_doc->m_bDefaultIgnoreCase;
3370+
dlg->m_ignore_case = m_doc->m_bDefaultTriggerIgnoreCase;
33713371
dlg->m_colour = 0; // no change
33723372
dlg->m_sound_pathname = NOSOUNDLIT;
33733373
dlg->m_omit_from_log = FALSE;
33743374
dlg->m_pTriggerMap = &m_doc->m_TriggerMap;
33753375
dlg->m_current_trigger = NULL;
33763376
dlg->m_bOmitFromOutput = FALSE;
3377-
dlg->m_bKeepEvaluating = m_doc->m_bDefaultKeepEvaluating;
3377+
dlg->m_bKeepEvaluating = m_doc->m_bDefaultTriggerKeepEvaluating;
33783378
dlg->m_bOneShot = FALSE;
33793379
dlg->m_bEnabled = TRUE;
33803380
dlg->m_iClipboardArg = 0;
3381-
dlg->m_iSendTo = m_doc->m_iDefaultSendTo;
3382-
dlg->m_bRegexp = m_doc->m_bDefaultRegexp;
3381+
dlg->m_iSendTo = m_doc->m_iDefaultTriggerSendTo;
3382+
dlg->m_bRegexp = m_doc->m_bDefaultTriggerRegexp;
33833383
dlg->m_bRepeat = FALSE;
3384-
dlg->m_bExpandVariables = m_doc->m_bDefaultExpandVariables;
3385-
dlg->m_iSequence = m_doc->m_iDefaultSequence;
3384+
dlg->m_bExpandVariables = m_doc->m_bDefaultTriggerExpandVariables;
3385+
dlg->m_iSequence = m_doc->m_iDefaultTriggerSequence;
33863386
dlg->m_iMatchTextColour = 0; // any
33873387
dlg->m_iMatchBackColour = 0; // any
33883388
dlg->m_iMatchBold = 2; // any
@@ -5828,7 +5828,7 @@ void CPrefsP16::InitDialog (CDialog * pDlg)
58285828

58295829
dlg->m_pTimerMap = &m_doc->m_TimerMap;
58305830
dlg->m_current_timer = NULL;
5831-
dlg->m_iSendTo = m_doc->m_iDefaultSendTo;
5831+
dlg->m_iSendTo = m_doc->m_iDefaultTimerSendTo;
58325832

58335833
} // end of CPrefsP16::InitDialog
58345834

‎doc.h

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -845,12 +845,21 @@ class CMUSHclientDoc : public CDocument
845845

846846
// version 4.54
847847

848-
unsigned short m_iDefaultSendTo; // default send-to location for triggers/aliases/timers
849-
unsigned short m_iDefaultSequence; // default sequence for triggers/aliases
850-
unsigned short m_bDefaultRegexp; // default regular expression flag for triggers/aliases
851-
unsigned short m_bDefaultExpandVariables; // default expand-variables flag for triggers/aliases
852-
unsigned short m_bDefaultKeepEvaluating; // default keep-evaluating flag for triggers/aliases
853-
unsigned short m_bDefaultIgnoreCase; // default ignore-case flag for triggers/aliases
848+
unsigned short m_iDefaultTriggerSendTo; // default send-to location for triggers
849+
unsigned short m_iDefaultTriggerSequence; // default sequence for triggers
850+
unsigned short m_bDefaultTriggerRegexp; // default regular expression flag for triggers
851+
unsigned short m_bDefaultTriggerExpandVariables; // default expand-variables flag for triggers
852+
unsigned short m_bDefaultTriggerKeepEvaluating; // default keep-evaluating flag for triggers
853+
unsigned short m_bDefaultTriggerIgnoreCase; // default ignore-case flag for triggers
854+
855+
unsigned short m_iDefaultAliasSendTo; // default send-to location for aliases
856+
unsigned short m_iDefaultAliasSequence; // default sequence for aliases
857+
unsigned short m_bDefaultAliasRegexp; // default regular expression flag for aliases
858+
unsigned short m_bDefaultAliasExpandVariables; // default expand-variables flag for aliases
859+
unsigned short m_bDefaultAliasKeepEvaluating; // default keep-evaluating flag for aliases
860+
unsigned short m_bDefaultAliasIgnoreCase; // default ignore-case flag for aliases
861+
862+
unsigned short m_iDefaultTimerSendTo; // default send-to location for timers
854863

855864
// end of stuff saved to disk **************************************************************
856865

‎scriptingoptions.cpp

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,21 @@ tConfigurationNumericOption OptionsTable [] = {
7373
{"ctrl_z_goes_to_end_of_buffer", false, O(m_bCtrlZGoesToEndOfBuffer)},
7474
{"custom_16_is_default_colour", false, O(m_bCustom16isDefaultColour), 0, 0, OPT_UPDATE_VIEWS},
7575

76-
{"default_send_to", eSendToWorld, O(m_iDefaultSendTo), eSendToWorld, eSendToLast - 1},
77-
{"default_sequence", DEFAULT_TRIGGER_SEQUENCE, O(m_iDefaultSequence), 0, 10000},
78-
{"default_regexp", false, O(m_bDefaultRegexp)},
79-
{"default_expand_variables", false, O(m_bDefaultExpandVariables)},
80-
{"default_keep_evaluating", false, O(m_bDefaultKeepEvaluating)},
81-
{"default_ignore_case", false, O(m_bDefaultIgnoreCase)},
76+
{"default_trigger_send_to", eSendToWorld, O(m_iDefaultTriggerSendTo), eSendToWorld, eSendToLast - 1},
77+
{"default_trigger_sequence", DEFAULT_TRIGGER_SEQUENCE, O(m_iDefaultTriggerSequence), 0, 10000},
78+
{"default_trigger_regexp", false, O(m_bDefaultTriggerRegexp)},
79+
{"default_trigger_expand_variables", false, O(m_bDefaultTriggerExpandVariables)},
80+
{"default_trigger_keep_evaluating", false, O(m_bDefaultTriggerKeepEvaluating)},
81+
{"default_trigger_ignore_case", false, O(m_bDefaultTriggerIgnoreCase)},
82+
83+
{"default_alias_send_to", eSendToWorld, O(m_iDefaultAliasSendTo), eSendToWorld, eSendToLast - 1},
84+
{"default_alias_sequence", DEFAULT_ALIAS_SEQUENCE, O(m_iDefaultAliasSequence), 0, 10000},
85+
{"default_alias_regexp", false, O(m_bDefaultAliasRegexp)},
86+
{"default_alias_expand_variables", false, O(m_bDefaultAliasExpandVariables)},
87+
{"default_alias_keep_evaluating", false, O(m_bDefaultAliasKeepEvaluating)},
88+
{"default_alias_ignore_case", false, O(m_bDefaultAliasIgnoreCase)},
89+
90+
{"default_timer_send_to", eSendToWorld, O(m_iDefaultTimerSendTo), eSendToWorld, eSendToLast - 1},
8291

8392
{"detect_pueblo", true, O(m_bPueblo)},
8493
{"do_not_add_macros_to_command_history",false, O(m_bDoNotAddMacrosToCommandHistory)},

0 commit comments

Comments
 (0)