[Freeciv-commits] r25930 - /branches/S2_5/client/gui-qt/

2014-08-18 Thread mlewczuk80
Author: mir3x Date: Mon Aug 18 20:02:31 2014 New Revision: 25930 URL: http://svn.gna.org/viewcvs/freeciv?rev=25930view=rev Log: Added diplomacy dialog to qt-client See http://gna.org/patch/?5042 Modified: branches/S2_5/client/gui-qt/Makefile.am branches/S2_5/client/gui-qt/cityrep.cpp

[Freeciv-commits] r25936 - in /branches/S2_5/client/gui-qt: fc_client.cpp menu.cpp

2014-08-18 Thread mlewczuk80
Author: mir3x Date: Mon Aug 18 20:10:32 2014 New Revision: 25936 URL: http://svn.gna.org/viewcvs/freeciv?rev=25936view=rev Log: Fixed full screen mode, now should be working correctly. See http://gna.org/patch/?5039 Modified: branches/S2_5/client/gui-qt/fc_client.cpp

[Freeciv-commits] r25938 - in /branches/S2_5/client/gui-qt: citydlg.cpp mapview.cpp

2014-08-18 Thread mlewczuk80
Author: mir3x Date: Mon Aug 18 20:12:11 2014 New Revision: 25938 URL: http://svn.gna.org/viewcvs/freeciv?rev=25938view=rev Log: When porting from qt4 to qt5, fromAscii was replaced by fromLatin, and it showed many characters incorectly (FromAscii(x) should be just replaced by QString(x)) See

[Freeciv-commits] r25939 - in /trunk/client/gui-qt: citydlg.cpp dialogs.cpp mapview.cpp

2014-08-18 Thread mlewczuk80
Author: mir3x Date: Mon Aug 18 20:12:23 2014 New Revision: 25939 URL: http://svn.gna.org/viewcvs/freeciv?rev=25939view=rev Log: When porting from qt4 to qt5, fromAscii was replaced by fromLatin, and it showed many characters incorectly (FromAscii(x) should be just replaced by QString(x)) See

[Freeciv-commits] r25940 - /branches/S2_5/client/gui-qt/dialogs.cpp

2014-08-18 Thread mlewczuk80
Author: mir3x Date: Mon Aug 18 21:24:57 2014 New Revision: 25940 URL: http://svn.gna.org/viewcvs/freeciv?rev=25940view=rev Log: When porting from qt4 to qt5, fromAscii was replaced by fromLatin, and it showed many characters incorectly (FromAscii(x) should be just replaced by QString(x)) *Updated

[Freeciv-commits] r25946 - /branches/S2_5/client/gui-qt/cityrep.cpp

2014-08-19 Thread mlewczuk80
Author: mir3x Date: Tue Aug 19 19:47:23 2014 New Revision: 25946 URL: http://svn.gna.org/viewcvs/freeciv?rev=25946view=rev Log: typo fix in Diplomacy Dialog (There was unwanted string for translators) Modified: branches/S2_5/client/gui-qt/cityrep.cpp Modified:

[Freeciv-commits] r25947 - /trunk/client/gui-qt/cityrep.cpp

2014-08-19 Thread mlewczuk80
Author: mir3x Date: Tue Aug 19 19:47:33 2014 New Revision: 25947 URL: http://svn.gna.org/viewcvs/freeciv?rev=25947view=rev Log: typo fix in Diplomacy Dialog (There was unwanted string for translators) Modified: trunk/client/gui-qt/cityrep.cpp Modified: trunk/client/gui-qt/cityrep.cpp URL:

[Freeciv-commits] r25956 - in /trunk/client/gui-qt: chatline.cpp fc_client.cpp fc_client.h gui_main.cpp pages.cpp

2014-08-20 Thread mlewczuk80
Author: mir3x Date: Wed Aug 20 11:08:51 2014 New Revision: 25956 URL: http://svn.gna.org/viewcvs/freeciv?rev=25956view=rev Log: Added options to start page: -starting game -loading game -loading scenarios -browsing files to locate saves/scenarios See patch #5053 Modified:

[Freeciv-commits] r25957 - in /branches/S2_5/client/gui-qt: chatline.cpp fc_client.cpp fc_client.h gui_main.cpp pages.cpp

2014-08-20 Thread mlewczuk80
Author: mir3x Date: Wed Aug 20 11:09:06 2014 New Revision: 25957 URL: http://svn.gna.org/viewcvs/freeciv?rev=25957view=rev Log: Added options to start page: -starting game -loading game -loading scenarios -browsing files to locate saves/scenarios See patch #5053 Modified:

[Freeciv-commits] r25978 - in /branches/S2_5/client/gui-qt: cityrep.cpp plrdlg.cpp plrdlg.h repodlgs.cpp

2014-08-21 Thread mlewczuk80
Author: mir3x Date: Thu Aug 21 18:59:16 2014 New Revision: 25978 URL: http://svn.gna.org/viewcvs/freeciv?rev=25978view=rev Log: Corrected text in report dialogs. Nation dialog sorts players by score in right order now. Removed barbarians from nation dialog. See patch #5054 Modified:

[Freeciv-commits] r25979 - in /trunk/client/gui-qt: cityrep.cpp plrdlg.cpp plrdlg.h repodlgs.cpp

2014-08-21 Thread mlewczuk80
Author: mir3x Date: Thu Aug 21 18:59:35 2014 New Revision: 25979 URL: http://svn.gna.org/viewcvs/freeciv?rev=25979view=rev Log: Corrected text in report dialogs. Nation dialog sorts players by score in right order now. Removed barbarians from nation dialog. See patch #5054 Modified:

[Freeciv-commits] r25980 - in /branches/S2_5/client/gui-qt: citydlg.cpp dialogs.cpp gui_main.cpp menu.cpp repodlgs.cpp

2014-08-21 Thread mlewczuk80
Author: mir3x Date: Thu Aug 21 19:06:10 2014 New Revision: 25980 URL: http://svn.gna.org/viewcvs/freeciv?rev=25980view=rev Log: QMessageBox wont open tabs on taskbar anymore See patch #5055 Modified: branches/S2_5/client/gui-qt/citydlg.cpp branches/S2_5/client/gui-qt/dialogs.cpp

[Freeciv-commits] r25981 - in /trunk/client/gui-qt: citydlg.cpp dialogs.cpp gui_main.cpp menu.cpp repodlgs.cpp

2014-08-21 Thread mlewczuk80
Author: mir3x Date: Thu Aug 21 19:06:22 2014 New Revision: 25981 URL: http://svn.gna.org/viewcvs/freeciv?rev=25981view=rev Log: QMessageBox wont open tabs on taskbar anymore See patch #5055 Modified: trunk/client/gui-qt/citydlg.cpp trunk/client/gui-qt/dialogs.cpp

[Freeciv-commits] r25983 - /trunk/client/gui-qt/cityrep.cpp

2014-08-21 Thread mlewczuk80
Author: mir3x Date: Thu Aug 21 19:11:02 2014 New Revision: 25983 URL: http://svn.gna.org/viewcvs/freeciv?rev=25983view=rev Log: Changed 1 string in cities report See patch #5056 Modified: trunk/client/gui-qt/cityrep.cpp Modified: trunk/client/gui-qt/cityrep.cpp URL:

[Freeciv-commits] r25982 - /branches/S2_5/client/gui-qt/cityrep.cpp

2014-08-21 Thread mlewczuk80
Author: mir3x Date: Thu Aug 21 19:10:49 2014 New Revision: 25982 URL: http://svn.gna.org/viewcvs/freeciv?rev=25982view=rev Log: Changed 1 string in cities report See patch #5056 Modified: branches/S2_5/client/gui-qt/cityrep.cpp Modified: branches/S2_5/client/gui-qt/cityrep.cpp URL:

[Freeciv-commits] r25985 - /trunk/client/gui-qt/cityrep.h

2014-08-21 Thread mlewczuk80
Author: mir3x Date: Thu Aug 21 19:15:55 2014 New Revision: 25985 URL: http://svn.gna.org/viewcvs/freeciv?rev=25985view=rev Log: In some cases, after unsuccessfull buying item, production could be changed to airport. Fixed. See patch #5057 Modified: trunk/client/gui-qt/cityrep.h Modified:

[Freeciv-commits] r25984 - /branches/S2_5/client/gui-qt/cityrep.h

2014-08-21 Thread mlewczuk80
Author: mir3x Date: Thu Aug 21 19:15:29 2014 New Revision: 25984 URL: http://svn.gna.org/viewcvs/freeciv?rev=25984view=rev Log: In some cases, after unsuccessfull buying item, production could be changed to airport. Fixed. See patch #5057 Modified: branches/S2_5/client/gui-qt/cityrep.h

[Freeciv-commits] r25990 - in /branches/S2_5/client/gui-qt: Makefile.am menu.cpp menu.h spaceshipdlg.cpp spaceshipdlg.h

2014-08-21 Thread mlewczuk80
Author: mir3x Date: Thu Aug 21 21:33:15 2014 New Revision: 25990 URL: http://svn.gna.org/viewcvs/freeciv?rev=25990view=rev Log: Added Spaceship report. See patch #5060 Modified: branches/S2_5/client/gui-qt/Makefile.am branches/S2_5/client/gui-qt/menu.cpp

[Freeciv-commits] r25991 - in /trunk/client/gui-qt: Makefile.am menu.cpp menu.h spaceshipdlg.cpp spaceshipdlg.h

2014-08-21 Thread mlewczuk80
Author: mir3x Date: Thu Aug 21 21:33:56 2014 New Revision: 25991 URL: http://svn.gna.org/viewcvs/freeciv?rev=25991view=rev Log: Added Spaceship report. See patch #5060 Modified: trunk/client/gui-qt/Makefile.am trunk/client/gui-qt/menu.cpp trunk/client/gui-qt/menu.h

[Freeciv-commits] r26017 - in /branches/S2_5/client/gui-qt: canvas.cpp gui_main.cpp

2014-08-24 Thread mlewczuk80
Author: mir3x Date: Sun Aug 24 17:47:29 2014 New Revision: 26017 URL: http://svn.gna.org/viewcvs/freeciv?rev=26017view=rev Log: Added callbacks to font options when city/production/research fonts are changed. Fixed drawing fonts on map view with correct font. Removed log_error from

[Freeciv-commits] r26018 - in /trunk/client/gui-qt: canvas.cpp gui_main.cpp

2014-08-24 Thread mlewczuk80
Author: mir3x Date: Sun Aug 24 17:48:13 2014 New Revision: 26018 URL: http://svn.gna.org/viewcvs/freeciv?rev=26018view=rev Log: Added callbacks to font options when city/production/research fonts are changed. Fixed drawing fonts on map view with correct font. Removed log_error from

[Freeciv-commits] r26019 - /trunk/client/gui-qt/mapview.cpp

2014-08-24 Thread mlewczuk80
Author: mir3x Date: Sun Aug 24 18:23:55 2014 New Revision: 26019 URL: http://svn.gna.org/viewcvs/freeciv?rev=26019view=rev Log: Fixed vieport. See patch #5064 Modified: trunk/client/gui-qt/mapview.cpp Modified: trunk/client/gui-qt/mapview.cpp URL:

[Freeciv-commits] r26085 - /branches/S2_5/client/gui-qt/repodlgs.cpp

2014-08-27 Thread mlewczuk80
Author: mir3x Date: Wed Aug 27 16:43:57 2014 New Revision: 26085 URL: http://svn.gna.org/viewcvs/freeciv?rev=26085view=rev Log: Added check for NULL displayed sprites. Also unit sprites are scaled now to fit in cells. See patch #5087 Modified: branches/S2_5/client/gui-qt/repodlgs.cpp

[Freeciv-commits] r26084 - /trunk/client/gui-qt/repodlgs.cpp

2014-08-27 Thread mlewczuk80
Author: mir3x Date: Wed Aug 27 16:43:37 2014 New Revision: 26084 URL: http://svn.gna.org/viewcvs/freeciv?rev=26084view=rev Log: Added check for NULL displayed sprites. Also unit sprites are scaled now to fit in cells. See patch #5087 Modified: trunk/client/gui-qt/repodlgs.cpp Modified:

[Freeciv-commits] r26089 - in /trunk/client: gui-qt/fc_client.cpp tilespec.c

2014-08-28 Thread mlewczuk80
Author: mir3x Date: Thu Aug 28 11:22:43 2014 New Revision: 26089 URL: http://svn.gna.org/viewcvs/freeciv?rev=26089view=rev Log: Remove player color hack in Qt client See patch #5112 Modified: trunk/client/gui-qt/fc_client.cpp trunk/client/tilespec.c Modified:

