[Freeciv-Dev] [patch #1687] Move the citizen bar next to the city name

2010-06-20 Thread Matthias Pfafferodt

Update of patch #1687 (project freeciv):

  Status:  Ready For Test = Done   
 Open/Closed:Open = Closed 


___

Reply to this item at:

  http://gna.org/patch/?1687

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1687] Move the citizen bar next to the city name

2010-06-13 Thread Matthias Pfafferodt

Follow-up Comment #7, patch #1687 (project freeciv):

version for S2_2

(file #9322)
___

Additional Item Attachment:

File name:
20100612-05-S2_2-patch-1687-Move-the-citizen-bar-next-to-the-city-n.patch
Size:11 KB


___

Reply to this item at:

  http://gna.org/patch/?1687

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1687] Move the citizen bar next to the city name

2010-06-12 Thread Matthias Pfafferodt

Update of patch #1687 (project freeciv):

  Status:None = Ready For Test 
 Assigned to:None = syntron
 Planned Release: = 2.3.0  

___

Follow-up Comment #1:

Nice patch! This is a better solution than to include the citizens line on
the overview page as well as on the happiness page. The problem is the size
of the first line and the alignment. At the moment the city name (+
population + status) moves around if one switches the city. How can it be
fixed to start at half the width of the window?

(also update the patch to trunk)

(file #9303)
___

Additional Item Attachment:

File name:
20100612-04-trunk-patch-1687-Move-the-citizen-bar-next-to-the-city-n.patch
Size:11 KB


___

Reply to this item at:

  http://gna.org/patch/?1687

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1687] Move the citizen bar next to the city name

2010-06-12 Thread Jon Severinsson

Follow-up Comment #2, patch #1687 (project freeciv):

 The problem is the size of the first line and the alignment.
 At the moment the city name (+ population + status) moves
 around if one switches the city. How can it be fixed to start
 at half the width of the window?

This is trivial. If you want the text to be centred in the right half you
only need to change hbox = gtk_hbox_new(FALSE, 0); to hbox =
gtk_hbox_new(TRUE, 0);.
If you want the text to be left-aligned in the right half you will
additionally have to add
gtk_misc_set_alignment(GTK_MISC(pdialog-name_label), 0.0f, 0.5f); to the
/ City name label here / section.

Attaching an updated patch as well as a backport to the 2.2 branch. (The
backport is mainly for my own use, as I want it in the 2.2 deb I use on my
netbook, but if you want to commit it to svn feel free to do so).

(file #9307, file #9308)
___

Additional Item Attachment:

File name: freeciv-trunk-move-citizen-bar-next-to-city-name-v2.patch Size:10
KB
File name: freeciv-2.2-move-citizen-bar-next-to-city-name-v2.patch Size:5 KB


___

Reply to this item at:

  http://gna.org/patch/?1687

___
  Meddelandet skickades via/av Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1687] Move the citizen bar next to the city name

2010-06-12 Thread Matthias Pfafferodt

Follow-up Comment #3, patch #1687 (project freeciv):

 This is trivial. 

But it is also that I wanted ;-) This way (city name left aligned in the
right half) it is similar to the previous centered place.

 Attaching an updated patch as well as a backport to the 2.2
 branch. (The backport is mainly for my own use, as I want it
 in the 2.2 deb I use on my netbook, but if you want to commit
 it to svn feel free to do so).

As it is a cosmetic change which allows to play freeciv on netbooks I think
this should go into 2.2.2. So no need to patch your own version anymore ...

Did you test the gtk2 city dialog of development branch? After the variable
city radii were included I did change its layout. Perhaps it would be
possible to save some height/width there (especially the production section
on the overview page)?

___

Reply to this item at:

  http://gna.org/patch/?1687

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1687] Move the citizen bar next to the city name

2010-06-12 Thread Jon Severinsson

Follow-up Comment #4, patch #1687 (project freeciv):

 As it is a cosmetic change which allows to play freeciv on
 netbooks I think this should go into 2.2.2. So no need to patch
 your own version anymore ...
Great! Please note that I found a typo in my backport (removed one variable
to much, fixed in the attacked version).

 Did you test the gtk2 city dialog of development branch? After
 the variable city radii were included I did change its layout.
 Perhaps it would be possible to save some height/width there
 (especially the production section on the overview page)?
I didn't until today, but here are some first thoughts:

The minimum width is still set by the production tab (at least in Swedish
translation, this is very dependent on the length of column headers and the
wonder names), so no change there.

The new position and additional height of the info box is great, it's not as
if supported and present units need the full widow width. Currently I'm using
kwin to force the window height, which cuts of several lines from the info box
in 2.2, so that change should probably be back-ported.

The line break in the Production progress-bar/drop-down-menu is imho stupid
and should be reverted, as it unnecessarily eats pixels from the Improvements
list.

But the big problem with trunk city dialogue is the oversized city map. It
forces both the Overview and the Happiness tabs to be way to tall. On the
overview map forcing the window height will cut it's height in about half and
only show the middle of it, which is enough to show the default radii, but it
registers clicks as if it was the upper half of the map, making managing your
workers manually impossible. The only solution I can think of that still keeps
compatibility with the variable radii feature is to put the city map in a
GtkScrolledWindow that adds a scrollbar when the height gets to small.

