Changeset View
Changeset View
Standalone View
Standalone View
shell/settings/sourceformattersettings.cpp
Show All 32 Lines | |||||
33 | #include <KConfigGroup> | 33 | #include <KConfigGroup> | ||
34 | 34 | | |||
35 | #include <interfaces/iplugin.h> | 35 | #include <interfaces/iplugin.h> | ||
36 | #include <interfaces/isourceformatter.h> | 36 | #include <interfaces/isourceformatter.h> | ||
37 | #include <language/interfaces/ilanguagesupport.h> | 37 | #include <language/interfaces/ilanguagesupport.h> | ||
38 | #include <shell/core.h> | 38 | #include <shell/core.h> | ||
39 | #include <shell/plugincontroller.h> | 39 | #include <shell/plugincontroller.h> | ||
40 | #include <shell/languagecontroller.h> | 40 | #include <shell/languagecontroller.h> | ||
41 | #include <util/scopeddialog.h> | ||||
41 | 42 | | |||
42 | #include "editstyledialog.h" | 43 | #include "editstyledialog.h" | ||
43 | #include "debug.h" | 44 | #include "debug.h" | ||
44 | 45 | | |||
45 | #define STYLE_ROLE (Qt::UserRole+1) | 46 | #define STYLE_ROLE (Qt::UserRole+1) | ||
46 | 47 | | |||
47 | using KDevelop::Core; | 48 | using KDevelop::Core; | ||
48 | using KDevelop::ISourceFormatter; | 49 | using KDevelop::ISourceFormatter; | ||
▲ Show 20 Lines • Show All 347 Lines • ▼ Show 20 Line(s) | |||||
396 | { | 397 | { | ||
397 | QString language = cbLanguages->currentText(); | 398 | QString language = cbLanguages->currentText(); | ||
398 | Q_ASSERT( languages.contains( language ) ); | 399 | Q_ASSERT( languages.contains( language ) ); | ||
399 | LanguageSettings& l = languages[ language ]; | 400 | LanguageSettings& l = languages[ language ]; | ||
400 | SourceFormatter* fmt = l.selectedFormatter; | 401 | SourceFormatter* fmt = l.selectedFormatter; | ||
401 | 402 | | |||
402 | QMimeType mimetype = l.mimetypes.first(); | 403 | QMimeType mimetype = l.mimetypes.first(); | ||
403 | if( QScopedPointer<QObject>(fmt->formatter->editStyleWidget( mimetype )) ) { | 404 | if( QScopedPointer<QObject>(fmt->formatter->editStyleWidget( mimetype )) ) { | ||
404 | EditStyleDialog dlg( fmt->formatter, mimetype, *l.selectedStyle, this ); | 405 | KDevelop::ScopedDialog<EditStyleDialog> dlg(fmt->formatter, mimetype, *l.selectedStyle, this); | ||
405 | if( dlg.exec() == QDialog::Accepted ) | 406 | if( dlg->exec() == QDialog::Accepted ) | ||
406 | { | 407 | { | ||
407 | l.selectedStyle->setContent(dlg.content()); | 408 | l.selectedStyle->setContent(dlg->content()); | ||
408 | } | 409 | } | ||
409 | updatePreview(); | 410 | updatePreview(); | ||
410 | emit changed(); | 411 | emit changed(); | ||
411 | } | 412 | } | ||
412 | } | 413 | } | ||
413 | 414 | | |||
414 | void SourceFormatterSettings::newStyle() | 415 | void SourceFormatterSettings::newStyle() | ||
415 | { | 416 | { | ||
▲ Show 20 Lines • Show All 123 Lines • Show Last 20 Lines |