[Freeciv-commits] r26090 - in /branches/S2_5/client: gui-qt/fc_client.cpp tilespec.c

2014-08-28 Thread mlewczuk80
Author: mir3x Date: Thu Aug 28 11:22:57 2014 New Revision: 26090 URL: http://svn.gna.org/viewcvs/freeciv?rev=26090view=rev Log: Remove player color hack in Qt client See patch #5112 Modified: branches/S2_5/client/gui-qt/fc_client.cpp branches/S2_5/client/tilespec.c Modified:

[Freeciv-commits] r26128 - in /trunk/client: ./ gui-qt/

2014-08-29 Thread mlewczuk80
Author: mir3x Date: Fri Aug 29 10:24:01 2014 New Revision: 26128 URL: http://svn.gna.org/viewcvs/freeciv?rev=26128view=rev Log: Removed old dock widgets (chat and messages). Added new semitransparent widgets, added menu entries for them. Added event icons to messages widget. See patch #5133

[Freeciv-commits] r26161 - in /trunk/client/gui-qt: cityrep.cpp cityrep.h

2014-09-01 Thread mlewczuk80
Author: mir3x Date: Mon Sep 1 14:27:09 2014 New Revision: 26161 URL: http://svn.gna.org/viewcvs/freeciv?rev=26161view=rev Log: After getting new info from server, current selection in cities report was lost. Added restoring selection in that case. See patch #5136 Modified:

[Freeciv-commits] r26162 - in /branches/S2_5/client/gui-qt: cityrep.cpp cityrep.h dialogs.cpp repodlgs.cpp

2014-09-01 Thread mlewczuk80
Author: mir3x Date: Mon Sep 1 14:27:23 2014 New Revision: 26162 URL: http://svn.gna.org/viewcvs/freeciv?rev=26162view=rev Log: After getting new info from server, current selection in cities report was lost. Added restoring selection in that case. See patch #5136 Modified:

[Freeciv-commits] r26163 - /trunk/client/gui-qt/repodlgs.cpp

2014-09-01 Thread mlewczuk80
Author: mir3x Date: Mon Sep 1 14:31:42 2014 New Revision: 26163 URL: http://svn.gna.org/viewcvs/freeciv?rev=26163view=rev Log: Added soring in economy report See patch #5143 Modified: trunk/client/gui-qt/repodlgs.cpp Modified: trunk/client/gui-qt/repodlgs.cpp URL:

[Freeciv-commits] r26165 - in /branches/S2_5/client/gui-qt: pages.cpp plrdlg.cpp

2014-09-01 Thread mlewczuk80
Author: mir3x Date: Mon Sep 1 14:35:42 2014 New Revision: 26165 URL: http://svn.gna.org/viewcvs/freeciv?rev=26165view=rev Log: Removed barbarians from start page and intelligence report. See patch #5137 Modified: branches/S2_5/client/gui-qt/pages.cpp

[Freeciv-commits] r26164 - in /trunk/client/gui-qt: pages.cpp plrdlg.cpp

2014-09-01 Thread mlewczuk80
Author: mir3x Date: Mon Sep 1 14:35:22 2014 New Revision: 26164 URL: http://svn.gna.org/viewcvs/freeciv?rev=26164view=rev Log: Removed barbarians from start page and intelligence report. See patch #5137 Modified: trunk/client/gui-qt/pages.cpp trunk/client/gui-qt/plrdlg.cpp Modified:

[Freeciv-commits] r26167 - in /branches/S2_5/client/gui-qt: mapview.cpp mapview.h

2014-09-01 Thread mlewczuk80
Author: mir3x Date: Mon Sep 1 14:41:21 2014 New Revision: 26167 URL: http://svn.gna.org/viewcvs/freeciv?rev=26167view=rev Log: Added tile pixmap to unit label (often useful when city labels take too much space and player doesnt see current terrain) See patch #5138 Modified:

[Freeciv-commits] r26166 - in /trunk/client/gui-qt: mapview.cpp mapview.h

2014-09-01 Thread mlewczuk80
Author: mir3x Date: Mon Sep 1 14:41:10 2014 New Revision: 26166 URL: http://svn.gna.org/viewcvs/freeciv?rev=26166view=rev Log: Added tile pixmap to unit label (often useful when city labels take too much space and player doesnt see current terrain) See patch #5138 Modified:

[Freeciv-commits] r26169 - in /branches/S2_5/client/gui-qt: cityrep.cpp cityrep.h

2014-09-01 Thread mlewczuk80
Author: mir3x Date: Mon Sep 1 14:44:08 2014 New Revision: 26169 URL: http://svn.gna.org/viewcvs/freeciv?rev=26169view=rev Log: Added tile pixmap to unit label (often useful when city labels take too much space and player doesnt see current terrain) See patch #5138 Modified:

[Freeciv-commits] r26168 - in /trunk/client/gui-qt: cityrep.cpp cityrep.h

2014-09-01 Thread mlewczuk80
Author: mir3x Date: Mon Sep 1 14:43:57 2014 New Revision: 26168 URL: http://svn.gna.org/viewcvs/freeciv?rev=26168view=rev Log: Added proper item sorting in city report. See patch #5142 Modified: trunk/client/gui-qt/cityrep.cpp trunk/client/gui-qt/cityrep.h Modified:

[Freeciv-commits] r26170 - /trunk/client/gui-qt/dialogs.cpp

2014-09-01 Thread mlewczuk80
Author: mir3x Date: Mon Sep 1 14:58:58 2014 New Revision: 26170 URL: http://svn.gna.org/viewcvs/freeciv?rev=26170view=rev Log: Added missing text when upgrading units. See patch #5149 Modified: trunk/client/gui-qt/dialogs.cpp Modified: trunk/client/gui-qt/dialogs.cpp URL:

[Freeciv-commits] r26211 - in /trunk/client/gui-qt: dialogs.cpp dialogs.h optiondlg.cpp

2014-09-03 Thread mlewczuk80
Author: mir3x Date: Thu Sep 4 00:31:14 2014 New Revision: 26211 URL: http://svn.gna.org/viewcvs/freeciv?rev=26211view=rev Log: Added support for nation sets to Qt-client See patch #4350 Modified: trunk/client/gui-qt/dialogs.cpp trunk/client/gui-qt/dialogs.h

