From b655bfc489dc6d59f6ab751470bb354e96571b01 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 1 Aug 2009 02:41:19 +0200
Subject: Fixing a bit enum OpenType names..

---
 src/application.cpp | 6 +++---
 src/application.h   | 4 ++--
 src/bookmarks.cpp   | 2 +-
 src/webview.cpp     | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/application.cpp b/src/application.cpp
index ff52d935..565c6ab3 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -98,7 +98,7 @@ int Application::newInstance()
     {
         for (int i = 0; i < args->count(); ++i)
         {
-            loadUrl(args->arg(i), Rekonq::NewTab); 
+            loadUrl(args->arg(i), Rekonq::NewCurrentTab); 
         }
         args->clear();
     }
@@ -290,10 +290,10 @@ void Application::loadUrl(const KUrl& url, const Rekonq::OpenType& type)
     case Rekonq::SettingOpenTab:
         webView = m_mainWindow->mainView()->newTab(!ReKonfig::openTabsBack());
         break;
-    case Rekonq::NewTab:
+    case Rekonq::NewCurrentTab:
         webView = m_mainWindow->mainView()->newTab(true);
         break;
-    case Rekonq::BackgroundTab:
+    case Rekonq::NewBackTab:
         webView = m_mainWindow->mainView()->newTab(false);
         break;
     case Rekonq::CurrentTab:
diff --git a/src/application.h b/src/application.h
index 615bfe6b..e5637c90 100644
--- a/src/application.h
+++ b/src/application.h
@@ -69,8 +69,8 @@ namespace Rekonq
     {
         CurrentTab,     ///< open url in current tab
         SettingOpenTab, ///< open url according to users settings
-        NewTab,         ///< open url in new tab and make it current
-        BackgroundTab   ///< open url in new tab in background
+        NewCurrentTab,  ///< open url in new tab and make it current
+        NewBackTab      ///< open url in new tab in background
     };
 
 }
diff --git a/src/bookmarks.cpp b/src/bookmarks.cpp
index 8797c7cd..1a42ca51 100644
--- a/src/bookmarks.cpp
+++ b/src/bookmarks.cpp
@@ -91,7 +91,7 @@ void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bm)
     QList<KUrl>::iterator url;
     for (url = urlList.begin(); url != urlList.end(); ++url)
     {
-        Application::instance()->loadUrl(*url, Rekonq::NewTab);
+        Application::instance()->loadUrl(*url, Rekonq::NewCurrentTab);
     }
 }
 
diff --git a/src/webview.cpp b/src/webview.cpp
index a8a45077..a562b1ab 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -327,5 +327,5 @@ void WebView::slotSearch()
     KAction *a = qobject_cast<KAction*>(sender());
     QString search = a->data().toString() + selectedText();
     KUrl urlSearch = KUrl::fromEncoded(search.toUtf8());
-    Application::instance()->loadUrl(urlSearch, Rekonq::NewTab);
+    Application::instance()->loadUrl(urlSearch, Rekonq::NewCurrentTab);
 }
-- 
cgit v1.2.1


From 78c674674f2670133437e4d1a17489b4db4c2948 Mon Sep 17 00:00:00 2001
From: megabigbug <megabigbug@arrakis.(none)>
Date: Sat, 1 Aug 2009 11:23:29 +0200
Subject: more aesthetic popups (again)

---
 src/mainwindow.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index cebb7454..27ed8e37 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -931,13 +931,18 @@ void MainWindow::notifyMessage(const QString &msg, Rekonq::Notify status)
         break;
     }
 
-    m_popup->setView(msg);
-
+    m_popup->setFrameShape(QFrame::NoFrame);
+    QLabel *label = new QLabel(msg);
+    m_popup->setLineWidth(0);
+    m_popup->setView(label);
+    m_popup->setFixedSize(0, 0);
+    m_popup->layout()->setAlignment(Qt::AlignTop);
+    m_popup->layout()->setMargin(4);
     int h = KGlobalSettings::generalFont().pointSize();
 
     // setting popus in bottom-left position
     int x = geometry().x();
-    int y = geometry().y() + height() - h*4;
+    int y = geometry().y() + height() - h*3;
     QPoint p(x,y);
 
     m_popup->show(p);
-- 
cgit v1.2.1