Removed 'CustomDocumentationTitles' option and made it active by default for all plugins. This relates to bug 1859.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 10 years ago
parent 0ffe0dfb29
commit 3a0f0172fb

@ -99,10 +99,10 @@ void AddCatalogDlg::docTypeChanged( const TQString & )
DocumentationPlugin * plugin = this->plugin(); DocumentationPlugin * plugin = this->plugin();
if ( plugin ) if ( plugin )
{ {
titleLabel->setEnabled( plugin->hasCapability(DocumentationPlugin::CustomDocumentationTitles) ); titleLabel->setEnabled(true);
titleEdit->setEnabled( plugin->hasCapability(DocumentationPlugin::CustomDocumentationTitles) ); titleEdit->setEnabled(true);
locationURL->setMode( plugin->catalogLocatorProps().first ); locationURL->setMode(plugin->catalogLocatorProps().first);
locationURL->setFilter( plugin->catalogLocatorProps().second ); locationURL->setFilter(plugin->catalogLocatorProps().second);
} }
} }

@ -32,11 +32,8 @@ EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* parent,
const char* name, bool modal, WFlags fl) const char* name, bool modal, WFlags fl)
:EditCatalogBase(parent,name, modal,fl), m_plugin(plugin) :EditCatalogBase(parent,name, modal,fl), m_plugin(plugin)
{ {
if (m_plugin->hasCapability(DocumentationPlugin::CustomDocumentationTitles)) titleLabel->setEnabled(true);
{ titleEdit->setEnabled(true);
titleLabel->setEnabled(true);
titleEdit->setEnabled(true);
}
locationURL->setMode(m_plugin->catalogLocatorProps().first); locationURL->setMode(m_plugin->catalogLocatorProps().first);
locationURL->setFilter(m_plugin->catalogLocatorProps().second); locationURL->setFilter(m_plugin->catalogLocatorProps().second);
} }

@ -222,7 +222,6 @@ public:
/**Capability of documentation plugin.*/ /**Capability of documentation plugin.*/
enum Capability { Index=1 /**<index can be built for catalogs*/, enum Capability { Index=1 /**<index can be built for catalogs*/,
FullTextSearch=2 /**<full text search is possible in catalog locations*/, FullTextSearch=2 /**<full text search is possible in catalog locations*/,
CustomDocumentationTitles=4 /**<user can specify titles for documentation catalogs*/,
ProjectDocumentation=8 /**<plugin can handle project API documentation*/, ProjectDocumentation=8 /**<plugin can handle project API documentation*/,
ProjectUserManual=16 /**<plugin can handle project user manual*/ }; ProjectUserManual=16 /**<plugin can handle project user manual*/ };
/**Possible project documentation types.*/ /**Possible project documentation types.*/

@ -42,7 +42,6 @@ DocCHMPlugin::DocCHMPlugin(TQObject* parent, const char* name, TQStringList // a
) )
:DocumentationPlugin(DocCHMPluginFactory::instance()->config(), parent, name) :DocumentationPlugin(DocCHMPluginFactory::instance()->config(), parent, name)
{ {
setCapabilities(CustomDocumentationTitles); // | Index | FullTextSearch | ProjectDocumentation
autoSetup(); autoSetup();
} }

@ -36,7 +36,7 @@ DocCustomPlugin::DocCustomPlugin(TQObject* parent, const char* name, const TQStr
) )
:DocumentationPlugin(DocCustomPluginFactory::instance()->config(), parent, name) :DocumentationPlugin(DocCustomPluginFactory::instance()->config(), parent, name)
{ {
setCapabilities(CustomDocumentationTitles | ProjectUserManual); setCapabilities(ProjectUserManual);
autoSetup(); autoSetup();
} }

@ -67,7 +67,7 @@ K_EXPORT_COMPONENT_FACTORY( libdocdoxygenplugin, DocDoxygenPluginFactory(data) )
DocDoxygenPlugin::DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList) DocDoxygenPlugin::DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList)
:DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), parent, name) :DocumentationPlugin(DocDoxygenPluginFactory::instance()->config(), parent, name)
{ {
setCapabilities(Index | FullTextSearch | ProjectDocumentation | CustomDocumentationTitles ); setCapabilities(Index | FullTextSearch | ProjectDocumentation);
autoSetup(); autoSetup();
} }

@ -63,7 +63,7 @@ K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) )
DocQtPlugin::DocQtPlugin(TQObject* parent, const char* name, const TQStringList) DocQtPlugin::DocQtPlugin(TQObject* parent, const char* name, const TQStringList)
:DocumentationPlugin(DocQtPluginFactory::instance()->config(), parent, name) :DocumentationPlugin(DocQtPluginFactory::instance()->config(), parent, name)
{ {
setCapabilities(Index | FullTextSearch | CustomDocumentationTitles); setCapabilities(Index | FullTextSearch);
autoSetup(); autoSetup();
} }

Loading…
Cancel
Save