vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'Plasma/5.8' into Plasma/5.9

icc-effect-5.14.5
David Edmundson 2017-04-13 11:55:52 +01:00
parent 944e723400 f5a43877a9
commit 55f2e72ce7
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kcmkwin/kwindecoration/kcm.cpp
View File

@ -83,6 +83,8 @@ ConfigurationModule::ConfigurationModule(QWidget *parent, const QVariantList &ar
{
m_proxyModel->setSourceModel(m_model);
m_proxyModel->setFilterCaseSensitivity(Qt::CaseInsensitive);
m_proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive);
m_proxyModel->sort(0);
connect(m_ui->filter, &QLineEdit::textChanged, m_proxyModel, &QSortFilterProxyModel::setFilterFixedString);
m_quickView = new QQuickView(0);
@ -99,7 +101,6 @@ ConfigurationModule::ConfigurationModule(QWidget *parent, const QVariantList &ar
m_quickView->rootContext()->setContextProperty(QStringLiteral("decorationsModel"), m_proxyModel);
updateColors();
m_quickView->rootContext()->setContextProperty("savedIndex", savedIndex());
m_quickView->rootContext()->setContextProperty("_borderSizesIndex", 3); // 3 is normal
m_quickView->rootContext()->setContextProperty("leftButtons", m_leftButtons);
m_quickView->rootContext()->setContextProperty("rightButtons", m_rightButtons);
@ -300,14 +301,6 @@ QVector< KDecoration2::DecorationButtonType > readDecorationButtons(const KConfi
return buttonsFromString(config.readEntry(key, buttonsToString(defaultValue)));
}
int ConfigurationModule::savedIndex() const
{
const KConfigGroup config = KSharedConfig::openConfig("kwinrc")->group(s_pluginName);
const QString plugin = config.readEntry("library", s_defaultPlugin);
const QString theme = config.readEntry("theme", s_defaultTheme);
return m_proxyModel->mapFromSource(m_model->findDecoration(plugin, theme)).row();
}
void ConfigurationModule::load()
{
s_loading = true;
@ -318,6 +311,9 @@ void ConfigurationModule::load()
const QVariant border = QVariant::fromValue(stringToSize(config.readEntry("BorderSize", s_borderSizeNormal)));
m_ui->borderSizesCombo->setCurrentIndex(m_ui->borderSizesCombo->findData(border));
int themeIndex = m_proxyModel->mapFromSource(m_model->findDecoration(plugin, theme)).row();
m_quickView->rootContext()->setContextProperty("savedIndex", themeIndex);
// buttons
const auto &left = readDecorationButtons(config, "ButtonsOnLeft", QVector<KDecoration2::DecorationButtonType >{
KDecoration2::DecorationButtonType::Menu,

2
kcmkwin/kwindecoration/kcm.h
View File

@ -57,8 +57,6 @@ public Q_SLOTS:
void defaults() override;
void load() override;
void save() override;
//what index is in the model the theme saved as current? needed to move the view at the proper index right at startup
int savedIndex() const;
protected:
void showEvent(QShowEvent *ev) override;

4
kcmkwin/kwindecoration/qml/Previews.qml
View File

@ -33,7 +33,9 @@ ScrollView {
cellWidth: 20 * units.gridUnit
cellHeight: cellWidth / 1.6
onContentHeightChanged: {
gridView.currentIndex = savedIndex;
if (gridView.currentIndex == -1) {
gridView.currentIndex = savedIndex;
}
gridView.positionViewAtIndex(gridView.currentIndex, GridView.Visible);
}