cosmos 4.2.4-java → 4.5.0-java

data/lib/cosmos/gui/dialogs/exception_list_dialog.rb

@@ -36,7 +36,7 @@ module Cosmos
       @list = Qt::ListWidget.new
       @exception_list.each_with_index do |exception, index|
         string = "#{index + 1}. #{exception.class} : #{exception.message}"
-        Qt::ListWidgetItem.new(tr(string), @list)
+        Qt::ListWidgetItem.new(string, @list)
       end
       layout.addWidget(@list)
       @list.connect(SIGNAL('itemSelectionChanged ()')) do

data/lib/cosmos/gui/dialogs/find_replace_dialog.rb

@@ -103,9 +103,9 @@ module Cosmos
     def create_input_layout
       input_layout = Qt::FormLayout.new
       @find_box = Qt::LineEdit.new
-      input_layout.addRow(tr("Fi&nd what:"), @find_box)
+      input_layout.addRow("Fi&nd what:", @find_box)
       @replace_box = Qt::LineEdit.new
-      replace_label = Qt::Label.new(tr("Re&place with:"))
+      replace_label = Qt::Label.new("Re&place with:")
       replace_label.setBuddy(@replace_box)
       @replace_items << replace_label
       input_layout.addRow(replace_label, @replace_box)
@@ -141,7 +141,7 @@ module Cosmos
       direction_layout.addWidget(@up)
       direction_layout.addWidget(down)
       direction_layout.addStretch
-      direction = Qt::GroupBox.new(tr("Direction"))
+      direction = Qt::GroupBox.new("Direction")
       direction.setLayout(direction_layout)
       direction
     end

data/lib/cosmos/gui/dialogs/interface_raw_dialog.rb

@@ -43,14 +43,14 @@ module Cosmos
         top_layout = Qt::HBoxLayout.new
         text_layout = Qt::VBoxLayout.new
 
-        title_label = Qt::Label.new(tr(title))
+        title_label = Qt::Label.new(title)
         text_layout.addWidget(title_label)
         @read_raw_data_time = Qt::Label.new("Read Raw Data Time: ")
         text_layout.addWidget(@read_raw_data_time)
         top_layout.addLayout(text_layout)
         top_layout.addStretch(1)
 
-        button = Qt::PushButton.new(tr("Pause"))
+        button = Qt::PushButton.new("Pause")
         top_layout.addWidget(button)
         button.connect(SIGNAL('clicked()')) do
           if button.text == "Pause"

data/lib/cosmos/gui/dialogs/set_tlm_dialog.rb

@@ -20,7 +20,7 @@ module Cosmos
   # are written back into the packet.
   class SetTlmDialog < Qt::Dialog
     # @return [Array<String>] Items which should not be displayed in the dialog
-    IGNORED_ITEMS = ['RECEIVED_TIMESECONDS', 'RECEIVED_TIMEFORMATTED', 'RECEIVED_COUNT', 'PKTID', 'CONFIG']
+    IGNORED_ITEMS = ['PACKET_TIMESECONDS', 'PACKET_TIMEFORMATTED', 'RECEIVED_TIMESECONDS', 'RECEIVED_TIMEFORMATTED', 'RECEIVED_COUNT', 'PKTID', 'CONFIG']
 
     # @return [String] Errors encountered when trying to set the values back
     #   into the packet

data/lib/cosmos/gui/dialogs/tlm_details_dialog.rb

@@ -50,15 +50,15 @@ module Cosmos
         setWindowTitle("#{@target_name} #{@packet_name} #{@item_name} Details")
 
         layout = Qt::VBoxLayout.new
-        layout.addWidget(Qt::Label.new(tr("#{target_name} #{packet_name} #{item_name}")))
+        layout.addWidget(Qt::Label.new("#{target_name} #{packet_name} #{item_name}"))
 
         # Display the item values
-        item_values = Qt::GroupBox.new(tr("Item Values"))
+        item_values = Qt::GroupBox.new("Item Values")
 
         values_layout = Qt::FormLayout.new
         @raw_value = Qt::LineEdit.new
         @raw_value.setReadOnly(true)
-        values_layout.addRow(tr("Raw Value:"), @raw_value)
+        values_layout.addRow("Raw Value:", @raw_value)
         @hex_raw_value = nil
         @hex_raw_num_digits = 0
         case item.data_type
@@ -67,21 +67,21 @@ module Cosmos
             @hex_raw_value = Qt::LineEdit.new
             @hex_raw_value.setReadOnly(true)
             @hex_raw_num_digits = (((item.bit_size - 1) / 8) + 1) * 2
-            values_layout.addRow(tr("Hex Raw Value:"), @hex_raw_value)
+            values_layout.addRow("Hex Raw Value:", @hex_raw_value)
           end
         end
         @converted_value = Qt::LineEdit.new
         @converted_value.setReadOnly(true)
-        values_layout.addRow(tr("Converted Value:"), @converted_value)
+        values_layout.addRow("Converted Value:", @converted_value)
         @formatted_value = Qt::LineEdit.new
         @formatted_value.setReadOnly(true)
-        values_layout.addRow(tr("Formatted Value:"), @formatted_value)
+        values_layout.addRow("Formatted Value:", @formatted_value)
         @formatted_with_units_value = Qt::LineEdit.new
         @formatted_with_units_value.setReadOnly(true)
-        values_layout.addRow(tr("Formatted with Units Value:"), @formatted_with_units_value)
+        values_layout.addRow("Formatted with Units Value:", @formatted_with_units_value)
         @limits_state = Qt::LineEdit.new
         @limits_state.setReadOnly(true)
-        values_layout.addRow(tr("Limits State:"), @limits_state)
+        values_layout.addRow("Limits State:", @limits_state)
 
         item_values.setLayout(values_layout)
         layout.addWidget(item_values)
@@ -101,7 +101,7 @@ module Cosmos
         end
 
         # Display the item details
-        item_details = Qt::GroupBox.new(tr("Item Details"))
+        item_details = Qt::GroupBox.new("Item Details")
         item_details.setLayout(build_details_layout(item, :TLM))
         layout.addWidget(item_details)
 
@@ -159,8 +159,9 @@ module Cosmos
       elsif @limits_layout
         label = Qt::Label.new(label_text)
         @limits_labels[limits_set] = label
-        @limits_layout.addRow(tr("#{limits_set}:"), label)
+        @limits_layout.addRow("#{limits_set}:", label)
       end
+      update_limits_checking()
     end
 
     def determine_limits_color(limit_state)

data/lib/cosmos/gui/dialogs/tlm_graph_dialog.rb

@@ -28,7 +28,7 @@ module Cosmos
     # @param target_name [String] Name of the target
     # @param packet_name [String] Name of the packet
     # @param item_name [String] Name of the item
-    def initialize(parent, target_name, packet_name, item_name)
+    def initialize(parent, target_name, packet_name, item_name, replay = false)
       packet, item = System.telemetry.packet_and_item(target_name, packet_name, item_name)
 
       num_array_elements = 0
@@ -101,7 +101,9 @@ module Cosmos
 
       # Start grapher if necessary
       if !item_string.empty?
-        Cosmos.run_cosmos_tool("TlmGrapher", "#{item_string} --system #{File.basename(System.initial_filename)}")
+        options = "#{item_string} --system #{File.basename(System.initial_filename)}"
+        options += " --replay" if replay
+        Cosmos.run_cosmos_tool("TlmGrapher", options)
       end
     end
   end

data/lib/cosmos/gui/opengl/earth_model.rb

@@ -19,7 +19,7 @@ module Cosmos
     # @param y (see TextureMappedSphere#initialize)
     # @param z (see TextureMappedSphere#initialize)
     def initialize(x, y, z)
-      super(x, y, z, File.join(::Cosmos::PATH, 'data', 'EarthMap1024x512.gif'))
+      super(x, y, z, File.join(::Cosmos::PATH, 'data', 'Earthmap1024x512.gif'))
     end
   end
 end

data/lib/cosmos/gui/qt.rb

@@ -12,6 +12,7 @@
 # adding workarounds should they be needed to work through problems with
 # interacting with QT from Ruby.
 
+require 'stringio'
 require 'cosmos'
 check_filename = File.join(Cosmos::USERPATH, "#{File.basename($0, File.extname($0))}_qt_check.txt")
 qt_in_system_folder = false
@@ -70,8 +71,16 @@ if Kernel.is_windows?
   end
 end
 
+if Kernel.is_windows?
+  temp_stderr = $stderr.clone
+  $stderr.reopen(File.new('nul', 'w'))
+end
 # This will either lock up or raise an error if older Qt dlls are present in the Windows system folders
-require 'Qt'
+begin
+  require 'Qt'
+ensure
+  $stderr.reopen(temp_stderr) if Kernel.is_windows?
+end
 File.delete(check_filename) if Kernel.is_windows? and File.exist?(check_filename)
 
 module Cosmos
@@ -165,8 +174,10 @@ module Cosmos
     FONTS[font_face][font_size][font_attrs] ||= {}
     font = FONTS[font_face][font_size][font_attrs][font_italics]
     unless font
-      if font_attrs and font_italics
+      if font_attrs && font_italics
         font = Qt::Font.new(font_face, font_size, font_attrs, font_italics)
+      elsif font_attrs
+        font = Qt::Font.new(font_face, font_size, font_attrs)
       else
         font = Qt::Font.new(font_face, font_size)
       end

data/lib/cosmos/gui/qt_tool.rb

@@ -14,10 +14,12 @@ require 'cosmos/gui/dialogs/about_dialog'
 require 'cosmos/gui/dialogs/exception_dialog'
 require 'cosmos/gui/dialogs/pry_dialog'
 require 'cosmos/gui/dialogs/scroll_text_dialog'
+require 'cosmos/gui/utilities/classification_banner'
 require 'ostruct'
 require 'optparse'
 
 module Cosmos
+
   # Base class of all COSMOS GUI Tools based on QT. It creates the help menu
   # which contains the About menu option. It provides configuration to all
   # tools to remember both the application window location and size across
@@ -28,6 +30,8 @@ module Cosmos
 
     @@redirect_io_thread = nil
 
+    include ClassificationBanner
+
     # Create a new application. IO is redirected such that writing to stdout or
     # stderr will result in a popup to be displayed to the user. Thus
     # applications should not write to stdout (i.e. puts or write) or stderr
@@ -56,14 +60,28 @@ module Cosmos
       @stylesheet = ''
       @stylesheet = File.read(app_style) if File.exist? app_style
 
-      # Get the source file location of the tool calling this method
-      location = self.class.instance_method(:initialize).source_location[0]
-      tool_name = location.split('/')[-2]
-      config_dir = File.join(Cosmos::USERPATH, 'config', 'tools', tool_name)
-      if File.exist? config_dir
-        @options.config_dir = config_dir
-        @options.config_file = config_path(@options.config_file, ".txt", tool_name)
-        @options.stylesheet = config_path(@options.stylesheet, ".css", tool_name)
+      self.class.normalize_config_options(@options)
+
+      # Add a banner based on system configuration
+      add_classification_banner
+    end
+
+    # Normalizes config_dir, config_file, and stylesheet options
+    def self.normalize_config_options(options)
+      # Determine the tool name based on the class
+      tool_name = self.to_s.class_name_to_filename.split('.')[0] # remove .rb
+      options.config_dir = File.join(Cosmos::USERPATH, 'config', 'tools', tool_name) unless options.config_dir
+      tool_name = options.config_dir.split('/')[-1]
+      if File.exist?(options.config_dir)
+        options.config_file = config_path(options, options.config_file, ".txt", tool_name)
+        options.stylesheet = config_path(options, options.stylesheet, ".css", tool_name)
+      elsif options.config_file == true
+        # If the config_file is required and the config_dir doesn't exist then
+        # this is a core COSMOS configuration error so just raise an error
+        raise "ERROR! config_dir #{options.config_dir} does not exist. tool_name = #{tool_name}"
+      else
+        options.config_file = nil
+        options.stylesheet = nil
       end
     end
 
@@ -72,41 +90,51 @@ module Cosmos
     # directory is prepended to the filename. If no file is given a default is
     # generated based on the application name.
     #
