diff options
| -rw-r--r-- | plugins/fossil/fossilclient.cpp | 27 | ||||
| -rw-r--r-- | plugins/fossil/fossilplugin.cpp | 4 |
2 files changed, 16 insertions, 15 deletions
diff --git a/plugins/fossil/fossilclient.cpp b/plugins/fossil/fossilclient.cpp index 092cd56..16385c5 100644 --- a/plugins/fossil/fossilclient.cpp +++ b/plugins/fossil/fossilclient.cpp @@ -150,11 +150,12 @@ public: // So we kludge this by coding it as a meta-option (pipe-separated), // then parse it out in arguments. // All-choice is a blank argument with no additional parameters - QList<ComboBoxItem> lineageFilterChoices; - lineageFilterChoices << ComboBoxItem(tr("Ancestors"), "ancestors") - << ComboBoxItem(tr("Descendants"), "descendants") - << ComboBoxItem(tr("Unfiltered"), ""); - mapSetting(addComboBox(QStringList("|LINEAGE|%1|current"), lineageFilterChoices), + const QList<ChoiceItem> lineageFilterChoices = { + ChoiceItem(tr("Ancestors"), "ancestors"), + ChoiceItem(tr("Descendants"), "descendants"), + ChoiceItem(tr("Unfiltered"), "") + }; + mapSetting(addChoices(tr("Lineage"), QStringList("|LINEAGE|%1|current"), lineageFilterChoices), settings.stringPointer(FossilSettings::timelineLineageFilterKey)); } @@ -173,20 +174,20 @@ public: VcsBase::VcsBaseClientSettings &settings = m_client->settings(); // option: -t <val> - const QList<ComboBoxItem> itemTypeChoices = { - ComboBoxItem(tr("All Items"), "all"), - ComboBoxItem(tr("File Commits"), "ci"), - ComboBoxItem(tr("Technical Notes"), "e"), - ComboBoxItem(tr("Tags"), "g"), - ComboBoxItem(tr("Tickets"), "t"), - ComboBoxItem(tr("Wiki Commits"), "w") + const QList<ChoiceItem> itemTypeChoices = { + ChoiceItem(tr("All Items"), "all"), + ChoiceItem(tr("File Commits"), "ci"), + ChoiceItem(tr("Technical Notes"), "e"), + ChoiceItem(tr("Tags"), "g"), + ChoiceItem(tr("Tickets"), "t"), + ChoiceItem(tr("Wiki Commits"), "w") }; // here we setup the ComboBox to map to the "-t <val>", which will produce // the enquoted option-values (e.g "-t all"). // Fossil expects separate arguments for option and value ( i.e. "-t" "all") // so we need to handle the splitting explicitly in arguments(). - mapSetting(addComboBox(QStringList("-t %1"), itemTypeChoices), + mapSetting(addChoices(tr("Item Types"), QStringList("-t %1"), itemTypeChoices), settings.stringPointer(FossilSettings::timelineItemTypeKey)); } diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp index e811443..88d93ca 100644 --- a/plugins/fossil/fossilplugin.cpp +++ b/plugins/fossil/fossilplugin.cpp @@ -1171,7 +1171,7 @@ void Fossil::Internal::FossilPlugin::testDiffFileResolving_data() void Fossil::Internal::FossilPlugin::testDiffFileResolving() { - VcsBase::VcsBaseEditorWidget::testDiffFileResolving(diffParameters.id); + VcsBase::VcsBaseEditorWidget::testDiffFileResolving(dd->diffFactory); } void Fossil::Internal::FossilPlugin::testLogResolving() @@ -1184,6 +1184,6 @@ void Fossil::Internal::FossilPlugin::testLogResolving() " EDITED src/core/scaler.cpp\n" " EDITED src/core/scaler.h\n" ); - VcsBase::VcsBaseEditorWidget::testLogResolving(fileLogParameters.id, data, "ac6d1129b8", "56d6917c3b"); + VcsBase::VcsBaseEditorWidget::testLogResolving(dd->fileLogFactory, data, "ac6d1129b8", "56d6917c3b"); } #endif |