Commit 4274156b authored by dt's avatar dt

Refactoring: Split up qtversionmanager.(h|cpp) into two files

QtOptionsPage now has its own page.
parent 66868d47
......@@ -57,6 +57,7 @@
#include "sessiondialog.h"
#include "buildparserfactory.h"
#include "qtversionmanager.h"
#include "qtoptionspage.h"
#include <coreplugin/basemode.h>
#include <coreplugin/coreconstants.h>
......
......@@ -54,12 +54,13 @@ HEADERS += projectexplorer.h \
projectmodels.h \
currentprojectfind.h \
toolchain.h \
cesdkhandler.h\
buildparserfactory.h\
gccparser.h\
msvcparser.h\
filewatcher.h\
qtversionmanager.h
cesdkhandler.h \
buildparserfactory.h \
gccparser.h \
msvcparser.h \
filewatcher.h \
qtversionmanager.h \
qtoptionspage.h
SOURCES += projectexplorer.cpp \
projectwindow.cpp \
buildmanager.cpp \
......@@ -102,12 +103,13 @@ SOURCES += projectexplorer.cpp \
projectmodels.cpp \
currentprojectfind.cpp \
toolchain.cpp \
cesdkhandler.cpp\
cesdkhandler.cpp \
buildparserfactory.cpp \
gccparser.cpp\
msvcparser.cpp\
filewatcher.cpp\
qtversionmanager.cpp
gccparser.cpp \
msvcparser.cpp \
filewatcher.cpp \
qtversionmanager.cpp \
qtoptionspage.cpp
FORMS += dependenciespanel.ui \
buildsettingspropertiespage.ui \
processstep.ui \
......@@ -116,8 +118,8 @@ FORMS += dependenciespanel.ui \
sessiondialog.ui \
projectwizardpage.ui \
buildstepspage.ui \
removefiledialog.ui\
qtversionmanager.ui\
removefiledialog.ui \
qtversionmanager.ui \
showbuildlog.ui
win32 {
SOURCES += applicationlauncher_win.cpp \
......@@ -127,5 +129,4 @@ win32 {
else:unix:SOURCES += applicationlauncher_x11.cpp
RESOURCES += projectexplorer.qrc
DEFINES += PROJECTEXPLORER_LIBRARY
OTHER_FILES += ProjectExplorer.pluginspec
This diff is collapsed.
/**************************************************************************
**
** This file is part of Qt Creator
**
** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
**
** Contact: Qt Software Information (qt-info@nokia.com)
**
** Commercial Usage
**
** Licensees holding valid Qt Commercial licenses may use this file in
** accordance with the Qt Commercial License Agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Nokia.
**
** GNU Lesser General Public License Usage
**
** Alternatively, 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.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
**
**************************************************************************/
#ifndef QTOPTIONSPAGE_H
#define QTOPTIONSPAGE_H
#include <coreplugin/dialogs/ioptionspage.h>
#include <QtGui/QWidget>
QT_BEGIN_NAMESPACE
class QTreeWidgetItem;
QT_END_NAMESPACE
namespace ProjectExplorer {
class QtVersion;
namespace Internal {
namespace Ui {
class QtVersionManager;
}
class QtDirWidget : public QWidget
{
Q_OBJECT
public:
QtDirWidget(QWidget *parent, QList<QtVersion *> versions, QtVersion *defaultVersion);
~QtDirWidget();
QList<QtVersion *> versions() const;
int defaultVersion() const;
void finish();
private:
void showEnvironmentPage(QTreeWidgetItem * item);
void fixQtVersionName(int index);
int indexForWidget(QWidget *debuggingHelperWidget) const;
Internal::Ui::QtVersionManager *m_ui;
QList<QtVersion *> m_versions;
int m_defaultVersion;
QString m_specifyNameString;
QString m_specifyPathString;
private slots:
void versionChanged(QTreeWidgetItem *item, QTreeWidgetItem *old);
void addQtDir();
void removeQtDir();
void updateState();
void makeMingwVisible(bool visible);
void onQtBrowsed();
void onMingwBrowsed();
void defaultChanged(int index);
void updateCurrentQtName();
void updateCurrentQtPath();
void updateCurrentMingwDirectory();
void msvcVersionChanged();
void buildDebuggingHelper();
void showDebuggingBuildLog();
};
class QtOptionsPage : public Core::IOptionsPage
{
Q_OBJECT
public:
QtOptionsPage();
~QtOptionsPage();
QString id() const;
QString trName() const;
QString category() const;
QString trCategory() const;
QWidget *createPage(QWidget *parent);
void apply();
void finish() { }
private:
QtDirWidget *m_widget;
};
} //namespace Internal
} //namespace ProjectExplorer
#endif // QTOPTIONSPAGE_H
......@@ -30,28 +30,21 @@
#ifndef QTVERSIONMANAGER_H
#define QTVERSIONMANAGER_H
#include "projectexplorer.h"
#include "environment.h"
#include "toolchain.h"
#include "projectexplorer_export.h"
#include <coreplugin/dialogs/ioptionspage.h>
#include <QtCore/QPointer>
#include <QtGui/QWidget>
#include <QtGui/QPushButton>
#include <QtCore/QHash>
namespace ProjectExplorer {
namespace Internal {
namespace Ui {
class QtVersionManager;
}
}
class QtDirWidget;
}
class PROJECTEXPLORER_EXPORT QtVersion
{
friend class QtDirWidget; //for changing name and path
friend class Internal::QtDirWidget; //for changing name and path
friend class QtVersionManager;
public:
QtVersion(const QString &name, const QString &path);
......@@ -130,44 +123,6 @@ private:
bool m_hasDebuggingHelper;
};
class QtDirWidget : public QWidget
{
Q_OBJECT
public:
QtDirWidget(QWidget *parent, QList<QtVersion *> versions, QtVersion *defaultVersion);
~QtDirWidget();
QList<QtVersion *> versions() const;
int defaultVersion() const;
void finish();
private:
void showEnvironmentPage(QTreeWidgetItem * item);
void fixQtVersionName(int index);
int indexForWidget(QWidget *debuggingHelperWidget) const;
Internal::Ui::QtVersionManager *m_ui;
QList<QtVersion *> m_versions;
int m_defaultVersion;
QString m_specifyNameString;
QString m_specifyPathString;
private slots:
void versionChanged(QTreeWidgetItem *item, QTreeWidgetItem *old);
void addQtDir();
void removeQtDir();
void updateState();
void makeMingwVisible(bool visible);
void onQtBrowsed();
void onMingwBrowsed();
void defaultChanged(int index);
void updateCurrentQtName();
void updateCurrentQtPath();
void updateCurrentMingwDirectory();
void msvcVersionChanged();
void buildDebuggingHelper();
void showDebuggingBuildLog();
};
class PROJECTEXPLORER_EXPORT QtVersionManager : public QObject
{
Q_OBJECT
......@@ -213,22 +168,6 @@ private:
int m_idcount;
};
class PROJECTEXPLORER_EXPORT QtOptionsPage : public Core::IOptionsPage
{
Q_OBJECT
public:
QtOptionsPage();
~QtOptionsPage();
QString id() const;
QString trName() const;
QString category() const;
QString trCategory() const;
QWidget *createPage(QWidget *parent);
void apply();
void finish() { }
private:
QtDirWidget *m_widget;
};
} // namespace ProjectExplorer
#endif // QTVERSIONMANAGER_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment