patchFreeciv - Patches: patch #3469, Get rid of most deprecated warning

 
 
Show feedback again

patch #3469: Get rid of most deprecated warning

Submitted by:  mir3x <mir3x>
Submitted on:  Tue 31 Jul 2012 10:22:57 PM UTC  
 
Category: client-gtk-3.0Priority: 5 - Normal
Status: DonePrivacy: Public
Assigned to: Marko Lindqvist <cazfi>Open/Closed: Closed
Planned Release: 2.4.0,2.5.0

Add a New Comment (Rich MarkupRich Markup):
   

You are not logged in

Please log in, so followups can be emailed to you.

 

(Jump to the original submission Jump to the original submission)

Mon 08 Apr 2013 08:36:37 AM UTC, comment #142:

> OK, this is the patch fixing the typo.

Ah, we already raised a new ticket (bug #20706), sorry for not mentioning it here.

Jacob Nevins <jtn>
Project Administrator
Mon 08 Apr 2013 08:34:41 AM UTC, comment #141:

OK, this is the patch fixing the typo.
Should be god for both S2_4 and trunk.

(file #17714)

Rafał Mużyło <galtgendo>
Wed 27 Mar 2013 06:32:43 AM UTC, comment #140:

...and this is why having your own patches rechecked by someone else is a good thing.

Back in trunk patches, I've made a minor typo, that I've later noticed and fixed in S2_4 branch, but the fix never made trunk and as such the typo is still present in the revision 22542 (originally in revision 21947). However file #17382 (IIRC) should have that typo already fixed.

In client/gui-gtk-3.0/gamedlgs.c, around line 278, in rates_lux_scale block, in gtk_range_set_increments call, rates_sci_scale is used by mistake.

Rafał Mużyło <galtgendo>
Sat 23 Mar 2013 10:39:37 AM UTC, comment #139:

No-one screamed...

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:36:44 AM UTC, SVN revision 22587:

Use GtkGrid in properties editor.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (60/60)

(Browse SVN revision 22587)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:36:41 AM UTC, SVN revision 22586:

Use GtkGrid for editor gui.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (59/60)

(Browse SVN revision 22586)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:36:37 AM UTC, SVN revision 22585:

Use GtkGrid for gui dialogs.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (58/60)

(Browse SVN revision 22585)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:36:34 AM UTC, SVN revision 22584:

Use GtkGrid on start page.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (57/60)

(Browse SVN revision 22584)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:36:30 AM UTC, SVN revision 22583:

Use GtkGrid on network page.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (56/60)

(Browse SVN revision 22583)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:36:26 AM UTC, SVN revision 22582:

Use GtkGrid in load dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (55/60)

(Browse SVN revision 22582)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:36:23 AM UTC, SVN revision 22581:

Use GtkGrid in save dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (54/60)

(Browse SVN revision 22581)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:36:20 AM UTC, SVN revision 22580:

Use GtkGrid for city dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (52/60)

(Browse SVN revision 22580)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:36:17 AM UTC, SVN revision 22579:

Use GtkGrid in city settings.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (51/60)

(Browse SVN revision 22579)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:36:13 AM UTC, SVN revision 22578:

Use GtkGrid for popup notify.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (50/60)

(Browse SVN revision 22578)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:36:10 AM UTC, SVN revision 22577:

Use GtkGrid in science dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (49/60)

(Browse SVN revision 22577)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:36:06 AM UTC, SVN revision 22576:

Use GtkGrid in unit selection dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (48/60)

(Browse SVN revision 22576)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:36:03 AM UTC, SVN revision 22575:

Use GtkGrid for diplomat actions dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (47/60)

(Browse SVN revision 22575)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:35:59 AM UTC, SVN revision 22574:

Use GtkGrid for nations.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (46/60)

(Browse SVN revision 22574)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:35:56 AM UTC, SVN revision 22573:

Use GtkGrid in city report.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (45/60)

(Browse SVN revision 22573)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:35:53 AM UTC, SVN revision 22572:

Use GtkGrid in player dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (44/60)

(Browse SVN revision 22572)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:35:50 AM UTC, SVN revision 22571:

Use GtkGrid in goto dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (43/60)

(Browse SVN revision 22571)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:35:47 AM UTC, SVN revision 22570:

Use GtkGrid in choice dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (42/60)

(Browse SVN revision 22570)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:35:44 AM UTC, SVN revision 22569:

Use GtkGrid for main menubar.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (41/60)

(Browse SVN revision 22569)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:35:37 AM UTC, SVN revision 22567:

Use GtkGrid for luaconsole.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (40/60)

(Browse SVN revision 22567)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:35:30 AM UTC, SVN revision 22565:

Use GtkGrid in spaceship dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (39/60)

(Browse SVN revision 22565)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:35:23 AM UTC, SVN revision 22563:

Use GtkGrid in diplomacy dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (38/60)

(Browse SVN revision 22563)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:35:19 AM UTC, SVN revision 22562:

Use GtkGrid in message dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (37/60)

(Browse SVN revision 22562)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:35:15 AM UTC, SVN revision 22561:

Use GtkGrid in option dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (36/60)

(Browse SVN revision 22561)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:35:09 AM UTC, SVN revision 22559:

Use GtkGrid in intelligence dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (35/60)

(Browse SVN revision 22559)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:35:06 AM UTC, SVN revision 22558:

Use GtkGrid on main page.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (34/60)

(Browse SVN revision 22558)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:35:02 AM UTC, SVN revision 22557:

Use GtkGrid for CMA.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (33/60)

(Browse SVN revision 22557)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:58 AM UTC, SVN revision 22556:

Use GtkGrid for chatline tools.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (32/60)

(Browse SVN revision 22556)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:54 AM UTC, SVN revision 22555:

Use GtkGrid in happiness tab.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (30/60)

(Browse SVN revision 22555)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:51 AM UTC, SVN revision 22554:

Use GtkGrid for city info.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (26/60)

(Browse SVN revision 22554)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:48 AM UTC, SVN revision 22553:

Use GtkGrid in gui_main.c

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (25/60)

(Browse SVN revision 22553)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:45 AM UTC, SVN revision 22552:

Use GtkGrid for map widget.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (24/60)

(Browse SVN revision 22552)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:43 AM UTC, SVN revision 22551:

Use GtkGrid for basic info.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (23/60)

(Browse SVN revision 22551)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:39 AM UTC, SVN revision 22550:

Use GtkGrid in CMA gui.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (22/60)

(Browse SVN revision 22550)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:33 AM UTC, SVN revision 22549:

Use gtk_widget_get_display() instead of gdk_screen_get_display().

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (18/60)

(Browse SVN revision 22549)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:30 AM UTC, SVN revision 22548:

Fixed some orientation related deprecations.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (15/60)

(Browse SVN revision 22548)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:26 AM UTC, SVN revision 22547:

Pass key event coordinates to key_city_overlay() instead of reading
current pointer location.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (13/60)

(Browse SVN revision 22547)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:23 AM UTC, SVN revision 22546:

Removed unused requisition variable.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (10/60)

(Browse SVN revision 22546)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:19 AM UTC, SVN revision 22545:

Use position information from event instead of reading pointer position
ourself in leave_mapcanvas()

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (9/60)

(Browse SVN revision 22545)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:17 AM UTC, SVN revision 22544:

Removed redundant visibility-notify-event callback.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (8/60)

(Browse SVN revision 22544)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:13 AM UTC, SVN revision 22543:

Use updated grab API

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (7/60)

(Browse SVN revision 22543)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:10 AM UTC, SVN revision 22542:

Rates dialog code modernization.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (6/60)

(Browse SVN revision 22542)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:06 AM UTC, SVN revision 22541:

GtkAdjustment usage cleanup

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (5/60)

(Browse SVN revision 22541)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:34:02 AM UTC, SVN revision 22540:

Use GdkRGBA for citydlg labels

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (4/60)

(Browse SVN revision 22540)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:33:53 AM UTC, SVN revision 22537:

Font style improvements in gtk3-client theme

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (2/60)

(Browse SVN revision 22537)

Jacob Nevins <jtn>
Project Administrator
Sat 23 Mar 2013 10:33:48 AM UTC, SVN revision 22536:

Center gtk3-client window as it opens.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (1/60)

(Browse SVN revision 22536)

Jacob Nevins <jtn>
Project Administrator
Sat 16 Mar 2013 01:39:51 PM UTC, comment #92:

Thanks.
Here's my version of the patch series backported from commits on trunk.
There were a few conflicts, but they were all explicable and easily resolved (unfortunately I lost my notes on the origins of the conflicts, so you'll have to take my word for it).
It compiles and my minimal testing so far didn't show any problems relative to trunk.

Compared to Rafał's patch series it has the following differences:

  • I took the arguably unrelated cleanup patch #2908 from trunk too
  • ...but I didn't take the fix for bug #14205
  • Patches which have not yet been applied to trunk have not been applied here either:
  • Patches are in a slightly different order (matching the order they were committed to trunk)

Are there any objections to committing this patch series?
(Commits would appear under relevant tickets, and I'd update the ticket statuses to reflect this.)

Couple of random notes on behavioural differences resulting from these changes (on trunk and S2_4)

  • minimap, unit list etc appears on the right of the main map rather than the left
  • option dialogs are more spaced out
Jacob Nevins <jtn>
Project Administrator
Sat 02 Mar 2013 03:00:29 PM UTC, comment #91:

This is what I have on my 2.4 branch.
It includes all the patches that got into trunk and a few that didn't.

Obviously, cherry-picking "Use g_strdup_printf() or g_strdup()..." patch has muddled the patchset a bit and is probably not really valid for 2.4.

There's also some some minor things like:
- 0001 patch, which got accepted and 0019, which didn't (patch #3560), do basically the same thing in different places - "gtk-button-images" is an upstream invention, not mine and arguably gui_gtkX_small_display_layout is sort of similar idea (using display space as efficiently as possible)
- 0004 patch is technically a bugfix, so it should have been picked up already
- patch #3572 is yet to be fully tested

(file #17382)

Rafał Mużyło <galtgendo>
Fri 01 Mar 2013 10:31:30 AM UTC, comment #90:

To avoid the risk of accidentally introducing changes that didn't go through Gna, it's probably best to backport from trunk svn.
I plan to do this; I've got a shortlist of changes to backport already. They don't cherry-pick trivially but I think the conflicts will be easy to resolve.
Next step is to post a massive patch stack from git here for review, and test it a bit.

Jacob Nevins <jtn>
Project Administrator
Wed 27 Feb 2013 06:33:20 PM UTC, comment #89:

Actually, most of my testing was done on 2.4 branch, so I still have my changes rebased on top of S2_4 branch.
Though I did cherry-pick a few other patches from trunk, including one or two that I probably didn't need that much, so you'd need to clean them up a bit.

Rafał Mużyło <galtgendo>
Sat 09 Feb 2013 12:12:52 AM UTC, comment #88:

> But anyway, in principle, is there a reason not to port the
> changes to the Gtk3 client code wholesale to S2_4? It's not like
> S2_4 gtk3 has a long history of testing behind it


Note that S2_4 gtk3-client is as much copy of gtk2-client as possible, and gtk2-client has been tested a lot during the years. But you are right that gtk3-client is all new client anyway, so we could still add stuff to S2_4 version quite liberally. Only that it would require weeding out any differences in the S2_4 and TRUNK codebases because of network protocol or client common code differences.

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Fri 08 Feb 2013 10:33:02 AM UTC, comment #87:

Months ago, I remember looking at some of the earlier commits to trunk in this ticket and thinking that they were visible improvements we might well want for S2_4.

On a brief look now I can't remember what exactly I was thinking of, unhelpfully. But anyway, in principle, is there a reason not to port the changes to the Gtk3 client code wholesale to S2_4? It's not like S2_4 gtk3 has a long history of testing behind it (I've noticed no feedback from users), and having two different gtk3 codebases to maintain seems like making a rod for our own backs. Unless all these GtkGrid changes are particularly risky, or bump the minimum required Gtk version or something?

(I haven't actually tried trunk gtk3 myself since the GtkGrid stuff went in.)

Jacob Nevins <jtn>
Project Administrator
Tue 18 Dec 2012 12:28:58 AM UTC, SVN revision 22085:

Use GtkGrid in properties editor.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (60/60)

(Browse SVN revision 22085)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sun 16 Dec 2012 11:25:12 PM UTC, SVN revision 22084:

Use GtkGrid for editor gui.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (59/60)

(Browse SVN revision 22084)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 15 Dec 2012 11:03:29 PM UTC, SVN revision 22082:

Use GtkGrid for gui dialogs.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (58/60)

(Browse SVN revision 22082)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Fri 14 Dec 2012 01:36:14 PM UTC, SVN revision 22075:

Use GtkGrid on start page.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (57/60)

(Browse SVN revision 22075)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 13 Dec 2012 09:38:35 AM UTC, SVN revision 22074:

Use GtkGrid on network page.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (56/60)

(Browse SVN revision 22074)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 12 Dec 2012 10:37:51 AM UTC, SVN revision 22072:

Use GtkGrid in load dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (55/60)

(Browse SVN revision 22072)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 11 Dec 2012 10:44:21 AM UTC, SVN revision 22071:

Use GtkGrid in save dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (54/60)

(Browse SVN revision 22071)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 11 Dec 2012 10:42:52 AM UTC, comment #79:

53/60 raised as patch #3572, just because I'm yet to test it.

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 05 Dec 2012 08:14:33 AM UTC, SVN revision 22054:

Use GtkGrid for cirty dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (52/60)

(Browse SVN revision 22054)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 04 Dec 2012 07:33:12 AM UTC, SVN revision 22050:

Use GtkGrid in city settings.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (51/60)

(Browse SVN revision 22050)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Mon 03 Dec 2012 07:47:20 AM UTC, SVN revision 22046:

Use GtkGrid for popup notify.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (50/60)

(Browse SVN revision 22046)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sun 02 Dec 2012 05:59:10 AM UTC, SVN revision 22045:

Use GtkGrid in science dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (49/60)

(Browse SVN revision 22045)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 01 Dec 2012 09:52:51 AM UTC, SVN revision 22043:

Use GtkGrid in unit selection dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (48/60)

(Browse SVN revision 22043)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 28 Nov 2012 06:55:31 AM UTC, SVN revision 22042:

Use GtkGrid for diplomat actions dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (47/60)

(Browse SVN revision 22042)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 27 Nov 2012 12:43:17 AM UTC, SVN revision 22040:

Use GtkGrid for nations.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (46/60)

(Browse SVN revision 22040)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Mon 26 Nov 2012 08:27:47 AM UTC, SVN revision 22039:

Use GtkGrid in city report.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (45/60)

(Browse SVN revision 22039)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sun 25 Nov 2012 02:16:39 AM UTC, SVN revision 22038:

Use GtkGrid in player dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (44/60)

(Browse SVN revision 22038)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 24 Nov 2012 03:24:37 AM UTC, SVN revision 22033:

Use GtkGrid in goto dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (43/60)

(Browse SVN revision 22033)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Fri 23 Nov 2012 04:51:15 AM UTC, SVN revision 22029:

Use GtkGrid in choice dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (42/60)

(Browse SVN revision 22029)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 22 Nov 2012 01:36:12 AM UTC, SVN revision 22027:

Use GtkGrid in for main menubar.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (41/60)

(Browse SVN revision 22027)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 21 Nov 2012 10:54:14 AM UTC, SVN revision 22020:

Use GtkGrid in for luaconsole.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (40/60)

(Browse SVN revision 22020)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 20 Nov 2012 08:57:10 PM UTC, SVN revision 22013:

Use GtkGrid in spaceship dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (39/60)

(Browse SVN revision 22013)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Mon 19 Nov 2012 11:26:50 PM UTC, SVN revision 22008:

Use GtkGrid in diplomacy dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (38/60)

(Browse SVN revision 22008)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Mon 19 Nov 2012 10:34:02 AM UTC, SVN revision 22007:

Use GtkGrid in message dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (37/60)

(Browse SVN revision 22007)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Mon 19 Nov 2012 03:22:24 AM UTC, SVN revision 22006:

Use GtkGrid in option dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (36/60)

(Browse SVN revision 22006)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sun 18 Nov 2012 09:30:07 AM UTC, SVN revision 22004:

Use GtkGrid in intelligence dialog.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (35/60)

(Browse SVN revision 22004)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 17 Nov 2012 09:57:12 PM UTC, SVN revision 21998:

Use GtkGrid on main page.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (34/60)

(Browse SVN revision 21998)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 17 Nov 2012 10:17:58 AM UTC, SVN revision 21996:

Use GtkGrid for CMA.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (33/60)

(Browse SVN revision 21996)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 17 Nov 2012 04:15:39 AM UTC, SVN revision 21995:

Use GtkGrid for chatline tools.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (32/60)

(Browse SVN revision 21995)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 17 Nov 2012 12:41:21 AM UTC, comment #57:

31/60 raised as patch #3566 for bug found in testing

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 17 Nov 2012 12:33:20 AM UTC, SVN revision 21994:

Use GtkGrid in happiness tab.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (30/60)

(Browse SVN revision 21994)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 17 Nov 2012 12:31:24 AM UTC, comment #55:

29/60 raised as patch #3565 as it depends on patch #3561 and cannot be committed yet. (I want to go though patches in this ticket in order so every one is certainly handled)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Fri 16 Nov 2012 02:00:45 AM UTC, comment #54:

28/60 raised as patch #3564 for problems found in testing.

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 15 Nov 2012 09:21:47 PM UTC, comment #53:

27/60 raised as patch #3561 for problem found in testing.

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 15 Nov 2012 11:44:51 AM UTC, SVN revision 21992:

Use GtkGrid for city info.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (26/60)

(Browse SVN revision 21992)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 15 Nov 2012 02:49:45 AM UTC, SVN revision 21991:

Use GtkGrid in gui_main.c

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (25/60)

(Browse SVN revision 21991)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 14 Nov 2012 11:46:41 PM UTC, SVN revision 21987:

Use GtkGrid for map widget.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (24/60)

(Browse SVN revision 21987)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 14 Nov 2012 11:43:17 AM UTC, SVN revision 21985:

Use GtkGrid for basic info.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (23/60)

(Browse SVN revision 21985)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 13 Nov 2012 11:48:01 PM UTC, SVN revision 21984:

Use GtkGrid in CMA gui.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (22/60)

(Browse SVN revision 21984)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 13 Nov 2012 11:45:46 PM UTC, comment #47:

21/60 raised as patch #3560, since it seems not to work.

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 13 Nov 2012 09:13:53 PM UTC, comment #46:

In the meanwhile, patch 25/60 has slightly changed.
Attaching updated version.

(file #16756)

Rafał Mużyło <galtgendo>
Tue 13 Nov 2012 02:29:03 PM UTC, comment #45:

20/60 is duplicate of bug #20095

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 13 Nov 2012 02:21:56 PM UTC, comment #44:

19/60 raised as patch #3558

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 13 Nov 2012 02:12:52 PM UTC, SVN revision 21981:

Use gtk_widget_get_display() instead of gdk_screen_get_display().

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (18/60)

(Browse SVN revision 21981)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 13 Nov 2012 02:09:08 PM UTC, comment #42:

17/60 is duplicate of bug #20000

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 13 Nov 2012 02:06:43 PM UTC, comment #41:

16/60 is duplicate of patch #3348

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 13 Nov 2012 02:23:31 AM UTC, SVN revision 21980:

Fixed some orientation related deprecations.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (15/60)

(Browse SVN revision 21980)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 13 Nov 2012 02:20:56 AM UTC, comment #39:

I've raised new version of 14/60 as patch #3557

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sun 11 Nov 2012 01:21:33 AM UTC, SVN revision 21978:

Pass key event coordinates to key_city_overlay() instead of reading
current pointer location.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (13/60)

(Browse SVN revision 21978)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sun 11 Nov 2012 01:13:10 AM UTC, comment #37:

Also 12/60 handled as part of patch #3550.

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 20 Oct 2012 11:10:03 PM UTC, comment #36:

I've raised 11/60 as patch #3550 for discussion as from quick glance it seems unacceptable to me.

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Fri 19 Oct 2012 11:41:49 PM UTC, SVN revision 21966:

Removed unused requisition variable.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (10/60)

(Browse SVN revision 21966)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 18 Oct 2012 11:10:01 PM UTC, SVN revision 21961:

Use position information from event instead of reading pointer position
ourself in leave_mapcanvas()

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (9/60)

(Browse SVN revision 21961)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Wed 17 Oct 2012 07:16:15 AM UTC, SVN revision 21960:

Removed redundant visibility-notify-event callback.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (8/60)

(Browse SVN revision 21960)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Mon 15 Oct 2012 09:40:36 PM UTC, SVN revision 21950:

Use updated grab API

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (7/60)

(Browse SVN revision 21950)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Mon 15 Oct 2012 12:35:48 AM UTC, SVN revision 21947:

Rates dialog code modernization.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (6/60)

(Browse SVN revision 21947)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 13 Oct 2012 11:55:30 PM UTC, SVN revision 21938:

GtkAdjustment usage cleanup

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (5/60)

(Browse SVN revision 21938)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 13 Oct 2012 12:53:51 AM UTC, SVN revision 21935:

Use GdkRGBA for citydlg labels

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (4/60)

(Browse SVN revision 21935)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 09 Oct 2012 09:27:17 AM UTC, comment #28:

3/60 is being handled as patch #3543

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Tue 09 Oct 2012 09:18:01 AM UTC, SVN revision 21910:

Font style improvements in gtk3-client theme

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (2/60)

(Browse SVN revision 21910)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Mon 08 Oct 2012 10:37:05 PM UTC, SVN revision 21904:

Center gtk3-client window as it opens.

Patch by Rafa?\197?\130 Mu?\197?\188y?\197?\130o

See gna patch #3469 (1/60)

(Browse SVN revision 21904)

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sat 06 Oct 2012 02:14:56 AM UTC, comment #25:

Usually we've enforced 1 patch/ticket policy to avoid tickets being in some pseudo state of being partly resolved (some patches committed) and partly not. With patchset of 60 patches I think we can try different approach here - forcing you to create 60 new tickets doesn't sound like good use of development time.

We resolve everything trivial (anything I end up committing without further comments) as part of this ticket. When ever some patch needs further discussion, it won't block this ticket, but new ticket will be created for the particular patch at that point.

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Sun 09 Sep 2012 11:09:43 PM UTC, comment #24:

When looking at "row-selected" description, it seems to me it can't be made to both act as it currently does and coded correctly:

As this is not a simple event, but a set of alternates, it can't be reasonably reimplemented either.

On not quite related note: today I've stumbled upon the explanation of the reason of bug #19846 - and it's nasty:
https://bugzilla.gnome.org/show_bug.cgi?id=671939

Rafał Mużyło <galtgendo>
Sun 09 Sep 2012 05:37:19 AM UTC, comment #23:

This tarball carries complete patchset against r21858 trunk.

There are quite a few patches here, that are already attached to other bugs/patches here, but there are just too many changes already to show the current state in any other way.

This isn't final yet - while grids have a few upsides, one downside in regard of boxes is that there's no real equivalent of gtk_box_pack_end - attaching at the end is simple, from - not so. To do that, I'll need to fix a few things.

It's not quite 1:1 - I think I went in the other direction this time and added too much spacing - but it should mostly match previous behavior.

But - unless I've missed something - it's more or less done.

Probably made a mistake or two there, so please review (especially votebar wasn't quite tested - didn't came up with an easy test setup).

Among the changes there are a few minor enhancements (i.e. in rates dialog - though I'm not sure I've made it in the right part of it (namely in regard of refreshing the dialog on govt. change)).

Most of my testing was on S2_4, but the patches were cherry-picked from one branch to the other, so it should be fine.

(file #16493)

Rafał Mużyło <galtgendo>
Mon 03 Sep 2012 05:46:21 PM UTC, comment #22:

I've been a little busy lately, so the progress is a bit slower than I expected.

On the other hand, as I'm reviewing my own changes, I notice a few places I can improve them.

I.e., for all those little rants about TOCTOU, I was doing the same in move_mapcanvas. Now, I've simplified that block to

Yet another unrelated note: I wonder how long will it take till gna.org renews its ssl certificate.

Rafał Mużyło <galtgendo>
Sat 25 Aug 2012 09:39:56 PM UTC, comment #21:

News update: git 1.7.12 was released.
It's with svn 1.7 patch here, so I'm slowly working on separating the changes I've already made (and tweaking them a little) into a series of git patches.

Unless something significant happens, within a week or two those patches will slowly be attached here.

Plans for a few callbacks:
- as create_line_at_mouse_pos is redundant, it will most likely become '{}'
- update_rect_at_mouse_pos probably likewise, after adjusting move_mapcanvas
- overlay_workers_at_city will simply be merged into butt_down_mapcanvas

Still planing to lean heavily on GtkGrid.

On semi-related note: complete 'git svn clone' took about 5 hours - ouch.

Rafał Mużyło <galtgendo>
Sun 12 Aug 2012 09:10:25 PM UTC, comment #20:

Due to previously mentioned reasons, things are a bit stuck right now, but I've ran a little test today in regard of create_line_at_mouse_pos.

It's already redundant - move_mapcanvas and move_overviewcanvas already cover it. Though it might be a good idea to add the conditions from create_line_at_mouse_pos to both of them - I'll need to check if that makes sense.

As for gridding, as I mentioned elsewhere, it's mostly done, I'll just need to restore the spacing and check a few things in the few places where I done something more than search&replace.

Rafał Mużyło <galtgendo>
Sun 05 Aug 2012 09:19:24 PM UTC, comment #19:

Seems a more detailed description is necessary:
- select a unit
- right click on a tile, that's far enough to make a visible difference but still being able to see the unit
- press and hold right mouse button, drag to select an area
- without releasing the button, press "c"

map does get centered, but the mouse is permanently grabbed
(gtk2 version might matter, it's 2.24.11 here)

Rafał Mużyło <galtgendo>
Sun 05 Aug 2012 09:07:46 PM UTC, comment #18:

sorry I was wrong. Centered was some vent.
It centered on new place but cursor still remained strange. After clicking new turn everything was ok ( client was almost ok except cursor and I was unable to select another unit)

Anonymous
Sun 05 Aug 2012 09:03:34 PM UTC, comment #17:

On gtk2 client
- select a unit (I selected )
- center the map on a different tile ( I chosen via messages and it centereed )
- select an area, don't release the button ( I chosen )
- press "c" ( nothing happened, unit was still centered )

Anonymous
Sun 05 Aug 2012 09:01:51 PM UTC, comment #16:

I've made those changes in gtk3 client, not gtk2, where the permanent grab happens.
(and I didn't exactly ask "what does center_tile_mapcanvas do ?", but more along the lines of "is there anything I should know about update_rect_at_mouse_pos in regard of common client code ?")

Rafał Mużyło <galtgendo>
Sun 05 Aug 2012 08:47:51 PM UTC, comment #15:

you asked what does earlier "center_tile_mapcanvas()" - it center map on unit when c is pressed, also probably center on some event via message output. I assume you changed it so of course its your fault, that 'c' make mess now.

Anonymous
Sun 05 Aug 2012 08:44:51 PM UTC, comment #14:

@comment 12:

I want to put something like:
{
GdkModifierType state;
gdk_device_get_state(ev->device, ev->window, NULL, &state);
if (rbutton_down && (state & GDK_BUTTON3_MASK)) {
update_selection_rectangle(ev->x, ev->y);
}
}
in move_mapcanvas instead of update_rect_at_mouse_pos.

(and whoever you were, you forgot to login)

Rafał Mużyło <galtgendo>
Sun 05 Aug 2012 08:25:52 PM UTC, comment #13:

Now, for something bit annoying, for a change: kind of similar test, but in "c" case, in gtk3 client leads to not quite correct display till mapcanvas gets redrawn - I'm not sure if it's related to my changes or not.

But in gtk2 client, it leads to mouse getting permanently being grabbed by mapcanvas - can't access menu, trying to close the window (with mouse) leads to getting messages about application not responding.

The exact procedure:
- select a unit
- center the map on a different tile
- select an area, don't release the button
- press "c"

Can someone else reproduce this in gtk2 client ?

Rafał Mużyło <galtgendo>
Sun 05 Aug 2012 08:04:36 PM UTC, comment #12:

>> I'm tempted to do something really annoying from common client code side of view - implement update_rect_at_mouse_pos as '{}' and just handle it in move_mapcanvas.


I still dont understood what you are trying to achieve

Anonymous
Sun 05 Aug 2012 08:02:38 PM UTC, comment #11:

Well, here's a funny thing: while tinkering with update_rect_at_mouse_pos, I thought I've made a regression, but gtk2 client seems to have the same problem.

Holding right mouse button, select an area. Without releasing the button, scroll with mouse wheel. When you stop scrolling, move the mouse a bit, while not releasing the button - observe part one of the problem. Now release it - second part of the problem (selection rectangle is drawn till map_canvas gets redrawn).

On a semi-related note: is toggle_focus_unit_state the function responsible for drawing focus circle ?

Also, it seems I'll go into total grid conversion, including converting all the boxes into grids. Crazy, ain't it ?

But I wonder: it seems that there's a good chance to make
a few options switchable without restart via gtk_orientable_set_orientation (that's gtk+ 2.16, actually).
I'll go back to this idea once I'm done with grids.

Rafał Mużyło <galtgendo>
Sat 04 Aug 2012 04:04:45 PM UTC, comment #10:

I've made not-quite-a-typo in the first version of the second - it worked, but generated new compiler warnings.

(file #16300)

Rafał Mużyło <galtgendo>
Sat 04 Aug 2012 03:40:59 AM UTC, comment #9:

I hope that whatever issues there are lately in 'git svn', they'll going to get reasonably fixed soon, cause that's likely the most simple solution on my side - I'll simply import svn repo into git then.

Anyway, there has been some progress in the last few hours, but it's quite hard to isolate the changes in the older patches from the more recent ones.

Looks like I'll lean very heavy on the grids - though it's sometimes quite hard to figure out which {h,v}boxes were functional and which only decorative. Probably won't get it completely right in the first go.

On a semi-related note: it seems I've stumbled on one or two places with a similar problem to that bug with editor mode and GtkScrolledWindow (can't recall the number atm.).

No luck in finding that focus circle yet.

Rafał Mużyło <galtgendo>
Fri 03 Aug 2012 09:44:17 AM UTC, comment #8:

I'm tempted to do something really annoying from common client code side of view - implement update_rect_at_mouse_pos as '{}' and just handle it in move_mapcanvas.

Initial tests look good - that is as I select things with mouse, the rectangle seems to be drawn at correct time and place.

What does "Called by center_tile_mapcanvas().." part of its description refers to (just to make sure the test is close to complete) ?

Also, I've noticed something odd (both in gtk3 and gtk2): once a unit is selected, cpu usage instantly spikes. I suspect it has something to do with selection circle under the unit, but need to find the place where it's drawn first.

Rafał Mużyło <galtgendo>
Thu 02 Aug 2012 11:45:05 PM UTC, comment #7:

It's bit hard to separate, as I'm a bit low on on disk space on this machine and svn is not git, so I've only have branch-2.4 checked out.

Rafał Mużyło <galtgendo>
Thu 02 Aug 2012 09:06:55 PM UTC, comment #6:

Remember to keep bug fixes and cleanup and feature development separate. First one should go to S2_4 too, last one only to TRUNK, and middle one usually to TRUNK only except when being requirement for later bugfix.

Marko Lindqvist <cazfi>
Project AdministratorIn charge of this item.
Thu 02 Aug 2012 08:54:58 PM UTC, comment #5:

So, step 2 will regard the simple part of gdk_window_get_pointer

- in chatline .c, one call was doing nothing, the other was connected to a signal that seems to have been redundant (AFAICT, things work correctly without handling that signal)
- one of the calls in mapctrl.c was made in a callback to an event where the pointer device wasn't really important (the little testing I've done suggest things work just like there use to with this change)

Now, I've got a little problem:
city_activated_callback (cityrep.c) and impr_callback (citydlg.c) - AFAICT, these two, while seem to be working, are actually incorrect both in gtk3 and gtk2; the problem is that, unless I'm missing something, they check for Ctrl being pressed during the callback, not when the event takes place; while in most cases, human reaction time will make it a non issue, it won't make it correct

Still left are those three functions in mapctrl.c - the plan for overlay_workers_at_city is unchanged atm., other two are a bit more complicated (want to made a significant change, but not break common client code in the process).

(file #16284)

Rafał Mużyło <galtgendo>
Thu 02 Aug 2012 03:24:12 PM UTC, comment #4:

I think I'll use this place for a staging ground.

step 1:
some of the trivial things (scrolbars, separators) and simple things (gdk_pointer_grab,gdk_display_pointer_ungrab - simple due to being done in the right calbacks)

(those two .drawable blocks are just a minor cleanup after gtk2 code removal)

Further steps are being worked on.
In regard of gdk_window_get_pointer:
- if there are no complaints, I'll make overlay_workers_at_city static and remove it from mapctrl.h
- as leave_mapcanvas is not client specific, I'll need to came up with something
- as for chatline.c, no idea yet;

(file #16283)

Rafał Mużyło <galtgendo>
Wed 01 Aug 2012 01:19:44 AM UTC, comment #3:

Also, there's a little thing I've missed in the initial port (mainly cause it was still hybrid then) - except for most gdk_window_get_pointer calls, those calls can be made far more simple via the content of events they handle.

Rafał Mużyło <galtgendo>
Tue 31 Jul 2012 11:03:54 PM UTC, comment #2:

Thank you, but I'd rather not.

First of all, the list of deprecation warnings is a bit incomplete, as we're targeting 3.4 and the list covers only 3.2 (due to a quirk of how are bounds for those warnings defined).

Second, related to first, with gtk2 cleanup I was already planing to go grid crazy and one of those missing warning sets regards GtkTable -> GtkGrid.

I'm already working on it, but there's quite a bit of it and I still haven't decided just how grid-crazy should I go.

While I (most likely) won't be touching scrollbars, scales, etc. in a more than trivial way, the boxes are a quite different matter.

I'll probably need an extra set of eyes or two for testing how the gui changes look (margins, padding, etc.), though.

Rafał Mużyło <galtgendo>
Tue 31 Jul 2012 10:51:18 PM UTC, comment #1:

I missed something before gdk_device_ungrab in 2 occurences.

(file #16255)

mir3x <mir3x>
Project Member
Tue 31 Jul 2012 10:22:57 PM UTC, original submission:

Changed to gtk3 functions all remaining except styles
( it looks like some rc files are needed )

( network page looks strange now - I checked create_start_page function but haven't figured why, there were only hboxes and vboxes changed,but correctly )

mir3x <mir3x>
Project Member

 

(Note: upload size limit is set to 1024 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

Attached Files
file #17714:  0001-fix-rates-dialog-typo.patch added by galtgendo (929B - text/x-patch - fix typo in rates_dialog)
file #17439:  S2_4-gtk3-grids-etc-patches.mbox added by jtn (341kB - application/mbox - S2_4 r22519: backported patch series from trunk (git mbox format))
file #17382:  freeciv-2.4-deprecation-patchset.tar.xz added by galtgendo (53kB - application/x-xz - the patches on top of S2_4 branch)
file #16493:  freeciv-trunk-patches.tar.xz added by galtgendo (48kB - application/octet-stream - complete patchset against r21858)
file #16300:  pointer-pos-changes-1.patch added by galtgendo (4kB - text/x-patch - corrected pointer-pos-changes-1.patch)
file #16284:  pointer-pos-changes-1.patch added by galtgendo (4kB - text/x-patch - gdk_window_get_pointer removal, step 1)
file #16283:  minor-deprecations-cleanup.patch added by galtgendo (16kB - text/x-patch - fix trivial stuff)
file #16255:  get_rid_gtk3_deprecated.patch.gz added by mir3x (13kB - application/x-gzip)
file #16254:  get_rid_gtk3_deprecated.patch.gz added by mir3x (13kB - application/x-gzip)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by jtn (Posted a comment)
  • -unavailable- added by cazfi (Posted a comment)
  • -unavailable- added by galtgendo (Updated the item)
  • -unavailable- added by galtgendo
  • -unavailable- added by mir3x (Submitted the item)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 0 encouragements so far.

    Only logged-in users can vote.

     

    Please enter the title of George Orwell's famous dystopian book (it's a date):

     

     

    Follow 17 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Mon 08 Apr 2013 08:34:41 AM UTCgaltgendoAttached File-=>Added 0001-fix-rates-dialog-typo.patch, #17714
    Sat 23 Mar 2013 10:39:37 AM UTCjtnPlanned Release2.5.0=>2.4.0,2.5.0
    Sat 16 Mar 2013 01:42:23 PM UTCjtnAttached File-=>Added S2_4-gtk3-grids-etc-patches.mbox, #17439
    Sat 02 Mar 2013 03:00:29 PM UTCgaltgendoAttached File-=>Added freeciv-2.4-deprecation-patchset.tar.xz, #17382
    Tue 18 Dec 2012 12:29:09 AM UTCcazfiStatusReady For Test=>Done
      Open/ClosedOpen=>Closed
    Tue 13 Nov 2012 09:13:53 PM UTCgaltgendoAttached File-=>Added 0025-use-grids-in-gui_main.c.patch, #16756
    Sat 06 Oct 2012 02:17:30 AM UTCcazfiStatusNone=>Ready For Test
      Assigned toNone=>cazfi
      Planned Release=>2.5.0
    Sun 09 Sep 2012 05:37:18 AM UTCgaltgendoAttached File-=>Added freeciv-trunk-patches.tar.xz, #16493
    Sat 04 Aug 2012 04:04:45 PM UTCgaltgendoAttached File-=>Added pointer-pos-changes-1.patch, #16300
    Thu 02 Aug 2012 08:54:58 PM UTCgaltgendoAttached File-=>Added pointer-pos-changes-1.patch, #16284
    Thu 02 Aug 2012 03:24:12 PM UTCgaltgendoAttached File-=>Added minor-deprecations-cleanup.patch, #16283
    Wed 01 Aug 2012 01:19:44 AM UTCgaltgendoCarbon-Copy-=>Added
    Tue 31 Jul 2012 10:51:18 PM UTCmir3xAttached File-=>Added get_rid_gtk3_deprecated.patch.gz, #16255
    Tue 31 Jul 2012 10:22:57 PM UTCmir3xAttached File-=>Added get_rid_gtk3_deprecated.patch.gz, #16254
    Show feedback again

    Back to the top


    Powered by Savane 3.1-cleanup