summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanagiotis Papadopoulos <pano_90@gmx.net>2009-06-22 16:48:11 +0200
committerPanagiotis Papadopoulos <pano_90@gmx.net>2009-06-22 16:48:11 +0200
commit2ab3a19dbc2bf02cea6bd9b733a38830a991ad32 (patch)
treec5de53e4881842fd35789c296d518b1927fb6f2e
parentChanged the string a bit to keep consistency (diff)
parentFixing popup pos && removing unwanted statusBar (diff)
downloadrekonq-2ab3a19dbc2bf02cea6bd9b733a38830a991ad32.tar.xz
Merge commit 'rekonq-master/master'
-rw-r--r--src/mainwindow.cpp8
-rw-r--r--src/rekonqui.rc2
2 files changed, 8 insertions, 2 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index c7e3c945..519081d6 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -136,6 +136,9 @@ MainWindow::MainWindow()
// toolbar position, icon size, etc.
setupGUI();
+ // no more status bar..
+ setStatusBar(0);
+
QTimer::singleShot(0, this, SLOT(postLaunch()));
}
@@ -887,9 +890,12 @@ void MainWindow::notifyMessage(const QString &msg, Rekonq::Notify status)
m_popup->setView(msg);
+ int h = KGlobalSettings::generalFont().pointSize();
+ kWarning() << "h: " << h;
+
// setting popus in bottom-left position
int x = geometry().x();
- int y = geometry().y() + height() - 45;
+ int y = geometry().y() + height() - h*4;
QPoint p(x,y);
m_popup->show(p);
diff --git a/src/rekonqui.rc b/src/rekonqui.rc
index 67b07c1c..dfc8bd2b 100644
--- a/src/rekonqui.rc
+++ b/src/rekonqui.rc
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!DOCTYPE gui SYSTEM "kpartgui.dtd">
-<gui name="rekonq" version="41">
+<gui name="rekonq" version="42">
<MenuBar>