From 0690fc58f73ac6938d29f6df9d66ce96c43516ce Mon Sep 17 00:00:00 2001
From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Thu, 9 Mar 2017 23:53:22 +0000
Subject: [PATCH] frmPreferences: Added icons

---
 source/bitmaps/icons/hideaddressbooks.png | Bin 0 -> 1417 bytes
 source/bitmaps/icons/windowpos.png        | Bin 0 -> 1498 bytes
 source/frmPreferences.cpp                 |  13 ++++++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 source/bitmaps/icons/hideaddressbooks.png
 create mode 100644 source/bitmaps/icons/windowpos.png

diff --git a/source/bitmaps/icons/hideaddressbooks.png b/source/bitmaps/icons/hideaddressbooks.png
new file mode 100644
index 0000000000000000000000000000000000000000..7aecb6f7bf17409a3d455888355408baf2a23d88
GIT binary patch
literal 1417
zcmV;41$O$0P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm0002p0002p0dP~I2LJ#78FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11qMk(K~z|U#g|=Z990y@|L5MhvpbtjW4@Y{q=kNH(@2B0mPReD
zSQHf0S`d6wTG1B~L0^3p-`fZCAgE7bQLu_wp-9j+4}w-|KdhR>HnAT`x7pc``PjMV
z_^`1w*-5))A9`Szng3kw`Q0<;-g_=^kB!pA-S2(A)vM(8K`Hc5DS!2eYv<3zgMKTH
zlt?tYfB!ejbtkQHdzgRwp%a+{Y%MzbEhb(Wh+Q*eTLG~1^OpcL2f*M2A|N6F1ZAWo
zF5*7&)oSuJ1OO8PF~ZBb2uKS<002Zl1sN{E6LC>a^OXvqSSJF26oH69RI6CB)dS9j
zo?TqcD@_Q)8nRh)^S+WDwR!)rj1-up+BATGYY;$000@Y<EQ(7m*H(S};W2t__ptrp
z`%})&$A|21zf7v(t?Srz9h6ETvKfQ6_N<5iVGxrZ-4=*&(Na=r8o;q^6%kkjN)w1|
z#S#}01bxO)a&r8%@;sNXT`ou%MiK@QpF4d~2VsPKn+Fl0wziBEixujBbR@9gBJ^GS
z0xLEQohShb)l>vcNg0}pZFwg=_{QGUP~z!S6-OaeC@u<d&@@047PxBiHG)ED!g>T$
zQhZ-F{M?5dSuh|{pTP{EqH>8qFJ@j{?F1VlU|O|Ttt2&3Hf|aq)=?N46B2;fgvwD=
zV&dWqwPObDfKDInibf1BT-N|x082p9XMw9KkrP&xD5^Pu<7iW6#l^dHyTodKF^3fN
zRDja_j0#mx)o6pn#0JDACfgE#EtRNgfT(auhj6Q++iYSI*RfI(-C6_)i32RIP<H}|
zBcJ1J<db%6jl-;^wxZRv&<X%{4wV2jtOcn6VOX(=S1mcvaYB*j8FztAYrlX`{m}^^
z3n08Bz?#j&XESAIB(|ZjM0vLg->ynp1NiFr1_1W~xN=7TPZ?jVop&IlDTzBG@wKMb
z04^6|G@FE{zdf>j^8*jZ9bIdDO;Oat@j{qEO91$1uGTbwMWiKbE9^u*yAfh4*ML$>
z^#HaEp2dYrh2^qJZJZ<q%!%=whzvyud)$(90Qlt18K7}PN(C^kyPzDCXrsYw5HsHv
zU=X$Rf!u04-hC3l+NJ<@yztDAoxN)oY|VmLSx(#)!#@OHzZgvAUac%-ZwufD>j1Pj
z1#o8kr~9LFF;{=nh#Zp|fg$+%so5#d-tZ|`{L8#F_wULOiOnD-2~z>)FV5~QT)*0>
zl|~{gRZ$H~=upYmyJn}na_CbK1PFovdH-+o?DU`M5F&2V01VE+S_J?}LK51>2yC64
z$hx$SJZwb$8i0q5=(DlecI8}SkvKVa2*9c3a(Ye3aBCuD+13GA8UQBNKN9SjKAE$T
zyLh$;0C<?|8Hj)F-%@Mn^n)WEsP6?!>Veb<bPx0&>+0&gu9XIpBh|!h0GL_T&Eq4Z
z)qEzFE-yfr2h8;h#K+eUM`?ZH@UeFQY+o*?0z9~9*YEkx-ip!+j*wJLCN&9X(9PeC
zj8=6vFEgt*t?V2CAk8P?iO;@#eRk^n09ytTNs^=k{15TzrqRmL)wgpFfH@T))f_kT
zwaH{AGr8Q^-TR(9IP%47gK+f3%`2BVgu++{)^@(UL|@<cJPKnS$hjZg)QlcSVXOn)
z`L_UUS?(+Ka0;LwK-=Q;Gyn@=<1OE-04@Vq1)%p9{VM9q?Eva~KTxlNCYu`hy|DiP
Xw+U~+_#vcD00000NkvXXu0mjfE<An7

literal 0
HcmV?d00001

diff --git a/source/bitmaps/icons/windowpos.png b/source/bitmaps/icons/windowpos.png
new file mode 100644
index 0000000000000000000000000000000000000000..de56d77b2dc661785057c170410b92e1bfc225f4
GIT binary patch
literal 1498
zcmV<01tt24P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm0002p0002p0dP~I2LJ#78FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11y@N#K~z|U)s|0eTt^+pKQr_G@7uM#b{uSPrI4fzq)r3^IS3&{
ziNYV1kQNYv6A}{T0O3RrTsR<Z2q7*A!Ko5Ls1gF9f`X7*T5>=UZ38CIC<H6X*0B?N
zvwz?2`!h2f950*3E_O+R_+H+dr#JKa%y;JZn}Pqa#8w}#{(8>`z1VpYY$fUH-|m0>
z=Ck(;z!_~=i&%Ma_WSYl@vk~TP4sX5vB>*>eiXQG0CKc({e``!OMBjb+8=+P$OqT^
zdeFNb`f6eEXJZE*2tc0eg=FoOtIee!ElPJz`Qwj1BtXO^=g0#AaQfyOGH>T9zkZ}>
zo%2lZ5=akM@zDnYF!w~`TBDJl$kO5ux^o_^!Q1mVL8!jG^s9-_-**6jcYL<B^qSZB
zaF*Lwt!|@AhwvsoAfib9;L@|z!}l6sn1*A|fAeYUs!s}w3-IZ|;^cSS7Y}+<Cy>#@
z3|@bRi&@nBxq18A8TCk`?v7_~C7`uv3jK2X__w|`1Q`3x(+8+j&WUDLRdbV|Bs6>c
zB>ySLoCfaH$I!`Tz`^t{QqL7nj6Frmi_!IU<YXBUde~Ni7>kC%{M_Oe7B@5Go*X{2
zG)=o{=XB@9w}0#aXl>r@SXs?}cOIK-MC2o+;D<rLv5$o4-d~aNQKT%B7wgRFI+b5O
z&#IUNDX^^sq{Q|!-1i*7Il2!3)y`<1`4dyKducAOvZppnv%XB_u_L}v=0m^+fG2%<
zGT2A;i}QEbHQ#;#8T<vO{4S(ZK@VOBQ_w6Tj(_SY9#j6C`#lBrGY1i_+L)LWSYsh@
zcy48})aG_2oW_ej7aZVFX&S9HQc8pn*yJU2XAw++a3`Q>q0<!x!D+rS{$8>yLkNNE
zx(FdCl}bC>2ih90wN_^Tu?c{N)%r3^ORq39Gefmn<-&yvJoL7M94b9b)&3nJpqq{J
zx3wqfdhg`s;u$>8BMd`YtriOl3p)k?z*yJ>Fhy?N*rQaA38N6#-*|UR)2xksmzOX8
zp2=#Aj1J=NbqV@?%H=Yy>k<S3#uz-$qbQ0UJFuC64#0BS?tRZ(LewO^VimWixH5hV
zvP*Cir~)LA+~C~dFHpa7l`P8`A0MaJ>#?w~z}d5BIeGHrjsS!;BsS|00YLMK%05D)
z5K@t)Dbe1eTXqh7pNWYHilShBeH~-W&<!C3LTq`$-yv(kYV5xOG<<yKFx7!1j$^de
z%+1Yh*?D<+nW?EMgb>tfHKdeeS;nbTr>ImaJ90o<!;P%d9Rbj!NuOJ-j6BZ?!|+W9
zn4X>{&vT+ELMerm5-BBXYiopIh%p8!CDvMkAi!~)y9Y5FkD&t-latIpQrpoCq?9B{
zLYk)Jd5%(wa=A<tMYP-PVc=%7$?WXxmH@_>5dbu7EXj`4Xf#OE6d?qj=V6SYR;%5$
z{?%%A`$6<b8tx{3x7%g^{{48KN0KB|Diwqf<as_UOx9Y25Ex^y*5dm<zW;`*Y4s?8
z-q@Nu(B>@b^*TjS(Cv0nN)g8~&1RFLD3DTOj6n!N9LGp0sny=Fyc_X%@4#lYo1ee)
z+_-%CGI^c@5QZV$ZkH&Ew%r4p6W+Lx?81TV6vr{H>!Osx^E`qe!1sN!Y@2I?HX{J{
zK%Gv9!C-(8f_A%27=}2GLy{zS|7^MQEYMnG|4RpEW@bp!6r~hJQBbK=a9wx%4t6vR
zcbA1*s#GfN?lc@tLxpqW+R8F>{(ml|N-5gy_FJR8twz!zmR@TJ(Ea)|FFp5*V^?2W
ztJn1H{Jhs%y;2823PnCu>YV-O`7hm<K>v687d%fpq?qkEGXMYp07*qoM6N<$f`m)Y
AOaK4?

literal 0
HcmV?d00001

diff --git a/source/frmPreferences.cpp b/source/frmPreferences.cpp
index c9623e0..2b2f481 100644
--- a/source/frmPreferences.cpp
+++ b/source/frmPreferences.cpp
@@ -23,6 +23,7 @@
 #include "common/preferences.h"
 #include "common/dirs.h"
 #include "bitmaps.h"
+#include "bitmaps/preferences.h"
 
 #include "import/import.h"
 #include "export/export.h"
@@ -33,7 +34,6 @@
 #include <wx/msgdlg.h>
 #include <wx/fileconf.h>
 
-
 frmPreferences::frmPreferences( wxWindow* parent )
 :
 frmPreferencesADT( parent )
@@ -44,6 +44,17 @@ frmPreferencesADT( parent )
 	wxMemoryInputStream astream(icons_accinet_png, sizeof(icons_accinet_png));
 	wxMemoryInputStream bstream(icons_acclocal_png, sizeof(icons_acclocal_png));
 	wxMemoryInputStream cstream(icons_accunsupported_png, sizeof(icons_accunsupported_png));
+	wxMemoryInputStream windowposstream(icons_windowpos_png, sizeof(icons_windowpos_png));
+	wxMemoryInputStream hideaddressbooksstream(icons_hideaddressbooks_png, sizeof(icons_hideaddressbooks_png));
+
+	wxImage icons_windowpos_png(windowposstream, wxBITMAP_TYPE_PNG);
+	wxBitmap WindowPosition(icons_windowpos_png, -1);
+
+	wxImage icons_hideaddressbooks_png(hideaddressbooksstream, wxBITMAP_TYPE_PNG);
+	wxBitmap HideAddressBooks(icons_hideaddressbooks_png, -1);
+	
+	bmpWindowPosition->SetBitmap(WindowPosition);
+	bmpLocalAddressBooks->SetBitmap(HideAddressBooks);
 	
 	wxImage icons_accinet_png(astream, wxBITMAP_TYPE_PNG);
 	wxBitmap AccInet(icons_accinet_png, -1);
-- 
2.39.5