-    # @param filename [String] Path to a configuration file
+    # @param filename [String|Boolean|nil] Path to a configuration file which means
+    #   the file must be found. true which means that a default configuration file
+    #   is required and must be found. nil which means a default file is acceptable
+    #   but not required.
     # @param type [String] File extension, e.g. '.txt'
     # @param tool_name [String] Name of the tool calling this method
-    # @return [String|nil] Path to a configuration file. If a filename was
-    #   passed and the configuration file is not found, the original filename
-    #   is returned. If no filename was passed nil is returned.
-    def config_path(filename, type, tool_name)
-      return filename if filename && File.exist?(filename)
-      if filename
-        # Add the configuration dir onto the filename
-        new_filename = File.join(@options.config_dir, filename)
-        return new_filename if File.exist?(new_filename)
-      else
-        # No file passed so default to a file named after the class
-        new_filename = File.join(@options.config_dir, "#{tool_name}#{type}")
+    # @return [String|nil] Path to an existing configuration file. nil is returned
+    #   if filename is nil and the default is not found. An error is raised if
+    #   filename is a string or true and it is not found.
+    def self.config_path(options, filename, type, tool_name)
+      # First check for an absolute path
+      return filename if filename && filename != true && File.exist?(filename)
+      # Build a default filename
+      default_filename = File.join(options.config_dir, "#{tool_name}#{type}")
+      if filename == true # The config file is required but not given
+        return default_filename if File.exist?(default_filename)
+        message = "\n\nDefault configuration file #{default_filename} not found.\n"\
+          "Either create this file or pass a configuration filename using the --config option.\n"
+        raise message
+      elsif filename # Filename was given so look for it in the config dir
+        new_filename = File.join(options.config_dir, filename)
         return new_filename if File.exist?(new_filename)
+        # If a filename is passed in it is an error if it does not exist
+        raise "\n\nConfiguration file #{new_filename} not found.\n"
       end
-      filename
+      # If filename is nil check for the default and return it
+      return default_filename if File.exist?(default_filename)
+      nil # return nil if filename is nil and the default is not found
     end
 
     # Create the exit_action and the about_action. The exit_action is not
     # placed in the File menu and must be manually added by the user. The
     # about_action is added to the Help menu by {#initialize_help_menu}.
     def initialize_actions
-      @exit_action = Qt::Action.new(Cosmos.get_icon('close.png'), tr('E&xit'), self)
-      @exit_keyseq = Qt::KeySequence.new(tr('Ctrl+Q'))
+      @exit_action = Qt::Action.new(Cosmos.get_icon('close.png'), 'E&xit', self)
+      @exit_keyseq = Qt::KeySequence.new('Ctrl+Q')
       @exit_action.shortcut = @exit_keyseq
-      @exit_action.statusTip = tr('Exit the application')
+      @exit_action.statusTip = 'Exit the application'
       connect(@exit_action, SIGNAL('triggered()'), self, SLOT('close()'))
 
-      @about_action = Qt::Action.new(Cosmos.get_icon('help.png'), tr('&About'), self)
-      @about_action.statusTip = tr('About the application')
+      @about_action = Qt::Action.new(Cosmos.get_icon('help.png'), '&About', self)
+      @about_action.statusTip = 'About the application'
       connect(@about_action, SIGNAL('triggered()'), self, SLOT('about()'))
-      @documentation_action = Qt::Action.new(tr('&Documentation'), self)
-      @documentation_action.statusTip = tr('COSMOS Online Documentation')
+      @documentation_action = Qt::Action.new('&Documentation', self)
+      @documentation_action.statusTip = 'COSMOS Online Documentation'
       self.connect(@documentation_action, SIGNAL('triggered()')) do
         Qt::DesktopServices.openUrl(Qt::Url.new("http://cosmosrb.com"))
       end
@@ -130,7 +158,7 @@ module Cosmos
       default_dirs = [default_dirs] unless default_dirs.is_a? Array
       default_dirs.each do |default_dir|
         default_context = default_dir.split('/')[-2..-1].join('/')
-        action = Qt::Action.new(tr(default_context), self)
+        action = Qt::Action.new(default_context, self)
         action.statusTip = status_tip if status_tip
         action.connect(SIGNAL('triggered()')) { callback.call(default_dir) }
         menu.addAction(action)
@@ -149,7 +177,7 @@ module Cosmos
           else
             name = "#{target_name}/#{target_sub_dir}"
           end
-          action = Qt::Action.new(tr(name), self)
+          action = Qt::Action.new(name, self)
           action.statusTip = status_tip if status_tip
           action.connect(SIGNAL('triggered()')) { callback.call(dir) }
           menu.addAction(action)
@@ -160,7 +188,7 @@ module Cosmos
     # Creates the Help menu and adds the about_action to it. Thus this MUST be
     # called after initialize_actions.
     def initialize_help_menu
-      @help_menu = menuBar().addMenu(tr('&Help'))
+      @help_menu = menuBar().addMenu('&Help')
       @help_menu.addAction(@about_action)
       @help_menu.addAction(@documentation_action)
     end
@@ -181,28 +209,26 @@ module Cosmos
 
       # Handle manually positioning the window
       unless @options.auto_position
-        # Get the desktop's geometry
-        desktop = Qt::Application.desktop
-
-        # Handle position relative to right edge
-        @options.x = desktop.width - frameGeometry().width + @options.x + 1 if @options.x < 0
-
-        # Handle position relative to bottom edge
-        @options.y = desktop.height - frameGeometry().height + @options.y + 1 if @options.y < 0
-
         # Move to the desired position
         move(@options.x, @options.y)
       end
 
       if @options.remember_geometry and !@options.command_line_geometry
+        # Get the desktop's geometry
+        desktop = Qt::Application.desktop
+        screen = desktop.screen
         settings = Qt::Settings.new('Ball Aerospace', self.class.to_s)
         if settings.contains('size') and @options.restore_size and @options.startup_state != :DEFAULT
           size = settings.value('size').toSize
-          resize(size)
+          if size.height > 0 and size.height < screen.height and size.width > 0 and size.width < screen.width
+            resize(size)
+          end
         end
         if settings.contains('position') and @options.restore_position
           position = settings.value('position').toPoint
-          move(position)
+          if position.x > 0 and position.y > 0 and position.x < screen.width and position.y < screen.height
+            move(position)
+          end
         end
       end
 
@@ -326,6 +352,8 @@ module Cosmos
       options.restore_size = true
       options.redirect_io = true
       options.title = "COSMOS Tool"
+      options.config_file = nil
+      options.stylesheet = nil
 
       parser = OptionParser.new do |option_parser|
         option_parser.banner = "Usage: ruby #{option_parser.program_name} [options]"

data/lib/cosmos/gui/text/ruby_editor.rb

@@ -24,6 +24,7 @@ module Cosmos
     signals 'breakpoint_set(int)'
     signals 'breakpoint_cleared(int)'
     signals 'breakpoints_cleared()'
+    signals 'font_changed(const QFont &)'
 
     attr_accessor :enable_breakpoints
     attr_accessor :filename
@@ -75,67 +76,63 @@ module Cosmos
 
       RULES = []
       RUBY_KEYWORDS.each do |w|
-        RULES << ['\b'+w+'\b', 0, STYLES['ruby_keyword']]
+        RULES << ['\b'+w+'\b', STYLES['ruby_keyword']]
       end
       Script.private_instance_methods.each do |w|
-        RULES << ['\b'+w.to_s+'\b', 0, STYLES['cosmos_keyword']]
+        RULES << ['\b'+w.to_s+'\b', STYLES['cosmos_keyword']]
       end
       BRACES.each do |b|
