Commit 2277e6e6 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Doxywizard: make the Next button on the last page of the expert tab switch to the run tab

parent fbc60af2
...@@ -128,6 +128,7 @@ MainWindow::MainWindow() ...@@ -128,6 +128,7 @@ MainWindow::MainWindow()
connect(showSettings,SIGNAL(clicked()),SLOT(showSettings())); connect(showSettings,SIGNAL(clicked()),SLOT(showSettings()));
connect(m_expert,SIGNAL(changed()),SLOT(configChanged())); connect(m_expert,SIGNAL(changed()),SLOT(configChanged()));
connect(m_wizard,SIGNAL(done()),SLOT(selectRunTab())); connect(m_wizard,SIGNAL(done()),SLOT(selectRunTab()));
connect(m_expert,SIGNAL(done()),SLOT(selectRunTab()));
loadSettings(); loadSettings();
updateLaunchButtonState(); updateLaunchButtonState();
...@@ -372,6 +373,7 @@ void MainWindow::saveSettings() ...@@ -372,6 +373,7 @@ void MainWindow::saveSettings()
void MainWindow::selectTab(int id) void MainWindow::selectTab(int id)
{ {
if (id==0) m_wizard->refresh(); if (id==0) m_wizard->refresh();
else if (id==1) m_expert->refresh();
} }
void MainWindow::selectRunTab() void MainWindow::selectRunTab()
......
...@@ -683,7 +683,7 @@ void Expert::activateTopic(QTreeWidgetItem *item,QTreeWidgetItem *) ...@@ -683,7 +683,7 @@ void Expert::activateTopic(QTreeWidgetItem *item,QTreeWidgetItem *)
QWidget *w = m_topics[item->text(0)]; QWidget *w = m_topics[item->text(0)];
m_topicStack->setCurrentWidget(w); m_topicStack->setCurrentWidget(w);
m_prev->setEnabled(m_topicStack->currentIndex()!=0); m_prev->setEnabled(m_topicStack->currentIndex()!=0);
m_next->setEnabled(m_topicStack->currentIndex()!=m_topicStack->count()-1); m_next->setEnabled(true);
} }
} }
...@@ -824,10 +824,17 @@ void Expert::showHelp(Input *option) ...@@ -824,10 +824,17 @@ void Expert::showHelp(Input *option)
void Expert::nextTopic() void Expert::nextTopic()
{ {
m_topicStack->setCurrentIndex(m_topicStack->currentIndex()+1); if (m_topicStack->currentIndex()+1==m_topicStack->count()) // last topic
m_next->setEnabled(m_topicStack->count()!=m_topicStack->currentIndex()+1); {
m_prev->setEnabled(m_topicStack->currentIndex()!=0); done();
m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(m_topicStack->currentIndex())); }
else
{
m_topicStack->setCurrentIndex(m_topicStack->currentIndex()+1);
m_next->setEnabled(m_topicStack->count()!=m_topicStack->currentIndex()+1);
m_prev->setEnabled(m_topicStack->currentIndex()!=0);
m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(m_topicStack->currentIndex()));
}
} }
void Expert::prevTopic() void Expert::prevTopic()
...@@ -931,3 +938,8 @@ bool Expert::pdfOutputPresent(const QString &workingDir) const ...@@ -931,3 +938,8 @@ bool Expert::pdfOutputPresent(const QString &workingDir) const
return fi.exists() && fi.isFile(); return fi.exists() && fi.isFile();
} }
void Expert::refresh()
{
m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(0));
}
...@@ -42,6 +42,7 @@ class Expert : public QSplitter, public DocIntf ...@@ -42,6 +42,7 @@ class Expert : public QSplitter, public DocIntf
public slots: public slots:
void activateTopic(QTreeWidgetItem *,QTreeWidgetItem *); void activateTopic(QTreeWidgetItem *,QTreeWidgetItem *);
QWidget *createTopicWidget(QDomElement &elem); QWidget *createTopicWidget(QDomElement &elem);
void refresh();
private slots: private slots:
void showHelp(Input *); void showHelp(Input *);
...@@ -50,6 +51,7 @@ class Expert : public QSplitter, public DocIntf ...@@ -50,6 +51,7 @@ class Expert : public QSplitter, public DocIntf
signals: signals:
void changed(); void changed();
void done();
private: private:
void createTopics(const QDomElement &); void createTopics(const QDomElement &);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment