configuration changes "done"!!

[chaz/openbox] / src / Configmenu.cc

diff --git a/src/Configmenu.cc b/src/Configmenu.cc
index bae8e1b6e203aec4cc25f6ca3a4751318099ad55..9de8864d52500d5f276e8e6652c74c4fd4f34fc7 100644 (file)
--- a/src/Configmenu.cc
+++ b/src/Configmenu.cc
@@ -59,13 +59,16 @@ Configmenu::Configmenu(BScreen &scr) : Basemenu(scr), screen(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());
+  setItemSelected(3, screen.opaqueMove());
+  setItemSelected(4, screen.fullMax());
+  setItemSelected(5, screen.focusNew());
+  setItemSelected(6, screen.focusLast());
+  setItemSelected(7, screen.hideToolbar());
 }
 
 Configmenu::~Configmenu(void) {
@@ -93,30 +96,35 @@ void Configmenu::itemSelected(int button, int index) {
   }
 
   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
@@ -144,10 +152,10 @@ 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());
+  setItemSelected(0, !configmenu->screen.sloppyFocus());
+  setItemSelected(1, configmenu->screen.sloppyFocus());
+  setItemEnabled(2, configmenu->screen.sloppyFocus());
+  setItemSelected(2, configmenu->screen.autoRaise());
 }
 
 void Configmenu::Focusmenu::itemSelected(int button, int index) {
@@ -161,16 +169,16 @@ 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(),
+    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);
 
@@ -179,23 +187,23 @@ void Configmenu::Focusmenu::itemSelected(int button, int index) {
     break;
 
   case 2: // sloppy focus
-    configmenu->screen.saveSloppyFocus(True);
+    configmenu->screen.setSloppyFocus(true);
 
     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) :
@@ -205,7 +213,7 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm) :
   setLabel(i18n->getMessage(ConfigmenuSet, ConfigmenuWindowPlacement,
                            "Window Placement"));
   setInternalMenu();
-
+  
   insert(i18n->getMessage(ConfigmenuSet, ConfigmenuSmartRows,
                          "Smart Placement (Rows)"),
         BScreen::RowSmartPlacement);
@@ -226,7 +234,7 @@ Configmenu::Placementmenu::Placementmenu(Configmenu *cm) :
                          "Bottom to Top"), BScreen::BottomTop);
   update();
 
-  switch (configmenu->screen.getPlacementPolicy()) {
+  switch (configmenu->screen.placementPolicy()) {
   case BScreen::RowSmartPlacement:
     setItemSelected(0, True);
     break;
@@ -244,16 +252,16 @@ 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::itemSelected(int button, int index) {
@@ -267,7 +275,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);
@@ -277,7 +285,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);
@@ -287,7 +295,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);
@@ -297,7 +305,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);
@@ -307,7 +315,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);
@@ -315,7 +323,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);
@@ -323,7 +331,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);
@@ -331,7 +339,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);