CVS commit by dymo: added support for dcf file extensions for qt-3.2 M +1 -1 doctreeglobalconfigwidget.cpp 1.24 M +13 -0 doctreeviewwidget.cpp 1.68 --- kdevelop/parts/doctreeview/doctreeglobalconfigwidget.cpp #1.23:1.24 @@ -415,5 +415,5 @@ void DocTreeGlobalConfigWidget::doxygenr void DocTreeGlobalConfigWidget::qtdocsadd_button_clicked( ) { - AddDocItemDialog *dialog = new AddDocItemDialog(KFile::File, "text/xml", AddDocItemDialog::Qt); + AddDocItemDialog *dialog = new AddDocItemDialog(KFile::File, "*.xml *.dcf", AddDocItemDialog::Qt); if (dialog->exec()) new KListViewItem(qtdocs_view, dialog->title(), dialog->url()); --- kdevelop/parts/doctreeview/doctreeviewwidget.cpp #1.67:1.68 @@ -1165,4 +1165,16 @@ DocTreeViewWidget::DocTreeViewWidget(Doc if (emap.empty() && (!qtdocdir.isEmpty())) { +#if QT_VERSION >= 0x030200 + config->writePathEntry("Qt Reference Documentation", QString(QT_DOCDIR) + QString("/qt.dcf")); + emap["Qt Reference Documentation"] = QString(QT_DOCDIR) + QString("/qt.dcf"); + config->writePathEntry("Qt Assistant Manual", QString(QT_DOCDIR) + QString("/assistant.dcf")); + emap["Qt Assistant Manual"] = QString(QT_DOCDIR) + QString("/assistant.dcf"); + config->writePathEntry("Qt Designer Manual", QString(QT_DOCDIR) + QString("/designer.dcf")); + emap["Qt Designer Manual"] = QString(QT_DOCDIR) + QString("/designer.dcf"); + config->writePathEntry("Guide to the Qt Translation Tools", QString(QT_DOCDIR) + QString("/linguist.dcf")); + emap["Guide to the Qt Translation Tools"] = QString(QT_DOCDIR) + QString("/linguist.dcf"); + config->writePathEntry("qmake User Guide", QString(QT_DOCDIR) + QString("/qmake.dcf")); + emap["qmake User Guide"] = QString(QT_DOCDIR) + QString("/qmake.dcf"); +#else config->writePathEntry("Qt Reference Documentation", QString(QT_DOCDIR) + QString("/qt.xml")); emap["Qt Reference Documentation"] = QString(QT_DOCDIR) + QString("/qt.xml"); @@ -1175,4 +1187,5 @@ DocTreeViewWidget::DocTreeViewWidget(Doc config->writePathEntry("qmake User Guide", QString(QT_DOCDIR) + QString("/qmake.xml")); emap["qmake User Guide"] = QString(QT_DOCDIR) + QString("/qmake.xml"); +#endif }