cosmos 4.2.4 → 4.5.0

data/lib/cosmos/tools/script_runner/script_runner_config.rb

@@ -16,12 +16,16 @@ module Cosmos
     # Processes the config file
     def initialize(filename)
       return unless filename
+      @filename = filename
       parser = ConfigParser.new("http://cosmosrb.com/docs/tools/#script-runner-configuration")
       parser.parse_file(filename) do |keyword, params|
         case keyword
         when 'LINE_DELAY'
           parser.verify_num_parameters(1, 1, "#{keyword} <Delay in Seconds>")
           ScriptRunnerFrame.line_delay = params[0].to_f
+        when 'PAUSE_ON_ERROR'
+          parser.verify_num_parameters(1, 1, "#{keyword} <TRUE or FALSE>")
+          ScriptRunnerFrame.pause_on_error = ConfigParser.handle_true_false(params[0])
         when 'MONITOR_LIMITS'
           parser.verify_num_parameters(0, 0, keyword)
           ScriptRunnerFrame.monitor_limits = true
@@ -35,5 +39,15 @@ module Cosmos
         end
       end
     end
+
+    def write_config
+      @filename = File.join(Cosmos::USERPATH, 'config', 'tools', 'script_runner', 'script_runner.txt') unless @filename
+      File.open(@filename, 'w') do |file|
+        file.puts("LINE_DELAY #{ScriptRunnerFrame.line_delay}")
+        file.puts("PAUSE_ON_ERROR #{ScriptRunnerFrame.pause_on_error ? 'TRUE' : 'FALSE'}")
+        file.puts("MONITOR_LIMITS") if ScriptRunnerFrame.monitor_limits
+        file.puts("PAUSE_ON_RED") if ScriptRunnerFrame.pause_on_red
+      end
+    end
   end
 end

data/lib/cosmos/tools/script_runner/script_runner_frame.rb

@@ -89,6 +89,9 @@ module Cosmos
     SET_TLM_KEYWORDS = %w(set_tlm set_tlm_raw override_tlm_raw normalize_tlm_raw)
     CHECK_KEYWORDS   = %w(check check_raw wait wait_raw wait_check wait_check_raw)
 
+    INSTANCE_VARS = %w(__return_val close_on_complete error eval_error filename instrumented_script \
+      line_number line_offset saved_instance saved_run_thread text text_binding uncaught_exception)
+
     attr_accessor :use_instrumentation
     attr_accessor :change_callback
     attr_accessor :run_callback
@@ -99,8 +102,8 @@ module Cosmos
     attr_accessor :continue_after_error
     attr_accessor :exceptions
     attr_accessor :script_binding
-    attr_accessor :inline_return
-    attr_accessor :inline_return_params
+    attr_accessor :inline_return # Deprecated and unused - Here to prevent cache errors for old scripts
+    attr_accessor :inline_return_params # Deprecated and unused - Here to prevent cache errors for old scripts
     attr_reader   :message_log
     attr_reader   :script_class
     attr_reader   :top_level_instrumented_cache
@@ -126,6 +129,7 @@ module Cosmos
     @@cancel_output = false
     @@cancel_limits = false
     @@file_number = 1
+    @@default_font = Cosmos.get_default_font
 
     def initialize(parent, default_tab_text = 'Untitled')
       super(parent)
@@ -252,7 +256,7 @@ module Cosmos
 
     def create_ruby_editor
       # Add Initial Text Window
-      script = RubyEditor.new(self)
+      script = RubyEditor.new(self, @@default_font)
       script.enable_breakpoints = true if @debug_frame
       connect(script,
               SIGNAL('breakpoint_set(int)'),
@@ -266,6 +270,10 @@ module Cosmos
               SIGNAL('breakpoints_cleared()'),
               self,
               SLOT('breakpoints_cleared()'))
+      script.connect(SIGNAL('font_changed(QFont)')) do |font|
+        # Remember changed fonts for future tabs
+        @@default_font = font
+      end
 
       # Add right click menu
       script.setContextMenuPolicy(Qt::CustomContextMenu)
@@ -315,6 +323,10 @@ module Cosmos
       @script.setFocus
     end
 
+    def active_script_highlight(color)
+      Qt.execute_in_main_thread { @active_script.highlight_line(color) }
+    end
+
     def allow_start=(value)
       @allow_start = value
       if @allow_start
@@ -560,10 +572,18 @@ module Cosmos
         return nil if @cancel_instrumentation
         instrumented_line = ''
         if instrumentable
-          # Skip the segment if it's empty. Note that the segment could have
-          # originally had comments but they were stripped in
+          # Add a newline if it's empty to ensure the instrumented code has
+          # the same number of lines as the original script. Note that the
+          # segment could have originally had comments but they were stripped in
           # ruby_lex_utils.remove_comments
-          next if segment.strip.empty?
+          if segment.strip.empty?
+            instrumented_text << "\n"
+            next
+          end
+
+          # Create a variable to hold the segment's return value
+          instrumented_line << "__return_val = nil; "
+
           # If not inside a begin block then create one to catch exceptions
           unless inside_begin
             instrumented_line << 'begin; '
@@ -571,24 +591,23 @@ module Cosmos
 
           # Add preline instrumentation
           instrumented_line << "ScriptRunnerFrame.instance.script_binding = binding(); "\
-            "if ScriptRunnerFrame.instance.inline_return then ScriptRunnerFrame.instance.inline_return = nil; "\
-            "return ScriptRunnerFrame.instance.inline_return_params; end; "\
             "ScriptRunnerFrame.instance.pre_line_instrumentation('#{filename}', #{line_no}); "
 
           # Add the actual line
+          instrumented_line << "__return_val = begin; "
           instrumented_line << segment
           instrumented_line.chomp!
 
           # Add postline instrumentation
-          instrumented_line << "; ScriptRunnerFrame.instance.post_line_instrumentation('#{filename}', #{line_no})"
+          instrumented_line << " end; ScriptRunnerFrame.instance.post_line_instrumentation('#{filename}', #{line_no}); "
 
           # Complete begin block to catch exceptions
           unless inside_begin
-            instrumented_line << "; rescue Exception => eval_error; "\
-            "retry if ScriptRunnerFrame.instance.exception_instrumentation(eval_error, '#{filename}', #{line_no}); end"
+            instrumented_line << "rescue Exception => eval_error; "\
+            "retry if ScriptRunnerFrame.instance.exception_instrumentation(eval_error, '#{filename}', #{line_no}); end; "
           end
 
-          instrumented_line << "\n"
+          instrumented_line << " __return_val\n"
         else
           unless segment =~ /^\s*end\s*$/ or segment =~ /^\s*when .*$/
             num_left_brackets = segment.count('{')
@@ -659,7 +678,7 @@ module Cosmos
     def exception_instrumentation(error, filename, line_number)
       if error.class == StopScript || error.class == SkipTestCase || !@use_instrumentation
         Kernel.raise error
-      else
+      elsif !error.eql?(@@error)
         line_number = line_number + @line_offset if @active_script.object_id == @script.object_id
         handle_exception(error, false, filename, line_number)
       end
@@ -752,6 +771,21 @@ module Cosmos
       @script.comment_or_uncomment_lines unless running?()
     end
 
+    def zoom_in
+      # @active_script since this can be used while running
+      @active_script.zoom_in
+    end
+
+    def zoom_out
+      # @active_script since this can be used while running
+      @active_script.zoom_out
+    end
+
+    def zoom_default
+      # @active_script since this can be used while running
+      @active_script.zoom_default
+    end
+
     ##################################################################################
     # Implement Script functionality in the frame (run selection, run from cursor, etc
     ##################################################################################
@@ -935,6 +969,10 @@ module Cosmos
               end
 
               if @script_binding
