ruber 0.0.8 → 0.0.9

data/lib/ruber/kde_sugar.rb

@@ -74,6 +74,22 @@ return *true* for both absolute and relative paths.
       !(local_file? or relative?)
     end
     
+=begin rdoc
+@return [Boolean] *true* if the two URLs are equal according to @==@ and *false*
+  otherwise
+=end
+    def eql? other
+      self == other
+    end
+    
+=begin rdoc
+Override of Object#hash
+@return [Integer] the hash value of the path associated with the URL
+=end
+    def hash
+      path.hash
+    end
+    
   end
 
   class TabWidget

data/lib/ruber/main_window/choose_plugins_dlg.rb

@@ -144,9 +144,9 @@ deselected.
       
       connect m, SIGNAL('itemChanged(QStandardItem*)'), self, SLOT('plugin_toggled(QStandardItem*)')
       
-      def m.flags idx
-        Qt::ItemIsSelectable|Qt::ItemIsEnabled| Qt::ItemIsUserCheckable
-      end
+#       def m.flags idx
+#         Qt::ItemIsSelectable|Qt::ItemIsEnabled| Qt::ItemIsUserCheckable
+#       end
       
       @url = KDE::UrlRequester.new self
       @ui.directories.custom_editor = @url.custom_editor
@@ -276,7 +276,10 @@ size of the contents.
         name.data = Qt::Variant.new(k.to_s)
         desc = Qt::StandardItem.new v.about.description
         dir = Qt::StandardItem.new v.directory
-        m.append_row [name, desc, dir]
+        row = [name, desc, dir]
+        row.each{|i| i.flags = Qt::ItemIsSelectable|Qt::ItemIsEnabled}
+        name.flags |= Qt::ItemIsUserCheckable
+        m.append_row row
       end
       update_plugin_status
       3.times{|i| @ui.plugins.resize_column_to_contents i}

data/lib/ruber/main_window/main_window.rb

@@ -29,8 +29,6 @@ require 'ruber/gui_states_handler'
 
 require 'ruber/main_window/main_window_internal'
 require 'ruber/main_window/main_window_actions'
-require 'ruber/main_window/hint_solver'
-require 'ruber/main_window/view_manager'
 
 require 'ruber/main_window/status_bar'
 require 'ruber/main_window/workspace'
@@ -43,6 +41,9 @@ The application's main window. It is made of a menu bar, a tool bar, a workspace
 and a status bar. The workspace (see Workspace) is the main window's central widget
 and where most of the user interaction happens. It contains the editors and the
 tool widgets.
+
+@api feature main_window
+@extension environment {api: '{Environment}'}
 =end
   class MainWindow < KParts::MainWindow
     
@@ -56,17 +57,7 @@ tool widgets.
         
     slots :load_settings
     
-=begin rdoc
-The default hints used by methods like {#editor_for} and {#editor_for!}
-=end
-    DEFAULT_HINTS = {
-      :exisiting => :always, 
-      :strategy => [:current, :current_tab, :first],
-      :new => :new_tab,
-      :split => :horizontal,
-      :show => true,
-      :create_if_needed => true
-    }.freeze
+    DEFAULT_HINTS = Ruber::World::Environment::DEFAULT_HINTS
     
 =begin rdoc
 The widget which contains the tool widgets.
@@ -98,17 +89,15 @@ is the plugin description for this object.
       super nil, 0
       initialize_plugin pdf
       initialize_states_handler
-      self.central_widget = Workspace.new self
-      # We need the instance variable to use it with Forwardable
-      @workspace = central_widget 
-      @tabs = central_widget.instance_variable_get :@views
-      @tabs.tabs_closable = Ruber[:config][:workspace, :close_buttons]
-      @view_manager = ViewManager.new @tabs, self
-      @auto_activate_editors = true
+      @active_environment = nil
+      @workspace = Workspace.new self
+      self.central_widget = @workspace
+      @workspace.add_widget Ruber[:world].default_environment.tab_widget
       @ui_states = {}
       @actions_state_handlers = Hash.new{|h, k| h[k] = []}
       @about_plugin_actions = []
       @switch_to_actions = []
+      @activate_project_actions = []
       @last_session_data = nil
       self.status_bar = StatusBar.new self
       self.connect(SIGNAL('current_document_changed(QObject*)')) do |doc|
@@ -117,17 +106,20 @@ is the plugin description for this object.
       connect Ruber[:components], SIGNAL('component_loaded(QObject*)'), self, SLOT('add_about_plugin_action(QObject*)')
       connect Ruber[:components], SIGNAL('unloading_component(QObject*)'), self, SLOT('remove_about_plugin_action(QObject*)')
       connect Ruber[:components], SIGNAL('unloading_component(QObject*)'), self, SLOT('remove_plugin_ui_actions(QObject*)')
-      connect @view_manager, SIGNAL('active_editor_changed(QWidget*)'), self, SLOT('slot_active_editor_changed(QWidget*)')
-      connect Ruber[:documents], SIGNAL('document_created(QObject*)'), self, SLOT('document_created(QObject*)')
-      connect Ruber[:documents], SIGNAL('closing_document(QObject*)'), self, SLOT(:update_switch_to_list)
+      connect Ruber[:world], SIGNAL('active_environment_changed_2(QObject*, QObject*)'), self, SLOT('slot_active_environment_changed(QObject*, QObject*)')
+      connect Ruber[:world], SIGNAL('document_created(QObject*)'), self, SLOT('document_created(QObject*)')
+      connect Ruber[:world], SIGNAL('closing_document(QObject*)'), self, SLOT(:update_switch_to_list)
 
       setup_actions action_collection
-      Ruber[:projects].connect( SIGNAL('current_project_changed(QObject*)') ) do |prj|
-        change_state "active_project_exists", !prj.nil?
-        change_title
+      active_project_action = action_collection.action('project-active_project')
+      default_view_action = active_project_action.add_action '&None (single files mode)'
+      
+      connect Ruber[:world], SIGNAL('project_created(QObject*)'), self, SLOT('slot_project_created(QObject*)')
+      connect Ruber[:world], SIGNAL('closing_project(QObject*)'), self, SLOT('slot_project_closing(QObject*)')
+      
+      Ruber[:world].connect SIGNAL('active_project_changed(QObject*)') do |prj|
+        @active_environment = Ruber[:world].environment prj
       end
-      connect @tabs, SIGNAL('tabCloseRequested(int)'), self, SLOT('close_tab(int)')
-      connect Ruber[:projects], SIGNAL('closing_project(QObject*)'), self, SLOT('close_project_files(QObject*)')
       setup_GUI
       create_shell_GUI true
       
@@ -148,38 +140,27 @@ is the plugin description for this object.
       action_collection.action("project-open_recent").load_entries recent_projects
       status_bar.show
       setup_initial_states
+      Ruber[:world].active_environment = Ruber[:world].default_environment
     end
     
 =begin rdoc
-The open tabs
+The toplevel panes associated with the active environment
 
-@return [Array<Pane>] a list of the top-level pane for each tab
+@return (see World::Environment#tabs)
 =end
     def tabs
-      @tabs.to_a
+      @active_environment.tabs
     end
     
 =begin rdoc
-The views contained in the main window
-
-If a document is given as argument, returns all views associated with the document;
-if no document is given, all views are returned.
+The views contained in the active environment
 
-The order of the views in the returned list is the activation order: the view
-which was activated more recently is at position 0 in the array, the one activated
-before that is at position 1 and so on. Views which have never been activated are
-at the end of the array, in an arbitrary order
-
-@param [Document,nil] doc the document to return the views for. If *nil*, all the
-  views will be returned
-@return [Array<EditorView>] the views associated with the given document, if any,
-  or all the views, in activation order, from most recently activated to less recently
-  activated
+@see World::Environment#views
+@param (see World::Environment#views)
+@return (see World::Environment#views)
 =end
     def views doc = nil
-      if doc then @view_manager.activation_order.select{|v| v.document == doc}
-      else @view_manager.activation_order.dup
-      end
+      @active_environment.views
     end
     
     ##
@@ -296,38 +277,39 @@ hint, a new one will be created, unless the @create_if_needed@ hint is *false*.
 @raise [ArgumentError] if _doc_ is a path or a @KDE::Url@ but the corresponding
   file doesn't exist
 =end
-    def editor_for! doc, hints = DEFAULT_HINTS
-      hints = DEFAULT_HINTS.merge hints
-      if hints[:new] == :replace
-        if active_editor
-          hints[:existing] = :never
-          hints[:show] = false
-        else hints[:new] = :new_tab
-        end
-      end
-      docs = Ruber[:documents].documents
-      unless doc.is_a? Document
-        unless hints.has_key? :close_starting_document
-          hints[:close_starting_document] = docs.size == 1 && 
-              docs[0].extension(:ruber_default_document).default_document && 
-              docs[0].pristine?
-        end
-        url = doc
-        if url.is_a? String
-          url = KDE::Url.new url
-          if url.relative?
-            path = File.expand_path url.path
-            url.path = path
-          end
-        end
-        doc = Ruber[:documents].document url
-      end
-      return unless doc
-      ed = @view_manager.without_activating{@view_manager.editor_for doc, hints}
-      if hints[:new] == :replace
-        replace_editor active_editor, ed
-      else ed
-      end
+    def editor_for! doc, hints = {}
+      @active_environment.editor_for! doc, hints
+#       hints = DEFAULT_HINTS.merge hints
+#       if hints[:new] == :replace
+#         if active_editor
+#           hints[:existing] = :never
+#           hints[:show] = false
+#         else hints[:new] = :new_tab
+#         end
+#       end
+#       docs = Ruber[:documents].documents
+#       unless doc.is_a? Document
+#         unless hints.has_key? :close_starting_document
+#           hints[:close_starting_document] = docs.size == 1 && 
+#               docs[0].extension(:ruber_default_document).default_document && 
+#               docs[0].pristine?
+#         end
+#         url = doc
+#         if url.is_a? String
+#           url = KDE::Url.new url
+#           if url.relative?
+#             path = File.expand_path url.path
+#             url.path = path
+#           end
+#         end
+#         doc = Ruber[:documents].document url
+#       end
+#       return unless doc
+#       ed = @view_manager.without_activating{@view_manager.editor_for doc, hints}
+#       if hints[:new] == :replace
+#         replace_editor active_editor, ed
+#       else ed
+#       end
     end
     
 =begin rdoc
@@ -343,36 +325,32 @@ editor associated with the given document exists or no document corresponds to _
 @raise [ArgumentError] if _doc_ is a path or a @KDE::Url@ but the corresponding
 file doesn't exist
 =end
-    def editor_for doc, hints = DEFAULT_HINTS
-      hints = DEFAULT_HINTS.merge hints
-      hints[:create_if_needed] = false
-      unless doc.is_a? Document
-        url = doc
-        if url.is_a? String
-          url = KDE::Url.new url
-          if url.relative?
-            path = File.expand_path url.path
-            url.path = path
-          end
-        end
-        doc = Ruber[:documents].document_for_url url
-      end
-      return unless doc
-      @view_manager.editor_for doc, hints
-    end
+#     def editor_for doc, hints = DEFAULT_HINTS
+#       hints = DEFAULT_HINTS.merge hints
+#       hints[:create_if_needed] = false
+#       unless doc.is_a? Document
+#         url = doc
+#         if url.is_a? String
+#           url = KDE::Url.new url
+#           if url.relative?
+#             path = File.expand_path url.path
+#             url.path = path
+#           end
+#         end
+#         doc = Ruber[:documents].document_for_url url
+#       end
+#       return unless doc
+#       @view_manager.editor_for doc, hints
+#     end
     
 =begin rdoc
 The active editor
     
-The active editor is the editor which has its GUI merged with the main window's.
-This means it is the editor which last received focus and the one which would receive
-focus when the tab widget does. If the focus already is in the tab widget, then
-the active editor is the one whose @is_active_window@ method returns *true*.
-
-@return [EditorView,nil] the active editor or *nil* if there's no active editor.
+@see World::Environment#active_editor
+@return (see World::Environment#active_editor)
 =end
     def active_editor
-      @view_manager.active_editor
+      @active_environment.active_editor
     end
     alias_method :current_editor, :active_editor
 
@@ -391,12 +369,7 @@ signals are emitted.
   editor will be deactivated
 =end
   def activate_editor editor
-    tab = @view_manager.tab editor
-    return unless tab
-    @tabs.current_widget = tab
-    return if active_editor == editor
-    @view_manager.make_editor_active editor
-    editor
+    @active_environment.activate_editor editor
   end
     
 =begin rdoc
@@ -428,16 +401,7 @@ it).
 @return [EditorView,nil] the new editor or *nil* if the user choose to abort
 =end
     def replace_editor old, editor_or_doc
-      if old.document.views.size == 1
-        return unless old.document.query_close
-        close_doc = true
-      end
-      if editor_or_doc.is_a?(EditorView) then ed = editor_or_doc
-      else ed = editor_for! editor_or_doc, :existing => :never, :show => false
-      end
-      old.parent.replace_view old, ed
-      close_editor old, false
-      ed
+      @active_environment.replace_editor old, editor_or_doc
     end
     
 =begin rdoc
@@ -451,22 +415,19 @@ The toplevel pane corresponding to the given index or editor
   @return [Pane] the toplevel pane containing the given editor
 =end
     def tab arg
-      @view_manager.tab arg
+      @active_environment.tab arg
     end
     
 =begin rdoc
 The document associated with the active editor
 
-This is a convenience method for @active_editor.document@ which takes care of the
-case when there's no active editor.
-
-@return [Document,nil] the document associated with the active editor or *nil*
-  if there's no active editor
+@see World::Environment#active_document
+@return (see World::Environment#active_document)
 =end
-    def current_document
+    def active_document
       (ed = active_editor) ? ed.document : nil
     end
-    alias_method :active_document, :current_document
+    alias_method :current_document, :active_document
     
 =begin rdoc
 Displays an editor for the given document
@@ -487,16 +448,17 @@ Besides the keys listed in {#editor_for!}, _hints_ can also contain the two entr
 @return [EditorView,nil] the editor which has been activated or *nil* if the
   editor couldn't be found (or created)
 =end
-    def display_doc doc, hints = DEFAULT_HINTS
-      ed = editor_for! doc, hints
-      return unless ed
-      activate_editor ed
-      line = hints[:line]
-      ed.go_to line, hints[:column] || 0 if line
-      ed.set_focus
-      ed
+    def display_document doc, hints = {}
+      @active_environment.display_document doc, hints
+#       ed = editor_for! doc, hints
+#       return unless ed
+#       activate_editor ed
+#       line = hints[:line]
+#       ed.go_to line, hints[:column] || 0 if line
+#       ed.set_focus
+#       ed
     end
-    alias_method :display_document, :display_doc
+    alias_method :display_doc, :display_document
     
 =begin rdoc
 Executes the given block without automatically activating an editor whenever the
@@ -523,43 +485,27 @@ After calling this method, the focus widget of the current tab gets focus
 @return [Object] the value returned by the block
 =end
     def without_activating &blk
-      @view_manager.without_activating &blk
+      blk.call
+#       @view_manager.without_activating &blk
     end
     
 =begin rdoc
 Closes an editor view
 
-If the editor to be closed is the last editor associated with the document the
-document will be closed. If _ask_ is *true* and the document is modified, the user
-will be asked whether to save or discard the changes and will have the possibility
-of aborting closing the editor (and the document). If _ask_ is false, the document
-will be closed without user interaction.
-
-If there are other editors associated with the document besides the one to close,
-the latter will be closed without affecting the document.
-
-@param [EditorView] editor the editor to close
-@param [Boolean] ask whether or not to ask confirmation from the user if the document
-  associated with _editor_ should be closed
-@return [Boolean] *true* if the editor is closed and *false* if it isn't.
+@see World::Environment#close_editor
+@param (see World::Environment#close_editor)
+@return (see World::Environment#close_editor)
 @note Always use this method to close an editor, rather than calling its {EditorView#close close}
   method directly, unless you want to leave the corresponding document without a view
 =end
     def close_editor editor, ask = true
-#       editor_tab = self.tab(editor)
-#       has_focus = editor_tab.is_active_window if editor_tab
-#       if has_focus
-#         views = editor_tab.to_a
-#         idx = views.index(editor)
-#         new_view = views[idx-1] || views[idx+1]
+      @active_environment.close_editor editor, ask
+#       doc = editor.document
+#       if doc.views.size > 1 
+#         editor.close
+#         true
+#       else doc.close ask
 #       end
-      doc = editor.document
-      if doc.views.size > 1 
-        editor.close
-        true
-      else doc.close ask
-      end
-#       focus_on_editor new_view if new_view
     end
     
 =begin rdoc
@@ -648,25 +594,25 @@ The new project will be made active and the existing one (if any) will be closed
   (including the project being already open in case _allow_reuse_ is *false*)
 =end
     def safe_open_project file, allow_reuse = false
-      prj = Ruber[:projects][file]
+      prj = Ruber[:world].projects[file]
       if !allow_reuse and prj
-        text = "A project corresponding to the file #{file} is already open. Please, close it before attempting to open it again"
+        text = i18n("A project corresponding to the file %s is already open. Please, close it before attempting to open it again" % file)
         KDE::MessageBox.sorry self, KDE.i18n(text)
         return nil
       elsif prj then return prj
       end
       message = nil
-      begin prj = Ruber[:projects].project file
+      begin prj = Ruber[:world].project file
       rescue Project::InvalidProjectFile => ex
         text = "%s isn't a valid project file. The error reported was:\n%s"
-        message = KDE.i18n(text) % [file, ex.message]
-      rescue LoadError then message = KDE.i18n(ex.message)
+        message = i18n(text) % [file, ex.message]
+      rescue LoadError then message = i18n(ex.message)
       end
       if prj
-        # The following two lines should be removed when we'll allow more than one project
+        # The following two line should be removed when we'll allow more than one project
         # open at the same time
-        Ruber[:projects].current_project.close if Ruber[:projects].current_project
-        Ruber[:projects].current_project = prj
+#         Ruber[:projects].current_project.close if Ruber[:projects].current_project
+        Ruber[:world].active_project = prj
         prj
       else
         KDE::MessageBox.sorry self, message
@@ -734,15 +680,21 @@ Giving focus to the editor implies:
 @return [EditorView,nil] the editor which was given focus or *nil* if no editor
   received focus
 =end  
-    def focus_on_editor ed = nil, hints = DEFAULT_HINTS
-      if ed
-        ed = editor_for! ed, hints unless ed.is_a? EditorView
-        activate_editor ed
-        ed.set_focus
-      else active_editor.set_focus if active_editor
-      end
+#     def focus_on_editor ed = nil, hints = DEFAULT_HINTS
+#       if ed
+#         ed = editor_for! ed, hints unless ed.is_a? EditorView
+#         activate_editor ed
+#         ed.set_focus
+#       else active_editor.set_focus if active_editor
+#       end
+#       active_editor
+#     end
+    
+    def focus_on_editor
+      active_editor.set_focus if active_editor
       active_editor
     end
+    slots :focus_on_editor
         
 =begin rdoc
 @return [String] the default directory where to look for, and create, projects
@@ -779,20 +731,6 @@ Executes a given action
       end
     end
    
-=begin rdoc
-Settings widget for the workspace group
-=end
-    class WorkspaceSettingsWidget < Qt::Widget
-=begin rdoc
-@param [Qt::Widget,nil] parent the parent widget
-=end
-      def initialize parent = nil
-        super
-        @ui = Ui::WorkspaceSettingsWidgetBase.new
-        @ui.setup_ui self
-      end
-    end
-    
   end
   
 end