Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-09 16:41:14 +02:00
Code Issues Releases Wiki Activity

Allow selected tool to persist across toolbar reset

Browse Source
This commit is contained in:
lllucius 2015-01-01 20:05:06 +00:00
parent 622b609f91
commit 6459324b4c
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/toolbars/ToolsToolBar.cpp
View File

@ -92,17 +92,6 @@ ToolsToolBar::ToolsToolBar()
#endif #endif
mMessageOfTool[drawTool] = _("Click and drag to move a track in time"); mMessageOfTool[drawTool] = _("Click and drag to move a track in time");
mMessageOfTool[multiTool] = wxT(""); // multi-mode tool mMessageOfTool[multiTool] = wxT(""); // multi-mode tool
}
ToolsToolBar::~ToolsToolBar()
{
for (int i = 0; i < 5; i++)
delete mTool[i];
}
void ToolsToolBar::Create(wxWindow * parent)
{
ToolBar::Create(parent);
bool multiToolActive = false; bool multiToolActive = false;
gPrefs->Read(wxT("/GUI/ToolBars/Tools/MultiToolActive"), &multiToolActive); gPrefs->Read(wxT("/GUI/ToolBars/Tools/MultiToolActive"), &multiToolActive);
@ -111,8 +100,12 @@ void ToolsToolBar::Create(wxWindow * parent)
mCurrentTool = multiTool; mCurrentTool = multiTool;
else else
mCurrentTool = selectTool; mCurrentTool = selectTool;
}
mTool[mCurrentTool]->PushDown(); ToolsToolBar::~ToolsToolBar()
{
for (int i = 0; i < 5; i++)
delete mTool[i];
} }
void ToolsToolBar::RegenerateToolsTooltips() void ToolsToolBar::RegenerateToolsTooltips()
@ -186,6 +179,8 @@ void ToolsToolBar::Populate()
mTool[ slideTool ] = MakeTool( bmpTimeShift, slideTool, _("Slide Tool") ); mTool[ slideTool ] = MakeTool( bmpTimeShift, slideTool, _("Slide Tool") );
mTool[ multiTool ] = MakeTool( bmpMulti, multiTool, _("Multi Tool") ); mTool[ multiTool ] = MakeTool( bmpMulti, multiTool, _("Multi Tool") );
mTool[mCurrentTool]->PushDown();
RegenerateToolsTooltips(); RegenerateToolsTooltips();
} }

1
src/toolbars/ToolsToolBar.h
View File

@ -51,7 +51,6 @@ class ToolsToolBar:public ToolBar {
ToolsToolBar(); ToolsToolBar();
virtual ~ToolsToolBar(); virtual ~ToolsToolBar();
void Create(wxWindow *parent);
void UpdatePrefs(); void UpdatePrefs();
void OnTool(wxCommandEvent & evt); void OnTool(wxCommandEvent & evt);