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

List:       kde-commits
Subject:    [kubeplayer/tablet] lib: introduce version for plasma active
From:       Robert Riemann <robert.riemann () physik ! hu-berlin ! de>
Date:       2011-09-10 19:42:38
Message-ID: 20110910194238.31D62A607A () git ! kde ! org
[Download RAW message or body]

Git commit e3b5df9d1a8c37449bc6de0517613435208842f7 by Robert Riemann.
Committed on 10/09/2011 at 21:39.
Pushed by rriemann into branch 'tablet'.

introduce version for plasma active (tablet version)

Changes:
- no menu bar
- toolbar goes by default on top

M  +3    -22   lib/MainWindow.rb

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

diff --git a/lib/MainWindow.rb b/lib/MainWindow.rb
index ebf55e8..a9df3b2 100644
--- a/lib/MainWindow.rb
+++ b/lib/MainWindow.rb
@@ -112,7 +112,7 @@ class MainWindow < KDE::MainWindow
 
     #### prepare menus
     collection = KDE::ActionCollection.new self
-    controlBar = KDE::ToolBar.new 'control_bar', self, Qt::BottomToolBarArea
+    controlBar = KDE::ToolBar.new 'control_bar', self, Qt::TopToolBarArea
     controlBar.tool_button_style = Qt::ToolButtonIconOnly
 
     menu = KDE::Menu.new i18n('&File'), self
@@ -127,33 +127,13 @@ class MainWindow < KDE::MainWindow
 
     ini_phonon collection, menu, controlBar
 
-    menu = KDE::Menu.new i18n('&Settings'), self
-    menuBar.add_menu menu
-
-    action = collection.add_action 'configure', KDE::Action.new( self )
-    action.icon = KDE::Icon.new 'configure'
-    action.text = i18n '&Settings'
-    connect( action, SIGNAL(:triggered), self) do
-      unless KDE::ConfigDialog::show_dialog 'settings' # if not already open do...
-        dialog = KDE::ConfigDialog.new self, 'settings', KDE::ConfigSkeleton.new
-        generalpage = Qt::Widget.new dialog
-        dialog.add_page generalpage, i18n('General'), '', i18n('General Settings')
-        Video.dlg_setup dialog
-        dialog.show
-      end
-    end
-    menu.add_action action
-
-    action = collection.add_action 'configure-keys', \
                KDE::StandardAction::keyBindings( self, SLOT( :configureKeys ), \
                collection )
-    menu.add_action action
-
     menuBar.add_menu helpMenu
 
     collection.associate_widget self
     collection.read_settings
     set_auto_save_settings
 
-    menuBar.show
+    menuBar.hide
     controlBar.show
 
     setCentralWidget @videoPlayer
@@ -169,6 +149,7 @@ class MainWindow < KDE::MainWindow
     dock.windowTitle = "Clips"
     dock.allowedAreas = Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea
     self.add_dock_widget Qt::LeftDockWidgetArea, dock
+    controlBar.add_action action
 
     # add search field
     @suggestTimer = Qt::Timer.new self


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