date:20071126

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722

2007/11/26, Jason Short [EMAIL PROTECTED]:

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722

I can't view that ticket as guest since trackers not allow me to display
them since many days :(

I'm going to commit a fix for this (why not) but I'd like more details.

Hurray, I have posted some ticket, I'm thought that nobody read them :)

What platform are you using?

I'm using Debian/GNU Linux testing on I386 (centrino dual core and K7 athlon
). Problem appears only with gcc-4.2. But gcc-4.1 don't have this problem.

Are you really saying that GINT_TO_POINTER is not reversible for
negative numbers on your platform? If that's the case we need to audit
a lot more users I think...and would need to complain to the glib people
to get the macro to barf when given a negative.

Yep. Optimisation -02 cause this problem. If GINT_TO_POINTER=-1 then it's
constant like variable (never take other value). Problem is prehaps more due
to the GCC than GLIB.

-jason

Cheers

--
Carl

2007/11/26, Jason Short [EMAIL PROTECTED]:
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 I cant view that ticket as guest since trackers not allow me to display them since many days :(
Im going to commit a fix for this (why not) but Id like more details.
Hurray, I have posted some ticket, Im thought that nobody read them :)
What platform are you using?Im using Debian/GNU Linux testing on I386 (centrino dual core and K7 athlon ). Problem appears only with gcc-4.2. But gcc-4.1 dont have this problem.
Are you really saying that GINT_TO_POINTER is not reversible fornegative numbers on your platform?If thats the case we need to audit
a lot more users I think...and would need to complain to the glib peopleto get the macro to barf when given a negative.Yep. Optimisation -02 cause this problem. If GINT_TO_POINTER=-1 then its constant like variable (never take other value). Problem is prehaps more due to the GCC than GLIB.
-jasonCheers-- Carl
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39722) Change CMA by F1 panel don't work (gcc-4.2 specific bug)


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 

Castanier Carl wrote:
 Yep. Optimisation -02 cause this problem. 

Too bad you didn't include this little detail in your original report.

Too bad you didn't read the documentation on compiling:

   gcc 4.2.1 and 4.2.2 miscompile Freeciv, if level -O2 (or above)
   optimization is used!

Don't use -O2.  Tell us whether this can be closed with -O1?



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39900) _Update button in city report


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39900 

Christian Knoke wrote:
 No, I didn't. Which PR number?
 
Your reply included the PR# in your second message, so we know you've
previously seen it


 'Update' is misleading. It's rather 'change'. But you also have
 'change' in the production submenue.
 
As I suspected, a language problem.  Alter, Change, Edit, Modify, and
Update are all relatively synonymous.  Update is a technically clearer
choice here than change (which is a very ambiguous generic term).

   http://wordnet.princeton.edu/perl/webwn?s=change
   http://wordnet.princeton.edu/perl/webwn?s=update

_Change would of course conflict with many screens -- as would C_hange,
Ch_ange, Cha_nge, Chan_ge, Chang_e -- so we cannot use it here.

_Modify would conflict with _Map (which is *always* displayed).

_Update (or _Upgrade on other tabs) is a much *safer* menu choice.


 The prob is the 1:n ratio in the UI city report/window.
 
I suspect the user will only make this mistake once  OTOH, it appears
that the screen designer had this intent, as otherwise there isn't much
use for the Select button.

Note that _Update isn't allowed (grayed out) until a city is selected.
Visual indication of its direct relationship to a city.

The same would happen with any imperative command with many selections.
Note that _Buy will cause a similar multiple incidents, and Cen_ter has
no possible meaning (somebody should look at that).

Perhaps Buy, Center, and Update should be grayed out whenever more than
one city is selected.


 This is something I haven't really checked, or had had the time to do
 up to now. Thank you for pointing out.
 
A language problem compounded by lack of understanding the menu system.

You are welcome.  I look forward to your further feedback when you've
checked *all* of the translations for possibilities (as I already did).
Each translator is responsible for their own Alt-key conflict resolution.



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39879) bug with plane patrol


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39879 

Thank you for the numerous savegames -- they say version 2.1.0.



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39912) consistent UI - Chat - use apostrophe to select


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39912 

Currently, the client uses Alt-C to open the _Chat tab.  This potentially
conflicts with many other menu items.

Instead, most games use \' (AKA apostrophe, single quote, or prime) to
begin a chat.

Once selected, the focus should be in the chat line, and stay there until
return is pressed.



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39722) Change CMA by F1 panel don't work (gcc-4.2 specific bug)


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 

Castanier Carl wrote:
 ... A
 program who miscompile is NOT cleanly written and I had make an effort to
 post patch to clean up this code. You can leave this patch as many others...

The patch changes the order of the menu, and adds a special case for the
-1 you changed to be the last item instead.

A compiler that mis-compiles without error messages is not well written.

A project that doesn't compile with a buggy compiler optimization option is
not a problem in and of itself.  It's called an option for a reason.


 I had never seen a project who dont compile with -02 or they solve
 immediately the problem. 

I suggest you Google this issue.  I know that there were problems at netbsd,
gimp, ghostscript,   Some of the best in the business!

I think that after we've told you WARNING and you do it anyway, you are
not being helpful to us.  We really appreciate helpful bug reports.

And we don't appreciate even lousy attempts at crude language.



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39911) Re: segfault when simultaneous movement is turned off

2007-11-26 Thread


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39911 


The problem is with the player name in text.c, const char
*get_info_label_text(void). Change and add a printf() statement like this:


  if (!game.info.simultaneous_phases) {
struct player *ply = get_player(game.info.phase);

printf(player %p, name: %p\n, ply, ply-name);
astr_add_line(str, _(Moving: %s), ply-name);
  }


This creates output like:


