Switchboard Power Plug

Merge lp://staging/~kay20/switchboard-plug-power/systemd-add into lp://staging/~elementary-apps/switchboard-plug-power/trunk

  1. systemd-add
  2. Merge into trunk
Proposed by kay van der Zander
Status: Merged
Approved by: Danielle Foré
Approved revision: 270
Merged at revision: 288
Proposed branch: lp://staging/~kay20/switchboard-plug-power/systemd-add
Merge into: lp://staging/~elementary-apps/switchboard-plug-power/trunk
Diff against target: 2477 lines (+1603/-451)
21 files modified
.bzrignore (+9/-0)
CMakeLists.txt (+7/-1)
cli/CMakeLists.txt (+24/-0)
cli/Systemd.vala (+149/-0)
cli/main.vala (+70/-0)
config.vala.cmake (+1/-1)
data/org.pantheon.switchboard.power.policy.cmake (+21/-0)
po/he.po (+97/-73)
po/pantheon-power-plug.pot (+98/-70)
po/ru.po (+104/-74)
src/ActionComboBox.vala (+16/-16)
src/Battery.vala (+86/-0)
src/CMakeLists.txt (+12/-2)
src/CliCommunicator.vala (+174/-0)
src/Interfaces.vala (+56/-0)
src/LidCloseActionComboBox.vala (+116/-0)
src/Permission.vala (+18/-0)
src/Plug.vala (+233/-198)
src/PowerSupply.vala (+78/-0)
src/TimeoutComboBox.vala (+16/-16)
vapi/polkit-gobject-1.vapi (+218/-0)
To merge this branch: bzr merge lp://staging/~kay20/switchboard-plug-power/systemd-add
Reviewer Review Type Date Requested Status
Danielle Foré Approve
elementary UX Pending
Review via email: mp+277518@code.staging.launchpad.net

Commit message

* add Upower and Systemd
* update translation

Description of the change

this branch include bug fixes of #1060456 #1341797 #1359054 #1373602 #1443616.
I contains structure changes and added dbus Upower and systemd
if systemd takes over all acpi functions is it easy to add in the cli

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

Can we get a lock icon near settings that need admin approval like we have in the user accounts plug?

Let's change the language "this pc" to "this computer". PC is Microsoft brand

review: Needs Fixing
Revision history for this message
Ben (benwaffle) :
Revision history for this message
kay van der Zander (kay20) wrote :

@ben changed the URL, the dbus way has no effect. different test show that this is the best way to use debus in this case. because you need 2 connections one for the path and the other one is for the information.

@dan changed PC into computer and added locks like the accounts plug. Only by the settings that need admin approval

Revision history for this message
Cody Garver (codygarver) wrote :

Needs to `bzr merge lp:switchboard-plug-power` and `bzr resolve` conflicts

Revision history for this message
kay van der Zander (kay20) wrote :

@cody done!

lp://staging/~kay20/switchboard-plug-power/systemd-add updated
268. By kay van der Zander

added lock images, changed dislay text and changed vendor url to the right url

269. By kay van der Zander

add polkit-gobject-1 as dependecy and let pkg locate the path of polkit

Revision history for this message
Danielle Foré (danrabbit) wrote :

Can't confirm that this fixed #1060456: Open to tab that reflects current power state

I can confirm that the lid close option works (#1359054), but I can't confirm about the external display because I don't have one (#1341797).

I can't confirm that setting "dim screen when inactive" has any effect while plugged in (#1373602).

So for me I think either we need to unlink the unfixed reports from this branch or it needs fixing

Revision history for this message
kay van der Zander (kay20) wrote :

I have removed the dim bug because it isn't fixed yet.
this merge is to my opinion ready.
could you test #1060456 once more?

lp://staging/~kay20/switchboard-plug-power/systemd-add updated
270. By kay van der Zander

fix #1060456

Revision history for this message
Danielle Foré (danrabbit) wrote :

Can confirm that tab switching for power state works now

Revision history for this message
Danielle Foré (danrabbit) wrote :

We're gonna merge to keep our velocity towards beta high. We can address the discovery method in another branch

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches