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

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

parent fbc60af2

addon/doxywizard/doxywizard.cpp

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ MainWindow::MainWindow() 
  connect(showSettings,SIGNAL(clicked()),SLOT(showSettings()));

  connect(m_expert,SIGNAL(changed()),SLOT(configChanged()));

  connect(m_wizard,SIGNAL(done()),SLOT(selectRunTab()));

  connect(m_expert,SIGNAL(done()),SLOT(selectRunTab()));



  loadSettings();

  updateLaunchButtonState();
@@ -372,6 +373,7 @@ void MainWindow::saveSettings() 
void MainWindow::selectTab(int id)

{

  if (id==0) m_wizard->refresh();

  else if (id==1) m_expert->refresh();

}



void MainWindow::selectRunTab()

addon/doxywizard/expert.cpp

+17 −5
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ void Expert::activateTopic(QTreeWidgetItem *item,QTreeWidgetItem *) 
    QWidget *w = m_topics[item->text(0)];

    m_topicStack->setCurrentWidget(w);

    m_prev->setEnabled(m_topicStack->currentIndex()!=0); 

    m_next->setEnabled(m_topicStack->currentIndex()!=m_topicStack->count()-1); 

    m_next->setEnabled(true);

  }

}
@@ -823,12 +823,19 @@ void Expert::showHelp(Input *option) 
}



void Expert::nextTopic()

{

  if (m_topicStack->currentIndex()+1==m_topicStack->count()) // last topic

  {

    done();

  }

  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()

{
@@ -931,3 +938,8 @@ bool Expert::pdfOutputPresent(const QString &workingDir) const 
  return fi.exists() && fi.isFile();

}



void Expert::refresh()

{

  m_treeWidget->setCurrentItem(m_treeWidget->invisibleRootItem()->child(0));

}

addon/doxywizard/expert.h

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ class Expert : public QSplitter, public DocIntf 
  public slots:

    void activateTopic(QTreeWidgetItem *,QTreeWidgetItem *);

    QWidget *createTopicWidget(QDomElement &elem);

    void refresh();



  private slots:

    void showHelp(Input *);
@@ -50,6 +51,7 @@ class Expert : public QSplitter, public DocIntf 


  signals:

    void changed();

    void done();



  private:

    void createTopics(const QDomElement &);