12 files changed, 728 insertions, 3 deletions
diff --git a/tools/installer_ng/Common/Files/DbChecker.bat b/tools/installer_ng/Common/Files/DbChecker.bat
new file mode 100644
index 0000000000..0a51917d11
--- /dev/null
+++ b/tools/installer_ng/Common/Files/DbChecker.bat
@@ -0,0 +1 @@
+start /B Miranda64.exe /svc:dbchecker
+\ No newline at end of file
diff --git a/tools/installer_ng/Common/Files/Docs/license.txt b/tools/installer_ng/Common/Files/Docs/license.txt
new file mode 100644
index 0000000000..e6c86ba968
--- /dev/null
+++ b/tools/installer_ng/Common/Files/Docs/license.txt
@@ -0,0 +1,351 @@
+ NOTE: This copyright does *not* cover dynamically linked plugin libraries
+ that link to Miranda - this is merely considered normal use of the
+ programme, and does *not* fall under the heading of "derived work".
+ Also note that the GPL below is copyrighted by the Free Software
+ Foundation, but the instance of code that it refers to (Miranda NG)
+ is copyrighted by me and others who actually wrote it.
+
+ Richard Hughes
+
+ -------------------------------------------------------------------------
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) 19yy  <name of author>
+
+    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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/tools/installer_ng/Common/Files/Settings/autoexec_sounds.ini b/tools/installer_ng/Common/Files/Settings/autoexec_sounds.ini
new file mode 100644
index 0000000000..f12535d7c3
--- /dev/null
+++ b/tools/installer_ng/Common/Files/Settings/autoexec_sounds.ini
@@ -0,0 +1,53 @@
+SETTINGS:
+
+[Skin]
+UseSound=b1
+
+[SkinSounds]
+AddedEvent=uSkins\Sounds\added_event.wav
+AuthRequest=uSkins\Sounds\authorisation_request.wav
+FileDone=uSkins\Sounds\complete.wav
+FileDenied=uSkins\Sounds\denied.wav
+FileFailed=uSkins\Sounds\error.wav
+RecvFile=uSkins\Sounds\incoming_file.wav
+ChatMessage=uSkins\Sounds\incoming_group_message.wav
+ChatSent=uSkins\Sounds\outgoing.wav
+ChatHighlight=uSkins\Sounds\message_highlight.wav
+ChatTopic=uSkins\Sounds\topic_changed.wav
+ChatNick=uSkins\Sounds\user_name.wav
+ChatQuit=uSkins\Sounds\user_disconnect.wav
+ChatKick=uSkins\Sounds\user_kicked.wav
+ChatPart=uSkins\Sounds\user_left.wav
+ChatAction=uSkins\Sounds\user_action.wav
+ChatNotice=uSkins\Sounds\user_notice.wav
+ChatMode=uSkins\Sounds\user_status.wav
+TNStart=uSkins\Sounds\typing_start.wav
+TNStop=uSkins\Sounds\typing_stop.wav
+RecvMsgActive=uSkins\Sounds\incoming_focused.wav
+AlertMsg=uSkins\Sounds\incoming_new.wav
+RecvMsgInactive=uSkins\Sounds\incoming_unfocused.wav
+SendMsg=uSkins\Sounds\outgoing.wav
+SendError=uSkins\Sounds\error.wav
+Nudge : Default=uSkins\Sounds\nudge.wav
+MetaContacts: Nudge=uSkins\Sounds\nudge.wav
+RecvUrl=uSkins\Sounds\incoming_url.wav
+weatheralert=uSkins\Sounds\weather_alert.wav
+weatherupdated=uSkins\Sounds\weather_update.wav
+NewsFeed=uSkins\Sounds\news_feed.wav
+Notification=uSkins\Sounds\notification.wav
+OtherEvent=uSkins\Sounds\other_event.wav
+ChatJoin=uSkins\Sounds\user_connect.wav
+MSN:Alerts=uSkins\Sounds\live_alert.wav
+MSN:Hotmail=uSkins\Sounds\live_mail.wav
+MSN_1:Alerts=uSkins\Sounds\live_alert.wav
+MSN_1:Hotmail=uSkins\Sounds\live_mail.wav
+UserOnline=uSkins\Sounds\online.wav
+UserFromOffline=uSkins\Sounds\online.wav
+WWIBirthdayNear=uSkins\Sounds\birthdaycoming.wav
+WWIBirthdayToday=uSkins\Sounds\birthday.wav
+Anniversary=uSkins\Sounds\reminder.wav
+Birthday=uSkins\Sounds\birthday.wav
+BirthdayComing=uSkins\Sounds\birthdaycoming.wav
+
+[TopToolBar]
+Enable/Disable sounds_Visible=b1
+\ No newline at end of file
diff --git a/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini b/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini
new file mode 100644
index 0000000000..c723854eaf
--- /dev/null
+++ b/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini
@@ -0,0 +1,118 @@
+;This file contains the information required to get Miranda up and running,
+;i.e. everything before a database is loaded
+
+;Settings relating to the location and loading of the database
+[Database]
+
+;ProfileDir
+;The directory to search for database files. If it's a relative path then
+;it's relative to the directory containing miranda32.exe. 
+;If no directory specified Profles subdirectory in miranda executable 
+;directory is assumed. You can use environment variables.
+;To comply with Windows security guidelines, it is recommended to keep 
+;your profile in %APPDATA%\Miranda NG
+ProfileDir=%APPDATA%\Miranda NG
+
+;ShowProfileMgr
+;Selects the test to use to decide whether to show the profile manager on
+;startup
+;"never": Only show it if the profile to use can't be guessed by any means
+;"yes":   Always show it
+;"smart": (default) Show it if the command line doesn't contain a db name
+;         that exists or there is more or less than 1 db in the ProfileDir.
+ShowProfileMgr=smart
+
+;DefaultProfile
+;Name of the profile to use if there's a choice. If Miranda is run with a
+;command line parameter then that is used instead of this setting.
+;Default is empty
+;If ShowProfileMgr=never then this profile is run without question
+;Otherwise the profile manager is run as usual but initially this profile
+;is selected
+;
+;0.4.1+ (2005/05/16) Only: This string can contain environment variables, e.g. %USERNAME%
+;
+DefaultProfile=
+
+;AutoCreate
+;"yes": If DefaultProfile or the command line parameter gives a profile
+;name that doesn't exist then that profile is created.
+;"no": (default) The profile manager is shown in this case
+AutoCreate=no
+
+;AutoExec is a system for batch addition of multiple settings to the database.
+;See http://trac.miranda-ng.org/browser/trunk/docs/autoexec_sample.ini for documentation.
+[AutoExec]
+
+;Use
+;"yes": Install .ini files automatically
+;"no": Disable the autoexec system entirely
+;"prompt": (default) Prompt the user before each installation
+;This setting doesn't affect the decision of whether to display further prompts
+Use=yes
+
+;Glob
+;A global expression containing the files to watch for database settings
+;This will be checked just after database load and continuously all the
+;time Miranda is running
+;If this contains a relative path, it's relative to the directory containing
+;miranda32.exe
+;Default: autoexec_*.ini
+Glob=autoexec_*.ini
+
+;Safe
+;A space-separated list of database module names known to be safe to alter
+;Default: CLC Icons CLUI CList SkinSounds PluginUpdater
+Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar PluginUpdater
+
+;Unsafe
+;A space-separated list of database module names that could be alter to
+;malicious purposes (eg by faking a login server to steal passwords)
+;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER XFire
+Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER XFire
+
+;OverrideSecurityFilename
+;System admins may find it desirable to install settings without prompting
+;the user. In that case all prompts and security will be overridden if
+;the name of the ini matches the name given here.
+;If this is used, make sure it's suitably random and hence not likely
+;to be downloaded.
+;Default is empty (no override possible)
+OverrideSecurityFilename=autoexec_forced_*.ini
+
+;OnCreateFilename
+;Defines ini file that will be executed every time new profile is created.
+;Default is empty (no override possible)
+OnCreateFilename=
+
+;Warn
+;"all": Warn the user before each setting change is made
+;"notsafe": (default) Warn before each change to a setting in a group
+;           that isn't listed in the 'Safe' setting
+;"onlyunsafe": Warn before each change to a setting in a group that is
+;           listed in the 'Unsafe' setting
+;"none": Never warn the user
+Warn=notsafe
+
+;OnCompletion
+;What to do with the ini file once it's imported
+;"delete": Delete the file from the disk
+;"recycle": (default) Move the file to the recycle bin (same as delete
+;           if you've disabled Windows' recycle bin)
+;"rename": Add the string in RenamePrefix to the beginning of the filename
+;"leave": Leave the file as-is. Note that this could cause it to be
+;         imported multiple times until it's moved.
+;"ask": Show a dialog to ask the user
+OnCompletion=recycle
+
+;RenamePrefix
+;A string to add before the filename if the 'rename' option is used for
+;OnCompletion. This can include a path specifier to move the file, eg ..\
+;Default: done_
+RenamePrefix=imported_
+
+; decisions about how Miranda loads plugins
+[PluginLoader]
+
+; if enabled, will ask the user if they want to re-enable a disabled plugin
+AskAboutIgnoredPlugins=0
+\ No newline at end of file
diff --git a/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini b/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini
new file mode 100644
index 0000000000..0bdb18e8f6
--- /dev/null
+++ b/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini
@@ -0,0 +1,118 @@
+;This file contains the information required to get Miranda up and running,
+;i.e. everything before a database is loaded
+
+;Settings relating to the location and loading of the database
+[Database]
+
+;ProfileDir
+;The directory to search for database files. If it's a relative path then
+;it's relative to the directory containing miranda32.exe. 
+;If no directory specified Profles subdirectory in miranda executable 
+;directory is assumed. You can use environment variables.
+;To comply with Windows security guidelines, it is recommended to keep 
+;your profile in %APPDATA%\Miranda NG
+ProfileDir=
+
+;ShowProfileMgr
+;Selects the test to use to decide whether to show the profile manager on
+;startup
+;"never": Only show it if the profile to use can't be guessed by any means
+;"yes":   Always show it
+;"smart": (default) Show it if the command line doesn't contain a db name
+;         that exists or there is more or less than 1 db in the ProfileDir.
+ShowProfileMgr=smart
+
+;DefaultProfile
+;Name of the profile to use if there's a choice. If Miranda is run with a
+;command line parameter then that is used instead of this setting.
+;Default is empty
+;If ShowProfileMgr=never then this profile is run without question
+;Otherwise the profile manager is run as usual but initially this profile
+;is selected
+;
+;0.4.1+ (2005/05/16) Only: This string can contain environment variables, e.g. %USERNAME%
+;
+DefaultProfile=
+
+;AutoCreate
+;"yes": If DefaultProfile or the command line parameter gives a profile
+;name that doesn't exist then that profile is created.
+;"no": (default) The profile manager is shown in this case
+AutoCreate=no
+
+;AutoExec is a system for batch addition of multiple settings to the database.
+;See http://trac.miranda-ng.org/browser/trunk/docs/autoexec_sample.ini for documentation.
+[AutoExec]
+
+;Use
+;"yes": Install .ini files automatically
+;"no": Disable the autoexec system entirely
+;"prompt": (default) Prompt the user before each installation
+;This setting doesn't affect the decision of whether to display further prompts
+Use=yes
+
+;Glob
+;A global expression containing the files to watch for database settings
+;This will be checked just after database load and continuously all the
+;time Miranda is running
+;If this contains a relative path, it's relative to the directory containing
+;miranda32.exe
+;Default: autoexec_*.ini
+Glob=autoexec_*.ini
+
+;Safe
+;A space-separated list of database module names known to be safe to alter
+;Default: CLC Icons CLUI CList SkinSounds PluginUpdater
+Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar PluginUpdater
+
+;Unsafe
+;A space-separated list of database module names that could be alter to
+;malicious purposes (eg by faking a login server to steal passwords)
+;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER XFire
+Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER XFire
+
+;OverrideSecurityFilename
+;System admins may find it desirable to install settings without prompting
+;the user. In that case all prompts and security will be overridden if
+;the name of the ini matches the name given here.
+;If this is used, make sure it's suitably random and hence not likely
+;to be downloaded.
+;Default is empty (no override possible)
+OverrideSecurityFilename=autoexec_forced_*.ini
+
+;OnCreateFilename
+;Defines ini file that will be executed every time new profile is created.
+;Default is empty (no override possible)
+OnCreateFilename=
+
+;Warn
+;"all": Warn the user before each setting change is made
+;"notsafe": (default) Warn before each change to a setting in a group
+;           that isn't listed in the 'Safe' setting
+;"onlyunsafe": Warn before each change to a setting in a group that is
+;           listed in the 'Unsafe' setting
+;"none": Never warn the user
+Warn=notsafe
+
+;OnCompletion
+;What to do with the ini file once it's imported
+;"delete": Delete the file from the disk
+;"recycle": (default) Move the file to the recycle bin (same as delete
+;           if you've disabled Windows' recycle bin)
+;"rename": Add the string in RenamePrefix to the beginning of the filename
+;"leave": Leave the file as-is. Note that this could cause it to be
+;         imported multiple times until it's moved.
+;"ask": Show a dialog to ask the user
+OnCompletion=recycle
+
+;RenamePrefix
+;A string to add before the filename if the 'rename' option is used for
+;OnCompletion. This can include a path specifier to move the file, eg ..\
+;Default: done_
+RenamePrefix=imported_
+
+; decisions about how Miranda loads plugins
+[PluginLoader]
+
+; if enabled, will ask the user if they want to re-enable a disabled plugin
+AskAboutIgnoredPlugins=0
+\ No newline at end of file
diff --git a/tools/installer_ng/Common/Installer/ISWin7.dll b/tools/installer_ng/Common/Installer/ISWin7.dll
new file mode 100644
index 0000000000..116a42a3fd
--- /dev/null
+++ b/tools/installer_ng/Common/Installer/ISWin7.dll
diff --git a/tools/installer_ng/Common/Installer/ISWin7.iss b/tools/installer_ng/Common/Installer/ISWin7.iss
new file mode 100644
index 0000000000..efa6803aad
--- /dev/null
+++ b/tools/installer_ng/Common/Installer/ISWin7.iss
@@ -0,0 +1,85 @@
+; ���������������� ������ ISWin7 v0.4.2
+;
+; ��������� Windows Vista ���� ���������� ���������� ���� ���� �������
+;
+; ��� �������� ������ ��������� ������� ����������� ���� ��� �� ���� �������.
+; �������� � Windows 7, Windows 8
+;
+; � Windows XP � Windows Vista �� ���������� �������������
+; ��� �� ������ ����������������� ��������� � ���� ������������ ��������
+;
+; ���������: VoLT
+;
+; � ���������� �������� ��������� ������ ��������� ���� ��������� � �������� Windows 7
+;
+; ������� ������������� �� ����� ������� s00p (������ � nnm-club.ru)
+; ���� ��� �� ������� ������� ������ R.G. ReCoding (������ rustorka.com) �� ���� � ������� ��������
+
+[Setup]
+AppName=My Program
+AppVerName=My Program version 1.5
+DefaultDirName={pf}\My Program
+DefaultGroupName=My Program
+UninstallDisplayIcon={app}\MyProg.exe
+Compression=lzma
+SolidCompression=yes
+OutputDir=.
+
+[Files]
+Source: ISWin7.dll; DestDir: {tmp}; Flags: dontcopy
+
+         // Handle ����� ������ ���� WizardForm.Handle.
+         // ��������� Left, Top, Right ��� Bottom ������ ����� ������,
+         // ���� ���� �� ���� ���������� ����� -1 �� ������ �������� �� �� ����
+[Code]   
+function win7_init(Handle:HWND; Left, Top, Right, Bottom : Integer): Boolean;
+external 'win7_init@files:ISWin7.dll stdcall';
+
+procedure win7_free;
+external 'win7_free@files:ISWin7.dll stdcall';
+
+procedure InitializeWizard();
+begin
+  // ��� ����� ��������� ����������� ��������� ������ �������
+  WizardForm.Bevel.Height := 1;
+  // �������������� ����������
+  if win7_init(WizardForm.Handle, 0, 0, 0, 47) then
+  begin
+    WizardForm.Caption := '��������';
+  end
+  else
+  begin
+    WizardForm.Caption := '���������';
+  end;
+end;
+
+procedure DeinitializeSetup();
+begin
+  // ��������� ����������
+  win7_free;
+end;
+
+procedure CurPageChanged(CurPageID: Integer);
+begin
+  WizardForm.ReadyPage.Hide;
+end;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/tools/installer_ng/Common/Installer/SetupMNGSmall.bmp b/tools/installer_ng/Common/Installer/SetupMNGSmall.bmp
new file mode 100644
index 0000000000..c592e0455b
--- /dev/null
+++ b/tools/installer_ng/Common/Installer/SetupMNGSmall.bmp
diff --git a/tools/installer_ng/Common/Installer/WizModernImage-IS.bmp b/tools/installer_ng/Common/Installer/WizModernImage-IS.bmp
new file mode 100644
index 0000000000..cf844e093a
--- /dev/null
+++ b/tools/installer_ng/Common/Installer/WizModernImage-IS.bmp
diff --git a/tools/installer_ng/Common/Installer/descctrl.dll b/tools/installer_ng/Common/Installer/descctrl.dll
new file mode 100644
index 0000000000..f750a4ae7c
--- /dev/null
+++ b/tools/installer_ng/Common/Installer/descctrl.dll
diff --git a/tools/installer_ng/Common/Installer/mng_installer.ico b/tools/installer_ng/Common/Installer/mng_installer.ico
new file mode 100644
index 0000000000..e1ecba35ca
--- /dev/null
+++ b/tools/installer_ng/Common/Installer/mng_installer.ico
diff --git a/tools/installer_ng/make.bat b/tools/installer_ng/make.bat
index 289c0d1089..88cf5d9c4e 100644
--- a/tools/installer_ng/make.bat
+++ b/tools/installer_ng/make.bat
@@ -3,14 +3,13 @@ rem Create directories and copy script
 mkdir tmp
 mkdir InnoNG_32
 mkdir InnoNG_64
-mkdir InnoNG_32\Installer
-mkdir InnoNG_64\Installer
 copy /V /Y MirandaNG.iss InnoNG_32\
 copy /V /Y MirandaNG.iss InnoNG_64\
+xcopy Common\* InnoNG_32 /I /S /V /Y
+xcopy Common\* InnoNG_64 /I /S /V /Y
 rem end
 
 rem Download
-wget -O tmp\common.7z http://miranda-ng.org/distr/installer/common.7z
 wget -O tmp\MNG_Sounds.7z http://miranda-ng.org/distr/addons/Sounds/MNG_Sounds.7z
 wget -O tmp\miranda-ng-alpha-latest.7z http://miranda-ng.org/distr/miranda-ng-alpha-latest.7z
 wget -O tmp\miranda-ng-alpha-latest_x64.7z http://miranda-ng.org/distr/miranda-ng-alpha-latest_x64.7z