Differential D5401 Diff 13379 kcmkwin/kwindecoration/kcm.cpp

Changeset View

Standalone View

View Options

kcmkwin/kwindecoration/kcm.cpp

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Line(s)83{
94 qmlRegisterType<QAbstractItemModel>(); 94​ qmlRegisterType<QAbstractItemModel>();
95 QWidget *widget = QWidget::createWindowContainer(m_quickView, this); 95​ QWidget *widget = QWidget::createWindowContainer(m_quickView, this);
96 QVBoxLayout* layout = new QVBoxLayout(m_ui->view); 96​ QVBoxLayout* layout = new QVBoxLayout(m_ui->view);
97 layout->setContentsMargins(0,0,0,0); 97​ layout->setContentsMargins(0,0,0,0);
98 layout->addWidget(widget); 98​ layout->addWidget(widget);
99 99​
100 m_quickView->rootContext()->setContextProperty(QStringLiteral("decorationsModel"), m_proxyModel); 100​ m_quickView->rootContext()->setContextProperty(QStringLiteral("decorationsModel"), m_proxyModel);
101 updateColors(); 101​ updateColors();
102 m_quickView->rootContext()->setContextProperty("savedIndex", savedIndex()); ​
103 m_quickView->rootContext()->setContextProperty("_borderSizesIndex", 3); // 3 is normal 102​ m_quickView->rootContext()->setContextProperty("_borderSizesIndex", 3); // 3 is normal
104 m_quickView->rootContext()->setContextProperty("leftButtons", m_leftButtons); 103​ m_quickView->rootContext()->setContextProperty("leftButtons", m_leftButtons);
105 m_quickView->rootContext()->setContextProperty("rightButtons", m_rightButtons); 104​ m_quickView->rootContext()->setContextProperty("rightButtons", m_rightButtons);
106 m_quickView->rootContext()->setContextProperty("availableButtons", m_availableButtons); 105​ m_quickView->rootContext()->setContextProperty("availableButtons", m_availableButtons);
107 106​
108 m_quickView->rootContext()->setContextProperty("titleFont", QFontDatabase::systemFont(QFontDatabase::TitleFont)); 107​ m_quickView->rootContext()->setContextProperty("titleFont", QFontDatabase::systemFont(QFontDatabase::TitleFont));
109 m_quickView->setResizeMode(QQuickView::SizeRootObjectToView); 108​ m_quickView->setResizeMode(QQuickView::SizeRootObjectToView);
110 m_quickView->setSource(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kwin/kcm_kwindecoration/main.qml")))); 109​ m_quickView->setSource(QUrl::fromLocalFile(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kwin/kcm_kwindecoration/main.qml"))));
▲ Show 20 Lines • Show All 184 Lines • ▼ Show 20 Line(s)291 for (auto it2 = s_buttonNames.constBegin(); it2 != s_buttonNames.constEnd(); ++it2) {
295 } 294​ }
296 } 295​ }
297 } 296​ }
298 return ret; 297​ return ret;
299 }; 298​ };
300 return buttonsFromString(config.readEntry(key, buttonsToString(defaultValue))); 299​ return buttonsFromString(config.readEntry(key, buttonsToString(defaultValue)));
301} 300​}
302 301​
303int ConfigurationModule::savedIndex() const ​
304{ ​
305 const KConfigGroup config = KSharedConfig::openConfig("kwinrc")->group(s_pluginName); ​
306 const QString plugin = config.readEntry("library", s_defaultPlugin); ​
307 const QString theme = config.readEntry("theme", s_defaultTheme); ​
308 return m_proxyModel->mapFromSource(m_model->findDecoration(plugin, theme)).row(); ​
309} ​
310 ​
311void ConfigurationModule::load() 302​void ConfigurationModule::load()
312{ 303​{
313 s_loading = true; 304​ s_loading = true;
314 const KConfigGroup config = KSharedConfig::openConfig("kwinrc")->group(s_pluginName); 305​ const KConfigGroup config = KSharedConfig::openConfig("kwinrc")->group(s_pluginName);
315 const QString plugin = config.readEntry("library", s_defaultPlugin); 306​ const QString plugin = config.readEntry("library", s_defaultPlugin);
316 const QString theme = config.readEntry("theme", s_defaultTheme); 307​ const QString theme = config.readEntry("theme", s_defaultTheme);
317 m_ui->closeWindowsDoubleClick->setChecked(config.readEntry("CloseOnDoubleClickOnMenu", false)); 308​ m_ui->closeWindowsDoubleClick->setChecked(config.readEntry("CloseOnDoubleClickOnMenu", false));
318 const QVariant border = QVariant::fromValue(stringToSize(config.readEntry("BorderSize", s_borderSizeNormal))); 309​ const QVariant border = QVariant::fromValue(stringToSize(config.readEntry("BorderSize", s_borderSizeNormal)));
319 m_ui->borderSizesCombo->setCurrentIndex(m_ui->borderSizesCombo->findData(border)); 310​ m_ui->borderSizesCombo->setCurrentIndex(m_ui->borderSizesCombo->findData(border));
320 311​
312​ int themeIndex = m_proxyModel->mapFromSource(m_model->findDecoration(plugin, theme)).row();
313​ m_quickView->rootContext()->setContextProperty("savedIndex", themeIndex);
314​
321 // buttons 315​ // buttons
322 const auto &left = readDecorationButtons(config, "ButtonsOnLeft", QVector<KDecoration2::DecorationButtonType >{ 316​ const auto &left = readDecorationButtons(config, "ButtonsOnLeft", QVector<KDecoration2::DecorationButtonType >{
323 KDecoration2::DecorationButtonType::Menu, 317​ KDecoration2::DecorationButtonType::Menu,
324 KDecoration2::DecorationButtonType::OnAllDesktops 318​ KDecoration2::DecorationButtonType::OnAllDesktops
325 }); 319​ });
326 while (m_leftButtons->rowCount() > 0) { 320​ while (m_leftButtons->rowCount() > 0) {
327 m_leftButtons->remove(0); 321​ m_leftButtons->remove(0);
328 } 322​ }
▲ Show 20 Lines • Show All 110 Lines • Show Last 20 Lines