LOTS of fixes to the VS solution

win32/copy/copy.vcxproj

@@ -16,6 +16,7 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>WDK7</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -25,7 +26,10 @@
     <Import Project="..\xchat.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)build\$(PlatformName)\bin</OutDir>
+    <IntDir>$(SolutionDir)build\$(PlatformName)\obj\$(ProjectName)</IntDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -67,8 +71,8 @@ copy "$(DepsRoot)\bin\libpng14-14.dll" "$(XChatDest)"
 copy "$(DepsRoot)\bin\libxml2.dll" "$(XChatDest)"
 xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\2.10.0\engines" "$(XChatDest)\lib\gtk-2.0\2.10.0\engines"
 xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\modules\libgail.dll" "$(XChatDest)\lib\gtk-2.0\modules\"
-xcopy /q /s /i "..\etc" "$(XChatDest)\etc"
-xcopy /q /s /i "..\share" "$(XChatDest)\share"
+xcopy /q /s /i etc "$(XChatDest)\etc"
+xcopy /q /s /i share "$(XChatDest)\share"
 copy "..\..\COPYING" "$(XChatDest)"
 copy "$(DepsRoot)\LICENSE.OPENSSL" "$(XChatDest)"
 copy "$(DepsRoot)\LICENSE.ZLIB" "$(XChatDest)"
@@ -102,13 +106,20 @@ copy "$(OutDir)\xcwinamp.dll" "$(XChatDest)\plugins"
 copy "$(OutDir)\xcwinsys.dll" "$(XChatDest)\plugins"
 copy "$(OutDir)\xcwmpa.dll" "$(XChatDest)\plugins"
 copy "$(DepsRoot)\bin\lua51.dll" "$(XChatDest)"
-xcopy /q /s /i "..\..\po\locale" "$(XChatDest)\locale"
+xcopy /q /s /i "$(OutDir)\locale" "$(XChatDest)\locale"
 xcopy /q /s /i "$(DepsRoot)\share\locale" "$(XChatDest)\share\locale"
 copy "$(ProgramFiles)\Codejock Software\ISSkin\ISSkinU.dll" "$(XChatDest)"
-copy "..\isskin\watercolorlite-green.cjstyles" "$(XChatDest)"</Command>
+copy "..\installer\watercolorlite-green.cjstyles" "$(XChatDest)"</Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <None Include="etc\download.png" />
+    <None Include="etc\gtk-2.0\gtkrc" />
+    <None Include="etc\gtkpref.png" />
+    <None Include="etc\music.png" />
+    <None Include="etc\system.png" />
+    <None Include="share\xml\iso-codes\iso_3166.xml" />
+    <None Include="share\xml\iso-codes\iso_639.xml" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

win32/copy/copy.vcxproj.filters

@@ -1,2 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" />
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{e02a8c67-767c-4c6e-a854-81fae08cf4da}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\etc">
+      <UniqueIdentifier>{503881c0-011d-443b-a373-4bfe125dcfa6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\share">
+      <UniqueIdentifier>{4316433a-2a8e-48f7-9020-e1f4de0d23d1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\etc\gtk-2.0">
+      <UniqueIdentifier>{832ebebc-ab71-4bf6-9f3a-02ec748f7c14}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\share\xml">
+      <UniqueIdentifier>{9a881586-aed2-4f80-ba84-e521e6785566}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files\share\xml\iso-codes">
+      <UniqueIdentifier>{c825f724-0618-4160-97b7-12d6e0f2bc7b}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="etc\download.png">
+      <Filter>Resource Files\etc</Filter>
+    </None>
+    <None Include="etc\gtkpref.png">
+      <Filter>Resource Files\etc</Filter>
+    </None>
+    <None Include="etc\music.png">
+      <Filter>Resource Files\etc</Filter>
+    </None>
+    <None Include="etc\system.png">
+      <Filter>Resource Files\etc</Filter>
+    </None>
+    <None Include="etc\gtk-2.0\gtkrc">
+      <Filter>Resource Files\etc\gtk-2.0</Filter>
+    </None>
+    <None Include="share\xml\iso-codes\iso_639.xml">
+      <Filter>Resource Files\share\xml\iso-codes</Filter>
+    </None>
+    <None Include="share\xml\iso-codes\iso_3166.xml">
+      <Filter>Resource Files\share\xml\iso-codes</Filter>
+    </None>
+  </ItemGroup>
+</Project>

win32/copy/etc/gtk-2.0/gtkrc

@@ -0,0 +1,71 @@
+gtk-font-name = "sans 8"
+
+gtk-icon-sizes = "gtk-menu=13,13:gtk-small-toolbar=16,16:gtk-large-toolbar=24,24:gtk-dnd=32,32"
+gtk-toolbar-icon-size = small-toolbar
+
+# disable images in buttons. i've only seen ugly delphi apps use this feature.
+gtk-button-images = 0
+
+# enable/disable images in menus. most "stock" microsoft apps don't use these, except sparingly.
+# the office apps use them heavily, though.
+gtk-menu-images = 1
+
+# use the win32 button ordering instead of the GNOME HIG one, where applicable
+gtk-alternative-button-order = 1
+
+# use the win32 sort indicators direction, as in Explorer
+gtk-alternative-sort-arrows = 1
+
+# Windows users don't expect the PC Speaker beeping at them when they backspace in an empty textview and stuff like that
+gtk-error-bell = 0
+
+# hide mnemonic underlines until the Alt key is pressed (requires gtk 2.18+)
+# gtk-auto-mnemonics = 1
+
+style "msw-default"
+{
+  GtkWidget::interior-focus = 1
+  GtkOptionMenu::indicator-size = { 9, 5 }
+  GtkOptionMenu::indicator-spacing = { 7, 5, 2, 2 }
+  GtkSpinButton::shadow-type = in
+
+  # Owen and I disagree that these should be themable
+  #GtkUIManager::add-tearoffs = 0
+  #GtkComboBox::add-tearoffs = 0
+
+  GtkComboBox::appears-as-list = 1
+  GtkComboBox::focus-on-click = 0
+
+  GOComboBox::add_tearoffs = 0
+
+  GtkTreeView::allow-rules = 0
+  GtkTreeView::expander-size = 12
+
+  GtkExpander::expander-size = 12
+
+  GtkScrolledWindow::scrollbar_spacing = 1
+
+  GtkSeparatorMenuItem::horizontal-padding = 2
+
+  engine "wimp"
+  {
+  }
+}
+class "*" style "msw-default"
+
+binding "ms-windows-tree-view"
+{
+  bind "Right" { "expand-collapse-cursor-row" (1,1,0) }
+  bind "Left" { "expand-collapse-cursor-row" (1,0,0) }
+}
+
+class "GtkTreeView" binding "ms-windows-tree-view"
+
+style "msw-combobox-thickness" = "msw-default"
+{
+  xthickness = 0
+  ythickness = 0
+}
+
+widget_class "*TreeView*ComboBox*" style "msw-combobox-thickness"
+widget_class "*ComboBox*GtkFrame*" style "msw-combobox-thickness"