-        RULES << ["#{b}", 0, STYLES['brace']]
+        RULES << ["#{b}", STYLES['brace']]
       end
       RULES.concat([
           # 'def' followed by an identifier
-          ['\bdef\b\s*(\w+)', 1, STYLES['method']],
+          ['\bdef\b\s*(\w+)', STYLES['method']],
           # 'class' followed by an identifier
-          ['\bclass\b\s*(\w+)', 1, STYLES['class']],
+          ['\bclass\b\s*(\w+)', STYLES['class']],
           # Ruby symbol
-          [':\b\w+', 0, STYLES['symbol']],
+          [':\b\w+', STYLES['symbol']],
           # Ruby namespace operator
-          ['\b\w+(::\b\w+)+', 0, STYLES['class']],
+          ['\b\w+(::\b\w+)+', STYLES['class']],
           # Ruby global
-          ['\\$\b\w+', 0, STYLES['string']],
+          ['\\$\b\w+', STYLES['string']],
           # Regex, possibly containing escape sequences
-          ["/.*/", 0, STYLES['string']],
+          ["/.*/", STYLES['string']],
           # Double-quoted string, possibly containing escape sequences
-          ['"([^"\\\\]|\\\\.)*"', 0, STYLES['string']],
+          ['"(?:[^"\\\\]|\\\\.)*"', STYLES['string']],
           # Match interpolated strings "blah #{code} blah"
-          ['(\#\\{)[^\\}]*\\}', 1, STYLES['brace']],
-          ['\#\\{[^\\}]*(\\})', 1, STYLES['brace']],
-          ['\#\\{([^\\}]*)\\}', 1, STYLES['normal']],
+          # This comes before single-quote and back-tick because
+          # those strings should not interpolate variables
+          ['(\#\\{)[^\\}]*\\}', STYLES['brace']],
+          ['\#\\{[^\\}]*(\\})', STYLES['brace']],
+          ['\#\\{([^\\}]*)\\}', STYLES['normal']],
           # Single-quoted string, possibly containing escape sequences
-          ["'[^'\\\\]*(\\.[^'\\\\]*)*'", 0, STYLES['string']],
+          ["'[^'\\\\]*(?:\\.[^'\\\\]*)*'", STYLES['string']],
           # Back-tick string, possibly containing escape sequences
-          ["`[^`\\\\]*(\\.[^`\\\\]*)*`", 0, STYLES['string']],
-          # A single # possibly followed by matched quotes
-          ['#(?=([^\'"]*(\'|")[^\'"]*(\'|"))*[^\'"]*$).*', 0, STYLES['comment']],
+          ["`[^`\\\\]*(\\.[^`\\\\]*)*`", STYLES['string']],
+          # Double quoted string | single quoted string | comment
+          # We don't want the first two but we want the last
+          ["\"[^\"]*\"|\'[^\']*\'|(#.*)", STYLES['comment']],
       ])
 
-      # Build a QRegExp for each pattern
+      # Build a RegExp for each pattern
       RULES_INFO = []
-      RULES.each do |pat, index, fmt|
-        RULES_INFO << [Qt::RegExp.new(pat, Qt::CaseSensitive, Qt::RegExp::RegExp2), index, fmt]
+      RULES.each do |pat, fmt|
+        RULES_INFO << [Regexp.new(pat), fmt]
       end
 
       def highlightBlock(text)
         # Do other syntax formatting
-        RULES_INFO.each do |expression, nth, format|
-          index = expression.indexIn(text, 0)
-          last_index = index
-          last_length = -1
-          while index >= 0
-            # We actually want the index of the nth match
-            index = expression.pos(nth)
-            # Bail if the index goes negative because it means
-            # we won't have a valid capture
-            break if index < 0
-            length = expression.cap(nth).length()
-            break if length <= 0
-            # Break if we're in an endless loop
-            break if (last_index == index and last_length == length)
-            last_length = length
-            last_index = index
-            self.setFormat(index, length, format)
-            index = expression.indexIn(text, index + length)
+        RULES_INFO.each do |expression, format|
+          match = text.scan(expression).flatten.compact
+          next unless match && !match.empty?
+          i = 0 # initial string match offset
+          match.each do |part|
+            # Index the match part starting at the offset
+            index = text.index(part, i)
+            self.setFormat(index, part.length, format)
+            # Increment the index so we can match the same string
+            # in two different locations in the text, e.g. "#{x} #{y}"
+            i = index + part.length
           end
         end
       end
@@ -156,10 +153,10 @@ module Cosmos
     CHAR_57 = Qt::Char.new(57)
     BREAKPOINT_SET = 1
     BREAKPOINT_CLEAR = -1
+    MINIMUM_POINT_SIZE = 4
 
