more theme selector support

3 files changed, 8 insertions, 73 deletions

diff --git a/build/etc/gtk-2.0/gtkrc b/build/etc/gtk-2.0/gtkrc
index bd7acd28..8ea661a7 100644
--- a/build/etc/gtk-2.0/gtkrc
+++ b/build/etc/gtk-2.0/gtkrc
@@ -1,71 +1,6 @@
-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
-gtk-auto-mnemonics = 1
-
-style "msw-default"
+gtk-theme-name = "MS-Windows"
+style "user-font"
 {
-  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" 
-  {
-  }
+	font_name="sans 8"
 }
-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" 
+widget_class "*" style "user-font"
\ No newline at end of file
diff --git a/build/release-x64.bat b/build/release-x64.bat
index 44107c7b..f42c1661 100644
--- a/build/release-x64.bat
+++ b/build/release-x64.bat
@@ -32,11 +32,11 @@ copy %DEPS_ROOT%\bin\libpixman-1-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpng15-15.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libtiff-3.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libxml2-2.dll %XCHAT_DEST%
-xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\
-copy %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
+xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
 xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\
 xcopy /q /s /i etc %XCHAT_DEST%\etc
 xcopy /q /s /i share %XCHAT_DEST%\share
+xcopy /q /s /i %DEPS_ROOT%\share\themes %XCHAT_DEST%\share\themes
 copy ..\COPYING %XCHAT_DEST%
 copy %DEPS_ROOT%\LICENSE.OPENSSL %XCHAT_DEST%
 copy %DEPS_ROOT%\LICENSE.ZLIB %XCHAT_DEST%
diff --git a/build/release-x86.bat b/build/release-x86.bat
index 4233f8d0..39c1caa2 100644
--- a/build/release-x86.bat
+++ b/build/release-x86.bat
@@ -32,11 +32,11 @@ copy %DEPS_ROOT%\bin\libpixman-1-0.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libpng15-15.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libtiff-3.dll %XCHAT_DEST%
 copy %DEPS_ROOT%\bin\libxml2-2.dll %XCHAT_DEST%
-xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libpixmap.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines\
-copy %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines\libwimp.dll %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
+xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\2.10.0\engines %XCHAT_DEST%\lib\gtk-2.0\2.10.0\engines
 xcopy /q /s /i %DEPS_ROOT%\lib\gtk-2.0\modules\libgail.dll %XCHAT_DEST%\lib\gtk-2.0\modules\
 xcopy /q /s /i etc %XCHAT_DEST%\etc
 xcopy /q /s /i share %XCHAT_DEST%\share
+xcopy /q /s /i %DEPS_ROOT%\share\themes %XCHAT_DEST%\share\themes
 copy ..\COPYING %XCHAT_DEST%
 copy %DEPS_ROOT%\LICENSE.OPENSSL %XCHAT_DEST%
 copy %DEPS_ROOT%\LICENSE.ZLIB %XCHAT_DEST%