Magnet Tool slider - non-linear preference
This commit is contained in:
parent
5908b0e358
commit
3df6c2438f
5 changed files with 12 additions and 1 deletions
|
@ -367,6 +367,9 @@ public:
|
|||
int getTempToolSwitchtimer() const {
|
||||
return getIntValue(temptoolswitchtimer);
|
||||
}
|
||||
bool isMagnetNonLinearSliderEnabled() const {
|
||||
return getBoolValue(magnetNonLinearSliderEnabled);
|
||||
}
|
||||
|
||||
// Xsheet tab
|
||||
QString getXsheetLayoutPreference() const {
|
||||
|
|
|
@ -120,6 +120,7 @@ enum PreferencesItemId {
|
|||
levelBasedToolsDisplay,
|
||||
useCtrlAltToResizeBrush,
|
||||
temptoolswitchtimer,
|
||||
magnetNonLinearSliderEnabled,
|
||||
|
||||
//----------
|
||||
// Xsheet
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#include "tcurveutil.h"
|
||||
#include "tenv.h"
|
||||
|
||||
#include "toonz/preferences.h"
|
||||
#include "toonz/tobjecthandle.h"
|
||||
#include "toonz/txshlevelhandle.h"
|
||||
#include "toonz/tstageobject.h"
|
||||
|
@ -149,7 +150,8 @@ public:
|
|||
{
|
||||
bind(TTool::Vectors);
|
||||
|
||||
m_toolSize.setNonLinearSlider();
|
||||
if (Preferences::instance()->getBoolValue(magnetNonLinearSliderEnabled))
|
||||
m_toolSize.setNonLinearSlider();
|
||||
|
||||
m_prop.bind(m_toolSize);
|
||||
}
|
||||
|
|
|
@ -1342,6 +1342,8 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {
|
|||
{useCtrlAltToResizeBrush, tr("Use Ctrl+Alt to Resize Brush")},
|
||||
{temptoolswitchtimer,
|
||||
tr("Temporary Tool Switch Shortcut Hold Time (ms):")},
|
||||
{magnetNonLinearSliderEnabled,
|
||||
tr("Magnet Tool Size Slider - Non-Linear mode*")},
|
||||
|
||||
// Xsheet
|
||||
{xsheetLayoutPreference, tr("Column Header Layout*:")},
|
||||
|
@ -2076,6 +2078,7 @@ QWidget* PreferencesPopup::createToolsPage() {
|
|||
if (Preferences::instance()->isShowAdvancedOptionsEnabled())
|
||||
insertUI(useCtrlAltToResizeBrush, lay);
|
||||
insertUI(temptoolswitchtimer, lay);
|
||||
insertUI(magnetNonLinearSliderEnabled, lay);
|
||||
|
||||
lay->setRowStretch(lay->rowCount(), 1);
|
||||
widget->setLayout(lay);
|
||||
|
|
|
@ -565,6 +565,8 @@ void Preferences::definePreferenceItems() {
|
|||
false);
|
||||
define(temptoolswitchtimer, "temptoolswitchtimer", QMetaType::Int, 500, 1,
|
||||
std::numeric_limits<int>::max());
|
||||
define(magnetNonLinearSliderEnabled, "magnetNonLinearSliderEnabled",
|
||||
QMetaType::Bool, false);
|
||||
|
||||
// Xsheet
|
||||
define(xsheetLayoutPreference, "xsheetLayoutPreference", QMetaType::QString,
|
||||
|
|
Loading…
Reference in a new issue