Differential D13595 Diff 36367 src/settings/dolphinsettingsdialog.cpp

Changeset View

Standalone View

View Options

src/settings/dolphinsettingsdialog.cpp

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Line(s)42{
50 box->button(QDialogButtonBox::Apply)->setEnabled(false); 50​ box->button(QDialogButtonBox::Apply)->setEnabled(false);
51 box->button(QDialogButtonBox::Ok)->setDefault(true); 51​ box->button(QDialogButtonBox::Ok)->setDefault(true);
52 setButtonBox(box); 52​ setButtonBox(box);
53 53​
54 connect(box->button(QDialogButtonBox::Ok), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings); 54​ connect(box->button(QDialogButtonBox::Ok), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings);
55 connect(box->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings); 55​ connect(box->button(QDialogButtonBox::Apply), &QAbstractButton::clicked, this, &DolphinSettingsDialog::applySettings);
56 connect(box->button(QDialogButtonBox::RestoreDefaults), &QAbstractButton::clicked, this, &DolphinSettingsDialog::restoreDefaults); 56​ connect(box->button(QDialogButtonBox::RestoreDefaults), &QAbstractButton::clicked, this, &DolphinSettingsDialog::restoreDefaults);
57 57​
58​ // General
59​ GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this);
60​ KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage,
61​ i18nc("@title:group General settings", "General"));
62​ generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-preview")));
63​ connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
64​
58 // Startup 65​ // Startup
59 StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this); 66​ StartupSettingsPage* startupSettingsPage = new StartupSettingsPage(url, this);
60 KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage, 67​ KPageWidgetItem* startupSettingsFrame = addPage(startupSettingsPage,
61 i18nc("@title:group", "Startup")); 68​ i18nc("@title:group", "Startup"));
62 startupSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("go-home"))); 69​ startupSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("go-home")));
63 connect(startupSettingsPage, &StartupSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); 70​ connect(startupSettingsPage, &StartupSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
64 71​
65 // View Modes 72​ // View Modes
Show All 21 Lines
87 auto* trashSettingsPage = createTrashSettingsPage(this); 94​ auto* trashSettingsPage = createTrashSettingsPage(this);
88 if (trashSettingsPage) { 95​ if (trashSettingsPage) {
89 KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage, 96​ KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage,
90 i18nc("@title:group", "Trash")); 97​ i18nc("@title:group", "Trash"));
91 trashSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("trash-empty"))); 98​ trashSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("trash-empty")));
92 connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); 99​ connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply);
93 } 100​ }
94 101​
95 // General 102​ m_pages.append(generalSettingsPage);
96 GeneralSettingsPage* generalSettingsPage = new GeneralSettingsPage(url, this); ​
97 KPageWidgetItem* generalSettingsFrame = addPage(generalSettingsPage, ​
98 i18nc("@title:group General settings", "General")); ​
99 generalSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("view-preview"))); ​
100 connect(generalSettingsPage, &GeneralSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); ​
101 ​
102 m_pages.append(startupSettingsPage); 103​ m_pages.append(startupSettingsPage);
103 m_pages.append(viewSettingsPage); 104​ m_pages.append(viewSettingsPage);
104 m_pages.append(navigationSettingsPage); 105​ m_pages.append(navigationSettingsPage);
105 m_pages.append(servicesSettingsPage); 106​ m_pages.append(servicesSettingsPage);
106 if (trashSettingsPage) { 107​ if (trashSettingsPage) {
107 m_pages.append(trashSettingsPage); 108​ m_pages.append(trashSettingsPage);
108 } 109​ }
109 m_pages.append(generalSettingsPage); ​
110 110​
111 const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog"); 111​ const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
112 KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig); 112​ KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig);
113} 113​}
114 114​
115DolphinSettingsDialog::~DolphinSettingsDialog() 115​DolphinSettingsDialog::~DolphinSettingsDialog()
116{ 116​{
117 KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog"); 117​ KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog");
▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines