Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Chun-wei Fan
|
728339e1ce |
@@ -1,39 +1,3 @@
|
||||
Overview of Changes in GTK+ 3.24.4
|
||||
==================================
|
||||
|
||||
* Support gtk_file_chooser_set_filter in GtkFileChooserNative
|
||||
|
||||
* Bugs fixed:
|
||||
wayland: Fix long combobox positioning
|
||||
about dialog: Activate all links in the same way
|
||||
switch: Add fallbacks for symbols
|
||||
spinbutton: Fix background color
|
||||
|
||||
* Translation updates:
|
||||
Africaans
|
||||
|
||||
|
||||
Overview of Changes in GTK+ 3.24.3
|
||||
==================================
|
||||
|
||||
* Bugs fixed:
|
||||
wayland: Respect length limits in text protocol
|
||||
wayland: Support key themes
|
||||
wayland: Fix hi-dpi cursor scaling
|
||||
quartz: Make point-to-pixel conversions work on all versions
|
||||
quartz: Re-add support for hidpi scaling
|
||||
quartz: Fix search engine integration
|
||||
win32: Fix ime change hangling
|
||||
placessidebar: Insert drops in the right place
|
||||
x11: Fix problems gdk_x11_get_parent_relative
|
||||
x11: Fix Wacom tool types
|
||||
icons: Recolor polygons as well in symbolic icons
|
||||
switch: Use Unicode symbols for I/O instead of translations
|
||||
|
||||
* Translation updates:
|
||||
Japanese
|
||||
|
||||
|
||||
Overview of Changes in GTK+ 3.24.2
|
||||
==================================
|
||||
|
||||
|
||||
+2
-5
@@ -156,14 +156,11 @@ Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
|
||||
makefile.msc in gdk and gtk. Be prepared to manually edit various
|
||||
makefile.msc files, and the makefile snippets in build/win32.
|
||||
|
||||
There are also VS 2008~2017 solution and project files to build GTK+, which
|
||||
There are also VS 2008/2010 solution and project files to build GTK+, which
|
||||
are maintained by Chun-wei Fan. They should build GTK+ out of the box,
|
||||
provided that the afore-mentioned dependencies are installed. They will
|
||||
build GDK with the Win32 backend, GTK+ itself (with GAIL/a11y built in),
|
||||
the GAIL-Util library and the gtk-demo program. Please also refer to the
|
||||
README file(s) that reside in build/win32 on how to enable additional features
|
||||
that are not enabled by default, such as EGL support via libANGLE, which
|
||||
emulate the GL/EGL calls using Direct3D 9/11.
|
||||
the GAIL-Util library and the gtk-demo program.
|
||||
|
||||
Please refer to the following GNOME Live! page for a more detailed ouline
|
||||
on the process of building the GTK+ stack and its dependencies with Visual
|
||||
|
||||
@@ -79,7 +79,7 @@ $(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
|
||||
$($(_gir_name)_MSVC_PROGRAM)),,
|
||||
$(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))
|
||||
|
||||
$(top_builddir)/build/win32/$(_gir_name)_list: Makefile
|
||||
$(top_builddir)/build/win32/$(_gir_name)_list:
|
||||
for F in $(_gir_files_msvc); do \
|
||||
case $$$$F in \
|
||||
*.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \
|
||||
@@ -88,11 +88,11 @@ $(top_builddir)/build/win32/$(_gir_name)_list: Makefile
|
||||
esac; \
|
||||
done
|
||||
|
||||
$(top_builddir)/build/win32/$(1).msvc.introspect: Makefile
|
||||
$(top_builddir)/build/win32/$(1).msvc.introspect:
|
||||
-$(RM) $(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
|
||||
# Assemble the Command to Run g-ir-scanner
|
||||
echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo $(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' @-echo Generating $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' $$$$(PYTHON) $$$$(G_IR_SCANNER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' --verbose -no-libtool \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
@@ -101,7 +101,6 @@ $(top_builddir)/build/win32/$(1).msvc.introspect: Makefile
|
||||
echo ' '$(_gir_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' '$(_gir_libraries_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' '$(_gir_program_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' --add-include-path=./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' --add-include-path=$$$$(G_IR_INCLUDEDIR) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' '$(_gir_includes_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' '$(_gir_export_packages_msvc)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
@@ -115,11 +114,11 @@ $(top_builddir)/build/win32/$(1).msvc.introspect: Makefile
|
||||
echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
|
||||
# Finally Assemble the Command to Compile the generated .gir
|
||||
echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\$(_typelib_basename_msvc).typelib: vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo '$(_typelib_basename_msvc).typelib: '$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' @-echo Compiling $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' $$$$(G_IR_COMPILER) \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' --includedir=$$$$(@D:\=/) --debug --verbose \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' $$$$(@R:\=/).gir \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' --includedir=. --debug --verbose \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' '$(1)' \'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo ' -o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
|
||||
endef
|
||||
|
||||
@@ -6,15 +6,8 @@ APIVERSION = 3.0
|
||||
|
||||
CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0
|
||||
|
||||
built_install_girs = \
|
||||
vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).gir \
|
||||
vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).gir \
|
||||
vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-$(APIVERSION).gir
|
||||
|
||||
built_install_typelibs = \
|
||||
vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).typelib \
|
||||
vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).typelib \
|
||||
vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-$(APIVERSION).typelib
|
||||
built_install_girs = Gdk-$(APIVERSION).gir GdkWin32-$(APIVERSION).gir Gtk-$(APIVERSION).gir
|
||||
built_install_typelibs = Gdk-$(APIVERSION).typelib GdkWin32-$(APIVERSION).typelib Gtk-$(APIVERSION).typelib
|
||||
|
||||
!include introspection-msvc.mak
|
||||
|
||||
@@ -37,8 +30,8 @@ setgirbuildenv:
|
||||
!include introspection.body.mak
|
||||
|
||||
install-introspection: all
|
||||
@-copy vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gir "$(G_IR_INCLUDEDIR)"
|
||||
@-copy /b vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.typelib "$(G_IR_TYPELIBDIR)"
|
||||
@-copy *.gir "$(G_IR_INCLUDEDIR)"
|
||||
@-copy /b *.typelib "$(G_IR_TYPELIBDIR)"
|
||||
|
||||
!else
|
||||
all:
|
||||
@@ -46,5 +39,5 @@ all:
|
||||
!endif
|
||||
|
||||
clean:
|
||||
@-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.typelib
|
||||
@-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gir
|
||||
@-del /f/q *.typelib
|
||||
@-del /f/q *.gir
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
<GtkIntrospectNMakeCmd>cd ..
|
||||
set VCInstallDir=$(VCInstallDir)
|
||||
nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot)</GtkIntrospectNMakeCmd>
|
||||
<GtkIntrospectBuiltFiles>$(BinDir)\Gtk-3.0.gir;$(BinDir)\Gtk-3.0.typelib</GtkIntrospectBuiltFiles>
|
||||
<GtkIntrospectBuiltFiles>$(SolutionDir)\..\Gtk-3.0.gir;$(SolutionDir)\..\Gtk-3.0.typelib</GtkIntrospectBuiltFiles>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<_PropertySheetDisplayName>gtk3builddefinesprops</_PropertySheetDisplayName>
|
||||
|
||||
@@ -0,0 +1,534 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="gtk3-build-defines.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
|
||||
<GtkDoInstallBin>
|
||||
mkdir $(CopyDir)\bin
|
||||
mkdir $(CopyDir)\lib\pkgconfig
|
||||
copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll" $(CopyDir)\bin
|
||||
copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gdk-$(ApiVersion).lib" $(CopyDir)\lib
|
||||
if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_BIN
|
||||
if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_BIN
|
||||
copy "$(BinDir)\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll" $(CopyDir)\bin
|
||||
copy "$(BinDir)\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin
|
||||
copy "$(BinDir)\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll" $(CopyDir)\bin
|
||||
copy "$(BinDir)\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk-$(ApiVersion).lib" $(CopyDir)\lib
|
||||
copy "$(BinDir)\gailutil-$(ApiVersion).lib" $(CopyDir)\lib
|
||||
copy "$(BinDir)\gtk3-demo.exe" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk3-demo.pdb" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk3-demo-application.exe" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk3-demo-application.pdb" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk3-icon-browser.exe" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk3-icon-browser.pdb" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk-encode-symbolic-svg.exe" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk-encode-symbolic-svg.pdb" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk-update-icon-cache.exe" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk-update-icon-cache.pdb" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk-query-settings.exe" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk-query-settings.pdb" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk-builder-tool.exe" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk-builder-tool.pdb" $(CopyDir)\bin
|
||||
goto DONE_BIN
|
||||
:DO_BROADWAY_BIN
|
||||
copy "$(BinDir)\broadwayd.exe" $(CopyDir)\bin
|
||||
copy "$(BinDir)\broadwayd.pdb" $(CopyDir)\bin
|
||||
if "$(Configuration)" == "Release_Broadway" goto DO_BROADWAY_RELEASE
|
||||
if "$(Configuration)" == "Debug_Broadway" goto DO_BROADWAY_DEBUG
|
||||
:DO_BROADWAY_RELEASE
|
||||
copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
|
||||
copy .\Release\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib
|
||||
copy .\Release\$(Platform)\bin\gtk3-demo.exe $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk3-demo.pdb $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk3-demo-application.exe $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk3-demo-application.pdb $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
|
||||
goto DONE_BIN
|
||||
:DO_BROADWAY_DEBUG
|
||||
copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).dll $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gtk-3$(GtkDllSuffix).pdb $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).dll $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\$(GtkDllPrefix)gailutil-3$(GtkDllSuffix).pdb $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk-$(ApiVersion).lib $(CopyDir)\lib
|
||||
copy .\Debug\$(Platform)\bin\gailutil-$(ApiVersion).lib $(CopyDir)\lib
|
||||
copy .\Debug\$(Platform)\bin\gtk3-demo.exe $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk3-demo.pdb $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk3-demo-application.exe $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk3-demo-application.pdb $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk3-icon-browser.exe $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk3-icon-browser.pdb $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.exe $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk-encode-symbolic-svg.pdb $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.exe $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk-update-icon-cache.pdb $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
|
||||
:DONE_BIN
|
||||
copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig
|
||||
copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig\gdk-win32-3.0.pc
|
||||
copy "..\gtk+-3.0.pc" $(CopyDir)\lib\pkgconfig
|
||||
copy "..\gtk+-3.0.pc" "$(CopyDir)\lib\pkgconfig\gtk+-3.0.pc"
|
||||
copy ..\gail-3.0.pc $(CopyDir)\lib\pkgconfig
|
||||
</GtkDoInstallBin>
|
||||
<GtkDoInstall>
|
||||
echo off
|
||||
mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\win32
|
||||
mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\deprecated
|
||||
copy ..\..\..\gdk\win32\gdkwin32.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
|
||||
copy ..\..\..\gdk\gdk.h $(CopyDir)\include\gtk-3.0\gdk\gdk.h
|
||||
copy ..\..\..\gdk\gdk-autocleanup.h $(CopyDir)\include\gtk-3.0\gdk\gdk-autocleanup.h
|
||||
copy ..\..\..\gdk\gdkapplaunchcontext.h $(CopyDir)\include\gtk-3.0\gdk\gdkapplaunchcontext.h
|
||||
copy ..\..\..\gdk\gdkcairo.h $(CopyDir)\include\gtk-3.0\gdk\gdkcairo.h
|
||||
copy ..\..\..\gdk\gdkcursor.h $(CopyDir)\include\gtk-3.0\gdk\gdkcursor.h
|
||||
copy ..\..\..\gdk\gdkdevice.h $(CopyDir)\include\gtk-3.0\gdk\gdkdevice.h
|
||||
copy ..\..\..\gdk\gdkdevicepad.h $(CopyDir)\include\gtk-3.0\gdk\gdkdevicepad.h
|
||||
copy ..\..\..\gdk\gdkdevicetool.h $(CopyDir)\include\gtk-3.0\gdk\gdkdevicetool.h
|
||||
copy ..\..\..\gdk\gdkdevicemanager.h $(CopyDir)\include\gtk-3.0\gdk\gdkdevicemanager.h
|
||||
copy ..\..\..\gdk\gdkdisplay.h $(CopyDir)\include\gtk-3.0\gdk\gdkdisplay.h
|
||||
copy ..\..\..\gdk\gdkdisplaymanager.h $(CopyDir)\include\gtk-3.0\gdk\gdkdisplaymanager.h
|
||||
copy ..\..\..\gdk\gdkdnd.h $(CopyDir)\include\gtk-3.0\gdk\gdkdnd.h
|
||||
copy ..\..\..\gdk\gdkdrawingcontext.h $(CopyDir)\include\gtk-3.0\gdk\gdkdrawingcontext.h
|
||||
copy ..\..\..\gdk\gdkevents.h $(CopyDir)\include\gtk-3.0\gdk\gdkevents.h
|
||||
copy ..\..\..\gdk\gdkframetimings.h $(CopyDir)\include\gtk-3.0\gdk\gdkframetimings.h
|
||||
copy ..\..\..\gdk\gdkglcontext.h $(CopyDir)\include\gtk-3.0\gdk\gdkglcontext.h
|
||||
copy ..\..\..\gdk\gdkkeys.h $(CopyDir)\include\gtk-3.0\gdk\gdkkeys.h
|
||||
copy ..\..\..\gdk\gdkkeysyms.h $(CopyDir)\include\gtk-3.0\gdk\gdkkeysyms.h
|
||||
copy ..\..\..\gdk\gdkkeysyms-compat.h $(CopyDir)\include\gtk-3.0\gdk\gdkkeysyms-compat.h
|
||||
copy ..\..\..\gdk\gdkmain.h $(CopyDir)\include\gtk-3.0\gdk\gdkmain.h
|
||||
copy ..\..\..\gdk\gdkmonitor.h $(CopyDir)\include\gtk-3.0\gdk\gdkmonitor.h
|
||||
copy ..\..\..\gdk\gdkpango.h $(CopyDir)\include\gtk-3.0\gdk\gdkpango.h
|
||||
copy ..\..\..\gdk\gdkframeclock.h $(CopyDir)\include\gtk-3.0\gdk\gdkframeclock.h
|
||||
copy ..\..\..\gdk\gdkpixbuf.h $(CopyDir)\include\gtk-3.0\gdk\gdkpixbuf.h
|
||||
copy ..\..\..\gdk\gdkprivate.h $(CopyDir)\include\gtk-3.0\gdk\gdkprivate.h
|
||||
copy ..\..\..\gdk\gdkproperty.h $(CopyDir)\include\gtk-3.0\gdk\gdkproperty.h
|
||||
copy ..\..\..\gdk\gdkrectangle.h $(CopyDir)\include\gtk-3.0\gdk\gdkrectangle.h
|
||||
copy ..\..\..\gdk\gdkrgba.h $(CopyDir)\include\gtk-3.0\gdk\gdkrgba.h
|
||||
copy ..\..\..\gdk\gdkscreen.h $(CopyDir)\include\gtk-3.0\gdk\gdkscreen.h
|
||||
copy ..\..\..\gdk\gdkseat.h $(CopyDir)\include\gtk-3.0\gdk\gdkseat.h
|
||||
copy ..\..\..\gdk\gdkselection.h $(CopyDir)\include\gtk-3.0\gdk\gdkselection.h
|
||||
copy ..\..\..\gdk\gdktestutils.h $(CopyDir)\include\gtk-3.0\gdk\gdktestutils.h
|
||||
copy ..\..\..\gdk\gdkthreads.h $(CopyDir)\include\gtk-3.0\gdk\gdkthreads.h
|
||||
copy ..\..\..\gdk\gdktypes.h $(CopyDir)\include\gtk-3.0\gdk\gdktypes.h
|
||||
copy ..\..\..\gdk\gdkvisual.h $(CopyDir)\include\gtk-3.0\gdk\gdkvisual.h
|
||||
copy ..\..\..\gdk\gdkwindow.h $(CopyDir)\include\gtk-3.0\gdk\gdkwindow.h
|
||||
copy ..\..\..\gdk\deprecated\gdkcolor.h $(CopyDir)\include\gtk-3.0\gdk\deprecated\gdkcolor.h
|
||||
copy ..\..\..\gdk\gdkconfig.h $(CopyDir)\include\gtk-3.0\gdk\gdkconfig.h
|
||||
copy ..\..\..\gdk\gdkenumtypes.h $(CopyDir)\include\gtk-3.0\gdk\gdkenumtypes.h
|
||||
copy ..\..\..\gdk\gdkversionmacros.h $(CopyDir)\include\gtk-3.0\gdk\gdkversionmacros.h
|
||||
copy ..\..\..\gdk\win32\gdkwin32cursor.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32cursor.h
|
||||
copy ..\..\..\gdk\win32\gdkwin32display.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32display.h
|
||||
copy ..\..\..\gdk\win32\gdkwin32displaymanager.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32displaymanager.h
|
||||
copy ..\..\..\gdk\win32\gdkwin32dnd.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32dnd.h
|
||||
copy ..\..\..\gdk\win32\gdkwin32glcontext.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32glcontext.h
|
||||
copy ..\..\..\gdk\win32\gdkwin32keys.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32keys.h
|
||||
copy ..\..\..\gdk\win32\gdkwin32misc.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32misc.h
|
||||
copy ..\..\..\gdk\win32\gdkwin32monitor.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32monitor.h
|
||||
copy ..\..\..\gdk\win32\gdkwin32screen.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32screen.h
|
||||
copy ..\..\..\gdk\win32\gdkwin32window.h $(CopyDir)\include\gtk-3.0\gdk\win32\gdkwin32window.h
|
||||
mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\a11y
|
||||
mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gtk\deprecated
|
||||
copy ..\..\..\gtk\gtk.h $(CopyDir)\include\gtk-3.0\gtk\gtk.h
|
||||
copy ..\..\..\gtk\gtk-autocleanups.h $(CopyDir)\include\gtk-3.0\gtk\gtk-autocleanups.h
|
||||
copy ..\..\..\gtk\gtkx.h $(CopyDir)\include\gtk-3.0\gtk\gtkx.h
|
||||
copy ..\..\..\gtk\gtkx-autocleanups.h $(CopyDir)\include\gtk-3.0\gtk\gtkx-autocleanups.h
|
||||
copy ..\..\..\gtk\gtk-a11y.h $(CopyDir)\include\gtk-3.0\gtk\gtk-a11y.h
|
||||
copy ..\..\..\gtk\gtkaboutdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkaboutdialog.h
|
||||
copy ..\..\..\gtk\gtkaccelgroup.h $(CopyDir)\include\gtk-3.0\gtk\gtkaccelgroup.h
|
||||
copy ..\..\..\gtk\gtkaccellabel.h $(CopyDir)\include\gtk-3.0\gtk\gtkaccellabel.h
|
||||
copy ..\..\..\gtk\gtkaccelmap.h $(CopyDir)\include\gtk-3.0\gtk\gtkaccelmap.h
|
||||
copy ..\..\..\gtk\gtkaccessible.h $(CopyDir)\include\gtk-3.0\gtk\gtkaccessible.h
|
||||
copy ..\..\..\gtk\gtkactionable.h $(CopyDir)\include\gtk-3.0\gtk\gtkactionable.h
|
||||
copy ..\..\..\gtk\gtkactionbar.h $(CopyDir)\include\gtk-3.0\gtk\gtkactionbar.h
|
||||
copy ..\..\..\gtk\gtkadjustment.h $(CopyDir)\include\gtk-3.0\gtk\gtkadjustment.h
|
||||
copy ..\..\..\gtk\gtkappchooser.h $(CopyDir)\include\gtk-3.0\gtk\gtkappchooser.h
|
||||
copy ..\..\..\gtk\gtkappchooserbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkappchooserbutton.h
|
||||
copy ..\..\..\gtk\gtkappchooserdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkappchooserdialog.h
|
||||
copy ..\..\..\gtk\gtkappchooserwidget.h $(CopyDir)\include\gtk-3.0\gtk\gtkappchooserwidget.h
|
||||
copy ..\..\..\gtk\gtkapplication.h $(CopyDir)\include\gtk-3.0\gtk\gtkapplication.h
|
||||
copy ..\..\..\gtk\gtkapplicationwindow.h $(CopyDir)\include\gtk-3.0\gtk\gtkapplicationwindow.h
|
||||
copy ..\..\..\gtk\gtkaspectframe.h $(CopyDir)\include\gtk-3.0\gtk\gtkaspectframe.h
|
||||
copy ..\..\..\gtk\gtkassistant.h $(CopyDir)\include\gtk-3.0\gtk\gtkassistant.h
|
||||
copy ..\..\..\gtk\gtkbbox.h $(CopyDir)\include\gtk-3.0\gtk\gtkbbox.h
|
||||
copy ..\..\..\gtk\gtkbin.h $(CopyDir)\include\gtk-3.0\gtk\gtkbin.h
|
||||
copy ..\..\..\gtk\gtkbindings.h $(CopyDir)\include\gtk-3.0\gtk\gtkbindings.h
|
||||
copy ..\..\..\gtk\gtkborder.h $(CopyDir)\include\gtk-3.0\gtk\gtkborder.h
|
||||
copy ..\..\..\gtk\gtkbox.h $(CopyDir)\include\gtk-3.0\gtk\gtkbox.h
|
||||
copy ..\..\..\gtk\gtkbuilder.h $(CopyDir)\include\gtk-3.0\gtk\gtkbuilder.h
|
||||
copy ..\..\..\gtk\gtkbuildable.h $(CopyDir)\include\gtk-3.0\gtk\gtkbuildable.h
|
||||
copy ..\..\..\gtk\gtkbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkbutton.h
|
||||
copy ..\..\..\gtk\gtkcalendar.h $(CopyDir)\include\gtk-3.0\gtk\gtkcalendar.h
|
||||
copy ..\..\..\gtk\gtkcellarea.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellarea.h
|
||||
copy ..\..\..\gtk\gtkcellareacontext.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellareacontext.h
|
||||
copy ..\..\..\gtk\gtkcellareabox.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellareabox.h
|
||||
copy ..\..\..\gtk\gtkcelleditable.h $(CopyDir)\include\gtk-3.0\gtk\gtkcelleditable.h
|
||||
copy ..\..\..\gtk\gtkcelllayout.h $(CopyDir)\include\gtk-3.0\gtk\gtkcelllayout.h
|
||||
copy ..\..\..\gtk\gtkcellrenderer.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrenderer.h
|
||||
copy ..\..\..\gtk\gtkcellrendereraccel.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrendereraccel.h
|
||||
copy ..\..\..\gtk\gtkcellrenderercombo.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrenderercombo.h
|
||||
copy ..\..\..\gtk\gtkcellrendererpixbuf.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrendererpixbuf.h
|
||||
copy ..\..\..\gtk\gtkcellrendererprogress.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrendererprogress.h
|
||||
copy ..\..\..\gtk\gtkcellrendererspin.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrendererspin.h
|
||||
copy ..\..\..\gtk\gtkcellrendererspinner.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrendererspinner.h
|
||||
copy ..\..\..\gtk\gtkcellrenderertext.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrenderertext.h
|
||||
copy ..\..\..\gtk\gtkcellrenderertoggle.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellrenderertoggle.h
|
||||
copy ..\..\..\gtk\gtkcellview.h $(CopyDir)\include\gtk-3.0\gtk\gtkcellview.h
|
||||
copy ..\..\..\gtk\gtkcheckbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkcheckbutton.h
|
||||
copy ..\..\..\gtk\gtkcheckmenuitem.h $(CopyDir)\include\gtk-3.0\gtk\gtkcheckmenuitem.h
|
||||
copy ..\..\..\gtk\gtkclipboard.h $(CopyDir)\include\gtk-3.0\gtk\gtkclipboard.h
|
||||
copy ..\..\..\gtk\gtkcolorbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkcolorbutton.h
|
||||
copy ..\..\..\gtk\gtkcolorchooser.h $(CopyDir)\include\gtk-3.0\gtk\gtkcolorchooser.h
|
||||
copy ..\..\..\gtk\gtkcolorchooserwidget.h $(CopyDir)\include\gtk-3.0\gtk\gtkcolorchooserwidget.h
|
||||
copy ..\..\..\gtk\gtkcolorchooserdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkcolorchooserdialog.h
|
||||
copy ..\..\..\gtk\gtkcolorutils.h $(CopyDir)\include\gtk-3.0\gtk\gtkcolorutils.h
|
||||
copy ..\..\..\gtk\gtkcombobox.h $(CopyDir)\include\gtk-3.0\gtk\gtkcombobox.h
|
||||
copy ..\..\..\gtk\gtkcomboboxtext.h $(CopyDir)\include\gtk-3.0\gtk\gtkcomboboxtext.h
|
||||
copy ..\..\..\gtk\gtkcontainer.h $(CopyDir)\include\gtk-3.0\gtk\gtkcontainer.h
|
||||
copy ..\..\..\gtk\gtkcssprovider.h $(CopyDir)\include\gtk-3.0\gtk\gtkcssprovider.h
|
||||
copy ..\..\..\gtk\gtkcsssection.h $(CopyDir)\include\gtk-3.0\gtk\gtkcsssection.h
|
||||
copy ..\..\..\gtk\gtkdebug.h $(CopyDir)\include\gtk-3.0\gtk\gtkdebug.h
|
||||
copy ..\..\..\gtk\gtkdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkdialog.h
|
||||
copy ..\..\..\gtk\gtkdnd.h $(CopyDir)\include\gtk-3.0\gtk\gtkdnd.h
|
||||
copy ..\..\..\gtk\gtkdragdest.h $(CopyDir)\include\gtk-3.0\gtk\gtkdragdest.h
|
||||
copy ..\..\..\gtk\gtkdragsource.h $(CopyDir)\include\gtk-3.0\gtk\gtkdragsource.h
|
||||
copy ..\..\..\gtk\gtkdrawingarea.h $(CopyDir)\include\gtk-3.0\gtk\gtkdrawingarea.h
|
||||
copy ..\..\..\gtk\gtkeditable.h $(CopyDir)\include\gtk-3.0\gtk\gtkeditable.h
|
||||
copy ..\..\..\gtk\gtkentry.h $(CopyDir)\include\gtk-3.0\gtk\gtkentry.h
|
||||
copy ..\..\..\gtk\gtkentrybuffer.h $(CopyDir)\include\gtk-3.0\gtk\gtkentrybuffer.h
|
||||
copy ..\..\..\gtk\gtkentrycompletion.h $(CopyDir)\include\gtk-3.0\gtk\gtkentrycompletion.h
|
||||
copy ..\..\..\gtk\gtkenums.h $(CopyDir)\include\gtk-3.0\gtk\gtkenums.h
|
||||
copy ..\..\..\gtk\gtkeventbox.h $(CopyDir)\include\gtk-3.0\gtk\gtkeventbox.h
|
||||
copy ..\..\..\gtk\gtkeventcontroller.h $(CopyDir)\include\gtk-3.0\gtk\gtkeventcontroller.h
|
||||
copy ..\..\..\gtk\gtkexpander.h $(CopyDir)\include\gtk-3.0\gtk\gtkexpander.h
|
||||
copy ..\..\..\gtk\gtkfilechooser.h $(CopyDir)\include\gtk-3.0\gtk\gtkfilechooser.h
|
||||
copy ..\..\..\gtk\gtkfilechooserbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkfilechooserbutton.h
|
||||
copy ..\..\..\gtk\gtkfilechooserdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkfilechooserdialog.h
|
||||
copy ..\..\..\gtk\gtkfilechoosernative.h $(CopyDir)\include\gtk-3.0\gtk\gtkfilechoosernative.h
|
||||
copy ..\..\..\gtk\gtkfilechooserwidget.h $(CopyDir)\include\gtk-3.0\gtk\gtkfilechooserwidget.h
|
||||
copy ..\..\..\gtk\gtkfilefilter.h $(CopyDir)\include\gtk-3.0\gtk\gtkfilefilter.h
|
||||
copy ..\..\..\gtk\gtkfixed.h $(CopyDir)\include\gtk-3.0\gtk\gtkfixed.h
|
||||
copy ..\..\..\gtk\gtkflowbox.h $(CopyDir)\include\gtk-3.0\gtk\gtkflowbox.h
|
||||
copy ..\..\..\gtk\gtkfontbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkfontbutton.h
|
||||
copy ..\..\..\gtk\gtkfontchooser.h $(CopyDir)\include\gtk-3.0\gtk\gtkfontchooser.h
|
||||
copy ..\..\..\gtk\gtkfontchooserdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkfontchooserdialog.h
|
||||
copy ..\..\..\gtk\gtkfontchooserwidget.h $(CopyDir)\include\gtk-3.0\gtk\gtkfontchooserwidget.h
|
||||
copy ..\..\..\gtk\gtkframe.h $(CopyDir)\include\gtk-3.0\gtk\gtkframe.h
|
||||
copy ..\..\..\gtk\gtkgesture.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesture.h
|
||||
copy ..\..\..\gtk\gtkgesturedrag.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesturedrag.h
|
||||
copy ..\..\..\gtk\gtkgesturelongpress.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesturelongpress.h
|
||||
copy ..\..\..\gtk\gtkgesturemultipress.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesturemultipress.h
|
||||
copy ..\..\..\gtk\gtkgesturepan.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesturepan.h
|
||||
copy ..\..\..\gtk\gtkgesturerotate.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesturerotate.h
|
||||
copy ..\..\..\gtk\gtkgesturesingle.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesturesingle.h
|
||||
copy ..\..\..\gtk\gtkgestureswipe.h $(CopyDir)\include\gtk-3.0\gtk\gtkgestureswipe.h
|
||||
copy ..\..\..\gtk\gtkgesturezoom.h $(CopyDir)\include\gtk-3.0\gtk\gtkgesturezoom.h
|
||||
copy ..\..\..\gtk\gtkglarea.h $(CopyDir)\include\gtk-3.0\gtk\gtkglarea.h
|
||||
copy ..\..\..\gtk\gtkgrid.h $(CopyDir)\include\gtk-3.0\gtk\gtkgrid.h
|
||||
copy ..\..\..\gtk\gtkheaderbar.h $(CopyDir)\include\gtk-3.0\gtk\gtkheaderbar.h
|
||||
copy ..\..\..\gtk\gtkicontheme.h $(CopyDir)\include\gtk-3.0\gtk\gtkicontheme.h
|
||||
copy ..\..\..\gtk\gtkiconview.h $(CopyDir)\include\gtk-3.0\gtk\gtkiconview.h
|
||||
copy ..\..\..\gtk\gtkimage.h $(CopyDir)\include\gtk-3.0\gtk\gtkimage.h
|
||||
copy ..\..\..\gtk\gtkimcontext.h $(CopyDir)\include\gtk-3.0\gtk\gtkimcontext.h
|
||||
copy ..\..\..\gtk\gtkimcontextinfo.h $(CopyDir)\include\gtk-3.0\gtk\gtkimcontextinfo.h
|
||||
copy ..\..\..\gtk\gtkimcontextsimple.h $(CopyDir)\include\gtk-3.0\gtk\gtkimcontextsimple.h
|
||||
copy ..\..\..\gtk\gtkimmodule.h $(CopyDir)\include\gtk-3.0\gtk\gtkimmodule.h
|
||||
copy ..\..\..\gtk\gtkimmulticontext.h $(CopyDir)\include\gtk-3.0\gtk\gtkimmulticontext.h
|
||||
copy ..\..\..\gtk\gtkinfobar.h $(CopyDir)\include\gtk-3.0\gtk\gtkinfobar.h
|
||||
copy ..\..\..\gtk\gtkinvisible.h $(CopyDir)\include\gtk-3.0\gtk\gtkinvisible.h
|
||||
copy ..\..\..\gtk\gtklabel.h $(CopyDir)\include\gtk-3.0\gtk\gtklabel.h
|
||||
copy ..\..\..\gtk\gtklayout.h $(CopyDir)\include\gtk-3.0\gtk\gtklayout.h
|
||||
copy ..\..\..\gtk\gtklevelbar.h $(CopyDir)\include\gtk-3.0\gtk\gtklevelbar.h
|
||||
copy ..\..\..\gtk\gtklinkbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtklinkbutton.h
|
||||
copy ..\..\..\gtk\gtklistbox.h $(CopyDir)\include\gtk-3.0\gtk\gtklistbox.h
|
||||
copy ..\..\..\gtk\gtkliststore.h $(CopyDir)\include\gtk-3.0\gtk\gtkliststore.h
|
||||
copy ..\..\..\gtk\gtklockbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtklockbutton.h
|
||||
copy ..\..\..\gtk\gtkmain.h $(CopyDir)\include\gtk-3.0\gtk\gtkmain.h
|
||||
copy ..\..\..\gtk\gtkmenu.h $(CopyDir)\include\gtk-3.0\gtk\gtkmenu.h
|
||||
copy ..\..\..\gtk\gtkmenubar.h $(CopyDir)\include\gtk-3.0\gtk\gtkmenubar.h
|
||||
copy ..\..\..\gtk\gtkmenubutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkmenubutton.h
|
||||
copy ..\..\..\gtk\gtkmenuitem.h $(CopyDir)\include\gtk-3.0\gtk\gtkmenuitem.h
|
||||
copy ..\..\..\gtk\gtkmenushell.h $(CopyDir)\include\gtk-3.0\gtk\gtkmenushell.h
|
||||
copy ..\..\..\gtk\gtkmenutoolbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkmenutoolbutton.h
|
||||
copy ..\..\..\gtk\gtkmessagedialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkmessagedialog.h
|
||||
copy ..\..\..\gtk\gtkmodelbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkmodelbutton.h
|
||||
copy ..\..\..\gtk\gtkmodules.h $(CopyDir)\include\gtk-3.0\gtk\gtkmodules.h
|
||||
copy ..\..\..\gtk\gtkmountoperation.h $(CopyDir)\include\gtk-3.0\gtk\gtkmountoperation.h
|
||||
copy ..\..\..\gtk\gtknativedialog.h $(CopyDir)\include\gtk-3.0\gtk\gtknativedialog.h
|
||||
copy ..\..\..\gtk\gtknotebook.h $(CopyDir)\include\gtk-3.0\gtk\gtknotebook.h
|
||||
copy ..\..\..\gtk\gtkoffscreenwindow.h $(CopyDir)\include\gtk-3.0\gtk\gtkoffscreenwindow.h
|
||||
copy ..\..\..\gtk\gtkorientable.h $(CopyDir)\include\gtk-3.0\gtk\gtkorientable.h
|
||||
copy ..\..\..\gtk\gtkoverlay.h $(CopyDir)\include\gtk-3.0\gtk\gtkoverlay.h
|
||||
copy ..\..\..\gtk\gtkpadcontroller.h $(CopyDir)\include\gtk-3.0\gtk\gtkpadcontroller.h
|
||||
copy ..\..\..\gtk\gtkpagesetup.h $(CopyDir)\include\gtk-3.0\gtk\gtkpagesetup.h
|
||||
copy ..\..\..\gtk\gtkpaned.h $(CopyDir)\include\gtk-3.0\gtk\gtkpaned.h
|
||||
copy ..\..\..\gtk\gtkpapersize.h $(CopyDir)\include\gtk-3.0\gtk\gtkpapersize.h
|
||||
copy ..\..\..\gtk\gtkplacessidebar.h $(CopyDir)\include\gtk-3.0\gtk\gtkplacessidebar.h
|
||||
copy ..\..\..\gtk\gtkplug.h $(CopyDir)\include\gtk-3.0\gtk\gtkplug.h
|
||||
copy ..\..\..\gtk\gtkpopover.h $(CopyDir)\include\gtk-3.0\gtk\gtkpopover.h
|
||||
copy ..\..\..\gtk\gtkpopovermenu.h $(CopyDir)\include\gtk-3.0\gtk\gtkpopovermenu.h
|
||||
copy ..\..\..\gtk\gtkprintcontext.h $(CopyDir)\include\gtk-3.0\gtk\gtkprintcontext.h
|
||||
copy ..\..\..\gtk\gtkprintoperation.h $(CopyDir)\include\gtk-3.0\gtk\gtkprintoperation.h
|
||||
copy ..\..\..\gtk\gtkprintoperationpreview.h $(CopyDir)\include\gtk-3.0\gtk\gtkprintoperationpreview.h
|
||||
copy ..\..\..\gtk\gtkprintsettings.h $(CopyDir)\include\gtk-3.0\gtk\gtkprintsettings.h
|
||||
copy ..\..\..\gtk\gtkprogressbar.h $(CopyDir)\include\gtk-3.0\gtk\gtkprogressbar.h
|
||||
copy ..\..\..\gtk\gtkradiobutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkradiobutton.h
|
||||
copy ..\..\..\gtk\gtkradiomenuitem.h $(CopyDir)\include\gtk-3.0\gtk\gtkradiomenuitem.h
|
||||
copy ..\..\..\gtk\gtkradiotoolbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkradiotoolbutton.h
|
||||
copy ..\..\..\gtk\gtkrange.h $(CopyDir)\include\gtk-3.0\gtk\gtkrange.h
|
||||
copy ..\..\..\gtk\gtkrecentchooser.h $(CopyDir)\include\gtk-3.0\gtk\gtkrecentchooser.h
|
||||
copy ..\..\..\gtk\gtkrecentchooserdialog.h $(CopyDir)\include\gtk-3.0\gtk\gtkrecentchooserdialog.h
|
||||
copy ..\..\..\gtk\gtkrecentchoosermenu.h $(CopyDir)\include\gtk-3.0\gtk\gtkrecentchoosermenu.h
|
||||
copy ..\..\..\gtk\gtkrecentchooserwidget.h $(CopyDir)\include\gtk-3.0\gtk\gtkrecentchooserwidget.h
|
||||
copy ..\..\..\gtk\gtkrecentfilter.h $(CopyDir)\include\gtk-3.0\gtk\gtkrecentfilter.h
|
||||
copy ..\..\..\gtk\gtkrecentmanager.h $(CopyDir)\include\gtk-3.0\gtk\gtkrecentmanager.h
|
||||
copy ..\..\..\gtk\gtkrender.h $(CopyDir)\include\gtk-3.0\gtk\gtkrender.h
|
||||
copy ..\..\..\gtk\gtkrevealer.h $(CopyDir)\include\gtk-3.0\gtk\gtkrevealer.h
|
||||
copy ..\..\..\gtk\gtkscale.h $(CopyDir)\include\gtk-3.0\gtk\gtkscale.h
|
||||
copy ..\..\..\gtk\gtkscalebutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkscalebutton.h
|
||||
copy ..\..\..\gtk\gtkscrollable.h $(CopyDir)\include\gtk-3.0\gtk\gtkscrollable.h
|
||||
copy ..\..\..\gtk\gtkscrollbar.h $(CopyDir)\include\gtk-3.0\gtk\gtkscrollbar.h
|
||||
copy ..\..\..\gtk\gtkscrolledwindow.h $(CopyDir)\include\gtk-3.0\gtk\gtkscrolledwindow.h
|
||||
copy ..\..\..\gtk\gtksearchbar.h $(CopyDir)\include\gtk-3.0\gtk\gtksearchbar.h
|
||||
copy ..\..\..\gtk\gtksearchentry.h $(CopyDir)\include\gtk-3.0\gtk\gtksearchentry.h
|
||||
copy ..\..\..\gtk\gtkselection.h $(CopyDir)\include\gtk-3.0\gtk\gtkselection.h
|
||||
copy ..\..\..\gtk\gtkseparator.h $(CopyDir)\include\gtk-3.0\gtk\gtkseparator.h
|
||||
copy ..\..\..\gtk\gtkseparatormenuitem.h $(CopyDir)\include\gtk-3.0\gtk\gtkseparatormenuitem.h
|
||||
copy ..\..\..\gtk\gtkseparatortoolitem.h $(CopyDir)\include\gtk-3.0\gtk\gtkseparatortoolitem.h
|
||||
copy ..\..\..\gtk\gtksettings.h $(CopyDir)\include\gtk-3.0\gtk\gtksettings.h
|
||||
copy ..\..\..\gtk\gtkshortcutlabel.h $(CopyDir)\include\gtk-3.0\gtk\gtkshortcutlabel.h
|
||||
copy ..\..\..\gtk\gtkshortcutsgroup.h $(CopyDir)\include\gtk-3.0\gtk\gtkshortcutsgroup.h
|
||||
copy ..\..\..\gtk\gtkshortcutssection.h $(CopyDir)\include\gtk-3.0\gtk\gtkshortcutssection.h
|
||||
copy ..\..\..\gtk\gtkshortcutsshortcut.h $(CopyDir)\include\gtk-3.0\gtk\gtkshortcutsshortcut.h
|
||||
copy ..\..\..\gtk\gtkshortcutswindow.h $(CopyDir)\include\gtk-3.0\gtk\gtkshortcutswindow.h
|
||||
copy ..\..\..\gtk\gtkshow.h $(CopyDir)\include\gtk-3.0\gtk\gtkshow.h
|
||||
copy ..\..\..\gtk\gtkstacksidebar.h $(CopyDir)\include\gtk-3.0\gtk\gtkstacksidebar.h
|
||||
copy ..\..\..\gtk\gtksizegroup.h $(CopyDir)\include\gtk-3.0\gtk\gtksizegroup.h
|
||||
copy ..\..\..\gtk\gtksizerequest.h $(CopyDir)\include\gtk-3.0\gtk\gtksizerequest.h
|
||||
copy ..\..\..\gtk\gtksocket.h $(CopyDir)\include\gtk-3.0\gtk\gtksocket.h
|
||||
copy ..\..\..\gtk\gtkspinbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkspinbutton.h
|
||||
copy ..\..\..\gtk\gtkspinner.h $(CopyDir)\include\gtk-3.0\gtk\gtkspinner.h
|
||||
copy ..\..\..\gtk\gtkstack.h $(CopyDir)\include\gtk-3.0\gtk\gtkstack.h
|
||||
copy ..\..\..\gtk\gtkstackswitcher.h $(CopyDir)\include\gtk-3.0\gtk\gtkstackswitcher.h
|
||||
copy ..\..\..\gtk\gtkstatusbar.h $(CopyDir)\include\gtk-3.0\gtk\gtkstatusbar.h
|
||||
copy ..\..\..\gtk\gtkstylecontext.h $(CopyDir)\include\gtk-3.0\gtk\gtkstylecontext.h
|
||||
copy ..\..\..\gtk\gtkstyleprovider.h $(CopyDir)\include\gtk-3.0\gtk\gtkstyleprovider.h
|
||||
copy ..\..\..\gtk\gtkswitch.h $(CopyDir)\include\gtk-3.0\gtk\gtkswitch.h
|
||||
copy ..\..\..\gtk\gtktestutils.h $(CopyDir)\include\gtk-3.0\gtk\gtktestutils.h
|
||||
copy ..\..\..\gtk\gtktextattributes.h $(CopyDir)\include\gtk-3.0\gtk\gtktextattributes.h
|
||||
copy ..\..\..\gtk\gtktextbuffer.h $(CopyDir)\include\gtk-3.0\gtk\gtktextbuffer.h
|
||||
copy ..\..\..\gtk\gtktextbufferrichtext.h $(CopyDir)\include\gtk-3.0\gtk\gtktextbufferrichtext.h
|
||||
copy ..\..\..\gtk\gtktextchild.h $(CopyDir)\include\gtk-3.0\gtk\gtktextchild.h
|
||||
copy ..\..\..\gtk\gtktextdisplay.h $(CopyDir)\include\gtk-3.0\gtk\gtktextdisplay.h
|
||||
copy ..\..\..\gtk\gtktextiter.h $(CopyDir)\include\gtk-3.0\gtk\gtktextiter.h
|
||||
copy ..\..\..\gtk\gtktextmark.h $(CopyDir)\include\gtk-3.0\gtk\gtktextmark.h
|
||||
copy ..\..\..\gtk\gtktexttag.h $(CopyDir)\include\gtk-3.0\gtk\gtktexttag.h
|
||||
copy ..\..\..\gtk\gtktexttagtable.h $(CopyDir)\include\gtk-3.0\gtk\gtktexttagtable.h
|
||||
copy ..\..\..\gtk\gtktextview.h $(CopyDir)\include\gtk-3.0\gtk\gtktextview.h
|
||||
copy ..\..\..\gtk\gtktogglebutton.h $(CopyDir)\include\gtk-3.0\gtk\gtktogglebutton.h
|
||||
copy ..\..\..\gtk\gtktoggletoolbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtktoggletoolbutton.h
|
||||
copy ..\..\..\gtk\gtktoolbar.h $(CopyDir)\include\gtk-3.0\gtk\gtktoolbar.h
|
||||
copy ..\..\..\gtk\gtktoolbutton.h $(CopyDir)\include\gtk-3.0\gtk\gtktoolbutton.h
|
||||
copy ..\..\..\gtk\gtktoolitem.h $(CopyDir)\include\gtk-3.0\gtk\gtktoolitem.h
|
||||
copy ..\..\..\gtk\gtktoolitemgroup.h $(CopyDir)\include\gtk-3.0\gtk\gtktoolitemgroup.h
|
||||
copy ..\..\..\gtk\gtktoolpalette.h $(CopyDir)\include\gtk-3.0\gtk\gtktoolpalette.h
|
||||
copy ..\..\..\gtk\gtktoolshell.h $(CopyDir)\include\gtk-3.0\gtk\gtktoolshell.h
|
||||
copy ..\..\..\gtk\gtktooltip.h $(CopyDir)\include\gtk-3.0\gtk\gtktooltip.h
|
||||
copy ..\..\..\gtk\gtktreednd.h $(CopyDir)\include\gtk-3.0\gtk\gtktreednd.h
|
||||
copy ..\..\..\gtk\gtktreemodel.h $(CopyDir)\include\gtk-3.0\gtk\gtktreemodel.h
|
||||
copy ..\..\..\gtk\gtktreemodelfilter.h $(CopyDir)\include\gtk-3.0\gtk\gtktreemodelfilter.h
|
||||
copy ..\..\..\gtk\gtktreemodelsort.h $(CopyDir)\include\gtk-3.0\gtk\gtktreemodelsort.h
|
||||
copy ..\..\..\gtk\gtktreeselection.h $(CopyDir)\include\gtk-3.0\gtk\gtktreeselection.h
|
||||
copy ..\..\..\gtk\gtktreesortable.h $(CopyDir)\include\gtk-3.0\gtk\gtktreesortable.h
|
||||
copy ..\..\..\gtk\gtktreestore.h $(CopyDir)\include\gtk-3.0\gtk\gtktreestore.h
|
||||
copy ..\..\..\gtk\gtktreeview.h $(CopyDir)\include\gtk-3.0\gtk\gtktreeview.h
|
||||
copy ..\..\..\gtk\gtktreeviewcolumn.h $(CopyDir)\include\gtk-3.0\gtk\gtktreeviewcolumn.h
|
||||
copy ..\..\..\gtk\gtktypes.h $(CopyDir)\include\gtk-3.0\gtk\gtktypes.h
|
||||
copy ..\..\..\gtk\gtkviewport.h $(CopyDir)\include\gtk-3.0\gtk\gtkviewport.h
|
||||
copy ..\..\..\gtk\gtkvolumebutton.h $(CopyDir)\include\gtk-3.0\gtk\gtkvolumebutton.h
|
||||
copy ..\..\..\gtk\gtkwidget.h $(CopyDir)\include\gtk-3.0\gtk\gtkwidget.h
|
||||
copy ..\..\..\gtk\gtkwidgetpath.h $(CopyDir)\include\gtk-3.0\gtk\gtkwidgetpath.h
|
||||
copy ..\..\..\gtk\gtkwindow.h $(CopyDir)\include\gtk-3.0\gtk\gtkwindow.h
|
||||
copy ..\..\..\gtk\gtkwindowgroup.h $(CopyDir)\include\gtk-3.0\gtk\gtkwindowgroup.h
|
||||
copy ..\..\..\gtk\gtktextlayout.h $(CopyDir)\include\gtk-3.0\gtk\gtktextlayout.h
|
||||
copy ..\..\..\gtk\gtktypebuiltins.h $(CopyDir)\include\gtk-3.0\gtk\gtktypebuiltins.h
|
||||
copy ..\..\..\gtk\gtkversion.h $(CopyDir)\include\gtk-3.0\gtk\gtkversion.h
|
||||
copy ..\..\..\gtk\a11y\gtk-a11y-autocleanups.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtk-a11y-autocleanups.h
|
||||
copy ..\..\..\gtk\a11y\gtkarrowaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkarrowaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkbooleancellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkbooleancellaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkbuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkbuttonaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkcellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkcellaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkcellaccessibleparent.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkcellaccessibleparent.h
|
||||
copy ..\..\..\gtk\a11y\gtkcheckmenuitemaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkcheckmenuitemaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkcomboboxaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkcomboboxaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkcontaineraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkcontaineraccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkcontainercellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkcontainercellaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkentryaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkentryaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkexpanderaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkexpanderaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkflowboxaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkflowboxchildaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkflowboxchildaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkframeaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkframeaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkiconviewaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkiconviewaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkimageaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimageaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkimagecellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkimagecellaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtklabelaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtklabelaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtklevelbaraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtklevelbaraccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtklinkbuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtklinkbuttonaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtklistboxaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtklistboxaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtklistboxrowaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtklistboxrowaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtklockbuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtklockbuttonaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkmenuaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkmenuaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkmenubuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkmenubuttonaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkmenuitemaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkmenuitemaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkmenushellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkmenushellaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtknotebookaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtknotebookaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtknotebookpageaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtknotebookpageaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkpanedaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkpanedaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkpopoveraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkpopoveraccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkprogressbaraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkprogressbaraccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkradiobuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkradiobuttonaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkradiomenuitemaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkradiomenuitemaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkrangeaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkrangeaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkrenderercellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkrenderercellaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkscaleaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkscaleaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkscalebuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkscalebuttonaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkscrolledwindowaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkscrolledwindowaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkspinbuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkspinbuttonaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkspinneraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkspinneraccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkstatusbaraccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkstatusbaraccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkstackaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkstackaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkswitchaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkswitchaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtktextcellaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtktextcellaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtktextviewaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtktextviewaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtktogglebuttonaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtktogglebuttonaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtktoplevelaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtktoplevelaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtktreeviewaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtktreeviewaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkwidgetaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkwidgetaccessible.h
|
||||
copy ..\..\..\gtk\a11y\gtkwindowaccessible.h $(CopyDir)\include\gtk-3.0\gtk\a11y\gtkwindowaccessible.h
|
||||
copy ..\..\..\gtk\deprecated\gtkactivatable.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkactivatable.h
|
||||
copy ..\..\..\gtk\deprecated\gtkaction.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkaction.h
|
||||
copy ..\..\..\gtk\deprecated\gtkactiongroup.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkactiongroup.h
|
||||
copy ..\..\..\gtk\deprecated\gtkalignment.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkalignment.h
|
||||
copy ..\..\..\gtk\deprecated\gtkarrow.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkarrow.h
|
||||
copy ..\..\..\gtk\deprecated\gtkcolorsel.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkcolorsel.h
|
||||
copy ..\..\..\gtk\deprecated\gtkcolorseldialog.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkcolorseldialog.h
|
||||
copy ..\..\..\gtk\deprecated\gtkfontsel.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkfontsel.h
|
||||
copy ..\..\..\gtk\deprecated\gtkgradient.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkgradient.h
|
||||
copy ..\..\..\gtk\deprecated\gtkhandlebox.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhandlebox.h
|
||||
copy ..\..\..\gtk\deprecated\gtkhbbox.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhbbox.h
|
||||
copy ..\..\..\gtk\deprecated\gtkhbox.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhbox.h
|
||||
copy ..\..\..\gtk\deprecated\gtkhpaned.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhpaned.h
|
||||
copy ..\..\..\gtk\deprecated\gtkhscale.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhscale.h
|
||||
copy ..\..\..\gtk\deprecated\gtkhscrollbar.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhscrollbar.h
|
||||
copy ..\..\..\gtk\deprecated\gtkhseparator.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhseparator.h
|
||||
copy ..\..\..\gtk\deprecated\gtkhsv.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkhsv.h
|
||||
copy ..\..\..\gtk\deprecated\gtkiconfactory.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkiconfactory.h
|
||||
copy ..\..\..\gtk\deprecated\gtkimagemenuitem.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkimagemenuitem.h
|
||||
copy ..\..\..\gtk\deprecated\gtkmisc.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkmisc.h
|
||||
copy ..\..\..\gtk\deprecated\gtknumerableicon.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtknumerableicon.h
|
||||
copy ..\..\..\gtk\deprecated\gtkradioaction.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkradioaction.h
|
||||
copy ..\..\..\gtk\deprecated\gtkrc.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkrc.h
|
||||
copy ..\..\..\gtk\deprecated\gtkrecentaction.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkrecentaction.h
|
||||
copy ..\..\..\gtk\deprecated\gtkstatusicon.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkstatusicon.h
|
||||
copy ..\..\..\gtk\deprecated\gtkstock.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkstock.h
|
||||
copy ..\..\..\gtk\deprecated\gtkstyle.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkstyle.h
|
||||
copy ..\..\..\gtk\deprecated\gtkstyleproperties.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkstyleproperties.h
|
||||
copy ..\..\..\gtk\deprecated\gtksymboliccolor.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtksymboliccolor.h
|
||||
copy ..\..\..\gtk\deprecated\gtktable.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtktable.h
|
||||
copy ..\..\..\gtk\deprecated\gtktearoffmenuitem.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtktearoffmenuitem.h
|
||||
copy ..\..\..\gtk\deprecated\gtkthemingengine.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkthemingengine.h
|
||||
copy ..\..\..\gtk\deprecated\gtktoggleaction.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtktoggleaction.h
|
||||
copy ..\..\..\gtk\deprecated\gtkuimanager.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkuimanager.h
|
||||
copy ..\..\..\gtk\deprecated\gtkvbbox.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkvbbox.h
|
||||
copy ..\..\..\gtk\deprecated\gtkvbox.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkvbox.h
|
||||
copy ..\..\..\gtk\deprecated\gtkvscale.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkvscale.h
|
||||
copy ..\..\..\gtk\deprecated\gtkvscrollbar.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkvscrollbar.h
|
||||
copy ..\..\..\gtk\deprecated\gtkvseparator.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkvseparator.h
|
||||
copy ..\..\..\gtk\deprecated\gtkvpaned.h $(CopyDir)\include\gtk-3.0\gtk\deprecated\gtkvpaned.h
|
||||
mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util
|
||||
copy ..\..\..\libgail-util\gailmisc.h $(CopyDir)\include\gail-3.0\libgail-util\gailmisc.h
|
||||
copy ..\..\..\libgail-util\gailtextutil.h $(CopyDir)\include\gail-3.0\libgail-util\gailtextutil.h
|
||||
copy ..\..\..\libgail-util\gail-util.h $(CopyDir)\include\gail-3.0\libgail-util\gail-util.h
|
||||
for %%s in (16 22 24 32 48 256) do ((mkdir $(CopyDir)\share\icons\hicolor\%%sx%%s\apps) & (copy /b ..\..\..\demos\gtk-demo\data\%%sx%%s\gtk3-demo.png $(CopyDir)\share\icons\hicolor\%%sx%%s\apps))
|
||||
mkdir $(CopyDir)\share\glib-2.0\schemas
|
||||
copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
|
||||
copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas
|
||||
copy ..\..\..\gtk\org.gtk.Settings.EmojiChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
|
||||
copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
|
||||
copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas
|
||||
</GtkDoInstall>
|
||||
<GtkDoInstallBroadwayHeaders>
|
||||
copy ..\..\..\gdk\broadway\gdkbroadway.h $(CopyDir)\include\gtk-$(ApiVersion)\gdk
|
||||
mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway
|
||||
copy ..\..\..\gdk\broadway\gdkbroadwaydisplay.h $(CopyDir)\include\gtk-3.0\gdk\broadway\gdkbroadwaydisplay.h
|
||||
copy ..\..\..\gdk\broadway\gdkbroadwaywindow.h $(CopyDir)\include\gtk-3.0\gdk\broadway\gdkbroadwaywindow.h
|
||||
copy ..\..\..\gdk\broadway\gdkbroadwaycursor.h $(CopyDir)\include\gtk-3.0\gdk\broadway\gdkbroadwaycursor.h
|
||||
copy ..\..\..\gdk\broadway\gdkbroadwaymonitor.h $(CopyDir)\include\gtk-3.0\gdk\broadway\gdkbroadwaymonitor.h
|
||||
copy ..\..\..\gdk\broadway\gdkbroadwayvisual.h $(CopyDir)\include\gtk-3.0\gdk\broadway\gdkbroadwayvisual.h
|
||||
</GtkDoInstallBroadwayHeaders>
|
||||
<GtkPostInstall>
|
||||
echo "Compiling gsettings XML Files..."
|
||||
$(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\schemas
|
||||
echo "Generating icon cache......"
|
||||
$(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
|
||||
</GtkPostInstall>
|
||||
<GenerateGtkPC>$(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)</GenerateGtkPC>
|
||||
<GenerateGtkPCX64>$(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)</GenerateGtkPCX64>
|
||||
<GtkPCFiles>..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc</GtkPCFiles>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<_PropertySheetDisplayName>gtk3installsprops</_PropertySheetDisplayName>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<BuildMacro Include="BinDir">
|
||||
<Value>$(BinDir)</Value>
|
||||
</BuildMacro>
|
||||
<BuildMacro Include="InstalledDlls">
|
||||
<Value>$(InstalledDlls)</Value>
|
||||
</BuildMacro>
|
||||
<BuildMacro Include="InstalledBins">
|
||||
<Value>$(InstalledBins)</Value>
|
||||
</BuildMacro>
|
||||
<BuildMacro Include="InstalledBroadwayBins">
|
||||
<Value>$(InstalledBroadwayBins)</Value>
|
||||
</BuildMacro>
|
||||
<BuildMacro Include="GtkDoInstallBin">
|
||||
<Value>$(GtkDoInstallBin)</Value>
|
||||
</BuildMacro>
|
||||
<BuildMacro Include="GtkDoInstall">
|
||||
<Value>$(GtkDoInstall)</Value>
|
||||
</BuildMacro>
|
||||
<BuildMacro Include="GtkDoInstallBroadwayHeaders">
|
||||
<Value>$(GtkDoInstallBroadwayHeaders)</Value>
|
||||
</BuildMacro>
|
||||
<BuildMacro Include="GtkPostInstall">
|
||||
<Value>$(GtkPostInstall)</Value>
|
||||
</BuildMacro>
|
||||
<BuildMacro Include="GenerateGtkPC">
|
||||
<Value>$(GenerateGtkPC)</Value>
|
||||
</BuildMacro>
|
||||
<BuildMacro Include="GenerateGtkPCX64">
|
||||
<Value>$(GenerateGtkPCX64)</Value>
|
||||
</BuildMacro>
|
||||
<BuildMacro Include="GtkPCFiles">
|
||||
<Value>$(GtkPCFiles)</Value>
|
||||
</BuildMacro>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -7,9 +7,7 @@
|
||||
<BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
|
||||
<GtkDoInstallBin>
|
||||
mkdir $(CopyDir)\bin
|
||||
mkdir $(CopyDir)\share\gir-1.0
|
||||
mkdir $(CopyDir)\lib\pkgconfig
|
||||
mkdir $(CopyDir)\lib\girepository-1.0
|
||||
|
||||
copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll" $(CopyDir)\bin
|
||||
copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin
|
||||
@@ -37,12 +35,6 @@ copy "$(BinDir)\gtk-query-settings.exe" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk-query-settings.pdb" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk-builder-tool.exe" $(CopyDir)\bin
|
||||
copy "$(BinDir)\gtk-builder-tool.pdb" $(CopyDir)\bin
|
||||
if exist $(BinDir)\Gdk-3.0.gir copy "$(BinDir)\Gdk-3.0.gir" $(CopyDir)\share\gir-1.0
|
||||
if exist $(BinDir)\GdkWin32-3.0.gir copy "$(BinDir)\GdkWin32-3.0.gir" $(CopyDir)\share\gir-1.0
|
||||
if exist $(BinDir)\Gtk-3.0.gir copy "$(BinDir)\Gtk-3.0.gir" $(CopyDir)\share\gir-1.0
|
||||
if exist $(BinDir)\Gdk-3.0.typelib copy "$(BinDir)\Gdk-3.0.typelib" $(CopyDir)\lib\girepository-1.0
|
||||
if exist $(BinDir)\GdkWin32-3.0.typelib copy "$(BinDir)\GdkWin32-3.0.typelib" $(CopyDir)\lib\girepository-1.0
|
||||
if exist $(BinDir)\Gtk-3.0.typelib copy "$(BinDir)\Gtk-3.0.typelib" $(CopyDir)\lib\girepository-1.0
|
||||
goto DONE_BIN
|
||||
|
||||
:DO_BROADWAY_BIN
|
||||
@@ -72,12 +64,6 @@ copy .\Release\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
|
||||
copy .\Release\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
|
||||
if exist .\Release\$(Platform)\bin\Gdk-3.0.gir copy .\Release\$(Platform)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0
|
||||
if exist .\Release\$(Platform)\bin\GdkWin32-3.0.gir copy .\Release\$(Platform)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0
|
||||
if exist .\Release\$(Platform)\bin\Gtk-3.0.gir copy .\Release\$(Platform)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0
|
||||
if exist .\Release\$(Platform)\bin\Gdk-3.0.typelib copy .\Release\$(Platform)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0
|
||||
if exist .\Release\$(Platform)\bin\GdkWin32-3.0.typelib copy .\Release\$(Platform)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0
|
||||
if exist .\Release\$(Platform)\bin\Gtk-3.0.typelib copy .\Release\$(Platform)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0
|
||||
|
||||
goto DONE_BIN
|
||||
|
||||
@@ -102,12 +88,6 @@ copy .\Debug\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
|
||||
copy .\Debug\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
|
||||
if exist .\Debug\$(Platform)\bin\Gdk-3.0.gir copy .\Debug\$(Platform)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0
|
||||
if exist .\Debug\$(Platform)\bin\GdkWin32-3.0.gir copy .\Debug\$(Platform)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0
|
||||
if exist .\Debug\$(Platform)\bin\Gtk-3.0.gir copy .\Debug\$(Platform)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0
|
||||
if exist .\Debug\$(Platform)\bin\Gdk-3.0.typelib copy .\Debug\$(Platform)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0
|
||||
if exist .\Debug\$(Platform)\bin\GdkWin32-3.0.typelib copy .\Debug\$(Platform)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0
|
||||
if exist .\Debug\$(Platform)\bin\Gtk-3.0.typelib copy .\Debug\$(Platform)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0
|
||||
|
||||
:DONE_BIN
|
||||
|
||||
|
||||
@@ -1,107 +1,103 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{A8092C4E-0A21-4B1D-AC82-16764E418D1F}</ProjectGuid>
|
||||
<RootNamespace>gtk3introspect</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Makefile</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<PlatformToolset>v100</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Makefile</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<PlatformToolset>v100</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Makefile</ConfigurationType>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<PlatformToolset>v100</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Makefile</ConfigurationType>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v100</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="gtk3-build-defines.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="gtk3-build-defines.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="gtk3-build-defines.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="gtk3-build-defines.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
|
||||
<NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
|
||||
<NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
|
||||
<NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
|
||||
<NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
|
||||
<NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
|
||||
<NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
|
||||
<NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
|
||||
<NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
|
||||
<NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
|
||||
<NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
|
||||
<NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
|
||||
<NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="gdk-3.vcxproj">
|
||||
<Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="gtk-3.vcxproj">
|
||||
<Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup Label="ProjectConfigurations">
|
||||
<ProjectConfiguration Include="Debug|Win32">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|Win32">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>Win32</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Debug|x64">
|
||||
<Configuration>Debug</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
<ProjectConfiguration Include="Release|x64">
|
||||
<Configuration>Release</Configuration>
|
||||
<Platform>x64</Platform>
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{A8092C4E-0A21-4B1D-AC82-16764E418D1F}</ProjectGuid>
|
||||
<RootNamespace>gtk3introspect</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Makefile</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<PlatformToolset>v100</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Makefile</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<PlatformToolset>v100</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Makefile</ConfigurationType>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<PlatformToolset>v100</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Makefile</ConfigurationType>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>v100</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="gtk3-build-defines.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="gtk3-build-defines.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="gtk3-build-defines.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="gtk3-build-defines.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection</NMakeBuildCommandLine>
|
||||
<NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection</NMakeReBuildCommandLine>
|
||||
<NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
|
||||
<NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection</NMakeBuildCommandLine>
|
||||
<NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection</NMakeReBuildCommandLine>
|
||||
<NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
|
||||
<NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection</NMakeBuildCommandLine>
|
||||
<NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection</NMakeReBuildCommandLine>
|
||||
<NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
|
||||
<NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection</NMakeBuildCommandLine>
|
||||
<NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection</NMakeReBuildCommandLine>
|
||||
<NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
|
||||
<NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="gtk3-install.vcxproj">
|
||||
<Project>{23bbf35f-78af-4e8c-983f-7b90448cd7df}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
@@ -91,8 +91,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-instal
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-introspect", "gtk3-introspect.vcproj", "{A8092C4E-0A21-4B1D-AC82-16764E418D1F}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}
|
||||
{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}
|
||||
{23BBF35F-78AF-4E8C-983F-7B90448CD7DF} = {23BBF35F-78AF-4E8C-983F-7B90448CD7DF}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
|
||||
@@ -65,6 +65,6 @@
|
||||
/>
|
||||
<UserMacro
|
||||
Name="GtkIntrospectBuiltFiles"
|
||||
Value="$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.gir;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.typelib;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.gir;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.typelib;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.gir;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.typelib"
|
||||
Value="$(SolutionDir)\..\Gtk-3.0.gir;$(SolutionDir)\..\Gtk-3.0.typelib;$(SolutionDir)\..\GdkWin32-3.0.gir;$(SolutionDir)\..\GdkWin32-3.0.typelib;$(SolutionDir)\..\Gdk-3.0.gir;$(SolutionDir)\..\Gdk-3.0.typelib"
|
||||
/>
|
||||
</VisualStudioPropertySheet>
|
||||
|
||||
@@ -9,9 +9,7 @@
|
||||
Name="GtkDoInstallBin"
|
||||
Value="
|
||||
mkdir $(CopyDir)\bin

|
||||
mkdir $(CopyDir)\share\gir-1.0

|
||||
mkdir $(CopyDir)\lib\pkgconfig

|
||||
mkdir $(CopyDir)\lib\girepository-1.0

|
||||
|
||||
copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll $(CopyDir)\bin

|
||||
copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb $(CopyDir)\bin

|
||||
@@ -39,12 +37,6 @@ copy $(ConfigurationName)\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\
|
||||
copy $(ConfigurationName)\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin

|
||||
copy $(ConfigurationName)\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin

|
||||
copy $(ConfigurationName)\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin

|
||||
if exist $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.gir copy $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
if exist $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.gir copy $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
if exist $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.gir copy $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
if exist $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.typelib copy $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
if exist $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.typelib copy $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
if exist $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.typelib copy $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
goto DONE_BIN

|
||||
|
||||
:DO_BROADWAY_BIN

|
||||
@@ -74,12 +66,6 @@ copy .\Release\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin
&#
|
||||
copy .\Release\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin

|
||||
copy .\Release\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin

|
||||
copy .\Release\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin

|
||||
if exist .\Release\$(PlatformName)\bin\Gdk-3.0.gir copy .\Release\$(PlatformName)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
if exist .\Release\$(PlatformName)\bin\GdkWin32-3.0.gir copy .\Release\$(PlatformName)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
if exist .\Release\$(PlatformName)\bin\Gtk-3.0.gir copy .\Release\$(PlatformName)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
if exist .\Release\$(PlatformName)\bin\Gdk-3.0.typelib copy .\Release\$(PlatformName)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
if exist .\Release\$(PlatformName)\bin\GdkWin32-3.0.typelib copy .\Release\$(PlatformName)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
if exist .\Release\$(PlatformName)\bin\Gtk-3.0.typelib copy .\Release\$(PlatformName)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
goto DONE_BIN

|
||||
|
||||
:DO_BROADWAY_DEBUG

|
||||
@@ -103,12 +89,6 @@ copy .\Debug\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin
�
|
||||
copy .\Debug\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin

|
||||
copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin

|
||||
copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin

|
||||
if exist .\Debug\$(PlatformName)\bin\Gdk-3.0.gir copy .\Debug\$(PlatformName)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
if exist .\Debug\$(PlatformName)\bin\GdkWin32-3.0.gir copy .\Debug\$(PlatformName)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
if exist .\Debug\$(PlatformName)\bin\Gtk-3.0.gir copy .\Debug\$(PlatformName)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0

|
||||
if exist .\Debug\$(PlatformName)\bin\Gdk-3.0.typelib copy .\Debug\$(PlatformName)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
if exist .\Debug\$(PlatformName)\bin\GdkWin32-3.0.typelib copy .\Debug\$(PlatformName)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
if exist .\Debug\$(PlatformName)\bin\Gtk-3.0.typelib copy .\Debug\$(PlatformName)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0

|
||||
:DONE_BIN

|
||||
|
||||
copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig

|
||||
|
||||
@@ -1,76 +1,76 @@
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9.00"
|
||||
Name="gtk3-introspect"
|
||||
ProjectGUID="{A8092C4E-0A21-4B1D-AC82-16764E418D1F}"
|
||||
Keyword="MakeFileProj"
|
||||
TargetFrameworkVersion="196613"
|
||||
>
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"
|
||||
/>
|
||||
<Platform
|
||||
Name="x64"
|
||||
/>
|
||||
</Platforms>
|
||||
<ToolFiles>
|
||||
</ToolFiles>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
ConfigurationType="0"
|
||||
InheritedPropertySheets=".\gtk3-build-defines.vsprops"
|
||||
>
|
||||
<Tool
|
||||
Name="VCNMakeTool"
|
||||
BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)"
|
||||
ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all"
|
||||
CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
|
||||
Output="$(GtkIntrospectBuiltFiles)"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
ConfigurationType="0"
|
||||
InheritedPropertySheets=".\gtk3-build-defines.vsprops"
|
||||
>
|
||||
<Tool
|
||||
Name="VCNMakeTool"
|
||||
BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64)"
|
||||
ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all"
|
||||
CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
|
||||
Output="$(GtkIntrospectBuiltFiles)"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
ConfigurationType="0"
|
||||
InheritedPropertySheets=".\gtk3-build-defines.vsprops"
|
||||
CharacterSet="2"
|
||||
DeleteExtensionsOnClean=""
|
||||
>
|
||||
<Tool
|
||||
Name="VCNMakeTool"
|
||||
BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)"
|
||||
ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all"
|
||||
CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
|
||||
Output="$(GtkIntrospectBuiltFiles)"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
ConfigurationType="0"
|
||||
InheritedPropertySheets=".\gtk3-build-defines.vsprops"
|
||||
>
|
||||
<Tool
|
||||
Name="VCNMakeTool"
|
||||
BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64)"
|
||||
ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all"
|
||||
CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
|
||||
Output="$(GtkIntrospectBuiltFiles)"
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
</VisualStudioProject>
|
||||
<?xml version="1.0" encoding="Windows-1252"?>
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9.00"
|
||||
Name="gtk3-introspect"
|
||||
ProjectGUID="{A8092C4E-0A21-4B1D-AC82-16764E418D1F}"
|
||||
Keyword="MakeFileProj"
|
||||
TargetFrameworkVersion="196613"
|
||||
>
|
||||
<Platforms>
|
||||
<Platform
|
||||
Name="Win32"
|
||||
/>
|
||||
<Platform
|
||||
Name="x64"
|
||||
/>
|
||||
</Platforms>
|
||||
<ToolFiles>
|
||||
</ToolFiles>
|
||||
<Configurations>
|
||||
<Configuration
|
||||
Name="Debug|Win32"
|
||||
ConfigurationType="0"
|
||||
InheritedPropertySheets=".\gtk3-build-defines.vsprops"
|
||||
>
|
||||
<Tool
|
||||
Name="VCNMakeTool"
|
||||
BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection"
|
||||
ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection"
|
||||
CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
|
||||
Output="$(GtkIntrospectBuiltFiles)"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
ConfigurationType="0"
|
||||
InheritedPropertySheets=".\gtk3-build-defines.vsprops"
|
||||
>
|
||||
<Tool
|
||||
Name="VCNMakeTool"
|
||||
BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection"
|
||||
ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection"
|
||||
CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
|
||||
Output="$(GtkIntrospectBuiltFiles)"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
ConfigurationType="0"
|
||||
InheritedPropertySheets=".\gtk3-build-defines.vsprops"
|
||||
CharacterSet="2"
|
||||
DeleteExtensionsOnClean=""
|
||||
>
|
||||
<Tool
|
||||
Name="VCNMakeTool"
|
||||
BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) install-introspection"
|
||||
ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean install-introspection"
|
||||
CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
|
||||
Output="$(GtkIntrospectBuiltFiles)"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
ConfigurationType="0"
|
||||
InheritedPropertySheets=".\gtk3-build-defines.vsprops"
|
||||
>
|
||||
<Tool
|
||||
Name="VCNMakeTool"
|
||||
BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) install-introspection"
|
||||
ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean install-introspection"
|
||||
CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
|
||||
Output="$(GtkIntrospectBuiltFiles)"
|
||||
/>
|
||||
</Configuration>
|
||||
</Configurations>
|
||||
</VisualStudioProject>
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
|
||||
m4_define([gtk_major_version], [3])
|
||||
m4_define([gtk_minor_version], [24])
|
||||
m4_define([gtk_micro_version], [4])
|
||||
m4_define([gtk_micro_version], [2])
|
||||
m4_define([gtk_interface_age], [0])
|
||||
m4_define([gtk_binary_age],
|
||||
[m4_eval(100 * gtk_minor_version + gtk_micro_version)])
|
||||
|
||||
@@ -50,7 +50,6 @@
|
||||
<property name="can_focus">1</property>
|
||||
<property name="receives_default">1</property>
|
||||
<property name="font">Sans 12</property>
|
||||
<property name="level">style|size|variations|features</property>
|
||||
<signal name="font-set" handler="font_changed" swapped="no"/>
|
||||
</object>
|
||||
</child>
|
||||
|
||||
+1
-1
@@ -534,7 +534,7 @@ GdkWin32_3_0_gir_MSVC_CFLAGS = $(BASE_MSVC_GIR_CFLAGS)
|
||||
GdkWin32_3_0_gir_MSVC_SCANNERFLAGS = \
|
||||
--identifier-prefix=Gdk \
|
||||
--c-include="gdk/gdkwin32.h" \
|
||||
--include-uninstalled='./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin/Gdk-3.0.gir'
|
||||
--include-uninstalled=./Gdk-3.0.gir
|
||||
|
||||
include $(top_srcdir)/build/Makefile.msvc-introspection
|
||||
|
||||
|
||||
@@ -35,20 +35,7 @@ gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context
|
||||
GAppInfo *info,
|
||||
GList *files)
|
||||
{
|
||||
GdkWaylandDisplay *display;
|
||||
gchar *id = NULL;
|
||||
|
||||
g_object_get (context, "display", &display, NULL);
|
||||
|
||||
if (display->gtk_shell_version >= 3)
|
||||
{
|
||||
id = g_uuid_string_random ();
|
||||
gtk_shell1_notify_launch (display->gtk_shell, id);
|
||||
}
|
||||
|
||||
g_object_unref (display);
|
||||
|
||||
return id;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
@@ -336,43 +336,43 @@ _gdk_wayland_display_get_cursor_for_name_with_scale (GdkDisplay *display,
|
||||
const gchar *name,
|
||||
guint scale)
|
||||
{
|
||||
GdkWaylandCursor *wayland_cursor;
|
||||
GdkWaylandCursor *private;
|
||||
GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
|
||||
|
||||
g_return_val_if_fail (GDK_IS_DISPLAY (display), NULL);
|
||||
|
||||
wayland_cursor = g_hash_table_lookup (display_wayland->cursor_cache, name);
|
||||
if (wayland_cursor && wayland_cursor->scale == scale)
|
||||
return GDK_CURSOR (g_object_ref (wayland_cursor));
|
||||
private = g_hash_table_lookup (display_wayland->cursor_cache, name);
|
||||
if (private)
|
||||
return GDK_CURSOR (g_object_ref (private));
|
||||
|
||||
wayland_cursor = g_object_new (GDK_TYPE_WAYLAND_CURSOR,
|
||||
"cursor-type", GDK_CURSOR_IS_PIXMAP,
|
||||
"display", display,
|
||||
NULL);
|
||||
private = g_object_new (GDK_TYPE_WAYLAND_CURSOR,
|
||||
"cursor-type", GDK_CURSOR_IS_PIXMAP,
|
||||
"display", display,
|
||||
NULL);
|
||||
|
||||
/* Blank cursor case */
|
||||
if (!name || g_str_equal (name, "none") || g_str_equal (name, "blank_cursor"))
|
||||
{
|
||||
wayland_cursor->name = g_strdup ("none");
|
||||
wayland_cursor->scale = scale;
|
||||
private->name = g_strdup ("none");
|
||||
private->scale = scale;
|
||||
|
||||
return GDK_CURSOR (wayland_cursor);
|
||||
return GDK_CURSOR (private);
|
||||
}
|
||||
|
||||
wayland_cursor->name = g_strdup (name);
|
||||
wayland_cursor->scale = scale;
|
||||
private->name = g_strdup (name);
|
||||
private->scale = scale;
|
||||
|
||||
if (!_gdk_wayland_cursor_update (display_wayland, wayland_cursor))
|
||||
if (!_gdk_wayland_cursor_update (display_wayland, private))
|
||||
{
|
||||
g_object_unref (wayland_cursor);
|
||||
g_object_unref (private);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* Insert into cache. */
|
||||
g_hash_table_replace (display_wayland->cursor_cache,
|
||||
wayland_cursor->name,
|
||||
g_object_ref (wayland_cursor));
|
||||
return GDK_CURSOR (wayland_cursor);
|
||||
g_hash_table_insert (display_wayland->cursor_cache,
|
||||
private->name,
|
||||
g_object_ref (private));
|
||||
return GDK_CURSOR (private);
|
||||
}
|
||||
|
||||
GdkCursor *
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
|
||||
#define MIN_SYSTEM_BELL_DELAY_MS 20
|
||||
|
||||
#define GTK_SHELL1_VERSION 3
|
||||
#define GTK_SHELL1_VERSION 2
|
||||
|
||||
static void _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland);
|
||||
|
||||
|
||||
@@ -140,7 +140,6 @@ struct _GdkWindowImplWayland
|
||||
EGLSurface dummy_egl_surface;
|
||||
|
||||
unsigned int initial_configure_received : 1;
|
||||
unsigned int configuring_popup : 1;
|
||||
unsigned int mapped : 1;
|
||||
unsigned int use_custom_surface : 1;
|
||||
unsigned int pending_buffer_attached : 1;
|
||||
@@ -1089,18 +1088,12 @@ gdk_wayland_window_maybe_configure (GdkWindow *window,
|
||||
is_xdg_popup = is_realized_popup (window);
|
||||
is_visible = gdk_window_is_visible (window);
|
||||
|
||||
if (is_xdg_popup &&
|
||||
is_visible &&
|
||||
!impl->initial_configure_received &&
|
||||
!impl->configuring_popup)
|
||||
if (is_xdg_popup && is_visible && !impl->initial_configure_received)
|
||||
gdk_window_hide (window);
|
||||
|
||||
gdk_wayland_window_configure (window, width, height, scale);
|
||||
|
||||
if (is_xdg_popup &&
|
||||
is_visible &&
|
||||
!impl->initial_configure_received &&
|
||||
!impl->configuring_popup)
|
||||
if (is_xdg_popup && is_visible && !impl->initial_configure_received)
|
||||
gdk_window_show (window);
|
||||
}
|
||||
|
||||
@@ -2420,11 +2413,9 @@ calculate_moved_to_rect_result (GdkWindow *window,
|
||||
window_width = width + window->shadow_left + window->shadow_right;
|
||||
window_height = height + window->shadow_top + window->shadow_bottom;
|
||||
|
||||
impl->configuring_popup = TRUE;
|
||||
gdk_window_move_resize (window,
|
||||
window_x, window_y,
|
||||
window_width, window_height);
|
||||
impl->configuring_popup = FALSE;
|
||||
|
||||
calculate_popup_rect (window,
|
||||
impl->pending_move_to_rect.rect_anchor,
|
||||
@@ -3532,20 +3523,14 @@ gdk_wayland_window_focus (GdkWindow *window,
|
||||
if (!impl->display_server.gtk_surface)
|
||||
return;
|
||||
|
||||
/* We didn't have an event to fetch a time from, meaning we have nothing valid
|
||||
* to send. This should rather be translated to a 'needs-attention' request or
|
||||
* something.
|
||||
*/
|
||||
if (timestamp == GDK_CURRENT_TIME)
|
||||
{
|
||||
GdkWaylandDisplay *display_wayland =
|
||||
GDK_WAYLAND_DISPLAY (gdk_window_get_display (window));
|
||||
return;
|
||||
|
||||
if (display_wayland->gtk_shell_version >= 3)
|
||||
{
|
||||
gtk_surface1_request_focus (impl->display_server.gtk_surface,
|
||||
display_wayland->startup_notification_id);
|
||||
g_clear_pointer (&display_wayland->startup_notification_id, g_free);
|
||||
}
|
||||
}
|
||||
else
|
||||
gtk_surface1_present (impl->display_server.gtk_surface, timestamp);
|
||||
gtk_surface1_present (impl->display_server.gtk_surface, timestamp);
|
||||
}
|
||||
|
||||
static void
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<protocol name="gtk">
|
||||
|
||||
<interface name="gtk_shell1" version="3">
|
||||
<interface name="gtk_shell1" version="2">
|
||||
<description summary="gtk specific extensions">
|
||||
gtk_shell is a protocol extension providing additional features for
|
||||
clients implementing it.
|
||||
@@ -28,14 +28,9 @@
|
||||
<request name="system_bell">
|
||||
<arg name="surface" type="object" interface="gtk_surface1" allow-null="true"/>
|
||||
</request>
|
||||
|
||||
<!-- Version 3 additions -->
|
||||
<request name="notify_launch" since="3">
|
||||
<arg name="startup_id" type="string"/>
|
||||
</request>
|
||||
</interface>
|
||||
|
||||
<interface name="gtk_surface1" version="3">
|
||||
<interface name="gtk_surface1" version="2">
|
||||
<request name="set_dbus_properties">
|
||||
<arg name="application_id" type="string" allow-null="true"/>
|
||||
<arg name="app_menu_path" type="string" allow-null="true"/>
|
||||
@@ -77,11 +72,6 @@
|
||||
<event name="configure_edges" since="2">
|
||||
<arg name="constraints" type="array"/>
|
||||
</event>
|
||||
|
||||
<!-- Version 3 additions -->
|
||||
<request name="request_focus" since="3">
|
||||
<arg name="startup_id" type="string" allow-null="true"/>
|
||||
</request>
|
||||
</interface>
|
||||
|
||||
</protocol>
|
||||
|
||||
@@ -29,8 +29,8 @@
|
||||
#include "gdkkeysyms.h"
|
||||
|
||||
|
||||
#define HAS_FOCUS(toplevel) \
|
||||
((toplevel)->has_focus || (toplevel)->has_pointer_focus)
|
||||
#define APPEARS_FOCUSED(toplevel) \
|
||||
((toplevel)->has_focus || (toplevel)->has_focus_window || (toplevel)->has_pointer_focus)
|
||||
|
||||
static void gdk_x11_device_manager_core_finalize (GObject *object);
|
||||
static void gdk_x11_device_manager_core_constructed (GObject *object);
|
||||
@@ -842,7 +842,7 @@ _gdk_device_manager_core_handle_focus (GdkWindow *window,
|
||||
if (toplevel->focus_window == original)
|
||||
return;
|
||||
|
||||
had_focus = HAS_FOCUS (toplevel);
|
||||
had_focus = APPEARS_FOCUSED (toplevel);
|
||||
x11_screen = GDK_X11_SCREEN (gdk_window_get_screen (window));
|
||||
|
||||
switch (detail)
|
||||
@@ -904,7 +904,7 @@ _gdk_device_manager_core_handle_focus (GdkWindow *window,
|
||||
break;
|
||||
}
|
||||
|
||||
if (HAS_FOCUS (toplevel) != had_focus)
|
||||
if (APPEARS_FOCUSED (toplevel) != had_focus)
|
||||
{
|
||||
GdkEvent *event;
|
||||
|
||||
|
||||
@@ -32,8 +32,8 @@ static gboolean gdk_event_source_dispatch (GSource *source,
|
||||
gpointer user_data);
|
||||
static void gdk_event_source_finalize (GSource *source);
|
||||
|
||||
#define HAS_FOCUS(toplevel) \
|
||||
((toplevel)->has_focus || (toplevel)->has_pointer_focus)
|
||||
#define APPEARS_FOCUSED(toplevel) \
|
||||
((toplevel)->has_focus || (toplevel)->has_focus_window || (toplevel)->has_pointer_focus)
|
||||
|
||||
struct _GdkEventSource
|
||||
{
|
||||
@@ -148,10 +148,10 @@ handle_focus_change (GdkEventCrossing *event)
|
||||
if (!event->focus || toplevel->has_focus_window)
|
||||
return;
|
||||
|
||||
had_focus = HAS_FOCUS (toplevel);
|
||||
had_focus = APPEARS_FOCUSED (toplevel);
|
||||
toplevel->has_pointer_focus = focus_in;
|
||||
|
||||
if (HAS_FOCUS (toplevel) != had_focus)
|
||||
if (APPEARS_FOCUSED (toplevel) != had_focus)
|
||||
{
|
||||
GdkEvent *focus_event;
|
||||
|
||||
|
||||
+1
-10
@@ -1336,15 +1336,6 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc
|
||||
done; \
|
||||
done; \
|
||||
done; \
|
||||
for s in scalable; do \
|
||||
for c in status; do \
|
||||
for f in $(srcdir)/icons/$$s/$$c/*.svg; do \
|
||||
test "$$f" = "$(srcdir)/icons/$$s/$$c/*.svg" && continue; \
|
||||
n=`basename $$f`; \
|
||||
echo " <file>icons/$$s/$$c/$$n</file>" >> $@; \
|
||||
done; \
|
||||
done; \
|
||||
done; \
|
||||
for f in $(srcdir)/inspector/*.ui; do \
|
||||
n=`basename $$f`; \
|
||||
echo " <file compressed='true' preprocess='xml-stripblanks'>inspector/$$n</file>" >> $@; \
|
||||
@@ -1560,7 +1551,7 @@ Gtk_3_0_gir_MSVC_EXPORT_PACKAGES = $(Gtk_3_0_gir_EXPORT_PACKAGES)
|
||||
Gtk_3_0_gir_MSVC_INCLUDE_GIRS = Atk-1.0
|
||||
Gtk_3_0_gir_MSVC_LIBS = gtk-3.0 gdk-3.0
|
||||
Gtk_3_0_gir_MSVC_CFLAGS = $(GTK_MSVC_GIR_CFLAGS)
|
||||
Gtk_3_0_gir_MSVC_SCANNERFLAGS = --warn-all --include-uninstalled='./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin/Gdk-3.0.gir'
|
||||
Gtk_3_0_gir_MSVC_SCANNERFLAGS = --warn-all --add-include-path=. --include-uninstalled=./Gdk-3.0.gir
|
||||
|
||||
include $(top_srcdir)/build/Makefile.msvc-introspection
|
||||
|
||||
|
||||
@@ -1174,12 +1174,11 @@ gtk_tree_view_accessible_grab_cell_focus (GtkCellAccessibleParent *parent,
|
||||
if (gtk_widget_is_toplevel (toplevel))
|
||||
{
|
||||
#ifdef GDK_WINDOWING_X11
|
||||
if (GDK_IS_X11_DISPLAY (gtk_widget_get_display (toplevel)))
|
||||
gtk_window_present_with_time (GTK_WINDOW (toplevel),
|
||||
gdk_x11_get_server_time (gtk_widget_get_window (widget)));
|
||||
else
|
||||
gtk_window_present_with_time (GTK_WINDOW (toplevel),
|
||||
gdk_x11_get_server_time (gtk_widget_get_window (widget)));
|
||||
#else
|
||||
gtk_window_present (GTK_WINDOW (toplevel));
|
||||
#endif
|
||||
gtk_window_present (GTK_WINDOW (toplevel));
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
|
||||
+1
-1
@@ -451,7 +451,7 @@ plane_set_property (GObject *object,
|
||||
GParamSpec *pspec)
|
||||
{
|
||||
GtkColorPlane *plane = GTK_COLOR_PLANE (object);
|
||||
GtkAdjustment *adjustment;
|
||||
GObject *adjustment;
|
||||
|
||||
/* Construct only properties can only be set once, these are created
|
||||
* only in order to be properly buildable from gtkcoloreditor.ui
|
||||
|
||||
@@ -58,49 +58,18 @@ static guint signals[N_SIGNALS] = { 0 };
|
||||
|
||||
G_DEFINE_TYPE (GtkEventControllerMotion, gtk_event_controller_motion, GTK_TYPE_EVENT_CONTROLLER)
|
||||
|
||||
static void
|
||||
get_coords (GtkWidget *widget,
|
||||
const GdkEvent *event,
|
||||
double *x,
|
||||
double *y)
|
||||
{
|
||||
GdkWindow *window, *ancestor;
|
||||
GtkAllocation alloc;
|
||||
|
||||
gtk_widget_get_allocation (widget, &alloc);
|
||||
gdk_event_get_coords (event, x, y);
|
||||
|
||||
ancestor = gtk_widget_get_window (widget);
|
||||
window = gdk_event_get_window (event);
|
||||
|
||||
while (window && ancestor && (window != ancestor))
|
||||
{
|
||||
gdk_window_coords_to_parent (window, *x, *y, x, y);
|
||||
window = gdk_window_get_parent (window);
|
||||
}
|
||||
|
||||
if (!gtk_widget_get_has_window (widget))
|
||||
{
|
||||
*x -= alloc.x;
|
||||
*y -= alloc.y;
|
||||
}
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gtk_event_controller_motion_handle_event (GtkEventController *controller,
|
||||
const GdkEvent *event)
|
||||
{
|
||||
GtkEventControllerClass *parent_class;
|
||||
GtkWidget *widget;
|
||||
GdkEventType type;
|
||||
|
||||
widget = gtk_event_controller_get_widget (controller);
|
||||
|
||||
type = gdk_event_get_event_type (event);
|
||||
if (type == GDK_ENTER_NOTIFY)
|
||||
{
|
||||
double x, y;
|
||||
get_coords (widget, event, &x, &y);
|
||||
gdk_event_get_coords (event, &x, &y);
|
||||
g_signal_emit (controller, signals[ENTER], 0, x, y);
|
||||
}
|
||||
else if (type == GDK_LEAVE_NOTIFY)
|
||||
@@ -110,7 +79,7 @@ gtk_event_controller_motion_handle_event (GtkEventController *controller,
|
||||
else if (type == GDK_MOTION_NOTIFY)
|
||||
{
|
||||
double x, y;
|
||||
get_coords (widget, event, &x, &y);
|
||||
gdk_event_get_coords (event, &x, &y);
|
||||
g_signal_emit (controller, signals[MOTION], 0, x, y);
|
||||
}
|
||||
|
||||
|
||||
@@ -466,7 +466,6 @@ gtk_file_chooser_native_set_property (GObject *object,
|
||||
|
||||
case GTK_FILE_CHOOSER_PROP_FILTER:
|
||||
self->current_filter = g_value_get_object (value);
|
||||
gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (self->dialog), self->current_filter);
|
||||
g_object_notify (G_OBJECT (self), "filter");
|
||||
break;
|
||||
|
||||
|
||||
@@ -332,13 +332,10 @@ show_portal_file_chooser (GtkFileChooserNative *self,
|
||||
g_variant_builder_add (&opt_builder, "{sv}", "modal",
|
||||
g_variant_new_boolean (data->modal));
|
||||
g_variant_builder_add (&opt_builder, "{sv}", "filters", get_filters (GTK_FILE_CHOOSER (self)));
|
||||
if (self->current_filter)
|
||||
g_variant_builder_add (&opt_builder, "{sv}", "current_filter",
|
||||
gtk_file_filter_to_gvariant (self->current_filter));
|
||||
if (self->current_name)
|
||||
if (GTK_FILE_CHOOSER_NATIVE (self)->current_name)
|
||||
g_variant_builder_add (&opt_builder, "{sv}", "current_name",
|
||||
g_variant_new_string (GTK_FILE_CHOOSER_NATIVE (self)->current_name));
|
||||
if (self->current_folder)
|
||||
if (GTK_FILE_CHOOSER_NATIVE (self)->current_folder)
|
||||
{
|
||||
gchar *path;
|
||||
|
||||
@@ -347,7 +344,7 @@ show_portal_file_chooser (GtkFileChooserNative *self,
|
||||
g_variant_new_bytestring (path));
|
||||
g_free (path);
|
||||
}
|
||||
if (self->current_file)
|
||||
if (GTK_FILE_CHOOSER_NATIVE (self)->current_file)
|
||||
{
|
||||
gchar *path;
|
||||
|
||||
@@ -357,7 +354,7 @@ show_portal_file_chooser (GtkFileChooserNative *self,
|
||||
g_free (path);
|
||||
}
|
||||
|
||||
if (self->choices)
|
||||
if (GTK_FILE_CHOOSER_NATIVE (self)->choices)
|
||||
g_variant_builder_add (&opt_builder, "{sv}", "choices",
|
||||
serialize_choices (GTK_FILE_CHOOSER_NATIVE (self)));
|
||||
|
||||
|
||||
+2
-8
@@ -3032,16 +3032,13 @@ gtk_flow_box_multipress_gesture_pressed (GtkGestureMultiPress *gesture,
|
||||
if (n_press != 1)
|
||||
gtk_gesture_set_state (priv->drag_gesture, GTK_EVENT_SEQUENCE_DENIED);
|
||||
|
||||
gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
|
||||
priv->active_child = child;
|
||||
priv->active_child_active = TRUE;
|
||||
gtk_widget_queue_draw (GTK_WIDGET (box));
|
||||
|
||||
if (n_press == 2 && !priv->activate_on_single_click)
|
||||
{
|
||||
gtk_gesture_set_state (GTK_GESTURE (gesture),
|
||||
GTK_EVENT_SEQUENCE_CLAIMED);
|
||||
g_signal_emit (box, signals[CHILD_ACTIVATED], 0, child);
|
||||
}
|
||||
g_signal_emit (box, signals[CHILD_ACTIVATED], 0, child);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -3055,9 +3052,6 @@ gtk_flow_box_multipress_gesture_released (GtkGestureMultiPress *gesture,
|
||||
|
||||
if (priv->active_child != NULL && priv->active_child_active)
|
||||
{
|
||||
gtk_gesture_set_state (GTK_GESTURE (gesture),
|
||||
GTK_EVENT_SEQUENCE_CLAIMED);
|
||||
|
||||
if (priv->activate_on_single_click)
|
||||
gtk_flow_box_select_and_activate (box, priv->active_child);
|
||||
else
|
||||
|
||||
+121
-157
@@ -53,10 +53,16 @@
|
||||
#include "gtkcombobox.h"
|
||||
#include "gtkgesturemultipress.h"
|
||||
|
||||
#ifdef HAVE_HARFBUZZ
|
||||
#if defined(HAVE_HARFBUZZ) && defined(HAVE_PANGOFT)
|
||||
#include <pango/pangofc-font.h>
|
||||
#include <hb.h>
|
||||
#include <hb-ot.h>
|
||||
#include <hb-ft.h>
|
||||
|
||||
#include <ft2build.h>
|
||||
#include FT_FREETYPE_H
|
||||
#include FT_MULTIPLE_MASTERS_H
|
||||
|
||||
#include "language-names.h"
|
||||
#include "script-names.h"
|
||||
#endif
|
||||
@@ -859,7 +865,7 @@ gtk_font_chooser_widget_init (GtkFontChooserWidget *fontchooser)
|
||||
|
||||
/* Load data and set initial style-dependent parameters */
|
||||
gtk_font_chooser_widget_load_fonts (fontchooser, TRUE);
|
||||
#ifdef HAVE_HARFBUZZ
|
||||
#if defined(HAVE_HARFBUZZ) && defined(HAVE_PANGOFT)
|
||||
gtk_font_chooser_widget_populate_features (fontchooser);
|
||||
#endif
|
||||
gtk_font_chooser_widget_set_cell_size (fontchooser);
|
||||
@@ -1439,7 +1445,7 @@ gtk_font_chooser_widget_ensure_selection (GtkFontChooserWidget *fontchooser)
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef HAVE_HARFBUZZ
|
||||
#if defined(HAVE_HARFBUZZ) && defined(HAVE_PANGOFT)
|
||||
|
||||
/* OpenType variations */
|
||||
|
||||
@@ -1498,139 +1504,69 @@ adjustment_changed (GtkAdjustment *adjustment,
|
||||
}
|
||||
|
||||
static gboolean
|
||||
should_show_axis (hb_ot_var_axis_info_t *hb_axis)
|
||||
should_show_axis (FT_Var_Axis *ax)
|
||||
{
|
||||
if (hb_axis->tag == HB_OT_TAG_VAR_AXIS_OPTICAL_SIZE)
|
||||
return FALSE;
|
||||
|
||||
if ((hb_axis->flags & HB_OT_VAR_AXIS_FLAG_HIDDEN) != 0)
|
||||
/* FIXME use FT_Get_Var_Axis_Flags */
|
||||
if (ax->tag == FT_MAKE_TAG ('o', 'p', 's', 'z'))
|
||||
return FALSE;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
#if 0
|
||||
static gboolean
|
||||
is_named_instance (hb_font_t *hb_font)
|
||||
is_named_instance (FT_Face face)
|
||||
{
|
||||
hb_face_t *hb_face;
|
||||
unsigned int n_axes;
|
||||
unsigned int n_instances;
|
||||
unsigned int len;
|
||||
int *coords;
|
||||
const int *coords1;
|
||||
float *design_coords;
|
||||
int *norm_coords;
|
||||
unsigned int instance;
|
||||
int i;
|
||||
|
||||
hb_face = hb_font_get_face (hb_font);
|
||||
n_axes = hb_ot_var_get_axis_count (hb_face);
|
||||
n_instances = hb_ot_var_get_named_instance_count (hb_face);
|
||||
if (n_instances == 0)
|
||||
return FALSE;
|
||||
|
||||
coords1 = hb_font_get_var_coords_normalized (hb_font, &len);
|
||||
coords = g_new0 (int, n_axes);
|
||||
for (i = 0; i < len; i++)
|
||||
coords[i] = coords1[i];
|
||||
|
||||
design_coords = g_new (float, n_axes);
|
||||
norm_coords = g_new (int, n_axes);
|
||||
for (instance = 0; instance < n_instances; instance++)
|
||||
{
|
||||
len = n_axes;
|
||||
hb_ot_var_named_instance_get_design_coords (hb_face, instance, &len, design_coords);
|
||||
hb_ot_var_normalize_coords (hb_face, len, design_coords, norm_coords);
|
||||
for (i = 0; i < n_axes; i++)
|
||||
{
|
||||
if (norm_coords[i] != coords[i])
|
||||
break;
|
||||
}
|
||||
if (i == n_axes)
|
||||
{
|
||||
g_free (coords);
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
g_free (coords);
|
||||
return FALSE;
|
||||
return (face->face_index >> 16) > 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static struct {
|
||||
guint32 tag;
|
||||
const char *name;
|
||||
} axis_names[] = {
|
||||
{ HB_OT_TAG_VAR_AXIS_WIDTH, N_("Width") },
|
||||
{ HB_OT_TAG_VAR_AXIS_WEIGHT, N_("Weight") },
|
||||
{ HB_OT_TAG_VAR_AXIS_ITALIC, N_("Italic") },
|
||||
{ HB_OT_TAG_VAR_AXIS_SLANT, N_("Slant") },
|
||||
{ FT_MAKE_TAG ('w', 'd', 't', 'h'), N_("Width") },
|
||||
{ FT_MAKE_TAG ('w', 'g', 'h', 't'), N_("Weight") },
|
||||
{ FT_MAKE_TAG ('i', 't', 'a', 'l'), N_("Italic") },
|
||||
{ FT_MAKE_TAG ('s', 'l', 'n', 't'), N_("Slant") },
|
||||
{ FT_MAKE_TAG ('o', 'p', 's', 'z'), N_("Optical Size") },
|
||||
};
|
||||
|
||||
/* FIXME: this is missing harfbuzz api that needs to deal with AVAR */
|
||||
static double
|
||||
get_value (hb_ot_var_axis_info_t *hb_axis, int value)
|
||||
{
|
||||
double val;
|
||||
|
||||
val = value * 1.0 / (1 << 14);
|
||||
if (value < 0)
|
||||
return hb_axis->default_value + (hb_axis->default_value - hb_axis->min_value) * val;
|
||||
else
|
||||
return hb_axis->default_value + (hb_axis->max_value - hb_axis->default_value) * val;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
add_axis (GtkFontChooserWidget *fontchooser,
|
||||
hb_font_t *hb_font,
|
||||
hb_ot_var_axis_info_t *hb_axis,
|
||||
int value,
|
||||
int row)
|
||||
add_axis (GtkFontChooserWidget *fontchooser,
|
||||
FT_Face face,
|
||||
FT_Var_Axis *ax,
|
||||
FT_Fixed value,
|
||||
int row)
|
||||
{
|
||||
GtkFontChooserWidgetPrivate *priv = fontchooser->priv;
|
||||
Axis *axis;
|
||||
const char *name = NULL;
|
||||
char text[64];
|
||||
unsigned int len = 64;
|
||||
const char *name;
|
||||
int i;
|
||||
double val;
|
||||
|
||||
axis = g_new (Axis, 1);
|
||||
axis->tag = hb_axis->tag;
|
||||
axis->tag = ax->tag;
|
||||
axis->fontchooser = GTK_WIDGET (fontchooser);
|
||||
|
||||
name = ax->name;
|
||||
for (i = 0; i < G_N_ELEMENTS (axis_names); i++)
|
||||
{
|
||||
if (axis_names[i].tag == hb_axis->tag)
|
||||
if (axis_names[i].tag == ax->tag)
|
||||
{
|
||||
name = _(axis_names[i].name);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (name == NULL)
|
||||
{
|
||||
hb_face_t *hb_face = hb_font_get_face (hb_font);
|
||||
hb_language_t language = hb_language_from_string ("en", -1);
|
||||
hb_ot_name_get_utf8 (hb_face, hb_axis->name_id, language, &len, text);
|
||||
name = text;
|
||||
}
|
||||
|
||||
axis->label = gtk_label_new (name);
|
||||
gtk_widget_show (axis->label);
|
||||
gtk_widget_set_halign (axis->label, GTK_ALIGN_START);
|
||||
gtk_widget_set_valign (axis->label, GTK_ALIGN_BASELINE);
|
||||
gtk_grid_attach (GTK_GRID (priv->axis_grid), axis->label, 0, row, 1, 1);
|
||||
val = get_value (hb_axis, value);
|
||||
axis->adjustment = gtk_adjustment_new (val,
|
||||
(double)hb_axis->min_value,
|
||||
(double)hb_axis->max_value,
|
||||
axis->adjustment = gtk_adjustment_new ((double)FixedToFloat(value),
|
||||
(double)FixedToFloat(ax->minimum),
|
||||
(double)FixedToFloat(ax->maximum),
|
||||
1.0, 10.0, 0.0);
|
||||
axis->scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, axis->adjustment);
|
||||
gtk_widget_show (axis->scale);
|
||||
gtk_scale_add_mark (GTK_SCALE (axis->scale), (double)hb_axis->default_value, GTK_POS_TOP, NULL);
|
||||
gtk_scale_add_mark (GTK_SCALE (axis->scale), (double)FixedToFloat(ax->def), GTK_POS_TOP, NULL);
|
||||
gtk_widget_set_valign (axis->scale, GTK_ALIGN_BASELINE);
|
||||
gtk_widget_set_hexpand (axis->scale, TRUE);
|
||||
gtk_widget_set_size_request (axis->scale, 100, -1);
|
||||
@@ -1646,8 +1582,7 @@ add_axis (GtkFontChooserWidget *fontchooser,
|
||||
|
||||
adjustment_changed (axis->adjustment, axis);
|
||||
g_signal_connect (axis->adjustment, "value-changed", G_CALLBACK (adjustment_changed), axis);
|
||||
|
||||
if (/* is_named_instance (hb_font) || */ !should_show_axis (hb_axis))
|
||||
if (is_named_instance (face) || !should_show_axis (ax))
|
||||
{
|
||||
gtk_widget_hide (axis->label);
|
||||
gtk_widget_hide (axis->scale);
|
||||
@@ -1664,15 +1599,10 @@ gtk_font_chooser_widget_update_font_variations (GtkFontChooserWidget *fontchoose
|
||||
{
|
||||
GtkFontChooserWidgetPrivate *priv = fontchooser->priv;
|
||||
PangoFont *pango_font;
|
||||
hb_font_t *hb_font;
|
||||
hb_face_t *hb_face;
|
||||
unsigned int n_axes;
|
||||
hb_ot_var_axis_info_t *axes;
|
||||
const int *coords;
|
||||
unsigned int len;
|
||||
int i;
|
||||
FT_Face ft_face;
|
||||
FT_MM_Var *ft_mm_var;
|
||||
FT_Error ret;
|
||||
gboolean has_axis = FALSE;
|
||||
PangoFontFace *face;
|
||||
|
||||
if (priv->updating_variations)
|
||||
return FALSE;
|
||||
@@ -1685,21 +1615,39 @@ gtk_font_chooser_widget_update_font_variations (GtkFontChooserWidget *fontchoose
|
||||
|
||||
pango_font = pango_context_load_font (gtk_widget_get_pango_context (GTK_WIDGET (fontchooser)),
|
||||
priv->font_desc);
|
||||
face = gtk_font_chooser_widget_get_face (GTK_FONT_CHOOSER (fontchooser));
|
||||
if (pango_font_face_is_synthesized (face))
|
||||
return FALSE;
|
||||
ft_face = pango_fc_font_lock_face (PANGO_FC_FONT (pango_font));
|
||||
|
||||
hb_font = pango_font_get_hb_font (pango_font);
|
||||
hb_face = hb_font_get_face (hb_font);
|
||||
n_axes = hb_ot_var_get_axis_count (hb_face);
|
||||
axes = g_new (hb_ot_var_axis_info_t, n_axes);
|
||||
hb_ot_var_get_axis_infos (hb_face, 0, &n_axes, axes);
|
||||
coords = hb_font_get_var_coords_normalized (hb_font, &len);
|
||||
for (i = 0; i < n_axes; i++)
|
||||
ret = FT_Get_MM_Var (ft_face, &ft_mm_var);
|
||||
if (ret == 0)
|
||||
{
|
||||
if (add_axis (fontchooser, hb_font, &axes[i], i < len ? coords[i] : 0, i + 4))
|
||||
has_axis = TRUE;
|
||||
int i;
|
||||
FT_Fixed *coords;
|
||||
|
||||
coords = g_new (FT_Fixed, ft_mm_var->num_axis);
|
||||
for (i = 0; i < ft_mm_var->num_axis; i++)
|
||||
coords[i] = ft_mm_var->axis[i].def;
|
||||
|
||||
if (ft_face->face_index > 0)
|
||||
{
|
||||
int instance_id = ft_face->face_index >> 16;
|
||||
if (instance_id && instance_id <= ft_mm_var->num_namedstyles)
|
||||
{
|
||||
FT_Var_Named_Style *instance = &ft_mm_var->namedstyle[instance_id - 1];
|
||||
memcpy (coords, instance->coords, ft_mm_var->num_axis * sizeof (*coords));
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; i < ft_mm_var->num_axis; i++)
|
||||
{
|
||||
if (add_axis (fontchooser, ft_face, &ft_mm_var->axis[i], coords[i], i + 4))
|
||||
has_axis = TRUE;
|
||||
}
|
||||
|
||||
g_free (coords);
|
||||
free (ft_mm_var);
|
||||
}
|
||||
|
||||
pango_fc_font_unlock_face (PANGO_FC_FONT (pango_font));
|
||||
g_object_unref (pango_font);
|
||||
|
||||
return has_axis;
|
||||
@@ -1842,7 +1790,7 @@ find_affected_text (hb_tag_t feature_tag,
|
||||
chars = g_string_new ("");
|
||||
|
||||
hb_ot_layout_table_find_script (hb_face, HB_OT_TAG_GSUB, script_tag, &script_index);
|
||||
hb_ot_layout_script_select_language (hb_face, HB_OT_TAG_GSUB, script_index, 1, &lang_tag, &lang_index);
|
||||
hb_ot_layout_script_find_language (hb_face, HB_OT_TAG_GSUB, script_index, lang_tag, &lang_index);
|
||||
if (hb_ot_layout_language_find_feature (hb_face, HB_OT_TAG_GSUB, script_index, lang_index, feature_tag, &feature_index))
|
||||
{
|
||||
unsigned int lookup_indexes[32];
|
||||
@@ -2178,8 +2126,8 @@ gtk_font_chooser_widget_update_font_features (GtkFontChooserWidget *fontchooser)
|
||||
{
|
||||
GtkFontChooserWidgetPrivate *priv = fontchooser->priv;
|
||||
PangoFont *pango_font;
|
||||
FT_Face ft_face;
|
||||
hb_font_t *hb_font;
|
||||
hb_face_t *hb_face;
|
||||
hb_tag_t script_tag;
|
||||
hb_tag_t lang_tag;
|
||||
guint script_index = 0;
|
||||
@@ -2187,10 +2135,6 @@ gtk_font_chooser_widget_update_font_features (GtkFontChooserWidget *fontchooser)
|
||||
int i, j;
|
||||
GList *l;
|
||||
gboolean has_feature = FALSE;
|
||||
hb_tag_t table[2] = { HB_OT_TAG_GSUB, HB_OT_TAG_GPOS };
|
||||
hb_tag_t features[80];
|
||||
unsigned int count;
|
||||
unsigned int n_features;
|
||||
|
||||
for (l = priv->feature_items; l; l = l->next)
|
||||
{
|
||||
@@ -2204,47 +2148,67 @@ gtk_font_chooser_widget_update_font_features (GtkFontChooserWidget *fontchooser)
|
||||
|
||||
pango_font = pango_context_load_font (gtk_widget_get_pango_context (GTK_WIDGET (fontchooser)),
|
||||
priv->font_desc);
|
||||
hb_font = pango_font_get_hb_font (pango_font);
|
||||
hb_face = hb_font_get_face (hb_font);
|
||||
ft_face = pango_fc_font_lock_face (PANGO_FC_FONT (pango_font)),
|
||||
hb_font = hb_ft_font_create (ft_face, NULL);
|
||||
|
||||
find_language_and_script (fontchooser, hb_face, &lang_tag, &script_tag);
|
||||
|
||||
n_features = 0;
|
||||
for (i = 0; i < 2; i++)
|
||||
if (hb_font)
|
||||
{
|
||||
hb_ot_layout_table_find_script (hb_face, table[i], script_tag, &script_index);
|
||||
hb_ot_layout_script_select_language (hb_face, table[i], script_index, 1, &lang_tag, &lang_index);
|
||||
count = G_N_ELEMENTS (features);
|
||||
hb_ot_layout_language_get_feature_tags (hb_face, table[i], script_index, lang_index, n_features, &count, features);
|
||||
n_features += count;
|
||||
}
|
||||
hb_tag_t table[2] = { HB_OT_TAG_GSUB, HB_OT_TAG_GPOS };
|
||||
hb_face_t *hb_face;
|
||||
hb_tag_t features[80];
|
||||
unsigned int count;
|
||||
unsigned int n_features;
|
||||
|
||||
for (j = 0; j < n_features; j++)
|
||||
{
|
||||
for (l = priv->feature_items; l; l = l->next)
|
||||
hb_face = hb_font_get_face (hb_font);
|
||||
|
||||
find_language_and_script (fontchooser, hb_face, &lang_tag, &script_tag);
|
||||
|
||||
n_features = 0;
|
||||
for (i = 0; i < 2; i++)
|
||||
{
|
||||
FeatureItem *item = l->data;
|
||||
if (item->tag != features[j])
|
||||
continue;
|
||||
hb_ot_layout_table_find_script (hb_face, table[i], script_tag, &script_index);
|
||||
hb_ot_layout_script_find_language (hb_face, table[i], script_index, lang_tag, &lang_index);
|
||||
count = G_N_ELEMENTS (features);
|
||||
hb_ot_layout_language_get_feature_tags (hb_face,
|
||||
table[i],
|
||||
script_index,
|
||||
lang_index,
|
||||
n_features,
|
||||
&count,
|
||||
features);
|
||||
n_features += count;
|
||||
}
|
||||
|
||||
has_feature = TRUE;
|
||||
gtk_widget_show (item->top);
|
||||
gtk_widget_show (gtk_widget_get_parent (item->top));
|
||||
|
||||
update_feature_example (item, hb_face, script_tag, lang_tag, priv->font_desc);
|
||||
|
||||
if (GTK_IS_RADIO_BUTTON (item->feat))
|
||||
for (j = 0; j < n_features; j++)
|
||||
{
|
||||
for (l = priv->feature_items; l; l = l->next)
|
||||
{
|
||||
GtkWidget *def = GTK_WIDGET (g_object_get_data (G_OBJECT (item->feat), "default"));
|
||||
gtk_widget_show (gtk_widget_get_parent (def));
|
||||
}
|
||||
else if (GTK_IS_CHECK_BUTTON (item->feat))
|
||||
{
|
||||
set_inconsistent (GTK_CHECK_BUTTON (item->feat), TRUE);
|
||||
FeatureItem *item = l->data;
|
||||
if (item->tag != features[j])
|
||||
continue;
|
||||
|
||||
has_feature = TRUE;
|
||||
gtk_widget_show (item->top);
|
||||
gtk_widget_show (gtk_widget_get_parent (item->top));
|
||||
|
||||
update_feature_example (item, hb_face, script_tag, lang_tag, priv->font_desc);
|
||||
|
||||
if (GTK_IS_RADIO_BUTTON (item->feat))
|
||||
{
|
||||
GtkWidget *def = GTK_WIDGET (g_object_get_data (G_OBJECT (item->feat), "default"));
|
||||
gtk_widget_show (gtk_widget_get_parent (def));
|
||||
}
|
||||
else if (GTK_IS_CHECK_BUTTON (item->feat))
|
||||
{
|
||||
set_inconsistent (GTK_CHECK_BUTTON (item->feat), TRUE);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
hb_face_destroy (hb_face);
|
||||
}
|
||||
|
||||
pango_fc_font_unlock_face (PANGO_FC_FONT (pango_font));
|
||||
g_object_unref (pango_font);
|
||||
|
||||
return has_feature;
|
||||
@@ -2297,7 +2261,7 @@ update_font_features (GtkFontChooserWidget *fontchooser)
|
||||
gtk_font_chooser_widget_update_preview_attributes (fontchooser);
|
||||
}
|
||||
|
||||
#endif /* HAVE_HARFBUZ */
|
||||
#endif
|
||||
|
||||
static void
|
||||
gtk_font_chooser_widget_merge_font_desc (GtkFontChooserWidget *fontchooser,
|
||||
@@ -2344,7 +2308,7 @@ gtk_font_chooser_widget_merge_font_desc (GtkFontChooserWidget *fontchooser
|
||||
|
||||
gtk_font_chooser_widget_update_marks (fontchooser);
|
||||
|
||||
#ifdef HAVE_HARFBUZZ
|
||||
#if defined(HAVE_HARFBUZZ) && defined(HAVE_PANGOFT)
|
||||
if (gtk_font_chooser_widget_update_font_features (fontchooser))
|
||||
has_tweak = TRUE;
|
||||
if (gtk_font_chooser_widget_update_font_variations (fontchooser))
|
||||
|
||||
+1
-2
@@ -134,8 +134,7 @@
|
||||
*
|
||||
* # CSS nodes
|
||||
*
|
||||
* GtkImage has a single CSS node with the name image. The style classes
|
||||
* may appear on image CSS nodes: .icon-dropshadow, .lowres-icon.
|
||||
* GtkImage has a single CSS node with the name image.
|
||||
*/
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -1727,8 +1727,8 @@ gtk_list_box_update_selection_full (GtkListBox *box,
|
||||
{
|
||||
gtk_list_box_unselect_all_internal (box);
|
||||
gtk_list_box_row_set_selected (row, TRUE);
|
||||
priv->selected_row = row;
|
||||
g_signal_emit (box, signals[ROW_SELECTED], 0, row);
|
||||
priv->selected_row = row;
|
||||
}
|
||||
else if (priv->selection_mode == GTK_SELECTION_SINGLE)
|
||||
{
|
||||
|
||||
+22
-59
@@ -213,12 +213,6 @@ enum {
|
||||
CHILD_PROP_BOTTOM_ATTACH
|
||||
};
|
||||
|
||||
typedef enum _GtkMenuScrollFlag
|
||||
{
|
||||
GTK_MENU_SCROLL_FLAG_NONE = 0,
|
||||
GTK_MENU_SCROLL_FLAG_ADAPT = 1 << 0,
|
||||
} GtkMenuScrollFlag;
|
||||
|
||||
static void gtk_menu_set_property (GObject *object,
|
||||
guint prop_id,
|
||||
const GValue *value,
|
||||
@@ -261,8 +255,7 @@ static gboolean gtk_menu_enter_notify (GtkWidget *widget,
|
||||
static gboolean gtk_menu_leave_notify (GtkWidget *widget,
|
||||
GdkEventCrossing *event);
|
||||
static void gtk_menu_scroll_to (GtkMenu *menu,
|
||||
gint offset,
|
||||
GtkMenuScrollFlag flags);
|
||||
gint offset);
|
||||
static void gtk_menu_grab_notify (GtkWidget *widget,
|
||||
gboolean was_grabbed);
|
||||
static gboolean gtk_menu_captured_event (GtkWidget *widget,
|
||||
@@ -1984,7 +1977,7 @@ gtk_menu_popup_internal (GtkMenu *menu,
|
||||
|
||||
associate_menu_grab_transfer_window (menu);
|
||||
|
||||
gtk_menu_scroll_to (menu, priv->scroll_offset, GTK_MENU_SCROLL_FLAG_NONE);
|
||||
gtk_menu_scroll_to (menu, priv->scroll_offset);
|
||||
|
||||
/* if no item is selected, select the first one */
|
||||
if (!menu_shell->priv->active_menu_item &&
|
||||
@@ -1992,7 +1985,6 @@ gtk_menu_popup_internal (GtkMenu *menu,
|
||||
gtk_menu_shell_select_first (menu_shell, TRUE);
|
||||
|
||||
/* Once everything is set up correctly, map the toplevel */
|
||||
gtk_window_force_resize (GTK_WINDOW (priv->toplevel));
|
||||
gtk_widget_show (priv->toplevel);
|
||||
|
||||
if (xgrab_shell == widget)
|
||||
@@ -2486,8 +2478,7 @@ gtk_menu_update_scroll_offset (GtkMenu *menu,
|
||||
|
||||
get_arrows_border (menu, &arrows_border);
|
||||
menu->priv->scroll_offset = arrows_border.top + (final_rect->y - flipped_rect->y);
|
||||
gtk_menu_scroll_to (menu, menu->priv->scroll_offset,
|
||||
GTK_MENU_SCROLL_FLAG_ADAPT);
|
||||
gtk_menu_scroll_to (menu, menu->priv->scroll_offset);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -2560,8 +2551,7 @@ gtk_menu_popdown (GtkMenu *menu)
|
||||
* non-tearoff menu was popped down.
|
||||
*/
|
||||
if (!priv->tearoff_active)
|
||||
gtk_menu_scroll_to (menu, priv->saved_scroll_offset,
|
||||
GTK_MENU_SCROLL_FLAG_NONE);
|
||||
gtk_menu_scroll_to (menu, priv->saved_scroll_offset);
|
||||
priv->tearoff_active = TRUE;
|
||||
}
|
||||
else
|
||||
@@ -2852,7 +2842,7 @@ gtk_menu_scrollbar_changed (GtkAdjustment *adjustment,
|
||||
|
||||
value = gtk_adjustment_get_value (adjustment);
|
||||
if (menu->priv->scroll_offset != value)
|
||||
gtk_menu_scroll_to (menu, value, GTK_MENU_SCROLL_FLAG_NONE);
|
||||
gtk_menu_scroll_to (menu, value);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -3045,7 +3035,7 @@ gtk_menu_set_tearoff_state (GtkMenu *menu,
|
||||
gtk_widget_show (GTK_WIDGET (menu));
|
||||
gtk_widget_show (priv->tearoff_window);
|
||||
|
||||
gtk_menu_scroll_to (menu, 0, GTK_MENU_SCROLL_FLAG_NONE);
|
||||
gtk_menu_scroll_to (menu, 0);
|
||||
|
||||
}
|
||||
else
|
||||
@@ -3491,7 +3481,7 @@ gtk_menu_size_allocate (GtkWidget *widget,
|
||||
height = allocation->height - (2 * border_width) - padding.top - padding.bottom;
|
||||
|
||||
if (menu_shell->priv->active)
|
||||
gtk_menu_scroll_to (menu, priv->scroll_offset, GTK_MENU_SCROLL_FLAG_NONE);
|
||||
gtk_menu_scroll_to (menu, priv->scroll_offset);
|
||||
|
||||
get_arrows_border (menu, &arrow_border);
|
||||
|
||||
@@ -3599,7 +3589,7 @@ gtk_menu_size_allocate (GtkWidget *widget,
|
||||
gtk_widget_hide (priv->tearoff_scrollbar);
|
||||
gtk_menu_set_tearoff_hints (menu, allocation->width);
|
||||
|
||||
gtk_menu_scroll_to (menu, 0, GTK_MENU_SCROLL_FLAG_NONE);
|
||||
gtk_menu_scroll_to (menu, 0);
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -4177,7 +4167,7 @@ gtk_menu_scroll_by (GtkMenu *menu,
|
||||
offset = priv->requested_height - view_height;
|
||||
|
||||
if (offset != priv->scroll_offset)
|
||||
gtk_menu_scroll_to (menu, offset, GTK_MENU_SCROLL_FLAG_NONE);
|
||||
gtk_menu_scroll_to (menu, offset);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
@@ -4687,7 +4677,7 @@ gtk_menu_captured_event (GtkWidget *widget,
|
||||
MIN (priv->scroll_offset, 0),
|
||||
MAX (priv->scroll_offset, priv->requested_height - view_height));
|
||||
|
||||
gtk_menu_scroll_to (menu, offset, GTK_MENU_SCROLL_FLAG_NONE);
|
||||
gtk_menu_scroll_to (menu, offset);
|
||||
|
||||
retval = TRUE;
|
||||
}
|
||||
@@ -5253,16 +5243,10 @@ gtk_menu_position (GtkMenu *menu,
|
||||
|
||||
if (!rect_window)
|
||||
{
|
||||
gtk_window_set_unlimited_guessed_size (GTK_WINDOW (priv->toplevel),
|
||||
FALSE, FALSE);
|
||||
gtk_menu_position_legacy (menu, set_scroll_offset);
|
||||
return;
|
||||
}
|
||||
|
||||
gtk_window_set_unlimited_guessed_size (GTK_WINDOW (priv->toplevel),
|
||||
!!(anchor_hints & GDK_ANCHOR_RESIZE_X),
|
||||
!!(anchor_hints & GDK_ANCHOR_RESIZE_Y));
|
||||
|
||||
/* Realize so we have the proper width and height to figure out
|
||||
* the right place to popup the menu.
|
||||
*/
|
||||
@@ -5332,26 +5316,11 @@ gtk_menu_stop_scrolling (GtkMenu *menu)
|
||||
}
|
||||
|
||||
static void
|
||||
sync_arrows_state (GtkMenu *menu)
|
||||
gtk_menu_scroll_to (GtkMenu *menu,
|
||||
gint offset)
|
||||
{
|
||||
GtkMenuPrivate *priv = menu->priv;
|
||||
GtkCssNode *top_arrow_node, *bottom_arrow_node;
|
||||
|
||||
top_arrow_node = gtk_css_gadget_get_node (priv->top_arrow_gadget);
|
||||
gtk_css_node_set_visible (top_arrow_node, priv->upper_arrow_visible);
|
||||
gtk_css_node_set_state (top_arrow_node, priv->upper_arrow_state);
|
||||
|
||||
bottom_arrow_node = gtk_css_gadget_get_node (priv->bottom_arrow_gadget);
|
||||
gtk_css_node_set_visible (bottom_arrow_node, priv->lower_arrow_visible);
|
||||
gtk_css_node_set_state (bottom_arrow_node, priv->lower_arrow_state);
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_menu_scroll_to (GtkMenu *menu,
|
||||
gint offset,
|
||||
GtkMenuScrollFlag flags)
|
||||
{
|
||||
GtkMenuPrivate *priv = menu->priv;
|
||||
GtkBorder arrow_border, padding;
|
||||
GtkWidget *widget;
|
||||
gint x, y;
|
||||
@@ -5387,25 +5356,13 @@ gtk_menu_scroll_to (GtkMenu *menu,
|
||||
{
|
||||
GtkStateFlags upper_arrow_previous_state = priv->upper_arrow_state;
|
||||
GtkStateFlags lower_arrow_previous_state = priv->lower_arrow_state;
|
||||
gboolean should_offset_by_arrow;
|
||||
|
||||
if (!priv->upper_arrow_visible || !priv->lower_arrow_visible)
|
||||
gtk_widget_queue_draw (GTK_WIDGET (menu));
|
||||
|
||||
if (!priv->upper_arrow_visible &
|
||||
flags & GTK_MENU_SCROLL_FLAG_ADAPT)
|
||||
should_offset_by_arrow = TRUE;
|
||||
else
|
||||
should_offset_by_arrow = FALSE;
|
||||
|
||||
priv->upper_arrow_visible = priv->lower_arrow_visible = TRUE;
|
||||
|
||||
if (flags & GTK_MENU_SCROLL_FLAG_ADAPT)
|
||||
sync_arrows_state (menu);
|
||||
|
||||
get_arrows_border (menu, &arrow_border);
|
||||
if (should_offset_by_arrow)
|
||||
offset += arrow_border.top;
|
||||
y += arrow_border.top;
|
||||
view_height -= arrow_border.top;
|
||||
view_height -= arrow_border.bottom;
|
||||
@@ -5472,7 +5429,13 @@ gtk_menu_scroll_to (GtkMenu *menu,
|
||||
}
|
||||
}
|
||||
|
||||
sync_arrows_state (menu);
|
||||
top_arrow_node = gtk_css_gadget_get_node (priv->top_arrow_gadget);
|
||||
gtk_css_node_set_visible (top_arrow_node, priv->upper_arrow_visible);
|
||||
gtk_css_node_set_state (top_arrow_node, priv->upper_arrow_state);
|
||||
|
||||
bottom_arrow_node = gtk_css_gadget_get_node (priv->bottom_arrow_gadget);
|
||||
gtk_css_node_set_visible (bottom_arrow_node, priv->lower_arrow_visible);
|
||||
gtk_css_node_set_state (bottom_arrow_node, priv->lower_arrow_state);
|
||||
|
||||
/* Scroll the menu: */
|
||||
if (gtk_widget_get_realized (widget))
|
||||
@@ -5558,7 +5521,7 @@ gtk_menu_scroll_item_visible (GtkMenuShell *menu_shell,
|
||||
* is on the menu
|
||||
*/
|
||||
menu_shell->priv->ignore_enter = TRUE;
|
||||
gtk_menu_scroll_to (menu, child_offset, GTK_MENU_SCROLL_FLAG_NONE);
|
||||
gtk_menu_scroll_to (menu, child_offset);
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -5579,7 +5542,7 @@ gtk_menu_scroll_item_visible (GtkMenuShell *menu_shell,
|
||||
* is on the menu
|
||||
*/
|
||||
menu_shell->priv->ignore_enter = TRUE;
|
||||
gtk_menu_scroll_to (menu, y, GTK_MENU_SCROLL_FLAG_NONE);
|
||||
gtk_menu_scroll_to (menu, y);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6063,7 +6026,7 @@ gtk_menu_real_move_scroll (GtkMenu *menu,
|
||||
new_offset = priv->scroll_offset + step;
|
||||
new_offset = CLAMP (new_offset, 0, end_position - page_size);
|
||||
|
||||
gtk_menu_scroll_to (menu, new_offset, GTK_MENU_SCROLL_FLAG_NONE);
|
||||
gtk_menu_scroll_to (menu, new_offset);
|
||||
|
||||
if (menu_shell->priv->active_menu_item)
|
||||
{
|
||||
|
||||
+1
-1
@@ -1009,7 +1009,7 @@ _gtk_popover_update_child_visible (GtkPopover *popover)
|
||||
}
|
||||
|
||||
parent = gtk_widget_get_parent (GTK_WIDGET (priv->parent_scrollable));
|
||||
gtk_popover_get_pointing_to (popover, &rect);
|
||||
rect = priv->pointing_to;
|
||||
|
||||
gtk_widget_translate_coordinates (priv->widget, parent,
|
||||
rect.x, rect.y, &rect.x, &rect.y);
|
||||
|
||||
+4
-2
@@ -449,7 +449,7 @@ gtk_revealer_real_size_allocate (GtkWidget *widget,
|
||||
GtkRevealerPrivate *priv = gtk_revealer_get_instance_private (revealer);
|
||||
GtkAllocation child_allocation;
|
||||
GtkWidget *child;
|
||||
gboolean window_visible;
|
||||
gboolean child_visible, window_visible;
|
||||
int bin_x, bin_y;
|
||||
GtkRevealerTransitionType transition;
|
||||
GtkBorder padding;
|
||||
@@ -460,7 +460,9 @@ gtk_revealer_real_size_allocate (GtkWidget *widget,
|
||||
gtk_revealer_get_child_allocation (revealer, allocation, &child_allocation);
|
||||
|
||||
child = gtk_bin_get_child (GTK_BIN (revealer));
|
||||
if (child != NULL && gtk_widget_get_visible (child))
|
||||
child_visible = child != NULL && gtk_widget_get_visible (child) &&
|
||||
gtk_widget_get_child_visible (child);
|
||||
if (child_visible)
|
||||
gtk_widget_size_allocate (child, &child_allocation);
|
||||
|
||||
if (gtk_widget_get_realized (widget))
|
||||
|
||||
+14
-22
@@ -73,37 +73,29 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkSearchEngineQuartz, _gtk_search_engine_quartz, GT
|
||||
{
|
||||
int i;
|
||||
GList *hits = NULL;
|
||||
/* The max was originally set to 1000 to mimic something called "the
|
||||
* boogie backend". submitted_hits contains the number of hits we've
|
||||
* processed in previous calls to this function.
|
||||
*/
|
||||
const unsigned int max_hits = 1000 - submitted_hits;
|
||||
const unsigned int max_iter = [ns_query resultCount];
|
||||
|
||||
for (i = 0; i < max_iter && i < max_hits; ++i)
|
||||
/* Here we submit hits "submitted_hits" to "resultCount" */
|
||||
for (i = submitted_hits; i < [ns_query resultCount]; i++)
|
||||
{
|
||||
id result = [ns_query resultAtIndex:i];
|
||||
const char *result_path;
|
||||
GFile *file;
|
||||
GtkSearchHit *hit;
|
||||
char *result_path;
|
||||
|
||||
result_path = [[result valueForAttribute:@"kMDItemPath"] UTF8String];
|
||||
file = g_file_new_for_path (result_path);
|
||||
|
||||
hit = g_new (GtkSearchHit, 1);
|
||||
hit->file = file;
|
||||
hit->info = NULL;
|
||||
|
||||
hits = g_list_prepend (hits, hit);
|
||||
result_path = g_strdup_printf ("file://%s", [[result valueForAttribute:@"kMDItemPath"] cString]);
|
||||
hits = g_list_prepend (hits, result_path);
|
||||
}
|
||||
|
||||
_gtk_search_engine_hits_added (engine, hits);
|
||||
g_list_free_full (hits, (GDestroyNotify) _gtk_search_hit_free);
|
||||
g_list_free (hits);
|
||||
|
||||
if (max_iter >= max_hits)
|
||||
submitted_hits = [ns_query resultCount];
|
||||
|
||||
/* The beagle backend stops at 1000 hits, so guess we do so too here.
|
||||
* It works pretty snappy on my MacBook, if we get rid of this limit
|
||||
* we are almost definitely going to need some code to submit hits
|
||||
* in batches.
|
||||
*/
|
||||
if (submitted_hits > 1000)
|
||||
[ns_query stopQuery];
|
||||
|
||||
submitted_hits += max_iter;
|
||||
}
|
||||
|
||||
- (void) queryUpdate:(id)sender
|
||||
|
||||
+86
-68
@@ -63,7 +63,6 @@
|
||||
#include "gtkactionhelper.h"
|
||||
#include "gtkcsscustomgadgetprivate.h"
|
||||
#include "gtkcssgadgetprivate.h"
|
||||
#include "gtkiconhelperprivate.h"
|
||||
#include "gtkstylecontextprivate.h"
|
||||
#include "gtkwidgetprivate.h"
|
||||
#include "gtkcssshadowsvalueprivate.h"
|
||||
@@ -87,8 +86,8 @@ struct _GtkSwitchPrivate
|
||||
|
||||
GtkCssGadget *gadget;
|
||||
GtkCssGadget *slider_gadget;
|
||||
GtkCssGadget *on_gadget;
|
||||
GtkCssGadget *off_gadget;
|
||||
PangoLayout *off_layout;
|
||||
PangoLayout *on_layout;
|
||||
|
||||
double handle_pos;
|
||||
guint tick_id;
|
||||
@@ -294,6 +293,51 @@ gtk_switch_pan_gesture_drag_end (GtkGestureDrag *gesture,
|
||||
gtk_widget_queue_allocate (GTK_WIDGET (sw));
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_switch_create_pango_layouts (GtkSwitch *self)
|
||||
{
|
||||
GtkSwitchPrivate *priv = self->priv;
|
||||
|
||||
g_clear_object (&priv->on_layout);
|
||||
/* Translators: if the "on" state label requires more than three
|
||||
* glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
|
||||
* the state
|
||||
*/
|
||||
priv->on_layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), C_("switch", "ON"));
|
||||
|
||||
|
||||
g_clear_object (&priv->off_layout);
|
||||
/* Translators: if the "off" state label requires more than three
|
||||
* glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
|
||||
*/
|
||||
priv->off_layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), C_("switch", "OFF"));
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_switch_screen_changed (GtkWidget *widget,
|
||||
GdkScreen *prev_screen)
|
||||
{
|
||||
gtk_switch_create_pango_layouts (GTK_SWITCH (widget));
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_switch_style_updated (GtkWidget *widget)
|
||||
{
|
||||
GtkSwitch *self = GTK_SWITCH (widget);
|
||||
GtkStyleContext *context;
|
||||
GtkCssStyleChange *change;
|
||||
|
||||
GTK_WIDGET_CLASS (gtk_switch_parent_class)->style_updated (widget);
|
||||
|
||||
context = gtk_widget_get_style_context (widget);
|
||||
change = gtk_style_context_get_change (context);
|
||||
|
||||
if (change == NULL || gtk_css_style_change_affects (change, GTK_CSS_AFFECTS_FONT))
|
||||
gtk_switch_create_pango_layouts (self);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static gboolean
|
||||
gtk_switch_enter (GtkWidget *widget,
|
||||
GdkEventCrossing *event)
|
||||
@@ -379,8 +423,7 @@ gtk_switch_get_content_size (GtkCssGadget *gadget,
|
||||
GtkSwitch *self;
|
||||
GtkSwitchPrivate *priv;
|
||||
gint slider_minimum, slider_natural;
|
||||
gint on_minimum, on_natural;
|
||||
gint off_minimum, off_natural;
|
||||
PangoRectangle on_rect, off_rect;
|
||||
|
||||
widget = gtk_css_gadget_get_owner (gadget);
|
||||
self = GTK_SWITCH (widget);
|
||||
@@ -392,26 +435,20 @@ gtk_switch_get_content_size (GtkCssGadget *gadget,
|
||||
&slider_minimum, &slider_natural,
|
||||
NULL, NULL);
|
||||
|
||||
gtk_css_gadget_get_preferred_size (priv->on_gadget,
|
||||
orientation,
|
||||
-1,
|
||||
&on_minimum, &on_natural,
|
||||
NULL, NULL);
|
||||
gtk_css_gadget_get_preferred_size (priv->off_gadget,
|
||||
orientation,
|
||||
-1,
|
||||
&off_minimum, &off_natural,
|
||||
NULL, NULL);
|
||||
pango_layout_get_pixel_extents (priv->on_layout, NULL, &on_rect);
|
||||
pango_layout_get_pixel_extents (priv->off_layout, NULL, &off_rect);
|
||||
|
||||
if (orientation == GTK_ORIENTATION_HORIZONTAL)
|
||||
{
|
||||
*minimum = 2 * MAX (slider_minimum, MAX (on_minimum, off_minimum));
|
||||
*natural = 2 * MAX (slider_natural, MAX (on_natural, off_natural));
|
||||
int text_width = MAX (on_rect.width, off_rect.width);
|
||||
*minimum = 2 * MAX (slider_minimum, text_width);
|
||||
*natural = 2 * MAX (slider_natural, text_width);
|
||||
}
|
||||
else
|
||||
{
|
||||
*minimum = MAX (slider_minimum, MAX (on_minimum, off_minimum));
|
||||
*natural = MAX (slider_natural, MAX (on_natural, off_natural));
|
||||
int text_height = MAX (on_rect.height, off_rect.height);
|
||||
*minimum = MAX (slider_minimum, text_height);
|
||||
*natural = MAX (slider_natural, text_height);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -448,28 +485,15 @@ gtk_switch_allocate_contents (GtkCssGadget *gadget,
|
||||
{
|
||||
GtkSwitch *self = GTK_SWITCH (gtk_css_gadget_get_owner (gadget));
|
||||
GtkSwitchPrivate *priv = self->priv;
|
||||
GtkAllocation child_alloc;
|
||||
GtkAllocation slider_alloc;
|
||||
|
||||
child_alloc.x = allocation->x + round (priv->handle_pos * (allocation->width - allocation->width / 2));
|
||||
child_alloc.y = allocation->y;
|
||||
child_alloc.width = allocation->width / 2;
|
||||
child_alloc.height = allocation->height;
|
||||
slider_alloc.x = allocation->x + round (priv->handle_pos * (allocation->width - allocation->width / 2));
|
||||
slider_alloc.y = allocation->y;
|
||||
slider_alloc.width = allocation->width / 2;
|
||||
slider_alloc.height = allocation->height;
|
||||
|
||||
gtk_css_gadget_allocate (priv->slider_gadget,
|
||||
&child_alloc,
|
||||
baseline,
|
||||
out_clip);
|
||||
|
||||
child_alloc.x = allocation->x;
|
||||
|
||||
gtk_css_gadget_allocate (priv->on_gadget,
|
||||
&child_alloc,
|
||||
baseline,
|
||||
out_clip);
|
||||
|
||||
child_alloc.x = allocation->x + allocation->width - child_alloc.width;
|
||||
gtk_css_gadget_allocate (priv->off_gadget,
|
||||
&child_alloc,
|
||||
&slider_alloc,
|
||||
baseline,
|
||||
out_clip);
|
||||
|
||||
@@ -598,9 +622,24 @@ gtk_switch_render_trough (GtkCssGadget *gadget,
|
||||
{
|
||||
GtkWidget *widget = gtk_css_gadget_get_owner (gadget);
|
||||
GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
|
||||
GtkStyleContext *context = gtk_widget_get_style_context (widget);
|
||||
PangoRectangle rect;
|
||||
gint label_x, label_y;
|
||||
|
||||
pango_layout_get_pixel_extents (priv->on_layout, NULL, &rect);
|
||||
|
||||
label_x = x + ((width / 2) - rect.width) / 2;
|
||||
label_y = y + (height - rect.height) / 2;
|
||||
|
||||
gtk_render_layout (context, cr, label_x, label_y, priv->on_layout);
|
||||
|
||||
pango_layout_get_pixel_extents (priv->off_layout, NULL, &rect);
|
||||
|
||||
label_x = x + (width / 2) + ((width / 2) - rect.width) / 2;
|
||||
label_y = y + (height - rect.height) / 2;
|
||||
|
||||
gtk_render_layout (context, cr, label_x, label_y, priv->off_layout);
|
||||
|
||||
gtk_css_gadget_draw (priv->on_gadget, cr);
|
||||
gtk_css_gadget_draw (priv->off_gadget, cr);
|
||||
gtk_css_gadget_draw (priv->slider_gadget, cr);
|
||||
|
||||
return FALSE;
|
||||
@@ -615,21 +654,6 @@ gtk_switch_draw (GtkWidget *widget,
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_switch_state_flags_changed (GtkWidget *widget,
|
||||
GtkStateFlags previous_state_flags)
|
||||
{
|
||||
GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
|
||||
GtkStateFlags state = gtk_widget_get_state_flags (widget);
|
||||
|
||||
gtk_css_gadget_set_state (priv->gadget, state);
|
||||
gtk_css_gadget_set_state (priv->slider_gadget, state);
|
||||
gtk_css_gadget_set_state (priv->on_gadget, state);
|
||||
gtk_css_gadget_set_state (priv->off_gadget, state);
|
||||
|
||||
GTK_WIDGET_CLASS (gtk_switch_parent_class)->state_flags_changed (widget, previous_state_flags);
|
||||
}
|
||||
|
||||
static void
|
||||
gtk_switch_set_related_action (GtkSwitch *sw,
|
||||
GtkAction *action)
|
||||
@@ -806,12 +830,13 @@ gtk_switch_dispose (GObject *object)
|
||||
|
||||
g_clear_object (&priv->gadget);
|
||||
g_clear_object (&priv->slider_gadget);
|
||||
g_clear_object (&priv->on_gadget);
|
||||
g_clear_object (&priv->off_gadget);
|
||||
|
||||
g_clear_object (&priv->pan_gesture);
|
||||
g_clear_object (&priv->multipress_gesture);
|
||||
|
||||
g_clear_object (&priv->on_layout);
|
||||
g_clear_object (&priv->off_layout);
|
||||
|
||||
G_OBJECT_CLASS (gtk_switch_parent_class)->dispose (object);
|
||||
}
|
||||
|
||||
@@ -904,7 +929,8 @@ gtk_switch_class_init (GtkSwitchClass *klass)
|
||||
widget_class->draw = gtk_switch_draw;
|
||||
widget_class->enter_notify_event = gtk_switch_enter;
|
||||
widget_class->leave_notify_event = gtk_switch_leave;
|
||||
widget_class->state_flags_changed = gtk_switch_state_flags_changed;
|
||||
widget_class->screen_changed = gtk_switch_screen_changed;
|
||||
widget_class->style_updated = gtk_switch_style_updated;
|
||||
|
||||
klass->activate = gtk_switch_activate;
|
||||
klass->state_set = state_set;
|
||||
@@ -1034,16 +1060,6 @@ gtk_switch_init (GtkSwitch *self)
|
||||
NULL,
|
||||
NULL);
|
||||
|
||||
priv->on_gadget = gtk_icon_helper_new_named ("image", GTK_WIDGET (self));
|
||||
_gtk_icon_helper_set_icon_name (GTK_ICON_HELPER (priv->on_gadget), "switch-on-symbolic", GTK_ICON_SIZE_MENU);
|
||||
gtk_css_node_set_parent (gtk_css_gadget_get_node (priv->on_gadget), widget_node);
|
||||
gtk_css_node_set_state (gtk_css_gadget_get_node (priv->on_gadget), gtk_css_node_get_state (widget_node));
|
||||
|
||||
priv->off_gadget = gtk_icon_helper_new_named ("image", GTK_WIDGET (self));
|
||||
_gtk_icon_helper_set_icon_name (GTK_ICON_HELPER (priv->off_gadget), "switch-off-symbolic", GTK_ICON_SIZE_MENU);
|
||||
gtk_css_node_set_parent (gtk_css_gadget_get_node (priv->off_gadget), widget_node);
|
||||
gtk_css_node_set_state (gtk_css_gadget_get_node (priv->off_gadget), gtk_css_node_get_state (widget_node));
|
||||
|
||||
gesture = gtk_gesture_multi_press_new (GTK_WIDGET (self));
|
||||
gtk_gesture_single_set_touch_only (GTK_GESTURE_SINGLE (gesture), FALSE);
|
||||
gtk_gesture_single_set_exclusive (GTK_GESTURE_SINGLE (gesture), TRUE);
|
||||
@@ -1066,6 +1082,8 @@ gtk_switch_init (GtkSwitch *self)
|
||||
gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (gesture),
|
||||
GTK_PHASE_BUBBLE);
|
||||
priv->pan_gesture = gesture;
|
||||
|
||||
gtk_switch_create_pango_layouts (self);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+5
-39
@@ -262,9 +262,6 @@ struct _GtkWindowPrivate
|
||||
guint maximized : 1;
|
||||
guint fullscreen : 1;
|
||||
guint tiled : 1;
|
||||
guint unlimited_guessed_size_x : 1;
|
||||
guint unlimited_guessed_size_y : 1;
|
||||
guint force_resize : 1;
|
||||
|
||||
guint use_subsurface : 1;
|
||||
|
||||
@@ -6458,25 +6455,6 @@ gtk_window_unmap (GtkWidget *widget)
|
||||
gtk_widget_unmap (child);
|
||||
}
|
||||
|
||||
void
|
||||
gtk_window_set_unlimited_guessed_size (GtkWindow *window,
|
||||
gboolean x,
|
||||
gboolean y)
|
||||
{
|
||||
GtkWindowPrivate *priv = window->priv;
|
||||
|
||||
priv->unlimited_guessed_size_x = x;
|
||||
priv->unlimited_guessed_size_y = y;
|
||||
}
|
||||
|
||||
void
|
||||
gtk_window_force_resize (GtkWindow *window)
|
||||
{
|
||||
GtkWindowPrivate *priv = window->priv;
|
||||
|
||||
priv->force_resize = TRUE;
|
||||
}
|
||||
|
||||
/* (Note: Replace "size" with "width" or "height". Also, the request
|
||||
* mode is honoured.)
|
||||
* For selecting the default window size, the following conditions
|
||||
@@ -6515,15 +6493,8 @@ gtk_window_guess_default_size (GtkWindow *window,
|
||||
|
||||
gdk_monitor_get_workarea (monitor, &workarea);
|
||||
|
||||
if (window->priv->unlimited_guessed_size_x)
|
||||
*width = INT_MAX;
|
||||
else
|
||||
*width = workarea.width;
|
||||
|
||||
if (window->priv->unlimited_guessed_size_y)
|
||||
*height = INT_MAX;
|
||||
else
|
||||
*height = workarea.height;
|
||||
*width = workarea.width;
|
||||
*height = workarea.height;
|
||||
|
||||
if (gtk_widget_get_request_mode (widget) == GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT)
|
||||
{
|
||||
@@ -9393,8 +9364,7 @@ gtk_window_compute_configure_request_size (GtkWindow *window,
|
||||
|
||||
info = gtk_window_get_geometry_info (window, FALSE);
|
||||
|
||||
if (priv->need_default_size ||
|
||||
priv->force_resize)
|
||||
if (priv->need_default_size)
|
||||
{
|
||||
gtk_window_guess_default_size (window, width, height);
|
||||
gtk_window_get_remembered_size (window, &w, &h);
|
||||
@@ -9799,13 +9769,9 @@ gtk_window_move_resize (GtkWindow *window)
|
||||
info->last.configure_request.y != new_request.y)
|
||||
configure_request_pos_changed = TRUE;
|
||||
|
||||
if (priv->force_resize ||
|
||||
(info->last.configure_request.width != new_request.width ||
|
||||
if ((info->last.configure_request.width != new_request.width ||
|
||||
info->last.configure_request.height != new_request.height))
|
||||
{
|
||||
priv->force_resize = FALSE;
|
||||
configure_request_size_changed = TRUE;
|
||||
}
|
||||
configure_request_size_changed = TRUE;
|
||||
|
||||
hints_changed = FALSE;
|
||||
|
||||
|
||||
@@ -135,11 +135,6 @@ void gtk_window_set_hardcoded_window (GtkWindow *window,
|
||||
|
||||
GdkScreen *_gtk_window_get_screen (GtkWindow *window);
|
||||
|
||||
void gtk_window_set_unlimited_guessed_size (GtkWindow *window,
|
||||
gboolean x,
|
||||
gboolean y);
|
||||
void gtk_window_force_resize (GtkWindow *window);
|
||||
|
||||
/* Exported handles */
|
||||
|
||||
typedef void (*GtkWindowHandleExported) (GtkWindow *window,
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 250 B |
Binary file not shown.
|
Before Width: | Height: | Size: 100 B |
@@ -1,62 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="16"
|
||||
height="16"
|
||||
viewBox="0 0 16 16"
|
||||
version="1.1"
|
||||
id="svg8"
|
||||
inkscape:version="0.92.4 5da689c313, 2019-01-14"
|
||||
sodipodi:docname="switch-off-symbolic.svg">
|
||||
<defs
|
||||
id="defs2" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="11.858493"
|
||||
inkscape:cx="-1.0931113"
|
||||
inkscape:cy="14.095717"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="true"
|
||||
units="px">
|
||||
<inkscape:grid
|
||||
type="xygrid"
|
||||
id="grid815" />
|
||||
</sodipodi:namedview>
|
||||
<metadata
|
||||
id="metadata5">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(0,-292.76666)">
|
||||
<path
|
||||
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
|
||||
d="m 7.9785156,295.73828 c -2.7589327,0 -5.015625,2.25865 -5.015625,5.01758 0,2.75893 2.2566923,5.01758 5.015625,5.01758 2.7589324,0 5.0175784,-2.25865 5.0175784,-5.01758 0,-2.75893 -2.258646,-5.01758 -5.0175784,-5.01758 z m 0,2 c 1.6780526,0 3.0175784,1.33953 3.0175784,3.01758 0,1.67805 -1.3395258,3.01758 -3.0175784,3.01758 -1.6780525,0 -3.015625,-1.33953 -3.015625,-3.01758 0,-1.67805 1.3375725,-3.01758 3.015625,-3.01758 z"
|
||||
id="path838"
|
||||
inkscape:connector-curvature="0" />
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 3.3 KiB |
@@ -1,64 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
width="16"
|
||||
height="16"
|
||||
viewBox="0 0 16 16"
|
||||
version="1.1"
|
||||
id="svg8"
|
||||
inkscape:version="0.92.4 5da689c313, 2019-01-14"
|
||||
sodipodi:docname="on-symbolic.svg">
|
||||
<defs
|
||||
id="defs2" />
|
||||
<sodipodi:namedview
|
||||
id="base"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:zoom="31.678384"
|
||||
inkscape:cx="10.416792"
|
||||
inkscape:cy="9.9204611"
|
||||
inkscape:document-units="px"
|
||||
inkscape:current-layer="layer1"
|
||||
showgrid="true"
|
||||
units="px">
|
||||
<inkscape:grid
|
||||
type="xygrid"
|
||||
id="grid815" />
|
||||
</sodipodi:namedview>
|
||||
<metadata
|
||||
id="metadata5">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<g
|
||||
inkscape:label="Layer 1"
|
||||
inkscape:groupmode="layer"
|
||||
id="layer1"
|
||||
transform="translate(0,-292.76666)">
|
||||
<rect
|
||||
style="opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.58198857;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;paint-order:normal"
|
||||
id="rect817"
|
||||
width="2"
|
||||
height="9.9999971"
|
||||
x="7"
|
||||
y="295.76666" />
|
||||
</g>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.9 KiB |
@@ -1216,7 +1216,6 @@ spinbutton {
|
||||
&:backdrop:disabled {
|
||||
color: transparentize($backdrop_insensitive_color,0.7);
|
||||
background-color: transparent;
|
||||
background-image: none;
|
||||
border-style: none none none solid; // It is needed or it gets overridden
|
||||
|
||||
&:dir(rtl) { border-style: none solid none none; }
|
||||
|
||||
@@ -505,7 +505,7 @@ spinbutton:not(.vertical) button:active { background-color: rgba(0, 0, 0, 0.1);
|
||||
|
||||
spinbutton:not(.vertical) button:backdrop { color: #86898a; background-color: transparent; border-color: rgba(32, 36, 37, 0.3); transition: 200ms ease-out; }
|
||||
|
||||
spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(86, 97, 100, 0.3); background-color: transparent; background-image: none; border-style: none none none solid; }
|
||||
spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(86, 97, 100, 0.3); background-color: transparent; border-style: none none none solid; }
|
||||
|
||||
spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; }
|
||||
|
||||
|
||||
@@ -513,7 +513,7 @@ spinbutton:not(.vertical) button:active { background-color: rgba(0, 0, 0, 0.1);
|
||||
|
||||
spinbutton:not(.vertical) button:backdrop { color: #96999a; background-color: transparent; border-color: rgba(192, 192, 189, 0.3); transition: 200ms ease-out; }
|
||||
|
||||
spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(195, 195, 192, 0.3); background-color: transparent; background-image: none; border-style: none none none solid; }
|
||||
spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(195, 195, 192, 0.3); background-color: transparent; border-style: none none none solid; }
|
||||
|
||||
spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; }
|
||||
|
||||
|
||||
@@ -980,10 +980,7 @@ spinbutton {
|
||||
background-color: $bg_color;
|
||||
}
|
||||
|
||||
&:disabled,
|
||||
&:backdrop:disabled {
|
||||
color: transparentize($insensitive_fg_color, 0.7);
|
||||
}
|
||||
&:disabled { color: transparentize($insensitive_fg_color, 0.7); }
|
||||
|
||||
&:active {
|
||||
background-color: $osd_bg_color;
|
||||
@@ -997,6 +994,7 @@ spinbutton {
|
||||
}
|
||||
|
||||
&:backdrop:disabled {
|
||||
color: $insensitive_bg_color;
|
||||
background-image: none;
|
||||
border-style: none none none solid; // It is needed or it gets overridden
|
||||
|
||||
|
||||
@@ -405,13 +405,13 @@ spinbutton:not(.vertical) button:dir(rtl) { border-style: none solid none none;
|
||||
|
||||
spinbutton:not(.vertical) button:hover { color: #fff; background-color: #000; }
|
||||
|
||||
spinbutton:not(.vertical) button:disabled, spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(128, 128, 128, 0.3); }
|
||||
spinbutton:not(.vertical) button:disabled { color: rgba(128, 128, 128, 0.3); }
|
||||
|
||||
spinbutton:not(.vertical) button:active { background-color: rgba(0, 0, 0, 0.8); color: #fff; }
|
||||
|
||||
spinbutton:not(.vertical) button:backdrop { color: #fff; background-color: transparent; border-color: rgba(115, 115, 115, 0.3); }
|
||||
|
||||
spinbutton:not(.vertical) button:backdrop:disabled { background-image: none; border-style: none none none solid; }
|
||||
spinbutton:not(.vertical) button:backdrop:disabled { color: #070707; background-image: none; border-style: none none none solid; }
|
||||
|
||||
spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; }
|
||||
|
||||
|
||||
@@ -409,13 +409,13 @@ spinbutton:not(.vertical) button:dir(rtl) { border-style: none solid none none;
|
||||
|
||||
spinbutton:not(.vertical) button:hover { color: #000; background-color: #fff; }
|
||||
|
||||
spinbutton:not(.vertical) button:disabled, spinbutton:not(.vertical) button:backdrop:disabled { color: rgba(128, 128, 128, 0.3); }
|
||||
spinbutton:not(.vertical) button:disabled { color: rgba(128, 128, 128, 0.3); }
|
||||
|
||||
spinbutton:not(.vertical) button:active { background-color: rgba(0, 0, 0, 0.8); color: #fff; }
|
||||
|
||||
spinbutton:not(.vertical) button:backdrop { color: #000; background-color: transparent; border-color: rgba(141, 141, 141, 0.3); }
|
||||
|
||||
spinbutton:not(.vertical) button:backdrop:disabled { background-image: none; border-style: none none none solid; }
|
||||
spinbutton:not(.vertical) button:backdrop:disabled { color: white; background-image: none; border-style: none none none solid; }
|
||||
|
||||
spinbutton:not(.vertical) button:backdrop:disabled:dir(rtl) { border-style: none solid none none; }
|
||||
|
||||
|
||||
@@ -33,9 +33,6 @@
|
||||
<property name="spacing">12</property>
|
||||
<child>
|
||||
<object class="GtkImage" id="logo_image">
|
||||
<style>
|
||||
<class name="icon-dropshadow"/>
|
||||
</style>
|
||||
<property name="visible">1</property>
|
||||
<property name="icon-name">image-missing</property>
|
||||
</object>
|
||||
@@ -125,7 +122,6 @@
|
||||
<property name="selectable">1</property>
|
||||
<property name="no-show-all">1</property>
|
||||
<property name="max-width-chars">60</property>
|
||||
<signal name="activate-link" handler="emit_activate_link" object="GtkAboutDialog" swapped="yes"/>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="fill">0</property>
|
||||
|
||||
@@ -75,9 +75,7 @@
|
||||
<object class="GtkCellRendererText" id="secondary_padding"/>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkCellRendererPixbuf" id="app_icon">
|
||||
<property name="stock-size">5</property>
|
||||
</object>
|
||||
<object class="GtkCellRendererPixbuf" id="app_icon"/>
|
||||
<attributes>
|
||||
<attribute name="gicon">1</attribute>
|
||||
</attributes>
|
||||
|
||||
@@ -190,23 +190,22 @@ quartz_filter_keypress (GtkIMContext *context,
|
||||
if (!GDK_IS_QUARTZ_WINDOW (qc->client_window))
|
||||
return FALSE;
|
||||
|
||||
nsview = gdk_quartz_window_get_nsview (qc->client_window);
|
||||
win = (GdkWindow *)[ (GdkQuartzView *)nsview gdkWindow];
|
||||
GTK_NOTE (MISC, g_print ("client_window: %p, win: %p, nsview: %p\n",
|
||||
qc->client_window, win, nsview));
|
||||
|
||||
NSEvent *nsevent = gdk_quartz_event_get_nsevent ((GdkEvent *)event);
|
||||
|
||||
if (!nsevent)
|
||||
{
|
||||
if (event->hardware_keycode == 0 && event->keyval == 0xffffff)
|
||||
/* update text input changes by mouse events */
|
||||
return output_result (context, event->window);
|
||||
return output_result (context, win);
|
||||
else
|
||||
return gtk_im_context_filter_keypress (qc->slave, event);
|
||||
}
|
||||
|
||||
nsview = gdk_quartz_window_get_nsview (qc->client_window);
|
||||
|
||||
win = (GdkWindow *)[(GdkQuartzView *)[[nsevent window] contentView] gdkWindow];
|
||||
GTK_NOTE (MISC, g_print ("client_window: %p, win: %p, nsview: %p\n",
|
||||
qc->client_window, win, nsview));
|
||||
|
||||
if (event->type == GDK_KEY_RELEASE)
|
||||
return FALSE;
|
||||
|
||||
|
||||
@@ -3966,7 +3966,7 @@ cups_request_ppd (GtkPrinter *printer)
|
||||
g_io_channel_set_encoding (data->ppd_io, NULL, NULL);
|
||||
g_io_channel_set_close_on_unref (data->ppd_io, TRUE);
|
||||
|
||||
data->printer = (GtkPrinterCups *) g_object_ref (printer);
|
||||
data->printer = g_object_ref (printer);
|
||||
|
||||
resource = g_strdup_printf ("/printers/%s.ppd",
|
||||
gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer)));
|
||||
|
||||
+237
-247
File diff suppressed because it is too large
Load Diff
@@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+ 2.6-branch\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-01-04 22:22+0000\n"
|
||||
"POT-Creation-Date: 2018-05-27 05:41+0000\n"
|
||||
"PO-Revision-Date: 2018-06-30 00:26+0200\n"
|
||||
"Last-Translator: Pieter Schoeman <pieter@sonbesie.co.za>\n"
|
||||
"Language-Team: translate-discuss-af@lists.sourceforge.net\n"
|
||||
|
||||
@@ -10,14 +10,14 @@
|
||||
# Juan Manuel García Molina <juanma_gm@wanadoo.es>, 2003.
|
||||
# Francisco Javier F. Serrador <serrador@cvs.gnome.org>, 2003 - 2006.
|
||||
# Jorge González <jorgegonz@svn.gnome.org>, 2007, 2008, 2009, 2010, 2011.
|
||||
# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
|
||||
# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
|
||||
#
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: gtk+.master\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2019-01-15 21:31+0000\n"
|
||||
"PO-Revision-Date: 2019-01-16 09:19+0100\n"
|
||||
"POT-Creation-Date: 2018-10-29 18:35+0000\n"
|
||||
"PO-Revision-Date: 2018-10-31 13:15+0100\n"
|
||||
"Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
|
||||
"Language-Team: es <gnome-es-list@gnome.org>\n"
|
||||
"Language: es\n"
|
||||
@@ -581,33 +581,33 @@ msgctxt "Action description"
|
||||
msgid "Clicks the button"
|
||||
msgstr "Pulsa el botón"
|
||||
|
||||
#: gtk/a11y/gtkcellaccessible.c:257
|
||||
#: gtk/a11y/gtkcellaccessible.c:255
|
||||
msgctxt "Action name"
|
||||
msgid "Expand or contract"
|
||||
msgstr "Expandir o contraer"
|
||||
|
||||
#: gtk/a11y/gtkcellaccessible.c:259
|
||||
#: gtk/a11y/gtkcellaccessible.c:257
|
||||
msgctxt "Action name"
|
||||
msgid "Edit"
|
||||
msgstr "Editar"
|
||||
|
||||
#: gtk/a11y/gtkcellaccessible.c:261 gtk/a11y/gtkcolorswatchaccessible.c:149
|
||||
#: gtk/a11y/gtkcellaccessible.c:259 gtk/a11y/gtkcolorswatchaccessible.c:149
|
||||
#: gtk/a11y/gtkentryaccessible.c:1557 gtk/a11y/gtkexpanderaccessible.c:281
|
||||
msgctxt "Action name"
|
||||
msgid "Activate"
|
||||
msgstr "Activar"
|
||||
|
||||
#: gtk/a11y/gtkcellaccessible.c:274
|
||||
#: gtk/a11y/gtkcellaccessible.c:272
|
||||
msgctxt "Action description"
|
||||
msgid "Expands or contracts the row in the tree view containing this cell"
|
||||
msgstr "Expande o contrae la celda en la vista de árbol que contiene la celda"
|
||||
|
||||
#: gtk/a11y/gtkcellaccessible.c:276
|
||||
#: gtk/a11y/gtkcellaccessible.c:274
|
||||
msgctxt "Action description"
|
||||
msgid "Creates a widget in which the contents of the cell can be edited"
|
||||
msgstr "Crea un widget en el que los contenidos de la celda se pueden editar"
|
||||
|
||||
#: gtk/a11y/gtkcellaccessible.c:278
|
||||
#: gtk/a11y/gtkcellaccessible.c:276
|
||||
msgctxt "Action description"
|
||||
msgid "Activates the cell"
|
||||
msgstr "Activa la celda"
|
||||
@@ -691,15 +691,15 @@ msgctxt "Stock label"
|
||||
msgid "_Close"
|
||||
msgstr "_Cerrar"
|
||||
|
||||
#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9255
|
||||
#: gtk/a11y/gtkimageaccessible.c:59 gtk/gtkheaderbar.c:415 gtk/gtkwindow.c:9253
|
||||
msgid "Minimize"
|
||||
msgstr "Minimizar"
|
||||
|
||||
#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9264
|
||||
#: gtk/a11y/gtkimageaccessible.c:60 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9262
|
||||
msgid "Maximize"
|
||||
msgstr "Maximizar"
|
||||
|
||||
#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9221
|
||||
#: gtk/a11y/gtkimageaccessible.c:61 gtk/gtkheaderbar.c:439 gtk/gtkwindow.c:9219
|
||||
msgid "Restore"
|
||||
msgstr "Restaurar"
|
||||
|
||||
@@ -1253,7 +1253,7 @@ msgstr ""
|
||||
#: gtk/gtkmountoperation.c:545 gtk/gtkpagesetupunixdialog.c:196
|
||||
#: gtk/gtkprintbackend.c:781 gtk/gtkprinteroptionwidget.c:545
|
||||
#: gtk/gtkprintunixdialog.c:673 gtk/gtkprintunixdialog.c:746
|
||||
#: gtk/gtkwindow.c:12724 gtk/inspector/css-editor.c:201
|
||||
#: gtk/gtkwindow.c:12722 gtk/inspector/css-editor.c:201
|
||||
#: gtk/ui/gtkappchooserdialog.ui:61 gtk/ui/gtkassistant.ui:125
|
||||
#: gtk/ui/gtkcolorchooserdialog.ui:34 gtk/ui/gtkfontchooserdialog.ui:31
|
||||
msgid "_Cancel"
|
||||
@@ -1304,7 +1304,7 @@ msgid "_Apply"
|
||||
msgstr "_Aplicar"
|
||||
|
||||
#: gtk/deprecated/gtkfontsel.c:1698 gtk/gtkmessagedialog.c:944
|
||||
#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:782 gtk/gtkwindow.c:12725
|
||||
#: gtk/gtkmessagedialog.c:966 gtk/gtkprintbackend.c:782 gtk/gtkwindow.c:12723
|
||||
msgid "_OK"
|
||||
msgstr "_Aceptar"
|
||||
|
||||
@@ -1468,7 +1468,7 @@ msgstr "No se puede guardar el archivo %s: %s\n"
|
||||
msgid "Can't close stream"
|
||||
msgstr "No se puede cerrar el flujo"
|
||||
|
||||
#: gtk/gtkaboutdialog.c:114 gtk/ui/gtkaboutdialog.ui:209
|
||||
#: gtk/gtkaboutdialog.c:114 gtk/ui/gtkaboutdialog.ui:206
|
||||
msgid "License"
|
||||
msgstr "Licencia"
|
||||
|
||||
@@ -2222,52 +2222,52 @@ msgstr "_Derecho:"
|
||||
msgid "Paper Margins"
|
||||
msgstr "Márgenes del papel"
|
||||
|
||||
#: gtk/gtkentry.c:9583 gtk/gtklabel.c:6680 gtk/gtktextview.c:9492
|
||||
#: gtk/gtkentry.c:9582 gtk/gtklabel.c:6680 gtk/gtktextview.c:9492
|
||||
msgid "Cu_t"
|
||||
msgstr "Cor_tar"
|
||||
|
||||
#: gtk/gtkentry.c:9587 gtk/gtklabel.c:6681 gtk/gtktextview.c:9496
|
||||
#: gtk/gtkentry.c:9586 gtk/gtklabel.c:6681 gtk/gtktextview.c:9496
|
||||
msgid "_Copy"
|
||||
msgstr "_Copiar"
|
||||
|
||||
#: gtk/gtkentry.c:9591 gtk/gtklabel.c:6682 gtk/gtktextview.c:9498
|
||||
#: gtk/gtkentry.c:9590 gtk/gtklabel.c:6682 gtk/gtktextview.c:9498
|
||||
msgid "_Paste"
|
||||
msgstr "_Pegar"
|
||||
|
||||
#: gtk/gtkentry.c:9594 gtk/gtkfilechooserwidget.c:1476
|
||||
#: gtk/gtkentry.c:9593 gtk/gtkfilechooserwidget.c:1476
|
||||
#: gtk/gtkfilechooserwidget.c:2276 gtk/gtklabel.c:6684 gtk/gtktextview.c:9501
|
||||
msgid "_Delete"
|
||||
msgstr "_Eliminar"
|
||||
|
||||
#: gtk/gtkentry.c:9605 gtk/gtklabel.c:6693 gtk/gtktextview.c:9515
|
||||
#: gtk/gtkentry.c:9604 gtk/gtklabel.c:6693 gtk/gtktextview.c:9515
|
||||
msgid "Select _All"
|
||||
msgstr "Seleccionar _todo"
|
||||
|
||||
#: gtk/gtkentry.c:9615 gtk/gtktextview.c:9525
|
||||
#: gtk/gtkentry.c:9614 gtk/gtktextview.c:9525
|
||||
msgid "Insert _Emoji"
|
||||
msgstr "Insertar _emoticono"
|
||||
|
||||
#: gtk/gtkentry.c:9791 gtk/gtktextview.c:9745
|
||||
#: gtk/gtkentry.c:9790 gtk/gtktextview.c:9745
|
||||
msgid "Select all"
|
||||
msgstr "Seleccionar todo"
|
||||
|
||||
#: gtk/gtkentry.c:9794 gtk/gtktextview.c:9748
|
||||
#: gtk/gtkentry.c:9793 gtk/gtktextview.c:9748
|
||||
msgid "Cut"
|
||||
msgstr "Cortar"
|
||||
|
||||
#: gtk/gtkentry.c:9797 gtk/gtktextview.c:9751
|
||||
#: gtk/gtkentry.c:9796 gtk/gtktextview.c:9751
|
||||
msgid "Copy"
|
||||
msgstr "Copiar"
|
||||
|
||||
#: gtk/gtkentry.c:9800 gtk/gtktextview.c:9754
|
||||
#: gtk/gtkentry.c:9799 gtk/gtktextview.c:9754
|
||||
msgid "Paste"
|
||||
msgstr "Pegar"
|
||||
|
||||
#: gtk/gtkentry.c:10870
|
||||
#: gtk/gtkentry.c:10869
|
||||
msgid "Caps Lock is on"
|
||||
msgstr "Bloq Mayús está activado"
|
||||
|
||||
#: gtk/gtkentry.c:11145
|
||||
#: gtk/gtkentry.c:11144
|
||||
msgid "Insert Emoji"
|
||||
msgstr "Insertar emoticono"
|
||||
|
||||
@@ -2294,8 +2294,8 @@ msgstr "_Nombre"
|
||||
|
||||
#. Open item is always present
|
||||
#: gtk/gtkfilechoosernative.c:541 gtk/gtkfilechoosernative.c:626
|
||||
#: gtk/gtkplacessidebar.c:3618 gtk/gtkplacessidebar.c:3686
|
||||
#: gtk/gtkplacesview.c:1682
|
||||
#: gtk/gtkplacessidebar.c:3615 gtk/gtkplacessidebar.c:3683
|
||||
#: gtk/gtkplacesview.c:1633
|
||||
msgid "_Open"
|
||||
msgstr "_Abrir"
|
||||
|
||||
@@ -2465,7 +2465,7 @@ msgstr "Copiar _ubicación"
|
||||
msgid "_Add to Bookmarks"
|
||||
msgstr "_Añadir a los marcadores"
|
||||
|
||||
#: gtk/gtkfilechooserwidget.c:2275 gtk/gtkplacessidebar.c:2734
|
||||
#: gtk/gtkfilechooserwidget.c:2275 gtk/gtkplacessidebar.c:2731
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:526
|
||||
msgid "_Rename"
|
||||
msgstr "_Renombrar"
|
||||
@@ -2647,10 +2647,11 @@ msgid "Ligatures"
|
||||
msgstr "Ligaduras"
|
||||
|
||||
#: gtk/gtkfontchooserwidget.c:2112
|
||||
#, fuzzy
|
||||
#| msgctxt "paper size"
|
||||
#| msgid "US Letter Plus"
|
||||
msgid "Letter Case"
|
||||
msgstr "Letter Case"
|
||||
msgstr "US Letter Plus"
|
||||
|
||||
#: gtk/gtkfontchooserwidget.c:2113
|
||||
msgid "Number Case"
|
||||
@@ -2676,16 +2677,16 @@ msgstr "Falló al crear el contexto de OpenGL"
|
||||
msgid "Application menu"
|
||||
msgstr "Menú de la aplicación"
|
||||
|
||||
#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9291
|
||||
#: gtk/gtkheaderbar.c:458 gtk/gtkwindow.c:9289
|
||||
msgid "Close"
|
||||
msgstr "Cerrar"
|
||||
|
||||
#: gtk/gtkicontheme.c:2343 gtk/gtkicontheme.c:2408
|
||||
#: gtk/gtkicontheme.c:2341 gtk/gtkicontheme.c:2406
|
||||
#, c-format
|
||||
msgid "Icon '%s' not present in theme %s"
|
||||
msgstr "El icono «%s» no está presente en el tema %s"
|
||||
|
||||
#: gtk/gtkicontheme.c:4082 gtk/gtkicontheme.c:4449
|
||||
#: gtk/gtkicontheme.c:4080 gtk/gtkicontheme.c:4447
|
||||
msgid "Failed to load icon"
|
||||
msgstr "No se pudo cargar el icono"
|
||||
|
||||
@@ -3099,224 +3100,185 @@ msgid "Show other locations"
|
||||
msgstr "Mostrar otras ubicaciones"
|
||||
|
||||
#. Adjust start/stop items to reflect the type of the drive
|
||||
#: gtk/gtkplacessidebar.c:2327 gtk/gtkplacessidebar.c:3706
|
||||
#: gtk/gtkplacessidebar.c:2324 gtk/gtkplacessidebar.c:3703
|
||||
msgid "_Start"
|
||||
msgstr "_Iniciar"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2328 gtk/gtkplacessidebar.c:3707
|
||||
#: gtk/gtkplacessidebar.c:2325 gtk/gtkplacessidebar.c:3704
|
||||
msgid "_Stop"
|
||||
msgstr "_Detener"
|
||||
|
||||
#. start() for type G_DRIVE_START_STOP_TYPE_SHUTDOWN is normally not used
|
||||
#: gtk/gtkplacessidebar.c:2335
|
||||
#: gtk/gtkplacessidebar.c:2332
|
||||
msgid "_Power On"
|
||||
msgstr "_Encender"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2336
|
||||
#: gtk/gtkplacessidebar.c:2333
|
||||
msgid "_Safely Remove Drive"
|
||||
msgstr "_Quitar unidad con seguridad"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2340
|
||||
#: gtk/gtkplacessidebar.c:2337
|
||||
msgid "_Connect Drive"
|
||||
msgstr "_Conectar unidad"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2341
|
||||
#: gtk/gtkplacessidebar.c:2338
|
||||
msgid "_Disconnect Drive"
|
||||
msgstr "_Desconectar unidad"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2345
|
||||
#: gtk/gtkplacessidebar.c:2342
|
||||
msgid "_Start Multi-disk Device"
|
||||
msgstr "_Iniciar dispositivo multidisco"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2346
|
||||
#: gtk/gtkplacessidebar.c:2343
|
||||
msgid "_Stop Multi-disk Device"
|
||||
msgstr "_Detener dispositivo multidisco"
|
||||
|
||||
#. stop() for type G_DRIVE_START_STOP_TYPE_PASSWORD is normally not used
|
||||
#: gtk/gtkplacessidebar.c:2351
|
||||
#: gtk/gtkplacessidebar.c:2348
|
||||
msgid "_Unlock Device"
|
||||
msgstr "_Desbloquear dispositivo"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2352
|
||||
#: gtk/gtkplacessidebar.c:2349
|
||||
msgid "_Lock Device"
|
||||
msgstr "_Bloquear dispositivo"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2390 gtk/gtkplacessidebar.c:3387
|
||||
#: gtk/gtkplacessidebar.c:2387 gtk/gtkplacessidebar.c:3384
|
||||
#, c-format
|
||||
msgid "Unable to start “%s”"
|
||||
msgstr "No se pudo iniciar «%s»"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2423
|
||||
#: gtk/gtkplacessidebar.c:2420
|
||||
#, c-format
|
||||
msgid "Error unlocking “%s”"
|
||||
msgstr "Error al desbloquear «%s»"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2425
|
||||
#: gtk/gtkplacessidebar.c:2422
|
||||
#, c-format
|
||||
msgid "Unable to access “%s”"
|
||||
msgstr "No se puede acceder a «%s»"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2659
|
||||
#: gtk/gtkplacessidebar.c:2656
|
||||
msgid "This name is already taken"
|
||||
msgstr "Este nombre ya está en uso"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2728 gtk/inspector/actions.ui:43
|
||||
#: gtk/gtkplacessidebar.c:2725 gtk/inspector/actions.ui:43
|
||||
#: gtk/inspector/css-node-tree.ui:39 gtk/inspector/object-tree.ui:110
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:189 gtk/ui/gtkfilechooserwidget.ui:500
|
||||
msgid "Name"
|
||||
msgstr "Nombre"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:2928
|
||||
#: gtk/gtkplacessidebar.c:2925
|
||||
#, c-format
|
||||
msgid "Unable to unmount “%s”"
|
||||
msgstr "No se puede desmontar «%s»"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3104
|
||||
#: gtk/gtkplacessidebar.c:3101
|
||||
#, c-format
|
||||
msgid "Unable to stop “%s”"
|
||||
msgstr "No se pudo detener «%s»"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3133
|
||||
#: gtk/gtkplacessidebar.c:3130
|
||||
#, c-format
|
||||
msgid "Unable to eject “%s”"
|
||||
msgstr "No se pudo expulsar «%s»"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3162 gtk/gtkplacessidebar.c:3191
|
||||
#: gtk/gtkplacessidebar.c:3159 gtk/gtkplacessidebar.c:3188
|
||||
#, c-format
|
||||
msgid "Unable to eject %s"
|
||||
msgstr "No se pudo expulsar %s"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3339
|
||||
#: gtk/gtkplacessidebar.c:3336
|
||||
#, c-format
|
||||
msgid "Unable to poll “%s” for media changes"
|
||||
msgstr "No se puede consultar a «%s» si hay cambios en el medio"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3623 gtk/gtkplacessidebar.c:3689
|
||||
#: gtk/gtkplacesview.c:1692
|
||||
#: gtk/gtkplacessidebar.c:3620 gtk/gtkplacessidebar.c:3686
|
||||
#: gtk/gtkplacesview.c:1643
|
||||
msgid "Open in New _Tab"
|
||||
msgstr "Abrir en una _pestaña nueva"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3629 gtk/gtkplacessidebar.c:3692
|
||||
#: gtk/gtkplacesview.c:1703
|
||||
#: gtk/gtkplacessidebar.c:3626 gtk/gtkplacessidebar.c:3689
|
||||
#: gtk/gtkplacesview.c:1654
|
||||
msgid "Open in New _Window"
|
||||
msgstr "Abrir en una _ventana nueva"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3696
|
||||
#: gtk/gtkplacessidebar.c:3693
|
||||
msgid "_Add Bookmark"
|
||||
msgstr "_Añadir marcador"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3697
|
||||
#: gtk/gtkplacessidebar.c:3694
|
||||
msgid "_Remove"
|
||||
msgstr "_Quitar"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3698
|
||||
#: gtk/gtkplacessidebar.c:3695
|
||||
msgid "Rename…"
|
||||
msgstr "Renombrar…"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3702 gtk/gtkplacesview.c:1737
|
||||
#: gtk/gtkplacessidebar.c:3699 gtk/gtkplacesview.c:1688
|
||||
msgid "_Mount"
|
||||
msgstr "_Montar"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3703 gtk/gtkplacesview.c:1727
|
||||
#: gtk/gtkplacessidebar.c:3700 gtk/gtkplacesview.c:1678
|
||||
msgid "_Unmount"
|
||||
msgstr "_Desmontar"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3704
|
||||
#: gtk/gtkplacessidebar.c:3701
|
||||
msgid "_Eject"
|
||||
msgstr "_Expulsar"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:3705
|
||||
#: gtk/gtkplacessidebar.c:3702
|
||||
msgid "_Detect Media"
|
||||
msgstr "_Detectar medio"
|
||||
|
||||
#: gtk/gtkplacessidebar.c:4151 gtk/gtkplacesview.c:1122
|
||||
#: gtk/gtkplacessidebar.c:4148 gtk/gtkplacesview.c:1121
|
||||
msgid "Computer"
|
||||
msgstr "Equipo"
|
||||
|
||||
#: gtk/gtkplacesview.c:898
|
||||
#: gtk/gtkplacesview.c:897
|
||||
msgid "Searching for network locations"
|
||||
msgstr "Buscando ubicaciones de red"
|
||||
|
||||
#: gtk/gtkplacesview.c:905
|
||||
#: gtk/gtkplacesview.c:904
|
||||
msgid "No network locations found"
|
||||
msgstr "No se han encontrado ubicaciones de red"
|
||||
|
||||
#. if it wasn't cancelled show a dialog
|
||||
#: gtk/gtkplacesview.c:1232 gtk/gtkplacesview.c:1307
|
||||
#: gtk/gtkplacesview.c:1231 gtk/gtkplacesview.c:1306
|
||||
msgid "Unable to access location"
|
||||
msgstr "No se puede acceder a la ubicación"
|
||||
|
||||
#. Restore from Cancel to Connect
|
||||
#: gtk/gtkplacesview.c:1250 gtk/ui/gtkplacesview.ui:317
|
||||
#: gtk/gtkplacesview.c:1249 gtk/ui/gtkplacesview.ui:449
|
||||
msgid "Con_nect"
|
||||
msgstr "Co_nectar"
|
||||
|
||||
#. if it wasn't cancelled show a dialog
|
||||
#: gtk/gtkplacesview.c:1370
|
||||
#: gtk/gtkplacesview.c:1369
|
||||
msgid "Unable to unmount volume"
|
||||
msgstr "No se puede desmontar del volumen"
|
||||
|
||||
#. Allow to cancel the operation
|
||||
#: gtk/gtkplacesview.c:1471
|
||||
#: gtk/gtkplacesview.c:1470
|
||||
msgid "Cance_l"
|
||||
msgstr "Cance_lar"
|
||||
|
||||
#: gtk/gtkplacesview.c:1634
|
||||
msgid "AppleTalk"
|
||||
msgstr "AppleTalk"
|
||||
|
||||
#. Translators: do not translate ftp:// and ftps://
|
||||
#: gtk/gtkplacesview.c:1638
|
||||
msgid "File Transfer Protocol"
|
||||
msgstr "Protocolo de transferencia de archivos"
|
||||
|
||||
#: gtk/gtkplacesview.c:1638
|
||||
msgid "ftp:// or ftps://"
|
||||
msgstr "ftp:// o ftps://"
|
||||
|
||||
#: gtk/gtkplacesview.c:1641
|
||||
msgid "Network File System"
|
||||
msgstr "Sistema de archivos en red"
|
||||
|
||||
#: gtk/gtkplacesview.c:1644
|
||||
msgid "Samba"
|
||||
msgstr "Samba"
|
||||
|
||||
#. Translators: do not translate sftp:// and ssh://
|
||||
#: gtk/gtkplacesview.c:1648
|
||||
msgid "SSH File Transfer Protocol"
|
||||
msgstr "Protocolo de transferencia de archivos por SSH"
|
||||
|
||||
#: gtk/gtkplacesview.c:1648
|
||||
msgid "sftp:// or ssh://"
|
||||
msgstr "sftp:// o ssh://"
|
||||
|
||||
#. Translators: do not translate dav:// and davs://
|
||||
#: gtk/gtkplacesview.c:1652
|
||||
msgid "WebDAV"
|
||||
msgstr "WebDAV"
|
||||
|
||||
#: gtk/gtkplacesview.c:1652
|
||||
msgid "dav:// or davs://"
|
||||
msgstr "dav:// o davs://"
|
||||
|
||||
#: gtk/gtkplacesview.c:1727
|
||||
#: gtk/gtkplacesview.c:1678
|
||||
msgid "_Disconnect"
|
||||
msgstr "_Desconectar"
|
||||
|
||||
#: gtk/gtkplacesview.c:1737
|
||||
#: gtk/gtkplacesview.c:1688
|
||||
msgid "_Connect"
|
||||
msgstr "_Conectar"
|
||||
|
||||
#: gtk/gtkplacesview.c:1878
|
||||
#: gtk/gtkplacesview.c:1829
|
||||
msgid "Unable to get remote server location"
|
||||
msgstr "No se pudo obtener la ubicación del servidor remoto"
|
||||
|
||||
#: gtk/gtkplacesview.c:2073 gtk/gtkplacesview.c:2082
|
||||
#: gtk/gtkplacesview.c:2017 gtk/gtkplacesview.c:2026
|
||||
msgid "Networks"
|
||||
msgstr "Redes"
|
||||
|
||||
#: gtk/gtkplacesview.c:2073 gtk/gtkplacesview.c:2082
|
||||
#: gtk/gtkplacesview.c:2017 gtk/gtkplacesview.c:2026
|
||||
msgid "On This Computer"
|
||||
msgstr "En este equipo"
|
||||
|
||||
@@ -3754,10 +3716,27 @@ msgid "No Results Found"
|
||||
msgstr "No se han encontrado resultados"
|
||||
|
||||
#: gtk/gtkshortcutswindow.c:1060 gtk/ui/gtkemojichooser.ui:390
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:324 gtk/ui/gtkplacesview.ui:274
|
||||
#: gtk/ui/gtkfilechooserwidget.ui:324 gtk/ui/gtkplacesview.ui:406
|
||||
msgid "Try a different search"
|
||||
msgstr "Pruebe una búsqueda diferente"
|
||||
|
||||
#. Translators: if the "on" state label requires more than three
|
||||
#. * glyphs then use MEDIUM VERTICAL BAR (U+2759) as the text for
|
||||
#. * the state
|
||||
#.
|
||||
#: gtk/gtkswitch.c:306
|
||||
msgctxt "switch"
|
||||
msgid "ON"
|
||||
msgstr "❙"
|
||||
|
||||
#. Translators: if the "off" state label requires more than three
|
||||
#. * glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
|
||||
#.
|
||||
#: gtk/gtkswitch.c:313
|
||||
msgctxt "switch"
|
||||
msgid "OFF"
|
||||
msgstr "○"
|
||||
|
||||
#: gtk/gtktextbufferrichtext.c:648
|
||||
#, c-format
|
||||
msgid "Unknown error when trying to deserialize %s"
|
||||
@@ -3939,24 +3918,24 @@ msgctxt "volume percentage"
|
||||
msgid "%d %%"
|
||||
msgstr "%d %%"
|
||||
|
||||
#: gtk/gtkwindow.c:9239
|
||||
#: gtk/gtkwindow.c:9237
|
||||
msgid "Move"
|
||||
msgstr "Mover"
|
||||
|
||||
#: gtk/gtkwindow.c:9247
|
||||
#: gtk/gtkwindow.c:9245
|
||||
msgid "Resize"
|
||||
msgstr "Redimensionar"
|
||||
|
||||
#: gtk/gtkwindow.c:9278
|
||||
#: gtk/gtkwindow.c:9276
|
||||
msgid "Always on Top"
|
||||
msgstr "Siempre encima"
|
||||
|
||||
#: gtk/gtkwindow.c:12712
|
||||
#: gtk/gtkwindow.c:12710
|
||||
#, c-format
|
||||
msgid "Do you want to use GTK+ Inspector?"
|
||||
msgstr "¿Quiere usar el inspector de GTK+?"
|
||||
|
||||
#: gtk/gtkwindow.c:12714
|
||||
#: gtk/gtkwindow.c:12712
|
||||
#, c-format
|
||||
msgid ""
|
||||
"GTK+ Inspector is an interactive debugger that lets you explore and modify "
|
||||
@@ -3967,7 +3946,7 @@ msgstr ""
|
||||
"modificar los aspectos internos de cualquier aplicación de GTK+. Al usarlo "
|
||||
"puede hacer que la aplicación falle o se cierre."
|
||||
|
||||
#: gtk/gtkwindow.c:12719
|
||||
#: gtk/gtkwindow.c:12717
|
||||
msgid "Don't show this message again"
|
||||
msgstr "No mostrar este mensaje de nuevo"
|
||||
|
||||
@@ -3981,7 +3960,7 @@ msgid "State"
|
||||
msgstr "Estado"
|
||||
|
||||
#: gtk/inspector/actions.ui:30 gtk/inspector/general.ui:115
|
||||
#: gtk/ui/gtkplacesview.ui:92
|
||||
#: gtk/ui/gtkplacesview.ui:158
|
||||
msgid "Prefix"
|
||||
msgstr "Prefijo"
|
||||
|
||||
@@ -6973,11 +6952,11 @@ msgctxt "Script"
|
||||
msgid "Zanabazar Square"
|
||||
msgstr "Zanabazar cuadrada"
|
||||
|
||||
#: gtk/ui/gtkaboutdialog.ui:136
|
||||
#: gtk/ui/gtkaboutdialog.ui:133
|
||||
msgid "About"
|
||||
msgstr "Acerca de"
|
||||
|
||||
#: gtk/ui/gtkaboutdialog.ui:176
|
||||
#: gtk/ui/gtkaboutdialog.ui:173
|
||||
msgid "Credits"
|
||||
msgstr "Créditos"
|
||||
|
||||
@@ -6989,7 +6968,7 @@ msgstr "_Ver todas las aplicaciones"
|
||||
msgid "_Find New Applications"
|
||||
msgstr "_Buscar aplicaciones nuevas"
|
||||
|
||||
#: gtk/ui/gtkappchooserwidget.ui:119
|
||||
#: gtk/ui/gtkappchooserwidget.ui:117
|
||||
msgid "No applications found."
|
||||
msgstr "No se han encontrado aplicaciones."
|
||||
|
||||
@@ -7210,24 +7189,67 @@ msgstr ""
|
||||
msgid "Available Protocols"
|
||||
msgstr "Protocolos disponibles"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:92
|
||||
msgid "AppleTalk"
|
||||
msgstr "AppleTalk"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:103
|
||||
msgid "File Transfer Protocol"
|
||||
msgstr "Protocolo de transferencia de archivos"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:114
|
||||
msgid "Network File System"
|
||||
msgstr "Sistema de archivos en red"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:125
|
||||
msgid "Samba"
|
||||
msgstr "Samba"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:136
|
||||
msgid "SSH File Transfer Protocol"
|
||||
msgstr "Protocolo de transferencia de archivos por SSH"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:147
|
||||
msgid "WebDAV"
|
||||
msgstr "WebDAV"
|
||||
|
||||
#. Translators: do not translate ftp:// and ftps://
|
||||
#: gtk/ui/gtkplacesview.ui:183
|
||||
msgid "ftp:// or ftps://"
|
||||
msgstr "ftp:// o ftps://"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:205
|
||||
msgid "smb://"
|
||||
msgstr "smb://"
|
||||
|
||||
#. Translators: do not translate sftp:// and ssh://
|
||||
#: gtk/ui/gtkplacesview.ui:216
|
||||
msgid "sftp:// or ssh://"
|
||||
msgstr "sftp:// o ssh://"
|
||||
|
||||
#. Translators: do not translate dav:// and davs://
|
||||
#: gtk/ui/gtkplacesview.ui:227
|
||||
msgid "dav:// or davs://"
|
||||
msgstr "dav:// o davs://"
|
||||
|
||||
#. Translators: Server as any successfully connected network address
|
||||
#: gtk/ui/gtkplacesview.ui:135
|
||||
#: gtk/ui/gtkplacesview.ui:267
|
||||
msgid "No recent servers found"
|
||||
msgstr "No se han encontrado servidores recientes"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:158
|
||||
#: gtk/ui/gtkplacesview.ui:290
|
||||
msgid "Recent Servers"
|
||||
msgstr "Servidores recientes"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:261
|
||||
#: gtk/ui/gtkplacesview.ui:393
|
||||
msgid "No results found"
|
||||
msgstr "No se han encontrado resultados"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:307
|
||||
#: gtk/ui/gtkplacesview.ui:439
|
||||
msgid "Connect to _Server"
|
||||
msgstr "Conectar al _servidor"
|
||||
|
||||
#: gtk/ui/gtkplacesview.ui:340
|
||||
#: gtk/ui/gtkplacesview.ui:472
|
||||
msgid "Enter server address…"
|
||||
msgstr "Introduzca la dirección del servidor…"
|
||||
|
||||
@@ -7649,7 +7671,7 @@ msgid "Vietnamese (VIQR)"
|
||||
msgstr "Vietnamita (VIQR)"
|
||||
|
||||
#. ID
|
||||
#: modules/input/imwayland.c:104
|
||||
#: modules/input/imwayland.c:100
|
||||
msgctxt "input method menu"
|
||||
msgid "Wayland"
|
||||
msgstr "Wayland"
|
||||
@@ -8293,17 +8315,6 @@ msgstr "salida-de-prueba.%s"
|
||||
msgid "Print to Test Printer"
|
||||
msgstr "Imprimir en la impresora de prueba"
|
||||
|
||||
#~ msgctxt "switch"
|
||||
#~ msgid "ON"
|
||||
#~ msgstr "❙"
|
||||
|
||||
#~ msgctxt "switch"
|
||||
#~ msgid "OFF"
|
||||
#~ msgstr "○"
|
||||
|
||||
#~ msgid "smb://"
|
||||
#~ msgstr "smb://"
|
||||
|
||||
#~| msgid "Default"
|
||||
#~ msgctxt "Language"
|
||||
#~ msgid "Default"
|
||||
|
||||
@@ -233,7 +233,7 @@ animation_timer (GtkEntryCompletion *completion)
|
||||
{
|
||||
g_print ("removing model!\n");
|
||||
|
||||
old_store = GTK_LIST_STORE (g_object_ref (store));
|
||||
old_store = g_object_ref (store);
|
||||
gtk_entry_completion_set_model (completion, NULL);
|
||||
}
|
||||
else
|
||||
|
||||
+2
-2
@@ -103,9 +103,9 @@ get_model (void)
|
||||
gtk_builder_add_from_string (builder, menu_markup, -1, &error);
|
||||
g_assert_no_error (error);
|
||||
|
||||
menu = G_MENU_MODEL (g_object_ref (gtk_builder_get_object (builder, "edit-menu")));
|
||||
menu = g_object_ref (gtk_builder_get_object (builder, "edit-menu"));
|
||||
|
||||
section = G_MENU_MODEL (g_object_ref (gtk_builder_get_object (builder, "size-placeholder")));
|
||||
section = g_object_ref (gtk_builder_get_object (builder, "size-placeholder"));
|
||||
g_object_unref (builder);
|
||||
|
||||
for (i = 0.5; i <= 2.0; i += 0.5)
|
||||
|
||||
@@ -7,14 +7,6 @@ window1
|
||||
<AtkComponent>
|
||||
layer: window
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-0
|
||||
"panel"
|
||||
parent: window1
|
||||
state: enabled sensitive showing visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
menubar1
|
||||
"menu bar"
|
||||
parent: window1
|
||||
|
||||
@@ -7,14 +7,6 @@ window1
|
||||
<AtkComponent>
|
||||
layer: window
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-0
|
||||
"panel"
|
||||
parent: window1
|
||||
state: enabled sensitive showing visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
menubutton
|
||||
"toggle button"
|
||||
parent: window1
|
||||
|
||||
@@ -7,14 +7,6 @@ window1
|
||||
<AtkComponent>
|
||||
layer: window
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-0
|
||||
"panel"
|
||||
parent: window1
|
||||
state: enabled sensitive showing visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
menubutton
|
||||
"toggle button"
|
||||
parent: window1
|
||||
@@ -31,7 +23,7 @@ window1
|
||||
<AtkAction>
|
||||
action 0 name: click
|
||||
action 0 description: Clicks the button
|
||||
unnamed-GtkPopoverAccessible-1
|
||||
unnamed-GtkPopoverAccessible-0
|
||||
"panel"
|
||||
parent: menubutton
|
||||
popup-for: menubutton
|
||||
@@ -40,54 +32,54 @@ window1
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
unnamed-GtkStackAccessible-2
|
||||
unnamed-GtkStackAccessible-1
|
||||
"panel"
|
||||
parent: unnamed-GtkPopoverAccessible-1
|
||||
parent: unnamed-GtkPopoverAccessible-0
|
||||
index: 0
|
||||
state: enabled sensitive visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-3
|
||||
unnamed-GtkContainerAccessible-2
|
||||
"filler"
|
||||
parent: unnamed-GtkStackAccessible-2
|
||||
parent: unnamed-GtkStackAccessible-1
|
||||
index: 0
|
||||
state: enabled sensitive vertical visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-4
|
||||
unnamed-GtkContainerAccessible-3
|
||||
"filler"
|
||||
parent: unnamed-GtkContainerAccessible-3
|
||||
parent: unnamed-GtkContainerAccessible-2
|
||||
index: 0
|
||||
state: enabled sensitive vertical visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-5
|
||||
unnamed-GtkContainerAccessible-4
|
||||
"filler"
|
||||
parent: unnamed-GtkContainerAccessible-4
|
||||
parent: unnamed-GtkContainerAccessible-3
|
||||
index: 0
|
||||
state: enabled sensitive vertical visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-6
|
||||
unnamed-GtkContainerAccessible-5
|
||||
"filler"
|
||||
parent: unnamed-GtkContainerAccessible-5
|
||||
parent: unnamed-GtkContainerAccessible-4
|
||||
index: 0
|
||||
state: enabled sensitive vertical visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
unnamed-GtkButtonAccessible-7
|
||||
unnamed-GtkButtonAccessible-6
|
||||
"push button"
|
||||
parent: unnamed-GtkContainerAccessible-6
|
||||
parent: unnamed-GtkContainerAccessible-5
|
||||
index: 0
|
||||
name: New
|
||||
state: enabled focusable sensitive visible
|
||||
|
||||
@@ -7,14 +7,6 @@ window1
|
||||
<AtkComponent>
|
||||
layer: window
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-0
|
||||
"panel"
|
||||
parent: window1
|
||||
state: enabled sensitive showing visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
menubutton
|
||||
"toggle button"
|
||||
parent: window1
|
||||
@@ -31,7 +23,7 @@ window1
|
||||
<AtkAction>
|
||||
action 0 name: click
|
||||
action 0 description: Clicks the button
|
||||
unnamed-GtkPopoverAccessible-1
|
||||
unnamed-GtkPopoverAccessible-0
|
||||
"panel"
|
||||
parent: menubutton
|
||||
popup-for: menubutton
|
||||
@@ -40,54 +32,54 @@ window1
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
unnamed-GtkStackAccessible-2
|
||||
unnamed-GtkStackAccessible-1
|
||||
"panel"
|
||||
parent: unnamed-GtkPopoverAccessible-1
|
||||
parent: unnamed-GtkPopoverAccessible-0
|
||||
index: 0
|
||||
state: enabled sensitive visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-3
|
||||
unnamed-GtkContainerAccessible-2
|
||||
"filler"
|
||||
parent: unnamed-GtkStackAccessible-2
|
||||
parent: unnamed-GtkStackAccessible-1
|
||||
index: 0
|
||||
state: enabled sensitive vertical visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-4
|
||||
unnamed-GtkContainerAccessible-3
|
||||
"filler"
|
||||
parent: unnamed-GtkContainerAccessible-3
|
||||
parent: unnamed-GtkContainerAccessible-2
|
||||
index: 0
|
||||
state: enabled sensitive vertical visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-5
|
||||
unnamed-GtkContainerAccessible-4
|
||||
"filler"
|
||||
parent: unnamed-GtkContainerAccessible-4
|
||||
parent: unnamed-GtkContainerAccessible-3
|
||||
index: 0
|
||||
state: enabled sensitive vertical visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-6
|
||||
unnamed-GtkContainerAccessible-5
|
||||
"filler"
|
||||
parent: unnamed-GtkContainerAccessible-5
|
||||
parent: unnamed-GtkContainerAccessible-4
|
||||
index: 0
|
||||
state: enabled sensitive vertical visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
unnamed-GtkButtonAccessible-7
|
||||
unnamed-GtkButtonAccessible-6
|
||||
"push button"
|
||||
parent: unnamed-GtkContainerAccessible-6
|
||||
parent: unnamed-GtkContainerAccessible-5
|
||||
index: 0
|
||||
name: New
|
||||
state: enabled focusable sensitive visible
|
||||
|
||||
@@ -7,14 +7,6 @@ window1
|
||||
<AtkComponent>
|
||||
layer: window
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-0
|
||||
"panel"
|
||||
parent: window1
|
||||
state: enabled sensitive showing visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
menubar1
|
||||
"menu bar"
|
||||
parent: window1
|
||||
|
||||
@@ -7,14 +7,6 @@ window1
|
||||
<AtkComponent>
|
||||
layer: window
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-0
|
||||
"panel"
|
||||
parent: window1
|
||||
state: enabled sensitive showing visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
scale1
|
||||
"slider"
|
||||
parent: window1
|
||||
|
||||
@@ -7,14 +7,6 @@ window1
|
||||
<AtkComponent>
|
||||
layer: window
|
||||
alpha: 1
|
||||
unnamed-GtkContainerAccessible-0
|
||||
"panel"
|
||||
parent: window1
|
||||
state: enabled sensitive showing visible
|
||||
toolkit: gtk
|
||||
<AtkComponent>
|
||||
layer: widget
|
||||
alpha: 1
|
||||
box1
|
||||
"filler"
|
||||
parent: window1
|
||||
|
||||
Reference in New Issue
Block a user