summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2010-02-10 12:47:57 +0100
committerAndrea Diamantini <adjam7@gmail.com>2010-02-10 12:47:57 +0100
commit315700ae94d0307b0bceb0e78329620e61a4ba0e (patch)
tree76347eb6c8c856f89c54298cfb070689d4e94015 /src
parentfix tab preview position (diff)
downloadrekonq-315700ae94d0307b0bceb0e78329620e61a4ba0e.tar.xz
DISCLAIMER: I'm sorry for this
This commit reverts the ability to change main toolbar settings (change icon/text). In the context rekonq is developed (KMainWindow + simple toolbars) this is quite impossible. We'll see in the next version a proper fix for this (back to XMLGUI? QML??) This commit fixes also the problem with the disappearing toolbar backing from a fullscreen close BUG:222826
Diffstat (limited to 'src')
-rw-r--r--src/mainwindow.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8ce6afe0..b0007ed4 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -103,7 +103,7 @@ MainWindow::MainWindow()
, m_bookmarksPanel(0)
, m_webInspectorPanel(0)
, m_historyBackMenu(0)
- , m_mainBar( new KToolBar( QString("MainToolBar"), this, Qt::TopToolBarArea, true, false, false) )
+ , m_mainBar( new KToolBar( QString("MainToolBar"), this, Qt::TopToolBarArea, true, true, false) )
, m_bmBar( new KToolBar( QString("BookmarkToolBar"), this, Qt::TopToolBarArea, true, false, false) )
, m_popup( new KPassivePopup(this) )
, m_hidePopup( new QTimer(this) )
@@ -184,12 +184,19 @@ void MainWindow::setupToolbars()
m_mainBar->addAction( actionByName("bookmarksActionMenu") );
m_mainBar->addAction( actionByName("rekonq_tools") );
+ m_mainBar->setContextMenuPolicy(Qt::PreventContextMenu);
+
+ m_mainBar->show(); // this just to fix reopening rekonq after fullscreen close
+
// =========== Bookmarks ToolBar ================================
m_bmBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
m_bmBar->setAcceptDrops(true);
m_bmBar->setContextMenuPolicy(Qt::CustomContextMenu);
m_bmBar->setIconDimensions(16);
Application::bookmarkProvider()->setupBookmarkBar(m_bmBar);
+
+ KToolBar::setToolBarsEditable(false);
+ KToolBar::setToolBarsLocked(true);
}