Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes xib regressions #142

Merged
merged 3 commits into from
Jun 28, 2014
Merged

Conversation

kojiishi
Copy link

Moved fixes for XIB regressions from discussions in #132 to a separate pull request so that you could review diffs easier on the github site.

During enabling localizations and merging the patch to release/1.6.1 branch, some hunks are likely to be accidentally included and looks errors to me.

This is a pull request to fix all regressions introduced by the merge.

Diff Examinations

The original diff that includes possible errors is unfortunately a bit hard to view because the XIB was moved and duplicated in the same commit, and git does not show diff of the XIB file in two revisions clearly.

To look at the diff, 4e1eef3 reverts all the changes made to base XIB file. And then following commits in this pull request re-apply hunks that look reasonable to me. By looking at changed files of this pull request, you're seeing these (revert and re-apply) patches combined.

If you prefer text rather than diff, here's a summary:

  1. <deployment defaultVersion> was changed from 1070 to 1080. This is probably ok as I can see project targets 10.8 now.
  2. showMenuIcon outlet was removed. This is probably an error, I reverted in this patch.
  3. metafont="system" was changed to LucidaGrande. This is probably an error, reverted.
  4. Two <buttonCell key="prototype"> were removed. I can't find documents on this element, but by guessing from name, it's a prototype for its child elements. Maybe newer Xcode removes it automatically, but reverted anyway since the removal doesn't look intentional nor meaningful.
  5. Logo imageScaling was changed from proportionallyDown to proportionallyUpOrDown. Not a bad change if Apple is going to release x4 Retina ;-)
  6. A connection to an action showMenuBarIconAction: in Show Icon In Menu Bar was removed. This is probably an error, reverted.
  7. widthSizable="YES" heightSizable="YES" were added in autoresizingMask element. This looks like a good change as Apple recommends more auto-sizing and auto-layout.
  8. numberFormatter were changed to hard-code properties such as decimalSeparator=".". I suppose this is accidental, and is probably a non-welcoming change since using "." as a decimal separator isn't good for some European languages.
  9. A typo fix ab876c2 was reverted, probably accidentally. Reverted the revert (re-applied) in this patch.

fikovnik added a commit that referenced this pull request Jun 28, 2014
@fikovnik fikovnik merged commit 11f9482 into fikovnik:release/1.6.1 Jun 28, 2014
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants