[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/kickoff_kde4-port/kicker/ui
From:       Stephan Binner <binner () kde ! org>
Date:       2007-07-24 16:49:10
Message-ID: 1185295750.457536.11869.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 691934 by binner:

QTab is really gone


 M  +5 -4      k_new_mnu.cpp  
 M  +1 -3      k_new_mnu.h  


--- branches/work/kickoff_kde4-port/kicker/ui/k_new_mnu.cpp #691933:691934
@@ -220,7 +220,7 @@
     m_kMenuBase->m_userInfo->setPaletteForegroundColor( userInfoColor );
 
     m_tabBar = new QTabBar(this);
-    connect(m_tabBar, SIGNAL(tabClicked(QTab*)), SLOT(tabClicked(QTab*)));
+    connect(m_tabBar, SIGNAL(currentChanged(int)), SLOT(tabClicked(int)));
 
     const int tab_icon_size = 32;
 
@@ -833,11 +833,11 @@
 {
 }
 
-void KickoffMenu::tabClicked(QTab* t)
+void KickoffMenu::tabClicked(int t)
 {
-    if (t==m_tabs[ApplicationsTab])
+    if (t==ApplicationsTab)
 	slotGoSubMenu(QString::null);
-    else if (t==m_tabs[LeaveTab])
+    else if (t==LeaveTab)
 	slotGoExitMainMenu();
 }
 
@@ -920,6 +920,7 @@
 
 void KickoffMenu::goSubMenu(const QString& relPath, bool keyboard)
 {
+    kDebug() << "goSubMenu() " << relPath << endl;
     if ( relPath.startsWith( "kicker:/goup/" ) )
     {
         QString rel = relPath.mid( strlen( "kicker:/goup/" ) );
--- branches/work/kickoff_kde4-port/kicker/ui/k_new_mnu.h #691933:691934
@@ -70,7 +70,6 @@
 class KMenuItem;
 class Q3ListView;
 class QTabBar;
-class QTab;
 
 static QString categories[14] = {I18N_NOOP("Actions"), I18N_NOOP("Applications"), \
                I18N_NOOP("Bookmarks"),
                                  I18N_NOOP("Notes"), I18N_NOOP("Emails"),  \
I18N_NOOP("Files"), I18N_NOOP("Music"), @@ -144,7 +143,7 @@
     void slotGoBack();
     void slotGoExitMainMenu();
     void slotGoExitSubMenu(const QString& url);
-    void tabClicked(QTab*);
+    void tabClicked(int);
 
     void paletteChanged();
     virtual void configChanged();
@@ -304,7 +303,6 @@
     PopupPath m_popupPath;
 
     QTabBar* m_tabBar;
-    QTab* m_tabs[NumTabs];
 
     QString newDesktopFile(const KUrl& url, const QString &directory);
     void updateRecentlyUsedApps(KService::Ptr &service);


[prev in list] [next in list] [prev in thread] [next in thread]