diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 19:56:30 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-09 19:56:30 +0000 |
| commit | 273865aa130f61f321d3eeafc0ea5a2a6dc9adf8 (patch) | |
| tree | 05b9f5275ef0a0c63592f9b1102235aead02b59d /chrome/app | |
| parent | 12c7b1eaa34937a72c8b81de17fdb5c72d842431 (diff) | |
| download | chromium_src-273865aa130f61f321d3eeafc0ea5a2a6dc9adf8.zip chromium_src-273865aa130f61f321d3eeafc0ea5a2a6dc9adf8.tar.gz chromium_src-273865aa130f61f321d3eeafc0ea5a2a6dc9adf8.tar.bz2 | |
Share the code that builds the page menu in a common model, make Mac and Win use it. Implement a mac menu controller that takes this model and generates an NSMenu. Remove the Page Menu NSMenu from Toolbar.xib since it's now created in code.
BUG=22646
TEST=page menu should work as before
Review URL: http://codereview.chromium.org/465130
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/nibs/Toolbar.xib | 710 |
1 files changed, 55 insertions, 655 deletions
diff --git a/chrome/app/nibs/Toolbar.xib b/chrome/app/nibs/Toolbar.xib index 9363025..b4aed92 100644 --- a/chrome/app/nibs/Toolbar.xib +++ b/chrome/app/nibs/Toolbar.xib @@ -8,9 +8,6 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1"/> - <integer value="42"/> - <integer value="48"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -46,6 +43,7 @@ <int key="NSvFlags">265</int> <string key="NSFrame">{{540, 0}, {0.777771, 36}}</string> <reference key="NSSuperview" ref="928520650"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSTextField" id="535508469"> @@ -53,6 +51,7 @@ <int key="NSvFlags">266</int> <string key="NSFrame">{{165, 5}, {341, 27}}</string> <reference key="NSSuperview" ref="928520650"/> + <reference key="NSWindow"/> <int key="NSTag">33004</int> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="464583340"> @@ -91,6 +90,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{101, 5}, {31, 27}}</string> <reference key="NSSuperview" ref="928520650"/> + <reference key="NSWindow"/> <int key="NSTag">33003</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="760046712"> @@ -120,6 +120,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{136, 5}, {29, 27}}</string> <reference key="NSSuperview" ref="928520650"/> + <reference key="NSWindow"/> <int key="NSTag">35000</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="960568152"> @@ -150,6 +151,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{66, 5}, {31, 27}}</string> <reference key="NSSuperview" ref="928520650"/> + <reference key="NSWindow"/> <int key="NSTag">33002</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="386107000"> @@ -175,6 +177,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{34, 5}, {28, 27}}</string> <reference key="NSSuperview" ref="928520650"/> + <reference key="NSWindow"/> <int key="NSTag">33001</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="3781855"> @@ -201,6 +204,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{5, 5}, {29, 27}}</string> <reference key="NSSuperview" ref="928520650"/> + <reference key="NSWindow"/> <int key="NSTag">33000</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="697431051"> @@ -227,6 +231,7 @@ <int key="NSvFlags">265</int> <string key="NSFrame">{{506, 5}, {29, 27}}</string> <reference key="NSSuperview" ref="928520650"/> + <reference key="NSWindow"/> <int key="NSTag">33005</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="203834804"> @@ -253,6 +258,7 @@ <int key="NSvFlags">265</int> <string key="NSFrame">{{540, 5}, {35, 27}}</string> <reference key="NSSuperview" ref="928520650"/> + <reference key="NSWindow"/> <int key="NSTag">33005</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="482050975"> @@ -278,6 +284,7 @@ <int key="NSvFlags">265</int> <string key="NSFrame">{{574, 5}, {35, 27}}</string> <reference key="NSSuperview" ref="928520650"/> + <reference key="NSWindow"/> <int key="NSTag">33005</int> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="204555298"> @@ -301,263 +308,34 @@ </object> <string key="NSFrameSize">{618, 36}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> <string key="NSClassName">ToolbarView</string> </object> - <object class="NSMenu" id="1035953805"> - <string key="NSTitle">Page Menu</string> + <object class="NSMenu" id="558188039"> + <string key="NSTitle">Wrench Menu</string> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="633871226"> - <reference key="NSMenu" ref="1035953805"/> + <object class="NSMenuItem" id="306298564"> + <reference key="NSMenu" ref="558188039"/> <string key="NSTitle"/> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <object class="NSCustomResource" key="NSOnImage" id="610745052"> + <object class="NSCustomResource" key="NSOnImage" id="377723476"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSMenuCheckmark</string> </object> - <object class="NSCustomResource" key="NSMixedImage" id="1070349142"> + <object class="NSCustomResource" key="NSMixedImage" id="651760058"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSMenuMixedState</string> </object> </object> - <object class="NSMenuItem" id="531344134"> - <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">^IDS_CREATE_SHORTCUTS</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - </object> - <object class="NSMenuItem" id="940961375"> - <reference key="NSMenu" ref="1035953805"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - </object> - <object class="NSMenuItem" id="356573692"> - <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">^IDS_CUT</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - </object> - <object class="NSMenuItem" id="525046613"> - <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">^IDS_COPY</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - </object> - <object class="NSMenuItem" id="871702681"> - <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">^IDS_PASTE</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - </object> - <object class="NSMenuItem" id="865353905"> - <reference key="NSMenu" ref="1035953805"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - </object> - <object class="NSMenuItem" id="552802748"> - <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">^IDS_FIND</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - <int key="NSTag">37000</int> - </object> - <object class="NSMenuItem" id="759431372"> - <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">^IDS_SAVE_PAGE</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - <int key="NSTag">35005</int> - </object> - <object class="NSMenuItem" id="950677546"> - <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">^IDS_PRINT</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - <int key="NSTag">35004</int> - </object> - <object class="NSMenuItem" id="762740339"> - <reference key="NSMenu" ref="1035953805"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - </object> - <object class="NSMenuItem" id="398561686"> - <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">^IDS_ZOOM_MENU</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="767450548"> - <string key="NSTitle">^IDS_ZOOM_MENU</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="117630796"> - <reference key="NSMenu" ref="767450548"/> - <string key="NSTitle">^IDS_ZOOM_PLUS</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - <int key="NSTag">38001</int> - </object> - <object class="NSMenuItem" id="246635843"> - <reference key="NSMenu" ref="767450548"/> - <string key="NSTitle">^IDS_ZOOM_NORMAL</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - <int key="NSTag">38002</int> - </object> - <object class="NSMenuItem" id="660549409"> - <reference key="NSMenu" ref="767450548"/> - <string key="NSTitle">^IDS_ZOOM_MINUS</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - <int key="NSTag">38003</int> - </object> - </object> - </object> - </object> - <object class="NSMenuItem" id="275495410"> - <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">^IDS_ENCODING_MENU</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="1054137046"> - <string key="NSTitle">^IDS_ENCODING_MENU</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - </object> - </object> - <object class="NSMenuItem" id="344412831"> - <reference key="NSMenu" ref="1035953805"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - </object> - <object class="NSMenuItem" id="448429887"> - <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">^IDS_DEVELOPER_MENU</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - <string key="NSAction">submenuAction:</string> - <object class="NSMenu" key="NSSubmenu" id="383305928"> - <string key="NSTitle">^IDS_DEVELOPER_MENU</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="688272012"> - <reference key="NSMenu" ref="383305928"/> - <string key="NSTitle">^IDS_VIEW_SOURCE</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - <int key="NSTag">35002</int> - </object> - <object class="NSMenuItem" id="830865062"> - <reference key="NSMenu" ref="383305928"/> - <string key="NSTitle">^IDS_DEV_TOOLS</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - <int key="NSTag">40004</int> - </object> - <object class="NSMenuItem" id="712404949"> - <reference key="NSMenu" ref="383305928"/> - <string key="NSTitle">^IDS_TASK_MANAGER</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - </object> - </object> - </object> - </object> - <object class="NSMenuItem" id="236901479"> - <reference key="NSMenu" ref="1035953805"/> - <bool key="NSIsDisabled">YES</bool> - <bool key="NSIsSeparator">YES</bool> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - </object> - <object class="NSMenuItem" id="966232471"> - <reference key="NSMenu" ref="1035953805"/> - <string key="NSTitle">^IDS_REPORT_BUG</string> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - <int key="NSTag">40008</int> - </object> - </object> - </object> - <object class="NSMenu" id="558188039"> - <string key="NSTitle">Wrench Menu</string> - <object class="NSMutableArray" key="NSMenuItems"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSMenuItem" id="306298564"> - <reference key="NSMenu" ref="558188039"/> - <string key="NSTitle"/> - <string key="NSKeyEquiv"/> - <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> - </object> <object class="NSMenuItem" id="824187729"> <reference key="NSMenu" ref="558188039"/> <string key="NSTitle">^IDS_NEW_TAB</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> <int key="NSTag">34014</int> </object> <object class="NSMenuItem" id="300890436"> @@ -565,8 +343,8 @@ <string key="NSTitle">^IDS_NEW_WINDOW</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> <int key="NSTag">34000</int> </object> <object class="NSMenuItem" id="498957868"> @@ -574,8 +352,8 @@ <string key="NSTitle">^IDS_NEW_INCOGNITO_WINDOW</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> <int key="NSTag">34001</int> </object> <object class="NSMenuItem" id="805002579"> @@ -585,16 +363,16 @@ <string key="NSTitle"/> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> </object> <object class="NSMenuItem" id="755764032"> <reference key="NSMenu" ref="558188039"/> <string key="NSTitle">^IDS_BOOMARK_BAR_ALWAYS_SHOW</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> <int key="NSTag">40009</int> </object> <object class="NSMenuItem" id="1051303932"> @@ -602,8 +380,8 @@ <string key="NSTitle">^IDS_FULLSCREEN</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> <int key="NSTag">34030</int> </object> <object class="NSMenuItem" id="800541023"> @@ -613,16 +391,16 @@ <string key="NSTitle"/> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> </object> <object class="NSMenuItem" id="118179064"> <reference key="NSMenu" ref="558188039"/> <string key="NSTitle">^IDS_CLEAR_BROWSING_DATA_MAC</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> <int key="NSTag">40013</int> </object> <object class="NSMenuItem" id="791058457"> @@ -630,8 +408,8 @@ <string key="NSTitle">^IDS_IMPORT_SETTINGS_TITLE</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> <int key="NSTag">40014</int> </object> <object class="NSMenuItem" id="1010888289"> @@ -641,16 +419,16 @@ <string key="NSTitle"/> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> </object> <object class="NSMenuItem" id="6307962"> <reference key="NSMenu" ref="558188039"/> <string key="NSTitle">^IDS_SHOW_HISTORY</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> <int key="NSTag">40010</int> </object> <object class="NSMenuItem" id="241294165"> @@ -658,16 +436,16 @@ <string key="NSTitle">^IDS_BOOKMARK_MANAGER</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> </object> <object class="NSMenuItem" id="548636593"> <reference key="NSMenu" ref="558188039"/> <string key="NSTitle">^IDS_SHOW_DOWNLOADS</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> <int key="NSTag">40012</int> </object> <object class="NSMenuItem" id="211303389"> @@ -675,8 +453,8 @@ <string key="NSTitle">^IDS_SHOW_EXTENSIONS</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> <int key="NSTag">40023</int> </object> <object class="NSMenuItem" id="163898806"> @@ -686,8 +464,8 @@ <string key="NSTitle"/> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> </object> <object class="NSMenuItem" id="1012539825"> <reference key="NSMenu" ref="558188039"/> @@ -696,8 +474,8 @@ <string key="NSTitle">^IDS_SYNC_START_SYNC_BUTTON_LABEL</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> <int key="NSTag">41108</int> </object> <object class="NSMenuItem" id="922630377"> @@ -708,16 +486,16 @@ <string key="NSTitle"/> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> </object> <object class="NSMenuItem" id="510846575"> <reference key="NSMenu" ref="558188039"/> <string key="NSTitle">^IDS_PREFERENCES_MAC</string> <string key="NSKeyEquiv"/> <int key="NSMnemonicLoc">2147483647</int> - <reference key="NSOnImage" ref="610745052"/> - <reference key="NSMixedImage" ref="1070349142"/> + <reference key="NSOnImage" ref="377723476"/> + <reference key="NSMixedImage" ref="651760058"/> </object> </object> </object> @@ -847,110 +625,6 @@ <object class="IBActionConnection" key="connection"> <string key="label">commandDispatch:</string> <reference key="source" ref="1003"/> - <reference key="destination" ref="531344134"/> - </object> - <int key="connectionID">71</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatch:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="552802748"/> - </object> - <int key="connectionID">75</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatch:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="759431372"/> - </object> - <int key="connectionID">76</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatch:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="950677546"/> - </object> - <int key="connectionID">77</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatch:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="966232471"/> - </object> - <int key="connectionID">78</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">cut:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="356573692"/> - </object> - <int key="connectionID">79</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">copy:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="525046613"/> - </object> - <int key="connectionID">80</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">paste:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="871702681"/> - </object> - <int key="connectionID">81</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatch:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="117630796"/> - </object> - <int key="connectionID">84</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatch:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="246635843"/> - </object> - <int key="connectionID">85</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatch:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="660549409"/> - </object> - <int key="connectionID">86</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatch:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="688272012"/> - </object> - <int key="connectionID">93</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatch:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="712404949"/> - </object> - <int key="connectionID">95</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatch:</string> - <reference key="source" ref="1003"/> <reference key="destination" ref="824187729"/> </object> <int key="connectionID">108</int> @@ -1045,22 +719,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">encodingMenu_</string> - <reference key="source" ref="1001"/> - <reference key="destination" ref="1054137046"/> - </object> - <int key="connectionID">134</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">attachedMenu_</string> - <reference key="source" ref="571076484"/> - <reference key="destination" ref="1035953805"/> - </object> - <int key="connectionID">135</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> <string key="label">attachedMenu_</string> <reference key="source" ref="602421009"/> <reference key="destination" ref="558188039"/> @@ -1069,14 +727,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">commandDispatch:</string> - <reference key="source" ref="1003"/> - <reference key="destination" ref="830865062"/> - </object> - <int key="connectionID">137</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBActionConnection" key="connection"> <string key="label">commandDispatchUsingKeyModifiers:</string> <reference key="source" ref="1003"/> <reference key="destination" ref="634265909"/> @@ -1092,14 +742,6 @@ <int key="connectionID">139</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">yetAnotherObjectToLocalize_</string> - <reference key="source" ref="1044322163"/> - <reference key="destination" ref="1035953805"/> - </object> - <int key="connectionID">140</int> - </object> - <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">commandDispatch:</string> <reference key="source" ref="1003"/> @@ -1314,46 +956,6 @@ <reference key="parent" ref="602421009"/> </object> <object class="IBObjectRecord"> - <int key="objectID">42</int> - <reference key="object" ref="1035953805"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="531344134"/> - <reference ref="356573692"/> - <reference ref="525046613"/> - <reference ref="940961375"/> - <reference ref="871702681"/> - <reference ref="865353905"/> - <reference ref="552802748"/> - <reference ref="950677546"/> - <reference ref="759431372"/> - <reference ref="762740339"/> - <reference ref="398561686"/> - <reference ref="344412831"/> - <reference ref="448429887"/> - <reference ref="275495410"/> - <reference ref="966232471"/> - <reference ref="236901479"/> - <reference ref="633871226"/> - </object> - <reference key="parent" ref="835640952"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">43</int> - <reference key="object" ref="531344134"/> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">44</int> - <reference key="object" ref="356573692"/> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">45</int> - <reference key="object" ref="525046613"/> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">48</int> <reference key="object" ref="558188039"/> <object class="NSMutableArray" key="children"> @@ -1396,143 +998,6 @@ <reference key="parent" ref="558188039"/> </object> <object class="IBObjectRecord"> - <int key="objectID">52</int> - <reference key="object" ref="940961375"/> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">53</int> - <reference key="object" ref="871702681"/> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">54</int> - <reference key="object" ref="865353905"/> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">55</int> - <reference key="object" ref="552802748"/> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">56</int> - <reference key="object" ref="950677546"/> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">57</int> - <reference key="object" ref="759431372"/> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">58</int> - <reference key="object" ref="762740339"/> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">59</int> - <reference key="object" ref="398561686"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="767450548"/> - </object> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">60</int> - <reference key="object" ref="767450548"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="117630796"/> - <reference ref="246635843"/> - <reference ref="660549409"/> - </object> - <reference key="parent" ref="398561686"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">61</int> - <reference key="object" ref="117630796"/> - <reference key="parent" ref="767450548"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">62</int> - <reference key="object" ref="344412831"/> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">63</int> - <reference key="object" ref="448429887"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="383305928"/> - </object> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">64</int> - <reference key="object" ref="383305928"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="688272012"/> - <reference ref="830865062"/> - <reference ref="712404949"/> - </object> - <reference key="parent" ref="448429887"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">65</int> - <reference key="object" ref="688272012"/> - <reference key="parent" ref="383305928"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">66</int> - <reference key="object" ref="275495410"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1054137046"/> - </object> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">67</int> - <reference key="object" ref="1054137046"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> - <reference key="parent" ref="275495410"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">69</int> - <reference key="object" ref="966232471"/> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">70</int> - <reference key="object" ref="236901479"/> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">82</int> - <reference key="object" ref="246635843"/> - <reference key="parent" ref="767450548"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">83</int> - <reference key="object" ref="660549409"/> - <reference key="parent" ref="767450548"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">87</int> - <reference key="object" ref="830865062"/> - <reference key="parent" ref="383305928"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">88</int> - <reference key="object" ref="712404949"/> - <reference key="parent" ref="383305928"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">96</int> <reference key="object" ref="805002579"/> <reference key="parent" ref="558188039"/> @@ -1583,11 +1048,6 @@ <reference key="parent" ref="835640952"/> </object> <object class="IBObjectRecord"> - <int key="objectID">127</int> - <reference key="object" ref="633871226"/> - <reference key="parent" ref="1035953805"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">129</int> <reference key="object" ref="306298564"/> <reference key="parent" ref="558188039"/> @@ -1655,7 +1115,6 @@ <string>12.CustomClassName</string> <string>12.IBPluginDependency</string> <string>122.IBPluginDependency</string> - <string>127.IBPluginDependency</string> <string>129.IBPluginDependency</string> <string>13.CustomClassName</string> <string>13.IBPluginDependency</string> @@ -1692,47 +1151,17 @@ <string>39.IBPluginDependency</string> <string>4.CustomClassName</string> <string>4.IBPluginDependency</string> - <string>42.IBEditorWindowLastContentRect</string> - <string>42.IBPluginDependency</string> - <string>43.IBPluginDependency</string> - <string>44.IBPluginDependency</string> - <string>45.IBPluginDependency</string> <string>48.IBEditorWindowLastContentRect</string> <string>48.IBPluginDependency</string> <string>49.IBPluginDependency</string> <string>5.IBPluginDependency</string> <string>50.IBPluginDependency</string> <string>51.IBPluginDependency</string> - <string>52.IBPluginDependency</string> - <string>53.IBPluginDependency</string> - <string>54.IBPluginDependency</string> - <string>55.IBPluginDependency</string> - <string>56.IBPluginDependency</string> - <string>57.IBPluginDependency</string> - <string>58.IBPluginDependency</string> - <string>59.IBPluginDependency</string> - <string>60.IBEditorWindowLastContentRect</string> - <string>60.IBPluginDependency</string> - <string>61.IBPluginDependency</string> - <string>62.IBPluginDependency</string> - <string>63.IBPluginDependency</string> - <string>64.IBEditorWindowLastContentRect</string> - <string>64.IBPluginDependency</string> - <string>65.IBPluginDependency</string> - <string>66.IBPluginDependency</string> - <string>67.IBEditorWindowLastContentRect</string> - <string>67.IBPluginDependency</string> - <string>69.IBPluginDependency</string> <string>7.CustomClassName</string> <string>7.IBAttributePlaceholdersKey</string> <string>7.IBPluginDependency</string> - <string>70.IBPluginDependency</string> <string>8.IBAttributePlaceholdersKey</string> <string>8.IBPluginDependency</string> - <string>82.IBPluginDependency</string> - <string>83.IBPluginDependency</string> - <string>87.IBPluginDependency</string> - <string>88.IBPluginDependency</string> <string>9.CustomClassName</string> <string>9.IBPluginDependency</string> <string>96.IBPluginDependency</string> @@ -1759,7 +1188,6 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>AutocompleteTextFieldCell</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1831,37 +1259,12 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>AutocompleteTextField</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{444, 446}, {235, 293}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{48, 162}, {335, 333}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{404, 503}, {202, 63}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{1211, 422}, {201, 63}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{404, 540}, {64, 6}}</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>DelayedMenuButton</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> @@ -1872,7 +1275,6 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> @@ -1882,10 +1284,6 @@ </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>ToolbarButtonCell</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -1941,11 +1339,13 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>closeTabMenuItem_</string> <string>closeWindowMenuItem_</string> + <string>helpMenu_</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSMenuItem</string> <string>NSMenuItem</string> + <string>NSMenu</string> </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> |