weft-qda 0.9.6 → 0.9.8

data/lib/weft/wxgui/dialogs.rb

@@ -1,54 +1,91 @@
 module QDA::GUI
-  class DocumentImportProgressTracker < QDA::Indexer
-    PT_STYLE = Wx::PD_APP_MODAL|Wx::PD_AUTO_HIDE
-    def initialize(parent, title)
-      super()
-      @parent = parent
-      @doctitle = title
-    end
-
-    def prepare(content)
-      @progbar = Wx::ProgressDialog.new('Importing document',
-                                         "Reading document #{@doctitle}",
-                                        content.count($/),
-                                        @parent, PT_STYLE)
-      @progress = 0
+  class StageProgressDialog < Wx::ProgressDialog
+    PT_STYLE = Wx::PD_APP_MODAL|Wx::PD_AUTO_HIDE|Wx::PD_CAN_ABORT
+    
+    FIXED_PROGRESS = 200
+    def initialize(parent, title, msg)
+      super(title, msg, FIXED_PROGRESS, parent, PT_STYLE)
+      @progress = 0.0
+      @step = FIXED_PROGRESS.to_f / 10.0
     end
 
-    def feed(line)
-      if ! @progbar.update(@progress += 1)
-        raise "Aborted document import"
+    def step(msg = nil)
+      @progress = @progress + @step
+      result = msg ? update(@progress.to_i, msg) : 
+                     update(@progress.to_i)
+      if not result
+        Kernel.raise UserAbortedException.new('Document import cancelled')
       end
-      super
     end
-
-    def terminate()
-      @progbar.destroy()
+    
+    def retarget(new_target)
+      remaining = FIXED_PROGRESS - @progress
+      @step = remaining / new_target.to_f
+    end
+    
+    def finish()
+      update(@progress = FIXED_PROGRESS)
     end
   end
-
-  class WordIndexSaveProgressTracker < QDA::Indexer
-    attr_reader :progbar
-    PT_STYLE = Wx::PD_APP_MODAL|Wx::PD_AUTO_HIDE
-    def initialize(count, parent, title)
-      super()
-      @progbar = Wx::ProgressDialog.new( 'Importing document',
-                                         "Saving indexes for #{title}",
-                                         count, parent, PT_STYLE)
-      @progress = 0
+  
+  # A simple class for displaying helpful info.
+  class InformationDialog < Wx::MessageDialog
+    INFO_DIALOG_FLAGS = Wx::OK|Wx::ICON_INFORMATION
+    def self.display(title, message)
+      new(nil, message, title, INFO_DIALOG_FLAGS).show_modal()
     end
-
-    def next()
-      if ! @progbar.update(@progress += 1)
-        raise "Aborted document import"
-      end
+  end
+  
+  class ErrorDialog < Wx::MessageDialog
+    ERR_DIALOG_FLAGS = Wx::OK|Wx::ICON_ERROR
+    def self.display(title, message)
+      new(nil, message, title, ERR_DIALOG_FLAGS).show_modal()    
     end
-
-    def terminate()
-      @progbar.destroy()
+  end
+  
+  # A simple class for seeking warnings of risky requests.  
+  class WarningDialog < Wx::MessageDialog
+    WARN_DIALOG_FLAGS = Wx::NO_DEFAULT|Wx::OK|Wx::CANCEL|Wx::ICON_EXCLAMATION
+    def self.display(title, message)
+      new(nil, message, title, WARN_DIALOG_FLAGS).show_modal()
     end
   end
