From c58c33764eb345bfa5f1de5915e40d3863e62390 Mon Sep 17 00:00:00 2001
From: Daniel Teske <daniel.teske@digia.com>
Date: Fri, 17 May 2013 13:26:30 +0200
Subject: [PATCH] AndroidManifestEditor: Readd some tweaks from the .ui file
Fx the version code spinbox being too big and readd some tooltips.k
Change-Id: I6e2e10d64d9616809f3b97c8c9a5d1e668c025ea
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
---
.../android/androidmanifesteditorwidget.cpp | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/src/plugins/android/androidmanifesteditorwidget.cpp b/src/plugins/android/androidmanifesteditorwidget.cpp
index a68bffc8717..dcf6ce58802 100644
--- a/src/plugins/android/androidmanifesteditorwidget.cpp
+++ b/src/plugins/android/androidmanifesteditorwidget.cpp
@@ -120,6 +120,18 @@ void AndroidManifestEditorWidget::initializePage()
QFormLayout *formLayout = new QFormLayout();
m_packageNameLineEdit = new QLineEdit(packageGroupBox);
+ m_packageNameLineEdit->setToolTip(tr(
+ "<p align=\"justify\">Please choose a valid package name "
+ "for your application (e.g. \"org.example.myapplication\").</p>"
+ "<p align=\"justify\">Packages are usually defined using a hierarchical naming pattern, "
+ "with levels in the hierarchy separated by periods (.) (pronounced \"dot\").</p>"
+ "<p align=\"justify\">In general, a package name begins with the top level domain name"
+ " of the organization and then the organization's domain and then any subdomains listed"
+ "in reverse order. The organization can then choose a specific name for their package."
+ " Package names should be all lowercase characters whenever possible.</p>"
+ "<p align=\"justify\">Complete conventions for disambiguating package names and rules for"
+ " naming packages when the Internet domain name cannot be directly used as a package name"
+ " are described in section 7.7 of the Java Language Specification.</p>"));
formLayout->addRow(tr("Package name:"), m_packageNameLineEdit);
m_packageNameWarning = new QLabel;
@@ -142,6 +154,7 @@ void AndroidManifestEditorWidget::initializePage()
m_versionCode = new QSpinBox(packageGroupBox);
m_versionCode->setMaximum(99);
m_versionCode->setValue(1);
+ m_versionCode->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
formLayout->addRow(tr("Version code:"), m_versionCode);
m_versionNameLinedit = new QLineEdit(packageGroupBox);
@@ -176,6 +189,7 @@ void AndroidManifestEditorWidget::initializePage()
m_lIconButton = new QToolButton(applicationGroupBox);
m_lIconButton->setMinimumSize(QSize(48, 48));
m_lIconButton->setMaximumSize(QSize(48, 48));
+ m_lIconButton->setToolTip(tr("Select low dpi icon"));
iconLayout->addWidget(m_lIconButton);
iconLayout->addItem(new QSpacerItem(28, 20, QSizePolicy::Expanding, QSizePolicy::Minimum));
@@ -183,6 +197,7 @@ void AndroidManifestEditorWidget::initializePage()
m_mIconButton = new QToolButton(applicationGroupBox);
m_mIconButton->setMinimumSize(QSize(48, 48));
m_mIconButton->setMaximumSize(QSize(48, 48));
+ m_mIconButton->setToolTip(tr("Select medium dpi icon"));
iconLayout->addWidget(m_mIconButton);
iconLayout->addItem(new QSpacerItem(28, 20, QSizePolicy::Expanding, QSizePolicy::Minimum));
@@ -190,6 +205,7 @@ void AndroidManifestEditorWidget::initializePage()
m_hIconButton = new QToolButton(applicationGroupBox);
m_hIconButton->setMinimumSize(QSize(48, 48));
m_hIconButton->setMaximumSize(QSize(48, 48));
+ m_hIconButton->setToolTip(tr("Select high dpi icon"));
iconLayout->addWidget(m_hIconButton);
formLayout->addRow(tr("Application icon:"), iconLayout);
--
GitLab