|
View:
New views
2 Messages
—
Rating Filter:
Alert me
|
|
|
Patch for Fox14Okay after sending this mail to Lyle only (sorry) here is my second attempt:
The patch and the new file fox-support.rb are attached I've tested the code against Fox-1.4.33, FXScintilla-1.63 and FXRuby-1.4.6 on Gentoo Linux Any feedback would be greatly appreciated. Jonathan # Purpose: Load the fxruby gem # # $Id: $ # # Authors: Jonathan Maasland <nochoice @ xs4all.nl> # Contributors: # # This file is part of the FreeRIDE project # # This application is free software; you can redistribute it and/or # modify it under the terms of the Ruby license defined in the # COPYING file. # # Copyright (c) 2006 Jonathan Maasland All rights reserved. # begin require 'rubygems' require_gem 'fxruby', '>= 1.4.0', '< 1.6.0' rescue LoadError require 'fox14' end require 'fox14/colors' require 'fox14/responder' #puts "Fox-version: #{Fox.fxrubyversion}" Index: plugins/rubyide_fox_gui/appframe.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_fox_gui/appframe.rb,v retrieving revision 1.11 diff -u -r1.11 appframe.rb --- plugins/rubyide_fox_gui/appframe.rb 16 Sep 2005 07:55:33 -0000 1.11 +++ plugins/rubyide_fox_gui/appframe.rb 24 Jul 2006 12:10:30 -0000 @@ -14,13 +14,7 @@ # Copyright (c) 2001 Curt Hibbs. All rights reserved. # -begin -require 'rubygems' -require_gem 'fxruby', '>= 1.2.0', '< 1.4.0' -rescue LoadError -require 'fox12' -end -require 'fox12/colors' +require 'fox-support' require 'rubyide_fox_gui/fxscintilla/scintilla' Index: plugins/rubyide_fox_gui/dockpane.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_fox_gui/dockpane.rb,v retrieving revision 1.11 diff -u -r1.11 dockpane.rb --- plugins/rubyide_fox_gui/dockpane.rb 1 Mar 2005 11:53:44 -0000 1.11 +++ plugins/rubyide_fox_gui/dockpane.rb 24 Jul 2006 12:10:30 -0000 @@ -182,7 +182,7 @@ @tab.hide @frame.hide @tab.create - @frame.reparent(@tabbook) + @frame.reparent(@tabbook, nil) @tab.connect(SEL_FOCUSIN) {@slot.data.setFocus} # it is the first time we dock it so now that it is docked and @@ -212,7 +212,7 @@ self.hide # and reparent the dockpane top frame to the dialog box - @sub_frame.reparent(@dlg_box) + @sub_frame.reparent(@dlg_box, nil) @dock_btn.icon = @icons['dock_dockpane'].data @dock_btn.tipText = "Dock" @dock_btn.helpText = "Dock the plugin" @@ -341,7 +341,7 @@ # plugin and docked in the dockpane top frame if event == :notify_data_set and @slot.data child_frame = @slot.data - child_frame.reparent(@sub_frame) + child_frame.reparent(@sub_frame, nil) child_frame.show end end Index: plugins/rubyide_fox_gui/editpane.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_fox_gui/editpane.rb,v retrieving revision 1.46 diff -u -r1.46 editpane.rb --- plugins/rubyide_fox_gui/editpane.rb 16 Dec 2005 11:11:40 -0000 1.46 +++ plugins/rubyide_fox_gui/editpane.rb 24 Jul 2006 12:10:32 -0000 @@ -18,14 +18,7 @@ # Copyright (c) 2002-2003 Rich Kilmer. All rights reserved. # -begin -require 'rubygems' -require_gem 'fxruby', '>= 1.2.0' -rescue LoadError -require 'fox12' -end -require 'fox12/responder' -require 'fox12/colors' +require 'fox-support' require 'rubyide_fox_gui/fxscintilla/scintilla' require 'rubyide_fox_gui/editpane_configurator' require 'rubyide_gui/code_template' Index: plugins/rubyide_fox_gui/editpane_configurator.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_fox_gui/editpane_configurator.rb,v retrieving revision 1.16 diff -u -r1.16 editpane_configurator.rb --- plugins/rubyide_fox_gui/editpane_configurator.rb 3 Nov 2005 10:59:01 -0000 1.16 +++ plugins/rubyide_fox_gui/editpane_configurator.rb 24 Jul 2006 12:10:34 -0000 @@ -13,14 +13,7 @@ # # Copyright (c) 2004 Laurent Julliard. All rights reserved. # -begin -require 'rubygems' -require_gem 'fxruby', '>= 1.2.0' -rescue LoadError -require 'fox12' -end -require 'fox12/colors' -require 'fox12/responder' +require 'fox-support' require 'rubyide_fox_gui/fxscintilla/style' module FreeRIDE Index: plugins/rubyide_fox_gui/statusbar.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_fox_gui/statusbar.rb,v retrieving revision 1.5 diff -u -r1.5 statusbar.rb --- plugins/rubyide_fox_gui/statusbar.rb 20 Feb 2005 08:04:01 -0000 1.5 +++ plugins/rubyide_fox_gui/statusbar.rb 24 Jul 2006 12:10:34 -0000 @@ -14,13 +14,7 @@ # Copyright (c) 2003 Laurent Julliard. All rights reserved. # -begin -require 'rubygems' -require_gem 'fxruby', '>= 1.2.0' -rescue LoadError -require 'fox12' -end -require 'fox12/colors' +require 'fox-support' module FreeRIDE module FoxRenderer Index: plugins/rubyide_fox_gui/fxscintilla/fxscintilla_test.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_fox_gui/fxscintilla/fxscintilla_test.rb,v retrieving revision 1.5 diff -u -r1.5 fxscintilla_test.rb --- plugins/rubyide_fox_gui/fxscintilla/fxscintilla_test.rb 20 Feb 2005 08:04:01 -0000 1.5 +++ plugins/rubyide_fox_gui/fxscintilla/fxscintilla_test.rb 24 Jul 2006 12:10:34 -0000 @@ -1,11 +1,6 @@ #!/usr/bin/env ruby -begin -require 'rubygems' -require_gem 'fxruby', '>= 1.2.0' -rescue LoadError -require 'fox12' -end +require 'fox-support' require 'rubyide_fox_gui/fxscintilla/scintilla' include Fox Index: plugins/rubyide_project/new_project_dialog.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_project/new_project_dialog.rb,v retrieving revision 1.3 diff -u -r1.3 new_project_dialog.rb --- plugins/rubyide_project/new_project_dialog.rb 8 Dec 2005 11:29:19 -0000 1.3 +++ plugins/rubyide_project/new_project_dialog.rb 24 Jul 2006 12:10:34 -0000 @@ -14,13 +14,7 @@ # Copyright (c) 2005 Jonathan Maasland All rights reserved. # -begin - require 'rubygems' - require_gem 'fxruby', '>= 1.2.0' -rescue LoadError - require 'fox12' -end - +require 'fox-support' require 'rubyide_project/project' require 'rubyide_tools_fox_project_explorer/prop_view_helpers' @@ -113,4 +107,4 @@ end end -end \ No newline at end of file +end Index: plugins/rubyide_tools_fox_configurator/fox_configurator.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_configurator/fox_configurator.rb,v retrieving revision 1.9 diff -u -r1.9 fox_configurator.rb --- plugins/rubyide_tools_fox_configurator/fox_configurator.rb 20 Oct 2005 14:46:08 -0000 1.9 +++ plugins/rubyide_tools_fox_configurator/fox_configurator.rb 24 Jul 2006 12:10:34 -0000 @@ -15,13 +15,7 @@ # Copyright (c) 2004 Laurent Julliard. All rights reserved. # -begin -require 'rubygems' -require_gem 'fxruby', '>= 1.2.0' -rescue LoadError -require 'fox12' -end -require 'fox12/responder' +require 'fox-support' module FreeRIDE module FoxRenderer @@ -212,11 +206,12 @@ # add the new config pane to the switcher and get back to the # previously current child if pane - pane.reparent(@config_frame) + pane.reparent(@config_frame, nil) end # now add the entry in the config tree list - node = @config_tree.addItemLast(parent, label, icon,icon) + #node = @config_tree.addItemLast(parent, label, icon,icon) + node = @config_tree.appendItem(parent, label, icon,icon) @config_tree.killSelection if pane config_slot.attr_pane_idx = @config_frame.indexOfChild(pane) @@ -258,7 +253,7 @@ main = @plugin["/system/ui/fox/FXMainWindow"].data p = @config_frame.childAtIndex(@tbd_config_pane_idx) while p = p.next - p.reparent(main) + p.reparent(main, nil) end # clear all nodes from the config tree Index: plugins/rubyide_tools_fox_databus_inspector/databus_inspector.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_databus_inspector/databus_inspector.rb,v retrieving revision 1.5 diff -u -r1.5 databus_inspector.rb --- plugins/rubyide_tools_fox_databus_inspector/databus_inspector.rb 9 Oct 2005 19:13:52 -0000 1.5 +++ plugins/rubyide_tools_fox_databus_inspector/databus_inspector.rb 24 Jul 2006 12:10:34 -0000 @@ -14,12 +14,7 @@ # Copyright (c) 2002 Laurent Julliard All rights reserved. # -begin -require 'rubygems' -require_gem 'fxruby', '>= 1.2.0' -rescue LoadError -require 'fox12' -end +require 'fox-support' module FreeRIDE module FoxRenderer @@ -163,7 +158,8 @@ # Recursively fill up the tree list def populateTree(treeList, rootItem, rootNode) rootNode.each_slot do |slot| - childItem = treeList.addItemLast(rootItem, slot.name) + #childItem = treeList.addItemLast(rootItem, slot.name) + childItem = treeList.appendItem(rootItem, slot.name) populateTree(treeList, childItem, slot) end end Index: plugins/rubyide_tools_fox_debugger/fox_debugger.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_debugger/fox_debugger.rb,v retrieving revision 1.26 diff -u -r1.26 fox_debugger.rb --- plugins/rubyide_tools_fox_debugger/fox_debugger.rb 20 Feb 2005 08:04:01 -0000 1.26 +++ plugins/rubyide_tools_fox_debugger/fox_debugger.rb 24 Jul 2006 12:10:36 -0000 @@ -14,13 +14,7 @@ # Copyright (c) 2002 Laurent Julliard. All rights reserved. # -begin -require 'rubygems' -require_gem 'fxruby', '>= 1.2.0' -rescue LoadError -require 'fox12' -end -require 'fox12/colors' +require 'fox-support' require 'rubyide_tools_fox_debugger/fox_debugger_configurator' module FreeRIDE Index: plugins/rubyide_tools_fox_debugger/fox_debugger_configurator.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_debugger/fox_debugger_configurator.rb,v retrieving revision 1.12 diff -u -r1.12 fox_debugger_configurator.rb --- plugins/rubyide_tools_fox_debugger/fox_debugger_configurator.rb 4 Jun 2006 09:59:02 -0000 1.12 +++ plugins/rubyide_tools_fox_debugger/fox_debugger_configurator.rb 24 Jul 2006 12:10:36 -0000 @@ -14,14 +14,7 @@ # Copyright (c) 2002 Laurent Julliard. All rights reserved. # -begin -require 'rubygems' -require_gem 'fxruby', '>= 1.2.0' -rescue LoadError -require 'fox12' -end - -require 'fox12/colors' +require 'fox-support' require 'rubyide_tools_fox_debugger/fox_ruby_configurator' module FreeRIDE Index: plugins/rubyide_tools_fox_debugger/fox_ruby_configurator.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_debugger/fox_ruby_configurator.rb,v retrieving revision 1.2 diff -u -r1.2 fox_ruby_configurator.rb --- plugins/rubyide_tools_fox_debugger/fox_ruby_configurator.rb 16 Sep 2005 07:31:04 -0000 1.2 +++ plugins/rubyide_tools_fox_debugger/fox_ruby_configurator.rb 24 Jul 2006 12:10:36 -0000 @@ -13,12 +13,7 @@ # Copyright (c) 2005 Jonathan Maasland. All rights reserved. # -begin -require 'rubygems' -require_gem 'fxruby', '>= 1.2.0' -rescue LoadError -require 'fox12' -end +require 'fox-support' module FreeRIDE module FoxRenderer Index: plugins/rubyide_tools_fox_file_browser/file_browser.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_file_browser/file_browser.rb,v retrieving revision 1.14 diff -u -r1.14 file_browser.rb --- plugins/rubyide_tools_fox_file_browser/file_browser.rb 18 Nov 2005 01:37:09 -0000 1.14 +++ plugins/rubyide_tools_fox_file_browser/file_browser.rb 24 Jul 2006 12:10:36 -0000 @@ -15,12 +15,7 @@ # Modified 2005 by Jonathan Maasland <nochoice AT xs4all.nl > # -begin -require 'rubygems' -require_gem 'fxruby', '>= 1.2.0' -rescue LoadError -require 'fox12' -end +require 'fox-support' module FreeRIDE module FoxRenderer Index: plugins/rubyide_tools_fox_file_browser/file_tree.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_file_browser/file_tree.rb,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 file_tree.rb --- plugins/rubyide_tools_fox_file_browser/file_tree.rb 20 Dec 2002 17:27:31 -0000 1.1.1.1 +++ plugins/rubyide_tools_fox_file_browser/file_tree.rb 24 Jul 2006 12:10:37 -0000 @@ -31,17 +31,17 @@ def add_node(node, name) unless node - addItemLast(node, name) + appendItem(node, name) else - addItemAfter(node, name) + insertItem(node,node.parent, name) end end def add_child_node(node, name, icon=nil) if icon - addItemLast(node, name, icon, icon) + appendItem(node, name, icon, icon) else - addItemLast(node, name) + appendItem(node, name) end end Index: plugins/rubyide_tools_fox_irb/fox_irb.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_irb/fox_irb.rb,v retrieving revision 1.6 diff -u -r1.6 fox_irb.rb --- plugins/rubyide_tools_fox_irb/fox_irb.rb 27 May 2006 15:18:31 -0000 1.6 +++ plugins/rubyide_tools_fox_irb/fox_irb.rb 24 Jul 2006 12:10:37 -0000 @@ -14,12 +14,7 @@ # Copyright (c) 2005 Laurent Julliard All rights reserved. # -begin -require 'rubygems' -require_gem 'fxruby', '>= 1.2.0' -rescue LoadError -require 'fox12' -end +require 'fox-support' require 'rubyide_tools_fox_irb/fxirb' Index: plugins/rubyide_tools_fox_irb/fxirb.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_irb/fxirb.rb,v retrieving revision 1.5 diff -u -r1.5 fxirb.rb --- plugins/rubyide_tools_fox_irb/fxirb.rb 27 May 2006 15:18:31 -0000 1.5 +++ plugins/rubyide_tools_fox_irb/fxirb.rb 24 Jul 2006 12:10:37 -0000 @@ -10,7 +10,7 @@ # - Currently maintained and developed by # Martin DeMello <martindemello@...> -require "fox12" +require "fox-support" require "irb" require "singleton" require "English" Index: plugins/rubyide_tools_fox_project_explorer/fox_project_explorer.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_project_explorer/fox_project_explorer.rb,v retrieving revision 1.6 diff -u -r1.6 fox_project_explorer.rb --- plugins/rubyide_tools_fox_project_explorer/fox_project_explorer.rb 26 Feb 2006 14:25:19 -0000 1.6 +++ plugins/rubyide_tools_fox_project_explorer/fox_project_explorer.rb 24 Jul 2006 12:10:38 -0000 @@ -14,12 +14,7 @@ # Copyright (c) 2005 Jonathan Maasland All rights reserved. # -begin - require 'rubygems' - require_gem 'fxruby', '>= 1.2.0' -rescue LoadError - require 'fox12' -end +require 'fox-support' require 'rubyide_tools_fox_source_browser/directory_source_tree' require 'rubyide_tools_fox_project_explorer/property_viewer' @@ -131,7 +126,7 @@ init_menu_enable_map create_popupmenu - @active_root = @project_tree.addItemLast(nil, "Active projects") + @active_root = @project_tree.appendItem(nil, "Active projects") @project_tree.expand(@active_root) @opened_projects = {} # k: the project-file path, v: the project treeItem Index: plugins/rubyide_tools_fox_ri/fox_ri.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_ri/fox_ri.rb,v retrieving revision 1.5 diff -u -r1.5 fox_ri.rb --- plugins/rubyide_tools_fox_ri/fox_ri.rb 30 Mar 2005 14:05:03 -0000 1.5 +++ plugins/rubyide_tools_fox_ri/fox_ri.rb 24 Jul 2006 12:10:39 -0000 @@ -14,12 +14,7 @@ # Copyright (c) 2005 Laurent Julliard All rights reserved. # -begin -require 'rubygems' -require_gem 'fxruby', '>= 1.2.0' -rescue LoadError -require 'fox12' -end +require 'fox-support' $: << File.join($FR_CODEBASE,'plugins','rubyide_tools_fox_ri','fxri') require 'rubyide_tools_fox_ri/fxri/fxri' Index: plugins/rubyide_tools_fox_ri/fxri/fxri.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_ri/fxri/fxri.rb,v retrieving revision 1.5 diff -u -r1.5 fxri.rb --- plugins/rubyide_tools_fox_ri/fxri/fxri.rb 21 Oct 2005 11:23:25 -0000 1.5 +++ plugins/rubyide_tools_fox_ri/fxri/fxri.rb 24 Jul 2006 12:10:39 -0000 @@ -5,6 +5,7 @@ # Copyright (C) 2005 Martin DeMello. All rights reserved. # Load FXRuby: try gem, then Fox 1.2, then Fox 1.0 +=begin begin # try fxruby gem require 'rubygems' @@ -32,6 +33,8 @@ FXStatusBar = FXStatusbar end end +=end +require 'fox-support' require 'thread' Index: plugins/rubyide_tools_fox_ri/fxri/lib/fxirb.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_ri/fxri/lib/fxirb.rb,v retrieving revision 1.3 diff -u -r1.3 fxirb.rb --- plugins/rubyide_tools_fox_ri/fxri/lib/fxirb.rb 21 Oct 2005 11:23:26 -0000 1.3 +++ plugins/rubyide_tools_fox_ri/fxri/lib/fxirb.rb 24 Jul 2006 12:10:39 -0000 @@ -15,7 +15,7 @@ # - Currently maintained and developed by # Martin DeMello <martindemello@...> -require "fox12" +require "fox14" require "irb" require "singleton" require "English" Index: plugins/rubyide_tools_fox_source_browser/directory_source_tree.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_source_browser/directory_source_tree.rb,v retrieving revision 1.3 diff -u -r1.3 directory_source_tree.rb --- plugins/rubyide_tools_fox_source_browser/directory_source_tree.rb 26 Feb 2006 14:25:19 -0000 1.3 +++ plugins/rubyide_tools_fox_source_browser/directory_source_tree.rb 24 Jul 2006 12:10:40 -0000 @@ -12,14 +12,9 @@ # COPYING file. # # Copyright (c) 2005 Jonathan Maasland All rights reserved. -# - -begin - require 'rubygems' - require_gem 'fxruby', '>= 1.2.0' -rescue LoadError - require 'fox12' -end +# + +require 'fox-support' require 'pathname' require 'rubyide_tools_fox_source_browser/source_tree' Index: plugins/rubyide_tools_fox_source_browser/source_tree.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_fox_source_browser/source_tree.rb,v retrieving revision 1.5 diff -u -r1.5 source_tree.rb --- plugins/rubyide_tools_fox_source_browser/source_tree.rb 6 Jan 2006 10:03:56 -0000 1.5 +++ plugins/rubyide_tools_fox_source_browser/source_tree.rb 24 Jul 2006 12:10:40 -0000 @@ -45,18 +45,22 @@ def add_node(node, name, icon=nil) unless node - addItemLast(node, name.to_s, icon, icon) + appendItem(node, name.to_s, icon, icon) else - addItemAfter(node, name.to_s, icon, icon) + insertItem(node, node.parent, name.to_s, icon, icon) end end def add_child_node(node, name, icon=nil) - addItemLast(node, name.to_s, icon, icon) + appendItem(node, name.to_s, icon, icon) end def add_node_before(node, name, icon=nil) - addItemBefore(node, name.to_s, icon, icon) + if node + insertItem(node, node.parent, name.to_s, icon, icon) + else + insertItem(node, nil, name.to_s, icon, icon) + end end def clear_nodes Index: plugins/rubyide_tools_rrb/rrb_plugin.rb =================================================================== RCS file: /var/cvs/freeride/freeride/plugins/rubyide_tools_rrb/rrb_plugin.rb,v retrieving revision 1.6 diff -u -r1.6 rrb_plugin.rb --- plugins/rubyide_tools_rrb/rrb_plugin.rb 20 Feb 2005 08:04:01 -0000 1.6 +++ plugins/rubyide_tools_rrb/rrb_plugin.rb 24 Jul 2006 12:10:40 -0000 @@ -1,11 +1,4 @@ -begin -require 'rubygems' -require_gem 'fxruby', '>= 1.2.0' -rescue LoadError -require 'fox12' -end - -require 'fox12/responder' +require 'fox-support' require 'rrb/script' require 'rrb/node' _______________________________________________ Freeride-devel mailing list Freeride-devel@... http://rubyforge.org/mailman/listinfo/freeride-devel |
|
|
Re: Patch for Fox14Jonathan Maasland wrote:
> Okay after sending this mail to Lyle only (sorry) here is my second > attempt: > > The patch and the new file fox-support.rb are attached > I've tested the code against Fox-1.4.33, FXScintilla-1.63 and > FXRuby-1.4.6 on Gentoo Linux > > Any feedback would be greatly appreciated. > > Jonathan > Jonathan, Thanks for the patch I have also tested it on my side and it seems to be working well as you said. I have added a few other modifications and committed the patch to the CVS repo. If other have FOX and FXRuby 1.4 installed it would be nice to spend some time testing all this. As soon as FXScintilla for FOX 1.- is released we'll make the necessary changes too the FR code to also switch to FOX 1.6. In the mean time we'll stick to FOX/FXRuby 1.4 Laurent _______________________________________________ Freeride-devel mailing list Freeride-devel@... http://rubyforge.org/mailman/listinfo/freeride-devel |
| Free Forum Powered by Nabble | Forum Help |