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

RemoteLinux: Internal settings pages improvements.

Browse Source 
- 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 <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-07-22 18:24:04 +02:00
parent fa33ff0a33
commit 92d32becfc
3 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/remotelinux/maemosettingspages.cpp
View File

@@ -128,12 +128,12 @@ QString MaemoQemuSettingsPage::category() const
QString MaemoQemuSettingsPage::displayCategory() const QString MaemoQemuSettingsPage::displayCategory() const
{ {
return QCoreApplication::translate("RemoteLinux", Constants::RemoteLinuxSettingsTrCategory); return QString(); // Already set by device configurations page.
} }
QIcon MaemoQemuSettingsPage::categoryIcon() const QIcon MaemoQemuSettingsPage::categoryIcon() const
{ {
return QIcon(QLatin1String(Constants::RemoteLinuxSettingsCategoryIcon)); return QIcon(); // See above.
} }
bool MaemoQemuSettingsPage::matches(const QString &searchKeyWord) const bool MaemoQemuSettingsPage::matches(const QString &searchKeyWord) const

5
src/plugins/remotelinux/remotelinux_constants.h
View File

@@ -4,10 +4,7 @@
namespace RemoteLinux { namespace RemoteLinux {
namespace Constants { namespace Constants {
const char RemoteLinuxSettingsCategory[] = "X.Maemo"; const char RemoteLinuxSettingsCategory[] = "X.RemoteLinux";
const char RemoteLinuxSettingsTrCategory[]
= QT_TRANSLATE_NOOP("RemoteLinux", "Linux Devices");
const char RemoteLinuxSettingsCategoryIcon[] = ":/projectexplorer/images/MaemoDevice.png";
const char GenericTestDeviceActionId[] = "RemoteLinux.GenericTestDeviceAction"; const char GenericTestDeviceActionId[] = "RemoteLinux.GenericTestDeviceAction";
const char GenericDeployKeyToDeviceActionId[] = "RemoteLinux.GenericDeployKeyToDeviceAction"; const char GenericDeployKeyToDeviceActionId[] = "RemoteLinux.GenericDeployKeyToDeviceAction";

6
src/plugins/remotelinux/remotelinuxsettingspages.cpp
View File

@@ -66,12 +66,12 @@ QString LinuxDeviceConfigurationsSettingsPage::category() const
QString LinuxDeviceConfigurationsSettingsPage::displayCategory() const QString LinuxDeviceConfigurationsSettingsPage::displayCategory() const
{ {
return QCoreApplication::translate("RemoteLinux", Constants::RemoteLinuxSettingsTrCategory); return QCoreApplication::translate("RemoteLinux", "Linux Devices");
} }
QIcon LinuxDeviceConfigurationsSettingsPage::categoryIcon() const QIcon LinuxDeviceConfigurationsSettingsPage::categoryIcon() const
{ {
return QIcon(QLatin1String(Constants::RemoteLinuxSettingsCategoryIcon)); return QIcon(QLatin1String(":/projectexplorer/images/MaemoDevice.png"));
} }
bool LinuxDeviceConfigurationsSettingsPage::matches(const QString &searchKeyWord) const bool LinuxDeviceConfigurationsSettingsPage::matches(const QString &searchKeyWord) const
@@ -98,7 +98,7 @@ void LinuxDeviceConfigurationsSettingsPage::finish()
QString LinuxDeviceConfigurationsSettingsPage::pageId() QString LinuxDeviceConfigurationsSettingsPage::pageId()
{ {
return QLatin1String("ZZ.Maemo Device Configurations"); return QLatin1String("AA.Remote Linux Device Configurations");
} }
QString LinuxDeviceConfigurationsSettingsPage::pageCategory() QString LinuxDeviceConfigurationsSettingsPage::pageCategory()