Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-22 17:53:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Further changes for child like behaviour

Browse source
This commit is contained in:
Mohammed Nafees 2014-04-24 17:18:24 +05:30
parent ba7c696786
commit dd74ea64e7
5 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/interface_en.ts
View file

@ -14,12 +14,12 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="3749"/>
<location filename="src/Application.cpp" line="3742"/>
<source>Open Script</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Application.cpp" line="3750"/>
<location filename="src/Application.cpp" line="3743"/>
<source>JavaScript Files (*.js)</source>
<translation type="unfinished"></translation>
</message>

11
interface/src/Application.cpp
View file

@ -625,7 +625,7 @@ void Application::resizeGL(int width, int height) {
updateProjectionMatrix();
glLoadIdentity();
if (_runningScriptsWidget->toggleViewAction()->isChecked()) {
if (_runningScriptsWidgetWasVisible) {
_runningScriptsWidget->setGeometry(_window->geometry().topLeft().x(),
_window->geometry().topLeft().y(),
_runningScriptsWidget->width(), _window->height());
@ -3636,19 +3636,15 @@ void Application::reloadAllScripts() {
void Application::manageRunningScriptsWidgetVisibility(bool shown)
{
if (_runningScriptsWidgetWasVisible && shown) {
_runningScriptsWidget->setWindowFlags(Qt::SubWindow | Qt::FramelessWindowHint |
Qt::WindowStaysOnTopHint);
_runningScriptsWidget->show();
} else {
_runningScriptsWidget->setWindowFlags(Qt::SubWindow | Qt::FramelessWindowHint);
} else if (_runningScriptsWidgetWasVisible && !shown) {
_runningScriptsWidget->hide();
}
}
void Application::toggleRunningScriptsWidget()
{
if (_runningScriptsWidget->toggleViewAction()->isChecked()) {
_runningScriptsWidget->toggleViewAction()->setChecked(false);
if (_runningScriptsWidgetWasVisible) {
_runningScriptsWidget->hide();
_runningScriptsWidgetWasVisible = false;
} else {
@ -3657,7 +3653,6 @@ void Application::toggleRunningScriptsWidget()
_runningScriptsWidget->setGeometry(_window->geometry().topLeft().x(),
_window->geometry().topLeft().y(),
_runningScriptsWidget->width(), _window->height());
_runningScriptsWidget->toggleViewAction()->setChecked(true);
_runningScriptsWidget->show();
_runningScriptsWidgetWasVisible = true;
}

5
interface/src/MainWindow.cpp
View file

@ -22,11 +22,13 @@ MainWindow::MainWindow(QWidget *parent) :
void MainWindow::moveEvent(QMoveEvent *e)
{
emit windowGeometryChanged(QRect(e->pos(), size()));
QMainWindow::moveEvent(e);
}
void MainWindow::resizeEvent(QResizeEvent *e)
{
emit windowGeometryChanged(QRect(QPoint(x(), y()), e->size()));
QMainWindow::resizeEvent(e);
}
void MainWindow::showEvent(QShowEvent *e)
@ -34,6 +36,7 @@ void MainWindow::showEvent(QShowEvent *e)
if (e->spontaneous()) {
emit windowShown(true);
}
QMainWindow::showEvent(e);
}
void MainWindow::hideEvent(QHideEvent *e)
@ -41,6 +44,7 @@ void MainWindow::hideEvent(QHideEvent *e)
if (e->spontaneous()) {
emit windowShown(false);
}
QMainWindow::hideEvent(e);
}
void MainWindow::changeEvent(QEvent *e)
@ -61,4 +65,5 @@ void MainWindow::changeEvent(QEvent *e)
emit windowShown(false);
}
}
QMainWindow::changeEvent(e);
}

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

@ -16,7 +16,7 @@
#include "Application.h"
RunningScriptsWidget::RunningScriptsWidget(QDockWidget *parent) :
RunningScriptsWidget::RunningScriptsWidget(QWidget *parent) :
QDockWidget(parent),
ui(new Ui::RunningScriptsWidget),
_mousePressed(false),
@ -105,6 +105,7 @@ void RunningScriptsWidget::mousePressEvent(QMouseEvent *e)
_mousePressed = false;
_mousePosition = QPoint();
}
QWidget::mousePressEvent(e);
}
void RunningScriptsWidget::mouseMoveEvent(QMouseEvent *e)
@ -116,6 +117,7 @@ void RunningScriptsWidget::mouseMoveEvent(QMouseEvent *e)
move(newPosition.x(), _boundary.y());
}
}
QWidget::mouseMoveEvent(e);
}
void RunningScriptsWidget::mouseReleaseEvent(QMouseEvent *e)
@ -124,6 +126,7 @@ void RunningScriptsWidget::mouseReleaseEvent(QMouseEvent *e)
_mousePressed = false;
_mousePosition = QPoint();
}
QWidget::mouseReleaseEvent(e);
}
void RunningScriptsWidget::keyPressEvent(QKeyEvent *e)
@ -188,6 +191,7 @@ void RunningScriptsWidget::keyPressEvent(QKeyEvent *e)
default:
break;
}
QWidget::keyPressEvent(e);
}
void RunningScriptsWidget::paintEvent(QPaintEvent *)

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

@ -20,7 +20,7 @@ class RunningScriptsWidget : public QDockWidget
{
Q_OBJECT
public:
explicit RunningScriptsWidget(QDockWidget *parent = 0);
explicit RunningScriptsWidget(QWidget *parent = 0);
~RunningScriptsWidget();
void setRunningScripts(const QStringList& list);