Merge pull request #583 from manongjohn/add_toolswitch_time_preference
Add temp tool hold switch time as preference
This commit is contained in:
commit
54bd7d0ceb
5 changed files with 13 additions and 2 deletions
|
@ -342,6 +342,9 @@ public:
|
|||
bool useCtrlAltToResizeBrushEnabled() const {
|
||||
return getBoolValue(useCtrlAltToResizeBrush);
|
||||
}
|
||||
int getTempToolSwitchtimer() const {
|
||||
return getIntValue(temptoolswitchtimer);
|
||||
}
|
||||
|
||||
// Xsheet tab
|
||||
QString getXsheetLayoutPreference() const {
|
||||
|
|
|
@ -107,6 +107,7 @@ enum PreferencesItemId {
|
|||
cursorOutlineEnabled,
|
||||
levelBasedToolsDisplay,
|
||||
useCtrlAltToResizeBrush,
|
||||
temptoolswitchtimer,
|
||||
|
||||
//----------
|
||||
// Xsheet
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
#include "timage.h"
|
||||
//#include "tapp.h"
|
||||
#include "toonzqt/menubarcommand.h"
|
||||
#include "toonz/preferences.h"
|
||||
#include <QAction>
|
||||
#include <QMap>
|
||||
#include <QDebug>
|
||||
|
@ -70,9 +71,10 @@ void ToolHandle::storeTool() {
|
|||
//-----------------------------------------------------------------------------
|
||||
|
||||
void ToolHandle::restoreTool() {
|
||||
// qDebug() << m_storedToolTime.elapsed();
|
||||
//qDebug() << m_storedToolTime.elapsed();
|
||||
if (m_storedToolName != m_toolName && m_storedToolName != "" &&
|
||||
m_storedToolTime.elapsed() > 500) {
|
||||
m_storedToolTime.elapsed() >
|
||||
Preferences::instance()->getTempToolSwitchtimer()) {
|
||||
setTool(m_storedToolName);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1082,6 +1082,8 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {
|
|||
{cursorOutlineEnabled, tr("Show Cursor Size Outlines")},
|
||||
{levelBasedToolsDisplay, tr("Toolbar Display Behaviour:")},
|
||||
{useCtrlAltToResizeBrush, tr("Use Ctrl+Alt to Resize Brush")},
|
||||
{temptoolswitchtimer,
|
||||
tr("Temporary Tool Switch Shortcut Hold Time (ms):")},
|
||||
|
||||
// Xsheet
|
||||
{xsheetLayoutPreference, tr("Column Header Layout*:")},
|
||||
|
@ -1716,6 +1718,7 @@ QWidget* PreferencesPopup::createToolsPage() {
|
|||
insertUI(levelBasedToolsDisplay, lay,
|
||||
getComboItemList(levelBasedToolsDisplay));
|
||||
// insertUI(useCtrlAltToResizeBrush, lay);
|
||||
insertUI(temptoolswitchtimer, lay);
|
||||
|
||||
lay->setRowStretch(lay->rowCount(), 1);
|
||||
widget->setLayout(lay);
|
||||
|
|
|
@ -498,6 +498,8 @@ void Preferences::definePreferenceItems() {
|
|||
0); // Default
|
||||
define(useCtrlAltToResizeBrush, "useCtrlAltToResizeBrush", QMetaType::Bool,
|
||||
true);
|
||||
define(temptoolswitchtimer, "temptoolswitchtimer", QMetaType::Int, 500, 1,
|
||||
std::numeric_limits<int>::max());
|
||||
|
||||
// Xsheet
|
||||
define(xsheetLayoutPreference, "xsheetLayoutPreference", QMetaType::QString,
|
||||
|
|
Loading…
Reference in a new issue