DELTA 18893 6499 698 SVN‰% ŠT;€‡g‚#…ƒ€‚q…2€qˆ€GMOCCMD=@MOCCMD@ include $(top_srcdir)/bootstrap/Makerules.mk noinst_LTLIBRARIES = libgui-qt.la AM_CPPFLAGS = \ -I. \ -I$(srcdir)/.. \ -I$(srcdir)/../include \ -I$(top_srcdir)/utility \ -I$(top_srcdir)/common \ -I$(top_srcdir)/common/aicore \ -I$(top_srcdir)/common/networking \ -I$(srcdir)/../agents \ -I$(top_srcdir)/dependencies/tinycthread \ $(gui_qt_cppflags) $(SOUND_CFLAGS) AM_CFLAGS = $(gui_qt_cflags) AM_CXXFLAGS = $(gui_qt_cxxflags) MOC_FILES = \ meta_fc_client.cpp \ meta_ratesdlg.cpp \ meta_mapview.cpp \ meta_menu.cpp \ meta_repodlgs.cpp \ meta_dialogs.cpp \ meta_optiondlg.cpp \ meta_citydlg.cpp \ meta_cityrep.cpp \ meta_fonts.cpp \ meta_helpdlg.cpp \ meta_plrdlg.cpp \ meta_diplodlg.cpp \ meta_spaceshipdlg.cpp \ meta_messagewin.cpp \ meta_chatline.cpp \ meta_messagedlg.cpp \ meta_sidebar.cpp \ meta_voteinfo_bar.cpp \ meta_gotodlg.cppdlg.hc_client.cpp \ fc_client.h \ fonts.cpp \ fonts.h \ finddlg.cpp \ finddlg.h \ gotodlg.cpp \ gotodlg.h \ graphics.cpp \ graphics.h \ gui_main.cpp \ gui_main.h \ helpdlg.cpp \ helpdlg.h \ inteldlg.cpp \ inteldlg.h \ listener.h \ luaconsole.cpp \ luaconsolexxside.cpp \ qtg_cxxside.h \ ratesdlg.cpp \ ratesdlg.h \ repodlgs.cpp \ repodlgs.h \ sidebar.cpp \ sidebar nodist_libgui_qt_la_SOURCES = $(MOC_FILES) CLEANFILES = $(MOC_FILES) ENDREP DELTA 33719 511655 273 SVN‘]’|7‹k…Ћ]€2µGÜfontsfont; QFont *f; QFont *remove_old; QString s; s = option_font_get(poption); font.fromString(s); s = option_name(poption); font_options_listener::set_font(s, font);ENDREP DELTA SVN ) )€ )/********************************************************************** 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 the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ***********************************************************************/ #include "fonts.h" // client #include "options.h" // Qt #include FC_CPP_DECLARE_LISTENER(font_options_listener) QMap font_options_listener::font_map = QMap(); /*************************************************************************** Constructor ***************************************************************************/ font_options_listener::font_options_listener() { if (font_map.empty()) { init_font_map(); } } /*************************************************************************** Initializes the font map ***************************************************************************/ void font_options_listener::init_font_map() { QFont font; QString s; options_iterate(client_optset, poption) { if (option_type(poption) == OT_FONT) { s = option_font_get(poption); font.fromString(s); s = option_name(poption); font_map[s] = font; } } options_iterate_end; } /*************************************************************************** Called whenever a font changes. Default implementation does nothing. ***************************************************************************/ void font_options_listener::update_font(const QString &name, const QFont &font) {} /*************************************************************************** Returns the font with the given name. ***************************************************************************/ QFont font_options_listener::get_font(const QString &name) const { return font_map[name]; } /*************************************************************************** Returns the appropriate QFont for the given client_font ***************************************************************************/ QFont font_options_listener::get_font(client_font font) { if (font_map.empty()) { init_font_map(); } switch (font) { case FONT_CITY_NAME: return font_map[fonts::city_names]; case FONT_CITY_PROD: return font_map[fonts::city_productions]; case FONT_REQTREE_TEXT: return font_map[fonts::reqtree_text]; case FONT_COUNT: break; // Will trigger a warning if not all cases are covered } // Reasonable default return font_map[fonts::default_font]; } /*************************************************************************** Sets the font with the given name. The configuration is *not* updated. ***************************************************************************/ void font_options_listener::set_font(const QString &name, const QFont &font) { font_map[name] = font; invoke(&font_options_listener::update_font, name, font); } /*************************************************************************** Constructor. ***************************************************************************/ font_updater::font_updater(QWidget *widget, const QString &font_name) : QObject(widget), font_name(font_name), widget(widget) { widget->setFont(get_font(font_name)); font_options_listener::listen(); } /*************************************************************************** Updates the widget's font. ***************************************************************************/ void font_updater::update_font(const QString &name, const QFont &font) { if (name == font_name) { widget->setFont(font); } } ENDREP DELTA SVN›D›D€›D/********************************************************************** 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 the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ***********************************************************************/ #ifndef FC__FONTS_H #define FC__FONTS_H // gui-qt #include "listener.h" // client #include "canvas_g.h" // client_font // Qt #include #include #include class QWidget; /*************************************************************************** The list of font names supported by the font classes. Keep it in sync with the options in client/options.c ***************************************************************************/ namespace fonts { const char * const city_label = "gui_qt_font_city_label"; const char * const default_font = "gui_qt_font_default"; const char * const notify_label = "gui_qt_font_notify_label"; const char * const spaceship_label = "gui_qt_font_spaceship_label"; const char * const help_label = "gui_qt_font_help_label"; const char * const help_link = "gui_qt_font_help_link"; const char * const help_text = "gui_qt_font_help_text"; const char * const help_title = "gui_qt_font_help_title"; const char * const chatline = "gui_qt_font_chatline"; const char * const beta_label = "gui_qt_font_beta_label"; const char * const small = "gui_qt_font_small"; const char * const comment_label = "gui_qt_font_comment_label"; const char * const city_names = "gui_qt_font_city_names"; const char * const city_productions = "gui_qt_font_city_productions"; const char * const reqtree_text = "gui_qt_font_reqtree_text"; } /*************************************************************************** Handles font configuration. Font names are those defined in the fonts namespace. ***************************************************************************/ class font_options_listener : public listener { static QMap font_map; static void init_font_map(); public: static void set_font(const QString &name, const QFont &value); static QFont get_font(client_font font); explicit font_options_listener(); virtual void update_font(const QString &name, const QFont &font); QFont get_font(const QString &name) const; }; /*************************************************************************** Automatically updates the font of a widget whenever it changes. All you need to do is creating a font_updater: ~~~~~{.cpp} new font_updater(the_widget, the_font_name); ~~~~~ You don't need to care about deleting this object. ***************************************************************************/ class font_updater : public QObject, private font_options_listener { Q_OBJECT QString font_name; QWidget *widget; public: explicit font_updater(QWidget *widget, const QString &font_name); private: virtual void update_font(const QString &name, const QFont &font); }; #endif // FC__FONTS_H ENDREP id: 6if.5ck.r33733/9396 type: file pred: 6if.5ck.r33719/613530 count: 32 text: 33733 0 1408 2061 5e48592207ded3ddd31bb2ebeded3482 cpath: /trunk/client/gui-qt/Makefile.am copyroot: 15280 /trunk id: 2p33.5ck.r33733/9590 type: file count: 0 text: 33733 1681 4151 4137 ea6e49382a5ef202b71c07ac5a8d0bbf cpath: /trunk/client/gui-qt/fonts.cpp copyroot: 15280 /trunk id: 2p35.5ck.r33733/9757 type: file count: 0 text: 33733 5845 3538 3524 75af76c831e9030386214527aacc360e cpath: /trunk/client/gui-qt/fonts.h copyroot: 15280 /trunk id: 6j1.5ck.r33733/9922 type: file pred: 6j1.5ck.r33719/615006 count: 50 text: 33733 1436 215 18812 1cfa4ae49a964127f2cc69226a62b406 props: 26905 81965 34 0 25e6c2f7558b7484000d4d090dea5b92 cpath: /trunk/client/gui-qt/gui_main.cpp copyroot: 15280 /trunk PLAIN K 11 Makefile.am V 24 file 6if.5ck.r33733/9396 K 10 canvas.cpp V 22 file 6ig.5ck.r33492/60 K 8 canvas.h V 25 file 6ih.5ck.r26905/85299 K 12 chatline.cpp V 24 file 6ii.5ck.r33710/5122 K 10 chatline.h V 24 file 6ij.5ck.r33710/5376 K 11 citydlg.cpp V 25 file 6ik.5ck.r33226/78470 K 9 citydlg.h V 24 file gr2.5ck.r33189/5637 K 11 cityrep.cpp V 26 file 6il.5ck.r33719/613727 K 9 cityrep.h V 25 file 6im.5ck.r32721/65718 K 10 colors.cpp V 25 file 6in.5ck.r31090/22860 K 8 colors.h V 25 file 6io.5ck.r26905/93658 K 14 connectdlg.cpp V 24 file 6ip.5ck.r30747/1785 K 12 connectdlg.h V 25 file 6iq.5ck.r26905/81414 K 11 dialogs.cpp V 25 file 6ir.5ck.r33689/82911 K 9 dialogs.h V 23 file 6is.5ck.r31326/544 K 12 diplodlg.cpp V 26 file 6it.5ck.r33719/613984 K 10 diplodlg.h V 26 file 6iu.5ck.r33719/614240 K 13 fc_client.cpp V 23 file 6lc.5ck.r33723/388 K 11 fc_client.h V 23 file 6ld.5ck.r33723/639 K 11 finddlg.cpp V 25 file 6iv.5ck.r26905/79622 K 9 finddlg.h V 25 file 6iw.5ck.r26905/95148 K 9 fonts.cpp V 25 file 2p33.5ck.r33733/9590 K 7 fonts.h V 25 file 2p35.5ck.r33733/9757 K 11 gotodlg.cpp V 25 file 6ix.5ck.r32526/98001 K 9 gotodlg.h V 25 file 6iy.5ck.r26905/82913 K 12 graphics.cpp V 24 file 6iz.5ck.r27004/7519 K 10 graphics.h V 25 file 6j0.5ck.r26905/93360 K 12 gui_main.cpp V 24 file 6j1.5ck.r33733/9922 K 10 gui_main.h V 24 file oxo.5ck.r30281/5961 K 11 helpdlg.cpp V 24 file 6j2.5ck.r33701/7923 K 9 helpdlg.h V 24 file 6j3.5ck.r33701/8174 K 12 inteldlg.cpp V 25 file 6j4.5ck.r26905/88586 K 10 inteldlg.h V 25 file 6j5.5ck.r26905/94253 K 10 listener.h V 25 file 2o8m.5ck.r33699/5298 K 14 luaconsole.cpp V 25 file 76c.5ck.r26905/82614 K 12 luaconsole.h V 25 file 76d.5ck.r26905/89778 K 11 mapctrl.cpp V 26 file 6j6.5ck.r33719/615264 K 9 mapctrl.h V 25 file 6j7.5ck.r26905/94551 K 11 mapview.cpp V 26 file 6j8.5ck.r33719/615519 K 9 mapview.h V 26 file 6j9.5ck.r33719/615775 K 8 menu.cpp V 24 file 6ja.5ck.r33728/4365 K 6 menu.h V 24 file 6jb.5ck.r33728/4614 K 14 messagedlg.cpp V 26 file 6jc.5ck.r33719/616029 K 12 messagedlg.h V 25 file 6jd.5ck.r26905/81118 K 14 messagewin.cpp V 26 file 6je.5ck.r33719/616286 K 12 messagewin.h V 25 file 6jf.5ck.r33255/19314 K 13 optiondlg.cpp V 25 file 6jg.5ck.r33300/24073 K 11 optiondlg.h V 24 file 6jh.5ck.r30993/5716 K 9 pages.cpp V 23 file 6ji.5ck.r33723/888 K 7 pages.h V 25 file 6jj.5ck.r26905/88888 K 10 plrdlg.cpp V 26 file 6jk.5ck.r33719/616798 K 8 plrdlg.h V 25 file 6jl.5ck.r31757/25135 K 15 qtg_cxxside.cpp V 25 file 6jo.5ck.r32487/66450 K 13 qtg_cxxside.h V 25 file 6jp.5ck.r33529/63306 K 12 ratesdlg.cpp V 24 file 6jq.5ck.r33728/4856 K 10 ratesdlg.h V 24 file 6jr.5ck.r33728/5108 K 12 repodlgs.cpp V 22 file 6js.5ck.r33731/78 K 10 repodlgs.h V 23 file 6jt.5ck.r31252/906 K 11 sidebar.cpp V 27 file 2oya.5ck.r33719/617313 K 9 sidebar.h V 27 file 2oyc.5ck.r33719/617488 K 16 spaceshipdlg.cpp V 26 file 6ju.5ck.r33719/617659 K 14 spaceshipdlg.h V 25 file 6jv.5ck.r27443/15080 K 10 sprite.cpp V 25 file 6jw.5ck.r33689/83421 K 8 sprite.h V 25 file 6jx.5ck.r26905/84707 K 10 themes.cpp V 24 file 6jy.5ck.r33286/2081 K 16 voteinfo_bar.cpp V 25 file 6jz.5ck.r26905/95445 K 14 voteinfo_bar.h V 24 file 6k0.5ck.r27391/9245 K 9 wldlg.cpp V 25 file 6k1.5ck.r26905/84106 K 7 wldlg.h V 25 file 6k2.5ck.r26905/80524 END ENDREP id: 6ie.5ck.r33733/13446 type: dir pred: 6ie.5ck.r33731/3512 count: 561 text: 33733 10177 3256 0 3dfcc550bf3f2a579d2c9686359b2f50 props: 28036 6173 380 0 ea9aeae72ef70d80276d9f2e0c9ac191 cpath: /trunk/client/gui-qt copyroot: 15280 /trunk PLAIN K 11 Makefile.am V 22 file 5f.5ck.r33448/493 K 6 agents V 23 dir zf.5ck.r32600/22034 K 11 attribute.c V 24 file xh.5ck.r28218/30713 K 11 attribute.h V 24 file xi.5ck.r18863/23649 K 7 audio.c V 24 file 139.5ck.r33330/3060 K 7 audio.h V 25 file 13a.5ck.r31663/17756 K 12 audio_none.c V 25 file 13d.5ck.r24916/15731 K 12 audio_none.h V 25 file 13e.5ck.r18863/20841 K 11 audio_sdl.c V 24 file 13f.5ck.r33312/2269 K 11 audio_sdl.h V 25 file 13g.5ck.r18863/23885 K 17 chatline_common.c V 23 file 14q.5ck.r31577/631 K 17 chatline_common.h V 23 file 14r.5ck.r31577/881 K 16 citydlg_common.c V 24 file z4.5ck.r33386/49740 K 16 citydlg_common.h V 24 file z5.5ck.r32721/48869 K 13 cityrepdata.c V 23 file mb.5ck.r33725/5954 K 13 cityrepdata.h V 24 file mc.5ck.r18863/19121 K 13 client_main.c V 24 file 2f.5cp.r33689/63060 K 13 client_main.h V 23 file hz.5cq.r33653/3811 K 8 climap.c V 24 file 197.5ck.r20232/3008 K 8 climap.h V 23 file 198.5ck.r32540/658 K 9 climisc.c V 21 file d5.5ck.r33583/96 K 9 climisc.h V 22 file i0.5ck.r33583/334 K 8 clinet.c V 23 file hc.5ck.r33478/2436 K 8 clinet.h V 24 file i1.5ck.r18863/24866 K 15 colors_common.c V 24 file 33a.5ck.r31147/4200 K 15 colors_common.h V 25 file 33b.5ck.r31848/23505 K 19 connectdlg_common.c V 24 file 2fw.5ck.r33547/5741 K 19 connectdlg_common.h V 22 file 2fx.5ck.r31709/95 K 9 control.c V 24 file gz.5ck.r33689/63329 K 9 control.h V 23 file i2.5ck.r33542/3572 K 7 dummy.c V 26 file 4f9.5ck.r26905/141682 K 12 dummycxx.cpp V 26 file 6kr.5ck.r26905/106211 K 8 editor.c V 24 file 3bg.5ck.r33144/4965 K 8 editor.h V 23 file 3bh.5ck.r32374/890 K 17 global_worklist.c V 25 file 4i6.5ck.r32721/49607 K 17 global_worklist.h V 26 file 4i7.5ck.r26905/126022 K 6 goto.c V 23 file vu.5ck.r33542/3817 K 6 goto.h V 22 file vv.5ck.r31300/734 K 11 gui-gtk-2.0 V 23 dir zs.5ck.r33725/10527 K 11 gui-gtk-3.0 V 23 dir zs.5g7.r33725/15188 K 11 gui-gtk-3.x V 23 dir zs.5u2.r33725/19881 K 6 gui-qt V 24 dir 6ie.5ck.r33733/13446 K 8 gui-sdl2 V 24 dir 16t.5l8.r33725/25807 K 8 gui-stub V 23 dir mh.5ck.r33653/29901 K 14 gui_cbsetter.c V 25 file a3c.5ck.r32487/79055 K 14 gui_cbsetter.h V 25 file a3d.5ck.r32487/79303 K 15 gui_interface.c V 25 file 6jm.5ir.r33529/75385 K 15 gui_interface.h V 25 file 6jn.5is.r33529/75658 K 10 helpdata.c V 24 file h1.5ck.r33725/26066 K 10 helpdata.h V 24 file i3.5ck.r33725/26312 K 7 include V 23 dir b8.5ck.r33529/77793 K 19 luaconsole_common.c V 26 file 75z.5ck.r26905/100821 K 19 luaconsole_common.h V 26 file 760.5ck.r26905/106500 K 9 luascript V 24 dir 761.5ck.r32536/37000 K 16 mapctrl_common.c V 25 file 15m.5ck.r33549/19683 K 16 mapctrl_common.h V 24 file 15n.5ck.r32343/1012 K 16 mapview_common.c V 23 file z2.5ck.r33542/4309 K 16 mapview_common.h V 21 file z3.5ck.r32427/66 K 19 messagewin_common.c V 24 file 14s.5ck.r33325/9366 K 19 messagewin_common.h V 24 file 14t.5ck.r33325/9620 K 7 music.c V 25 file zmc.5ck.r30210/64954 K 7 music.h V 25 file zme.5ck.r27127/11513 K 9 options.c V 25 file dc.5ck.r33719/621355 K 9 options.h V 25 file i4.5ck.r33719/621601 K 17 overview_common.c V 25 file 2yk.5ck.r33483/57541 K 17 overview_common.h V 24 file 2yl.5ck.r29833/4964 K 10 packhand.c V 23 file n.5ck.r33689/93401 K 10 packhand.h V 24 file i5.5ck.r18863/20596 K 15 plrdlg_common.c V 25 file 14u.5ck.r30328/73502 K 15 plrdlg_common.h V 25 file 14v.5ck.r18863/21328 K 17 repodlgs_common.c V 25 file 11i.5ck.r30568/61953 K 17 repodlgs_common.h V 25 file 11j.5ck.r19589/11861 K 9 reqtree.c V 25 file 2ym.5ck.r33226/87883 K 9 reqtree.h V 24 file 2yn.5ck.r24150/6004 K 9 servers.c V 25 file 33x.5ck.r33529/78031 K 9 servers.h V 25 file 33y.5ck.r20478/36372 K 6 text.c V 25 file 2g3.5ck.r33386/72291 K 6 text.h V 24 file 2g4.5ck.r32343/1257 K 15 themes_common.c V 25 file 352.5ck.r31663/18995 K 15 themes_common.h V 25 file 353.5ck.r31663/19241 K 10 tilespec.c V 24 file hl.5ck.r33725/26554 K 10 tilespec.h V 23 file i6.5ck.r33547/6236 K 19 unitselect_common.c V 26 file 76v.5ck.r30060/143258 K 19 unitselect_common.h V 26 file 76w.5ck.r26905/117548 K 14 update_queue.c V 25 file 4jw.5ck.r33575/26601 K 14 update_queue.h V 25 file 4jx.5ck.r33575/26850 K 10 voteinfo.c V 25 file 4fe.5ck.r30210/66670 K 10 voteinfo.h V 26 file 4ff.5ck.r26905/142263 K 6 zoom.c V 24 file 2120.5ck.r33335/200 K 6 zoom.h V 25 file 2122.5ck.r30913/1856 END ENDREP id: d.5ck.r33733/17992 type: dir pred: d.5ck.r33731/8054 count: 7424 text: 33733 13685 4294 0 f4b061e673313f656a27c24da0ab2650 props: 28036 11094 400 0 bbe1d6769a94f3af2a54f7dc91fc9c71 cpath: /trunk/client copyroot: 15280 /trunk PLAIN K 9 ABOUT-NLS V 24 file fu.5ck.r33136/31347 K 7 AUTHORS V 24 file 5u.5ck.r22143/14016 K 7 COPYING V 22 file 1h.5ck.r29454/952 K 9 ChangeLog V 26 file 6l.5ck.r31297/7697235 K 7 INSTALL V 21 file 6.5ck.r33470/217 K 11 Makefile.am V 22 file 59.5ck.r33448/261 K 4 NEWS V 24 file 6m.5ck.r25634/30702 K 6 README V 20 file 7.0.r4421/96382 K 2 ai V 21 dir 8.5ck.r33725/5731 K 10 autogen.sh V 23 file 12o.5ck.r33470/442 K 9 bootstrap V 23 dir 2p5.5ck.r33447/3735 K 6 client V 22 dir d.5ck.r33733/17992 K 6 common V 22 dir p.5ck.r33725/37308 K 12 configure.ac V 22 file 149.5ck.r33690/80 K 4 data V 23 dir w.5ck.r33719/635662 K 12 dependencies V 23 dir 2yu.5ck.r33404/2662 K 3 doc V 22 dir k7.5ck.r33687/2913 K 10 fc_version V 26 file 2lo.5en.r33665/124009 K 11 gen_headers V 24 dir 1hsw.5ck.r32371/1764 K 3 lua V 24 dir 2c5e.5ck.r31919/4841 K 2 m4 V 25 dir 12p.5ck.r33689/107992 K 7 scripts V 23 dir 2yo.5ck.r31852/3843 K 6 server V 22 dir z.5ck.r33725/43589 K 5 tests V 22 dir 2g9.5ck.r32361/591 K 5 tools V 23 dir 4pj.5js.r33712/1835 K 12 translations V 23 dir t0a.5ck.r33696/7670 K 7 utility V 23 dir 1c.5ck.r33725/48129 K 7 windows V 23 dir 2eu.5x1.r33716/2332 END ENDREP id: 3.5ck.r33733/19395 type: dir pred: 3.5ck.r33731/9455 count: 21855 text: 33733 18222 1160 0 01d10cd269f791ec498bd2b6d887d0ec props: 28036 14655 292 0 9e1d5de0253c723466868990c52c129f cpath: /trunk copyroot: 15280 /trunk PLAIN K 8 branches V 20 dir 1.0.r33732/18776 K 4 tags V 19 dir 2.0.r33382/6667 K 5 trunk V 22 dir 3.5ck.r33733/19395 K 7 website V 21 dir 3ge.0.r33387/2571 END ENDREP id: 0.0.r33733/19786 type: dir pred: 0.0.r33732/19098 count: 33733 text: 33733 19619 154 0 0848dfea08b011cacafd30be04d23b85 cpath: / copyroot: 0 / 6if.5ck.t33732-1 modify true false /trunk/client/gui-qt/Makefile.am _3.5ck.t33732-1 add true false /trunk/client/gui-qt/fonts.cpp _5.5ck.t33732-1 add true false /trunk/client/gui-qt/fonts.h 6j1.5ck.t33732-1 modify true false /trunk/client/gui-qt/gui_main.cpp 19786 19934