- delay creating the AppletBrowser until it's actually used. in
practice, one should NEVER create user interface in ctors/init()s of objects that get created at startup of the app if that UI is not for immediately visibility - fix the build temporarily (but commenting out AppletBrowser bits) until Ivan commits the missing files svn path=/trunk/KDE/kdebase/workspace/libs/plasma/; revision=717926
This commit is contained in:
parent
8a811e46f7
commit
b8343e6cf7
@ -53,7 +53,7 @@ set(plasma_LIB_SRCS
|
||||
widgets/signalplotter.cpp
|
||||
widgets/meter.cpp
|
||||
|
||||
appletbrowser.cpp
|
||||
# appletbrowser.cpp
|
||||
appletbrowser/appletbrowserwindow.cpp
|
||||
appletbrowser/kcategorizeditemsview.cpp
|
||||
appletbrowser/kcategorizeditemsviewdelegate.cpp
|
||||
@ -106,7 +106,7 @@ set(plasma_LIB_INCLUDES
|
||||
abstractrunner.h
|
||||
animator.h
|
||||
applet.h
|
||||
appletbrowser.h
|
||||
# appletbrowser.h
|
||||
configxml.h
|
||||
containment.h
|
||||
corona.h
|
||||
|
@ -49,7 +49,8 @@
|
||||
#include "ksmserver_interface.h"
|
||||
#include "screensaver_interface.h"
|
||||
|
||||
#include "appletbrowser.h"
|
||||
//#include "appletbrowser.h"
|
||||
class AppletBrowser;
|
||||
|
||||
namespace Plasma
|
||||
{
|
||||
@ -66,7 +67,8 @@ public:
|
||||
engineExplorerAction(0),
|
||||
runCommandAction(0),
|
||||
screen(-1),
|
||||
immutable(false)
|
||||
immutable(false),
|
||||
appletBrowser(0)
|
||||
{
|
||||
}
|
||||
|
||||
@ -76,6 +78,7 @@ public:
|
||||
applets.clear();
|
||||
delete layout;
|
||||
delete bitmapBackground;
|
||||
//delete appletBrowser;
|
||||
}
|
||||
|
||||
FormFactor formFactor;
|
||||
@ -102,19 +105,16 @@ Containment::Containment(QGraphicsItem* parent,
|
||||
: Applet(parent, serviceId, containmentId),
|
||||
d(new Private)
|
||||
{
|
||||
d->appletBrowser = new AppletBrowser(this);
|
||||
}
|
||||
|
||||
Containment::Containment(QObject* parent, const QVariantList& args)
|
||||
: Applet(parent, args),
|
||||
d(new Private)
|
||||
{
|
||||
d->appletBrowser = new AppletBrowser(this);
|
||||
}
|
||||
|
||||
Containment::~Containment()
|
||||
{
|
||||
delete d->appletBrowser;
|
||||
delete d;
|
||||
}
|
||||
|
||||
@ -196,10 +196,12 @@ void Containment::launchExplorer()
|
||||
|
||||
void Containment::launchAppletBrowser()
|
||||
{
|
||||
d->appletBrowser->show();
|
||||
if (!d->appletBrowser) {
|
||||
// d->appletBrowser = new AppletBrowser(this);
|
||||
}
|
||||
|
||||
|
||||
// d->appletBrowser->show();
|
||||
}
|
||||
|
||||
void Containment::runCommand()
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user