-
+  
+  class ConfirmDialog < Wx::MessageDialog
+    CONFIRM_DIALOG_FLAGS = Wx::NO_DEFAULT|Wx::YES|Wx::NO|Wx::ICON_EXCLAMATION
+    def self.display(title, message)
+      new(nil, message, title, CONFIRM_DIALOG_FLAGS).show_modal()
+    end
+  end
+  
+  class SuppressibleConfirmDialog < ConfirmDialog
+    def self.suppress_conf()
+      conf = Wx::ConfigBase.get()
+      conf.path  = '/SuppressWarnings'
+      conf
+    end
+    
+    def self.suppressed?(key)
+      suppress_conf.read_bool(key, false)
+    end
+    
+    def self.suppress(key)
+      suppress_conf.write(key, true)
+    end
+    
+    def self.release(key)
+      suppress_conf.write(key, false)
+    end
+    
+    def self.display(key, title, message)
+      if suppressed?(key)
+        return Wx::ID_YES
+      else
+        return super(title, message)
+      end
+    end
+  end
+  
   class SearchDialog < Wx::Dialog
     def initialize(parent)
       super( parent, -1, 'Search', DEF_POS, Wx::Size.new(500,175) )
@@ -70,7 +107,7 @@ module QDA::GUI
 
       @expand = Wx::SpinCtrl.new( self, -1, "")
       @expand.set_range(0, 1000)
-      @expand.set_value(100)
+      @expand.set_value(200)
       mini_sizer.add(@expand, 0, Wx::ALL, 4)
       mini_sizer.add(Wx::StaticText.new(self, -1, 'characters'),
                      0, Wx::ALL, 6)
@@ -125,4 +162,70 @@ module QDA::GUI
       @expand.get_value().to_i
     end
   end
+
+  class ImportFileDialog < Wx::FileDialog
+    def initialize(parent, import_class)
+      @import_class = import_class
+      imports  = QDA::Filters::import_filters[import_class]
+      wildcard = imports.map { | filt | '%s (*.%s)|*.%s' % 
+                                   [ filt::DESCRIPTION, 
+                                     filt::EXTENSIONS, 
+                                     filt::EXTENSIONS ] }.join('|')
+      super(parent, Lang::IMPORT_DOC_DIALOGUE_TITLE,
+			"",  "", wildcard, Wx::MULTIPLE)
+    end
+    
+    # return each selected file in turn into a block, passing in +path+ and 
+    # +filename+
+    def each_with_path
+      get_paths.each_with_index do | fpath, i |
+        yield fpath, get_filenames[i]
+      end
+    end
+    
+    def filter()
+      QDA::Filters::import_filters[@import_class][filter_index]
+    end
+  end
+  
+  
+  class ExportFileDialog < Wx::FileDialog
+    def initialize(parent, export_obj)
+      @obj = export_obj
+      exports = QDA::Filters::export_filters[@obj.class]
+      wildcard = exports.map { | filt | '%s (*.%s)|*.%s' % 
+                                   [ filt::DESCRIPTION, 
+                                     filt::EXTENSION, 
+                                     filt::EXTENSION ] }.join('|')
+      super(parent, Lang::EXPORT_DOC_DIALOGUE_TITLE,
+			"",  "", wildcard, Wx::SAVE|Wx::OVERWRITE_PROMPT)
+	  set_filename( exports[0].def_name(export_obj) )
+    end
+    
+    def filter()
+      QDA::Filters::export_filters[@obj.class][filter_index]
+    end
+  end
+  
+  
+  class ScriptFileDialog < Wx::FileDialog
+    def initialize(parent, saving = false)
+      if saving
+        style = Wx::SAVE|Wx::OVERWRITE_PROMPT
+        title = 'Save a Script to a Ruby File'
+      else
+        style = Wx::OPEN
+        title = 'Import a Script from a Ruby File'
+      end
+      super(parent, title, "", "", 'Ruby files (*.rb)|*.rb', style)
+    end
+  end
+  
+  class ScriptOutputFileDialog < Wx::FileDialog
+    def initialize(parent)
+      style = Wx::SAVE|Wx::OVERWRITE_PROMPT 
+      super(parent, 'Save Script Output to a File',
+			"",  "", 'Output files (*.txt)|*.txt', style)
+    end  
+  end
 end

data/lib/weft/wxgui/error_handler.rb

@@ -1,52 +1,132 @@
+require 'net/http'
+require 'rbconfig'
+require 'uri'
+
 module QDA::GUI