[Freeciv-commits] r26212 - in /trunk/client/gui-qt: citydlg.cpp cityrep.cpp dialogs.cpp mapview.cpp plrdlg.cpp ratesdlg.cpp spaceshipdlg.cpp

2014-09-04 Thread mlewczuk80
Author: mir3x Date: Thu Sep 4 11:28:13 2014 New Revision: 26212 URL: http://svn.gna.org/viewcvs/freeciv?rev=26212view=rev Log: Fixed strings in Qt-client unsuitable for i18n bug reported by Jacob Nevins jtn See bug #22314 Modified: trunk/client/gui-qt/citydlg.cpp

[Freeciv-commits] r26237 - in /trunk/client/gui-qt: Makefile.am menu.cpp menu.h messagedlg.cpp messagedlg.h

2014-09-06 Thread mlewczuk80
Author: mir3x Date: Sat Sep 6 10:30:13 2014 New Revision: 26237 URL: http://svn.gna.org/viewcvs/freeciv?rev=26237view=rev Log: Added messages options to Qt-client See patch #5165 Modified: trunk/client/gui-qt/Makefile.am trunk/client/gui-qt/menu.cpp trunk/client/gui-qt/menu.h

[Freeciv-commits] r26239 - in /trunk/client/gui-qt: fc_client.cpp fc_client.h pages.cpp

2014-09-06 Thread mlewczuk80
Author: mir3x Date: Sat Sep 6 10:34:22 2014 New Revision: 26239 URL: http://svn.gna.org/viewcvs/freeciv?rev=26239view=rev Log: Now beta label is shown with correct font in qt-client See patch #5166 Modified: trunk/client/gui-qt/fc_client.cpp trunk/client/gui-qt/fc_client.h

[Freeciv-commits] r26240 - in /branches/S2_5/client/gui-qt: fc_client.cpp fc_client.h pages.cpp

2014-09-06 Thread mlewczuk80
Author: mir3x Date: Sat Sep 6 10:35:03 2014 New Revision: 26240 URL: http://svn.gna.org/viewcvs/freeciv?rev=26240view=rev Log: Now beta label is shown with correct font in qt-client See patch #5166 Modified: branches/S2_5/client/gui-qt/fc_client.cpp

[Freeciv-commits] r26278 - in /trunk/client/gui-qt: fc_client.cpp fc_client.h mapctrl.cpp mapview.cpp mapview.h

2014-09-07 Thread mlewczuk80
Author: mir3x Date: Sun Sep 7 15:18:11 2014 New Revision: 26278 URL: http://svn.gna.org/viewcvs/freeciv?rev=26278view=rev Log: Added animated curosrs See patch #5169 Modified: trunk/client/gui-qt/fc_client.cpp trunk/client/gui-qt/fc_client.h trunk/client/gui-qt/mapctrl.cpp

[Freeciv-commits] r26279 - in /branches/S2_5/client/gui-qt: fc_client.cpp fc_client.h mapctrl.cpp mapview.cpp mapview.h

2014-09-07 Thread mlewczuk80
Author: mir3x Date: Sun Sep 7 15:18:22 2014 New Revision: 26279 URL: http://svn.gna.org/viewcvs/freeciv?rev=26279view=rev Log: Added animated curosrs See patch #5169 Modified: branches/S2_5/client/gui-qt/fc_client.cpp branches/S2_5/client/gui-qt/fc_client.h

[Freeciv-commits] r26281 - in /trunk/client/gui-qt: fc_client.cpp pages.cpp

2014-09-07 Thread mlewczuk80
Author: mir3x Date: Sun Sep 7 15:22:14 2014 New Revision: 26281 URL: http://svn.gna.org/viewcvs/freeciv?rev=26281view=rev Log: Removed margins around map view See patch #5170 Modified: trunk/client/gui-qt/fc_client.cpp trunk/client/gui-qt/pages.cpp Modified:

[Freeciv-commits] r26282 - in /branches/S2_5/client/gui-qt: fc_client.cpp pages.cpp

2014-09-07 Thread mlewczuk80
Author: mir3x Date: Sun Sep 7 15:22:25 2014 New Revision: 26282 URL: http://svn.gna.org/viewcvs/freeciv?rev=26282view=rev Log: Removed margins around map view See patch #5170 Modified: branches/S2_5/client/gui-qt/fc_client.cpp branches/S2_5/client/gui-qt/pages.cpp Modified:

[Freeciv-commits] r26283 - /trunk/client/gui-qt/repodlgs.cpp

2014-09-07 Thread mlewczuk80
Author: mir3x Date: Sun Sep 7 15:25:02 2014 New Revision: 26283 URL: http://svn.gna.org/viewcvs/freeciv?rev=26283view=rev Log: Added future tech handling See patch #5171 Modified: trunk/client/gui-qt/repodlgs.cpp Modified: trunk/client/gui-qt/repodlgs.cpp URL:

[Freeciv-commits] r26284 - /branches/S2_5/client/gui-qt/repodlgs.cpp

2014-09-07 Thread mlewczuk80
Author: mir3x Date: Sun Sep 7 15:25:12 2014 New Revision: 26284 URL: http://svn.gna.org/viewcvs/freeciv?rev=26284view=rev Log: Added future tech handling See patch #5171 Modified: branches/S2_5/client/gui-qt/repodlgs.cpp Modified: branches/S2_5/client/gui-qt/repodlgs.cpp URL:

[Freeciv-commits] r26285 - /branches/S2_5/client/gui-qt/

2014-09-07 Thread mlewczuk80
Author: mir3x Date: Sun Sep 7 15:41:48 2014 New Revision: 26285 URL: http://svn.gna.org/viewcvs/freeciv?rev=26285view=rev Log: added vote bar See patch #5163 Modified: branches/S2_5/client/gui-qt/Makefile.am branches/S2_5/client/gui-qt/fc_client.cpp

[Freeciv-commits] r26286 - in /trunk/client/gui-qt: Makefile.am fc_client.cpp fc_client.h mapview.cpp pages.cpp voteinfo_bar.cpp voteinfo_bar.h

2014-09-07 Thread mlewczuk80
Author: mir3x Date: Sun Sep 7 15:41:59 2014 New Revision: 26286 URL: http://svn.gna.org/viewcvs/freeciv?rev=26286view=rev Log: added vote bar See patch #5163 Modified: trunk/client/gui-qt/Makefile.am trunk/client/gui-qt/fc_client.cpp trunk/client/gui-qt/fc_client.h