[...]
player 0x823babc, name: 0x823bac0
player 0x823e918, name: 0x823e91c
player 0x823e918, name: 0x823e91c
player 0x8241774, name: 0x8241778
player 0x8241774, name: 0x8241778
player 0x82445d0, name: 0x82445d4
player 0x82445d0, name: 0x82445d4
player (nil), name: 0x4


Now with ...


  if (!game.info.simultaneous_phases) {
struct player *ply = get_player(game.info.phase);

if(ply != NULL) {
  printf(player %p, name: %p\n, ply, ply-name);
  astr_add_line(str, _(Moving: %s), ply-name);
}
else {
  astr_add_line( str, _(Moving: [unknown player]) );
}
  }


... the client says Moving: [unknown player] and does not crash. While
the unknown player moved, I could see on the map that my own units
were moved, like Explorers that have the command auto explore. After
that, the client says Moving: Harry S. Truman, and I can make my next
turn.


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39879) bug with plane patrol

2007-11-26 Thread MichaÃ«l


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39879 

William Allen Simpson a écrit :
 URL: http://bugs.freeciv.org/Ticket/Display.html?id=39879 

 Looking at your savegame as the Russians, there is no possibility to run
 AWACs between Paris and ocean.  Please give more details.

 What player?

 AWACS begins at what city?

 Patrol (q) from where to where?



   
oh i'm sorry

i played multiplayer game on freeciv 2.1.0 as french civilization. 
player who maintained the server played with  russians. all players 
connected to the the russians player's server. 3 human : germans, 
russians, and frenchs (me). 3 or 4 IA.



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39879) bug with plane patrol

2007-11-26 Thread MichaÃ«l


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39879 

William Allen Simpson a écrit :
 URL: http://bugs.freeciv.org/Ticket/Display.html?id=39879 

 Looking at your savegame as the Russians, there is no possibility to run
 AWACs between Paris and ocean.  Please give more details.

 What player?

 AWACS begins at what city?

 Patrol (q) from where to where?



   
patrol began from ocean and arrived to paris. game crashed as soon as 
clicking paris (freeciv window simply suddenly disappeared). this 
crashed occured between sebvm 2 and sebvm 3, and two times (after 
reconnecting i tryed at once to do the same thing and the crash occured 
in this same way)



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39879) bug with plane patrol


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39879 

MichaÃ«l wrote:

  this
 crashed occured between sebvm 2 and sebvm 3, and two times (after 
 reconnecting i tryed at once to do the same thing and the crash occured 
 in this same way)
 
I've looked at all the files, and French did not have an AWACS nor the
technology to build one in 2 or 3.  I checked them all, and none of the
files have an AWACS.  Since you are not running the server, I know it's
hard to get the correct saved game.

I also tested Russian intelligence in +1738, and had no crash.

I re-tested PR#23961 AWACS, and had no problem with patrol to a city,
nor between cities.

I invite you to try our most recent release, and let us know whether the
problems are fixed for you!

   ftp://ftp.freeciv.org/freeciv/stable/freeciv-2.1.1.tar.bz2



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39900) _Update button in city report

2007-11-26 Thread Christian Knoke


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39900 


Hello, William,

  'Update' is misleading. It's rather 'change'. But you also have
  'change' in the production submenue.
  
 As I suspected, a language problem.  Alter, Change, Edit, Modify, and
 Update are all relatively synonymous.  Update is a technically clearer
 choice here than change (which is a very ambiguous generic term).
 
http://wordnet.princeton.edu/perl/webwn?s=change
http://wordnet.princeton.edu/perl/webwn?s=update

Thank you. Quote:

Verb

* S: (v) update (modernize or bring up to date) We updated the
kitchen in the old house
* S: (v) update (bring up to date; supply with recent information)
* S: (v) update (bring to the latest state of technology)

That supports me in my standing opinion that 'Update' is the wrong term
here.

[opening mistakingly a dozen of city windows]

 I suspect the user will only make this mistake once

Yes, because he or she stopps playing Freeciv after that ...

 A language problem compounded by lack of understanding the menu system.

Choosing UI terms for the sake of fitting shortcuts instead of meaning?

Christian

-- 
Christian Knoke* * *http://cknoke.de
* * * * * * * * *  Ceterum censeo Microsoft esse dividendum.



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39900) _Update button in city report


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39900 

Christian Knoke wrote:
 * S: (v) update (modernize or bring up to date) We updated the
 kitchen in the old house
 * S: (v) update (bring up to date; supply with recent information)
 * S: (v) update (bring to the latest state of technology)
 
 That supports me in my standing opinion that 'Update' is the wrong term
 here.
 
That is exactly the *correct* meaning.  Just as you update a kitchen to
remove or replace its appliances, you update the city to remove or replace
its workers and infrastructure.



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39722) Change CMA by F1 panel don't work (gcc-4.2 specific bug)

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722

2007/11/26, William Allen Simpson [EMAIL PROTECTED]:

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722

Castanier Carl wrote:
... A
program who miscompile is NOT cleanly written and I had make an effort
to
post patch to clean up this code. You can leave this patch as many
others...

The patch changes the order of the menu, and adds a special case for the
-1 you changed to be the last item instead.

hehe there are 2 patchs :) someone had focus me on that point and the second
one close your mouth
ho, sorry was a pepeto comment :) you can't read them :)
Anyway, I can't talk about it since I can't read any tickets and I can't see
what I wrote.

A compiler that mis-compiles without error messages is not well written.

A project that doesn't compile with a buggy compiler optimization option
is
not a problem in and of itself. It's called an option for a reason.

yep, but options must be tested in configure.ac :))

I had never seen a project who dont compile with -02 or they solv
immediately the problem.

I suggest you Google this issue. I know that there were problems at
netbsd,
gimp, ghostscript, Some of the best in the business!

You need to put -02 option explicitly by CFLAGS.

I think that after we've told you WARNING and you do it anyway, you are
not being helpful to us. We really appreciate helpful bug reports.

