Skip to content

feat(power): adapt dconfig #764

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

Closed
mhduiy wants to merge 1 commit into from
Closed

feat(power): adapt dconfig #764

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
394 changes: 393 additions & 1 deletion misc/dsg-configs/org.deepin.dde.daemon.power.json
View file
Open in desktop

Large diffs are not rendered by default.

102 changes: 52 additions & 50 deletions session/power1/constant.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,62 +6,64 @@ package power

// nolint
const (
gsSchemaPower = "com.deepin.dde.power"
// settingKeys
settingKeyBatteryScreensaverDelay = "battery-screensaver-delay"
settingKeyBatteryScreenBlackDelay = "battery-screen-black-delay"
settingKeyBatterySleepDelay = "battery-sleep-delay"
settingKeyBatteryLockDelay = "battery-lock-delay"

settingKeyLinePowerScreensaverDelay = "line-power-screensaver-delay"
settingKeyLinePowerScreenBlackDelay = "line-power-screen-black-delay"
settingKeyLinePowerSleepDelay = "line-power-sleep-delay"
settingKeyLinePowerLockDelay = "line-power-lock-delay"

settingKeyAdjustBrightnessEnabled = "adjust-brightness-enabled"
settingKeyAmbientLightAdjuestBrightness = "ambient-light-adjust-brightness"
settingKeyScreenBlackLock = "screen-black-lock"
settingKeySleepLock = "sleep-lock"

settingKeyLinePowerLidClosedAction = "line-power-lid-closed-action"
settingKeyLinePowerPressPowerBtnAction = "line-power-press-power-button"
settingKeyBatteryLidClosedAction = "battery-lid-closed-action"
settingKeyBatteryPressPowerBtnAction = "battery-press-power-button"
settingKeyLowPowerNotifyEnable = "low-power-notify-enable"
settingKeyLowPowerNotifyThreshold = "low-power-notify-threshold"
settingKeyLowPowerAutoSleepThreshold = "percentage-action"
settingKeyLowPowerAction = "low-power-action"
settingKeyBrightnessDropPercent = "brightness-drop-percent"
settingKeyPowerSavingEnabled = "power-saving-mode-enabled"

settingKeyPowerButtonPressedExec = "power-button-pressed-exec"

settingKeyFullScreenWorkaroundEnabled = "fullscreen-workaround-enabled"
settingKeyUsePercentageForPolicy = "use-percentage-for-policy"

settingKeyLowPercentage = "percentage-low"
settingKeyDangerlPercentage = "percentage-danger"
settingKeyCriticalPercentage = "percentage-critical"
settingKeyActionPercentage = "percentage-action"

settingKeyLowTime = "time-to-empty-low"
settingKeyDangerTime = "time-to-empty-danger"
settingKeyCriticalTime = "time-to-empty-critical"
settingKeyActionTime = "time-to-empty-action"

settingKeySaveBrightnessWhilePsm = "save-brightness-while-psm"

settingLightSensorEnabled = "light-sensor-enabled"
settingKeyMode = "mode"

settingKeyHighPerformanceEnabled = "high-performance-enabled"

// cmd
cmdDDELowPower = "/usr/lib/deepin-daemon/dde-lowpower"

batteryDisplay = "Display"
)

// dconfig keys
const (
dsettingLinePowerScreensaverDelay = "linePowerScreensaverDelay"
dsettingBatteryScreensaverDelay = "batteryScreensaverDelay"
dsettingPowerSavingModeBrightnessDropPercent = "powerSavingModeBrightnessDropPercent"
dsettingBatteryScreenBlackDelay = "batteryScreenBlackDelay"
dsettingBatterySleepDelay = "batterySleepDelay"
dsettingLinePowerScreenBlackDelay = "linePowerScreenBlackDelay"
dsettingLinePowerSleepDelay = "linePowerSleepDelay"
dsettingLinePowerLockDelay = "linePowerLockDelay"
dsettingBatteryLockDelay = "batteryLockDelay"
dsettingAdjustBrightnessEnabled = "adjustBrightnessEnabled"
dsettingAmbientLightAdjustBrightness = "ambientLightAdjustBrightness"
dsettingScreenBlackLock = "screenBlackLock"
dsettingSleepLock = "sleepLock"
dsettingLidClosedSleep = "lidClosedSleep"
dsettingBatteryLidClosedSleep = "batteryLidClosedSleep"
dsettingPowerButtonPressedExec = "powerButtonPressedExec"
dsettingFullscreenWorkaroundAppList = "fullscreenWorkaroundAppList"
dsettingUsePercentageForPolicy = "usePercentageForPolicy"
dsettingPowerModuleInitialized = "powerModuleInitialized"
dsettingLowPowerNotifyThreshold = "lowPowerNotifyThreshold"
dsettingLowPowerAction = "lowPowerAction"
dsettingPercentageAction = "percentageAction"
dsettingTimeToEmptyLow = "timeToEmptyLow"
dsettingTimeToEmptyDanger = "timeToEmptyDanger"
dsettingTimeToEmptyCritical = "timeToEmptyCritical"
dsettingTimeToEmptyAction = "timeToEmptyAction"
dsettingLinePowerLidClosedAction = "linePowerLidClosedAction"
dsettingLinePowerPressPowerButton = "linePowerPressPowerButton"
dsettingBatteryLidClosedAction = "batteryLidClosedAction"
dsettingBatteryPressPowerButton = "batteryPressPowerButton"
dsettingLowPowerNotifyEnable = "lowPowerNotifyEnable"
dsettingSaveBrightnessWhilePsm = "saveBrightnessWhilePsm"
dsettingLightSensorEnabled = "lightSensorEnabled"
dsettingLowPowerPercentInUpdatingNotify = "lowPowerPercentInUpdatingNotify"
dsettingHighPerformanceEnabled = "highPerformanceEnabled"
dsettingsPowerSavingModeEnabled = "powerSavingModeEnabled"
dsettingScheduledShutdownState = "scheduledShutdownState"
dsettingShutdownTime = "shutdownTime"
dsettingShutdownRepetition = "shutdownRepetition"
dsettingCustomShutdownWeekDays = "customShutdownWeekDays"
dsettingShutdownCountdown = "shutdownCountdown"
dsettingNextShutdownTime = "nextShutdownTime"
)

const (
DSettingsAppID = "org.deepin.dde.daemon"
DSettingsDisplayName = "org.deepin.Display"
DSettingsAutoChangeWm = "auto-change-deepin-wm"
)

const (
powerActionShutdown int32 = iota
powerActionSuspend
Expand Down
3 changes: 2 additions & 1 deletion session/power1/daemon.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,10 @@
package power

import (
"os"

"github.com/linuxdeepin/dde-daemon/loader"
"github.com/linuxdeepin/go-lib/log"
"os"
)

var logger = log.NewLogger("daemon/session/power")
Expand Down
4 changes: 2 additions & 2 deletions session/power1/lid_switch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,9 @@ func (h *LidSwitchHandler) doLidStateChanged(state bool) {
onBattery = h.manager.OnBattery
var lidCloseAction int32
if onBattery {
lidCloseAction = m.BatteryLidClosedAction.Get() // 获取合盖操作
lidCloseAction = m.BatteryLidClosedAction // 获取合盖操作
} else {
lidCloseAction = m.LinePowerLidClosedAction.Get() // 获取合盖操作
lidCloseAction = m.LinePowerLidClosedAction // 获取合盖操作
}
switch lidCloseAction {
case powerActionShutdown:
Expand Down
Loading
Loading