(file #9309)
___

Additional Item Attachment:

File name: freeciv-2.2-move-citizen-bar-next-to-city-name-v2.patch Size:5 KB


___

Reply to this item at:

  http://gna.org/patch/?1687

___
  Meddelandet skickades via/av Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1687] Move the citizen bar next to the city name

2010-06-12 Thread Matthias Pfafferodt

Follow-up Comment #5, patch #1687 (project freeciv):

 Great! Please note that I found a typo in my backport (removed
 one variable to much, fixed in the attacked version). 

I did also fixed this to do a compile test ...

 The line break in the Production progress-bar/drop-down-menu
 is imho stupid and should be reverted, as it unnecessarily
 eats pixels from the Improvements list. 

but it is needed to reduce the size of the production progressbar (test it
with: 'Magellans Expedition (W) [+] 200/400'); please try also the
experimental ruleset and a city of size 30 (variable city radii  build
slots). See the attached savegame (done with the help of the editor).
 
 But the big problem with trunk city dialogue is the oversized
 city map. It forces both the Overview and the Happiness tabs
 to be way to tall.

Which topology are you using? For topology 3 it is OK.

 On the overview map forcing the window height will cut it's
 height in about half and only show the middle of it, which is
 enough to show the default radii, but it registers clicks as
 if it was the upper half of the map, making managing your
 workers manually impossible.

Do you have a screenshot?

 The only solution I can think of that still keeps
 compatibility with the variable radii feature is to put the
 city map in a GtkScrolledWindow that adds a scrollbar when the
 height gets to small.

I tried this but failed as also an eventbox is needed. See also patch #1330.

If the optimization of the gtk city dialog needs more discussion this should
go into a separate ticket ...

(file #9311)
___

Additional Item Attachment:

File name: civgame-T0056-Y-1200-manual.sav.bz2 Size:25 KB


___

Reply to this item at:

  http://gna.org/patch/?1687

___
  Nachricht geschickt von/durch Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1687] Move the citizen bar next to the city name

2010-06-12 Thread Jon Severinsson

Follow-up Comment #6, patch #1687 (project freeciv):

 but it is needed to reduce the size of the production
 progressbar (test it with: 'Magellans Expedition (W) [+]
 200/400')
Good point, I guess it stays.

 Which topology are you using? For topology 3 it is OK. 
I'm using topology 5. For me, topology 3 is not OK either.

 Do you have a screenshot? 
Attached. The problem is that to toggle the worker in (1) I have to click on
(2) and toggling the worker in (3) is impossible.
Also note that this only happens if you configure your window manager (in my
case kwin) to force the window size to fit the screen. If I don't do that, I
will instead have a window that continues outside the screen (see second
screen-shot)

 If the optimization of the gtk city dialog needs more
 discussion this should go into a separate ticket ...
It does, but I will have to do some thinking first.


(file #9312, file #9313)
___

Additional Item Attachment:

File name: freeciv-trunk-citydialogue-overview.png Size:263 KB
File name: freeciv-trunk-citydialogue-overview-no-forced-size.png Size:161 KB


___

Reply to this item at:

  http://gna.org/patch/?1687

___
  Meddelandet skickades via/av Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] [patch #1687] Move the citizen bar next to the city name

2010-05-31 Thread Jon Severinsson

URL:
  http://gna.org/patch/?1687

 Summary: Move the citizen bar next to the city name
 Project: Freeciv
Submitted by: jon_severinsson
Submitted on: måndag 2010-05-31 den 23:43
Category: client-gtk-2.0
Priority: 5 - Normal
  Status: None
 Privacy: Public
 Assigned to: None
Originator Email: 
 Open/Closed: Open
 Discussion Lock: Any
 Planned Release: 

___

Details:

This is the fourth patch in a short series intended to improve the gtk gui on
netbook sized displays.

The city dialogue is to tall to fit on netbook sized displays. This patch
moves the citizen bar up one row, next to the city name, and thus reduces the
height of the window. This has the side effect that the citizen bar can be
accessed from all tabs in the window, but I don't see that as being
problematic.

Also please note that because there now is something to the right of the bar,
the pixcomm widget must be resized (or rather truncated when drawn) to it's
current width instead of just continue empty. This prompted a minor change in
how the + and - icons in edit mode is treated (they are now considered
citizen when counting citizens, thus the change in NUM_CITIZENS_SHOWN).
Clicking on the + and - doesn't actually do anything at the moment, and this
patch doesn't change that fact (as it doesn't touch citizens_callback()).



___

File Attachments:


---
Date: måndag 2010-05-31 den 23:43  Name:
freeciv-2.2.1-move-citizen-bar-next-to-city-name.patch  Size: 4 kB   By:
jon_severinsson

http://gna.org/patch/download.php?file_id=9231

___

Reply to this item at:

  http://gna.org/patch/?1687

___
  Meddelandet skickades via/av Gna!
  http://gna.org/


___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev