[Freeciv-commits] r33695 - in /trunk: common/ tools/ruledit/ tools/ruleutil/
Author: cazfi
Date: Wed Aug 24 09:43:34 2016
New Revision: 33695
URL: http://svn.gna.org/viewcvs/freeciv?rev=33695&view=rev
Log:
Added value editing for Unit class, Output type, and Good requirement types.
See patch #7646
Modified:
trunk/common/unittype.c
trunk/common/unittype.h
trunk/tools/ruledit/tab_misc.cpp
trunk/tools/ruledit/univ_value.c
trunk/tools/ruleutil/rulesave.c
Modified: trunk/common/unittype.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/unittype.c?rev=33695&r1=33694&r2=33695&view=diff
==
--- trunk/common/unittype.c (original)
+++ trunk/common/unittype.c Wed Aug 24 09:43:34 2016
@@ -1709,6 +1709,7 @@
unit_classes[i].cache.bonus_roads = NULL;
unit_classes[i].cache.subset_movers = NULL;
unit_classes[i].helptext = NULL;
+unit_classes[i].disabled = FALSE;
}
}
Modified: trunk/common/unittype.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/unittype.h?rev=33695&r1=33694&r2=33695&view=diff
==
--- trunk/common/unittype.h (original)
+++ trunk/common/unittype.h Wed Aug 24 09:43:34 2016
@@ -134,6 +134,7 @@
struct unit_class {
Unit_Class_id item_number;
struct name_translation name;
+ bool disabled;
enum unit_move_type move_type;
int min_speed; /* Minimum speed after damage and effects */
int hp_loss_pct; /* Percentage of hitpoints lost each turn not in
city or airbase */
@@ -789,6 +790,14 @@
}\
}
+#define unit_active_class_iterate(_p)\
+ unit_class_iterate(_p) { \
+if (!_p->disabled) {
+
+#define unit_active_class_iterate_end\
+}\
+ } unit_class_iterate_end;
+
#define SPECLIST_TAG unit_class
#define SPECLIST_TYPE struct unit_class
#include "speclist.h"
Modified: trunk/tools/ruledit/tab_misc.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/tab_misc.cpp?rev=33695&r1=33694&r2=33695&view=diff
==
--- trunk/tools/ruledit/tab_misc.cpp(original)
+++ trunk/tools/ruledit/tab_misc.cppWed Aug 24 09:43:34 2016
@@ -257,7 +257,11 @@
} advance_active_iterate_end;
stats->item(row++, 1)->setText(QString::number(count));
- stats->item(row++,
1)->setText(QString::number(game.control.num_unit_classes));
+ count = 0;
+ unit_active_class_iterate(pclass) {
+count++;
+ } unit_active_class_iterate_end;
+ stats->item(row++, 1)->setText(QString::number(count));
count = 0;
unit_active_type_iterate(ptype) {
Modified: trunk/tools/ruledit/univ_value.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/univ_value.c?rev=33695&r1=33694&r2=33695&view=diff
==
--- trunk/tools/ruledit/univ_value.c(original)
+++ trunk/tools/ruledit/univ_value.cWed Aug 24 09:43:34 2016
@@ -241,16 +241,28 @@
cb(utype_rule_name(putype), univ->value.utype == putype, data);
} unit_active_type_iterate_end;
break;
+ case VUT_UCLASS:
+unit_active_class_iterate(pclass) {
+ cb(uclass_rule_name(pclass), univ->value.uclass == pclass, data);
+} unit_active_class_iterate_end;
+break;
+ case VUT_OTYPE:
+output_type_iterate(otype) {
+ cb(get_output_name(otype), univ->value.outputtype == otype, data);
+} output_type_iterate_end;
+break;
+ case VUT_GOOD:
+goods_active_type_iterate(pgood) {
+ cb(goods_rule_name(pgood), univ->value.good == pgood, data);
+} goods_active_type_iterate_end;
+break;
case VUT_UTFLAG:
- case VUT_UCLASS:
case VUT_UCFLAG:
- case VUT_OTYPE:
case VUT_SPECIALIST:
case VUT_AI_LEVEL:
case VUT_TERRAINCLASS:
case VUT_TERRAINALTER:
case VUT_CITYTILE:
- case VUT_GOOD:
case VUT_TERRFLAG:
case VUT_NATIONALITY:
case VUT_BASEFLAG:
Modified: trunk/tools/ruleutil/rulesave.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruleutil/rulesave.c?rev=33695&r1=33694&r2=33695&view=diff
==
--- trunk/tools/ruleutil/rulesave.c (original)
+++ trunk/tools/ruleutil/rulesave.c Wed Aug 24 09:43:34 2016
@@ -2458,7 +2458,7 @@
comment_uclasses(sfile);
sect_idx = 0;
- unit_class_iterate(puc) {
+ unit_active_class_iterate(puc) {
char path[512];
char *hut_str = NULL;
const char *flag_names[UCF_COUNT];
@@ -2506,7 +2506,7 @@
save_strvec(sfile, puc->helptext, path, "helptext");
- } unit_class_iterate_end;
+ } unit_active_class_iterate_end;
comment_utypes(sfile);
__
[Freeciv-commits] r33696 - in /trunk/translations: core/POTFILES.in nations/POTFILES.skip ruledit/POTFILES.skip
Author: cazfi Date: Wed Aug 24 09:49:46 2016 New Revision: 33696 URL: http://svn.gna.org/viewcvs/freeciv?rev=33696&view=rev Log: Updated POTFILES Modified: trunk/translations/core/POTFILES.in trunk/translations/nations/POTFILES.skip trunk/translations/ruledit/POTFILES.skip Modified: trunk/translations/core/POTFILES.in URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/core/POTFILES.in?rev=33696&r1=33695&r2=33696&view=diff == --- trunk/translations/core/POTFILES.in (original) +++ trunk/translations/core/POTFILES.in Wed Aug 24 09:49:46 2016 @@ -3,6 +3,7 @@ ai/default/aicity.c ai/default/daidiplomacy.c ai/threaded/threadedai.c +ai/threxpr/threxprai.c client/agents/cma_core.c client/agents/cma_fec.c client/attribute.c @@ -87,6 +88,7 @@ client/gui-gtk-3.0/tileset_dlg.c client/gui-gtk-3.0/transportdlg.c client/gui-gtk-3.0/unitselect.c +client/gui-gtk-3.0/unitselunitdlg.c client/gui-gtk-3.0/voteinfo_bar.c client/gui-gtk-3.0/wldlg.c client/gui-gtk-3.x/action_dialog.c @@ -125,6 +127,7 @@ client/gui-gtk-3.x/tileset_dlg.c client/gui-gtk-3.x/transportdlg.c client/gui-gtk-3.x/unitselect.c +client/gui-gtk-3.x/unitselunitdlg.c client/gui-gtk-3.x/voteinfo_bar.c client/gui-gtk-3.x/wldlg.c client/gui-qt/chatline.cpp @@ -204,6 +207,7 @@ common/player.c common/player.h common/research.c +common/reqtext.c common/requirements.c common/team.c common/tech.c Modified: trunk/translations/nations/POTFILES.skip URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/nations/POTFILES.skip?rev=33696&r1=33695&r2=33696&view=diff == --- trunk/translations/nations/POTFILES.skip(original) +++ trunk/translations/nations/POTFILES.skipWed Aug 24 09:49:46 2016 @@ -4,6 +4,7 @@ ai/default/aicity.c ai/default/daidiplomacy.c ai/threaded/threadedai.c +ai/threxpr/threxprai.c client/agents/cma_core.c client/agents/cma_fec.c client/attribute.c @@ -88,6 +89,7 @@ client/gui-gtk-3.0/tileset_dlg.c client/gui-gtk-3.0/transportdlg.c client/gui-gtk-3.0/unitselect.c +client/gui-gtk-3.0/unitselunitdlg.c client/gui-gtk-3.0/voteinfo_bar.c client/gui-gtk-3.0/wldlg.c client/gui-gtk-3.x/action_dialog.c @@ -126,6 +128,7 @@ client/gui-gtk-3.x/tileset_dlg.c client/gui-gtk-3.x/transportdlg.c client/gui-gtk-3.x/unitselect.c +client/gui-gtk-3.x/unitselunitdlg.c client/gui-gtk-3.x/voteinfo_bar.c client/gui-gtk-3.x/wldlg.c client/gui-qt/chatline.cpp @@ -237,6 +240,7 @@ common/player.c common/player.h common/research.c +common/reqtext.c common/requirements.c common/team.c common/tech.c Modified: trunk/translations/ruledit/POTFILES.skip URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/ruledit/POTFILES.skip?rev=33696&r1=33695&r2=33696&view=diff == --- trunk/translations/ruledit/POTFILES.skip(original) +++ trunk/translations/ruledit/POTFILES.skipWed Aug 24 09:49:46 2016 @@ -3,6 +3,7 @@ ai/default/aicity.c ai/default/daidiplomacy.c ai/threaded/threadedai.c +ai/threxpr/threxprai.c client/agents/cma_core.c client/agents/cma_fec.c client/attribute.c @@ -87,6 +88,7 @@ client/gui-gtk-3.0/tileset_dlg.c client/gui-gtk-3.0/transportdlg.c client/gui-gtk-3.0/unitselect.c +client/gui-gtk-3.0/unitselunitdlg.c client/gui-gtk-3.0/voteinfo_bar.c client/gui-gtk-3.0/wldlg.c client/gui-gtk-3.x/action_dialog.c @@ -125,6 +127,7 @@ client/gui-gtk-3.x/tileset_dlg.c client/gui-gtk-3.x/transportdlg.c client/gui-gtk-3.x/unitselect.c +client/gui-gtk-3.x/unitselunitdlg.c client/gui-gtk-3.x/voteinfo_bar.c client/gui-gtk-3.x/wldlg.c client/gui-qt/chatline.cpp @@ -236,6 +239,7 @@ common/player.c common/player.h common/research.c +common/reqtext.c common/requirements.c common/team.c common/tech.c ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33697 - in /branches/S2_6/translations: freeciv/POTFILES.in nations/POTFILES.skip ruledit/POTFILES.skip
Author: cazfi Date: Wed Aug 24 09:52:37 2016 New Revision: 33697 URL: http://svn.gna.org/viewcvs/freeciv?rev=33697&view=rev Log: Updated POTFILES Modified: branches/S2_6/translations/freeciv/POTFILES.in branches/S2_6/translations/nations/POTFILES.skip branches/S2_6/translations/ruledit/POTFILES.skip Modified: branches/S2_6/translations/freeciv/POTFILES.in URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/freeciv/POTFILES.in?rev=33697&r1=33696&r2=33697&view=diff == --- branches/S2_6/translations/freeciv/POTFILES.in (original) +++ branches/S2_6/translations/freeciv/POTFILES.in Wed Aug 24 09:52:37 2016 @@ -87,6 +87,7 @@ client/gui-gtk-3.0/tileset_dlg.c client/gui-gtk-3.0/transportdlg.c client/gui-gtk-3.0/unitselect.c +client/gui-gtk-3.0/unitselunitdlg.c client/gui-gtk-3.0/voteinfo_bar.c client/gui-gtk-3.0/wldlg.c client/gui-qt/chatline.cpp Modified: branches/S2_6/translations/nations/POTFILES.skip URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/nations/POTFILES.skip?rev=33697&r1=33696&r2=33697&view=diff == --- branches/S2_6/translations/nations/POTFILES.skip(original) +++ branches/S2_6/translations/nations/POTFILES.skipWed Aug 24 09:52:37 2016 @@ -88,6 +88,7 @@ client/gui-gtk-3.0/tileset_dlg.c client/gui-gtk-3.0/transportdlg.c client/gui-gtk-3.0/unitselect.c +client/gui-gtk-3.0/unitselunitdlg.c client/gui-gtk-3.0/voteinfo_bar.c client/gui-gtk-3.0/wldlg.c client/gui-qt/chatline.cpp Modified: branches/S2_6/translations/ruledit/POTFILES.skip URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/translations/ruledit/POTFILES.skip?rev=33697&r1=33696&r2=33697&view=diff == --- branches/S2_6/translations/ruledit/POTFILES.skip(original) +++ branches/S2_6/translations/ruledit/POTFILES.skipWed Aug 24 09:52:37 2016 @@ -87,6 +87,7 @@ client/gui-gtk-3.0/theme_dlg.c client/gui-gtk-3.0/tileset_dlg.c client/gui-gtk-3.0/unitselect.c +client/gui-gtk-3.0/unitselunitdlg.c client/gui-gtk-3.0/voteinfo_bar.c client/gui-gtk-3.0/wldlg.c client/gui-qt/chatline.cpp ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33698 - in /branches/S2_6/client/gui-qt: chatline.cpp chatline.h fc_client.cpp fc_client.h listener.h pages.cpp
Author: mir3x
Date: Wed Aug 24 15:31:03 2016
New Revision: 33698
URL: http://svn.gna.org/viewcvs/freeciv?rev=33698&view=rev
Log:
Qt client - use helper<> to propagate output_window_append
Patch by Louis Moureaux
See patch #7491
Modified:
branches/S2_6/client/gui-qt/chatline.cpp
branches/S2_6/client/gui-qt/chatline.h
branches/S2_6/client/gui-qt/fc_client.cpp
branches/S2_6/client/gui-qt/fc_client.h
branches/S2_6/client/gui-qt/listener.h
branches/S2_6/client/gui-qt/pages.cpp
Modified: branches/S2_6/client/gui-qt/chatline.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/chatline.cpp?rev=33698&r1=33697&r2=33698&view=diff
==
--- branches/S2_6/client/gui-qt/chatline.cpp(original)
+++ branches/S2_6/client/gui-qt/chatline.cppWed Aug 24 15:31:03 2016
@@ -40,6 +40,83 @@
#include "chatline.h"
static bool is_plain_public_message(QString s);
+
+FC_CPP_DECLARE_LISTENER(chat_listener)
+
+/***
+ Called whenever a message is received. Default implementation does
+ nothing.
+***/
+void chat_listener::chat_message_received(const QString &,
+ const struct text_tag_list *)
+{}
+
+/***
+ Sends commands to server, but first searches for cutom keys, if it finds
+ then it makes custom action
+***/
+void chat_listener::send_chat_message(const QString &message)
+{
+ int index;
+ QString splayer, s;
+
+ /* FIXME
+ * Key == PICK: used for picking nation, it was put here cause those
+ * Qt slots are a bit limited ...I'm unable to pass custom player pointer
+ * or idk how to do that
+ */
+ s = message;
+ index = message.indexOf("PICK:");
+
+ if (index != -1) {
+s = s.remove("PICK:");
+/* now should be playername left in string */
+players_iterate(pplayer) {
+ splayer = QString(pplayer->name);
+
+ if (!splayer.compare(s)) {
+popup_races_dialog(pplayer);
+ }
+} players_iterate_end;
+return;
+ }
+
+ /*
+ * If client send commands to take ai, set /away to disable AI
+ */
+ if (message.startsWith("/take ")) {
+ s = s.remove("/take ");
+ players_iterate(pplayer) {
+ splayer = QString(pplayer->name);
+ splayer = "\"" + splayer + "\"";
+
+ if (!splayer.compare(s)) {
+if (pplayer->ai_controlled) {
+ send_chat(message.toLocal8Bit());
+ send_chat("/away");
+ return;
+}
+ }
+} players_iterate_end;
+ }
+
+ /*
+ * Option to send to allies by default
+ */
+ gui()->chat_history.prepend(message);
+ if (!message.isEmpty()) {
+if (client_state() >= C_S_RUNNING && gui_options.gui_qt_allied_chat_only
+&& is_plain_public_message(message)) {
+ send_chat((QString(CHAT_ALLIES_PREFIX)
+ + " " + message).toLocal8Bit());
+} else {
+ send_chat(message.toLocal8Bit());
+}
+ }
+ // Empty messages aren't sent
+ // FIXME Inconsistent behavior: "." will send an empty message to allies
+}
+
/***
Constructor for chatwdg
***/
@@ -94,6 +171,8 @@
connect(remove_links, SIGNAL(clicked()), this, SLOT(rm_links()));
connect(cb, SIGNAL(stateChanged(int)), this, SLOT(state_changed(int)));
setMouseTracking(true);
+
+ chat_listener::listen();
}
/***
@@ -178,11 +257,19 @@
}
}
+/***
+ Adds news string to chatwdg (from chat_listener interface)
+***/
+void chatwdg::chat_message_received(const QString& message,
+const struct text_tag_list *tags)
+{
+ append(apply_tags(message, tags, true));
+}
/***
Adds news string to chatwdg
***/
-void chatwdg::append(QString str)
+void chatwdg::append(const QString &str)
{
QTextCursor cursor;
@@ -197,17 +284,7 @@
***/
void chatwdg::send()
{
- gui()->chat_history.prepend(chat_line->text());
- if (chat_line->text() != "") {
-if (client_state() >= C_S_RUNNING && gui_options.gui_qt_allied_chat_only
-&& is_plain_public_message(chat_line->text())) {
- send_chat(QString("%1 %2")
- .arg(CHAT_ALLIES_PREFIX)
-
[Freeciv-commits] r33699 - in /trunk/client/gui-qt: chatline.cpp chatline.h fc_client.cpp fc_client.h listener.h pages.cpp
Author: mir3x
Date: Wed Aug 24 15:31:30 2016
New Revision: 33699
URL: http://svn.gna.org/viewcvs/freeciv?rev=33699&view=rev
Log:
Qt client - use helper<> to propagate output_window_append
Patch by Louis Moureaux
See patch #7491
Modified:
trunk/client/gui-qt/chatline.cpp
trunk/client/gui-qt/chatline.h
trunk/client/gui-qt/fc_client.cpp
trunk/client/gui-qt/fc_client.h
trunk/client/gui-qt/listener.h
trunk/client/gui-qt/pages.cpp
Modified: trunk/client/gui-qt/chatline.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/chatline.cpp?rev=33699&r1=33698&r2=33699&view=diff
==
--- trunk/client/gui-qt/chatline.cpp(original)
+++ trunk/client/gui-qt/chatline.cppWed Aug 24 15:31:30 2016
@@ -40,6 +40,83 @@
#include "chatline.h"
static bool is_plain_public_message(QString s);
+
+FC_CPP_DECLARE_LISTENER(chat_listener)
+
+/***
+ Called whenever a message is received. Default implementation does
+ nothing.
+***/
+void chat_listener::chat_message_received(const QString &,
+ const struct text_tag_list *)
+{}
+
+/***
+ Sends commands to server, but first searches for cutom keys, if it finds
+ then it makes custom action
+***/
+void chat_listener::send_chat_message(const QString &message)
+{
+ int index;
+ QString splayer, s;
+
+ /* FIXME
+ * Key == PICK: used for picking nation, it was put here cause those
+ * Qt slots are a bit limited ...I'm unable to pass custom player pointer
+ * or idk how to do that
+ */
+ s = message;
+ index = message.indexOf("PICK:");
+
+ if (index != -1) {
+s = s.remove("PICK:");
+/* now should be playername left in string */
+players_iterate(pplayer) {
+ splayer = QString(pplayer->name);
+
+ if (!splayer.compare(s)) {
+popup_races_dialog(pplayer);
+ }
+} players_iterate_end;
+return;
+ }
+
+ /*
+ * If client send commands to take ai, set /away to disable AI
+ */
+ if (message.startsWith("/take ")) {
+ s = s.remove("/take ");
+ players_iterate(pplayer) {
+ splayer = QString(pplayer->name);
+ splayer = "\"" + splayer + "\"";
+
+ if (!splayer.compare(s)) {
+if (is_ai(pplayer)) {
+ send_chat(message.toLocal8Bit());
+ send_chat("/away");
+ return;
+}
+ }
+} players_iterate_end;
+ }
+
+ /*
+ * Option to send to allies by default
+ */
+ gui()->chat_history.prepend(message);
+ if (!message.isEmpty()) {
+if (client_state() >= C_S_RUNNING && gui_options.gui_qt_allied_chat_only
+&& is_plain_public_message(message)) {
+ send_chat((QString(CHAT_ALLIES_PREFIX)
+ + " " + message).toLocal8Bit());
+} else {
+ send_chat(message.toLocal8Bit());
+}
+ }
+ // Empty messages aren't sent
+ // FIXME Inconsistent behavior: "." will send an empty message to allies
+}
+
/***
Constructor for chatwdg
***/
@@ -94,6 +171,8 @@
connect(remove_links, SIGNAL(clicked()), this, SLOT(rm_links()));
connect(cb, SIGNAL(stateChanged(int)), this, SLOT(state_changed(int)));
setMouseTracking(true);
+
+ chat_listener::listen();
}
/***
@@ -178,11 +257,19 @@
}
}
+/***
+ Adds news string to chatwdg (from chat_listener interface)
+***/
+void chatwdg::chat_message_received(const QString& message,
+const struct text_tag_list *tags)
+{
+ append(apply_tags(message, tags, true));
+}
/***
Adds news string to chatwdg
***/
-void chatwdg::append(QString str)
+void chatwdg::append(const QString &str)
{
QTextCursor cursor;
@@ -197,17 +284,7 @@
***/
void chatwdg::send()
{
- gui()->chat_history.prepend(chat_line->text());
- if (chat_line->text() != "") {
-if (client_state() >= C_S_RUNNING && gui_options.gui_qt_allied_chat_only
-&& is_plain_public_message(chat_line->text())) {
- send_chat(QString("%1 %2")
- .arg(CHAT_ALLIES_PREFIX)
- .arg(chat_line->text().toUtf8().data()).toUtf8().data());
-} else {
- send_chat
[Freeciv-commits] r33701 - in /trunk/client/gui-qt: helpdlg.cpp helpdlg.h
Author: mir3x
Date: Wed Aug 24 15:35:06 2016
New Revision: 33701
URL: http://svn.gna.org/viewcvs/freeciv?rev=33701&view=rev
Log:
Qt client - updated help dialog
See patch #7633
Modified:
trunk/client/gui-qt/helpdlg.cpp
trunk/client/gui-qt/helpdlg.h
Modified: trunk/client/gui-qt/helpdlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/helpdlg.cpp?rev=33701&r1=33700&r2=33701&view=diff
==
--- trunk/client/gui-qt/helpdlg.cpp (original)
+++ trunk/client/gui-qt/helpdlg.cpp Wed Aug 24 15:35:06 2016
@@ -59,8 +59,8 @@
static help_dialog *help_dlg = NULL;
canvas *terrain_canvas(struct terrain *terrain,
- const struct extra_type *resource,
- enum extra_cause cause);
+ const struct extra_type *resource = NULL,
+ enum extra_cause cause = EC_COUNT);
/**
Popup the help dialog to get help on the given string topic. Note
that the topic may appear in multiple sections of the help (it may
@@ -172,26 +172,104 @@
**/
void help_dialog::make_tree()
{
+ char *title;
+ int dep;
+ int i;
+ QHash hash;
+ QIcon *icon;
QTreeWidgetItem *item;
- int dep;
- char *title;
- QHash hash;
+ sprite *spite;
+ struct advance *padvance;
+ struct canvas *pcan;
+ struct extra_type *pextra;
+ struct government *gov;
+ struct impr_type *imp;
+ struct terrain *pterrain;
+ struct unit_type *f_type;
+ struct drawn_sprite sprs[80];
help_items_iterate(pitem) {
const char *s;
int last;
title = pitem->topic;
+
for (s = pitem->topic; *s == ' '; s++) {
/* nothing */
}
+
item = new QTreeWidgetItem(QStringList(title));
topics_map[item] = pitem;
dep = s - pitem->topic;
hash.insert(dep, item);
+icon = nullptr;
+
if (dep == 0) {
tree_wdg->addTopLevelItem(item);
} else {
last = dep - 1;
+ spite = nullptr;
+
+ switch (pitem->type) {
+ case HELP_EXTRA:
+pextra = extra_type_by_translated_name(s);
+fill_basic_extra_sprite_array(tileset, sprs, pextra);
+icon = new QIcon(*sprs->sprite->pm);
+break;
+
+ case HELP_GOVERNMENT:
+gov = government_by_translated_name(s);
+spite = get_government_sprite(tileset, gov);
+if (spite) {
+ icon = new QIcon(*spite->pm);
+}
+break;
+
+ case HELP_IMPROVEMENT:
+ case HELP_WONDER:
+imp = improvement_by_translated_name(s);
+spite = get_building_sprite(tileset, imp);
+if (spite) {
+ icon = new QIcon(*spite->pm);
+}
+break;
+
+ case HELP_TECH:
+padvance = advance_by_translated_name(s);
+if (padvance && !is_future_tech(i = advance_number(padvance))) {
+ spite = get_tech_sprite(tileset, i);
+ if (spite) {
+icon = new QIcon(*spite->pm);
+ }
+}
+break;
+
+ case HELP_TERRAIN:
+pterrain = terrain_by_translated_name(s);
+pcan = terrain_canvas(pterrain);
+if (pcan) {
+ icon = new QIcon(pcan->map_pixmap);
+ delete pcan;
+}
+break;
+
+ case HELP_UNIT:
+f_type = unit_type_by_translated_name(s);
+if (f_type) {
+ spite = get_unittype_sprite(tileset, f_type, direction8_invalid());
+}
+if (spite) {
+ icon = new QIcon(*spite->pm);
+}
+break;
+
+ default:
+break;
+ }
+
+ if (icon != nullptr) {
+item->setIcon(0, *icon);
+ }
+
hash.value(last)->addChild(item);
}
} help_items_iterate_end;
@@ -227,6 +305,10 @@
**/
void help_dialog::update_fonts()
{
+ QFont *def_font;
+
+ def_font = gui()->fc_fonts.get_font("gui_qt_font_default");
+ tree_wdg->setFont(*def_font);
help_wdg->update_fonts();
}
@@ -407,13 +489,13 @@
/
Adds a pixmap to the information panel.
/
-void help_widget::add_info_canvas(struct canvas *canvas, bool shadow)
+void help_widget::add_info_pixmap(QPixmap *pm, bool shadow)
{
QLabel *label = new QLabel();
QGraphicsDropShadowEffect *effect;
label->setAlignment(Qt::AlignHCenter);
- label->setPixmap(canvas->map_pixmap);
+ label->setPixmap(*pm);
if (shadow) {
effect = new QGraphicsDropShadowEffect(label);
@@ -529,9 +611,10 @@
/
QString help_widget::link_me(const char *str, help_page_type hpt)
{
+ QString s;
+ s = QString(str).replace(" ", " ");
re
[Freeciv-commits] r33700 - in /branches/S2_6/client/gui-qt: helpdlg.cpp helpdlg.h
Author: mir3x
Date: Wed Aug 24 15:34:56 2016
New Revision: 33700
URL: http://svn.gna.org/viewcvs/freeciv?rev=33700&view=rev
Log:
Qt client - updated help dialog
See patch #7633
Modified:
branches/S2_6/client/gui-qt/helpdlg.cpp
branches/S2_6/client/gui-qt/helpdlg.h
Modified: branches/S2_6/client/gui-qt/helpdlg.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/helpdlg.cpp?rev=33700&r1=33699&r2=33700&view=diff
==
--- branches/S2_6/client/gui-qt/helpdlg.cpp (original)
+++ branches/S2_6/client/gui-qt/helpdlg.cpp Wed Aug 24 15:34:56 2016
@@ -59,8 +59,8 @@
static help_dialog *help_dlg = NULL;
canvas *terrain_canvas(struct terrain *terrain,
- const struct resource *resource,
- enum extra_cause cause);
+ const struct resource *resource = NULL,
+ enum extra_cause cause = EC_COUNT);
/**
Popup the help dialog to get help on the given string topic. Note
that the topic may appear in multiple sections of the help (it may
@@ -172,26 +172,105 @@
**/
void help_dialog::make_tree()
{
+ char *title;
+ int dep;
+ int i;
+ QHash hash;
+ QIcon *icon;
QTreeWidgetItem *item;
- int dep;
- char *title;
- QHash hash;
+ sprite *spite;
+ struct advance *padvance;
+ struct canvas *pcan;
+ struct extra_type *pextra;
+ struct government *gov;
+ struct impr_type *imp;
+ struct terrain *pterrain;
+ struct unit_type *f_type;
+ struct drawn_sprite sprs[80];
help_items_iterate(pitem) {
const char *s;
int last;
title = pitem->topic;
+
for (s = pitem->topic; *s == ' '; s++) {
/* nothing */
}
+
item = new QTreeWidgetItem(QStringList(title));
topics_map[item] = pitem;
dep = s - pitem->topic;
hash.insert(dep, item);
+icon = nullptr;
+
if (dep == 0) {
tree_wdg->addTopLevelItem(item);
} else {
last = dep - 1;
+ spite = nullptr;
+
+ switch (pitem->type) {
+ case HELP_EXTRA:
+pextra = extra_type_by_translated_name(s);
+fill_basic_extra_sprite_array(tileset, sprs, pextra);
+icon = new QIcon(*sprs->sprite->pm);
+break;
+
+ case HELP_GOVERNMENT:
+gov = government_by_translated_name(s);
+spite = get_government_sprite(tileset, gov);
+if (spite) {
+ icon = new QIcon(*spite->pm);
+}
+break;
+
+ case HELP_IMPROVEMENT:
+ case HELP_WONDER:
+imp = improvement_by_translated_name(s);
+spite = get_building_sprite(tileset, imp);
+if (spite) {
+ icon = new QIcon(*spite->pm);
+}
+break;
+
+ case HELP_TECH:
+padvance = advance_by_translated_name(s);
+if (padvance && !is_future_tech(i = advance_number(padvance))) {
+ spite = get_tech_sprite(tileset, i);
+ if (spite) {
+icon = new QIcon(*spite->pm);
+ }
+}
+break;
+
+ case HELP_TERRAIN:
+pterrain = terrain_by_translated_name(s);
+pcan = terrain_canvas(pterrain);
+if (pcan) {
+ icon = new QIcon(pcan->map_pixmap);
+ delete pcan;
+}
+break;
+
+ case HELP_UNIT:
+f_type = unit_type_by_translated_name(s);
+if (f_type) {
+ spite = get_unittype_sprite(tileset, f_type, direction8_invalid(),
+ true);
+}
+if (spite) {
+ icon = new QIcon(*spite->pm);
+}
+break;
+
+ default:
+break;
+ }
+
+ if (icon != nullptr) {
+item->setIcon(0, *icon);
+ }
+
hash.value(last)->addChild(item);
}
} help_items_iterate_end;
@@ -227,6 +306,10 @@
**/
void help_dialog::update_fonts()
{
+ QFont *def_font;
+
+ def_font = gui()->fc_fonts.get_font("gui_qt_font_default");
+ tree_wdg->setFont(*def_font);
help_wdg->update_fonts();
}
@@ -408,13 +491,13 @@
/
Adds a pixmap to the information panel.
/
-void help_widget::add_info_canvas(struct canvas *canvas, bool shadow)
+void help_widget::add_info_pixmap(QPixmap *pm, bool shadow)
{
QLabel *label = new QLabel();
QGraphicsDropShadowEffect *effect;
label->setAlignment(Qt::AlignHCenter);
- label->setPixmap(canvas->map_pixmap);
+ label->setPixmap(*pm);
if (shadow) {
effect = new QGraphicsDropShadowEffect(label);
@@ -530,9 +613,10 @@
/
QString help_widget::link_me(const cha
[Freeciv-commits] r33702 - /trunk/windows/installer_msys2/Makefile
Author: cazfi Date: Thu Aug 25 07:33:14 2016 New Revision: 33702 URL: http://svn.gna.org/viewcvs/freeciv?rev=33702&view=rev Log: Updated msys2 ruledit dll list to match environment 160821. See patch #7652 Modified: trunk/windows/installer_msys2/Makefile Modified: trunk/windows/installer_msys2/Makefile URL: http://svn.gna.org/viewcvs/freeciv/trunk/windows/installer_msys2/Makefile?rev=33702&r1=33701&r2=33702&view=diff == --- trunk/windows/installer_msys2/Makefile (original) +++ trunk/windows/installer_msys2/Makefile Thu Aug 25 07:33:14 2016 @@ -284,25 +284,29 @@ libgraphite2.dll \ libpcre-1.dll -QT_MSYS_DLLS := \ - stdc++-6.dll - install-env-qt: install-env-common # add DLLs cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-$(WINARCH)-$(GUI)/ - cp -R $(addprefix /bin/msys-, $(QT_MSYS_DLLS)) install-$(WINARCH)-$(GUI)/ # add additional Qt files cp -R /$(ARCHDIR)/share/qt5/plugins install-$(WINARCH)-$(GUI)/ cp -R /$(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/ find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -delete -# TODO: Clean out unnecessary ones. These are just copies of COMMON_DLLS and -# COMMON_MSYS_DLLS with most obviously unnecessary things left out. RULEDIT_DLLS := \ libstdc++-6.dll \ + libeay32.dll \ + ssleay32.dll \ libidn-11.dll \ + libnghttp2-14.dll \ + librtmp-1.dll \ libssh2-1.dll \ libcurl-4.dll \ + libgmp-10.dll \ + libgnutls-30.dll \ + libhogweed-4-2.dll \ + libnettle-6-2.dll \ + libp11-kit-0.dll \ + libtasn1-6.dll \ libatk-1.0-0.dll \ libbz2-1.dll \ libcairo-2.dll \ @@ -328,34 +332,10 @@ libgraphite2.dll \ libpcre-1.dll -RULEDIT_MSYS_DLLS := \ - 2.0.dll \ - sqlite3-0.dll \ - ssl-1.0.0.dll \ - $(GCCDLL) \ - z.dll \ - bz2-1.dll \ - crypto-1.0.0.dll \ - gssapi-3.dll \ - heimntlm-0.dll \ - krb5-26.dll \ - asn1-8.dll \ - com_err-1.dll \ - roken-18.dll \ - crypt-0.dll \ - wind-0.dll \ - hx509-5.dll \ - heimbase-1.dll \ - iconv-2.dll \ - intl-8.dll \ - lzma-5.dll - install-env-ruledit: # add DLLs cp -R $(addprefix $(DLLPATH_PREFIX), $(RULEDIT_DLLS)) install-$(WINARCH)-ruledit/ cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-$(WINARCH)-ruledit/ - cp -R $(addprefix /bin/msys-, $(RULEDIT_MSYS_DLLS)) install-$(WINARCH)-ruledit/ - cp -R $(addprefix /bin/msys-, $(QT_MSYS_DLLS)) install-$(WINARCH)-ruledit/ # add additional Qt files cp -R /$(ARCHDIR)/share/qt5/plugins install-$(WINARCH)-ruledit/ cp -R /usr/share/locale install-$(WINARCH)-ruledit/share/ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33703 - /branches/S2_6/win32/installer_msys2/Makefile
Author: cazfi Date: Thu Aug 25 07:33:21 2016 New Revision: 33703 URL: http://svn.gna.org/viewcvs/freeciv?rev=33703&view=rev Log: Updated msys2 ruledit dll list to match environment 160821. See patch #7652 Modified: branches/S2_6/win32/installer_msys2/Makefile Modified: branches/S2_6/win32/installer_msys2/Makefile URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/win32/installer_msys2/Makefile?rev=33703&r1=33702&r2=33703&view=diff == --- branches/S2_6/win32/installer_msys2/Makefile(original) +++ branches/S2_6/win32/installer_msys2/MakefileThu Aug 25 07:33:21 2016 @@ -273,25 +273,29 @@ libgraphite2.dll \ libpcre-1.dll -QT_MSYS_DLLS := \ - stdc++-6.dll - install-env-qt: install-env-common # add DLLs cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-$(WINARCH)-$(GUI)/ - cp -R $(addprefix /bin/msys-, $(QT_MSYS_DLLS)) install-$(WINARCH)-$(GUI)/ # add additional Qt files cp -R /$(ARCHDIR)/share/qt5/plugins install-$(WINARCH)-$(GUI)/ cp -R /$(ARCHDIR)/share/locale install-$(WINARCH)-$(GUI)/share/ find install-$(WINARCH)-$(GUI)/share/locale -type f -not -name "freeciv*.mo" -delete -# TODO: Clean out unnecessary ones. These are just copies of COMMON_DLLS and -# COMMON_MSYS_DLLS with most obviously unnecessary things left out. RULEDIT_DLLS := \ libstdc++-6.dll \ + libeay32.dll \ + ssleay32.dll \ libidn-11.dll \ + libnghttp2-14.dll \ + librtmp-1.dll \ libssh2-1.dll \ libcurl-4.dll \ + libgmp-10.dll \ + libgnutls-30.dll \ + libhogweed-4-2.dll \ + libnettle-6-2.dll \ + libp11-kit-0.dll \ + libtasn1-6.dll \ libatk-1.0-0.dll \ libbz2-1.dll \ libcairo-2.dll \ @@ -317,34 +321,10 @@ libgraphite2.dll \ libpcre-1.dll -RULEDIT_MSYS_DLLS := \ - 2.0.dll \ - sqlite3-0.dll \ - ssl-1.0.0.dll \ - $(GCCDLL) \ - z.dll \ - bz2-1.dll \ - crypto-1.0.0.dll \ - gssapi-3.dll \ - heimntlm-0.dll \ - krb5-26.dll \ - asn1-8.dll \ - com_err-1.dll \ - roken-18.dll \ - crypt-0.dll \ - wind-0.dll \ - hx509-5.dll \ - heimbase-1.dll \ - iconv-2.dll \ - intl-8.dll \ - lzma-5.dll - install-env-ruledit: # add DLLs cp -R $(addprefix $(DLLPATH_PREFIX), $(RULEDIT_DLLS)) install-$(WINARCH)-ruledit/ cp -R $(addprefix $(DLLPATH_PREFIX), $(QT_DLLS)) install-$(WINARCH)-ruledit/ - cp -R $(addprefix /bin/msys-, $(RULEDIT_MSYS_DLLS)) install-$(WINARCH)-ruledit/ - cp -R $(addprefix /bin/msys-, $(QT_MSYS_DLLS)) install-$(WINARCH)-ruledit/ # add additional Qt files cp -R /$(ARCHDIR)/share/qt5/plugins install-$(WINARCH)-ruledit/ cp -R /usr/share/locale install-$(WINARCH)-ruledit/share/ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33704 - in /trunk/client: gui-gtk-3.0/pages.c gui-gtk-3.x/pages.c
Author: cazfi
Date: Thu Aug 25 08:30:43 2016
New Revision: 33704
URL: http://svn.gna.org/viewcvs/freeciv?rev=33704&view=rev
Log:
Corrected "Choose a Scenario" label placement in gtk3-clients
Reported by Jacob Nevins
See bug #24882
Modified:
trunk/client/gui-gtk-3.0/pages.c
trunk/client/gui-gtk-3.x/pages.c
Modified: trunk/client/gui-gtk-3.0/pages.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/pages.c?rev=33704&r1=33703&r2=33704&view=diff
==
--- trunk/client/gui-gtk-3.0/pages.c(original)
+++ trunk/client/gui-gtk-3.0/pages.cThu Aug 25 08:30:43 2016
@@ -3150,6 +3150,15 @@
g_signal_connect(view, "row-activated",
G_CALLBACK(scenario_callback), NULL);
+ label = g_object_new(GTK_TYPE_LABEL,
+"use-underline", TRUE,
+"mnemonic-widget", view,
+"label", _("Choose a _Scenario:"),
+"xalign", 0.0,
+"yalign", 0.5,
+NULL);
+ gtk_container_add(GTK_CONTAINER(vbox), label);
+
sbox = gtk_grid_new();
gtk_grid_set_column_spacing(GTK_GRID(sbox), 12);
gtk_grid_set_row_homogeneous(GTK_GRID(sbox), TRUE);
@@ -3157,15 +3166,6 @@
GTK_ORIENTATION_VERTICAL);
gtk_grid_set_row_spacing(GTK_GRID(sbox), 2);
gtk_container_add(GTK_CONTAINER(vbox), sbox);
-
- label = g_object_new(GTK_TYPE_LABEL,
-"use-underline", TRUE,
-"mnemonic-widget", view,
-"label", _("Choose a _Scenario:"),
-"xalign", 0.0,
-"yalign", 0.5,
-NULL);
- gtk_container_add(GTK_CONTAINER(sbox), label);
hbox = gtk_grid_new();
gtk_grid_set_column_homogeneous(GTK_GRID(hbox), TRUE);
Modified: trunk/client/gui-gtk-3.x/pages.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.x/pages.c?rev=33704&r1=33703&r2=33704&view=diff
==
--- trunk/client/gui-gtk-3.x/pages.c(original)
+++ trunk/client/gui-gtk-3.x/pages.cThu Aug 25 08:30:43 2016
@@ -3150,6 +3150,15 @@
g_signal_connect(view, "row-activated",
G_CALLBACK(scenario_callback), NULL);
+ label = g_object_new(GTK_TYPE_LABEL,
+"use-underline", TRUE,
+"mnemonic-widget", view,
+"label", _("Choose a _Scenario:"),
+"xalign", 0.0,
+"yalign", 0.5,
+NULL);
+ gtk_container_add(GTK_CONTAINER(vbox), label);
+
sbox = gtk_grid_new();
gtk_grid_set_column_spacing(GTK_GRID(sbox), 12);
gtk_grid_set_row_homogeneous(GTK_GRID(sbox), TRUE);
@@ -3157,15 +3166,6 @@
GTK_ORIENTATION_VERTICAL);
gtk_grid_set_row_spacing(GTK_GRID(sbox), 2);
gtk_container_add(GTK_CONTAINER(vbox), sbox);
-
- label = g_object_new(GTK_TYPE_LABEL,
-"use-underline", TRUE,
-"mnemonic-widget", view,
-"label", _("Choose a _Scenario:"),
-"xalign", 0.0,
-"yalign", 0.5,
-NULL);
- gtk_container_add(GTK_CONTAINER(sbox), label);
hbox = gtk_grid_new();
gtk_grid_set_column_homogeneous(GTK_GRID(hbox), TRUE);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33706 - /branches/S2_5/client/gui-gtk-3.0/pages.c
Author: cazfi
Date: Thu Aug 25 08:31:01 2016
New Revision: 33706
URL: http://svn.gna.org/viewcvs/freeciv?rev=33706&view=rev
Log:
Corrected "Choose a Scenario" label placement in gtk3-client
Reported by Jacob Nevins
See bug #24882
Modified:
branches/S2_5/client/gui-gtk-3.0/pages.c
Modified: branches/S2_5/client/gui-gtk-3.0/pages.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/pages.c?rev=33706&r1=33705&r2=33706&view=diff
==
--- branches/S2_5/client/gui-gtk-3.0/pages.c(original)
+++ branches/S2_5/client/gui-gtk-3.0/pages.cThu Aug 25 08:31:01 2016
@@ -3120,6 +3120,15 @@
g_signal_connect(view, "row-activated",
G_CALLBACK(scenario_callback), NULL);
+ label = g_object_new(GTK_TYPE_LABEL,
+"use-underline", TRUE,
+"mnemonic-widget", view,
+"label", _("Choose a _Scenario:"),
+"xalign", 0.0,
+"yalign", 0.5,
+NULL);
+ gtk_container_add(GTK_CONTAINER(vbox), label);
+
sbox = gtk_grid_new();
gtk_grid_set_column_spacing(GTK_GRID(sbox), 12);
gtk_grid_set_row_homogeneous(GTK_GRID(sbox), TRUE);
@@ -3127,15 +3136,6 @@
GTK_ORIENTATION_VERTICAL);
gtk_grid_set_row_spacing(GTK_GRID(sbox), 2);
gtk_container_add(GTK_CONTAINER(vbox), sbox);
-
- label = g_object_new(GTK_TYPE_LABEL,
-"use-underline", TRUE,
-"mnemonic-widget", view,
-"label", _("Choose a _Scenario:"),
-"xalign", 0.0,
-"yalign", 0.5,
-NULL);
- gtk_container_add(GTK_CONTAINER(sbox), label);
hbox = gtk_grid_new();
gtk_grid_set_column_homogeneous(GTK_GRID(hbox), TRUE);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33705 - /branches/S2_6/client/gui-gtk-3.0/pages.c
Author: cazfi
Date: Thu Aug 25 08:30:55 2016
New Revision: 33705
URL: http://svn.gna.org/viewcvs/freeciv?rev=33705&view=rev
Log:
Corrected "Choose a Scenario" label placement in gtk3-client
Reported by Jacob Nevins
See bug #24882
Modified:
branches/S2_6/client/gui-gtk-3.0/pages.c
Modified: branches/S2_6/client/gui-gtk-3.0/pages.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/pages.c?rev=33705&r1=33704&r2=33705&view=diff
==
--- branches/S2_6/client/gui-gtk-3.0/pages.c(original)
+++ branches/S2_6/client/gui-gtk-3.0/pages.cThu Aug 25 08:30:55 2016
@@ -3142,6 +3142,15 @@
g_signal_connect(view, "row-activated",
G_CALLBACK(scenario_callback), NULL);
+ label = g_object_new(GTK_TYPE_LABEL,
+"use-underline", TRUE,
+"mnemonic-widget", view,
+"label", _("Choose a _Scenario:"),
+"xalign", 0.0,
+"yalign", 0.5,
+NULL);
+ gtk_container_add(GTK_CONTAINER(vbox), label);
+
sbox = gtk_grid_new();
gtk_grid_set_column_spacing(GTK_GRID(sbox), 12);
gtk_grid_set_row_homogeneous(GTK_GRID(sbox), TRUE);
@@ -3149,15 +3158,6 @@
GTK_ORIENTATION_VERTICAL);
gtk_grid_set_row_spacing(GTK_GRID(sbox), 2);
gtk_container_add(GTK_CONTAINER(vbox), sbox);
-
- label = g_object_new(GTK_TYPE_LABEL,
-"use-underline", TRUE,
-"mnemonic-widget", view,
-"label", _("Choose a _Scenario:"),
-"xalign", 0.0,
-"yalign", 0.5,
-NULL);
- gtk_container_add(GTK_CONTAINER(sbox), label);
hbox = gtk_grid_new();
gtk_grid_set_column_homogeneous(GTK_GRID(hbox), TRUE);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33708 - in /branches/S2_6/data/wonders: mausoleum_of_halicarnassus.png temple_of_artemis.png
Author: cazfi Date: Thu Aug 25 08:51:35 2016 New Revision: 33708 URL: http://svn.gna.org/viewcvs/freeciv?rev=33708&view=rev Log: Added frame to large icons of Tample of Artemis and Mausoleum of Halicarnassus. See bug #25009 Modified: branches/S2_6/data/wonders/mausoleum_of_halicarnassus.png branches/S2_6/data/wonders/temple_of_artemis.png Modified: branches/S2_6/data/wonders/mausoleum_of_halicarnassus.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/wonders/mausoleum_of_halicarnassus.png?rev=33708&r1=33707&r2=33708&view=diff == Binary files - no diff available. Modified: branches/S2_6/data/wonders/temple_of_artemis.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/data/wonders/temple_of_artemis.png?rev=33708&r1=33707&r2=33708&view=diff == Binary files - no diff available. ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33707 - in /trunk/data/wonders: mausoleum_of_halicarnassus.png temple_of_artemis.png
Author: cazfi Date: Thu Aug 25 08:51:30 2016 New Revision: 33707 URL: http://svn.gna.org/viewcvs/freeciv?rev=33707&view=rev Log: Added frame to large icons of Tample of Artemis and Mausoleum of Halicarnassus. See bug #25009 Modified: trunk/data/wonders/mausoleum_of_halicarnassus.png trunk/data/wonders/temple_of_artemis.png Modified: trunk/data/wonders/mausoleum_of_halicarnassus.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/wonders/mausoleum_of_halicarnassus.png?rev=33707&r1=33706&r2=33707&view=diff == Binary files - no diff available. Modified: trunk/data/wonders/temple_of_artemis.png URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/wonders/temple_of_artemis.png?rev=33707&r1=33706&r2=33707&view=diff == Binary files - no diff available. ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r33709 - in /branches/S2_5/data/wonders: mausoleum_of_halicarnassus.png temple_of_artemis.png
Author: cazfi Date: Thu Aug 25 08:51:40 2016 New Revision: 33709 URL: http://svn.gna.org/viewcvs/freeciv?rev=33709&view=rev Log: Added frame to large icons of Tample of Artemis and Mausoleum of Halicarnassus. See bug #25009 Modified: branches/S2_5/data/wonders/mausoleum_of_halicarnassus.png branches/S2_5/data/wonders/temple_of_artemis.png Modified: branches/S2_5/data/wonders/mausoleum_of_halicarnassus.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/wonders/mausoleum_of_halicarnassus.png?rev=33709&r1=33708&r2=33709&view=diff == Binary files - no diff available. Modified: branches/S2_5/data/wonders/temple_of_artemis.png URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/wonders/temple_of_artemis.png?rev=33709&r1=33708&r2=33709&view=diff == Binary files - no diff available. ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
