patchFreeciv - Patches: patch #4351, SDL client support for nation sets

 
 
Show feedback again

patch #4351: SDL client support for nation sets

Submitted by:  Jacob Nevins <jtn>
Submitted on:  Fri 20 Dec 2013 11:58:30 PM UTC  
 
Category: client-sdlPriority: 5 - Normal
Status: DonePrivacy: Public
Assigned to: Marko Lindqvist <cazfi>Open/Closed: Closed
Planned Release: 2.5.0,2.6.0

Add a New Comment (Rich MarkupRich Markup):
   

You are not logged in

Please log in, so followups can be emailed to you.

 

(Jump to the original submission Jump to the original submission)

Sat 27 Sep 2014 10:44:33 AM UTC, comment #7:

Python 3 incompatibility raised as new ticket bug #22705.

Jacob Nevins <jtn>
Project Administrator
Fri 26 Sep 2014 05:25:42 PM UTC, comment #6:

This patch is broken when compiled using python3.

The line in common/packets.def
BOOL nationset_change; add-cap(nationset_change)
does not compile.

In Python3 the 'dict_keys' object does not support indexing.

This is the first use of this structure in common/packets.def so prior to this patch python3 works. I will also post this comment on the second recent use.

Anonymous
Sat 09 Aug 2014 08:07:41 AM UTC, SVN revision 25859:

Added support for changing nationset to sdl-clients.

Requested by Jacob Nevins

See patch #4351

(Browse SVN revision 25859)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 09 Aug 2014 08:07:29 AM UTC, SVN revision 25858:

Added support for changing nationset to sdl-clients.

Requested by Jacob Nevins

See patch #4351

(Browse SVN revision 25858)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Mon 04 Aug 2014 11:29:07 PM UTC, comment #3:

> could someone test it for me?

Had a quick look; it compiles and seems to work for me, thanks.

Jacob Nevins <jtn>
Project Administrator
Mon 04 Aug 2014 10:50:42 PM UTC, comment #2:

First commit candidates. Sdl-client (unlike sdl2-client) does not work on my computer at all, so could someone test it for me? (I'm just blindly ported stuff from sdl2-client & optional capability handling, and tested that it compiles)

(file #21664, file #21665)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Mon 04 Aug 2014 10:22:42 PM UTC, comment #1:

WIP patch for TRUNK, sdl2-client only.

Network protocol changed so that nation availability packet tells if it's being sent because of nationset change or because someone picked/unpicked a nation. That's used to avoid double dialog update when first nation availability changes and then changes the value of the "nationset" option (required to show correct nationset in the selection widget).

TODO:
- sdl-client (TRUNK / S2_5)
- make network protocol change optional in S2_5 (probably meaning slow and ugly double update for the dialog when server is beta1 one)

Note that we have to wait for server to send new option value back to us - we can't just update the dialog with the value we're requesting, as the request may fail for some reason, or nationset change might be requested by someone else than us.

(file #21663)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Fri 20 Dec 2013 11:58:30 PM UTC, original submission:

The "pick nation" UI in the SDL/SDL2 clients should properly support the "nation set" concept of patch #3448.

Minimal support would be adding a dropdown to choose the nation set, but popping down the dialog whenever it changes. Full support would be to keep the dialog up and adapt to the changes in available nations (as in the Gtk clients post patch #4349).

Jacob Nevins <jtn>
Project Administrator

 

(Note: upload size limit is set to 1024 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

Attached Files
file #21664:  SdlNationset-2.patch.bz2 added by cazfi (5kB - application/x-bzip)
file #21665:  SdlNationset-S2_5.patch added by cazfi (20kB - text/x-diff)
file #21663:  SdlNationset.patch added by cazfi (21kB - text/x-diff)

 

Depends on the following items: None found

Digest:
   patch dependencies.

 

Carbon-Copy List
  • -unavailable- added by cazfi (Updated the item)
  • -unavailable- added by jtn (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Please enter the title of George Orwell's famous dystopian book (it's a date):

     

     

    Follow 9 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Sat 09 Aug 2014 08:07:56 AM UTCcazfiStatusReady For Test=>Done
      Assigned toNone=>cazfi
      Open/ClosedOpen=>Closed
    Mon 04 Aug 2014 10:50:42 PM UTCcazfiAttached File-=>Added SdlNationset-2.patch.bz2, #21664
      Attached File-=>Added SdlNationset-S2_5.patch, #21665
      StatusIn Progress=>Ready For Test
    Mon 04 Aug 2014 10:22:42 PM UTCcazfiAttached File-=>Added SdlNationset.patch, #21663
      StatusNone=>In Progress
    Sat 21 Dec 2013 12:00:37 AM UTCjtnDependencies-=>patch #3448 is dependent
    Show feedback again

    Back to the top


    Powered by Savane 3.1-cleanup