History

Style

Thijs Wenker committed 12 years ago

Commit c1ed38f1 parent 0e28ff26 files · +147 −131Browse files

Showing the changes to interface/src/ui/ScriptEditorWindow.cpp (1 of 6 files). Show all

Unified · Split

interface/src/ui/ScriptEditorWindow.cpp+53−43
@@ -29,19 +29,19 @@ · 28 unmodified lines
2929 #include "FlowLayout.h"
3030
3131 ScriptEditorWindow::ScriptEditorWindow() :
32− ui(new Ui::ScriptEditorWindow)
32+ _ScriptEditorWindowUI(new Ui::ScriptEditorWindow),
33+ _loadMenu(new QMenu),
34+ _saveMenu(new QMenu)
3335 {
34− ui->setupUi(this);
36+ _ScriptEditorWindowUI->setupUi(this);
3537 show();
3638 addScriptEditorWidget("New script");
37− loadMenu = new QMenu();
38− connect(loadMenu, SIGNAL(aboutToShow()), this, SLOT(loadMenuAboutToShow()));
39− ui->loadButton->setMenu(loadMenu);
39+ connect(_loadMenu, SIGNAL(aboutToShow()), this, SLOT(loadMenuAboutToShow()));
40+ _ScriptEditorWindowUI->loadButton->setMenu(_loadMenu);
4041
41− saveMenu = new QMenu();
42− saveMenu->addAction("Save as..", this, SLOT(saveScriptAsClicked()), Qt::CTRL|Qt::SHIFT|Qt::Key_S);
42+ _saveMenu->addAction("Save as..", this, SLOT(saveScriptAsClicked()), Qt::CTRL | Qt::SHIFT | Qt::Key_S);
4343
44− ui->saveButton->setMenu(saveMenu);
44+ _ScriptEditorWindowUI->saveButton->setMenu(_saveMenu);
4545
4646 connect(new QShortcut(QKeySequence("Ctrl+N"), this), SIGNAL(activated()), this, SLOT(newScriptClicked()));
4747 connect(new QShortcut(QKeySequence("Ctrl+S"), this), SIGNAL(activated()), this, SLOT(saveScriptClicked()));
@@ -50,19 +50,21 @@ ScriptEditorWindow::ScriptEditorWindow() : · 2 unmodified lines
5050 }
5151
5252 ScriptEditorWindow::~ScriptEditorWindow() {
53− delete ui;
53+ delete _ScriptEditorWindowUI;
5454 }
5555
5656 void ScriptEditorWindow::setRunningState(bool run) {
57− if (ui->tabWidget->currentIndex() != -1) {
58− ((ScriptEditorWidget*)ui->tabWidget->currentWidget())->setRunning(run);
57+ if (_ScriptEditorWindowUI->tabWidget->currentIndex() != -1) {
58+ static_cast<ScriptEditorWidget*>(_ScriptEditorWindowUI->tabWidget->currentWidget())->setRunning(run);
5959 }
6060 this->updateButtons();
6161 }
6262
6363 void ScriptEditorWindow::updateButtons() {
64− ui->toggleRunButton->setEnabled(ui->tabWidget->currentIndex() != -1);
65− ui->toggleRunButton->setIcon(ui->tabWidget->currentIndex() != -1 && ((ScriptEditorWidget*)ui->tabWidget->currentWidget())->isRunning() ? QIcon("../resources/icons/stop-script.svg"):QIcon("../resources/icons/start-script.svg"));
64+ _ScriptEditorWindowUI->toggleRunButton->setEnabled(_ScriptEditorWindowUI->tabWidget->currentIndex() != -1);
65+ _ScriptEditorWindowUI->toggleRunButton->setIcon(_ScriptEditorWindowUI->tabWidget->currentIndex() != -1 &&
66+ static_cast<ScriptEditorWidget*>(_ScriptEditorWindowUI->tabWidget->currentWidget())->isRunning() ?
67+ QIcon("../resources/icons/stop-script.svg") : QIcon("../resources/icons/start-script.svg"));
6668 }
6769
6870 void ScriptEditorWindow::loadScriptMenu(const QString& scriptName) {
@@ -79,21 +81,21 @@ void ScriptEditorWindow::loadScriptClicked() { · 10 unmodified lines
7981 }
8082
8183 void ScriptEditorWindow::loadMenuAboutToShow() {
82− loadMenu->clear();
84+ _loadMenu->clear();
8385 QStringList runningScripts = Application::getInstance()->getRunningScripts();
8486 if (runningScripts.count() > 0) {
8587 QSignalMapper* signalMapper = new QSignalMapper(this);
8688 foreach (const QString& runningScript, runningScripts) {
87− QAction* runningScriptAction = new QAction(runningScript, loadMenu);
89+ QAction* runningScriptAction = new QAction(runningScript, _loadMenu);
8890 connect(runningScriptAction, SIGNAL(triggered()), signalMapper, SLOT(map()));
8991 signalMapper->setMapping(runningScriptAction, runningScript);
90− loadMenu->addAction(runningScriptAction);
92+ _loadMenu->addAction(runningScriptAction);
9193 }
92− connect(signalMapper, SIGNAL(mapped(const QString &)), this, SLOT(loadScriptMenu(const QString &)));
94+ connect(signalMapper, SIGNAL(mapped(const QString &)), this, SLOT(loadScriptMenu(const QString&)));
9395 } else {
94− QAction* naAction = new QAction("(no running scripts)",loadMenu);
96+ QAction* naAction = new QAction("(no running scripts)", _loadMenu);
9597 naAction->setDisabled(true);
96− loadMenu->addAction(naAction);
98+ _loadMenu->addAction(naAction);
9799 }
98100 }
99101
@@ -102,19 +104,22 @@ void ScriptEditorWindow::newScriptClicked() { · 2 unmodified lines
102104 }
103105
104106 void ScriptEditorWindow::toggleRunScriptClicked() {
105− this->setRunningState(!(ui->tabWidget->currentIndex() !=-1 && ((ScriptEditorWidget*)ui->tabWidget->currentWidget())->isRunning()));
107+ this->setRunningState(!(_ScriptEditorWindowUI->tabWidget->currentIndex() !=-1
108+ && static_cast<ScriptEditorWidget*>(_ScriptEditorWindowUI->tabWidget->currentWidget())->isRunning()));
106109 }
107110
108111 void ScriptEditorWindow::saveScriptClicked() {
109− if (ui->tabWidget->currentIndex() != -1) {
110− ScriptEditorWidget* currentScriptWidget = (ScriptEditorWidget*)ui->tabWidget->currentWidget();
112+ if (_ScriptEditorWindowUI->tabWidget->currentIndex() != -1) {
113+ ScriptEditorWidget* currentScriptWidget = static_cast<ScriptEditorWidget*>(_ScriptEditorWindowUI->tabWidget
114+ ->currentWidget());
111115 currentScriptWidget->save();
112116 }
113117 }
114118
115119 void ScriptEditorWindow::saveScriptAsClicked() {
116− if (ui->tabWidget->currentIndex() != -1) {
117− ScriptEditorWidget* currentScriptWidget = (ScriptEditorWidget*)ui->tabWidget->currentWidget();
120+ if (_ScriptEditorWindowUI->tabWidget->currentIndex() != -1) {
121+ ScriptEditorWidget* currentScriptWidget = static_cast<ScriptEditorWidget*>(_ScriptEditorWindowUI->tabWidget
122+ ->currentWidget());
118123 currentScriptWidget->saveAs();
119124 }
120125 }
@@ -124,8 +129,8 @@ ScriptEditorWidget* ScriptEditorWindow::addScriptEditorWidget(QString title) { · 3 unmodified lines
124129 connect(newScriptEditorWidget, SIGNAL(scriptnameChanged()), this, SLOT(updateScriptNameOrStatus()));
125130 connect(newScriptEditorWidget, SIGNAL(scriptModified()), this, SLOT(updateScriptNameOrStatus()));
126131 connect(newScriptEditorWidget, SIGNAL(runningStateChanged()), this, SLOT(updateButtons()));
127− ui->tabWidget->addTab(newScriptEditorWidget, title);
128− ui->tabWidget->setCurrentWidget(newScriptEditorWidget);
132+ _ScriptEditorWindowUI->tabWidget->addTab(newScriptEditorWidget, title);
133+ _ScriptEditorWindowUI->tabWidget->setCurrentWidget(newScriptEditorWidget);
129134 newScriptEditorWidget->setUpdatesEnabled(true);
130135 newScriptEditorWidget->adjustSize();
131136 return newScriptEditorWidget;
@@ -133,13 +138,14 @@ ScriptEditorWidget* ScriptEditorWindow::addScriptEditorWidget(QString title) { · 1 unmodified line
133138
134139 void ScriptEditorWindow::tabSwitched(int tabIndex) {
135140 this->updateButtons();
136− if (ui->tabWidget->currentIndex() != -1) {
137− ScriptEditorWidget* currentScriptWidget = (ScriptEditorWidget*)ui->tabWidget->currentWidget();
138− QString modifiedStar = (currentScriptWidget->isModified()?"*":"");
141+ if (_ScriptEditorWindowUI->tabWidget->currentIndex() != -1) {
142+ ScriptEditorWidget* currentScriptWidget = static_cast<ScriptEditorWidget*>(_ScriptEditorWindowUI->tabWidget
143+ ->currentWidget());
144+ QString modifiedStar = (currentScriptWidget->isModified() ? "*" : "");
139145 if (currentScriptWidget->getScriptName().length() > 0) {
140− this->setWindowTitle("Script Editor ["+currentScriptWidget->getScriptName()+modifiedStar+"]");
146+ this->setWindowTitle("Script Editor [" + currentScriptWidget->getScriptName() + modifiedStar + "]");
141147 } else {
142− this->setWindowTitle("Script Editor [New script"+modifiedStar+"]");
148+ this->setWindowTitle("Script Editor [New script" + modifiedStar + "]");
143149 }
144150 } else {
145151 this->setWindowTitle("Script Editor");
@@ -147,21 +153,25 @@ void ScriptEditorWindow::tabSwitched(int tabIndex) { · 1 unmodified line
147153 }
148154
149155 void ScriptEditorWindow::tabCloseRequested(int tabIndex) {
150− ScriptEditorWidget* closingScriptWidget = (ScriptEditorWidget*)ui->tabWidget->widget(tabIndex);
156+ ScriptEditorWidget* closingScriptWidget = static_cast<ScriptEditorWidget*>(_ScriptEditorWindowUI->tabWidget
157+ ->widget(tabIndex));
151158 if(closingScriptWidget->questionSave()) {
152− ui->tabWidget->removeTab(tabIndex);
159+ _ScriptEditorWindowUI->tabWidget->removeTab(tabIndex);
153160 }
154161 }
155162
156163 void ScriptEditorWindow::closeEvent(QCloseEvent *event) {
157164 bool unsaved_docs_warning = false;
158− for (int i = 0; i < ui->tabWidget->count(); i++ && !unsaved_docs_warning){
159− if(((ScriptEditorWidget*)ui->tabWidget->widget(i))->isModified()){
165+ for (int i = 0; i < _ScriptEditorWindowUI->tabWidget->count(); i++){
166+ if(static_cast<ScriptEditorWidget*>(_ScriptEditorWindowUI->tabWidget->widget(i))->isModified()){
160167 unsaved_docs_warning = true;
168+ break;
161169 }
162170 }
163171
164− if (!unsaved_docs_warning || QMessageBox::warning(this, tr("Interface"), tr("There are some unsaved scripts, are you sure you want to close the editor? Changes will be lost!"), QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Cancel) == QMessageBox::Discard) {
172+ if (!unsaved_docs_warning || QMessageBox::warning(this, tr("Interface"),
173+ tr("There are some unsaved scripts, are you sure you want to close the editor? Changes will be lost!"),
174+ QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Cancel) == QMessageBox::Discard) {
165175 event->accept();
166176 } else {
167177 event->ignore();
@@ -172,19 +182,19 @@ void ScriptEditorWindow::updateScriptNameOrStatus() { · 4 unmodified lines
172182 ScriptEditorWidget* source = (ScriptEditorWidget*)QObject::sender();
173183 QString modifiedStar = (source->isModified()?"*":"");
174184 if (source->getScriptName().length() > 0) {
175− for (int i = 0; i < ui->tabWidget->count(); i++){
176− if (ui->tabWidget->widget(i) == source) {
177− ui->tabWidget->setTabText(i,modifiedStar+QFileInfo(source->getScriptName()).fileName());
178− ui->tabWidget->setTabToolTip(i, source->getScriptName());
185+ for (int i = 0; i < _ScriptEditorWindowUI->tabWidget->count(); i++){
186+ if (_ScriptEditorWindowUI->tabWidget->widget(i) == source) {
187+ _ScriptEditorWindowUI->tabWidget->setTabText(i,modifiedStar + QFileInfo(source->getScriptName()).fileName());
188+ _ScriptEditorWindowUI->tabWidget->setTabToolTip(i, source->getScriptName());
179189 }
180190 }
181191 }
182192
183− if (ui->tabWidget->currentWidget() == source) {
193+ if (_ScriptEditorWindowUI->tabWidget->currentWidget() == source) {
184194 if (source->getScriptName().length() > 0) {
185− this->setWindowTitle("Script Editor ["+source->getScriptName()+modifiedStar+"]");
195+ this->setWindowTitle("Script Editor [" + source->getScriptName() + modifiedStar + "]");
186196 } else {
187− this->setWindowTitle("Script Editor [New script"+modifiedStar+"]");
197+ this->setWindowTitle("Script Editor [New script" + modifiedStar + "]");
188198 }
189199 }
190200 }