diff --git a/ConfigurationManager.cpp b/ConfigurationManager.cpp index ecf6fb1..3eb4a98 100644 --- a/ConfigurationManager.cpp +++ b/ConfigurationManager.cpp @@ -47,9 +47,9 @@ void ConfigurationManager::updateTemplateDescription(const Utils::StringAspect & } if (&templateAspect == &m_generalSettings.ccTemplate) { - m_generalSettings.updateCCTemplateDescription(templ->description()); + m_generalSettings.ccTemplateDescription.setValue(templ->description()); } else if (&templateAspect == &m_generalSettings.caTemplate) { - m_generalSettings.updateCATemplateDescription(templ->description()); + m_generalSettings.caTemplateDescription.setValue(templ->description()); } } diff --git a/settings/GeneralSettings.cpp b/settings/GeneralSettings.cpp index 27766be..de886b2 100644 --- a/settings/GeneralSettings.cpp +++ b/settings/GeneralSettings.cpp @@ -90,6 +90,10 @@ GeneralSettings::GeneralSettings() ccStatus.setDefaultValue(""); ccTest.m_buttonText = TrConstants::TEST; + ccTemplateDescription.setDisplayStyle(Utils::StringAspect::TextEditDisplay); + ccTemplateDescription.setReadOnly(true); + ccTemplateDescription.setDefaultValue(""); + // preset1 specifyPreset1.setSettingsKey(Constants::CC_SPECIFY_PRESET1); specifyPreset1.setLabelText(TrConstants::ADD_NEW_PRESET); @@ -145,8 +149,9 @@ GeneralSettings::GeneralSettings() caStatus.setDefaultValue(""); caTest.m_buttonText = TrConstants::TEST; - m_ccTemplateDescription = new QLabel(); - m_caTemplateDescription = new QLabel(); + caTemplateDescription.setDisplayStyle(Utils::StringAspect::TextEditDisplay); + caTemplateDescription.setReadOnly(true); + caTemplateDescription.setDefaultValue(""); readSettings(); @@ -159,16 +164,6 @@ GeneralSettings::GeneralSettings() setLayouter([this]() { using namespace Layouting; - auto ccTemplateInfoCCSection = new Utils::DetailsWidget(); - ccTemplateInfoCCSection->setState(Utils::DetailsWidget::Collapsed); - ccTemplateInfoCCSection->setSummaryText("Template Format Details"); - ccTemplateInfoCCSection->setWidget(m_ccTemplateDescription); - - auto caTemplateInfoCASection = new Utils::DetailsWidget(); - caTemplateInfoCASection->setState(Utils::DetailsWidget::Collapsed); - caTemplateInfoCASection->setSummaryText("Template Format Details"); - caTemplateInfoCASection->setWidget(m_caTemplateDescription); - auto ccGrid = Grid{}; ccGrid.addRow({ccProvider, ccSelectProvider}); ccGrid.addRow({ccUrl, ccSetUrl}); @@ -191,11 +186,11 @@ GeneralSettings::GeneralSettings() title(TrConstants::CODE_COMPLETION), Column{ ccGrid, - ccTemplateInfoCCSection, + ccTemplateDescription, Row{specifyPreset1, preset1Language, Stretch{1}}, ccPreset1Grid}}; auto caGroup - = Group{title(TrConstants::CHAT_ASSISTANT), Column{caGrid, caTemplateInfoCASection}}; + = Group{title(TrConstants::CHAT_ASSISTANT), Column{caGrid, caTemplateDescription}}; auto rootLayout = Column{ Row{enableQodeAssist, Stretch{1}, Row{checkUpdate, resetToDefaults}}, @@ -371,18 +366,6 @@ void GeneralSettings::updatePreset1Visiblity(bool state) ccPreset1SelectTemplate.updateVisibility(specifyPreset1.volatileValue()); } -void GeneralSettings::updateCCTemplateDescription(const QString &text) -{ - if (text != m_ccTemplateDescription->text()) - m_ccTemplateDescription->setText(text); -} - -void GeneralSettings::updateCATemplateDescription(const QString &text) -{ - if (text != m_caTemplateDescription->text()) - m_caTemplateDescription->setText(text); -} - void GeneralSettings::setupConnections() { connect(&enableLogging, &Utils::BoolAspect::volatileValueChanged, this, [this]() { diff --git a/settings/GeneralSettings.hpp b/settings/GeneralSettings.hpp index 4702a27..51aecfc 100644 --- a/settings/GeneralSettings.hpp +++ b/settings/GeneralSettings.hpp @@ -55,6 +55,8 @@ public: Utils::StringAspect ccStatus{this}; ButtonAspect ccTest{this}; + Utils::StringAspect ccTemplateDescription{this}; + // TODO create dynamic presets system // preset1 for code completion settings Utils::BoolAspect specifyPreset1{this}; @@ -88,6 +90,8 @@ public: Utils::StringAspect caStatus{this}; ButtonAspect caTest{this}; + Utils::StringAspect caTemplateDescription{this}; + void showSelectionDialog(const QStringList &data, Utils::StringAspect &aspect, const QString &title = {}, @@ -101,15 +105,9 @@ public: void updatePreset1Visiblity(bool state); - void updateCCTemplateDescription(const QString &text); - void updateCATemplateDescription(const QString &text); - private: void setupConnections(); void resetPageToDefaults(); - - QLabel *m_ccTemplateDescription = nullptr; - QLabel *m_caTemplateDescription = nullptr; }; GeneralSettings &generalSettings();