forked from qt-creator/qt-creator
Cvs: Move to Tr::tr
Change-Id: Iba6cfa75745ec2644c1a3dd20949971d16f6dba7 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
@@ -3,6 +3,8 @@
|
||||
|
||||
#include "cvssettings.h"
|
||||
|
||||
#include "cvstr.h"
|
||||
|
||||
#include <coreplugin/icore.h>
|
||||
|
||||
#include <utils/hostosinfo.h>
|
||||
@@ -13,8 +15,7 @@
|
||||
|
||||
using namespace Utils;
|
||||
|
||||
namespace Cvs {
|
||||
namespace Internal {
|
||||
namespace Cvs::Internal {
|
||||
|
||||
// CvsSettings
|
||||
|
||||
@@ -27,13 +28,13 @@ CvsSettings::CvsSettings()
|
||||
binaryPath.setDisplayStyle(StringAspect::PathChooserDisplay);
|
||||
binaryPath.setExpectedKind(PathChooser::ExistingCommand);
|
||||
binaryPath.setHistoryCompleter(QLatin1String("Cvs.Command.History"));
|
||||
binaryPath.setDisplayName(tr("CVS Command"));
|
||||
binaryPath.setLabelText(tr("CVS command:"));
|
||||
binaryPath.setDisplayName(Tr::tr("CVS Command"));
|
||||
binaryPath.setLabelText(Tr::tr("CVS command:"));
|
||||
|
||||
registerAspect(&cvsRoot);
|
||||
cvsRoot.setDisplayStyle(StringAspect::LineEditDisplay);
|
||||
cvsRoot.setSettingsKey("Root");
|
||||
cvsRoot.setLabelText(tr("CVS root:"));
|
||||
cvsRoot.setLabelText(Tr::tr("CVS root:"));
|
||||
|
||||
registerAspect(&diffOptions);
|
||||
diffOptions.setDisplayStyle(StringAspect::LineEditDisplay);
|
||||
@@ -44,8 +45,8 @@ CvsSettings::CvsSettings()
|
||||
registerAspect(&describeByCommitId);
|
||||
describeByCommitId.setSettingsKey("DescribeByCommitId");
|
||||
describeByCommitId.setDefaultValue(true);
|
||||
describeByCommitId.setLabelText(tr("Describe all files matching commit id"));
|
||||
describeByCommitId.setToolTip(tr("When checked, all files touched by a commit will be "
|
||||
describeByCommitId.setLabelText(Tr::tr("Describe all files matching commit id"));
|
||||
describeByCommitId.setToolTip(Tr::tr("When checked, all files touched by a commit will be "
|
||||
"displayed when clicking on a revision number in the annotation view "
|
||||
"(retrieved via commit ID). Otherwise, only the respective file will be displayed."));
|
||||
|
||||
@@ -72,7 +73,7 @@ QStringList CvsSettings::addOptions(const QStringList &args) const
|
||||
CvsSettingsPage::CvsSettingsPage(CvsSettings *settings)
|
||||
{
|
||||
setId(VcsBase::Constants::VCS_ID_CVS);
|
||||
setDisplayName(CvsSettings::tr("CVS"));
|
||||
setDisplayName(Tr::tr("CVS"));
|
||||
setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
|
||||
setSettings(settings);
|
||||
|
||||
@@ -82,14 +83,14 @@ CvsSettingsPage::CvsSettingsPage(CvsSettings *settings)
|
||||
|
||||
Column {
|
||||
Group {
|
||||
title(CvsSettings::tr("Configuration")),
|
||||
title(Tr::tr("Configuration")),
|
||||
Form {
|
||||
s.binaryPath,
|
||||
s.cvsRoot
|
||||
}
|
||||
},
|
||||
Group {
|
||||
title(CvsSettings::tr("Miscellaneous")),
|
||||
title(Tr::tr("Miscellaneous")),
|
||||
Column {
|
||||
Form {
|
||||
s.timeout,
|
||||
@@ -104,5 +105,4 @@ CvsSettingsPage::CvsSettingsPage(CvsSettings *settings)
|
||||
});
|
||||
}
|
||||
|
||||
} // Internal
|
||||
} // Cvs
|
||||
} // Cvs::Internal
|
||||
|
||||
Reference in New Issue
Block a user