Author: cazfi
Date: Mon Jul 25 14:19:04 2016
New Revision: 33323
URL: http://svn.gna.org/viewcvs/freeciv?rev=33323&view=rev
Log:
Added beta version message for sdl-clients.
See patch #7494
Modified:
branches/S2_6/client/gui-sdl/chatline.h
branches/S2_6/client/gui-sdl/pages.c
branches/S2_6/client/gui-sdl2/chatline.h
branches/S2_6/client/gui-sdl2/messagewin.c
branches/S2_6/client/gui-sdl2/pages.c
Modified: branches/S2_6/client/gui-sdl/chatline.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/chatline.h?rev=33323&r1=33322&r2=33323&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/chatline.h (original)
+++ branches/S2_6/client/gui-sdl/chatline.h Mon Jul 25 14:19:04 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -11,13 +11,13 @@
GNU General Public License for more details.
***********************************************************************/
-/**********************************************************************
+/***********************************************************************
chatline.h - description
-------------------
begin : Sun Jun 30 2002
copyright : (C) 2002 by RafaÅ Bursig
email : RafaÅ Bursig <bur...@poczta.fm>
- **********************************************************************/
+***********************************************************************/
#ifndef FC__CHATLINE_H
#define FC__CHATLINE_H
@@ -28,7 +28,7 @@
bool popdown_conn_list_dialog(void);
void popdown_load_game_dialog(void);
-#define set_output_window_text( pString ) \
- output_window_append( ftc_any, pString )
+#define set_output_window_text(_pstr_) \
+ output_window_append( ftc_any, _pstr_ )
#endif /* FC__CHATLINE_H */
Modified: branches/S2_6/client/gui-sdl/pages.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/pages.c?rev=33323&r1=33322&r2=33323&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/pages.c (original)
+++ branches/S2_6/client/gui-sdl/pages.c Mon Jul 25 14:19:04 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996-2004 - The Freeciv Team
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -307,24 +307,28 @@
group_set_area(pWidget, pWindow->prev, area);
setup_vertical_widgets_position(1, area.x, area.y, area.w, h, pWidget,
pWindow->prev);
-
+
area.h = h * 2;
SDL_FillRectAlpha(pWindow->theme, &area, &bg_color);
-
+
widget_set_position(pWindow,
(Main.screen->w - pWindow->size.w) - adj_size(20),
(Main.screen->h - pWindow->size.h) - adj_size(20));
draw_intro_gfx();
-
+
redraw_group(pStartMenu->pBeginWidgetList, pStartMenu->pEndWidgetList,
FALSE);
putline(pWindow->dst->surface,
area.x, area.y + (h * 2 - 1),
area.x + area.w - 1, area.y + (h * 2 - 1),
line_color);
-
+
set_output_window_text(_("SDLClient welcomes you..."));
+
+#if IS_BETA_VERSION
+ set_output_window_text(beta_message());
+#endif /* IS_BETA_VERSION */
rev_ver = fc_git_revision();
if (rev_ver != NULL) {
@@ -341,9 +345,12 @@
flush_all();
}
+/**************************************************************************
+ Close start menu
+**************************************************************************/
static void popdown_start_menu()
{
- if(pStartMenu) {
+ if (pStartMenu) {
popdown_window_group_dialog(pStartMenu->pBeginWidgetList,
pStartMenu->pEndWidgetList);
FC_FREE(pStartMenu);
Modified: branches/S2_6/client/gui-sdl2/chatline.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/chatline.h?rev=33323&r1=33322&r2=33323&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/chatline.h (original)
+++ branches/S2_6/client/gui-sdl2/chatline.h Mon Jul 25 14:19:04 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -11,13 +11,13 @@
GNU General Public License for more details.
***********************************************************************/
-/**********************************************************************
+/***********************************************************************
chatline.h - description
-------------------
begin : Sun Jun 30 2002
copyright : (C) 2002 by RafaÅ Bursig
email : RafaÅ Bursig <bur...@poczta.fm>
- **********************************************************************/
+***********************************************************************/
#ifndef FC__CHATLINE_H
#define FC__CHATLINE_H
@@ -28,7 +28,7 @@
bool popdown_conn_list_dialog(void);
void popdown_load_game_dialog(void);
-#define set_output_window_text( pString ) \
- output_window_append( ftc_any, pString )
+#define set_output_window_text(_pstr_) \
+ output_window_append(ftc_any, _pstr_)
#endif /* FC__CHATLINE_H */
Modified: branches/S2_6/client/gui-sdl2/messagewin.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/messagewin.c?rev=33323&r1=33322&r2=33323&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/messagewin.c (original)
+++ branches/S2_6/client/gui-sdl2/messagewin.c Mon Jul 25 14:19:04 2016
@@ -181,7 +181,7 @@
if (create) {
add_widget_to_vertical_scroll_widget_list(pMsg_Dlg, pBuf,
pWindow, FALSE,
area.x, area.y);
- create = FALSE;
+ create = FALSE;
} else {
add_widget_to_vertical_scroll_widget_list(pMsg_Dlg, pBuf,
pMsg_Dlg->pBeginActiveWidgetList,
@@ -221,7 +221,7 @@
add_widget_to_vertical_scroll_widget_list(pMsg_Dlg, pBuf,
pWindow, FALSE,
area.x, area.y);
- create = FALSE;
+ create = FALSE;
} else {
add_widget_to_vertical_scroll_widget_list(pMsg_Dlg, pBuf,
pMsg_Dlg->pBeginActiveWidgetList,
@@ -266,8 +266,6 @@
pMsg_Dlg->pEndWidgetList = pWindow;
pMsg_Dlg->pBeginWidgetList = pWindow;
-/* area = pWindow->area;*/
-
/* create scrollbar */
create_vertical_scrollbar(pMsg_Dlg, 1, N_MSG_VIEW, TRUE, TRUE);
Modified: branches/S2_6/client/gui-sdl2/pages.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/pages.c?rev=33323&r1=33322&r2=33323&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/pages.c (original)
+++ branches/S2_6/client/gui-sdl2/pages.c Mon Jul 25 14:19:04 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996-2004 - The Freeciv Team
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -337,6 +337,10 @@
set_output_window_text(_("SDL2-client welcomes you..."));
+#if IS_BETA_VERSION
+ set_output_window_text(beta_message());
+#endif /* IS_BETA_VERSION */
+
rev_ver = fc_git_revision();
if (rev_ver != NULL) {
char buffer[512];
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