So, do reply to me.

And we don't appreciate even lousy attempts at crude language.

Then, you have to don't tell me too bad 2 times without reading tiles of
my submitted bug. -02 is an option into configure.ac and you can test
version of gcc to remove this option ; that's close the bug. My purpose was
to keep enable -02.
You are not center of the world. That all for me. I have answer to previous
message from Mr Short who seems have some education. So what your problem
with me? Why you simply don't ask? Why you talk of this patch many month
after I posted it in such term? Why I'm too bad?

DON'T REPLY, I think you and me is over. I will never more post anything. If
you see patch from me, it's too bad so close it quick quick quick tks.

--
Carl

2007/11/26, William Allen Simpson [EMAIL PROTECTED]:
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 Castanier Carl wrote: ... A program who miscompile is NOT cleanly written and I had make an effort to
post patch to clean up this code. You can leave this patch as many others...The patch changes the order of the menu, and adds a special case for the-1 you changed to be the last item instead.
hehe there are 2 patchs :) someone had focus me on that point and the second one close your mouthho, sorry was a pepeto comment :) you cant read them :)Anyway, I cant talk about it since I cant read any tickets and I cant see what I wrote.
A compiler that mis-compiles without error messages is not well written.
A project that doesnt compile with a buggy compiler optimization option isnot a problem in and of itself.Its called an option for a reason.yep, but options must be tested in
configure.ac :)) I had never seen a project who dont compile with -02 or they solv
immediately the problem.I suggest you Google this issue.I know that there were problems at netbsd,gimp, ghostscript, Some of the best in the business!You need to put -02 option explicitly by CFLAGS.
I think that after weve told you WARNING and you do it anyway, you are
not being helpful to us.We really appreciate helpful bug reports.So, do reply to me.
And we dont appreciate even lousy attempts at crude language.Then, you have to dont tell me too bad 2 times without reading tiles of my submitted bug. -02 is an option into
configure.ac and you can test version of gcc to remove this option ; thats close the bug. My purpose was to keep enable -02.You are not center of the world. That all for me. I have answer to previous message from Mr Short who seems have some education. So what your problem with me? Why you simply dont ask? Why you talk of this patch many month after I posted it in such term? Why Im too bad?
DONT REPLY, I think you and me is over. I will never more post anything. If you see patch from me, its too bad so close it quick quick quick tks.-- Carl
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39900) _Update button in city report


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39900 

Erik Johansson wrote:
 Are there tools available for this, 

Not that I'm aware of.


 ... or guidelines, 

http://developer.gnome.org/projects/gup/hig/

http://developer.apple.com/documentation/UserExperience/Conceptual/OSXHIGuidelines/

http://msdn2.microsoft.com/en-us/library/Aa511258.aspx


 ... is there anyway to
 mark strings that are active on the same screen?

Nope.  Pretty straightforward: bring up a game, hit F1, F2, ..., look at
the menu items, and try out the shortcut keys to make sure they work.


 ... Because the times
 I've done translation it's almost impossible to know what you should
 use as a shortcut key. I think in most cases it might not be a good
 idea to add shortcut keys.
 
Actually, *every* action needs a shortcut key, so that disabled users can
select them without a mouse.  Which is a specified goal for 2.1, and what
the previous bug report described.


 Further I think Escape should be used to access the map, it's the most
 important of all the shortcut keys but is the most awkward to use.
 Pluss that would also free up alt-m.
 
Escape is *always* cancel.

I've tried out tab -- it doesn't seem to do anything yet.



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39722) Change CMA by F1 panel don't work (gcc-4.2 specific bug)


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 

Castanier Carl wrote:
 URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 
 
 2007/11/26, Jason Short [EMAIL PROTECTED]:

 URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 
 
 I can't view that ticket as guest since trackers not allow me to display
 them since many days :(

The guest account was temporarily broken.

 What platform are you using?
 
 I'm using Debian/GNU Linux testing on I386 (centrino dual core and K7 
 athlon ). Problem appears only with gcc-4.2. But gcc-4.1 don't have this 
 problem.

It isn't perhaps a 64-bit system?

 Are you really saying that GINT_TO_POINTER is not reversible for
 negative numbers on your platform?  If that's the case we need to audit
 a lot more users I think...and would need to complain to the glib people
 to get the macro to barf when given a negative.
 
 Yep. Optimisation -02 cause this problem. If GINT_TO_POINTER=-1 then 
 it's constant like variable (never take other value). Problem is prehaps 
 more due to the GCC than GLIB.

Really sounds to me like this is a glib bug.

-jason



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39900) _Update button in city report


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39900 

William Allen Simpson wrote:
 URL: http://bugs.freeciv.org/Ticket/Display.html?id=39900 
 
 Christian Knoke wrote:
 No, I didn't. Which PR number?

 Your reply included the PR# in your second message, so we know you've
 previously seen it

Please be polite.  Just because he asks a question that takes 10 seconds 
to answer, instead of spending 5-10 minutes re-scanning old texts, is 
not a good reason to be patronizing.  And you didn't answer the question.

 'Update' is misleading. It's rather 'change'. But you also have
 'change' in the production submenue.

 As I suspected, a language problem.  Alter, Change, Edit, Modify, and
 Update are all relatively synonymous.  Update is a technically clearer
 choice here than change (which is a very ambiguous generic term).

Neither update nor change is synonymous with opening a popup window. 
  Nor are any of the other synonyms.  In fact, nothing is updated or 
changed when the button is pressed.

 The same would happen with any imperative command with many selections.
 Note that _Buy will cause a similar multiple incidents, and Cen_ter has
 no possible meaning (somebody should look at that).

Buy is supposed to have a confirmation dialog (not sure if it's per-city 
or not).

 Perhaps Buy, Center, and Update should be grayed out whenever more than
 one city is selected.

