wilderjds
/
plasma-workspace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove shell's copy of PlasmaQuick headers

Browse Source 
Summary:
It's exported and we're including the include path in our cmake so we
had two paths to the same thing included.

Test Plan: Compiled

Reviewers: #plasma, markg

Reviewed By: markg

Subscribers: markg, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D4030
wilder-5.14
David Edmundson 9 years ago
parent 8f74e49c82
commit 04c54f4e58
8 changed files with 10 additions and 360 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      shell/desktopview.h
  2. 5
      shell/panelconfigview.h
  3. 4
      shell/panelview.h
  4. 126
      shell/plasmaquick/configmodel.h
  5. 92
      shell/plasmaquick/configview.h
  6. 135
      shell/plasmaquick/containmentview.h
  7. 1
      shell/shellcorona.cpp
  8. 3
      shell/standaloneappcorona.cpp

4
shell/desktopview.h
Unescape View File

@ -20,8 +20,8 @@
#define DESKTOVIEW_H #define DESKTOVIEW_H
#include "plasmaquick/containmentview.h" #include <PlasmaQuick/ContainmentView>
#include "panelconfigview.h" #include <PlasmaQuick/ConfigView>
#include <QtCore/qpointer.h> #include <QtCore/qpointer.h>
namespace KWayland namespace KWayland

5
shell/panelconfigview.h
Unescape View File

@ -20,7 +20,9 @@
#ifndef PANELCONFIGVIEW_H #ifndef PANELCONFIGVIEW_H
#define PANELCONFIGVIEW_H #define PANELCONFIGVIEW_H
#include "plasmaquick/configview.h" #include <PlasmaQuick/ConfigView>
#include <Plasma/Theme>
#include "panelview.h" #include "panelview.h"
#include <QQuickItem> #include <QQuickItem>
@ -29,7 +31,6 @@
#include <QQmlListProperty> #include <QQmlListProperty>
#include <QStandardItemModel> #include <QStandardItemModel>
#include <QPointer> #include <QPointer>
#include <Plasma/Theme>
class PanelView; class PanelView;

4
shell/panelview.h
Unescape View File

@ -23,8 +23,8 @@
#include <Plasma/Theme> #include <Plasma/Theme>
#include <QTimer> #include <QTimer>
#include "plasmaquick/containmentview.h" #include <PlasmaQuick/ContainmentView>
#include "plasmaquick/configview.h" #include <PlasmaQuick/ConfigView>
class ShellCorona; class ShellCorona;

126
shell/plasmaquick/configmodel.h
Unescape View File

@ -1,126 +0,0 @@
/*
* Copyright 2013 Marco Martin <mart@kde.org>
* Copyright 2015 Eike Hein <hein@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef CONFIGMODEL_H
#define CONFIGMODEL_H
#include <QQmlListProperty>
#include <QAbstractListModel>
//
// W A R N I N G
// -------------
//
// This file is not part of the public Plasma API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
namespace Plasma
{
class Applet;
}
namespace PlasmaQuick
{
class ConfigPropertyMap;
class ConfigCategoryPrivate;
class ConfigModelPrivate;
class ConfigCategory;
/*
* This model contains all the possible config categories for a dialog,
* such as categories of the config dialog for an Applet
* TODO: it should probably become an import instead of a library?
*/
class ConfigModel : public QAbstractListModel
{
Q_OBJECT
Q_PROPERTY(QQmlListProperty<PlasmaQuick::ConfigCategory> categories READ categories CONSTANT)
Q_CLASSINFO("DefaultProperty", "categories")
Q_PROPERTY(int count READ count NOTIFY countChanged)
public:
enum Roles {
NameRole = Qt::UserRole + 1,
IconRole,
SourceRole,
PluginNameRole,
VisibleRole
};
ConfigModel(QObject *parent = 0);
~ConfigModel() override;
/**
* add a new category in the model
* @param ConfigCategory the new category
**/
void appendCategory(const QString &iconName, const QString &name,
const QString &path, const QString &pluginName);
void appendCategory(const QString &iconName, const QString &name,
const QString &path, const QString &pluginName, bool visible);
/**
* clears the model
**/
void clear();
void setApplet(Plasma::Applet *interface);
Plasma::Applet *applet() const;
int count()
{
return rowCount();
}
int rowCount(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &, int) const Q_DECL_OVERRIDE;
/**
* @param row the row for which the data will be returned
* @raturn the data of the specified row
**/
Q_INVOKABLE QVariant get(int row) const;
/**
* @return the categories of the model
**/
QQmlListProperty<ConfigCategory> categories();
Q_SIGNALS:
/**
* emitted when the count is changed
**/
void countChanged();
private:
friend class ConfigModelPrivate;
ConfigModelPrivate *const d;
};
}
#endif // multiple inclusion guard

92
shell/plasmaquick/configview.h
Unescape View File

