Tíquete #47804

List counters in the help system

: 2023-04-08 19:20 Última Atualização: 2023-10-16 03:34

Relator:
Dono:
Tipo:
Estado:
Fechado
Componente:
Marcos:
Prioridade:
5 - Medium
Gravidade:
5 - Medium
Resolução:
Fixed
Arquivo:
4

Details

Split from #47697, which already has a patch ( https://osdn.net/ticket/download.php?group_id=12505&tid=47697&file_id=12014 )

Client / help system changes to show pages about counters.

Ticket History (3/23 Histories)

2023-04-08 19:20 Updated by: cazfi
  • New Ticket "List counters in the help system" created
2023-04-14 21:39 Updated by: lachu
Comentário

Reply To cazfi

Split from #47697, which already has a patch ( https://osdn.net/ticket/download.php?group_id=12505&tid=47697&file_id=12014 ) Client / help system changes to show pages about counters.

0003-OSDN-TICKET-47697-S-awomir-Lach-slawek-lach.art.pl.patch(3KB)
Changes - version from previous ticket (server side to support description)
2023-04-17 02:25 Updated by: None
Comentário

Reply To lachu

Reply To cazfi

Split from #47697, which already has a patch ( https://osdn.net/ticket/download.php?group_id=12505&tid=47697&file_id=12014 ) Client / help system changes to show pages about counters.

0003-OSDN-TICKET-47697-S-awomir-Lach-slawek-lach.art.pl.patch(3KB) Changes - version from previous ticket (server side to support description)

0003-OSDN-TICKET-47697-S-awomir-Lach-slawek-lach.art.pl.patch(3KB)
Changes - version from previous ticket (server side to support description)

I put bad description. Patch contains client-side, but requires also to apply server side/network changes.

2023-05-09 11:59 Updated by: cazfi
Comentário
../src/client/helpdata.c: In function ‘boot_help_texts’:
../src/client/helpdata.c:1112:19: error: declaration of ‘i’ shadows a previous local [-Werror=shadow]
 1112 |               int i;
      |                   ^
../src/client/helpdata.c:731:7: note: shadowed declaration is here
  731 |   int i;
      |       ^
---

- The patch seems to touch client-common code only. Doesn't it require gui-specific parts too? Each gui to show that new help page?

2023-05-10 01:02 Updated by: None
Comentário

Reply To cazfi

{{{ ../src/client/helpdata.c: In function ‘boot_help_texts’: ../src/client/helpdata.c:1112:19: error: declaration of ‘i’ shadows a previous local -Werror=shadow 1112 | int i; | ../src/client/helpdata.c:731:7: note: shadowed declaration is here 731 | int i; | }}} --- - The patch seems to touch client-common code only. Doesn't it require gui-specific parts too? Each gui to show that new help page?

As far as I can tell, it do not require gui-specific code. We had helpdata.txt, where new section is defined and common-gui code to generate this new section. I could add new gui-specific code to GTK+-4 client to shown more info (like checkpoint) in table format, but I think this patch fulfilled simplicity requirement.

2023-05-13 01:43 Updated by: lachu
Comentário

Reply To cazfi

{{{ ../src/client/helpdata.c: In function ‘boot_help_texts’: ../src/client/helpdata.c:1112:19: error: declaration of ‘i’ shadows a previous local -Werror=shadow 1112 | int i; | ../src/client/helpdata.c:731:7: note: shadowed declaration is here 731 | int i; | }}} --- - The patch seems to touch client-common code only. Doesn't it require gui-specific parts too? Each gui to show that new help page?

Look above message. Thanks.

2023-05-13 16:21 Updated by: cazfi
Comentário

Reply To lachu

Reply To cazfi

- The patch seems to touch client-common code only. Doesn't it require gui-specific parts too? Each gui to show that new help page?

Look above message. Thanks.

And the variable shadowing warning from the compiler?

2023-05-21 22:15 Updated by: lachu
Comentário

Reply To cazfi

Reply To lachu

Reply To cazfi

- The patch seems to touch client-common code only. Doesn't it require gui-specific parts too? Each gui to show that new help page?

Look above message. Thanks.

And the variable shadowing warning from the compiler?

2023-05-21 22:14 Updated by: lachu

File 0001-OSDN-47804-S-awomir-Lach-slawek-lach.art.pl.patch (File ID: 12420) is attached

Sorry you must wait so long. I have less free time by now, but I will try to gather some time to develop freeciv in future weeks.

2023-05-27 08:32 Updated by: cazfi
Comentário

Qt-client does not compile:

../src/client/gui-qt/helpdlg.cpp: In member function ‘void help_widget::set_topic(const help_item*)’:
../src/client/gui-qt/helpdlg.cpp:808:10: error: enumeration value ‘HELP_COUNTER’ not handled in switch [-Werror=switch]
  808 |   switch (topic->type) {

Better summary of counters needed:

+text = "SAAAASDSWDWWDWD"

2023-06-24 14:29 Updated by: cazfi
Comentário

Any progress with this?

2023-06-28 21:58 Updated by: lachu
Comentário

Reply To cazfi

Any progress with this?

Still do not make progress with this ticket, sorry.

2023-07-23 02:24 Updated by: lachu
  • File COUNTERS-HELP-SYSTEM-001-Qt-Fix.patch (File ID: 12941) is attached
2023-07-23 02:27 Updated by: lachu
  • File COUNTERS-HELP-SYSTEM-001-Qt-Fix.patch (File ID: 12941) is deleted
2023-07-23 02:27 Updated by: lachu
Comentário
COUNTERS-HELP-SYSTEM-001-Qt-Fix.patch(4KB)
Patch - test

Content distribution network do not work, but I put newest patch. I hope it will match changes prepared in previous patches.

2023-07-23 02:27 Updated by: lachu
Comentário
COUNTERS-HELP-SYSTEM-001-Qt-Fix.patch(4KB)
Patch - test

Content distribution network do not work, but I put newest patch. I hope it will match changes prepared in previous patches.

I mean I cannot download previous patches to check, what changes it trying to introduce.

(Edited, 2023-07-23 02:29 Updated by: lachu)
2023-10-04 07:10 Updated by: cazfi
Comentário

The patch does not apply. Likely broken by "Current Musicset" help page.

2023-10-10 04:25 Updated by: lachu
Comentário

Reply To cazfi

The patch does not apply. Likely broken by "Current Musicset" help page.

0001-OSDN-47804-S-awomir-Lach-slawek-lach.art.pl.patch(4KB)
Fix type and rebases

Fix typo, not type

(Edited, 2023-10-10 04:26 Updated by: lachu)
2023-10-13 07:08 Updated by: cazfi
  • Dono Update from (Nenhum) to cazfi
  • Resolução Update from Nenhum to Accepted
2023-10-16 03:34 Updated by: cazfi
  • Estado Update from Aberto to Fechado
  • Resolução Update from Accepted to Fixed

Attachment File List

Editar

You are not logged in. I you are not logged in, your comment will be treated as an anonymous post. » Login