ifmapper 0.9.9 → 1.0.0

data/lib/IFMapper/FXMapFileDialog.rb

@@ -7,13 +7,18 @@
 class FXMapFileDialog < FXFileDialog
   @@last_path = nil
 
-  KNOWN_EXTENSIONS = [
-    "Map Files (*.map,*.gmp,*.ifm,*.inf,*.t,*.t3m)",
-    "All Files (*)",
+  KNOWN_LOAD_EXTENSIONS = [
+    "#{EXT_MAP_FILES} (*.map,*.gmp,*.ifm,*.inf,*.t,*.t3m)",
+    EXT_ALL_FILES,
+  ]
+
+  KNOWN_SAVE_EXTENSIONS = [
+    "#{EXT_MAP_FILES} (*.map,*.gmp,*.ifm,*.inf,*.inform,*.t,*.t3m)",
+    EXT_ALL_FILES,
   ]
 
 
-  def initialize(parent, title, patterns = KNOWN_EXTENSIONS)
+  def initialize(parent, title, patterns = KNOWN_LOAD_EXTENSIONS)
     opts = 0
     if RUBY_PLATFORM =~ /mswin/
       opts |= FILEMATCH_NOESCAPE

data/lib/IFMapper/FXMapperSettings.rb

@@ -1,8 +1,31 @@
 
+begin
+  require 'iconv'
+rescue LoadError
+  $stderr.puts 'Iconv could not be loaded.  Languages other than English will have problems'
+  class Iconv
+    def initialize(to, from)
+    end
+
+    def iconv(a)
+      a
+    end
+  end
+end
+
+
 #
 # This class contains the applicatio and map's settings
 #
 class FXMapperSettings < Hash
+
+  class UnknownParameter < StandardError; end;
+
+  #
+  # Return the home location
+  #
+  # Result: home location for user
+  #
   def home
     if ENV['HOME']
       homedir = File.expand_path('~')
@@ -17,6 +40,12 @@ class FXMapperSettings < Hash
     return homedir
   end
 
+
+  #
+  # Write out the preferences to disk.
+  #
+  # Result: none
+  #
   def write
     begin
       file = home + '/.ifmapper'
@@ -29,47 +58,148 @@ class FXMapperSettings < Hash
     end
   end
 
+
+  if RUBY_PLATFORM =~ /mswin/
+    require 'Win32API'
+    LOCALE_USER_DEFAULT = 0x400
+    LOCALE_SLANGUAGE    = 0x1001
+
+    FORMAT_MESSAGE_FROM_SYSTEM      = 0x00001000
+    FORMAT_MESSAGE_ARGUMENT_ARRAY   = 0x00002000 
+    FormatMessage = Win32API.new("kernel32","FormatMessage","LPLLPLP","L")  
+    GetLastError  = Win32API.new("kernel32","GetLastError",[],"L") 
+    GetLocaleInfo = Win32API.new('Kernel32.dll', 'GetLocaleInfo',
+				 %w{l l p i}, 'i')
+
+    LANGUAGES = {
+      /English/  => 'en',
+      /Spanish/  => 'es',
+      # todo1
+      /German/   => 'de',
+      /Italian/  => 'it',
+      /French/   => 'fr',
+      /Japanese/ => 'ja',
+      /Chinese/  => 'ch',
+      /Korean/   => 'ko',
+      /Arabic/   => 'ar',
+      /Hebrew/   => 'he',
+    }
+  end
+
+
+  #
+  # Restore user preferences
+  #
+  # Result: 
+  #
   def initialize
+    has_yaml = true
     begin
+      require 'yaml'
       f = home + '/.ifmapper'
       self.replace( YAML.load_file(f) )
+    rescue LoadError
+      has_yaml = false
     rescue
     end
 
+    if RUBY_PLATFORM =~ /mswin/
+      lcid   = LOCALE_USER_DEFAULT
+      lctype = LOCALE_SLANGUAGE
+      slanguage = '\0' * 256
+      len = 256
+      ret = GetLocaleInfo.call lcid, lctype, slanguage, len
+      if ret == 0
+	error_code = GetLastError.call
+	msg = " " * 255
+	FormatMessage.call(
+            FORMAT_MESSAGE_FROM_SYSTEM +
+            FORMAT_MESSAGE_ARGUMENT_ARRAY,
+            '',
+            error_code,
+            0,
+            msg,
+            255,
+            ''
+         )
+	msg.gsub!(/\000/, '')
+	msg.strip!
+	$stderr.puts msg
+      end
+      language = 'en'
+      LANGUAGES.each { |re, locale|
+	if slanguage =~ re
+	  language = locale
+	  break
+	end
+      }
+    else
+      locale = ENV['LC_ALL'] || ENV['LC_CTYPE'] || 'en_US'
+      language = locale[0,2]
+    end
+
+    while ARGV.size > 0
+      param = ARGV.shift
+      case param
+      when /^-l(anguage)?$/
+	language = ARGV.shift
+	language = language[0,2].downcase
+	self['Language'] = language
+      else
+	$stderr.puts "Unknown parameter '#{param}'."
+	exit(1)
+      end
+    end
+
     defaults = {
-		     # Colors
-		     'BG Color'           => 'dark grey',
-		     'Arrow Color'        => 'black',
-		     'Box BG Color'       => 'white',
-		     'Box Darkness Color' => 'grey',
-		     'Box Border Color'   => 'black',
-		     'Box Number Color'   => 'grey',
-		     
-		     # Fonts
-		     'Font Text'          => 'Times',
-		     'Font Objects'       => 'Times',
-		     
-		     # Creation options
-		     'Create on Connection' => true,
-		     'Edit on Creation'     => false,
-		     'Automatic Connection' => true,
-
-
-		     # Display options
-		     'Use Room Cursor'      => false,
-		     'Paths as Curves'      => true,
-
-                     # Location options
-                     'Location Tasks'           => true,
-                     'Location Description'     => false,
-		     'Location Numbers'         => true,
-
-                     # Grid options
-		     'Grid Boxes' => true,
-		     'Grid Straight Connections' => true,
-		     'Grid Diagonal Connections' => false,
-		 }
+      # Language
+      'Language' => language,
+
+      # Colors
+      'BG Color'           => 'dark grey',
+      'Arrow Color'        => 'black',
+      'Box BG Color'       => 'white',
+      'Box Darkness Color' => 'grey',
+      'Box Border Color'   => 'black',
+      'Box Number Color'   => 'grey',
+      
+      # Fonts
+      'Font Text'          => 'Times',
+      'Font Objects'       => 'Times',
+      
+      # Creation options
+      'Create on Connection' => true,
+      'Edit on Creation'     => false,
+      'Automatic Connection' => true,
+
+
+      # Display options
+      'Use Room Cursor'      => false,
+      'Paths as Curves'      => true,
+
+      # Location options
+      'Location Tasks'           => true,
+      'Location Description'     => false,
+      'Location Numbers'         => true,
+
+      # Grid options
+      'Grid Boxes' => true,
+      'Grid Straight Connections' => true,
+      'Grid Diagonal Connections' => false,
+
+    }
 
     self.replace( defaults.merge(self) )
+    language = self['Language']
+
+    begin
+      require "IFMapper/locales/#{language}/Messages.rb"
+    rescue LoadError => e
+      puts "Language '#{language}' was not found."
+    end
+
+    unless has_yaml
+      $stderr.puts ERR_NO_YAML
+    end
   end
 end

data/lib/IFMapper/FXMapperWindow.rb

@@ -1,4 +1,5 @@
 
+
 begin
   $rubygems = false
   require 'rubygems'
@@ -7,9 +8,9 @@ rescue LoadError
 end
 
 def no_fox
-  $stderr.puts "Please install the FXRuby (FOX) library v1.2 or later."
+  $stderr.puts ERR_NO_FOX
   if $rubygems
-    $stderr.puts "You can usually do so if you do 'gem install -r fxruby'."
+    $stderr.puts ERR_HAS_GEMS
   end
   exit(1)
 end
@@ -33,39 +34,38 @@ def get_fox
   no_fox if ver.to_i < 1 or rev.to_i < 2
 end
 
+
 get_fox
 include Fox
 
-begin
-  require 'yaml'
-rescue LoadError => e
-  $stderr.puts "Please install the yaml library."
-  $stderr.puts "Without it, preferences cannot be loaded or saved."
-end
-
-
-
 require 'IFMapper/FXMap'
 require 'IFMapper/FXMapperSettings'
 require 'IFMapper/FXWarningBox'
-require 'IFMapper/FXAboutDialogBox'
-require 'IFMapper/FXSearchDialogBox'
-require 'IFMapper/FXMapFileDialog'
-require 'IFMapper/FXMapColorBox'
-require 'IFMapper/FXRoomList'
-
 
 
 class FXMapperWindow < FXMainWindow
 
   PROGRAM_NAME = "Interactive Fiction Mapper"
-  VERSION      = '0.9.8'
-  AUTHOR       = "Gonzalo Garramuno"
-  TITLE = "#{PROGRAM_NAME} v#{VERSION} - Written by #{AUTHOR}"
+  VERSION      = '1.0.0'
+  AUTHOR = "Gonzalo Garramuño"
 
   @@copy_buffer = nil
   @@default_options = FXMapperSettings.new
 
+  LANGUAGES = {
+    'English'  => 'en',
+    'Español' => 'es',
+    # todo1
+    'Deutsch'  => 'de',
+    'Italiano' => 'it',
+    'Fran�ais' => 'fr',
+    # todo2
+    'Japanese' => 'ja',
+    'Chinese'  => 'ch',
+    'Korean'   => 'ko',
+    'Arabic'   => 'ar',
+  }
+
   def open_map(file)
     tmp = nil
     begin
@@ -151,7 +151,8 @@ class FXMapperWindow < FXMainWindow
   # Callback to Open File
   #
   def open_cb(sender, sel, ptr)
-    file = FXMapFileDialog.new(self, "Load New Map").filename
+    require 'IFMapper/FXMapFileDialog'
+    file = FXMapFileDialog.new(self, MSG_LOAD_MAP).filename
     return if file == ''
 
     # First, make sure we don't have it loaded already...
@@ -182,7 +183,7 @@ class FXMapperWindow < FXMainWindow
     else
       map = @maps[0]
     end
-    status "Loading '#{file}'..."
+    status "#{MSG_LOADING} '#{file}'..."
 
     tmp = nil
     if file =~ /\.ifm$/i
@@ -202,7 +203,7 @@ class FXMapperWindow < FXMainWindow
       w = FXWarningBox.new( self, 
 			   "#{tmp}")
       w.execute
-      status "Could not load '#{file}'." 
+      status "#{ERR_COULD_NOT_LOAD} '#{file}'." 
       if make_new_map
 	if map.close_cb
 	  @maps.delete(map)
@@ -220,7 +221,7 @@ class FXMapperWindow < FXMainWindow
     map.window.create
     map.modified = false
     update_map
-    status "Loaded '#{file}'."
+    status "#{MSG_LOADED} '#{file}'."
   end
 
   #
@@ -269,11 +270,21 @@ class FXMapperWindow < FXMainWindow
     m.window.create
   end
 
+  #
+  # Callback used to change language
+  #
+  def language_cb(sender, msg, opts)
+    @@default_options['Language'] = LANGUAGES[sender.text]
+    
+    require "IFMapper/locales/#{language}/Messages.rb"
+    recreate
+  end
+
   #
   # Create a new map
   #
   def new_map
-    mapname  = "Empty Map \##{@maps.size+1}"
+    mapname  = "#{MSG_EMPTY_MAP} \##{@maps.size+1}"
     @maps.push( FXMap.new(mapname, @mdiclient, @@default_options.dup,
 			  @mdiicon, @mdimenu, MDI_NORMAL, 0, 0, 790, 500) )
     map = @maps[-1]
@@ -309,7 +320,7 @@ class FXMapperWindow < FXMainWindow
       }
       icon
     rescue
-      raise RuntimeError, "Couldn't load icon: #{filename}"
+      raise RuntimeError, "#{ERR_NO_ICON} #{filename}"
     end
   end
 
@@ -334,7 +345,7 @@ class FXMapperWindow < FXMainWindow
   #
   # Popup a printer dialog and return the settings or false if user cancels
   #
-  def printer_dialog(title = 'Print Map')
+  def printer_dialog(title = MSG_PRINT_MAP)
     map = current_map
     dlg = FXPrintDialog.new(self, title + " for #{map.name}")
     dlg.printer.flags |= PRINT_DEST_PAPER 
@@ -349,13 +360,11 @@ class FXMapperWindow < FXMainWindow
     map = current_map
     return unless map
 
-    w = FXWarningBox.new( self, 
-			 "Sorry, but printing is not yet implemented\n" + 
-			 "in this version.")
+    w = FXWarningBox.new( self, ERR_NO_PRINTING)
     w.execute
     return
 
