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

QmlWizards: Unify templates

Browse Source 
Unify the original qml file generated by Qt Quick UI / Qt Quick
Application wizards. Use a default size of 360x360.
Furthermore, add a MouseArea such that clicking on the app will close
it (demonstrating the use of Qt.quit()).

Reviewed-by: Alessandro Portale
This commit is contained in:
Kai Koehne
2010-11-11 11:39:57 +01:00
parent 8f85202fb1
commit e35c53e7f8
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
share/qtcreator/templates/qmlapp/qml/app/main.qml
View File

@@ -1,10 +1,16 @@
import Qt 4.7 import Qt 4.7
Rectangle { Rectangle {
width: 200 width: 360
height: 323 height: 360
Text { Text {
text: "Hello World" text: "Hello World"
anchors.centerIn: parent anchors.centerIn: parent
} }
MouseArea {
anchors.fill: parent
onClicked: {
Qt.quit();
}
}
} }

5
src/plugins/qmljseditor/qmlfilewizard.cpp
View File

@@ -62,11 +62,12 @@ QString QmlFileWizard::fileContents(const QString &fileName) const
QTextStream str(&contents); QTextStream str(&contents);
// str << CppTools::AbstractEditorSupport::licenseTemplate(); // str << CppTools::AbstractEditorSupport::licenseTemplate();
// 100:62 is the 'golden ratio'
str << QLatin1String("import Qt 4.7\n") str << QLatin1String("import Qt 4.7\n")
<< QLatin1String("\n") << QLatin1String("\n")
<< QLatin1String("Rectangle {\n") << QLatin1String("Rectangle {\n")
<< QLatin1String(" width: 640\n") << QLatin1String(" width: 100\n")
<< QLatin1String(" height: 480\n") << QLatin1String(" height: 62\n")
<< QLatin1String("}\n"); << QLatin1String("}\n");
return contents; return contents;

13
src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
View File

@@ -117,13 +117,18 @@ Core::GeneratedFiles QmlProjectApplicationWizard::generateFiles(const QWizard *w
<< "import Qt 4.7" << endl << "import Qt 4.7" << endl
<< endl << endl
<< "Rectangle {" << endl << "Rectangle {" << endl
<< " width: 200" << endl << " width: 360" << endl
<< " height: 200" << endl << " height: 360" << endl
<< " Text {" << endl << " Text {" << endl
<< " x: 66" << endl << " anchors.centerIn: parent" << endl
<< " y: 93" << endl
<< " text: \"Hello World\"" << endl << " text: \"Hello World\"" << endl
<< " }" << endl << " }" << endl
<< " MouseArea {" << endl
<< " anchors.fill: parent" << endl
<< " onClicked: {" << endl
<< " Qt.quit();" << endl
<< " }" << endl
<< " }" << endl
<< "}" << endl; << "}" << endl;
} }
Core::GeneratedFile generatedMainFile(mainFileName); Core::GeneratedFile generatedMainFile(mainFileName);