Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add slider to fine-tune bar opacity #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add slider to fine-tune bar opacity #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31bc9b1
Add opacity slider
ZoomTen Jun 29, 2020
6a68448
Update translations
ZoomTen Jun 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 13 additions & 1 deletion desktop/bar/barwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ struct BarWindowPrivate {
bool statusCenterShown = false;

tSettings settings;

bool translucencyEnabled = true;
int translucencyOpacity = 150;
};

BarWindow::BarWindow(QWidget* parent) :
Expand Down Expand Up @@ -140,9 +143,18 @@ BarWindow::BarWindow(QWidget* parent) :

connect(&d->settings, &tSettings::settingChanged, this, [ = ](QString key, QVariant value) {
if (key == "Appearance/translucent") {
d->translucencyEnabled = value.toBool();
this->update();
}
});
connect(&d->settings, &tSettings::settingChanged, this, [ = ](QString key, QVariant value) {
if (key == "Appearance/opacity") {
d->translucencyOpacity = value.toInt();
this->update();
}
});
d->translucencyEnabled = d->settings.value("Appearance/translucent").toBool();
d->translucencyOpacity = d->settings.value("Appearance/opacity").toInt();

KeyGrab* statusCenterGrab = new KeyGrab(QKeySequence(Qt::MetaModifier | Qt::Key_Tab));
connect(statusCenterGrab, &KeyGrab::activated, this, [ = ] {
Expand Down Expand Up @@ -192,7 +204,7 @@ void BarWindow::leaveEvent(QEvent* event) {

void BarWindow::paintEvent(QPaintEvent* event) {
QColor bgCol = this->palette().color(QPalette::Window);
if (d->settings.value("Appearance/translucent").toBool()) bgCol.setAlpha(150);
if (d->translucencyEnabled) bgCol.setAlpha(d->translucencyOpacity);

QPainter painter(this);
painter.setPen(Qt::transparent);
Expand Down
1 change: 1 addition & 0 deletions desktop/defaults.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,4 @@ blacklist=

[Appearance]
translucent=true
opacity=150
25 changes: 25 additions & 0 deletions plugins/ThemePlugin/settings/themesettingspane.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include <QStandardPaths>
#include <QStyleFactory>
#include <QDir>
#include <QTimer>

struct ThemeSettingsPanePrivate {
QSettings* kwinSettings;
Expand Down Expand Up @@ -84,6 +85,24 @@ ThemeSettingsPane::ThemeSettingsPane() :
}
});
ui->transparencySwitch->setChecked(d->settings.value("Appearance/translucent").toBool());

connect(&d->settings, &tSettings::settingChanged, this, [ = ](QString key, QVariant value) {
if (key == "Appearance/opacity") {
ui->opacitySlider->setValue(value.toInt());
ui->opacitySliderLabel->setText(value.toString());
ui->opacitySliderLabel->setText(QString::number(
(value.toFloat())/255*100,
'g',3)+"%");
}
});
ui->opacitySlider->setValue(d->settings.value("Appearance/opacity").toInt());

// for some reason the slider label doesn't update early
QTimer::singleShot(100, this, [this](){
ui->opacitySliderLabel->setText(QString::number(
(d->settings.value("Appearance/opacity").toFloat())/255*100,
'g',3)+"%");
});
}

ThemeSettingsPane::~ThemeSettingsPane() {
Expand Down Expand Up @@ -248,3 +267,9 @@ void ThemeSettingsPane::on_setWindowBordersButton_clicked() {
void ThemeSettingsPane::on_transparencySwitch_toggled(bool checked) {
d->settings.setValue("Appearance/translucent", checked);
}


void ThemeSettingsPane::on_opacitySlider_valueChanged(int value)
{
d->settings.setValue("Appearance/opacity", value);
}
1 change: 1 addition & 0 deletions plugins/ThemePlugin/settings/themesettingspane.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ class ThemeSettingsPane : public StatusCenterPane {
void on_widgetThemeBox_currentIndexChanged(int index);
void on_setWindowBordersButton_clicked();
void on_transparencySwitch_toggled(bool checked);
void on_opacitySlider_valueChanged(int value);
};

#endif // THEMESETTINGSPANE_H
84 changes: 69 additions & 15 deletions plugins/ThemePlugin/settings/themesettingspane.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-124</y>
<width>613</width>
<height>735</height>
<y>-195</y>
<width>715</width>
<height>783</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
Expand Down Expand Up @@ -531,6 +531,35 @@
<item alignment="Qt::AlignHCenter">
<widget class="QWidget" name="effectsWidget" native="true">
<layout class="QGridLayout" name="gridLayout_5">
<item row="2" column="0">
<widget class="QLabel" name="label_17">
<property name="text">
<string>Bar Opacity</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSlider" name="opacitySlider">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="maximum">
<number>255</number>
</property>
<property name="value">
<number>150</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::NoTicks</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_16">
<property name="sizePolicy">
Expand All @@ -544,13 +573,6 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="tSwitch" name="transparencySwitch">
<property name="text">
<string notr="true">TransparencySwitch</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_15">
<property name="font">
Expand All @@ -564,6 +586,38 @@
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QLabel" name="opacitySliderLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>48</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>100%</string>
</property>
<property name="textFormat">
<enum>Qt::PlainText</enum>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2">
<widget class="tSwitch" name="transparencySwitch">
<property name="text">
<string notr="true">TransparencySwitch</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down Expand Up @@ -595,17 +649,17 @@
<signal>backButtonClicked()</signal>
</slots>
</customwidget>
<customwidget>
<class>tSwitch</class>
<extends>QPushButton</extends>
<header location="global">tswitch.h</header>
</customwidget>
<customwidget>
<class>AccentColourPicker</class>
<extends>QWidget</extends>
<header>settings/accentcolourpicker.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>tSwitch</class>
<extends>QPushButton</extends>
<header location="global">tswitch.h</header>
</customwidget>
<customwidget>
<class>tConditionalWidget</class>
<extends>QWidget</extends>
Expand Down
16 changes: 13 additions & 3 deletions plugins/ThemePlugin/translations/aa_DJ.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<name>ThemeSettingsPane</name>
<message>
<location filename="../settings/themesettingspane.ui" line="35"/>
<location filename="../settings/themesettingspane.cpp" line="198"/>
<location filename="../settings/themesettingspane.cpp" line="216"/>
<source>Theme</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -144,15 +144,25 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="543"/>
<location filename="../settings/themesettingspane.ui" line="537"/>
<source>Bar Opacity</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="572"/>
<source>Transparency Effects</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="563"/>
<location filename="../settings/themesettingspane.ui" line="585"/>
<source>EFFECTS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="604"/>
<source>100%</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="363"/>
<source>Set the appearance of buttons, text boxes and other interface elements</source>
Expand Down
16 changes: 13 additions & 3 deletions plugins/ThemePlugin/translations/aa_ER.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<name>ThemeSettingsPane</name>
<message>
<location filename="../settings/themesettingspane.ui" line="35"/>
<location filename="../settings/themesettingspane.cpp" line="198"/>
<location filename="../settings/themesettingspane.cpp" line="216"/>
<source>Theme</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -144,15 +144,25 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="543"/>
<location filename="../settings/themesettingspane.ui" line="537"/>
<source>Bar Opacity</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="572"/>
<source>Transparency Effects</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="563"/>
<location filename="../settings/themesettingspane.ui" line="585"/>
<source>EFFECTS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="604"/>
<source>100%</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="363"/>
<source>Set the appearance of buttons, text boxes and other interface elements</source>
Expand Down
16 changes: 13 additions & 3 deletions plugins/ThemePlugin/translations/aa_ET.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<name>ThemeSettingsPane</name>
<message>
<location filename="../settings/themesettingspane.ui" line="35"/>
<location filename="../settings/themesettingspane.cpp" line="198"/>
<location filename="../settings/themesettingspane.cpp" line="216"/>
<source>Theme</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -144,15 +144,25 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="543"/>
<location filename="../settings/themesettingspane.ui" line="537"/>
<source>Bar Opacity</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="572"/>
<source>Transparency Effects</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="563"/>
<location filename="../settings/themesettingspane.ui" line="585"/>
<source>EFFECTS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="604"/>
<source>100%</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="363"/>
<source>Set the appearance of buttons, text boxes and other interface elements</source>
Expand Down
16 changes: 13 additions & 3 deletions plugins/ThemePlugin/translations/ab_GE.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<name>ThemeSettingsPane</name>
<message>
<location filename="../settings/themesettingspane.ui" line="35"/>
<location filename="../settings/themesettingspane.cpp" line="198"/>
<location filename="../settings/themesettingspane.cpp" line="216"/>
<source>Theme</source>
<translation type="unfinished"></translation>
</message>
Expand Down Expand Up @@ -144,15 +144,25 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="543"/>
<location filename="../settings/themesettingspane.ui" line="537"/>
<source>Bar Opacity</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="572"/>
<source>Transparency Effects</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="563"/>
<location filename="../settings/themesettingspane.ui" line="585"/>
<source>EFFECTS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="604"/>
<source>100%</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../settings/themesettingspane.ui" line="363"/>
<source>Set the appearance of buttons, text boxes and other interface elements</source>
Expand Down