[Freeciv-commits] r26287 - /trunk/client/gui-qt/mapview.cpp

2014-09-07 Thread mlewczuk80
Author: mir3x Date: Sun Sep 7 15:44:54 2014 New Revision: 26287 URL: http://svn.gna.org/viewcvs/freeciv?rev=26287view=rev Log: If gold income was negative it was shown as +-X, instead just -X. See patch #5172 Modified: trunk/client/gui-qt/mapview.cpp Modified:

[Freeciv-commits] r26297 - /trunk/client/gui-qt/messagewin.cpp

2014-09-09 Thread mlewczuk80
Author: mir3x Date: Tue Sep 9 14:22:54 2014 New Revision: 26297 URL: http://svn.gna.org/viewcvs/freeciv?rev=26297view=rev Log: Added horizontal scrolling to messages widget Added restoring chat/message stretch factor after unhiding widget. See patch #5186 Modified:

[Freeciv-commits] r26301 - in /trunk/client/gui-qt: chatline.cpp chatline.h fc_client.cpp fc_client.h pages.cpp

2014-09-09 Thread mlewczuk80
Author: mir3x Date: Tue Sep 9 14:33:46 2014 New Revision: 26301 URL: http://svn.gna.org/viewcvs/freeciv?rev=26301view=rev Log: Chat update: Added chat autocompletion, history, links and colors. See patch #5200 Modified: trunk/client/gui-qt/chatline.cpp trunk/client/gui-qt/chatline.h

[Freeciv-commits] r26303 - in /trunk/client/gui-qt: fc_client.cpp fc_client.h mapview.cpp mapview.h

2014-09-09 Thread mlewczuk80
Author: mir3x Date: Tue Sep 9 14:42:04 2014 New Revision: 26303 URL: http://svn.gna.org/viewcvs/freeciv?rev=26303view=rev Log: Added some destructors to keep valgrind happier. See patch #5202 Modified: trunk/client/gui-qt/fc_client.cpp trunk/client/gui-qt/fc_client.h

[Freeciv-commits] r26353 - in /trunk/client/gui-qt: citydlg.cpp citydlg.h gui_main.cpp

2014-09-11 Thread mlewczuk80
Author: mir3x Date: Thu Sep 11 10:30:06 2014 New Revision: 26353 URL: http://svn.gna.org/viewcvs/freeciv?rev=26353view=rev Log: Fixed labels not changing in governor tab, Added forced dialog close when city_label font is changed. (otherwise they wouldnt change soon, cause city dialog in most

[Freeciv-commits] r26354 - in /branches/S2_5/client/gui-qt: chatline.cpp chatline.h mapctrl.cpp

2014-09-11 Thread mlewczuk80
Author: mir3x Date: Thu Sep 11 10:35:51 2014 New Revision: 26354 URL: http://svn.gna.org/viewcvs/freeciv?rev=26354view=rev Log: Added possibility of creating links by ctrl+alt+rightClick on map. See patch #5210 Modified: branches/S2_5/client/gui-qt/chatline.cpp

[Freeciv-commits] r26359 - in /trunk/client/gui-qt: Makefile.am fc_client.cpp fc_client.h gotodlg.cpp gotodlg.h menu.cpp menu.h pages.cpp

2014-09-12 Thread mlewczuk80
Author: mir3x Date: Fri Sep 12 10:10:51 2014 New Revision: 26359 URL: http://svn.gna.org/viewcvs/freeciv?rev=26359view=rev Log: Added goto/airlift widget See patch #5213 Modified: trunk/client/gui-qt/Makefile.am trunk/client/gui-qt/fc_client.cpp trunk/client/gui-qt/fc_client.h

[Freeciv-commits] r26358 - in /branches/S2_5/client/gui-qt: Makefile.am fc_client.cpp fc_client.h gotodlg.cpp gotodlg.h menu.cpp menu.h pages.cpp

2014-09-12 Thread mlewczuk80
Author: mir3x Date: Fri Sep 12 10:10:41 2014 New Revision: 26358 URL: http://svn.gna.org/viewcvs/freeciv?rev=26358view=rev Log: Added goto/airlift widget See patch #5213 Modified: branches/S2_5/client/gui-qt/Makefile.am branches/S2_5/client/gui-qt/fc_client.cpp

[Freeciv-commits] r26360 - /branches/S2_5/client/gui-qt/repodlgs.cpp

2014-09-12 Thread mlewczuk80
Author: mir3x Date: Fri Sep 12 10:14:42 2014 New Revision: 26360 URL: http://svn.gna.org/viewcvs/freeciv?rev=26360view=rev Log: Updated units report: - updated layout - added icons to units and buttons See patch #5215 Modified: branches/S2_5/client/gui-qt/repodlgs.cpp Modified:

[Freeciv-commits] r26361 - /trunk/client/gui-qt/repodlgs.cpp

2014-09-12 Thread mlewczuk80
Author: mir3x Date: Fri Sep 12 10:15:21 2014 New Revision: 26361 URL: http://svn.gna.org/viewcvs/freeciv?rev=26361view=rev Log: Updated units report: - updated layout - added icons to units and buttons See patch #5215 Modified: trunk/client/gui-qt/repodlgs.cpp Modified:

[Freeciv-commits] r26362 - /branches/S2_5/client/gui-qt/chatline.cpp

2014-09-12 Thread mlewczuk80
Author: mir3x Date: Fri Sep 12 10:19:37 2014 New Revision: 26362 URL: http://svn.gna.org/viewcvs/freeciv?rev=26362view=rev Log: Fixed some characters wrongly displayed in chat widget. See patch #5216 Modified: branches/S2_5/client/gui-qt/chatline.cpp Modified:

[Freeciv-commits] r26363 - /trunk/client/gui-qt/chatline.cpp

2014-09-12 Thread mlewczuk80
Author: mir3x Date: Fri Sep 12 10:20:06 2014 New Revision: 26363 URL: http://svn.gna.org/viewcvs/freeciv?rev=26363view=rev Log: Fixed some characters wrongly displayed in chat widget. See patch #5216 Modified: trunk/client/gui-qt/chatline.cpp Modified: trunk/client/gui-qt/chatline.cpp

[Freeciv-commits] r26414 - /branches/S2_5/client/gui-qt/citydlg.cpp

2014-09-14 Thread mlewczuk80
Author: mir3x Date: Sun Sep 14 20:08:03 2014 New Revision: 26414 URL: http://svn.gna.org/viewcvs/freeciv?rev=26414view=rev Log: If there is no item selected on worklist, then it will be assumed its first item. See patch #5219 Modified: branches/S2_5/client/gui-qt/citydlg.cpp Modified:

[Freeciv-commits] r26413 - /trunk/client/gui-qt/citydlg.cpp

2014-09-14 Thread mlewczuk80
Author: mir3x Date: Sun Sep 14 20:07:51 2014 New Revision: 26413 URL: http://svn.gna.org/viewcvs/freeciv?rev=26413view=rev Log: If there is no item selected on worklist, then it will be assumed its first item. See patch #5219 Modified: trunk/client/gui-qt/citydlg.cpp Modified:

[Freeciv-commits] r26415 - /trunk/client/gui-qt/plrdlg.cpp

2014-09-14 Thread mlewczuk80
Author: mir3x Date: Sun Sep 14 20:10:27 2014 New Revision: 26415 URL: http://svn.gna.org/viewcvs/freeciv?rev=26415view=rev Log: Fixed crash when global observing tried to check technologies Added sorting technologies See patch #5220 Modified: trunk/client/gui-qt/plrdlg.cpp Modified:

[Freeciv-commits] r26416 - /branches/S2_5/client/gui-qt/plrdlg.cpp

2014-09-14 Thread mlewczuk80
Author: mir3x Date: Sun Sep 14 20:10:39 2014 New Revision: 26416 URL: http://svn.gna.org/viewcvs/freeciv?rev=26416view=rev Log: Fixed crash when global observing tried to check technologies Added sorting technologies See patch #5220 Modified: branches/S2_5/client/gui-qt/plrdlg.cpp

[Freeciv-commits] r26418 - /trunk/client/gui-qt/repodlgs.cpp

2014-09-14 Thread mlewczuk80
Author: mir3x Date: Sun Sep 14 20:13:21 2014 New Revision: 26418 URL: http://svn.gna.org/viewcvs/freeciv?rev=26418view=rev Log: Prevented observer changing current/goal technology. See patch #5221 Modified: trunk/client/gui-qt/repodlgs.cpp Modified: trunk/client/gui-qt/repodlgs.cpp URL:

[Freeciv-commits] r26420 - /branches/S2_5/client/gui-qt/chatline.cpp

2014-09-14 Thread mlewczuk80
Author: mir3x Date: Sun Sep 14 20:16:14 2014 New Revision: 26420 URL: http://svn.gna.org/viewcvs/freeciv?rev=26420view=rev Log: replace fake html tags like (X) or X to [(X)] or [X] See patch #5222 Modified: branches/S2_5/client/gui-qt/chatline.cpp Modified:

[Freeciv-commits] r26419 - /trunk/client/gui-qt/chatline.cpp

2014-09-14 Thread mlewczuk80
Author: mir3x Date: Sun Sep 14 20:16:01 2014 New Revision: 26419 URL: http://svn.gna.org/viewcvs/freeciv?rev=26419view=rev Log: replace fake html tags like (X) or X to [(X)] or [X] See patch #5222 Modified: trunk/client/gui-qt/chatline.cpp Modified: trunk/client/gui-qt/chatline.cpp URL:

[Freeciv-commits] r26422 - in /branches/S2_5/client/gui-qt: chatline.cpp messagewin.cpp

2014-09-14 Thread mlewczuk80
Author: mir3x Date: Sun Sep 14 20:18:42 2014 New Revision: 26422 URL: http://svn.gna.org/viewcvs/freeciv?rev=26422view=rev Log: Forced default (fusion) style in chat and messages See patch #5223 Modified: branches/S2_5/client/gui-qt/chatline.cpp

[Freeciv-commits] r26481 - in /branches/S2_5/client/gui-qt: citydlg.cpp citydlg.h

2014-09-17 Thread mlewczuk80
Author: mir3x Date: Wed Sep 17 09:40:27 2014 New Revision: 26481 URL: http://svn.gna.org/viewcvs/freeciv?rev=26481view=rev Log: Fixed double refresh of current and supported units Patched some memory leaks. See patch #5237 Modified: branches/S2_5/client/gui-qt/citydlg.cpp

[Freeciv-commits] r26480 - in /trunk/client/gui-qt: citydlg.cpp citydlg.h

2014-09-17 Thread mlewczuk80
Author: mir3x Date: Wed Sep 17 09:40:18 2014 New Revision: 26480 URL: http://svn.gna.org/viewcvs/freeciv?rev=26480view=rev Log: Fixed double refresh of current and supported units Patched some memory leaks. See patch #5237 Modified: trunk/client/gui-qt/citydlg.cpp

[Freeciv-commits] r26502 - in /branches/S2_5/client/gui-qt: menu.cpp menu.h

2014-09-19 Thread mlewczuk80
Author: mir3x Date: Fri Sep 19 09:58:03 2014 New Revision: 26502 URL: http://svn.gna.org/viewcvs/freeciv?rev=26502view=rev Log: Added new dialog with full GPL license. See patch #5218 Modified: branches/S2_5/client/gui-qt/menu.cpp branches/S2_5/client/gui-qt/menu.h Modified:

[Freeciv-commits] r26501 - in /trunk/client/gui-qt: menu.cpp menu.h

2014-09-19 Thread mlewczuk80
Author: mir3x Date: Fri Sep 19 09:57:23 2014 New Revision: 26501 URL: http://svn.gna.org/viewcvs/freeciv?rev=26501view=rev Log: Added new dialog with full GPL license. See patch #5218 Modified: trunk/client/gui-qt/menu.cpp trunk/client/gui-qt/menu.h Modified:

[Freeciv-commits] r26505 - in /branches/S2_5/client/gui-qt: dialogs.cpp dialogs.h

2014-09-19 Thread mlewczuk80
Author: mir3x Date: Fri Sep 19 10:06:47 2014 New Revision: 26505 URL: http://svn.gna.org/viewcvs/freeciv?rev=26505view=rev Log: Added popup notify goto dialog. See patch #5244 Modified: branches/S2_5/client/gui-qt/dialogs.cpp branches/S2_5/client/gui-qt/dialogs.h Modified:

[Freeciv-commits] r26506 - in /trunk/client/gui-qt: dialogs.cpp dialogs.h

2014-09-19 Thread mlewczuk80
Author: mir3x Date: Fri Sep 19 10:10:07 2014 New Revision: 26506 URL: http://svn.gna.org/viewcvs/freeciv?rev=26506view=rev Log: Added popup notify goto dialog. See patch #5244 Modified: trunk/client/gui-qt/dialogs.cpp trunk/client/gui-qt/dialogs.h Modified:

[Freeciv-commits] r26507 - in /trunk/client/gui-qt: mapview.cpp mapview.h spaceshipdlg.cpp

2014-09-19 Thread mlewczuk80
Author: mir3x Date: Fri Sep 19 10:14:51 2014 New Revision: 26507 URL: http://svn.gna.org/viewcvs/freeciv?rev=26507view=rev Log: Fixed not freed canvases in mapview and spaceship dialog See patch #5245 Modified: trunk/client/gui-qt/mapview.cpp trunk/client/gui-qt/mapview.h

[Freeciv-commits] r26508 - in /branches/S2_5/client/gui-qt: mapview.cpp mapview.h spaceshipdlg.cpp

2014-09-19 Thread mlewczuk80
Author: mir3x Date: Fri Sep 19 10:15:12 2014 New Revision: 26508 URL: http://svn.gna.org/viewcvs/freeciv?rev=26508view=rev Log: Fixed not freed canvases in mapview and spaceship dialog See patch #5245 Modified: branches/S2_5/client/gui-qt/mapview.cpp

[Freeciv-commits] r26523 - /branches/S2_5/client/gui-qt/citydlg.cpp

2014-09-22 Thread mlewczuk80
Author: mir3x Date: Mon Sep 22 09:50:08 2014 New Revision: 26523 URL: http://svn.gna.org/viewcvs/freeciv?rev=26523view=rev Log: Removed white spaces in city dialog on progress bar, and added better resizing for production widget. See patch #5254 Modified:

[Freeciv-commits] r26524 - /trunk/client/gui-qt/citydlg.cpp

2014-09-22 Thread mlewczuk80
Author: mir3x Date: Mon Sep 22 09:52:32 2014 New Revision: 26524 URL: http://svn.gna.org/viewcvs/freeciv?rev=26524view=rev Log: Removed white spaces in city dialog on progress bar, and added better resizing for production widget. See patch #5254 Modified: trunk/client/gui-qt/citydlg.cpp

[Freeciv-commits] r26525 - /branches/S2_5/client/gui-qt/mapview.cpp

2014-09-22 Thread mlewczuk80
Author: mir3x Date: Mon Sep 22 09:55:02 2014 New Revision: 26525 URL: http://svn.gna.org/viewcvs/freeciv?rev=26525view=rev Log: Patched badly initialized class in mapview.cpp See patch #5262 Modified: branches/S2_5/client/gui-qt/mapview.cpp Modified:

[Freeciv-commits] r26570 - in /trunk/client/gui-qt: citydlg.cpp citydlg.h

2014-09-24 Thread mlewczuk80
Author: mir3x Date: Wed Sep 24 21:31:02 2014 New Revision: 26570 URL: http://svn.gna.org/viewcvs/freeciv?rev=26570view=rev Log: Added 4 buttons to worklist ( add, move current production up, move down, delete ) See patch #5270 Modified: trunk/client/gui-qt/citydlg.cpp

[Freeciv-commits] r26571 - in /branches/S2_5/client/gui-qt: citydlg.cpp citydlg.h

2014-09-24 Thread mlewczuk80
Author: mir3x Date: Wed Sep 24 21:33:37 2014 New Revision: 26571 URL: http://svn.gna.org/viewcvs/freeciv?rev=26571view=rev Log: Added 4 buttons to worklist ( add, move current production up, move down, delete ) See patch #5270 Modified: branches/S2_5/client/gui-qt/citydlg.cpp

[Freeciv-commits] r26576 - in /trunk: ./ data/themes/ data/themes/gui-qt/ data/themes/gui-qt/oxygen/

2014-09-25 Thread mlewczuk80
Author: mir3x Date: Thu Sep 25 10:10:43 2014 New Revision: 26576 URL: http://svn.gna.org/viewcvs/freeciv?rev=26576view=rev Log: Added 17 oxygen icons (32x32) to themes/gui-qt/oxygen/ for use in qt-client See patch #5277 Added: trunk/data/themes/gui-qt/

[Freeciv-commits] r26575 - in /branches/S2_5: ./ data/themes/ data/themes/gui-qt/ data/themes/gui-qt/oxygen/

2014-09-25 Thread mlewczuk80
Author: mir3x Date: Thu Sep 25 10:10:17 2014 New Revision: 26575 URL: http://svn.gna.org/viewcvs/freeciv?rev=26575view=rev Log: Added 17 oxygen icons (32x32) to themes/gui-qt/oxygen/ for use in qt-client See patch #5277 Added: branches/S2_5/data/themes/gui-qt/

[Freeciv-commits] r26639 - in /branches/S2_5/client/gui-qt: citydlg.cpp fc_client.cpp fc_client.h pages.cpp

2014-10-01 Thread mlewczuk80
Author: mir3x Date: Wed Oct 1 09:36:20 2014 New Revision: 26639 URL: http://svn.gna.org/viewcvs/freeciv?rev=26639view=rev Log: Added few icons to start page and city dialog See patch #5289 Modified: branches/S2_5/client/gui-qt/citydlg.cpp branches/S2_5/client/gui-qt/fc_client.cpp

[Freeciv-commits] r26640 - in /trunk/client/gui-qt: citydlg.cpp fc_client.cpp fc_client.h pages.cpp

2014-10-01 Thread mlewczuk80
Author: mir3x Date: Wed Oct 1 09:36:31 2014 New Revision: 26640 URL: http://svn.gna.org/viewcvs/freeciv?rev=26640view=rev Log: Added few icons to start page and city dialog See patch #5289 Modified: trunk/client/gui-qt/citydlg.cpp trunk/client/gui-qt/fc_client.cpp

[Freeciv-commits] r26641 - in /branches/S2_5/client/gui-qt: cityrep.cpp plrdlg.cpp repodlgs.cpp

2014-10-01 Thread mlewczuk80
Author: mir3x Date: Wed Oct 1 09:47:16 2014 New Revision: 26641 URL: http://svn.gna.org/viewcvs/freeciv?rev=26641view=rev Log: Visual changes to report dialogs Units report: - updated total upgradable units to int, instead checkbox Cities report: - changed font for city name to capitalized -

