From a5c655a4026705dc956fdd92e87e004f695fe4a8 Mon Sep 17 00:00:00 2001 From: "stuart.morgan%alumni.case.edu" Date: Tue, 15 Sep 2009 01:34:29 +0000 Subject: [PATCH] Camino only - Bug 400639: Remove Advanced Font prefs sheet. Original patch by Christopher Henderson . r=alqahira sr=pink git-svn-id: svn://10.0.0.236/branches/CAMINO_2_0_BRANCH@258385 18797224-902f-48f8-a5cc-f745e15eee43 --- .../PreferencePanes/Appearance/Appearance.h | 14 +- .../PreferencePanes/Appearance/Appearance.mm | 88 +++---- .../English.lproj/Appearance.nib/classes.nib | 227 +++++++++++------- .../English.lproj/Appearance.nib/info.nib | 10 +- .../Appearance.nib/keyedobjects.nib | Bin 30374 -> 27060 bytes .../English.lproj/Localizable.strings.in | 3 - 6 files changed, 192 insertions(+), 150 deletions(-) diff --git a/mozilla/camino/PreferencePanes/Appearance/Appearance.h b/mozilla/camino/PreferencePanes/Appearance/Appearance.h index 660d389b5dd..e7bdbd42d38 100644 --- a/mozilla/camino/PreferencePanes/Appearance/Appearance.h +++ b/mozilla/camino/PreferencePanes/Appearance/Appearance.h @@ -62,16 +62,12 @@ IBOutlet NSTextField* mFontSampleMonospace; IBOutlet NSTextField* mProportionalSampleLabel; - IBOutlet NSTextField* mProportionalSubLabel; + IBOutlet NSPopUpButton* mMinFontSizePopup; + IBOutlet NSMatrix* mDefaultFontMatrix; IBOutlet NSButton* mUseMyFontsCheckbox; - // advanced panel stuff - IBOutlet NSPanel* mAdvancedFontsDialog; - IBOutlet NSPopUpButton* mMinFontSizePopup; - IBOutlet NSTextField* mAdvancedFontsLabel; - - IBOutlet NSMatrix* mDefaultFontMatrix; + IBOutlet NSView* mPreviousBottomControl; NSArray* mRegionMappingTable; @@ -93,8 +89,8 @@ - (IBAction)monospaceFontChoiceButtonClicked:(id)sender; - (IBAction)fontRegionPopupClicked:(id)sender; -- (IBAction)showAdvancedFontsDialog:(id)sender; -- (IBAction)advancedFontsDone:(id)sender; +- (IBAction)minFontSizePopupClicked:(id)sender; +- (IBAction)defaultFontTypeClicked:(id)sender; - (IBAction)resetToDefaults:(id)sender; diff --git a/mozilla/camino/PreferencePanes/Appearance/Appearance.mm b/mozilla/camino/PreferencePanes/Appearance/Appearance.mm index a0fa2a5a8e0..8e75c4e9089 100644 --- a/mozilla/camino/PreferencePanes/Appearance/Appearance.mm +++ b/mozilla/camino/PreferencePanes/Appearance/Appearance.mm @@ -71,6 +71,7 @@ - (void)setFontSampleOfType:(NSString*)fontType withFont:(NSFont*)font andDict:(NSDictionary*)regionDict; - (void)saveFont:(NSFont*)font toDict:(NSMutableDictionary*)regionDict forType:(NSString*)fontType; +- (void)updateAdvancedFontControls; - (void)updateFontSampleOfType:(NSString*)fontType; - (NSTextField*)fontSampleForType:(NSString*)fontType; - (NSString*)fontSizeType:(NSString*)fontType; @@ -130,13 +131,6 @@ [super dealloc]; } -- (id)initWithBundle:(NSBundle*)bundle -{ - self = [super initWithBundle:bundle]; - mFontButtonForEditor = nil; - return self; -} - - (void)mainViewDidLoad { // should save and restore this @@ -162,6 +156,7 @@ [self loadFontPrefs]; [self updateFontPreviews]; + [self updateAdvancedFontControls]; } - (void)didUnselect @@ -170,8 +165,28 @@ [self saveFontPrefs]; } +// The colors and fonts tab views are different heights. We need to resize +// the window when each is selected so the spacing looks correct. - (void)tabView:(NSTabView*)tabView didSelectTabViewItem:(NSTabViewItem*)tabViewItem { + NSControl* bottomControl = nil; + if ([[tabViewItem identifier] isEqualToString:@"colors"]) + bottomControl = mUseMyColorsCheckbox; + else if ([[tabViewItem identifier] isEqualToString:@"fonts"]) + bottomControl = mUseMyFontsCheckbox; + + if (bottomControl && bottomControl != mPreviousBottomControl) { + NSWindow* prefsWindow = [mTabView window]; + float heightChange = [mPreviousBottomControl frame].origin.y - + [bottomControl frame].origin.y; + + NSRect windowFrame = [prefsWindow frame]; + windowFrame.size.height += heightChange; + windowFrame.origin.y -= heightChange; + [prefsWindow setFrame:windowFrame display:YES animate:[prefsWindow isVisible]]; + + mPreviousBottomControl = bottomControl; + } } - (void)setupFontRegionPopup @@ -248,6 +263,7 @@ { // save the old values [self updateFontPreviews]; + [self updateAdvancedFontControls]; } - (void)loadFontPrefs @@ -656,15 +672,6 @@ NSString* propLabelString = [NSString stringWithFormat:[self localizedStringForKey:@"ProportionalLabelFormat"], [self localizedStringForKey:defaultFontType]]; [mProportionalSampleLabel setStringValue:propLabelString]; - - NSString* sublabelValue = [self localizedStringForKey:[defaultFontType stringByAppendingString:@"_note"]]; - [mProportionalSubLabel setStringValue:sublabelValue]; - - NSString* noteFontExample = [defaultFontType isEqualToString:@"serif"] ? @"Times" : @"Helvetica"; - [mProportionalSubLabel setFont:[[NSFontManager sharedFontManager] fontWithFamily:noteFontExample - traits:0 - weight:5 /* normal weight */ - size:[[mProportionalSubLabel font] pointSize]]]; [self setupFontSamplesFromDict:regionDict]; } @@ -674,15 +681,11 @@ const int kDefaultFontSerifTag = 0; const int kDefaultFontSansSerifTag = 1; -- (IBAction)showAdvancedFontsDialog:(id)sender +- (void)updateAdvancedFontControls { NSDictionary* regionDict = [self settingsForCurrentRegion]; if (!regionDict) return; - NSString* advancedLabel = [NSString stringWithFormat:[self localizedStringForKey:@"AdditionalFontsLabelFormat"], - [regionDict objectForKey:@"region"]]; - [mAdvancedFontsLabel setStringValue:advancedLabel]; - // set up min size popup int itemIndex = 0; NSMutableDictionary* fontSizeDict = [regionDict objectForKey:@"fontsize"]; @@ -693,24 +696,14 @@ const int kDefaultFontSansSerifTag = 1; itemIndex = 0; } [mMinFontSizePopup selectItemAtIndex:itemIndex]; - + // set up default font radio buttons (default to serif) NSString* defaultFontType = [self defaultProportionalFontTypeForCurrentRegion]; [mDefaultFontMatrix selectCellWithTag:([defaultFontType isEqualToString:@"sans-serif"] ? kDefaultFontSansSerifTag : kDefaultFontSerifTag)]; - - mFontPanelWasVisible = [[NSFontPanel sharedFontPanel] isVisible]; - [[NSFontPanel sharedFontPanel] orderOut:nil]; - - [NSApp beginSheet:mAdvancedFontsDialog - modalForWindow:[mTabView window] // any old window accessor - modalDelegate:self - didEndSelector:@selector(advancedFontsSheetDidEnd:returnCode:contextInfo:) - contextInfo:NULL]; } -- (IBAction)advancedFontsDone:(id)sender +- (IBAction)minFontSizePopupClicked:(id)sender { - // save settings NSDictionary* regionDict = [self settingsForCurrentRegion]; if (!regionDict) return; @@ -719,21 +712,21 @@ const int kDefaultFontSansSerifTag = 1; NSMutableDictionary* fontSizeDict = [regionDict objectForKey:@"fontsize"]; [fontSizeDict setObject:[NSNumber numberWithInt:(int)minSize] forKey:@"minimum"]; - // Save the default font type. + [self saveFontSizePrefsForRegion:regionDict]; + [self updateFontPreviews]; +} + +- (IBAction)defaultFontTypeClicked:(id)sender +{ + NSDictionary* regionDict = [self settingsForCurrentRegion]; + if (!regionDict) return; + NSMutableDictionary* defaultFontTypeDict = [regionDict objectForKey:@"defaultFontType"]; NSString* defaultFontType = ([[mDefaultFontMatrix selectedCell] tag] == kDefaultFontSerifTag) ? @"serif" : @"sans-serif"; [defaultFontTypeDict setObject:defaultFontType forKey:@"type"]; - - [mAdvancedFontsDialog orderOut:self]; - [NSApp endSheet:mAdvancedFontsDialog]; - - // Apply the changes for the current region. - [self saveAllFontPrefsForRegion:regionDict]; + [self saveDefaultFontTypePrefForRegion:regionDict]; [self updateFontPreviews]; - - if (mFontPanelWasVisible) - [[NSFontPanel sharedFontPanel] makeKeyAndOrderFront:self]; } - (IBAction)resetToDefaults:(id)sender { @@ -798,13 +791,10 @@ const int kDefaultFontSansSerifTag = 1; // Update the UI. Order is important here -- syncing the font panel depends on the // font previews being correct. [self updateFontPreviews]; + [self updateAdvancedFontControls]; [mUseMyFontsCheckbox setState:[self useMyFontsPref]]; } -- (void)advancedFontsSheetDidEnd:(NSWindow*)sheet returnCode:(int)returnCode contextInfo:(void*)contextInfo -{ -} - @end @implementation OrgMozillaCaminoPreferenceAppearance (FontManagerDelegate) @@ -839,10 +829,6 @@ const int kDefaultFontSansSerifTag = 1; - (void)changeFont:(id)sender { - // Ignore font panel changes if the advanced panel is up. - if ([mAdvancedFontsDialog isVisible]) - return; - NSDictionary* regionDict = [self settingsForCurrentRegion]; if (mFontButtonForEditor == mChooseProportionalFontButton) { diff --git a/mozilla/camino/PreferencePanes/Appearance/English.lproj/Appearance.nib/classes.nib b/mozilla/camino/PreferencePanes/Appearance/English.lproj/Appearance.nib/classes.nib index e3bed7c5e58..2eaf17f377b 100644 --- a/mozilla/camino/PreferencePanes/Appearance/English.lproj/Appearance.nib/classes.nib +++ b/mozilla/camino/PreferencePanes/Appearance/English.lproj/Appearance.nib/classes.nib @@ -1,83 +1,144 @@ -{ - IBClasses = ( - { - CLASS = FirstResponder; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - CLASS = NSMenu; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - CLASS = NSMenuItem; - LANGUAGE = ObjC; - SUPERCLASS = NSObject; - }, - { - CLASS = NSObject; - LANGUAGE = ObjC; - }, - { - CLASS = NSPreferencePane; - LANGUAGE = ObjC; - OUTLETS = { - "_firstKeyView" = id; - "_initialKeyView" = id; - "_lastKeyView" = id; - "_window" = id; - }; - SUPERCLASS = NSObject; - }, - { - CLASS = NSView; - LANGUAGE = ObjC; - SUPERCLASS = NSResponder; - }, - { - ACTIONS = { - advancedFontsDone = id; - buttonClicked = id; - colorChanged = id; - fontRegionPopupClicked = id; - monospaceFontChoiceButtonClicked = id; - proportionalFontChoiceButtonClicked = id; - resetToDefaults = id; - showAdvancedFontsDialog = id; - useMyFontsButtonClicked = id; - }; - CLASS = OrgMozillaCaminoPreferenceAppearance; - LANGUAGE = ObjC; - OUTLETS = { - mAdvancedFontsDialog = NSPanel; - mAdvancedFontsLabel = NSTextField; - mBackgroundColorWell = NSColorWell; - mChooseMonospaceFontButton = NSButton; - mChooseProportionalFontButton = NSButton; - mDefaultFontMatrix = NSMatrix; - mFontRegionPopup = NSPopUpButton; - mFontSampleMonospace = NSTextField; - mFontSampleProportional = NSTextField; - mMinFontSizePopup = NSPopUpButton; - mProportionalSampleLabel = NSTextField; - mProportionalSubLabel = NSTextField; - mResetButton = NSButton; - mTabView = NSTabView; - mTextColorWell = NSColorWell; - mUnderlineLinksCheckbox = NSButton; - mUnvisitedLinksColorWell = NSColorWell; - mUseMyColorsCheckbox = NSButton; - mUseMyFontsCheckbox = NSButton; - mVisitedLinksColorWell = NSColorWell; - }; - SUPERCLASS = PreferencePaneBase; - }, - { - CLASS = PreferencePaneBase; - LANGUAGE = ObjC; - SUPERCLASS = NSPreferencePane; - } - ); - IBVersion = 1; -} \ No newline at end of file + + + + + IBClasses + + + CLASS + PreferencePaneBase + LANGUAGE + ObjC + SUPERCLASS + NSPreferencePane + + + CLASS + NSView + LANGUAGE + ObjC + SUPERCLASS + NSResponder + + + CLASS + NSMenuItem + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSMenu + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + CLASS + NSPreferencePane + LANGUAGE + ObjC + OUTLETS + + _firstKeyView + id + _initialKeyView + id + _lastKeyView + id + _window + id + + SUPERCLASS + NSObject + + + ACTIONS + + buttonClicked + id + colorChanged + id + defaultFontTypeClicked + id + fontRegionPopupClicked + id + minFontSizePopupClicked + id + monospaceFontChoiceButtonClicked + id + proportionalFontChoiceButtonClicked + id + resetToDefaults + id + useMyFontsButtonClicked + id + + CLASS + OrgMozillaCaminoPreferenceAppearance + LANGUAGE + ObjC + OUTLETS + + mBackgroundColorWell + NSColorWell + mChooseMonospaceFontButton + NSButton + mChooseProportionalFontButton + NSButton + mDefaultFontMatrix + NSMatrix + mFontRegionPopup + NSPopUpButton + mFontSampleMonospace + NSTextField + mFontSampleProportional + NSTextField + mMinFontSizePopup + NSPopUpButton + mPreviousBottomControl + NSView + mProportionalSampleLabel + NSTextField + mResetButton + NSButton + mTabView + NSTabView + mTextColorWell + NSColorWell + mUnderlineLinksCheckbox + NSButton + mUnvisitedLinksColorWell + NSColorWell + mUseMyColorsCheckbox + NSButton + mUseMyFontsCheckbox + NSButton + mVisitedLinksColorWell + NSColorWell + + SUPERCLASS + PreferencePaneBase + + + IBVersion + 1 + + diff --git a/mozilla/camino/PreferencePanes/Appearance/English.lproj/Appearance.nib/info.nib b/mozilla/camino/PreferencePanes/Appearance/English.lproj/Appearance.nib/info.nib index e7dbdbf1735..ef2c7f2bb2c 100644 --- a/mozilla/camino/PreferencePanes/Appearance/English.lproj/Appearance.nib/info.nib +++ b/mozilla/camino/PreferencePanes/Appearance/English.lproj/Appearance.nib/info.nib @@ -2,16 +2,18 @@ - IBDocumentLocation - 69 14 356 240 0 0 1440 878 IBFramework Version - 489.0 + 677 IBLastKnownRelativeProjectPath ../../../Camino.xcodeproj IBOldestOS 4 + IBOpenObjects + + 107 + IBSystem Version - 9J61 + 9L31a targetFramework IBCocoaFramework diff --git a/mozilla/camino/PreferencePanes/Appearance/English.lproj/Appearance.nib/keyedobjects.nib b/mozilla/camino/PreferencePanes/Appearance/English.lproj/Appearance.nib/keyedobjects.nib index fde4515e7a80b951c7e2d7ad618aa42fce138953..9e77a4c0e420ab8b1309cf65b75753a9582e902a 100644 GIT binary patch delta 17408 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 MU*vvmx|R<9fA_GcWB>pF delta 20779 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%0A-O&?z zQqSmFy{Fzsuh9GJgY=>L2z{hJMjx+F(x>Ws>NEAd_1XFX`oa34`Vsm(eWAWYuh#4I z75XZ@L2uUA>PPA8^$q$aeY1X|eu}o@2(>9^>&>38UN>38ej)}PQ{D^DsPQ9i1?rF>5LGv({bx0UZNKV6YhF`}ZVqP}8T z#Y+{3D}JlwDhE{-SB|ZmSGlJ0-O9t2w@0Rq>^HJzWXs5>N3I?D>c~SQkB|JdimKwO z0;~E}^@h9QQbh7pEbL%yNNP-@T^bcPDU zNJF*3U@#l32Ag4w;bB9Ap~*18&}x`$m}+PSNCOv5b09K&40Ji`LRBEvI=rFO$I z!wSPH!&<|7!%K!uhAoC|h8>2ThBpjv8QwMQHGE(=U^r~}*zl?0bHfS4DZ^>QS;INQ z_l66Gi-w;JzZiZs{BF2zxM}#yaMwr}v5_{q8QqPZMsFi$^fd+;gN>oaaHG-~X^b(( z8551k##CbuW4bZZ*vr`0*xzU$XdG-DY8-CNG3FZ!jm5??qsFK=RvN2~Mx(`8YaC@9 zV;pO2G>$hm8{3RCOtVdonVv8`X?n`^v}uWHnQ4V-m1(VMz3C;>X46*FtESgXubbX9 zy<^&Adf)V+>5%Co(^1oBrW2-9rqiagrf*H>O+T7`GW}w@YPx2+VY+2E-7ynp(#)7y zv!~g|tT6kVgUq4k2y>)4#vE@>GN+n*nlsJ4&DrJw=E3Hn<`L#RbD_D!tTyY+73M0l z!E83ynn#)I%?;)zbF+D(d5XEsJi{!QXPM`i=bGo67n&XB#pY+t&zV=6*O*^0Z!m8% zZ!vE(?=bH&+jpDaHos@yXWnlFPncg|8Bl+ zzG=Q~zGuM}+9I=fSiCKAi?7As5@ZRrL|7s%F_w5sk|ovB(~@cFZOOI_une|5WEpPB zwG>#2ETtBWMQ16um@HO{%`(O^7FKH}SXwQU?Urelb_;KrX_;+#%re(9-?Gr+uq?JL zwJf(hZ&__wXL-@G(X!dH)$*$4HOuRkH!bg2_E_Gxd}ujj`N(qA@|op?<&@>L<*emf z%X!O>mP?k)mR~KuTmG>8X}M*&Vti!B1)_iM`wbZJy>a7*lDyzY2w$@rlS?jH1t&P?R)>i9e>ojY- umA5`(oo9X0y1=^By4?Dl^#$t&>r2*Gt-A>6AFTFB|JZMwe><<%{r?X&a|FZy diff --git a/mozilla/camino/PreferencePanes/Appearance/English.lproj/Localizable.strings.in b/mozilla/camino/PreferencePanes/Appearance/English.lproj/Localizable.strings.in index 28ae44c21c1..82a0e4a8084 100644 --- a/mozilla/camino/PreferencePanes/Appearance/English.lproj/Localizable.strings.in +++ b/mozilla/camino/PreferencePanes/Appearance/English.lproj/Localizable.strings.in @@ -5,9 +5,6 @@ "ProportionalLabelFormat" = "Proportional (%@):"; "serif" = "Serif"; "sans-serif" = "Sans-serif"; -"AdditionalFontsLabelFormat" = "Additional fonts for %@ pages"; -"serif_note" = "(like Times)"; -"sans-serif_note" = "(like Helvetica)"; /* Displayed when there is no font specified in prefs for a given language group and type */ "NoFontSelected" = "No font selected";