Author: mir3x
Date: Sun Dec 6 17:19:24 2015
New Revision: 30869
URL: http://svn.gna.org/viewcvs/freeciv?rev=30869&view=rev
Log:
Qt-client - reverted patch #6648 for S2_5.
See patch #6648
Modified:
branches/S2_5/client/gui-qt/chatline.cpp
branches/S2_5/client/options.c
Modified: branches/S2_5/client/gui-qt/chatline.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-qt/chatline.cpp?rev=30869&r1=30868&r2=30869&view=diff
==============================================================================
--- branches/S2_5/client/gui-qt/chatline.cpp (original)
+++ branches/S2_5/client/gui-qt/chatline.cpp Sun Dec 6 17:19:24 2015
@@ -20,7 +20,6 @@
#include <QStyleFactory>
// client
-#include "audio.h"
#include "climisc.h" /* for write_chatline_content */
#include "climap.h"
#include "control.h"
@@ -33,7 +32,6 @@
#include "chatline.h"
-extern char gui_qt_wakeup_text[512];
static bool gui_qt_allied_chat_only = false;
static bool is_plain_public_message(QString s);
static QString replace_html(QString str);
@@ -503,24 +501,12 @@
int conn_id)
{
QString str;
- QString wakeup;
str = QString::fromUtf8(astring);
gui()->set_status_bar(str);
gui()->update_completer();
str = replace_html(str);
- wakeup = gui_qt_wakeup_text;
-
- /* Format wakeup string if needed */
- if (wakeup.contains("%1")) {
- wakeup = wakeup.arg(client.conn.username);
- }
-
- /* Play sound if we encountered wakeup string */
- if (str.contains(wakeup) && client_state() < C_S_RUNNING) {
- audio_play_sound(get_event_sound_tag(E_IMP_SOLD), NULL);
- }
gui()->append_output_window(apply_tags(str, tags, false));
if (gui()->infotab != NULL) {
gui()->infotab->chtwdg->append(apply_tags(str, tags, true));
Modified: branches/S2_5/client/options.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/options.c?rev=30869&r1=30868&r2=30869&view=diff
==============================================================================
--- branches/S2_5/client/options.c (original)
+++ branches/S2_5/client/options.c Sun Dec 6 17:19:24 2015
@@ -248,7 +248,6 @@
char gui_qt_font_city_names[512] = "Sans Serif,10,-1,5,75,0,0,0,0,0";
char gui_qt_font_city_productions[512] = "Sans Serif,10,-1,5,50,1,0,0,0,0";
char gui_qt_font_reqtree_text[512] = "Sans Serif,10,-1,5,50,1,0,0,0,0";
-char gui_qt_wakeup_text[512] = "Wake up %1";
/* Set to TRUE after the first call to options_init(), to avoid the usage
* of non-initialized datas when calling the changed callback. */
@@ -2683,12 +2682,7 @@
N_("This font is used to the display the requirement tree "
"in the Research report."),
COC_FONT, GUI_QT,
- "Sans Serif,10,-1,5,50,1,0,0,0,0", NULL),
- GEN_STR_OPTION(gui_qt_wakeup_text,
- N_("Wake up sequence"),
- N_("String which will trigger sound in pregame page,"
- "%1 stands for nick"),
- COC_INTERFACE, GUI_QT, "Wake up %1", NULL)
+ "Sans Serif,10,-1,5,50,1,0,0,0,0", NULL)
};
static const int client_options_num = ARRAY_SIZE(client_options);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
