[Pkg-cli-apps-commits] [keepass2] 04/06: refresh patches, remove upstream applied fix-autotype-paste.patch
Julian Taylor
jtaylor.debian at googlemail.com
Fri Oct 17 18:28:54 UTC 2014
This is an automated email from the git hooks/post-receive script.
jtaylor-guest pushed a commit to branch master
in repository keepass2.
commit 9156f96b09e72a2acf50b8a1c478000e0ba245d0
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Fri Oct 17 19:53:50 2014 +0200
refresh patches, remove upstream applied fix-autotype-paste.patch
---
debian/patches/disable-autoupdate-dialog.patch | 6 +-
debian/patches/do-not-use-the-non-free-icons.patch | 31 +-
debian/patches/enable-local-help.patch | 6 +-
debian/patches/fix-XSL-search-path.patch | 14 +-
debian/patches/fix-autotype-paste.patch | 31 --
debian/patches/remove-ToolsVersion-3.5.patch | 6 +-
debian/patches/series | 1 -
debian/patches/skip-sgen-run-during-build.patch | 8 +-
debian/patches/use-installed-ico-files.patch | 349 +++++++++++++--------
debian/patches/use-the-mono-signing-key.patch | 12 +-
10 files changed, 277 insertions(+), 187 deletions(-)
diff --git a/debian/patches/disable-autoupdate-dialog.patch b/debian/patches/disable-autoupdate-dialog.patch
index 856fe13..d875eaf 100644
--- a/debian/patches/disable-autoupdate-dialog.patch
+++ b/debian/patches/disable-autoupdate-dialog.patch
@@ -8,8 +8,10 @@ Forwarded: not-needed
KeePass/App/Configuration/AceApplication.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- a/KeePass/App/Configuration/AceApplication.cs
-+++ b/KeePass/App/Configuration/AceApplication.cs
+Index: keepass2/KeePass/App/Configuration/AceApplication.cs
+===================================================================
+--- keepass2.orig/KeePass/App/Configuration/AceApplication.cs
++++ keepass2/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 8cf6de4..66eacb7 100644
--- a/debian/patches/do-not-use-the-non-free-icons.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -7,9 +7,11 @@ Forwarded: not-needed
KeePass/Properties/Resources.resx | 70 +++++++++++++++++++--------------------
1 file changed, 35 insertions(+), 35 deletions(-)
---- a/KeePass/Properties/Resources.resx
-+++ b/KeePass/Properties/Resources.resx
-@@ -413,40 +413,40 @@
+Index: keepass2/KeePass/Properties/Resources.resx
+===================================================================
+--- keepass2.orig/KeePass/Properties/Resources.resx
++++ keepass2/KeePass/Properties/Resources.resx
+@@ -407,40 +407,40 @@
<value>..\Resources\Nuvola\B48x48_Run.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_AmP" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -61,7 +63,7 @@ Forwarded: not-needed
</data>
<data name="B16x16_File_SaveAll" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Nuvola_Derived\B16x16_File_SaveAll.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -458,22 +458,22 @@
+@@ -452,22 +452,22 @@
<value>..\Resources\Nuvola_Derived\B16x16_File_Close.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_PwTresor" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -89,7 +91,7 @@ Forwarded: not-needed
</data>
<data name="B16x16_Make_KDevelop" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Nuvola\B16x16_Make_KDevelop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -482,10 +482,10 @@
+@@ -476,10 +476,10 @@
<value>..\Resources\Nuvola\B48x48_Make_KDevelop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_OnePwPro" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -102,7 +104,7 @@ Forwarded: not-needed
</data>
<data name="B16x16_FontBold" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\B16x16_FontBold.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -521,13 +521,13 @@
+@@ -515,13 +515,13 @@
<value>..\Resources\Images\B16x16_Imp_KeePassX.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_HandySafe" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -119,7 +121,7 @@ Forwarded: not-needed
</data>
<data name="B48x48_View_Detailed" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Nuvola\B48x48_View_Detailed.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -542,13 +542,13 @@
+@@ -536,13 +536,13 @@
<value>..\Resources\Icons\LockOverlay.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_PwPrompter" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -136,7 +138,7 @@ Forwarded: not-needed
</data>
<data name="B16x16_MenuRadio" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Images\B16x16_MenuRadio.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -557,13 +557,13 @@
+@@ -551,13 +551,13 @@
<value>..\Resources\Nuvola\B16x16_KaboodleLoop.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_PwsPlus" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -153,7 +155,7 @@ Forwarded: not-needed
</data>
<data name="B16x16_EditCopyLink" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Nuvola_Derived\B16x16_EditCopyLink.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -572,19 +572,19 @@
+@@ -566,19 +566,19 @@
<value>..\Resources\Nuvola_Derived\B16x16_Key_New.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_DesktopKnox" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -178,7 +180,7 @@ Forwarded: not-needed
</data>
<data name="B16x16_Folder_2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Nuvola_Derived\B16x16_Folder_2.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-@@ -599,9 +599,9 @@
+@@ -593,13 +593,13 @@
<value>..\Resources\Data\MostPopularPasswords.txt.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="B16x16_Imp_NortonIdSafe" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -189,6 +191,9 @@ Forwarded: not-needed
- <value>..\Resources\Images\B16x16_Imp_Dashlane.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ <value>..\Resources\Nuvola\B16x16_KGPG_Import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
--</root>
-\ No newline at end of file
-+</root>
+ <data name="B16x16_Imp_VisKeeper" type="System.Resources.ResXFileRef, System.Windows.Forms">
+- <value>..\Resources\Images\B16x16_Imp_VisKeeper.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
++ <value>..\Resources\Nuvola\B16x16_KGPG_Import.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
+ <data name="B16x16_MenuCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Images\B16x16_MenuCheck.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
diff --git a/debian/patches/enable-local-help.patch b/debian/patches/enable-local-help.patch
index 03ff89e..7d5f604 100644
--- a/debian/patches/enable-local-help.patch
+++ b/debian/patches/enable-local-help.patch
@@ -9,8 +9,10 @@ Forwarded: not-needed
KeePass/App/AppHelp.cs | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
---- a/KeePass/App/AppHelp.cs
-+++ b/KeePass/App/AppHelp.cs
+Index: keepass2/KeePass/App/AppHelp.cs
+===================================================================
+--- keepass2.orig/KeePass/App/AppHelp.cs
++++ keepass2/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 59e7e7e..468cf11 100644
--- a/debian/patches/fix-XSL-search-path.patch
+++ b/debian/patches/fix-XSL-search-path.patch
@@ -10,8 +10,10 @@ Forwarded: not-needed
KeePass/Forms/AboutForm.cs | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
---- a/KeePass/App/AppDefs.cs
-+++ b/KeePass/App/AppDefs.cs
+Index: keepass2/KeePass/App/AppDefs.cs
+===================================================================
+--- keepass2.orig/KeePass/App/AppDefs.cs
++++ keepass2/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);
@@ -21,9 +23,11 @@ Forwarded: not-needed
public const string XslFilesDir = "XSL";
public const string XslFileHtmlLite = "KDBX_DetailsLite.xsl";
public const string XslFileHtmlFull = "KDBX_DetailsFull.xsl";
---- a/KeePass/Forms/AboutForm.cs
-+++ b/KeePass/Forms/AboutForm.cs
-@@ -89,8 +89,7 @@ namespace KeePass.Forms
+Index: keepass2/KeePass/Forms/AboutForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/AboutForm.cs
++++ keepass2/KeePass/Forms/AboutForm.cs
+@@ -85,8 +85,7 @@ namespace KeePass.Forms
m_lvComponents.Items.Add(lvi);
lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
diff --git a/debian/patches/fix-autotype-paste.patch b/debian/patches/fix-autotype-paste.patch
deleted file mode 100644
index 7d54135..0000000
--- a/debian/patches/fix-autotype-paste.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Julian Taylor <jtaylor.debian at googlemail.com>
-Date: Sun, 17 Aug 2014 15:51:37 +0200
-Subject: fix-autotype-paste
-
-Do not translate upper-case letters; on Windows, sending VK_A results in
-'a', and 'A' with Shift; on some Linux systems, only Ctrl+'v' pastes,
-not Ctrl+'V'
-
-Applied-upstream: 2.28
-Bug: http://sourceforge.net/p/keepass/discussion/329220/thread/bce61102/
----
- KeePass/Util/SendInputExt/SiCodes.cs | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
---- a/KeePass/Util/SendInputExt/SiCodes.cs
-+++ b/KeePass/Util/SendInputExt/SiCodes.cs
-@@ -203,8 +203,12 @@ namespace KeePass.Util.SendInputExt
- Debug.Assert(d['9'] == (int)Keys.D9);
-
- Debug.Assert((int)Keys.A == (int)'A');
-- for(char ch = 'A'; ch <= 'Z'; ++ch)
-- d[ch] = (int)ch - (int)'A' + (int)Keys.A;
-+ // Do not translate upper-case letters;
-+ // on Windows, sending VK_A results in 'a', and 'A' with Shift;
-+ // on some Linux systems, only Ctrl+'v' pastes, not Ctrl+'V':
-+ // https://sourceforge.net/p/keepass/discussion/329220/thread/bce61102/
-+ // for(char ch = 'A'; ch <= 'Z'; ++ch)
-+ // d[ch] = (int)ch - (int)'A' + (int)Keys.A;
- for(char ch = 'a'; ch <= 'z'; ++ch)
- d[ch] = (int)ch - (int)'a' + (int)Keys.A;
- Debug.Assert(d['z'] == (int)Keys.Z);
diff --git a/debian/patches/remove-ToolsVersion-3.5.patch b/debian/patches/remove-ToolsVersion-3.5.patch
index 52bee17..76a2f34 100644
--- a/debian/patches/remove-ToolsVersion-3.5.patch
+++ b/debian/patches/remove-ToolsVersion-3.5.patch
@@ -8,8 +8,10 @@ Forwarded: not-needed
KeePass/KeePass.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---- a/KeePass/KeePass.csproj
-+++ b/KeePass/KeePass.csproj
+Index: keepass2/KeePass/KeePass.csproj
+===================================================================
+--- keepass2.orig/KeePass/KeePass.csproj
++++ keepass2/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">
diff --git a/debian/patches/series b/debian/patches/series
index b6fdcc2..f2fef72 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ fix-XSL-search-path.patch
remove-ToolsVersion-3.5.patch
enable-local-help.patch
disable-autoupdate-dialog.patch
-fix-autotype-paste.patch
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index e378181..1ca8c25 100644
--- a/debian/patches/skip-sgen-run-during-build.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -7,9 +7,11 @@ Forwarded: not-needed
KeePass/KeePass.csproj | 3 ---
1 file changed, 3 deletions(-)
---- a/KeePass/KeePass.csproj
-+++ b/KeePass/KeePass.csproj
-@@ -1294,7 +1294,4 @@
+Index: keepass2/KeePass/KeePass.csproj
+===================================================================
+--- keepass2.orig/KeePass/KeePass.csproj
++++ keepass2/KeePass/KeePass.csproj
+@@ -1304,7 +1304,4 @@
<Target Name="AfterBuild">
</Target>
-->
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index d122ce5..1059bb2 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -41,7 +41,7 @@ Forwarded: not-needed
KeePass/Forms/KeyPromptForm.cs | 2 +-
KeePass/Forms/LanguageForm.cs | 2 +-
KeePass/Forms/MainForm.cs | 2 +-
- KeePass/Forms/MainForm_Functions.cs | 14 +++++++-------
+ KeePass/Forms/MainForm_Functions.cs | 16 ++++++++--------
KeePass/Forms/OptionsForm.cs | 2 +-
KeePass/Forms/PluginsForm.cs | 2 +-
KeePass/Forms/PrintForm.cs | 2 +-
@@ -56,10 +56,12 @@ Forwarded: not-needed
KeePass/Forms/UrlOverrideForm.cs | 2 +-
KeePass/Forms/UrlOverridesForm.cs | 2 +-
KeePass/Forms/XmlReplaceForm.cs | 2 +-
- 48 files changed, 55 insertions(+), 55 deletions(-)
+ 48 files changed, 56 insertions(+), 56 deletions(-)
---- a/KeePass/Forms/AboutForm.cs
-+++ b/KeePass/Forms/AboutForm.cs
+Index: keepass2/KeePass/Forms/AboutForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/AboutForm.cs
++++ keepass2/KeePass/Forms/AboutForm.cs
@@ -56,11 +56,11 @@ namespace KeePass.Forms
string strTitle = PwDefs.ProductName;
string strDesc = KPRes.Version + " " + PwDefs.VersionString;
@@ -74,9 +76,11 @@ Forwarded: not-needed
m_lvComponents.Columns.Add(KPRes.Component, 100, HorizontalAlignment.Left);
m_lvComponents.Columns.Add(KPRes.Status + " / " + KPRes.Version, 100,
---- a/KeePass/Forms/AutoTypeCtxForm.cs
-+++ b/KeePass/Forms/AutoTypeCtxForm.cs
-@@ -72,7 +72,7 @@ namespace KeePass.Forms
+Index: keepass2/KeePass/Forms/AutoTypeCtxForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/AutoTypeCtxForm.cs
++++ keepass2/KeePass/Forms/AutoTypeCtxForm.cs
+@@ -76,7 +76,7 @@ namespace KeePass.Forms
m_lblText.Text = KPRes.AutoTypeEntrySelectionDescLong;
this.Text = KPRes.AutoTypeEntrySelection;
@@ -85,8 +89,10 @@ Forwarded: not-needed
string strRect = Program.Config.UI.AutoTypeCtxRect;
if(strRect.Length > 0) UIUtil.SetWindowScreenRect(this, strRect);
---- a/KeePass/Forms/CharPickerForm.cs
-+++ b/KeePass/Forms/CharPickerForm.cs
+Index: keepass2/KeePass/Forms/CharPickerForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/CharPickerForm.cs
++++ keepass2/KeePass/Forms/CharPickerForm.cs
@@ -133,7 +133,7 @@ namespace KeePass.Forms
m_fontChars = FontUtil.CreateFont("Tahoma", 8.25f, FontStyle.Bold);
@@ -96,8 +102,10 @@ Forwarded: not-needed
this.Text = KPRes.PickCharacters + " - " + PwDefs.ShortProductName;
m_secWord.Attach(m_tbSelected, OnSelectedTextChangedEx, true);
---- a/KeePass/Forms/ColumnsForm.cs
-+++ b/KeePass/Forms/ColumnsForm.cs
+Index: keepass2/KeePass/Forms/ColumnsForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/ColumnsForm.cs
++++ keepass2/KeePass/Forms/ColumnsForm.cs
@@ -58,7 +58,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_View_Detailed,
@@ -106,9 +114,11 @@ Forwarded: not-needed
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
this.Text = KPRes.ConfigureColumns;
- int nWidth = (m_lvColumns.ClientRectangle.Width -
---- a/KeePass/Forms/CsvImportForm.cs
-+++ b/KeePass/Forms/CsvImportForm.cs
+ float fWidth = (float)(m_lvColumns.ClientRectangle.Width -
+Index: keepass2/KeePass/Forms/CsvImportForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/CsvImportForm.cs
++++ keepass2/KeePass/Forms/CsvImportForm.cs
@@ -109,7 +109,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -118,8 +128,10 @@ Forwarded: not-needed
this.Text = KPRes.GenericCsvImporter + " - " + PwDefs.ShortProductName;
// FontUtil.AssignDefaultBold(m_grpSyntax);
---- a/KeePass/Forms/DataEditorForm.cs
-+++ b/KeePass/Forms/DataEditorForm.cs
+Index: keepass2/KeePass/Forms/DataEditorForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/DataEditorForm.cs
++++ keepass2/KeePass/Forms/DataEditorForm.cs
@@ -93,7 +93,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -129,9 +141,11 @@ Forwarded: not-needed
this.DoubleBuffered = true;
string strRect = Program.Config.UI.DataEditorRect;
---- a/KeePass/Forms/DataViewerForm.cs
-+++ b/KeePass/Forms/DataViewerForm.cs
-@@ -91,7 +91,7 @@ namespace KeePass.Forms
+Index: keepass2/KeePass/Forms/DataViewerForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/DataViewerForm.cs
++++ keepass2/KeePass/Forms/DataViewerForm.cs
+@@ -93,7 +93,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -140,8 +154,10 @@ Forwarded: not-needed
string strTitle = PwDefs.ShortProductName + " " + KPRes.DataViewer;
if(m_strDataDesc.Length > 0)
---- a/KeePass/Forms/DatabaseOperationsForm.cs
-+++ b/KeePass/Forms/DatabaseOperationsForm.cs
+Index: keepass2/KeePass/Forms/DatabaseOperationsForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/DatabaseOperationsForm.cs
++++ keepass2/KeePass/Forms/DatabaseOperationsForm.cs
@@ -61,7 +61,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Package_Settings, KPRes.DatabaseMaintenance,
@@ -151,19 +167,23 @@ Forwarded: not-needed
this.Text = KPRes.DatabaseMaintenance;
m_numHistoryDays.Value = m_pwDatabase.MaintenanceHistoryDays;
---- a/KeePass/Forms/DatabaseSettingsForm.cs
-+++ b/KeePass/Forms/DatabaseSettingsForm.cs
-@@ -79,7 +79,7 @@ namespace KeePass.Forms
+Index: keepass2/KeePass/Forms/DatabaseSettingsForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/DatabaseSettingsForm.cs
++++ keepass2/KeePass/Forms/DatabaseSettingsForm.cs
+@@ -81,7 +81,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Ark, KPRes.DatabaseSettings,
KPRes.DatabaseSettingsDesc);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- m_bInitializing = true;
-
---- a/KeePass/Forms/DuplicationForm.cs
-+++ b/KeePass/Forms/DuplicationForm.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
@@ -100,7 +100,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -173,8 +193,10 @@ Forwarded: not-needed
FontUtil.AssignDefaultBold(m_cbAppendCopy);
FontUtil.AssignDefaultBold(m_cbFieldRefs);
---- a/KeePass/Forms/EcasActionForm.cs
-+++ b/KeePass/Forms/EcasActionForm.cs
+Index: keepass2/KeePass/Forms/EcasActionForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EcasActionForm.cs
++++ keepass2/KeePass/Forms/EcasActionForm.cs
@@ -59,7 +59,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -184,8 +206,10 @@ Forwarded: not-needed
m_lblParamHint.Text = KPRes.ParamDescHelp;
---- a/KeePass/Forms/EcasConditionForm.cs
-+++ b/KeePass/Forms/EcasConditionForm.cs
+Index: keepass2/KeePass/Forms/EcasConditionForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EcasConditionForm.cs
++++ keepass2/KeePass/Forms/EcasConditionForm.cs
@@ -56,7 +56,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -195,8 +219,10 @@ Forwarded: not-needed
m_lblParamHint.Text = KPRes.ParamDescHelp;
---- a/KeePass/Forms/EcasEventForm.cs
-+++ b/KeePass/Forms/EcasEventForm.cs
+Index: keepass2/KeePass/Forms/EcasEventForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EcasEventForm.cs
++++ keepass2/KeePass/Forms/EcasEventForm.cs
@@ -56,7 +56,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -206,8 +232,10 @@ Forwarded: not-needed
m_lblParamHint.Text = KPRes.ParamDescHelp;
---- a/KeePass/Forms/EcasTriggerForm.cs
-+++ b/KeePass/Forms/EcasTriggerForm.cs
+Index: keepass2/KeePass/Forms/EcasTriggerForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EcasTriggerForm.cs
++++ keepass2/KeePass/Forms/EcasTriggerForm.cs
@@ -67,7 +67,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Run, strTitle, strDesc);
@@ -217,8 +245,10 @@ Forwarded: not-needed
m_lvEvents.SmallImageList = m_ilIcons;
m_lvConditions.SmallImageList = m_ilIcons;
---- a/KeePass/Forms/EcasTriggersForm.cs
-+++ b/KeePass/Forms/EcasTriggersForm.cs
+Index: keepass2/KeePass/Forms/EcasTriggersForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EcasTriggersForm.cs
++++ keepass2/KeePass/Forms/EcasTriggersForm.cs
@@ -82,7 +82,7 @@ namespace KeePass.Forms
Properties.Resources.B48x48_Make_KDevelop, KPRes.Triggers,
KPRes.TriggersDesc);
@@ -228,8 +258,10 @@ Forwarded: not-needed
int nWidth = (m_lvTriggers.ClientSize.Width - UIUtil.GetVScrollBarWidth() - 1);
m_lvTriggers.Columns.Add(KPRes.Triggers, nWidth);
---- a/KeePass/Forms/EditAutoTypeItemForm.cs
-+++ b/KeePass/Forms/EditAutoTypeItemForm.cs
+Index: keepass2/KeePass/Forms/EditAutoTypeItemForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EditAutoTypeItemForm.cs
++++ keepass2/KeePass/Forms/EditAutoTypeItemForm.cs
@@ -106,7 +106,7 @@ namespace KeePass.Forms
KPRes.ConfigureKeystrokeSeqDesc);
}
@@ -239,8 +271,10 @@ Forwarded: not-needed
// FontUtil.AssignDefaultBold(m_lblTargetWindow);
// FontUtil.AssignDefaultBold(m_rbSeqDefault);
---- a/KeePass/Forms/EditStringForm.cs
-+++ b/KeePass/Forms/EditStringForm.cs
+Index: keepass2/KeePass/Forms/EditStringForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EditStringForm.cs
++++ keepass2/KeePass/Forms/EditStringForm.cs
@@ -93,7 +93,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -250,9 +284,11 @@ Forwarded: not-needed
UIUtil.EnableAutoCompletion(m_cmbStringName, true);
UIUtil.PrepareStandardMultilineControl(m_richStringValue, true, true);
---- a/KeePass/Forms/EntropyForm.cs
-+++ b/KeePass/Forms/EntropyForm.cs
-@@ -74,7 +74,7 @@ namespace KeePass.Forms
+Index: keepass2/KeePass/Forms/EntropyForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EntropyForm.cs
++++ keepass2/KeePass/Forms/EntropyForm.cs
+@@ -78,7 +78,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Binary, KPRes.EntropyTitle,
KPRes.EntropyDesc);
@@ -260,9 +296,11 @@ Forwarded: not-needed
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
this.Text = KPRes.EntropyTitle;
- UpdateUIState();
---- a/KeePass/Forms/EntryListForm.cs
-+++ b/KeePass/Forms/EntryListForm.cs
+ m_bmpRandom = CreateRandomBitmap(m_picRandom.ClientSize);
+Index: keepass2/KeePass/Forms/EntryListForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EntryListForm.cs
++++ keepass2/KeePass/Forms/EntryListForm.cs
@@ -87,7 +87,7 @@ namespace KeePass.Forms
m_imgIcon, m_strTitle, m_strDescShort);
m_lblText.Text = m_strDescLong;
@@ -272,8 +310,10 @@ Forwarded: not-needed
if(m_ilIcons != null) m_lvEntries.SmallImageList = m_ilIcons;
else m_ilIcons = new ImageList();
---- a/KeePass/Forms/EntryReportForm.cs
-+++ b/KeePass/Forms/EntryReportForm.cs
+Index: keepass2/KeePass/Forms/EntryReportForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/EntryReportForm.cs
++++ keepass2/KeePass/Forms/EntryReportForm.cs
@@ -51,7 +51,7 @@ namespace KeePass.Forms
private void OnFormLoad(object sender, EventArgs e)
@@ -283,8 +323,10 @@ Forwarded: not-needed
if(!string.IsNullOrEmpty(m_strTitle)) this.Text = m_strTitle;
else m_strTitle = PwDefs.ShortProductName;
---- a/KeePass/Forms/ExchangeDataForm.cs
-+++ b/KeePass/Forms/ExchangeDataForm.cs
+Index: keepass2/KeePass/Forms/ExchangeDataForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/ExchangeDataForm.cs
++++ keepass2/KeePass/Forms/ExchangeDataForm.cs
@@ -100,7 +100,7 @@ namespace KeePass.Forms
Properties.Resources.B48x48_Folder_Download);
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -294,8 +336,10 @@ Forwarded: not-needed
this.Text = strWndTitle;
---- a/KeePass/Forms/FieldRefForm.cs
-+++ b/KeePass/Forms/FieldRefForm.cs
+Index: keepass2/KeePass/Forms/FieldRefForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/FieldRefForm.cs
++++ keepass2/KeePass/Forms/FieldRefForm.cs
@@ -68,7 +68,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -305,8 +349,10 @@ Forwarded: not-needed
UIUtil.SetExplorerTheme(m_lvEntries, true);
---- a/KeePass/Forms/FileBrowserForm.cs
-+++ b/KeePass/Forms/FileBrowserForm.cs
+Index: keepass2/KeePass/Forms/FileBrowserForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/FileBrowserForm.cs
++++ keepass2/KeePass/Forms/FileBrowserForm.cs
@@ -97,7 +97,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -316,8 +362,10 @@ Forwarded: not-needed
this.Text = m_strTitle;
m_nIconDim = m_tvFolders.ItemHeight;
---- a/KeePass/Forms/GroupForm.cs
-+++ b/KeePass/Forms/GroupForm.cs
+Index: keepass2/KeePass/Forms/GroupForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/GroupForm.cs
++++ keepass2/KeePass/Forms/GroupForm.cs
@@ -78,7 +78,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Txt, strTitle,
@@ -327,8 +375,10 @@ Forwarded: not-needed
this.Text = strTitle;
UIUtil.SetButtonImage(m_btnAutoTypeEdit,
---- a/KeePass/Forms/HelpSourceForm.cs
-+++ b/KeePass/Forms/HelpSourceForm.cs
+Index: keepass2/KeePass/Forms/HelpSourceForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/HelpSourceForm.cs
++++ keepass2/KeePass/Forms/HelpSourceForm.cs
@@ -47,7 +47,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Download, KPRes.HelpSourceSelection,
@@ -338,8 +388,10 @@ Forwarded: not-needed
this.Text = KPRes.HelpSourceSelection;
FontUtil.AssignDefaultBold(m_radioLocal);
---- a/KeePass/Forms/IOConnectionForm.cs
-+++ b/KeePass/Forms/IOConnectionForm.cs
+Index: keepass2/KeePass/Forms/IOConnectionForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/IOConnectionForm.cs
++++ keepass2/KeePass/Forms/IOConnectionForm.cs
@@ -75,7 +75,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -349,8 +401,10 @@ Forwarded: not-needed
this.Text = strTitle;
FontUtil.AssignDefaultBold(m_lblUrl);
---- a/KeePass/Forms/IconPickerForm.cs
-+++ b/KeePass/Forms/IconPickerForm.cs
+Index: keepass2/KeePass/Forms/IconPickerForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/IconPickerForm.cs
++++ keepass2/KeePass/Forms/IconPickerForm.cs
@@ -80,7 +80,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -360,8 +414,10 @@ Forwarded: not-needed
FontUtil.AssignDefaultBold(m_radioStandard);
FontUtil.AssignDefaultBold(m_radioCustom);
---- a/KeePass/Forms/ImportMethodForm.cs
-+++ b/KeePass/Forms/ImportMethodForm.cs
+Index: keepass2/KeePass/Forms/ImportMethodForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/ImportMethodForm.cs
++++ keepass2/KeePass/Forms/ImportMethodForm.cs
@@ -56,7 +56,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Download, KPRes.ImportBehavior,
@@ -371,8 +427,10 @@ Forwarded: not-needed
this.Text = KPRes.ImportBehavior;
---- a/KeePass/Forms/InternalBrowserForm.cs
-+++ b/KeePass/Forms/InternalBrowserForm.cs
+Index: keepass2/KeePass/Forms/InternalBrowserForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/InternalBrowserForm.cs
++++ keepass2/KeePass/Forms/InternalBrowserForm.cs
@@ -53,7 +53,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -382,8 +440,10 @@ Forwarded: not-needed
if(m_strInitialUrl.Length > 0)
m_webBrowser.Navigate(m_strInitialUrl);
---- a/KeePass/Forms/KeyCreationForm.cs
-+++ b/KeePass/Forms/KeyCreationForm.cs
+Index: keepass2/KeePass/Forms/KeyCreationForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/KeyCreationForm.cs
++++ keepass2/KeePass/Forms/KeyCreationForm.cs
@@ -82,7 +82,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Sign, KPRes.CreateMasterKey,
@@ -393,8 +453,10 @@ Forwarded: not-needed
this.Text = KPRes.CreateMasterKey;
FontUtil.SetDefaultFont(m_cbPassword);
---- a/KeePass/Forms/KeyPromptForm.cs
-+++ b/KeePass/Forms/KeyPromptForm.cs
+Index: keepass2/KeePass/Forms/KeyPromptForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/KeyPromptForm.cs
++++ keepass2/KeePass/Forms/KeyPromptForm.cs
@@ -120,7 +120,7 @@ namespace KeePass.Forms
string strBannerDesc = WinUtil.CompactPath(m_ioInfo.Path, 45);
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -404,9 +466,11 @@ Forwarded: not-needed
FontUtil.SetDefaultFont(m_cbPassword);
FontUtil.AssignDefaultBold(m_cbPassword);
---- a/KeePass/Forms/LanguageForm.cs
-+++ b/KeePass/Forms/LanguageForm.cs
-@@ -55,7 +55,7 @@ namespace KeePass.Forms
+Index: keepass2/KeePass/Forms/LanguageForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/LanguageForm.cs
++++ keepass2/KeePass/Forms/LanguageForm.cs
+@@ -58,7 +58,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Keyboard_Layout,
KPRes.SelectLanguage, KPRes.SelectLanguageDesc);
@@ -414,9 +478,11 @@ Forwarded: not-needed
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
this.Text = KPRes.SelectLanguage;
- int nWidth = m_lvLanguages.ClientRectangle.Width / 4;
---- a/KeePass/Forms/MainForm.cs
-+++ b/KeePass/Forms/MainForm.cs
+ List<Image> lImg = new List<Image>();
+Index: keepass2/KeePass/Forms/MainForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/MainForm.cs
++++ keepass2/KeePass/Forms/MainForm.cs
@@ -140,7 +140,7 @@ namespace KeePass.Forms
m_strNeverExpiresText = KPRes.NeverExpires;
@@ -426,9 +492,11 @@ Forwarded: not-needed
m_imgFileSaveEnabled = Properties.Resources.B16x16_FileSave;
m_imgFileSaveDisabled = Properties.Resources.B16x16_FileSave_Disabled;
// m_imgFileSaveAllEnabled = Properties.Resources.B16x16_File_SaveAll;
---- a/KeePass/Forms/MainForm_Functions.cs
-+++ b/KeePass/Forms/MainForm_Functions.cs
-@@ -417,19 +417,19 @@ namespace KeePass.Forms
+Index: keepass2/KeePass/Forms/MainForm_Functions.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/MainForm_Functions.cs
++++ keepass2/KeePass/Forms/MainForm_Functions.cs
+@@ -427,18 +427,18 @@ namespace KeePass.Forms
strNtfText = strNtfPre + strFileDesc;
Icon icoDisposable, icoAssignable;
@@ -441,7 +509,6 @@ Forwarded: not-needed
- TaskbarList.SetOverlayIcon(this, Properties.Resources.LockOverlay,
+ TaskbarList.SetOverlayIcon(this, new Icon("/usr/share/keepass2/LockOverlay.ico"),
KPRes.Locked);
- DwmUtil.EnableWindowPeekPreview(this, false);
}
else if(s.DatabaseOpened == false)
{
@@ -451,7 +518,7 @@ Forwarded: not-needed
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -453,7 +453,7 @@ namespace KeePass.Forms
+@@ -461,7 +461,7 @@ namespace KeePass.Forms
m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
Icon icoDisposable, icoAssignable;
@@ -460,7 +527,7 @@ Forwarded: not-needed
ref m_kvpIcoTrayNormal, out icoAssignable, out icoDisposable);
m_ntfTray.Icon = icoAssignable;
if(icoDisposable != null) icoDisposable.Dispose();
-@@ -477,7 +477,7 @@ namespace KeePass.Forms
+@@ -486,7 +486,7 @@ namespace KeePass.Forms
m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
Icon icoToDispose, icoToAssign;
@@ -469,16 +536,22 @@ Forwarded: not-needed
ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
this.Icon = icoToAssign;
if(icoToDispose != null) icoToDispose.Dispose();
-@@ -2570,7 +2570,7 @@ namespace KeePass.Forms
- m_bTaskbarButtonMessage = true;
+@@ -2622,12 +2622,12 @@ namespace KeePass.Forms
+ }
+ else if(m.Msg == DwmUtil.WM_DWMSENDICONICTHUMBNAIL)
+ {
+- DwmUtil.SetIconicThumbnail(this, Properties.Resources.KeePass, ref m);
++ DwmUtil.SetIconicThumbnail(this, new Icon("/usr/share/keepass2/KeePass.ico"), ref m);
+ return;
+ }
+ else if(m.Msg == DwmUtil.WM_DWMSENDICONICLIVEPREVIEWBITMAP)
+ {
+- DwmUtil.SetIconicPreview(this, Properties.Resources.KeePass, ref m);
++ DwmUtil.SetIconicPreview(this, new Icon("/usr/share/keepass2/KeePass.ico"), ref m);
+ return;
}
- // else if(m.Msg == DwmUtil.WM_DWMSENDICONICTHUMBNAIL)
-- // DwmUtil.SetThumbnailIcon(this, Properties.Resources.KeePass, m.LParam);
-+ // DwmUtil.SetThumbnailIcon(this, new Icon("/usr/share/keepass2/KeePass.ico"), m.LParam);
- base.WndProc(ref m);
- }
-@@ -3632,7 +3632,7 @@ namespace KeePass.Forms
+@@ -3700,7 +3700,7 @@ namespace KeePass.Forms
// wasn't fully constructed at that time yet)
// if(IsFileLocked(null))
// TaskbarList.SetOverlayIcon(this,
@@ -487,8 +560,10 @@ Forwarded: not-needed
}
if(Program.Config.MainWindow.MinimizeToTray) MinimizeToTray(true);
---- a/KeePass/Forms/OptionsForm.cs
-+++ b/KeePass/Forms/OptionsForm.cs
+Index: keepass2/KeePass/Forms/OptionsForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/OptionsForm.cs
++++ keepass2/KeePass/Forms/OptionsForm.cs
@@ -111,7 +111,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -498,8 +573,10 @@ Forwarded: not-needed
Debug.Assert(m_ilIcons != null);
if(m_ilIcons != null)
---- a/KeePass/Forms/PluginsForm.cs
-+++ b/KeePass/Forms/PluginsForm.cs
+Index: keepass2/KeePass/Forms/PluginsForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/PluginsForm.cs
++++ keepass2/KeePass/Forms/PluginsForm.cs
@@ -64,7 +64,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_BlockDevice, KPRes.Plugins,
@@ -509,9 +586,11 @@ Forwarded: not-needed
m_cbCacheDeleteOld.Checked = Program.Config.Application.Start.PluginCacheDeleteOld;
---- a/KeePass/Forms/PrintForm.cs
-+++ b/KeePass/Forms/PrintForm.cs
-@@ -95,7 +95,7 @@ namespace KeePass.Forms
+Index: keepass2/KeePass/Forms/PrintForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/PrintForm.cs
++++ keepass2/KeePass/Forms/PrintForm.cs
+@@ -97,7 +97,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -519,9 +598,11 @@ Forwarded: not-needed
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
CreateDialogBanner();
- UIUtil.SetButtonImage(m_btnConfigPrinter,
---- a/KeePass/Forms/ProxyForm.cs
-+++ b/KeePass/Forms/ProxyForm.cs
+ List<Image> lTabImg = new List<Image>();
+Index: keepass2/KeePass/Forms/ProxyForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/ProxyForm.cs
++++ keepass2/KeePass/Forms/ProxyForm.cs
@@ -44,7 +44,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -531,9 +612,11 @@ Forwarded: not-needed
ProxyServerType pst = Program.Config.Integration.ProxyType;
if(pst == ProxyServerType.None) m_rbNoProxy.Checked = true;
---- a/KeePass/Forms/PwEntryForm.cs
-+++ b/KeePass/Forms/PwEntryForm.cs
-@@ -609,7 +609,7 @@ namespace KeePass.Forms
+Index: keepass2/KeePass/Forms/PwEntryForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/PwEntryForm.cs
++++ keepass2/KeePass/Forms/PwEntryForm.cs
+@@ -654,7 +654,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
KeePass.Properties.Resources.B48x48_KGPG_Sign, strTitle, strDesc);
@@ -542,8 +625,10 @@ Forwarded: not-needed
this.Text = strTitle;
m_imgPwGen = UIUtil.CreateDropDownImage(Properties.Resources.B16x16_Key_New);
---- a/KeePass/Forms/PwGeneratorForm.cs
-+++ b/KeePass/Forms/PwGeneratorForm.cs
+Index: keepass2/KeePass/Forms/PwGeneratorForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/PwGeneratorForm.cs
++++ keepass2/KeePass/Forms/PwGeneratorForm.cs
@@ -98,7 +98,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_KGPG_Gen, KPRes.PasswordOptions,
@@ -553,8 +638,10 @@ Forwarded: not-needed
UIUtil.SetButtonImage(m_btnProfileAdd,
Properties.Resources.B16x16_FileSaveAs, false);
---- a/KeePass/Forms/SearchForm.cs
-+++ b/KeePass/Forms/SearchForm.cs
+Index: keepass2/KeePass/Forms/SearchForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/SearchForm.cs
++++ keepass2/KeePass/Forms/SearchForm.cs
@@ -92,7 +92,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -564,8 +651,10 @@ Forwarded: not-needed
m_cbDerefData.Text = m_cbDerefData.Text + " (" + KPRes.Slow + ")";
---- a/KeePass/Forms/SingleLineEditForm.cs
-+++ b/KeePass/Forms/SingleLineEditForm.cs
+Index: keepass2/KeePass/Forms/SingleLineEditForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/SingleLineEditForm.cs
++++ keepass2/KeePass/Forms/SingleLineEditForm.cs
@@ -73,7 +73,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
@@ -575,9 +664,11 @@ Forwarded: not-needed
this.Text = m_strTitle;
m_lblLongDesc.Text = m_strLongDesc;
---- a/KeePass/Forms/StatusLoggerForm.cs
-+++ b/KeePass/Forms/StatusLoggerForm.cs
-@@ -124,7 +124,7 @@ namespace KeePass.Forms
+Index: keepass2/KeePass/Forms/StatusLoggerForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/StatusLoggerForm.cs
++++ keepass2/KeePass/Forms/StatusLoggerForm.cs
+@@ -127,7 +127,7 @@ namespace KeePass.Forms
{
GlobalWindowManager.AddWindow(this);
@@ -586,8 +677,10 @@ Forwarded: not-needed
this.Text = PwDefs.ShortProductName;
m_pbProgress.Minimum = 0;
---- a/KeePass/Forms/TanWizardForm.cs
-+++ b/KeePass/Forms/TanWizardForm.cs
+Index: keepass2/KeePass/Forms/TanWizardForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/TanWizardForm.cs
++++ keepass2/KeePass/Forms/TanWizardForm.cs
@@ -61,7 +61,7 @@ namespace KeePass.Forms
KeePass.Properties.Resources.B48x48_Wizard, KPRes.TanWizard,
KPRes.TanWizardDesc);
@@ -597,8 +690,10 @@ Forwarded: not-needed
this.Text = KPRes.TanWizard;
if((m_pgStorage.Name != null) && (m_pgStorage.Name.Length > 0))
---- a/KeePass/Forms/UpdateCheckForm.cs
-+++ b/KeePass/Forms/UpdateCheckForm.cs
+Index: keepass2/KeePass/Forms/UpdateCheckForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/UpdateCheckForm.cs
++++ keepass2/KeePass/Forms/UpdateCheckForm.cs
@@ -64,7 +64,7 @@ namespace KeePass.Forms
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_WWW, KPRes.UpdateCheck,
@@ -608,8 +703,10 @@ Forwarded: not-needed
this.Text = KPRes.UpdateCheck + " - " + PwDefs.ShortProductName;
UIUtil.SetExplorerTheme(m_lvInfo, true);
---- a/KeePass/Forms/UrlOverrideForm.cs
-+++ b/KeePass/Forms/UrlOverrideForm.cs
+Index: keepass2/KeePass/Forms/UrlOverrideForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/UrlOverrideForm.cs
++++ keepass2/KeePass/Forms/UrlOverrideForm.cs
@@ -51,7 +51,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -619,8 +716,10 @@ Forwarded: not-needed
this.Text = KPRes.UrlOverride;
m_tbScheme.Text = m_ovr.Scheme;
---- a/KeePass/Forms/UrlOverridesForm.cs
-+++ b/KeePass/Forms/UrlOverridesForm.cs
+Index: keepass2/KeePass/Forms/UrlOverridesForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/UrlOverridesForm.cs
++++ keepass2/KeePass/Forms/UrlOverridesForm.cs
@@ -66,7 +66,7 @@ namespace KeePass.Forms
GlobalWindowManager.AddWindow(this);
@@ -630,8 +729,10 @@ Forwarded: not-needed
this.Text = KPRes.UrlOverrides;
UIUtil.SetExplorerTheme(m_lvOverrides, false);
---- a/KeePass/Forms/XmlReplaceForm.cs
-+++ b/KeePass/Forms/XmlReplaceForm.cs
+Index: keepass2/KeePass/Forms/XmlReplaceForm.cs
+===================================================================
+--- keepass2.orig/KeePass/Forms/XmlReplaceForm.cs
++++ keepass2/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 f31ec6f..34ca317 100644
--- a/debian/patches/use-the-mono-signing-key.patch
+++ b/debian/patches/use-the-mono-signing-key.patch
@@ -8,8 +8,10 @@ Forwarded: not-needed
KeePassLib/KeePassLib.csproj | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---- a/KeePass/KeePass.csproj
-+++ b/KeePass/KeePass.csproj
+Index: keepass2/KeePass/KeePass.csproj
+===================================================================
+--- keepass2.orig/KeePass/KeePass.csproj
++++ keepass2/KeePass/KeePass.csproj
@@ -11,7 +11,7 @@
<AssemblyName>KeePass</AssemblyName>
<ApplicationIcon>KeePass.ico</ApplicationIcon>
@@ -19,8 +21,10 @@ Forwarded: not-needed
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>2.0</OldToolsVersion>
---- a/KeePassLib/KeePassLib.csproj
-+++ b/KeePassLib/KeePassLib.csproj
+Index: keepass2/KeePassLib/KeePassLib.csproj
+===================================================================
+--- keepass2.orig/KeePassLib/KeePassLib.csproj
++++ keepass2/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