Merge branch 'master' into alpha-kung

2019-02-04 00:04:14 +09:00
parent 6a90f66b2e 05fca0e17d
commit be19793b48
75 changed files with 1141 additions and 801 deletions
@@ -72,7 +72,8 @@ void AudioTabController::initStage2( OverlayController* var_parent,
    {
        QString notifIconPath = QStandardPaths::locate(
            QStandardPaths::AppDataLocation,
-            QStringLiteral( "/res/qml/ptt_notification.png" ) );
+            QStringLiteral(
+                "/res/img/audio/microphone/ptt_notification.png" ) );
        if ( QFile::exists( notifIconPath ) )
        {
            vr::VROverlay()->SetOverlayFromFile(
@@ -274,7 +274,7 @@ void UtilitiesTabController::modAlarmTimeMinute( int value, bool notify )

 QString getBatteryIconPath( int batteryState )
 {
-    QString batteryPrefix = "/res/battery_";
+    QString batteryPrefix = "/res/img/battery/battery_";
    return QStandardPaths::locate(
        QStandardPaths::AppDataLocation,
        batteryPrefix + QString::number( batteryState ) + ".png" );