[Pkg-cli-apps-commits] [SCM] keepass2 branch, master, updated. debian/2.18+dfsg-2-7-gb24722a
Julian Taylor
jtaylor.debian at googlemail.com
Wed May 2 17:27:37 UTC 2012
The following commit has been merged in the master branch:
commit c9556216e986c4922f677a0aa896428ecd8baea0
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Wed May 2 19:13:58 2012 +0200
New upstream release (LP: #990557)
drop upstream applied fix-winforms-eventordering.patch
diff --git a/debian/changelog b/debian/changelog
index b642d7d..000fd83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+keepass2 (2.19+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release (LP: #990557)
+ - drop upstream applied fix-winforms-eventordering.patch
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Wed, 02 May 2012 19:12:27 +0200
+
keepass2 (2.18+dfsg-2) unstable; urgency=low
[ Julian Taylor ]
diff --git a/debian/patches/disable-autoupdate-dialog.patch b/debian/patches/disable-autoupdate-dialog.patch
index c30041d..fb614a8 100644
--- a/debian/patches/disable-autoupdate-dialog.patch
+++ b/debian/patches/disable-autoupdate-dialog.patch
@@ -6,11 +6,11 @@ does makes not much sense for the package
Forwarded: not-needed
---
KeePass/App/Configuration/AceApplication.cs | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
+ 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/KeePass/App/Configuration/AceApplication.cs
+++ b/KeePass/App/Configuration/AceApplication.cs
-@@ -193,8 +193,8 @@
+@@ -209,8 +209,8 @@
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 5d20ff3..1d56dbe 100644
--- a/debian/patches/do-not-use-the-non-free-icons.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -4,12 +4,12 @@ Subject: do not use the non-free icons
Forwarded: not-needed
---
- KeePass/Properties/Resources.resx | 56 ++++++++++++++++++------------------
- 1 files changed, 28 insertions(+), 28 deletions(-)
+ KeePass/Properties/Resources.resx | 56 ++++++++++++++++++-------------------
+ 1 file changed, 28 insertions(+), 28 deletions(-)
--- a/KeePass/Properties/Resources.resx
+++ b/KeePass/Properties/Resources.resx
-@@ -416,43 +416,43 @@
+@@ -413,43 +413,43 @@
<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">
@@ -65,7 +65,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>
-@@ -464,22 +464,22 @@
+@@ -461,22 +461,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">
@@ -93,7 +93,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>
-@@ -488,10 +488,10 @@
+@@ -485,10 +485,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">
@@ -106,7 +106,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>
-@@ -527,13 +527,13 @@
+@@ -524,13 +524,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">
@@ -123,7 +123,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>
-@@ -548,13 +548,13 @@
+@@ -545,13 +545,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">
@@ -140,7 +140,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>
-@@ -563,13 +563,13 @@
+@@ -560,13 +560,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">
diff --git a/debian/patches/enable-local-help.patch b/debian/patches/enable-local-help.patch
index 9a8ee58..8df732b 100644
--- a/debian/patches/enable-local-help.patch
+++ b/debian/patches/enable-local-help.patch
@@ -7,7 +7,7 @@ located as html files in "/usr/share/doc/keepass2/Chm/help/"
Forwarded: not-needed
---
KeePass/App/AppHelp.cs | 19 ++++++++-----------
- 1 files changed, 8 insertions(+), 11 deletions(-)
+ 1 file changed, 8 insertions(+), 11 deletions(-)
--- a/KeePass/App/AppHelp.cs
+++ b/KeePass/App/AppHelp.cs
diff --git a/debian/patches/fix-winforms-eventordering.patch b/debian/patches/fix-winforms-eventordering.patch
deleted file mode 100644
index 37d8e59..0000000
--- a/debian/patches/fix-winforms-eventordering.patch
+++ /dev/null
@@ -1,279 +0,0 @@
-From: Dominik Reichl <dominik.reichl at t-online.de>
-Date: Thu, 12 Jan 2012 19:59:59 +0100
-Subject: workaround broken event ordering in mono 2.10
-
-Bug: http://bugzilla.xamarin.com/show_bug.cgi?id=2159
----
- KeePass/Forms/PwEntryForm.cs | 9 ++
- KeePass/KeePass.csproj | 1 +
- KeePass/UI/GlobalWindowManager.cs | 5 +
- KeePass/Util/MonoWorkarounds.cs | 205 +++++++++++++++++++++++++++++++++++++
- 4 files changed, 220 insertions(+), 0 deletions(-)
- create mode 100644 KeePass/Util/MonoWorkarounds.cs
-
---- a/KeePass/Forms/PwEntryForm.cs
-+++ b/KeePass/Forms/PwEntryForm.cs
-@@ -1609,8 +1609,17 @@
- return base.ProcessDialogKey(keyData);
- }
-
-+ private bool m_bClosing = false; // Mono bug workaround
- private void OnFormClosing(object sender, FormClosingEventArgs e)
- {
-+ if(m_bClosing) return;
-+ m_bClosing = true;
-+ HandleFormClosing(e);
-+ m_bClosing = false;
-+ }
-+
-+ private void HandleFormClosing(FormClosingEventArgs e)
-+ {
- bool bCancel = false;
- if(!m_bForceClosing && (m_pwEditMode != PwEditMode.ViewReadOnlyEntry))
- {
---- a/KeePass/KeePass.csproj
-+++ b/KeePass/KeePass.csproj
-@@ -973,6 +973,7 @@
- <Compile Include="Util\IpcBroadcast.Fsw.cs" />
- <Compile Include="Util\IpcUtilEx.cs" />
- <Compile Include="Util\KeyUtil.cs" />
-+ <Compile Include="Util\MonoWorkarounds.cs" />
- <Compile Include="Util\NetUtil.cs" />
- <Compile Include="Util\PwGeneratorUtil.cs" />
- <Compile Include="Util\SearchUtil.cs" />
---- a/KeePass/UI/GlobalWindowManager.cs
-+++ b/KeePass/UI/GlobalWindowManager.cs
-@@ -25,6 +25,7 @@
- using System.Drawing;
-
- using KeePass.App;
-+using KeePass.Util;
-
- using KeePassLib.Native;
- using KeePassLib.Utility;
-@@ -122,6 +123,8 @@
-
- CustomizeControl(form);
-
-+ MonoWorkarounds.ApplyTo(form);
-+
- if(GlobalWindowManager.WindowAdded != null)
- GlobalWindowManager.WindowAdded(null, new GwmWindowEventArgs(
- form, wnd));
-@@ -148,6 +151,8 @@
- GlobalWindowManager.WindowRemoved(null, new GwmWindowEventArgs(
- form, m_vWindows[i].Value));
-
-+ MonoWorkarounds.Release(form);
-+
- m_vWindows.RemoveAt(i);
- return;
- }
---- /dev/null
-+++ b/KeePass/Util/MonoWorkarounds.cs
-@@ -0,0 +1,205 @@
-+/*
-+ KeePass Password Safe - The Open-Source Password Manager
-+ Copyright (C) 2003-2012 Dominik Reichl <dominik.reichl at t-online.de>
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License
-+ along with this program; if not, write to the Free Software
-+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-+*/
-+
-+using System;
-+using System.Collections.Generic;
-+using System.Text;
-+using System.Windows.Forms;
-+using System.ComponentModel;
-+using System.Reflection;
-+using System.Diagnostics;
-+
-+using KeePassLib.Native;
-+
-+namespace KeePass.Util
-+{
-+ public static class MonoWorkarounds
-+ {
-+ private static bool? m_bReq = null;
-+ public static bool IsRequired
-+ {
-+ get
-+ {
-+ if(!m_bReq.HasValue) m_bReq = NativeLib.IsUnix();
-+ return m_bReq.Value;
-+ }
-+ }
-+
-+ public static void ApplyTo(Form f)
-+ {
-+ if(!MonoWorkarounds.IsRequired) return;
-+ if(f == null) { Debug.Assert(false); return; }
-+
-+ ApplyToControlsRec(f.Controls, f, MonoWorkarounds.ApplyToControl);
-+ }
-+
-+ public static void Release(Form f)
-+ {
-+ if(!MonoWorkarounds.IsRequired) return;
-+ if(f == null) { Debug.Assert(false); return; }
-+
-+ ApplyToControlsRec(f.Controls, f, MonoWorkarounds.ReleaseControl);
-+ }
-+
-+ private delegate void MwaControlHandler(Control c, Form fContext);
-+
-+ private static void ApplyToControlsRec(Control.ControlCollection cc,
-+ Form fContext, MwaControlHandler fn)
-+ {
-+ if(cc == null) { Debug.Assert(false); return; }
-+
-+ foreach(Control c in cc)
-+ {
-+ fn(c, fContext);
-+ ApplyToControlsRec(c.Controls, fContext, fn);
-+ }
-+ }
-+
-+ private sealed class MwaHandlerInfo
-+ {
-+ private readonly Delegate m_fnOrg; // May be null
-+ public Delegate FunctionOriginal
-+ {
-+ get { return m_fnOrg; }
-+ }
-+
-+ private readonly Delegate m_fnOvr;
-+ public Delegate FunctionOverride
-+ {
-+ get { return m_fnOvr; }
-+ }
-+
-+ private readonly DialogResult m_dr;
-+ public DialogResult Result
-+ {
-+ get { return m_dr; }
-+ }
-+
-+ private readonly Form m_fContext;
-+ public Form FormContext
-+ {
-+ get { return m_fContext; }
-+ }
-+
-+ public MwaHandlerInfo(Delegate fnOrg, Delegate fnOvr, DialogResult dr,
-+ Form fContext)
-+ {
-+ m_fnOrg = fnOrg;
-+ m_fnOvr = fnOvr;
-+ m_dr = dr;
-+ m_fContext = fContext;
-+ }
-+ }
-+
-+ private static void ApplyToControl(Control c, Form fContext)
-+ {
-+ Button btn = (c as Button);
-+ if(btn != null) ApplyToButton(btn, fContext);
-+ }
-+
-+ private static EventHandlerList GetEventHandlers(Component c,
-+ out object objClickEvent)
-+ {
-+ FieldInfo fi = typeof(Control).GetField("ClickEvent", // Mono
-+ BindingFlags.Static | BindingFlags.NonPublic);
-+ if(fi == null)
-+ fi = typeof(Control).GetField("EventClick", // .NET
-+ BindingFlags.Static | BindingFlags.NonPublic);
-+ if(fi == null) { Debug.Assert(false); objClickEvent = null; return null; }
-+
-+ objClickEvent = fi.GetValue(null);
-+ if(objClickEvent == null) { Debug.Assert(false); return null; }
-+
-+ PropertyInfo pi = typeof(Component).GetProperty("Events",
-+ BindingFlags.Instance | BindingFlags.NonPublic);
-+ return (pi.GetValue(c, null) as EventHandlerList);
-+ }
-+
-+ private static Dictionary<object, MwaHandlerInfo> m_dictHandlers =
-+ new Dictionary<object, MwaHandlerInfo>();
-+ private static void ApplyToButton(Button btn, Form fContext)
-+ {
-+ DialogResult dr = btn.DialogResult;
-+ if(dr == DialogResult.None) return; // No workaround required
-+
-+ object objClickEvent;
-+ EventHandlerList ehl = GetEventHandlers(btn, out objClickEvent);
-+ if(ehl == null) { Debug.Assert(false); return; }
-+ Delegate fnClick = ehl[objClickEvent]; // May be null
-+
-+ EventHandler fnOvr = new EventHandler(MonoWorkarounds.OnButtonClick);
-+ m_dictHandlers[btn] = new MwaHandlerInfo(fnClick, fnOvr, dr, fContext);
-+ btn.DialogResult = DialogResult.None;
-+ ehl[objClickEvent] = fnOvr;
-+ }
-+
-+ private static void ReleaseControl(Control c, Form fContext)
-+ {
-+ Button btn = (c as Button);
-+ if(btn != null) ReleaseButton(btn, fContext);
-+ }
-+
-+ private static void ReleaseButton(Button btn, Form fContext)
-+ {
-+ MwaHandlerInfo hi;
-+ m_dictHandlers.TryGetValue(btn, out hi);
-+ if(hi == null) return;
-+
-+ object objClickEvent;
-+ EventHandlerList ehl = GetEventHandlers(btn, out objClickEvent);
-+ if(ehl == null) { Debug.Assert(false); return; }
-+
-+ if(hi.FunctionOriginal != null)
-+ ehl[objClickEvent] = hi.FunctionOriginal;
-+ else ehl.RemoveHandler(objClickEvent, hi.FunctionOverride);
-+
-+ btn.DialogResult = hi.Result;
-+ m_dictHandlers.Remove(btn);
-+ }
-+
-+ private static void OnButtonClick(object sender, EventArgs e)
-+ {
-+ Button btn = (sender as Button);
-+ if(btn == null) { Debug.Assert(false); return; }
-+
-+ MwaHandlerInfo hi;
-+ m_dictHandlers.TryGetValue(btn, out hi);
-+ if(hi == null) { Debug.Assert(false); return; }
-+
-+ Form f = hi.FormContext;
-+
-+ // Set current dialog result by setting the form's private
-+ // variable; the DialogResult property can't be used,
-+ // because it raises close events
-+ FieldInfo fiRes = typeof(Form).GetField("dialog_result",
-+ BindingFlags.Instance | BindingFlags.NonPublic);
-+ if(fiRes == null) { Debug.Assert(false); return; }
-+ if(f != null) fiRes.SetValue(f, hi.Result);
-+
-+ if(hi.FunctionOriginal != null)
-+ hi.FunctionOriginal.Method.Invoke(hi.FunctionOriginal.Target,
-+ new object[]{ btn, e });
-+
-+ // Raise close events, if the click event handler hasn't
-+ // reset the dialog result
-+ if((f != null) && (f.DialogResult == hi.Result))
-+ f.DialogResult = hi.Result; // Raises close events
-+ }
-+ }
-+}
diff --git a/debian/patches/remove-ToolsVersion-3.5.patch b/debian/patches/remove-ToolsVersion-3.5.patch
index 100f0c9..3b058cc 100644
--- a/debian/patches/remove-ToolsVersion-3.5.patch
+++ b/debian/patches/remove-ToolsVersion-3.5.patch
@@ -6,7 +6,7 @@ use debians default
Forwarded: not-needed
---
KeePass/KeePass.csproj | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
diff --git a/debian/patches/series b/debian/patches/series
index 865a26e..8e07c9a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ remove-ToolsVersion-3.5.patch
enable-local-help.patch
work-around-issues-with-autotype-and-keyboard-layout.patch
disable-autoupdate-dialog.patch
-fix-winforms-eventordering.patch
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index 36b9a0f..a4c08b8 100644
--- a/debian/patches/skip-sgen-run-during-build.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -5,11 +5,11 @@ Subject: skip sgen run during build
Forwarded: not-needed
---
KeePass/KeePass.csproj | 3 ---
- 1 files changed, 0 insertions(+), 3 deletions(-)
+ 1 file changed, 3 deletions(-)
--- a/KeePass/KeePass.csproj
+++ b/KeePass/KeePass.csproj
-@@ -1240,7 +1240,4 @@
+@@ -1248,7 +1248,4 @@
<Target Name="AfterBuild">
</Target>
-->
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
index ea6cdf0..5b24e45 100644
--- a/debian/patches/use-installed-ico-files.patch
+++ b/debian/patches/use-installed-ico-files.patch
@@ -8,52 +8,64 @@ This avoids a UnknownImageFormat error probably caused by mono bug.
Bugs-mono: https://bugzilla.novell.com/show_bug.cgi?id=599462
Forwarded: not-needed
---
- KeePass/Forms/AboutForm.cs | 4 ++--
- KeePass/Forms/AutoTypeCtxForm.cs | 2 +-
- KeePass/Forms/CharPickerForm.cs | 2 +-
- KeePass/Forms/ColumnsForm.cs | 2 +-
- KeePass/Forms/DataEditorForm.cs | 2 +-
- KeePass/Forms/DataViewerForm.cs | 2 +-
- KeePass/Forms/DatabaseOperationsForm.cs | 2 +-
- KeePass/Forms/DatabaseSettingsForm.cs | 2 +-
- KeePass/Forms/DuplicationForm.cs | 2 +-
- KeePass/Forms/EcasTriggerForm.cs | 2 +-
- KeePass/Forms/EcasTriggersForm.cs | 2 +-
- KeePass/Forms/EditAutoTypeItemForm.cs | 2 +-
- KeePass/Forms/EditStringForm.cs | 2 +-
- KeePass/Forms/EntropyForm.cs | 2 +-
- KeePass/Forms/EntryListForm.cs | 2 +-
- KeePass/Forms/EntryReportForm.cs | 2 +-
- KeePass/Forms/ExchangeDataForm.cs | 2 +-
- KeePass/Forms/FieldRefForm.cs | 2 +-
- KeePass/Forms/FileBrowserForm.cs | 2 +-
- KeePass/Forms/GroupForm.cs | 2 +-
- KeePass/Forms/HelpSourceForm.cs | 2 +-
- KeePass/Forms/IOConnectionForm.cs | 2 +-
- KeePass/Forms/IconPickerForm.cs | 2 +-
- KeePass/Forms/ImportCsvForm.cs | 2 +-
- KeePass/Forms/ImportMethodForm.cs | 2 +-
- KeePass/Forms/InternalBrowserForm.cs | 2 +-
- KeePass/Forms/KeyCreationForm.cs | 2 +-
- KeePass/Forms/KeyPromptForm.cs | 2 +-
- KeePass/Forms/LanguageForm.cs | 2 +-
- KeePass/Forms/MainForm.cs | 2 +-
- KeePass/Forms/MainForm_Functions.cs | 12 ++++++------
- KeePass/Forms/OptionsForm.cs | 2 +-
- KeePass/Forms/PluginsForm.cs | 2 +-
- KeePass/Forms/PrintForm.cs | 2 +-
- KeePass/Forms/ProxyForm.cs | 2 +-
- KeePass/Forms/PwEntryForm.cs | 2 +-
- KeePass/Forms/PwGeneratorForm.cs | 2 +-
- KeePass/Forms/SearchForm.cs | 2 +-
- KeePass/Forms/SingleLineEditForm.cs | 2 +-
- KeePass/Forms/StatusLoggerForm.cs | 2 +-
- KeePass/Forms/TanWizardForm.cs | 2 +-
- KeePass/Forms/UpdateCheckForm.cs | 2 +-
- KeePass/Forms/UrlSchemeForm.cs | 2 +-
- KeePass/Forms/UrlSchemesForm.cs | 2 +-
- 44 files changed, 50 insertions(+), 50 deletions(-)
+ Ext/DeprecatedSources/ImportCsvForm_120218.cs | 2 +-
+ KeePass/Forms/AboutForm.cs | 4 ++--
+ KeePass/Forms/AutoTypeCtxForm.cs | 2 +-
+ KeePass/Forms/CharPickerForm.cs | 2 +-
+ KeePass/Forms/ColumnsForm.cs | 2 +-
+ KeePass/Forms/CsvImportForm.cs | 2 +-
+ KeePass/Forms/DataEditorForm.cs | 2 +-
+ KeePass/Forms/DataViewerForm.cs | 2 +-
+ KeePass/Forms/DatabaseOperationsForm.cs | 2 +-
+ KeePass/Forms/DatabaseSettingsForm.cs | 2 +-
+ KeePass/Forms/DuplicationForm.cs | 2 +-
+ KeePass/Forms/EcasTriggerForm.cs | 2 +-
+ KeePass/Forms/EcasTriggersForm.cs | 2 +-
+ KeePass/Forms/EditAutoTypeItemForm.cs | 2 +-
+ KeePass/Forms/EditStringForm.cs | 2 +-
+ KeePass/Forms/EntropyForm.cs | 2 +-
+ KeePass/Forms/EntryListForm.cs | 2 +-
+ KeePass/Forms/EntryReportForm.cs | 2 +-
+ KeePass/Forms/ExchangeDataForm.cs | 2 +-
+ KeePass/Forms/FieldRefForm.cs | 2 +-
+ KeePass/Forms/FileBrowserForm.cs | 2 +-
+ KeePass/Forms/GroupForm.cs | 2 +-
+ KeePass/Forms/HelpSourceForm.cs | 2 +-
+ KeePass/Forms/IOConnectionForm.cs | 2 +-
+ KeePass/Forms/IconPickerForm.cs | 2 +-
+ KeePass/Forms/ImportMethodForm.cs | 2 +-
+ KeePass/Forms/InternalBrowserForm.cs | 2 +-
+ KeePass/Forms/KeyCreationForm.cs | 2 +-
+ KeePass/Forms/KeyPromptForm.cs | 2 +-
+ KeePass/Forms/LanguageForm.cs | 2 +-
+ KeePass/Forms/MainForm.cs | 2 +-
+ KeePass/Forms/MainForm_Functions.cs | 12 ++++++------
+ KeePass/Forms/OptionsForm.cs | 2 +-
+ KeePass/Forms/PluginsForm.cs | 2 +-
+ KeePass/Forms/PrintForm.cs | 2 +-
+ KeePass/Forms/ProxyForm.cs | 2 +-
+ KeePass/Forms/PwEntryForm.cs | 2 +-
+ KeePass/Forms/PwGeneratorForm.cs | 2 +-
+ KeePass/Forms/SearchForm.cs | 2 +-
+ KeePass/Forms/SingleLineEditForm.cs | 2 +-
+ KeePass/Forms/StatusLoggerForm.cs | 2 +-
+ KeePass/Forms/TanWizardForm.cs | 2 +-
+ KeePass/Forms/UpdateCheckForm.cs | 2 +-
+ KeePass/Forms/UrlSchemeForm.cs | 2 +-
+ KeePass/Forms/UrlSchemesForm.cs | 2 +-
+ 45 files changed, 51 insertions(+), 51 deletions(-)
+--- a/Ext/DeprecatedSources/ImportCsvForm_120218.cs
++++ b/Ext/DeprecatedSources/ImportCsvForm_120218.cs
+@@ -69,7 +69,7 @@
+
+ GlobalWindowManager.AddWindow(this);
+
+- this.Icon = Properties.Resources.KeePass;
++ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+
+ m_bBlockChangedEvent = true;
+
--- a/KeePass/Forms/AboutForm.cs
+++ b/KeePass/Forms/AboutForm.cs
@@ -56,11 +56,11 @@
@@ -103,6 +115,17 @@ Forwarded: not-needed
this.Text = KPRes.ConfigureColumns;
int nWidth = (m_lvColumns.ClientRectangle.Width -
+--- a/KeePass/Forms/CsvImportForm.cs
++++ b/KeePass/Forms/CsvImportForm.cs
+@@ -107,7 +107,7 @@
+
+ GlobalWindowManager.AddWindow(this);
+
+- this.Icon = Properties.Resources.KeePass;
++ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
+ this.Text = KPRes.GenericCsvImporter + " - " + PwDefs.ShortProductName;
+
+ // FontUtil.AssignDefaultBold(m_grpSyntax);
--- a/KeePass/Forms/DataEditorForm.cs
+++ b/KeePass/Forms/DataEditorForm.cs
@@ -92,7 +92,7 @@
@@ -116,15 +139,15 @@ Forwarded: not-needed
string strRect = Program.Config.UI.DataEditorRect;
--- a/KeePass/Forms/DataViewerForm.cs
+++ b/KeePass/Forms/DataViewerForm.cs
-@@ -71,7 +71,7 @@
+@@ -76,7 +76,7 @@
GlobalWindowManager.AddWindow(this);
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- m_tslViewer.Text = KPRes.ShowIn + ":";
- m_tslEncoding.Text = KPRes.Encoding + ":";
+ if(m_strDataDesc.Length > 0)
+ this.Text = m_strDataDesc + " - " + this.Text;
--- a/KeePass/Forms/DatabaseOperationsForm.cs
+++ b/KeePass/Forms/DatabaseOperationsForm.cs
@@ -61,7 +61,7 @@
@@ -182,15 +205,15 @@ Forwarded: not-needed
m_lvTriggers.Columns.Add(KPRes.Triggers, nWidth);
--- a/KeePass/Forms/EditAutoTypeItemForm.cs
+++ b/KeePass/Forms/EditAutoTypeItemForm.cs
-@@ -121,7 +121,7 @@
+@@ -97,7 +97,7 @@
KPRes.ConfigureKeystrokeSeqDesc);
}
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- UIUtil.EnableAutoCompletion(m_cmbWindow, false);
-
+ // FontUtil.AssignDefaultBold(m_lblTargetWindow);
+ // FontUtil.AssignDefaultBold(m_rbSeqDefault);
--- a/KeePass/Forms/EditStringForm.cs
+++ b/KeePass/Forms/EditStringForm.cs
@@ -93,7 +93,7 @@
@@ -255,8 +278,8 @@ Forwarded: not-needed
- this.Icon = Properties.Resources.KeePass;
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- UIUtil.SetExplorerTheme(m_lvEntries.Handle);
- if(UISystemFonts.ListFont != null)
+ UIUtil.SetExplorerTheme(m_lvEntries, true);
+
--- a/KeePass/Forms/FileBrowserForm.cs
+++ b/KeePass/Forms/FileBrowserForm.cs
@@ -93,7 +93,7 @@
@@ -270,7 +293,7 @@ Forwarded: not-needed
m_nIconDim = m_tvFolders.ItemHeight;
--- a/KeePass/Forms/GroupForm.cs
+++ b/KeePass/Forms/GroupForm.cs
-@@ -66,7 +66,7 @@
+@@ -68,7 +68,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Folder_Txt, KPRes.EditGroup,
KPRes.EditGroupDesc);
@@ -312,17 +335,6 @@ Forwarded: not-needed
FontUtil.AssignDefaultBold(m_radioStandard);
FontUtil.AssignDefaultBold(m_radioCustom);
---- a/KeePass/Forms/ImportCsvForm.cs
-+++ b/KeePass/Forms/ImportCsvForm.cs
-@@ -69,7 +69,7 @@
-
- GlobalWindowManager.AddWindow(this);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- m_bBlockChangedEvent = true;
-
--- a/KeePass/Forms/ImportMethodForm.cs
+++ b/KeePass/Forms/ImportMethodForm.cs
@@ -56,7 +56,7 @@
@@ -369,7 +381,7 @@ Forwarded: not-needed
FontUtil.AssignDefaultBold(m_cbKeyFile);
--- a/KeePass/Forms/LanguageForm.cs
+++ b/KeePass/Forms/LanguageForm.cs
-@@ -54,7 +54,7 @@
+@@ -55,7 +55,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
Properties.Resources.B48x48_Keyboard_Layout,
KPRes.SelectLanguage, KPRes.SelectLanguageDesc);
@@ -433,7 +445,7 @@ Forwarded: not-needed
ref m_kvpIcoMain, out icoToAssign, out icoToDispose))
this.Icon = icoToAssign;
if(icoToDispose != null) icoToDispose.Dispose();
-@@ -3503,7 +3503,7 @@
+@@ -3515,7 +3515,7 @@
// wasn't fully constructed at that time yet)
// if(IsFileLocked(null))
// TaskbarList.SetOverlayIcon(this,
@@ -488,7 +500,7 @@ Forwarded: not-needed
if(pst == ProxyServerType.None) m_rbNoProxy.Checked = true;
--- a/KeePass/Forms/PwEntryForm.cs
+++ b/KeePass/Forms/PwEntryForm.cs
-@@ -550,7 +550,7 @@
+@@ -580,7 +580,7 @@
BannerFactory.CreateBannerEx(this, m_bannerImage,
KeePass.Properties.Resources.B48x48_KGPG_Sign, strTitle, strDesc);
@@ -496,7 +508,7 @@ Forwarded: not-needed
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
this.Text = strTitle;
- UIUtil.SetButtonImage(m_btnTools,
+ m_imgPwGen = UIUtil.CreateDropDownImage(Properties.Resources.B16x16_Key_New);
--- a/KeePass/Forms/PwGeneratorForm.cs
+++ b/KeePass/Forms/PwGeneratorForm.cs
@@ -90,7 +90,7 @@
@@ -562,7 +574,7 @@ Forwarded: not-needed
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
this.Text = KPRes.UpdateCheck + " - " + PwDefs.ShortProductName;
- // UIUtil.SetExplorerTheme(m_lvInfo.Handle);
+ UIUtil.SetExplorerTheme(m_lvInfo, true);
--- a/KeePass/Forms/UrlSchemeForm.cs
+++ b/KeePass/Forms/UrlSchemeForm.cs
@@ -51,7 +51,7 @@
@@ -584,4 +596,4 @@ Forwarded: not-needed
+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
this.Text = KPRes.UrlSchemeOverrides;
- UIUtil.SetExplorerTheme(m_lvOverrides.Handle);
+ UIUtil.SetExplorerTheme(m_lvOverrides, false);
diff --git a/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch b/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch
index f9f634f..5bfd5c6 100644
--- a/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch
+++ b/debian/patches/work-around-issues-with-autotype-and-keyboard-layout.patch
@@ -5,7 +5,7 @@ Subject: work around issues with autotype and keyboard layouts
for some reason unicode codes works better
---
KeePass/Util/SendInputEx.Unix.cs | 6 ++++--
- 1 files changed, 4 insertions(+), 2 deletions(-)
+ 1 file changed, 4 insertions(+), 2 deletions(-)
--- a/KeePass/Util/SendInputEx.Unix.cs
+++ b/KeePass/Util/SendInputEx.Unix.cs
--
keepass2
More information about the Pkg-cli-apps-commits
mailing list