-    printer = printer_dialog "Print Locations"
+    printer = printer_dialog MSG_PRINT_LOC
     map.print_locations( printer ) if printer
   end
 
@@ -366,9 +375,10 @@ class FXMapperWindow < FXMainWindow
     map = current_map
     return unless map
 
-    d = FXMapFileDialog.new(self, "Save Map as IFM File", 
+    require 'IFMapper/FXMapFileDialog'
+    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_IFM, 
 			    [
-			      "IFM Map (*.ifm)"
+			      FMT_IFM
 			    ])
     map.export_ifm(d.filename) if d.filename != ''
   end
@@ -380,9 +390,10 @@ class FXMapperWindow < FXMainWindow
     map = current_map
     return unless map
 
-    d = FXMapFileDialog.new(self, "Save Map as Inform Files", 
+    require 'IFMapper/FXMapFileDialog'
+    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_INFORM, 
 			    [
-			      "Inform Source Code (*.inf,*.inform)",
+			      FMT_INFORM,
 			    ])
     map.export_inform( d.filename ) if d.filename != ''
   end
@@ -396,10 +407,10 @@ class FXMapperWindow < FXMainWindow
     return unless map
 
     require 'IFMapper/TADSWriter'
-
-    d = FXMapFileDialog.new(self, "Save Map as TADS Files", 
+    require 'IFMapper/FXMapFileDialog'
+    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_TADS, 
 			    [
-			      "TADS Source Code (*.t)"
+			      FMT_TADS
 			    ])
     map.export_tads( d.filename ) if d.filename != ''
   end
@@ -420,9 +431,10 @@ class FXMapperWindow < FXMainWindow
       return
     end
 