@ -1,92 +0,0 @@
/*
* Copyright 2013 Marco Martin <mart@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef CONFIGVIEW_H
#define CONFIGVIEW_H
#include <QQuickView>
//
// W A R N I N G
// -------------
//
// This file is not part of the public Plasma API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
namespace Plasma
{
class Applet;
}
namespace PlasmaQuick
{
class ConfigViewPrivate;
class ConfigModel;
class ConfigView : public QQuickView
{
Q_OBJECT
Q_PROPERTY(PlasmaQuick::ConfigModel *configModel READ configModel CONSTANT)
Q_PROPERTY(QString appletGlobalShortcut READ appletGlobalShortcut WRITE setAppletGlobalShortcut NOTIFY appletGlobalShortcutChanged)
public:
/**
* @param applet the applet of this ConfigView
* @param parent the QWindow in which this ConfigView is parented to
**/
ConfigView(Plasma::Applet *applet, QWindow *parent = 0);
~ConfigView() override;
virtual void init();
Plasma::Applet *applet();
QString appletGlobalShortcut() const;
void setAppletGlobalShortcut(const QString &shortcut);
/**
* @return the ConfigModel of the ConfigView
**/
PlasmaQuick::ConfigModel *configModel() const;
Q_SIGNALS:
void appletGlobalShortcutChanged();
protected:
void hideEvent(QHideEvent *ev) override;
void resizeEvent(QResizeEvent *re) override;
private:
ConfigViewPrivate *const d;
Q_PRIVATE_SLOT(d, void updateMinimumWidth())
Q_PRIVATE_SLOT(d, void updateMinimumHeight())
Q_PRIVATE_SLOT(d, void updateMaximumWidth())
Q_PRIVATE_SLOT(d, void updateMaximumHeight())
};
}
#endif // multiple inclusion guard

135
shell/plasmaquick/containmentview.h
Unescape View File

@ -1,135 +0,0 @@
/*
* Copyright 2012 Marco Martin <mart@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef PLASMAQUICKCONTAINMENTVIEW_H
#define PLASMAQUICKCONTAINMENTVIEW_H
#include <kquickaddons/quickviewsharedengine.h>
#include "plasma/corona.h"
#include "plasma/containment.h"
//
// W A R N I N G
// -------------
//
// This file is not part of the public Plasma API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
namespace PlasmaQuick
{
class ContainmentViewPrivate;
class ContainmentView : public KQuickAddons::QuickViewSharedEngine
{
Q_OBJECT
Q_PROPERTY(Plasma::Types::Location location READ location WRITE setLocation NOTIFY locationChanged)
Q_PROPERTY(Plasma::Types::FormFactor formFactor READ formFactor NOTIFY formFactorChanged)
Q_PROPERTY(QRectF screenGeometry READ screenGeometry NOTIFY screenGeometryChanged)
public:
/**
* @param corona the corona of this view
* @param parent the QWindow this ContainmentView is parented to
**/
explicit ContainmentView(Plasma::Corona *corona, QWindow *parent = 0);
~ContainmentView() override;
/**
* @return the corona of this view
**/
Plasma::Corona *corona() const;
/**
* @return the KConfigGroup of this view
**/
virtual KConfigGroup config() const;
/**
* sets the containment for this view
* @param cont the containment of this view
**/
void setContainment(Plasma::Containment *cont);
/**
* @return the containment of this ContainmentView
**/
Plasma::Containment *containment() const;
/**
* @return the location of this ContainmentView
**/
Plasma::Types::Location location() const;
/**
* Sets the location of the ContainmentView
* @param location the location of the ContainmentView
**/
void setLocation(Plasma::Types::Location location);
/**
* @return the formfactor of the ContainmentView
**/
Plasma::Types::FormFactor formFactor() const;
/**
* @return the screenGeometry of the ContainmentView
**/
QRectF screenGeometry();
protected Q_SLOTS:
/**
* It will be called when the configuration is requested
*/
virtual void showConfigurationInterface(Plasma::Applet *applet);
Q_SIGNALS:
/**
* emitted when the location is changed
**/
void locationChanged(Plasma::Types::Location location);
/**
* emitted when the formfactor is changed
**/
void formFactorChanged(Plasma::Types::FormFactor formFactor);
/**
* emitted when the containment is changed
**/
void containmentChanged();
/**
* emitted when the screenGeometry is changed
**/
void screenGeometryChanged();
private:
ContainmentViewPrivate *const d;
Q_PRIVATE_SLOT(d, void updateDestroyed(bool))
friend class ContainmentViewPrivate;
};
}
#endif // CONTAINMENTVIEW_H

1
shell/shellcorona.cpp
Unescape View File

@ -61,7 +61,6 @@
#include "desktopview.h" #include "desktopview.h"
#include "panelview.h" #include "panelview.h"
#include "scripting/scriptengine.h" #include "scripting/scriptengine.h"
#include "plasmaquick/configview.h"
#include "shellmanager.h" #include "shellmanager.h"
#include "osd.h" #include "osd.h"
#include "screenpool.h" #include "screenpool.h"

3
shell/standaloneappcorona.cpp
Unescape View File

@ -21,8 +21,11 @@
#include "standaloneappcorona.h" #include "standaloneappcorona.h"
#include "desktopview.h" #include "desktopview.h"
#include "panelview.h"
#include <QDebug> #include <QDebug>
#include <QAction> #include <QAction>
#include <QQuickItem>
#include <kactivities/consumer.h> #include <kactivities/consumer.h>
#include <KActionCollection> #include <KActionCollection>

Write Preview
Loading…
Cancel
Save