Author: mir3x Date: Sun Feb 14 10:11:44 2016 New Revision: 31918 URL: http://svn.gna.org/viewcvs/freeciv?rev=31918&view=rev Log: Added default font to qt client.
See patch #6941 Modified: branches/S2_6/client/gui-qt/fc_client.cpp branches/S2_6/client/gui-qt/gui_main.cpp branches/S2_6/client/options.c branches/S2_6/client/options.h Modified: branches/S2_6/client/gui-qt/fc_client.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/fc_client.cpp?rev=31918&r1=31917&r2=31918&view=diff ============================================================================== --- branches/S2_6/client/gui-qt/fc_client.cpp (original) +++ branches/S2_6/client/gui-qt/fc_client.cpp Sun Feb 14 10:11:44 2016 @@ -765,9 +765,13 @@ /**************************************************************************** Adds new font or overwrite old one ****************************************************************************/ -void fc_font::set_font(QString name, QFont * qf) -{ - font_map.insert(name,qf); +void fc_font::set_font(QString name, QFont *qf) +{ + font_map.insert(name, qf); + /* Automatically set default font */ + if (name == "gui_qt_font_default") { + QApplication::setFont(*qf); + } } /**************************************************************************** Modified: branches/S2_6/client/gui-qt/gui_main.cpp URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-qt/gui_main.cpp?rev=31918&r1=31917&r2=31918&view=diff ============================================================================== --- branches/S2_6/client/gui-qt/gui_main.cpp (original) +++ branches/S2_6/client/gui-qt/gui_main.cpp Sun Feb 14 10:11:44 2016 @@ -202,6 +202,8 @@ } option_var_set_callback(gui_qt_font_city_names, + apply_font); + option_var_set_callback(gui_qt_font_default, apply_font); option_var_set_callback(gui_qt_font_city_productions, apply_font); Modified: branches/S2_6/client/options.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/options.c?rev=31918&r1=31917&r2=31918&view=diff ============================================================================== --- branches/S2_6/client/options.c (original) +++ branches/S2_6/client/options.c Sun Feb 14 10:11:44 2016 @@ -274,6 +274,7 @@ /* gui-qt client specific options. */ .gui_qt_fullscreen = FALSE, .gui_qt_font_city_label = "Monospace,8,-1,5,50,0,0,0,0,0", + .gui_qt_font_default = "Sans Serif,10,-1,5,75,0,0,0,0,0", .gui_qt_font_notify_label = "Monospace,8,-1,5,75,0,0,0,0,0", .gui_qt_font_spaceship_label = "Monospace,8,-1,5,50,0,0,0,0,0", .gui_qt_font_help_label = "Sans Serif,9,-1,5,50,0,0,0,0,0", @@ -2793,6 +2794,11 @@ "dialogs."), COC_FONT, GUI_QT, "Monospace,8,-1,5,50,0,0,0,0,0", font_changed_callback), + GEN_FONT_OPTION(gui_qt_font_default, "default_font", + N_("Default font"), + N_("This is default font"), + COC_FONT, GUI_QT, + "Sans Serif,10,-1,5,75,0,0,0,0,0", font_changed_callback), GEN_FONT_OPTION(gui_qt_font_notify_label, "notify_label", N_("Notify Label"), N_("This font is used to display server reports such " Modified: branches/S2_6/client/options.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/options.h?rev=31918&r1=31917&r2=31918&view=diff ============================================================================== --- branches/S2_6/client/options.h (original) +++ branches/S2_6/client/options.h Sun Feb 14 10:11:44 2016 @@ -290,6 +290,7 @@ bool gui_qt_fullscreen; bool gui_qt_allied_chat_only; char gui_qt_font_city_label[512]; + char gui_qt_font_default[512]; char gui_qt_font_notify_label[512]; char gui_qt_font_spaceship_label[512]; char gui_qt_font_help_label[512]; _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits