~saviq/qtubuntu/remove-content-hub-and-ual-gles

« back to all changes in this revision

Viewing changes to src/ubuntuappmenu/menuregistrar.h

Committer: Gerry Boland
Date: 2017-08-03 14:59:07 UTC
mfrom: (391.1.8 qtubuntu)
Revision ID: gerry.boland@canonical.com-20170803145907-w1vuhqxz2s6z001x

Merge papi-cleanup and fix

files removed:
debian/qtubuntu-appmenutheme.install

src/ubuntuappmenu

src/ubuntuappmenu/com.ubuntu.MenuRegistrar.xml

src/ubuntuappmenu/gmenumodelexporter.cpp

src/ubuntuappmenu/gmenumodelexporter.h

src/ubuntuappmenu/gmenumodelplatformmenu.cpp

src/ubuntuappmenu/gmenumodelplatformmenu.h

src/ubuntuappmenu/logging.h

src/ubuntuappmenu/menuregistrar.cpp

src/ubuntuappmenu/menuregistrar.h

src/ubuntuappmenu/qtubuntuextraactionhandler.cpp

src/ubuntuappmenu/qtubuntuextraactionhandler.h

src/ubuntuappmenu/registry.cpp

src/ubuntuappmenu/registry.h

src/ubuntuappmenu/theme.cpp

src/ubuntuappmenu/theme.h

src/ubuntuappmenu/themeplugin.cpp

src/ubuntuappmenu/themeplugin.h

src/ubuntuappmenu/ubuntuappmenu.json

src/ubuntuappmenu/ubuntuappmenu.pro

src/ubuntumirclient/qmirclientplatformservices.cpp

src/ubuntumirclient/qmirclientplatformservices.h

files modified:
debian/control

debian/rules

src/src.pro

src/ubuntumirclient/qmirclientcursor.cpp

src/ubuntumirclient/qmirclientinput.cpp

src/ubuntumirclient/qmirclientintegration.cpp

src/ubuntumirclient/qmirclientintegration.h

src/ubuntumirclient/qmirclientwindow.cpp

src/ubuntumirclient/ubuntumirclient.pro

Show diffs side-by-side

added added

removed removed

src/ubuntuappmenu/menuregistrar.h

* This program is free software: you can redistribute it and/or modify it under

* the terms of the GNU Lesser General Public License version 3, as published by

* the Free Software Foundation.

* This program is distributed in the hope that it will be useful, but WITHOUT

* ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

* SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

* Lesser General Public License for more details.

* You should have received a copy of the GNU Lesser General Public License

* along with this program. If not, see <http://www.gnu.org/licenses/>.

#ifndef MENUREGISTRAR_H

#define MENUREGISTRAR_H

#include <QObject>

#include <QWindow>

#include <QPointer>

#include <QDBusObjectPath>

#include <gio/gio.h>

class UbuntuMenuRegistrar : public QObject

{

Q_OBJECT

public:

UbuntuMenuRegistrar();

~UbuntuMenuRegistrar();

void registerMenuForWindow(QWindow* window, const QDBusObjectPath& path);

void unregisterMenu();

private Q_SLOTS:

void registerSurfaceMenu();

void onRegistrarServiceChanged();

private:

void registerMenu();

void registerApplicationMenu();

void unregisterApplicationMenu();

void unregisterSurfaceMenu();

GDBusConnection *m_connection;

QString m_service;

QDBusObjectPath m_path;

QPointer<QWindow> m_window;

QString m_registeredSurfaceId;

pid_t m_registeredProcessId;

};

#endif // MENUREGISTRAR_H

Older »