From 78aef384a57bca278bdd4484e9b31bbd7b88c98e Mon Sep 17 00:00:00 2001
From: Alexandr Domrachev <alexandr.domrachev@gmail.com>
Date: Mon, 27 Apr 2009 18:01:41 +0000
Subject: TabBar code clean. Icons added to context menu

---
 src/tabbar.cpp | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

(limited to 'src/tabbar.cpp')

diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 75a06e23..6914ef77 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -96,18 +96,20 @@ QSize TabBar::tabSizeHint(int index) const
 void TabBar::contextMenuRequested(const QPoint &position)
 {
     KMenu menu;
-    menu.addAction(i18n("New &Tab"), this, SIGNAL(newTab()));
+    MainWindow *mainWindow = Application::instance()->mainWindow();
+
+    menu.addAction(mainWindow->actionByName(QLatin1String("new_tab")));
     int index = tabAt(position);
     if (-1 != index)
     {
         m_actualIndex = index;
 
-        KAction *action = (KAction *) menu.addAction(i18n("Clone Tab"), this, SLOT(cloneTab()));
+        menu.addAction(KIcon("tab-duplicate"), i18n("Clone Tab"), this, SLOT(cloneTab()));
         menu.addSeparator();
-        action = (KAction *) menu.addAction(i18n("&Close Tab"), this, SLOT(closeTab()));
-        action = (KAction *) menu.addAction(i18n("Close &Other Tabs"), this, SLOT(closeOtherTabs()));
+        menu.addAction(KIcon("tab-close"), i18n("&Close Tab"), this, SLOT(closeTab()));
+        menu.addAction(KIcon("tab-close-other"), i18n("Close &Other Tabs"), this, SLOT(closeOtherTabs()));
         menu.addSeparator();
-        action = (KAction *) menu.addAction(i18n("Reload Tab"), this, SLOT(reloadTab()));
+        menu.addAction(KIcon("view-refresh"), i18n("Reload Tab"), this, SLOT(reloadTab()));
     }
     else
     {
@@ -136,16 +138,6 @@ void TabBar::closeOtherTabs()
 }
 
 
-void TabBar::mousePressEvent(QMouseEvent *event)
-{
-    if (event->button() == Qt::LeftButton)
-    {
-        m_dragStartPos = event->pos();
-    }
-    KTabBar::mousePressEvent(event);
-}
-
-
 void TabBar::reloadTab()
 {
     emit reloadTab(m_actualIndex);
-- 
cgit v1.2.1


From 2382db2c27728214cb9645fee3ef49222ca8dcd5 Mon Sep 17 00:00:00 2001
From: Alexandr Domrachev <alexandr.domrachev@gmail.com>
Date: Mon, 27 Apr 2009 18:42:51 +0000
Subject: TabBar context menu fix ported

---
 src/tabbar.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/tabbar.cpp')

diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index 6914ef77..f11ea688 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -49,7 +49,8 @@ TabBar::TabBar(QWidget *parent)
     setElideMode(Qt::ElideRight);
     setContextMenuPolicy(Qt::CustomContextMenu);
     setMovable(true);
-    connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(contextMenuRequested(const QPoint &)));
+    connect(this, SIGNAL(customContextMenuRequested(const QPoint &)), this,
+            SLOT(contextMenuRequested(const QPoint &)));
 
     // tabbar font
     QFont standardFont = KGlobalSettings::generalFont();
-- 
cgit v1.2.1