Menu
▾
▴
[SM-CVS] CVS: squirrelmail/config conf.pl, 1.270, 1.271 config_default.php, 1.152, 1.153
|
From: Steve B. <ste...@us...> - 2006-10-09 18:04:45
|
Update of /cvsroot/squirrelmail/squirrelmail/config In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19602/config Modified Files: conf.pl config_default.php Log Message: Add support for fallback icon themes. Similar to fallback template set. Index: conf.pl =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/config/conf.pl,v retrieving revision 1.270 retrieving revision 1.271 diff -u -w -r1.270 -r1.271 --- conf.pl 9 Oct 2006 11:35:21 -0000 1.270 +++ conf.pl 9 Oct 2006 18:04:42 -0000 1.271 @@ -2744,14 +2744,22 @@ sub command_iconSets { print "\nDefine the icon themes that you wish to use. If you have added\n"; print "a theme of your own, just follow the instructions (?) about\n"; - print "how to add them. You can also change the default theme.\n\n"; + print "how to add them. You can also change the default and fallback\n"; + print "themes. The default theme will be used when no icon theme is\n"; + print "set by the user. The fallback theme will be used if an icon\n"; + print "cannot be found in the currently selected icon theme.\n\n"; print "Available icon themes:\n\n"; $count = 0; while ( $count <= $#icon_theme_name ) { if ( $count == $icon_theme_def ) { - print " *"; + print " d"; + } else { + print " "; + } + if ( $count eq $icon_theme_fallback ) { + print "f "; } else { print " "; } @@ -2770,12 +2778,15 @@ $count++; } + print "\n d = Default icon theme\n"; + print " f = Fallback icon theme\n"; print "\n"; print ".------------------------------------.\n"; print "| t (detect icon themes) |\n"; print "| + (add icon theme) |\n"; print "| - N (remove icon theme) |\n"; print "| m N (mark default icon theme) |\n"; + print "| f N (set fallback icon set) |\n"; print "| l (list icon themes) |\n"; print "| d (done) |\n"; print "`------------------------------------'\n"; @@ -2786,13 +2797,16 @@ while ( $input ne "d" ) { if ( $input =~ /^\s*l\s*/i ) { $count = 0; + print "\n"; while ( $count <= $#icon_theme_name ) { if ( $count == $icon_theme_def ) { - print " *"; + print " d"; } else { print " "; } - if ( $count < 10 ) { + if ( $count eq $icon_theme_fallback ) { + print "f "; + } else { print " "; } $name = $icon_theme_name[$count]; @@ -2806,6 +2820,8 @@ $count++; } + print "\n d = Default icon theme\n"; + print " f = Fallback icon theme\n\n"; } elsif ( $input =~ /^\s*m\s*[0-9]+/i ) { $old_def = $icon_theme_def; $icon_theme_def = $input; @@ -2814,6 +2830,14 @@ print "Cannot set default icon theme to $icon_theme_default. That theme does not exist.\n"; $icon_theme_def = $old_def; } + } elsif ( $input =~ /^\s*f\s*[0-9]+/i ) { + $old_fb = $icon_theme_fallback; + $icon_theme_fallback = $input; + $icon_theme_fallback =~ s/^\s*f\s*//; + if ( ( $icon_theme_fallback > $#icon_theme_name ) || ( $icon_theme_fallback < 0 ) ) { + print "Cannot set fallback icon theme to $icon_theme_fallback. That theme does not exist.\n"; + $icon_theme_fallback = $old_fb; + } } elsif ( $input =~ /^\s*\+/ ) { print "What is the name of this icon theme? "; $name = <STDIN>; @@ -2834,6 +2858,8 @@ } if ( $rem_num == $icon_theme_def ) { print "You cannot remove the default icon theme!\n"; + } elsif ( $rem_num == $icon_theme_fallback ) { + print "You cannot remove the fallback icon theme!\n"; } else { $count = 0; @new_theme_name = (); @@ -2910,6 +2936,7 @@ print "| + (add icon theme) |\n"; print "| - N (remove icon theme) |\n"; print "| m N (mark default icon theme) |\n"; + print "| f N (set fallback icon set) |\n"; print "| l (list icon themes) |\n"; print "| d (done) |\n"; print "`------------------------------------'\n"; @@ -4354,6 +4381,8 @@ if ( $icon_theme_def eq '' ) { $icon_theme_def = '0'; } print CF "\$icon_theme_def = $icon_theme_def;\n"; + if ( $icon_theme_fallback eq '' ) { $icon_theme_fallback = '0'; } + print CF "\$icon_theme_fallback = $icon_theme_fallback;\n"; for ( $count = 0 ; $count <= $#icon_theme_name ; $count++ ) { $path = $icon_theme_path[$count]; Index: config_default.php =================================================================== RCS file: /cvsroot/squirrelmail/squirrelmail/config/config_default.php,v retrieving revision 1.152 retrieving revision 1.153 diff -u -w -r1.152 -r1.153 --- config_default.php 9 Oct 2006 11:35:21 -0000 1.152 +++ config_default.php 9 Oct 2006 18:04:42 -0000 1.153 @@ -708,11 +708,15 @@ * number to the array below and follow the pattern * * $icon_theme_default sets the theme that will be used by default. + * $icon_theme_fallback specifies which theme will be used if an icon is + * not found in the selected theme * * @global integer $icon_theme_def + * @global integer $icon_theme_fallback * @since 1.5.2 */ -$icon_theme_def = 3; +$icon_theme_def = 1; +$icon_theme_fallback = 3; /** * Listing of installed icon themes |