-class ErrorHandlerApp < Wx::App
+# A dialog that shows if Weft QDA encounters an unhandled exception.
+# Gathers information about the error, and offers to send it over HTTP
+# to a crash report CGI.
+class CrashReportDialog < Wx::Dialog
   attr_accessor :err
+  attr_reader :panel
+  private :panel
+  
+  def initialize(parent, exception)
+    super(nil, -1, Lang::CRASH_REPORT_TITLE)
+    @err = exception
 
-  def on_init()
-    frame = Wx::Frame.new(nil, -1, 'Text')
-
-    panel = Wx::Panel.new(frame)
+    @panel = Wx::Panel.new(self)
     sizer = Wx::BoxSizer.new(Wx::VERTICAL)
+    text = Wx::StaticText.new(panel, -1, Lang::CRASH_REPORT_MESSAGE)
+    sizer.add(text, 0, Wx::ALL, 8)
+    sizer.add( construct_crash_report_form , 1, Wx::GROW|Wx::ALL, 5)    
+    sizer.add( construct_send_buttons, 0,
+              Wx::GROW|Wx::ADJUST_MINSIZE|Wx::ALIGN_BOTTOM, 8)
+
+    panel.set_sizer(sizer)
+    self.client_size = Wx::Size.new(400, 500)
+  end
+  
+  def self.display(*args)
+    new(*args).show_modal()
+  end
+  
+  def rs2exe
+    if defined? ::RUBYSCRIPT2EXE_EEEEXE
+      return ::RUBYSCRIPT2EXE_EEEEXE
+    else
+      return ''
+    end
+   end
+    
+  def crash_details()
+    @crash ||= { 'when' => Time.now.to_s(),
+                 'os'   => Config::CONFIG['target_os'],
+                 'config' => Config::CONFIG['build'], 
+                 'ruby_version' => [ Config::CONFIG['MAJOR'], 
+                                     Config::CONFIG['MINOR'], 
+                                     Config::CONFIG['TEENY'] ].join('.'),
+                 'rs2exe' => rs2exe,
+                 'backtrace' => ( [ err.inspect ] + 
+                                    err.backtrace ).join("\n") }
+  end
+  
+  def crash_details_string
+    %w[when os config ruby_version rs2exe backtrace].inject('') do | str, key |
+      str << "#{key}: #{crash_details[key]}\n"
+    end
+  end
+  
+  
+  def encoded_crash_details()
+    str = crash_details.keys.inject('') do | str, key |
+      str << URI.encode(key) << '=' << URI.encode(crash_details[key]) << '&'
+    end
+    str << URI.encode('email') << '=' << URI.encode(@email_box.value) << '&'
+    str << URI.encode('info') << '=' << URI.encode(@info_box.value)
+  end
+  
+  
+  def on_dont_send()
+    end_modal(Wx::ID_CANCEL)
+  end
+  
+  # 
+  def on_send()
+    disable()
+    Wx::BusyCursor.busy do
+      # see weft/wxgui/constants.rb for CRASH_REPORT_URL
+      Net::HTTP.start(CRASH_REPORT_URL.host, 80) do | http |
+        response = http.post(CRASH_REPORT_URL.path, encoded_crash_details)
+        if response.code != '204'
+          ErrorDialog.display( Lang::FAILED_CRASH_SEND_TITLE, 
+                               Lang::FAILED_CRASH_SEND_MESSAGE %
+                               response.inspect )
+        end
+     end
+   end
+   end_modal(Wx::ID_OK)
+  end
+  
+  def construct_crash_report_form()
+    report_box = Wx::StaticBox.new(panel, -1, Lang::CRASH_REPORT)
+    report_box_sizer = Wx::StaticBoxSizer.new(report_box, Wx::VERTICAL)
+    
+    email_label = Wx::StaticText.new(panel, -1, Lang::CRASH_REPORT_EMAIL) 
+    report_box_sizer.add(email_label, 0, Wx::ALL, 3)
+    @email_box   = Wx::TextCtrl.new(panel, -1, '')
+    report_box_sizer.add(@email_box, 0, Wx::ALL|Wx::GROW, 3)
+    
+    info_label = Wx::StaticText.new(panel, -1, Lang::CRASH_REPORT_INFO) 
+    report_box_sizer.add(info_label, 0, Wx::ALL, 3)
+    @info_box   = Wx::TextCtrl.new(panel, -1, '')
+    report_box_sizer.add(@info_box, 0, Wx::ALL|Wx::GROW, 3)
 
