From 0ee5dac23e4b687755c18dd68bcc47625bc59532 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 8 Feb 2009 18:53:48 +0100
Subject: Ready for 0.0.3 release. Last fixes..

---
 src/mainwindow.cpp | 7 +++++--
 src/rekonqui.rc    | 6 +++---
 src/settings.cpp   | 2 ++
 3 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 294bf589..ecd5e452 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -73,8 +73,7 @@ MainWindow::MainWindow()
 
     // updating rekonq configuration
     slotUpdateConf();
-//     QTimer::singleShot(0, this, SLOT( postLaunch() ) );
-
+    
     // creating a new tab
     m_view->newTab();
 
@@ -137,6 +136,10 @@ MainWindow::MainWindow()
     KToolBar *bmToolbar = toolBar("bookmarksToolBar");
     m_bookmarksProvider->provideBmToolbar( bmToolbar );
 
+    // setting up toolbars to NOT have context menu enabled
+    setContextMenuPolicy( Qt::ActionsContextMenu );
+
+    // search bar
     m_searchBar = new SearchBar( this );
     connect(m_searchBar, SIGNAL(search(const KUrl&)), this, SLOT(loadUrl(const KUrl&)));
     navigationBar->addWidget(m_searchBar);
diff --git a/src/rekonqui.rc b/src/rekonqui.rc
index 861f8538..0e372e82 100644
--- a/src/rekonqui.rc
+++ b/src/rekonqui.rc
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="rekonq" version="25">
+<kpartgui name="rekonq" version="27">
 <MenuBar>
 <!--  ============ FILE menu =========== -->
 <Menu name="file" noMerge="1"><text>&amp;File</text>
@@ -59,7 +59,7 @@
 </MenuBar>
 
 <!--  ============ Main ToolBar =========== -->
-<ToolBar name="mainToolBar" fullWidth="true" iconText="iconOnly" newline="true" position="top" noMerge="1"><text>Main Toolbar</text>
+<ToolBar name="mainToolBar" iconText="iconOnly" newline="true" position="top" noMerge="1"><text>Main Toolbar</text>
     <Action name="history back" />
     <Action name="history forward" />
     <Action name="stop reload" />
@@ -67,7 +67,7 @@
 </ToolBar>
 
 <!--  ============ Bookmarks ToolBar =========== -->
-<ToolBar name="bookmarksToolBar" fullWidth="true" iconSize="8" newline="true" position="top"><text>Bookmarks Toolbar</text>
+<ToolBar name="bookmarksToolBar" iconSize="16" newline="true" position="top" noMerge="1" hidden="true"><text>Bookmarks Toolbar</text>
 </ToolBar>
 
 </kpartgui>
diff --git a/src/settings.cpp b/src/settings.cpp
index 2181d0fd..7ab6e3dc 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -133,9 +133,11 @@ void SettingsDialog::readConfig()
     // ======= Fonts
     QFont stdFont = ReKonfig::standardFont();
     d->fontsUi.standardFontChooser->setFont(stdFont, false);
+    d->fontsUi.standardFontChooser->setSampleText( stdFont.family() + " " + QString::number(stdFont.pointSize()) );
     connect(d->fontsUi.standardFontChooser, SIGNAL(fontSelected(QFont)),this, SLOT(saveSettings()));
     QFont fxFont = ReKonfig::fixedFont();
     d->fontsUi.fixedFontChooser->setFont(fxFont, true);
+    d->fontsUi.fixedFontChooser->setSampleText( fxFont.family() + " " + QString::number(fxFont.pointSize()) );
     connect(d->fontsUi.fixedFontChooser, SIGNAL(fontSelected(QFont)),this, SLOT(saveSettings()));
 
     // ======= Proxy
-- 
cgit v1.2.1