Lubuntu
/
lxqt-panel-packaging
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove reverse-applicable patches.

Browse Source
ubuntu/eoan
Simon Quigley 5 years ago
parent 3425a55990
commit a0418e8556
9 changed files with 1 additions and 2607 deletions
Show Stats Download Patch File Download Diff File

1
debian/changelog vendored
Unescape View File

@ -2,6 +2,7 @@ lxqt-panel (0.14.0-0ubuntu1) UNRELEASED; urgency=medium
* New upstream release.
- Bump build dependencies.
- Remove reverse-applicable patches.
* Bump Standards-version to 4.3.0, no changes needed.
* Bump debhelper compat to 12, no changes needed.
* Add a new lxqt-panel-l10n package.

105
debian/patches/add-autoexpansion-1.patch vendored
Unescape View File

@ -1,105 +0,0 @@
Description: Allow plugin's "static" configration change
This is patch 1/4 adding autoexpansion support to the spacer plugin.
Author: Palo Kisa <palo.kisa@gmail.com>
Origin: upstream
Bug: https://github.com/lxqt/lxqt/issues/1038
Applied-Upstream: commit:6fbe184
Last-Update: 2018-08-16
--- a/panel/ilxqtpanel.h
+++ b/panel/ilxqtpanel.h
@@ -110,6 +110,16 @@ public:
*
*/
virtual void willShowWindow(QWidget * w) = 0;
+
+ /*!
+ * \brief By calling this function, a plugin notifies the panel about change of it's "static"
+ * configuration
+ *
+ * \param plugin the changed plugin
+ *
+ * \sa ILXQtPanelPlugin::isSeparate(), ILXQtPanelPlugin::isExpandable
+ */
+ virtual void pluginFlagsChanged(const ILXQtPanelPlugin * plugin) = 0;
};
#endif // ILXQTPANEL_H
--- a/panel/ilxqtpanelplugin.h
+++ b/panel/ilxqtpanelplugin.h
@@ -196,6 +196,17 @@ public:
mPanel->willShowWindow(w);
}
+ /*!
+ * \brief By calling this function, a plugin notifies the panel about change of it's "static"
+ * configuration
+ *
+ * \sa isSeparate(), isExpandable
+ */
+ inline void pluginFlagsChanged()
+ {
+ mPanel->pluginFlagsChanged(this);
+ }
+
virtual bool isSeparate() const { return false; }
virtual bool isExpandable() const { return false; }
private:
--- a/panel/lxqtpanel.cpp
+++ b/panel/lxqtpanel.cpp
@@ -1225,6 +1225,14 @@ void LXQtPanel::willShowWindow(QWidget *
/************************************************
************************************************/
+void LXQtPanel::pluginFlagsChanged(const ILXQtPanelPlugin * /*plugin*/)
+{
+ mLayout->rebuild();
+}
+
+/************************************************
+
+ ************************************************/
QString LXQtPanel::qssPosition() const
{
return positionToStr(position());
--- a/panel/lxqtpanel.h
+++ b/panel/lxqtpanel.h
@@ -146,6 +146,7 @@ public:
QRect calculatePopupWindowPos(QPoint const & absolutePos, QSize const & windowSize) const override;
QRect calculatePopupWindowPos(const ILXQtPanelPlugin *plugin, const QSize &windowSize) const override;
void willShowWindow(QWidget * w) override;
+ void pluginFlagsChanged(const ILXQtPanelPlugin * plugin) override;
// ........ end of ILXQtPanel overrides
/**
--- a/panel/lxqtpanellayout.cpp
+++ b/panel/lxqtpanellayout.cpp
@@ -946,6 +946,16 @@ void LXQtPanelLayout::setLineCount(int v
/************************************************
************************************************/
+void LXQtPanelLayout::rebuild()
+{
+ mLeftGrid->rebuild();
+ mRightGrid->rebuild();
+}
+
+
+/************************************************
+
+ ************************************************/
int LXQtPanelLayout::lineSize() const
{
return mLeftGrid->lineSize();
--- a/panel/lxqtpanellayout.h
+++ b/panel/lxqtpanellayout.h
@@ -73,6 +73,10 @@ public:
ILXQtPanel::Position position() const { return mPosition; }
void setPosition(ILXQtPanel::Position value);
+ /*! \brief Force the layout to re-read items/plugins "static" configuration
+ */
+ void rebuild();
+
static bool itemIsSeparate(QLayoutItem *item);
signals:
void pluginMoved(Plugin * plugin);

35
debian/patches/add-autoexpansion-2.patch vendored
Unescape View File

@ -1,35 +0,0 @@
Description: Add "override" to declarations
This is patch 2/4 adding autoexpansion support to the spacer plugin.
Author: Palo Kisa <palo.kisa@gmail.com>
Origin: upstream
Bug: https://github.com/lxqt/lxqt/issues/1038
Applied-Upstream: commit:764aadd
Last-Update: 2018-08-16
--- a/plugin-spacer/spacer.h
+++ b/plugin-spacer/spacer.h
@@ -57,18 +57,18 @@ class Spacer : public QObject, public I
public:
Spacer(const ILXQtPanelPluginStartupInfo &startupInfo);
- virtual QWidget *widget() { return &mSpacer; }
- virtual QString themeId() const { return "Spacer"; }
+ virtual QWidget *widget() override { return &mSpacer; }
+ virtual QString themeId() const override { return "Spacer"; }
- bool isSeparate() const { return true; }
+ bool isSeparate() const override { return true; }
- virtual ILXQtPanelPlugin::Flags flags() const { return HaveConfigDialog; }
- QDialog *configureDialog();
+ virtual ILXQtPanelPlugin::Flags flags() const override { return HaveConfigDialog; }
+ QDialog *configureDialog() override;
- virtual void realign();
+ virtual void realign() override;
private slots:
- virtual void settingsChanged();
+ virtual void settingsChanged() override;
private:
void setSizes();

238
debian/patches/add-autoexpansion-3.patch vendored
Unescape View File

@ -1,238 +0,0 @@
Description: Add auto-expansion feature
This is patch 3/4 adding autoexpansion support to the spacer plugin.
Author: Palo Kisa <palo.kisa@gmail.com>
Origin: upstream
Bug: https://github.com/lxqt/lxqt/issues/1038
Applied-Upstream: commit:b57a178
Last-Update: 2018-08-16
--- a/plugin-spacer/spacer.cpp
+++ b/plugin-spacer/spacer.cpp
@@ -55,6 +55,7 @@ Spacer::Spacer(const ILXQtPanelPluginSta
QObject()
, ILXQtPanelPlugin(startupInfo)
, mSize(8)
+ , mExpandable(false)
{
settingsChanged();
}
@@ -65,8 +66,12 @@ Spacer::Spacer(const ILXQtPanelPluginSta
void Spacer::settingsChanged()
{
mSize = settings()->value("size", 8).toInt();
+ const bool old_expandable = mExpandable;
+ mExpandable = settings()->value("expandable", false).toBool();
mSpacer.setType(settings()->value("spaceType", SpacerConfiguration::msTypes[0]).toString());
setSizes();
+ if (old_expandable != mExpandable)
+ pluginFlagsChanged();
}
/************************************************
@@ -82,21 +87,30 @@ QDialog *Spacer::configureDialog()
************************************************/
void Spacer::setSizes()
{
- if (panel()->isHorizontal())
+ if (mExpandable)
{
- mSpacer.setOrientation("horizontal");
- mSpacer.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
- mSpacer.setFixedWidth(mSize);
- mSpacer.setMinimumHeight(0);
- mSpacer.setMaximumHeight(QWIDGETSIZE_MAX);
- }
- else
+ mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ mSpacer.setMinimumSize({1, 1});
+ mSpacer.setMaximumSize({QWIDGETSIZE_MAX, QWIDGETSIZE_MAX});
+ mSpacer.setOrientation(panel()->isHorizontal() ? "horizontal" : "vertical");
+ } else
{
- mSpacer.setOrientation("vertical");
- mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- mSpacer.setFixedHeight(mSize);
- mSpacer.setMinimumWidth(0);
- mSpacer.setMaximumWidth(QWIDGETSIZE_MAX);
+ if (panel()->isHorizontal())
+ {
+ mSpacer.setOrientation("horizontal");
+ mSpacer.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
+ mSpacer.setFixedWidth(mSize);
+ mSpacer.setMinimumHeight(0);
+ mSpacer.setMaximumHeight(QWIDGETSIZE_MAX);
+ }
+ else
+ {
+ mSpacer.setOrientation("vertical");
+ mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+ mSpacer.setFixedHeight(mSize);
+ mSpacer.setMinimumWidth(0);
+ mSpacer.setMaximumWidth(QWIDGETSIZE_MAX);
+ }
}
}
--- a/plugin-spacer/spacer.h
+++ b/plugin-spacer/spacer.h
@@ -61,6 +61,7 @@ public:
virtual QString themeId() const override { return "Spacer"; }
bool isSeparate() const override { return true; }
+ bool isExpandable() const override { return mExpandable; }
virtual ILXQtPanelPlugin::Flags flags() const override { return HaveConfigDialog; }
QDialog *configureDialog() override;
@@ -76,6 +77,7 @@ private:
private:
SpacerWidget mSpacer;
int mSize;
+ int mExpandable;
};
class SpacerPluginLibrary: public QObject, public ILXQtPanelPluginLibrary
--- a/plugin-spacer/spacerconfiguration.cpp
+++ b/plugin-spacer/spacerconfiguration.cpp
@@ -52,6 +52,8 @@ SpacerConfiguration::SpacerConfiguration
connect(ui->sizeSB, static_cast<void (QSpinBox::*)(int)>(&QSpinBox::valueChanged), this, &SpacerConfiguration::sizeChanged);
connect(ui->typeCB, static_cast<void (QComboBox::*)(int index)>(&QComboBox::currentIndexChanged), this, &SpacerConfiguration::typeChanged);
+ //Note: if there will be more than 2 radio buttons for width/size type, this simple setting logic will break
+ connect(ui->sizeExpandRB, &QAbstractButton::toggled, this, &SpacerConfiguration::widthTypeChanged);
}
SpacerConfiguration::~SpacerConfiguration()
@@ -63,6 +65,10 @@ void SpacerConfiguration::loadSettings()
{
ui->sizeSB->setValue(settings().value("size", 8).toInt());
ui->typeCB->setCurrentIndex(ui->typeCB->findData(settings().value("spaceType", msTypes[0]).toString()));
+ const bool expandable = settings().value("expandable", false).toBool();
+ ui->sizeExpandRB->setChecked(expandable);
+ ui->sizeFixedRB->setChecked(!expandable);
+ ui->sizeSB->setDisabled(expandable);
}
void SpacerConfiguration::sizeChanged(int value)
@@ -74,3 +80,8 @@ void SpacerConfiguration::typeChanged(in
{
settings().setValue("spaceType", ui->typeCB->itemData(index, Qt::UserRole));
}
+
+void SpacerConfiguration::widthTypeChanged(bool expandableChecked)
+{
+ settings().setValue("expandable", expandableChecked);
+}
--- a/plugin-spacer/spacerconfiguration.h
+++ b/plugin-spacer/spacerconfiguration.h
@@ -58,6 +58,7 @@ private slots:
void loadSettings();
void sizeChanged(int value);
void typeChanged(int index);
+ void widthTypeChanged(bool expandableChecked);
};
#endif // SPACERCONFIGURATION_H
--- a/plugin-spacer/spacerconfiguration.ui
+++ b/plugin-spacer/spacerconfiguration.ui
@@ -6,6 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
+ <width>289</width>
+ <height>135</height>
</rect>
</property>
<property name="windowTitle">
@@ -19,7 +21,7 @@
</property>
</widget>
</item>
- <item row="0" column="1">
+ <item row="0" column="2">
<widget class="QSpinBox" name="sizeSB">
<property name="minimum">
<number>4</number>
@@ -32,21 +34,14 @@
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="2" column="0">
<widget class="QLabel" name="labelType">
<property name="text">
<string>Space type:</string>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QComboBox" name="typeCB">
- <property name="editable">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="2">
+ <item row="3" column="0" colspan="3">
<widget class="QDialogButtonBox" name="buttons">
<property name="orientation">
<enum>Qt::Horizontal</enum>
@@ -56,6 +51,27 @@
</property>
</widget>
</item>
+ <item row="0" column="1">
+ <widget class="QRadioButton" name="sizeFixedRB">
+ <property name="text">
+ <string>fixed</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" colspan="2">
+ <widget class="QComboBox" name="typeCB">
+ <property name="editable">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1" colspan="2">
+ <widget class="QRadioButton" name="sizeExpandRB">
+ <property name="text">
+ <string>expandable</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<resources/>
@@ -65,6 +81,32 @@
<signal>clicked(QAbstractButton*)</signal>
<receiver>SpacerConfiguration</receiver>
<slot>close()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>sizeFixedRB</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>sizeSB</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>152</x>
+ <y>21</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>244</x>
+ <y>21</y>
+ </hint>
+ </hints>
</connection>
</connections>
</ui>

114
debian/patches/add-autoexpansion-4.patch vendored
Unescape View File

@ -1,114 +0,0 @@
Description: Use QStringLiteral whenever possible
This is patch 4/4 adding autoexpansion support to the spacer plugin.
Author: Palo Kisa <palo.kisa@gmail.com>
Origin: upstream
Bug: https://github.com/lxqt/lxqt/issues/1038
Applied-Upstream: commit:4908fcd
Last-Update: 2018-08-16
--- a/plugin-spacer/spacer.cpp
+++ b/plugin-spacer/spacer.cpp
@@ -65,10 +65,10 @@ Spacer::Spacer(const ILXQtPanelPluginSta
************************************************/
void Spacer::settingsChanged()
{
- mSize = settings()->value("size", 8).toInt();
+ mSize = settings()->value(QStringLiteral("size"), 8).toInt();
const bool old_expandable = mExpandable;
- mExpandable = settings()->value("expandable", false).toBool();
- mSpacer.setType(settings()->value("spaceType", SpacerConfiguration::msTypes[0]).toString());
+ mExpandable = settings()->value(QStringLiteral("expandable"), false).toBool();
+ mSpacer.setType(settings()->value(QStringLiteral("spaceType"), SpacerConfiguration::msTypes[0]).toString());
setSizes();
if (old_expandable != mExpandable)
pluginFlagsChanged();
@@ -92,12 +92,12 @@ void Spacer::setSizes()
mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
mSpacer.setMinimumSize({1, 1});
mSpacer.setMaximumSize({QWIDGETSIZE_MAX, QWIDGETSIZE_MAX});
- mSpacer.setOrientation(panel()->isHorizontal() ? "horizontal" : "vertical");
+ mSpacer.setOrientation(panel()->isHorizontal() ? QStringLiteral("horizontal") : QStringLiteral("vertical"));
} else
{
if (panel()->isHorizontal())
{
- mSpacer.setOrientation("horizontal");
+ mSpacer.setOrientation(QStringLiteral("horizontal"));
mSpacer.setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
mSpacer.setFixedWidth(mSize);
mSpacer.setMinimumHeight(0);
@@ -105,7 +105,7 @@ void Spacer::setSizes()
}
else
{
- mSpacer.setOrientation("vertical");
+ mSpacer.setOrientation(QStringLiteral("vertical"));
mSpacer.setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
mSpacer.setFixedHeight(mSize);
mSpacer.setMinimumWidth(0);
--- a/plugin-spacer/spacer.h
+++ b/plugin-spacer/spacer.h
@@ -58,7 +58,7 @@ public:
Spacer(const ILXQtPanelPluginStartupInfo &startupInfo);
virtual QWidget *widget() override { return &mSpacer; }
- virtual QString themeId() const override { return "Spacer"; }
+ virtual QString themeId() const override { return QStringLiteral("Spacer"); }
bool isSeparate() const override { return true; }
bool isExpandable() const override { return mExpandable; }
--- a/plugin-spacer/spacerconfiguration.cpp
+++ b/plugin-spacer/spacerconfiguration.cpp
@@ -31,9 +31,9 @@
//Note: strings can't actually be translated here (in static initialization time)
// the QT_TR_NOOP here is just for qt translate tools to get the strings for translation
const QStringList SpacerConfiguration::msTypes = {
- QLatin1String(QT_TR_NOOP("lined"))
- , QLatin1String(QT_TR_NOOP("dotted"))
- , QLatin1String(QT_TR_NOOP("invisible"))
+ QStringLiteral(QT_TR_NOOP("lined"))
+ , QStringLiteral(QT_TR_NOOP("dotted"))
+ , QStringLiteral(QT_TR_NOOP("invisible"))
};
SpacerConfiguration::SpacerConfiguration(PluginSettings *settings, QWidget *parent) :
@@ -41,7 +41,7 @@ SpacerConfiguration::SpacerConfiguration
ui(new Ui::SpacerConfiguration)
{
setAttribute(Qt::WA_DeleteOnClose);
- setObjectName("SpacerConfigurationWindow");
+ setObjectName(QStringLiteral("SpacerConfigurationWindow"));
ui->setupUi(this);
//Note: translation is needed here in runtime (translator is attached already)
@@ -63,9 +63,9 @@ SpacerConfiguration::~SpacerConfiguratio
void SpacerConfiguration::loadSettings()
{
- ui->sizeSB->setValue(settings().value("size", 8).toInt());
- ui->typeCB->setCurrentIndex(ui->typeCB->findData(settings().value("spaceType", msTypes[0]).toString()));
- const bool expandable = settings().value("expandable", false).toBool();
+ ui->sizeSB->setValue(settings().value(QStringLiteral("size"), 8).toInt());
+ ui->typeCB->setCurrentIndex(ui->typeCB->findData(settings().value(QStringLiteral("spaceType"), msTypes[0]).toString()));
+ const bool expandable = settings().value(QStringLiteral("expandable"), false).toBool();
ui->sizeExpandRB->setChecked(expandable);
ui->sizeFixedRB->setChecked(!expandable);
ui->sizeSB->setDisabled(expandable);
@@ -73,15 +73,15 @@ void SpacerConfiguration::loadSettings()
void SpacerConfiguration::sizeChanged(int value)
{
- settings().setValue("size", value);
+ settings().setValue(QStringLiteral("size"), value);
}
void SpacerConfiguration::typeChanged(int index)
{
- settings().setValue("spaceType", ui->typeCB->itemData(index, Qt::UserRole));
+ settings().setValue(QStringLiteral("spaceType"), ui->typeCB->itemData(index, Qt::UserRole));
}
void SpacerConfiguration::widthTypeChanged(bool expandableChecked)
{
- settings().setValue("expandable", expandableChecked);
+ settings().setValue(QStringLiteral("expandable"), expandableChecked);
}

1756
debian/patches/completely-remove-plugin-clock.patch vendored
View File

File diff suppressed because it is too large Load Diff

30
debian/patches/don't-autounmute-on-volume-change.patch vendored
Unescape View File

@ -1,30 +0,0 @@
Description: volume: Do not auto-unmute on volume change
Author: Palo Kisa <palo.kisa@gmail.com>
Origin: upstream
Bug: https://github.com/lxqt/lxqt/issues/1520
Applied-Upstream: commit:41259bb
Last-Update: 2018-07-16
--- a/plugin-volume/audiodevice.cpp
+++ b/plugin-volume/audiodevice.cpp
@@ -114,7 +114,6 @@ void AudioDevice::setVolume(int volume)
return;
setVolumeNoCommit(volume);
- setMute(false);
if (m_engine)
m_engine->commitDeviceVolume(this);
--- a/plugin-volume/lxqtvolume.cpp
+++ b/plugin-volume/lxqtvolume.cpp
@@ -283,10 +283,7 @@ void LXQtVolume::showNotification(bool f
{
if (Q_LIKELY(m_defaultSink))
{
- if (m_defaultSink->mute())
- m_notification->setSummary(tr("Volume: muted"));
- else
- m_notification->setSummary(tr("Volume: %1%").arg(QString::number(m_defaultSink->volume())));
+ m_notification->setSummary(tr("Volume: %1%%2").arg(QString::number(m_defaultSink->volume())).arg(m_defaultSink->mute() ? tr("(muted)") : ""));
m_notification->update();
}
}

322
debian/patches/override-icon-theme.patch vendored
Unescape View File

@ -1,322 +0,0 @@
Description: Add optional overriding of icon theme.
Author: Walter Lapchynski <wxl@ubuntu.com>
Last-Updated: 2018-08-22
Applied-Upstream: https://github.com/lxqt/lxqt-panel/pull/674/commits/1a70479ed931e07a67a182223426328ab3fcbeff
--- a/panel/config/configpaneldialog.cpp
+++ b/panel/config/configpaneldialog.cpp
@@ -56,3 +56,8 @@ void ConfigPanelDialog::showConfigPlugin
{
showPage(mPluginsPage);
}
+
+void ConfigPanelDialog::updateIconThemeSettings()
+{
+ mPanelPage->updateIconThemeSettings();
+}
--- a/panel/config/configpaneldialog.h
+++ b/panel/config/configpaneldialog.h
@@ -43,6 +43,7 @@ public:
void showConfigPanelPage();
void showConfigPluginsPage();
+ void updateIconThemeSettings();
private:
ConfigPanelWidget *mPanelPage;
--- a/panel/config/configpanelwidget.cpp
+++ b/panel/config/configpanelwidget.cpp
@@ -57,6 +57,7 @@ ConfigPanelWidget::ConfigPanelWidget(LXQ
fillComboBox_position();
fillComboBox_alignment();
+ fillComboBox_icon();
mOldPanelSize = mPanel->panelSize();
mOldIconSize = mPanel->iconSize();
@@ -115,6 +116,9 @@ ConfigPanelWidget::ConfigPanelWidget(LXQ
connect(ui->slider_opacity, &QSlider::valueChanged, this, &ConfigPanelWidget::editChanged);
connect(ui->checkBox_reserveSpace, &QAbstractButton::toggled, [this](bool checked) { mPanel->setReserveSpace(checked, true); });
+
+ connect(ui->groupBox_icon, &QGroupBox::clicked, this, &ConfigPanelWidget::editChanged);
+ connect(ui->comboBox_icon, QOverload<int>::of(&QComboBox::activated), this, &ConfigPanelWidget::editChanged);
}
@@ -211,6 +215,59 @@ void ConfigPanelWidget::fillComboBox_ali
};
}
+/************************************************
+ *
+ ************************************************/
+void ConfigPanelWidget::fillComboBox_icon()
+{
+ ui->groupBox_icon->setChecked(!mPanel->iconTheme().isEmpty());
+
+ QStringList themeList;
+ QStringList processed;
+ const QStringList baseDirs = QIcon::themeSearchPaths();
+ for (const QString &baseDirName : baseDirs)
+ {
+ QDir baseDir(baseDirName);
+ if (!baseDir.exists())
+ continue;
+ const QFileInfoList dirs = baseDir.entryInfoList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name);
+ for (const QFileInfo &dir : dirs)
+ {
+ if (!processed.contains(dir.canonicalFilePath()))
+ {
+ processed << dir.canonicalFilePath();
+ QDir Dir(dir.canonicalFilePath());
+ QSettings file(Dir.absoluteFilePath(QStringLiteral("index.theme")), QSettings::IniFormat);
+ if (file.status() == QSettings::NoError
+ && !file.value(QStringLiteral("Icon Theme/Directories")).toStringList().join(QLatin1Char(' ')).isEmpty()
+ && !file.value(QStringLiteral("Icon Theme/Hidden"), false).toBool())
+ {
+ themeList << Dir.dirName();
+ }
+ }
+ }
+ }
+ if (!themeList.isEmpty())
+ {
+ themeList.sort();
+ ui->comboBox_icon->insertItems(0, themeList);
+ QString curTheme = QIcon::themeName();
+ if (!curTheme.isEmpty())
+ ui->comboBox_icon->setCurrentText(curTheme);
+ }
+}
+
+
+/************************************************
+ *
+ ************************************************/
+void ConfigPanelWidget::updateIconThemeSettings()
+{
+ ui->groupBox_icon->setChecked(!mPanel->iconTheme().isEmpty());
+ QString curTheme = QIcon::themeName();
+ if (!curTheme.isEmpty())
+ ui->comboBox_icon->setCurrentText(curTheme);
+}
/************************************************
*
@@ -284,6 +341,11 @@ void ConfigPanelWidget::editChanged()
QString image = ui->checkBox_customBgImage->isChecked() ? ui->lineEdit_customBgImage->text() : QString();
mPanel->setBackgroundImage(image, true);
+
+ if (!ui->groupBox_icon->isChecked())
+ mPanel->setIconTheme(QString());
+ else if (!ui->comboBox_icon->currentText().isEmpty())
+ mPanel->setIconTheme(ui->comboBox_icon->currentText());
}
--- a/panel/config/configpanelwidget.h
+++ b/panel/config/configpanelwidget.h
@@ -49,6 +49,7 @@ public:
int screenNum() const { return mScreenNum; }
ILXQtPanel::Position position() const { return mPosition; }
+ void updateIconThemeSettings();
signals:
void changed();
@@ -73,6 +74,7 @@ private:
void addPosition(const QString& name, int screen, LXQtPanel::Position position);
void fillComboBox_position();
void fillComboBox_alignment();
+ void fillComboBox_icon();
int indexForPosition(int screen, ILXQtPanel::Position position);
int getMaxLength();
--- a/panel/config/configpanelwidget.ui
+++ b/panel/config/configpanelwidget.ui
@@ -555,6 +555,44 @@
</layout>
</widget>
</item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_icon">
+ <property name="toolTip">
+ <string>A partial workaround for widget styles that
+cannot give a separate theme to the panel.
+
+You might also want to disable:
+
+LXQt Appearance Configuration →
+Icons Theme →
+Colorize icons based on widget style (palette)</string>
+ </property>
+ <property name="title">
+ <string>Override icon &amp;theme</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ <layout class="QFormLayout" name="formLayout_2">
+ <property name="formAlignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Icon theme for panels:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="comboBox_icon"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
</layout>
</widget>
<resources/>
--- a/panel/lxqtpanel.cpp
+++ b/panel/lxqtpanel.cpp
@@ -1354,6 +1354,28 @@ void LXQtPanel::setShowDelay(int showDel
saveSettings(true);
}
+QString LXQtPanel::iconTheme() const
+{
+ return mSettings->value("iconTheme").toString();
+}
+
+void LXQtPanel::setIconTheme(const QString& iconTheme)
+{
+ LXQtPanelApplication *a = reinterpret_cast<LXQtPanelApplication*>(qApp);
+ a->setIconTheme(iconTheme);
+}
+
+void LXQtPanel::updateConfigDialog() const
+{
+ if (!mConfigDialog.isNull() && mConfigDialog->isVisible())
+ {
+ mConfigDialog->updateIconThemeSettings();
+ const QList<QWidget*> widgets = mConfigDialog->findChildren<QWidget*>();
+ for (QWidget *widget : widgets)
+ widget->update();
+ }
+}
+
bool LXQtPanel::isPluginSingletonAndRunnig(QString const & pluginId) const
{
Plugin const * plugin = mPlugins->pluginByID(pluginId);
--- a/panel/lxqtpanel.h
+++ b/panel/lxqtpanel.h
@@ -222,6 +222,7 @@ public:
bool hidable() const { return mHidable; }
int animationTime() const { return mAnimationTime; }
int showDelay() const { return mShowDelayTimer.interval(); }
+ QString iconTheme() const;
/*!
* \brief Checks if a given Plugin is running and has the
@@ -232,6 +233,11 @@ public:
* ILXQtPanelPlugin::SingleInstance flag set, false otherwise.
*/
bool isPluginSingletonAndRunnig(QString const & pluginId) const;
+ /*!
+ * \brief Updates the config dialog. Used for updating its icons
+ * when the panel-specific icon theme changes.
+ */
+ void updateConfigDialog() const;
public slots:
/**
@@ -299,6 +305,7 @@ public slots:
void setHidable(bool hidable, bool save); //!< \sa setPanelSize()
void setAnimationTime(int animationTime, bool save); //!< \sa setPanelSize()
void setShowDelay(int showDelay, bool save); //!< \sa setPanelSize()
+ void setIconTheme(const QString& iconTheme);
/**
* @brief Saves the current configuration, i.e. writes the current
@@ -549,7 +556,7 @@ private:
* @brief Stores if mLength is stored in pixels or relative to the
* screen size in percents. If true, the length is stored in percents,
* otherwise in pixels.
- *
+ *
* \sa mLength
*/
bool mLengthInPercents;
--- a/panel/lxqtpanelapplication.cpp
+++ b/panel/lxqtpanelapplication.cpp
@@ -117,6 +117,15 @@ LXQtPanelApplication::LXQtPanelApplicati
QStringList panels = d->mSettings->value("panels").toStringList();
+ // WARNING: Giving a separate icon theme to the panel is wrong and has side effects.
+ // However, it is optional and can be used as the last resort for avoiding a low
+ // contrast in the case of symbolic SVG icons. (The correct way of doing that is
+ // using a Qt widget style that can assign a separate theme/QPalette to the panel.)
+ mGlobalIconTheme = QIcon::themeName();
+ const QString iconTheme = d->mSettings->value("iconTheme").toString();
+ if (!iconTheme.isEmpty())
+ QIcon::setThemeName(iconTheme);
+
if (panels.isEmpty())
{
panels << "panel1";
@@ -280,3 +289,21 @@ bool LXQtPanelApplication::isPluginSingl
return false;
}
+
+// See LXQtPanelApplication::LXQtPanelApplication for why this isn't good.
+void LXQtPanelApplication::setIconTheme(const QString &iconTheme)
+{
+ Q_D(LXQtPanelApplication);
+
+ d->mSettings->setValue("iconTheme", iconTheme == mGlobalIconTheme ? QString() : iconTheme);
+ QString newTheme = iconTheme.isEmpty() ? mGlobalIconTheme : iconTheme;
+ if (newTheme != QIcon::themeName())
+ {
+ QIcon::setThemeName(newTheme);
+ for(LXQtPanel* panel : qAsConst(mPanels))
+ {
+ panel->update();
+ panel->updateConfigDialog();
+ }
+ }
+}
--- a/panel/lxqtpanelapplication.h
+++ b/panel/lxqtpanelapplication.h
@@ -69,12 +69,14 @@ public:
explicit LXQtPanelApplication(int& argc, char** argv);
~LXQtPanelApplication();
+ void setIconTheme(const QString &iconTheme);
+
/*!
* \brief Determines the number of LXQtPanel objects
* \return the current number of LXQtPanel objects
*/
- int count() { return mPanels.count(); }
-
+ int count() const { return mPanels.count(); }
+
/*!
* \brief Checks if a given Plugin is running and has the
* ILXQtPanelPlugin::SingleInstance flag set. As Plugins are added to
@@ -123,6 +125,10 @@ private:
*/
QList<LXQtPanel*> mPanels;
/*!
+ * \brief The global icon theme used by all apps (except for panels perhaps).
+ */
+ QString mGlobalIconTheme;
+ /*!
* \brief Creates a new LXQtPanel with the given name and connects the
* appropriate signals and slots.
* This method can be used at application startup.

7
debian/patches/series vendored
Unescape View File

@ -1,7 +0,0 @@
completely-remove-plugin-clock.patch
don't-autounmute-on-volume-change.patch
add-autoexpansion-1.patch
add-autoexpansion-2.patch
add-autoexpansion-3.patch
add-autoexpansion-4.patch
override-icon-theme.patch
Write Preview
Loading…
Cancel
Save