[Pkg-cli-apps-commits] [keepass2] 03/04: Refresh patches, remove old icon patch
Julian Taylor
jtaylor.debian at googlemail.com
Thu Jun 22 05:43:04 UTC 2017
This is an automated email from the git hooks/post-receive script.
jtaylor-guest pushed a commit to branch master
in repository keepass2.
commit ea9e8369a7dfc923dc72a959d8bffa1761860c22
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Sun Jun 18 19:27:41 2017 +0200
Refresh patches, remove old icon patch
Using installed icons does not appear to be necessary with current mono
anymore.
---
debian/changelog | 2 +
debian/install | 4 -
debian/patches/disable-clipboard-workaround.patch | 4 +-
debian/patches/do-not-use-the-non-free-icons.patch | 28 +-
debian/patches/dont-display-as-dev-version.patch | 2 +-
debian/patches/fix-XSL-search-path.patch | 8 +-
debian/patches/force_toolsversion_4 | 2 +-
debian/patches/series | 1 -
debian/patches/skip-sgen-run-during-build.patch | 2 +-
debian/patches/use-installed-ico-files.patch | 758 ---------------------
10 files changed, 28 insertions(+), 783 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9a03899..ca21eb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ keepass2 (2.36+dfsg-1) unstable; urgency=medium
* New upstream release
* Update rules for new icon path
+ * remove debian/patches/use-installed-ico-files.patch:
+ does not appear to be necessary with current mono anymore
-- Julian Taylor <jtaylor.debian at googlemail.com> Sun, 18 Jun 2017 19:28:14 +0200
diff --git a/debian/install b/debian/install
index 916bc73..21c8c84 100644
--- a/debian/install
+++ b/debian/install
@@ -2,10 +2,6 @@ Build/KeePass/Release/KeePass.exe usr/lib/keepass2
Ext/KeePass.config.xml usr/lib/keepass2
Ext/KeePass.exe.config usr/lib/keepass2
Ext/XSL usr/share/keepass2
-KeePass/Resources/Icons/LockOverlay.ico usr/share/keepass2
-KeePass/Resources/Icons/QuadLocked.ico usr/share/keepass2
-KeePass/Resources/Icons/QuadNormal.ico usr/share/keepass2
-KeePass/Resources/Images/KeePass.ico usr/share/keepass2
debian/keepass2.desktop usr/share/applications
debian/keepass2.sh usr/bin
debian/keepass2.xml usr/share/mime/packages
diff --git a/debian/patches/disable-clipboard-workaround.patch b/debian/patches/disable-clipboard-workaround.patch
index 4f080ff..6f1f533 100644
--- a/debian/patches/disable-clipboard-workaround.patch
+++ b/debian/patches/disable-clipboard-workaround.patch
@@ -13,9 +13,9 @@ Index: keepass2/KeePassLib/Utility/MonoWorkarounds.cs
===================================================================
--- keepass2.orig/KeePassLib/Utility/MonoWorkarounds.cs
+++ keepass2/KeePassLib/Utility/MonoWorkarounds.cs
-@@ -169,7 +169,7 @@ namespace KeePassLib.Utility
+@@ -174,7 +174,7 @@ namespace KeePassLib.Utility
- // m_fOwnWindow = fOwnWindow;
+ // g_fOwnWindow = fOwnWindow;
- if(IsRequired(1530))
+ if(false && IsRequired(1530))
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 00e287c..d836888 100644
--- a/debian/patches/do-not-use-the-non-free-icons.patch
+++ b/debian/patches/do-not-use-the-non-free-icons.patch
@@ -4,14 +4,14 @@ Subject: do not use the non-free icons
Forwarded: not-needed
---
- KeePass/Properties/Resources.resx | 80 +++++++++++++++++++--------------------
- 1 file changed, 40 insertions(+), 40 deletions(-)
+ KeePass/Properties/Resources.resx | 83 ++++++++++++++++++++-------------------
+ 1 file changed, 43 insertions(+), 40 deletions(-)
Index: keepass2/KeePass/Properties/Resources.resx
===================================================================
--- keepass2.orig/KeePass/Properties/Resources.resx
+++ keepass2/KeePass/Properties/Resources.resx
-@@ -404,40 +404,40 @@
+@@ -401,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>
<data name="B16x16_Imp_AmP" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -63,7 +63,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</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>
-@@ -449,22 +449,22 @@
+@@ -446,22 +449,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">
@@ -91,7 +91,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</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>
-@@ -473,10 +473,10 @@
+@@ -470,10 +473,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">
@@ -104,7 +104,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</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>
-@@ -503,13 +503,13 @@
+@@ -500,13 +503,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">
@@ -121,7 +121,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</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>
-@@ -524,13 +524,13 @@
+@@ -521,13 +524,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">
@@ -138,7 +138,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</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>
-@@ -539,13 +539,13 @@
+@@ -536,13 +539,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">
@@ -155,7 +155,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</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>
-@@ -554,19 +554,19 @@
+@@ -551,19 +554,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">
@@ -180,7 +180,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</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>
-@@ -581,13 +581,13 @@
+@@ -578,13 +581,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">
@@ -197,7 +197,7 @@ Index: keepass2/KeePass/Properties/Resources.resx
</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>
-@@ -629,18 +629,18 @@
+@@ -626,19 +629,19 @@
<value>..\Resources\Nuvola_Derived\B16x16_Folder_New_Ex.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="B16x16_Imp_NPassword" type="System.Resources.ResXFileRef, System.Windows.Forms">
@@ -219,6 +219,12 @@ Index: keepass2/KeePass/Properties/Resources.resx
- <value>..\Resources\Images\B16x16_Imp_Enpass.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="KeePass_G" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Icons\KeePass_G.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+@@ -661,4 +664,4 @@
+ <data name="KeePass" type="System.Resources.ResXFileRef, System.Windows.Forms">
+ <value>..\Resources\Icons\KeePass.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+ </data>
-</root>
\ No newline at end of file
+</root>
diff --git a/debian/patches/dont-display-as-dev-version.patch b/debian/patches/dont-display-as-dev-version.patch
index acd2eb4..82d7b21 100644
--- a/debian/patches/dont-display-as-dev-version.patch
+++ b/debian/patches/dont-display-as-dev-version.patch
@@ -11,7 +11,7 @@ Index: keepass2/KeePass/Program.cs
===================================================================
--- keepass2.orig/KeePass/Program.cs
+++ keepass2/KeePass/Program.cs
-@@ -779,7 +779,7 @@ namespace KeePass
+@@ -776,7 +776,7 @@ namespace KeePass
Assembly asm = Assembly.GetExecutingAssembly();
byte[] pk = asm.GetName().GetPublicKeyToken();
string strPk = MemUtil.ByteArrayToHexString(pk);
diff --git a/debian/patches/fix-XSL-search-path.patch b/debian/patches/fix-XSL-search-path.patch
index 1727636..53cf9ef 100644
--- a/debian/patches/fix-XSL-search-path.patch
+++ b/debian/patches/fix-XSL-search-path.patch
@@ -20,14 +20,14 @@ Index: keepass2/KeePass/App/AppDefs.cs
+ public const string DebianDataDir = "/usr/share/keepass2/";
+
- public const string XslFilesDir = "XSL";
- public const string XslFileHtmlFull = "KDBX_DetailsFull_HTML.xsl";
- public const string XslFileHtmlLight = "KDBX_DetailsLight_HTML.xsl";
+ public static readonly Color ColorQualityLow = Color.FromArgb(255, 128, 0);
+ public static readonly Color ColorQualityHigh = Color.FromArgb(0, 255, 0);
+
Index: keepass2/KeePass/Forms/AboutForm.cs
===================================================================
--- keepass2.orig/KeePass/Forms/AboutForm.cs
+++ keepass2/KeePass/Forms/AboutForm.cs
-@@ -97,8 +97,7 @@ namespace KeePass.Forms
+@@ -98,8 +98,7 @@ namespace KeePass.Forms
m_lvComponents.Items.Add(lvi);
lvi = new ListViewItem(KPRes.XslStylesheetsKdbx);
diff --git a/debian/patches/force_toolsversion_4 b/debian/patches/force_toolsversion_4
index a81c7e9..264fc57 100644
--- a/debian/patches/force_toolsversion_4
+++ b/debian/patches/force_toolsversion_4
@@ -30,7 +30,7 @@ Index: keepass2/KeePass/KeePass.csproj
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -1392,4 +1392,4 @@
+@@ -1407,4 +1407,4 @@
<Target Name="AfterBuild">
</Target>
-->
diff --git a/debian/patches/series b/debian/patches/series
index 8b32af6..c7feb75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
use-the-mono-signing-key.patch
-use-installed-ico-files.patch
do-not-use-the-non-free-icons.patch
skip-sgen-run-during-build.patch
fix-XSL-search-path.patch
diff --git a/debian/patches/skip-sgen-run-during-build.patch b/debian/patches/skip-sgen-run-during-build.patch
index 026394d..1897c7b 100644
--- a/debian/patches/skip-sgen-run-during-build.patch
+++ b/debian/patches/skip-sgen-run-during-build.patch
@@ -11,7 +11,7 @@ Index: keepass2/KeePass/KeePass.csproj
===================================================================
--- keepass2.orig/KeePass/KeePass.csproj
+++ keepass2/KeePass/KeePass.csproj
-@@ -1392,7 +1392,4 @@
+@@ -1407,7 +1407,4 @@
<Target Name="AfterBuild">
</Target>
-->
diff --git a/debian/patches/use-installed-ico-files.patch b/debian/patches/use-installed-ico-files.patch
deleted file mode 100644
index c75d925..0000000
--- a/debian/patches/use-installed-ico-files.patch
+++ /dev/null
@@ -1,758 +0,0 @@
-From: Debian CLI Applications Team <pkg-cli-apps-team at lists.alioth.debian.org>
-Date: Sun, 10 Apr 2011 15:46:08 +0200
-Subject: use installed ico files
-
-use installed icons instead of pulling them from the ressource.
-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/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/EcasActionForm.cs | 2 +-
- KeePass/Forms/EcasConditionForm.cs | 2 +-
- KeePass/Forms/EcasEventForm.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/FieldPickerForm.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 | 16 ++++++++--------
- 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/UrlOverrideForm.cs | 2 +-
- KeePass/Forms/UrlOverridesForm.cs | 2 +-
- KeePass/Forms/XmlReplaceForm.cs | 2 +-
- 49 files changed, 57 insertions(+), 57 deletions(-)
-
-Index: keepass2/KeePass/Forms/AboutForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/AboutForm.cs
-+++ keepass2/KeePass/Forms/AboutForm.cs
-@@ -68,11 +68,11 @@ namespace KeePass.Forms
- strDesc += ")";
- }
-
-- Icon icoNew = new Icon(Properties.Resources.KeePass, 48, 48);
-+ Icon icoNew = new Icon(new Icon("/usr/share/keepass2/KeePass.ico"), 48, 48);
-
- BannerFactory.CreateBannerEx(this, m_bannerImage, icoNew.ToBitmap(),
- strTitle, strDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -76,7 +76,7 @@ namespace KeePass.Forms
-
- m_lblText.Text = KPRes.AutoTypeEntrySelectionDescLong2;
- this.Text = KPRes.AutoTypeEntrySelection;
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -135,7 +135,7 @@ namespace KeePass.Forms
-
- m_fontChars = FontUtil.CreateFont("Tahoma", 8.25f, FontStyle.Bold);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -58,7 +58,7 @@ namespace KeePass.Forms
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- Properties.Resources.B48x48_View_Detailed,
- KPRes.ConfigureColumns, KPRes.ConfigureColumnsDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -112,7 +112,7 @@ namespace KeePass.Forms
- // Callable from KPScript without parent form
- Debug.Assert(this.StartPosition == FormStartPosition.CenterScreen);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -95,7 +95,7 @@ namespace KeePass.Forms
-
- GlobalWindowManager.AddWindow(this);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -93,7 +93,7 @@ namespace KeePass.Forms
-
- GlobalWindowManager.AddWindow(this);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -64,7 +64,7 @@ namespace KeePass.Forms
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- Properties.Resources.B48x48_Package_Settings, KPRes.DatabaseMaintenance,
- KPRes.DatabaseMaintenanceDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -90,7 +90,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");
-
- 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);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -59,7 +59,7 @@ namespace KeePass.Forms
- GlobalWindowManager.AddWindow(this);
-
- this.Text = KPRes.Action;
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- m_lblParamHint.Text = KPRes.ParamDescHelp;
-
-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);
-
- this.Text = KPRes.Condition;
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- m_lblParamHint.Text = KPRes.ParamDescHelp;
-
-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);
-
- this.Text = KPRes.Event;
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- m_lblParamHint.Text = KPRes.ParamDescHelp;
-
-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);
- this.Text = strTitle;
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -82,7 +82,7 @@ namespace KeePass.Forms
- Properties.Resources.B48x48_Make_KDevelop, KPRes.Triggers,
- KPRes.TriggersDesc);
- this.Text = KPRes.Triggers;
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -106,7 +106,7 @@ namespace KeePass.Forms
- KPRes.ConfigureKeystrokeSeqDesc);
- }
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- // 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
-@@ -97,7 +97,7 @@ namespace KeePass.Forms
-
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- Properties.Resources.B48x48_Font, strTitle, strDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -77,7 +77,7 @@ namespace KeePass.Forms
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- Properties.Resources.B48x48_Binary, KPRes.EntropyTitle,
- KPRes.EntropyDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -87,7 +87,7 @@ namespace KeePass.Forms
- m_imgIcon, m_strTitle, m_strDescShort);
- m_lblText.Text = m_strDescLong;
- this.Text = m_strTitle;
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -51,7 +51,7 @@ namespace KeePass.Forms
-
- private void OnFormLoad(object sender, EventArgs e)
- {
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -100,7 +100,7 @@ namespace KeePass.Forms
- Properties.Resources.B48x48_Folder_Download);
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- bmpBanner, strWndTitle, strWndDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- this.Text = strWndTitle;
-
-Index: keepass2/KeePass/Forms/FieldPickerForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/FieldPickerForm.cs
-+++ keepass2/KeePass/Forms/FieldPickerForm.cs
-@@ -93,7 +93,7 @@ namespace KeePass.Forms
- if(strTitle.Length > 0) strTitleEx += " - ";
- strTitleEx += PwDefs.ShortProductName;
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- this.Text = strTitleEx;
-
- BannerFactory.CreateBannerEx(this, m_bannerImage,
-Index: keepass2/KeePass/Forms/FieldRefForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/FieldRefForm.cs
-+++ keepass2/KeePass/Forms/FieldRefForm.cs
-@@ -71,7 +71,7 @@ namespace KeePass.Forms
-
- GlobalWindowManager.AddWindow(this);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- UIUtil.SetExplorerTheme(m_lvEntries, true);
-
-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);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -80,7 +80,7 @@ namespace KeePass.Forms
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- Properties.Resources.B48x48_Folder_Txt, strTitle,
- (m_bCreatingNew ? KPRes.AddGroupDesc : KPRes.EditGroupDesc));
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- this.Text = strTitle;
-
- UIUtil.SetButtonImage(m_btnAutoTypeEdit,
-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,
- KPRes.HelpSourceSelectionDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -85,7 +85,7 @@ namespace KeePass.Forms
-
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- KeePass.Properties.Resources.B48x48_WWW, strTitle, strDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- this.Text = strTitle;
-
- FontUtil.AssignDefaultBold(m_lblUrl);
-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);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -56,7 +56,7 @@ namespace KeePass.Forms
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- Properties.Resources.B48x48_Folder_Download, KPRes.ImportBehavior,
- KPRes.ImportBehaviorDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- this.Text = KPRes.ImportBehavior;
-
-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);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -82,7 +82,7 @@ namespace KeePass.Forms
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- Properties.Resources.B48x48_KGPG_Sign, KPRes.CreateMasterKey,
- m_ioInfo.GetDisplayName());
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -121,7 +121,7 @@ namespace KeePass.Forms
- string strBannerDesc = WinUtil.CompactPath(m_ioInfo.Path, 45);
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- Properties.Resources.B48x48_KGPG_Key2, strBannerTitle, strBannerDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -58,7 +58,7 @@ namespace KeePass.Forms
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- Properties.Resources.B48x48_Keyboard_Layout,
- KPRes.SelectLanguage, KPRes.SelectLanguageDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -141,7 +141,7 @@ namespace KeePass.Forms
- m_strNeverExpiresText = KPRes.NeverExpires;
-
- this.Text = PwDefs.ShortProductName;
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -438,18 +438,18 @@ namespace KeePass.Forms
- strNtfText = strNtfPre + strFileDesc;
-
- Icon icoDisposable, icoAssignable;
-- 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();
-
-- TaskbarList.SetOverlayIcon(this, Properties.Resources.LockOverlay,
-+ TaskbarList.SetOverlayIcon(this, new Icon("/usr/share/keepass2/LockOverlay.ico"),
- KPRes.Locked);
- }
- else if(s.DatabaseOpened == false)
- {
- Icon icoDisposable, icoAssignable;
-- 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();
-@@ -472,7 +472,7 @@ namespace KeePass.Forms
- m_docMgr.ActiveDatabase.IOConnectionInfo.Path, 63 - strNtfPre.Length);
-
- Icon icoDisposable, icoAssignable;
-- 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();
-@@ -497,7 +497,7 @@ namespace KeePass.Forms
- m_ntfTray.Text = StrUtil.CompactString3Dots(strNtfText, 63);
-
- Icon icoToDispose, icoToAssign;
-- 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();
-@@ -2771,12 +2771,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;
- }
-
-@@ -3900,7 +3900,7 @@ namespace KeePass.Forms
- // wasn't fully constructed at that time yet)
- // if(IsFileLocked(null))
- // TaskbarList.SetOverlayIcon(this,
-- // Properties.Resources.LockOverlay, KPRes.Locked);
-+ // new Icon("/usr/share/keepass2/LockOverlay.ico"), KPRes.Locked);
- }
-
- if(Program.Config.MainWindow.MinimizeToTray) MinimizeToTray(true);
-Index: keepass2/KeePass/Forms/OptionsForm.cs
-===================================================================
---- keepass2.orig/KeePass/Forms/OptionsForm.cs
-+++ keepass2/KeePass/Forms/OptionsForm.cs
-@@ -121,7 +121,7 @@ namespace KeePass.Forms
-
- GlobalWindowManager.AddWindow(this);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -64,7 +64,7 @@ namespace KeePass.Forms
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- Properties.Resources.B48x48_BlockDevice, KPRes.Plugins,
- KPRes.PluginsDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -100,7 +100,7 @@ namespace KeePass.Forms
-
- GlobalWindowManager.AddWindow(this);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- CreateDialogBanner();
-
- 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);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -662,7 +662,7 @@ namespace KeePass.Forms
-
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- KeePass.Properties.Resources.B48x48_KGPG_Sign, strTitle, strDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- this.Text = strTitle;
-
- m_imgGenPw = UIUtil.CreateDropDownImage(Properties.Resources.B16x16_Key_New);
-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,
- KPRes.PasswordOptionsDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -92,7 +92,7 @@ namespace KeePass.Forms
-
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- Properties.Resources.B48x48_XMag, strTitle, KPRes.SearchDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -73,7 +73,7 @@ namespace KeePass.Forms
-
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- m_imgIcon, m_strTitle, m_strDesc);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
-
- 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
-@@ -127,7 +127,7 @@ namespace KeePass.Forms
- {
- GlobalWindowManager.AddWindow(this);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -61,7 +61,7 @@ namespace KeePass.Forms
- KeePass.Properties.Resources.B48x48_Wizard, KPRes.TanWizard,
- KPRes.TanWizardDesc);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -64,7 +64,7 @@ namespace KeePass.Forms
- BannerFactory.CreateBannerEx(this, m_bannerImage,
- Properties.Resources.B48x48_WWW, KPRes.UpdateCheck,
- KPRes.UpdateCheckResults);
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -51,7 +51,7 @@ namespace KeePass.Forms
-
- GlobalWindowManager.AddWindow(this);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -66,7 +66,7 @@ namespace KeePass.Forms
-
- GlobalWindowManager.AddWindow(this);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- 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
-@@ -62,7 +62,7 @@ namespace KeePass.Forms
- KeePass.Properties.Resources.B48x48_Binary, KPRes.XmlReplace,
- KPRes.XmlReplaceDesc);
-
-- this.Icon = Properties.Resources.KeePass;
-+ this.Icon = new Icon("/usr/share/keepass2/KeePass.ico");
- this.Text = KPRes.XmlReplace;
-
- Bitmap bmpBig = SystemIcons.Warning.ToBitmap();
--
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