-    d = FXMapFileDialog.new(self, "Save Acrobat PDF File", 
+    require 'IFMapper/FXMapFileDialog'
+    d = FXMapFileDialog.new(self, MSG_SAVE_MAP_AS_PDF, 
 			    [
-			      "Acrobat PDF (*.pdf)"
+			      FMT_PDF
 			    ])
     if d.filename != ''
       map.pdf_export(d.filename)
@@ -436,9 +448,7 @@ class FXMapperWindow < FXMainWindow
     map = current_map
     return unless map
 
-    w = FXWarningBox.new( self, 
-			 "Sorry, but printing is not yet implemented\n" + 
-			 "in this version.")
+    w = FXWarningBox.new( self, ERR_NO_PRINTING )
     w.execute
     return
     require 'IFMapper/MapPrinting'
@@ -540,8 +550,7 @@ class FXMapperWindow < FXMainWindow
     sel = @@copy_buffer
     pos = map.find_empty_area( sel[0] )
     if not pos
-      w = FXWarningBox.new( map.window, 
-			   "Sorry. No free room in map to paste the nodes.")
+      w = FXWarningBox.new( map.window, ERR_NO_FREE_ROOM)
       w.execute
     else
       map.clear_selection
@@ -627,7 +636,7 @@ class FXMapperWindow < FXMainWindow
   #
   def hilite_matches(map, matches, re, idx = 0 )
     if matches.size == 0
-      status "No matches for regex '#{re}'."
+      status "#{ERR_NO_MATCHES} '#{re}'."
       return
     end
 
@@ -650,7 +659,7 @@ class FXMapperWindow < FXMainWindow
     map.center_view_on_room( room )
     update_section
 
-    status "'#{room.name}' matches. #{matches.size} matches in map, #{num.size} in section."
+    status "'#{room.name}' #{MSG_MATCHES}. #{matches.size} #{MSG_MATCHES_IN_MAP}, #{num.size} #{MSG_MATCHES_IN_SECTION}."
     map.draw
   end
 
@@ -678,8 +687,9 @@ class FXMapperWindow < FXMainWindow
     map = current_map
     return unless map
 
-    title = "Find Location In Map"
+    title = MSG_FIND_LOCATION_IN_MAP
     if not @search
+      require 'IFMapper/FXSearchDialogBox'
       @search = FXSearchDialogBox.new(self)
     end
     @search.proc  = method(:find_in_map)
@@ -711,8 +721,9 @@ class FXMapperWindow < FXMainWindow
     map = current_map
     return unless map
 
-    title = "Find Location in this Section"
+    title = MSG_FIND_LOCATION_IN_SECTION
     if not @search
+      require 'IFMapper/FXSearchDialogBox'
       @search = FXSearchDialogBox.new(self)
     end
     @search.proc  = method(:find_in_section)
@@ -768,8 +779,9 @@ class FXMapperWindow < FXMainWindow
     map = current_map
     return unless map
 
-    title = "Find Object In Map"
+    title = MSG_FIND_OBJECT_IN_MAP
     if not @search
+      require 'IFMapper/FXSearchDialogBox'
       @search = FXSearchDialogBox.new(self)
     end
     @search.proc  = method(:find_object_in_map)
@@ -785,8 +797,9 @@ class FXMapperWindow < FXMainWindow
     map = current_map
     return unless map
 
-    title = "Find Task In Map"
+    title = MSG_FIND_TASK_IN_MAP
     if not @search
+      require 'IFMapper/FXSearchDialogBox'
       @search = FXSearchDialogBox.new(self)
     end
     @search.proc  = method(:find_task_in_map)
@@ -822,8 +835,9 @@ class FXMapperWindow < FXMainWindow
     map = current_map
     return unless map
 
-    title = "Find In Description In Map"
+    title = MSG_FIND_DESCRIPTION_IN_MAP
     if not @search
+      require 'IFMapper/FXSearchDialogBox'
       @search = FXSearchDialogBox.new(self)
     end
     @search.proc  = method(:find_desc_in_map)
@@ -832,6 +846,7 @@ class FXMapperWindow < FXMainWindow
     @search.show
   end
 
+
   #
   # Pop-up color preferences
   #
@@ -840,6 +855,7 @@ class FXMapperWindow < FXMainWindow
     return if not map
 
     if not @colors
+      require 'IFMapper/FXMapColorBox'
       @colors = FXMapColorBox.new(self)
     else
       @colors.show
@@ -879,24 +895,12 @@ class FXMapperWindow < FXMainWindow
 
 
   def about_cb(sender, id, event )
-    FXAboutDialogBox.new(self, "About This Software...", <<"EOF").execute
-#{PROGRAM_NAME} - #{VERSION}
-Written by Gonzalo Garramuno.
-
-FXRuby Version: #{Fox::fxrubyversion}
-
-A WYSIWYG mapping tool for interactive fiction.
-
-ggarra@advancedsl.com.ar
-|_|0|_|
-|_|_|0|
-|0|0|0|
-
-EOF
+    require 'IFMapper/FXAboutDialogBox'
+    FXAboutDialogBox.new(self, MSG_ABOUT_SOFTWARE, 
+			 eval("\"#{MSG_ABOUT}\"")).execute
   end
 
 
-
   def create_menus
     # Construct these icons
     newdoc    = load_icon("filenew")
@@ -906,126 +910,123 @@ EOF
 
     # File Menu
     filemenu = FXMenuPane.new(self)
-    FXMenuTitle.new(@menubar, "&File", nil, filemenu)
-    cmd = FXMenuCommand.new(filemenu, "&New...\tCtl-N\tCreate new document.", newdoc)
+    FXMenuTitle.new(@menubar, MENU_FILE, nil, filemenu)
+    cmd = FXMenuCommand.new(filemenu, MENU_NEW, newdoc)
     cmd.connect(SEL_COMMAND, method(:new_map_cb))
 
-    cmd = FXMenuCommand.new(filemenu, "&Open...\tCtl-O\tOpen document file.", opendoc)
+    cmd = FXMenuCommand.new(filemenu, MENU_OPEN, opendoc)
     cmd.connect(SEL_COMMAND, method(:open_cb))
-    cmd = FXMenuCommand.new(filemenu, "&Save\tCtl-S\tSave document.", savedoc)
+    cmd = FXMenuCommand.new(filemenu, MENU_SAVE, savedoc)
     cmd.connect(SEL_COMMAND, method(:save_cb))
-    cmd = FXMenuCommand.new(filemenu, "Save &As...\t\tSave document to another file.",
+    cmd = FXMenuCommand.new(filemenu, MENU_SAVE_AS,
 			    saveasdoc)
     cmd.connect(SEL_COMMAND, method(:save_as_cb))
 
     # Export submenu
     submenu = FXMenuPane.new(self)
 
-    cmd = FXMenuCommand.new(submenu, "&Export as PDF...\t\tExport map as Acrobat PDF document.", nil)
+    cmd = FXMenuCommand.new(submenu, MENU_EXPORT_PDF, nil)
     cmd.connect(SEL_COMMAND, method(:pdf_export_cb))
 
-    cmd = FXMenuCommand.new(submenu, "&Export as IFM...\t\tExport map as an IFM map.", nil)
+    cmd = FXMenuCommand.new(submenu, MENU_EXPORT_IFM, nil)
     cmd.connect(SEL_COMMAND, method(:ifm_export_cb))
 
-    cmd = FXMenuCommand.new(submenu, "&Export as Inform Source...\t\tExport map as an Inform source code file.", nil)
+    cmd = FXMenuCommand.new(submenu, MENU_EXPORT_INFORM, nil)
     cmd.connect(SEL_COMMAND, method(:inform_export_cb))
 
-    cmd = FXMenuCommand.new(submenu, "&Export as TADS3 Source...\t\tExport map as a TADS3 source code file.", nil)
+    cmd = FXMenuCommand.new(submenu, MENU_EXPORT_TADS, nil)
     cmd.connect(SEL_COMMAND, method(:tads_export_cb))
 
-    FXMenuCascade.new(filemenu, "Export", nil, submenu)
+    FXMenuCascade.new(filemenu, MENU_EXPORT, nil, submenu)
 
 
     submenu = FXMenuPane.new(self)
-    cmd = FXMenuCommand.new(submenu, "&Map...\t\tPrint map (as graph).",
-			    nil)
+    cmd = FXMenuCommand.new(submenu, MENU_PRINT_MAP, nil)
     cmd.connect(SEL_COMMAND, method(:print_cb))
 
-    cmd = FXMenuCommand.new(submenu, "Map &Locations...\t\tPrint map locations as text list.", nil)
+    cmd = FXMenuCommand.new(submenu, MENU_PRINT_LOCATIONS, nil)
     cmd.connect(SEL_COMMAND, method(:print_locations_cb))
-    FXMenuCascade.new(filemenu, "Print", nil, submenu)
-
+    FXMenuCascade.new(filemenu, MENU_PRINT, nil, submenu)
 
-    cmd = FXMenuCommand.new(filemenu, "&Quit\tCtl-Q\tQuit the application.", nil)
+    cmd = FXMenuCommand.new(filemenu, MENU_QUIT, nil)
     cmd.connect( SEL_COMMAND, method(:close_cb) )
 
     # Edit Menu
     editmenu = FXMenuPane.new(self)
-    FXMenuTitle.new(@menubar, "&Edit", nil, editmenu)
-    cmd = FXMenuCommand.new(editmenu, "&Copy\tCtl-C\tCopy Location Data", nil)
+    FXMenuTitle.new(@menubar, MENU_EDIT, nil, editmenu)
+    cmd = FXMenuCommand.new(editmenu, MENU_COPY, nil)
     cmd.connect(SEL_COMMAND, method(:copy_selected_cb))
-    cmd = FXMenuCommand.new(editmenu, "Cu&t\tCtl-X\tCut Location", nil)
+    cmd = FXMenuCommand.new(editmenu, MENU_CUT, nil)
     cmd.connect(SEL_COMMAND, method(:cut_selected_cb))
-    cmd = FXMenuCommand.new(editmenu, "&Paste\tCtl-V\tPaste Location Data", 
-			    nil) 
+    cmd = FXMenuCommand.new(editmenu, MENU_PASTE, nil) 
     cmd.connect(SEL_COMMAND, method(:paste_selected_cb))
 
     # Select submenu
     FXMenuSeparator.new(editmenu)
     submenu = FXMenuPane.new(self)
-    cmd = FXMenuCommand.new(submenu, "&All Locations\tAlt-A\tSelect all locations in section")
+    cmd = FXMenuCommand.new( submenu, MENU_SELECT_ALL )
     cmd.connect(SEL_COMMAND, method(:select_all_cb))
-    cmd = FXMenuCommand.new(submenu, "&None\tAlt-N\tClear selection in section.")
+    cmd = FXMenuCommand.new( submenu, MENU_SELECT_NONE )
     cmd.connect(SEL_COMMAND, method(:select_none_cb))
-    FXMenuCascade.new(editmenu, "Select", nil, submenu)
+    FXMenuCascade.new( editmenu, MENU_SELECT, nil, submenu )
 
     # Searching submenu
     FXMenuSeparator.new(editmenu)
     submenu = FXMenuPane.new(self)
-    cmd = FXMenuCommand.new(submenu, "&Location in Map\tCtl-F\tFind a Location Name in Map")
+    cmd = FXMenuCommand.new(submenu, MENU_SEARCH_MAP)
     cmd.connect(SEL_COMMAND, method(:find_in_map_cb))
-    cmd = FXMenuCommand.new(submenu, "Location in &Section\tAlt-F\tFind a Location Name in Current Section")
+    cmd = FXMenuCommand.new(submenu, MENU_SEARCH_SECTION)
     cmd.connect(SEL_COMMAND, method(:find_in_section_cb))
-    cmd = FXMenuCommand.new(submenu, "&Object in Map\tAlt-O\tFind Location with an Object in the Map")
+    cmd = FXMenuCommand.new(submenu, MENU_SEARCH_OBJECT)
     cmd.connect(SEL_COMMAND, method(:find_object_in_map_cb))
-    cmd = FXMenuCommand.new(submenu, "&Task in Map\tAlt-T\tFind Location with a Task in the Map")
+    cmd = FXMenuCommand.new(submenu, MENU_SEARCH_TASK)
     cmd.connect(SEL_COMMAND, method(:find_task_in_map_cb))
-    cmd = FXMenuCommand.new(submenu, "&Keyword in Descriptions\tAlt-D\tFind Location with Description Keyword in the Map")
+    cmd = FXMenuCommand.new(submenu, MENU_SEARCH_DESCRIPTION)
     cmd.connect(SEL_COMMAND, method(:find_desc_in_map_cb))
-    FXMenuCascade.new(editmenu, "Search", nil, submenu)
+    FXMenuCascade.new(editmenu, MENU_SEARCH, nil, submenu)
 
     # Complex Connection
     FXMenuSeparator.new(editmenu)
-    cmd = FXMenuCommand.new(editmenu, "Comple&x Connection\tx\tCreate a complex connection.", nil)
-    cmd.connect( SEL_COMMAND, method(:complex_connection_cb))
+    cmd = FXMenuCommand.new(editmenu, MENU_COMPLEX_CONNECTION, nil)
+    cmd.connect( SEL_COMMAND, method(:complex_connection_cb) )
 
     FXMenuSeparator.new(editmenu)
-    cmd = FXMenuCommand.new(editmenu, "Delete\tDel\tDelete selected locations or connections.", nil)
+    cmd = FXMenuCommand.new(editmenu, MENU_DELETE, nil)
     cmd.connect( SEL_COMMAND, method(:delete_selected_cb) )
 
     # Map menu
     mapmenu = FXMenuPane.new(self)
 
-    cmd = FXMenuCommand.new(mapmenu, "Map Information\t\tChange map information.")
+    cmd = FXMenuCommand.new(mapmenu, MENU_MAP_INFO)
     cmd.connect(SEL_COMMAND) {  map_properties }
 
-    cmd = FXMenuCommand.new(mapmenu, "Room List\t\tList all rooms in map.")
+    cmd = FXMenuCommand.new(mapmenu, MENU_ROOM_LIST)
     cmd.connect(SEL_COMMAND, method(:roomlist) )
 
     # Automap submenu
     #
     submenu = FXMenuPane.new(self)
-    cmd = FXMenuCommand.new(submenu, "&Start...\tCtl-T\tStart creating map from transcript file.")
+    cmd = FXMenuCommand.new(submenu, MENU_AUTOMAP_START)
     cmd.connect(SEL_COMMAND, method(:start_automap_cb))
-    cmd = FXMenuCommand.new(submenu, "S&top...\tCtl-P\tStop autocreating map.")
+    cmd = FXMenuCommand.new(submenu, MENU_AUTOMAP_STOP)
     cmd.connect(SEL_COMMAND, method(:stop_automap_cb))
     FXMenuSeparator.new(submenu)
-    cmd = FXMenuCommand.new(submenu, "&Properties...\tCtl-H\tTranscript properties.")
+    cmd = FXMenuCommand.new(submenu, MENU_AUTOMAP_PROPERTIES)
     cmd.connect(SEL_COMMAND, method(:automap_properties_cb))
-    FXMenuCascade.new(mapmenu, "Automap", nil, submenu)
+    FXMenuCascade.new(mapmenu, MENU_AUTOMAP, nil, submenu)
 
     # Sections submenu
     submenu = FXMenuPane.new(self)
-    cmd = FXMenuCommand.new(submenu, "Next Section\t\tGo to Next Map Section.")
+    cmd = FXMenuCommand.new(submenu, MENU_NEXT_SECTION)
     cmd.connect(SEL_COMMAND) { 
       next_section
     }
-    cmd = FXMenuCommand.new(submenu, "Previous Section\t\tGo to Previous Map Section.")
+    cmd = FXMenuCommand.new(submenu, MENU_PREVIOUS_SECTION)
     cmd.connect(SEL_COMMAND) { 
       previous_section
     }
     FXMenuSeparator.new(submenu)
-    cmd = FXMenuCommand.new(submenu, "Add Section\t\tAdd a New Section to Map.")
+    cmd = FXMenuCommand.new(submenu, MENU_ADD_SECTION)
     cmd.connect(SEL_COMMAND) { 
       map = current_map
       if map
@@ -1034,7 +1035,7 @@ EOF
 	update_section
       end
     }
-    cmd = FXMenuCommand.new(submenu, "Rename Section\t\tRename Current Section.")
+    cmd = FXMenuCommand.new(submenu, MENU_RENAME_SECTION)
     cmd.connect(SEL_COMMAND) { 
       map = current_map
       if map
@@ -1043,7 +1044,7 @@ EOF
       end
     }
     FXMenuSeparator.new(submenu)
-    cmd = FXMenuCommand.new(submenu, "Delete Section\t\tDelete Current Section from Map.")
+    cmd = FXMenuCommand.new(submenu, MENU_DELETE_SECTION)
     cmd.connect(SEL_COMMAND) { 
       map = current_map
       if map
@@ -1052,14 +1053,14 @@ EOF
 	update_section
       end
     }
-    FXMenuCascade.new(mapmenu, "Sections", nil, submenu)
+    FXMenuCascade.new(mapmenu, MENU_SECTIONS, nil, submenu)
     
     #
     # Zoom submenu
     #
     submenu = FXMenuPane.new(self)
     [25, 50, 75, 100, 125].each { |v| 
-      cmd = FXMenuCommand.new(submenu, v.to_s + "%\t\tZoom page to #{v}%.")
+      cmd = FXMenuCommand.new(submenu, eval("\"#{MENU_ZOOM_PERCENT}\""))
       cmd.connect(SEL_COMMAND) { 
 	map = current_map
 	if map
@@ -1068,11 +1069,11 @@ EOF
 	end
       }
     }
-    FXMenuCascade.new(mapmenu, "Zoom", nil, submenu)
+    FXMenuCascade.new(mapmenu, MENU_ZOOM, nil, submenu)
 
     submenu = FXMenuPane.new(self)
 
-    cmd = FXMenuCheck.new(submenu, "Edit on Creation\t\tEdit locations on creation.")
+    cmd = FXMenuCheck.new(submenu, MENU_EDIT_ON_CREATION)
     cmd.check = @@default_options['Edit on Creation']
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
@@ -1085,7 +1086,7 @@ EOF
       s.check = map.options['Edit on Creation'] if map
     }
 
-    cmd = FXMenuCheck.new(submenu, "Automatic Connection\t\tConnect new location to adjacent one .")
+    cmd = FXMenuCheck.new(submenu, MENU_AUTOMATIC_CONNECTION)
     cmd.check = @@default_options['Automatic Connection']
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
@@ -1098,7 +1099,7 @@ EOF
       s.check = map.options['Automatic Connection'] if map
     }
 