+                # Check for accessing an instance variable or local
+                if debug_text =~ /^@\S+$/ || @script_binding.local_variables.include?(debug_text.to_sym)
+                  debug_text = "puts #{debug_text}" # Automatically add puts to print it
+                end
                 eval(debug_text, @script_binding, 'debug', 1)
               else
                 Object.class_eval(debug_text, 'debug', 1)
@@ -972,17 +1010,20 @@ module Cosmos
             @debug_text.setPlainText("")
           end
         end
-
         @debug_frame.addWidget(@debug_text)
 
-        @return_button = Qt::PushButton.new('Insert Return')
-        @debug_frame.addWidget(@return_button)
-        @return_button.connect(SIGNAL('clicked(bool)')) do
-          scriptrunner_puts "Debug: insert_return(); ScriptRunnerFrame.instance.go()"
-          handle_output_io()
-          insert_return()
-          go()
+        @locals_button = Qt::PushButton.new('Locals')
+        @locals_button.connect(SIGNAL('clicked(bool)')) do
+          next unless @script_binding
+          @locals_button.setEnabled(false)
+          vars = @script_binding.local_variables.map(&:to_s)
+          puts "Locals: #{vars.reject {|x| INSTANCE_VARS.include?(x)}.sort.join(', ')}"
+          while @output_io.string[-1..-1] == "\n"
+            Qt::CoreApplication.processEvents()
+          end
+          @locals_button.setEnabled(true)
         end
+        @debug_frame.addWidget(@locals_button)
 
         @bottom_frame.layout.addLayout(@debug_frame)
       end