-    @text_box = Wx::TextCtrl.new(panel, -1, @err.to_s,
-                                Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, 
-                                Wx::TE_MULTILINE|Wx::TE_RICH|Wx::TE_NOHIDESEL)
+    data_label = Wx::StaticText.new(panel, -1, Lang::CRASH_REPORT_DATA) 
+    report_box_sizer.add(data_label, 0, Wx::ALL, 2)
+    
+    @text_box = Wx::TextCtrl.new(panel, -1, crash_details_string(),
+                                 DEF_POS, DEF_SIZE, 
+                                 Wx::TE_MULTILINE|Wx::TE_RICH|
+                                 Wx::TE_NOHIDESEL|Wx::TE_READONLY )
+    report_box_sizer.add(@text_box, 1, Wx::ALL|Wx::GROW, 3)
+    return report_box_sizer
+  end
+  
+  
+  def construct_send_buttons()
     butt_panel = Wx::Panel.new(panel)
     bott_sizer = Wx::BoxSizer.new(Wx::HORIZONTAL)
 
-    button = Wx::Button.new(butt_panel, -1, 'Save')
-    button.evt_button(button.get_id) { | e | on_font(e) }
+    button = Wx::Button.new(butt_panel, -1, "Don't Send")
+    button.evt_button(button.get_id) { | e | on_dont_send() }
     bott_sizer.add(button, 1, Wx::ALL, 4)
 
     button = Wx::Button.new(butt_panel, -1, 'Send')
-    button.evt_button(button.get_id) { | e | on_bold(e) }
-    bott_sizer.add(button, 1, Wx::ALL, 4)
-
-    button = Wx::Button.new(butt_panel, -1, 'Close')
-    button.evt_button(button.get_id) { | e | on_colour(e) }
+    button.evt_button(button.get_id) { on_send }
     bott_sizer.add(button, 1, Wx::ALL, 4)
-
     butt_panel.set_sizer(bott_sizer)
-
-    sizer.add(@text_box, 1, Wx::GROW)
-    sizer.add(butt_panel, 0, Wx::GROW|Wx::ADJUST_MINSIZE|Wx::ALIGN_BOTTOM)
-    panel.set_sizer(sizer)
-
-
-    frame.set_client_size( Wx::Size.new(200,200) )
-    frame.show()
-  end
-
-  def on_font(e)
-    dialog = Wx::FontDialog.new()
-    case dialog.show_modal()
-    when Wx::ID_OK
-      font = dialog.get_font_data.get_chosen_font()
-      @text_box.set_font(font)
-    when Wx::ID_CANCEL
-      return
-    end
+    return butt_panel  
   end
 end
-
 end

data/lib/weft/wxgui/exceptions.rb

@@ -0,0 +1,7 @@
+module QDA::GUI
+  class GUIException < StandardError
+  end
+  
+  class UserAbortedException < GUIException
+  end
+end

data/lib/weft/wxgui/inspectors.rb

@@ -1,208 +1,36 @@
-require 'weft/wxgui/inspectors/textcontrols'
-
 module QDA::GUI
-  class CategoryDropDown < Wx::ComboBox
-    include Subscriber
-
-    MAXIMUM_DROPDOWN_LENGTH = 7
-    attr_accessor :sticky
-
-    # +locked+ if true will prevent the dropdown from responding to
-    # global category focus events.
-    def initialize(app, parent, text_box = nil, locked = false)
-      super(parent, -1, '', Wx::DEFAULT_POSITION,
-             Wx::DEFAULT_SIZE, [])
-      @locked = locked
-      @client_data = {}
-      @text_box = text_box
-      @sticky = false
-
-      @app = app
-
-      evt_kill_focus() do | e | 
-        find_and_add_categories()
-        e.skip()
-      end
-
-      evt_text_enter(self.get_id) do | e |
-        find_and_add_categories()
-      end
-
-      evt_combobox(self.get_id) do | e |
-        e.skip()
-        on_item_selected(e)
-      end
-        
-      subscribe(:focus_category, :category_deleted, :category_changed)
-      if $wxapp.current_category
-        set_active_category($wxapp.current_category)
-      end
-    end
-
-    # is this dropdown responding to global :focus_category events?
-    def locked?
-      @locked ? true : false
-    end
-
-    # make this dropdown receive global :focus_category events
-    def lock
-      @locked = true
+  class MDIWorkAreaWindow < Wx::MDIChildFrame
+    def initialize(workarea, *args)
+      super(workarea, -1, *args)
     end
-
-    # prevent this dropdown responding to global :focus_category events
-    def unlock
-      @locked = false
-    end
-
-    # highlight text coded by the category on the way.
-    def set_selection(idx)
-      super(idx)
-      if @text_box && category = current_category 
-        @text_box.highlight_codingtable(category.codes)
-      end
+  end
+  
+  class StandaloneWorkAreaWindow < Wx::Frame
+    def initialize(workarea, *args)
+      super(nil, -1, *args)
     end
     
-    # highlight text coded by the newly-selected category
-    def on_item_selected(e)
-      if @text_box && category = current_category 
-        @text_box.highlight_codingtable(category.codes)
-      end
-    end
-
-    # add the newly-focused category to this dropdown and highlight
-    # its text.
-    def receive_focus_category(cat)
-      set_active_category(cat) unless locked?
+    #
+    def activate()
+      # TODO - raise() doesn't seem to work on GTK
+      shown? ? raise() : show()
     end
+  end
 
-    # if a category is deleted it should be removed from the list
-    def receive_category_deleted(cat)
-      (0 .. count - 1).each do | i |
-        delete(i) if get_client_data(i).dbid == cat.dbid
-      end
-    end
-
-    def receive_category_changed(cat)
-      (0 .. count - 1).each do | i |
-        if get_client_data(i).dbid == cat.dbid
-          # TODO set_string not implemented (wxr 0.6.0)
-          # set_string(i, cat.name)
-          # set_client_data(cat.name, cat)
-          prepend(cat) # will automatically delete old
-        end
-      end
-    end
-
-    def set_active_category(category)
-      # clear the first node unless it is sticky because it has been used
-      unless @sticky
-        delete(0)
-      end
-      # clear any remaining excess items
-      while count > MAXIMUM_DROPDOWN_LENGTH
-        delete(count - 1)
-      end
-
-      prepend(category)
-      @sticky = false
-      set_selection(0)
-      # currently disabled until 0.9.6
-
-    end
-
-    def prepend(category)
-      copy = [ category.name, category ]
-      while count > 0
-        this_text = get_string(0)
-        this_cat  = @client_data[this_text]
-        unless this_cat.dbid == category.dbid
-          copy.push( this_text,  @client_data[this_text] )
-        end
-        delete(0)
-      end
-
-      until copy.empty?
-        new_text, new_data = copy.shift, copy.shift
-        append(new_text, nil)
-        set_client_data(new_text, new_data)
-      end
-      set_selection(0)
-    end
-
-    # added for compatibility with set_client_data - temporarily
-    # removed in WxRuby 0.4.0, should remove when this is fixed
-    def append(text, category, *args )
-      super(text, nil, *args)
-      set_client_data(text, category )
-    end
-
-    # mimicking WxWidgets method, temp disabled in WxRuby
-    def set_client_data(text, client_data)
-      @client_data[text] = client_data
-    end
-
-    # mimicking ...
-    def get_client_data(index)
-      text = get_string(index)
-      @client_data[text]
-    end
-
-    def find_and_add_categories()
-      typed_text = get_value()
-      unless find_string( typed_text ) || typed_text.empty?
-        matches = @app.app.get_categories_by_path(typed_text)
-        if matches.empty?
-          
-        elsif matches.length > 1
-
-        end
-        matches.each { | cat | prepend(cat) unless cat.parent.nil? }
-        set_selection( 0 )
-      end
-    end
-
-    def on_blur(e)
-      find_and_add_categories()
-      e.skip()
-    end
-
-    # missing in wxruby, but part of WxWidgets
-    # this version differs by returning nil rather than -1 on failure
-    def find_string(str)
-      ( 0 ... count ).each do | i |
-        return i if str == get_string(i)
-      end
-      return nil
-    end
-
-
-    # TODO - some visual cue to indicate that no category matched find-first
-    def set_broken(bool)
-      
-    end
-
-    def set_warning(bool)
-
-    end
-    # returns the Category object associated with the currently
-    # selected item in the drop down.
-    def current_category
-      if curr_sel = get_selection()
-        if curr_sel.nil? || curr_sel == -1
-          return nil
-        end
-        return get_client_data( curr_sel )
-      end
-    end
+  if WINDOW_MODE == :MDI
+    WorkAreaWindowBaseClass = MDIWorkAreaWindow
+  else
+    WorkAreaWindowBaseClass = StandaloneWorkAreaWindow
   end
 
