X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fkdenlivesettingsdialog.cpp;h=64f9aaeb2668bccaf2d258f44e622912a09f745b;hb=56aee6aedeeed3efd10ada8fe3c229eddc01ef05;hp=cbcdbb032d93af147146488cf4d25338e54fc5f9;hpb=f5977736d9ff8860798eaaf9de79ef1cfff0bf83;p=kdenlive

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index cbcdbb03..64f9aaeb 100644
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -175,10 +175,6 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(const QMap<QString, QString>& map
     m_configSdl.reload_blackmagic->setIcon(KIcon("view-refresh"));
     connect(m_configSdl.reload_blackmagic, SIGNAL(clicked(bool)), this, SLOT(slotReloadBlackMagic()));
 
-#ifndef USE_OPENGL
-    m_configSdl.kcfg_openglmonitors->setHidden(true);
-#endif
-
     m_page6 = addPage(p6, i18n("Playback"), "media-playback-start");
 
     QWidget *p7 = new QWidget;
@@ -341,6 +337,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 +350,22 @@ void KdenliveSettingsDialog::setupJogshuttleBtns(QString device)
     // according to the user-selected language, so they do not appear in random order.
     QMap<QString, QString> mappable_actions(m_mappable_actions);
     QList<QString> action_names = mappable_actions.keys();
+    QList<QString>::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 +389,7 @@ void KdenliveSettingsDialog::setupJogshuttleBtns(QString device)
         if (i < actions_map.size())
             button->setCurrentIndex(action_pos[actions_map[i]]);
     }
-
+#endif
 }
 
 KdenliveSettingsDialog::~KdenliveSettingsDialog() {}
@@ -1217,7 +1229,7 @@ void KdenliveSettingsDialog::slotReloadShuttleDevices()
     KdenliveSettings::setShuttledevicepaths(devPathList);
     QTimer::singleShot(200, this, SLOT(slotUpdateShuttleDevice()));
 
-    kDebug() << "Devices reloded";
+    kDebug() << "Devices reloaded";
 
 #endif //USE_JOGSHUTTLE
 }