diff --git a/ChangeLog b/ChangeLog index 49546620..f75f46bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -163,6 +163,7 @@ Changes since version 0.80.2: - moved out font name conversion code from getstyle/setstyle/convertfonts and made it support fontsets - Converted all menu and po files to UTF-8 - Updated de.po (Thomas Otto <3.1415926535897932384626433832@gmx.net>) +- fixed a crash bug when switching workspaces Changes since version 0.80.1: ............................. diff --git a/WPrefs.app/Expert.c b/WPrefs.app/Expert.c index 34585136..b84fbf13 100644 --- a/WPrefs.app/Expert.c +++ b/WPrefs.app/Expert.c @@ -51,11 +51,10 @@ showData(_Panel *panel) WMSetButtonSelected(panel->swi[1], WMGetUDBoolForKey(udb, "NoXSetStuff")); WMSetButtonSelected(panel->swi[2], GetBoolForKey("SaveSessionOnExit")); WMSetButtonSelected(panel->swi[3], GetBoolForKey("UseSaveUnders")); - WMSetButtonSelected(panel->swi[4], GetBoolForKey("WindozeCycling")); - WMSetButtonSelected(panel->swi[5], GetBoolForKey("DontConfirmKill")); - WMSetButtonSelected(panel->swi[6], GetBoolForKey("DisableBlinking")); + WMSetButtonSelected(panel->swi[4], GetBoolForKey("DontConfirmKill")); + WMSetButtonSelected(panel->swi[5], GetBoolForKey("DisableBlinking")); //if (WMHasAntialiasingSupport(WMWidgetScreen(panel->box))) - WMSetButtonSelected(panel->swi[7], GetBoolForKey("AntialiasedText")); + WMSetButtonSelected(panel->swi[6], GetBoolForKey("AntialiasedText")); } @@ -68,7 +67,7 @@ createPanel(Panel *p) panel->box = WMCreateBox(panel->parent); WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2); - for (i=0; i<8; i++) { + for (i=0; i<7; i++) { panel->swi[i] = WMCreateSwitchButton(panel->box); WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25); WMMoveWidget(panel->swi[i], 20, 20+i*25); @@ -78,13 +77,12 @@ createPanel(Panel *p) WMSetButtonText(panel->swi[1], _("Do not set non-WindowMaker specific parameters (do not use xset).")); WMSetButtonText(panel->swi[2], _("Automatically save session when exiting Window Maker.")); WMSetButtonText(panel->swi[3], _("Use SaveUnder in window frames, icons, menus and other objects.")); - WMSetButtonText(panel->swi[4], _("Use Windoze style cycling.")); - WMSetButtonText(panel->swi[5], _("Disable confirmation panel for the Kill command.")); - WMSetButtonText(panel->swi[6], _("Disable selection animation for selected icons.")); - WMSetButtonText(panel->swi[7], _("Smooth font edges (needs restart).")); + WMSetButtonText(panel->swi[4], _("Disable confirmation panel for the Kill command.")); + WMSetButtonText(panel->swi[5], _("Disable selection animation for selected icons.")); + WMSetButtonText(panel->swi[6], _("Smooth font edges (needs restart).")); //if (!WMHasAntialiasingSupport(WMWidgetScreen(panel->box))) - WMSetButtonEnabled(panel->swi[7], True); + WMSetButtonEnabled(panel->swi[6], True); WMRealizeWidget(panel->box); WMMapSubwidgets(panel->box); @@ -104,11 +102,10 @@ storeDefaults(_Panel *panel) SetBoolForKey(WMGetButtonSelected(panel->swi[2]), "SaveSessionOnExit"); SetBoolForKey(WMGetButtonSelected(panel->swi[3]), "UseSaveUnders"); - SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "WindozeCycling"); - SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DontConfirmKill"); - SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "DisableBlinking"); + SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DontConfirmKill"); + SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DisableBlinking"); //if (WMHasAntialiasingSupport(WMWidgetScreen(panel->box))) - SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "AntialiasedText"); + SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "AntialiasedText"); } diff --git a/WPrefs.app/WPrefs.c b/WPrefs.app/WPrefs.c index 1e4c9501..73bdd221 100644 --- a/WPrefs.app/WPrefs.c +++ b/WPrefs.app/WPrefs.c @@ -87,7 +87,6 @@ typedef struct _WPrefs { WMFrame *banner; WMLabel *nameL; WMLabel *versionL; - WMLabel *creditsL; WMLabel *statusL; Panel *currentPanel; @@ -323,38 +322,30 @@ createMainWindow(WMScreen *scr) WMMoveWidget(WPrefs.banner, FRAME_LEFT, FRAME_TOP); WMSetFrameRelief(WPrefs.banner, WRFlat); - font = WMCreateFont(scr, "Lucida Sans,Comic Sans MS,Times New Roman,serif:bold:pixelsize=24"); + font = WMCreateFont(scr, "Lucida Sans,Times New Roman,serif:bold:pixelsize=24"); if (!font) font = WMBoldSystemFontOfSize(scr, 24); WPrefs.nameL = WMCreateLabel(WPrefs.banner); WMSetLabelTextAlignment(WPrefs.nameL, WACenter); - WMResizeWidget(WPrefs.nameL, FRAME_WIDTH-20, 30); - WMMoveWidget(WPrefs.nameL, 10, 25); + WMResizeWidget(WPrefs.nameL, FRAME_WIDTH-20, 60); + WMMoveWidget(WPrefs.nameL, 10, 60); WMSetLabelFont(WPrefs.nameL, font); - WMSetLabelText(WPrefs.nameL, _("Window Maker Preferences Utility")); + WMSetLabelText(WPrefs.nameL, _("Window Maker Preferences")); WMReleaseFont(font); WPrefs.versionL = WMCreateLabel(WPrefs.banner); WMResizeWidget(WPrefs.versionL, FRAME_WIDTH-20, 20); - WMMoveWidget(WPrefs.versionL, 10, 65); + WMMoveWidget(WPrefs.versionL, 10, 100); WMSetLabelTextAlignment(WPrefs.versionL, WACenter); - sprintf(buffer, _("Version %s for Window Maker %s or newer"), WVERSION, - WMVERSION); + sprintf(buffer, _("Version %s"), VERSION); WMSetLabelText(WPrefs.versionL, buffer); WPrefs.statusL = WMCreateLabel(WPrefs.banner); WMResizeWidget(WPrefs.statusL, FRAME_WIDTH-20, 60); - WMMoveWidget(WPrefs.statusL, 10, 100); + WMMoveWidget(WPrefs.statusL, 10, 150); WMSetLabelTextAlignment(WPrefs.statusL, WACenter); WMSetLabelText(WPrefs.statusL, _("Starting...")); - WPrefs.creditsL = WMCreateLabel(WPrefs.banner); - WMResizeWidget(WPrefs.creditsL, FRAME_WIDTH-20, 60); - WMMoveWidget(WPrefs.creditsL, 10, FRAME_HEIGHT-60); - WMSetLabelTextAlignment(WPrefs.creditsL, WACenter); - WMSetLabelText(WPrefs.creditsL, _("Programming/Design: Alfredo K. Kojima\n" - "Artwork: Marco van Hylckama Vlieg, Largo et al\n" - "More Programming: James Thompson et al")); WMMapSubwidgets(WPrefs.win); @@ -416,7 +407,6 @@ changeSection(WMWidget *self, void *data) if (WPrefs.currentPanel == NULL) { WMDestroyWidget(WPrefs.nameL); - WMDestroyWidget(WPrefs.creditsL); WMDestroyWidget(WPrefs.versionL); WMDestroyWidget(WPrefs.statusL); @@ -722,9 +712,7 @@ Initialize(WMScreen *scr) WMRealizeWidget(WPrefs.scrollV); - WMSetLabelText(WPrefs.statusL, - _("WPrefs is free software and is distributed WITHOUT ANY\n" - "WARRANTY under the terms of the GNU General Public License.")); + WMSetLabelText(WPrefs.statusL, ""); } diff --git a/WPrefs.app/WPrefs.h b/WPrefs.app/WPrefs.h index 07dda522..2b1ff09e 100644 --- a/WPrefs.app/WPrefs.h +++ b/WPrefs.app/WPrefs.h @@ -39,9 +39,6 @@ /****/ -#define WVERSION "0.45" -#define WMVERSION "0.65.x" - extern char *NOptionValueChanged; typedef struct _Panel Panel; diff --git a/WPrefs.app/main.c b/WPrefs.app/main.c index 7425a7f0..c69f21ff 100644 --- a/WPrefs.app/main.c +++ b/WPrefs.app/main.c @@ -114,7 +114,7 @@ main(int argc, char **argv) for (i=1; ientry_no == 0) + if (menu->entry_no <= old_pos) return -1; #define WS(i) ((WWindow*)menu->entries[i]->clientdata)->frame->workspace @@ -326,12 +326,12 @@ UpdateSwitchMenu(WScreen *scr, WWindow *wwin, int action) it = entry->flags.indicator_type; ion = entry->flags.indicator_on; - wMenuRemoveItem(switchmenu, i); - if (!IS_OMNIPRESENT(wwin) && idx < 0) { idx = menuIndexForWindow(switchmenu, wwin, i); } + wMenuRemoveItem(switchmenu, i); + entry = wMenuInsertCallback(switchmenu, idx, t, focusWindow, wwin); wfree(t);