Commit 48f4fd9c authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Release-1.7.2-20101224

parent dd7602fd

Doxyfile

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ ENUM_VALUES_PER_LINE = 4 
GENERATE_TREEVIEW      = YES

USE_INLINE_TREES       = YES

TREEVIEW_WIDTH         = 250

EXT_LINKS_IN_WINDOW    = YES

EXT_LINKS_IN_WINDOW    = NO

FORMULA_FONTSIZE       = 10

SEARCHENGINE           = YES

SERVER_BASED_SEARCH    = NO

INSTALL

+2 −2
Original line number Diff line number Diff line 
DOXYGEN Version 1.7.2-20101118

DOXYGEN Version 1.7.2-20101224



Please read the installation section of the manual 

(http://www.doxygen.org/install.html) for instructions.



--------

Dimitri van Heesch (18 November 2010)
 
Dimitri van Heesch (24 December 2010)

README

+2 −2
Original line number Diff line number Diff line 
DOXYGEN Version 1.7.2_20101118

DOXYGEN Version 1.7.2_20101224



Please read INSTALL for compilation instructions.
@@ -26,4 +26,4 @@ forum. 


Enjoy,



Dimitri van Heesch (dimitri@stack.nl) (18 November 2010)
 
Dimitri van Heesch (dimitri@stack.nl) (24 December 2010)

addon/doxywizard/doxywizard.qrc

+1 −0
Original line number Diff line number Diff line
@@ -6,5 +6,6 @@ 
  <file>images/file.png</file>

  <file>images/folder.png</file>

  <file>images/refresh.png</file>

  <file>images/tunecolor.png</file>

</qresource>

</RCC>

addon/doxywizard/wizard.cpp

+39 −1
Original line number Diff line number Diff line
@@ -117,6 +117,32 @@ static void updateStringOption( 


//==========================================================================



TuneColorDialog::TuneColorDialog(QWidget *parent) : QDialog(parent)

{

   setWindowTitle(tr("Tune the color of the HTML output"));

   QGridLayout *layout = new QGridLayout(this);

   m_image = new QImage(QString::fromAscii(":/images/tunecolor.png"));

   m_imageLab = new QLabel;

   m_imageLab->setPixmap(QPixmap::fromImage(*m_image));

   layout->addWidget(new QLabel(tr("Example output: use the sliders to change")),0,0);

   layout->addWidget(m_imageLab,1,0);

   QHBoxLayout *buttonsLayout = new QHBoxLayout;



   QPushButton *okButton = new QPushButton(tr("Ok"));

   connect(okButton,SIGNAL(clicked()),SLOT(accept()));

   okButton->setDefault(true);

   QPushButton *cancelButton = new QPushButton(tr("Cancel"));

   connect(cancelButton,SIGNAL(clicked()),SLOT(reject()));



   buttonsLayout->addStretch();

   buttonsLayout->addWidget(okButton);

   buttonsLayout->addWidget(cancelButton);

   layout->addLayout(buttonsLayout,5,0);



}



//==========================================================================



Step1::Step1(Wizard *wizard,const QHash<QString,Input*> &modelData) : m_wizard(wizard), m_modelData(modelData)

{

  QVBoxLayout *layout = new QVBoxLayout(this);
@@ -477,9 +503,14 @@ Step3::Step3(Wizard *wizard,const QHash<QString,Input*> &modelData) 
    m_htmlOptionsGroup->addButton(r, 2);

    // GENERATE_HTMLHELP

    vbox->addWidget(r);

    m_searchEnabled=new QCheckBox(tr("With search function (requires PHP enabled web server)"));

    m_searchEnabled=new QCheckBox(tr("With search function"));

    vbox->addWidget(m_searchEnabled);

    // SEARCH_ENGINE

    QHBoxLayout *hbox = new QHBoxLayout;

    m_tuneColor=new QPushButton(tr("Change color..."));

    hbox->addWidget(m_tuneColor);

    hbox->addStretch(1);

    vbox->addLayout(hbox);

    m_htmlOptions->setLayout(vbox);

    m_htmlOptions->setChecked(true);

  }
@@ -531,6 +562,13 @@ Step3::Step3(Wizard *wizard,const QHash<QString,Input*> &modelData) 
          SLOT(setHtmlOptions(int)));

  connect(m_texOptionsGroup,SIGNAL(buttonClicked(int)),

          SLOT(setLatexOptions(int)));

  connect(m_tuneColor,SIGNAL(clicked()),SLOT(tuneColorDialog()));

}



void Step3::tuneColorDialog()

{

  TuneColorDialog tuneColor(this);

  tuneColor.exec();

}



void Step3::setHtmlEnabled(bool b)