From 1e5727326a294d38365b7131c2f40b3a55a64a8e Mon Sep 17 00:00:00 2001 From: Berke Viktor Date: Tue, 22 Nov 2011 15:51:27 +0100 Subject: [PATCH] more stuff for gtk.org reversion --- build/dep-extract.bat | 39 ++-------------------- build/etc/gtk-2.0/gtkrc | 73 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 72 insertions(+), 40 deletions(-) diff --git a/build/dep-extract.bat b/build/dep-extract.bat index 1fd5594f..05e40e02 100644 --- a/build/dep-extract.bat +++ b/build/dep-extract.bat @@ -1,42 +1,9 @@ @echo off -set PATH=%PATH%;%PROGRAMW6432%\7-Zip;c:\mozilla-build\gendef - +set PATH=%PROGRAMW6432%\7-Zip cd ..\dep-x64 -::7z x -y *.rpm -::7z x *.cpio -::del *.cpio -::xcopy /q /s /i usr\x86_64-w64-mingw32\sys-root\mingw\* . -::rmdir /q /s usr -::set OPATH=%PATH% -::set PATH=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\amd64 -::cd lib -::for %%A in (..\bin\*.dll) do ( -:: gendef %%A -:: lib /nologo /machine:x64 /def:%%~nA.def -::) -::cd .. -::set PATH=%OPATH% -7z x *.7z 7z x *.zip -::copy /y ..\build\glibconfig-x64.h lib\glib-2.0\include\glibconfig.h - +7z x *.7z cd ..\dep-x86 -::7z x -y *.rpm -::7z x *.cpio -::del *.cpio -::xcopy /q /s /i usr\i686-w64-mingw32\sys-root\mingw\* . -::rmdir /q /s usr -::set OPATH=%PATH% -::set PATH=%PATH%;c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin;c:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE -::cd lib -::for %%A in (..\bin\*.dll) do ( -:: gendef ..\bin\%%A -:: lib /nologo /machine:x86 /def:%%~nA.def -::) -::cd .. -::set PATH=%OPATH% -7z x *.7z 7z x *.zip -::copy /y ..\build\glibconfig-x86.h lib\glib-2.0\include\glibconfig.h - +7z x *.7z pause diff --git a/build/etc/gtk-2.0/gtkrc b/build/etc/gtk-2.0/gtkrc index 8ea661a7..6ac7b76c 100644 --- a/build/etc/gtk-2.0/gtkrc +++ b/build/etc/gtk-2.0/gtkrc @@ -1,6 +1,71 @@ -gtk-theme-name = "MS-Windows" -style "user-font" +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" { - font_name="sans 8" + 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" + { + } } -widget_class "*" style "user-font" \ No newline at end of file +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"