Differential D20072 Diff 54898 kcms/componentchooser/componentchooser.cpp

Changeset View

Standalone View

View Options

kcms/componentchooser/componentchooser.cpp

Context not available.
134 cg.readEntry("Name",i18n("Unknown"))); 134​ cg.readEntry("Name",i18n("Unknown")));
135 item->setData(Qt::UserRole, (*it)); 135​ item->setData(Qt::UserRole, (*it));
136 ServiceChooser->addItem(item); 136​ ServiceChooser->addItem(item);
137​ loadConfigWidget((*it), cfg.group(QByteArray()).readEntry("configurationType"), item->text());
137 } 138​ }
138 ServiceChooser->setFixedWidth(ServiceChooser->sizeHintForColumn(0) + 20); 139​ ServiceChooser->setFixedWidth(ServiceChooser->sizeHintForColumn(0) + 20);
139 ServiceChooser->sortItems(); 140​ ServiceChooser->sortItems();
140 connect(ServiceChooser,&QListWidget::currentItemChanged,this,&ComponentChooser::slotServiceSelected); 141​ connect(ServiceChooser,&QListWidget::currentItemChanged,this,&ComponentChooser::slotServiceSelected);
141 ServiceChooser->setCurrentRow(0); 142​ ServiceChooser->setCurrentRow(0);
142 slotServiceSelected(ServiceChooser->item(0)); ​
143 ​
144} 143​}
145 144​
146void ComponentChooser::slotServiceSelected(QListWidgetItem* it) { 145​void ComponentChooser::loadConfigWidget(const QString &service, const QString &cfgType, const QString &name)
147 if (!it) return; 146​{
148 147​ QWidget *loadedConfigWidget = nullptr;
149 if (somethingChanged) { 148​ if (cfgType.isEmpty() || (cfgType == QLatin1String("component")))
150 if (KMessageBox::questionYesNo(this,i18n("<qt>You changed the default component of your choice, do want to save that change now ?</qt>"),QString(),KStandardGuiItem::save(),KStandardGuiItem::discard())==KMessageBox::Yes) save(); ​
151 } ​
152 KConfig cfg(it->data(Qt::UserRole).toString(), KConfig::SimpleConfig); ​
153 ​
154 ComponentDescription->setText(cfg.group(QByteArray()).readEntry("Comment",i18n("No description available"))); ​
155 ComponentDescription->setMinimumSize(ComponentDescription->sizeHint()); ​
156 ​
157 ​
158 QString cfgType=cfg.group(QByteArray()).readEntry("configurationType"); ​
159 QWidget *newConfigWidget = nullptr; ​
160 if (cfgType.isEmpty() || (cfgType==QLatin1String("component"))) ​
161 { 149​ {
162 if (!(configWidget && qobject_cast<CfgComponent*>(configWidget))) 150​ loadedConfigWidget = new CfgComponent(configContainer);
163 { 151​ static_cast<CfgComponent*>(loadedConfigWidget)->ChooserDocu->setText(i18n("Choose from the list below which component should be used by default for the %1 service.", name));
164 CfgComponent* cfgcomp = new CfgComponent(configContainer); ​
165 cfgcomp->ChooserDocu->setText(i18n("Choose from the list below which component should be used by default for the %1 service.", it->text())); ​
166 newConfigWidget = cfgcomp; ​
167 } ​
168 else ​
169 { ​
170 static_cast<CfgComponent*>(configWidget)->ChooserDocu->setText(i18n("Choose from the list below which component should be used by default for the %1 service.", it->text())); ​
171 } ​
172 } 152​ }
173 else if (cfgType==QLatin1String("internal_email")) 153​ else if (cfgType==QLatin1String("internal_email"))
174 { 154​ {
175 if (!(configWidget && qobject_cast<CfgEmailClient*>(configWidget))) 155​ loadedConfigWidget = new CfgEmailClient(configContainer);
176 { ​
177 newConfigWidget = new CfgEmailClient(configContainer); ​
178 } ​
179 ​
180 } 156​ }
181#ifdef Q_OS_UNIX 157​#ifdef Q_OS_UNIX
182 else if (cfgType==QLatin1String("internal_terminal")) 158​ else if (cfgType==QLatin1String("internal_terminal"))
183 { 159​ {
184 if (!(configWidget && qobject_cast<CfgTerminalEmulator*>(configWidget))) 160​ loadedConfigWidget = new CfgTerminalEmulator(configContainer);
185 { ​
186 newConfigWidget = new CfgTerminalEmulator(configContainer); ​
187 } ​
188 ​
189 } 161​ }
190#endif 162​#endif
191 else if (cfgType==QLatin1String("internal_filemanager")) 163​ else if (cfgType==QLatin1String("internal_filemanager"))
192 { 164​ {
193 if (!(configWidget && qobject_cast<CfgFileManager*>(configWidget))) 165​ loadedConfigWidget = new CfgFileManager(configContainer);
194 { ​
195 newConfigWidget = new CfgFileManager(configContainer); ​
196 } ​
197 ​
198 } 166​ }
199 else if (cfgType==QLatin1String("internal_browser")) 167​ else if (cfgType==QLatin1String("internal_browser"))
200 { 168​ {
201 if (!(configWidget && qobject_cast<CfgBrowser*>(configWidget))) 169​ loadedConfigWidget = new CfgBrowser(configContainer);
202 { 170​ }
203 newConfigWidget = new CfgBrowser(configContainer); ​
204 } ​
205 171​
172​ if (loadedConfigWidget) {
173​ configWidgetMap.insert(service, loadedConfigWidget);
174​ configContainer->addWidget(loadedConfigWidget);
175​ connect(loadedConfigWidget, SIGNAL(changed(bool)), this, SLOT(emitChanged(bool)));
206 } 176​ }
177​}
207 178​
208 if (newConfigWidget) 179​void ComponentChooser::slotServiceSelected(QListWidgetItem* it) {
209 { 180​ if (!it) return;
210 configContainer->addWidget(newConfigWidget); 181​
211 configContainer->setCurrentWidget (newConfigWidget); 182​ if (somethingChanged) {
212 configContainer->removeWidget(configWidget); 183​ if (KMessageBox::questionYesNo(this,i18n("<qt>You changed the default component of your choice, do want to save that change now ?</qt>"),QString(),KStandardGuiItem::save(),KStandardGuiItem::discard())==KMessageBox::Yes) save();
213 delete configWidget; ​
214 configWidget=newConfigWidget; ​
215 connect(configWidget,SIGNAL(changed(bool)),this,SLOT(emitChanged(bool))); ​
216 configContainer->setMinimumSize(configWidget->sizeHint()); ​
217 } 184​ }
185​ const QString &service = it->data(Qt::UserRole).toString();
186​ KConfig cfg(service, KConfig::SimpleConfig);
187​
188​ ComponentDescription->setText(cfg.group(QByteArray()).readEntry("Comment",i18n("No description available")));
189​ ComponentDescription->setMinimumSize(ComponentDescription->sizeHint());
218 190​
219 if (configWidget) 191​ configWidget = configWidgetMap.value(service);
192​ if (configWidget) {
193​ configContainer->setCurrentWidget(configWidget);
220 dynamic_cast<CfgPlugin*>(configWidget)->load(&cfg); 194​ dynamic_cast<CfgPlugin*>(configWidget)->load(&cfg);
195​ }
221 196​
222 emitChanged(false); 197​ emitChanged(false);
223 latestEditedService=it->data(Qt::UserRole).toString(); 198​ latestEditedService = service;
224} 199​}
225 200​
226 201​
Context not available.
232 207​
233ComponentChooser::~ComponentChooser() 208​ComponentChooser::~ComponentChooser()
234{ 209​{
235 delete configWidget; 210​ foreach (QWidget *configWidget, configWidgetMap)
ngrahamUnsubmitted
Not Done

No foreach in new code. See https://www.kdab.com/goodbye-q_foreach/

Also, follow KDE coding style and always use braces for loops and conditionals.

ngraham: No `foreach` in new code. See https://www.kdab.com/goodbye-q_foreach/ Also, follow KDE coding…
211​ delete configWidget;
236} 212​}
237 213​
238void ComponentChooser::load() { 214​void ComponentChooser::load() {
Context not available.