-    cmd = FXMenuCheck.new(submenu, "Create on Connectionn\t\tCreate missing locations when creating a connection.")
+    cmd = FXMenuCheck.new(submenu, MENU_CREATE_ON_CONNECTION)
     cmd.check = @@default_options['Create on Connection']
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
@@ -1109,13 +1110,13 @@ EOF
       s.check = map.options['Create on Connection'] if map
     }
 
-    FXMenuCascade.new(mapmenu, "Options", nil, submenu)
+    FXMenuCascade.new(mapmenu, MENU_OPTIONS, nil, submenu)
 
     ##########################
     # Display submenu
     #########################
     submenu = FXMenuPane.new(self)
-    cmd = FXMenuCheck.new(submenu, "Use Room Cursor\t\tMake your mouse cursor a room showing the direction of exit.")
+    cmd = FXMenuCheck.new(submenu, MENU_USE_ROOM_CURSOR)
     cmd.check = @@default_options['Use Room Cursor']
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
@@ -1129,7 +1130,7 @@ EOF
       s.check = map.options['Use Room Cursor'] if map
     }
 
-    cmd = FXMenuCheck.new(submenu, "Paths as Curves\t\tDraw complex paths as curves.")
+    cmd = FXMenuCheck.new(submenu, MENU_PATHS_AS_CURVES)
     cmd.check = @@default_options['Paths as Curves']
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
@@ -1142,7 +1143,7 @@ EOF
       map = current_map
       s.check = map.options['Paths as Curves'] if map
     }
-    cmd = FXMenuCheck.new(submenu, "Location Numbers\t\tShow Location Numbers.")
+    cmd = FXMenuCheck.new(submenu, MENU_LOCATION_NUMBERS)
     cmd.check = @@default_options['Location Numbers']
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
@@ -1156,7 +1157,7 @@ EOF
       s.check = map.options['Location Numbers'] if map
     }
 
-    cmd = FXMenuCheck.new(submenu, "Location Tasks\t\tShow Tasks in Location Edit Box.")
+    cmd = FXMenuCheck.new(submenu, MENU_LOCATION_TASKS)
     cmd.check = @@default_options['Location Tasks']
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
@@ -1170,7 +1171,7 @@ EOF
       s.check = map.options['Location Tasks'] if map
     }
 
-    cmd = FXMenuCheck.new(submenu, "Location Description\t\tShow Description in Location Edit Box.")
+    cmd = FXMenuCheck.new(submenu, MENU_LOCATION_DESC)
     cmd.check = @@default_options['Location Description']
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
@@ -1184,7 +1185,7 @@ EOF
       s.check = map.options['Location Description'] if map
     }
 
-    cmd = FXMenuCheck.new(submenu, "Boxes\t\tDraw dashed box guidelines.")
+    cmd = FXMenuCheck.new(submenu, MENU_BOXES)
     cmd.check = @@default_options['Grid Boxes']
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
@@ -1198,7 +1199,7 @@ EOF
       s.check = map.options['Grid Boxes'] if map
     }
 
-    cmd = FXMenuCheck.new(submenu, "Straight Connections\t\tDraw dashed N/S/E/W guidelines")
+    cmd = FXMenuCheck.new(submenu, MENU_STRAIGHT_CONN)
     cmd.check = @@default_options['Grid Straight Connections']
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
@@ -1212,7 +1213,7 @@ EOF
       s.check = map.options['Grid Straight Connections'] if map
     }
 
-    cmd = FXMenuCheck.new(submenu, "Diagonal Connections\t\tDraw dashed NW/NE/SW/SE guidelines")
+    cmd = FXMenuCheck.new(submenu, MENU_DIAGONAL_CONN)
     cmd.check = @@default_options['Grid Diagonal Connections']
     cmd.connect(SEL_COMMAND) { |s, m, e|
       map = current_map
@@ -1226,31 +1227,42 @@ EOF
       s.check = map.options['Grid Diagonal Connections'] if map
     }
 
-    FXMenuCascade.new(mapmenu, 'Display', nil, submenu)
+    FXMenuCascade.new(mapmenu, MENU_DISPLAY, nil, submenu)
 
     submenu = FXMenuPane.new(self)
-    cmd = FXMenuCommand.new(submenu, "Colors\t\tChange map colors.")
+
+    cmd = FXMenuCommand.new(submenu, MENU_COLORS)
     cmd.connect(SEL_COMMAND, method(:colors_cb))
 
+#     langmenu = FXMenuPane.new(self)
+#     LANGUAGES.each { |k, v|
+#       next unless File.exists?( "lib/IFMapper/locales/#{v}/Messages.rb" )
+#       cmd = FXMenuCheck.new(langmenu, k)
+#       cmd.connect(SEL_COMMAND, method(:language_cb))
+#     }
+
+#     FXMenuCascade.new(mapmenu, MENU_LANGUAGE, nil, langmenu)
+    
+
     FXMenuSeparator.new(submenu)
-    cmd = FXMenuCommand.new(submenu, "Save Preferences\t\tSave Preferences for Startup")
+    cmd = FXMenuCommand.new(submenu, MENU_SAVE_PREFS)
     cmd.connect(SEL_COMMAND) { 
       map = current_map
       map.options.write if map
     }
-    FXMenuCascade.new(mapmenu, 'Preferences', nil, submenu)
+    FXMenuCascade.new(mapmenu, MENU_PREFS, nil, submenu)
 
-    FXMenuTitle.new(@menubar,"&Map", nil, mapmenu)
+    FXMenuTitle.new(@menubar, MENU_MAP, nil, mapmenu)
 
     # Window menu
     windowmenu = FXMenuPane.new(self)
-    FXMenuCommand.new(windowmenu, "Tile &Horizontally", nil,
+    FXMenuCommand.new(windowmenu, MENU_TILE_HORIZONTALLY, nil,
       @mdiclient, FXMDIClient::ID_MDI_TILEHORIZONTAL)
-    FXMenuCommand.new(windowmenu, "Tile &Vertically", nil,
+    FXMenuCommand.new(windowmenu, MENU_TILE_VERTICALLY, nil,
       @mdiclient, FXMDIClient::ID_MDI_TILEVERTICAL)
-    FXMenuCommand.new(windowmenu, "C&ascade", nil,
+    FXMenuCommand.new(windowmenu, MENU_CASCADE, nil,
       @mdiclient, FXMDIClient::ID_MDI_CASCADE)
-    FXMenuCommand.new(windowmenu, "&Close", nil,
+    FXMenuCommand.new(windowmenu, MENU_CLOSE, nil,
       @mdiclient, FXMDIClient::ID_MDI_CLOSE)
     sep1 = FXMenuSeparator.new(windowmenu)
     sep1.setTarget(@mdiclient)
@@ -1259,21 +1271,23 @@ EOF
     FXMenuCommand.new(windowmenu, nil, nil, @mdiclient, FXMDIClient::ID_MDI_2)
     FXMenuCommand.new(windowmenu, nil, nil, @mdiclient, FXMDIClient::ID_MDI_3)
     FXMenuCommand.new(windowmenu, nil, nil, @mdiclient, FXMDIClient::ID_MDI_4)
-    FXMenuCommand.new(windowmenu, "&Others...", nil, @mdiclient, FXMDIClient::ID_MDI_OVER_5)
-    FXMenuTitle.new(@menubar,"&Window", nil, windowmenu)
+    FXMenuCommand.new(windowmenu, MENU_OTHERS, nil, @mdiclient, 
+		      FXMDIClient::ID_MDI_OVER_5)
+    FXMenuTitle.new(@menubar, MENU_WINDOW, nil, windowmenu)
 
     # Help menu
     helpmenu = FXMenuPane.new(self)
-    cmd = FXMenuCommand.new(helpmenu, "&Hotkeys", nil)
+    cmd = FXMenuCommand.new(helpmenu, MENU_HOTKEYS, nil)
     cmd.connect(SEL_COMMAND, method(:hotkeys))
-    cmd = FXMenuCommand.new(helpmenu, "&Instructions", nil)
+    cmd = FXMenuCommand.new(helpmenu, MENU_INSTRUCTIONS, nil)
     cmd.connect(SEL_COMMAND, method(:docs))
     FXMenuSeparator.new(helpmenu)
-    cmd = FXMenuCommand.new(helpmenu, "&About", nil)
+    cmd = FXMenuCommand.new(helpmenu, MENU_ABOUT, nil)
     cmd.connect(SEL_COMMAND, method(:about_cb))
 
-    cmd = FXMenuCommand.new(helpmenu, "&Resource Code", nil)
+    cmd = FXMenuCommand.new(helpmenu, MENU_RESOURCE, nil)
     cmd.connect(SEL_COMMAND) {
+      require 'IFMapper/FXMapFileDialog'
       file = FXMapFileDialog.new(self, "Resource a Ruby File", 
 				 ['Ruby File (*.rb)']).filename
       if file != ''
@@ -1284,59 +1298,35 @@ EOF
 	end
       end
     }
-    FXMenuTitle.new(@menubar,"&Help", nil, helpmenu)
+    FXMenuTitle.new(@menubar, MENU_HELP, nil, helpmenu)
   end
 
+  def language
+    return @@default_options['Language']
+  end
 
   def docs(*opts)
-    f = File.open('README.txt')
-    text = f.readlines.join("")
-    f.close
-    FXAboutDialogBox.new(self, "Instructions", text).show
+    browsers = [ 'firefox', 'opera', 'explorer' ]
+    address  = 'docs/' + language + '/start.html'
+    status "#{MSG_OPENING_WEB_PAGE} #{address}..."
+    ok = false
+    browsers.each { |cmd|
+      if RUBY_PLATFORM =~ /mswin/
+	ok = system("start #{cmd} #{address}")
+      else
+	ok = system("#{cmd} #{address} &")
+      end
+      break if ok
+    }
+    if not ok
+      status ERR_COULD_NOT_OPEN_WEB_BROWSER
+    end
   end
 
-  def hotkeys(*opts)
-    FXAboutDialogBox.new(self, "Hotkeys", <<'EOF').show
-
-LMB - Left   Mouse Button
-MMB - Middle Mouse Button
-RMB - Right  Mouse Button
-
-Mouse controls
---------------
-
-Use  LMB to add new locations or connections among rooms.
-
-Click with LMB on any room or connection to select it.
-
-Double click on rooms or connections to access their properties.
-
-Click several times on an existing connecion to establish a one-way 
-connection.
-
-Drag with MMB or ALT + LMB to scroll around the page.
-
-Use mousewheel to zoom in and out.
-
-Use RMB after selecting a connection to bring a menu to allow you
-to flip its direction or to attach it to some other exit in one 
-of the rooms.
 
-Keyboard controls
------------------
-
-Use 'x' to start a new complex connection (ie. a connection across
-rooms that are not neighbors), then click on each exit of each room.
-
-Use 'Delete' or 'Backspace' to remove any selected connection or room.
-
-Use arrow keys or numeric keypad to move selected rooms around 
-the page, one unit at a time.
-
-Use CTRL + LMB when adding a connection to create a dead-end 
-connection (one that loops onto itself)
-
-EOF
+  def hotkeys(*opts)
+    require 'IFMapper/FXAboutDialogBox'
+    FXAboutDialogBox.new(self, BOX_HOTKEYS, MSG_HOTKEYS).show
   end
 
   def create_toolbar(toolbar)
@@ -1348,15 +1338,15 @@ EOF
     saveasdoc = load_icon("filesaveas")
 
     # File manipulation
-    cmd = FXButton.new(toolbar, "\tNew\tCreate new document.", newdoc, nil, 0,
+    cmd = FXButton.new(toolbar, ICON_NEW, newdoc, nil, 0,
 		       FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     cmd.connect(SEL_COMMAND, method(:new_map_cb))
 
-    cmd = FXButton.new(toolbar, "\tOpen\tOpen document file.", opendoc, nil, 0,
+    cmd = FXButton.new(toolbar, ICON_OPEN, opendoc, nil, 0,
       FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     cmd.connect(SEL_COMMAND, method(:open_cb))
 
-    cmd = FXButton.new(toolbar, "\tSave\tSave document.", savedoc, nil, 0,
+    cmd = FXButton.new(toolbar, ICON_SAVE, savedoc, nil, 0,
       FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     cmd.connect(SEL_COMMAND, method(:save_cb))
     cmd.connect(SEL_UPDATE) { |sender, sel, ptr|
@@ -1364,7 +1354,7 @@ EOF
       message = map ? FXWindow::ID_ENABLE : FXWindow::ID_DISABLE
       sender.handle(self, MKUINT(message, SEL_COMMAND), nil)
     }
-    cmd = FXButton.new(toolbar, "\tSave As\tSave document to another file.",
+    cmd = FXButton.new(toolbar, ICON_SAVE_AS,
       saveasdoc, nil, 0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     cmd.connect(SEL_COMMAND, method(:save_as_cb))
     cmd.connect(SEL_UPDATE) { |sender, sel, ptr|
@@ -1376,7 +1366,7 @@ EOF
     # Print
     FXFrame.new(toolbar,
       LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0, 0, 4, 20)
-    cmd = FXButton.new(toolbar, "\tPrint Map\tPrint map (as graph).",
+    cmd = FXButton.new(toolbar, ICON_PRINT,
 		       load_icon("printicon"), @mdiclient, FXGLViewer::ID_PRINT_IMAGE,
 		       BUTTON_AUTOGRAY|FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     cmd.connect(SEL_COMMAND, method(:print_cb))
@@ -1389,7 +1379,7 @@ EOF
     # Editing
     FXFrame.new(toolbar,
       LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0, 0, 4, 20)
-    cmd = FXButton.new(toolbar, "\tCut", load_icon("cut"), @mdiclient,
+    cmd = FXButton.new(toolbar, ICON_CUT, load_icon("cut"), @mdiclient,
       FXGLViewer::ID_CUT_SEL, (BUTTON_AUTOGRAY|FRAME_THICK|FRAME_RAISED|
       LAYOUT_TOP|LAYOUT_LEFT))
     cmd.connect(SEL_COMMAND, method(:cut_selected_cb))
@@ -1398,7 +1388,7 @@ EOF
       message = map ? FXWindow::ID_ENABLE : FXWindow::ID_DISABLE
       sender.handle(self, MKUINT(message, SEL_COMMAND), nil)
     }
-    cmd = FXButton.new(toolbar, "\tCopy", load_icon("copy"), @mdiclient,
+    cmd = FXButton.new(toolbar, ICON_COPY, load_icon("copy"), @mdiclient,
       FXGLViewer::ID_COPY_SEL, (BUTTON_AUTOGRAY|FRAME_THICK|FRAME_RAISED|
       LAYOUT_TOP|LAYOUT_LEFT))
     cmd.connect(SEL_COMMAND, method(:copy_selected_cb))
@@ -1407,7 +1397,7 @@ EOF
       message = map ? FXWindow::ID_ENABLE : FXWindow::ID_DISABLE
       sender.handle(self, MKUINT(message, SEL_COMMAND), nil)
     }
-    cmd = FXButton.new(toolbar, "\tPaste", load_icon("paste"), @mdiclient,
+    cmd = FXButton.new(toolbar, ICON_PASTE, load_icon("paste"), @mdiclient,
       FXGLViewer::ID_PASTE_SEL, (BUTTON_AUTOGRAY|FRAME_THICK|FRAME_RAISED|
       LAYOUT_TOP|LAYOUT_LEFT))
     cmd.connect(SEL_COMMAND, method(:paste_selected_cb))
@@ -1420,11 +1410,11 @@ EOF
     # Zooming
     FXFrame.new(toolbar,
       LAYOUT_TOP|LAYOUT_LEFT|LAYOUT_FIX_WIDTH|LAYOUT_FIX_HEIGHT, 0, 0, 4, 20)
-    cmd = FXButton.new(toolbar, "+\tZoom In", load_icon("zoom"), @mdiclient,
+    cmd = FXButton.new(toolbar, ICON_ZOOM_IN, load_icon("zoom"), @mdiclient,
 		       0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     cmd.connect(SEL_COMMAND) { zoom_in }
 
-    cmd = FXButton.new(toolbar, "-\tZoom Out", load_icon("zoom"), @mdiclient, 
+    cmd = FXButton.new(toolbar, ICON_ZOOM_OUT, load_icon("zoom"), @mdiclient, 
 		       0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     cmd.connect(SEL_COMMAND) { zoom_out }
 
@@ -1432,7 +1422,7 @@ EOF
     # Section travel
     frame = FXHorizontalFrame.new(toolbar,
 				  LAYOUT_RIGHT|FRAME_THICK|FRAME_RAISED)
-    cmd = FXButton.new(frame, "\tPrevious Section", load_icon("prevpage"), 
+    cmd = FXButton.new(frame, ICON_PREV_SECTION, load_icon("prevpage"), 
 		       @mdiclient,
 		       0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     cmd.connect(SEL_COMMAND) { previous_section }
@@ -1455,7 +1445,7 @@ EOF
       update_section if map
     }
 
-    cmd = FXButton.new(frame, "\tNext Section", load_icon("nextpage"), 
+    cmd = FXButton.new(frame, ICON_NEXT_SECTION, load_icon("nextpage"), 
 		       @mdiclient,
 		       0, FRAME_THICK|FRAME_RAISED|LAYOUT_TOP|LAYOUT_LEFT)
     cmd.connect(SEL_COMMAND) { next_section }    
@@ -1529,9 +1519,7 @@ EOF
   end
 
 
-  def initialize(app)
-    super(app, TITLE, nil, nil, DECOR_ALL, 0, 0, 800, 600)
-  
+  def create_widgets
     # Menubar
     @menubar = FXMenuBar.new(self, LAYOUT_SIDE_TOP|LAYOUT_FILL_X)
 
@@ -1553,6 +1541,12 @@ EOF
 
     self.connect(SEL_CLOSE, method(:close_cb))
     show
+  end
+
+  def initialize(app)
+    super(app, eval("\"#{TITLE}\""), nil, nil, DECOR_ALL, 0, 0, 800, 600)
+  
+    create_widgets
 
     # Trap CTRL-C signals and exit nicely
     trap('SIGINT') {
@@ -1573,4 +1567,5 @@ EOF
       }
       self.close if exit
   end
+
 end