mirrors/theshell
1
0
Fork 0
mirror of https://github.com/vicr123/theshell.git synced 2025-01-23 04:11:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'volumeOverdrive' of https://github.com/zBlakee/theshell into zBlakee-volumeOverdrive

Browse source 
Merge pull request
This commit is contained in:
Victor Tran 2017-10-03 13:33:03 +11:00
commit 1f1e5cea24
4 changed files with 186 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
infopanedropdown.cpp
View file

@ -295,6 +295,7 @@ InfoPaneDropdown::InfoPaneDropdown(WId MainWindowId, QWidget *parent) :
ui->BarOnBottom->setChecked(!settings.value("bar/onTop", true).toBool()); ui->BarOnBottom->setChecked(!settings.value("bar/onTop", true).toBool());
ui->AutoShowBarSwitch->setChecked(settings.value("bar/autoshow", true).toBool()); ui->AutoShowBarSwitch->setChecked(settings.value("bar/autoshow", true).toBool());
ui->SoundFeedbackSoundSwitch->setChecked(settings.value("sound/feedbackSound", true).toBool()); ui->SoundFeedbackSoundSwitch->setChecked(settings.value("sound/feedbackSound", true).toBool());
ui->SoundFeedbackSoundSwitch->setChecked(settings.value("sound/volumeOverdrive", true).toBool());
updateAccentColourBox(); updateAccentColourBox();
on_StatusBarSwitch_toggled(ui->StatusBarSwitch->isChecked()); on_StatusBarSwitch_toggled(ui->StatusBarSwitch->isChecked());
@ -2725,10 +2726,13 @@ void InfoPaneDropdown::on_decorativeColorThemeRadio_toggled(bool checked)
} }
} }
void InfoPaneDropdown::on_SoundFeedbackSoundSwitch_toggled(bool checked) void InfoPaneDropdown::on_SoundFeedbackSoundSwitch_toggled(bool checked) {
{ settings.setValue("sound/feedbackSound", checked);
settings.setValue("sound/feedbackSound", checked); }
}
void InfoPaneDropdown::on_VolumeOverdriveSwitch_toggled(bool checked) {
settings.setValue("sound/volumeOverdrive", checked);
}
void InfoPaneDropdown::updateAccentColourBox() { void InfoPaneDropdown::updateAccentColourBox() {
//Set up theme button combo box //Set up theme button combo box

2
infopanedropdown.h
View file

@ -366,6 +366,8 @@ private slots:
void on_SoundFeedbackSoundSwitch_toggled(bool checked); void on_SoundFeedbackSoundSwitch_toggled(bool checked);
void on_VolumeOverdriveSwitch_toggled(bool checked);
void updateAccentColourBox(); void updateAccentColourBox();
void on_dpi100_toggled(bool checked); void on_dpi100_toggled(bool checked);

334
infopanedropdown.ui
View file

@ -376,8 +376,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>592</width> <width>614</width>
<height>1062</height> <height>1046</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_26"> <layout class="QVBoxLayout" name="verticalLayout_26">
@ -611,14 +611,14 @@
<second>0</second> <second>0</second>
<year>1969</year> <year>1969</year>
<month>9</month> <month>9</month>
<day>16</day> <day>15</day>
</datetime> </datetime>
</property> </property>
<property name="date"> <property name="date">
<date> <date>
<year>1969</year> <year>1969</year>
<month>9</month> <month>9</month>
<day>16</day> <day>15</day>
</date> </date>
</property> </property>
<property name="displayFormat"> <property name="displayFormat">
@ -2419,7 +2419,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>883</width> <width>883</width>
<height>589</height> <height>601</height>
</rect> </rect>
</property> </property>
<layout class="QGridLayout" name="gridLayout_21"> <layout class="QGridLayout" name="gridLayout_21">
@ -2981,161 +2981,6 @@
</widget> </widget>
<widget class="QWidget" name="NotificationsSettings"> <widget class="QWidget" name="NotificationsSettings">
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="1" column="2">
<widget class="QPushButton" name="pushButton_9">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset theme="list-add">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_43">
<property name="text">
<string>Show Notifications on lock screen</string>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_89">
<property name="text">
<string>Attenuate audio</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3">
<widget class="QFrame" name="displayHeader_2">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_13">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="displayLabel_2">
<property name="font">
<font>
<pointsize>15</pointsize>
</font>
</property>
<property name="text">
<string>Notifications</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="displayLine_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_49">
<property name="text">
<string>Show options when connecting media</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Don't keep notifications from</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_58">
<property name="text">
<string>Notification Sound</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QListView" name="listView">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="10" column="0" colspan="3">
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="1" colspan="2">
<widget class="QCheckBox" name="checkBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Keep notifications from blank app_name parameters</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="3">
<widget class="Line" name="line_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="Switch" name="AttenuateSwitch">
<property name="text">
<string notr="true">AttenuateSwitch</string>
</property>
</widget>
</item>
<item row="7" column="1" colspan="2">
<widget class="QComboBox" name="notificationSoundBox"/>
</item>
<item row="6" column="1">
<widget class="Switch" name="MediaSwitch">
<property name="text">
<string notr="true">MediaSwitch</string>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2"> <item row="4" column="1" colspan="2">
<widget class="QFrame" name="frame_4"> <widget class="QFrame" name="frame_4">
<property name="frameShape"> <property name="frameShape">
@ -3194,6 +3039,161 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="3">
<widget class="QFrame" name="displayHeader_2">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Raised</enum>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_13">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="displayLabel_2">
<property name="font">
<font>
<pointsize>15</pointsize>
</font>
</property>
<property name="text">
<string>Notifications</string>
</property>
</widget>
</item>
<item>
<widget class="Line" name="displayLine_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="pushButton_9">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset theme="list-add">
<normaloff>.</normaloff>.</iconset>
</property>
<property name="flat">
<bool>true</bool>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QLabel" name="label_89">
<property name="text">
<string>Attenuate audio</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_43">
<property name="text">
<string>Show Notifications on lock screen</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QListView" name="listView">
<property name="enabled">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Don't keep notifications from</string>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QLabel" name="label_58">
<property name="text">
<string>Notification Sound</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="label_49">
<property name="text">
<string>Show options when connecting media</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="3">
<widget class="Line" name="line_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="Switch" name="MediaSwitch">
<property name="text">
<string notr="true">MediaSwitch</string>
</property>
</widget>
</item>
<item row="11" column="0" colspan="3">
<spacer name="verticalSpacer_10">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="1" colspan="2">
<widget class="QCheckBox" name="checkBox">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Keep notifications from blank app_name parameters</string>
</property>
</widget>
</item>
<item row="8" column="1">
<widget class="Switch" name="AttenuateSwitch">
<property name="text">
<string notr="true">AttenuateSwitch</string>
</property>
</widget>
</item>
<item row="7" column="1" colspan="2">
<widget class="QComboBox" name="notificationSoundBox"/>
</item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="lineEdit_3"> <widget class="QLineEdit" name="lineEdit_3">
<property name="enabled"> <property name="enabled">
@ -3218,6 +3218,20 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="10" column="0">
<widget class="QLabel" name="label_46">
<property name="text">
<string>Volume overdrive</string>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="Switch" name="pushButton_8">
<property name="text">
<string>VolumeOverdriveSwitch</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="InputSettings"> <widget class="QWidget" name="InputSettings">

2
nativeeventfilter.cpp
View file

@ -161,6 +161,7 @@ bool NativeEventFilter::nativeEventFilter(const QByteArray &eventType, void *mes
if (AudioMan->QuietMode() == AudioManager::mute) { if (AudioMan->QuietMode() == AudioManager::mute) {
Hotkeys->show(QIcon::fromTheme("audio-volume-muted"), tr("Volume"), tr("Quiet Mode is set to Mute.")); Hotkeys->show(QIcon::fromTheme("audio-volume-muted"), tr("Volume"), tr("Quiet Mode is set to Mute."));
} else { } else {
if (!(settings.value("sound/volumeOverdrive", true).toBool() && volume > 100)) {
volume = volume + 5; volume = volume + 5;
if (volume - 5 < 100 && volume > 100) { if (volume - 5 < 100 && volume > 100) {
volume = 100; volume = 100;
@ -176,6 +177,7 @@ bool NativeEventFilter::nativeEventFilter(const QByteArray &eventType, void *mes
} }
Hotkeys->show(QIcon::fromTheme("audio-volume-high"), tr("Volume"), volume); Hotkeys->show(QIcon::fromTheme("audio-volume-high"), tr("Volume"), volume);
}
} }
} else if (button->detail == XKeysymToKeycode(QX11Info::display(), XF86XK_AudioLowerVolume)) { //Decrease Volume by 5% } else if (button->detail == XKeysymToKeycode(QX11Info::display(), XF86XK_AudioLowerVolume)) { //Decrease Volume by 5%
if (AudioMan->QuietMode() == AudioManager::mute) { if (AudioMan->QuietMode() == AudioManager::mute) {