Differential D14620 Diff 39114 addons/symbolviewer/plugin_katesymbolviewer.cpp

Changeset View

Standalone View

View Options

addons/symbolviewer/plugin_katesymbolviewer.cpp

Context not available.
81 mw->guiFactory()->addClient (this); 81​ mw->guiFactory()->addClient (this);
82 m_symbols = nullptr; 82​ m_symbols = nullptr;
83 83​
84​ // FIXME Let the parser decide which options are available and how they are named
85​ // because not all these options are supported by all parsers
84 m_popup = new QMenu(m_symbols); 86​ m_popup = new QMenu(m_symbols);
85 m_treeOn = m_popup->addAction(i18n("Tree Mode"), this, &KatePluginSymbolViewerView::parseSymbols); 87​ m_treeOn = m_popup->addAction(i18n("Tree Mode"), this, &KatePluginSymbolViewerView::actionTriggered);
86 m_treeOn->setCheckable(true); 88​ m_treeOn->setCheckable(true);
87 m_sort = m_popup->addAction(i18n("Show Sorted"), this, &KatePluginSymbolViewerView::parseSymbols); 89​ m_expandOn = m_popup->addAction(i18n("Expand Tree"), this, &KatePluginSymbolViewerView::actionTriggered);
90​ m_expandOn->setCheckable(true);
91​ m_sort = m_popup->addAction(i18n("Show Sorted"), this, &KatePluginSymbolViewerView::actionTriggered);
88 m_sort->setCheckable(true); 92​ m_sort->setCheckable(true);
89 m_popup->addSeparator(); 93​ m_popup->addSeparator();
90 m_macro = m_popup->addAction(i18n("Show Macros"), this, &KatePluginSymbolViewerView::parseSymbols); 94​ m_macro = m_popup->addAction(i18n("Show Macros"), this, &KatePluginSymbolViewerView::actionTriggered);
91 m_macro->setCheckable(true); 95​ m_macro->setCheckable(true);
92 m_struct = m_popup->addAction(i18n("Show Structures"), this, &KatePluginSymbolViewerView::parseSymbols); 96​ m_struct = m_popup->addAction(i18n("Show Structures"), this, &KatePluginSymbolViewerView::actionTriggered);
93 m_struct->setCheckable(true); 97​ m_struct->setCheckable(true);
94 m_func = m_popup->addAction(i18n("Show Functions"), this, &KatePluginSymbolViewerView::parseSymbols); 98​ m_func = m_popup->addAction(i18n("Show Functions"), this, &KatePluginSymbolViewerView::actionTriggered);
95 m_func->setCheckable(true); 99​ m_func->setCheckable(true);
100​ m_typesOn = m_popup->addAction(i18n("Show Parameters"), this, &KatePluginSymbolViewerView::actionTriggered);
101​ m_typesOn->setCheckable(true);
96 102​
97 KConfigGroup config(KSharedConfig::openConfig(), "PluginSymbolViewer"); 103​ KConfigGroup config(KSharedConfig::openConfig(), "PluginSymbolViewer");
98 m_plugin->typesOn = config.readEntry(QLatin1String("ViewTypes"), false); 104​ m_typesOn->setChecked(config.readEntry(QLatin1String("ViewTypes"), false));
99 m_plugin->expandedOn = config.readEntry(QLatin1String("ExpandTree"), false); 105​ m_expandOn->setChecked(config.readEntry(QLatin1String("ExpandTree"), false));
100 m_treeOn->setChecked(config.readEntry(QLatin1String("TreeView"), false)); 106​ m_treeOn->setChecked(config.readEntry(QLatin1String("TreeView"), false));
101 m_sort->setChecked(config.readEntry(QLatin1String("SortSymbols"), false)); 107​ m_sort->setChecked(config.readEntry(QLatin1String("SortSymbols"), false));
102 108​
Context not available.
254 m_popup->popup(QCursor::pos(), m_treeOn); 260​ m_popup->popup(QCursor::pos(), m_treeOn);
255} 261​}
256 262​
263​/**
264​ * Each popup menu action is connected to this slot which offer the possibility
265​ * to modify the menu depended on current settings.
266​ */
267​void KatePluginSymbolViewerView::actionTriggered()
268​{
269​ m_expandOn->setEnabled(m_treeOn->isChecked());
sarsUnsubmitted
Not Done

What I meant was that you could move this line to parseSymbols() and not add a new "wrapper" function with only one extra line of code...

If you absolutely want to save the one setEnabled() for the timer-based document update, please use a more descriptive name like displayOptionChanged() or something similar.

sars: What I meant was that you could move this line to parseSymbols() and not add a new "wrapper"…
270​ parseSymbols();
271​}
272​
257void KatePluginSymbolViewerView::parseSymbols() 273​void KatePluginSymbolViewerView::parseSymbols()
258{ 274​{
259 if (!m_symbols) 275​ if (!m_symbols)
Context not available.
352 return (KTextEditor::ConfigPage*)p; 368​ return (KTextEditor::ConfigPage*)p;
353} 369​}
354 370​
355void KatePluginSymbolViewer::applyConfig( KatePluginSymbolViewerConfigPage* p ) 371​void KatePluginSymbolViewer::applyConfig(KatePluginSymbolViewerConfigPage* p)
356{ 372​{
357 KConfigGroup config(KSharedConfig::openConfig(), QStringLiteral("PluginSymbolViewer")); 373​ KConfigGroup config(KSharedConfig::openConfig(), QStringLiteral("PluginSymbolViewer"));
358 config.writeEntry(QLatin1String("ViewTypes"), p->viewReturns->isChecked()); 374​ config.writeEntry(QLatin1String("ViewTypes"), p->viewReturns->isChecked());
Context not available.
360 config.writeEntry(QLatin1String("TreeView"), p->treeView->isChecked()); 376​ config.writeEntry(QLatin1String("TreeView"), p->treeView->isChecked());
361 config.writeEntry(QLatin1String("SortSymbols"), p->sortSymbols->isChecked()); 377​ config.writeEntry(QLatin1String("SortSymbols"), p->sortSymbols->isChecked());
362 378​
363 typesOn = p->viewReturns->isChecked(); ​
364 expandedOn = p->expandTree->isChecked(); ​
365 if (m_view) { 379​ if (m_view) {
380​ m_view->m_typesOn->setChecked(p->viewReturns->isChecked());
381​ m_view->m_expandOn->setChecked(p->expandTree->isChecked());
366 m_view->m_treeOn->setChecked(p->treeView->isChecked()); 382​ m_view->m_treeOn->setChecked(p->treeView->isChecked());
367 m_view->m_sort->setChecked(p->sortSymbols->isChecked()); 383​ m_view->m_sort->setChecked(p->sortSymbols->isChecked());
368 } 384​ }
Context not available.