Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

activities cleanup

Browse source
This commit is contained in:
Ivailo Monev 2015-01-16 02:12:09 +00:00
parent e510a2a866
commit e3192fc222
17 changed files with 1 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
kwin/atoms.cpp
View file

@ -38,9 +38,6 @@ Atoms::Atoms()
atoms[n] = &kwin_running;
names[n++] = (char *) "KWIN_RUNNING";
atoms[n] = &activities;
names[n++] = (char *) "_KDE_NET_WM_ACTIVITIES";
atoms[n] = &wm_protocols;
names[n++] = (char *) "WM_PROTOCOLS";

1
kwin/atoms.h
View file

@ -34,7 +34,6 @@ public:
Atoms();
Atom kwin_running;
Atom activities;
Atom wm_protocols;
Atom wm_delete_window;

1
kwin/sm.h
View file

@ -69,7 +69,6 @@ struct SessionInfo {
int tabGroup; // Unique identifier for the client group that this window is in
Client* tabGroupClient; // The first client created that has an identical identifier
QStringList activities;
};

5
kwin/unmanaged.cpp
View file

@ -120,11 +120,6 @@ int Unmanaged::desktop() const
return NET::OnAllDesktops; // TODO for some window types should be the current desktop?
}
QStringList Unmanaged::activities() const
{
return QStringList();
}
QPoint Unmanaged::clientPos() const
{
return QPoint(0, 0); // unmanaged windows don't have decorations

1
kwin/unmanaged.h
View file

@ -39,7 +39,6 @@ public:
bool track(Window w);
static void deleteUnmanaged(Unmanaged* c);
virtual int desktop() const;
virtual QStringList activities() const;
virtual QPoint clientPos() const;
virtual QSize clientSize() const;
virtual QRect transparentRect() const;

16
libs/plasmagenericshell/scripting/containment.cpp
View file

@ -263,22 +263,6 @@ uint Containment::id() const
return d->containment.data()->id();
}
QString Containment::name() const
{
if (!d->containment) {
return QString();
}
return d->containment.data()->activity();
}
void Containment::setName(const QString &name)
{
if (d->containment) {
d->containment.data()->setActivity(name);
}
}
QString Containment::type() const
{
if (!d->containment) {

4
libs/plasmagenericshell/scripting/containment.h
View file

@ -45,7 +45,6 @@ class PLASMAGENERICSHELL_EXPORT Containment : public Applet
Q_PROPERTY(QStringList globalConfigKeys READ globalConfigKeys)
Q_PROPERTY(QStringList globalConfigGroups READ globalConfigGroups)
Q_PROPERTY(QStringList currentConfigGroup WRITE setCurrentConfigGroup READ currentConfigGroup)
Q_PROPERTY(QString name READ name WRITE setName)
Q_PROPERTY(QString wallpaperPlugin READ wallpaperPlugin WRITE setWallpaperPlugin)
Q_PROPERTY(QString wallpaperMode READ wallpaperMode WRITE setWallpaperMode)
Q_PROPERTY(bool locked READ locked WRITE setLocked)
@ -65,9 +64,6 @@ public:
QString formFactor() const;
QList<int> widgetIds() const;
QString name() const;
void setName(const QString &name);
int desktop() const;
void setDesktop(int desktop);

59
libs/plasmagenericshell/scripting/scriptengine.cpp
View file

@ -74,40 +74,6 @@ ScriptEngine::~ScriptEngine()
{
}
QScriptValue ScriptEngine::activityById(QScriptContext *context, QScriptEngine *engine)
{
if (context->argumentCount() == 0) {
return context->throwError(i18n("activityById requires an id"));
}
const uint id = context->argument(0).toInt32();
ScriptEngine *env = envFor(engine);
foreach (Plasma::Containment *c, env->m_corona->containments()) {
if (c->id() == id && !isPanel(c)) {
return env->wrap(c);
}
}
return engine->undefinedValue();
}
QScriptValue ScriptEngine::activityForScreen(QScriptContext *context, QScriptEngine *engine)
{
if (context->argumentCount() == 0) {
return context->throwError(i18n("activityForScreen requires a screen id"));
}
const uint screen = context->argument(0).toInt32();
const uint desktop = context->argumentCount() > 1 ? context->argument(1).toInt32() : -1;
ScriptEngine *env = envFor(engine);
return env->wrap(env->m_corona->containmentForScreen(screen, desktop));
}
QScriptValue ScriptEngine::newActivity(QScriptContext *context, QScriptEngine *engine)
{
return createContainment("desktop", "desktop", context, engine);
}
QScriptValue ScriptEngine::newPanel(QScriptContext *context, QScriptEngine *engine)
{
return createContainment("panel", "panel", context, engine);
@ -198,7 +164,7 @@ ScriptEngine *ScriptEngine::envFor(QScriptEngine *engine)
QScriptValue ScriptEngine::panelById(QScriptContext *context, QScriptEngine *engine)
{
if (context->argumentCount() == 0) {
return context->throwError(i18n("activityById requires an id"));
return context->throwError(i18n("panelById requires an id"));
}
const uint id = context->argument(0).toInt32();
@ -598,11 +564,7 @@ void ScriptEngine::setupEngine()
}
m_scriptSelf.setProperty("QRectF", constructQRectFClass(this));
m_scriptSelf.setProperty("Activity", newFunction(ScriptEngine::newActivity));
m_scriptSelf.setProperty("Panel", newFunction(ScriptEngine::newPanel));
m_scriptSelf.setProperty("activities", newFunction(ScriptEngine::activities));
m_scriptSelf.setProperty("activityById", newFunction(ScriptEngine::activityById));
m_scriptSelf.setProperty("activityForScreen", newFunction(ScriptEngine::activityForScreen));
m_scriptSelf.setProperty("panelById", newFunction(ScriptEngine::panelById));
m_scriptSelf.setProperty("panels", newFunction(ScriptEngine::panels));
m_scriptSelf.setProperty("fileExists", newFunction(ScriptEngine::fileExists));
@ -627,25 +589,6 @@ bool ScriptEngine::isPanel(const Plasma::Containment *c)
c->containmentType() == Plasma::Containment::CustomPanelContainment;
}
QScriptValue ScriptEngine::activities(QScriptContext *context, QScriptEngine *engine)
{
Q_UNUSED(context)
QScriptValue containments = engine->newArray();
ScriptEngine *env = envFor(engine);
int count = 0;
foreach (Plasma::Containment *c, env->corona()->containments()) {
if (!isPanel(c)) {
containments.setProperty(count, env->wrap(c));
++count;
}
}
containments.setProperty("length", count);
return containments;
}
Plasma::Corona *ScriptEngine::corona() const
{
return m_corona;

4
libs/plasmagenericshell/scripting/scriptengine.h
View file

@ -69,11 +69,7 @@ private:
// containment accessors
static QStringList availableContainments(const QString &type);
static QScriptValue newActivity(QScriptContext *context, QScriptEngine *engine);
static QScriptValue newPanel(QScriptContext *context, QScriptEngine *engine);
static QScriptValue activities(QScriptContext *context, QScriptEngine *engine);
static QScriptValue activityById(QScriptContext *context, QScriptEngine *engine);
static QScriptValue activityForScreen(QScriptContext *context, QScriptEngine *engine);
static QScriptValue panelById(QScriptContext *context, QScriptEngine *engine);
static QScriptValue panels(QScriptContext *context, QScriptEngine *engine);
static QScriptValue fileExists(QScriptContext *context, QScriptEngine *engine);

5
libs/taskmanager/task.cpp
View file

@ -694,11 +694,6 @@ WId Task::idFromMimeData(const QMimeData *mimeData, bool *ok)
return id;
}
QStringList Task::activities() const
{
return d->activities;
}
Task::WindowProperties::WindowProperties(unsigned int netWinInfoProperties, unsigned int netWinInfoProperties2)
: netWindowInfoProperties(netWinInfoProperties), netWindowInfoProperties2(netWinInfoProperties2)
{

6
libs/taskmanager/task.h
View file

@ -68,7 +68,6 @@ class TASKMANAGER_EXPORT Task : public QObject
Q_PROPERTY(bool modified READ isModified)
Q_PROPERTY(bool demandsAttention READ demandsAttention)
Q_PROPERTY(int desktop READ desktop)
Q_PROPERTY(QStringList activities READ activities)
public:
@ -256,11 +255,6 @@ public:
*/
QRect geometry() const;
/**
* Returns the activities on which this task's window resides.
*/
QStringList activities() const;
// internal
//* @internal

1
libs/taskmanager/task_p.h
View file

@ -59,7 +59,6 @@ public:
KWindowInfo info;
WindowList transients;
WindowList transientsDemandingAttention;
QStringList activities;
int lastWidth;
int lastHeight;

1
libs/taskmanager/taskmanager.cpp
View file

@ -200,7 +200,6 @@ Task *TaskManager::findTask(int desktop, const QPoint& p)
if (!t->isOnAllDesktops() && t->desktop() != desktop) {
continue;
}
//FIXME activities?
if (t->isIconified() || t->isShaded()) {
continue;

18
plasma/desktop/toolboxes/desktoptoolbox.cpp
View file

@ -208,10 +208,6 @@ QSize DesktopToolBox::fullWidth() const
adjustBackgroundBorders();
int extraSpace = 0;
if (!m_containment->activity().isNull()) {
extraSpace = Plasma::Theme::defaultTheme()->fontMetrics().width(m_containment->activity()+'x');
}
return QSize(size() + left + right + extraSpace, size() + bottom);
}
@ -223,10 +219,6 @@ QSize DesktopToolBox::fullHeight() const
adjustBackgroundBorders();
int extraSpace = 0;
if (!m_containment->activity().isNull()) {
extraSpace = Plasma::Theme::defaultTheme()->fontMetrics().width(m_containment->activity()+'x');
}
return QSize(size() + left, size() + top + bottom + extraSpace);
}
@ -254,12 +246,6 @@ QRectF DesktopToolBox::boundingRect() const
int extraSpace = size();
adjustBackgroundBorders();
//keep space for the label and a character more
if (!m_containment->activity().isNull()) {
extraSpace = iconSize().width()
+ Plasma::Theme::defaultTheme()->fontMetrics().width(m_containment->activity()+'x');
}
qreal left, top, right, bottom;
m_background->getMargins(left, top, right, bottom);
@ -328,10 +314,6 @@ void DesktopToolBox::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
QString activityName;
QSize textSize;
if (cornerElement.isNull()) {
activityName = m_containment->activity();
textSize = Plasma::Theme::defaultTheme()->fontMetrics().size(Qt::TextSingleLine, activityName+'x');
}
adjustBackgroundBorders();
m_background->resizeFrame(rect.size());

1
plasma/generic/dataengines/tasks/tasksource.cpp
View file

@ -98,7 +98,6 @@ void TaskSource::updateTask(::TaskManager::TaskChanges taskChanges)
setData("onCurrentDesktop", taskPtr->isOnCurrentDesktop());
setData("onAllDesktops", taskPtr->isOnAllDesktops());
setData("desktop", taskPtr->desktop());
setData("activities", taskPtr->activities());
setData("icon", taskPtr->icon());
setData("actionMinimize", taskPtr->info().actionSupported(NET::ActionMinimize));
setData("actionMaximize", taskPtr->info().actionSupported(NET::ActionMax));

20
plasma/generic/scriptengines/javascript/plasmoid/appletinterface.cpp
View file

@ -57,8 +57,6 @@ AppletInterface::AppletInterface(AbstractJsAppletScript *parent)
this, SIGNAL(formFactorChanged()));
connect(m_appletScriptEngine, SIGNAL(locationChanged()),
this, SIGNAL(locationChanged()));
connect(m_appletScriptEngine, SIGNAL(contextChanged()),
this, SIGNAL(contextChanged()));
}
AppletInterface::~AppletInterface()
@ -86,11 +84,6 @@ AppletInterface::Location AppletInterface::location() const
return static_cast<Location>(applet()->location());
}
QString AppletInterface::currentActivity() const
{
return applet()->context()->currentActivity();
}
AppletInterface::AspectRatioMode AppletInterface::aspectRatioMode() const
{
return static_cast<AspectRatioMode>(applet()->aspectRatioMode());
@ -605,9 +598,6 @@ ContainmentInterface::ContainmentInterface(AbstractJsAppletScript *parent)
connect(containment(), SIGNAL(screenChanged(int, int, Plasma::Containment*)), this, SIGNAL(screenChanged()));
connect(containment()->context(), SIGNAL(activityChanged(Plasma::Context *)), this, SIGNAL(activityNameChanged()));
connect(containment()->context(), SIGNAL(changed(Plasma::Context *)), this, SIGNAL(activityIdChanged()));
if (containment()->corona()) {
connect(containment()->corona(), SIGNAL(availableScreenRegionChanged()),
this, SIGNAL(availableScreenRegionChanged()));
@ -718,16 +708,6 @@ bool ContainmentInterface::hasMovableApplets() const
return m_movableApplets;
}
QString ContainmentInterface::activityName() const
{
return containment()->context()->currentActivity();
}
QString ContainmentInterface::activityId() const
{
return containment()->context()->currentActivityId();
}
ToolBoxProxy* ContainmentInterface::toolBox()
{
if (!m_toolBox) {

10
plasma/generic/scriptengines/javascript/plasmoid/appletinterface.h
View file

@ -70,7 +70,6 @@ class AppletInterface : public QObject
Q_PROPERTY(AspectRatioMode aspectRatioMode READ aspectRatioMode WRITE setAspectRatioMode)
Q_PROPERTY(FormFactor formFactor READ formFactor NOTIFY formFactorChanged)
Q_PROPERTY(Location location READ location NOTIFY locationChanged)
Q_PROPERTY(QString currentActivity READ currentActivity NOTIFY contextChanged)
Q_PROPERTY(bool shouldConserveResources READ shouldConserveResources)
Q_PROPERTY(QString activeConfig WRITE setActiveConfig READ activeConfig)
Q_PROPERTY(bool busy WRITE setBusy READ isBusy)
@ -243,7 +242,6 @@ enum IntervalAlignment {
Q_INVOKABLE FormFactor formFactor() const;
Location location() const;
QString currentActivity() const;
bool shouldConserveResources() const;
Q_INVOKABLE AspectRatioMode aspectRatioMode() const;
@ -325,7 +323,6 @@ Q_SIGNALS:
void formFactorChanged();
void locationChanged();
void contextChanged();
void immutableChanged();
void statusChanged();
@ -418,8 +415,6 @@ class ContainmentInterface : public APPLETSUPERCLASS
Q_PROPERTY(Type containmentType READ containmentType WRITE setContainmentType)
Q_PROPERTY(int screen READ screen NOTIFY screenChanged)
Q_PROPERTY(bool movableApplets READ hasMovableApplets WRITE setMovableApplets)
Q_PROPERTY(QString activityName READ activityName NOTIFY activityNameChanged)
Q_PROPERTY(QString activityId READ activityId NOTIFY activityIdChanged)
Q_PROPERTY(ToolBoxProxy* toolBox READ toolBox CONSTANT)
Q_ENUMS(Type)
@ -447,9 +442,6 @@ public:
void setMovableApplets(bool movable);
bool hasMovableApplets() const;
QString activityName() const;
QString activityId() const;
ToolBoxProxy* toolBox();
Q_INVOKABLE QScriptValue screenGeometry(int id) const;
@ -459,8 +451,6 @@ Q_SIGNALS:
void appletAdded(QGraphicsWidget *applet, const QPointF &pos);
void appletRemoved(QGraphicsWidget *applet);
void screenChanged();
void activityNameChanged();
void activityIdChanged();
void availableScreenRegionChanged();
protected Q_SLOTS: