Add ScriptsLocation settings value

2025-04-08 01:22:25 +02:00 · 2014-05-14 00:28:11 -07:00 · 2014-05-14 00:28:11 -07:00 · 38a5b5b8d1
commit 38a5b5b8d1
parent bc60c8ba92
7 changed files with 217 additions and 6 deletions
--- a/interface/resources/styles/preferences.qss
+++ b/interface/resources/styles/preferences.qss
@ -12,7 +12,8 @@ QLabel#advancedTuningLabel {

 QPushButton#buttonBrowseHead,
 QPushButton#buttonBrowseBody,
-QPushButton#buttonBrowseLocation {
+QPushButton#buttonBrowseLocation,
+QPushButton#buttonBrowseScriptsLocation {
    background-image: url(styles/search.svg);
    background-repeat: no-repeat;
    background-position: center center;
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@ -93,8 +93,8 @@ Menu::Menu() :
    _fastFPSAverage(ONE_SECOND_OF_FRAMES),
    _loginAction(NULL),
    _preferencesDialog(NULL),
-    _snapshotsLocation()
-{
+    _snapshotsLocation(),
+    _scriptsLocation() {
    Application *appInstance = Application::getInstance();

    QMenu* fileMenu = addMenu("File");
@ -501,6 +501,7 @@ void Menu::loadSettings(QSettings* settings) {
    _boundaryLevelAdjust = loadSetting(settings, "boundaryLevelAdjust", 0);
    _snapshotsLocation = settings->value("snapshotsLocation",
                                         QStandardPaths::writableLocation(QStandardPaths::DesktopLocation)).toString();
+    setScriptsLocation(settings->value("scriptsLocation", QString()).toString());

    settings->beginGroup("View Frustum Offset Camera");
    // in case settings is corrupt or missing loadSetting() will check for NaN
@ -545,6 +546,7 @@ void Menu::saveSettings(QSettings* settings) {
    settings->setValue("avatarLODDistanceMultiplier", _avatarLODDistanceMultiplier);
    settings->setValue("boundaryLevelAdjust", _boundaryLevelAdjust);
    settings->setValue("snapshotsLocation", _snapshotsLocation);
+    settings->setValue("scriptsLocation", _scriptsLocation);
    settings->beginGroup("View Frustum Offset Camera");
    settings->setValue("viewFrustumOffsetYaw", _viewFrustumOffset.yaw);
    settings->setValue("viewFrustumOffsetPitch", _viewFrustumOffset.pitch);
@ -1604,3 +1606,7 @@ QString Menu::getSnapshotsLocation() const {
    return _snapshotsLocation;
 }

+void Menu::setScriptsLocation(const QString& scriptsLocation) {
+    _scriptsLocation = scriptsLocation;
+    emit scriptLocationChanged(scriptsLocation);
+}
--- a/interface/src/Menu.h
+++ b/interface/src/Menu.h
@ -93,6 +93,9 @@ public:
    QString getSnapshotsLocation() const;
    void setSnapshotsLocation(QString snapshotsLocation) { _snapshotsLocation = snapshotsLocation; }

+    const QString& getScriptsLocation() const { return _scriptsLocation; }
+    void setScriptsLocation(const QString& scriptsLocation);
+
    BandwidthDialog* getBandwidthDialog() const { return _bandwidthDialog; }
    FrustumDrawMode getFrustumDrawMode() const { return _frustumDrawMode; }
    ViewFrustumOffset getViewFrustumOffset() const { return _viewFrustumOffset; }
@ -145,6 +148,9 @@ public:
    void static goToDomain(const QString newDomain);
    void static goTo(QString destination);

+signals:
+    void scriptLocationChanged(const QString& newPath);
+
 public slots:

    void loginForCurrentDomain();
@ -261,6 +267,7 @@ private:
    QPointer<AttachmentsDialog> _attachmentsDialog;
    QAction* _chatAction;
    QString _snapshotsLocation;
+    QString _scriptsLocation;
 };

 namespace MenuOption {
--- a/interface/src/ui/PreferencesDialog.cpp
+++ b/interface/src/ui/PreferencesDialog.cpp
@ -29,6 +29,7 @@ PreferencesDialog::PreferencesDialog(QWidget* parent, Qt::WindowFlags flags) : F
    connect(ui.buttonBrowseHead, &QPushButton::clicked, this, &PreferencesDialog::openHeadModelBrowser);
    connect(ui.buttonBrowseBody, &QPushButton::clicked, this, &PreferencesDialog::openBodyModelBrowser);
    connect(ui.buttonBrowseLocation, &QPushButton::clicked, this, &PreferencesDialog::openSnapshotLocationBrowser);
+    connect(ui.buttonBrowseScriptsLocation, &QPushButton::clicked, this, &PreferencesDialog::openScriptsLocationBrowser);
 }

 void PreferencesDialog::accept() {
@ -70,13 +71,32 @@ void PreferencesDialog::openBodyModelBrowser() {

 void PreferencesDialog::openSnapshotLocationBrowser() {
    setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
+    show();
+
    QString dir = QFileDialog::getExistingDirectory(this, tr("Snapshots Location"),
                                                    QStandardPaths::writableLocation(QStandardPaths::DesktopLocation),
                                                    QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
    if (!dir.isNull() && !dir.isEmpty()) {
        ui.snapshotLocationEdit->setText(dir);
    }
+
    setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+    show();
+}
+
+void PreferencesDialog::openScriptsLocationBrowser() {
+    setWindowFlags(windowFlags() & ~Qt::WindowStaysOnTopHint);
+    show();
+
+    QString dir = QFileDialog::getExistingDirectory(this, tr("Scripts Location"),
+                                                    ui.scriptsLocationEdit->text(),
+                                                    QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
+    if (!dir.isNull() && !dir.isEmpty()) {
+        ui.scriptsLocationEdit->setText(dir);
+    }
+
+    setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
+    show();
 }

 void PreferencesDialog::resizeEvent(QResizeEvent *resizeEvent) {
@ -116,6 +136,8 @@ void PreferencesDialog::loadPreferences() {

    ui.snapshotLocationEdit->setText(menuInstance->getSnapshotsLocation());

+    ui.scriptsLocationEdit->setText(menuInstance->getScriptsLocation());
+
    ui.pupilDilationSlider->setValue(myAvatar->getHead()->getPupilDilation() *
                                     ui.pupilDilationSlider->maximum());
    
@ -169,6 +191,10 @@ void PreferencesDialog::savePreferences() {
        Menu::getInstance()->setSnapshotsLocation(ui.snapshotLocationEdit->text());
    }

+    if (!ui.scriptsLocationEdit->text().isEmpty() && QDir(ui.scriptsLocationEdit->text()).exists()) {
+        Menu::getInstance()->setScriptsLocation(ui.scriptsLocationEdit->text());
+    }
+
    myAvatar->getHead()->setPupilDilation(ui.pupilDilationSlider->value() / (float)ui.pupilDilationSlider->maximum());
    myAvatar->setLeanScale(ui.leanScaleSpin->value());
    myAvatar->setClampedTargetScale(ui.avatarScaleSpin->value());
--- a/interface/src/ui/PreferencesDialog.h
+++ b/interface/src/ui/PreferencesDialog.h
@ -42,6 +42,7 @@ private slots:
    void setHeadUrl(QString modelUrl);
    void setSkeletonUrl(QString modelUrl);
    void openSnapshotLocationBrowser();
+    void openScriptsLocationBrowser();
    
 };

--- a/interface/src/ui/RunningScriptsWidget.cpp
+++ b/interface/src/ui/RunningScriptsWidget.cpp
@ -12,18 +12,27 @@
 #include "ui_runningScriptsWidget.h"
 #include "RunningScriptsWidget.h"

+#include <QCompleter>
+#include <QAbstractProxyModel>
 #include <QFileInfo>
 #include <QKeyEvent>
 #include <QPainter>
 #include <QTableWidgetItem>
+#include <QFileSystemModel>

+#include "ScriptListModel.h"
 #include "Application.h"

+
 RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) :
    FramelessDialog(parent, 0, POSITION_LEFT),
-    ui(new Ui::RunningScriptsWidget) {
+    ui(new Ui::RunningScriptsWidget),
+    _fsm(this),
+    _spm(this) {
    ui->setupUi(this);

+    setAttribute(Qt::WA_DeleteOnClose, false);
+
    setAllowResize(false);

    ui->hideWidgetButton->setIcon(QIcon(Application::resourcesPath() + "images/close.svg"));
@ -31,6 +40,28 @@ RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) :
    ui->stopAllButton->setIcon(QIcon(Application::resourcesPath() + "images/stop.svg"));
    ui->loadScriptButton->setIcon(QIcon(Application::resourcesPath() + "images/plus-white.svg"));

+    ui->recentlyLoadedScriptsArea->hide();
+
+    _fsm.setReadOnly(true);
+    _fsm.setRootPath(QDir("/Users/huffman/dev/hifi-19644/examples").absolutePath());
+    _fsm.setFilter(QDir::NoDotAndDotDot | QDir::Files);
+    _fsm.setNameFilterDisables(false);
+    _fsm.setNameFilters(QStringList("*.js"));
+    _spm.setSourceModel(&_fsm);
+    _spm.sort(0, Qt::AscendingOrder);
+    _spm.setDynamicSortFilter(true);
+    ui->scriptListView->setModel(&_spm);
+    ui->scriptListView->setAttribute(Qt::WA_MacShowFocusRect, false);
+    ui->scriptListView->setRootIndex(_spm.mapFromSource(_fsm.index("/Users/huffman/dev/hifi-19644/examples")));
+    connect(ui->filterLineEdit, &QLineEdit::textChanged, this, &RunningScriptsWidget::updateFileFilter);
+    connect(ui->scriptListView, &QListView::doubleClicked, this, &RunningScriptsWidget::scriptFileSelected);
+
+    // QCompleter *completer = new QCompleter(this);
+    // completer->setModel(&_spm);
+    // completer->setCompletionMode(QCompleter::InlineCompletion);
+    // completer->setCaseSensitivity(Qt::CaseInsensitive);
+    // ui->filterLineEdit->setCompleter(completer);
+
    _runningScriptsTable = new ScriptsTableWidget(ui->runningScriptsTableWidget);
    _runningScriptsTable->setColumnCount(2);
    _runningScriptsTable->setColumnWidth(0, 245);
--- a/interface/ui/preferencesDialog.ui
+++ b/interface/ui/preferencesDialog.ui
@ -155,8 +155,8 @@ color: #0e7077</string>
     <rect>
      <x>0</x>
      <y>0</y>
-      <width>615</width>
-      <height>936</height>
+      <width>600</width>
+      <height>1039</height>
     </rect>
    </property>
    <layout class="QVBoxLayout" name="verticalLayout_2">
@ -612,6 +612,145 @@ color: #0e7077</string>
       </item>
      </layout>
     </item>
+     <item>
+      <widget class="QLabel" name="avatarTitleLabel_3">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>40</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <family>Arial</family>
+         <pointsize>20</pointsize>
+         <weight>50</weight>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">color: #0e7077</string>
+       </property>
+       <property name="text">
+        <string>Scripts</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="headLabel_4">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <family>Arial</family>
+         <pointsize>16</pointsize>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">color: #0e7077</string>
+       </property>
+       <property name="text">
+        <string>Load scripts from this directory:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft</set>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <property name="buddy">
+        <cstring>snapshotLocationEdit</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_11">
+       <item>
+        <widget class="QLineEdit" name="scriptsLocationEdit">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="font">
+          <font>
+           <family>Arial</family>
+          </font>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_11">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QPushButton" name="buttonBrowseScriptsLocation">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>30</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>30</width>
+           <height>30</height>
+          </size>
+         </property>
+         <property name="styleSheet">
+          <string notr="true"/>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>30</width>
+           <height>30</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
     <item>
      <spacer name="verticalSpacer">
       <property name="orientation">