The popup-city-dialog button should certainly NOT be greyed out when 
multiple cities are chosen.  This is an oft-needed feature for some 
players (to look closely at all cities fitting certain criteria).

Likewise buying in multiple cities is also quite useful at the later 
stages of the game.

The center button could be deselected with multiple cities selected.

 This is something I haven't really checked, or had had the time to do
 up to now. Thank you for pointing out.

 A language problem compounded by lack of understanding the menu system.
 
 You are welcome.  I look forward to your further feedback when you've
 checked *all* of the translations for possibilities (as I already did).
 Each translator is responsible for their own Alt-key conflict resolution.

This isn't a problem of translation, for as you've pointed out each 
translator is responsible for their own conflict resolution.  All we 
need to worry about therefore is the English system and in finding a way 
for translators to reasonably be able to deal with shortcut conflict 
resolution (currently impossible for most with a reasonable time 
investment IMO).

The fact remains that Update as a synonym for popup window is a 
non-starter.

-jason



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39914) Freeciv Crash

2007-11-26 Thread Jason Short


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39914 

 [guest - Mon Nov 26 16:13:28 2007]:
 
 hi,
 freeciv client crashes too often after about 5-6 turns. sometimes says
 connection to server lost on a localhost game. Attached a bug report.
 thanks

What platform are you using?

What version of Freeciv?

-jason


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39900) _Update button in city report


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39900 

William Allen Simpson wrote:

 ... Because the times
 I've done translation it's almost impossible to know what you should
 use as a shortcut key. I think in most cases it might not be a good
 idea to add shortcut keys.

 Actually, *every* action needs a shortcut key, so that disabled users can
 select them without a mouse.  Which is a specified goal for 2.1, and what
 the previous bug report described.

You've correctly identified the problem but I still see no solution 
proposed.  Leaving it all for the translators without any support is 
simply not going to work.

Improving documentation and differentiation among strings would be a 
quick improvement.  TRANS comments and translation prefixes (with one 
?window: prefix per different window that is self-conflicting) can help 
translators to tell which strings must avoid conflict.  This will 
probably require the use of Q_ to be added in many places.  And it will 
only go so far as it is still up to the translator to check for 
conflicts at the end.

Another useful tool might be listing all commands available on each 
screen, with shortcut.  A simple text output to do so can then be 
checked by translators and conflicts will be apparent.  But this output 
must not be tied to any GUI and therefore will be tedious to maintain.

A third tool would be auto-detection of conflicts at runtime.  An output 
message (or even a popup window) could alert the user to report a bug. 
This would be easy to maintain, once written, but requires the game to 
be run for conflicts to be checked.

None of these seems fully satisfactory to me.

-jason



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39913) consistent UI - Government should be Edit


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39913 

This also fixes the bug that the editor main menu was improperly disabled
sometimes.  HIG [page 43] explicitly says:

   Do not disable menu titles. Allow the user to explore the menu, even
   though there might be no available items on it at that time.

With the Editing Mode under Edit, Editing Mode can be disabled instead.
The items below it are disabled until Editing Mode is enabled (as now).

Attempted to fix gui-win32 in passing (without testing), but no others.

Index: client/gui-gtk-2.0/menu.c
===
--- client/gui-gtk-2.0/menu.c   (revision 14078)
+++ client/gui-gtk-2.0/menu.c   (working copy)
@@ -766,28 +766,39 @@
   { / N_(Game) / N_(_Quit),NULL,
game_menu_callback, MENU_GAME_QUIT, 
StockItem,
GTK_STOCK_QUIT  
},
-  /* Government menu ... */
-  { / N_(Gover_nment), NULL,
+  /* was Government menu ... */
+  { / N_(_Edit),   NULL,
NULL,   0,  
Branch  },
-  { / N_(Government) /tearoff1,  NULL,
+  { / N_(_Edit) /tearoff1,   NULL,
NULL,   0,  
Tearoff },
-  { / N_(Government) / N_(_Tax Rates), shiftt,
+  { / N_(_Edit) / N_(Tax Rates),   shiftt,
government_menu_callback,   MENU_GOVERNMENT_TAX_RATE
},
-  { / N_(Government) /sep1,  NULL,
+  { / N_(_Edit) /sep1,   NULL,
NULL,   0,  
Separator   },
-  { / N_(Government) / N_(_Find City), shiftf,
+  { / N_(_Edit) / N_(Find City),   shiftf,
government_menu_callback,   MENU_GOVERNMENT_FIND_CITY   
},
-  { / N_(Government) / N_(_Worklists), controll,
+  { / N_(_Edit) / N_(Worklists),   controll,
government_menu_callback,   MENU_GOVERNMENT_WORKLISTS   
},
-  { / N_(Government) /sep2,  NULL,
+  { / N_(_Edit) /sep2,   NULL,
NULL,   0,  
Separator   },
-  { / N_(Government) / N_(_Change Government),   NULL,
+  { / N_(_Edit) / N_(_Government), NULL,
NULL,   0,  
Branch  },
-  { / N_(Government) / N_(_Change Government) / N_(_Revolution...),
+  { / N_(_Edit) / N_(_Government) / N_(Revolution...),
 shiftr,
government_menu_callback,   MENU_GOVERNMENT_REVOLUTION  
},
-  { / N_(_Government) / N_(_Change Government) /sep1, NULL,
+  { / N_(_Edit) / N_(_Government) /sep1, NULL,
NULL,   0,  
Separator   },
+  /* was Editor menu */
+  { / N_(_Edit) /tearoff2, NULL, NULL, 0, Tearoff },
+  { / N_(_Edit) / N_(Editing _Mode), NULL,
+editor_menu_callback, MENU_EDITOR_TOGGLE, CheckItem },
+  { / N_(_Edit) / N_(Editing _Tools), NULL,
+editor_menu_callback, MENU_EDITOR_TOOLS },
+  { / N_(_Edit) / N_(Recalculate _Borders), NULL,
+editor_menu_callback, MENU_EDITOR_RECALCULATE_BORDERS },
+  { / N_(_Edit) / N_(Regenerate _Water), NULL,
+editor_menu_callback, MENU_EDITOR_REGENERATE_WATER },
+
   /* View menu ... */
   { / N_(_View),   NULL,
NULL,   0,  
Branch  },
@@ -955,18 +966,6 @@
   { / N_(Reports) / N_(S_paceship),F12,
reports_menu_callback,  MENU_REPORT_SPACESHIP   
},
 
-  /* Editor menu */
-  { / N_(_Editor), NULL, NULL, 0, Branch },
-  { / N_(_Editor) /tearoff1, NULL, NULL, 0, Tearoff },
-  { / N_(_Editor) / N_(_Editing Mode), NULL,
-editor_menu_callback, MENU_EDITOR_TOGGLE, CheckItem },
-  { / N_(_Editor) / N_(_Tools), NULL,
-editor_menu_callback, MENU_EDITOR_TOOLS },
-  { / N_(_Editor) / N_(Recalculate _Borders), NULL,
-editor_menu_callback, MENU_EDITOR_RECALCULATE_BORDERS },
-  { / N_(_Editor) / N_(Regenerate _Water), NULL,
-editor_menu_callback, MENU_EDITOR_REGENERATE_WATER },
-
   /* Help menu ... */
   { / N_(_Help),   NULL,
NULL,   0,  
Branch  },
@@ -1268,14 +1267,13 @@
   menus_set_sensitive(main/_Game/L_eave, aconnection.established);
 
   if (!can_client_change_view()) {
-menus_set_sensitive(main/_Reports, FALSE);
-menus_set_sensitive(main/_Government, FALSE);
+menus_set_sensitive(main/_Edit, FALSE);

Re: [Freeciv-Dev] (PR#39722) Change CMA by F1 panel don't work (gcc-4.2 specific bug)

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722

2007/11/26, Jason Dorje Short [EMAIL PROTECTED]:

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722

Castanier Carl wrote:
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722

2007/11/26, Jason Short [EMAIL PROTECTED]:

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722

I can't view that ticket as guest since trackers not allow me to display
them since many days :(

The guest account was temporarily broken.

I have read it :( and it's not easy to talk about a post without know what I
wrote bcs it's old

What platform are you using?

I'm using Debian/GNU Linux testing on I386 (centrino dual core and K7
athlon ). Problem appears only with gcc-4.2. But gcc-4.1 don't have this
problem.

It isn't perhaps a 64-bit system?

no it's i396 not ia64. But, a friend had same problem with ia64 and gcc-4.2

Are you really saying that GINT_TO_POINTER is not reversible for
negative numbers on your platform? If that's the case we need to
audit
a lot more users I think...and would need to complain to the glib
people
to get the macro to barf when given a negative.

Yep. Optimisation -02 cause this problem. If GINT_TO_POINTER=-1 then
it's constant like variable (never take other value). Problem is prehaps
more due to the GCC than GLIB.

Yep. Optimisation -02 cause this problem ?? If it's not written in my bug
report, I have tell a big mistake. I use allways this option for packaging
freeciv in .deb than to debian maintainer, but if there are no mentions of
it, then -O2 was not the problem, was only gcc-4.2.

Really sounds to me like this is a glib bug.

Really, I can't answer since it's working with other compiler (3.4 on msys
and 4.2 on linux). Bug still remains if you change version of glib (tested
with 2.8 and 2.10). I had same problem long time ago with g77 (fortran
code). Community of 250 people cannot find in library where we are wrong.
Just changing compiler closed the problem.
When GINT_TO_POINTER take -1 value it can't be changed. Variable still exist
but execution of changing value no or pointer point on NULL variable of type
GINT_TO_POINTER (FF FF). It can be also du to differents compilation options
between glib and freeciv ; but I thougth that I had checked it.
Anyway, this is lonely problem with gcc'-4.2 and can be solve easy. I have
thougth about send a bug report to gcc but I don't have authority for
freeciv to do it. It can also be send to glib.
I forget to tell you. I'm not friendly with freeciv interface trancking bug
and I have posted 2 or 3 reports for same bug. I cannot erase previous but
only last one have good patch. As Mr Simpson focus, the behaviour mustn't be
changed so my last patch include solution to don't change order into menu.

-jason

Cheers

--
Carl

2007/11/26, Jason Dorje Short [EMAIL PROTECTED]:
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 Castanier Carl wrote: URL:
http://bugs.freeciv.org/Ticket/Display.html?id=39722 2007/11/26, Jason Short [EMAIL PROTECTED]: URL:
http://bugs.freeciv.org/Ticket/Display.html?id=39722 I cant view that ticket as guest since trackers not allow me to display
them since many days :(The guest account was temporarily broken.I have read it :( and its not easy to talk about a post without know what I wrote bcs its old
What platform are you using? Im using Debian/GNU Linux testing on I386 (centrino dual core and K7 athlon ). Problem appears only with gcc-4.2. But gcc-4.1 dont have this problem.
It isnt perhaps a 64-bit system?no its i396 not ia64. But, a friend had same problem with ia64 and gcc-4.2
Are you really saying that GINT_TO_POINTER is not reversible for negative numbers on your platform?If thats the case we need to audit a lot more users I think...and would need to complain to the glib people
to get the macro to barf when given a negative. Yep. Optimisation -02 cause this problem. If GINT_TO_POINTER=-1 then its constant like variable (never take other value). Problem is prehaps
more due to the GCC than GLIB.Yep. Optimisation -02 cause this problem ?? If its not written in my bug report, I have tell a big mistake. I use allways this option for packaging freeciv in .deb than to debian maintainer, but if there are no mentions of it, then -O2 was not the problem, was only
gcc-4.2. Really sounds to me like this is a glib bug.
Really, I cant answer since its working with other compiler (3.4 on msys and 4.2 on linux). Bug still remains if you change version of glib (tested with 2.8 and 2.10). I had same problem long time ago with g77 (fortran code). Community of 250 people cannot find in library where we are wrong. Just changing compiler closed the problem.
When GINT_TO_POINTER take -1 value it cant be changed. Variable still exist but execution of changing value no or pointer point on NULL variable of type GINT_TO_POINTER (FF FF). It can be also du to differents compilation

Re: [Freeciv-Dev] (PR#39722) gcc-4.2 -O2 compile fails as predicted

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722

2007/11/26, William Allen Simpson [EMAIL PROTECTED]:

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722

Castanier Carl wrote:
ho, sorry was a pepeto comment :) you can't read them :)
Anyway, I can't talk about it since I can't read any tickets and I can't
see
what I wrote.

Ah, another child. There are at least 3 ways to read the reports. And of
course, surely you saved your own email on your own computer.

I use report bug interface when I post a patch.

yep, but options must be tested in configure.ac :))

Our configure.ac does not have -O2 by default.

You need to put -02 option explicitly by CFLAGS.

We already warned you not to do this. There's an old saying,

If it hurts when you do that -- stop doing it.

-O2, If you can make the test, it can hapend with -O1. It's written on my
tickets. Forward me it and I can answer clearly.

I like it

--
Carl

2007/11/26, William Allen Simpson [EMAIL PROTECTED]:
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 Castanier Carl wrote: ho, sorry was a pepeto comment :) you cant read them :)
Anyway, I cant talk about it since I cant read any tickets and I cant see what I wrote.Ah, another child.There are at least 3 ways to read the reports.And ofcourse, surely you saved your own email on your own computer.
I use report bug interface when I post a patch. yep, but options must be tested in
configure.ac:))Our configure.ac does not have -O2 by default. You need to put -02 option explicitly by CFLAGS.We already warned you not to do this.Theres an old saying,
If it hurts when you do that -- stop doing it.-O2, If you can make the test, it can hapend with -O1. Its written on my tickets. Forward me it and I can answer clearly.
I like it-- Carl
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39900) _Update button in city report

2007-11-26 Thread Erik Johansson

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39900

On Nov 26, 2007 5:21 PM, William Allen Simpson
http://developer.apple.com/...

A better reference is
http://developer.apple.com/documentation/Accessibility/Conceptual/AccessibilityMacOSX/index.html

... Because the times
I've done translation it's almost impossible to know what you should
use as a shortcut key. I think in most cases it might not be a good
idea to add shortcut keys.

Actually, *every* action needs a shortcut key, so that disabled users can
select them without a mouse.

Perhaps, but there is such a thing as to many shotcut keys or buttons,
but I'm sure someone has discussed this to death on some mailinglist
somwhere. but the popup city button seems kind of stupid anyways,
typical thing you would remove if you love GNOME hig.

Ha! I just spent the weekend with a guy working with SUN on a 3 year
Gnome accessiblity project. But we aren't using Gnome.

Further I think Escape should be used to access the map, it's the most
important of all the shortcut keys but is the most awkward to use.
Pluss that would also free up alt-m.

Escape is *always* cancel.

Yes, but it can be used and it's kind of logical, we can still keep
the 'm' key, you don't want to grab the tab key. ESC works for;
Dialogs just close the dialog and bring up the last used tab, tabs
(e.g. city list) you just switch to the map tab

So ESC works great for bringing up the map.

--
/emj

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39900) _Update button in city report


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39900 

Jason Dorje Short wrote:
 Neither update nor change is synonymous with opening a popup window. 
   Nor are any of the other synonyms.  In fact, nothing is updated or 
 changed when the button is pressed.
 
(heavy sigh)  Someday, somebody else will read the HIG before arguing.  Yes,
I've been an Apple developer since 1985, so I've certain expectations.  And
I'm much less familiar with Gnome HIG, as my expertise on Unix is primarily
network code.  But still, they don't seem that terribly different.

As I explained earlier (and I wish you'd read the entire thread before
replying), opening a popup window is a programming concept.  It is not a
user concept.

The user concepts here are phrased in action terms (all city related):

   Select, Display, Update, Buy, and Center.

Select does not select anything, it brings up a floating menu.

Display does not display anything, it brings up a floating checklist.

Update does not update anything, it brings up a floating window.  Nobody
cares that it is called a popup window in GTK (and has other names in
other GUI environments).

Popup is not something you can do to a city.  I'd like to see you try!
There are some fine SF stories along those lines

This is only one of two places this idiotic term was used, and I've fixed
both of them!


 Buy is supposed to have a confirmation dialog (not sure if it's per-city 
 or not).
  
That doesn't happen here.  But I agree that it should!



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39722) gcc-4.2 -O2 compile fails as predicted

2007-11-26 Thread Jason Short


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 

Indeed, this is officially a gcc bug, explained in 39459 in more detail.

https://bugzilla.novell.com/show_bug.cgi?id=300410

Nonetheless I see no problem with working around it (as 39459 did).  In
general we should strive to remove pointer-to-int casts like this as
they seem to be an ongoing problem.

The attached patch removes the (bad) assumption that CMA_NONE is -1,
changes CMA_NONE and CMA_CUSTOM to be positive (it doesn't use the
cmafec_preset_num value as this is variable), and adds an assertion to
trigger if there's a problem.  I will commit to all branches (without
the assertion for 2.1).

-jason

Index: client/gui-gtk-2.0/cityrep.c
===
--- client/gui-gtk-2.0/cityrep.c	(revision 14078)
+++ client/gui-gtk-2.0/cityrep.c	(working copy)
@@ -52,9 +52,11 @@
 #include cityrep.h
 
 #define NEG_VAL(x)  ((x)0 ? (x) : (-x))
-#define CMA_NONE	(-1)
-#define CMA_CUSTOM	(-2)
 
+/* Some versions of gcc have problems with negative values here (PR#39722). */
+#define CMA_NONE	(1)
+#define CMA_CUSTOM	(10001)
+
 enum city_operation_type {
   CO_CHANGE, CO_LAST, CO_NEXT, CO_FIRST, CO_NONE
 };
@@ -542,12 +544,18 @@
   gtk_menu_item_set_submenu(parent_item, menu);
 
   if (change_cma) {
-for (i = -1; i  cmafec_preset_num(); i++) {
-  w = (i == -1 ? gtk_menu_item_new_with_label(_(none))
-	   : gtk_menu_item_new_with_label(cmafec_preset_get_descr(i)));
+w = gtk_menu_item_new_with_label(_(none));
+gtk_menu_shell_append(GTK_MENU_SHELL(menu), w);
+g_signal_connect(w, activate, G_CALLBACK(select_cma_callback),
+		 GINT_TO_POINTER(CMA_NONE));
+assert(GPOINTER_TO_INT(GINT_TO_POINTER(CMA_NONE)) == CMA_NONE);
+
+for (i = 0; i  cmafec_preset_num(); i++) {
+  w = gtk_menu_item_new_with_label(cmafec_preset_get_descr(i));
   gtk_menu_shell_append(GTK_MENU_SHELL(menu), w);
   g_signal_connect(w, activate, G_CALLBACK(select_cma_callback),
 		   GINT_TO_POINTER(i));
+  assert(GPOINTER_TO_INT(GINT_TO_POINTER(i)) == i);
 }
   } else {
 /* search for a none */
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39916) Diplomacy proposals last after end of turn

2007-11-26 Thread Ulrik Sverdrup


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39916 

Reporting a bug in the Diplomacy code that affects (at least) the Gtk2
client in version 2.1.1.

If not answered, the initial Ceasefire proposal tabs are still not
closed after end of turn.

This means you can save this proposal and accept it several turns
later where (I think) the AI does not want it.

Steps to reproduce:
1. Meet your opponent for the first time, recieve a ceasefire
proposal. Neither accept nor cancel it.
2. During the next few turns, build an army, destroy some of the
opponent's cities.
3. When fitting, accept ceasefire.

Suggested resolution:
1. Close tab in the user interface
2. Sanity checks in the diplomacy code


Regards,
Ulrik engla Sverdrup



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39917) Diplomacy model bug: War as default relation for (previously) uncontacted allies of allies

2007-11-26 Thread Ulrik Sverdrup


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39917 

Bug in the diplomacy model reported against 2.1

Short description of the situation:
Your AI opponents A and B are allied.
1. You have never met B, but have alliance with A.
2. Now as you meet B, your relation to B changes from 'no contact' to
war, but simultaneously you get a ceasefire proposal.
3. Before you resolve diplomacy with B, A tells you they break the
alliance since you are now at war with their ally B.
4. I could resolve this by accepting B's proposal, then proposing
alliance with A.

The error at point 3 here is that the default relation is War, even to
allies of your allies. If this applies to peace parties to your allies
I don't know yet. This is somehow a design error or hole in the
diplomacy model. One way to resolve it is to use a different first
relation than war in point 2, for example cease-fire.

I regrettably have no savegame yet.



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39900) _Update button in city report


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39900 

William Allen Simpson wrote:
 URL: http://bugs.freeciv.org/Ticket/Display.html?id=39900 
 
 Jason Dorje Short wrote:
 Neither update nor change is synonymous with opening a popup window. 
   Nor are any of the other synonyms.  In fact, nothing is updated or 
 changed when the button is pressed.

 As I explained earlier (and I wish you'd read the entire thread before
 replying), opening a popup window is a programming concept.  It is not a
 user concept.

Opening a window is a user concept.  popup, itself, is not even a word.

I have not read any apple HIG and have only skimmed the gnome HIG, but I 
find it hard to believe it doesn't say that actions should be 
self-explanatory.

 Select does not select anything, it brings up a floating menu.

Speaking as a user I have no idea what that does without trying it.

 Display does not display anything, it brings up a floating checklist.

Speaking as a user I have no idea what that does without trying it.

 Update does not update anything, it brings up a floating window.  Nobody
 cares that it is called a popup window in GTK (and has other names in
 other GUI environments).

Speaking as a user I have no idea what that does without trying it.

-jason



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39914) Freeciv Crash

2007-11-26 Thread [EMAIL PROTECTED]


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39914 

hi,
using fedora core 8. installed from rpm package. freeciv version 2.1
thanks
Kunal
On Mon, 2007-11-26 at 10:41 -0800, Jason Short wrote:
 URL: http://bugs.freeciv.org/Ticket/Display.html?id=39914 
 
  [guest - Mon Nov 26 16:13:28 2007]:
  
  hi,
  freeciv client crashes too often after about 5-6 turns. sometimes says
  connection to server lost on a localhost game. Attached a bug report.
  thanks
 
 What platform are you using?
 
 What version of Freeciv?
 
 -jason
 




___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39900) _Update button in city report

2007-11-26 Thread Daniel Markstedt


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39900 

I agree that actions in the client should preferably be an analogy of an action 
in 
the game world. Popup does indeed not live up to that criteria.

On the other hand, simply Update doesn't quite convey the meaning of this 
action in my opinion. From my subjective point of view, Update causes 
something to happen in the same dialog, as in Update server list or the like.

Instead I propose Inspect, as an analogy of you as the leader personally 
visiting the city to inspect it.

 ~Daniel

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

[Freeciv-Dev] (PR#39913) consistent UI - Government should be Edit

2007-11-26 Thread Daniel Markstedt


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39913 

 [wsimpson - Mon Nov 26 13:20:04 2007]:
 
 As noted elsewhere, the second item in the main menu bar should be
 _Edit.
 

However, as noted yet elsewhere, menu and button labels should preferably be 
analogies of game world concepts. To edit is something I associate with 
publishing, not the running of a country.

We've been trying to move away from the 'Freeciv-looks-like-a-spreadsheet-
app' image for a long time now. This would IMO be a move in the wrong 
direction.

How about something like Council or Throne Room or Assembly etc. Please 
give suggestions!

 At some time the the not-too-distant past, somebody changed _Edit to
 Gover_nment in GTK2, or Gov_ernment in win32, and who knows what else.
 
 This is bad from a UI standpoint, or from Human Interface Guidelines.
 It
 conflicts with several tabs and other screens.
 
 _Government, G_overnment, Go_vernment, Gove_rnment, Gover_nment,
 Govern_ment,
 and Governmen_t all conflict.  This was a very poor choice for the
 main menu.
 

This is certainly a problem. On the other hand, picking a label shouldn't IMO 
be 
based on the keyboard shortcut that could be made for it, but rather the 
clarity 
and accuracy of the string. In the worst case, there are always solutions like 
Government (_X) or whatever.

 The _Edit msgid is still present in most 2.1 po file's #~ sections,
 and will
 be relatively easy to change back.
 

Please don't change this in 2.1. I wouldn't want such a high-visibility string 
to 
change with a maintenance release. It would cause confusion that is out of 
proportion to the issue it's solving.

 There is only one item in the menu that has anything to do with
 Government
 or changing government, and it has its own key!  I'd put it in next to
 the
 Government icon in the main panel, instead.
 

Do you mean Revolution?

 We should combine the rest with Editor menu items in 2.2.
 
 
 

How about putting the Editor functions under Game? Toggle editor mode and 
Show editor panel could be kept at the top level while the rest could be 
relegated to a submenu. It wouldn't add too much complexity to the menu IMO.

 ~Daniel

___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39917) Diplomacy model bug: War as default relation for (previously) uncontacted allies of allies


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39917 

Welcome back.

I agree, war is a bad default state.  And it was a fairly recent change, so
the rest of the code doesn't work well.




___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39913) consistent UI - Government should be Edit


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39913 

Daniel Markstedt wrote:
 How about something like Council or Throne Room or Assembly etc. Please 
 give suggestions!
 
Civ2 used Kingdom.  Anyway, it's a bad idea.  Everything related to
editing should be under the Edit menu.


 Please don't change this in 2.1. 

OK.  I've already written the patch for 2.1, but svn revert works

I will change Gover_nment to Gov_ernment, so gui-gtk2 matches gui-win32,
to eliminate the conflict with other _n's.  No po changes.


 Do you mean Revolution?
...
 How about putting the Editor functions under Game? 

No, let's put Revolution under Game, instead.

Of course, as I mentioned earlier, it really needs to be activated by
clicking on the current government icon in the pane, just like changing
tax rates.  But they are supposed to have a parallel menu item, too.



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39913) consistent UI - Government should be Edit


