X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkdenlivesettingsdialog.cpp;fp=src%2Fkdenlivesettingsdialog.cpp;h=e64753b3b08b389254e2d617ac4943cffa3addaa;hb=aec01436823fc842d7bf7158e79bac84c1521552;hp=cbcdbb032d93af147146488cf4d25338e54fc5f9;hpb=f5977736d9ff8860798eaaf9de79ef1cfff0bf83;p=kdenlive diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp index cbcdbb03..e64753b3 100644 --- a/src/kdenlivesettingsdialog.cpp +++ b/src/kdenlivesettingsdialog.cpp @@ -341,6 +341,7 @@ void KdenliveSettingsDialog::setupJogshuttleBtns(QString device) list1[i]->hide(); } +#ifdef USE_JOGSHUTTLE int keysCount = JogShuttle::keysCount(device); for (int i = 0; i < keysCount; i++) { @@ -353,7 +354,22 @@ void KdenliveSettingsDialog::setupJogshuttleBtns(QString device) // according to the user-selected language, so they do not appear in random order. QMap mappable_actions(m_mappable_actions); QList action_names = mappable_actions.keys(); + QList::Iterator iter = action_names.begin(); + kDebug() << "::::::::::::::::"; + while (iter != action_names.end()) { + kDebug() << *iter; + ++iter; + } + + kDebug() << "::::::::::::::::"; + qSort(action_names); + iter = action_names.begin(); + while (iter != action_names.end()) { + kDebug() << *iter; + ++iter; + } + kDebug() << "::::::::::::::::"; // Here we need to compute the action_id -> index-in-action_names. We iterate over the // action_names, as the sorting may depend on the user-language. @@ -377,7 +393,7 @@ void KdenliveSettingsDialog::setupJogshuttleBtns(QString device) if (i < actions_map.size()) button->setCurrentIndex(action_pos[actions_map[i]]); } - +#endif } KdenliveSettingsDialog::~KdenliveSettingsDialog() {} @@ -1217,7 +1233,7 @@ void KdenliveSettingsDialog::slotReloadShuttleDevices() KdenliveSettings::setShuttledevicepaths(devPathList); QTimer::singleShot(200, this, SLOT(slotUpdateShuttleDevice())); - kDebug() << "Devices reloded"; + kDebug() << "Devices reloaded"; #endif //USE_JOGSHUTTLE }