-    def initialize(parent)
+    def initialize(parent, font = Cosmos.get_default_font)
       super(parent)
-      font = Cosmos.get_default_font
       setFont(font)
       @fontMetrics = Cosmos.getFontMetrics(font)
 
@@ -180,6 +177,18 @@ module Cosmos
       line_count_changed(-1)
     end
 
+    def wheelEvent(event)
+      if event.modifiers() == Qt::ControlModifier && event.delta > 0
+        event.setAccepted(true)
+        zoom_in()
+      elsif event.modifiers() == Qt::ControlModifier && event.delta < 0
+        event.setAccepted(true)
+        zoom_out()
+      else
+        super(event)
+      end
+    end
+
     def dispose
       super()
       @syntax.dispose
@@ -288,6 +297,31 @@ module Cosmos
       cursor.endEditBlock
     end
 
+    def zoom_in
+      font = Cosmos.getFont(font().family, font().pointSize + 1)
+      setFont(font)
+      @fontMetrics = Cosmos.getFontMetrics(font)
+      emit font_changed(font)
+    end
+
+    def zoom_out
+      return if font().pointSize <= MINIMUM_POINT_SIZE
+      font = Cosmos.getFont(font().family, font().pointSize - 1)
+      setFont(font)
+      @fontMetrics = Cosmos.getFontMetrics(font)
+      emit font_changed(font)
+    end
+
+    def zoom_default
+      font = Cosmos.get_default_font
+      setFont(font)
+      @fontMetrics = Cosmos.getFontMetrics(font)
+      # Force a repaint of the number area by doing a small scroll
+      verticalScrollBar.setValue(verticalScrollBar.minimum+1)
+      verticalScrollBar.setValue(verticalScrollBar.minimum)
+      emit font_changed(font)
+    end
+
     def resizeEvent(e)
       super(e)
       cr = self.contentsRect()
@@ -302,6 +336,7 @@ module Cosmos
 
     def line_number_area_paint_event(event)
       painter = Qt::Painter.new(@lineNumberArea)
+      painter.setFont(font())
       # Check for weird bad initialization conditions
       if painter.isActive and not painter.paintEngine.nil?
         event_rect = event.rect()
@@ -397,14 +432,21 @@ module Cosmos
     end
 
     def line_at_point(point)
-      line = point.y / @fontMetrics.height() + 1 +
-        firstVisibleBlock().blockNumber()
-      yield line if line <= document.blockCount()
+      block_num = firstVisibleBlock().blockNumber()
+      while block_num < document.blockCount()
+        block = document.findBlockByNumber(block_num)
+        top, bottom = block_top_and_bottom(block)
+        if (top..bottom).include?(point.y)
+          yield block_num + 1
+          break
+        end
+        block_num += 1
+      end
     end
 
     def create_add_breakpoint_action(point)
-      action = Qt::Action.new(tr("Add Breakpoint"), self)
-      action.statusTip = tr("Add a breakpoint at this line")
+      action = Qt::Action.new("Add Breakpoint", self)
+      action.statusTip = "Add a breakpoint at this line"
       action.connect(SIGNAL('triggered()')) do
         line_at_point(point) do |line|
           add_breakpoint(line)
@@ -415,8 +457,8 @@ module Cosmos
     end
 
     def create_clear_breakpoint_action(point)
-      action = Qt::Action.new(tr("Clear Breakpoint"), self)
-      action.statusTip = tr("Clear an existing breakpoint at this line")
+      action = Qt::Action.new("Clear Breakpoint", self)
+      action.statusTip = "Clear an existing breakpoint at this line"
       action.connect(SIGNAL('triggered()')) do
         line_at_point(point) do |line|
           clear_breakpoint(line)
@@ -427,8 +469,8 @@ module Cosmos
     end
 
     def create_clear_all_breakpoints_action
-      action = Qt::Action.new(tr("Clear All Breakpoints"), self)
-      action.statusTip = tr("Clear all existing breakpoints")
+      action = Qt::Action.new("Clear All Breakpoints", self)
+      action.statusTip = "Clear all existing breakpoints"
       action.connect(SIGNAL('triggered()')) do
         clear_breakpoints
         emit breakpoints_cleared