feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Move EventFilteringMainWindow to utils

Browse Source 
Also rename it to AppMainWindow. We add some more functionality to
it in following patches.

Change-Id: I752ccd07759eaaf6a2e96ec758e35b595bf788a2
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
Kai Koehne
2012-03-13 16:20:06 +01:00
parent 254185c4ea
commit a2d3d7f3bf
8 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/coreplugin.pro
View File

@@ -75,7 +75,6 @@ SOURCES += mainwindow.cpp \
dialogs/ioptionspage.cpp \
dialogs/iwizard.cpp \
settingsdatabase.cpp \
eventfilteringmainwindow.cpp \
imode.cpp \
editormanager/systemeditor.cpp \
designmode.cpp \
@@ -170,7 +169,6 @@ HEADERS += mainwindow.h \
fileiconprovider.h \
mimedatabase.h \
settingsdatabase.h \
eventfilteringmainwindow.h \
editormanager/systemeditor.h \
designmode.h \
editortoolbar.h \

2
src/plugins/coreplugin/coreplugin.qbs
View File

@@ -46,8 +46,6 @@ QtcPlugin {
"editmode.h",
"editortoolbar.cpp",
"editortoolbar.h",
"eventfilteringmainwindow.cpp",
"eventfilteringmainwindow.h",
"externaltool.cpp",
"externaltool.h",
"externaltoolmanager.h",

85
src/plugins/coreplugin/eventfilteringmainwindow.cpp
View File

@@ -1,85 +0,0 @@
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
**
** GNU Lesser General Public License Usage
**
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this file.
** Please review the following information to ensure the GNU Lesser General
** Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** Other Usage
**
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#include "eventfilteringmainwindow.h"
#ifdef Q_OS_WIN
#include <windows.h>
#endif
#include <QtDebug>
#include <QEvent>
#include <QCoreApplication>
namespace Core {
namespace Internal {
/* The notification signal is delayed by using a custom event
* as otherwise device removal is not detected properly
* (devices are still present in the registry. */
class DeviceNotifyEvent : public QEvent {
public:
explicit DeviceNotifyEvent(int id) : QEvent(static_cast<QEvent::Type>(id)) {}
};
EventFilteringMainWindow::EventFilteringMainWindow() :
m_deviceEventId(QEvent::registerEventType(QEvent::User + 2))
{
}
#ifdef Q_OS_WIN
bool EventFilteringMainWindow::event(QEvent *event)
{
if (event->type() == m_deviceEventId) {
event->accept();
emit deviceChange();
return true;
}
return QMainWindow::event(event);
}
bool EventFilteringMainWindow::winEvent(MSG *msg, long *result)
{
if (msg->message == WM_DEVICECHANGE) {
if (msg->wParam & 0x7 /* DBT_DEVNODES_CHANGED */) {
*result = TRUE;
QCoreApplication::postEvent(this, new DeviceNotifyEvent(m_deviceEventId));
}
}
return false;
}
#endif
} // namespace Internal
} // namespace Core

72
src/plugins/coreplugin/eventfilteringmainwindow.h
View File

@@ -1,72 +0,0 @@
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
**
** GNU Lesser General Public License Usage
**
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this file.
** Please review the following information to ensure the GNU Lesser General
** Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** Other Usage
**
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
** If you have questions regarding the use of this file, please contact
** Nokia at qt-info@nokia.com.
**
**************************************************************************/
#ifndef EVENTFILTERINGMAINWINDOW_H
#define EVENTFILTERINGMAINWINDOW_H
#include <QMainWindow>
QT_BEGIN_NAMESPACE
QT_END_NAMESPACE
namespace Core {
namespace Internal {
/*!
* This class only exists because we can't include windows.h in mainwindow.cpp
* because windows defines an IContext...
*/
class EventFilteringMainWindow : public QMainWindow
{
Q_OBJECT
public:
EventFilteringMainWindow();
signals:
void deviceChange();
#ifdef Q_OS_WIN
protected:
virtual bool winEvent(MSG *message, long *result);
virtual bool event(QEvent *event);
#endif
private:
const int m_deviceEventId;
};
} // Internal
} // Core
#endif // EVENTFILTERINGMAINWINDOW_H

2
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -126,7 +126,7 @@ using namespace Core::Internal;
enum { debugMainWindow = 0 };
MainWindow::MainWindow() :
EventFilteringMainWindow(),
Utils::AppMainWindow(),
m_coreImpl(new ICore(this)),
m_additionalContexts(Constants::C_GLOBAL),
m_settings(ExtensionSystem::PluginManager::instance()->settings()),

5
src/plugins/coreplugin/mainwindow.h
View File

@@ -33,10 +33,11 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
#include "eventfilteringmainwindow.h"
#include "icontext.h"
#include "icore.h"
#include <utils/appmainwindow.h>
#include <QMap>
#include <QColor>
@@ -80,7 +81,7 @@ class StatusBarManager;
class VersionDialog;
class SystemEditor;
class MainWindow : public EventFilteringMainWindow
class MainWindow : public Utils::AppMainWindow
{
Q_OBJECT