[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kubeplayer/1.1] lib: manual merge: integration of tablet patches
From:       Robert Riemann <robert.riemann () physik ! hu-berlin ! de>
Date:       2011-11-25 0:43:18
Message-ID: 20111125004318.8AFBDA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit d0456099b9099b2b620e079d84b2b3af46ff144c by Robert Riemann.
Committed on 25/11/2011 at 01:38.
Pushed by rriemann into tag '1.1'.

manual merge: integration of tablet patches

M  +3    -2    lib/MainWindow.rb

http://commits.kde.org/kubeplayer/d0456099b9099b2b620e079d84b2b3af46ff144c

diff --cc lib/MainWindow.rb
index e0eaa4c,a9df3b2..a480759
--- a/lib/MainWindow.rb
+++ b/lib/MainWindow.rb
@@@ -181,13 -142,14 +181,14 @@@ class MainWindow < KDE::MainWindo
      menuBar.add_menu menu
  
      # add clip list dock widget
 -    dock = Qt::DockWidget.new self
 -    action = collection.add_action 'toogle-listwidgetcontainer-dock', dock.toggle_view_action
 +    @listDock = Qt::DockWidget.new self
 +    action = collection.add_action 'toogle-listwidgetcontainer-dock', @listDock.toggle_view_action
      menu.add_action action
 -    dock.objectName = "listWidgetContainerDock"
 -    dock.windowTitle = "Clips"
 -    dock.allowedAreas = Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea
 -    self.add_dock_widget Qt::LeftDockWidgetArea, dock
 +    @listDock.objectName = "listWidgetContainerDock"
 +    @listDock.windowTitle = "Clips"
 +    @listDock.allowedAreas = Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea
 +    self.add_dock_widget Qt::LeftDockWidgetArea, @listDock
+     controlBar.add_action action
  
      # add search field
      @suggestTimer = Qt::Timer.new self
[prev in list] [next in list] [prev in thread] [next in thread]