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

RemoteLinux: Try better wording for upload options

Browse Source 
The actual deploy method is not really fixed until the step starts
running.

Task-number: QTCREATORBUG-29710
Change-Id: Ide4f76b1270f1e998dfac516ae101ddf6f4cebed
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2023-10-05 17:31:58 +02:00
parent 449f622942
commit 1700355534
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/remotelinux/rsyncdeploystep.cpp
View File

@@ -38,7 +38,7 @@ public:
{
flags.setDisplayStyle(StringAspect::LineEditDisplay);
flags.setSettingsKey("RemoteLinux.RsyncDeployStep.Flags");
flags.setLabelText(Tr::tr("Flags:"));
flags.setLabelText(Tr::tr("Flags for rsync:"));
flags.setValue(FileTransferSetupData::defaultRsyncFlags());
ignoreMissingFiles.setSettingsKey("RemoteLinux.RsyncDeployStep.IgnoreMissingFiles");
@@ -47,9 +47,9 @@ public:
method.setDisplayStyle(SelectionAspect::DisplayStyle::ComboBox);
method.setDisplayName(Tr::tr("Transfer method:"));
method.addOption(Tr::tr("rsync"), Tr::tr("Use rsync if available."));
method.addOption(Tr::tr("SFTP"), Tr::tr("Use sftp if available."));
method.addOption(Tr::tr("Generic Copy"), Tr::tr("Use generic copy, most likely to succeed."));
method.addOption(Tr::tr("Use rsync if available. Otherwise use default transfer."));
method.addOption(Tr::tr("Use sftp if available. Otherwise use default transfer."));
method.addOption(Tr::tr("Use default transfer. This might be slow."));
setInternalInitializer([this]() -> expected_str<void> {
if (BuildDeviceKitAspect::device(kit()) == DeviceKitAspect::device(kit())) {
@@ -202,7 +202,7 @@ GroupItem RsyncDeployStep::deployRecipe()
RsyncDeployStepFactory::RsyncDeployStepFactory()
{
registerStep<RsyncDeployStep>(Constants::RsyncDeployStepId);
setDisplayName(Tr::tr("Deploy files via rsync"));
setDisplayName(Tr::tr("Deploy files"));
}
} // RemoteLinux::Internal