-  class WorkAreaWindow <  Wx::MDIChildFrame
+  class WorkAreaWindow < WorkAreaWindowBaseClass
     # the default size for new windows of this type and
     # subclasses. Expressed as a proportion of MDI client area width
     # and MDI client area height.
     W_WINDOW_DEF_SIZE = [ 0.6, 0.8 ]
 
     def initialize(workarea, title, last_layout)
+      @workarea = workarea
       size = pos = nil
       if last_layout
         size = Wx::Size.new( last_layout[:w], last_layout[:h] )
@@ -212,9 +40,15 @@ module QDA::GUI
         size = workarea.proportional_size(*proportions)
         pos  = Wx::DEFAULT_POSITION
       end
-      super(workarea, -1, title, pos, size)
+      super(workarea, title, pos, size)
+      evt_set_focus() { | e | on_focus() }
     end
 
+    # 
+    def on_focus()
+      @workarea.active_child = self
+    end
+    
     # returns a hash serialising the current shape and location of
     # this window, so it can later be unthawed
     def layout()
@@ -239,17 +73,19 @@ module QDA::GUI
 
   # a WorkArea Window with a notebook layout with a coding panel
   # including a text display in the first pane. Documents, Categories
-  # and Queries are all displayed using this model
+  # and Queries are all displayed using this model. 
   class InspectorWindow < WorkAreaWindow
-    if Wx::RUBY_PLATFORM == 'WXGTK'
+    if Wx::RUBY_PLATFORM == 'WXGTK' and WINDOW_MODE == :MDI
       # GTK uses a notebook to fake MDI windows, so if running under
-      # WXGTK, place the real notebook tabs on the right instead
+      # WXGTK and using MDI mode, place the real notebook tabs on the
+      # right instead. Note that this combo (GTK+MDI) is not recommended
       INSPECTOR_NB_STYLE = [ Wx::DEFAULT_POSITION, Wx::DEFAULT_SIZE, 
                              Wx::NB_RIGHT ]
     else
       INSPECTOR_NB_STYLE = []
     end
-
+    attr_reader :client
+    
     def initialize(workarea, title, last_layout, &text_constructor)
       super(workarea, title, last_layout)
 
@@ -258,22 +94,29 @@ module QDA::GUI
       sizer_1 = Wx::BoxSizer.new(Wx::VERTICAL)
 
       @text_box = text_constructor.call(panel_1)
