Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 19:10:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update RunningScriptsWidget to use FramelessDialog

Browse source
This commit is contained in:
Ryan Huffman 2014-04-25 10:10:50 -07:00
parent 84e7b1598c
commit 225c022511
3 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
interface/src/Application.cpp
View file

@ -164,7 +164,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
_bytesPerSecond(0), _bytesPerSecond(0),
_previousScriptLocation(), _previousScriptLocation(),
_logger(new FileLogger(this)), _logger(new FileLogger(this)),
_runningScriptsWidget(new RunningScriptsWidget), _runningScriptsWidget(new RunningScriptsWidget(_window)),
_runningScriptsWidgetWasVisible(false) _runningScriptsWidgetWasVisible(false)
{ {
// init GnuTLS for DTLS with domain-servers // init GnuTLS for DTLS with domain-servers
@ -332,7 +332,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
LocalVoxelsList::getInstance()->addPersistantTree(DOMAIN_TREE_NAME, _voxels.getTree()); LocalVoxelsList::getInstance()->addPersistantTree(DOMAIN_TREE_NAME, _voxels.getTree());
LocalVoxelsList::getInstance()->addPersistantTree(CLIPBOARD_TREE_NAME, &_clipboard); LocalVoxelsList::getInstance()->addPersistantTree(CLIPBOARD_TREE_NAME, &_clipboard);
_window->addDockWidget(Qt::NoDockWidgetArea, _runningScriptsWidget);
_runningScriptsWidget->setRunningScripts(getRunningScripts()); _runningScriptsWidget->setRunningScripts(getRunningScripts());
connect(_runningScriptsWidget, &RunningScriptsWidget::stopScriptName, this, &Application::stopScript); connect(_runningScriptsWidget, &RunningScriptsWidget::stopScriptName, this, &Application::stopScript);
@ -356,7 +355,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
connect(_window, &MainWindow::windowGeometryChanged, connect(_window, &MainWindow::windowGeometryChanged,
_runningScriptsWidget, &RunningScriptsWidget::setBoundary); _runningScriptsWidget, &RunningScriptsWidget::setBoundary);
connect(_window, &MainWindow::windowShown, this, &Application::manageRunningScriptsWidgetVisibility);
//When -url in command line, teleport to location //When -url in command line, teleport to location
urlGoTo(argc, constArgv); urlGoTo(argc, constArgv);
@ -705,11 +703,6 @@ void Application::resizeGL(int width, int height) {
updateProjectionMatrix(); updateProjectionMatrix();
glLoadIdentity(); glLoadIdentity();
if (_runningScriptsWidgetWasVisible) {
_runningScriptsWidget->setGeometry(_window->geometry().topLeft().x(),
_window->geometry().topLeft().y(),
_runningScriptsWidget->width(), _window->height());
}
// update Stats width // update Stats width
int horizontalOffset = 0; int horizontalOffset = 0;
if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
@ -3350,15 +3343,13 @@ void Application::manageRunningScriptsWidgetVisibility(bool shown)
void Application::toggleRunningScriptsWidget() void Application::toggleRunningScriptsWidget()
{ {
qDebug() << "RS";
if (_runningScriptsWidgetWasVisible) { if (_runningScriptsWidgetWasVisible) {
_runningScriptsWidget->hide(); _runningScriptsWidget->hide();
_runningScriptsWidgetWasVisible = false; _runningScriptsWidgetWasVisible = false;
} else { } else {
_runningScriptsWidget->setBoundary(QRect(_window->geometry().topLeft(), _runningScriptsWidget->setBoundary(QRect(_window->geometry().topLeft(),
_window->size())); _window->size()));
_runningScriptsWidget->setGeometry(_window->geometry().topLeft().x(),
_window->geometry().topLeft().y(),
_runningScriptsWidget->width(), _window->height());
_runningScriptsWidget->show(); _runningScriptsWidget->show();
_runningScriptsWidgetWasVisible = true; _runningScriptsWidgetWasVisible = true;
} }

9
interface/src/ui/RunningScriptsWidget.cpp
View file

@ -20,14 +20,13 @@
#include "Application.h" #include "Application.h"
RunningScriptsWidget::RunningScriptsWidget(QWidget *parent) : RunningScriptsWidget::RunningScriptsWidget(QWidget *parent) :
QDockWidget(parent), FramelessDialog(parent, 0, POSITION_LEFT),
ui(new Ui::RunningScriptsWidget), ui(new Ui::RunningScriptsWidget),
_mousePressed(false), _mousePressed(false),
_mousePosition(QPoint()) _mousePosition(QPoint())
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::SubWindow | Qt::FramelessWindowHint);
ui->hideWidgetButton->setIcon(QIcon(Application::resourcesPath() + "images/close.svg")); ui->hideWidgetButton->setIcon(QIcon(Application::resourcesPath() + "images/close.svg"));
ui->reloadAllButton->setIcon(QIcon(Application::resourcesPath() + "images/reload.svg")); ui->reloadAllButton->setIcon(QIcon(Application::resourcesPath() + "images/reload.svg"));
@ -114,7 +113,7 @@ void RunningScriptsWidget::mousePressEvent(QMouseEvent *e)
_mousePressed = false; _mousePressed = false;
_mousePosition = QPoint(); _mousePosition = QPoint();
} }
QWidget::mousePressEvent(e); FramelessDialog::mousePressEvent(e);
} }
void RunningScriptsWidget::mouseMoveEvent(QMouseEvent *e) void RunningScriptsWidget::mouseMoveEvent(QMouseEvent *e)
@ -126,7 +125,7 @@ void RunningScriptsWidget::mouseMoveEvent(QMouseEvent *e)
move(newPosition.x(), _boundary.y()); move(newPosition.x(), _boundary.y());
} }
} }
QWidget::mouseMoveEvent(e); FramelessDialog::mouseMoveEvent(e);
} }
void RunningScriptsWidget::mouseReleaseEvent(QMouseEvent *e) void RunningScriptsWidget::mouseReleaseEvent(QMouseEvent *e)
@ -201,7 +200,7 @@ void RunningScriptsWidget::keyPressEvent(QKeyEvent *e)
break; break;
} }
QWidget::keyPressEvent(e); FramelessDialog::keyPressEvent(e);
} }
void RunningScriptsWidget::paintEvent(QPaintEvent *) void RunningScriptsWidget::paintEvent(QPaintEvent *)

6
interface/src/ui/RunningScriptsWidget.h
View file

@ -12,16 +12,14 @@
#ifndef hifi_RunningScriptsWidget_h #ifndef hifi_RunningScriptsWidget_h
#define hifi_RunningScriptsWidget_h #define hifi_RunningScriptsWidget_h
// Qt #include "FramelessDialog.h"
#include <QDockWidget>
#include "ScriptsTableWidget.h" #include "ScriptsTableWidget.h"
namespace Ui { namespace Ui {
class RunningScriptsWidget; class RunningScriptsWidget;
} }
class RunningScriptsWidget : public QDockWidget class RunningScriptsWidget : public FramelessDialog
{ {
Q_OBJECT Q_OBJECT
public: public: