Skip to content

Commit 5120d0c

Browse files
nickgammonnickgammon
committed
Renamed output_line_preamble_xxx options as timestamp_xxx
1 parent 645bd7f commit 5120d0c

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

‎plugins/Config_Option_Changer.xml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,11 @@ Type 'config_options' to see dialog of options to change.
4444
4545
-- alpha options they can change
4646
alpha_options = {
47-
editor_window_name = { desc = 'Name of external editor window' },
48-
script_editor_argument = { desc = 'External editor argument' },
49-
output_line_preamble_input = { desc = 'Timestamp (input)' },
50-
output_line_preamble_notes = { desc = 'Timestamp (notes)' },
51-
output_line_preamble_output = { desc = 'Timestamp (output)' },
47+
editor_window_name = { desc = 'Name of external editor window' },
48+
script_editor_argument = { desc = 'External editor argument' },
49+
timestamp_input = { desc = 'Timestamp (input)' },
50+
timestamp_notes = { desc = 'Timestamp (notes)' },
51+
timestamp_output = { desc = 'Timestamp (output)' },
5252
} -- end alpha_options
5353
5454
@@ -83,12 +83,12 @@ numeric_options = {
8383
8484
-- colour options they can change
8585
colour_options = {
86-
output_line_preamble_input_text_colour = { desc = 'Timestamp (input) text colour' },
87-
output_line_preamble_notes_text_colour = { desc = 'Timestamp (notes) text colour' },
88-
output_line_preamble_output_text_colour = { desc = 'Timestamp (output) text colour' },
89-
output_line_preamble_input_back_colour = { desc = 'Timestamp (input) background colour' },
90-
output_line_preamble_notes_back_colour = { desc = 'Timestamp (notes) background colour' },
91-
output_line_preamble_output_back_colour = { desc = 'Timestamp (output) background colour' },
86+
timestamp_input_text_colour = { desc = 'Timestamp (input) text colour' },
87+
timestamp_notes_text_colour = { desc = 'Timestamp (notes) text colour' },
88+
timestamp_output_text_colour = { desc = 'Timestamp (output) text colour' },
89+
timestamp_input_back_colour = { desc = 'Timestamp (input) background colour' },
90+
timestamp_notes_back_colour = { desc = 'Timestamp (notes) background colour' },
91+
timestamp_output_back_colour = { desc = 'Timestamp (output) background colour' },
9292
} -- end colour_options
9393
9494
function edit_boolean_option (name)

‎scriptingoptions.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,6 @@ tConfigurationNumericOption OptionsTable [] = {
147147
{"output_font_height", 12, O(m_font_height), 1, 1000, OPT_UPDATE_VIEWS | OPT_UPDATE_OUTPUT_FONT},
148148
{"output_font_weight", FW_DONTCARE, O(m_font_weight), 0, 1000, OPT_UPDATE_VIEWS | OPT_UPDATE_OUTPUT_FONT},
149149
{"output_font_charset", DEFAULT_CHARSET, O(m_font_charset), 0, 65536, OPT_UPDATE_VIEWS | OPT_UPDATE_OUTPUT_FONT},
150-
{"output_line_preamble_input_text_colour", RGB (255, 255, 255), O(m_OutputLinePreambleInputTextColour), 0, 0xFFFFFF, OPT_RGB_COLOUR | OPT_UPDATE_VIEWS},
151-
{"output_line_preamble_notes_text_colour", RGB (255, 255, 255), O(m_OutputLinePreambleNotesTextColour), 0, 0xFFFFFF, OPT_RGB_COLOUR | OPT_UPDATE_VIEWS},
152-
{"output_line_preamble_output_text_colour", RGB (255, 255, 255), O(m_OutputLinePreambleOutputTextColour),0, 0xFFFFFF, OPT_RGB_COLOUR | OPT_UPDATE_VIEWS},
153-
{"output_line_preamble_input_back_colour", RGB (0, 0, 0), O(m_OutputLinePreambleInputBackColour), 0, 0xFFFFFF, OPT_RGB_COLOUR | OPT_UPDATE_VIEWS},
154-
{"output_line_preamble_notes_back_colour", RGB (0, 0, 0), O(m_OutputLinePreambleNotesBackColour), 0, 0xFFFFFF, OPT_RGB_COLOUR | OPT_UPDATE_VIEWS},
155-
{"output_line_preamble_output_back_colour", RGB (0, 0, 0), O(m_OutputLinePreambleOutputBackColour),0, 0xFFFFFF, OPT_RGB_COLOUR | OPT_UPDATE_VIEWS},
156150
{"paste_commented_softcode", false, O(m_bPasteCommentedSoftcode)},
157151
{"paste_delay", 0, O(m_nPasteDelay), 0, 100000},
158152
{"paste_delay_per_lines", 1, O(m_nPasteDelayPerLines), 1, 100000},
@@ -185,6 +179,12 @@ tConfigurationNumericOption OptionsTable [] = {
185179
{"start_paused", false, O(m_bStartPaused)},
186180
{"tab_completion_lines", 200, O(m_iTabCompletionLines), 1, 500000},
187181
{"tab_completion_space", false, O(m_bTabCompletionSpace)},
182+
{"timestamp_input_text_colour", RGB (128, 0, 0), O(m_OutputLinePreambleInputTextColour), 0, 0xFFFFFF, OPT_RGB_COLOUR | OPT_UPDATE_VIEWS},
183+
{"timestamp_notes_text_colour", RGB (0, 0, 255), O(m_OutputLinePreambleNotesTextColour), 0, 0xFFFFFF, OPT_RGB_COLOUR | OPT_UPDATE_VIEWS},
184+
{"timestamp_output_text_colour", RGB (255, 255, 255), O(m_OutputLinePreambleOutputTextColour),0, 0xFFFFFF, OPT_RGB_COLOUR | OPT_UPDATE_VIEWS},
185+
{"timestamp_input_back_colour", RGB (0, 0, 0), O(m_OutputLinePreambleInputBackColour), 0, 0xFFFFFF, OPT_RGB_COLOUR | OPT_UPDATE_VIEWS},
186+
{"timestamp_notes_back_colour", RGB (0, 0, 0), O(m_OutputLinePreambleNotesBackColour), 0, 0xFFFFFF, OPT_RGB_COLOUR | OPT_UPDATE_VIEWS},
187+
{"timestamp_output_back_colour", RGB (0, 0, 0), O(m_OutputLinePreambleOutputBackColour),0, 0xFFFFFF, OPT_RGB_COLOUR | OPT_UPDATE_VIEWS},
188188
{"translate_backslash_sequences", false, O(m_bTranslateBackslashSequences)},
189189
{"translate_german", false, O(m_bTranslateGerman)},
190190
{"underline_hyperlinks", true, O(m_bUnderlineHyperlinks), 0, 0, OPT_SERVER_CAN_WRITE},
@@ -258,9 +258,6 @@ tConfigurationAlphaOption AlphaOptionsTable [] =
258258
{"on_world_lose_focus", "", A(m_strWorldLoseFocus)},
259259
{"on_world_open", "", A(m_strWorldOpen)},
260260
{"output_font_name", "FixedSys", A(m_font_name), OPT_UPDATE_OUTPUT_FONT},
261-
{"output_line_preamble_input", "", A(m_strOutputLinePreambleInput), OPT_KEEP_SPACES},
262-
{"output_line_preamble_notes", "", A(m_strOutputLinePreambleNotes), OPT_KEEP_SPACES},
263-
{"output_line_preamble_output", "", A(m_strOutputLinePreambleOutput), OPT_KEEP_SPACES},
264261
{"password", "", A(m_password), OPT_PASSWORD | OPT_PLUGIN_CANNOT_RW},
265262
{"paste_line_postamble", "", A(m_pasteline_postamble), OPT_KEEP_SPACES},
266263
{"paste_line_preamble", "", A(m_pasteline_preamble), OPT_KEEP_SPACES},
@@ -286,6 +283,9 @@ tConfigurationAlphaOption AlphaOptionsTable [] =
286283
{"speed_walk_prefix", "#", A(m_speed_walk_prefix), OPT_KEEP_SPACES},
287284
{"tab_completion_defaults", "", A(m_strTabCompletionDefaults), OPT_MULTLINE},
288285
{"terminal_identification", "mushclient", A(m_strTerminalIdentification)},
286+
{"timestamp_input", "", A(m_strOutputLinePreambleInput), OPT_KEEP_SPACES},
287+
{"timestamp_notes", "", A(m_strOutputLinePreambleNotes), OPT_KEEP_SPACES},
288+
{"timestamp_output", "", A(m_strOutputLinePreambleOutput), OPT_KEEP_SPACES},
289289
{NULL} // end of table marker
290290
};
291291

0 commit comments

Comments
 (0)