+      @text_box.evt_key_down { | e | on_key_down(e) }
       sizer_1.add(@text_box, 10, Wx::GROW|Wx::ALL, 4)
 
       butt_panel = Wx::Panel.new(panel_1, -1)
       bott_sizer = Wx::BoxSizer.new(Wx::HORIZONTAL)
       
-      @drop_down = CategoryDropDown.new(@app, butt_panel, @text_box)
+      @drop_down = CategoryDropDown.new(client, butt_panel, @text_box)
       bott_sizer.add(@drop_down, 3, Wx::ALL, 4)
 
-      button = Wx::Button.new(butt_panel, -1, 'Code')
+      button = Wx::Button.new(butt_panel, -1, 'Mark')
       button.evt_button(button.get_id) { | e | on_code(e) }
       bott_sizer.add(button, 1, Wx::ALL, 4)
 
-      button = Wx::Button.new(butt_panel, -1, 'Uncode')
+      button = Wx::Button.new(butt_panel, -1, 'Unmark')
       button.evt_button(button.get_id) { | e | on_uncode(e) }
       bott_sizer.add(button, 1, Wx::ALL, 4)
-
+      
+      if @text_box.respond_to?(:start_find)
+        button = Wx::Button.new(butt_panel, -1, 'Find')
+        button.evt_button(button.get_id) { @text_box.start_find(self) }
+        bott_sizer.add(button, 1, Wx::ALL, 4)
+      end
+      
       # 		button = Wx::Button.new(butt_panel, -1, 'Note')
       # 		button.evt_button(button.get_id) { | e | on_code(e) }
       # 		bott_sizer.add(button, 1, Wx::ALL, 4, Wx::ALIGN_RIGHT)
@@ -286,6 +129,7 @@ module QDA::GUI
       panel_1.set_sizer( sizer_1 )
       @notebook.add_page(panel_1, 'text') 
       evt_activate() { | e | on_activate(e) }
+      subscribe(client, :text_font_changed)
     end
 
     # (hopefully temporary) method -- when this window is closed,
@@ -315,9 +159,8 @@ module QDA::GUI
         codes = @text_box.selection_to_fragments()
         codes.each { | c | category.code(c.docid, c.offset, c.length) }
 
-        $wxapp.app.save_category( category )
+        @client.app.save_category( category )
         @drop_down.sticky = true
-        $wxapp.broadcast(:category_changed, category )
       end
     end
     
@@ -327,14 +170,24 @@ module QDA::GUI
       Wx::BusyCursor.busy do 
         codes = @text_box.selection_to_fragments()
         codes.each { | c | category.uncode(c.docid, c.offset, c.length) }
-        $wxapp.app.save_category( category )
+        @client.app.save_category( category )
         @drop_down.sticky = true
-        $wxapp.broadcast(:category_changed, category )          
       end
     end
 
-    def refresh()
-
+    # implements keyboard shortcuts for this window - these are activated by
+    # interaction with the text-box.
+    # currently, CTRL-k is mapped to "Code" and CTRL-l is mapped to "Uncode"
+    def on_key_down(evt)
+      return unless evt.control_down()
+      case evt.key_code()
+      when 70 # "f"
+        @text_box.start_find(self) if @text_box.respond_to?(:start_find)
+      when 77 # "m"
+        on_code(evt)
+      when 44 # ","
+        on_uncode(evt)
+      end
     end
 
     # the current category active in this window
@@ -347,7 +200,7 @@ module QDA::GUI
     end
 
     # set the display font for use in this inspector
-    def set_display_font(font)
+    def receive_text_font_changed(font)
       @text_box.set_font(font)
     end
   end
@@ -355,7 +208,7 @@ module QDA::GUI
   require 'weft/wxgui/inspectors/document.rb'
   require 'weft/wxgui/inspectors/category.rb'
   # require 'weft/wxgui/inspectors/imagedocument.rb'
-  require 'weft/wxgui/inspectors/search.rb'
+  require 'weft/wxgui/inspectors/query.rb'
   require 'weft/wxgui/inspectors/script.rb'
   require 'weft/wxgui/inspectors/codereview.rb'
 end