gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-22 14:08:06 +01:00
Code Issues Projects Releases Wiki Activity

Renamed "Apercu" to "MiniPreview" in the configuration database

Browse Source 
The name of the 2 settings have been changed:
 - enable: MiniwindowApercuBalloons -> MiniwindowPreviewBalloons
 - size: ApercuSize -> MiniPreviewSize

The old name is still supported to avoid breaking user's configuration, but
WPrefs will update the setting to the new names when updating the
configuration.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2014-12-31 01:09:53 +01:00
committed by Carlos R. Mafra
parent 67b4302ef8
commit 5c9438115b
3 changed files with 86 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/defaults.c
View File

@@ -318,6 +318,17 @@ static WOptionEnumeration seDragMaximizedWindow[] = {
{NULL, 0, 0}
};
/*
* Backward Compatibility:
* The Mini-Previews were introduced in 0.95.6 under the name "Apercu".
* For compatibility, we still support the old names in configuration files,
* which are loaded in this structure, so this should stay for at least
* 2 years (that means until 2017) */
static struct {
char enable;
int size;
} legacy_minipreview_config;
/*
* ALL entries in the tables bellow, NEED to have a default value
* defined, and this value needs to be correct.
@@ -485,7 +496,7 @@ WDefaultEntry optionList[] = {
&wPreferences.window_balloon, getBool, NULL, NULL, NULL},
{"MiniwindowTitleBalloons", "NO", NULL,
&wPreferences.miniwin_title_balloon, getBool, NULL, NULL, NULL},
{"MiniwindowApercuBalloons", "NO", NULL,
{"MiniwindowPreviewBalloons", "NO", NULL,
&wPreferences.miniwin_preview_balloon, getBool, NULL, NULL, NULL},
{"AppIconBalloons", "NO", NULL,
&wPreferences.appicon_balloon, getBool, NULL, NULL, NULL},
@@ -505,9 +516,20 @@ WDefaultEntry optionList[] = {
&wPreferences.strict_windoze_cycle, getBool, NULL, NULL, NULL},
{"SwitchPanelOnlyOpen", "NO", NULL,
&wPreferences.panel_only_open, getBool, NULL, NULL, NULL},
{"ApercuSize", "128", NULL,
{"MiniPreviewSize", "128", NULL,
&wPreferences.minipreview_size, getInt, NULL, NULL, NULL},
/*
* Backward Compatibility:
* The Mini-Previews were introduced in 0.95.6 under the name "Apercu".
* For compatibility, we still support the old names in configuration files,
* so this should stay for at least 2 years (that means until 2017)
*/
{"MiniwindowApercuBalloons", "NO", NULL,
&legacy_minipreview_config.enable, getBool, NULL, NULL, NULL},
{"ApercuSize", "128", NULL,
&legacy_minipreview_config.size, getInt, NULL, NULL, NULL},
/* style options */
{"MenuStyle", "normal", seMenuStyles,
@@ -1131,6 +1153,10 @@ void wReadDefaults(WScreen * scr, WMPropList * new_dict)
void *tdata;
WMPropList *old_dict = (w_global.domain.wmaker->dictionary != new_dict ? w_global.domain.wmaker->dictionary : NULL);
/* Backward Compatibility: init array to special value to detect if they changed */
legacy_minipreview_config.enable = 99;
legacy_minipreview_config.size = -1;
needs_refresh = 0;
for (i = 0; i < wlengthof(optionList); i++) {
@@ -1190,18 +1216,28 @@ void wReadDefaults(WScreen * scr, WMPropList * new_dict)
/*
* Backward Compatibility:
* the option 'minipreview_size' used to be coded as a multiple of the icon size in v0.95.6
* it is now expressed directly in pixels, but to avoid breaking user's setting we check
* for old coding and convert it now.
* Support the old setting names for Apercu, now called Mini-Preview
*
* This code should probably stay for at least 2 years, you should not consider removing
* it before year 2017
*/
if (wPreferences.minipreview_size < 24) {
/* 24 is the minimum icon size proposed in WPref's settings */
wPreferences.minipreview_size *= wPreferences.icon_size;
if (wPreferences.miniwin_preview_balloon)
wwarning(_("your ApercuSize setting is using old syntax, it is converted to %d pixels; consider running WPrefs.app to update your settings"),
wPreferences.minipreview_size);
if (legacy_minipreview_config.enable != 99) {
wwarning(_("your configuration is using old syntax for Mini-Preview settings; consider running WPrefs.app to update"));
wPreferences.miniwin_preview_balloon = legacy_minipreview_config.enable;
if (legacy_minipreview_config.size >= 0) {
/*
* the option 'ApercuSize' used to be coded as a multiple of the icon size in v0.95.6
* it is now expressed directly in pixels, but to avoid breaking user's setting we check
* for old coding and convert it now.
*/
if (legacy_minipreview_config.size < 24) {
/* 24 is the minimum icon size proposed in WPref's settings */
wPreferences.minipreview_size = legacy_minipreview_config.size * wPreferences.icon_size;
} else {
wPreferences.minipreview_size = legacy_minipreview_config.size;
}
}
}
if (needs_refresh != 0 && !scr->flags.startup) {