[Freeciv-commits] r31411 - in /branches/S2_6/dependencies/tolua-5.2: ./ include/ src/bin/ src/bin/lua/ src/lib/
Author: cazfi Date: Fri Jan 8 09:49:22 2016 New Revision: 31411 URL: http://svn.gna.org/viewcvs/freeciv?rev=31411=rev Log: Updated included tolua to version 5.2.4. See patch #6737 Added: branches/S2_6/dependencies/tolua-5.2/Version branches/S2_6/dependencies/tolua-5.2/freeciv_tolua.patch Modified: branches/S2_6/dependencies/tolua-5.2/Makefile.am branches/S2_6/dependencies/tolua-5.2/README branches/S2_6/dependencies/tolua-5.2/include/tolua.h branches/S2_6/dependencies/tolua-5.2/src/bin/lua/basic.lua branches/S2_6/dependencies/tolua-5.2/src/bin/lua/clean.lua branches/S2_6/dependencies/tolua-5.2/src/bin/lua/compat.lua branches/S2_6/dependencies/tolua-5.2/src/bin/lua/function.lua branches/S2_6/dependencies/tolua-5.2/src/bin/tolua.c branches/S2_6/dependencies/tolua-5.2/src/bin/toluabind.c branches/S2_6/dependencies/tolua-5.2/src/lib/tolua_event.c branches/S2_6/dependencies/tolua-5.2/src/lib/tolua_map.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_6/dependencies/tolua-5.2/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/tolua-5.2/Makefile.am?rev=31411=31410=31411=diff Modified: branches/S2_6/dependencies/tolua-5.2/README URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/tolua-5.2/README?rev=31411=31410=31411=diff Added: branches/S2_6/dependencies/tolua-5.2/Version URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/tolua-5.2/Version?rev=31411=auto Added: branches/S2_6/dependencies/tolua-5.2/freeciv_tolua.patch URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/tolua-5.2/freeciv_tolua.patch?rev=31411=auto Modified: branches/S2_6/dependencies/tolua-5.2/include/tolua.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/tolua-5.2/include/tolua.h?rev=31411=31410=31411=diff Modified: branches/S2_6/dependencies/tolua-5.2/src/bin/lua/basic.lua URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/tolua-5.2/src/bin/lua/basic.lua?rev=31411=31410=31411=diff Modified: branches/S2_6/dependencies/tolua-5.2/src/bin/lua/clean.lua URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/tolua-5.2/src/bin/lua/clean.lua?rev=31411=31410=31411=diff Modified: branches/S2_6/dependencies/tolua-5.2/src/bin/lua/compat.lua URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/tolua-5.2/src/bin/lua/compat.lua?rev=31411=31410=31411=diff Modified: branches/S2_6/dependencies/tolua-5.2/src/bin/lua/function.lua URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/tolua-5.2/src/bin/lua/function.lua?rev=31411=31410=31411=diff Modified: branches/S2_6/dependencies/tolua-5.2/src/bin/tolua.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/tolua-5.2/src/bin/tolua.c?rev=31411=31410=31411=diff Modified: branches/S2_6/dependencies/tolua-5.2/src/bin/toluabind.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/tolua-5.2/src/bin/toluabind.c?rev=31411=31410=31411=diff Modified: branches/S2_6/dependencies/tolua-5.2/src/lib/tolua_event.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/tolua-5.2/src/lib/tolua_event.c?rev=31411=31410=31411=diff Modified: branches/S2_6/dependencies/tolua-5.2/src/lib/tolua_map.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/dependencies/tolua-5.2/src/lib/tolua_map.c?rev=31411=31410=31411=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31410 - in /trunk/dependencies/tolua-5.2: ./ include/ src/bin/ src/bin/lua/ src/lib/
Author: cazfi Date: Fri Jan 8 09:49:08 2016 New Revision: 31410 URL: http://svn.gna.org/viewcvs/freeciv?rev=31410=rev Log: Updated included tolua to version 5.2.4. See patch #6737 Added: trunk/dependencies/tolua-5.2/Version trunk/dependencies/tolua-5.2/freeciv_tolua.patch Modified: trunk/dependencies/tolua-5.2/Makefile.am trunk/dependencies/tolua-5.2/README trunk/dependencies/tolua-5.2/include/tolua.h trunk/dependencies/tolua-5.2/src/bin/lua/basic.lua trunk/dependencies/tolua-5.2/src/bin/lua/clean.lua trunk/dependencies/tolua-5.2/src/bin/lua/compat.lua trunk/dependencies/tolua-5.2/src/bin/lua/function.lua trunk/dependencies/tolua-5.2/src/bin/tolua.c trunk/dependencies/tolua-5.2/src/bin/toluabind.c trunk/dependencies/tolua-5.2/src/lib/tolua_event.c trunk/dependencies/tolua-5.2/src/lib/tolua_map.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/dependencies/tolua-5.2/Makefile.am URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/tolua-5.2/Makefile.am?rev=31410=31409=31410=diff Modified: trunk/dependencies/tolua-5.2/README URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/tolua-5.2/README?rev=31410=31409=31410=diff Added: trunk/dependencies/tolua-5.2/Version URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/tolua-5.2/Version?rev=31410=auto Added: trunk/dependencies/tolua-5.2/freeciv_tolua.patch URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/tolua-5.2/freeciv_tolua.patch?rev=31410=auto Modified: trunk/dependencies/tolua-5.2/include/tolua.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/tolua-5.2/include/tolua.h?rev=31410=31409=31410=diff Modified: trunk/dependencies/tolua-5.2/src/bin/lua/basic.lua URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/tolua-5.2/src/bin/lua/basic.lua?rev=31410=31409=31410=diff Modified: trunk/dependencies/tolua-5.2/src/bin/lua/clean.lua URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/tolua-5.2/src/bin/lua/clean.lua?rev=31410=31409=31410=diff Modified: trunk/dependencies/tolua-5.2/src/bin/lua/compat.lua URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/tolua-5.2/src/bin/lua/compat.lua?rev=31410=31409=31410=diff Modified: trunk/dependencies/tolua-5.2/src/bin/lua/function.lua URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/tolua-5.2/src/bin/lua/function.lua?rev=31410=31409=31410=diff Modified: trunk/dependencies/tolua-5.2/src/bin/tolua.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/tolua-5.2/src/bin/tolua.c?rev=31410=31409=31410=diff Modified: trunk/dependencies/tolua-5.2/src/bin/toluabind.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/tolua-5.2/src/bin/toluabind.c?rev=31410=31409=31410=diff Modified: trunk/dependencies/tolua-5.2/src/lib/tolua_event.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/tolua-5.2/src/lib/tolua_event.c?rev=31410=31409=31410=diff Modified: trunk/dependencies/tolua-5.2/src/lib/tolua_map.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/dependencies/tolua-5.2/src/lib/tolua_map.c?rev=31410=31409=31410=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31420 - /trunk/server/meta.c
Author: cazfi Date: Fri Jan 8 21:21:25 2016 New Revision: 31420 URL: http://svn.gna.org/viewcvs/freeciv?rev=31420=rev Log: Free structure of the metaserver connection handling thread. See bug #24287 Modified: trunk/server/meta.c Modified: trunk/server/meta.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/meta.c?rev=31420=31419=31420=diff == --- trunk/server/meta.c (original) +++ trunk/server/meta.c Fri Jan 8 21:21:25 2016 @@ -476,7 +476,7 @@ } /** - control when we send info to the metaserver. + Control when we send info to the metaserver. **/ bool send_server_info_to_metaserver(enum meta_flag flag) { @@ -497,6 +497,7 @@ /* Wait metaserver thread to finish */ fc_thread_wait(meta_srv_thread); +free(meta_srv_thread); meta_srv_thread = NULL; return TRUE; ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31421 - /branches/S2_6/server/meta.c
Author: cazfi Date: Fri Jan 8 21:21:31 2016 New Revision: 31421 URL: http://svn.gna.org/viewcvs/freeciv?rev=31421=rev Log: Free structure of the metaserver connection handling thread. See bug #24287 Modified: branches/S2_6/server/meta.c Modified: branches/S2_6/server/meta.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/meta.c?rev=31421=31420=31421=diff == --- branches/S2_6/server/meta.c (original) +++ branches/S2_6/server/meta.c Fri Jan 8 21:21:31 2016 @@ -474,7 +474,7 @@ } /** - control when we send info to the metaserver. + Control when we send info to the metaserver. **/ bool send_server_info_to_metaserver(enum meta_flag flag) { @@ -495,6 +495,7 @@ /* Wait metaserver thread to finish */ fc_thread_wait(meta_srv_thread); +free(meta_srv_thread); meta_srv_thread = NULL; return TRUE; ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31413 - /trunk/server/rscompat.c
Author: sveinung Date: Fri Jan 8 11:41:22 2016 New Revision: 31413 URL: http://svn.gna.org/viewcvs/freeciv?rev=31413=rev Log: Fix ruleset unit type user flag upgrade. See bug #24285 Modified: trunk/server/rscompat.c Modified: trunk/server/rscompat.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/rscompat.c?rev=31413=31412=31413=diff == --- trunk/server/rscompat.c (original) +++ trunk/server/rscompat.c Fri Jan 8 11:41:22 2016 @@ -145,7 +145,7 @@ { N_("Nuclear"), N_("This unit's attack causes a nuclear explosion!") }, { N_("Infra"), N_("Can build infrastructure.") } }; -int first_free = first_free_unit_type_user_flag(); +int first_free = first_free_unit_type_user_flag() + UTYF_USER_FLAG_1; int i; for (i = 0; i < ARRAY_SIZE(new_flags_30); i++) { ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31412 - in /trunk/data/sandbox: effects.ruleset game.ruleset
Author: sveinung Date: Fri Jan 8 11:41:17 2016 New Revision: 31412 URL: http://svn.gna.org/viewcvs/freeciv?rev=31412=rev Log: sandbox: let Spy units Steal Maps. Allow Spy units to steal parts of other player's world map. See patch 6783 Modified: trunk/data/sandbox/effects.ruleset trunk/data/sandbox/game.ruleset Modified: trunk/data/sandbox/effects.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/effects.ruleset?rev=31412=31411=31412=diff == --- trunk/data/sandbox/effects.ruleset (original) +++ trunk/data/sandbox/effects.ruleset Fri Jan 8 11:41:17 2016 @@ -3883,6 +3883,32 @@ "Action", "Join City", "Local", FALSE } +[effect_incident_caught_steal_maps] +type = "Casus_Belli_Caught" +value = 1 +reqs = +{ "type", "name", "range", "present" + "Action", "Steal Maps", "Local", TRUE + "DiplRel", "War", "Local", FALSE +} + +[effect_incident_success_steal_maps] +type = "Casus_Belli_Success" +value = 1 +reqs = +{ "type", "name", "range", "present" + "Action", "Steal Maps", "Local", TRUE + "DiplRel", "War", "Local", FALSE +} + +[effect_half_chance_steal_maps] +type = "Action_Odds_Pct" +value = -50 +reqs = +{ "type", "name", "range", "present" + "Action", "Steal Maps", "Local", TRUE +} + [effect_incident_caught_steal_tech] type = "Casus_Belli_Caught" value = 1 Modified: trunk/data/sandbox/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/game.ruleset?rev=31412=31411=31412=diff == --- trunk/data/sandbox/game.ruleset (original) +++ trunk/data/sandbox/game.ruleset Fri Jan 8 11:41:17 2016 @@ -232,6 +232,9 @@ ; /* TRANS: Indus_trial Espionage (3% chance of success). */ ui_name_targeted_steal_tech = _("Indus%strial Espionage%s") +; /* TRANS: Steal _Map Fragments (3% chance of success). */ +ui_name_steal_maps = _("Steal %sMap Fragments%s") + ; /* TRANS: _Investigate City (100% chance of success). */ ui_name_investigate_city = _("%sInvestigate City%s") @@ -320,6 +323,19 @@ "UnitFlag", "Diplomat", "Local" "UnitState", "OnLivableTile", "Local" "MinMoveFrags", "1", "Local" +} + +[actionenabler_steal_maps] +action = "Steal Maps" +actor_reqs= +{ "type", "name", "range" + "UnitFlag", "Spy", "Local" + "UnitState", "OnLivableTile", "Local" + "MinMoveFrags", "1", "Local" +} +target_reqs = +{ "type", "name", "range", "present" + "NationGroup", "Barbarian", "Player", FALSE } [actionenabler_steal_tech_random] ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31414 - in /trunk: ./ ai/default/ client/ common/ data/alien/ data/civ1/ data/civ2/ data/civ2civ3/ data/classic/ data/exper...
Author: sveinung Date: Fri Jan 8 11:41:29 2016 New Revision: 31414 URL: http://svn.gna.org/viewcvs/freeciv?rev=31414=rev Log: Action enabler controlled home city setting. "Home City" action enablers control when the player can order a unit to change home city. The rule against giving away a unit by changing its home city to a city belonging to the ally has moved to the ruleset. See patch #6801 Modified: trunk/ai/default/aicity.c trunk/ai/default/aitools.c trunk/client/control.c trunk/common/actions.c trunk/common/actions.h trunk/common/packets.def trunk/common/unit.c trunk/common/unit.h trunk/data/alien/game.ruleset trunk/data/civ1/game.ruleset trunk/data/civ2/game.ruleset trunk/data/civ2civ3/game.ruleset trunk/data/classic/game.ruleset trunk/data/experimental/game.ruleset trunk/data/multiplayer/game.ruleset trunk/data/sandbox/game.ruleset trunk/doc/README.actions trunk/fc_version trunk/server/advisors/advdata.c trunk/server/legacysave.c trunk/server/rscompat.c trunk/server/ruleset.c trunk/server/savecompat.c trunk/server/savegame2.c trunk/server/savegame3.c trunk/server/unithand.c trunk/server/unittools.c trunk/tools/ruledit/rulesave.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/ai/default/aicity.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aicity.c?rev=31414=31413=31414=diff Modified: trunk/ai/default/aitools.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aitools.c?rev=31414=31413=31414=diff Modified: trunk/client/control.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/control.c?rev=31414=31413=31414=diff Modified: trunk/common/actions.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.c?rev=31414=31413=31414=diff Modified: trunk/common/actions.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/actions.h?rev=31414=31413=31414=diff Modified: trunk/common/packets.def URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.def?rev=31414=31413=31414=diff Modified: trunk/common/unit.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/unit.c?rev=31414=31413=31414=diff Modified: trunk/common/unit.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/unit.h?rev=31414=31413=31414=diff Modified: trunk/data/alien/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/game.ruleset?rev=31414=31413=31414=diff Modified: trunk/data/civ1/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/game.ruleset?rev=31414=31413=31414=diff Modified: trunk/data/civ2/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2/game.ruleset?rev=31414=31413=31414=diff Modified: trunk/data/civ2civ3/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ2civ3/game.ruleset?rev=31414=31413=31414=diff Modified: trunk/data/classic/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/classic/game.ruleset?rev=31414=31413=31414=diff Modified: trunk/data/experimental/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/game.ruleset?rev=31414=31413=31414=diff Modified: trunk/data/multiplayer/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/multiplayer/game.ruleset?rev=31414=31413=31414=diff Modified: trunk/data/sandbox/game.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/sandbox/game.ruleset?rev=31414=31413=31414=diff Modified: trunk/doc/README.actions URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/README.actions?rev=31414=31413=31414=diff Modified: trunk/fc_version URL: http://svn.gna.org/viewcvs/freeciv/trunk/fc_version?rev=31414=31413=31414=diff Modified: trunk/server/advisors/advdata.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/advisors/advdata.c?rev=31414=31413=31414=diff Modified: trunk/server/legacysave.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/legacysave.c?rev=31414=31413=31414=diff Modified: trunk/server/rscompat.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/rscompat.c?rev=31414=31413=31414=diff Modified: trunk/server/ruleset.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=31414=31413=31414=diff Modified: trunk/server/savecompat.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/savecompat.c?rev=31414=31413=31414=diff Modified: trunk/server/savegame2.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame2.c?rev=31414=31413=31414=diff Modified: trunk/server/savegame3.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame3.c?rev=31414=31413=31414=diff Modified: trunk/server/unithand.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=31414=31413=31414=diff Modified: trunk/server/unittools.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/unittools.c?rev=31414=31413=31414=diff Modified: trunk/tools/ruledit/rulesave.c URL:
[Freeciv-commits] r31419 - in /branches/S2_6/win32/installer: Makefile create-freeciv-ruledit-nsi.sh
Author: cazfi Date: Fri Jan 8 15:32:45 2016 New Revision: 31419 URL: http://svn.gna.org/viewcvs/freeciv?rev=31419=rev Log: Show translation statistics of the ruledit domain in Ruledit Windows Installer See patch #6803 Modified: branches/S2_6/win32/installer/Makefile branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh Modified: branches/S2_6/win32/installer/Makefile URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/Makefile?rev=31419=31418=31419=diff == --- branches/S2_6/win32/installer/Makefile (original) +++ branches/S2_6/win32/installer/Makefile Fri Jan 8 15:32:45 2016 @@ -67,6 +67,8 @@ cd build-ruledit; ../../../configure --disable-client --disable-server --disable-fcmp --disable-freeciv-manual # make make -C build-ruledit + make -C build-ruledit/translations/ruledit update-po + make -C build-ruledit/bootstrap langstat_ruledit.txt build-freeciv-gtk3: build-freeciv-common Modified: branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh?rev=31419=31418=31419=diff == --- branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh (original) +++ branches/S2_6/win32/installer/create-freeciv-ruledit-nsi.sh Fri Jan 8 15:32:45 2016 @@ -162,16 +162,16 @@ ### additional languages ### cat
[Freeciv-commits] r31415 - in /trunk/client/gui-gtk-3.x: citydlg.c gui_main.c gui_stuff.c gui_stuff.h mapview.c
Author: cazfi Date: Fri Jan 8 13:33:26 2016 New Revision: 31415 URL: http://svn.gna.org/viewcvs/freeciv?rev=31415=rev Log: Replaced deprecated gtk_widget_override_color() calls with modern solutions See patch #6796 Modified: trunk/client/gui-gtk-3.x/citydlg.c trunk/client/gui-gtk-3.x/gui_main.c trunk/client/gui-gtk-3.x/gui_stuff.c trunk/client/gui-gtk-3.x/gui_stuff.h trunk/client/gui-gtk-3.x/mapview.c Modified: trunk/client/gui-gtk-3.x/citydlg.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/citydlg.c?rev=31415=31414=31415=diff == --- trunk/client/gui-gtk-3.x/citydlg.c (original) +++ trunk/client/gui-gtk-3.x/citydlg.c Fri Jan 8 13:33:26 2016 @@ -1738,8 +1738,7 @@ char buf[NUM_INFO_FIELDS][512]; struct city *pcity = pdialog->pcity; int granaryturns; - GdkRGBA red = {1.0, 0, 0, 1.0}; - GdkRGBA *color; + static GtkCssProvider *emergency_provider = NULL; enum { FOOD, SHIELD, TRADE, GOLD, LUXURY, SCIENCE, GRANARY, GROWTH, CORRUPTION, WASTE, CULTURE, @@ -1801,24 +1800,57 @@ gtk_label_set_text(GTK_LABEL(info_label[i]), buf[i]); } - /* + /* * Special style stuff for granary, growth and pollution below. The * "4" below is arbitrary. 3 turns should be enough of a warning. */ - color = (granaryturns > -4 && granaryturns < 0) ? : NULL; - gtk_widget_override_color(info_label[GRANARY], GTK_STATE_FLAG_NORMAL, color); - - color = (granaryturns == 0 || pcity->surplus[O_FOOD] < 0) ? : NULL; - gtk_widget_override_color(info_label[GROWTH], GTK_STATE_FLAG_NORMAL, color); + + if (emergency_provider == NULL) { +emergency_provider = gtk_css_provider_new(); + +gtk_css_provider_load_from_data(emergency_provider, +".emergency {\n color: rgba(255, 0.0, 0.0, 255);\n}", +-1, NULL); + + gtk_style_context_add_provider(gtk_widget_get_style_context(info_label[GRANARY]), + GTK_STYLE_PROVIDER(emergency_provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + gtk_style_context_add_provider(gtk_widget_get_style_context(info_label[GROWTH]), + GTK_STYLE_PROVIDER(emergency_provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + gtk_style_context_add_provider(gtk_widget_get_style_context(info_label[POLLUTION]), + GTK_STYLE_PROVIDER(emergency_provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + gtk_style_context_add_provider(gtk_widget_get_style_context(info_label[ILLNESS]), + GTK_STYLE_PROVIDER(emergency_provider), + GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); + } + + if (granaryturns > -4 && granaryturns < 0) { + gtk_style_context_add_class(gtk_widget_get_style_context(info_label[GRANARY]), "emergency"); + } else { + gtk_style_context_remove_class(gtk_widget_get_style_context(info_label[GRANARY]), "emergency"); + } + + if (granaryturns == 0 || pcity->surplus[O_FOOD] < 0) { + gtk_style_context_add_class(gtk_widget_get_style_context(info_label[GROWTH]), "emergency"); + } else { + gtk_style_context_remove_class(gtk_widget_get_style_context(info_label[GROWTH]), "emergency"); + } /* someone could add the color for better granularity here */ - - color = (pcity->pollution >= 10) ? : NULL; - gtk_widget_override_color(info_label[POLLUTION], GTK_STATE_FLAG_NORMAL, color); + if (pcity->pollution >= 10) { + gtk_style_context_add_class(gtk_widget_get_style_context(info_label[POLLUTION]), "emergency"); + } else { + gtk_style_context_remove_class(gtk_widget_get_style_context(info_label[POLLUTION]), "emergency"); + } /* illness is in tenth of percent, i.e 100 != 10.0% */ - color = (illness >= 100) ? : NULL; - gtk_widget_override_color(info_label[ILLNESS], GTK_STATE_FLAG_NORMAL, color); + if (illness >= 100) { + gtk_style_context_add_class(gtk_widget_get_style_context(info_label[ILLNESS]), "emergency"); + } else { + gtk_style_context_remove_class(gtk_widget_get_style_context(info_label[ILLNESS]), "emergency"); + } } / Modified: trunk/client/gui-gtk-3.x/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/gui_main.c?rev=31415=31414=31415=diff == --- trunk/client/gui-gtk-3.x/gui_main.c (original) +++ trunk/client/gui-gtk-3.x/gui_main.c Fri Jan 8 13:33:26 2016 @@ -1670,6 +1670,8 @@ /* GTK withdraw gtk options. Process GTK arguments */ gtk_init(, ); + dlg_tab_provider_prepare(); + toplevel = gtk_window_new(GTK_WINDOW_TOPLEVEL);
[Freeciv-commits] r31417 - /branches/S2_6/utility/fcbacktrace.c
Author: cazfi Date: Fri Jan 8 13:54:53 2016 New Revision: 31417 URL: http://svn.gna.org/viewcvs/freeciv?rev=31417=rev Log: Disabled backtrace logs from testmatic builds See patch #6795 Modified: branches/S2_6/utility/fcbacktrace.c Modified: branches/S2_6/utility/fcbacktrace.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/fcbacktrace.c?rev=31417=31416=31417=diff == --- branches/S2_6/utility/fcbacktrace.c (original) +++ branches/S2_6/utility/fcbacktrace.c Fri Jan 8 13:54:53 2016 @@ -25,7 +25,8 @@ #include "fcbacktrace.h" -#if defined(DEBUG) && defined(HAVE_BACKTRACE) +/* We don't want backtrace-spam to testmatic logs */ +#if defined(DEBUG) && defined(HAVE_BACKTRACE) && !defined(TESTMATIC_ENABLED) #define BACKTRACE_ACTIVE 1 #endif ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31416 - /trunk/utility/fcbacktrace.c
Author: cazfi Date: Fri Jan 8 13:54:46 2016 New Revision: 31416 URL: http://svn.gna.org/viewcvs/freeciv?rev=31416=rev Log: Disabled backtrace logs from testmatic builds See patch #6795 Modified: trunk/utility/fcbacktrace.c Modified: trunk/utility/fcbacktrace.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/utility/fcbacktrace.c?rev=31416=31415=31416=diff == --- trunk/utility/fcbacktrace.c (original) +++ trunk/utility/fcbacktrace.c Fri Jan 8 13:54:46 2016 @@ -25,7 +25,8 @@ #include "fcbacktrace.h" -#if defined(DEBUG) && defined(HAVE_BACKTRACE) +/* We don't want backtrace-spam to testmatic logs */ +#if defined(DEBUG) && defined(HAVE_BACKTRACE) && !defined(TESTMATIC_ENABLED) #define BACKTRACE_ACTIVE 1 #endif ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r31418 - in /trunk/win32/installer: Makefile create-freeciv-ruledit-nsi.sh
Author: cazfi Date: Fri Jan 8 15:32:39 2016 New Revision: 31418 URL: http://svn.gna.org/viewcvs/freeciv?rev=31418=rev Log: Show translation statistics of the ruledit domain in Ruledit Windows Installer See patch #6803 Modified: trunk/win32/installer/Makefile trunk/win32/installer/create-freeciv-ruledit-nsi.sh Modified: trunk/win32/installer/Makefile URL: http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/Makefile?rev=31418=31417=31418=diff == --- trunk/win32/installer/Makefile (original) +++ trunk/win32/installer/Makefile Fri Jan 8 15:32:39 2016 @@ -67,6 +67,8 @@ cd build-ruledit; ../../../configure --disable-client --disable-server --disable-fcmp --disable-freeciv-manual # make make -C build-ruledit + make -C build-ruledit/translations/ruledit update-po + make -C build-ruledit/bootstrap langstat_ruledit.txt build-freeciv-gtk3: build-freeciv-common Modified: trunk/win32/installer/create-freeciv-ruledit-nsi.sh URL: http://svn.gna.org/viewcvs/freeciv/trunk/win32/installer/create-freeciv-ruledit-nsi.sh?rev=31418=31417=31418=diff == --- trunk/win32/installer/create-freeciv-ruledit-nsi.sh (original) +++ trunk/win32/installer/create-freeciv-ruledit-nsi.sh Fri Jan 8 15:32:39 2016 @@ -162,16 +162,16 @@ ### additional languages ### cat