"Hide toolbar"), 6);
update();
+ setValues();
+}
+
+void Configmenu::setValues() {
setItemSelected(2, screen.getImageControl()->doDither());
setItemSelected(3, screen.opaqueMove());
setItemSelected(4, screen.fullMax());
setItemSelected(7, screen.hideToolbar());
}
-Configmenu::~Configmenu(void) {
+Configmenu::~Configmenu() {
delete focusmenu;
delete placementmenu;
}
switch(item->function()) {
case 1: { // dither
- screen.getImageControl()->
- setDither((! screen.getImageControl()->doDither()));
+ screen.setImageDither(!screen.getImageControl()->doDither());
setItemSelected(index, screen.getImageControl()->doDither());
} // switch
}
-void Configmenu::reconfigure(void) {
+void Configmenu::reconfigure() {
+ setValues();
focusmenu->reconfigure();
placementmenu->reconfigure();
"Auto Raise"), 3);
update();
+ setValues();
+}
+
+void Configmenu::Focusmenu::setValues() {
setItemSelected(0, !configmenu->screen.sloppyFocus());
setItemSelected(1, configmenu->screen.sloppyFocus());
setItemEnabled(2, configmenu->screen.sloppyFocus());
setItemSelected(2, configmenu->screen.autoRaise());
}
+void Configmenu::Focusmenu::reconfigure() {
+ setValues();
+ Basemenu::reconfigure();
+}
+
void Configmenu::Focusmenu::itemSelected(int button, int index) {
if (button != 1)
return;
configmenu->screen.setSloppyFocus(false);
configmenu->screen.setAutoRaise(false);
- if (! configmenu->screen.getOpenbox().getFocusedWindow())
+ if (! configmenu->screen.getOpenbox().focusedWindow())
XSetInputFocus(configmenu->screen.getOpenbox().getXDisplay(),
configmenu->screen.getToolbar()->getWindowID(),
RevertToParent, CurrentTime);
else
XSetInputFocus(configmenu->screen.getOpenbox().getXDisplay(),
configmenu->screen.getOpenbox().
- getFocusedWindow()->getClientWindow(),
+ focusedWindow()->getClientWindow(),
RevertToParent, CurrentTime);
configmenu->screen.reconfigure();
"Cascade Placement"), BScreen::CascadePlacement);
insert(i18n->getMessage(ConfigmenuSet, ConfigmenuBestFit,
"Best Fit Placement"), BScreen::BestFitPlacement);
+ insert(i18n->getMessage(ConfigmenuSet, ConfigmenuUnderMouse,
+ "Under Mouse Placement"),
+ BScreen::UnderMousePlacement);
+ insert(i18n->getMessage(ConfigmenuSet, ConfigmenuClickMouse,
+ "Click Mouse Placement"),
+ BScreen::ClickMousePlacement);
insert(i18n->getMessage(ConfigmenuSet, ConfigmenuLeftRight,
"Left to Right"), BScreen::LeftRight);
insert(i18n->getMessage(ConfigmenuSet, ConfigmenuRightLeft,
"Bottom to Top"), BScreen::BottomTop);
update();
- switch (configmenu->screen.placementPolicy()) {
- case BScreen::RowSmartPlacement:
- setItemSelected(0, True);
- break;
-
- case BScreen::ColSmartPlacement:
- setItemSelected(1, True);
- break;
-
- case BScreen::CascadePlacement:
- setItemSelected(2, True);
- break;
+ setValues();
+}
- case BScreen::BestFitPlacement:
- setItemSelected(3, True);
- break;
- }
+void Configmenu::Placementmenu::setValues() {
+ const int p = configmenu->screen.placementPolicy();
+ setItemSelected(0, p == BScreen::RowSmartPlacement);
+ setItemSelected(1, p == BScreen::ColSmartPlacement);
+ setItemSelected(2, p == BScreen::CascadePlacement);
+ setItemSelected(3, p == BScreen::BestFitPlacement);
+ setItemSelected(4, p == BScreen::UnderMousePlacement);
+ setItemSelected(5, p == BScreen::ClickMousePlacement);
- Bool rl = (configmenu->screen.rowPlacementDirection() ==
+ bool rl = (configmenu->screen.rowPlacementDirection() ==
BScreen::LeftRight),
tb = (configmenu->screen.colPlacementDirection() ==
BScreen::TopBottom);
- setItemSelected(4, rl);
- setItemSelected(5, !rl);
+ setItemSelected(6, rl);
+ setItemEnabled(6, (p != BScreen::UnderMousePlacement &&
+ p != BScreen::ClickMousePlacement));
+ setItemSelected(7, !rl);
+ setItemEnabled(7, (p != BScreen::UnderMousePlacement &&
+ p != BScreen::ClickMousePlacement));
+
+ setItemSelected(8, tb);
+ setItemEnabled(8, (p != BScreen::UnderMousePlacement &&
+ p != BScreen::ClickMousePlacement));
+ setItemSelected(9, !tb);
+ setItemEnabled(9, (p != BScreen::UnderMousePlacement &&
+ p != BScreen::ClickMousePlacement));
+}
- setItemSelected(6, tb);
- setItemSelected(7, !tb);
+void Configmenu::Placementmenu::reconfigure() {
+ setValues();
+ Basemenu::reconfigure();
}
void Configmenu::Placementmenu::itemSelected(int button, int index) {
switch (item->function()) {
case BScreen::RowSmartPlacement:
configmenu->screen.setPlacementPolicy(item->function());
-
- setItemSelected(0, True);
- setItemSelected(1, False);
- setItemSelected(2, False);
- setItemSelected(3, False);
-
break;
case BScreen::ColSmartPlacement:
configmenu->screen.setPlacementPolicy(item->function());
-
- setItemSelected(0, False);
- setItemSelected(1, True);
- setItemSelected(2, False);
- setItemSelected(3, False);
-
break;
case BScreen::CascadePlacement:
configmenu->screen.setPlacementPolicy(item->function());
-
- setItemSelected(0, False);
- setItemSelected(1, False);
- setItemSelected(2, True);
- setItemSelected(3, False);
-
break;
case BScreen::BestFitPlacement:
configmenu->screen.setPlacementPolicy(item->function());
+ break;
- setItemSelected(0, False);
- setItemSelected(1, False);
- setItemSelected(2, False);
- setItemSelected(3, True);
+ case BScreen::UnderMousePlacement:
+ configmenu->screen.setPlacementPolicy(item->function());
+ break;
+ case BScreen::ClickMousePlacement:
+ configmenu->screen.setPlacementPolicy(item->function());
break;
case BScreen::LeftRight:
configmenu->screen.setRowPlacementDirection(BScreen::LeftRight);
-
- setItemSelected(4, True);
- setItemSelected(5, False);
-
break;
case BScreen::RightLeft:
configmenu->screen.setRowPlacementDirection(BScreen::RightLeft);
-
- setItemSelected(4, False);
- setItemSelected(5, True);
-
break;
case BScreen::TopBottom:
configmenu->screen.setColPlacementDirection(BScreen::TopBottom);
-
- setItemSelected(5, True);
- setItemSelected(6, False);
-
break;
case BScreen::BottomTop:
configmenu->screen.setColPlacementDirection(BScreen::BottomTop);
-
- setItemSelected(5, False);
- setItemSelected(6, True);
-
break;
}
+ setValues();
}