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

Better organized the window inspector panel.

Browse Source
This commit is contained in:
dan
2001-04-12 00:00:06 +00:00
parent 09f4b0d409
commit a41b8993e5
2 changed files with 81 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -19,6 +19,7 @@ Changes since version 0.64.0:
- Fixed problem with GNOME apps that have windows which need to stay on the - Fixed problem with GNOME apps that have windows which need to stay on the
desktop level. desktop level.
- Fixed incorrect parsing of display and screen number from $DISPLAY. - Fixed incorrect parsing of display and screen number from $DISPLAY.
- Organized the inspector panel a bit better.
Changes since version 0.63.1: Changes since version 0.63.1:

160
src/winspector.c
View File

@@ -619,32 +619,32 @@ saveSettings(WMButton *button, InspectorPanel *panel)
different |= insertAttribute(dict, winDic, AStartMaximized, value, flags); different |= insertAttribute(dict, winDic, AStartMaximized, value, flags);
value = (WMGetButtonSelected(panel->attrChk[10])!=0) ? Yes : No; value = (WMGetButtonSelected(panel->attrChk[10])!=0) ? Yes : No;
different |= insertAttribute(dict, winDic, ASkipWindowList, value, flags); different |= insertAttribute(dict, winDic, AFullMaximize, value, flags);
value = (WMGetButtonSelected(panel->moreChk[0])!=0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[0])!=0) ? Yes : No;
different |= insertAttribute(dict, winDic, ANoHideOthers, value, flags);
value = (WMGetButtonSelected(panel->moreChk[1])!=0) ? Yes : No;
different |= insertAttribute(dict, winDic, ANoKeyBindings, value, flags); different |= insertAttribute(dict, winDic, ANoKeyBindings, value, flags);
value = (WMGetButtonSelected(panel->moreChk[2])!=0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[1])!=0) ? Yes : No;
different |= insertAttribute(dict, winDic, ANoMouseBindings, value, flags); different |= insertAttribute(dict, winDic, ANoMouseBindings, value, flags);
value = (WMGetButtonSelected(panel->moreChk[3])!=0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[2])!=0) ? Yes : No;
different |= insertAttribute(dict, winDic, AKeepInsideScreen,value, flags); different |= insertAttribute(dict, winDic, ASkipWindowList, value, flags);
value = (WMGetButtonSelected(panel->moreChk[4])!=0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[3])!=0) ? Yes : No;
different |= insertAttribute(dict, winDic, AUnfocusable, value, flags); different |= insertAttribute(dict, winDic, AUnfocusable, value, flags);
value = (WMGetButtonSelected(panel->moreChk[4])!=0) ? Yes : No;
different |= insertAttribute(dict, winDic, AKeepInsideScreen,value, flags);
value = (WMGetButtonSelected(panel->moreChk[5])!=0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[5])!=0) ? Yes : No;
different |= insertAttribute(dict, winDic, ADontSaveSession, value, flags); different |= insertAttribute(dict, winDic, ANoHideOthers, value, flags);
value = (WMGetButtonSelected(panel->moreChk[6])!=0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[6])!=0) ? Yes : No;
different |= insertAttribute(dict, winDic, AEmulateAppIcon, value, flags); different |= insertAttribute(dict, winDic, ADontSaveSession, value, flags);
value = (WMGetButtonSelected(panel->moreChk[7])!=0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[7])!=0) ? Yes : No;
different |= insertAttribute(dict, winDic, AFullMaximize, value, flags); different |= insertAttribute(dict, winDic, AEmulateAppIcon, value, flags);
#ifdef XKB_BUTTON_HINT #ifdef XKB_BUTTON_HINT
value = (WMGetButtonSelected(panel->moreChk[8])!=0) ? Yes : No; value = (WMGetButtonSelected(panel->moreChk[8])!=0) ? Yes : No;
@@ -833,16 +833,16 @@ applySettings(WMButton *button, InspectorPanel *panel)
WSETUFLAG(wwin, omnipresent, WMGetButtonSelected(panel->attrChk[7])); WSETUFLAG(wwin, omnipresent, WMGetButtonSelected(panel->attrChk[7]));
WSETUFLAG(wwin, start_miniaturized, WMGetButtonSelected(panel->attrChk[8])); WSETUFLAG(wwin, start_miniaturized, WMGetButtonSelected(panel->attrChk[8]));
WSETUFLAG(wwin, start_maximized, WMGetButtonSelected(panel->attrChk[9])); WSETUFLAG(wwin, start_maximized, WMGetButtonSelected(panel->attrChk[9]));
skip_window_list = WMGetButtonSelected(panel->attrChk[10]); WSETUFLAG(wwin, full_maximize, WMGetButtonSelected(panel->attrChk[10]));
WSETUFLAG(wwin, no_hide_others, WMGetButtonSelected(panel->moreChk[0])); WSETUFLAG(wwin, no_bind_keys, WMGetButtonSelected(panel->moreChk[0]));
WSETUFLAG(wwin, no_bind_keys, WMGetButtonSelected(panel->moreChk[1])); WSETUFLAG(wwin, no_bind_mouse, WMGetButtonSelected(panel->moreChk[1]));
WSETUFLAG(wwin, no_bind_mouse, WMGetButtonSelected(panel->moreChk[2])); skip_window_list = WMGetButtonSelected(panel->moreChk[2]);
WSETUFLAG(wwin, dont_move_off, WMGetButtonSelected(panel->moreChk[3])); WSETUFLAG(wwin, no_focusable, WMGetButtonSelected(panel->moreChk[3]));
WSETUFLAG(wwin, no_focusable, WMGetButtonSelected(panel->moreChk[4])); WSETUFLAG(wwin, dont_move_off, WMGetButtonSelected(panel->moreChk[4]));
WSETUFLAG(wwin, dont_save_session, WMGetButtonSelected(panel->moreChk[5])); WSETUFLAG(wwin, no_hide_others, WMGetButtonSelected(panel->moreChk[5]));
WSETUFLAG(wwin, emulate_appicon, WMGetButtonSelected(panel->moreChk[6])); WSETUFLAG(wwin, dont_save_session, WMGetButtonSelected(panel->moreChk[6]));
WSETUFLAG(wwin, full_maximize, WMGetButtonSelected(panel->moreChk[7])); WSETUFLAG(wwin, emulate_appicon, WMGetButtonSelected(panel->moreChk[7]));
#ifdef XKB_BUTTON_HINT #ifdef XKB_BUTTON_HINT
WSETUFLAG(wwin, no_language_button, WMGetButtonSelected(panel->moreChk[8])); WSETUFLAG(wwin, no_language_button, WMGetButtonSelected(panel->moreChk[8]));
#endif #endif
@@ -991,7 +991,7 @@ revertSettings(WMButton *button, InspectorPanel *panel)
flag = WFLAGP(wwin, start_maximized!=0); flag = WFLAGP(wwin, start_maximized!=0);
break; break;
case 10: case 10:
flag = WFLAGP(wwin, skip_window_list); flag = WFLAGP(wwin, full_maximize);
break; break;
} }
WMSetButtonSelected(panel->attrChk[i], flag); WMSetButtonSelected(panel->attrChk[i], flag);
@@ -1001,28 +1001,28 @@ revertSettings(WMButton *button, InspectorPanel *panel)
switch (i) { switch (i) {
case 0: case 0:
flag = WFLAGP(wwin, no_hide_others);
break;
case 1:
flag = WFLAGP(wwin, no_bind_keys); flag = WFLAGP(wwin, no_bind_keys);
break; break;
case 2: case 1:
flag = WFLAGP(wwin, no_bind_mouse); flag = WFLAGP(wwin, no_bind_mouse);
break; break;
case 3: case 2:
flag = WFLAGP(wwin, dont_move_off); flag = WFLAGP(wwin, skip_window_list);
break; break;
case 4: case 3:
flag = WFLAGP(wwin, no_focusable); flag = WFLAGP(wwin, no_focusable);
break; break;
case 4:
flag = WFLAGP(wwin, dont_move_off);
break;
case 5: case 5:
flag = WFLAGP(wwin, dont_save_session); flag = WFLAGP(wwin, no_hide_others);
break; break;
case 6: case 6:
flag = WFLAGP(wwin, emulate_appicon); flag = WFLAGP(wwin, dont_save_session);
break; break;
case 7: case 7:
flag = WFLAGP(wwin, full_maximize); flag = WFLAGP(wwin, emulate_appicon);
break; break;
#ifdef XKB_BUTTON_HINT #ifdef XKB_BUTTON_HINT
case 8: case 8:
@@ -1323,7 +1323,7 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos,
panel->selWinB = WMCreateCommandButton(panel->specFrm); panel->selWinB = WMCreateCommandButton(panel->specFrm);
WMMoveWidget(panel->selWinB, 20, 145-24 - 10); WMMoveWidget(panel->selWinB, 20, 145-24 - 10);
WMResizeWidget(panel->selWinB, frame_width - 2*10 - 20, 24); WMResizeWidget(panel->selWinB, frame_width - 2*10 - 20, 24);
WMSetButtonText(panel->selWinB, _("Select Window")); WMSetButtonText(panel->selWinB, _("Select window"));
WMSetButtonAction(panel->selWinB, selectWindow, panel); WMSetButtonAction(panel->selWinB, selectWindow, panel);
@@ -1348,7 +1348,7 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos,
switch (i) { switch (i) {
case 0: case 0:
caption = _("Disable Titlebar"); caption = _("Disable titlebar");
flag = WFLAGP(wwin, no_titlebar); flag = WFLAGP(wwin, no_titlebar);
descr = _("Remove the titlebar of this window.\n" descr = _("Remove the titlebar of this window.\n"
"To access the window commands menu of a window\n" "To access the window commands menu of a window\n"
@@ -1357,57 +1357,59 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos,
"settings)."); "settings).");
break; break;
case 1: case 1:
caption = _("Disable Resizebar"); caption = _("Disable resizebar");
flag = WFLAGP(wwin, no_resizebar); flag = WFLAGP(wwin, no_resizebar);
descr = _("Remove the resizebar of this window."); descr = _("Remove the resizebar of this window.");
break; break;
case 2: case 2:
caption = _("Disable Close Button"); caption = _("Disable close button");
flag = WFLAGP(wwin, no_close_button); flag = WFLAGP(wwin, no_close_button);
descr = _("Remove the `close window' button of this window."); descr = _("Remove the `close window' button of this window.");
break; break;
case 3: case 3:
caption = _("Disable Miniaturize Button"); caption = _("Disable miniaturize button");
flag = WFLAGP(wwin, no_miniaturize_button); flag = WFLAGP(wwin, no_miniaturize_button);
descr = _("Remove the `miniaturize window' button of the window."); descr = _("Remove the `miniaturize window' button of the window.");
break; break;
case 4: case 4:
caption = _("Disable Border"); caption = _("Disable border");
flag = WFLAGP(wwin, no_border); flag = WFLAGP(wwin, no_border);
descr = _("Remove the 1 pixel black border around the window."); descr = _("Remove the 1 pixel black border around the window.");
break; break;
case 5: case 5:
caption = _("Keep on Top / Floating"); caption = _("Keep on top (floating)");
flag = WFLAGP(wwin, floating); flag = WFLAGP(wwin, floating);
descr = _("Keep the window over other windows, not allowing\n" descr = _("Keep the window over other windows, not allowing\n"
"them to cover it."); "them to cover it.");
break; break;
case 6: case 6:
caption = _("Keep at Bottom / Sunken"); caption = _("Keep at bottom (sunken)");
flag = WFLAGP(wwin, sunken); flag = WFLAGP(wwin, sunken);
descr = _("Keep the window under all other windows."); descr = _("Keep the window under all other windows.");
break; break;
case 7: case 7:
caption = _("Omnipresent"); caption = _("Omnipresent");
flag = WFLAGP(wwin, omnipresent); flag = WFLAGP(wwin, omnipresent);
descr = _("Make window occupy all workspaces."); descr = _("Make window present in all workspaces.");
break; break;
case 8: case 8:
caption = _("Start Miniaturized"); caption = _("Start miniaturized");
flag = WFLAGP(wwin, start_miniaturized); flag = WFLAGP(wwin, start_miniaturized);
descr = _("Make the window be automatically miniaturized when it's\n" descr = _("Make the window be automatically miniaturized when it's\n"
"first shown."); "first shown.");
break; break;
case 9: case 9:
caption = _("Start Maximized"); caption = _("Start maximized");
flag = WFLAGP(wwin, start_maximized!=0); flag = WFLAGP(wwin, start_maximized!=0);
descr = _("Make the window be automatically maximized when it's\n" descr = _("Make the window be automatically maximized when it's\n"
"first shown."); "first shown.");
break; break;
case 10: case 10:
caption = _("Skip Window List"); caption = _("Full screen maximization");
flag = WFLAGP(wwin, skip_window_list); flag = WFLAGP(wwin, full_maximize);
descr = _("Do not list the window in the window list menu."); descr = _("Make the window use the whole screen space when it's\n"
"maximized. The titlebar and resizebar will be moved\n"
"to outside the screen.");
break; break;
} }
panel->attrChk[i] = WMCreateSwitchButton(panel->attrFrm); panel->attrChk[i] = WMCreateSwitchButton(panel->attrFrm);
@@ -1439,63 +1441,61 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos,
switch (i) { switch (i) {
case 0: case 0:
caption = _("Ignore HideOthers"); caption = _("Do not bind keyboard shortcuts");
flag = WFLAGP(wwin, no_hide_others);
descr = _("Do not hide the window when issuing the\n"
"`HideOthers' command.");
break;
case 1:
caption = _("Don't Bind Keyboard Shortcuts");
flag = WFLAGP(wwin, no_bind_keys); flag = WFLAGP(wwin, no_bind_keys);
descr = _("Do not bind keyboard shortcuts from Window Maker\n" descr = _("Do not bind keyboard shortcuts from Window Maker\n"
"when this window is focused. This will allow the\n" "when this window is focused. This will allow the\n"
"window to receive all key combinations regardless\n" "window to receive all key combinations regardless\n"
"of your shortcut configuration."); "of your shortcut configuration.");
break; break;
case 2: case 1:
caption = _("Don't Bind Mouse Clicks"); caption = _("Do not bind mouse clicks");
flag = WFLAGP(wwin, no_bind_mouse); flag = WFLAGP(wwin, no_bind_mouse);
descr = _("Do not bind mouse actions, such as `Alt'+drag\n" descr = _("Do not bind mouse actions, such as `Alt'+drag\n"
"in the window (when alt is the modifier you have" "in the window (when alt is the modifier you have"
"configured)."); "configured).");
break; break;
case 3: case 2:
caption = _("Keep Inside Screen"); caption = _("Do not show in the window list");
flag = WFLAGP(wwin, dont_move_off); flag = WFLAGP(wwin, skip_window_list);
descr = _("Do not allow the window to move itself completely\n" descr = _("Do not list the window in the window list menu.");
"outside the screen. For bug compatibility.\n");
break; break;
case 4: case 3:
caption = _("Don't Let It Take Focus"); caption = _("Do not let it take focus");
flag = WFLAGP(wwin, no_focusable); flag = WFLAGP(wwin, no_focusable);
descr = _("Do not let the window take keyboard focus when you\n" descr = _("Do not let the window take keyboard focus when you\n"
"click on it."); "click on it.");
break; break;
case 4:
caption = _("Keep inside screen");
flag = WFLAGP(wwin, dont_move_off);
descr = _("Do not allow the window to move itself completely\n"
"outside the screen. For bug compatibility.\n");
break;
case 5: case 5:
caption = _("Don't Save Session"); caption = _("Ignore 'Hide Others'");
flag = WFLAGP(wwin, no_hide_others);
descr = _("Do not hide the window when issuing the\n"
"`HideOthers' command.");
break;
case 6:
caption = _("Ignore 'Save Session'");
flag = WFLAGP(wwin, dont_save_session); flag = WFLAGP(wwin, dont_save_session);
descr = _("Do not save the associated application in the\n" descr = _("Do not save the associated application in the\n"
"session's state, so that it won't be restarted\n" "session's state, so that it won't be restarted\n"
"together with other applications when Window Maker\n" "together with other applications when Window Maker\n"
"starts."); "starts.");
break; break;
case 6: case 7:
caption = _("Emulate Application Icon"); caption = _("Emulate application icon");
flag = WFLAGP(wwin, emulate_appicon); flag = WFLAGP(wwin, emulate_appicon);
descr = _("Make this window act as an application that provides\n" descr = _("Make this window act as an application that provides\n"
"enough information to Window Maker for a dockable\n" "enough information to Window Maker for a dockable\n"
"application icon to be created."); "application icon to be created.");
break; break;
case 7:
caption = _("Full Screen Maximization");
flag = WFLAGP(wwin, full_maximize);
descr = _("Make the window use the whole screen space when it's\n"
"maximized. The titlebar and resizebar will be moved\n"
"to outside the screen.");
break;
#ifdef XKB_BUTTON_HINT #ifdef XKB_BUTTON_HINT
case 8: case 8:
caption = _("Disable Language Button"); caption = _("Disable language button");
flag = WFLAGP(wwin, no_language_button); flag = WFLAGP(wwin, no_language_button);
descr = _("Remove the `toggle language' button of the window."); descr = _("Remove the `toggle language' button of the window.");
break; break;
@@ -1541,7 +1541,7 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos,
panel->fileLbl = WMCreateLabel(panel->iconFrm); panel->fileLbl = WMCreateLabel(panel->iconFrm);
WMMoveWidget(panel->fileLbl, 20, 85); WMMoveWidget(panel->fileLbl, 20, 85);
WMResizeWidget(panel->fileLbl, PWIDTH - (2 * 15) - (2 * 20), 14); WMResizeWidget(panel->fileLbl, PWIDTH - (2 * 15) - (2 * 20), 14);
WMSetLabelText(panel->fileLbl, _("Icon File Name:")); WMSetLabelText(panel->fileLbl, _("Icon filename:"));
panel->fileText = WMCreateTextField(panel->iconFrm); panel->fileText = WMCreateTextField(panel->iconFrm);
WMMoveWidget(panel->fileText, 20, 105); WMMoveWidget(panel->fileText, 20, 105);
@@ -1587,7 +1587,7 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos,
WApplication *wapp = wApplicationOf(wwin->main_window); WApplication *wapp = wApplicationOf(wwin->main_window);
panel->appFrm = WMCreateFrame(panel->win); panel->appFrm = WMCreateFrame(panel->win);
WMSetFrameTitle(panel->appFrm, _("Application Wide")); WMSetFrameTitle(panel->appFrm, _("Application Attributes"));
WMMoveWidget(panel->appFrm, 15, 50); WMMoveWidget(panel->appFrm, 15, 50);
WMResizeWidget(panel->appFrm, frame_width, 240); WMResizeWidget(panel->appFrm, frame_width, 240);
@@ -1598,12 +1598,12 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos,
switch (i) { switch (i) {
case 0: case 0:
caption = _("Start Hidden"); caption = _("Start hidden");
flag = WFLAGP(wapp->main_window_desc, start_hidden); flag = WFLAGP(wapp->main_window_desc, start_hidden);
descr = _("Automatically hide application when it's started."); descr = _("Automatically hide application when it's started.");
break; break;
case 1: case 1:
caption = _("No Application Icon"); caption = _("No application icon");
flag = WFLAGP(wapp->main_window_desc, no_appicon); flag = WFLAGP(wapp->main_window_desc, no_appicon);
descr = _("Disable the application icon for the application.\n" descr = _("Disable the application icon for the application.\n"
"Note that you won't be able to dock it anymore,\n" "Note that you won't be able to dock it anymore,\n"
@@ -1611,7 +1611,7 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos,
"working correctly."); "working correctly.");
break; break;
case 2: case 2:
caption = _("Collapse Application Icons"); caption = _("Collapse application icons");
flag = WFLAGP(wapp->main_window_desc, collapse_appicons); flag = WFLAGP(wapp->main_window_desc, collapse_appicons);
descr = _("Collapse application icons from other instances\n" descr = _("Collapse application icons from other instances\n"
"of this application into one.\n"); "of this application into one.\n");
@@ -1628,10 +1628,10 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos,
if (WFLAGP(wwin, emulate_appicon)) { if (WFLAGP(wwin, emulate_appicon)) {
WMSetButtonEnabled(panel->appChk[1], False); WMSetButtonEnabled(panel->appChk[1], False);
WMSetButtonEnabled(panel->moreChk[6], True); WMSetButtonEnabled(panel->moreChk[7], True);
} else { } else {
WMSetButtonEnabled(panel->appChk[1], True); WMSetButtonEnabled(panel->appChk[1], True);
WMSetButtonEnabled(panel->moreChk[6], False); WMSetButtonEnabled(panel->moreChk[7], False);
} }
} else { } else {
int tmp; int tmp;
@@ -1641,7 +1641,7 @@ createInspectorForWindow(WWindow *wwin, int xpos, int ypos,
tmp = False; tmp = False;
else else
tmp = True; tmp = True;
WMSetButtonEnabled(panel->moreChk[6], tmp); WMSetButtonEnabled(panel->moreChk[7], tmp);
WMSetPopUpButtonItemEnabled(panel->pagePopUp, 4, False); WMSetPopUpButtonItemEnabled(panel->pagePopUp, 4, False);
panel->appFrm = NULL; panel->appFrm = NULL;