Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 [EMAIL PROTECTED] wrote: ... IIRC, the geographic features (hills, ocean, etc.) were supposed to be added when the city name explicitly states it, so a city name like Montserrat (meaning Serrated Mount) can get the (hills) designation, but Barcelona can't have (ocean) even if the real-life city is coastal. At least, that's the criteria I used back then. I've been using real-life criteria elsewhere, that's OK. There are very few cities with geographic features in their names. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 On 1/5/08, William Allen Simpson [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 [EMAIL PROTECTED] wrote: ... IIRC, the geographic features (hills, ocean, etc.) were supposed to be added when the city name explicitly states it, so a city name like Montserrat (meaning Serrated Mount) can get the (hills) designation, but Barcelona can't have (ocean) even if the real-life city is coastal. At least, that's the criteria I used back then. I've been using real-life criteria elsewhere, that's OK. There are very few cities with geographic features in their names. Some nations have a lot of this kind of city names, though only native speakers would probably notice. It's a nice touch, still. I embrace both standards, anyway, as long as either is applied constantly throughout one nation. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39984) server options setting and saving is weird
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39984 Madeline Book wrote: One use for the Save Options Now item (in the menu Game submenu Options) is to save your local options (as well as CMA presets, shown report columns, etc.; ...). Furthermore, it is not automatic (i.e. whenever you close the dialog as you suggest) to prevent clobbering your existing civclientrc (e.g. when upgrading to a newer client version). And how frequent is that? While testing, I swap between versions all the time, and the few changes can be slightly annoying, but not critical. Anyway, you've stated a (previously undocumented) rationale, and it conflicts with the reporter's desire that his options always be saved as soon as he makes the changes. That's what we all needed to know So, here's a different idea: in addition to the Cancel and OK buttons on the various options/settings dialogs, add a Save button. I'm not good at GTK2 programming, but it looks relatively easy. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39984) server options setting and saving during start screen
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39984
William Allen Simpson wrote:
So, here's a different idea: in addition to the Cancel and OK buttons on
the various options/settings dialogs, add a Save button. I'm not good at
GTK2 programming, but it looks relatively easy.
The server settable options and local options dialogs used standard
GTK2 functions. Here's the code.
The message options dialog is done as one of those switchable tab panes;
not easy to quickly figure that out. It wasn't raised as the issue here,
anyway, so perhaps in the future
Index: client/gui-gtk-2.0/repodlgs.c
===
--- client/gui-gtk-2.0/repodlgs.c (revision 14221)
+++ client/gui-gtk-2.0/repodlgs.c (working copy)
@@ -1449,9 +1449,17 @@
*/
static void settable_options_callback(GtkWidget *win, gint rid, GtkWidget *w)
{
- if (rid == GTK_RESPONSE_OK) {
+ switch (rid) {
+ case GTK_RESPONSE_ACCEPT:
settable_options_processing(w);
- }
+save_options();
+break;
+ case GTK_RESPONSE_APPLY:
+settable_options_processing(w);
+break;
+ default:
+break;
+ };
gtk_widget_destroy(win);
}
@@ -1470,7 +1478,8 @@
gtk_dialog_new_with_buttons(_(Game Settings),
NULL, 0,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK, GTK_RESPONSE_OK,
+ GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
+ GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
win = settable_options_dialog_shell;
Index: client/gui-gtk-2.0/gamedlgs.c
===
--- client/gui-gtk-2.0/gamedlgs.c (revision 14221)
+++ client/gui-gtk-2.0/gamedlgs.c (working copy)
@@ -368,12 +368,11 @@
/**
...
**/
-static void option_command_callback(GtkWidget *w, gint response_id)
+static void option_command_processing(void)
{
- if (response_id == GTK_RESPONSE_OK) {
-const char *dp;
-bool b;
-int val;
+ const char *dp;
+ bool b;
+ int val;
client_options_iterate(o) {
switch (o-type) {
@@ -423,10 +422,27 @@
} else {
gtk_window_unfullscreen(GTK_WINDOW(toplevel));
}
- }
- gtk_widget_destroy(option_dialog_shell);
}
+/**
+...
+**/
+static void option_command_callback(GtkWidget *win, gint rid)
+{
+ switch (rid) {
+ case GTK_RESPONSE_ACCEPT:
+option_command_processing();
+save_options();
+break;
+ case GTK_RESPONSE_APPLY:
+option_command_processing();
+break;
+ default:
+break;
+ };
+ gtk_widget_destroy(win);
+}
+
/
...
*/
@@ -440,14 +456,11 @@
option_dialog_shell = gtk_dialog_new_with_buttons(_(Set local options),
NULL,
0,
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL,
- GTK_STOCK_OK,
- GTK_RESPONSE_OK,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
+ GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
NULL);
setup_dialog(option_dialog_shell, toplevel);
- gtk_dialog_set_default_response(GTK_DIALOG(option_dialog_shell),
- GTK_RESPONSE_OK);
gtk_window_set_position (GTK_WINDOW(option_dialog_shell), GTK_WIN_POS_MOUSE);
notebook = gtk_notebook_new();
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39984) server options setting and saving is weird
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39984 On 1/5/08, William Allen Simpson [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39984 Madeline Book wrote: One use for the Save Options Now item (in the menu Game submenu Options) is to save your local options (as well as CMA presets, shown report columns, etc.; ...). Furthermore, it is not automatic (i.e. whenever you close the dialog as you suggest) to prevent clobbering your existing civclientrc (e.g. when upgrading to a newer client version). And how frequent is that? Frequent for developers, not so much for users. Anyway there are workarounds like using the environment variable FREECIV_OPT to specify a different file for saving/loading the civclientrc, so it is not that pressing an issue. While testing, I swap between versions all the time, and the few changes can be slightly annoying, but not critical. Anyway, you've stated a (previously undocumented) rationale, and it conflicts with the reporter's desire that his options always be saved as soon as he makes the changes. That's what we all needed to know So, here's a different idea: in addition to the Cancel and OK buttons on the various options/settings dialogs, add a Save button. Yes, this is the approach we have take for the sundry setting dialogs in warclient (also Reset and Apply (but don't save) buttons for convenience). I'm not good at GTK2 programming, but it looks relatively easy. Thankfully the API documentation for GTK2 is fairly useful, if the library in general can be somewhat tedious and idiosyncratic because of its c-level emulation of c++ features and adherence to design patterns over ease of use. Still easier than rolling your own GUI I suppose. :) ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 This transaction appears to have no content You call that being negative? No way! On the contrary, it's great to get good feedback, particularly from the original author of the ruleset. Guardamar is Guardamar del Segura, one of the four traditional extreme points where the Catalan language is spoken (along with Salses, Fraga and Maó, with permission from l'Alguer). I didn't even know there was a Guardamar in la Safor, but I will add it. Sant Fruitós natives never use de Bages to refer to their own town (I know, I'm one), but you're right, we should have the whole name. I will do the same with Guardiola (Sant Salvador de Guardiola, actually). As for the geographical features, I didn't know about this criterion. It makes sense, though. I didn't feel much comfortable with geographical indications just for a few cities. I will add both hills and ocean for Peníscola. Yes, only hills is justified by the name, but I can't resist having ocean for a place like that. So, here you are, version two. Joan 2008/1/5, [EMAIL PROTECTED] [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 Thanks, Joan, for improving on the ruleset I worked on quite some time ago. Adding Pau Claris, Salses and Fraga were nice touches, I think. Now, I hate to be negative, BUT... IIRC, the geographic features (hills, ocean, etc.) were supposed to be added when the city name explicitly states it, so a city name like Montserrat (meaning Serrated Mount) can get the (hills) designation, but Barcelona can't have (ocean) even if the real-life city is coastal. At least, that's the criteria I used back then. So, I think the added geographical features added to Amposta, Barcelona, Begur, Blanes, Cadaqués, Lleida, Maó (newly added), Palma de Mallorca, Tarragona and València have to be removed. By the way, the first time around, we forgot to add (hills) to Peníscola (it's name derives from peña, meaning bouldery hill). I'd complete the name of newly added Sant Fruitós: Sant Fruitós de Bages. I'm not sure whether the newly added city name of Guardamar refers to Guardamar de la Safor or to Guardamar del Segura. Let's add both! :-) In both cases, the (ocean) designation is warranted, and the latter might deserve the (river) designation as well. On Jan 4, 2008 11:29 AM, Joan Creus [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 This transaction appears to have no content The catalan ruleset has a few typos in city names. In the attached patch, I have fixed them, added a few more cities, and added a couple new (long dead) rulers for good measure. No translatable string has been changed, for inclusion in 2.1. Thanks, Joan -- Miguel Farah [EMAIL PROTECTED] You call that being negative? No way! On the contrary, its great to get good feedback, particularly from the original author of the ruleset.Guardamar is Guardamar del Segura, one of the four traditional extreme points where the Catalan language is spoken (along with Salses, Fraga and Maó, with permission from lAlguer). I didnt even know there was a Guardamar in la Safor, but I will add it. Sant Fruitós natives never use de Bages to refer to their own town (I know, Im one), but youre right, we should have the whole name. I will do the same with Guardiola (Sant Salvador de Guardiola, actually). As for the geographical features, I didnt know about this criterion. It makes sense, though. I didnt feel much comfortable with geographical indications just for a few cities. I will add both hills and ocean for Peníscola. Yes, only hills is justified by the name, but I cant resist having ocean for a place like that. So, here you are, version two.Joan2008/1/5, [EMAIL PROTECTED] [EMAIL PROTECTED] :URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 Thanks, Joan, for improving on the ruleset I worked on quite some timeago. Adding Pau Claris, Salses and Fraga were nice touches, I think.Now, I hate to be negative, BUT... IIRC, the geographic features (hills, ocean, etc.) were supposed to be added when the city name explicitlystates it, so a city name like Montserrat (meaning Serrated Mount) canget the (hills) designation, but Barcelona cant have (ocean) even if the real-life city is coastal. At least, thats the criteria I usedback then.So, I think the added geographical features added to Amposta, Barcelona,Begur, Blanes, Cadaqués, Lleida, Maó (newly added), Palma de Mallorca, Tarragona and València have to be removed.By the way, the first time around, we forgot to add (hills) toPeníscola (its name derives from peña, meaning bouldery hill). Id complete the name of newly added Sant Fruitós: Sant Fruitós deBages.Im not sure whether the newly added city name of Guardamar refers toGuardamar de la Safor or to Guardamar del Segura. Lets add both! :-) In both cases, the (ocean) designation is warranted, and the
Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 On Jan 5, 2008 4:38 PM, Joan Creus [EMAIL PROTECTED] wrote: You call that being negative? No way! On the contrary, it's great to get good feedback, particularly from the original author of the ruleset. Actually, I wasn't the original author - I did a lot of work on it, though. Guardamar is Guardamar del Segura, one of the four traditional extreme points where the Catalan language is spoken (along with Salses, Fraga and Maó, with permission from l'Alguer). I didn't even know there was a Guardamar in la Safor, but I will add it. Cool. You forgot to add (ocean) to both, though. [...] I will add both hills and ocean for Peníscola. Yes, only hills is justified by the name, but I can't resist having ocean for a place like that. You know what? Me neither. Peníscola is a special place. :-) And, while we're at it, let's add some more cities as well: Roses Calonge Treumal Cambrils Tossa de Mar (ocean) Solsona Agramunt What do you think? -- Miguel Farah [EMAIL PROTECTED] ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40002) sdlclient crashing when diplomat bribes
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40002 Hi, I get hit by this any time I try to bribe an enemy unit with my diplomat in SDLclient. It's in both 2.1.0 and .2 0x004b0b1e in diplomat_bribe_yes_callback (pWidget=0x13c68810) at diplomat_dialog.c:1311 1311if (find_unit_by_id(pIncite_Dlg-diplomat_id) (gdb) bt #0 0x004b0b1e in diplomat_bribe_yes_callback (pWidget=0x13c68810) at diplomat_dialog.c:1311 #1 0x004e6c37 in widget_pressed_action (pWidget=0x13c68810) at widget.c:402 #2 0x004bdb4e in main_mouse_button_down_handler (pButtonEvent=0x837120, pData=value optimized out) at gui_main.c:350 #3 0x004be28f in gui_event_loop (pData=0x0, loop_action=0, key_down_handler=0x4bdbe0 main_key_down_handler, key_up_handler=0x4bd690 main_key_up_handler, mouse_button_down_handler=0x4bdab0 main_mouse_button_down_handler, mouse_button_up_handler=0x4bda20 main_mouse_button_up_handler, mouse_motion_handler=0x4bd6c0 main_mouse_motion_handler) at gui_main.c:734 #4 0x004bea28 in ui_main (argc=1, argv=value optimized out) at gui_main.c:1060 #5 0x0040ab16 in main (argc=value optimized out, argv=0x7fff14ba0b98) at civclient.c:380 According to valgrind, it's trying to dereference a null pointer. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39984) server options setting and saving during start screen
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39984 Madeline Book wrote: (also Reset and Apply (but don't save) buttons for convenience). When writing the code, the examples implied that Apply didn't save, so that's what I used instead of OK (Cancel, Apply, Save). Reset is a good idea for the future, but I think it requires the field and packet changes discussed for 2.2, based on your earlier description concerning levels of access and other issues. I'm trying to keep the changes for 2.1 as simple as possible ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40001) Update to catalan.ruleset for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40001 While we're on the topic, I'd like to discuss this: http://forum.freeciv.org/viewtopic.php?t=4216 The poster is mainly trolling, but he brings up the legit question of whether the Catalonia described in our ruleset existed in the middle ages or not. From Freeciv's nations policy: a nation listed as ancient or medieval should have had an independent dynasty or state in ancient or medieval times respectively ( http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.nations?rev=14172view=auto ) I'm not well versed in Iberian history, so please educate me on the issue. :) ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
