[sdk/kdesrc-build] /: Fix git-repository-base option
Git commit 5602388099291523942b475b51a2f6a2334012af by Andrew Shark. Committed on 26/01/2024 at 05:17. Pushed by ashark into branch 'master'. Fix git-repository-base option Before this commit, only the last occurrence of this option was applied to the build context. Now we actually can use it several times in the global section, as it was intended. - The actual reading of 'git-repository-base' was done when constructing OptionBase from the global section of the config. - The merging options from the constructed OptionsBase object into the BuildContext was done in setOption of BuildContext, but because it was not properly handled in OptionsBase, only the last value was appeared in BuildContext's handling. - Now it is handled in the OptionsBase also when merging (we expect that the type of value is a hash then). - Remove incorrect placement of 'git-repository-base' to the checking of module-set option in the Module, so our BuildContex::setOption can call its parent class Module::setOption, which then can pass this option handling to its parent class OptionsBase::setOption. Also: - Move endWord suggestion next to the printed message. The actual endWord does not matter when parsing, so it makes code a bit more readable when understanding how it parses - Edit comment so it better explains why we remove some options that we read from the config - Move the config description in docbook to the correct scope M +60 -59 doc/conf-options-table.docbook M +6-5modules/ksb/Application.pm M +1-18 modules/ksb/BuildContext.pm M +1-1modules/ksb/Module.pm M +28 -0modules/ksb/OptionsBase.pm https://invent.kde.org/sdk/kdesrc-build/-/commit/5602388099291523942b475b51a2f6a2334012af diff --git a/doc/conf-options-table.docbook b/doc/conf-options-table.docbook index 0573f12d..8722b1ae 100644 --- a/doc/conf-options-table.docbook +++ b/doc/conf-options-table.docbook @@ -108,6 +108,66 @@ protocol is most efficient. + +git-repository-base + + +TypeString +Available since1.12.1 + +This option is used to create a short +name to reference a specific Git repository base URL in later module set declarations, which is useful for +quickly declaring many Git modules to build. + +You must specify two things (separated by a space): The name to assign +to the base URL, and the actual base URL itself. For example: + + + +global +# other options +# This is the common path to all anonymous Git server modules. +git-repository-base kde-git kde: +end global + +# Module declarations + +module-set +# Now you can use the alias you defined earlier, but only in a module-set. +repository kde-git +use-modules module1.git module2.git +end module-set + + + +The module-set's use-modules option created two modules +internally, with behaving as if it had read: + + +module module1 +repository kde:module1.git +end module + +module module2 +repository kde:module2.git +end module + + +The kde: repository prefix used above is a +shortcut which will be setup by automatically. See the TechBase +https://techbase.kde.org/Development/Git/Configuration#URL_Renaming;>URL +Renaming article for more information. Note that unlike most other +options, this option can be specified multiple times in order to create as +many aliases as necessary. + +It is not required to use this option to take advantage of module-set, +this option exists to make it easy to use the same repository across many +different module sets. + + + install-environment-driver @@ -1267,65 +1327,6 @@ installations. However this only works on build systems that support - -git-repository-base - - -TypeString -Available since1.12.1 - -This option is used to create a short -name to reference a specific Git repository base URL in later module set declarations, which is useful for -quickly declaring many Git modules to build. - -You must specify two things (separated by a space): The name to assign -to the base URL, and the actual base URL itself. For example: - - - -global -# other options -# This is the common path to all anonymous Git server modules. -git-repository-base kde-git kde: -end global - -# Module declarations - -module-set -# Now you can use the alias you defined earlier, but only in a module-set. -repository kde-git -use-modules module1.git module2.git -end module-set - - - -The module-set's use-modules option created two modules -internally, with behaving as if it had read: - - -module module1 -repository kde:module1.git -end module - -module module2 -repository kde:module2.git -end module - - -The kde: repository prefix used above is a -shortcut which will be setup by automatically. See the TechBase -https://techbase.kde.org/Development/Git/Configuration#URL_Renaming;>URL -Renaming article for more information. Note that unlike most other -options, this option can be specified multiple times in order to create as -many aliases as necessary. - -It is
[office/kmymoney/Handbook-5.2] /: continue resolving FIXME's
Git commit 95664d524f249f72196d0ba615be814b45c87b74 by Jack Ostroff. Committed on 25/01/2024 at 22:15. Pushed by ostroffjh into branch 'Handbook-5.2'. continue resolving FIXME's M +31 -3README-CONTRIBUTORS M +15 -13 doc/details-accounts.docbook M +221 -163 doc/details-ledgers.docbook M +31 -16 doc/details-payees.docbook M +1-1doc/details-schedules.docbook M +12 -12 doc/details-tags.docbook M +37 -38 doc/details-widgets.docbook A +17 -0doc/dialog-close.svg A +13 -0doc/edit-clear.svg A +---doc/ledger_filter.png A +13 -0doc/list-add-user.svg A +16 -0doc/list-remove-user.svg A +---doc/single_split.png A +13 -0doc/split_icon.svg M +---doc/split_transaction.png M +---doc/split_unassigned.png A +8-0doc/tag-edit.svg A +13 -0doc/tag-new.svg A +13 -0doc/user-group-properties.svg https://invent.kde.org/office/kmymoney/-/commit/95664d524f249f72196d0ba615be814b45c87b74 diff --git a/README-CONTRIBUTORS b/README-CONTRIBUTORS index 1481ee4831..5e3c33324d 100644 --- a/README-CONTRIBUTORS +++ b/README-CONTRIBUTORS @@ -22,10 +22,10 @@ complete by then. This is in the order pulled in from index.docbook, with brief note on state of update - prelim update done + prelim update complete - prelim update done + prelim update complete prelim update - probably need a complete replacement of this @@ -287,8 +287,36 @@ multiple places. - CSV importer - Banking cols, many have "X" to clear the value, and ther is "clear all." Investment cols do not have "x" and only "Clear" not "Clear all", plus Clear Fee. +- Why is "Reconciled" not an option on the transaction state dropdown in the filter + section of the ledger? + +- I'd like to be consistent in use or not of inline icons when describing where to click + to do something, but I'm deferring as too much effort for now. + +- The split editor window title is just "Dialog." The title of the window for + actually editing a single split is "Slit transaction." We need better terms that make + more sense. + +- Payees entered in a split, show up in the memo of the transaction, like memos and + tags. Perhaps they should be displayed in the Payee field, perhaps in parens with + the payy from each split?) + +- (from an otherwise resolved FIXME in the split transaction section) do we have + adequate description of currency conversion? I THINK so, but am leaving this + comment for confirmation. + +- It is also not clear if we need more detail on what can be a split (account instead + of category?) and where that would be described. + +- Where should we describe the Undo feature? + +- transaction matching section of Ledgers chapter - first, are matched transactions + still highlighted in green? If not, how? + +- Need more details on the descriptions of all the transaction status features in the + filter dropdown? - +- Is it still true you can not match two imported or two not-imported transactions? This is a list of potential enhancements I came up with while reviewing the handbook, but have not yet posted either as wishlist bugs, entries to any Issue on invent, or diff --git a/doc/details-accounts.docbook b/doc/details-accounts.docbook index 459fb42e38..9b9512db68 100644 --- a/doc/details-accounts.docbook +++ b/doc/details-accounts.docbook @@ -218,9 +218,12 @@ The Account Number and the https://en.wikipedia.org/wiki/International_Bank_Account_Number;> IBAN (International Bank Account Number) are not - currently used by . These fields may be left blank and filled in at a - later time; they are only required for online banking. - + required by . These fields may be left blank and filled in at a later + time. The account number may be used for online banking and to assure data + imports use the right account. The IBAN may be used by the + KBanking plugin. + @@ -836,15 +839,12 @@ Hierarchy - This shows where the account is in the overall hierarcy of accounts. You can -change the parent account by clicking the new parent account and then -clicking OK. +change the parent account by dragging the account and dropping it on a +different parent account in this view of the account hierarchy, or in the +Accounts View or the Institutuions View. You can also change the parent +account here by clicking the new parent account and then clicking +OK. @@ -887,8 +887,10 @@ This shows the status of the online connection, the bank/broker, and the account number. It also allows you to store or change the password - for the online account. - + for the online account. Where and how the password is actually stored + depends on your specific instance, but most
[pim/kalarm] doc: Fix syntax
Git commit 5a1df91e25fd296d6effdccf349e9f5244664359 by David Jarvie. Committed on 25/01/2024 at 17:58. Pushed by djarvie into branch 'master'. Fix syntax M +4-4doc/index.docbook https://invent.kde.org/pim/kalarm/-/commit/5a1df91e25fd296d6effdccf349e9f5244664359 diff --git a/doc/index.docbook b/doc/index.docbook index 526ddb38e..15dbefebb 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -2094,7 +2094,7 @@ windowing system in use. -X11 Windowing System +X11 Windowing System You can choose in the Configuration dialog which of @@ -2153,7 +2153,7 @@ shortcut key for this action. -Wayland Windowing System +Wayland Windowing System The Wayland windowing system does not allow applications to control the position or decoration of their windows, so the display @@ -3058,7 +3058,7 @@ windowing system in use. -X11 Windowing System +X11 Windowing System @@ -3089,7 +3089,7 @@ for details. -Wayland Windowing System +Wayland Windowing System
[pim/kalarm] doc: Update copyright
Git commit ce0009615a1d02f2df688dfb04f6225f83cf4adc by David Jarvie. Committed on 25/01/2024 at 17:50. Pushed by djarvie into branch 'master'. Update copyright M +3-3doc/index.docbook https://invent.kde.org/pim/kalarm/-/commit/ce0009615a1d02f2df688dfb04f6225f83cf4adc diff --git a/doc/index.docbook b/doc/index.docbook index 2034fdf9..526ddb38 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -31,7 +31,7 @@ -20012002200320042005200620072008200920102011201220132016201820192020202120222023 +200120022003200420052006200720082009201020112012201320162018201920202021202220232024 @@ -5229,11 +5229,11 @@ detailed instructions are contained in the -Program copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 +Program copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023, 2024 -Documentation copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2016, 2018, 2019, 2020, 2021, 2022, 2023 +Documentation copyright 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2016, 2018, 2019, 2020, 2021, 2022, 2023, 2024
[pim/kalarm] doc: Wayland updates
Git commit f5abd12036eab410fbc226c73cac4ed367754819 by David Jarvie. Committed on 25/01/2024 at 17:49. Pushed by djarvie into branch 'master'. Wayland updates M +57 -15 doc/index.docbook https://invent.kde.org/pim/kalarm/-/commit/f5abd12036eab410fbc226c73cac4ed367754819 diff --git a/doc/index.docbook b/doc/index.docbook index 01bc011f8..2034fdf95 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -39,8 +39,8 @@ -2023-9-20 -3.7.0 (KDE Gear 23.12) +2024-1-25 +3.7.0 (KDE Gear 24.02) is a personal alarm message, command and email scheduler by . @@ -82,11 +82,11 @@ message. Alarms may also be scheduled from the command line, or via calls from programs. -When an alarm message is due, it is displayed on each -desktop to ensure that you don't miss it. The message window shows the -time for which the alarm was scheduled. It usually has a defer option -to ask for the alarm to be displayed again later. An example of an -alarm message: +When an alarm message is due, if the windowing system permits, it +is displayed on each desktop to ensure that you don't miss it. The +message window shows the time for which the alarm was scheduled. It +usually has a defer option to ask for the alarm to be displayed again +later. An example of an alarm message: Screenshot of the message window @@ -2001,9 +2001,10 @@ they are displayed in windows or as notifications. Alarm messages which are displayed in windows provide the fullest functionality. -When an alarm message is due, it is displayed on each -desktop and cannot be covered by ordinary windows, to ensure that -you see it. The message window shows the time for which the alarm was +When an alarm message is due, it is if possible displayed on +each desktop and cannot be covered by ordinary windows, to ensure that +you see it. (Note that only the X11 windowing system currently provides +this facility.) The message window shows the time for which the alarm was scheduled, so that you can see when it popped up if you were away from the computer at the time. If the alarm's scheduled time is in a different time zone from your local computer's setting, its time zone @@ -2088,6 +2089,13 @@ highlighted. +The way that alarm message windows are displayed depends on the +windowing system in use. + + + +X11 Windowing System + You can choose in the Configuration dialog which of two different modes should be used to display alarm message @@ -2114,9 +2122,6 @@ application, it is shown as a non-modal window regardless of this configuration setting. This is due to a limitation of the window system. - -Positioning of Message Windows - You can choose in the Configuration dialog which of two schemes should be used to position alarm message windows: @@ -2145,7 +2150,23 @@ corner of the screen, by means of the menu option. If you wish, you can set up a global shortcut key for this action. - + + + +Wayland Windowing System + +The Wayland windowing system does not allow applications to +control the position or decoration of their windows, so the display +options are much more limited. + +To reduce the chance of accidentally acknowledging the alarm, the +buttons on the window are initially disabled, becoming active only +after a configurable delay. + + + + + @@ -3032,7 +3053,12 @@ window, to show disabled and archived alarms. The Alarm Windows tab contains options to control -the appearance of alarm message windows. +the appearance of alarm message windows. The available options depend on the +windowing system in use. + + + +X11 Windowing System @@ -3060,6 +3086,22 @@ This option controls whether alarm message windows are modal or not, for details. + + + +Wayland Windowing System + + + +To reduce the chance of accidentally acknowledging the +alarm, the window's buttons are initially disabled. The delay in +seconds before they become active is set in +Button activation delay (seconds). + + + + +
[pim/kalarm/release/24.02] doc: Fix version number
Git commit eec9812897e4cab224c90f13e54e3bce8c6a5dac by David Jarvie. Committed on 25/01/2024 at 16:07. Pushed by djarvie into branch 'release/24.02'. Fix version number M +1-1doc/index.docbook https://invent.kde.org/pim/kalarm/-/commit/eec9812897e4cab224c90f13e54e3bce8c6a5dac diff --git a/doc/index.docbook b/doc/index.docbook index 01bc011f8..24ba54ca9 100644 --- a/doc/index.docbook +++ b/doc/index.docbook @@ -40,7 +40,7 @@ 2023-9-20 -3.7.0 (KDE Gear 23.12) +3.7.0 (KDE Gear 24.02) is a personal alarm message, command and email scheduler by .
