Attachment #182067 for bug #258758

Lines 326-333 Link Here

(-)applets/lancelot/libs/lancelot/Global.cpp~ (+5 lines)
326		326
327	d->confMain = new KConfig("lancelot" + app + "rc");	327	d->confMain = new KConfig("lancelot" + app + "rc");
328		328
		329	Plasma::Theme::defaultTheme()->setUseGlobalSettings(true);
		330	qDebug() << "What is the plasma theme: " << Plasma::Theme::defaultTheme()->themeName();
329	QString search = "desktoptheme/" + Plasma::Theme::defaultTheme()->themeName() + "/lancelot/" + app + "theme.config";	331	QString search = "desktoptheme/" + Plasma::Theme::defaultTheme()->themeName() + "/lancelot/" + app + "theme.config";
330	kDebug() << search;	332	kDebug() << search;
		333	qDebug() << "Trying:" << search;
331		334
332	QString path = KStandardDirs::locate( "data", search );	335	QString path = KStandardDirs::locate( "data", search );
333	if (path == "") {	336	if (path == "") {
Lines 338-343 Link Here
338	path = "lancelotrc";	341	path = "lancelotrc";
339	}	342	}
340	kDebug() << path;	343	kDebug() << path;
		344
		345	qDebug() << "Using theme:" << path;
341	d->confTheme = new KConfig(path);	346	d->confTheme = new KConfig(path);
342		347
343	Instance::Private::activeInstance = this;	348	Instance::Private::activeInstance = this;

Lines 20-25 Link Here

(-)applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp~ (-6 / +21 lines)
20	#include "PassagewayView.h"	20	#include "PassagewayView.h"
21		21
22	#include <QWidget>	22	#include <QWidget>
		23	#include <QGraphicsSceneMouseEvent>
		24	#include <QGraphicsView>
		25	#include <QApplication>
		26	#include <climits>
23		27
24	namespace Lancelot {	28	namespace Lancelot {
25		29
Lines 65-70 Link Here
65	: layout(NULL), buttonsLayout(NULL), listsLayout(NULL), parent(p), focusIndex(0)	69	: layout(NULL), buttonsLayout(NULL), listsLayout(NULL), parent(p), focusIndex(0)
66	{	70	{
67	parent->setLayout(layout = new NodeLayout());	71	parent->setLayout(layout = new NodeLayout());
		72	layout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
		73	layout->setMaximumSize(INT_MAX, INT_MAX);
68		74
69	layout->addItem(	75	layout->addItem(
70	buttonsLayout = new QGraphicsLinearLayout(Qt::Horizontal),	76	buttonsLayout = new QGraphicsLinearLayout(Qt::Horizontal),
Lines 72-77 Link Here
72	NodeLayout::NodeCoordinate(1, 0, 0, 32)	78	NodeLayout::NodeCoordinate(1, 0, 0, 32)
73	);	79	);
74		80
		81	buttonsLayout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
		82	buttonsLayout->setMaximumSize(INT_MAX, INT_MAX);
		83
75	ExtenderButton * spacer =	84	ExtenderButton * spacer =
76	new ExtenderButton(parent);	85	new ExtenderButton(parent);
77	spacer->setGroupByName("PassagewayView-Spacer");	86	spacer->setGroupByName("PassagewayView-Spacer");
Lines 88-93 Link Here
88		97
89	listsLayout->setSizer(new PassagewayViewSizer());	98	listsLayout->setSizer(new PassagewayViewSizer());
90		99
		100	listsLayout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
		101	listsLayout->setMaximumSize(INT_MAX, INT_MAX);
		102
91	buttonsLayout->setSpacing(0.0);	103	buttonsLayout->setSpacing(0.0);
92		104
93	next(Step("", QIcon(), entranceModel));	105	next(Step("", QIcon(), entranceModel));
Lines 161-167 Link Here
161	path.takeLast();	173	path.takeLast();
162		174
163	buttonsLayout->removeItem(button);	175	buttonsLayout->removeItem(button);
164	layout->activate();	176
		177	// This really shouldn't be needed :(
		178	buttonsLayout->setGeometry(buttonsLayout->geometry());
		179
		180
165	listsLayout->pop();	181	listsLayout->pop();
166		182
167	button->deleteLater();	183	button->deleteLater();
Lines 196-214 Link Here
196	list->setCategoriesGroupByName("ActionListView-CategoriesPass");	212	list->setCategoriesGroupByName("ActionListView-CategoriesPass");
197	list->setCategoriesActivable(true);	213	list->setCategoriesActivable(true);
198		214
199	// if (lists.count() > 0) {
200	// lists.last()->clearSelection();
201	// }
202
203	focusIndex = lists.count();	215	focusIndex = lists.count();
204	lists.append(list);	216	lists.append(list);
205		217
206	// list->initialSelection();
207	path.append(step);	218	path.append(step);
208		219
209	buttonsLayout->addItem(button);	220	buttonsLayout->addItem(button);
210	listsLayout->push(list);	221	listsLayout->push(list);
211		222
		223	// This really shouldn't be needed :(
		224	buttonsLayout->setGeometry(buttonsLayout->geometry());
		225	listsLayout->setGeometry(listsLayout->geometry());
		226
212	QObject::connect(	227	QObject::connect(
213	list, SIGNAL(activated(int)),	228	list, SIGNAL(activated(int)),
214	parent, SLOT(listItemActivated(int))	229	parent, SLOT(listItemActivated(int))

Return to bug 258758