Skip to content

Commit a407d39

Browse files
authored
Merge pull request #101 from Aerilius/issue-90
Fix issue #90: Turn off console on startup, add a config in menu
2 parents ffcb609 + 2dda17a commit a407d39

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

src/testup/core.rb

+7-6
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ module TestUp
3939
# Sketchup.write_default(TestUp::PLUGIN_ID, 'dev-mode', true)
4040
DEBUG = Sketchup.read_default(PLUGIN_ID, 'dev-mode', false)
4141

42-
# <debug>
43-
if defined?(SKETCHUP_CONSOLE)
44-
SKETCHUP_CONSOLE.show
45-
elsif defined?(LAYOUT_CONSOLE)
46-
LAYOUT_CONSOLE.show
42+
if Sketchup.read_default(PLUGIN_ID, 'open_console_on_startup', false)
43+
if defined?(SKETCHUP_CONSOLE)
44+
SKETCHUP_CONSOLE.show
45+
elsif defined?(LAYOUT_CONSOLE)
46+
LAYOUT_CONSOLE.show
47+
end
4748
end
48-
# </debug>
4949

5050
PATH_IMAGES = File.join(PATH, 'images').freeze
5151
PATH_JS_SCRIPTS = File.join(PATH, 'js').freeze
@@ -130,6 +130,7 @@ def self.reset_settings
130130
@settings[:run_in_gui] = nil
131131
@settings[:verbose_console_tests] = nil
132132
@settings[:paths_to_testsuites] = nil
133+
@settings[:open_console_on_startup] = nil
133134
end
134135

135136

src/testup/ui.rb

+11
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,16 @@ def self.init_ui
8484
cmd.status_bar_text = 'Open folder with logs.'
8585
cmd_open_logs = cmd
8686

87+
cmd = UI::Command.new('Open console on startup') {
88+
self.settings[:open_console_on_startup] = !self.settings[:open_console_on_startup]
89+
}
90+
cmd.tooltip = 'Open console on startup'
91+
cmd.status_bar_text = 'Open console on startup.'
92+
cmd.set_validation_proc {
93+
self.settings[:open_console_on_startup] ? MF_CHECKED : MF_ENABLED
94+
} if defined?(Sketchup)
95+
cmd_open_console_on_startup = cmd
96+
8797
cmd = UI::Command.new('Reload TestUp') {
8898
TESTUP_CONSOLE.clear
8999
window_visible = @window && @window.visible?
@@ -136,6 +146,7 @@ def self.init_ui
136146
sub_menu.add_item('Remove Run...') { self::Runs.remove }
137147
menu.add_separator
138148
menu.add_item(cmd_open_logs)
149+
menu.add_item(cmd_open_console_on_startup)
139150
menu.add_item(cmd_toggle_run_tests_in_console)
140151
menu.add_item(cmd_toggle_verbose_console_tests)
141152
menu.add_item(cmd_display_minitest_help)

0 commit comments

Comments
 (0)