This commit breaks compiling for a short (!) period, need to sync my work to a different system

This commit is contained in:
Robin Krom 2020-02-25 07:56:45 +01:00
commit 684a7615d7
38 changed files with 1845 additions and 1324 deletions

View file

@ -1,20 +1,20 @@
/*
* Greenshot - a free and open source screenshot tool
* Copyright (C) 2007-2020 Thomas Braun, Jens Klingen, Robin Krom
*
*
* For more information see: http://getgreenshot.org/
* The Greenshot project is hosted on GitHub https://github.com/greenshot/greenshot
*
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 1 of the License, or
* (at your option) any later version.
*
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@ -33,8 +33,8 @@ namespace Greenshot.Processors {
public class TitleFixProcessor : AbstractProcessor {
private static readonly ILog LOG = LogManager.GetLogger(typeof(TitleFixProcessor));
private static readonly CoreConfiguration config = IniConfig.GetIniSection<CoreConfiguration>();
public TitleFixProcessor() {
public TitleFixProcessor() {
List<string> corruptKeys = new List<string>();
foreach(string key in config.ActiveTitleFixes) {
if (config.TitleFixMatcher.ContainsKey(key)) continue;
@ -42,8 +42,8 @@ namespace Greenshot.Processors {
LOG.WarnFormat("Key {0} not found, configuration is broken! Disabling this key!", key);
corruptKeys.Add(key);
}
// Fix configuration if needed
// Fix configuration if needed
if (corruptKeys.Count <= 0) return;
foreach(string corruptKey in corruptKeys) {
@ -54,8 +54,8 @@ namespace Greenshot.Processors {
}
config.IsDirty = true;
}
public override string Designation => "TitleFix";
public override string Designation => "TitleFix";
public override string Description => Designation;
@ -67,7 +67,7 @@ namespace Greenshot.Processors {
foreach(string titleIdentifier in config.ActiveTitleFixes) {
string regexpString = config.TitleFixMatcher[titleIdentifier];
string replaceString = config.TitleFixReplacer[titleIdentifier] ?? string.Empty;
if (string.IsNullOrEmpty(regexpString)) continue;
var regex = new Regex(regexpString);