[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 17:45:34
Message-ID: 1185299134.123457.18259.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 691949 by binner:
bye bye Q3WidgetStack
M +0 -1 itemview.cpp
M +0 -1 itemview.h
M +46 -42 k_new_mnu.cpp
M +3 -3 k_new_mnu.h
--- branches/work/kickoff_kde4-port/kicker/ui/itemview.cpp #691948:691949
@@ -30,7 +30,6 @@
#include <qimage.h>
#include <qpainter.h>
#include <qstyle.h>
-#include <q3widgetstack.h>
#include <qlayout.h>
#include <qlabel.h>
#include <q3vbox.h>
--- branches/work/kickoff_kde4-port/kicker/ui/itemview.h #691948:691949
@@ -49,7 +49,6 @@
class KActionCollection;
class KBookmarkOwner;
class Panel;
-class Q3WidgetStack;
class KHistoryComboBox;
class Q3ScrollView;
class PopupMenuTitle;
--- branches/work/kickoff_kde4-port/kicker/ui/k_new_mnu.cpp #691948:691949
@@ -30,7 +30,7 @@
#include <qimage.h>
#include <qpainter.h>
#include <qstyle.h>
-#include <q3widgetstack.h>
+#include <qstackedwidget.h>
#include <qlayout.h>
#include <qlabel.h>
#include <qregexp.h>
@@ -256,31 +256,31 @@
m_tabBar->setTabIcon(LeaveTab,BarIcon("application-exit", tab_icon_size));
}
- connect(m_tabBar, SIGNAL(selected(int)), m_stacker, SLOT(raiseWidget(int)));
- connect(m_stacker, SIGNAL(aboutToShow(int)), m_tabBar, \
SLOT(setCurrentTab(int))); + connect(m_tabBar, SIGNAL(selected(int)), m_stacker, \
SLOT(setCurrentIndex(int))); + connect(m_stacker, SIGNAL(currentChanged(int)), \
m_tabBar, SLOT(setCurrentTab(int)));
m_favoriteView = new FavoritesItemView (m_stacker, "m_favoriteView");
m_favoriteView->setAcceptDrops(true);
m_favoriteView->setItemsMovable(true);
- m_stacker->addWidget(m_favoriteView, FavoriteTab);
+ m_stacker->insertWidget(FavoriteTab, m_favoriteView);
- m_recentlyView = new ItemView (m_stacker, "m_recentlyView");
- m_stacker->addWidget(m_recentlyView, HistoryTab);
+ m_browserView = new FlipScrollView(m_stacker, "m_browserView");
+ m_stacker->insertWidget(ApplicationsTab, m_browserView);
+ connect( m_browserView, SIGNAL( backButtonClicked() ), SLOT( slotGoBack() ) );
m_systemView = new ItemView(m_stacker, "m_systemView");
- m_stacker->addWidget(m_systemView, ComputerTab );
+ m_stacker->insertWidget(ComputerTab, m_systemView);
- m_browserView = new FlipScrollView(m_stacker, "m_browserView");
- m_stacker->addWidget(m_browserView, ApplicationsTab);
- connect( m_browserView, SIGNAL( backButtonClicked() ), SLOT( slotGoBack() ) );
+ m_recentlyView = new ItemView (m_stacker, "m_recentlyView");
+ m_stacker->insertWidget(HistoryTab, m_recentlyView);
m_exitView = new FlipScrollView(m_stacker, "m_exitView");
- m_stacker->addWidget(m_exitView, LeaveTab);
+ m_stacker->insertWidget(LeaveTab, m_exitView);
connect( m_exitView, SIGNAL( backButtonClicked() ), SLOT( slotGoExitMainMenu() ) \
);
m_searchWidget = new Q3VBox (m_stacker, "m_searchWidget");
m_searchWidget->setSpacing(0);
- m_stacker->addWidget(m_searchWidget, 5);
+ m_stacker->insertWidget(5, m_searchWidget);
// search provider icon
#warning FIXME
@@ -428,14 +428,15 @@
void KickoffMenu::setupUi()
{
- m_stacker = new Q3WidgetStack( this, "m_stacker" );
+ m_stacker = new QStackedWidget( this );
m_stacker->setGeometry( QRect( 90, 260, 320, 220 ) );
m_stacker->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)3, \
(QSizePolicy::SizeType)3, 1, 1, m_stacker->sizePolicy().hasHeightForWidth() ) ); \
m_stacker->setPaletteBackgroundColor( QColor( 255, 255, 255 ) ); // \
m_stacker->setFocusPolicy( Qt::StrongFocus ); m_stacker->setLineWidth( 0 );
m_stacker->setFocusPolicy(Qt::NoFocus);
- connect(m_stacker, SIGNAL(aboutToShow(QWidget*)), \
SLOT(stackWidgetRaised(QWidget*))); +// \
m_kMenuBase->hboxLayout1->addWidget(m_stacker); + connect(m_stacker, \
SIGNAL(currentChanged(int)), SLOT(stackWidgetRaised(int)));
m_kMenuBase->m_kcommand->setName("m_kcommand");
}
@@ -513,11 +514,11 @@
m_searchActions->setFocusPolicy(raiseWidget == m_searchWidget ?
Qt::StrongFocus : Qt::NoFocus);
setTabOrder(raiseWidget, m_searchResultsWidget);
- if (raiseWidget != m_stacker->visibleWidget()
+ if (raiseWidget != m_stacker->currentWidget()
&& static_cast<QWidget*>(receiver)->focusPolicy() == Qt::NoFocus
- && m_stacker->id(raiseWidget) >= 0) {
+ && m_stacker->indexOf(raiseWidget) >= 0) {
- m_stacker->raiseWidget(raiseWidget);
+ m_stacker->setCurrentWidget(raiseWidget);
return true;
}
@@ -550,7 +551,7 @@
if ( ( e->type() == QEvent::DragEnter || e->type() == QEvent::DragMove ) &&
raiseWidget == m_favoriteView )
{
- m_stacker->raiseWidget(m_favoriteView);
+ m_stacker->setCurrentWidget(m_favoriteView);
return false;
}
@@ -560,12 +561,12 @@
// must have focusNextPrevChild() overwritten to do nothing
if (e->type() == QEvent::KeyPress && !raiseRect.isNull()) {
ItemView* view;
- if (m_browserView==m_stacker->visibleWidget())
+ if (m_browserView==m_stacker->currentWidget())
view = m_browserView->currentView();
- else if (m_exitView==m_stacker->visibleWidget())
+ else if (m_exitView==m_stacker->currentWidget())
view = m_exitView->currentView();
else
- view = dynamic_cast<ItemView*>(m_stacker->visibleWidget());
+ view = dynamic_cast<ItemView*>(m_stacker->currentWidget());
if (view)
{
@@ -601,10 +602,10 @@
break;
case Qt::Key_Left:
- if (m_browserView == m_stacker->visibleWidget() || m_exitView == \
m_stacker->visibleWidget()) {
- FlipScrollView* flip = \
dynamic_cast<FlipScrollView*>(m_stacker->visibleWidget()); + if \
(m_browserView == m_stacker->currentWidget() || m_exitView == \
m_stacker->currentWidget()) { + FlipScrollView* flip = \
dynamic_cast<FlipScrollView*>(m_stacker->currentWidget()); if \
(flip->showsBackButton()) {
- if (m_browserView == m_stacker->visibleWidget())
+ if (m_browserView == m_stacker->currentWidget())
goSubMenu( m_browserView->currentView()->backPath(), \
true ); else
view->slotItemClicked(view->firstChild());
@@ -613,10 +614,10 @@
}
// nobreak
case Qt::Key_Backspace:
- if (m_browserView == m_stacker->visibleWidget() || m_exitView == \
m_stacker->visibleWidget()) {
- FlipScrollView* flip = \
dynamic_cast<FlipScrollView*>(m_stacker->visibleWidget()); + if \
(m_browserView == m_stacker->currentWidget() || m_exitView == \
m_stacker->currentWidget()) { + FlipScrollView* flip = \
dynamic_cast<FlipScrollView*>(m_stacker->currentWidget()); if \
(flip->showsBackButton()) {
- if (m_browserView == m_stacker->visibleWidget())
+ if (m_browserView == m_stacker->currentWidget())
goSubMenu( m_browserView->currentView()->backPath(), \
true ); else
view->slotItemClicked(view->firstChild());
@@ -638,7 +639,7 @@
bool r = QDialog::eventFilter(receiver, e);
if (!r && raiseWidget)
- m_stacker->raiseWidget(raiseWidget);
+ m_stacker->setCurrentWidget(raiseWidget);
if (e->type() == QEvent::Wheel && raiseWidget )
{
@@ -694,7 +695,7 @@
{
if ( m_sloppySource.contains(QCursor::pos()))
{
- m_stacker->raiseWidget(m_sloppyWidget);
+ m_stacker->setCurrentWidget(m_sloppyWidget);
m_sloppyWidget = 0;
m_sloppySource = QRect();
@@ -755,8 +756,11 @@
m_kMenuBase->m_searchFrame->setPaletteBackgroundPixmap( canvas );
}
-void KickoffMenu::stackWidgetRaised(QWidget* raiseWidget)
+void KickoffMenu::stackWidgetRaised(int _raiseWidget)
{
+kDebug() << "stackWidgetRaised()" << _raiseWidget << endl;
+ QWidget *raiseWidget= m_stacker->widget(_raiseWidget);
+
paintSearchTab(raiseWidget == m_searchWidget);
if (raiseWidget == m_browserView) {
@@ -798,7 +802,7 @@
// if (dynamic_cast<QScrollView*>(raiseWidget))
// m_activeTab->setFocusProxy(static_cast<QScrollView*>(raiseWidget)->viewport());
- if (0 && /*raiseWidget == m_stacker->visibleWidget() &&*/ \
!raiseWidget->hasFocus()) { + if (0 && /*raiseWidget == m_stacker->currentWidget() \
&&*/ !raiseWidget->hasFocus()) {
if (dynamic_cast<Q3ScrollView*>(raiseWidget))
static_cast<Q3ScrollView*>(raiseWidget)->viewport()->setFocus();
@@ -817,7 +821,7 @@
else if (raiseWidget == m_exitView)
view = m_exitView->currentView();
else
- view = dynamic_cast<ItemView*>(m_stacker->visibleWidget());
+ view = dynamic_cast<ItemView*>(m_stacker->currentWidget());
if (view && !view->selectedItem()) {
if (view->firstChild() && view->firstChild()->isSelectable()) {
view->setSelected(view->firstChild(),true);
@@ -1282,7 +1286,7 @@
insertStaticItems();
- m_stacker->raiseWidget (m_favoriteView);
+ m_stacker->setCurrentWidget(m_favoriteView);
}
void KickoffMenu::insertStaticExitItems()
@@ -1666,7 +1670,7 @@
updateMedia();
m_mediaFreeTimer.start(10 * 1000); // refresh all 10s
- m_stacker->raiseWidget(FavoriteTab);
+ m_stacker->setCurrentIndex(FavoriteTab);
m_kMenuBase->m_kcommand->clear();
current_query.clear();
m_kMenuBase->m_kcommand->setFocus();
@@ -1700,7 +1704,7 @@
m_resizeHandle->setPaletteBackgroundPixmap( pix );
m_tabBar->setShape( m_orientation == BottomUp
- ? QTabBar::RoundedBelow : QTabBar::RoundedAbove);
+ ? QTabBar::RoundedSouth : QTabBar::RoundedNorth);
QPixmap respix = QPixmap( KStandardDirs::locate("data", \
"kicker/pics/resize_handle.png" ) ); if ( m_orientation == TopDown ) {
@@ -1764,7 +1768,7 @@
// QToolTip::setGloballyEnabled(m_toolTipsEnabled);
// remove focus from lineedit again, otherwise it doesn't kill its timers
- m_stacker->raiseWidget(FavoriteTab);
+ m_stacker->setCurrentIndex(FavoriteTab);
QWidget::hide();
}
@@ -1904,7 +1908,7 @@
if (!text.isEmpty()) {
const QColor on = QColor( 244, 244, 244 );
const QColor off = QColor( 181, 181, 181 );
- m_stacker->raiseWidget(m_searchWidget);
+ m_stacker->setCurrentWidget(m_searchWidget);
paintSearchTab(true);
}
@@ -2900,10 +2904,10 @@
if (source==m_recentlyView) {
m_popupMenu->insertSeparator();
if (m_popupService)
- m_popupMenu->insertItem(SmallIconSet("history_clear"),
+ m_popupMenu->insertItem(SmallIconSet("history-clear"),
i18n("Clear Recently Used Applications"), ClearRecentlyUsedApps);
else
- m_popupMenu->insertItem(SmallIconSet("history_clear"),
+ m_popupMenu->insertItem(SmallIconSet("history-clear"),
i18n("Clear Recently Used Documents"), ClearRecentlyUsedDocs);
}
@@ -3042,7 +3046,7 @@
KickerSettings::setFavorites(favs);
KickerSettings::self()->writeConfig();
m_browserDirty=true;
- m_stacker->raiseWidget(FavoriteTab);
+ m_stacker->setCurrentIndex(FavoriteTab);
break;
case RemoveFromFavorites:
@@ -3080,7 +3084,7 @@
KickerSettings::setFavorites(favs);
KickerSettings::self()->writeConfig();
m_browserDirty=true;
- m_stacker->raiseWidget(FavoriteTab);
+ m_stacker->setCurrentIndex(FavoriteTab);
break;
case ClearRecentlyUsedApps:
@@ -3699,7 +3703,7 @@
KickerSettings::setFavorites(favs);
slotFavoritesMoved( newItem, 0, after );
}
- m_stacker->raiseWidget(m_favoriteView);
+ m_stacker->setCurrentWidget(m_favoriteView);
}
void KickoffMenu::resetOverflowCategory()
--- branches/work/kickoff_kde4-port/kicker/ui/k_new_mnu.h #691948:691949
@@ -56,7 +56,7 @@
class KActionCollection;
class KBookmarkOwner;
class Panel;
-class Q3WidgetStack;
+class QStackedWidget;
class KHistoryComboBox;
class Q3ScrollView;
class PopupMenuTitle;
@@ -131,7 +131,7 @@
virtual void hide();
virtual void show();
- void stackWidgetRaised(QWidget*);
+ void stackWidgetRaised(int);
protected slots:
void slotLock();
@@ -321,7 +321,7 @@
QPixmap search_tab_top_right;
QPixmap search_tab_top_center;
- Q3WidgetStack *m_stacker;
+ QStackedWidget *m_stacker;
QStringList m_programsInMenu;
QStringList m_newInstalledPrograms, m_seenPrograms;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic