Author: mir3x
Date: Sun Aug 28 20:13:59 2016
New Revision: 33723
URL: http://svn.gna.org/viewcvs/freeciv?rev=33723&view=rev
Log:
Qt client - fixed manu in pregame page
Patch by Louis Moureaux <louis94>
See bug #25017
Modified:
trunk/client/gui-qt/fc_client.cpp
trunk/client/gui-qt/fc_client.h
trunk/client/gui-qt/pages.cpp
Modified: trunk/client/gui-qt/fc_client.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/fc_client.cpp?rev=33723&r1=33722&r2=33723&view=diff
==============================================================================
--- trunk/client/gui-qt/fc_client.cpp (original)
+++ trunk/client/gui-qt/fc_client.cpp Sun Aug 28 20:13:59 2016
@@ -239,6 +239,14 @@
}
/****************************************************************************
+ Slot to send fake chat messages. Do not use in new code.
+****************************************************************************/
+void fc_client::send_fake_chat_message(const QString &message)
+{
+ send_chat_message(message);
+}
+
+/****************************************************************************
Appends text to chat window
****************************************************************************/
void fc_client::chat_message_received(const QString &message,
Modified: trunk/client/gui-qt/fc_client.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/fc_client.h?rev=33723&r1=33722&r2=33723&view=diff
==============================================================================
--- trunk/client/gui-qt/fc_client.h (original)
+++ trunk/client/gui-qt/fc_client.h Sun Aug 28 20:13:59 2016
@@ -274,7 +274,7 @@
void update_sidebar_tooltips();
private slots:
-
+ void send_fake_chat_message(const QString &message);
void server_input(int sock);
void closing();
void slot_lan_scan();
Modified: trunk/client/gui-qt/pages.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-qt/pages.cpp?rev=33723&r1=33722&r2=33723&view=diff
==============================================================================
--- trunk/client/gui-qt/pages.cpp (original)
+++ trunk/client/gui-qt/pages.cpp Sun Aug 28 20:13:59 2016
@@ -1972,7 +1972,7 @@
menu.addAction(action);
}
connect(player_menu_mapper, SIGNAL(mapped(const QString &)),
- this, SLOT(send_chat_message(const QString &)));
+ this, SLOT(send_fake_chat_message(const QString &)));
menu.exec(global_pos);
return;
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
