From f3121e1bf6c6ec1c8de029266f49c29e15637554 Mon Sep 17 00:00:00 2001 From: Mohammed Nafees Date: Thu, 3 Apr 2014 22:33:45 +0530 Subject: [PATCH] Removed the animation, placed UI elements according to mockup --- interface/interface_en.ts | 30 ++++++++++--------- interface/src/Application.cpp | 35 ++++++++--------------- interface/src/Application.h | 1 - interface/src/ui/RunningScriptsWidget.cpp | 9 +++--- interface/ui/runningScriptsWidget.ui | 29 ++++++++++--------- 5 files changed, 48 insertions(+), 56 deletions(-) diff --git a/interface/interface_en.ts b/interface/interface_en.ts index 92ccb01cb4..16de312c33 100644 --- a/interface/interface_en.ts +++ b/interface/interface_en.ts @@ -4,22 +4,22 @@ Application - + Export Voxels - + Sparse Voxel Octree Files (*.svo) - + Open Script - + JavaScript Files (*.js) @@ -162,49 +162,51 @@ RunningScriptsWidget - + Form - + <html><head/><body><p><span style=" font-size:18pt;">Running Scripts</span></p></body></html> - + <html><head/><body><p><span style=" font-weight:600;">Currently running</span></p></body></html> - - Reload All + + Reload all + Reload All - - Stop All + + Stop all + Stop All - + <html><head/><body><p><span style=" font-weight:600;">Recently loaded</span></p></body></html> - + (click a script or use the 1-9 keys to load and run it) - + There are no scripts currently running. diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index a63cbffd31..01cccbde47 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -171,7 +171,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : _recentMaxPackets(0), _resetRecentMaxPacketsSoon(true), _previousScriptLocation(), - _logger(new FileLogger(this)) + _logger(new FileLogger(this)), + _runningScriptsWidget(new RunningScriptsWidget) { // read the ApplicationInfo.ini file for Name/Version/Domain information QSettings applicationInfo(Application::resourcesPath() + "info/ApplicationInfo.ini", QSettings::IniFormat); @@ -333,7 +334,8 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : LocalVoxelsList::getInstance()->addPersistantTree(DOMAIN_TREE_NAME, _voxels.getTree()); LocalVoxelsList::getInstance()->addPersistantTree(CLIPBOARD_TREE_NAME, &_clipboard); - _window->addDockWidget(Qt::NoDockWidgetArea, _runningScriptsWidget = new RunningScriptsWidget()); + _window->addDockWidget(Qt::NoDockWidgetArea, _runningScriptsWidget); + _runningScriptsWidget->hide(); _runningScriptsWidget->setRunningScripts(getRunningScripts()); connect(_runningScriptsWidget, &RunningScriptsWidget::stopScriptName, this, &Application::stopScript); @@ -620,10 +622,11 @@ void Application::resizeGL(int width, int height) { updateProjectionMatrix(); glLoadIdentity(); - if (_runningScriptsWidgetVisible) + if (_runningScriptsWidget->isVisible()) { _runningScriptsWidget->setGeometry(_window->geometry().topLeft().x(), _window->geometry().topLeft().y(), _runningScriptsWidget->width(), _window->height()); + } } void Application::updateProjectionMatrix() { @@ -3630,30 +3633,16 @@ void Application::reloadAllScripts() { void Application::toggleRunningScriptsWidget() { if (!_runningScriptsWidget->toggleViewAction()->isChecked()) { - _runningScriptsWidget->move(_window->geometry().topLeft().x(), _window->geometry().topLeft().y()); - _runningScriptsWidget->resize(0, _window->height()); + _runningScriptsWidget->setGeometry(_window->geometry().topLeft().x(), + _window->geometry().topLeft().y(), + 310, _window->height()); _runningScriptsWidget->toggleViewAction()->trigger(); _runningScriptsWidget->grabKeyboard(); - _runningScriptsWidgetVisible = true; - - QPropertyAnimation* slideAnimation = new QPropertyAnimation(_runningScriptsWidget, "geometry", _runningScriptsWidget); - slideAnimation->setStartValue(_runningScriptsWidget->geometry()); - slideAnimation->setEndValue(QRect(_window->geometry().topLeft().x(), _window->geometry().topLeft().y(), - 310, _runningScriptsWidget->height())); - slideAnimation->setDuration(250); - slideAnimation->start(QAbstractAnimation::DeleteWhenStopped); + _runningScriptsWidget->show(); } else { + _runningScriptsWidget->toggleViewAction()->trigger(); _runningScriptsWidget->releaseKeyboard(); - _runningScriptsWidgetVisible = false; - - QPropertyAnimation* slideAnimation = new QPropertyAnimation(_runningScriptsWidget, "geometry", _runningScriptsWidget); - slideAnimation->setStartValue(_runningScriptsWidget->geometry()); - slideAnimation->setEndValue(QRect(_window->geometry().topLeft().x(), _window->geometry().topLeft().y(), - 0, _runningScriptsWidget->height())); - slideAnimation->setDuration(250); - slideAnimation->start(QAbstractAnimation::DeleteWhenStopped); - - QTimer::singleShot(260, _runningScriptsWidget->toggleViewAction(), SLOT(trigger())); + _runningScriptsWidget->hide(); } } diff --git a/interface/src/Application.h b/interface/src/Application.h index 32e8d3ac62..221a81478e 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -502,7 +502,6 @@ private: RunningScriptsWidget* _runningScriptsWidget; QHash _scriptEnginesHash; - bool _runningScriptsWidgetVisible; }; #endif /* defined(__interface__Application__) */ diff --git a/interface/src/ui/RunningScriptsWidget.cpp b/interface/src/ui/RunningScriptsWidget.cpp index 66664dcc8c..a684fb4594 100644 --- a/interface/src/ui/RunningScriptsWidget.cpp +++ b/interface/src/ui/RunningScriptsWidget.cpp @@ -10,6 +10,7 @@ #include #include +#include #include #include @@ -26,14 +27,14 @@ RunningScriptsWidget::RunningScriptsWidget(QDockWidget *parent) : _runningScriptsTable = new ScriptsTableWidget(ui->runningScriptsTableWidget); _runningScriptsTable->setColumnCount(2); - _runningScriptsTable->setColumnWidth(0, 245); + _runningScriptsTable->setColumnWidth(0, 252); _runningScriptsTable->setColumnWidth(1, 22); connect(_runningScriptsTable, &QTableWidget::cellClicked, this, &RunningScriptsWidget::stopScript); _recentlyLoadedScriptsTable = new ScriptsTableWidget(ui->recentlyLoadedScriptsTableWidget); _recentlyLoadedScriptsTable->setColumnCount(2); _recentlyLoadedScriptsTable->setColumnWidth(0, 25); - _recentlyLoadedScriptsTable->setColumnWidth(1, 235); + _recentlyLoadedScriptsTable->setColumnWidth(1, 242); connect(_recentlyLoadedScriptsTable, &QTableWidget::cellClicked, this, &RunningScriptsWidget::loadScript); @@ -147,13 +148,13 @@ void RunningScriptsWidget::paintEvent(QPaintEvent *) if (ui->currentlyRunningLabel->isVisible()) { // line below the 'Currently Running' label painter.drawLine(20, ui->currentlyRunningLabel->y() + ui->currentlyRunningLabel->height(), - width() - 20, ui->currentlyRunningLabel->y() + ui->currentlyRunningLabel->height()); + width() - 21, ui->currentlyRunningLabel->y() + ui->currentlyRunningLabel->height()); } if (ui->recentlyLoadedLabel->isVisible()) { // line below the 'Recently loaded' label painter.drawLine(20, ui->recentlyLoadedLabel->y() + ui->recentlyLoadedLabel->height(), - width() - 20, ui->recentlyLoadedLabel->y() + ui->recentlyLoadedLabel->height()); + width() - 21, ui->recentlyLoadedLabel->y() + ui->recentlyLoadedLabel->height()); } painter.end(); diff --git a/interface/ui/runningScriptsWidget.ui b/interface/ui/runningScriptsWidget.ui index d35caf0d77..7353c19508 100644 --- a/interface/ui/runningScriptsWidget.ui +++ b/interface/ui/runningScriptsWidget.ui @@ -39,7 +39,7 @@ font-size: 20pt; 20 40 - 301 + 270 20 @@ -54,10 +54,10 @@ font-size: 14pt; - 40 + 20 230 111 - 31 + 35 @@ -69,11 +69,11 @@ font-size: 14pt; background: #0e7077; color: #fff; -border-radius: 6px; +border-radius: 4px; font: 14pt 75pt; - Reload All + Reload all @@ -83,10 +83,10 @@ font: 14pt 75pt; - 160 + 144 230 101 - 31 + 35 @@ -95,11 +95,11 @@ font: 14pt 75pt; background: #0e7077; color: #fff; -border-radius: 6px; +border-radius: 4px; font: 14pt 75pt; - Stop All + Stop all @@ -194,9 +194,9 @@ font-size: 14pt; - 20 + 14 300 - 270 + 276 280 @@ -204,14 +204,15 @@ font-size: 14pt; background: transparent; font-size: 14pt; + reloadAllButton - 20 + 14 60 - 270 - 140 + 276 + 161