From 63e05dbadd29ee8dcf5cdef751a8b69e22bea9b9 Mon Sep 17 00:00:00 2001
From: "smfr%smfr.org" <smfr%smfr.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 8 Aug 2005 03:19:55 +0000
Subject: [PATCH] Fix bug 202014: add UI to the Mac Print Dialog Extension
 (PDE) that allows the user to select which headers and footers to print.
 Patch by Conrad Carlen, r=pinkerton, sr=me, a=asa.

git-svn-id: svn://10.0.0.236/trunk@177305 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../res/English.lproj/PrintPDE.nib/info.nib   |   6 +-
 .../English.lproj/PrintPDE.nib/objects.xib    | 330 +++++++++++++++++-
 2 files changed, 326 insertions(+), 10 deletions(-)

diff --git a/mozilla/embedding/components/printingui/src/mac/printpde/res/English.lproj/PrintPDE.nib/info.nib b/mozilla/embedding/components/printingui/src/mac/printpde/res/English.lproj/PrintPDE.nib/info.nib
index b8f83ace691..acc80b929b5 100644
--- a/mozilla/embedding/components/printingui/src/mac/printpde/res/English.lproj/PrintPDE.nib/info.nib
+++ b/mozilla/embedding/components/printingui/src/mac/printpde/res/English.lproj/PrintPDE.nib/info.nib
@@ -3,13 +3,13 @@
 <plist version="1.0">
 <dict>
 	<key>IBDocumentLocation</key>
-	<string>615 91 356 240 0 0 1600 1002 </string>
+	<string>561 530 356 240 0 0 1600 1002 </string>
 	<key>IBFramework Version</key>
-	<string>286.0</string>
+	<string>437.0</string>
 	<key>IBLockedObjects</key>
 	<array/>
 	<key>IBSystem Version</key>
-	<string>6G30</string>
+	<string>8C46</string>
 	<key>targetFramework</key>
 	<string>IBCarbonFramework</string>
 </dict>
diff --git a/mozilla/embedding/components/printingui/src/mac/printpde/res/English.lproj/PrintPDE.nib/objects.xib b/mozilla/embedding/components/printingui/src/mac/printpde/res/English.lproj/PrintPDE.nib/objects.xib
index 46e6ab36b45..9942cb4c073 100644
--- a/mozilla/embedding/components/printingui/src/mac/printpde/res/English.lproj/PrintPDE.nib/objects.xib
+++ b/mozilla/embedding/components/printingui/src/mac/printpde/res/English.lproj/PrintPDE.nib/objects.xib
@@ -4,16 +4,16 @@
   <object name="rootObject" class="NSCustomObject" id="1">
     <string name="customClass">NSApplication</string>
   </object>
-  <array count="11" name="allObjects">
+  <array count="64" name="allObjects">
     <object class="IBCarbonWindow" id="166">
-      <string name="windowRect">195 570 431 1074 </string>
+      <string name="windowRect">101 176 413 668 </string>
       <string name="title">Window</string>
       <object name="rootControl" class="IBCarbonRootControl" id="167">
-        <string name="bounds">0 0 236 504 </string>
+        <string name="bounds">0 0 312 492 </string>
         <array count="1" name="subviews">
           <object class="IBCarbonUserPane" id="212">
-            <string name="bounds">0 0 216 478 </string>
-            <array count="8" name="subviews">
+            <string name="bounds">0 0 292 472 </string>
+            <array count="19" name="subviews">
               <object class="IBCarbonCheckBox" id="210">
                 <string name="bounds">20 117 38 325 </string>
                 <ostype name="controlSignature">MOZZ</ostype>
@@ -71,6 +71,216 @@
                 <string name="title">Appearance:</string>
                 <int name="justification">-1</int>
               </object>
+              <object class="IBCarbonStaticText" id="219">
+                <string name="bounds">206 20 222 109 </string>
+                <string name="title">Page Headers:</string>
+              </object>
+              <object class="IBCarbonPopupButton" id="220">
+                <string name="bounds">207 116 224 208 </string>
+                <ostype name="controlSignature">MOZZ</ostype>
+                <int name="controlID">4006</int>
+                <boolean name="small">TRUE</boolean>
+                <int name="controlSize">1</int>
+                <int name="titleJustification">1</int>
+                <object name="menu" class="IBCarbonMenu" id="223">
+                  <string name="title">Popup:</string>
+                  <array count="6" name="items">
+                    <object class="IBCarbonMenuItem" id="224">
+                      <boolean name="checked">TRUE</boolean>
+                      <string name="title">(Blank)</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="257">
+                      <string name="title">Title</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="221">
+                      <string name="title">URL</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="222">
+                      <string name="title">Date/Time</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="254">
+                      <string name="title">Page #</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="255">
+                      <string name="title">Page # of #</string>
+                    </object>
+                  </array>
+                </object>
+              </object>
+              <object class="IBCarbonStaticText" id="225">
+                <string name="bounds">232 116 248 208 </string>
+                <string name="title">Left</string>
+                <int name="justification">1</int>
+              </object>
+              <object class="IBCarbonStaticText" id="226">
+                <string name="bounds">232 216 248 308 </string>
+                <string name="title">Center</string>
+                <int name="justification">1</int>
+              </object>
+              <object class="IBCarbonStaticText" id="227">
+                <string name="bounds">231 316 247 408 </string>
+                <string name="title">Right</string>
+                <int name="justification">1</int>
+              </object>
+              <object class="IBCarbonStaticText" id="228">
+                <string name="bounds">255 25 271 109 </string>
+                <string name="title">Page Footers:</string>
+              </object>
+              <object class="IBCarbonPopupButton" id="266">
+                <string name="bounds">207 216 224 308 </string>
+                <ostype name="controlSignature">MOZZ</ostype>
+                <int name="controlID">4007</int>
+                <boolean name="small">TRUE</boolean>
+                <int name="controlSize">1</int>
+                <object name="menu" class="IBCarbonMenu" id="260">
+                  <string name="title">Popup:</string>
+                  <array count="6" name="items">
+                    <object class="IBCarbonMenuItem" id="263">
+                      <boolean name="checked">TRUE</boolean>
+                      <string name="title">(Blank)</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="265">
+                      <string name="title">Title</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="258">
+                      <string name="title">URL</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="259">
+                      <string name="title">Date/Time</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="261">
+                      <string name="title">Page #</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="264">
+                      <string name="title">Page # of #</string>
+                    </object>
+                  </array>
+                </object>
+              </object>
+              <object class="IBCarbonPopupButton" id="268">
+                <string name="bounds">207 316 224 408 </string>
+                <ostype name="controlSignature">MOZZ</ostype>
+                <int name="controlID">4008</int>
+                <boolean name="small">TRUE</boolean>
+                <int name="controlSize">1</int>
+                <object name="menu" class="IBCarbonMenu" id="267">
+                  <string name="title">Popup:</string>
+                  <array count="6" name="items">
+                    <object class="IBCarbonMenuItem" id="270">
+                      <boolean name="checked">TRUE</boolean>
+                      <string name="title">(Blank)</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="269">
+                      <string name="title">Title</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="272">
+                      <string name="title">URL</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="273">
+                      <string name="title">Date/Time</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="274">
+                      <string name="title">Page #</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="275">
+                      <string name="title">Page # of #</string>
+                    </object>
+                  </array>
+                </object>
+              </object>
+              <object class="IBCarbonPopupButton" id="277">
+                <string name="bounds">256 116 273 208 </string>
+                <ostype name="controlSignature">MOZZ</ostype>
+                <int name="controlID">4009</int>
+                <boolean name="small">TRUE</boolean>
+                <int name="controlSize">1</int>
+                <object name="menu" class="IBCarbonMenu" id="280">
+                  <string name="title">Popup:</string>
+                  <array count="6" name="items">
+                    <object class="IBCarbonMenuItem" id="283">
+                      <boolean name="checked">TRUE</boolean>
+                      <string name="title">(Blank)</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="282">
+                      <string name="title">Title</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="281">
+                      <string name="title">URL</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="276">
+                      <string name="title">Date/Time</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="284">
+                      <string name="title">Page #</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="278">
+                      <string name="title">Page # of #</string>
+                    </object>
+                  </array>
+                </object>
+              </object>
+              <object class="IBCarbonPopupButton" id="285">
+                <string name="bounds">255 216 272 308 </string>
+                <ostype name="controlSignature">MOZZ</ostype>
+                <int name="controlID">4010</int>
+                <boolean name="small">TRUE</boolean>
+                <int name="controlSize">1</int>
+                <object name="menu" class="IBCarbonMenu" id="291">
+                  <string name="title">Popup:</string>
+                  <array count="6" name="items">
+                    <object class="IBCarbonMenuItem" id="289">
+                      <boolean name="checked">TRUE</boolean>
+                      <string name="title">(Blank)</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="287">
+                      <string name="title">Title</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="288">
+                      <string name="title">URL</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="290">
+                      <string name="title">Date/Time</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="286">
+                      <string name="title">Page #</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="293">
+                      <string name="title">Page # of #</string>
+                    </object>
+                  </array>
+                </object>
+              </object>
+              <object class="IBCarbonPopupButton" id="298">
+                <string name="bounds">255 316 272 408 </string>
+                <ostype name="controlSignature">MOZZ</ostype>
+                <int name="controlID">4011</int>
+                <boolean name="small">TRUE</boolean>
+                <int name="controlSize">1</int>
+                <object name="menu" class="IBCarbonMenu" id="296">
+                  <string name="title">Popup:</string>
+                  <array count="6" name="items">
+                    <object class="IBCarbonMenuItem" id="297">
+                      <boolean name="checked">TRUE</boolean>
+                      <string name="title">(Blank)</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="302">
+                      <string name="title">Title</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="294">
+                      <string name="title">URL</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="301">
+                      <string name="title">Date/Time</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="300">
+                      <string name="title">Page #</string>
+                    </object>
+                    <object class="IBCarbonMenuItem" id="295">
+                      <string name="title">Page # of #</string>
+                    </object>
+                  </array>
+                </object>
+              </object>
             </array>
             <ostype name="controlSignature">MOZZ</ostype>
             <int name="controlID">4000</int>
