[Pkg-cli-apps-commits] [keepass2] 03/07: refresh patches
Julian Taylor
jtaylor.debian at googlemail.com
Sun Jan 10 19:30:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
jtaylor-guest pushed a commit to branch master
in repository keepass2.
commit b82a6766e64fb4faa83f37c15d788af82707a14c
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Sun Jan 10 19:54:50 2016 +0100
refresh patches
---
debian/patches/disable-autoupdate-dialog.patch | 8 +-
debian/patches/do-not-use-the-non-free-icons.patch | 8 +-
debian/patches/enable-local-help.patch | 8 +-
debian/patches/fix-XSL-search-path.patch | 16 +-
debian/patches/force_toolsversion_4 | 82 ++--
debian/patches/skip-sgen-run-during-build.patch | 12 +-
debian/patches/use-installed-ico-files.patch | 416 ++++++++++-----------
debian/patches/use-the-mono-signing-key.patch | 16 +-
8 files changed, 276 insertions(+), 290 deletions(-)
diff --git a/debian/patches/disable-autoupdate-dialog.patch b/debian/patches/disable-autoupdate-dialog.patch
index d875eaf..24dfaa7 100644
--- a/debian/patches/disable-autoupdate-dialog.patch
+++ b/debian/patches/disable-autoupdate-dialog.patch
@@ -8,10 +8,10 @@ Forwarded: not-needed
KeePass/App/Configuration/AceApplication.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-Index: keepass2/KeePass/App/Configuration/AceApplication.cs
-===================================================================
---- keepass2.orig/KeePass/App/Configuration/AceApplication.cs
-+++ keepass2/KeePass/App/Configuration/AceApplication.cs
+diff --git a/KeePass/App/Configuration/AceApplication.cs b/KeePass/App/Configuration/AceApplication.cs
+index e3e7841..0220620 100644
+--- a/KeePass/App/Configuration/AceApplication.cs
++++ b/KeePass/App/Configuration/AceApplication.cs
@@ -301,8 +301,8 @@ namespace KeePass.App.Configuration
set { m_bCheckForUpdate = value; }
}
diff --git a/debian/patches/do-not-use-the-non-free-icons.patch b/debian/patches/do-not-use-the-non-free-icons.patch
index 4925793..eff2b3a 100644
--- a/debian/patches/do-not-use-the-non-free-icons.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -7,10 +7,10 @@ Forwarded: not-needed
KeePass/Properties/Resources.resx | 70 +++++++++++++++++++--------------------
1 file changed, 35 insertions(+), 35 deletions(-)
-Index: keepass2/KeePass/Properties/Resources.resx
-===================================================================
---- keepass2.orig/KeePass/Properties/Resources.resx
-+++ keepass2/KeePass/Properties/Resources.resx
+diff --git a/KeePass/Properties/Resources.resx b/KeePass/Properties/Resources.resx
+index 1f7acfc..ff28a03 100644
+--- a/KeePass/Properties/Resources.resx
++++ b/KeePass/Properties/Resources.resx
@@ -404,40 +404,40 @@
<value>..\Resources\Nuvola\B48x48_Run.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
diff --git a/debian/patches/enable-local-help.patch b/debian/patches/enable-local-help.patch
index 7d5f604..e81e75c 100644
--- a/debian/patches/enable-local-help.patch
+++ b/debian/patches/enable-local-help.patch
@@ -9,10 +9,10 @@ Forwarded: not-needed
KeePass/App/AppHelp.cs | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
-Index: keepass2/KeePass/App/AppHelp.cs
-===================================================================
---- keepass2.orig/KeePass/App/AppHelp.cs
-+++ keepass2/KeePass/App/AppHelp.cs
+diff --git a/KeePass/App/AppHelp.cs b/KeePass/App/AppHelp.cs
+index fd99e25..02e41f8 100644
+--- a/KeePass/App/AppHelp.cs
++++ b/KeePass/App/AppHelp.cs
@@ -58,7 +58,7 @@ namespace KeePass.App
{
if(m_strLocalHelpFile == null) return false;
diff --git a/debian/patches/fix-XSL-search-path.patch b/debian/patches/fix-XSL-search-path.patch
index 468cf11..5341b20 100644
--- a/debian/patches/fix-XSL-search-path.patch
+++ b/debian/patches/fix-XSL-search-path.patch
@@ -10,10 +10,10 @@ Forwarded: not-needed
KeePass/Forms/AboutForm.cs | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
-Index: keepass2/KeePass/App/AppDefs.cs
-===================================================================
---- keepass2.orig/KeePass/App/AppDefs.cs
-+++ keepass2/KeePass/App/AppDefs.cs
+diff --git a/KeePass/App/AppDefs.cs b/KeePass/App/AppDefs.cs
+index 469cb65..ef07db9 100644
+--- a/KeePass/App/AppDefs.cs
++++ b/KeePass/App/AppDefs.cs
@@ -36,6 +36,8 @@ namespace KeePass.App
public static readonly Color ColorControlDisabled = SystemColors.Control;
public static readonly Color ColorEditError = Color.FromArgb(255, 192, 192);
@@ -23,10 +23,10 @@ Index: keepass2/KeePass/App/AppDefs.cs
public const string XslFilesDir = "XSL";
public const string XslFileHtmlLite = "KDBX_DetailsLite.xsl";
public const string XslFileHtmlFull = "KDBX_DetailsFull.xsl";
-Index: keepass2/KeePass/Forms/AboutForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/AboutForm.cs
-+++ keepass2/KeePass/Forms/AboutForm.cs
+diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
+index 193ecdc..2cd96cf 100644
+--- a/KeePass/Forms/AboutForm.cs
++++ b/KeePass/Forms/AboutForm.cs
@@ -85,8 +85,7 @@ namespace KeePass.Forms
m_lvComponents.Items.Add(lvi);
diff --git a/debian/patches/force_toolsversion_4 b/debian/patches/force_toolsversion_4
index 190b989..1221ea2 100644
--- a/debian/patches/force_toolsversion_4
+++ b/debian/patches/force_toolsversion_4
@@ -1,24 +1,46 @@
-Index: keepass2/KeePass/KeePass.csproj
+From: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
+Date: Sun, 10 Jan 2016 19:44:35 +0100
+Subject: force_toolsversion_4
+
===================================================================
---- keepass2.orig/KeePass/KeePass.csproj
-+++ keepass2/KeePass/KeePass.csproj
+---
+ KeePass.sln | 2 +-
+ KeePass/KeePass.csproj | 4 ++--
+ KeePassLib/KeePassLib.csproj | 4 ++--
+ Translation/TrlUtil/TrlUtil.csproj | 4 ++--
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/KeePass.sln b/KeePass.sln
+index b955428..ca4da98 100644
+--- a/KeePass.sln
++++ b/KeePass.sln
+@@ -1,4 +1,4 @@
+-Microsoft Visual Studio Solution File, Format Version 10.00
++Microsoft Visual Studio Solution File, Format Version 12.00
+ # Visual Studio 2008
+ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}"
+ EndProject
+diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
+index 27be521..a0de64f 100644
+--- a/KeePass/KeePass.csproj
++++ b/KeePass/KeePass.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -1315,4 +1315,4 @@
+@@ -1323,4 +1323,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
\ No newline at end of file
+</Project>
-Index: keepass2/KeePassLib/KeePassLib.csproj
-===================================================================
---- keepass2.orig/KeePassLib/KeePassLib.csproj
-+++ keepass2/KeePassLib/KeePassLib.csproj
+diff --git a/KeePassLib/KeePassLib.csproj b/KeePassLib/KeePassLib.csproj
+index 0a30ef8..c7436f9 100644
+--- a/KeePassLib/KeePassLib.csproj
++++ b/KeePassLib/KeePassLib.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
@@ -32,36 +54,10 @@ Index: keepass2/KeePassLib/KeePassLib.csproj
-</Project>
\ No newline at end of file
+</Project>
-Index: keepass2/KeePassLibSD/KeePassLibSD.csproj
-===================================================================
---- keepass2.orig/KeePassLibSD/KeePassLibSD.csproj
-+++ keepass2/KeePassLibSD/KeePassLibSD.csproj
-@@ -1,4 +1,4 @@
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -14,7 +14,7 @@
- <PlatformID>3C41C503-53EF-4c2a-8DD4-A8217CAD115E</PlatformID>
- <OSVersion>4.20</OSVersion>
- <DeployDirSuffix>KeePassLibSD</DeployDirSuffix>
-- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
-+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <FormFactorID>
- </FormFactorID>
- <SignAssembly>true</SignAssembly>
-@@ -382,4 +382,4 @@
- </Target>
- -->
- <Import Condition="'$(TargetFrameworkVersion)' == 'v3.5'" Project="$(MSBuildBinPath)\Microsoft.CompactFramework.CSharp.targets" />
--</Project>
-\ No newline at end of file
-+</Project>
-Index: keepass2/Translation/TrlUtil/TrlUtil.csproj
-===================================================================
---- keepass2.orig/Translation/TrlUtil/TrlUtil.csproj
-+++ keepass2/Translation/TrlUtil/TrlUtil.csproj
+diff --git a/Translation/TrlUtil/TrlUtil.csproj b/Translation/TrlUtil/TrlUtil.csproj
+index 6e20b80..0198f1d 100644
+--- a/Translation/TrlUtil/TrlUtil.csproj
++++ b/Translation/TrlUtil/TrlUtil.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
@@ -75,13 +71,3 @@ Index: keepass2/Translation/TrlUtil/TrlUtil.csproj
-</Project>
\ No newline at end of file
+</Project>
-Index: keepass2/KeePass.sln
-===================================================================
---- keepass2.orig/KeePass.sln
-+++ keepass2/KeePass.sln
-@@ -1,4 +1,4 @@
--Microsoft Visual Studio Solution File, Format Version 10.00
-+Microsoft Visual Studio Solution File, Format Version 12.00
- # Visual Studio 2008
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}"
- EndProject
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index ab81aad..3d66e74 100644
--- a/debian/patches/skip-sgen-run-during-build.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -7,16 +7,16 @@ Forwarded: not-needed
KeePass/KeePass.csproj | 3 ---
1 file changed, 3 deletions(-)
-Index: keepass2/KeePass/KeePass.csproj
-===================================================================
---- keepass2.orig/KeePass/KeePass.csproj
-+++ keepass2/KeePass/KeePass.csproj
-@@ -1315,7 +1315,4 @@
+diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
+index 021ae11..27be521 100644
+--- a/KeePass/KeePass.csproj
++++ b/KeePass/KeePass.csproj
+@@ -1323,7 +1323,4 @@
<Target Name="AfterBuild">
</Target>
-->
- <PropertyGroup>
-- <PostBuildEvent>"$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_33430356D8D7D1B8 /compiler:/delaysign-</PostBuildEvent>
+- <PostBuildEvent>"$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_27A70973F3FC3787 /compiler:/delaysign-</PostBuildEvent>
- </PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index 04f3555..72c6b09 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -58,10 +58,10 @@ Forwarded: not-needed
KeePass/Forms/XmlReplaceForm.cs | 2 +-
48 files changed, 56 insertions(+), 56 deletions(-)
-Index: keepass2/KeePass/Forms/AboutForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/AboutForm.cs
-+++ keepass2/KeePass/Forms/AboutForm.cs
+diff --git a/KeePass/Forms/AboutForm.cs b/KeePass/Forms/AboutForm.cs
+index 57edb52..193ecdc 100644
+--- a/KeePass/Forms/AboutForm.cs
++++ b/KeePass/Forms/AboutForm.cs
@@ -56,11 +56,11 @@ namespace KeePass.Forms
string strTitle = PwDefs.ProductName;
string strDesc = KPRes.Version + " " + PwDefs.VersionString;
@@ -76,10 +76,10 @@ Index: keepass2/KeePass/Forms/AboutForm.cs
m_lvComponents.Columns.Add(KPRes.Component, 100, HorizontalAlignment.Left);
m_lvComponents.Columns.Add(KPRes.Status + " / " + KPRes.Version, 100,
-Index: keepass2/KeePass/Forms/AutoTypeCtxForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/AutoTypeCtxForm.cs
-+++ keepass2/KeePass/Forms/AutoTypeCtxForm.cs
+diff --git a/KeePass/Forms/AutoTypeCtxForm.cs b/KeePass/Forms/AutoTypeCtxForm.cs
+index c62955c..26ec71a 100644
+--- a/KeePass/Forms/AutoTypeCtxForm.cs
++++ b/KeePass/Forms/AutoTypeCtxForm.cs
@@ -76,7 +76,7 @@ namespace KeePass.Forms
m_lblText.Text = KPRes.AutoTypeEntrySelectionDescLong;
@@ -89,10 +89,10 @@ Index: keepass2/KeePass/Forms/AutoTypeCtxForm.cs
string strRect = Program.Config.UI.AutoTypeCtxRect;
if(strRect.Length > 0) UIUtil.SetWindowScreenRect(this, strRect);
-Index: keepass2/KeePass/Forms/CharPickerForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/CharPickerForm.cs
-+++ keepass2/KeePass/Forms/CharPickerForm.cs
+diff --git a/KeePass/Forms/CharPickerForm.cs b/KeePass/Forms/CharPickerForm.cs
+index 27b464e..522fec4 100644
+--- a/KeePass/Forms/CharPickerForm.cs
++++ b/KeePass/Forms/CharPickerForm.cs
@@ -134,7 +134,7 @@ namespace KeePass.Forms
m_fontChars = FontUtil.CreateFont("Tahoma", 8.25f, FontStyle.Bold);
@@ -102,10 +102,10 @@ Index: keepass2/KeePass/Forms/CharPickerForm.cs
this.Text = KPRes.PickCharacters + " - " + PwDefs.ShortProductName;
m_secWord.Attach(m_tbSelected, OnSelectedTextChangedEx, true);
-Index: keepass2/KeePass/Forms/ColumnsForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/ColumnsForm.cs
-+++ keepass2/KeePass/Forms/ColumnsForm.cs
+diff --git a/KeePass/Forms/ColumnsForm.cs b/KeePass/Forms/ColumnsForm.cs
+index ea3339e..f8adb6a 100644
+--- a/KeePass/Forms/ColumnsForm.cs
++++ b/KeePass/Forms/ColumnsForm.cs
@@ -58,7 +58,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_View_Detailed,
@@ -115,10 +115,10 @@ Index: keepass2/KeePass/Forms/ColumnsForm.cs
this.Text = KPRes.ConfigureColumns;
float fWidth = (float)(m_lvColumns.ClientRectangle.Width -
-Index: keepass2/KeePass/Forms/CsvImportForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/CsvImportForm.cs
-+++ keepass2/KeePass/Forms/CsvImportForm.cs
+diff --git a/KeePass/Forms/CsvImportForm.cs b/KeePass/Forms/CsvImportForm.cs
+index eec83d1..feaa044 100644
+--- a/KeePass/Forms/CsvImportForm.cs
++++ b/KeePass/Forms/CsvImportForm.cs
@@ -109,7 +109,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -128,10 +128,10 @@ Index: keepass2/KeePass/Forms/CsvImportForm.cs
this.Text = KPRes.GenericCsvImporter + " - " + PwDefs.ShortProductName;
// FontUtil.AssignDefaultBold(m_grpSyntax);
-Index: keepass2/KeePass/Forms/DataEditorForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/DataEditorForm.cs
-+++ keepass2/KeePass/Forms/DataEditorForm.cs
+diff --git a/KeePass/Forms/DataEditorForm.cs b/KeePass/Forms/DataEditorForm.cs
+index 45959d7..c0fc6a4 100644
+--- a/KeePass/Forms/DataEditorForm.cs
++++ b/KeePass/Forms/DataEditorForm.cs
@@ -93,7 +93,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -141,10 +141,10 @@ Index: keepass2/KeePass/Forms/DataEditorForm.cs
this.DoubleBuffered = true;
string strRect = Program.Config.UI.DataEditorRect;
-Index: keepass2/KeePass/Forms/DataViewerForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/DataViewerForm.cs
-+++ keepass2/KeePass/Forms/DataViewerForm.cs
+diff --git a/KeePass/Forms/DataViewerForm.cs b/KeePass/Forms/DataViewerForm.cs
+index 607a7e3..96678f4 100644
+--- a/KeePass/Forms/DataViewerForm.cs
++++ b/KeePass/Forms/DataViewerForm.cs
@@ -93,7 +93,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -154,10 +154,10 @@ Index: keepass2/KeePass/Forms/DataViewerForm.cs
string strTitle = PwDefs.ShortProductName + " " + KPRes.DataViewer;
if(m_strDataDesc.Length > 0)
-Index: keepass2/KeePass/Forms/DatabaseOperationsForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/DatabaseOperationsForm.cs
-+++ keepass2/KeePass/Forms/DatabaseOperationsForm.cs
+diff --git a/KeePass/Forms/DatabaseOperationsForm.cs b/KeePass/Forms/DatabaseOperationsForm.cs
+index efcb436..a7b9b5a 100644
+--- a/KeePass/Forms/DatabaseOperationsForm.cs
++++ b/KeePass/Forms/DatabaseOperationsForm.cs
@@ -61,7 +61,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Package_Settings, KPRes.DatabaseMaintenance,
@@ -167,10 +167,10 @@ Index: keepass2/KeePass/Forms/DatabaseOperationsForm.cs
this.Text = KPRes.DatabaseMaintenance;
m_numHistoryDays.Value = m_pwDatabase.MaintenanceHistoryDays;
-Index: keepass2/KeePass/Forms/DatabaseSettingsForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/DatabaseSettingsForm.cs
-+++ keepass2/KeePass/Forms/DatabaseSettingsForm.cs
+diff --git a/KeePass/Forms/DatabaseSettingsForm.cs b/KeePass/Forms/DatabaseSettingsForm.cs
+index e1e2576..598e111 100644
+--- a/KeePass/Forms/DatabaseSettingsForm.cs
++++ b/KeePass/Forms/DatabaseSettingsForm.cs
@@ -81,7 +81,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Ark, KPRes.DatabaseSettings,
@@ -180,10 +180,10 @@ Index: keepass2/KeePass/Forms/DatabaseSettingsForm.cs
FontUtil.AssignDefaultItalic(m_lblHeaderCpAlgo);
FontUtil.AssignDefaultItalic(m_lblHeaderCp);
-Index: keepass2/KeePass/Forms/DuplicationForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/DuplicationForm.cs
-+++ keepass2/KeePass/Forms/DuplicationForm.cs
+diff --git a/KeePass/Forms/DuplicationForm.cs b/KeePass/Forms/DuplicationForm.cs
+index 9ad52ce..7abe0aa 100644
+--- a/KeePass/Forms/DuplicationForm.cs
++++ b/KeePass/Forms/DuplicationForm.cs
@@ -100,7 +100,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -193,10 +193,10 @@ Index: keepass2/KeePass/Forms/DuplicationForm.cs
FontUtil.AssignDefaultBold(m_cbAppendCopy);
FontUtil.AssignDefaultBold(m_cbFieldRefs);
-Index: keepass2/KeePass/Forms/EcasActionForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/EcasActionForm.cs
-+++ keepass2/KeePass/Forms/EcasActionForm.cs
+diff --git a/KeePass/Forms/EcasActionForm.cs b/KeePass/Forms/EcasActionForm.cs
+index 3a07a58..51c7d7b 100644
+--- a/KeePass/Forms/EcasActionForm.cs
++++ b/KeePass/Forms/EcasActionForm.cs
@@ -59,7 +59,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -206,10 +206,10 @@ Index: keepass2/KeePass/Forms/EcasActionForm.cs
m_lblParamHint.Text = KPRes.ParamDescHelp;
-Index: keepass2/KeePass/Forms/EcasConditionForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/EcasConditionForm.cs
-+++ keepass2/KeePass/Forms/EcasConditionForm.cs
+diff --git a/KeePass/Forms/EcasConditionForm.cs b/KeePass/Forms/EcasConditionForm.cs
+index e48a767..b5aa88e 100644
+--- a/KeePass/Forms/EcasConditionForm.cs
++++ b/KeePass/Forms/EcasConditionForm.cs
@@ -56,7 +56,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -219,10 +219,10 @@ Index: keepass2/KeePass/Forms/EcasConditionForm.cs
m_lblParamHint.Text = KPRes.ParamDescHelp;
-Index: keepass2/KeePass/Forms/EcasEventForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/EcasEventForm.cs
-+++ keepass2/KeePass/Forms/EcasEventForm.cs
+diff --git a/KeePass/Forms/EcasEventForm.cs b/KeePass/Forms/EcasEventForm.cs
+index 8adddb5..b7b96c0 100644
+--- a/KeePass/Forms/EcasEventForm.cs
++++ b/KeePass/Forms/EcasEventForm.cs
@@ -56,7 +56,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -232,10 +232,10 @@ Index: keepass2/KeePass/Forms/EcasEventForm.cs
m_lblParamHint.Text = KPRes.ParamDescHelp;
-Index: keepass2/KeePass/Forms/EcasTriggerForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/EcasTriggerForm.cs
-+++ keepass2/KeePass/Forms/EcasTriggerForm.cs
+diff --git a/KeePass/Forms/EcasTriggerForm.cs b/KeePass/Forms/EcasTriggerForm.cs
+index cf16913..3e7106e 100644
+--- a/KeePass/Forms/EcasTriggerForm.cs
++++ b/KeePass/Forms/EcasTriggerForm.cs
@@ -67,7 +67,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Run, strTitle, strDesc);
@@ -245,10 +245,10 @@ Index: keepass2/KeePass/Forms/EcasTriggerForm.cs
m_lvEvents.SmallImageList = m_ilIcons;
m_lvConditions.SmallImageList = m_ilIcons;
-Index: keepass2/KeePass/Forms/EcasTriggersForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/EcasTriggersForm.cs
-+++ keepass2/KeePass/Forms/EcasTriggersForm.cs
+diff --git a/KeePass/Forms/EcasTriggersForm.cs b/KeePass/Forms/EcasTriggersForm.cs
+index 6733641..1d5c281 100644
+--- a/KeePass/Forms/EcasTriggersForm.cs
++++ b/KeePass/Forms/EcasTriggersForm.cs
@@ -82,7 +82,7 @@ namespace KeePass.Forms
Properties.Resources.B48x48_Make_KDevelop, KPRes.Triggers,
KPRes.TriggersDesc);
@@ -258,10 +258,10 @@ Index: keepass2/KeePass/Forms/EcasTriggersForm.cs
int nWidth = (m_lvTriggers.ClientSize.Width - UIUtil.GetVScrollBarWidth() - 1);
m_lvTriggers.Columns.Add(KPRes.Triggers, nWidth);
-Index: keepass2/KeePass/Forms/EditAutoTypeItemForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/EditAutoTypeItemForm.cs
-+++ keepass2/KeePass/Forms/EditAutoTypeItemForm.cs
+diff --git a/KeePass/Forms/EditAutoTypeItemForm.cs b/KeePass/Forms/EditAutoTypeItemForm.cs
+index ab39b11..2e79f63 100644
+--- a/KeePass/Forms/EditAutoTypeItemForm.cs
++++ b/KeePass/Forms/EditAutoTypeItemForm.cs
@@ -106,7 +106,7 @@ namespace KeePass.Forms
KPRes.ConfigureKeystrokeSeqDesc);
}
@@ -271,11 +271,11 @@ Index: keepass2/KeePass/Forms/EditAutoTypeItemForm.cs
// FontUtil.AssignDefaultBold(m_lblTargetWindow);
// FontUtil.AssignDefaultBold(m_rbSeqDefault);
-Index: keepass2/KeePass/Forms/EditStringForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/EditStringForm.cs
-+++ keepass2/KeePass/Forms/EditStringForm.cs
-@@ -93,7 +93,7 @@ namespace KeePass.Forms
+diff --git a/KeePass/Forms/EditStringForm.cs b/KeePass/Forms/EditStringForm.cs
+index 0721b55..01c4b60 100644
+--- a/KeePass/Forms/EditStringForm.cs
++++ b/KeePass/Forms/EditStringForm.cs
+@@ -97,7 +97,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Font, strTitle, strDesc);
@@ -284,10 +284,10 @@ Index: keepass2/KeePass/Forms/EditStringForm.cs
UIUtil.EnableAutoCompletion(m_cmbStringName, true);
UIUtil.PrepareStandardMultilineControl(m_richStringValue, true, true);
-Index: keepass2/KeePass/Forms/EntropyForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/EntropyForm.cs
-+++ keepass2/KeePass/Forms/EntropyForm.cs
+diff --git a/KeePass/Forms/EntropyForm.cs b/KeePass/Forms/EntropyForm.cs
+index 279e4fa..927125b 100644
+--- a/KeePass/Forms/EntropyForm.cs
++++ b/KeePass/Forms/EntropyForm.cs
@@ -78,7 +78,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Binary, KPRes.EntropyTitle,
@@ -297,10 +297,10 @@ Index: keepass2/KeePass/Forms/EntropyForm.cs
this.Text = KPRes.EntropyTitle;
m_bmpRandom = CreateRandomBitmap(m_picRandom.ClientSize);
-Index: keepass2/KeePass/Forms/EntryListForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/EntryListForm.cs
-+++ keepass2/KeePass/Forms/EntryListForm.cs
+diff --git a/KeePass/Forms/EntryListForm.cs b/KeePass/Forms/EntryListForm.cs
+index 8eba7d6..022dd76 100644
+--- a/KeePass/Forms/EntryListForm.cs
++++ b/KeePass/Forms/EntryListForm.cs
@@ -87,7 +87,7 @@ namespace KeePass.Forms
m_imgIcon, m_strTitle, m_strDescShort);
m_lblText.Text = m_strDescLong;
@@ -310,10 +310,10 @@ Index: keepass2/KeePass/Forms/EntryListForm.cs
if(m_ilIcons != null) m_lvEntries.SmallImageList = m_ilIcons;
else m_ilIcons = new ImageList();
-Index: keepass2/KeePass/Forms/EntryReportForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/EntryReportForm.cs
-+++ keepass2/KeePass/Forms/EntryReportForm.cs
+diff --git a/KeePass/Forms/EntryReportForm.cs b/KeePass/Forms/EntryReportForm.cs
+index c958121..87037d8 100644
+--- a/KeePass/Forms/EntryReportForm.cs
++++ b/KeePass/Forms/EntryReportForm.cs
@@ -51,7 +51,7 @@ namespace KeePass.Forms
private void OnFormLoad(object sender, EventArgs e)
@@ -323,10 +323,10 @@ Index: keepass2/KeePass/Forms/EntryReportForm.cs
if(!string.IsNullOrEmpty(m_strTitle)) this.Text = m_strTitle;
else m_strTitle = PwDefs.ShortProductName;
-Index: keepass2/KeePass/Forms/ExchangeDataForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/ExchangeDataForm.cs
-+++ keepass2/KeePass/Forms/ExchangeDataForm.cs
+diff --git a/KeePass/Forms/ExchangeDataForm.cs b/KeePass/Forms/ExchangeDataForm.cs
+index b4f0254..efbabd7 100644
+--- a/KeePass/Forms/ExchangeDataForm.cs
++++ b/KeePass/Forms/ExchangeDataForm.cs
@@ -100,7 +100,7 @@ namespace KeePass.Forms
Properties.Resources.B48x48_Folder_Download);
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -336,10 +336,10 @@ Index: keepass2/KeePass/Forms/ExchangeDataForm.cs
this.Text = strWndTitle;
-Index: keepass2/KeePass/Forms/FieldRefForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/FieldRefForm.cs
-+++ keepass2/KeePass/Forms/FieldRefForm.cs
+diff --git a/KeePass/Forms/FieldRefForm.cs b/KeePass/Forms/FieldRefForm.cs
+index 6f71a27..a2830c3 100644
+--- a/KeePass/Forms/FieldRefForm.cs
++++ b/KeePass/Forms/FieldRefForm.cs
@@ -71,7 +71,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -349,10 +349,10 @@ Index: keepass2/KeePass/Forms/FieldRefForm.cs
UIUtil.SetExplorerTheme(m_lvEntries, true);
-Index: keepass2/KeePass/Forms/FileBrowserForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/FileBrowserForm.cs
-+++ keepass2/KeePass/Forms/FileBrowserForm.cs
+diff --git a/KeePass/Forms/FileBrowserForm.cs b/KeePass/Forms/FileBrowserForm.cs
+index 2b82ea3..bdccfe6 100644
+--- a/KeePass/Forms/FileBrowserForm.cs
++++ b/KeePass/Forms/FileBrowserForm.cs
@@ -97,7 +97,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -362,10 +362,10 @@ Index: keepass2/KeePass/Forms/FileBrowserForm.cs
this.Text = m_strTitle;
m_nIconDim = m_tvFolders.ItemHeight;
-Index: keepass2/KeePass/Forms/GroupForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/GroupForm.cs
-+++ keepass2/KeePass/Forms/GroupForm.cs
+diff --git a/KeePass/Forms/GroupForm.cs b/KeePass/Forms/GroupForm.cs
+index 92ac1cf..172b731 100644
+--- a/KeePass/Forms/GroupForm.cs
++++ b/KeePass/Forms/GroupForm.cs
@@ -78,7 +78,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Txt, strTitle,
@@ -375,10 +375,10 @@ Index: keepass2/KeePass/Forms/GroupForm.cs
this.Text = strTitle;
UIUtil.SetButtonImage(m_btnAutoTypeEdit,
-Index: keepass2/KeePass/Forms/HelpSourceForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/HelpSourceForm.cs
-+++ keepass2/KeePass/Forms/HelpSourceForm.cs
+diff --git a/KeePass/Forms/HelpSourceForm.cs b/KeePass/Forms/HelpSourceForm.cs
+index 92051df..1302061 100644
+--- a/KeePass/Forms/HelpSourceForm.cs
++++ b/KeePass/Forms/HelpSourceForm.cs
@@ -47,7 +47,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Download, KPRes.HelpSourceSelection,
@@ -388,10 +388,10 @@ Index: keepass2/KeePass/Forms/HelpSourceForm.cs
this.Text = KPRes.HelpSourceSelection;
FontUtil.AssignDefaultBold(m_radioLocal);
-Index: keepass2/KeePass/Forms/IOConnectionForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/IOConnectionForm.cs
-+++ keepass2/KeePass/Forms/IOConnectionForm.cs
+diff --git a/KeePass/Forms/IOConnectionForm.cs b/KeePass/Forms/IOConnectionForm.cs
+index 2878082..7463e83 100644
+--- a/KeePass/Forms/IOConnectionForm.cs
++++ b/KeePass/Forms/IOConnectionForm.cs
@@ -75,7 +75,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -401,10 +401,10 @@ Index: keepass2/KeePass/Forms/IOConnectionForm.cs
this.Text = strTitle;
FontUtil.AssignDefaultBold(m_lblUrl);
-Index: keepass2/KeePass/Forms/IconPickerForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/IconPickerForm.cs
-+++ keepass2/KeePass/Forms/IconPickerForm.cs
+diff --git a/KeePass/Forms/IconPickerForm.cs b/KeePass/Forms/IconPickerForm.cs
+index c4c9d2f..a8fcdb2 100644
+--- a/KeePass/Forms/IconPickerForm.cs
++++ b/KeePass/Forms/IconPickerForm.cs
@@ -80,7 +80,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -414,10 +414,10 @@ Index: keepass2/KeePass/Forms/IconPickerForm.cs
FontUtil.AssignDefaultBold(m_radioStandard);
FontUtil.AssignDefaultBold(m_radioCustom);
-Index: keepass2/KeePass/Forms/ImportMethodForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/ImportMethodForm.cs
-+++ keepass2/KeePass/Forms/ImportMethodForm.cs
+diff --git a/KeePass/Forms/ImportMethodForm.cs b/KeePass/Forms/ImportMethodForm.cs
+index 4f1d5ee..63b1f76 100644
+--- a/KeePass/Forms/ImportMethodForm.cs
++++ b/KeePass/Forms/ImportMethodForm.cs
@@ -56,7 +56,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Download, KPRes.ImportBehavior,
@@ -427,10 +427,10 @@ Index: keepass2/KeePass/Forms/ImportMethodForm.cs
this.Text = KPRes.ImportBehavior;
-Index: keepass2/KeePass/Forms/InternalBrowserForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/InternalBrowserForm.cs
-+++ keepass2/KeePass/Forms/InternalBrowserForm.cs
+diff --git a/KeePass/Forms/InternalBrowserForm.cs b/KeePass/Forms/InternalBrowserForm.cs
+index f856339..a200647 100644
+--- a/KeePass/Forms/InternalBrowserForm.cs
++++ b/KeePass/Forms/InternalBrowserForm.cs
@@ -53,7 +53,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -440,10 +440,10 @@ Index: keepass2/KeePass/Forms/InternalBrowserForm.cs
if(m_strInitialUrl.Length > 0)
m_webBrowser.Navigate(m_strInitialUrl);
-Index: keepass2/KeePass/Forms/KeyCreationForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/KeyCreationForm.cs
-+++ keepass2/KeePass/Forms/KeyCreationForm.cs
+diff --git a/KeePass/Forms/KeyCreationForm.cs b/KeePass/Forms/KeyCreationForm.cs
+index f7671a3..005e510 100644
+--- a/KeePass/Forms/KeyCreationForm.cs
++++ b/KeePass/Forms/KeyCreationForm.cs
@@ -82,7 +82,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Sign, KPRes.CreateMasterKey,
@@ -453,10 +453,10 @@ Index: keepass2/KeePass/Forms/KeyCreationForm.cs
this.Text = KPRes.CreateMasterKey;
FontUtil.SetDefaultFont(m_cbPassword);
-Index: keepass2/KeePass/Forms/KeyPromptForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/KeyPromptForm.cs
-+++ keepass2/KeePass/Forms/KeyPromptForm.cs
+diff --git a/KeePass/Forms/KeyPromptForm.cs b/KeePass/Forms/KeyPromptForm.cs
+index 96aaa23..b2a0e4f 100644
+--- a/KeePass/Forms/KeyPromptForm.cs
++++ b/KeePass/Forms/KeyPromptForm.cs
@@ -120,7 +120,7 @@ namespace KeePass.Forms
string strBannerDesc = WinUtil.CompactPath(m_ioInfo.Path, 45);
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -466,10 +466,10 @@ Index: keepass2/KeePass/Forms/KeyPromptForm.cs
FontUtil.SetDefaultFont(m_cbPassword);
FontUtil.AssignDefaultBold(m_cbPassword);
-Index: keepass2/KeePass/Forms/LanguageForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/LanguageForm.cs
-+++ keepass2/KeePass/Forms/LanguageForm.cs
+diff --git a/KeePass/Forms/LanguageForm.cs b/KeePass/Forms/LanguageForm.cs
+index c0fdbc9..fa105a3 100644
+--- a/KeePass/Forms/LanguageForm.cs
++++ b/KeePass/Forms/LanguageForm.cs
@@ -58,7 +58,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Keyboard_Layout,
@@ -479,10 +479,10 @@ Index: keepass2/KeePass/Forms/LanguageForm.cs
this.Text = KPRes.SelectLanguage;
List<Image> lImg = new List<Image>();
-Index: keepass2/KeePass/Forms/MainForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/MainForm.cs
-+++ keepass2/KeePass/Forms/MainForm.cs
+diff --git a/KeePass/Forms/MainForm.cs b/KeePass/Forms/MainForm.cs
+index 46f8f7f..51852e6 100644
+--- a/KeePass/Forms/MainForm.cs
++++ b/KeePass/Forms/MainForm.cs
@@ -140,7 +140,7 @@ namespace KeePass.Forms
m_strNeverExpiresText = KPRes.NeverExpires;
@@ -492,16 +492,16 @@ Index: keepass2/KeePass/Forms/MainForm.cs
m_imgFileSaveEnabled = Properties.Resources.B16x16_FileSave;
m_imgFileSaveDisabled = Properties.Resources.B16x16_FileSave_Disabled;
// m_imgFileSaveAllEnabled = Properties.Resources.B16x16_File_SaveAll;
-Index: keepass2/KeePass/Forms/MainForm_Functions.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/MainForm_Functions.cs
-+++ keepass2/KeePass/Forms/MainForm_Functions.cs
-@@ -423,18 +423,18 @@ namespace KeePass.Forms
+diff --git a/KeePass/Forms/MainForm_Functions.cs b/KeePass/Forms/MainForm_Functions.cs
+index d49c901..8e4f2e3 100644
+--- a/KeePass/Forms/MainForm_Functions.cs
++++ b/KeePass/Forms/MainForm_Functions.cs
+@@ -425,18 +425,18 @@ namespace KeePass.Forms
strNtfText = strNtfPre + strFileDesc;
Icon icoDisposable, icoAssignable;
-- CreateColorizedIcon(Properties.Resources.QuadLocked, false,
-+ CreateColorizedIcon(new Icon("/usr/share/keepass2/QuadLocked.ico"), false,
+- CreateColorizedIcon(Properties.Resources.QuadLocked, qSmall,
++ CreateColorizedIcon(new Icon("/usr/share/keepass2/QuadLocked.ico"), qSmall,
ref m_kvpIcoTrayLocked, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
@@ -513,30 +513,30 @@ Index: keepass2/KeePass/Forms/MainForm_Functions.cs
else if(s.DatabaseOpened == false)
{
Icon icoDisposable, icoAssignable;
-- CreateColorizedIcon(Properties.Resources.QuadNormal, false,
-+ CreateColorizedIcon(new Icon("/usr/share/keepass2/QuadNormal.ico"), false,
+- CreateColorizedIcon(Properties.Resources.QuadNormal, qSmall,
++ CreateColorizedIcon(new Icon("/usr/share/keepass2/QuadNormal.ico"), qSmall,
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -457,7 +457,7 @@ namespace KeePass.Forms
+@@ -459,7 +459,7 @@ namespace KeePass.Forms
m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
Icon icoDisposable, icoAssignable;
-- CreateColorizedIcon(Properties.Resources.QuadNormal, false,
-+ CreateColorizedIcon(new Icon("/usr/share/keepass2/QuadNormal.ico"), false,
+- CreateColorizedIcon(Properties.Resources.QuadNormal, qSmall,
++ CreateColorizedIcon(new Icon("/usr/share/keepass2/QuadNormal.ico"), qSmall,
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -482,7 +482,7 @@ namespace KeePass.Forms
+@@ -484,7 +484,7 @@ namespace KeePass.Forms
m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
Icon icoToDispose, icoToAssign;
-- if(CreateColorizedIcon(Properties.Resources.KeePass, true,
-+ if(CreateColorizedIcon(new Icon("/usr/share/keepass2/KeePass.ico"), true,
+- if(CreateColorizedIcon(Properties.Resources.KeePass, 0,
++ if(CreateColorizedIcon(new Icon("/usr/share/keepass2/KeePass.ico"), 0,
ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
this.Icon = icoToAssign;
if(icoToDispose != null) icoToDispose.Dispose();
-@@ -2622,12 +2622,12 @@ namespace KeePass.Forms
+@@ -2675,12 +2675,12 @@ namespace KeePass.Forms
}
else if(m.Msg == DwmUtil.WM_DWMSENDICONICTHUMBNAIL)
{
@@ -551,7 +551,7 @@ Index: keepass2/KeePass/Forms/MainForm_Functions.cs
return;
}
-@@ -3717,7 +3717,7 @@ namespace KeePass.Forms
+@@ -3781,7 +3781,7 @@ namespace KeePass.Forms
// wasn't fully constructed at that time yet)
// if(IsFileLocked(null))
// TaskbarList.SetOverlayIcon(this,
@@ -560,11 +560,11 @@ Index: keepass2/KeePass/Forms/MainForm_Functions.cs
}
if(Program.Config.MainWindow.MinimizeToTray) MinimizeToTray(true);
-Index: keepass2/KeePass/Forms/OptionsForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/OptionsForm.cs
-+++ keepass2/KeePass/Forms/OptionsForm.cs
-@@ -111,7 +111,7 @@ namespace KeePass.Forms
+diff --git a/KeePass/Forms/OptionsForm.cs b/KeePass/Forms/OptionsForm.cs
+index d1c8290..45e3f7f 100644
+--- a/KeePass/Forms/OptionsForm.cs
++++ b/KeePass/Forms/OptionsForm.cs
+@@ -119,7 +119,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -573,10 +573,10 @@ Index: keepass2/KeePass/Forms/OptionsForm.cs
Debug.Assert(m_ilIcons != null);
if(m_ilIcons != null)
-Index: keepass2/KeePass/Forms/PluginsForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/PluginsForm.cs
-+++ keepass2/KeePass/Forms/PluginsForm.cs
+diff --git a/KeePass/Forms/PluginsForm.cs b/KeePass/Forms/PluginsForm.cs
+index 0f8570f..825198a 100644
+--- a/KeePass/Forms/PluginsForm.cs
++++ b/KeePass/Forms/PluginsForm.cs
@@ -64,7 +64,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_BlockDevice, KPRes.Plugins,
@@ -586,11 +586,11 @@ Index: keepass2/KeePass/Forms/PluginsForm.cs
m_cbCacheDeleteOld.Checked = Program.Config.Application.Start.PluginCacheDeleteOld;
-Index: keepass2/KeePass/Forms/PrintForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/PrintForm.cs
-+++ keepass2/KeePass/Forms/PrintForm.cs
-@@ -97,7 +97,7 @@ namespace KeePass.Forms
+diff --git a/KeePass/Forms/PrintForm.cs b/KeePass/Forms/PrintForm.cs
+index 7b179d8..f313346 100644
+--- a/KeePass/Forms/PrintForm.cs
++++ b/KeePass/Forms/PrintForm.cs
+@@ -99,7 +99,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -599,10 +599,10 @@ Index: keepass2/KeePass/Forms/PrintForm.cs
CreateDialogBanner();
List<Image> lTabImg = new List<Image>();
-Index: keepass2/KeePass/Forms/ProxyForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/ProxyForm.cs
-+++ keepass2/KeePass/Forms/ProxyForm.cs
+diff --git a/KeePass/Forms/ProxyForm.cs b/KeePass/Forms/ProxyForm.cs
+index 07e4750..9a1868f 100644
+--- a/KeePass/Forms/ProxyForm.cs
++++ b/KeePass/Forms/ProxyForm.cs
@@ -44,7 +44,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -612,10 +612,10 @@ Index: keepass2/KeePass/Forms/ProxyForm.cs
ProxyServerType pst = Program.Config.Integration.ProxyType;
if(pst == ProxyServerType.None) m_rbNoProxy.Checked = true;
-Index: keepass2/KeePass/Forms/PwEntryForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/PwEntryForm.cs
-+++ keepass2/KeePass/Forms/PwEntryForm.cs
+diff --git a/KeePass/Forms/PwEntryForm.cs b/KeePass/Forms/PwEntryForm.cs
+index ed3fafa..19fb8d9 100644
+--- a/KeePass/Forms/PwEntryForm.cs
++++ b/KeePass/Forms/PwEntryForm.cs
@@ -652,7 +652,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -625,10 +625,10 @@ Index: keepass2/KeePass/Forms/PwEntryForm.cs
this.Text = strTitle;
m_imgPwGen = UIUtil.CreateDropDownImage(Properties.Resources.B16x16_Key_New);
-Index: keepass2/KeePass/Forms/PwGeneratorForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/PwGeneratorForm.cs
-+++ keepass2/KeePass/Forms/PwGeneratorForm.cs
+diff --git a/KeePass/Forms/PwGeneratorForm.cs b/KeePass/Forms/PwGeneratorForm.cs
+index 1b365d3..b189385 100644
+--- a/KeePass/Forms/PwGeneratorForm.cs
++++ b/KeePass/Forms/PwGeneratorForm.cs
@@ -98,7 +98,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Gen, KPRes.PasswordOptions,
@@ -638,10 +638,10 @@ Index: keepass2/KeePass/Forms/PwGeneratorForm.cs
UIUtil.SetButtonImage(m_btnProfileAdd,
Properties.Resources.B16x16_FileSaveAs, false);
-Index: keepass2/KeePass/Forms/SearchForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/SearchForm.cs
-+++ keepass2/KeePass/Forms/SearchForm.cs
+diff --git a/KeePass/Forms/SearchForm.cs b/KeePass/Forms/SearchForm.cs
+index 2869567..c7efa5d 100644
+--- a/KeePass/Forms/SearchForm.cs
++++ b/KeePass/Forms/SearchForm.cs
@@ -92,7 +92,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -651,10 +651,10 @@ Index: keepass2/KeePass/Forms/SearchForm.cs
m_cbDerefData.Text = m_cbDerefData.Text + " (" + KPRes.Slow + ")";
-Index: keepass2/KeePass/Forms/SingleLineEditForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/SingleLineEditForm.cs
-+++ keepass2/KeePass/Forms/SingleLineEditForm.cs
+diff --git a/KeePass/Forms/SingleLineEditForm.cs b/KeePass/Forms/SingleLineEditForm.cs
+index 54b1f9e..15f585e 100644
+--- a/KeePass/Forms/SingleLineEditForm.cs
++++ b/KeePass/Forms/SingleLineEditForm.cs
@@ -73,7 +73,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -664,10 +664,10 @@ Index: keepass2/KeePass/Forms/SingleLineEditForm.cs
this.Text = m_strTitle;
m_lblLongDesc.Text = m_strLongDesc;
-Index: keepass2/KeePass/Forms/StatusLoggerForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/StatusLoggerForm.cs
-+++ keepass2/KeePass/Forms/StatusLoggerForm.cs
+diff --git a/KeePass/Forms/StatusLoggerForm.cs b/KeePass/Forms/StatusLoggerForm.cs
+index 303ed62..b4832ec 100644
+--- a/KeePass/Forms/StatusLoggerForm.cs
++++ b/KeePass/Forms/StatusLoggerForm.cs
@@ -127,7 +127,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -677,10 +677,10 @@ Index: keepass2/KeePass/Forms/StatusLoggerForm.cs
this.Text = PwDefs.ShortProductName;
m_pbProgress.Minimum = 0;
-Index: keepass2/KeePass/Forms/TanWizardForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/TanWizardForm.cs
-+++ keepass2/KeePass/Forms/TanWizardForm.cs
+diff --git a/KeePass/Forms/TanWizardForm.cs b/KeePass/Forms/TanWizardForm.cs
+index 02ca150..a7f99ba 100644
+--- a/KeePass/Forms/TanWizardForm.cs
++++ b/KeePass/Forms/TanWizardForm.cs
@@ -61,7 +61,7 @@ namespace KeePass.Forms
KeePass.Properties.Resources.B48x48_Wizard, KPRes.TanWizard,
KPRes.TanWizardDesc);
@@ -690,10 +690,10 @@ Index: keepass2/KeePass/Forms/TanWizardForm.cs
this.Text = KPRes.TanWizard;
if((m_pgStorage.Name != null) && (m_pgStorage.Name.Length > 0))
-Index: keepass2/KeePass/Forms/UpdateCheckForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/UpdateCheckForm.cs
-+++ keepass2/KeePass/Forms/UpdateCheckForm.cs
+diff --git a/KeePass/Forms/UpdateCheckForm.cs b/KeePass/Forms/UpdateCheckForm.cs
+index c2a235c..62d2f71 100644
+--- a/KeePass/Forms/UpdateCheckForm.cs
++++ b/KeePass/Forms/UpdateCheckForm.cs
@@ -64,7 +64,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_WWW, KPRes.UpdateCheck,
@@ -703,10 +703,10 @@ Index: keepass2/KeePass/Forms/UpdateCheckForm.cs
this.Text = KPRes.UpdateCheck + " - " + PwDefs.ShortProductName;
UIUtil.SetExplorerTheme(m_lvInfo, true);
-Index: keepass2/KeePass/Forms/UrlOverrideForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/UrlOverrideForm.cs
-+++ keepass2/KeePass/Forms/UrlOverrideForm.cs
+diff --git a/KeePass/Forms/UrlOverrideForm.cs b/KeePass/Forms/UrlOverrideForm.cs
+index e6b0ff2..a8087df 100644
+--- a/KeePass/Forms/UrlOverrideForm.cs
++++ b/KeePass/Forms/UrlOverrideForm.cs
@@ -51,7 +51,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -716,10 +716,10 @@ Index: keepass2/KeePass/Forms/UrlOverrideForm.cs
this.Text = KPRes.UrlOverride;
m_tbScheme.Text = m_ovr.Scheme;
-Index: keepass2/KeePass/Forms/UrlOverridesForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/UrlOverridesForm.cs
-+++ keepass2/KeePass/Forms/UrlOverridesForm.cs
+diff --git a/KeePass/Forms/UrlOverridesForm.cs b/KeePass/Forms/UrlOverridesForm.cs
+index 1ed5e16..2f28e8a 100644
+--- a/KeePass/Forms/UrlOverridesForm.cs
++++ b/KeePass/Forms/UrlOverridesForm.cs
@@ -66,7 +66,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -729,10 +729,10 @@ Index: keepass2/KeePass/Forms/UrlOverridesForm.cs
this.Text = KPRes.UrlOverrides;
UIUtil.SetExplorerTheme(m_lvOverrides, false);
-Index: keepass2/KeePass/Forms/XmlReplaceForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/XmlReplaceForm.cs
-+++ keepass2/KeePass/Forms/XmlReplaceForm.cs
+diff --git a/KeePass/Forms/XmlReplaceForm.cs b/KeePass/Forms/XmlReplaceForm.cs
+index d9d1d85..fe98777 100644
+--- a/KeePass/Forms/XmlReplaceForm.cs
++++ b/KeePass/Forms/XmlReplaceForm.cs
@@ -62,7 +62,7 @@ namespace KeePass.Forms
KeePass.Properties.Resources.B48x48_Binary, KPRes.XmlReplace,
KPRes.XmlReplaceDesc);
diff --git a/debian/patches/use-the-mono-signing-key.patch b/debian/patches/use-the-mono-signing-key.patch
index 34ca317..f8ba1ee 100644
--- a/debian/patches/use-the-mono-signing-key.patch
+++ b/debian/patches/use-the-mono-signing-key.patch
@@ -8,10 +8,10 @@ Forwarded: not-needed
KeePassLib/KeePassLib.csproj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
-Index: keepass2/KeePass/KeePass.csproj
-===================================================================
---- keepass2.orig/KeePass/KeePass.csproj
-+++ keepass2/KeePass/KeePass.csproj
+diff --git a/KeePass/KeePass.csproj b/KeePass/KeePass.csproj
+index afc8b54..021ae11 100644
+--- a/KeePass/KeePass.csproj
++++ b/KeePass/KeePass.csproj
@@ -11,7 +11,7 @@
<AssemblyName>KeePass</AssemblyName>
<ApplicationIcon>KeePass.ico</ApplicationIcon>
@@ -21,10 +21,10 @@ Index: keepass2/KeePass/KeePass.csproj
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
-Index: keepass2/KeePassLib/KeePassLib.csproj
-===================================================================
---- keepass2.orig/KeePassLib/KeePassLib.csproj
-+++ keepass2/KeePassLib/KeePassLib.csproj
+diff --git a/KeePassLib/KeePassLib.csproj b/KeePassLib/KeePassLib.csproj
+index a59d90a..0a30ef8 100644
+--- a/KeePassLib/KeePassLib.csproj
++++ b/KeePassLib/KeePassLib.csproj
@@ -10,7 +10,7 @@
<RootNamespace>KeePassLib</RootNamespace>
<AssemblyName>KeePassLib</AssemblyName>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/keepass2.git
More information about the Pkg-cli-apps-commits
mailing list