X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FConfigmenu.cc;h=a12ca5ad1ac1f0f60161302bd4041152a82a34de;hb=66e3f4d0600eeb8c642dc2f3b3320a3e9af075e3;hp=aa715f1eb0ff1d8e0384bce0d4cc4032e90e7aa2;hpb=424d476f7cd0ccc2def4f14119cd4fc3171d0159;p=chaz%2Fopenbox diff --git a/src/Configmenu.cc b/src/Configmenu.cc index aa715f1e..a12ca5ad 100644 --- a/src/Configmenu.cc +++ b/src/Configmenu.cc @@ -36,9 +36,8 @@ #include "Window.h" #include "Screen.h" -Configmenu::Configmenu(BScreen *scr) : Basemenu(scr) { - screen = scr; - openbox = screen->getOpenbox(); +Configmenu::Configmenu(BScreen &scr) : Basemenu(scr), screen(scr) +{ setLabel(i18n->getMessage(ConfigmenuSet, ConfigmenuConfigOptions, "Config options")); setInternalMenu(); @@ -60,16 +59,23 @@ Configmenu::Configmenu(BScreen *scr) : Basemenu(scr) { "Focus New Windows"), 4); insert(i18n->getMessage(ConfigmenuSet, ConfigmenuFocusLast, "Focus Last Window on Workspace"), 5); + insert(i18n->getMessage(ConfigmenuSet, ConfigmenuHideToolbar, + "Hide toolbar"), 6); update(); - setItemSelected(2, screen->getImageControl()->doDither()); - setItemSelected(3, screen->doOpaqueMove()); - setItemSelected(4, screen->doFullMax()); - setItemSelected(5, screen->doFocusNew()); - setItemSelected(6, screen->doFocusLast()); + setValues(); } -Configmenu::~Configmenu(void) { +void Configmenu::setValues() { + setItemSelected(2, screen.getImageControl()->doDither()); + setItemSelected(3, screen.opaqueMove()); + setItemSelected(4, screen.fullMax()); + setItemSelected(5, screen.focusNew()); + setItemSelected(6, screen.focusLast()); + setItemSelected(7, screen.hideToolbar()); +} + +Configmenu::~Configmenu() { delete focusmenu; delete placementmenu; } @@ -85,45 +91,51 @@ void Configmenu::itemSelected(int button, int index) { switch(item->function()) { case 1: { // dither - screen->getImageControl()-> - setDither((! screen->getImageControl()->doDither())); + screen.getImageControl()-> + setDither((! screen.getImageControl()->doDither())); - setItemSelected(index, screen->getImageControl()->doDither()); + setItemSelected(index, screen.getImageControl()->doDither()); break; } case 2: { // opaque move - screen->saveOpaqueMove((! screen->doOpaqueMove())); + screen.setOpaqueMove(!screen.opaqueMove()); - setItemSelected(index, screen->doOpaqueMove()); + setItemSelected(index, screen.opaqueMove()); break; } case 3: { // full maximization - screen->saveFullMax((! screen->doFullMax())); + screen.setFullMax(!screen.fullMax()); - setItemSelected(index, screen->doFullMax()); + setItemSelected(index, screen.fullMax()); break; } case 4: { // focus new windows - screen->saveFocusNew((! screen->doFocusNew())); + screen.setFocusNew(!screen.focusNew()); - setItemSelected(index, screen->doFocusNew()); + setItemSelected(index, screen.focusNew()); break; } case 5: { // focus last window on workspace - screen->saveFocusLast((! screen->doFocusLast())); - setItemSelected(index, screen->doFocusLast()); + screen.setFocusLast(!screen.focusLast()); + setItemSelected(index, screen.focusLast()); + break; + } + case 6:{ //toggle toolbar hide + screen.setHideToolbar(!screen.hideToolbar()); + setItemSelected(index, screen.hideToolbar()); break; } } // switch } -void Configmenu::reconfigure(void) { +void Configmenu::reconfigure() { + setValues(); focusmenu->reconfigure(); placementmenu->reconfigure(); @@ -145,10 +157,19 @@ Configmenu::Focusmenu::Focusmenu(Configmenu *cm) : Basemenu(cm->screen) { "Auto Raise"), 3); update(); - setItemSelected(0, (! configmenu->screen->isSloppyFocus())); - setItemSelected(1, configmenu->screen->isSloppyFocus()); - setItemEnabled(2, configmenu->screen->isSloppyFocus()); - setItemSelected(2, configmenu->screen->doAutoRaise()); + 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) { @@ -162,41 +183,41 @@ void Configmenu::Focusmenu::itemSelected(int button, int index) { switch (item->function()) { case 1: // click to focus - configmenu->screen->saveSloppyFocus(False); - configmenu->screen->saveAutoRaise(False); + configmenu->screen.setSloppyFocus(false); + configmenu->screen.setAutoRaise(false); - if (! configmenu->screen->getOpenbox()->getFocusedWindow()) - XSetInputFocus(configmenu->screen->getOpenbox()->getXDisplay(), - configmenu->screen->getToolbar()->getWindowID(), + if (! configmenu->screen.getOpenbox().getFocusedWindow()) + XSetInputFocus(configmenu->screen.getOpenbox().getXDisplay(), + configmenu->screen.getToolbar()->getWindowID(), RevertToParent, CurrentTime); else - XSetInputFocus(configmenu->screen->getOpenbox()->getXDisplay(), - configmenu->screen->getOpenbox()-> + XSetInputFocus(configmenu->screen.getOpenbox().getXDisplay(), + configmenu->screen.getOpenbox(). getFocusedWindow()->getClientWindow(), RevertToParent, CurrentTime); - configmenu->screen->reconfigure(); + configmenu->screen.reconfigure(); break; case 2: // sloppy focus - configmenu->screen->saveSloppyFocus(True); + configmenu->screen.setSloppyFocus(true); - configmenu->screen->reconfigure(); + configmenu->screen.reconfigure(); break; case 3: // auto raise with sloppy focus - Bool change = ((configmenu->screen->doAutoRaise()) ? False : True); - configmenu->screen->saveAutoRaise(change); + bool change = ((configmenu->screen.autoRaise()) ? false : true); + configmenu->screen.setAutoRaise(change); break; } - setItemSelected(0, (! configmenu->screen->isSloppyFocus())); - setItemSelected(1, configmenu->screen->isSloppyFocus()); - setItemEnabled(2, configmenu->screen->isSloppyFocus()); - setItemSelected(2, configmenu->screen->doAutoRaise()); + setItemSelected(0, !configmenu->screen.sloppyFocus()); + setItemSelected(1, configmenu->screen.sloppyFocus()); + setItemEnabled(2, configmenu->screen.sloppyFocus()); + setItemSelected(2, configmenu->screen.autoRaise()); } Configmenu::Placementmenu::Placementmenu(Configmenu *cm) : @@ -206,7 +227,7 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm) : setLabel(i18n->getMessage(ConfigmenuSet, ConfigmenuWindowPlacement, "Window Placement")); setInternalMenu(); - + insert(i18n->getMessage(ConfigmenuSet, ConfigmenuSmartRows, "Smart Placement (Rows)"), BScreen::RowSmartPlacement); @@ -227,7 +248,11 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm) : "Bottom to Top"), BScreen::BottomTop); update(); - switch (configmenu->screen->getPlacementPolicy()) { + setValues(); +} + +void Configmenu::Placementmenu::setValues() { + switch (configmenu->screen.placementPolicy()) { case BScreen::RowSmartPlacement: setItemSelected(0, True); break; @@ -245,16 +270,21 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm) : break; } - Bool rl = (configmenu->screen->getRowPlacementDirection() == + Bool rl = (configmenu->screen.rowPlacementDirection() == BScreen::LeftRight), - tb = (configmenu->screen->getColPlacementDirection() == + tb = (configmenu->screen.colPlacementDirection() == BScreen::TopBottom); setItemSelected(4, rl); - setItemSelected(5, ! rl); + setItemSelected(5, !rl); setItemSelected(6, tb); - setItemSelected(7, ! tb); + setItemSelected(7, !tb); +} + +void Configmenu::Placementmenu::reconfigure() { + setValues(); + Basemenu::reconfigure(); } void Configmenu::Placementmenu::itemSelected(int button, int index) { @@ -268,7 +298,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { switch (item->function()) { case BScreen::RowSmartPlacement: - configmenu->screen->savePlacementPolicy(item->function()); + configmenu->screen.setPlacementPolicy(item->function()); setItemSelected(0, True); setItemSelected(1, False); @@ -278,7 +308,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { break; case BScreen::ColSmartPlacement: - configmenu->screen->savePlacementPolicy(item->function()); + configmenu->screen.setPlacementPolicy(item->function()); setItemSelected(0, False); setItemSelected(1, True); @@ -288,7 +318,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { break; case BScreen::CascadePlacement: - configmenu->screen->savePlacementPolicy(item->function()); + configmenu->screen.setPlacementPolicy(item->function()); setItemSelected(0, False); setItemSelected(1, False); @@ -298,7 +328,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { break; case BScreen::BestFitPlacement: - configmenu->screen->savePlacementPolicy(item->function()); + configmenu->screen.setPlacementPolicy(item->function()); setItemSelected(0, False); setItemSelected(1, False); @@ -308,7 +338,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { break; case BScreen::LeftRight: - configmenu->screen->saveRowPlacementDirection(BScreen::LeftRight); + configmenu->screen.setRowPlacementDirection(BScreen::LeftRight); setItemSelected(4, True); setItemSelected(5, False); @@ -316,7 +346,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { break; case BScreen::RightLeft: - configmenu->screen->saveRowPlacementDirection(BScreen::RightLeft); + configmenu->screen.setRowPlacementDirection(BScreen::RightLeft); setItemSelected(4, False); setItemSelected(5, True); @@ -324,7 +354,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { break; case BScreen::TopBottom: - configmenu->screen->saveColPlacementDirection(BScreen::TopBottom); + configmenu->screen.setColPlacementDirection(BScreen::TopBottom); setItemSelected(5, True); setItemSelected(6, False); @@ -332,7 +362,7 @@ void Configmenu::Placementmenu::itemSelected(int button, int index) { break; case BScreen::BottomTop: - configmenu->screen->saveColPlacementDirection(BScreen::BottomTop); + configmenu->screen.setColPlacementDirection(BScreen::BottomTop); setItemSelected(5, False); setItemSelected(6, True);