@@ -1060,7 +1101,7 @@ module Cosmos
 
     def toggle_disconnect(config_file, ask_for_config_file = true)
       dialog = Qt::Dialog.new(self, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
-      dialog.setWindowTitle(tr("Disconnect Settings"))
+      dialog.setWindowTitle("Disconnect Settings")
       dialog_layout = Qt::VBoxLayout.new
       dialog_layout.addWidget(Qt::Label.new("Targets checked will be disconnected."))
 
@@ -1156,7 +1197,7 @@ module Cosmos
           Splash.execute(self) do |splash|
             ConfigParser.splash = splash
             splash.message = "Initializing Command and Telemetry Server"
-            set_disconnected_targets(targets, config_file)
+            set_disconnected_targets(targets, targets.length == all_targets.length, config_file)
             ConfigParser.splash = nil
           end
         end
@@ -1357,7 +1398,13 @@ module Cosmos
           $stdout.add_stream(@output_io)
           $stderr.add_stream(@output_io)
 
-          scriptrunner_puts "Starting script: #{File.basename(@filename)}" unless close_on_complete
+          unless close_on_complete
+            scriptrunner_puts("Starting script: #{File.basename(@filename)}")
+            targets = get_disconnected_targets()
+            if targets
+              scriptrunner_puts("DISCONNECTED targets: #{targets.join(',')}")
+            end
+          end
           handle_output_io()
 
           # Start Limits Monitoring
@@ -1627,33 +1674,33 @@ module Cosmos
         menu = current_script.context_menu(point)
         menu.addSeparator()
         if not self.class.running?
-          exec_selected_action = Qt::Action.new(tr("Execute Selected Lines"), self)
-          exec_selected_action.statusTip = tr("Execute the selected lines as a standalone script")
+          exec_selected_action = Qt::Action.new("Execute Selected Lines", self)
+          exec_selected_action.statusTip = "Execute the selected lines as a standalone script"
           exec_selected_action.connect(SIGNAL('triggered()')) { run_selection() }
           menu.addAction(exec_selected_action)
 
-          exec_cursor_action = Qt::Action.new(tr("Execute From Cursor"), self)
-          exec_cursor_action.statusTip = tr("Execute the script starting at the line containing the cursor")
+          exec_cursor_action = Qt::Action.new("Execute From Cursor", self)
+          exec_cursor_action.statusTip = "Execute the script starting at the line containing the cursor"
           exec_cursor_action.connect(SIGNAL('triggered()')) { run_from_cursor() }
           menu.addAction(exec_cursor_action)
 
           menu.addSeparator()
 
           if RUBY_VERSION.split('.')[0].to_i > 1
-            syntax_action = Qt::Action.new(tr("Ruby Syntax Check Selected Lines"), self)
-            syntax_action.statusTip = tr("Check the selected lines for valid Ruby syntax")
+            syntax_action = Qt::Action.new("Ruby Syntax Check Selected Lines", self)
+            syntax_action.statusTip = "Check the selected lines for valid Ruby syntax"
             syntax_action.connect(SIGNAL('triggered()')) { ruby_syntax_check_selection() }
             menu.addAction(syntax_action)
           end
 
-          mnemonic_action = Qt::Action.new(tr("Mnemonic Check Selected Lines"), self)
-          mnemonic_action.statusTip = tr("Check the selected lines for valid targets, packets, mnemonics and parameters")
+          mnemonic_action = Qt::Action.new("Mnemonic Check Selected Lines", self)
+          mnemonic_action.statusTip = "Check the selected lines for valid targets, packets, mnemonics and parameters"
           mnemonic_action.connect(SIGNAL('triggered()')) { mnemonic_check_selection() }
           menu.addAction(mnemonic_action)
 
         elsif running?() and @realtime_button_bar.state != 'Running'
-          exec_selected_action = Qt::Action.new(tr("Execute Selected Lines While Paused"), self)
-          exec_selected_action.statusTip = tr("Execute the selected lines as a standalone script")
+          exec_selected_action = Qt::Action.new("Execute Selected Lines While Paused", self)
+          exec_selected_action.statusTip = "Execute the selected lines as a standalone script"
           exec_selected_action.connect(SIGNAL('triggered()')) { run_selection_while_paused() }
           menu.addAction(exec_selected_action)
         end
@@ -1667,7 +1714,12 @@ module Cosmos
       if cached
         @active_script.setPlainText(cached.gsub("\r", ''))
       else
-        @active_script.setPlainText(File.read(filename).gsub("\r", ''))
+        if File.exist?(filename)
+          data = File.read(filename).gsub("\r", '')
+        else
+          data = ""
+        end
+        @active_script.setPlainText(data)
       end
       mark_breakpoints(filename)
 

data/lib/cosmos/tools/table_manager/table_config.rb

@@ -85,9 +85,9 @@ module Cosmos
           when 'TABLEFILE'
             usage = "#{keyword} <File name>"
             parser.verify_num_parameters(1, 1, usage)
-            filename = File.join(File.dirname(filename), params[0])
-            raise parser.error("Table file #{filename} not found", usage) unless File.exist?(filename)
-            process_file(filename)
+            table_filename = File.join(File.dirname(filename), params[0])
+            raise parser.error("Table file #{table_filename} not found", usage) unless File.exist?(table_filename)
+            process_file(table_filename)
 
           when 'TABLE'
             finish_packet()
@@ -172,6 +172,8 @@ module Cosmos
     # duplicated until the specified number of rows are created.
     def finish_packet
       if @current_packet
+        warnings = @current_packet.check_bit_offsets
+        raise "Overlapping items not allowed in tables.\n#{warnings}" if warnings.length > 0
         if @current_packet.type == :TWO_DIMENSIONAL
           items = @current_packet.sorted_items.clone
           (@current_packet.num_rows - 1).times do |row|

data/lib/cosmos/tools/table_manager/table_manager.rb

@@ -12,9 +12,9 @@ require 'cosmos'
 Cosmos.catch_fatal_exception do
   require 'cosmos/gui/qt_tool'
   require 'cosmos/gui/dialogs/progress_dialog'
+  require 'cosmos/gui/dialogs/tlm_details_dialog'
   require 'cosmos/tools/table_manager/table_config'
   require 'cosmos/tools/table_manager/table_manager_core'
-  require 'cosmos/gui/dialogs/tlm_details_dialog'
 end
 
 class Qt::ComboBox
@@ -192,7 +192,7 @@ module Cosmos
           option_parser.on("-c", "--create FILE", "Use the specified definition file to create the table") do |arg|
             options.create = arg
           end
-          option_parser.on("-o", "--output DIRECTORY", "Create files in the specified directory") do |arg|
+          option_parser.on("-o", "--output DIRECTORY", "Create files in the specified directory (required with --create)") do |arg|
             options.output_dir = File.expand_path(arg)
           end
           option_parser.on("--convert FILE", "Convert the specified configuration file to the new format") do |arg|
@@ -211,12 +211,15 @@ module Cosmos
     #   command line
     # @return [Boolean] Whether to contine running the application
     def self.post_options_parsed_hook(options)
-      if options.create
+      if options.create and options.output_dir
+        normalize_config_options(options)
         core = TableManagerCore.new
-        core.file_new(options.create, options.output_dir)
+        create_path = self.config_path(options, options.create, ".txt", "table_manager")
+        core.file_new(create_path, options.output_dir)
         return false
       end
       if options.convert
+        normalize_config_options(options)
         if options.convert.include?("/")
           parts = options.convert.split("/")
         else
@@ -279,7 +282,7 @@ module Cosmos
       complete_initialize()
       setMinimumSize(400, 250)
 
-      statusBar.showMessage(tr("Ready")) # Show message to initialize status bar
+      statusBar.showMessage("Ready") # Show message to initialize status bar
     end
 
     def initialize_actions(no_tables = false)
@@ -296,79 +299,79 @@ module Cosmos
       open_action.connect(SIGNAL('triggered()')) { file_open(@bin_path) }
       self.addAction(open_action) # Add it to the application
 
-      @file_open_both = Qt::Action.new(Cosmos.get_icon('open.png'), tr('Open &Both'), self)
-      @file_open_both.statusTip = tr('Specify both the binary file and the definition file to open')
+      @file_open_both = Qt::Action.new(Cosmos.get_icon('open.png'), 'Open &Both', self)
+      @file_open_both.statusTip = 'Specify both the binary file and the definition file to open'
       @file_open_both.connect(SIGNAL('triggered()')) { file_open_both() }
 
-      @file_save = Qt::Action.new(Cosmos.get_icon('save.png'), tr('&Save File'), self)
+      @file_save = Qt::Action.new(Cosmos.get_icon('save.png'), '&Save File', self)
       @file_save_keyseq = Qt::KeySequence.new(Qt::KeySequence::Save)
       @file_save.shortcut = @file_save_keyseq
-      @file_save.statusTip = tr('Save the displayed data back to the binary file')
+      @file_save.statusTip = 'Save the displayed data back to the binary file'
       @file_save.connect(SIGNAL('triggered()')) { file_save() }
 
-      @file_save_as = Qt::Action.new(Cosmos.get_icon('save_as.png'), tr('Save File &As'), self)
+      @file_save_as = Qt::Action.new(Cosmos.get_icon('save_as.png'), 'Save File &As', self)
       @file_save_as_keyseq = Qt::KeySequence.new(Qt::KeySequence::SaveAs)
       @file_save_as.shortcut = @file_save_as_keyseq
-      @file_save_as.statusTip = tr('Save the displayed data to a new binary file')
+      @file_save_as.statusTip = 'Save the displayed data to a new binary file'
       @file_save_as.connect(SIGNAL('triggered()')) { file_save(true) }
 
-      @file_close = Qt::Action.new(Cosmos.get_icon('close.png'), tr('&Close File'), self)
-      @file_close_keyseq = Qt::KeySequence.new(tr("Ctrl+W")) # Qt::KeySequence::Close is Alt-F4 on Windows
+      @file_close = Qt::Action.new(Cosmos.get_icon('close.png'), '&Close File', self)
+      @file_close_keyseq = Qt::KeySequence.new("Ctrl+W") # Qt::KeySequence::Close is Alt-F4 on Windows
       @file_close.shortcut = @file_close_keyseq
-      @file_close.statusTip = tr('Close the current file')
+      @file_close.statusTip = 'Close the current file'
       @file_close.connect(SIGNAL('triggered()')) { file_close() }
 
-      @file_check = Qt::Action.new(Cosmos.get_icon('checkmark.png'), tr('&Check All'), self)
-      @file_check_keyseq = Qt::KeySequence.new(tr('Ctrl+K'))
+      @file_check = Qt::Action.new(Cosmos.get_icon('checkmark.png'), '&Check All', self)
+      @file_check_keyseq = Qt::KeySequence.new('Ctrl+K')
       @file_check.shortcut = @file_check_keyseq
-      @file_check.statusTip = tr('Check each data value against verification criteria')
+      @file_check.statusTip = 'Check each data value against verification criteria'
       @file_check.connect(SIGNAL('triggered()')) { file_check() }
 
-      @file_hex = Qt::Action.new(tr('&Hex Dump'), self)
-      @file_hex_keyseq = Qt::KeySequence.new(tr('Ctrl+H'))
+      @file_hex = Qt::Action.new('&Hex Dump', self)
+      @file_hex_keyseq = Qt::KeySequence.new('Ctrl+H')
       @file_hex.shortcut = @file_hex_keyseq
-      @file_hex.statusTip = tr('Display a hex representation of the binary file')
+      @file_hex.statusTip = 'Display a hex representation of the binary file'
       @file_hex.connect(SIGNAL('triggered()')) { display_hex(:file) }
 
-      @file_report = Qt::Action.new(tr('Create &Report'), self)
-      @file_report_keyseq = Qt::KeySequence.new(tr('Ctrl+R'))
+      @file_report = Qt::Action.new('Create &Report', self)
+      @file_report_keyseq = Qt::KeySequence.new('Ctrl+R')
       @file_report.shortcut = @file_report_keyseq
-      @file_report.statusTip = tr('Create a text file report describing the binary data')
+      @file_report.statusTip = 'Create a text file report describing the binary data'
       @file_report.connect(SIGNAL('triggered()')) { file_report() }
 
       unless no_tables
         # Table Menu Actions
-        @table_check = Qt::Action.new(Cosmos.get_icon('checkmark.png'), tr('&Check'), self)
-        @table_check.statusTip = tr('Check each data value against verification criteria')
+        @table_check = Qt::Action.new(Cosmos.get_icon('checkmark.png'), '&Check', self)
+        @table_check.statusTip = 'Check each data value against verification criteria'
         @table_check.connect(SIGNAL('triggered()')) { table_check() }
 
-        @table_default = Qt::Action.new(tr('&Default'), self)
-        @table_default_keyseq = Qt::KeySequence.new(tr('Ctrl+D'))
+        @table_default = Qt::Action.new('&Default', self)
+        @table_default_keyseq = Qt::KeySequence.new('Ctrl+D')
         @table_default.shortcut = @table_default_keyseq
-        @table_default.statusTip = tr('Revert all data values to their defaults')
+        @table_default.statusTip = 'Revert all data values to their defaults'
         @table_default.connect(SIGNAL('triggered()')) { table_default() }
 
-        @table_hex = Qt::Action.new(tr('&Hex Dump'), self)
-        @table_hex.statusTip = tr('Display a hex representation of the table')
+        @table_hex = Qt::Action.new('&Hex Dump', self)
+        @table_hex.statusTip = 'Display a hex representation of the table'
         @table_hex.connect(SIGNAL('triggered()')) { display_hex(:table) }
 
-        @table_save = Qt::Action.new(tr('&Save Table Binary'), self)
-        @table_save.statusTip = tr('Save the current table to a stand alone binary file')
+        @table_save = Qt::Action.new('&Save Table Binary', self)
+        @table_save.statusTip = 'Save the current table to a stand alone binary file'
         @table_save.connect(SIGNAL('triggered()')) { table_save() }
 
-        @table_commit = Qt::Action.new(tr('Commit to Existing &File'), self)
-        @table_commit.statusTip = tr('Incorporate the current table data into a binary file which already contains the table')
+        @table_commit = Qt::Action.new('Commit to Existing &File', self)
+        @table_commit.statusTip = 'Incorporate the current table data into a binary file which already contains the table'
         @table_commit.connect(SIGNAL('triggered()')) { table_commit() }
       end
     end
 
     def initialize_menus(no_tables = false)
-      file_menu = menuBar.addMenu(tr('&File'))
+      file_menu = menuBar.addMenu('&File')
 
-      file_new = file_menu.addMenu(Cosmos.get_icon('file.png'), tr("&New File")) # \tCtrl-N displays shortcut
+      file_new = file_menu.addMenu(Cosmos.get_icon('file.png'), "&New File") # \tCtrl-N displays shortcut
       target_dirs_action(file_new, @system_def_path, 'tools/table_manager', method(:file_new))
 
-      file_open = file_menu.addMenu(Cosmos.get_icon('open.png'), tr("&Open")) # \tCtrl-O displays shortcut
+      file_open = file_menu.addMenu(Cosmos.get_icon('open.png'), "&Open") # \tCtrl-O displays shortcut
       target_dirs_action(file_open, @system_bin_path, 'tables', method(:file_open))
 
       file_menu.addAction(@file_open_both)
@@ -383,7 +386,7 @@ module Cosmos
       file_menu.addAction(@exit_action)
 
       unless no_tables
-        table_menu = menuBar.addMenu(tr('&Table'))
+        table_menu = menuBar.addMenu('&Table')
         table_menu.addAction(@table_check)
         table_menu.addAction(@table_default)
         table_menu.addAction(@table_hex)
@@ -409,9 +412,9 @@ module Cosmos
       # Create the information pane with the filenames
       filename_layout = Qt::FormLayout.new
       @table_def_label = Qt::Label.new("")
-      filename_layout.addRow(tr("Definition File:"), @table_def_label)
+      filename_layout.addRow("Definition File:", @table_def_label)
       @table_bin_label = Qt::Label.new("")
-      filename_layout.addRow(tr("Binary File:"), @table_bin_label)
+      filename_layout.addRow("Binary File:", @table_bin_label)
       @top_layout.addLayout(filename_layout)
 
       # Separator before editor
@@ -556,7 +559,7 @@ module Cosmos
 
       display_all_gui_data()
       @table_bin_label.text = filename
-      statusBar.showMessage(tr("File Saved Successfully"))
+      statusBar.showMessage("File Saved Successfully")
     rescue TableManagerCore::CoreError, SaveError => err
       Qt::MessageBox.warning(self, "File Save Errors", err.message)
     rescue => err
@@ -1073,8 +1076,8 @@ module Cosmos
             else
               item_name = gui_table.verticalHeaderItem(table_item.row).text
             end
-            details_action = Qt::Action.new(tr("Details"), self)
-            details_action.statusTip = tr("Popup details about #{current_table_name} #{item_name}")
+            details_action = Qt::Action.new("Details", self)
+            details_action.statusTip = "Popup details about #{current_table_name} #{item_name}"
             details_action.connect(SIGNAL('triggered()')) do
               TlmDetailsDialog.new(nil,
                                    'TABLE',
@@ -1084,8 +1087,8 @@ module Cosmos
             end
             menu.addAction(details_action)
 
-            default_action = Qt::Action.new(tr("Default"), self)
-            default_action.statusTip = tr("Set item to default value")
+            default_action = Qt::Action.new("Default", self)
+            default_action.statusTip = "Set item to default value"
             default_action.connect(SIGNAL('triggered()')) do
               item = table.get_item(item_name)
               table.write(item.name, item.default)