Sketcher/Gui: Extend toolbar framework and fix toolbar visibility not preserved
================================================================================= fixes #9208 Essentially: - The regular mechanism to save toolbar state when changing from one WB to another is not designed to support changes within one WB (e.g. from edit mode and back). - At creation time, toolbars can be initialised with default visible or default hidden state. Additionally, there is third configuration "Unavailable", which refers to a toolbar that is hidden, and the control to enable it is also hidden by default. - The ToolBarManager is extended to enable to set the State of one or more toolbars. - The State refers to changes to be effected on one or more toolbars by client code: * ForceHidden allows to hide a toolbar and also hide its control (a toolbar not available in a mode). * ForceAvailable allows to make a toolbar available by making its control visible, the toolbar itself is visible or not depending on user settings. * RestoreDefault allows to bring the control visibility to the default of the toolbar, the toolbar itself is visible or not depending on user settings. * SaveState allows to store the current visibility state of a toolbar. It enables client code to save the state when appropriate. It provides the only option for default "Unavailable" toolbars, which are fully managed by client code. It provides additional flexibility to save other toolbar visibility on request. For the Sketcher this means: - That edit mode toolbars are not shown outside edit mode. - That edit mode toolbars and non-edit mode toolbars can be configured independently. - that edit mode toolbars' state is saved when leaving edit mode if and only if, the workbench that is selected when leaving edit mode is the Sketcher WB. - it won't save the state if the user manually selected another WB and then left edit mode (why? see limitation above). Limitation: - When switching to another WB while in edit mode, the other WB is activated before the current WB (sketcher WB) is deactivated. This means that at sketcher level, the sketcher has no chance to save states or do other tidy up actions before the tools of the other WB are activated. - This, however, is understood as not relevant enough as to warrant changing the mechanisms in place.
This commit is contained in:
Abdullah Tahiri
committed by
abdullahtahiriyo
abdullahtahiriyo
parent
68dc92f38b
commit
554ede35d2
@@ -24,8 +24,10 @@
|
||||
|
||||
#include "Utils.h"
|
||||
#include "Workbench.h"
|
||||
#include <Base/Console.h>
|
||||
#include <Gui/Application.h>
|
||||
#include <Gui/Document.h>
|
||||
#include <Gui/WorkbenchManager.h>
|
||||
#include <Mod/Sketcher/App/Constraint.h>
|
||||
|
||||
using namespace SketcherGui;
|
||||
@@ -106,34 +108,37 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
|
||||
addSketcherWorkbenchSketchActions(*sketcher);
|
||||
|
||||
Gui::ToolBarItem* sketcherEditMode =
|
||||
new Gui::ToolBarItem(root, Gui::ToolBarItem::HideStyle::FORCE_HIDE);
|
||||
new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable);
|
||||
sketcherEditMode->setCommand("Sketcher Edit Mode");
|
||||
addSketcherWorkbenchSketchEditModeActions(*sketcherEditMode);
|
||||
|
||||
Gui::ToolBarItem* geom = new Gui::ToolBarItem(root, Gui::ToolBarItem::HideStyle::FORCE_HIDE);
|
||||
Gui::ToolBarItem* geom =
|
||||
new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable);
|
||||
geom->setCommand("Sketcher geometries");
|
||||
addSketcherWorkbenchGeometries(*geom);
|
||||
|
||||
Gui::ToolBarItem* cons = new Gui::ToolBarItem(root, Gui::ToolBarItem::HideStyle::FORCE_HIDE);
|
||||
Gui::ToolBarItem* cons =
|
||||
new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable);
|
||||
cons->setCommand("Sketcher constraints");
|
||||
addSketcherWorkbenchConstraints(*cons);
|
||||
|
||||
Gui::ToolBarItem* consaccel =
|
||||
new Gui::ToolBarItem(root, Gui::ToolBarItem::HideStyle::FORCE_HIDE);
|
||||
new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable);
|
||||
consaccel->setCommand("Sketcher tools");
|
||||
addSketcherWorkbenchTools(*consaccel);
|
||||
|
||||
Gui::ToolBarItem* bspline = new Gui::ToolBarItem(root, Gui::ToolBarItem::HideStyle::FORCE_HIDE);
|
||||
Gui::ToolBarItem* bspline =
|
||||
new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable);
|
||||
bspline->setCommand("Sketcher B-spline tools");
|
||||
addSketcherWorkbenchBSplines(*bspline);
|
||||
|
||||
Gui::ToolBarItem* virtualspace =
|
||||
new Gui::ToolBarItem(root, Gui::ToolBarItem::HideStyle::FORCE_HIDE);
|
||||
new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable);
|
||||
virtualspace->setCommand("Sketcher virtual space");
|
||||
addSketcherWorkbenchVirtualSpace(*virtualspace);
|
||||
|
||||
Gui::ToolBarItem* edittools =
|
||||
new Gui::ToolBarItem(root, Gui::ToolBarItem::HideStyle::FORCE_HIDE);
|
||||
new Gui::ToolBarItem(root, Gui::ToolBarItem::DefaultVisibility::Unavailable);
|
||||
edittools->setCommand("Sketcher edit tools");
|
||||
addSketcherWorkbenchEditTools(*edittools);
|
||||
|
||||
@@ -147,13 +152,6 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const
|
||||
return root;
|
||||
}
|
||||
|
||||
void Workbench::activated()
|
||||
{
|
||||
Gui::Document* doc = Gui::Application::Instance->activeDocument();
|
||||
if (isSketchInEdit(doc)) {
|
||||
enterEditMode();
|
||||
}
|
||||
}
|
||||
|
||||
namespace
|
||||
{
|
||||
@@ -174,28 +172,64 @@ inline const QStringList nonEditModeToolbarNames()
|
||||
}
|
||||
}// namespace
|
||||
|
||||
void Workbench::activated()
|
||||
{
|
||||
/* When the workbench is activated, it may happen that we are in edit mode or not.
|
||||
* If we are not in edit mode, the function enterEditMode (called by the ViewProvider) takes
|
||||
* care to save the state of toolbars outside of edit mode. We cannot do it here, as we are
|
||||
* coming from another WB.
|
||||
*
|
||||
* If we moved to another WB from edit mode, the new WB was activated before deactivating this.
|
||||
* Therefore we had no chance to tidy up the save state. We assume a loss of any CHANGE to
|
||||
* toolbar configuration since last entering edit mode in this case (for any change in
|
||||
* configuration to be stored, the edit mode must be left while the selected Workbench is the
|
||||
* sketcher WB).
|
||||
*
|
||||
* However, now that we are back (from another WB), we need to make the toolbars available.
|
||||
* These correspond to the last saved state.
|
||||
*/
|
||||
Base::Console().Log("Sketch WB: Activated\n");
|
||||
Gui::Document* doc = Gui::Application::Instance->activeDocument();
|
||||
if (isSketchInEdit(doc)) {
|
||||
Gui::ToolBarManager::getInstance()->setState(editModeToolbarNames(),
|
||||
Gui::ToolBarManager::State::ForceAvailable);
|
||||
}
|
||||
}
|
||||
|
||||
void Workbench::enterEditMode()
|
||||
{
|
||||
/*Modify toolbars dynamically.
|
||||
First save state of toolbars in case user changed visibility of a toolbar but he's not changing
|
||||
the wb. This happens in someone works directly from sketcher, changing from edit mode to
|
||||
not-edit-mode*/
|
||||
Gui::ToolBarManager::getInstance()->saveState();
|
||||
/* Ensure the state left by the non-edit mode toolbars is saved (in case of changing to edit
|
||||
* mode) without changing workbench
|
||||
*/
|
||||
Gui::ToolBarManager::getInstance()->setState(nonEditModeToolbarNames(),
|
||||
Gui::ToolBarManager::State::SaveState);
|
||||
|
||||
Gui::ToolBarManager::getInstance()->setToolbarVisibility(true, editModeToolbarNames());
|
||||
Gui::ToolBarManager::getInstance()->setToolbarVisibility(false, nonEditModeToolbarNames());
|
||||
Gui::ToolBarManager::getInstance()->setState(editModeToolbarNames(),
|
||||
Gui::ToolBarManager::State::ForceAvailable);
|
||||
Gui::ToolBarManager::getInstance()->setState(nonEditModeToolbarNames(),
|
||||
Gui::ToolBarManager::State::ForceHidden);
|
||||
}
|
||||
|
||||
void Workbench::leaveEditMode()
|
||||
{
|
||||
/*Modify toolbars dynamically.
|
||||
First save state of toolbars in case user changed visibility of a toolbar but he's not changing
|
||||
the wb. This happens in someone works directly from sketcher, changing from edit mode to
|
||||
not-edit-mode*/
|
||||
Gui::ToolBarManager::getInstance()->saveState();
|
||||
/* Ensure the state left by the edit mode toolbars is saved (in case of changing to edit mode)
|
||||
* without changing workbench.
|
||||
*
|
||||
* However, do not save state if the current workbench is not the Sketcher WB, because otherwise
|
||||
* we would be saving the state of the currently activated workbench, and the toolbars would
|
||||
* disappear (as the toolbars of that other WB are only visible).
|
||||
*/
|
||||
auto* workbench = Gui::WorkbenchManager::instance()->active();
|
||||
|
||||
Gui::ToolBarManager::getInstance()->setToolbarVisibility(false, editModeToolbarNames());
|
||||
Gui::ToolBarManager::getInstance()->setToolbarVisibility(true, nonEditModeToolbarNames());
|
||||
if (workbench->name() == "SketcherWorkbench") {
|
||||
Gui::ToolBarManager::getInstance()->setState(editModeToolbarNames(),
|
||||
Gui::ToolBarManager::State::SaveState);
|
||||
}
|
||||
|
||||
Gui::ToolBarManager::getInstance()->setState(editModeToolbarNames(),
|
||||
Gui::ToolBarManager::State::RestoreDefault);
|
||||
Gui::ToolBarManager::getInstance()->setState(nonEditModeToolbarNames(),
|
||||
Gui::ToolBarManager::State::RestoreDefault);
|
||||
}
|
||||
|
||||
namespace SketcherGui
|
||||
|
||||
Reference in New Issue
Block a user