ruber 0.0.8 → 0.0.9

data/lib/ruber/main_window/open_file_in_project_dlg.rb

@@ -110,10 +110,10 @@ module Ruber
  =====Arguments
  _parent_:: the widget parent of the dialog
 =end
-    def initialize parent = nil
-      super
-      files = Ruber.current_project.project_files.to_a
-      @base_dir = Ruber.current_project.project_directory
+    def initialize prj, parent = nil
+      super parent
+      files = prj.project_files.to_a
+      @base_dir = prj.project_directory
       @ui = Ui::OpenFileInProjectDlg.new
       @ui.setupUi self
       @ui.regexp_error.hide

data/lib/ruber/main_window/plugin.yaml

@@ -29,18 +29,16 @@ config_options:
   v_splitter: {key: Vertical splitter, type: string list, default: "['80', '20']"}
  workspace:
   tools_sizes: {default: {}}
-  close_buttons: {default: 'true', type: bool}
 config_widgets:
  - {caption: General, pixmap: configure, class: Ruber::MainWindowSettingsWidget}
  - {caption: Colors, pixmap: fill-color, class: Ruber::OutputColorWidget}
- - {caption: Workspace, pixmap: workspace.png, class: Ruber::MainWindow::WorkspaceSettingsWidget}
 actions:
  file_new: {standard_action: open_new, slot: new_file()}
  file_open: {standard_action: open, slot: open_file()}
  file_open_recent: {standard_action: open_recent, signal: urlSelected(KUrl), slot: open_recent_file(KUrl)}
  file-save_all: {text: Save &All, icon: document-save-all, slot: save_all()}
  file_close: {standard_action: close, slot: close_current_editor()}
- file-close_tab: {text: Close Current &Tab, slot: close_tab(), state: current_document}
+ file-close_tab: {text: Close Current &Tab, slot: close_current_tab(), state: current_document}
  file-close_all: {text: Clos&e All, slot: close_all_views(), state: current_document}
  file-close_other: {text: Close All O&ther, slot: close_other_views(), state: current_document}
  file_quit: {standard_action: quit, receiver: 'Ruber[:app]', slot: closeAllWindows()}
@@ -56,6 +54,7 @@ actions:
  project-close: {text: '&Close Project', slot: close_current_project(), state: active_project_exists}
  project-quick_open_file: {text: '&Quick Open File', icon: document-open, shortcut: Alt+Ctrl+O, slot: open_file_in_project(), state: active_project_exists}
  project-configure: {text: Co&nfigure Project..., icon: configure, slot: configure_project(), state: active_project_exists}
+ project-active_project: {text: '&Active Project', signal: 'triggered(QAction*)', class: KDE::SelectAction, slot: 'change_active_project(QAction*)'}
  options-choose_plugins: {text: C&hoose Plugins..., icon: preferences-plugin, slot: choose_plugins()}
  options_configure: {standard_action: preferences, slot: preferences()}
  configure_document: {text: Configure &Document, icon: configure, slot: configure_document(), state: current_document}
@@ -68,6 +67,4 @@ actions:
  window-next_horizontally: {text: Next View Horizontally, slot: move_among_views(), state: current_document, shortcut: Ctrl+Alt+Right}
  window-next_vertically: {text: Next View Vertically, slot: move_among_views(), state: current_document, shortcut: Ctrl+Alt+PgDown}
  window-previous_horizontally: {text: Previous View Horizontally, slot: move_among_views(), state: current_document, shortcut: Ctrl+Alt+Left}
- window-previous_vertically: {text: Previous View Vertically, slot: move_among_views(), state: current_document, shortcut: Ctrl+Alt+PgUp}
-extensions:
- ruber_default_document: {class: Ruber::Application::DefaultDocumentExtension, scope: document, place: all}
+ window-previous_vertically: {text: Previous View Vertically, slot: move_among_views(), state: current_document, shortcut: Ctrl+Alt+PgUp}

data/lib/ruber/main_window/ui/workspace_settings_widget.rb

@@ -1,8 +1,8 @@
 =begin
 ** Form generated from reading ui file 'workspace_settings_widget.ui'
 **
-** Created: mer gen 12 12:12:11 2011
-**      by: Qt User Interface Compiler version 4.7.1
+** Created: lun apr 18 09:11:58 2011
+**      by: Qt User Interface Compiler version 4.7.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
 =end

data/lib/ruber/main_window/workspace.rb

@@ -23,24 +23,34 @@ require 'facets/enumerable/sum'
 module Ruber
   
 =begin rdoc
-Widget representing the main area of Ruber's main window, containing the tool
-widgets, together with their tab bars, and the tab widget containing the views.
+Widget representing the main area of Ruber's main window. It contains the space
+for the main widget (that is, the tab widget where the editors are located) and
+the tool widgets, together with their tab bars.
 
-===Tool Widgets
-The workspace provides three <i>tool widgets containers</i>, on all sides of the
-editor views except above them. The container on each side is indipendent from the
-others.
+To allow for several main widgets existing (but not being visible) at the same time
+(one main widget for each environment) the space for the main widget is given by
+a single @Qt::StackedWidget@, where the different main widgets are placed using
+{#add_widget}. {#main_widget=} is then used to bring one of the main widgets to
+the foreground; {#remove_widget} removes a widget from the stacked widget (to be
+used when a project is closed).
 
-A tool widget can be
-* +raised+ or +lowered+: a raised tool widget is the only one which can bee seen
-  and interact with the user. There can be only one raised tool widget for side.
-  All other tool widgets are said to be lowered.
-* +visible+ or +hidden+: while a lowered tool widget is can never be seen, the
-  opposite is not necessarily true. A raised tool widget will be visible only if
-  its container is visible, otherwise it will be hidden, too
-* +active+ or +inactive+: a tool widget is active only if it has focus, otherwise
-  it's inactive. Obviously, only visible tool widgets can be active and there can
-  be at most one active tool widget in all the workspace.
+The workspace provides three _tool widgets containers_, one on each side of the
+main widget except above it. The container on each side is indipendent from the
+others. The containers have buttons for their tool widgets and a @Qt::StackedWidget@
+for the widget themselves. Each container is indipendent from the other ones
+
+A tool widget can be in several different states:
+* _raised_ or _lowered_: a tool widget is _raised_ when it's on the top of its container
+  stacked widget. There can be only one raised tool widget for side. All tool widgets
+  which aren't raised are said to be _lowered_
+* _visible_ or _hidden_: each tool widget container can be visible or hidden. The
+  raised tool widget in a visible container is said to be _visible_. Widgets in
+  an hidden container are said to be _hidden_.
+* _active_ or _inactive_: the _active_ tool widget is the one which has keyboard
+  focus; all others are _inactive_. Of course there can be at most one active tool
+  widget across the whole workspace. If the focus is not in one of the tool widgets
+  (most likely meaning one of the editors has focus), all tool widgets will be
+  inactive.
 =end
   class Workspace < Qt::Widget
     
@@ -112,17 +122,12 @@ Internal class used to store information about the position of a tool widget
     signals 'tool_shown(QWidget*)'
     
     slots 'toggle_tool(int)'
-    
+       
 =begin rdoc
-The tab widget containing the editor views
-=end
-#   attr_reader :views
-    
-=begin rdoc
-Creates a new Workspace. _parent_ is the workspace's parent widget
+@param [Qt::Widget,nil] parent the parent widget
 =end
     def initialize parent = nil
-      super
+      super parent
       @button_bars = {}
       @splitters = {}
       @stacks = {}
@@ -133,14 +138,38 @@ Creates a new Workspace. _parent_ is the workspace's parent widget
       create_skeleton
     end
     
+    def add_widget w
+      @main_widget.add_widget w
+    end
+    
+    def remove_widget w
+      @main_widget.remove_widget w
+    end
+    
+    def main_widget
+      @main_widget.current_widget
+    end
+    
+    def main_widget= w
+      unless @main_widget.include? w
+        Kernel.raise ArgumentError, "a widget which has not been added to the workspace can\'t become the main widget"
+      end
+      @main_widget.current_widget = w
+    end
+
 =begin rdoc
-Adds a tool widget to the workspace. _side_ is the side where the widget should
-be put. It can be <tt>:left</tt>, <tt>:right</tt> or <tt>:bottom</tt>. _widget_
-is the widget to add; _icon_ is the <tt>Qt::Pixmap</tt> containing the icon to
-put on the tab bar and _caption_ is the text to display on the same caption.
+Adds a tool widget to the workspace
 
-If _widget_ had already been added as a tool widget (either on the same side or
-another side, then ArgumentError is raised).
+@param [Symbol] side the side where the tool widget should be put. It can be
+  @:left@, @:right@ or @:bottom@
+@param [Qt::Widget] widget the widget to add
+@param [Qt::Pixmap] icon the icon to show on the button associated with the tool
+  widget
+@param [String] caption the text to show on the button associated with the tool
+  widget
+@raise [ArgumentError] if the same tool widget had already been added to the workspace
+  (either on the same side or on another side)
+@return [nil]
 =end
     def add_tool_widget side, widget, icon, caption
       if @stacks.values.include? widget.parent
@@ -153,6 +182,7 @@ another side, then ArgumentError is raised).
       @stacks[side].add_widget widget
       connect bar.tab(id), SIGNAL('clicked(int)'), self, SLOT('toggle_tool(int)')
       @next_id += 1
