summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/launcher/launcher.cpp34
-rw-r--r--core/launcher/launcher.h2
2 files changed, 32 insertions, 4 deletions
diff --git a/core/launcher/launcher.cpp b/core/launcher/launcher.cpp
index fc944e1..e74301c 100644
--- a/core/launcher/launcher.cpp
+++ b/core/launcher/launcher.cpp
@@ -151,2 +151,11 @@ void CategoryTabWidget::nextTab()
+
+void CategoryTabWidget::showTab(const QString& id)
+{
+ if ( categoryBar ) {
+ int idx = ids.findIndex( id );
+ categoryBar->setCurrentTab( idx );
+ }
+}
+
void CategoryTabWidget::addItem( const QString& linkfile )
@@ -189,2 +198,8 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
{
+ QString current;
+ if ( categoryBar ) {
+ int c = categoryBar->currentTab();
+ if ( c >= 0 ) current = ids[c];
+ }
+
delete categoryBar;
@@ -250,4 +265,10 @@ void CategoryTabWidget::initializeCategories(AppLnkSet* rootFolder,
+ if ( !current.isNull() ) {
+ showTab(current);
+ }
+
categoryBar->show();
stack->show();
+
+ QCopEnvelope e("QPE/TaskBar","reloadApps()");
}
@@ -616,3 +637,2 @@ Launcher::Launcher( QWidget* parent, const char* name, WFlags fl )
tabs = new CategoryTabWidget( this );
- tabs->setMaximumWidth( qApp->desktop()->width() );
setCentralWidget( tabs );
@@ -676,2 +696,3 @@ void Launcher::doMaximize()
QMainWindow::showMaximized();
+ tabs->setMaximumWidth( qApp->desktop()->width() );
}
@@ -834,2 +855,7 @@ void Launcher::nextView()
+void Launcher::showTab(const QString& id)
+{
+ tabs->showTab(id);
+ raise();
+}
@@ -891,3 +917,3 @@ void Launcher::updateLink(const QString& link)
}
-
+
if ( notify_sm )
@@ -1191,3 +1217,3 @@ void Launcher::launcherMessage( const QCString &msg, const QByteArray &data)
QString type;
- stream >> type;
+ stream >> type;
tabs->setBusyIndicatorType(type);
@@ -1199,3 +1225,3 @@ void Launcher::launcherMessage( const QCString &msg, const QByteArray &data)
raise ( );
-
+
}
diff --git a/core/launcher/launcher.h b/core/launcher/launcher.h
index 89bf6f3..c92ef5d 100644
--- a/core/launcher/launcher.h
+++ b/core/launcher/launcher.h
@@ -74,2 +74,3 @@ public slots:
void prevTab();
+ void showTab(const QString&);
@@ -107,2 +108,3 @@ public slots:
void viewSelected(const QString&);
+ void showTab(const QString&);
void select( const AppLnk * );