@@ -89,8 +299,61 @@
     <reference idRef="216"/>
     <reference idRef="217"/>
     <reference idRef="218"/>
+    <reference idRef="219"/>
+    <reference idRef="220"/>
+    <reference idRef="221"/>
+    <reference idRef="222"/>
+    <reference idRef="223"/>
+    <reference idRef="224"/>
+    <reference idRef="225"/>
+    <reference idRef="226"/>
+    <reference idRef="227"/>
+    <reference idRef="228"/>
+    <reference idRef="254"/>
+    <reference idRef="255"/>
+    <reference idRef="257"/>
+    <reference idRef="258"/>
+    <reference idRef="259"/>
+    <reference idRef="260"/>
+    <reference idRef="261"/>
+    <reference idRef="263"/>
+    <reference idRef="264"/>
+    <reference idRef="265"/>
+    <reference idRef="266"/>
+    <reference idRef="267"/>
+    <reference idRef="268"/>
+    <reference idRef="269"/>
+    <reference idRef="270"/>
+    <reference idRef="272"/>
+    <reference idRef="273"/>
+    <reference idRef="274"/>
+    <reference idRef="275"/>
+    <reference idRef="276"/>
+    <reference idRef="277"/>
+    <reference idRef="278"/>
+    <reference idRef="280"/>
+    <reference idRef="281"/>
+    <reference idRef="282"/>
+    <reference idRef="283"/>
+    <reference idRef="284"/>
+    <reference idRef="285"/>
+    <reference idRef="286"/>
+    <reference idRef="287"/>
+    <reference idRef="288"/>
+    <reference idRef="289"/>
+    <reference idRef="290"/>
+    <reference idRef="291"/>
+    <reference idRef="293"/>
+    <reference idRef="294"/>
+    <reference idRef="295"/>
+    <reference idRef="296"/>
+    <reference idRef="297"/>
+    <reference idRef="298"/>
+    <reference idRef="300"/>
+    <reference idRef="301"/>
+    <reference idRef="302"/>
   </array>
-  <array count="11" name="allParents">
+  <array count="64" name="allParents">
     <reference idRef="1"/>
     <reference idRef="166"/>
     <reference idRef="212"/>
@@ -102,6 +365,59 @@
     <reference idRef="212"/>
     <reference idRef="212"/>
     <reference idRef="212"/>
+    <reference idRef="212"/>
+    <reference idRef="212"/>
+    <reference idRef="223"/>
+    <reference idRef="223"/>
+    <reference idRef="220"/>
+    <reference idRef="223"/>
+    <reference idRef="212"/>
+    <reference idRef="212"/>
+    <reference idRef="212"/>
+    <reference idRef="212"/>
+    <reference idRef="223"/>
+    <reference idRef="223"/>
+    <reference idRef="223"/>
+    <reference idRef="260"/>
+    <reference idRef="260"/>
+    <reference idRef="266"/>
+    <reference idRef="260"/>
+    <reference idRef="260"/>
+    <reference idRef="260"/>
+    <reference idRef="260"/>
+    <reference idRef="212"/>
+    <reference idRef="268"/>
+    <reference idRef="212"/>
+    <reference idRef="267"/>
+    <reference idRef="267"/>
+    <reference idRef="267"/>
+    <reference idRef="267"/>
+    <reference idRef="267"/>
+    <reference idRef="267"/>
+    <reference idRef="280"/>
+    <reference idRef="212"/>
+    <reference idRef="280"/>
+    <reference idRef="277"/>
+    <reference idRef="280"/>
+    <reference idRef="280"/>
+    <reference idRef="280"/>
+    <reference idRef="280"/>
+    <reference idRef="212"/>
+    <reference idRef="291"/>
+    <reference idRef="291"/>
+    <reference idRef="291"/>
+    <reference idRef="291"/>
+    <reference idRef="291"/>
+    <reference idRef="285"/>
+    <reference idRef="291"/>
+    <reference idRef="296"/>
+    <reference idRef="296"/>
+    <reference idRef="298"/>
+    <reference idRef="296"/>
+    <reference idRef="212"/>
+    <reference idRef="296"/>
+    <reference idRef="296"/>
+    <reference idRef="296"/>
   </array>
   <dictionary count="2" name="nameTable">
     <string>File&apos;s Owner</string>
@@ -109,5 +425,5 @@
     <string>PrintPDE</string>
     <reference idRef="166"/>
   </dictionary>
-  <unsigned_int name="nextObjectID">219</unsigned_int>
+  <unsigned_int name="nextObjectID">307</unsigned_int>
 </object>