RemoteLinux: Internal settings pages improvements.

- Use better strings for category and id.
- Don't set display category and icon again in Qemu settings page.

Change-Id: I054d70bbd59521ca22f528ecb42eee35ecb73ecd
Reviewed-on: http://codereview.qt.nokia.com/2049
Reviewed-by: Christian Kandeler <[email protected]>

3 files changed, 6 insertions, 9 deletions

diff --git a/src/plugins/remotelinux/maemosettingspages.cpp b/src/plugins/remotelinux/maemosettingspages.cpp
index 6b19865dd21..c5c232ce8ec 100644
--- a/src/plugins/remotelinux/maemosettingspages.cpp
+++ b/src/plugins/remotelinux/maemosettingspages.cpp
@@ -128,12 +128,12 @@ QString MaemoQemuSettingsPage::category() const
 
 QString MaemoQemuSettingsPage::displayCategory() const
 {
-    return QCoreApplication::translate("RemoteLinux", Constants::RemoteLinuxSettingsTrCategory);
+    return QString(); // Already set by device configurations page.
 }
 
 QIcon MaemoQemuSettingsPage::categoryIcon() const
 {
-    return QIcon(QLatin1String(Constants::RemoteLinuxSettingsCategoryIcon));
+    return QIcon(); // See above.
 }
 
 bool MaemoQemuSettingsPage::matches(const QString &searchKeyWord) const
diff --git a/src/plugins/remotelinux/remotelinux_constants.h b/src/plugins/remotelinux/remotelinux_constants.h
index f543c57d302..8fada78746b 100644
--- a/src/plugins/remotelinux/remotelinux_constants.h
+++ b/src/plugins/remotelinux/remotelinux_constants.h
@@ -4,10 +4,7 @@
 namespace RemoteLinux {
 namespace Constants {
 
-const char RemoteLinuxSettingsCategory[] = "X.Maemo";
-const char RemoteLinuxSettingsTrCategory[]
-    = QT_TRANSLATE_NOOP("RemoteLinux", "Linux Devices");
-const char RemoteLinuxSettingsCategoryIcon[] = ":/projectexplorer/images/MaemoDevice.png";
+const char RemoteLinuxSettingsCategory[] = "X.RemoteLinux";
 
 const char GenericTestDeviceActionId[] = "RemoteLinux.GenericTestDeviceAction";
 const char GenericDeployKeyToDeviceActionId[] = "RemoteLinux.GenericDeployKeyToDeviceAction";
diff --git a/src/plugins/remotelinux/remotelinuxsettingspages.cpp b/src/plugins/remotelinux/remotelinuxsettingspages.cpp
index 7bfc30ae9ff..c23f8495d08 100644
--- a/src/plugins/remotelinux/remotelinuxsettingspages.cpp
+++ b/src/plugins/remotelinux/remotelinuxsettingspages.cpp
@@ -66,12 +66,12 @@ QString LinuxDeviceConfigurationsSettingsPage::category() const
 
 QString LinuxDeviceConfigurationsSettingsPage::displayCategory() const
 {
-    return QCoreApplication::translate("RemoteLinux", Constants::RemoteLinuxSettingsTrCategory);
+    return QCoreApplication::translate("RemoteLinux", "Linux Devices");
 }
 
 QIcon LinuxDeviceConfigurationsSettingsPage::categoryIcon() const
 {
-    return QIcon(QLatin1String(Constants::RemoteLinuxSettingsCategoryIcon));
+    return QIcon(QLatin1String(":/projectexplorer/images/MaemoDevice.png"));
 }
 
 bool LinuxDeviceConfigurationsSettingsPage::matches(const QString &searchKeyWord) const
@@ -98,7 +98,7 @@ void LinuxDeviceConfigurationsSettingsPage::finish()
 
 QString LinuxDeviceConfigurationsSettingsPage::pageId()
 {
-    return QLatin1String("ZZ.Maemo Device Configurations");
+    return QLatin1String("AA.Remote Linux Device Configurations");
 }
 
 QString LinuxDeviceConfigurationsSettingsPage::pageCategory()