From 63269a2507e86aa94a816ce745602d8a8be6fb33 Mon Sep 17 00:00:00 2001 From: Julien Caillon Date: Tue, 4 Apr 2017 20:02:13 +0200 Subject: [PATCH] Tooltips on non progress keywords --- 3PA/3P.csproj | 2 +- 3PA/Lib/ProcessIo.cs | 3 + 3PA/Lib/UpdateHandler.cs | 1 - 3PA/Lib/Utils.cs | 127 +---- .../Appli/Pages/Actions/DoDeployPage.cs | 12 +- 3PA/MainFeatures/AppliMenu.cs | 2 +- .../AutoCompletionFeature/CompletionItem.cs | 33 +- .../AutoCompletionFeature/NppLang.cs | 52 +- 3PA/MainFeatures/InfoToolTip/InfoToolTip.cs | 2 +- 3PA/MainFeatures/Parser/IParserVisitor.cs | 1 + 3PA/MainFeatures/Parser/ParsedItem.cs | 11 + 3PA/MainFeatures/Parser/ParserAnalyze.cs | 4 +- 3PA/MainFeatures/Parser/ParserHandler.cs | 2 +- 3PA/MainFeatures/Parser/ParserVisitor.cs | 5 + 3PA/MainFeatures/Parser/TextLexerVisitor.cs | 25 +- 3PA/MainFeatures/Pro/Deployer.cs | 286 +++++++++-- 3PA/MainFeatures/Pro/FilesInfo.cs | 14 +- 3PA/MainFeatures/Pro/ProCompilation.cs | 52 +- 3PA/MainFeatures/Pro/ProDeployment.cs | 96 ++-- 3PA/MainFeatures/Pro/ProEnvironment.cs | 9 +- 3PA/MainFeatures/Pro/ProExecution.cs | 36 +- 3PA/MainFeatures/Pro/ProMisc.cs | 19 +- 3PA/NppCore/NotificationsPublisher.cs | 1 - 3PA/NppCore/Npp.cs | 2 +- 3PA/Plug.cs | 3 - 3PA/Tests/PlugDebug.cs | 62 ++- 3PA/_Resource/ImageResources.Designer.cs | 480 +++++++++--------- 3PA/_Resource/ImageResources.resx | 6 +- .../Type/{Numbers.png => Number.png} | Bin .../Core/Core/HtmlContainerInt.cs | 6 +- newReleaseNotes.md | 15 +- 31 files changed, 826 insertions(+), 543 deletions(-) rename 3PA/_Resource/Images/ParserItem/Type/{Numbers.png => Number.png} (100%) diff --git a/3PA/3P.csproj b/3PA/3P.csproj index ec489b3b..8c635d45 100644 --- a/3PA/3P.csproj +++ b/3PA/3P.csproj @@ -463,7 +463,7 @@ - + diff --git a/3PA/Lib/ProcessIo.cs b/3PA/Lib/ProcessIo.cs index 0c1a8a8b..5fba3484 100644 --- a/3PA/Lib/ProcessIo.cs +++ b/3PA/Lib/ProcessIo.cs @@ -98,6 +98,9 @@ public bool TryDoWait(bool hidden = false) { /// Start the process synchronously /// public bool DoWait(bool hidden = false) { + StandardOutput.Clear(); + ErrorOutput.Clear(); + if (hidden) { StartInfo.CreateNoWindow = true; StartInfo.WindowStyle = ProcessWindowStyle.Hidden; diff --git a/3PA/Lib/UpdateHandler.cs b/3PA/Lib/UpdateHandler.cs index 37d2f7c4..fcfc460b 100644 --- a/3PA/Lib/UpdateHandler.cs +++ b/3PA/Lib/UpdateHandler.cs @@ -334,7 +334,6 @@ It will be automatically installed the next time you restart Notepad++
/// private static void UpdateDoneFromVersion(string fromVersion) { if (!fromVersion.IsHigherVersionThan("1.7.3")) { - UserCommunication.Notify("Cleaning libraries..."); Utils.DeleteDirectory(Path.Combine(Npp.ConfigDirectory, "Libraries"), true); } } diff --git a/3PA/Lib/Utils.cs b/3PA/Lib/Utils.cs index 6c2eb8a5..89491154 100644 --- a/3PA/Lib/Utils.cs +++ b/3PA/Lib/Utils.cs @@ -28,7 +28,6 @@ using System.Drawing.Drawing2D; using System.Drawing.Imaging; using System.IO; -using System.Linq; using System.Linq.Expressions; using System.Net; using System.Security.Cryptography; @@ -37,7 +36,6 @@ using System.Windows.Forms; using YamuiFramework.Helper; using YamuiFramework.HtmlRenderer.Core.Core.Entities; -using _3PA.Lib.Ftp; using _3PA.MainFeatures; using _3PA.MainFeatures.Appli; using _3PA.MainFeatures.FileExplorer; @@ -183,7 +181,7 @@ public static bool DeleteDirectory(string path, bool recursive) { try { if (string.IsNullOrEmpty(path) || !Directory.Exists(path)) return true; - Directory.Delete(path, true); + Directory.Delete(path, recursive); } catch (Exception e) { UserCommunication.Notify("Failed to delete the following directory :
" + path.ToHtmlLink() + "
\"" + e.Message + "\"
", MessageImg.MsgHighImportance, "Delete folder", "Can't delete a folder!"); return false; @@ -770,128 +768,5 @@ public static bool ZipFolder(string zipPath, string folderPath, ZipStorer.Compre #endregion - #region Wrapper around FtpsClient - - private static Dictionary _ftpClients = new Dictionary(); - - /// - /// Sends a file to a ftp(s) server : EASY MODE, connects, create the directories... - /// Utils.SendFileToFtp(@"D:\Profiles\jcaillon\Downloads\function_forward_sample.p", "ftp://cnaf049:sopra100@rs28.lyon.fr.sopra/cnaf/users/cnaf049/vm/jca/derp/yolo/test.p"); - /// - public static bool SendFileToFtp(string localFilePath, string ftpUri) { - if (string.IsNullOrEmpty(localFilePath) || !File.Exists(localFilePath)) - return false; - - try { - // parse our uri - var regex = new Regex(@"^(ftps?:\/\/([^:\/@]*)?(:[^:\/@]*)?(@[^:\/@]*)?(:[^:\/@]*)?)(\/.*)$"); - var match = regex.Match(ftpUri.Replace("\\", "/")); - if (!match.Success) - return false; - - var serverUri = match.Groups[1].Value; - var distantPath = match.Groups[6].Value; - string userName = null; - string passWord = null; - string server; - int port; - if (!string.IsNullOrEmpty(match.Groups[4].Value)) { - userName = match.Groups[2].Value; - passWord = match.Groups[3].Value.Trim(':'); - server = match.Groups[4].Value.Trim('@'); - if (!int.TryParse(match.Groups[5].Value.Trim(':'), out port)) - port = -1; - } else { - server = match.Groups[2].Value; - if (!int.TryParse(match.Groups[3].Value.Trim(':'), out port)) - port = -1; - } - - FtpsClient ftp; - if (!_ftpClients.ContainsKey(serverUri)) - _ftpClients.Add(serverUri, new FtpsClient()); - ftp = _ftpClients[serverUri]; - - // try to connect! - if (!ftp.Connected) { - if (!ConnectFtp(ftp, userName, passWord, server, port, serverUri)) - return false; - } - - // dispose of the ftp on shutdown - Plug.OnShutDown += DisconnectFtp; - - try { - ftp.PutFile(localFilePath, distantPath); - } catch (Exception) { - // might be disconnected?? - try { - ftp.GetCurrentDirectory(); - } catch (Exception) { - if (!ConnectFtp(ftp, userName, passWord, server, port, serverUri)) - return false; - } - try { - // try to create the directory and then push the file again - ftp.MakeDir((Path.GetDirectoryName(distantPath) ?? "").Replace('\\', '/'), true); - ftp.PutFile(localFilePath, distantPath); - } catch (Exception e) { - if (!IsSpamming(serverUri, 2000, true)) - ErrorHandler.ShowErrors(e, "Error sending a file! " + e.Message); - } - } - } catch (Exception e) { - ErrorHandler.ShowErrors(e, "Error sending a file to FTP"); - } - - return true; - } - - public static bool ConnectFtp(FtpsClient ftp, string userName, string passWord, string server, int port, string serverUri) { - NetworkCredential credential = null; - if (!string.IsNullOrEmpty(userName)) - credential = new NetworkCredential(userName, passWord); - - var modes = new List(); - typeof(EsslSupportMode).ForEach((s, l) => { modes.Add((EsslSupportMode) l); }); - - ftp.DataConnectionMode = EDataConnectionMode.Passive; - while (!ftp.Connected && ftp.DataConnectionMode == EDataConnectionMode.Passive) { - foreach (var mode in modes.OrderByDescending(mode => mode)) { - try { - var curPort = port > -1 ? port : ((mode & EsslSupportMode.Implicit) == EsslSupportMode.Implicit ? 990 : 21); - ftp.Connect(server, curPort, credential, mode, 1800); - ftp.Connected = true; - break; - } catch (Exception) { - //ignored - } - } - ftp.DataConnectionMode = EDataConnectionMode.Active; - } - - // failed? - if (!ftp.Connected) { - if (!IsSpamming(serverUri, 2000, true)) { - UserCommunication.Notify(string.Format(@"Failed to connect to the FTP server!

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"; + } } /// @@ -817,7 +819,7 @@ public override CompletionType Type { } public override Image ItemTypeImage { - get { return ImageResources.Numbers; } + get { return ImageResources.Number; } } } @@ -831,6 +833,14 @@ internal abstract class LangCompletionItem : CompletionItem { public override bool SurvivesFilter(int currentLine, ParsedScopeItem currentScope) { return true; } + + public override string ToString() { + var toDisplay = new StringBuilder(); + toDisplay.Append(HtmlHelper.FormatSubtitle("DEFINITION")); + toDisplay.Append(HtmlHelper.FormatRow("Defined for the language", NppKeyword.Lang.LangName)); + toDisplay.Append(HtmlHelper.FormatRow("Extracted from", NppKeyword.OriginFile.ToHtmlLink())); + return toDisplay.ToString(); + } } /// @@ -844,6 +854,23 @@ public override CompletionType Type { public override Image ItemTypeImage { get { return ImageResources.LangFunction; } } + + public override string ToString() { + var toDisplay = new StringBuilder(base.ToString()); + if (NppKeyword.Overloads != null) { + toDisplay.Append(HtmlHelper.FormatSubtitle("OVERLOADS")); + foreach (var overload in NppKeyword.Overloads) { + toDisplay.Append("
" + 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(); + } } /// diff --git a/3PA/MainFeatures/AutoCompletionFeature/NppLang.cs b/3PA/MainFeatures/AutoCompletionFeature/NppLang.cs index 16663685..fbaa4961 100644 --- a/3PA/MainFeatures/AutoCompletionFeature/NppLang.cs +++ b/3PA/MainFeatures/AutoCompletionFeature/NppLang.cs @@ -266,9 +266,9 @@ public LangDescription ReadApiFileIfNeeded() { }); } - _keywords.Add(new NppKeyword(keyword) { + _keywords.Add(new NppKeywordApis(keyword, this) { Overloads = overloads, - Origin = NppKeywordOrigin.AutoCompApiXml + Origin = NppKeywordOrigin.Api }); } } @@ -298,8 +298,8 @@ public LangDescription ReadApiFileIfNeeded() { foreach (var keyword in WebUtility.HtmlDecode(descendant.Value).Replace('\r', ' ').Replace('\n', ' ').Split(' ')) { if (!string.IsNullOrEmpty(keyword) && !uniqueKeywords.Contains(keyword)) { uniqueKeywords.Add(keyword); - _keywords.Add(new NppKeyword(keyword) { - Origin = NppKeywordOrigin.UserLangXml + _keywords.Add(new NppKeywordUserLangs(keyword, this) { + Origin = NppKeywordOrigin.UserLangs }); } } @@ -318,8 +318,8 @@ public LangDescription ReadApiFileIfNeeded() { foreach (var keyword in WebUtility.HtmlDecode(descendant.Value).Split(' ')) { if (!string.IsNullOrEmpty(keyword) && !uniqueKeywords.Contains(keyword)) { uniqueKeywords.Add(keyword); - _keywords.Add(new NppKeyword(keyword) { - Origin = NppKeywordOrigin.LangsXml + _keywords.Add(new NppKeywordLangs(keyword, this) { + Origin = NppKeywordOrigin.Langs }); } } @@ -364,23 +364,55 @@ internal class NppKeyword { public string Value { get; set; } public NppKeywordOrigin Origin { get; set; } + public List Overloads { get; set; } + public LangDescription Lang { get; private set; } + internal class NppOverload { public string Description { get; set; } public string ReturnValue { get; set; } public List Params { get; set; } } - public NppKeyword(string value) { + public NppKeyword(string value, LangDescription langDescription) { Value = value; + Lang = langDescription; + } + + public virtual string OriginFile { + get { return ""; } + } + } + + internal class NppKeywordLangs : NppKeyword { + public NppKeywordLangs(string value, LangDescription langDescription) : base(value, langDescription) {} + + public override string OriginFile { + get { return Npp.ConfXml.FileNppLangsXml; } + } + } + + internal class NppKeywordUserLangs : NppKeyword { + public NppKeywordUserLangs(string value, LangDescription langDescription) : base(value, langDescription) { } + + public override string OriginFile { + get { return Npp.ConfXml.FileNppUserDefinedLang; } + } + } + + internal class NppKeywordApis : NppKeyword { + public NppKeywordApis(string value, LangDescription langDescription) : base(value, langDescription) { } + + public override string OriginFile { + get { return Path.Combine(Npp.FolderNppAutocompApis, Lang.LangName + ".xml"); } } } internal enum NppKeywordOrigin { - LangsXml, - UserLangXml, - AutoCompApiXml + Langs, + UserLangs, + Api } #endregion diff --git a/3PA/MainFeatures/InfoToolTip/InfoToolTip.cs b/3PA/MainFeatures/InfoToolTip/InfoToolTip.cs index 847f8f31..e37cb98f 100644 --- a/3PA/MainFeatures/InfoToolTip/InfoToolTip.cs +++ b/3PA/MainFeatures/InfoToolTip/InfoToolTip.cs @@ -215,7 +215,7 @@ private static void ClickHandler(HtmlLinkClickedEventArgs htmlLinkClickedEventAr } break; case "gotodefinition": - ProMisc.GoToDefinition(); + ProMisc.GoToDefinition(false); break; case "nexttooltip": IndexToShow++; diff --git a/3PA/MainFeatures/Parser/IParserVisitor.cs b/3PA/MainFeatures/Parser/IParserVisitor.cs index da06e491..76d740e9 100644 --- a/3PA/MainFeatures/Parser/IParserVisitor.cs +++ b/3PA/MainFeatures/Parser/IParserVisitor.cs @@ -23,6 +23,7 @@ namespace _3PA.MainFeatures.Parser { internal interface IParserVisitor { void PreVisit(Parser parser); + void Visit(ParsedWord pars); void Visit(ParsedFile pars); void Visit(ParsedPreProcBlock pars); void Visit(ParsedImplementation pars); diff --git a/3PA/MainFeatures/Parser/ParsedItem.cs b/3PA/MainFeatures/Parser/ParsedItem.cs index d5c6c423..c99f0f20 100644 --- a/3PA/MainFeatures/Parser/ParsedItem.cs +++ b/3PA/MainFeatures/Parser/ParsedItem.cs @@ -218,6 +218,17 @@ internal enum ParseFlag : ulong { #region procedural classes + /// + /// A simple word parsed in the file + /// + internal class ParsedWord : ParsedScopeItem { + public override void Accept(IParserVisitor visitor) { + visitor.Visit(this); + } + + public ParsedWord(string name, Token token) : base(name, token, ParsedScopeType.Root) { } + } + /// /// The "root" scope of a file /// diff --git a/3PA/MainFeatures/Parser/ParserAnalyze.cs b/3PA/MainFeatures/Parser/ParserAnalyze.cs index a9671053..48314bc3 100644 --- a/3PA/MainFeatures/Parser/ParserAnalyze.cs +++ b/3PA/MainFeatures/Parser/ParserAnalyze.cs @@ -1558,8 +1558,8 @@ private void CreateParsedIncludeFile(Token bracketToken) { switch (state) { case 0: // read the file name - if (token is TokenWord) { - fileName += token.Value; + if (token is TokenWord || token is TokenString) { + fileName += GetTokenStrippedValue(token); state++; } break; diff --git a/3PA/MainFeatures/Parser/ParserHandler.cs b/3PA/MainFeatures/Parser/ParserHandler.cs index 1c421837..288a7ed2 100644 --- a/3PA/MainFeatures/Parser/ParserHandler.cs +++ b/3PA/MainFeatures/Parser/ParserHandler.cs @@ -130,7 +130,7 @@ private static void DoParse() { } else { var textLexer = new TextLexer(Sci.GetTextAroundFirstVisibleLine(Config.Instance.NppAutoCompleteMaxLengthToParse), AutoCompletion.CurrentLangAdditionalChars); - var textVisitor = new TextLexerVisitor() { + var textVisitor = new TextLexerVisitor(_lastFilePathParsed) { IgnoreNumbers = Config.Instance.NppAutoCompleteIgnoreNumbers, MinWordLengthRequired = Config.Instance.NppAutoCompleteMinWordLengthRequired, KnownWords = KnownWords != null ? new HashSet(KnownWords, AutoCompletion.ParserStringComparer) : new HashSet(AutoCompletion.ParserStringComparer) diff --git a/3PA/MainFeatures/Parser/ParserVisitor.cs b/3PA/MainFeatures/Parser/ParserVisitor.cs index aca49e42..1ea9f686 100644 --- a/3PA/MainFeatures/Parser/ParserVisitor.cs +++ b/3PA/MainFeatures/Parser/ParserVisitor.cs @@ -197,6 +197,11 @@ public void PostVisit() { _parser = null; } + + public void Visit(ParsedWord pars) { + + } + /// /// Run statement, /// a second pass will be done after the visit is over to determine if a run is diff --git a/3PA/MainFeatures/Parser/TextLexerVisitor.cs b/3PA/MainFeatures/Parser/TextLexerVisitor.cs index ef40de11..eb221e01 100644 --- a/3PA/MainFeatures/Parser/TextLexerVisitor.cs +++ b/3PA/MainFeatures/Parser/TextLexerVisitor.cs @@ -44,6 +44,23 @@ internal class TextLexerVisitor : ILexerVisitor { public List ParsedCompletionItemsList { get; private set; } + public string FilePath { get; private set; } + + #endregion + + #region Private fields + + private ParsedFile _rootScope; + + #endregion + + #region Life and death + + public TextLexerVisitor(string filePath) { + FilePath = filePath; + _rootScope = new ParsedFile("Root", new TokenEos(null, 0, 0, 0, 0)); + } + #endregion #region Visits @@ -66,7 +83,7 @@ public void Visit(TokenNumber tok) { if (!IgnoreNumbers) { if (!KnownWords.Contains(tok.Value) && tok.EndPosition - tok.StartPosition >= MinWordLengthRequired) { KnownWords.Add(tok.Value); - PushToAutoCompletion(new NumberCompletionItem (), tok); + PushToAutoCompletion(new NumberCompletionItem(), tok); } } } @@ -84,7 +101,11 @@ public void Visit(TokenWord tok) { private void PushToAutoCompletion(TextCompletionItem item, Token origin) { item.DisplayText = origin.Value; - item.OriginToken = origin; + item.FromParser = true; + item.ParsedBaseItem = new ParsedWord(origin.Value, origin) { + FilePath = FilePath, + Scope = _rootScope + }; item.Ranking = AutoCompletion.FindRankingOfParsedItem(item.DisplayText); ParsedCompletionItemsList.Add(item); } diff --git a/3PA/MainFeatures/Pro/Deployer.cs b/3PA/MainFeatures/Pro/Deployer.cs index 9fef733c..a79e0077 100644 --- a/3PA/MainFeatures/Pro/Deployer.cs +++ b/3PA/MainFeatures/Pro/Deployer.cs @@ -26,8 +26,10 @@ using System.Linq; using System.Net; using System.Text; +using System.Text.RegularExpressions; using System.Threading.Tasks; using _3PA.Lib; +using _3PA.Lib.Ftp; using _3PA.NppCore; using _3PA._Resource; @@ -390,7 +392,7 @@ public List DeployFilterRules { /// /// This method returns the target directories (or pl, zip or ftp) for the given source path, for each : /// If CompileLocally, returns the directory of the source - /// If the deployment dir is empty and we didn't match an absolute compilation path, returns the source directoy as well + /// If the deployment dir is empty and we didn't match an absolute compilation path, returns the source directory as well /// public List GetTargetsNeededForFile(string sourcePath, int step) { @@ -461,13 +463,10 @@ public List GetTransfersNeededForFile(string file, int step) { /// Returns a list of files in the given folders (recursively or not depending on the option), /// this list is filtered thanks to the rules given (also, for step == 0, only progress files are listed) /// - public HashSet GetFilesList(List listOfFolderPath, SearchOption searchOptions, int step) { - // constructs the list of all the files (unique) accross the different folders + public HashSet GetFilesList(List listOfFolderPath, SearchOption searchOptions, int step, string fileExtensionFilter = "*") { + // constructs the list of all the files (unique) across the different folders var filesToCompile = new HashSet(StringComparer.CurrentCultureIgnoreCase); - // case of step 0 (compilation) we list only compilable files - var fileExtensionFilter = step == 0 ? Config.Instance.FilesPatternCompilable : "*"; - // construct the filters list var includeFiltersList = DeployFilterRules.Where(rule => rule.Step == step && rule.Include).ToList(); var excludeFiltersList = DeployFilterRules.Where(rule => rule.Step == step && !rule.Include).ToList(); @@ -503,27 +502,24 @@ public bool IsFilePassingFilters(string filePath, List include return passing; } - #endregion - - #region Deploy Files - /// - /// Creates a list of files to deploy after a compilation, - /// for each Origin file will correspond one (or more if it's a .cls) .r file, - /// and one .lst if the option has been checked + /// Creates a list of files to deploy for the given step /// - public List DeployFilesForStep(int step, List listOfSourceDir, SearchOption searchOptions, Action updateDeploymentPercentage = null) { + public List GetFilesToDeployForStep(int step, List listOfSourceDir, SearchOption searchOptions, string fileExtensionFilter = "*") { var outputList = new List(); // list the files to deploy foreach (var file in GetFilesList(listOfSourceDir, searchOptions, step)) { outputList.AddRange(GetTransfersNeededForFile(file, step)); } - - // do deploy - return DeployFiles(outputList, updateDeploymentPercentage); + + return outputList; } + #endregion + + #region Deploy Files + /// /// Deploy a given list of files (can reduce the list if there are duplicated items so it returns it) /// @@ -547,7 +543,7 @@ public List DeployFiles(List deployToDo, Action Path.GetDirectoryName(deploy.To)) .Select(group => group.First()) .ToNonNullList() - .ForEach(deploy => Utils.CreateDirectory(Path.GetDirectoryName(deploy.To))); + .ForEach(deploy => CreateDirectory(Path.GetDirectoryName(deploy.To), deploy)); #region preparation for archives (zip/pl) @@ -565,7 +561,7 @@ public List DeployFiles(List deployToDo, Action DeployType.Prolib) { @@ -624,13 +620,11 @@ public List DeployFiles(List deployToDo, Action !string.IsNullOrEmpty(deploy.ArchivePath) && deploy.ArchivePath.Equals(pathPl)), FileAttributes.Hidden); } } } - - var prolibMessage = new StringBuilder(); - + // for each .pl that needs to be created... foreach (var pl in dicPlToTempFolder) { var pl1 = pl; @@ -665,7 +659,7 @@ public List DeployFiles(List deployToDo, Action DeployFiles(List deployToDo, Action { - if (File.Exists(deploy.From)) - deploy.IsOk = !string.IsNullOrEmpty(deploy.ToTemp) && Utils.MoveFile(deploy.From, deploy.ToTemp); + deploy.IsOk = !string.IsNullOrEmpty(deploy.ToTemp) && MoveFile(deploy.From, deploy.ToTemp, deploy); if (deploy.IsOk) nbFilesDone[0]++; if (updateDeploymentPercentage != null) @@ -692,24 +686,26 @@ public List DeployFiles(List deployToDo, Action { deploy.IsOk = deploy.IsOk && Utils.MoveFile(deploy.ToTemp, deploy.From); }); + // move files from the temp subfolder + Parallel.ForEach(onePlSubFolderDeployments, deploy => { + deploy.IsOk = deploy.IsOk && MoveFile(deploy.ToTemp, deploy.From, deploy); + if (!prolibOk) { + deploy.DeployError = prolibExe.ErrorOutput.ToString(); + deploy.IsOk = false; + } + }); } // compress .pl prolibExe.StartInfo.WorkingDirectory = Path.GetDirectoryName(pl.Key) ?? ""; prolibExe.Arguments = pl.Key.ProQuoter() + " -compress -nowarn"; - if (!prolibExe.TryDoWait(true)) - prolibMessage.Append(prolibExe.ErrorOutput); + prolibExe.TryDoWait(true); - // delete temp folders - Utils.DeleteDirectory(pl.Value, true); + // delete temp folder + DeleteDirectory(pl.Value, onePlDeployments.Find(deploy => !string.IsNullOrEmpty(deploy.ArchivePath) && deploy.ArchivePath.Equals(pl1.Key)), true); } - - if (prolibMessage.Length > 0) - UserCommunication.Notify("Errors occured when trying to create/add files to the .pl file :
" + 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 - + /// /// Replace the variables <XXX> in the string /// @@ -798,6 +794,199 @@ private string GetRegexAndReplaceVariablesIn(string input) { input = ReplaceVariablesIn(input); return input.StartsWith(":") ? input.Remove(0, 1) : input.Replace('/', '\\').WildCardToRegex(); } + + /// + /// Creates the directory, can apply attributes + /// + private bool CreateDirectory(string path, FileToDeploy file, FileAttributes attributes = FileAttributes.Directory) { + try { + if (Directory.Exists(path)) + return true; + var dirInfo = Directory.CreateDirectory(path); + dirInfo.Attributes |= attributes; + } catch (Exception e) { + if (file != null) + file.DeployError = "Couldn't create directory " + path.ProQuoter() + " : \"" + e.Message + "\""; + return false; + } + return true; + } + + /// + /// Delete a dir, recursively + /// + private bool DeleteDirectory(string path, FileToDeploy file, bool recursive) { + try { + if (string.IsNullOrEmpty(path) || !Directory.Exists(path)) + return true; + Directory.Delete(path, recursive); + } catch (Exception e) { + if (file != null) + file.DeployError = "Couldn't delete the directory " + path.ProQuoter() + " : \"" + e.Message + "\""; + return false; + } + return true; + } + + /// + /// Move a file, return true if ok, false otherwise + /// + private bool MoveFile(string sourceFile, string targetFile, FileToDeploy file) { + try { + if (!File.Exists(sourceFile)) { + file.DeployError = "The source file " + sourceFile.ProQuoter() + " doesn't exist"; + return false; + } + if (sourceFile.Equals(targetFile)) + return true; + File.Delete(targetFile); + File.Move(sourceFile, targetFile); + } catch (Exception e) { + file.DeployError = "Couldn't move " + sourceFile.ProQuoter() + " to " + targetFile.ProQuoter() + " : \"" + e.Message + "\""; + return false; + } + return true; + } + + /// + /// Copy a file (erase existing target), ensures the user gets a feedback is something goes wrong + /// return true if ok, false otherwise + /// + private bool CopyFile(string sourceFile, string targetFile, FileToDeploy file) { + try { + if (sourceFile.Equals(targetFile)) + return true; + if (!File.Exists(sourceFile)) { + file.DeployError = "The source file " + sourceFile.ProQuoter() + " doesn't exist"; + return false; + } + File.Delete(targetFile); + File.Copy(sourceFile, targetFile); + } catch (Exception e) { + file.DeployError = "Couldn't move " + sourceFile.ProQuoter() + " to " + targetFile.ProQuoter() + " : \"" + e.Message + "\""; + return false; + } + return true; + } + + #region Wrapper around FtpsClient + + private static Dictionary _ftpClients = new Dictionary(); + + /// + /// Sends a file to a ftp(s) server : EASY MODE, connects, create the directories... + /// Utils.SendFileToFtp(@"D:\Profiles\jcaillon\Downloads\function_forward_sample.p", "ftp://cnaf049:sopra100@rs28.lyon.fr.sopra/cnaf/users/cnaf049/vm/jca/derp/yolo/test.p"); + /// + private static bool SendFileToFtp(string localFilePath, string ftpUri, FileToDeploy file) { + + if (string.IsNullOrEmpty(localFilePath) || !File.Exists(localFilePath)) { + file.DeployError = "The source file " + localFilePath.ProQuoter() + " doesn't exist"; + return false; + } + try { + // parse our uri + var regex = new Regex(@"^(ftps?:\/\/([^:\/@]*)?(:[^:\/@]*)?(@[^:\/@]*)?(:[^:\/@]*)?)(\/.*)$"); + var match = regex.Match(ftpUri.Replace("\\", "/")); + if (!match.Success) { + file.DeployError = "Invalid URI for the targeted FTP : " + ftpUri.ProQuoter(); + return false; + } + + var serverUri = match.Groups[1].Value; + var distantPath = match.Groups[6].Value; + string userName = null; + string passWord = null; + string server; + int port; + if (!string.IsNullOrEmpty(match.Groups[4].Value)) { + userName = match.Groups[2].Value; + passWord = match.Groups[3].Value.Trim(':'); + server = match.Groups[4].Value.Trim('@'); + if (!int.TryParse(match.Groups[5].Value.Trim(':'), out port)) + port = -1; + } else { + server = match.Groups[2].Value; + if (!int.TryParse(match.Groups[3].Value.Trim(':'), out port)) + port = -1; + } + + FtpsClient ftp; + if (!_ftpClients.ContainsKey(serverUri)) + _ftpClients.Add(serverUri, new FtpsClient()); + ftp = _ftpClients[serverUri]; + + // try to connect! + if (!ftp.Connected) { + if (!ConnectFtp(ftp, userName, passWord, server, port, file)) + return false; + } + + // dispose of the ftp on shutdown + Plug.OnShutDown += DisconnectFtp; + + try { + ftp.PutFile(localFilePath, distantPath); + } catch (Exception) { + + // might be disconnected?? + try { + ftp.GetCurrentDirectory(); + } catch (Exception) { + if (!ConnectFtp(ftp, userName, passWord, server, port, file)) + return false; + } + + // try to create the directory and then push the file again + ftp.MakeDir((Path.GetDirectoryName(distantPath) ?? "").Replace('\\', '/'), true); + ftp.PutFile(localFilePath, distantPath); + } + } catch (Exception e) { + file.DeployError = "Error sending " + localFilePath.ProQuoter() + " to FTP " + ftpUri.ProQuoter() + " : \"" + e.Message + "\""; + return false; + } + + return true; + } + + private static bool ConnectFtp(FtpsClient ftp, string userName, string passWord, string server, int port, FileToDeploy file) { + NetworkCredential credential = null; + if (!string.IsNullOrEmpty(userName)) + credential = new NetworkCredential(userName, passWord); + + var modes = new List(); + typeof(EsslSupportMode).ForEach((s, l) => { modes.Add((EsslSupportMode)l); }); + + ftp.DataConnectionMode = EDataConnectionMode.Passive; + while (!ftp.Connected && ftp.DataConnectionMode == EDataConnectionMode.Passive) { + foreach (var mode in modes.OrderByDescending(mode => mode)) { + try { + var curPort = port > -1 ? port : ((mode & EsslSupportMode.Implicit) == EsslSupportMode.Implicit ? 990 : 21); + ftp.Connect(server, curPort, credential, mode, 1800); + ftp.Connected = true; + break; + } catch (Exception) { + //ignored + } + } + ftp.DataConnectionMode = EDataConnectionMode.Active; + } + + // failed? + if (!ftp.Connected) { + file.DeployError = "Failed to connect to a FTP server with : " + string.Format(@"Username : {0}, Password : {1}, Host : {2}, Port : {3}", userName ?? "none", passWord ?? "none", server, port == -1 ? 21 : port); + return false; + } + return true; + } + + private static void DisconnectFtp() { + foreach (var ftpsClient in _ftpClients) { + ftpsClient.Value.Close(); + } + _ftpClients.Clear(); + } + + #endregion #endregion @@ -932,12 +1121,20 @@ public TransferNeeded(string targetDir, DeployType deployType, bool finalDeploy) #region FileToDeploy public class FileToDeploy { + /// /// The path of input file that was originally compiled to trigger this move /// public string Origin { get; set; } + /// + /// Need to move this file FROM this path + /// public string From { get; set; } + + /// + /// Need to move this file TO this path + /// public string To { get; set; } /// @@ -951,10 +1148,15 @@ public class FileToDeploy { public string TargetDir { get; set; } /// - /// Type de transfer + /// Type of transfer /// public DeployType DeployType { get; set; } + /// + /// Null if no errors, otherwise it contains the description of the error that occurred for this file + /// + public string DeployError { get; set; } + /// /// true if this is the last deploy action for the file /// diff --git a/3PA/MainFeatures/Pro/FilesInfo.cs b/3PA/MainFeatures/Pro/FilesInfo.cs index 9f8c5077..b0ec689b 100644 --- a/3PA/MainFeatures/Pro/FilesInfo.cs +++ b/3PA/MainFeatures/Pro/FilesInfo.cs @@ -275,7 +275,7 @@ public static bool ClearAllErrors(string filePath, bool clearForCompil = false) if (clearForCompil) { // for each file info that has an error generated when compiling the "filePath" - foreach (var kpv in _sessionInfo.Where(pair => pair.Value.FileErrors != null && pair.Value.FileErrors.Exists(error => error.CompiledFilePath.EqualsCi(filePath)))) { + foreach (var kpv in _sessionInfo.Where(pair => pair.Value.FileErrors != null && pair.Value.FileErrors.Exists(error => error.CompiledFilePath != null && error.CompiledFilePath.EqualsCi(filePath)))) { kpv.Value.FileErrors.Clear(); jobDone = true; @@ -413,13 +413,17 @@ public static void GoToPrevError(int line) { public static void ProExecutionHandleCompilationOnEachCompilationOk(ProExecutionHandleCompilation proExecutionHandleCompilation, List fileToCompiles, Dictionary> errorsList, List filesToDeploy) { // clear errors on each compiled file - foreach (var fileToCompile in fileToCompiles) { - ClearAllErrors(fileToCompile.InputPath, true); + if (fileToCompiles != null) { + foreach (var fileToCompile in fileToCompiles) { + ClearAllErrors(fileToCompile.InputPath, true); + } } // update the errors - foreach (var keyValue in errorsList) { - UpdateFileErrors(keyValue.Key, keyValue.Value); + if (errorsList != null) { + foreach (var keyValue in errorsList) { + UpdateFileErrors(keyValue.Key, keyValue.Value); + } } } diff --git a/3PA/MainFeatures/Pro/ProCompilation.cs b/3PA/MainFeatures/Pro/ProCompilation.cs index 04e06088..9c64bf56 100644 --- a/3PA/MainFeatures/Pro/ProCompilation.cs +++ b/3PA/MainFeatures/Pro/ProCompilation.cs @@ -119,7 +119,7 @@ public bool CompilationDone { /// total number of processes used /// public int TotalNumberOfProcesses { - get { return _processes != null ? _processes.Count : 0; } + get { return _processes.Count; } } /// @@ -162,6 +162,27 @@ public int NumberOfFilesTreated { } } + /// + /// List of all the files that needed to be compiled (should be used after the execution) + /// + public List ListFilesToCompile { + get { return _listFilesToCompile; } + } + + /// + /// List of all the compilation errors found (should be used after the execution) + /// + public Dictionary> ListErrors { + get { return _listErrors; } + } + + /// + /// List of all the files that need to be deployed after the compilation (should be used after the execution) + /// + public List ListFilesToDeploy { + get { return _listFilesToDeploy; } + } + #endregion #region private fields @@ -202,35 +223,32 @@ public ProCompilation(ProEnvironment.ProEnvironmentObject proEnv) { /// /// Compiles the list of files given /// - public bool CompileFiles(HashSet filesToCompile) { + public bool CompileFiles(List filesToCompile) { + + if (filesToCompile == null || filesToCompile.Count == 0) { + EndOfCompilation(); + return true; + } // init StartingTime = DateTime.Now; NbFilesToCompile = filesToCompile.Count; // now we do a list of those files, sorted from the biggest (in size) to the smallest file - var sizeFileList = new List(); - foreach (var filePath in filesToCompile) { - var fileInfo = new FileInfo(filePath); - sizeFileList.Add(new ProCompilationFile { - Path = filePath, - Size = fileInfo.Length - }); - } - sizeFileList.Sort((file1, file2) => file2.Size.CompareTo(file1.Size)); + filesToCompile.Sort((file1, file2) => file2.Size.CompareTo(file1.Size)); // we want to dispatch all those files in a fair way among the Prowin processes we will create... var numberOfProcesses = MonoProcess ? 1 : NumberOfProcessesPerCore * Environment.ProcessorCount; var fileLists = new List>(); var currentProcess = 0; - foreach (var file in sizeFileList) { + foreach (var file in filesToCompile) { // create a new process when needed if (currentProcess >= fileLists.Count) fileLists.Add(new List()); // assign the file to the current process - fileLists[currentProcess].Add(new FileToCompile(file.Path)); + fileLists[currentProcess].Add(file); // we will assign the next file to the next process... currentProcess++; @@ -386,13 +404,5 @@ private string GetElapsedTime() { #endregion - #region internal structure - - private struct ProCompilationFile { - public string Path { get; set; } - public long Size { get; set; } - } - - #endregion } } \ No newline at end of file diff --git a/3PA/MainFeatures/Pro/ProDeployment.cs b/3PA/MainFeatures/Pro/ProDeployment.cs index 3b6812f0..70a350cc 100644 --- a/3PA/MainFeatures/Pro/ProDeployment.cs +++ b/3PA/MainFeatures/Pro/ProDeployment.cs @@ -30,11 +30,6 @@ internal class ProDeployment { #region Options - /// - /// If null, we list the files to compile from the source directory considering the filter rules - /// - public HashSet FilesToCompile { get; set; } - /// /// If true, don't actually do anything, just test it /// @@ -44,10 +39,15 @@ internal class ProDeployment { #region Public properties + /// + /// max step composing this deployment + /// + public int MaxStep { get; private set; } + /// /// Total number of steps composing this deployment /// - public int TotalNumberOfSteps { get; private set; } + public int TotalNumberOfSteps { get { return MaxStep + 2; } } /// /// Current deployment step @@ -59,10 +59,7 @@ internal class ProDeployment { /// public float ProgressionPercentage { get { - float totalPerc = 0; - if (_proCompilation != null) { - totalPerc += _proCompilation.CompilationProgression; - } + float totalPerc = _proCompilation == null ? 0 : _proCompilation.CompilationProgression; if (CurrentStep > 0) { totalPerc += CurrentStep * 100; } @@ -91,8 +88,6 @@ public float ProgressionPercentage { private Dictionary> _filesToDeployPerStep = new Dictionary>(); - private Dictionary> _compilationErrors; - private DeployProfile _currentProfile; private ProEnvironment.ProEnvironmentObject _proEnv; @@ -124,7 +119,7 @@ public ProDeployment(ProEnvironment.ProEnvironmentObject proEnv, DeployProfile c public bool Start() { StartingTime = DateTime.Now; - TotalNumberOfSteps = _proEnv.Deployer.DeployTransferRules.Count > 0 ? _proEnv.Deployer.DeployTransferRules.Max(rule => rule.Step) : 0; + MaxStep = _proEnv.Deployer.DeployTransferRules.Count > 0 ? _proEnv.Deployer.DeployTransferRules.Max(rule => rule.Step) : 0; _filesToDeployPerStep.Clear(); // new mass compilation @@ -138,16 +133,8 @@ public bool Start() { _proCompilation.OnCompilationOk += OnCompilationOk; _proCompilation.OnCompilationFailed += OnCompilationFailed; - - // list all the files to compile - if (FilesToCompile == null) { - FilesToCompile = _proEnv.Deployer.GetFilesList( - new List {_currentProfile.SourceDirectory}, - _currentProfile.ExploreRecursively ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly, - 0); - } - - return FilesToCompile.Count == 0 || _proCompilation.CompileFiles(FilesToCompile); + + return _proCompilation.CompileFiles(GetFilesToCompileInStepZero()); } /// @@ -166,12 +153,34 @@ public string GetElapsedTime() { #endregion + /// + /// List all the compilable files in the source directory + /// + protected virtual List GetFilesToCompileInStepZero() { + return + _proEnv.Deployer.GetFilesList( + new List { _currentProfile.SourceDirectory }, + _currentProfile.ExploreRecursively ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly, + 0, + Config.Instance.FilesPatternCompilable + ).Select(s => new FileToCompile(s)).ToList(); + } + + /// + /// List all the files that should be deployed from the source directory + /// + protected virtual List GetFilesToDeployInStepOne() { + return _proEnv.Deployer.GetFilesToDeployForStep(1, + new List { _currentProfile.SourceDirectory }, + _currentProfile.ExploreRecursively ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly + ); + } + #region Private /// /// Called when the compilation step 0 failed /// - /// private void OnCompilationFailed(ProCompilation proCompilation) { CompilationHasFailed = true; EndOfDeployment(); @@ -182,8 +191,6 @@ private void OnCompilationFailed(ProCompilation proCompilation) { /// private void OnCompilationOk(ProCompilation comp, List fileToCompiles, Dictionary> compilationErrors, List filesToDeploy) { - _compilationErrors = compilationErrors; - // Make the deployment for the compilation step (0) _filesToDeployPerStep.Add(0, _proEnv.Deployer.DeployFiles(filesToDeploy, f => _currentStepDeployPercentage = f)); @@ -200,16 +207,20 @@ private void DeployStepOneAndMore(int currentStep) { _currentStepDeployPercentage = 0; CurrentStep = currentStep; - if (currentStep <= TotalNumberOfSteps) { - - _filesToDeployPerStep.Add(currentStep, - _proEnv.Deployer.DeployFilesForStep( - currentStep, - new List { currentStep == 1 ? _currentProfile.SourceDirectory : _proEnv.BaseCompilationPath }, - _currentProfile.ExploreRecursively ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly, - f => _currentStepDeployPercentage = f - ) - ); + if (currentStep <= MaxStep) { + + List filesToDeploy; + + if (currentStep == 1) { + filesToDeploy = GetFilesToDeployInStepOne(); + } else { + filesToDeploy = _proEnv.Deployer.GetFilesToDeployForStep(currentStep, + new List {_proEnv.BaseCompilationPath}, + _currentProfile.ExploreRecursively ? SearchOption.AllDirectories : SearchOption.TopDirectoryOnly + ); + } + + _filesToDeployPerStep.Add(currentStep, _proEnv.Deployer.DeployFiles(filesToDeploy, f => _currentStepDeployPercentage = f)); // hook ExecuteDeploymentHook(currentStep); @@ -267,6 +278,9 @@ private void EndOfDeployment() { #region FormatDeploymentReport + /// + /// Generate an html report for the current deployment + /// public string FormatDeploymentReport() { StringBuilder currentReport = new StringBuilder(); @@ -327,7 +341,7 @@ public string FormatDeploymentReport() { foreach (var fileToCompile in _proCompilation.GetListOfFileToCompile.OrderBy(compile => Path.GetFileName(compile.InputPath))) { var toCompile = fileToCompile; - var errorsOfTheFile = _compilationErrors.ContainsKey(toCompile.InputPath) ? _compilationErrors[toCompile.InputPath] : new List(); + var errorsOfTheFile = _proCompilation.ListErrors.ContainsKey(toCompile.InputPath) ? _proCompilation.ListErrors[toCompile.InputPath] : new List(); bool hasError = errorsOfTheFile.Count > 0 && errorsOfTheFile.Exists(error => error.Level > ErrorLevel.StrongWarning); bool hasWarning = errorsOfTheFile.Count > 0 && errorsOfTheFile.Exists(error => error.Level <= ErrorLevel.StrongWarning); @@ -384,11 +398,15 @@ public string FormatDeploymentReport() { var transferMsg = file.DeployType == DeployType.Move ? "" : "(" + file.DeployType + ") "; line.Append("
"); if (file.IsOk) { - line.Append("" + 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 /// public string GetPfPath() { - return (!string.IsNullOrEmpty(CurrentDb) && DbConnectionInfo.ContainsKey(CurrentDb)) ? DbConnectionInfo[CurrentDb] : - string.Empty; + if (!string.IsNullOrEmpty(CurrentDb) && DbConnectionInfo.ContainsKey(CurrentDb)) { + return DbConnectionInfo[CurrentDb]; + } + if (DbConnectionInfo.Count > 0) { + CurrentDb = DbConnectionInfo.First().Key; + } + return string.Empty; } public bool RemoveCurrentPfPath() { diff --git a/3PA/MainFeatures/Pro/ProExecution.cs b/3PA/MainFeatures/Pro/ProExecution.cs index bbbc7083..08436e1f 100644 --- a/3PA/MainFeatures/Pro/ProExecution.cs +++ b/3PA/MainFeatures/Pro/ProExecution.cs @@ -648,13 +648,6 @@ public ProExecutionHandleCompilation(ProEnvironment.ProEnvironmentObject proEnv) #region Override - protected override string CheckParameters() { - if (ExecutionType == ExecutionType.Compile && !ProEnv.CompileLocally && !Path.IsPathRooted(ProEnv.BaseCompilationPath)) { - return "The path for the compilation base directory is incorrect :
" + (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> ReadErrorsFromFile(string f #region FileToCompile internal class FileToCompile { - // stores the path + /// + /// The path to the source that needs to be compiled + /// public string InputPath { get; set; } + /// + /// Size of the file to compile (set in constructor) + /// + public long Size { get; private set; } + // stores temporary path used during the compilation public string CompInputPath { get; set; } public string CompOutputDir { get; set; } @@ -902,6 +902,9 @@ internal class FileToCompile { public string CompOutputLis { get; set; } public string CompOutputDbg { get; set; } + /// + /// Returns the base file name (set in constructor) + /// public string BaseFileName { get; private set; } /// @@ -910,6 +913,11 @@ internal class FileToCompile { public FileToCompile(string inputPath) { InputPath = inputPath; BaseFileName = Path.GetFileNameWithoutExtension(inputPath); + try { + Size = new FileInfo(inputPath).Length; + } catch (Exception) { + Size = 0; + } } } @@ -1124,8 +1132,6 @@ internal class ProExecutionRun : ProExecutionHandleCompilation { public override ExecutionType ExecutionType { get { return ExecutionType.Run; } } - private static bool _dontWarnAboutRCode; - protected override bool SetExecutionInfo() { if (!base.SetExecutionInfo()) @@ -1133,16 +1139,6 @@ protected override bool SetExecutionInfo() { _processStartDir = Path.GetDirectoryName(Files.First().InputPath) ?? _localTempDir; - // when running a procedure, check that a .r is not hiding the program, if that's the case we warn the user - if (!_dontWarnAboutRCode) { - if (File.Exists(Path.ChangeExtension(Files.First().InputPath, ".r"))) { - UserCommunication.NotifyUnique("rcodehide", "Friendly warning, an r-code (i.e. *.r file) is hiding the current program
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 /// public static void GoToDefinition(bool fromMouseClick) { + // if a tooltip is opened, try to execute the "go to definition" of the tooltip first if (InfoToolTip.InfoToolTip.IsVisible) { if (!string.IsNullOrEmpty(InfoToolTip.InfoToolTip.GoToDefinitionFile)) { @@ -196,10 +197,6 @@ public static void GoToDefinition(bool fromMouseClick) { UserCommunication.Notify("Sorry, couldn't go to the definition of " + curWord + "", MessageImg.MsgInfo, "Information", "Failed to find an origin", 5); } - public static void GoToDefinition() { - GoToDefinition(false); - } - #endregion #region Open help @@ -312,9 +309,11 @@ public static void OpenDataReader() { } #endregion - + #region Single : Compilation, Check syntax, Run, Prolint + private static bool _dontWarnAboutRCode; + /// /// Called to run/compile/check/prolint the current program /// @@ -344,6 +343,16 @@ public static void StartProgressExec(ExecutionType executionType, ActionYou can change the list of valid extensions in the settings window", MessageImg.MsgWarning, "Invalid file extension", "Not an executable", 10); return; } + + // when running a procedure, check that a .r is not hiding the program, if that's the case we warn the user + if (executionType == ExecutionType.Run && !_dontWarnAboutRCode) { + if (File.Exists(Path.ChangeExtension(Npp.CurrentFile.Path, ".r"))) { + UserCommunication.NotifyUnique("rcodehide", "Friendly warning, an r-code (i.e. *.r file) is hiding the current program
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(CurrentFile.Path, Sci.FirstVisibleLine, Sci.CurrentPoint)); } diff --git a/3PA/Plug.cs b/3PA/Plug.cs index 8a12020d..ba83f7e9 100644 --- a/3PA/Plug.cs +++ b/3PA/Plug.cs @@ -639,9 +639,6 @@ public static void OnSciMarginClick(SCNotification nc) { /// When the user leaves his cursor inactive on npp /// public static void OnSciDwellStart() { - if (!Npp.CurrentFile.IsProgress) - return; - if (WinApi.GetForegroundWindow() == Npp.Handle) InfoToolTip.ShowToolTipFromDwell(); } diff --git a/3PA/Tests/PlugDebug.cs b/3PA/Tests/PlugDebug.cs index c12c4270..2d9c19b4 100644 --- a/3PA/Tests/PlugDebug.cs +++ b/3PA/Tests/PlugDebug.cs @@ -28,6 +28,7 @@ using System.IO; using System.Net; using System.Text; +using System.Text.RegularExpressions; using YamuiFramework.Helper; using _3PA.Lib; using _3PA.MainFeatures; @@ -43,8 +44,61 @@ internal class PlugDebug { #region Debug test public static void DebugTest1() { - UserCommunication.Notify("fuck"); - MeasureIt(() => { }, "2 : "); + + FindIncludes2(); + + MeasureIt(() => { + }, "1 : "); + } + + private static void FindIncludes2() { + Utils.ForEachLine(@"d:\Profiles\jcaillon\Desktop\test.xrf", new byte[0], (i, line) => { + var startIdx = 0; + do { + var incIdx = line.IndexOf("INCLUDE ", startIdx, StringComparison.CurrentCulture); + if (incIdx > 0) { + // the line format should be 999 INCLUDE inc.i, we test the presence of the number + if (incIdx - 2 < 0 || !char.IsDigit(line[incIdx - 2])) { + startIdx = incIdx + 1; + continue; + } + // position at the start of inc.i + incIdx += 8; + if (incIdx < line.Length - 1) { + // skip a first " + if (line[incIdx] == '"') { + incIdx++; + } + // skip all the whitespaces + while (incIdx < line.Length && char.IsWhiteSpace(line[incIdx])) { + incIdx++; + } + // now match until the next whitespace + var maxIdx = incIdx; + while (maxIdx < line.Length && !char.IsWhiteSpace(line[maxIdx])) { + maxIdx++; + } + // extract the .i name + if (maxIdx > incIdx) { + var yoyo = line.Substring(incIdx, maxIdx - incIdx).Trim().TrimEnd('"'); + UserCommunication.Notify(yoyo); + } + } + } + break; + } while (true); + }, Encoding.Default); + } + + private static void FindIncludes() { + var source = Utils.ReadAllText(@"d:\Profiles\jcaillon\Desktop\test.xrf", Encoding.Default); + + var regex = new Regex("\\s[0-9]+\\sINCLUDE\\s([^\"][^\\s]*)"); + foreach (Match match in regex.Matches(source)) { + if (match.Groups.Count > 0) { + //UserCommunication.Notify(match.Groups[1].Value); + } + } } public static void DebugTest2() {} @@ -244,6 +298,10 @@ private void AppendEverything(T item) { Output.Append("\r\n"); } + public void Visit(ParsedWord pars) { + AppendEverything(pars); + } + public void Visit(ParsedFile pars) { AppendEverything(pars); } diff --git a/3PA/_Resource/ImageResources.Designer.cs b/3PA/_Resource/ImageResources.Designer.cs index 326065f4..18edd860 100644 --- a/3PA/_Resource/ImageResources.Designer.cs +++ b/3PA/_Resource/ImageResources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// Ce code a été généré par un outil. -// Version du runtime :4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// Les modifications apportées à ce fichier peuvent provoquer un comportement incorrect et seront perdues si -// le code est régénéré. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -13,12 +13,12 @@ namespace _3PA._Resource { /// - /// Une classe de ressource fortement typée destinée, entre autres, à la consultation des chaînes localisées. + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // Cette classe a été générée automatiquement par la classe StronglyTypedResourceBuilder - // à l'aide d'un outil, tel que ResGen ou Visual Studio. - // Pour ajouter ou supprimer un membre, modifiez votre fichier .ResX, puis réexécutez ResGen - // avec l'option /str ou régénérez votre projet VS. + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] @@ -33,7 +33,7 @@ internal ImageResources() { } /// - /// Retourne l'instance ResourceManager mise en cache utilisée par cette classe. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ internal ImageResources() { } /// - /// Remplace la propriété CurrentUICulture du thread actuel pour toutes - /// les recherches de ressources à l'aide de cette classe de ressource fortement typée. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { @@ -61,7 +61,7 @@ internal ImageResources() { } /// - /// Recherche une ressource localisée de type System.Drawing.Icon semblable à (Icône). + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// internal static System.Drawing.Icon _3p_icon { get { @@ -71,7 +71,7 @@ internal static System.Drawing.Icon _3p_icon { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Abbreviation { get { @@ -81,7 +81,7 @@ internal static System.Drawing.Bitmap Abbreviation { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Abstract { get { @@ -91,7 +91,7 @@ internal static System.Drawing.Bitmap Abstract { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Add { get { @@ -101,7 +101,7 @@ internal static System.Drawing.Bitmap Add { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Alphabetical_sorting { get { @@ -111,7 +111,7 @@ internal static System.Drawing.Bitmap Alphabetical_sorting { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Autocompletion { get { @@ -121,7 +121,7 @@ internal static System.Drawing.Bitmap Autocompletion { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap bg_darkmaul { get { @@ -131,7 +131,7 @@ internal static System.Drawing.Bitmap bg_darkmaul { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap bg_hellokitty { get { @@ -141,7 +141,7 @@ internal static System.Drawing.Bitmap bg_hellokitty { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap bg_MaximoVLorenzo { get { @@ -151,7 +151,7 @@ internal static System.Drawing.Bitmap bg_MaximoVLorenzo { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap bg_oss { get { @@ -161,7 +161,7 @@ internal static System.Drawing.Bitmap bg_oss { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Block { get { @@ -171,7 +171,7 @@ internal static System.Drawing.Bitmap Block { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap BringToFront { get { @@ -181,7 +181,7 @@ internal static System.Drawing.Bitmap BringToFront { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Browse { get { @@ -191,7 +191,7 @@ internal static System.Drawing.Bitmap Browse { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Buffer { get { @@ -201,7 +201,7 @@ internal static System.Drawing.Bitmap Buffer { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Calendar { get { @@ -211,7 +211,7 @@ internal static System.Drawing.Bitmap Calendar { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Cancel { get { @@ -221,7 +221,7 @@ internal static System.Drawing.Bitmap Cancel { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap CheckCode { get { @@ -231,7 +231,7 @@ internal static System.Drawing.Bitmap CheckCode { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Class { get { @@ -241,7 +241,7 @@ internal static System.Drawing.Bitmap Class { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ClearAll { get { @@ -251,7 +251,7 @@ internal static System.Drawing.Bitmap ClearAll { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap CodeExplorer16x16 { get { @@ -261,7 +261,7 @@ internal static System.Drawing.Bitmap CodeExplorer16x16 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap CodeExplorerLogo { get { @@ -271,7 +271,7 @@ internal static System.Drawing.Bitmap CodeExplorerLogo { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Collapse { get { @@ -281,7 +281,7 @@ internal static System.Drawing.Bitmap Collapse { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap CompileCode { get { @@ -291,7 +291,7 @@ internal static System.Drawing.Bitmap CompileCode { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap CompileOptions { get { @@ -301,7 +301,7 @@ internal static System.Drawing.Bitmap CompileOptions { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Configuration { get { @@ -311,7 +311,7 @@ internal static System.Drawing.Bitmap Configuration { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Constructor { get { @@ -321,7 +321,7 @@ internal static System.Drawing.Bitmap Constructor { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Copy { get { @@ -331,7 +331,7 @@ internal static System.Drawing.Bitmap Copy { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap CreateWindowBlock { get { @@ -341,7 +341,7 @@ internal static System.Drawing.Bitmap CreateWindowBlock { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap DataAdmin { get { @@ -351,7 +351,7 @@ internal static System.Drawing.Bitmap DataAdmin { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Database { get { @@ -361,7 +361,7 @@ internal static System.Drawing.Bitmap Database { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap DatabaseTools { get { @@ -371,7 +371,7 @@ internal static System.Drawing.Bitmap DatabaseTools { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap DataDigger { get { @@ -381,7 +381,7 @@ internal static System.Drawing.Bitmap DataDigger { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap DataReader { get { @@ -391,7 +391,7 @@ internal static System.Drawing.Bitmap DataReader { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Default { get { @@ -401,7 +401,7 @@ internal static System.Drawing.Bitmap Default { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap DefinedTempTable { get { @@ -411,7 +411,7 @@ internal static System.Drawing.Bitmap DefinedTempTable { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap DefinitionBlock { get { @@ -421,7 +421,7 @@ internal static System.Drawing.Bitmap DefinitionBlock { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Del { get { @@ -431,7 +431,7 @@ internal static System.Drawing.Bitmap Del { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Delete { get { @@ -441,7 +441,7 @@ internal static System.Drawing.Bitmap Delete { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap DeleteFunction { get { @@ -451,7 +451,7 @@ internal static System.Drawing.Bitmap DeleteFunction { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap DeleteProcedure { get { @@ -461,7 +461,7 @@ internal static System.Drawing.Bitmap DeleteProcedure { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Deploy { get { @@ -471,7 +471,7 @@ internal static System.Drawing.Bitmap Deploy { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Dictionary { get { @@ -481,7 +481,7 @@ internal static System.Drawing.Bitmap Dictionary { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap DisplayParserResults { get { @@ -491,7 +491,7 @@ internal static System.Drawing.Bitmap DisplayParserResults { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap DownloadAll { get { @@ -501,7 +501,7 @@ internal static System.Drawing.Bitmap DownloadAll { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap DownloadDbNok { get { @@ -511,7 +511,7 @@ internal static System.Drawing.Bitmap DownloadDbNok { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap DownloadDbOk { get { @@ -521,7 +521,7 @@ internal static System.Drawing.Bitmap DownloadDbOk { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Dynamic { get { @@ -531,7 +531,7 @@ internal static System.Drawing.Bitmap Dynamic { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap DynamicFunctionCall { get { @@ -541,7 +541,7 @@ internal static System.Drawing.Bitmap DynamicFunctionCall { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap DynamicFunctionCallExternal { get { @@ -551,7 +551,7 @@ internal static System.Drawing.Bitmap DynamicFunctionCallExternal { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Edit { get { @@ -561,7 +561,7 @@ internal static System.Drawing.Bitmap Edit { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap EditCode { get { @@ -571,7 +571,7 @@ internal static System.Drawing.Bitmap EditCode { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Env { get { @@ -581,7 +581,7 @@ internal static System.Drawing.Bitmap Env { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap EnvName { get { @@ -591,7 +591,7 @@ internal static System.Drawing.Bitmap EnvName { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap EnvSuffix { get { @@ -601,7 +601,7 @@ internal static System.Drawing.Bitmap EnvSuffix { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap eraser { get { @@ -611,7 +611,7 @@ internal static System.Drawing.Bitmap eraser { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Error { get { @@ -621,7 +621,7 @@ internal static System.Drawing.Bitmap Error { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Error30x30 { get { @@ -631,7 +631,7 @@ internal static System.Drawing.Bitmap Error30x30 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Expand { get { @@ -641,7 +641,7 @@ internal static System.Drawing.Bitmap Expand { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExplorerDir0 { get { @@ -651,7 +651,7 @@ internal static System.Drawing.Bitmap ExplorerDir0 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExplorerDir1 { get { @@ -661,7 +661,7 @@ internal static System.Drawing.Bitmap ExplorerDir1 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExplorerDir2 { get { @@ -671,7 +671,7 @@ internal static System.Drawing.Bitmap ExplorerDir2 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExplorerDir3 { get { @@ -681,7 +681,7 @@ internal static System.Drawing.Bitmap ExplorerDir3 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Export { get { @@ -691,7 +691,7 @@ internal static System.Drawing.Bitmap Export { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtCls { get { @@ -701,7 +701,7 @@ internal static System.Drawing.Bitmap ExtCls { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtD { get { @@ -711,7 +711,7 @@ internal static System.Drawing.Bitmap ExtD { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtDbg { get { @@ -721,7 +721,7 @@ internal static System.Drawing.Bitmap ExtDbg { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtDf { get { @@ -731,7 +731,7 @@ internal static System.Drawing.Bitmap ExtDf { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Extent { get { @@ -741,7 +741,7 @@ internal static System.Drawing.Bitmap Extent { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap External { get { @@ -751,7 +751,7 @@ internal static System.Drawing.Bitmap External { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExternalProcedure { get { @@ -761,7 +761,7 @@ internal static System.Drawing.Bitmap ExternalProcedure { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtFolder { get { @@ -771,7 +771,7 @@ internal static System.Drawing.Bitmap ExtFolder { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtFtp { get { @@ -781,7 +781,7 @@ internal static System.Drawing.Bitmap ExtFtp { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtI { get { @@ -791,7 +791,7 @@ internal static System.Drawing.Bitmap ExtI { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtLis { get { @@ -801,7 +801,7 @@ internal static System.Drawing.Bitmap ExtLis { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtP { get { @@ -811,7 +811,7 @@ internal static System.Drawing.Bitmap ExtP { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtPl { get { @@ -821,7 +821,7 @@ internal static System.Drawing.Bitmap ExtPl { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtR { get { @@ -831,7 +831,7 @@ internal static System.Drawing.Bitmap ExtR { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtT { get { @@ -841,7 +841,7 @@ internal static System.Drawing.Bitmap ExtT { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtUnknow { get { @@ -851,7 +851,7 @@ internal static System.Drawing.Bitmap ExtUnknow { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtW { get { @@ -861,7 +861,7 @@ internal static System.Drawing.Bitmap ExtW { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtXml { get { @@ -871,7 +871,7 @@ internal static System.Drawing.Bitmap ExtXml { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtXrf { get { @@ -881,7 +881,7 @@ internal static System.Drawing.Bitmap ExtXrf { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ExtZip { get { @@ -891,7 +891,7 @@ internal static System.Drawing.Bitmap ExtZip { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Favourite { get { @@ -901,7 +901,7 @@ internal static System.Drawing.Bitmap Favourite { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Fetch { get { @@ -911,7 +911,7 @@ internal static System.Drawing.Bitmap Fetch { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Field { get { @@ -921,7 +921,7 @@ internal static System.Drawing.Bitmap Field { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap FieldPk { get { @@ -931,7 +931,7 @@ internal static System.Drawing.Bitmap FieldPk { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap FileExplorer16x16 { get { @@ -941,7 +941,7 @@ internal static System.Drawing.Bitmap FileExplorer16x16 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap FileExplorerLogo { get { @@ -951,7 +951,7 @@ internal static System.Drawing.Bitmap FileExplorerLogo { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap FileInfo { get { @@ -961,7 +961,7 @@ internal static System.Drawing.Bitmap FileInfo { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap FileScope { get { @@ -971,7 +971,7 @@ internal static System.Drawing.Bitmap FileScope { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Final { get { @@ -981,7 +981,7 @@ internal static System.Drawing.Bitmap Final { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap FromInclude { get { @@ -991,7 +991,7 @@ internal static System.Drawing.Bitmap FromInclude { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Function { get { @@ -1001,7 +1001,7 @@ internal static System.Drawing.Bitmap Function { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap GenerateCode { get { @@ -1011,7 +1011,7 @@ internal static System.Drawing.Bitmap GenerateCode { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap GetHelp { get { @@ -1021,7 +1021,7 @@ internal static System.Drawing.Bitmap GetHelp { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap getting_started_0 { get { @@ -1031,7 +1031,7 @@ internal static System.Drawing.Bitmap getting_started_0 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap getting_started_1 { get { @@ -1041,7 +1041,7 @@ internal static System.Drawing.Bitmap getting_started_1 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap getting_started_2 { get { @@ -1051,7 +1051,7 @@ internal static System.Drawing.Bitmap getting_started_2 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap getting_started_3 { get { @@ -1061,7 +1061,7 @@ internal static System.Drawing.Bitmap getting_started_3 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Git { get { @@ -1071,7 +1071,7 @@ internal static System.Drawing.Bitmap Git { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Global { get { @@ -1081,7 +1081,7 @@ internal static System.Drawing.Bitmap Global { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap GoBackward { get { @@ -1091,7 +1091,7 @@ internal static System.Drawing.Bitmap GoBackward { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap GoToDefinition { get { @@ -1101,7 +1101,7 @@ internal static System.Drawing.Bitmap GoToDefinition { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Help { get { @@ -1111,7 +1111,7 @@ internal static System.Drawing.Bitmap Help { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Historic { get { @@ -1121,7 +1121,7 @@ internal static System.Drawing.Bitmap Historic { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Import { get { @@ -1131,7 +1131,7 @@ internal static System.Drawing.Bitmap Import { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Include { get { @@ -1141,7 +1141,7 @@ internal static System.Drawing.Bitmap Include { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap IndentCode { get { @@ -1151,7 +1151,7 @@ internal static System.Drawing.Bitmap IndentCode { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Index { get { @@ -1161,7 +1161,7 @@ internal static System.Drawing.Bitmap Index { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Input { get { @@ -1171,7 +1171,7 @@ internal static System.Drawing.Bitmap Input { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap InputOutput { get { @@ -1181,7 +1181,7 @@ internal static System.Drawing.Bitmap InputOutput { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap InsertMark { get { @@ -1191,7 +1191,7 @@ internal static System.Drawing.Bitmap InsertMark { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Keyword { get { @@ -1201,7 +1201,7 @@ internal static System.Drawing.Bitmap Keyword { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap KeywordObject { get { @@ -1211,7 +1211,7 @@ internal static System.Drawing.Bitmap KeywordObject { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Label { get { @@ -1221,7 +1221,7 @@ internal static System.Drawing.Bitmap Label { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap LangFunction { get { @@ -1231,7 +1231,7 @@ internal static System.Drawing.Bitmap LangFunction { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap LangWord { get { @@ -1241,7 +1241,7 @@ internal static System.Drawing.Bitmap LangWord { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap LocalScope { get { @@ -1251,7 +1251,7 @@ internal static System.Drawing.Bitmap LocalScope { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Logo150x150 { get { @@ -1261,7 +1261,7 @@ internal static System.Drawing.Bitmap Logo150x150 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Logo16x16 { get { @@ -1271,7 +1271,7 @@ internal static System.Drawing.Bitmap Logo16x16 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Logo20x20 { get { @@ -1281,7 +1281,7 @@ internal static System.Drawing.Bitmap Logo20x20 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Logo30x30 { get { @@ -1291,7 +1291,7 @@ internal static System.Drawing.Bitmap Logo30x30 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap MainBlock { get { @@ -1301,7 +1301,7 @@ internal static System.Drawing.Bitmap MainBlock { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap MainWindow { get { @@ -1311,7 +1311,7 @@ internal static System.Drawing.Bitmap MainWindow { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Mandatory { get { @@ -1321,7 +1321,7 @@ internal static System.Drawing.Bitmap Mandatory { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Method { get { @@ -1331,7 +1331,7 @@ internal static System.Drawing.Bitmap Method { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Miscellaneous { get { @@ -1341,7 +1341,7 @@ internal static System.Drawing.Bitmap Miscellaneous { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap MissingDbName { get { @@ -1351,7 +1351,7 @@ internal static System.Drawing.Bitmap MissingDbName { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ModificationTag { get { @@ -1361,7 +1361,7 @@ internal static System.Drawing.Bitmap ModificationTag { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap More { get { @@ -1371,7 +1371,7 @@ internal static System.Drawing.Bitmap More { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap MsgDebug { get { @@ -1381,7 +1381,7 @@ internal static System.Drawing.Bitmap MsgDebug { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap MsgError { get { @@ -1391,7 +1391,7 @@ internal static System.Drawing.Bitmap MsgError { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap MsgHighImportance { get { @@ -1401,7 +1401,7 @@ internal static System.Drawing.Bitmap MsgHighImportance { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap MsgInfo { get { @@ -1411,7 +1411,7 @@ internal static System.Drawing.Bitmap MsgInfo { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap MsgOk { get { @@ -1421,7 +1421,7 @@ internal static System.Drawing.Bitmap MsgOk { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap MsgPoison { get { @@ -1431,7 +1431,7 @@ internal static System.Drawing.Bitmap MsgPoison { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap MsgQuestion { get { @@ -1441,7 +1441,7 @@ internal static System.Drawing.Bitmap MsgQuestion { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap MsgRip { get { @@ -1451,7 +1451,7 @@ internal static System.Drawing.Bitmap MsgRip { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap MsgToolTip { get { @@ -1461,7 +1461,7 @@ internal static System.Drawing.Bitmap MsgToolTip { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap MsgUpdate { get { @@ -1471,7 +1471,7 @@ internal static System.Drawing.Bitmap MsgUpdate { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap MsgWarning { get { @@ -1481,7 +1481,7 @@ internal static System.Drawing.Bitmap MsgWarning { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap New { get { @@ -1491,7 +1491,7 @@ internal static System.Drawing.Bitmap New { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Next { get { @@ -1501,7 +1501,7 @@ internal static System.Drawing.Bitmap Next { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap NotApplicable { get { @@ -1511,7 +1511,7 @@ internal static System.Drawing.Bitmap NotApplicable { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap NotFound { get { @@ -1521,7 +1521,7 @@ internal static System.Drawing.Bitmap NotFound { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap NotSaved { get { @@ -1531,17 +1531,17 @@ internal static System.Drawing.Bitmap NotSaved { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Numbers { + internal static System.Drawing.Bitmap Number { get { - object obj = ResourceManager.GetObject("Numbers", resourceCulture); + object obj = ResourceManager.GetObject("Number", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Numerical_sorting { get { @@ -1551,7 +1551,7 @@ internal static System.Drawing.Bitmap Numerical_sorting { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Ok { get { @@ -1561,7 +1561,7 @@ internal static System.Drawing.Bitmap Ok { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Ok30x30 { get { @@ -1571,7 +1571,7 @@ internal static System.Drawing.Bitmap Ok30x30 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap OnEvent { get { @@ -1581,7 +1581,7 @@ internal static System.Drawing.Bitmap OnEvent { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap OpenInExplorer { get { @@ -1591,7 +1591,7 @@ internal static System.Drawing.Bitmap OpenInExplorer { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap OutDated { get { @@ -1601,7 +1601,7 @@ internal static System.Drawing.Bitmap OutDated { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Output { get { @@ -1611,7 +1611,7 @@ internal static System.Drawing.Bitmap Output { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Override { get { @@ -1621,7 +1621,7 @@ internal static System.Drawing.Bitmap Override { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Parameter { get { @@ -1631,7 +1631,7 @@ internal static System.Drawing.Bitmap Parameter { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Persistent { get { @@ -1641,7 +1641,7 @@ internal static System.Drawing.Bitmap Persistent { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Preprocessed { get { @@ -1651,7 +1651,7 @@ internal static System.Drawing.Bitmap Preprocessed { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap PreprocessorBlock { get { @@ -1661,7 +1661,7 @@ internal static System.Drawing.Bitmap PreprocessorBlock { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Previous { get { @@ -1671,7 +1671,7 @@ internal static System.Drawing.Bitmap Previous { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Primary { get { @@ -1681,7 +1681,7 @@ internal static System.Drawing.Bitmap Primary { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Private { get { @@ -1691,7 +1691,7 @@ internal static System.Drawing.Bitmap Private { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Procedure { get { @@ -1701,7 +1701,7 @@ internal static System.Drawing.Bitmap Procedure { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ProDesktop { get { @@ -1711,7 +1711,7 @@ internal static System.Drawing.Bitmap ProDesktop { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ProgramParameter { get { @@ -1721,7 +1721,7 @@ internal static System.Drawing.Bitmap ProgramParameter { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ProgressHelp { get { @@ -1731,7 +1731,7 @@ internal static System.Drawing.Bitmap ProgressHelp { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ProgressTools { get { @@ -1741,7 +1741,7 @@ internal static System.Drawing.Bitmap ProgressTools { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ProlintCode { get { @@ -1751,7 +1751,7 @@ internal static System.Drawing.Bitmap ProlintCode { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Protected { get { @@ -1761,7 +1761,7 @@ internal static System.Drawing.Bitmap Protected { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Prototype { get { @@ -1771,7 +1771,7 @@ internal static System.Drawing.Bitmap Prototype { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Public { get { @@ -1781,7 +1781,7 @@ internal static System.Drawing.Bitmap Public { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Publish { get { @@ -1791,7 +1791,7 @@ internal static System.Drawing.Bitmap Publish { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Push { get { @@ -1801,7 +1801,7 @@ internal static System.Drawing.Bitmap Push { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ReadOnly { get { @@ -1811,7 +1811,7 @@ internal static System.Drawing.Bitmap ReadOnly { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Recycle_sign { get { @@ -1821,7 +1821,7 @@ internal static System.Drawing.Bitmap Recycle_sign { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Refresh { get { @@ -1831,7 +1831,7 @@ internal static System.Drawing.Bitmap Refresh { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Refreshing { get { @@ -1841,7 +1841,7 @@ internal static System.Drawing.Bitmap Refreshing { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Report { get { @@ -1851,7 +1851,7 @@ internal static System.Drawing.Bitmap Report { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Report_64x64 { get { @@ -1861,7 +1861,7 @@ internal static System.Drawing.Bitmap Report_64x64 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Reserved { get { @@ -1871,7 +1871,7 @@ internal static System.Drawing.Bitmap Reserved { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Return { get { @@ -1881,7 +1881,7 @@ internal static System.Drawing.Bitmap Return { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Root { get { @@ -1891,7 +1891,7 @@ internal static System.Drawing.Bitmap Root { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Rules { get { @@ -1901,7 +1901,7 @@ internal static System.Drawing.Bitmap Rules { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap RunCode { get { @@ -1911,7 +1911,7 @@ internal static System.Drawing.Bitmap RunCode { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap RunExternal { get { @@ -1921,7 +1921,7 @@ internal static System.Drawing.Bitmap RunExternal { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap RunInternal { get { @@ -1931,7 +1931,7 @@ internal static System.Drawing.Bitmap RunInternal { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap RuntimeBlock { get { @@ -1941,7 +1941,7 @@ internal static System.Drawing.Bitmap RuntimeBlock { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Save { get { @@ -1951,7 +1951,7 @@ internal static System.Drawing.Bitmap Save { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Save2 { get { @@ -1961,7 +1961,7 @@ internal static System.Drawing.Bitmap Save2 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Search { get { @@ -1971,7 +1971,7 @@ internal static System.Drawing.Bitmap Search { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap SelectFile { get { @@ -1981,7 +1981,7 @@ internal static System.Drawing.Bitmap SelectFile { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap SendToAppbuilder { get { @@ -1991,7 +1991,7 @@ internal static System.Drawing.Bitmap SendToAppbuilder { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Sequence { get { @@ -2001,7 +2001,7 @@ internal static System.Drawing.Bitmap Sequence { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Serializable { get { @@ -2011,7 +2011,7 @@ internal static System.Drawing.Bitmap Serializable { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap SettingsBlock { get { @@ -2021,7 +2021,7 @@ internal static System.Drawing.Bitmap SettingsBlock { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Shared { get { @@ -2031,7 +2031,7 @@ internal static System.Drawing.Bitmap Shared { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ShowOptions { get { @@ -2041,7 +2041,7 @@ internal static System.Drawing.Bitmap ShowOptions { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Snippet { get { @@ -2051,7 +2051,7 @@ internal static System.Drawing.Bitmap Snippet { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Static { get { @@ -2061,7 +2061,7 @@ internal static System.Drawing.Bitmap Static { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap StaticFunctionCall { get { @@ -2071,7 +2071,7 @@ internal static System.Drawing.Bitmap StaticFunctionCall { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Stop { get { @@ -2081,7 +2081,7 @@ internal static System.Drawing.Bitmap Stop { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Subscribe { get { @@ -2091,7 +2091,7 @@ internal static System.Drawing.Bitmap Subscribe { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Synchronize { get { @@ -2101,7 +2101,7 @@ internal static System.Drawing.Bitmap Synchronize { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Table { get { @@ -2111,7 +2111,7 @@ internal static System.Drawing.Bitmap Table { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap TableUsed { get { @@ -2121,7 +2121,7 @@ internal static System.Drawing.Bitmap TableUsed { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap TempTable { get { @@ -2131,7 +2131,7 @@ internal static System.Drawing.Bitmap TempTable { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap TempTableUsed { get { @@ -2141,7 +2141,7 @@ internal static System.Drawing.Bitmap TempTableUsed { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Tests { get { @@ -2151,7 +2151,7 @@ internal static System.Drawing.Bitmap Tests { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap TestTube { get { @@ -2161,7 +2161,7 @@ internal static System.Drawing.Bitmap TestTube { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Time { get { @@ -2171,7 +2171,7 @@ internal static System.Drawing.Bitmap Time { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap TitleBlock { get { @@ -2181,7 +2181,7 @@ internal static System.Drawing.Bitmap TitleBlock { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ToggleComment { get { @@ -2191,7 +2191,7 @@ internal static System.Drawing.Bitmap ToggleComment { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Turtle { get { @@ -2201,7 +2201,7 @@ internal static System.Drawing.Bitmap Turtle { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Uncertain { get { @@ -2211,7 +2211,7 @@ internal static System.Drawing.Bitmap Uncertain { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap UndoUserAction { get { @@ -2221,7 +2221,7 @@ internal static System.Drawing.Bitmap UndoUserAction { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Unsubscribe { get { @@ -2231,7 +2231,7 @@ internal static System.Drawing.Bitmap Unsubscribe { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Update { get { @@ -2241,7 +2241,7 @@ internal static System.Drawing.Bitmap Update { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap VariableComplex { get { @@ -2251,7 +2251,7 @@ internal static System.Drawing.Bitmap VariableComplex { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap VariablePrimitive { get { @@ -2261,7 +2261,7 @@ internal static System.Drawing.Bitmap VariablePrimitive { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ViewFile { get { @@ -2271,7 +2271,7 @@ internal static System.Drawing.Bitmap ViewFile { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Warning30x30 { get { @@ -2281,7 +2281,7 @@ internal static System.Drawing.Bitmap Warning30x30 { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Widget { get { @@ -2291,7 +2291,7 @@ internal static System.Drawing.Bitmap Widget { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap Word { get { @@ -2301,7 +2301,7 @@ internal static System.Drawing.Bitmap Word { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap XtfrBlock { get { @@ -2311,7 +2311,7 @@ internal static System.Drawing.Bitmap XtfrBlock { } /// - /// Recherche une ressource localisée de type System.Drawing.Bitmap. + /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap ZoomIn { get { diff --git a/3PA/_Resource/ImageResources.resx b/3PA/_Resource/ImageResources.resx index 4ef9f11f..2f948c39 100644 --- a/3PA/_Resource/ImageResources.resx +++ b/3PA/_Resource/ImageResources.resx @@ -730,9 +730,6 @@ images\menu\displayparserresults.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - images\parseritem\type\numbers.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - images\parseritem\type\langfunction.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -796,4 +793,7 @@ images\menu\compileoptions.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + images\parseritem\type\number.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/3PA/_Resource/Images/ParserItem/Type/Numbers.png b/3PA/_Resource/Images/ParserItem/Type/Number.png similarity index 100% rename from 3PA/_Resource/Images/ParserItem/Type/Numbers.png rename to 3PA/_Resource/Images/ParserItem/Type/Number.png diff --git a/YamuiFramework/HtmlRenderer/Core/Core/HtmlContainerInt.cs b/YamuiFramework/HtmlRenderer/Core/Core/HtmlContainerInt.cs index 3af7135b..54a87d4e 100644 --- a/YamuiFramework/HtmlRenderer/Core/Core/HtmlContainerInt.cs +++ b/YamuiFramework/HtmlRenderer/Core/Core/HtmlContainerInt.cs @@ -782,10 +782,12 @@ internal void HandleLinkClicked(RControl parent, RPoint location, CssBox link) { } } else { if (!string.IsNullOrEmpty(link.HrefLink) && Directory.Exists(link.HrefLink)) { - Process.Start("explorer.exe", "\"" + link.HrefLink + "\""); + Process.Start(link.HrefLink); } else { if (!string.IsNullOrEmpty(link.HrefLink) && File.Exists(link.HrefLink)) { - var process = new ProcessStartInfo(link.HrefLink) {UseShellExecute = true}; + var process = new ProcessStartInfo(link.HrefLink) { + UseShellExecute = true + }; Process.Start(process); } else { if (new Regex(@"^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_]*)?$").Match(link.HrefLink).Success) { diff --git a/newReleaseNotes.md b/newReleaseNotes.md index 20c6ead7..71e8c433 100644 --- a/newReleaseNotes.md +++ b/newReleaseNotes.md @@ -1,23 +1,28 @@ -Enjoy! +Once again, massive changes all across the board. The most important being the auto completion : try typing something in a non progress file! +More info on that [here - an alternative auto completion for notepad++](http://jcaillon.github.io/3P/#/alternative-autocompletion) + +For this beta version, I've temporary disable the `cancel` button in the deployment page, it will be back in the next release. If I also waited to correct that, I would have delayed this beta release for another month; but there are already too many new features to be tested, couldn't wait any longer. + +Enough talking. Enjoy! **Improvements :** - New options for each environment : - You can now choose a progress program that will be executed before each progress execution (like a compilation for instance); this will be useful for users that prefer to dynamically connect databases instead of using a .pf or extra connection info - - You can also choose a progress program executer *after* any execution + - You can also choose a progress program that will be executed *after* any execution - New compilation options (available through a new item in the main menu) : - Generate debug-list - Generate xref file - Generate xref xml file - Generate listing file - - You can also choose to immediatly generate + show one of this files in the new *Progress tools* menu + - You can also choose to immediately generate + show one of these files in the new *Progress tools* menu - New feature : **Correct code indentation** - New item in the main menu **Display parser errors** : this will validate your file using the parser of 3P, it can be used to know if your file can be read by the AppBuilder (for instance). You also have the opportunity to display the parser errors each time you save the file (it will only be displayed if there are errors), see `Options` > `Code edition`. This is enabled by default. Since I introduced this feature, i will stop displaying the number of extra characters in the code explorer, which already displays a lot of information. - New options for the auto completion : - you can now choose to immediately show the auto completion after a `.` or `:` (this is true currently and by default) - you can now choose to not display the auto completion on each input but still correct the case of the words as you type - - options are now splitted between : general options / progress specific options / default auto completion replacement options + - options are now dispatched between : general options / progress specific options / default auto completion replacement options - Updated [DataDigger](https://datadigger.wordpress.com/2017/02/20/20170220/) to the latest beta version 20170324, thanks [Patrick](https://github.com/patrickTingen/DataDigger)! - Ftp connections now also work for servers with the active transfer mode activated - Improvements to the parser, this should be its final form; it now parses include files exactly like the progress compiler, replacing the include call by the content of the file @@ -46,7 +51,7 @@ See the example below for a better understanding **Fixed issues :** - Replaced the old mechanism to hide the progress splashscreen during a prowin execution, now simply uses `-nosplash` -- 3P no longers catches errors from other .net plugins (like CSScriptNpp) +- 3P no longer catches errors from other .net plugins (like CSScriptNpp) - Correction of various bugs related to document encoding - Fixed an issue with the type buttons of the file explorer that would show the tooltip content of the autocompetion type buttons - 3P now correctly reads the Npp configuration from the cloud folder (if any)