sonic-pi/trunk/sonic-pi-3.2.0-gui_paths.patch

   1 diff -ruN a/app/gui/qt/mainwindow.cpp b/app/gui/qt/mainwindow.cpp
   2 --- a/app/gui/qt/mainwindow.cpp 2020-02-25 01:23:45.000000000 +0100
   3 +++ b/app/gui/qt/mainwindow.cpp 2020-03-08 13:53:17.604508214 +0100
   4 @@ -353,10 +353,10 @@
   5          ruby_path = "ruby";
   6      }
   7
   8 -    ruby_server_path = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/sonic-pi-server.rb");
   9 -    port_discovery_path = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/port-discovery.rb");
  10 -    fetch_url_path = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/fetch-url.rb");
  11 -    sample_path = QDir::toNativeSeparators(root_path + "/etc/samples");
  12 +    ruby_server_path = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/sonic-pi-server.rb");
  13 +    port_discovery_path = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/port-discovery.rb");
  14 +    fetch_url_path = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/fetch-url.rb");
  15 +    sample_path = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/samples");
  16
  17      sp_user_path           = QDir::toNativeSeparators(sonicPiHomePath() + "/.sonic-pi");
  18      sp_user_tmp_path       = QDir::toNativeSeparators(sp_user_path + "/.writableTesterPath");
  19 @@ -367,14 +367,14 @@
  20      process_log_path       = QDir::toNativeSeparators(log_path + "/processes.log");
  21      scsynth_log_path       = QDir::toNativeSeparators(log_path + QDir::separator() + "scsynth.log");
  22
  23 -    init_script_path       = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/init-script.rb");
  24 -    exit_script_path       = QDir::toNativeSeparators(root_path + "/app/server/ruby/bin/exit-script.rb");
  25 +    init_script_path       = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/init-script.rb");
  26 +    exit_script_path       = QDir::toNativeSeparators(root_path + "/usr/lib/sonic-pi/server/bin/exit-script.rb");
  27
  28 -    qt_app_theme_path      = QDir::toNativeSeparators(root_path + "/app/gui/qt/theme/app.qss");
  29 +    qt_app_theme_path      = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/theme/app.qss");
  30
  31 -    qt_browser_dark_css    = QDir::toNativeSeparators(root_path + "/app/gui/qt/theme/dark/doc-styles.css");
  32 -    qt_browser_light_css   = QDir::toNativeSeparators(root_path + "/app/gui/qt/theme/light/doc-styles.css");
  33 -    qt_browser_hc_css      = QDir::toNativeSeparators(root_path + "/app/gui/qt/theme/high_contrast/doc-styles.css");
  34 +    qt_browser_dark_css    = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/theme/dark/doc-styles.css");
  35 +    qt_browser_light_css   = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/theme/light/doc-styles.css");
  36 +    qt_browser_hc_css      = QDir::toNativeSeparators(root_path + "/usr/share/sonic-pi/theme/high_contrast/doc-styles.css");
  37
  38      // attempt to create log directory
  39      QDir logDir(log_path);
  40 @@ -1056,7 +1056,7 @@
  41      return QCoreApplication::applicationDirPath() + "/../../../../..";
  42  #else
  43      // On linux, CMake builds app into the build folder
  44 -    return QCoreApplication::applicationDirPath() + "/../../../..";
  45 +    return QCoreApplication::applicationDirPath() + "/../..";
  46  #endif
  47  }
  48
  49 @@ -1098,7 +1098,7 @@
  50      // Register server pid for potential zombie clearing
  51      QStringList regServerArgs;
  52  #if QT_VERSION >= QT_VERSION_CHECK(5, 3, 0)
  53 -    regServerArgs << QDir::toNativeSeparators(rootPath() + "/app/server/ruby/bin/task-register.rb")<< QString::number(serverProcess->processId());
  54 +    regServerArgs << QDir::toNativeSeparators(rootPath() + "/usr/lib/sonic-pi/server/bin/task-register.rb")<< QString::number(serverProcess->processId());
  55  #endif
  56      QProcess *regServerProcess = new QProcess();
  57      regServerProcess->start(ruby_path, regServerArgs);
  58 diff -ruN a/app/gui/qt/model/sonicpitheme.cpp b/app/gui/qt/model/sonicpitheme.cpp
  59 --- a/app/gui/qt/model/sonicpitheme.cpp 2020-02-25 01:23:45.000000000 +0100
  60 +++ b/app/gui/qt/model/sonicpitheme.cpp 2020-03-08 19:59:00.840045897 +0100
  61 @@ -25,11 +25,11 @@
  62      this->customSettingsFilename = customSettingsFilename;
  63      this->rootPath = rootPath;
  64
  65 -    qt_app_theme_path      = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/app.qss");
  66 +    qt_app_theme_path      = QDir::toNativeSeparators(rootPath + "/usr/share/sonic-pi/theme/app.qss");
  67
  68 -    qt_browser_dark_css    = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/dark/doc-styles.css");
  69 -    qt_browser_light_css   = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/light/doc-styles.css");
  70 -    qt_browser_hc_css      = QDir::toNativeSeparators(rootPath + "/app/gui/qt/theme/high_contrast/doc-styles.css");
  71 +    qt_browser_dark_css    = QDir::toNativeSeparators(rootPath + "/usr/share/sonic-pi/theme/dark/doc-styles.css");
  72 +    qt_browser_light_css   = QDir::toNativeSeparators(rootPath + "/usr/share/sonic-pi/theme/light/doc-styles.css");
  73 +    qt_browser_hc_css      = QDir::toNativeSeparators(rootPath + "/usr/share/sonic-pi/theme/high_contrast/doc-styles.css");
  74
  75      loadToolBarIcons();
  76