The connexion used was: -
- Username : {0} -
- Password : {1} -
- Host : {2} -
- Port : {3} - ", userName ?? "none", passWord ?? "none", server, port == -1 ? 21 : port), MessageImg.MsgError, "Ftp connexion", "Failed"); - } - return false; - } - return true; - } - - private static void DisconnectFtp() { - foreach (var ftpsClient in _ftpClients) { - ftpsClient.Value.Close(); - } - _ftpClients.Clear(); - } - - #endregion } } \ No newline at end of file diff --git a/3PA/MainFeatures/Appli/Pages/Actions/DoDeployPage.cs b/3PA/MainFeatures/Appli/Pages/Actions/DoDeployPage.cs index 3c8a0a26..babbbee9 100644 --- a/3PA/MainFeatures/Appli/Pages/Actions/DoDeployPage.cs +++ b/3PA/MainFeatures/Appli/Pages/Actions/DoDeployPage.cs @@ -220,7 +220,7 @@ public override void OnShow() { // cur env lblCurEnv.Text = string.Format("{0} (switch)", ProEnvironment.Current.Name + (!string.IsNullOrEmpty(ProEnvironment.Current.Suffix) ? " - " + ProEnvironment.Current.Suffix : "")); - lbl_deployDir.Text = string.Format("The deployment directory is {0}", ProEnvironment.Current.BaseCompilationPath); + lbl_deployDir.Text = @"The deployment directory is " + ProEnvironment.Current.BaseCompilationPath.ToHtmlLink(); // update the rules for the current env var currentDeployer = ProEnvironment.Current.Deployer; @@ -267,7 +267,7 @@ private void BtStartOnButtonPressed(object sender, EventArgs eventArgs) { UpdateProgressBar(); - btCancel.SafeInvoke(button => button.Visible = true); + //btCancel.SafeInvoke(button => button.Visible = true); if (_proDeployment.Start()) { this.SafeInvoke(page => { @@ -297,10 +297,11 @@ private void OnCompilationEnd(ProDeployment proDeployment) { } ResetScreen(); UpdateReport(_proDeployment.FormatDeploymentReport()); + btReport.Visible = true; // notify the user if (!_proDeployment.HasBeenCancelled) { - UserCommunication.NotifyUnique("ReportAvailable", "The requested deployment is over,
please check the generated report to see the result :
Cick here to see the report", MessageImg.MsgInfo, "Deploy your application", "Report available", args => { + UserCommunication.NotifyUnique("ReportAvailable", "The requested deployment is over,
please check the generated report to see the result :
Click here to see the report", MessageImg.MsgInfo, "Deploy your application", "Report available", args => { Appli.GoToPage(PageNames.MassCompiler); UserCommunication.CloseUniqueNotif("ReportAvailable"); }, Appli.IsFocused() ? 10 : 0); @@ -410,7 +411,10 @@ private void CbNameOnSelectedIndexChanged(YamuiComboBox sender) { // allows to update the progression bar private void UpdateProgressBar() { progressBar.SafeInvoke(bar => { - bar.Text = @"Step " + _proDeployment.CurrentStep + @" / " + _proDeployment.TotalNumberOfSteps + @" ~ " + Math.Round(_proDeployment.ProgressionPercentage, 1) + @"%" + @" (elapsed time = " + _proDeployment.GetElapsedTime() + @")"; + if (_proDeployment.ProgressionPercentage < 0.1) + bar.Text = @"Initializing, please wait..."; + else + bar.Text = Math.Round(_proDeployment.ProgressionPercentage, 1) + @"%" + @" (in " + _proDeployment.GetElapsedTime() + @", step " + _proDeployment.CurrentStep + @"/" + _proDeployment.MaxStep + @")"; bar.Progress = _proDeployment.ProgressionPercentage; }); } diff --git a/3PA/MainFeatures/AppliMenu.cs b/3PA/MainFeatures/AppliMenu.cs index 4d9a7f46..8e044385 100644 --- a/3PA/MainFeatures/AppliMenu.cs +++ b/3PA/MainFeatures/AppliMenu.cs @@ -280,7 +280,7 @@ private AppliMenu() { #region Main menu - var goToDefItem = new MenuItem(this, "Go to definition", ImageResources.GoToDefinition, item => ProMisc.GoToDefinition(), "Go_To_Definition", "Ctrl+B"); + var goToDefItem = new MenuItem(this, "Go to definition", ImageResources.GoToDefinition, item => ProMisc.GoToDefinition(false), "Go_To_Definition", "Ctrl+B") { Generic = true }; goToDefItem.SubText = "Middle click / " + goToDefItem.SubText; var goToPreviousJump = new MenuItem(this, "Go to previous jump point", ImageResources.GoBackward, item => Npp.GoBackFromDefinition(), "Go_Backwards", "Ctrl+Shift+B") { Generic = true diff --git a/3PA/MainFeatures/AutoCompletionFeature/CompletionItem.cs b/3PA/MainFeatures/AutoCompletionFeature/CompletionItem.cs index 8ad950b3..3c0cd8f2 100644 --- a/3PA/MainFeatures/AutoCompletionFeature/CompletionItem.cs +++ b/3PA/MainFeatures/AutoCompletionFeature/CompletionItem.cs @@ -787,11 +787,13 @@ public override Image ItemTypeImage { /// internal abstract class TextCompletionItem : CompletionItem { - public Token OriginToken { get; set; } - public override bool SurvivesFilter(int currentLine, ParsedScopeItem currentScope) { return true; } + + public override string ToString() { + return "This is a piece of text extracted from your current file"; + } } ///
" + overload.Description + "
");
+ toDisplay.Append(@"");
+ toDisplay.Append("" + DisplayText + " (");
+ toDisplay.Append(string.Join(", ", overload.Params));
+ toDisplay.Append(")
"); + toDisplay.Append("returns " + overload.ReturnValue); + toDisplay.Append(@"
");
+ }
+ }
+ return toDisplay.ToString();
+ }
}
/// "); + toDisplay.Append("returns " + overload.ReturnValue); + toDisplay.Append(@"
" + prolibMessage, MessageImg.MsgError, "Prolib output", "Errors"); } #endregion @@ -750,15 +746,15 @@ private bool DeploySingleFile(FileToDeploy file) { if (File.Exists(file.From)) { switch (file.DeployType) { case DeployType.Copy: - file.IsOk = Utils.CopyFile(file.From, file.To); + file.IsOk = CopyFile(file.From, file.To, file); break; case DeployType.Move: - file.IsOk = Utils.MoveFile(file.From, file.To, true); + file.IsOk = MoveFile(file.From, file.To, file); break; case DeployType.Ftp: - file.IsOk = Utils.SendFileToFtp(file.From, file.To); + file.IsOk = SendFileToFtp(file.From, file.To, file); break; case DeployType.Zip: @@ -767,7 +763,7 @@ private bool DeploySingleFile(FileToDeploy file) { zip.AddFile(ZipStorer.Compression.Deflate, file.From, file.RelativePathInArchive, "Added @ " + DateTime.Now); file.IsOk = true; } catch (Exception e) { - ErrorHandler.ShowErrors(e, "Zipping during deployment"); + file.DeployError = "Couldn't zip " + file.From.ProQuoter() + " : \"" + e.Message + "\""; file.IsOk = false; } break; @@ -781,7 +777,7 @@ private bool DeploySingleFile(FileToDeploy file) { #endregion #region private /utils - + ///
");
if (file.IsOk) {
- line.Append("![](" + Utils.GetExtensionImage(ext) + ")
" + transferMsg + file.To.ToHtmlLink(file.To.Replace(groupBase, "").TrimStart('\\')));
+ line.Append("");
} else {
- line.Append("
Transfer error for " + transferMsg + file.To.Replace(_proEnv.BaseCompilationPath, ""));
+ line.Append("Transfer failed for ");
}
+ line.Append(transferMsg + file.To.ToHtmlLink(file.To.Replace(groupBase, "").TrimStart('\\')));
line.Append(" from " + string.Format("{1}", Path.GetDirectoryName(file.Origin), file.Origin.Replace(kpv.Key <= 1 ? _proEnv.BaseLocalPath : _proEnv.BaseCompilationPath, "").TrimStart('\\')));
+ if (!file.IsOk) {
+ line.Append("
Reason : " + file.DeployError); + } line.Append("
");
}
diff --git a/3PA/MainFeatures/Pro/ProEnvironment.cs b/3PA/MainFeatures/Pro/ProEnvironment.cs
index b13db95d..9e7e8ee2 100644
--- a/3PA/MainFeatures/Pro/ProEnvironment.cs
+++ b/3PA/MainFeatures/Pro/ProEnvironment.cs
@@ -144,8 +144,13 @@ public ProEnvironmentObject(ProEnvironmentObject toCopy) {
/// Returns the currently selected database's .pf for the current environment
/// Reason : " + file.DeployError); + } line.Append("
" + (String.IsNullOrEmpty(ProEnv.BaseCompilationPath) ? "it's empty!" : ProEnv.BaseCompilationPath) + "
You must provide a valid path before executing this action :1. Either change the compilation directory
2. Or toggle the option to compile next to the source file!
The options are configurable in the set environment page"; - } - return base.CheckParameters(); - } - protected override bool SetExecutionInfo() { if (Files == null) @@ -891,9 +884,16 @@ protected static Dictionary
If you modified it since the last compilation you might not have the expected behavior...
" + "stop".ToHtmlLink("Click here to not show this message again for this session") + "", MessageImg.MsgWarning, "Progress execution", "An Rcode hides the program", args => { - _dontWarnAboutRCode = true; - UserCommunication.CloseUniqueNotif("rcodehide"); - }, 5); - } - } - return true; } diff --git a/3PA/MainFeatures/Pro/ProMisc.cs b/3PA/MainFeatures/Pro/ProMisc.cs index 76820de9..3271c2db 100644 --- a/3PA/MainFeatures/Pro/ProMisc.cs +++ b/3PA/MainFeatures/Pro/ProMisc.cs @@ -117,6 +117,7 @@ private static int ToggleCommentOnRange(int startPos, int endPos) { /// caret. At last, it tries to find a file in the propath ///
If you modified it since the last compilation you might not have the expected behavior...
" + "stop".ToHtmlLink("Click here to not show this message again for this session") + "", MessageImg.MsgWarning, "Progress execution", "An Rcode hides the program", args => { + _dontWarnAboutRCode = true; + UserCommunication.CloseUniqueNotif("rcodehide"); + }, 5); + } + } // update function prototypes ProGenerateCode.Factory.UpdateFunctionPrototypesIfNeeded(true); diff --git a/3PA/NppCore/NotificationsPublisher.cs b/3PA/NppCore/NotificationsPublisher.cs index e12777a5..e92410a9 100644 --- a/3PA/NppCore/NotificationsPublisher.cs +++ b/3PA/NppCore/NotificationsPublisher.cs @@ -244,7 +244,6 @@ public static void OnNppNotification(SCNotification nc) { case (uint) NppNotif.NPPN_LANGCHANGED: // on lang type changed NppBufferActivated(); - UserCommunication.Notify("lang changed " + Npp.CurrentInternalLangName); return; case (uint) NppNotif.NPPN_WORDSTYLESUPDATED: diff --git a/3PA/NppCore/Npp.cs b/3PA/NppCore/Npp.cs index 9038868a..79ca00b5 100644 --- a/3PA/NppCore/Npp.cs +++ b/3PA/NppCore/Npp.cs @@ -373,7 +373,7 @@ public static void Goto(string document, int position, int line, int column, boo UserCommunication.Notify(@"Can't find/open the following file :
" + document, MessageImg.MsgHighImportance, "Warning", "File not found", 5); return; } - if (saveHistoric && CurrentFile.IsProgress) { + if (saveHistoric) { _goToHistory.Push(new Tuple