From 894ba46223fbea521853feebde6cb5ef6cebc179 Mon Sep 17 00:00:00 2001 From: trizen Date: Sun, 22 Aug 2021 23:05:45 +0300 Subject: [PATCH] - Use Gtk3 by default. This can be changed in the config file, by changing `gtk_version` from `3` to `2`, which will use Gtk2 instead. See also: https://github.com/trizen/obmenu-generator/discussions/42 - Version 0.90 --- obmenu-generator | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/obmenu-generator b/obmenu-generator index 6f5874f..73a4b6b 100755 --- a/obmenu-generator +++ b/obmenu-generator @@ -24,7 +24,7 @@ # Name: obmenu-generator # License: GPLv3 # Created: 25 March 2011 -# Latest edit: 10 August 2021 +# Latest edit: 22 August 2021 # https://github.com/trizen/obmenu-generator use 5.014; @@ -35,7 +35,7 @@ use 5.014; use Linux::DesktopFiles; my $pkgname = 'obmenu-generator'; -my $version = '0.89'; +my $version = '0.90'; our ($CONFIG, $SCHEMA); my $output_h = \*STDOUT; @@ -114,8 +114,8 @@ my $config_help = <<"HELP"; ], || ICON SETTINGS - | use_gtk3 : Use the Gtk3 library for resolving the icon paths. (default: 0) - | gtk_rc_filename : Absolute path to the GTK configuration file. + | gtk_version : The version of the Gtk library used for resolving the icon paths. (default: 3) + | gtk_rc_filename : Absolute path to the Gtk configuration file. | missing_icon : Use this icon for missing icons (default: gtk-missing-image) | icon_size : Preferred size for icons. (default: 48) | generic_fallback : Try to shorten icon name at '-' characters before looking at inherited themes. (default: 0) @@ -249,13 +249,13 @@ my %CONFIG = ( terminal => 'xterm', editor => 'geany', missing_icon => 'gtk-missing-image', - gtk_rc_filename => "$home_dir/.gtkrc-2.0", + gtk_rc_filename => "$home_dir/.config/gtk-3.0/settings.ini", icon_size => 48, force_icon_size => 0, generic_fallback => 0, locale_support => 1, - use_gtk3 => 0, + gtk_version => 3, VERSION => $version, ); @@ -380,7 +380,7 @@ sub get_icon_path { require Digest::MD5; - $CONFIG{use_gtk3} + ($CONFIG{gtk_version} == 3) ? do { eval "use Gtk3"; 'Gtk3'->init;