diff options
15 files changed, 0 insertions, 372 deletions
diff --git a/share/qtcreator/welcomescreen/gettingstarted.qml b/share/qtcreator/welcomescreen/gettingstarted.qml deleted file mode 100644 index cf77902554..0000000000 --- a/share/qtcreator/welcomescreen/gettingstarted.qml +++ /dev/null @@ -1,161 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of Qt Creator. -** -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** 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. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -import QtQuick 2.1 -import widgets 1.0 - -Rectangle { - id: gettingStartedRoot - width: 920 - height: 600 - - PageCaption { - id: pageCaption - - x: 32 - y: 8 - - anchors.rightMargin: 16 - anchors.right: parent.right - anchors.leftMargin: 16 - anchors.left: parent.left - - caption: qsTr("Getting Started") - } - - Item { - id: canvas - - width: 920 - height: 200 - - anchors.horizontalCenter: parent.horizontalCenter - anchors.top: parent.top - anchors.topMargin: 0 - - GettingStartedItem { - x: 688 - y: 83 - - anchors.rightMargin: 32 - anchors.right: parent.right - - description: qsTr("To select a tutorial and learn how to develop applications.") - title: qsTr("Start Developing") - number: 4 - imageUrl: "widgets/images/gettingStarted04.png" - onClicked: tab.currentIndex = 3; - - } - - GettingStartedItem { - x: 468 - y: 83 - - description: qsTr("To check that the Qt SDK installation was successful, open an example application and run it.") - title: qsTr("Building and Running an Example Application") - number: 3 - imageUrl: "widgets/images/gettingStarted03.png" - onClicked: gettingStarted.openSplitHelp("qthelp://org.qt-project.qtcreator/doc/creator-build-example-application.html") - } - - GettingStartedItem { - id: gettingStartedItem - - x: 30 - y: 83 - - imageUrl: "widgets/images/gettingStarted01.png" - title: qsTr("IDE Overview") - description: qsTr("To find out what kind of integrated environment (IDE) Qt Creator is.") - number: 1 - - onClicked: gettingStarted.openHelp("qthelp://org.qt-project.qtcreator/doc/creator-overview.html") - } - - GettingStartedItem { - x: 250 - y: 83 - - description: qsTr("To become familiar with the parts of the Qt Creator user interface and to learn how to use them.") - title: qsTr("User Interface") - imageUrl: "widgets/images/gettingStarted02.png" - number: 2 - onClicked: gettingStarted.openHelp("qthelp://org.qt-project.qtcreator/doc/creator-quick-tour.html") - } - - Grid { - id: grid - - x: 36 - y: 424 - - spacing: 24 - - rows: gettingStartedRoot.height > 640 ? 3 : 1 - - IconAndLink { - iconName: "userguideIcon" - linkText: qsTr("User Guide") - onClicked: gettingStarted.openHelp("qthelp://org.qt-project.qtcreator/doc/index.html") - } - - IconAndLink { - iconName: "communityIcon" - linkText: qsTr("Online Community") - onClicked: gettingStarted.openUrl("http://qt-project.org/forums") - } - - IconAndLink { - iconName: "labsIcon" - linkText: qsTr("Blogs") - onClicked: gettingStarted.openUrl("http://planet.qt-project.org") - } - } - - Image { - x: 231 - y: 172 - source: "widgets/images/arrowBig.png" - } - - Image { - x: 451 - y: 172 - source: "widgets/images/arrowBig.png" - } - - Image { - x: 669 - y: 172 - source: "widgets/images/arrowBig.png" - } - - } -} diff --git a/share/qtcreator/welcomescreen/widgets/GettingStartedItem.qml b/share/qtcreator/welcomescreen/widgets/GettingStartedItem.qml deleted file mode 100644 index afa60d8914..0000000000 --- a/share/qtcreator/welcomescreen/widgets/GettingStartedItem.qml +++ /dev/null @@ -1,123 +0,0 @@ -import QtQuick 2.1 - -Item { - id: gettingStartedItem - width: 200 - height: 300 - - property alias title: titleText.text - property alias description: descriptionText.text - property int number: 1 - property alias imageUrl: image.source - - signal clicked - - Rectangle { - y: 170 - width: 20 - height: 20 - color: "#7383a7" - radius: 20 - anchors.left: parent.left - anchors.leftMargin: 8 - smooth: true - visible: false - - NativeText { - color: "#f7f7f7" - font.bold: true - text: gettingStartedItem.number - font.family: "Helvetica" - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - font.pixelSize: 15 - } - } - - NativeText { - id: titleText - y: 188 - color: colors.strongForegroundColor - wrapMode: Text.WordWrap - anchors.left: parent.left - anchors.leftMargin: 8 - anchors.right: parent.right - anchors.rightMargin: 8 - font: fonts.standardCaption - } - - NativeText { - id: descriptionText - y: 246 - height: 62 - color: "#828282" - anchors.bottom: parent.bottom - anchors.bottomMargin: 2 - anchors.right: parent.right - anchors.rightMargin: 8 - anchors.left: parent.left - anchors.leftMargin: 8 - horizontalAlignment: Text.AlignJustify - wrapMode: Text.WordWrap - font.pixelSize: 12 - font.bold: false - font.family: "Helvetica" - } - - Item { - id: item1 - y: 22 - width: 184 - height: 160 - anchors.right: parent.right - anchors.rightMargin: 8 - anchors.left: parent.left - anchors.leftMargin: 8 - - Image { - id: image - x: 0 - y: 0 - anchors.horizontalCenter: parent.horizontalCenter - anchors.verticalCenter: parent.verticalCenter - } - } - Rectangle { - id: border - color: "#00000000" - radius: 8 - visible: false - anchors.fill: parent - border.color: "#dddcdc" - anchors.margins: 4 - } - - MouseArea { - anchors.fill: parent - hoverEnabled: true - cursorShape: Qt.PointingHandCursor - onEntered: { - gettingStartedItem.state="hover" - } - - onExited: { - gettingStartedItem.state="" - } - - onClicked: { - gettingStartedItem.clicked(); - } - - } - - states: [ - State { - name: "hover" - - PropertyChanges { - target: border - visible: true - } - } - ] -} diff --git a/share/qtcreator/welcomescreen/widgets/IconAndLink.qml b/share/qtcreator/welcomescreen/widgets/IconAndLink.qml deleted file mode 100644 index f865f1e4a7..0000000000 --- a/share/qtcreator/welcomescreen/widgets/IconAndLink.qml +++ /dev/null @@ -1,26 +0,0 @@ -import QtQuick 2.1 -import widgets 1.0 - -Row { - id: root - - property string iconName - property string linkText - signal clicked - - spacing: 4 - - Image { - y: 10 - source: "images/icons/" + iconName +".png" - } - - LinkedText { - x: 19 - y: 5 - height: 38 - text: linkText - verticalAlignment: Text.AlignBottom - onClicked: root.clicked(); - } -} diff --git a/share/qtcreator/welcomescreen/widgets/images/gettingStarted01.png b/share/qtcreator/welcomescreen/widgets/images/gettingStarted01.png Binary files differdeleted file mode 100644 index b85aa3c797..0000000000 --- a/share/qtcreator/welcomescreen/widgets/images/gettingStarted01.png +++ /dev/null diff --git a/share/qtcreator/welcomescreen/widgets/images/gettingStarted02.png b/share/qtcreator/welcomescreen/widgets/images/gettingStarted02.png Binary files differdeleted file mode 100644 index 0371604e8f..0000000000 --- a/share/qtcreator/welcomescreen/widgets/images/gettingStarted02.png +++ /dev/null diff --git a/share/qtcreator/welcomescreen/widgets/images/gettingStarted03.png b/share/qtcreator/welcomescreen/widgets/images/gettingStarted03.png Binary files differdeleted file mode 100644 index 59e846787f..0000000000 --- a/share/qtcreator/welcomescreen/widgets/images/gettingStarted03.png +++ /dev/null diff --git a/share/qtcreator/welcomescreen/widgets/images/gettingStarted04.png b/share/qtcreator/welcomescreen/widgets/images/gettingStarted04.png Binary files differdeleted file mode 100644 index e62125a49a..0000000000 --- a/share/qtcreator/welcomescreen/widgets/images/gettingStarted04.png +++ /dev/null diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/feedbackIcon.png b/share/qtcreator/welcomescreen/widgets/images/icons/feedbackIcon.png Binary files differdeleted file mode 100644 index d4da180a0c..0000000000 --- a/share/qtcreator/welcomescreen/widgets/images/icons/feedbackIcon.png +++ /dev/null diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/labsIcon.png b/share/qtcreator/welcomescreen/widgets/images/icons/labsIcon.png Binary files differdeleted file mode 100644 index c1d8c857c9..0000000000 --- a/share/qtcreator/welcomescreen/widgets/images/icons/labsIcon.png +++ /dev/null diff --git a/share/qtcreator/welcomescreen/widgets/images/icons/userguideIcon.png b/share/qtcreator/welcomescreen/widgets/images/icons/userguideIcon.png Binary files differdeleted file mode 100644 index a598aaf848..0000000000 --- a/share/qtcreator/welcomescreen/widgets/images/icons/userguideIcon.png +++ /dev/null diff --git a/share/qtcreator/welcomescreen/widgets/qmldir b/share/qtcreator/welcomescreen/widgets/qmldir index 247b4b2853..f5bc065cc2 100644 --- a/share/qtcreator/welcomescreen/widgets/qmldir +++ b/share/qtcreator/welcomescreen/widgets/qmldir @@ -1,5 +1,4 @@ CustomColors 1.0 CustomColors.qml -GettingStartedItem 1.0 GettingStartedItem.qml ProjectItem 1.0 ProjectItem.qml CustomFonts 1.0 CustomFonts.qml LinkedText 1.0 LinkedText.qml @@ -16,7 +15,6 @@ Sessions 1.0 Sessions.qml Feedback 1.0 Feedback.qml PageLoader 1.0 PageLoader.qml ToolTip 1.0 ToolTip.qml -IconAndLink 1.0 IconAndLink.qml ComboBox 1.0 ComboBox.qml NativeText 1.0 NativeText.qml diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index 71286c838e..a514b0d3b0 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -205,42 +205,6 @@ private: QMutex m_mutex; }; -GettingStartedWelcomePage::GettingStartedWelcomePage() : m_engine(0) -{ - -} - -QUrl GettingStartedWelcomePage::pageLocation() const -{ - QString resourcePath = Core::ICore::resourcePath(); -#ifdef Q_OS_WIN - // normalize paths so QML doesn't freak out if it's wrongly capitalized on Windows - resourcePath = Utils::normalizePathName(resourcePath); -#endif - - return QUrl::fromLocalFile(resourcePath + QLatin1String("/welcomescreen/gettingstarted.qml")); -} - -QString GettingStartedWelcomePage::title() const -{ - return tr("Getting Started"); -} - -int GettingStartedWelcomePage::priority() const -{ - return 4; -} - -void GettingStartedWelcomePage::facilitateQml(QQmlEngine *engine) -{ - m_engine = engine; -} - -GettingStartedWelcomePage::Id GettingStartedWelcomePage::id() const -{ - return GettingStarted; -} - ExamplesWelcomePage::ExamplesWelcomePage() : m_engine(0), m_showExamples(false) { diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.h b/src/plugins/qtsupport/gettingstartedwelcomepage.h index 515cac9b5d..f18f290679 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.h +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.h @@ -43,24 +43,6 @@ namespace QtSupport { namespace Internal { class ExamplesListModel; -class GettingStartedWelcomePageWidget; - -class GettingStartedWelcomePage : public Utils::IWelcomePage -{ - Q_OBJECT - -public: - GettingStartedWelcomePage(); - QUrl pageLocation() const; - QString title() const; - int priority() const; - void facilitateQml(QQmlEngine *); - Id id() const; - -private: - QQmlEngine *m_engine; -}; - class ExamplesWelcomePage : public Utils::IWelcomePage { diff --git a/src/plugins/qtsupport/qtsupportplugin.cpp b/src/plugins/qtsupport/qtsupportplugin.cpp index 0813dd6949..7aae247e14 100644 --- a/src/plugins/qtsupport/qtsupportplugin.cpp +++ b/src/plugins/qtsupport/qtsupportplugin.cpp @@ -85,8 +85,6 @@ bool QtSupportPlugin::initialize(const QStringList &arguments, QString *errorMes welcomePage = new ExamplesWelcomePage; addAutoReleasedObject(welcomePage); - GettingStartedWelcomePage *gettingStartedWelcomePage = new GettingStartedWelcomePage; - addAutoReleasedObject(gettingStartedWelcomePage); #endif addAutoReleasedObject(new CustomExecutableRunConfigurationFactory); diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index e35787ab95..6b0b3bce48 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/src/plugins/welcome/welcomeplugin.cpp @@ -231,10 +231,6 @@ void WelcomeMode::initPlugins() QSettings *settings = Core::ICore::settings(); setActivePlugin(settings->value(QLatin1String(currentPageSettingsKeyC)).toInt()); - // TODO: re-enable reading from Settings when possible. See QTCREATORBUG-6803 - if (activePlugin() > 1) - setActivePlugin(1); - QQmlContext *ctx = m_welcomePage->rootContext(); ctx->setContextProperty(QLatin1String("welcomeMode"), this); |