+      nil
     end
     
 =begin rdoc
@@ -357,8 +387,8 @@ splitters and tab view)
       v.add_widget h
       v.add_widget @stacks[:bottom]
       h.add_widget @stacks[:left]
-      @views = KDE::TabWidget.new(h){self.document_mode = true}
-      h.add_widget @views
+      @main_widget = Qt::StackedWidget.new self
+      h.add_widget @main_widget
       h.add_widget @stacks[:right]
     end
     

data/lib/ruber/output_widget.rb

@@ -826,17 +826,17 @@ corresponding item by overriding this method to always return *nil*.
       return unless res
       res = Array res
       res << 0 if res.size == 1
-      #if res[0] is an url with scheme file:, transform it into a regular file
-      #name by removing the scheme and the two following slash
-      res[0].sub! %r{^file://}, ''
-      if KDE::Url.file_url?(res[0]) then res
-      else
-        res[0] = File.join (@working_dir || Dir.pwd), res[0] unless Pathname.new(res[0]).absolute?
-        if File.exist?(res[0]) and !File.directory?(res[0])
-          res
-        else nil
+      res[0].sub!(%r{^file://},'')
+      unless res[0].match(%r{^.+://})
+        path = Pathname.new(res[0])
+        begin
+          res[0] = path.realpath(@working_dir).to_s
+          return nil unless File.file? res[0]
+        rescue Errno::ENOENT 
+          return nil
         end
       end
+      res
     end
     
 =begin rdoc
@@ -936,12 +936,13 @@ is valid and <tt>Qt::NoItemFlags</tt> if it isn't vaid.
 
 If <tt>global_flags</tt> is *nil*, this method behaves as <tt>Qt::StandardModel#flags</tt>.
 =end
-      def flags idx
-        if @global_flags
-          idx.valid? ? @global_flags : Qt::NoItemFlags
-        else super
-        end
-      end
+#       def flags idx
+#         super
+#         if @global_flags
+#           idx.valid? ? @global_flags : Qt::NoItemFlags
+#         else super
+#         end
+#       end
       
 =begin rdoc
 Changes content of the given element. 
@@ -965,6 +966,7 @@ Returns the new item.
         col = opts[:col] || 0
         parent = opts[:parent]
         it = Qt::StandardItem.new(text)
+        it.flags = @global_flags if @global_flags
         row = (parent || self).row_count + row if row < 0
         col = (parent || self).column_count + col if col < 0
         if parent then parent.set_child row, col, it
@@ -1032,7 +1034,9 @@ This method returns an array containing all the non-empty items of the new row.
         end
         text = Array.new(col) << text unless text.is_a? Array
         items = text.map do |i| 
-          i ? Qt::StandardItem.new(i) : Qt::StandardItem.new
+          it = i ? Qt::StandardItem.new(i) : Qt::StandardItem.new
+          it.flags = @global_flags if @global_flags
+          it
         end
         parent.insert_row row, items
         items.delete_if{|i| i.text.nil?}

data/lib/ruber/pane.rb

@@ -147,6 +147,8 @@ Signal emitted whenever the single view associated with the paned is about to be
 =begin rdoc
 Signal emitted whenever a view in the pane or one of its children has been removed
 
+In slots connected to this signal, calls to {#view} will return *nil*.
+
 @param [Pane] pane the pane the view was child of
 @param [Qt::Widget] view the view which was removed from the pane. Note that when
   this signal is emitted, the view hasn't as yet been destroyed, but it has already
@@ -401,7 +403,8 @@ Iterates on all views contained in the pane
 This method always acts recursively, meaning that views indirectly contained in
 the pane are returned. 
 
-If the pane is in single view mode, that only view is passed to the block.
+If the pane is in single view mode, that only view is passed to the block. If the
+only view has been closed, the block is not called.
 
 @yieldparam [EditorView] view a view contained (directly) in the pane
 @return [Pane,Enumerator] if a block is given then *self*, otherwise an Enumerator
@@ -409,8 +412,8 @@ If the pane is in single view mode, that only view is passed to the block.
 =end
     def each_view &blk
       return to_enum(:each_view) unless block_given?
-      if single_view? then yield @view
-      else
+      if single_view? and @view.parent then yield @view
+      elsif !single_view?
         each_pane(:recursive) do |pn|
           yield pn.view if pn.single_view?
         end
@@ -514,7 +517,8 @@ It does nothing if the splitter is already in single view mode
       keeping_focus view do
         @view = view
         @view.parent = self unless @view.parent == self
-        @splitter.each{|w| w.disconnect SIGNAL('closing_last_view(QWidget*)'), self, SLOT('remove_pane(QWidget*)')}
+        @splitter.each{|w| take_pane w}
+#         @splitter.each{|w| w.disconnect SIGNAL('closing_last_view(QWidget*)'), self, SLOT('remove_pane(QWidget*)')}
         layout.remove_widget @splitter
         layout.insert_widget 0, @view
         self.label = label
@@ -526,7 +530,6 @@ It does nothing if the splitter is already in single view mode
       end
     end
 
-    
     private
     
     def keeping_focus *widgets
@@ -591,6 +594,8 @@ Slot called when the single view contained in the pane is closed
 It emis the {#closing_last_view} signal passing *self* as argument, makes the
 view parentless and schedules *self* for deletion.
 
+After this method as been called (in particular, in slots connected to the {#remove_view} signal), calls to {#view} will return *nil*.
+
 *Note:* this method assumes the {Pane} is in single view mode
 @param [EditorView] view the view which is being closed
 @return [nil]
@@ -598,6 +603,7 @@ view parentless and schedules *self* for deletion.
     def remove_view view
       emit closing_last_view(self)
       @view.parent = nil
+      @view = nil
       emit removing_view self, view
       delete_later
       nil

data/lib/ruber/project.rb

@@ -111,8 +111,6 @@ When the project is created, it's not active.
     def initialize parent, backend, name = nil
       super(parent)
       @active = false
-      Ruber[:components].named_connect(SIGNAL('component_loaded(QObject*)'), "register_component_with_project #{object_id}"){|c| c.register_with_project self}
-      Ruber[:components].named_connect(SIGNAL('unloading_component(QObject*)'), "remove_component_from_project #{object_id}"){|c| c.remove_from_project self}
       @project_file = backend.file
       setup_container backend, project_dir
       @dialog_class = ProjectDialog
@@ -130,6 +128,8 @@ When the project is created, it's not active.
         raise InvalidProjectFile, "You need to specify a project name for a new project"
       end
       @project_extensions = {}
+      Ruber[:components].named_connect(SIGNAL('component_loaded(QObject*)'), "register_component_with_project #{object_id}"){|c| c.register_with_project self}
+      Ruber[:components].named_connect(SIGNAL('unloading_component(QObject*)'), "remove_component_from_project #{object_id}"){|c| c.remove_from_project self}
       Ruber[:components].each_component{|c| c.register_with_project self}
     end
     
@@ -263,7 +263,7 @@ name doesn't exist, or if _args_ is not empty, +ArgumentError+ is raised.
           puts "Arguments: #{args.empty? ? '[]' : args.join( ', ')}"
         end
         raise ArgumentError, "wrong number of arguments (#{args.size} for 0)" unless args.empty?
-        @project_extensions.fetch(name){|k| raise ArgumentError, "No project extension with name #{k}"}
+        @project_extensions[name] || super
       end
     end
     
@@ -289,17 +289,27 @@ writing the settings to file
     end
     
 =begin rdoc
-Closes the project. This means:
-* calling the +save+ method if _save_ is *true*
-* removing all the project extensions
-* emitting the <tt>closing(QObject*)</tt> signal
-
-If _save_ is *true*, returns *false* if an error occurred while saving
-and *true* if no error occurred. If _save_ is *false*, it always
-returns *true*
+Closes the project
+
+According to the _save_ parameter, the project may save itself and its extensions\'
+settings or not. In the first case, extensions may stop the project from closing
+by having their @query_close@ method return *false*. If _save_ is false, nothing
+will be saved and the closing can't be interrupted.
+    
+Before closing the project, the {#closing} signal is emitted. After that, all extensions
+will be removed (calling their @remove_from_project@ method if they have one).
+
+@param [Boolean] save whether or not to save the project and the extensions\'
+  settings. If *true*, the extensions will also have a chance to abort closing by
+  returning *false* from their @query_close@ method
+@return [Boolean] *true* if the project was closed correctly and *false* if the
+  project couldn\'t be closed, either because some of the extensions\' @query_close@
+  method returned *false* or because the project itself couldn\'t be saved for some
+  reason.
 =end
     def close save = true
       if save
+        return false unless query_close
         return false unless self.save
       end
       emit closing(self)
@@ -355,6 +365,11 @@ If _file_ is a relative path, it's considered relative to the current directory.
 
 If the project file _file_ already exists but it's not a valid project file,
 AbstractProject::InvalidProjectFile will be raised.
+
+@param [String] file the path of the project file (it doesn't need to exist)
+@param [String,nil] name the name of the project. If the project file already exists,
+  then this should be *nil*. If the project file doesn't exist, this should *not*
+  be *nil*
 =end
     def initialize file, name = nil
       file = File.join(Dir.pwd, file) unless file.start_with? '/'
@@ -362,7 +377,7 @@ AbstractProject::InvalidProjectFile will be raised.
       rescue YamlSettingsBackend::InvalidSettingsFile => e
         raise Ruber::AbstractProject::InvalidProjectFile, e.message
       end
-      super Ruber[:projects], back, name
+      super Ruber[:world], back, name
     end
     
 =begin rdoc

data/lib/ruber/projects/ui/project_files_rule_chooser_widget.rb

@@ -1,8 +1,8 @@
 =begin
 ** Form generated from reading ui file 'project_files_rule_chooser_widget.ui'
 **
-** Created: mer gen 12 12:12:11 2011
-**      by: Qt User Interface Compiler version 4.7.1
+** Created: lun apr 18 09:11:58 2011
+**      by: Qt User Interface Compiler version 4.7.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
 =end

data/lib/ruber/projects/ui/project_files_widget.rb

@@ -1,8 +1,8 @@
 =begin
 ** Form generated from reading ui file 'project_files_widget.ui'
 **
-** Created: mer gen 12 12:12:11 2011
-**      by: Qt User Interface Compiler version 4.7.1
+** Created: lun apr 18 09:11:58 2011
+**      by: Qt User Interface Compiler version 4.7.2
 **
 ** WARNING! All changes made in this file will be lost when recompiling ui file!
 =end

data/lib/ruber/utils.rb

@@ -336,6 +336,9 @@ those signals, everything else will still work (in the rest of the documentation
 every time emitting a signal is mentioned, it's understood that the signal won't
 be emitted if it doesn't exist).
 
+Classes including this module may customize what is done when the state change by
+overriding the {#do_activation} and {#do_deactivation} methods.
+
 Classes mixing-in this module should initialize an instance variable called
 <tt>@active</tt>. If they don't, one initialized to *nil* will be created the first
 time it'll be needed (possibly with a warning).
@@ -374,8 +377,8 @@ If previously the object was inactive, emits the @activated@ signal.
 =begin rdoc
 Enables or disables the object
 
-If the state of the object changes, the @activated@ or @deactivated@ signal is
-emitted.
+If the state of the object changes, the {#do_activation} or {#do_deactivation}
+methods are called. This happens _after_ the state has been changed.
 
 @param [Object] val whether the object should be activated or deactivated. If the
 object is a true value, the object will be activated, otherwise it will be deactivated
@@ -385,12 +388,42 @@ object is a true value, the object will be activated, otherwise it will be deact
       old = @active
       @active = val.to_bool
       if old != @active
-        emit(@active ? activated : deactivated) rescue NameError
+        @active ? do_activation : do_deactivation
       end
     end
     
+    private
+    
+=begin rdoc
+Method called after the state changes from active to inactive
+
+It emits the @deactivated@ signal, if the class including the module has the signal.
+
+Including classes can override this method to perform other actions every time the
+object becomes inactive. In this case, they should call *super* if they want the
+signal to be emitted
+@return [nil]
+=end
+    def do_deactivation
+      emit deactivated rescue NameError
+    end
+
+=begin rdoc
+Method called after the state changes from inactive to active
+
+It emits the @activated@ signal, if the class including the module has the signal.
+
+Including classes can override this method to perform other actions every time the
+object becomes active. In this case, they should call *super* if they want the
+signal to be emitted
+@return [nil]
+=end
+    def do_activation
+      emit activated rescue NameError
+    end
+    
   end
-  
+    
 end
 
 module Shellwords