Skip to content

Commit

Permalink
Rename both new methods to backupWorkingPatchList and `restorePatch…
Browse files Browse the repository at this point in the history
…List` (#6)

* [org.SfietKonstantin.patchmanager.xml] Rename both new methods

… to `backupWorkingPatchList` and `restorePatchList`
Reference: sailfishos-patches#437 (comment)

* [patchmanagerobject.cpp] First round of name changes

* [patchmanagerobject.h] Carry out all name changes

* [patchmanager.cpp] Carry out all name changes

* [patchmanager.h] Carry out all name changes

* [org.SfietKonstantin.patchmanager.xml] Fix accidentally swapped names

* [PatchManagerPage.qml] Carry out all name changes

* [patchmanager-tool] Carry out all name changes

* [main.cpp] Carry out all name changes

¿Is the masking of the **"** with **\** correct in C++?

* [PatchManagerPage.qml] Enhance wording of menu entry

Better, but still not really good, IMO.  Issue is, it must be terse enough to fit in a single line in portrait orientation on a Jolla 1 (i.e., 540 pixels width)!

* [index.qdoc] Overhaul

Sorry, I became carried away: Originally I only adjusted the original lines 307 & 310, then started fixing a few typos, enhanced a few phrases etc. etc. and ended up in going over the whole file.

Open points:
- Line 110: "\uicontrol"
  Is this correct markup?  Does the sentence make sense this way?
- Line 161: "\badcode"
  Is this correct markup?
- Line 225: "In this state, all enabled services are disabled, and PM must be reactivated via the GUI."
  "Patches" instead of "services"?
- Line 289: "\warning"
  Not "Warning"?  I.e., is it a markup term?

* [patchmanagerobject.cpp] Complete name changes

Questions:
- Was capitalising "\c Patches" in line 372 O.K.?
- Is the "\sa" in line 373 correct?

* [patchmanagerobject.cpp] Try to rectify comments lines 344 - 387

Please review thoroughly!  It became obvious, that some copy&paste flaws existed, but I am not sure, if I rectified them correctly.  I simply assumed that the code is correct, but maybe (unlikely) the documentation mismatch was the other way around.

* [patchmanagerobject.cpp] Complete name changes & overhaul

Notes / questions:
- Line 587: "()"?  Function name missing?
- Line 1103: "on the bus" -> "on D-Bus"?
- Line 1198: Ambiguous, especially the second "all".
- Line 1705: Not better "/sa" instead of "See also"?
- Line 2121: Is that an accidentally deleted comment: Check `git blame`

* [patchmanagerobject.cpp] Revert over-eagerly applied capitalisation

* [index.qdoc] Two minor rectifications of yesterday's work

* [index.qdoc] Fix ambiguosity and missing "that" in line 120

* [index.qdoc] Enhance lines 124 and 135 a little bit

* [index.qdoc] More minor fixes

* [index.qdoc] Even moere small fixes

* [index.qdoc] More nitpicks

* [index.qdoc] Rectify broken sentence, detected and forgotten multiple times
  • Loading branch information
Olf0 authored Aug 14, 2023
1 parent b7c9117 commit 6ab1ddd
Show file tree
Hide file tree
Showing 9 changed files with 183 additions and 218 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@
<method name="getLoaded">
<arg name="loaded" type="b" direction="out" />
</method>
<method name="revertToLastGood">
<method name="restorePatchList">
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
</method>
<method name="setKnownGood">
<method name="backupWorkingPatchList">
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
</method>
<method name="resolveFailure">
Expand Down
4 changes: 2 additions & 2 deletions src/bin/patchmanager-daemon/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ void help()
std::cout << " patchmanager -a <Patch> : Enable and activate a Patch" << std::endl;
std::cout << " patchmanager -u <Patch> : Deactivate and disable (unapply) a Patch" << std::endl;
std::cout << " patchmanager --unapply-all : Deactivate and disable (unapply) all Patches" << std::endl;
std::cout << " patchmanager --save-as-good : Save list of enabled Patches as 'known good'" << std::endl;
std::cout << " patchmanager --load-known-good : Enable 'known good' Patches" << std::endl;
std::cout << " patchmanager --backup-working : Save list of enabled Patches as \"working\"" << std::endl;
std::cout << " patchmanager --restore-working : Enable backup list of \"working\" Patches" << std::endl;
std::cout << " patchmanager --daemon : Start Patchmanager as daemon" << std::endl;
}

Expand Down
Loading

0 comments on commit 6ab1ddd

Please sign in to comment.