diff --git a/osx/launcher.sh b/osx/launcher.sh index 130888c9..732f9866 100755 --- a/osx/launcher.sh +++ b/osx/launcher.sh @@ -30,9 +30,10 @@ export GTK_DATA_PREFIX="$bundle_res" export GTK_EXE_PREFIX="$bundle_res" export GTK_PATH="$bundle_res" -export GTK2_RC_FILES="$bundle_etc/gtk-2.0/gtkrc" -export GTK_IM_MODULE_FILE="$bundle_etc/gtk-2.0/gtk.immodules" -export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-2.0/gdk-pixbuf.loaders" +export GTK_THEME="Mac" +export GTK_KEY_THEME="Mac" +export GTK_IM_MODULE_FILE="$bundle_etc/gtk-3.0/gtk.immodules" +export GDK_PIXBUF_MODULE_FILE="$bundle_etc/gtk-3.0/gdk-pixbuf.loaders" export PANGO_LIBDIR="$bundle_lib" export PANGO_SYSCONFDIR="$bundle_etc" diff --git a/osx/settings.ini b/osx/settings.ini new file mode 100644 index 00000000..b81bb04d --- /dev/null +++ b/osx/settings.ini @@ -0,0 +1,5 @@ +[Settings] +gtk-theme-name=Mac +gtk-key-theme-name=Mac +gtk-menu-images=0 +gtk-button-images=0 diff --git a/osx/zoitechat.bundle b/osx/zoitechat.bundle index 81145fb8..af933ed1 100644 --- a/osx/zoitechat.bundle +++ b/osx/zoitechat.bundle @@ -8,7 +8,7 @@ ${project}/launcher.sh - gtk+-2.0 + gtk+-3.0 ${project}/Info.plist @@ -47,18 +47,18 @@ ${prefix}/lib/pango/${pkg:pango:pango_module_version}/modules/ - ${prefix}/share/themes/Mac/gtk-2.0-key/gtkrc + ${prefix}/share/themes/Mac/gtk-3.0/gtk-keys.css - + ${prefix}/share/locale ${prefix}/share/locale - - ${project}/gtkrc + + ${project}/settings.ini