Skip to content

Removed disable icon code #464

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

Open
stefonarch wants to merge 1 commit into
base: no-battery-icon
Choose a base branch
from
Open

Removed disable icon code #464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions config/batterywatchersettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ BatteryWatcherSettings::BatteryWatcherSettings(QWidget *parent) :
connect(mUi->actionComboBox, &QComboBox::currentIndexChanged, this, &BatteryWatcherSettings::settingsChanged);
connect(mUi->warningSpinBox, &QSpinBox::valueChanged, this, &BatteryWatcherSettings::settingsChanged);
connect(mUi->levelSpinBox, &QSpinBox::valueChanged, this, &BatteryWatcherSettings::settingsChanged);
connect(mUi->showIconCheckBox, &QCheckBox::toggled, this, &BatteryWatcherSettings::settingsChanged);
connect(mUi->showIconCheckBox, &QCheckBox::toggled, mUi->previewBox, &QGroupBox::setEnabled);
connect(mUi->iconTypeComboBox, &QComboBox::currentIndexChanged, this, &BatteryWatcherSettings::settingsChanged);
connect(mUi->iconTypeComboBox, &QComboBox::currentIndexChanged, this, &BatteryWatcherSettings::updatePreview);
connect(mUi->iconTypeComboBox, &QComboBox::currentIndexChanged, this, &BatteryWatcherSettings::onChargeIconChanged);
Expand All @@ -89,7 +87,6 @@ void BatteryWatcherSettings::loadSettings()
setComboBoxToValue(mUi->actionComboBox, mSettings.getPowerLowAction());
mUi->warningSpinBox->setValue(mSettings.getPowerLowWarningTime());
mUi->levelSpinBox->setValue(mSettings.getPowerLowLevel());
mUi->showIconCheckBox->setChecked(mSettings.isShowIcon());
setComboBoxToValue(mUi->iconTypeComboBox, mSettings.getIconType());
}

Expand All @@ -99,7 +96,6 @@ void BatteryWatcherSettings::saveSettings()
mSettings.setPowerLowAction(currentValue(mUi->actionComboBox));
mSettings.setPowerLowWarningTime(mUi->warningSpinBox->value());
mSettings.setPowerLowLevel(mUi->levelSpinBox->value());
mSettings.setShowIcon(mUi->showIconCheckBox->isChecked());
mSettings.setIconType(static_cast<PowerManagementSettings::IconType>(currentValue(mUi->iconTypeComboBox)));
}

Expand Down
78 changes: 32 additions & 46 deletions config/batterywatchersettings.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>428</width>
<height>414</height>
<height>454</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -30,18 +30,18 @@
</property>
<layout class="QFormLayout" name="formLayout">
<property name="fieldGrowthPolicy">
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
<enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
</property>
<property name="labelAlignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
</property>
<item row="0" column="0">
<widget class="QLabel" name="actionLabel">
<property name="text">
<string>When power is low then:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
</property>
</widget>
</item>
Expand All @@ -54,14 +54,14 @@
<string>Warning:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QSpinBox" name="warningSpinBox">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
</property>
<property name="suffix">
<string> seconds</string>
Expand All @@ -77,45 +77,47 @@
<string>Level is low at:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSpinBox" name="levelSpinBox">
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
</property>
<property name="suffix">
<string> %</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="showIconLabel">
<widget class="QLabel" name="iconTypeLabel">
<property name="text">
<string>Show icon:</string>
<string>Icon:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QCheckBox" name="showIconCheckBox">
<property name="text">
<string/>
</property>
</widget>
<widget class="QComboBox" name="iconTypeComboBox"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="iconTypeLabel">
<property name="text">
<string>Icon:</string>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QComboBox" name="iconTypeComboBox" />
<property name="sizeType">
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>25</height>
</size>
</property>
</spacer>
</item>
<item row="6" column="0" colspan="2">
<item row="5" column="0" colspan="2">
<widget class="QGroupBox" name="previewBox">
<property name="title">
<string>Preview</string>
Expand All @@ -127,7 +129,7 @@
<number>100</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
<enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
Expand All @@ -143,7 +145,7 @@
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
Expand All @@ -158,7 +160,7 @@
<string>Charging</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
Expand All @@ -174,7 +176,7 @@
<string/>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
Expand All @@ -196,17 +198,17 @@
<string>Discharging</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</item>
<item row="0" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<enum>Qt::Orientation::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
<enum>QSizePolicy::Policy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
Expand All @@ -219,22 +221,6 @@
</layout>
</widget>
</item>
<item row="5" column="0">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>25</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
Expand Down
14 changes: 0 additions & 14 deletions src/trayicon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ TrayIcon::TrayIcon(QObject *parent)
msContextMenu->addSeparator();

connect(msContextMenu->addAction(QIcon::fromTheme(QStringLiteral("help-about")), tr("About")), &QAction::triggered, [] { TrayIcon::onAboutTriggered(); });
connect(msContextMenu->addAction(QIcon::fromTheme(QStringLiteral("edit-delete")), tr("Disable icon")), &QAction::triggered, [] { TrayIcon::onDisableIconTriggered(); });
}
setContextMenu(msContextMenu.get());
msInstances.push_back(this);
Expand Down Expand Up @@ -220,19 +219,6 @@ void TrayIcon::onAboutTriggered()
}


void TrayIcon::onDisableIconTriggered()
{
auto notification = new LXQt::Notification{tr("LXQt Power Management info"), nullptr};
notification->setBody(tr("The LXQt Power Management tray icon can be (re)enabled in <i>lxqt-config-powermanagement</i>"));
notification->setIcon(QSL("preferences-system-power-management"));
notification->setActions({tr("Configure now")});
notification->setUrgencyHint(LXQt::Notification::UrgencyLow);
connect(notification, &LXQt::Notification::actionActivated, [notification] { notification->close(); QProcess::startDetached(QL1S("lxqt-config-powermanagement"), QStringList()); });
connect(notification, &LXQt::Notification::notificationClosed, notification, &QObject::deleteLater);
notification->update();

PowerManagementSettings().setShowIcon(false);
}

void TrayIcon::onActivated(QSystemTrayIcon::ActivationReason reason)
{
Expand Down
1 change: 0 additions & 1 deletion src/trayicon.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ private slots:
static void onPauseTimeout();
static void onConfigureTriggered();
static void onAboutTriggered();
static void onDisableIconTriggered();

private:
virtual const QIcon & getIcon() const;
Expand Down