Construct QList for pages from initializer list
This commit is contained in:
parent
fb97615363
commit
47fae26975
|
@ -124,8 +124,8 @@ SettingsDialog::SettingsDialog(Plasmoid::SyncthingApplet &applet)
|
||||||
category = new OptionCategory;
|
category = new OptionCategory;
|
||||||
m_appearanceOptionPage = new AppearanceOptionPage(applet);
|
m_appearanceOptionPage = new AppearanceOptionPage(applet);
|
||||||
category->setDisplayName(QCoreApplication::translate("Plasmoid::SettingsDialog", "Plasmoid"));
|
category->setDisplayName(QCoreApplication::translate("Plasmoid::SettingsDialog", "Plasmoid"));
|
||||||
category->assignPages(QList<OptionPage *>() << new ConnectionOptionPage(applet.connection()) << new NotificationsOptionPage(GuiType::Plasmoid)
|
category->assignPages({ new ConnectionOptionPage(applet.connection()), new NotificationsOptionPage(GuiType::Plasmoid), m_appearanceOptionPage,
|
||||||
<< m_appearanceOptionPage << new IconsOptionPage << new ShortcutOptionPage(applet));
|
new IconsOptionPage, new ShortcutOptionPage(applet) });
|
||||||
category->setIcon(QIcon::fromTheme(QStringLiteral("plasma")));
|
category->setIcon(QIcon::fromTheme(QStringLiteral("plasma")));
|
||||||
categories << category;
|
categories << category;
|
||||||
|
|
||||||
|
@ -142,11 +142,12 @@ SettingsDialog::SettingsDialog(Plasmoid::SyncthingApplet &applet)
|
||||||
|
|
||||||
category = new OptionCategory;
|
category = new OptionCategory;
|
||||||
category->setDisplayName(QCoreApplication::translate("Plasmoid::SettingsDialog", "Extras"));
|
category->setDisplayName(QCoreApplication::translate("Plasmoid::SettingsDialog", "Extras"));
|
||||||
category->assignPages(QList<OptionPage *>() << webViewPage
|
category->assignPages({ webViewPage
|
||||||
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
||||||
<< systemdPage
|
,
|
||||||
|
systemdPage
|
||||||
#endif
|
#endif
|
||||||
);
|
});
|
||||||
category->setIcon(
|
category->setIcon(
|
||||||
QIcon::fromTheme(QStringLiteral("preferences-other"), QIcon(QStringLiteral(":/icons/hicolor/scalable/apps/preferences-other.svg"))));
|
QIcon::fromTheme(QStringLiteral("preferences-other"), QIcon(QStringLiteral(":/icons/hicolor/scalable/apps/preferences-other.svg"))));
|
||||||
categories << category;
|
categories << category;
|
||||||
|
|
|
@ -1278,27 +1278,26 @@ SettingsDialog::SettingsDialog(Data::SyncthingConnection *connection, QWidget *p
|
||||||
|
|
||||||
category = new OptionCategory(this);
|
category = new OptionCategory(this);
|
||||||
category->setDisplayName(tr("Tray"));
|
category->setDisplayName(tr("Tray"));
|
||||||
category->assignPages(QList<OptionPage *>() << new ConnectionOptionPage(connection) << new NotificationsOptionPage << new AppearanceOptionPage
|
category->assignPages({ new ConnectionOptionPage(connection), new NotificationsOptionPage, new AppearanceOptionPage,
|
||||||
<< new IconsOptionPage(IconsOptionPage::Context::UI)
|
new IconsOptionPage(IconsOptionPage::Context::UI), new IconsOptionPage(IconsOptionPage::Context::System) });
|
||||||
<< new IconsOptionPage(IconsOptionPage::Context::System));
|
|
||||||
category->setIcon(QIcon(QStringLiteral(":/icons/hicolor/scalable/app/syncthingtray.svg")));
|
category->setIcon(QIcon(QStringLiteral(":/icons/hicolor/scalable/app/syncthingtray.svg")));
|
||||||
categories << category;
|
categories << category;
|
||||||
|
|
||||||
category = new OptionCategory(this);
|
category = new OptionCategory(this);
|
||||||
category->setDisplayName(tr("Web view"));
|
category->setDisplayName(tr("Web view"));
|
||||||
category->assignPages(QList<OptionPage *>() << new WebViewOptionPage);
|
category->assignPages({ new WebViewOptionPage });
|
||||||
category->setIcon(
|
category->setIcon(
|
||||||
QIcon::fromTheme(QStringLiteral("internet-web-browser"), QIcon(QStringLiteral(":/icons/hicolor/scalable/apps/internet-web-browser.svg"))));
|
QIcon::fromTheme(QStringLiteral("internet-web-browser"), QIcon(QStringLiteral(":/icons/hicolor/scalable/apps/internet-web-browser.svg"))));
|
||||||
categories << category;
|
categories << category;
|
||||||
|
|
||||||
category = new OptionCategory(this);
|
category = new OptionCategory(this);
|
||||||
category->setDisplayName(tr("Startup"));
|
category->setDisplayName(tr("Startup"));
|
||||||
category->assignPages(
|
category->assignPages({ new AutostartOptionPage, new LauncherOptionPage, new LauncherOptionPage(QStringLiteral("Inotify"))
|
||||||
QList<OptionPage *>() << new AutostartOptionPage << new LauncherOptionPage << new LauncherOptionPage(QStringLiteral("Inotify"))
|
|
||||||
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
#ifdef LIB_SYNCTHING_CONNECTOR_SUPPORT_SYSTEMD
|
||||||
<< new SystemdOptionPage
|
,
|
||||||
|
new SystemdOptionPage
|
||||||
#endif
|
#endif
|
||||||
);
|
});
|
||||||
category->setIcon(QIcon::fromTheme(QStringLiteral("system-run"), QIcon(QStringLiteral(":/icons/hicolor/scalable/apps/system-run.svg"))));
|
category->setIcon(QIcon::fromTheme(QStringLiteral("system-run"), QIcon(QStringLiteral(":/icons/hicolor/scalable/apps/system-run.svg"))));
|
||||||
categories << category;
|
categories << category;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue