From ce5380aaebd95e2b17c046a50d6d5f0f158d3b02 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 18 Nov 2009 12:11:16 +0100
Subject: [PATCH] Wizard: Polish, layout and module names. Reviewed-by: con
---
.../projectexplorer/projectwizardpage.ui | 11 ++++---
.../qt4projectmanager/qtmodulesinfo.cpp | 32 +++++++++----------
2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/src/plugins/projectexplorer/projectwizardpage.ui b/src/plugins/projectexplorer/projectwizardpage.ui
index 6773a3da3a7..89d15be8683 100644
--- a/src/plugins/projectexplorer/projectwizardpage.ui
+++ b/src/plugins/projectexplorer/projectwizardpage.ui
@@ -65,10 +65,13 @@
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
<property name="sizeHint" stdset="0">
<size>
- <width>20</width>
- <height>40</height>
+ <width>0</width>
+ <height>10</height>
</size>
</property>
</spacer>
@@ -92,8 +95,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>601</width>
- <height>154</height>
+ <width>611</width>
+ <height>305</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
diff --git a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
index 90a3f28f4d5..92f8e565c4a 100644
--- a/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
+++ b/src/plugins/qt4projectmanager/qtmodulesinfo.cpp
@@ -51,67 +51,67 @@ const itemVectorType itemVector()
{
static const struct item items[] = {
{"core",
- QCoreApplication::translate("QtModulesInfo", "QtCore Module"),
+ QLatin1String("QtCore"),
QCoreApplication::translate("QtModulesInfo", "Core non-GUI classes used by other modules"),
true},
{"gui",
- QCoreApplication::translate("QtModulesInfo", "QtGui Module"),
+ QLatin1String("QtGui"),
QCoreApplication::translate("QtModulesInfo", "Graphical user interface components"),
true},
{"network",
- QCoreApplication::translate("QtModulesInfo", "QtNetwork Module"),
+ QLatin1String("QtNetwork"),
QCoreApplication::translate("QtModulesInfo", "Classes for network programming"),
false},
{"opengl",
- QCoreApplication::translate("QtModulesInfo", "QtOpenGL Module"),
+ QLatin1String("QtOpenGL"),
QCoreApplication::translate("QtModulesInfo", "OpenGL support classes"),
false},
{"sql",
- QCoreApplication::translate("QtModulesInfo", "QtSql Module"),
+ QLatin1String("QtSql"),
QCoreApplication::translate("QtModulesInfo", "Classes for database integration using SQL"),
false},
{"script",
- QCoreApplication::translate("QtModulesInfo", "QtScript Module"),
+ QLatin1String("QtScript"),
QCoreApplication::translate("QtModulesInfo", "Classes for evaluating Qt Scripts"),
false},
{"scripttools",
- QCoreApplication::translate("QtModulesInfo", "QtScriptTools Module"),
+ QLatin1String("QtScriptTools"),
QCoreApplication::translate("QtModulesInfo", "Additional Qt Script components"),
false},
{"svg",
- QCoreApplication::translate("QtModulesInfo", "QtSvg Module"),
+ QLatin1String("QtSvg"),
QCoreApplication::translate("QtModulesInfo", "Classes for displaying the contents of SVG files"),
false},
{"webkit",
- QCoreApplication::translate("QtModulesInfo", "QtWebKit Module"),
+ QLatin1String("QtWebKit"),
QCoreApplication::translate("QtModulesInfo", "Classes for displaying and editing Web content"),
false},
{"xml",
- QCoreApplication::translate("QtModulesInfo", "QtXml Module"),
+ QLatin1String("QtXml"),
QCoreApplication::translate("QtModulesInfo", "Classes for handling XML"),
false},
{"xmlpatterns",
- QCoreApplication::translate("QtModulesInfo", "QtXmlPatterns Module"),
+ QLatin1String("QtXmlPatterns"),
QCoreApplication::translate("QtModulesInfo", "An XQuery/XPath engine for XML and custom data models"),
false},
{"phonon",
- QCoreApplication::translate("QtModulesInfo", "Phonon Module"),
+ QLatin1String("Phonon"),
QCoreApplication::translate("QtModulesInfo", "Multimedia framework classes"),
false},
{"multimedia",
- QCoreApplication::translate("QtModulesInfo", "QtMultimedia Module"),
+ QLatin1String("QtMultimedia"),
QCoreApplication::translate("QtModulesInfo", "Classes for low-level multimedia functionality"),
false},
{"qt3support",
- QCoreApplication::translate("QtModulesInfo", "Qt3Support Module"),
+ QLatin1String("Qt3Support"),
QCoreApplication::translate("QtModulesInfo", "Classes that ease porting from Qt 3 to Qt 4"),
false},
{"testlib",
- QCoreApplication::translate("QtModulesInfo", "QtTest Module"),
+ QLatin1String("QtTest"),
QCoreApplication::translate("QtModulesInfo", "Tool classes for unit testing"),
false},
{"dbus",
- QCoreApplication::translate("QtModulesInfo", "QtDBus Module"),
+ QLatin1String("QtDBus"),
QCoreApplication::translate("QtModulesInfo", "Classes for Inter-Process Communication using the D-Bus"),
false}
};
--
GitLab