From 78f84bbb00a62e5de804c98e0a5c3644189c1f35 Mon Sep 17 00:00:00 2001
From: Paolo Capriotti <p.capriotti@gmail.com>
Date: Sat, 20 Mar 2010 14:46:52 +0000
Subject: [PATCH] Add actions to action_collection in qtonly.

---
 lib/mainwindow.rb            |  6 ++----
 lib/toolkits/compat/qtkde.rb | 11 +++++------
 lib/toolkits/kde.rb          |  6 ++++++
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/lib/mainwindow.rb b/lib/mainwindow.rb
index 02eec23..f8d036e 100644
--- a/lib/mainwindow.rb
+++ b/lib/mainwindow.rb
@@ -140,8 +140,7 @@ private
     movelist_dock.object_name = "movelist"
     add_dock_widget(Qt::LeftDockWidgetArea, movelist_dock, Qt::Vertical)
     movelist_dock.show
-    action_collection.add_action('toggle_history', 
-      movelist_dock.toggle_view_action)
+    action_collection[:toggle_history] = movelist_dock.toggle_view_action
 
     @view = MultiView.new(self, movelist_stack)
     create_view(:name => game.class.plugin_name)
@@ -159,8 +158,7 @@ private
     add_dock_widget(Qt::BottomDockWidgetArea, console_dock, Qt::Horizontal)                      
     console_dock.window_flags = console_dock.window_flags & ~Qt::WindowStaysOnTopHint            
     console_dock.show
-    action_collection.add_action('toggle_console', 
-      console_dock.toggle_view_action)
+    action_collection[:toggle_console] = console_dock.toggle_view_action
     
     self.central_widget = @view
   end
diff --git a/lib/toolkits/compat/qtkde.rb b/lib/toolkits/compat/qtkde.rb
index f2b4d21..c1b9ceb 100644
--- a/lib/toolkits/compat/qtkde.rb
+++ b/lib/toolkits/compat/qtkde.rb
@@ -16,10 +16,6 @@ class Qt::MainWindow
     @tmp_menu = Qt::Menu.new("Temp")
     menu_bar.add_menu(@tmp_menu)
   end
-  
-  def action_collection
-    self
-  end
 end
 
 class Qt::Dialog
@@ -47,9 +43,12 @@ class KDE::TabWidget
 end
 
 module ActionHandler
+  def action_collection
+    @action_collection ||= { }
+  end
+  
   def add_action(name, a)
-    # fixme
-    action_parent.tmp_menu.add_action(a)
+    action_parent.action_collection[name] = a
   end
   
   def std_action(name, &blk)
diff --git a/lib/toolkits/kde.rb b/lib/toolkits/kde.rb
index 4d6a8ec..d4b7867 100644
--- a/lib/toolkits/kde.rb
+++ b/lib/toolkits/kde.rb
@@ -91,6 +91,12 @@ class KDE::CmdLineArgs
   end
 end
 
+class KDE::ActionCollection
+  def []=(name, action)
+    add_action(name.to_s, action)
+  end
+end
+
 module ActionHandler
   def std_action(action, opts = {}, &blk)
     target, slot = get_slot(opts[:slot], &blk)
-- 
2.11.4.GIT