nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reorder the menu, put Workspace Warping beside the opaque moving option

Browse source
This commit is contained in:
Dana Jansens 2002-07-23 04:31:28 +00:00
parent 6747a451f4
commit 725e87a05e
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/Configmenu.cc
View file

@ -54,18 +54,18 @@ Configmenu::Configmenu(BScreen *scr) : Basemenu(scr) {
"Image Dithering"), 1); "Image Dithering"), 1);
insert(i18n(ConfigmenuSet, ConfigmenuOpaqueMove, insert(i18n(ConfigmenuSet, ConfigmenuOpaqueMove,
"Opaque Window Moving"), 2); "Opaque Window Moving"), 2);
insert(i18n(ConfigmenuSet, ConfigmenuFullMax,
"Full Maximization"), 3);
insert(i18n(ConfigmenuSet, ConfigmenuFocusNew,
"Focus New Windows"), 4);
insert(i18n(ConfigmenuSet, ConfigmenuFocusLast,
"Focus Last Window on Workspace"), 5);
insert(i18n(ConfigmenuSet, ConfigmenuWindowToWindowSnap,
"Window-To-Window Snapping"), 6);
insert(i18n(ConfigmenuSet, ConfigmenuWindowCornerSnap,
"Window Corner Snapping"), 7);
insert(i18n(ConfigmenuSet, ConfigmenuWorkspaceWarping, insert(i18n(ConfigmenuSet, ConfigmenuWorkspaceWarping,
"Workspace Warping"), 8); "Workspace Warping"), 3);
insert(i18n(ConfigmenuSet, ConfigmenuFullMax,
"Full Maximization"), 4);
insert(i18n(ConfigmenuSet, ConfigmenuFocusNew,
"Focus New Windows"), 5);
insert(i18n(ConfigmenuSet, ConfigmenuFocusLast,
"Focus Last Window on Workspace"), 6);
insert(i18n(ConfigmenuSet, ConfigmenuWindowToWindowSnap,
"Window-To-Window Snapping"), 7);
insert(i18n(ConfigmenuSet, ConfigmenuWindowCornerSnap,
"Window Corner Snapping"), 8);
insert(i18n(ConfigmenuSet, ConfigmenuDisableBindings, insert(i18n(ConfigmenuSet, ConfigmenuDisableBindings,
"Disable Mouse with Scroll Lock"), 9); "Disable Mouse with Scroll Lock"), 9);
insert(i18n(ConfigmenuSet, ConfigmenuHideToolbar, insert(i18n(ConfigmenuSet, ConfigmenuHideToolbar,
@ -82,6 +82,7 @@ void Configmenu::setValues(void) {
#endif // XINERAMA #endif // XINERAMA
setItemSelected(index++, getScreen()->doImageDither()); setItemSelected(index++, getScreen()->doImageDither());
setItemSelected(index++, getScreen()->doOpaqueMove()); setItemSelected(index++, getScreen()->doOpaqueMove());
setItemSelected(index++, getScreen()->doWorkspaceWarping());
setItemSelected(index++, getScreen()->doFullMax()); setItemSelected(index++, getScreen()->doFullMax());
setItemSelected(index++, getScreen()->doFocusNew()); setItemSelected(index++, getScreen()->doFocusNew());
setItemSelected(index++, getScreen()->doFocusLast()); setItemSelected(index++, getScreen()->doFocusLast());
@ -90,7 +91,6 @@ void Configmenu::setValues(void) {
setItemSelected(index, getScreen()->getWindowCornerSnap()); setItemSelected(index, getScreen()->getWindowCornerSnap());
setItemEnabled(index++, getScreen()->getWindowToWindowSnap()); setItemEnabled(index++, getScreen()->getWindowToWindowSnap());
setItemSelected(index++, getScreen()->doWorkspaceWarping());
setItemSelected(index++, getScreen()->allowScrollLock()); setItemSelected(index++, getScreen()->allowScrollLock());
setItemSelected(index++, getScreen()->doHideToolbar()); setItemSelected(index++, getScreen()->doHideToolbar());
} }
@ -125,37 +125,37 @@ void Configmenu::itemSelected(int button, unsigned int index) {
setItemSelected(index, getScreen()->doOpaqueMove()); setItemSelected(index, getScreen()->doOpaqueMove());
break; break;
case 3: // full maximization case 3: // workspace wrapping
getScreen()->saveWorkspaceWarping(! getScreen()->doWorkspaceWarping());
setItemSelected(index, getScreen()->doWorkspaceWarping());
break;
case 4: // full maximization
getScreen()->saveFullMax(! getScreen()->doFullMax()); getScreen()->saveFullMax(! getScreen()->doFullMax());
setItemSelected(index, getScreen()->doFullMax()); setItemSelected(index, getScreen()->doFullMax());
break; break;
case 4: // focus new windows case 5: // focus new windows
getScreen()->saveFocusNew(! getScreen()->doFocusNew()); getScreen()->saveFocusNew(! getScreen()->doFocusNew());
setItemSelected(index, getScreen()->doFocusNew()); setItemSelected(index, getScreen()->doFocusNew());
break; break;
case 5: // focus last window on workspace case 6: // focus last window on workspace
getScreen()->saveFocusLast(! getScreen()->doFocusLast()); getScreen()->saveFocusLast(! getScreen()->doFocusLast());
setItemSelected(index, getScreen()->doFocusLast()); setItemSelected(index, getScreen()->doFocusLast());
break; break;
case 6: // window-to-window snapping case 7: // window-to-window snapping
getScreen()->saveWindowToWindowSnap(! getScreen()->getWindowToWindowSnap()); getScreen()->saveWindowToWindowSnap(! getScreen()->getWindowToWindowSnap());
setItemSelected(index, getScreen()->getWindowToWindowSnap()); setItemSelected(index, getScreen()->getWindowToWindowSnap());
setItemEnabled(index + 1, getScreen()->getWindowToWindowSnap()); setItemEnabled(index + 1, getScreen()->getWindowToWindowSnap());
break; break;
case 7: // window corner snapping case 8: // window corner snapping
getScreen()->saveWindowCornerSnap(! getScreen()->getWindowCornerSnap()); getScreen()->saveWindowCornerSnap(! getScreen()->getWindowCornerSnap());
setItemSelected(index, getScreen()->getWindowCornerSnap()); setItemSelected(index, getScreen()->getWindowCornerSnap());
break; break;
case 8: // workspace wrapping
getScreen()->saveWorkspaceWarping(! getScreen()->doWorkspaceWarping());
setItemSelected(index, getScreen()->doWorkspaceWarping());
break;
case 9: // disable mouse bindings with Scroll Lock case 9: // disable mouse bindings with Scroll Lock
getScreen()->saveAllowScrollLock(! getScreen()->allowScrollLock()); getScreen()->saveAllowScrollLock(! getScreen()->allowScrollLock());
setItemSelected(index, getScreen()->allowScrollLock()); setItemSelected(index, getScreen()->allowScrollLock());