Skip to content

Upstream merge conflict#1

Draft
shahmoradi wants to merge 6099 commits into
cdslaborg:masterfrom
doxygen:master
Draft

Upstream merge conflict#1
shahmoradi wants to merge 6099 commits into
cdslaborg:masterfrom
doxygen:master

Conversation

@shahmoradi

Copy link
Copy Markdown
Member

Upstream merge conflict with the fork by @shahmoradi

StackAndPointer and others added 30 commits April 30, 2026 18:10
When switching the UI language, the Expert view recreates all input
widgets with default values, causing user settings to be lost.

This fix:
- Saves all current configuration values before recreating widgets
- Restores the saved values to the newly created widgets
- Blocks signals during restoration to prevent false 'modified' state

This ensures that configuration settings are preserved across language
changes without triggering unsaved changes indicator.
…ttings

fix: Under language settings other than English, after reading the configuration file, switching page settings will revert to default values.
Add automatic backup when saving Doxyfile
- Changed QFileInfo::exists() to QFile::exists() in qmFilePath() to
  properly detect Qt resource files (QFileInfo does not work with
  the ':/' resource path prefix)
- Added conditional check in CMakeLists.txt to only generate
  translations.qrc when QM files are available
- This fixes language switching in release builds with static Qt linking
…urces

Fix translation resource embedding for static Qt builds
Feature is not production ready.
In case building without git the `doxygen_gitid` is not present in the tag file though the test required it.
Added extra replacement statement
`<div>` tags are only shown in HTML output, so we need a "breaking" tag in between.
issue #12111 Requirements output for LaTeX is not good
…f a line

In case of an unclosed tag at the end of a comment block this was already handled but due to the adding of an artificial tag (In this case a pair `<em>` / `</em>`  for the markdown handling of `*...*`) the matching of the tags was artificially corrupted.
The later should not be the case.
Now correct output is generated although a warning still is given (for the `</em>` tag but this is correct as here the usage of the markdown replacement is not correct).
Translate `<group>` `docs` attributes in doxywizard i18n XML files
- Corrected  some strings
- Added some missing translations
The application returns, when clicking on one of the topics in the expert tab, the translated value, but the `m_topics` was "ordered" according to the original English texts, now the translated value is stored.
…ranslations

Small corrections to doxywizard translations
…xpert

Problem switching between topics in expert tab
albert-github and others added 30 commits June 12, 2026 18:22
The representation in the the doxywizard of some values was not correct, they should be represented as "code", as such `minmaxdef` is replaced by minmaxdefcode`and consequently `minmaxdef` became obsolete.
Analogous for `defvaltxt` and `defvalcode`.
Writing correct variable in case of `-auto`
…_code

Unifying output in respect to `min/max/def` values.
…ethods

translator_kr.h: bring Korean translator fully up to date (1.8.15 → current)
translator_cn: bring TranslatorChinese up to date with release 1.16.0
- correctly sorting non up to date translators (sorting didn't work properly as 1.16.0 came after 1.4.6)
- suppress "almost up to date list" when no items present
- word `obsolete` is not correct should be `incomplete`
- `&#160;` appeared in the official output in the documentations, use `&nbsp;` (remainder of when everything was still governed by `\htmlonly` and `\latexonly`.
For the doxygen documentation (internationalization table) some code is generated like:
```
  <tr bgcolor="#ffffff">
    <td bgcolor="#ff5555">Serbian</td>
    <td>Dejan Milosavljevic</td>
    <td><span style="color: brown">[unreachable]</span></td>
    <td bgcolor="#ff5555">1\.6\.0</td>
  </tr>
```
in LaTeX this results in:
```
Serbian&Dejan Milosavljevic&\+[unreachable]\+&1.6.0\\
```

and in the resulting pdf file we see some strange line-break signs (due to the `\+`).
The `\+` at the end of the string does not really make sense, so removed (with the `\_` command also the `\+` had to be removed).
translator: translate 'satisfies'/'verifies' keywords in requirement relation text
Navigation tree doesn't render due to `\n` in output
Remove redundant QCString conversions in translation files (found in PR #12209, here handled separately)
Some brief internal doxygen documentation was cuf-off at the end of `i.e.` or `e.g.` this has been corrected
Creating some helper functions for the `enum class MemberType`  analogous to e.g. `SrcLangExt`
- commenting the argument name
- `fortranscanner.l`: `stripWhiteSpace` is not an inplace operations, so needs assignment. It can be done, after reformulating the `if` condition when as prefix has been stripped (in that case string has been changed and some space might have occurred, otherwise it was already remove a couple of lines before).
…16.0 (#12209)

* Update translator_tw.h to be fully up to date with release 1.16.0

- Add 76 missing translation methods for releases 1.8.15 through 1.16.0
- Change base class from TranslatorAdapter_1_8_15 to Translator
- Add changelog comment at top of file
- TranslatorChinesetraditional now implements all 319 required methods

* Apply suggestions from code review

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

* translator_tw.h: fix unused parameter style and missing semicolons

- trVhdlType: collapse redundant if/else branches (both returned same
  string) and mark 'single' as /*single*/ since Chinese has no plural
- trConcept: replace first_capital ternary (both arms identical) and
  (void)singular with /*first_capital*/, /*singular*/ parameter style
- trSatisfies, trVerifies, trUnsatisfiedRequirementsText,
  trUnverifiedRequirementsText: replace (void)singular with
  bool /*singular*/ to match the style used elsewhere in the file
- Fix three missing semicolons in trFileMembersDescriptionTotal,
  trNamespaceMembersDescriptionTotal, trModuleMembersDescriptionTotal

* Update src/translator_tw.h

Co-authored-by: albert-github <albert.tests@gmail.com>

* Update src/translator_tw.h

Co-authored-by: albert-github <albert.tests@gmail.com>

* Update src/translator_tw.h

Co-authored-by: albert-github <albert.tests@gmail.com>

* Update src/translator_tw.h

Co-authored-by: albert-github <albert.tests@gmail.com>

* Update src/translator_tw.h

Co-authored-by: albert-github <albert.tests@gmail.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Dimitri van Heesch <doxygen@gmail.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Co-authored-by: albert-github <albert.tests@gmail.com>
…undant

Remove redundant QCString conversions
Improve brief part internal doxygen documentation
Creating some helper functions for the `enum class MemberType`
Remove some not necessary `(void)` constructs
…arsed incorrectly when there is 'static' or qualifiers in the square brackets
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

9 participants