Merge pull request #932 from deXol/develop

[BLE] Force select bundle with shift + click instead of ctrl

Author: limpkin

src/BleDev.cpp

@@ -63,17 +63,17 @@ void BleDev::clearWidgets()
 
 void BleDev::keyPressEvent(QKeyEvent *event)
 {
-    if (event->key() == Qt::Key_Control)
+    if (event->key() == Qt::Key_Shift)
     {
-        DeviceDetector::instance().ctrlPressed();
+        DeviceDetector::instance().shiftPressed();
     }
 }
 
 void BleDev::keyReleaseEvent(QKeyEvent *event)
 {
-    if (event->key() == Qt::Key_Control)
+    if (event->key() == Qt::Key_Shift)
     {
-        DeviceDetector::instance().ctrlReleased();
+        DeviceDetector::instance().shiftReleased();
     }
 }
 
@@ -138,7 +138,7 @@ void BleDev::on_btnFileBrowser_clicked()
 {
     if (wsClient->get_status() != Common::NoBundle &&
         (DeviceDetector::instance().isConnectedWithBluetooth() ||
-        (DeviceDetector::instance().getBattery() < MIN_BATTERY_PCT_FOR_UPLOAD && !DeviceDetector::instance().isCtrlPressed())))
+        (DeviceDetector::instance().getBattery() < MIN_BATTERY_PCT_FOR_UPLOAD && !DeviceDetector::instance().isShiftPressed())))
     {
         QMessageBox::warning(this, tr("Battery too low for bundle upload"),
                              tr("Please have your device connected through USB and fully charged"));
@@ -150,7 +150,7 @@ void BleDev::on_btnFileBrowser_clicked()
                                             s.value("last_used_path/bundle_dir", QDir::homePath()).toString(),
                                             "*.img");
 
-    DeviceDetector::instance().ctrlReleased();
+    DeviceDetector::instance().shiftReleased();
 
     if (fileName.isEmpty())
     {

src/DeviceDetector.h

@@ -37,9 +37,9 @@ class DeviceDetector : public QObject
     void setIsConnectedWithBluetooth(bool bt) { m_isConnectedWithBluetooth = bt; }
     quint8 getBattery() const { return m_battery; }
     void setBattery(quint8 battery) { m_battery = battery; }
-    void ctrlPressed() { m_isCtrlPressed = true; }
-    void ctrlReleased() { m_isCtrlPressed = false; }
-    bool isCtrlPressed() const { return m_isCtrlPressed; }
+    void shiftPressed() { m_isShiftPressed = true; }
+    void shiftReleased() { m_isShiftPressed = false; }
+    bool isShiftPressed() const { return m_isShiftPressed; }
 
 signals:
     void deviceChanged(Common::MPHwVersion newDevType);
@@ -52,7 +52,7 @@ public slots:
     bool m_advancedMode = false;
     bool m_isConnectedWithBluetooth = false;
     quint8 m_battery = 0;
-    bool m_isCtrlPressed = false;
+    bool m_isShiftPressed = false;
 };
 
 #endif // DEVICEDETECTOR_H

src/MainWindow.cpp

@@ -2257,15 +2257,15 @@ void MainWindow::keyPressEvent(QKeyEvent *event)
 {
     if (event->key() == Qt::Key_Control)
     {
-        DeviceDetector::instance().ctrlPressed();
+        DeviceDetector::instance().shiftPressed();
     }
 }
 
 void MainWindow::keyReleaseEvent(QKeyEvent *event)
 {
     if (event->key() == Qt::Key_Control)
     {
-        DeviceDetector::instance().ctrlReleased();
+        DeviceDetector::instance().shiftReleased();
     }
 }