mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-04 04:33:11 +02:00
This fixes all warnings that I got while compiling with g++ 4.7.2: In file included from interface/src/Application.h:53:0, from interface/src/Menu.cpp:36: interface/src/Menu.h: In constructor ‘Menu::Menu()’: interface/src/Menu.h:292:13: warning: ‘Menu::_scriptsLocation’ will be initialized after [-Wreorder] interface/src/Menu.h:289:27: warning: ‘QPointer<LoginDialog> Menu::_loginDialog’ [-Wreorder] interface/src/Menu.cpp:82:1: warning: when initialized here [-Wreorder] libraries/audio/src/AudioRingBuffer.cpp: In member function ‘qint64 AudioRingBuffer::writeData(const char*, qint64)’: libraries/audio/src/AudioRingBuffer.cpp:126:75: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] libraries/audio/src/PositionalAudioRingBuffer.cpp: In member function ‘bool PositionalAudioRingBuffer::shouldBeAddedToMix()’: libraries/audio/src/PositionalAudioRingBuffer.cpp:212:37: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] interface/ui/preferencesDialog.ui: Warning: The name 'horizontalLayout_11' (QHBoxLayout) is already in use, defaulting to 'horizontalLayout_111'. interface/ui/preferencesDialog.ui: Warning: The name 'horizontalSpacer_11' (QSpacerItem) is already in use, defaulting to 'horizontalSpacer_111'. interface/src/avatar/Avatar.cpp: In member function ‘void Avatar::initializeHair()’: interface/src/avatar/Avatar.cpp:587:21: warning: name lookup of ‘link’ changed [enabled by default] interface/src/avatar/Avatar.cpp:574:18: warning: matches this ‘link’ under ISO standard rules [enabled by default] interface/src/avatar/Avatar.cpp:577:22: warning: matches this ‘link’ under old rules [enabled by default] interface/src/ui/ApplicationOverlay.cpp: In member function ‘void ApplicationOverlay::renderControllerPointers()’: interface/src/ui/ApplicationOverlay.cpp:379:59: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] In file included from interface/src/ui/RunningScriptsWidget.cpp:14:0: interface/src/ui/RunningScriptsWidget.h: In constructor ‘RunningScriptsWidget::RunningScriptsWidget(QWidget*)’: interface/src/ui/RunningScriptsWidget.h:61:18: warning: ‘RunningScriptsWidget::_scriptsModel’ will be initialized after [-Wreorder] interface/src/ui/RunningScriptsWidget.h:60:27: warning: ‘QSortFilterProxyModel RunningScriptsWidget::_proxyModel’ [-Wreorder] interface/src/ui/RunningScriptsWidget.cpp:27:1: warning: when initialized here [-Wreorder]
202 lines
6.9 KiB
C++
202 lines
6.9 KiB
C++
//
|
|
// RunningScriptsWidget.cpp
|
|
// interface/src/ui
|
|
//
|
|
// Created by Mohammed Nafees on 03/28/2014.
|
|
// Updated by Ryan Huffman on 05/13/2014.
|
|
// Copyright 2014 High Fidelity, Inc.
|
|
//
|
|
// Distributed under the Apache License, Version 2.0.
|
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
|
//
|
|
|
|
#include "ui_runningScriptsWidget.h"
|
|
#include "RunningScriptsWidget.h"
|
|
|
|
#include <QAbstractProxyModel>
|
|
#include <QFileInfo>
|
|
#include <QKeyEvent>
|
|
#include <QPainter>
|
|
#include <QTableWidgetItem>
|
|
|
|
#include "Application.h"
|
|
#include "Menu.h"
|
|
#include "ScriptsModel.h"
|
|
|
|
|
|
RunningScriptsWidget::RunningScriptsWidget(QWidget* parent) :
|
|
FramelessDialog(parent, 0, POSITION_LEFT),
|
|
ui(new Ui::RunningScriptsWidget),
|
|
_signalMapper(this),
|
|
_proxyModel(this),
|
|
_scriptsModel(this) {
|
|
ui->setupUi(this);
|
|
|
|
setAttribute(Qt::WA_DeleteOnClose, false);
|
|
|
|
setAllowResize(false);
|
|
|
|
ui->hideWidgetButton->setIcon(QIcon(Application::resourcesPath() + "images/close.svg"));
|
|
ui->reloadAllButton->setIcon(QIcon(Application::resourcesPath() + "images/reload.svg"));
|
|
ui->stopAllButton->setIcon(QIcon(Application::resourcesPath() + "images/stop.svg"));
|
|
ui->loadScriptButton->setIcon(QIcon(Application::resourcesPath() + "images/plus-white.svg"));
|
|
|
|
ui->recentlyLoadedScriptsArea->hide();
|
|
|
|
ui->filterLineEdit->installEventFilter(this);
|
|
|
|
connect(&_proxyModel, &QSortFilterProxyModel::modelReset,
|
|
this, &RunningScriptsWidget::selectFirstInList);
|
|
|
|
_proxyModel.setSourceModel(&_scriptsModel);
|
|
_proxyModel.sort(0, Qt::AscendingOrder);
|
|
_proxyModel.setDynamicSortFilter(true);
|
|
ui->scriptListView->setModel(&_proxyModel);
|
|
|
|
connect(ui->filterLineEdit, &QLineEdit::textChanged, this, &RunningScriptsWidget::updateFileFilter);
|
|
connect(ui->scriptListView, &QListView::doubleClicked, this, &RunningScriptsWidget::loadScriptFromList);
|
|
|
|
_recentlyLoadedScriptsTable = new ScriptsTableWidget(ui->recentlyLoadedScriptsTableWidget);
|
|
_recentlyLoadedScriptsTable->setColumnCount(1);
|
|
_recentlyLoadedScriptsTable->setColumnWidth(0, 265);
|
|
|
|
connect(ui->hideWidgetButton, &QPushButton::clicked,
|
|
Application::getInstance(), &Application::toggleRunningScriptsWidget);
|
|
connect(ui->reloadAllButton, &QPushButton::clicked,
|
|
Application::getInstance(), &Application::reloadAllScripts);
|
|
connect(ui->stopAllButton, &QPushButton::clicked,
|
|
this, &RunningScriptsWidget::allScriptsStopped);
|
|
connect(ui->loadScriptButton, &QPushButton::clicked,
|
|
Application::getInstance(), &Application::loadDialog);
|
|
connect(&_signalMapper, SIGNAL(mapped(QString)), Application::getInstance(), SLOT(stopScript(const QString&)));
|
|
}
|
|
|
|
RunningScriptsWidget::~RunningScriptsWidget() {
|
|
delete ui;
|
|
}
|
|
|
|
void RunningScriptsWidget::updateFileFilter(const QString& filter) {
|
|
QRegExp regex("^.*" + QRegExp::escape(filter) + ".*$", Qt::CaseInsensitive);
|
|
_proxyModel.setFilterRegExp(regex);
|
|
selectFirstInList();
|
|
}
|
|
|
|
void RunningScriptsWidget::loadScriptFromList(const QModelIndex& index) {
|
|
QVariant scriptFile = _proxyModel.data(index, ScriptsModel::ScriptPath);
|
|
Application::getInstance()->loadScript(scriptFile.toString(), false, false);
|
|
}
|
|
|
|
void RunningScriptsWidget::loadSelectedScript() {
|
|
QModelIndex selectedIndex = ui->scriptListView->currentIndex();
|
|
if (selectedIndex.isValid()) {
|
|
loadScriptFromList(selectedIndex);
|
|
}
|
|
}
|
|
|
|
void RunningScriptsWidget::setBoundary(const QRect& rect) {
|
|
_boundary = rect;
|
|
}
|
|
|
|
void RunningScriptsWidget::setRunningScripts(const QStringList& list) {
|
|
setUpdatesEnabled(false);
|
|
QLayoutItem* widget;
|
|
while ((widget = ui->scrollAreaWidgetContents->layout()->takeAt(0)) != NULL) {
|
|
delete widget->widget();
|
|
delete widget;
|
|
}
|
|
const int CLOSE_ICON_HEIGHT = 12;
|
|
for (int i = 0; i < list.size(); i++) {
|
|
QWidget* row = new QWidget(ui->scrollAreaWidgetContents);
|
|
row->setLayout(new QHBoxLayout(row));
|
|
|
|
QUrl url = QUrl(list.at(i));
|
|
QLabel* name = new QLabel(url.fileName(), row);
|
|
QPushButton* closeButton = new QPushButton(row);
|
|
closeButton->setFlat(true);
|
|
closeButton->setIcon(
|
|
QIcon(QPixmap(Application::resourcesPath() + "images/kill-script.svg").scaledToHeight(CLOSE_ICON_HEIGHT)));
|
|
closeButton->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred));
|
|
closeButton->setStyleSheet("border: 0;");
|
|
closeButton->setCursor(Qt::PointingHandCursor);
|
|
|
|
connect(closeButton, SIGNAL(clicked()), &_signalMapper, SLOT(map()));
|
|
_signalMapper.setMapping(closeButton, url.toString());
|
|
|
|
row->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
|
|
|
|
row->layout()->setContentsMargins(4, 4, 4, 4);
|
|
row->layout()->setSpacing(0);
|
|
|
|
row->layout()->addWidget(name);
|
|
row->layout()->addWidget(closeButton);
|
|
|
|
row->setToolTip(url.toString());
|
|
|
|
QFrame* line = new QFrame(row);
|
|
line->setFrameShape(QFrame::HLine);
|
|
line->setStyleSheet("color: #E1E1E1; margin-left: 6px; margin-right: 6px;");
|
|
|
|
ui->scrollAreaWidgetContents->layout()->addWidget(row);
|
|
ui->scrollAreaWidgetContents->layout()->addWidget(line);
|
|
}
|
|
|
|
|
|
ui->noRunningScriptsLabel->setVisible(list.isEmpty());
|
|
ui->reloadAllButton->setVisible(!list.isEmpty());
|
|
ui->stopAllButton->setVisible(!list.isEmpty());
|
|
|
|
ui->scrollAreaWidgetContents->updateGeometry();
|
|
setUpdatesEnabled(true);
|
|
Application::processEvents();
|
|
repaint();
|
|
}
|
|
|
|
void RunningScriptsWidget::showEvent(QShowEvent* event) {
|
|
if (!event->spontaneous()) {
|
|
ui->filterLineEdit->setFocus();
|
|
}
|
|
|
|
FramelessDialog::showEvent(event);
|
|
}
|
|
|
|
void RunningScriptsWidget::selectFirstInList() {
|
|
if (_proxyModel.rowCount() > 0) {
|
|
ui->scriptListView->setCurrentIndex(_proxyModel.index(0, 0));
|
|
}
|
|
}
|
|
|
|
bool RunningScriptsWidget::eventFilter(QObject* sender, QEvent* event) {
|
|
if (sender == ui->filterLineEdit) {
|
|
if (event->type() != QEvent::KeyPress) {
|
|
return false;
|
|
}
|
|
QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
|
|
if (keyEvent->key() == Qt::Key_Return || keyEvent->key() == Qt::Key_Enter) {
|
|
QModelIndex selectedIndex = ui->scriptListView->currentIndex();
|
|
if (selectedIndex.isValid()) {
|
|
loadScriptFromList(selectedIndex);
|
|
}
|
|
event->accept();
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
return FramelessDialog::eventFilter(sender, event);
|
|
}
|
|
|
|
void RunningScriptsWidget::keyPressEvent(QKeyEvent *keyEvent) {
|
|
if (keyEvent->key() == Qt::Key_Escape) {
|
|
return;
|
|
} else {
|
|
FramelessDialog::keyPressEvent(keyEvent);
|
|
}
|
|
}
|
|
|
|
void RunningScriptsWidget::scriptStopped(const QString& scriptName) {
|
|
// _recentlyLoadedScripts.prepend(scriptName);
|
|
}
|
|
|
|
void RunningScriptsWidget::allScriptsStopped() {
|
|
Application::getInstance()->stopAllScripts();
|
|
}
|