Convert to new paths system

2019-03-19 16:10:35 +01:00
parent 62dcea6943
commit d654567d98
4 changed files with 42 additions and 32 deletions
@@ -250,10 +250,22 @@ void UtilitiesTabController::modAlarmTimeMinute( int value, bool notify )

 QString getBatteryIconPath( int batteryState )
 {
-    QString batteryPrefix = "/res/img/battery/battery_";
-    return QStandardPaths::locate(
-        QStandardPaths::AppDataLocation,
-        batteryPrefix + QString::number( batteryState ) + ".png" );
+    constexpr auto batteryPrefix = "/res/img/battery/battery_";
+
+    const auto batteryFullPath
+        = ( batteryPrefix + QString::number( batteryState ) + ".png" )
+              .toStdString();
+
+    const auto batteryPath = paths::binaryDirectoryFindFile( batteryFullPath );
+
+    if ( !batteryPath.has_value() )
+    {
+        LOG( ERROR ) << "Unable to find battery image number '" << batteryState
+                     << "'.";
+        return "";
+    }
+
+    return QString::fromStdString( *batteryPath );
 }

 vr::VROverlayHandle_t createBatteryOverlay( vr::TrackedDeviceIndex_t index )