diff options
| -rw-r--r-- | win32/copy/copy.vcxproj | 5 | ||||
| -rw-r--r-- | win32/copy/etc/gtk-2.0/gtkrc | 69 | ||||
| -rw-r--r-- | win32/hexchat.props | 2 | ||||
| -rw-r--r-- | win32/installer/hexchat.iss.tt | 13 |
4 files changed, 7 insertions, 82 deletions
diff --git a/win32/copy/copy.vcxproj b/win32/copy/copy.vcxproj index e5c81570..d0c1150b 100644 --- a/win32/copy/copy.vcxproj +++ b/win32/copy/copy.vcxproj @@ -80,11 +80,6 @@ </ItemDefinitionGroup> <ItemGroup> <None Include="changelog.url" /> - <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="readme.url" /> <None Include="share\xml\iso-codes\iso_3166.xml" /> <None Include="share\xml\iso-codes\iso_639.xml" /> diff --git a/win32/copy/etc/gtk-2.0/gtkrc b/win32/copy/etc/gtk-2.0/gtkrc deleted file mode 100644 index 6b073da5..00000000 --- a/win32/copy/etc/gtk-2.0/gtkrc +++ /dev/null @@ -1,69 +0,0 @@ -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" -{ - 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" diff --git a/win32/hexchat.props b/win32/hexchat.props index a117a33b..8af53c79 100644 --- a/win32/hexchat.props +++ b/win32/hexchat.props @@ -75,10 +75,10 @@ copy "$(DepsRoot)\bin\pixman-1.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\ssleay32.dll" "$(HexChatRel)" copy "$(DepsRoot)\bin\zlib1.dll" "$(HexChatRel)" xcopy /q /s /i "$(DepsRoot)\lib\gtk-2.0\i686-pc-vs10\engines" "$(HexChatRel)\lib\gtk-2.0\i686-pc-vs10\engines" -xcopy /q /s /i etc "$(HexChatRel)\etc" xcopy /q /s /i share "$(HexChatRel)\share" xcopy /q /s /i "..\..\COPYING" "$(HexChatRel)\share\doc\hexchat\" xcopy /q /s /i "$(DepsRoot)\share\doc" "$(HexChatRel)\share\doc" +xcopy /q /s /i "$(DepsRoot)\share\themes\MS-Windows" "$(HexChatRel)\share\themes\MS-Windows" xcopy /q /s /i "$(DepsRoot)\lib\enchant\libenchant_myspell.dll" "$(HexChatRel)\lib\enchant\" xcopy /q /s /i "$(HexChatBin)hcchecksum.dll" "$(HexChatRel)\plugins\" copy "$(HexChatBin)hcdoat.dll" "$(HexChatRel)\plugins" diff --git a/win32/installer/hexchat.iss.tt b/win32/installer/hexchat.iss.tt index 022b0be0..3b69f3bd 100644 --- a/win32/installer/hexchat.iss.tt +++ b/win32/installer/hexchat.iss.tt @@ -58,7 +58,6 @@ Name: "custom"; Description: "Custom Installation"; Flags: iscustom [Components] Name: "libs"; Description: "HexChat"; Types: normal minimal custom; Flags: fixed -Name: "gtktheme"; Description: "GTK+ Theme (Native Windows look)"; Types: normal minimal custom; Flags: disablenouninstallwarning Name: "xctext"; Description: "HexChat-Text"; Types: custom; Flags: disablenouninstallwarning Name: "xtm"; Description: "HexChat Theme Manager"; Types: normal custom; Flags: disablenouninstallwarning Name: "translations"; Description: "Translations"; Types: normal custom; Flags: disablenouninstallwarning @@ -111,9 +110,9 @@ Source: "portable-mode"; DestDir: "{app}"; Tasks: portable Source: "changelog.url"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "readme.url"; DestDir: "{app}"; Flags: ignoreversion; Components: libs Source: "cert.pem"; DestDir: "{app}"; Flags: ignoreversion; Components: libs -Source: "etc\gtk-2.0\gtkrc"; DestDir: "{app}\etc\gtk-2.0"; Flags: ignoreversion; Components: gtktheme Source: "share\xml\*"; DestDir: "{app}\share\xml"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs Source: "share\doc\*"; DestDir: "{app}\share\doc"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs +Source: "share\themes\MS-Windows\*"; DestDir: "{app}\share\themes\MS-Windows"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: libs Source: "share\locale\*"; DestDir: "{app}\share\locale"; Flags: ignoreversion createallsubdirs recursesubdirs; Components: translations Source: "atk-1.0.dll"; DestDir: "{app}"; Flags: ignoreversion; Components: libs @@ -246,10 +245,10 @@ begin if(CurPageID = wpReady) then begin idpClearFiles; - + if not IsTaskSelected('portable') then begin - + #if APPARCH == "x64" REDIST := 'http://dl.hexchat.net/misc/vcredist_2013_x64.exe'; PERL := 'http://dl.hexchat.net/misc/perl/Perl%205.20.0%20x64.msi'; @@ -272,13 +271,13 @@ begin if IsComponentSelected('spell') and not CheckSpellInstall() then idpAddFile(SPELL, ExpandConstant('{tmp}\spelling-dicts.exe')); - + if IsComponentSelected('langs\perl') and not CheckDLL('perl520.dll') then idpAddFile(PERL, ExpandConstant('{tmp}\perl.msi')); - + if IsComponentSelected('langs\python\python2') and not CheckDLL('python27.dll') then idpAddFile(PY2, ExpandConstant('{tmp}\python.msi')); - + if IsComponentSelected('langs\python\python3') and not CheckDLL('python34.dll') then idpAddFile(PY3, ExpandConstant('{tmp}\python.msi')); end; |