Marlin

Merge lp://qastaging/~timorei/marlin/Fixes805729 into lp://qastaging/marlin/0.x

Fixes805729
Merge into trunk

Proposed by Timo Reimerdes on 2011-07-11

Status:

Rejected

Rejected by:

ammonkey on 2011-07-15

Proposed branch:

lp://qastaging/~timorei/marlin/Fixes805729

Merge into:

lp://qastaging/marlin/0.x

Diff against target:

371 lines (+117/-34)

4 files modified

org.gnome.marlin.gschema.xml.in (+21/-1)
po/de.po (+4/-0)
src/View/SettingsDialog.vala (+71/-13)
src/fm-columns-view.c (+21/-20)

To merge this branch:

bzr merge lp://qastaging/~timorei/marlin/Fixes805729

Undecided

Fix Released

Link a bug report

Reviewer	Date Requested	Status
ammonkey		Disapprove on 2011-07-13
xapantu	2011-07-11	Approve on 2011-07-12
Review via email: mp+67588@code.qastaging.launchpad.net

Description of the change

editable icon-sizes,
gsettings-keys,
options-dialogue

I used the same way that the sidebar icons sizes uses. So the not-working live-update applies here as well.

Revision history for this message

xapantu (xapantu) wrote on 2011-07-12:

There are some indentations errors in SettingsDialog.vala, maybe you could take a look at that? We prefer to have the comments using the same indentation level as the code too.

Any chance to get that in the list view too?

Otherwise, it is fine, it will be merged as soon as possible, thanks!

review: Approve

Revision history for this message

ammonkey (am-monkeyd) wrote on 2011-07-13:

The icon sizes shoud be determined by the zoom level as it is actually in the icon view.
I took some of your commit and updated the code to use zoom lvl in list & column view. Gonna take advantage of theses changes to fully implement zoom in list & column view too.

I mark this as disapprove as it needed fixing and it's now committed in rev 404. thx for starting fixing this bug.

review: Disapprove