URL: http://bugs.freeciv.org/Ticket/Display.html?id=39913 

William Allen Simpson wrote:
 I will change Gover_nment to Gov_ernment, so gui-gtk2 matches gui-win32,
 to eliminate the conflict with other _n's.  No po changes.
 
Committed S2_1 revision 14083.


Index: client/gui-gtk-2.0/menu.c
===
--- client/gui-gtk-2.0/menu.c   (revision 14082)
+++ client/gui-gtk-2.0/menu.c   (working copy)
@@ -726,17 +726,17 @@
game_menu_callback, MENU_GAME_QUIT, 
StockItem,
GTK_STOCK_QUIT  
},
   /* Government menu ... */
-  { / N_(Gover_nment), NULL,
+  { / N_(Gov_ernment), NULL,
NULL,   0,  
Branch  },
   { / N_(Government) /tearoff1,  NULL,
NULL,   0,  
Tearoff },
-  { / N_(Government) / N_(_Tax Rates), shiftt,
+  { / N_(Government) / N_(Tax Rates),  shiftt,
government_menu_callback,   MENU_GOVERNMENT_TAX_RATE
},
   { / N_(Government) /sep1,  NULL,
NULL,   0,  
Separator   },
-  { / N_(Government) / N_(_Find City), shiftf,
+  { / N_(Government) / N_(Find City),  shiftf,
government_menu_callback,   MENU_GOVERNMENT_FIND_CITY   
},
-  { / N_(Government) / N_(_Worklists), controll,
+  { / N_(Government) / N_(Worklists),  controll,
government_menu_callback,   MENU_GOVERNMENT_WORKLISTS   
},
   { / N_(Government) /sep2,  NULL,
NULL,   0,  
Separator   },
Index: client/gui-win32/menu.c
===
--- client/gui-win32/menu.c (revision 14082)
+++ client/gui-win32/menu.c (working copy)
@@ -321,8 +321,8 @@
   {N_(Gov_ernment),  IDM_SUBMENU},
   {N_(Tax Rates) \tShift+T,IDM_GOVERNMENT_TAX_RATE},
   { , IDM_SEPARATOR},
-  {N_(_Find City)\tCtl+F,  IDM_GOVERNMENT_FIND_CITY},
-  {N_(Work_lists)\tCtl+W,  IDM_GOVERNMENT_WORKLISTS},
+  {N_(Find City) \tCtl+F,  IDM_GOVERNMENT_FIND_CITY},
+  {N_(Worklists) \tCtl+W,  IDM_GOVERNMENT_WORKLISTS},
   { , IDM_SEPARATOR},
   {N_(_Change Government),   IDM_SUBMENU},
   {N_(_Revolution),  IDM_GOVERNMENT_REVOLUTION},
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#39900) _Update button in city report to _Inspect