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

wmaker/WPrefs: Remove legacy support for deprecated apercus.

Browse Source 
Replaced by minipreviews in December 2014.  Over two years have passed.
This commit is contained in:
Doug Torrance
2017-03-11 18:00:25 -05:00
committed by Carlos R. Mafra
parent f6320d4fa5
commit fa8121ee61
2 changed files with 0 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
WPrefs.app/Icons.c
View File

@@ -60,8 +60,6 @@ typedef struct _Panel {
CallbackRec callbacks; CallbackRec callbacks;
Bool have_legacy_apercu;
WMWidget *parent; WMWidget *parent;
WMFrame *posF; WMFrame *posF;
@@ -201,14 +199,6 @@ static void showData(_Panel * panel)
/* Mini-Previews for Icons */ /* Mini-Previews for Icons */
/*
* Backward Compatibility:
* These settings changed names after 0.95.6, so to avoid breaking user's
* config we still support the old names, and silently convert them to the
* new settings
* This hack should be kept for at least 2 years, that means >= 2017.
*/
panel->have_legacy_apercu = False;
str = GetStringForKey("MiniwindowPreviewBalloons"); str = GetStringForKey("MiniwindowPreviewBalloons");
if (str != NULL) { if (str != NULL) {
/* New names found, use them in priority */ /* New names found, use them in priority */
@@ -220,25 +210,6 @@ static void showData(_Panel * panel)
} else { } else {
i = minipreview_minimum_size; i = minipreview_minimum_size;
} }
} else {
/* No new names, try the legacy names */
b = GetBoolForKey("MiniwindowApercuBalloons");
if (b) {
panel->have_legacy_apercu = True;
i = GetIntegerForKey("ApercuSize");
/*
* In the beginning, the option was coded as a multiple of the icon
* size; then it was converted to pixel size
*/
if (i < 24)
i *= GetIntegerForKey("IconSize");
if (i <= minipreview_minimum_size)
i = minipreview_minimum_size + 1; /* +1 to not display as "off" */
} else {
i = minipreview_minimum_size;
}
} }
WMSetSliderValue(panel->minipreview.slider, i); WMSetSliderValue(panel->minipreview.slider, i);
minipreview_slider_changed(panel->minipreview.slider, panel); minipreview_slider_changed(panel->minipreview.slider, panel);
@@ -478,10 +449,6 @@ static void storeData(_Panel * panel)
} }
SetIntegerForKey(i, "MiniPreviewSize"); SetIntegerForKey(i, "MiniPreviewSize");
} }
if (panel->have_legacy_apercu) {
RemoveObjectForKey("MiniwindowApercuBalloons");
RemoveObjectForKey("ApercuSize");
}
for (i = 0; i < wlengthof(icon_animation); i++) { for (i = 0; i < wlengthof(icon_animation); i++) {
if (WMGetButtonSelected(panel->animB[i])) { if (WMGetButtonSelected(panel->animB[i])) {

48
src/defaults.c
View File

@@ -312,17 +312,6 @@ static WOptionEnumeration seDragMaximizedWindow[] = {
{NULL, 0, 0} {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 * ALL entries in the tables bellow, NEED to have a default value
* defined, and this value needs to be correct. * defined, and this value needs to be correct.
@@ -527,17 +516,6 @@ WDefaultEntry optionList[] = {
{"IgnoreGtkHints", "NO", NULL, {"IgnoreGtkHints", "NO", NULL,
&wPreferences.ignore_gtk_decoration_hints, getBool, NULL, NULL, NULL}, &wPreferences.ignore_gtk_decoration_hints, getBool, 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", "0", NULL,
&legacy_minipreview_config.size, getInt, NULL, NULL, NULL},
/* style options */ /* style options */
{"MenuStyle", "normal", seMenuStyles, {"MenuStyle", "normal", seMenuStyles,
@@ -1222,32 +1200,6 @@ void wReadDefaults(WScreen * scr, WMPropList * new_dict)
} }
} }
/*
* Backward Compatibility:
* 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 (legacy_minipreview_config.enable) {
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) { if (needs_refresh != 0 && !scr->flags.startup) {
int foo; int foo;