Commit 06762b4c authored by hjk's avatar hjk
Browse files

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

parents 01933445 55c55d52
......@@ -388,15 +388,20 @@ QPixmap ManhattanStyle::standardPixmap(StandardPixmap standardPixmap, const QSty
int ManhattanStyle::styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget,
QStyleHintReturn *returnData) const
{
int ret = 0;
int ret = d->style->styleHint(hint, option, widget, returnData);
switch (hint) {
// Make project explorer alternate rows all the way
case QStyle::SH_ItemView_PaintAlternatingRowColorsForEmptyArea:
if (widget && widget->property("AlternateEmpty").toBool())
ret = true;
break;
case QStyle::SH_EtchDisabledText:
ret = false; // We really should only enforce this for panel widgets
if (panelWidget(widget))
ret = false;
break;
default:
ret = d->style->styleHint(hint, option, widget, returnData);
break;
}
return ret;
}
......
......@@ -5,6 +5,7 @@ Including cpp.pri in designer.pro enables them and defines
CPP_ENABLED.
Resource handling:
------------------
When the editor is opened for the ui file we remember the internal qrc list
read from the ui file (m_originalUiQrcPaths). In next step (a call to
......@@ -35,3 +36,11 @@ designer's internal file watcher updates the changes to qrc files silently.
A call to setResourceEditingEnabled(false) removes the edit resources action
form resource browser in designer
Building
--------
The plugin accesses some private headers of Qt Designer 4.5.
Copies of them are located in qt_private to achieve a clean build
from a standard Qt distribution. The script syncqtheader.sh
can be used to update them.
......@@ -48,11 +48,11 @@
#include <utils/qtcassert.h>
#include <QtDesigner/QDesignerFormEditorPluginInterface>
#include <QtDesigner/private/pluginmanager_p.h>
#include <qt_private/pluginmanager_p.h>
#include <QtDesigner/private/iconloader_p.h> // createIconSet
#include <QtDesigner/private/qdesigner_formwindowmanager_p.h>
#include <QtDesigner/private/formwindowbase_p.h>
#include <qt_private/iconloader_p.h> // createIconSet
#include <qt_private/qdesigner_formwindowmanager_p.h>
#include <qt_private/formwindowbase_p.h>
#include <QtDesigner/QDesignerFormEditorInterface>
#include <QtDesigner/QDesignerComponents>
......
......@@ -34,7 +34,7 @@
#include "formtemplatewizardpage.h"
#include "formeditorw.h"
#include <QtDesigner/private/abstractnewformwidget_p.h>
#include <qt_private/abstractnewformwidget_p.h>
#include <QtCore/QDebug>
#include <QtCore/QXmlStreamReader>
......
......@@ -45,8 +45,8 @@
#include <QtDesigner/QDesignerFormWindowInterface>
#include <QtDesigner/QDesignerFormEditorInterface>
#include <QtDesigner/QDesignerFormWindowManagerInterface>
#include <QtDesigner/private/formwindowbase_p.h>
#include <QtDesigner/private/qtresourcemodel_p.h>
#include <qt_private/formwindowbase_p.h>
#include <qt_private/qtresourcemodel_p.h>
#include <QtCore/QFile>
#include <QtCore/QDir>
......
/***************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Qt Software Information (qt-info@nokia.com)
**
**
** Non-Open Source Usage
**
** Licensees may use this file in accordance with the Qt Beta Version
** License Agreement, Agreement version 2.2 provided with the Software or,
** alternatively, in accordance with the terms contained in a written
** agreement between you and Nokia.
**
** GNU General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU General
** Public License versions 2.0 or 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the packaging
** of this file. Please review the following information to ensure GNU
** General Public Licensing requirements will be met:
**
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** http://www.gnu.org/copyleft/gpl.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt GPL Exception
** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists for the convenience
// of Qt Designer. This header
// file may change from version to version without notice, or even be removed.
//
// We mean it.
//
#ifndef ABSTRACTNEWFORMWIDGET_H
#define ABSTRACTNEWFORMWIDGET_H
#include <QtDesigner/sdk_global.h>
#include <QtGui/QWidget>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QDesignerFormEditorInterface;
class QDESIGNER_SDK_EXPORT QDesignerNewFormWidgetInterface : public QWidget
{
Q_DISABLE_COPY(QDesignerNewFormWidgetInterface)
Q_OBJECT
public:
explicit QDesignerNewFormWidgetInterface(QWidget *parent = 0);
virtual ~QDesignerNewFormWidgetInterface();
virtual bool hasCurrentTemplate() const = 0;
virtual QString currentTemplate(QString *errorMessage = 0) = 0;
static QDesignerNewFormWidgetInterface *createNewFormWidget(QDesignerFormEditorInterface *core, QWidget *parent = 0);
Q_SIGNALS:
void templateActivated();
void currentTemplateChanged(bool templateSelected);
};
QT_END_NAMESPACE
QT_END_HEADER
#endif // ABSTRACTNEWFORMWIDGET_H
/***************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Qt Software Information (qt-info@nokia.com)
**
**
** Non-Open Source Usage
**
** Licensees may use this file in accordance with the Qt Beta Version
** License Agreement, Agreement version 2.2 provided with the Software or,
** alternatively, in accordance with the terms contained in a written
** agreement between you and Nokia.
**
** GNU General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU General
** Public License versions 2.0 or 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the packaging
** of this file. Please review the following information to ensure GNU
** General Public Licensing requirements will be met:
**
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** http://www.gnu.org/copyleft/gpl.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt GPL Exception
** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists for the convenience
// of Qt Designer. This header
// file may change from version to version without notice, or even be removed.
//
// We mean it.
//
#ifndef ABSTRACTOPTIONSPAGE_P_H
#define ABSTRACTOPTIONSPAGE_P_H
#include <QtDesigner/sdk_global.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QString;
class QWidget;
class QDESIGNER_SDK_EXPORT QDesignerOptionsPageInterface
{
public:
virtual ~QDesignerOptionsPageInterface() {}
virtual QString name() const = 0;
virtual QWidget *createPage(QWidget *parent) = 0;
virtual void apply() = 0;
virtual void finish() = 0;
};
QT_END_NAMESPACE
QT_END_HEADER
#endif // ABSTRACTOPTIONSPAGE_P_H
/***************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Qt Software Information (qt-info@nokia.com)
**
**
** Non-Open Source Usage
**
** Licensees may use this file in accordance with the Qt Beta Version
** License Agreement, Agreement version 2.2 provided with the Software or,
** alternatively, in accordance with the terms contained in a written
** agreement between you and Nokia.
**
** GNU General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU General
** Public License versions 2.0 or 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the packaging
** of this file. Please review the following information to ensure GNU
** General Public Licensing requirements will be met:
**
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** http://www.gnu.org/copyleft/gpl.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt GPL Exception
** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists for the convenience
// of Qt Designer. This header
// file may change from version to version without notice, or even be removed.
//
// We mean it.
//
#ifndef ABSTRACTSETTINGS_P_H
#define ABSTRACTSETTINGS_P_H
#include <QtDesigner/sdk_global.h>
#include <QVariant>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
class QString;
/*!
To be implemented by IDEs that want to control the way designer retrieves/stores its settings.
*/
class QDESIGNER_SDK_EXPORT QDesignerSettingsInterface
{
public:
virtual ~QDesignerSettingsInterface() {}
virtual void beginGroup(const QString &prefix) = 0;
virtual void endGroup() = 0;
virtual bool contains(const QString &key) const = 0;
virtual void setValue(const QString &key, const QVariant &value) = 0;
virtual QVariant value(const QString &key, const QVariant &defaultValue = QVariant()) const = 0;
virtual void remove(const QString &key) = 0;
};
QT_END_NAMESPACE
QT_END_HEADER
#endif // ABSTRACTSETTINGS_P_H
/***************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Qt Software Information (qt-info@nokia.com)
**
**
** Non-Open Source Usage
**
** Licensees may use this file in accordance with the Qt Beta Version
** License Agreement, Agreement version 2.2 provided with the Software or,
** alternatively, in accordance with the terms contained in a written
** agreement between you and Nokia.
**
** GNU General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU General
** Public License versions 2.0 or 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the packaging
** of this file. Please review the following information to ensure GNU
** General Public Licensing requirements will be met:
**
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** http://www.gnu.org/copyleft/gpl.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt GPL Exception
** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists for the convenience
// of Qt Designer. This header
// file may change from version to version without notice, or even be removed.
//
// We mean it.
//
#ifndef FORMWINDOWBASE_H
#define FORMWINDOWBASE_H
#include "shared_global_p.h"
#include <QtDesigner/QDesignerFormWindowInterface>
#include <QtCore/QVariantMap>
#include <QtCore/QList>
QT_BEGIN_NAMESPACE
class QDesignerDnDItemInterface;
class QMenu;
class QtResourceSet;
class QDesignerPropertySheet;
namespace qdesigner_internal {
class QEditorFormBuilder;
class DeviceProfile;
class Grid;
class DesignerPixmapCache;
class DesignerIconCache;
class FormWindowBasePrivate;
class QDESIGNER_SHARED_EXPORT FormWindowBase: public QDesignerFormWindowInterface
{
Q_OBJECT
public:
enum HighlightMode { Restore, Highlight };
enum SaveResourcesBehaviour { SaveAll, SaveOnlyUsedQrcFiles, DontSaveQrcFiles };
explicit FormWindowBase(QDesignerFormEditorInterface *core, QWidget *parent = 0, Qt::WindowFlags flags = 0);
virtual ~FormWindowBase();
QVariantMap formData();
void setFormData(const QVariantMap &vm);
// Return the widget containing the form. This is used to
// apply embedded design settings to that are inherited (for example font).
// These are meant to be applied to the form only and not to the other editors
// in the widget stack.
virtual QWidget *formContainer() const = 0;
// Deprecated
virtual QPoint grid() const;
// Deprecated
virtual void setGrid(const QPoint &grid);
virtual bool hasFeature(Feature f) const;
virtual Feature features() const;
virtual void setFeatures(Feature f);
const Grid &designerGrid() const;
void setDesignerGrid(const Grid& grid);
bool hasFormGrid() const;
void setHasFormGrid(bool b);
bool gridVisible() const;
SaveResourcesBehaviour saveResourcesBehaviour() const;
void setSaveResourcesBehaviour(SaveResourcesBehaviour behaviour);
static const Grid &defaultDesignerGrid();
static void setDefaultDesignerGrid(const Grid& grid);
// Overwrite to initialize and return a full popup menu for a managed widget
virtual QMenu *initializePopupMenu(QWidget *managedWidget);
// Helper to create a basic popup menu from task menu extensions (internal/public)
static QMenu *createExtensionTaskMenu(QDesignerFormWindowInterface *fw, QObject *o, bool trailingSeparator = true);
virtual bool dropWidgets(const QList<QDesignerDnDItemInterface*> &item_list, QWidget *target,
const QPoint &global_mouse_pos) = 0;
// Helper to find the widget at the mouse position with some flags.
enum WidgetUnderMouseMode { FindSingleSelectionDropTarget, FindMultiSelectionDropTarget };
QWidget *widgetUnderMouse(const QPoint &formPos, WidgetUnderMouseMode m);
virtual QWidget *widgetAt(const QPoint &pos) = 0;
virtual QWidget *findContainer(QWidget *w, bool excludeLayout) const = 0;
void deleteWidgetList(const QWidgetList &widget_list);
virtual void highlightWidget(QWidget *w, const QPoint &pos, HighlightMode mode = Highlight) = 0;
enum PasteMode { PasteAll, PasteActionsOnly };
virtual void paste(PasteMode pasteMode) = 0;
// Factory method to create a form builder
virtual QEditorFormBuilder *createFormBuilder() = 0;
virtual bool blockSelectionChanged(bool blocked) = 0;
virtual void emitSelectionChanged() = 0;
DesignerPixmapCache *pixmapCache() const;
DesignerIconCache *iconCache() const;
QtResourceSet *resourceSet() const;
void setResourceSet(QtResourceSet *resourceSet);
void addReloadableProperty(QDesignerPropertySheet *sheet, int index);
void removeReloadableProperty(QDesignerPropertySheet *sheet, int index);
void addReloadablePropertySheet(QDesignerPropertySheet *sheet, QObject *object);
void removeReloadablePropertySheet(QDesignerPropertySheet *sheet);
void reloadProperties();
void emitWidgetRemoved(QWidget *w);
void emitObjectRemoved(QObject *o);
DeviceProfile deviceProfile() const;
QString styleName() const;
QString deviceProfileName() const;
enum LineTerminatorMode {
LFLineTerminator,
CRLFLineTerminator,
NativeLineTerminator =
#if defined (Q_OS_WIN)
CRLFLineTerminator
#else
LFLineTerminator
#endif
};
void setLineTerminatorMode(LineTerminatorMode mode);
LineTerminatorMode lineTerminatorMode() const;
// Connect the 'activated' (doubleclicked) signal of the form window to a
// slot triggering the default action (of the task menu)
static void setupDefaultAction(QDesignerFormWindowInterface *fw);
public slots:
void resourceSetActivated(QtResourceSet *resourceSet, bool resourceSetChanged);
private slots:
void triggerDefaultAction(QWidget *w);
private:
void syncGridFeature();
FormWindowBasePrivate *m_d;
};
} // namespace qdesigner_internal
QT_END_NAMESPACE
#endif // FORMWINDOWBASE_H
/***************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Qt Software Information (qt-info@nokia.com)
**
**
** Non-Open Source Usage
**
** Licensees may use this file in accordance with the Qt Beta Version
** License Agreement, Agreement version 2.2 provided with the Software or,
** alternatively, in accordance with the terms contained in a written
** agreement between you and Nokia.
**
** GNU General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU General
** Public License versions 2.0 or 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the packaging
** of this file. Please review the following information to ensure GNU
** General Public Licensing requirements will be met:
**
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
** http://www.gnu.org/copyleft/gpl.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt GPL Exception
** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
**
***************************************************************************/
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists for the convenience
// of Qt Designer. This header
// file may change from version to version without notice, or even be removed.
//
// We mean it.
//
#ifndef ICONLOADER_H
#define ICONLOADER_H
#include "shared_global_p.h"
QT_BEGIN_NAMESPACE
class QString;
class QIcon;
namespace qdesigner_internal {
QDESIGNER_SHARED_EXPORT QIcon createIconSet(const QString &name);
QDESIGNER_SHARED_EXPORT QIcon emptyIcon();
} // namespace qdesigner_internal
QT_END_NAMESPACE
#endif // ICONLOADER_H
/***************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Qt Software Information (qt-info@nokia.com)
**
**
** Non-Open Source Usage
**
** Licensees may use this file in accordance with the Qt Beta Version
** License Agreement, Agreement version 2.2 provided with the Software or,
** alternatively, in accordance with the terms contained in a written
** agreement between you and Nokia.
**
** GNU General Public License Usage
**
** Alternatively, this file may be used under the terms of the GNU General
** Public License versions 2.0 or 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the packaging
** of this file. Please review the following information to ensure GNU
** General Public Licensing requirements will be met:
**
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and