[Freeciv-commits] r26642 - in /trunk/client/gui-qt: cityrep.cpp plrdlg.cpp repodlgs.cpp

2014-10-01 Thread mlewczuk80
Author: mir3x Date: Wed Oct 1 09:47:27 2014 New Revision: 26642 URL: http://svn.gna.org/viewcvs/freeciv?rev=26642view=rev Log: Visual changes to report dialogs Units report: - updated total upgradable units to int, instead checkbox Cities report: - changed font for city name to capitalized -

[Freeciv-commits] r27238 - in /branches/S2_5: client/gui-qt/ translations/freeciv/

2014-12-10 Thread mlewczuk80
Author: mir3x Date: Wed Dec 10 17:59:01 2014 New Revision: 27238 URL: http://svn.gna.org/viewcvs/freeciv?rev=27238view=rev Log: Added help dialog to qt-client. Patch by Louis Moureaux louis94 See bug #23009 Modified: branches/S2_5/client/gui-qt/Makefile.am

[Freeciv-commits] r27239 - in /trunk: client/gui-qt/ translations/freeciv/

2014-12-10 Thread mlewczuk80
Author: mir3x Date: Wed Dec 10 18:08:23 2014 New Revision: 27239 URL: http://svn.gna.org/viewcvs/freeciv?rev=27239view=rev Log: Added help dialog to qt-client. Patch by Louis Moureaux louis94 See bug #23009 Modified: trunk/client/gui-qt/Makefile.am trunk/client/gui-qt/gui_main.cpp

[Freeciv-commits] r27297 - /branches/S2_5/client/gui-qt/helpdlg.cpp

2014-12-14 Thread mlewczuk80
Author: mir3x Date: Sun Dec 14 16:16:25 2014 New Revision: 27297 URL: http://svn.gna.org/viewcvs/freeciv?rev=27297view=rev Log: Fixed creating tree in qt-manual See bug #23052 Modified: branches/S2_5/client/gui-qt/helpdlg.cpp Modified: branches/S2_5/client/gui-qt/helpdlg.cpp URL:

[Freeciv-commits] r27298 - /trunk/client/gui-qt/helpdlg.cpp

2014-12-14 Thread mlewczuk80
Author: mir3x Date: Sun Dec 14 16:17:27 2014 New Revision: 27298 URL: http://svn.gna.org/viewcvs/freeciv?rev=27298view=rev Log: Fixed creating tree in qt-manual See bug #23052 Modified: trunk/client/gui-qt/helpdlg.cpp Modified: trunk/client/gui-qt/helpdlg.cpp URL:

[Freeciv-commits] r27315 - /trunk/client/gui-qt/citydlg.cpp

2014-12-16 Thread mlewczuk80
Author: mir3x Date: Tue Dec 16 16:28:24 2014 New Revision: 27315 URL: http://svn.gna.org/viewcvs/freeciv?rev=27315view=rev Log: Fixed wrong city dialog title See patch #5552 Modified: trunk/client/gui-qt/citydlg.cpp Modified: trunk/client/gui-qt/citydlg.cpp URL:

[Freeciv-commits] r27340 - /branches/S2_5/client/gui-qt/fc_client.cpp

2014-12-18 Thread mlewczuk80
Author: mir3x Date: Thu Dec 18 18:05:25 2014 New Revision: 27340 URL: http://svn.gna.org/viewcvs/freeciv?rev=27340view=rev Log: Fixed encoding in city names. See bug #23007 Modified: branches/S2_5/client/gui-qt/fc_client.cpp Modified: branches/S2_5/client/gui-qt/fc_client.cpp URL:

[Freeciv-commits] r27341 - /trunk/client/gui-qt/fc_client.cpp

2014-12-18 Thread mlewczuk80
Author: mir3x Date: Thu Dec 18 18:05:55 2014 New Revision: 27341 URL: http://svn.gna.org/viewcvs/freeciv?rev=27341view=rev Log: Fixed encoding in city names. See bug #23007 Modified: trunk/client/gui-qt/fc_client.cpp Modified: trunk/client/gui-qt/fc_client.cpp URL:

[Freeciv-commits] r27343 - in /branches/S2_5/client/gui-qt: menu.cpp menu.h

2014-12-18 Thread mlewczuk80
Author: mir3x Date: Thu Dec 18 18:26:52 2014 New Revision: 27343 URL: http://svn.gna.org/viewcvs/freeciv?rev=27343view=rev Log: Added 'Save', 'Save As' and 'Leave Game' menus to Qt-client See bug #23011 Modified: branches/S2_5/client/gui-qt/menu.cpp branches/S2_5/client/gui-qt/menu.h

[Freeciv-commits] r27342 - in /trunk/client/gui-qt: menu.cpp menu.h

2014-12-18 Thread mlewczuk80
Author: mir3x Date: Thu Dec 18 18:26:40 2014 New Revision: 27342 URL: http://svn.gna.org/viewcvs/freeciv?rev=27342view=rev Log: Added 'Save', 'Save As' and 'Leave Game' menus to Qt-client See bug #23011 Modified: trunk/client/gui-qt/menu.cpp trunk/client/gui-qt/menu.h Modified:

[Freeciv-commits] r27347 - in /branches/S2_5: ./ client/gui-qt/ data/themes/gui-qt/ data/themes/gui-qt/icons/ data/themes/gui-qt/oxygen/

2014-12-19 Thread mlewczuk80
Author: mir3x Date: Fri Dec 19 15:50:58 2014 New Revision: 27347 URL: http://svn.gna.org/viewcvs/freeciv?rev=27347view=rev Log: Removed oxygen icons Patch submitted by Louis Moureaux louis94 See bug #23094 Added: branches/S2_5/data/themes/gui-qt/icons/

[Freeciv-commits] r27348 - in /trunk: ./ client/gui-qt/ data/themes/gui-qt/ data/themes/gui-qt/icons/ data/themes/gui-qt/oxygen/

2014-12-19 Thread mlewczuk80
Author: mir3x Date: Fri Dec 19 15:51:38 2014 New Revision: 27348 URL: http://svn.gna.org/viewcvs/freeciv?rev=27348view=rev Log: Removed oxygen icons Patch submitted by Louis Moureaux louis94 See bug #23094 Added: trunk/data/themes/gui-qt/icons/

  1   2   3   4   5   6   7   8   9   10   >