--- applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp~ 2009-01-06 18:23:55.000000000 +0100 +++ applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp 2009-02-17 14:26:53.000000000 +0100 @@ -20,6 +20,7 @@ #include "PassagewayView.h" #include <QWidget> +#include <climits> namespace Lancelot { @@ -65,6 +66,8 @@ : layout(NULL), buttonsLayout(NULL), listsLayout(NULL), parent(p), focusIndex(0) { parent->setLayout(layout = new NodeLayout()); + layout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding)); + layout->setMaximumSize(INT_MAX, INT_MAX); layout->addItem( buttonsLayout = new QGraphicsLinearLayout(Qt::Horizontal), @@ -72,6 +75,9 @@ NodeLayout::NodeCoordinate(1, 0, 0, 32) ); + buttonsLayout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding)); + buttonsLayout->setMaximumSize(INT_MAX, INT_MAX); + ExtenderButton * spacer = new ExtenderButton(parent); spacer->setGroupByName("PassagewayView-Spacer"); @@ -87,6 +93,9 @@ ); listsLayout->setSizer(new PassagewayViewSizer()); + listsLayout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding)); + listsLayout->setMaximumSize(INT_MAX, INT_MAX); + buttonsLayout->setSpacing(0.0); @@ -161,7 +170,11 @@ path.takeLast(); buttonsLayout->removeItem(button); - layout->activate(); + //layout->activate(); + // This really shouldn't be needed :( + buttonsLayout->setGeometry(buttonsLayout->geometry()); + + listsLayout->pop(); button->deleteLater(); @@ -196,19 +209,19 @@ list->setCategoriesGroupByName("ActionListView-CategoriesPass"); list->setCategoriesActivable(true); - // if (lists.count() > 0) { - // lists.last()->clearSelection(); - // } focusIndex = lists.count(); lists.append(list); - // list->initialSelection(); path.append(step); buttonsLayout->addItem(button); listsLayout->push(list); + // This really shouldn't be needed :( + buttonsLayout->setGeometry(buttonsLayout->geometry()); + listsLayout->setGeometry(listsLayout->geometry()); + QObject::connect( list, SIGNAL(activated(int)), parent, SLOT(listItemActivated(int)) --- applets/lancelot/libs/lancelot/Global.cpp~ 2008-12-21 21:20:19.000000000 +0100 +++ applets/lancelot/libs/lancelot/Global.cpp 2009-02-17 13:51:28.000000000 +0100 @@ -326,8 +326,10 @@ d->confMain = new KConfig("lancelot" + app + "rc"); + Plasma::Theme::defaultTheme()->setUseGlobalSettings(true); + qDebug() << "What is the plasma theme: " << Plasma::Theme::defaultTheme()->themeName(); QString search = "desktoptheme/" + Plasma::Theme::defaultTheme()->themeName() + "/lancelot/" + app + "theme.config"; - kDebug() << search; + qDebug() << "Trying:" << search; QString path = KStandardDirs::locate( "data", search ); if (path == "") { @@ -337,7 +339,7 @@ if (path == "") { path = "lancelotrc"; } - kDebug() << path; + kDebug() << "Using theme:" << path; d->confTheme = new KConfig(path); Instance::Private::activeInstance = this;