X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/73b2a9a749a960c7c5150d70e847cd740983c034..bdba6fdc0db2329dbe2d4fe45262631b1b506caa:/wxPython/wx/tools/XRCed/xrced.xrc

diff --git a/wxPython/wx/tools/XRCed/xrced.xrc b/wxPython/wx/tools/XRCed/xrced.xrc
index e80599b59f..29601a4f97 100644
--- a/wxPython/wx/tools/XRCed/xrced.xrc
+++ b/wxPython/wx/tools/XRCed/xrced.xrc
@@ -10,6 +10,7 @@
           <orient>wxHORIZONTAL</orient>
           <object class="sizeritem">
             <object class="wxTextCtrl" name="TEXT">
+              <value></value>
               <size>250,100</size>
               <style>wxTE_MULTILINE</style>
             </object>
@@ -22,23 +23,17 @@
         <flag>wxEXPAND</flag>
       </object>
       <object class="sizeritem">
-        <object class="wxStaticLine"/>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
             <object class="wxButton" name="wxID_OK">
-              <label>OK</label>
-              <default>1</default>
+              <label></label>
+              <label>&amp;Ok</label>
             </object>
-            <flag>wxRIGHT</flag>
-            <border>10</border>
           </object>
-          <object class="sizeritem">
+          <object class="button">
             <object class="wxButton" name="wxID_CANCEL">
-              <label>Cancel</label>
+              <label></label>
+              <label>&amp;Cancel</label>
             </object>
           </object>
         </object>
@@ -191,24 +186,21 @@
         <option>1</option>
         <flag>wxEXPAND</flag>
       </object>
-      <object class="sizeritem">
-        <object class="wxStaticLine"/>
-        <flag>wxEXPAND</flag>
+      <object class="spacer">
+        <size>0,10</size>
       </object>
       <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
             <object class="wxButton" name="wxID_OK">
-              <label>OK</label>
-              <default>1</default>
+              <label></label>
+              <label>&amp;Ok</label>
             </object>
-            <flag>wxRIGHT</flag>
-            <border>10</border>
           </object>
-          <object class="sizeritem">
+          <object class="button">
             <object class="wxButton" name="wxID_CANCEL">
-              <label>Cancel</label>
+              <label></label>
+              <label>&amp;Cancel</label>
             </object>
           </object>
         </object>
@@ -233,24 +225,21 @@
         <flag>wxALL|wxEXPAND</flag>
         <border>5</border>
       </object>
-      <object class="sizeritem">
-        <object class="wxStaticLine"/>
-        <flag>wxEXPAND</flag>
+      <object class="spacer">
+        <size>0,10</size>
       </object>
       <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
             <object class="wxButton" name="wxID_OK">
-              <label>OK</label>
-              <default>1</default>
+              <label></label>
+              <label>&amp;Ok</label>
             </object>
-            <flag>wxRIGHT</flag>
-            <border>10</border>
           </object>
-          <object class="sizeritem">
+          <object class="button">
             <object class="wxButton" name="wxID_CANCEL">
-              <label>Cancel</label>
+              <label></label>
+              <label>&amp;Cancel</label>
             </object>
           </object>
         </object>
@@ -261,7 +250,7 @@
     <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
   </object>
   <object class="wxDialog" name="DIALOG_STYLES">
-    <title>Window styles</title>
+    <title>Window Styles</title>
     <centered>1</centered>
     <object class="wxBoxSizer">
       <orient>wxVERTICAL</orient>
@@ -299,24 +288,21 @@
         <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
         <border>5</border>
       </object>
-      <object class="sizeritem">
-        <object class="wxStaticLine"/>
-        <flag>wxEXPAND</flag>
+      <object class="spacer">
+        <size>0,10</size>
       </object>
       <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
             <object class="wxButton" name="wxID_OK">
-              <label>OK</label>
-              <default>1</default>
+              <label></label>
+              <label>&amp;Ok</label>
             </object>
-            <flag>wxRIGHT</flag>
-            <border>10</border>
           </object>
-          <object class="sizeritem">
+          <object class="button">
             <object class="wxButton" name="wxID_CANCEL">
-              <label>Cancel</label>
+              <label></label>
+              <label>&amp;Cancel</label>
             </object>
           </object>
         </object>
@@ -350,7 +336,7 @@
               <orient>wxVERTICAL</orient>
               <object class="sizeritem">
                 <object class="wxSpinCtrl" name="SPIN">
-                  <size>20,-1d</size>
+                  <size>60,-1</size>
                 </object>
                 <flag>wxBOTTOM</flag>
                 <border>5</border>
@@ -381,25 +367,23 @@
         </object>
         <option>1</option>
         <flag>wxEXPAND</flag>
+        <border>0</border>
       </object>
-      <object class="sizeritem">
-        <object class="wxStaticLine"/>
-        <flag>wxEXPAND</flag>
+      <object class="spacer">
+        <size>0,10</size>
       </object>
       <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
             <object class="wxButton" name="wxID_OK">
-              <label>OK</label>
-              <default>1</default>
+              <label></label>
+              <label>&amp;Ok</label>
             </object>
-            <flag>wxRIGHT</flag>
-            <border>10</border>
           </object>
-          <object class="sizeritem">
+          <object class="button">
             <object class="wxButton" name="wxID_CANCEL">
-              <label>Cancel</label>
+              <label></label>
+              <label>&amp;Cancel</label>
             </object>
           </object>
         </object>
@@ -522,31 +506,38 @@
             <object class="wxCheckBox" name="AutoGenerateCB">
               <label>Autogenerate Python module when saving XRC</label>
             </object>
+            <flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
+            <border>5</border>
           </object>
           <object class="sizeritem">
             <object class="wxCheckBox" name="EmbedCB">
-              <label>Embed resource in python module</label>
+              <label>Embed resources in the Python module</label>
             </object>
+            <flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
+            <border>5</border>
           </object>
           <object class="sizeritem">
             <object class="wxCheckBox" name="GettextCB">
               <label>Generate gettext strings</label>
-              <enabled>0</enabled>
             </object>
+            <flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
+            <border>5</border>
           </object>
           <object class="sizeritem">
             <object class="wxCheckBox" name="MakeXRSFileCB">
               <label>Generate and use compressed XRS file</label>
               <enabled>0</enabled>
+              <hidden>1</hidden>
             </object>
-          </object>
-          <object class="spacer">
-            <size>1,10</size>
+            <flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
+            <border>5</border>
           </object>
           <object class="sizeritem">
             <object class="wxStaticText">
               <label>Filename:</label>
             </object>
+            <flag>wxALL</flag>
+            <border>5</border>
           </object>
           <object class="sizeritem">
             <object class="wxBoxSizer">
@@ -555,17 +546,18 @@
                 <object class="wxTextCtrl" name="FileNameTC">
                   <size>500,-1</size>
                 </object>
-                <flag>wxALIGN_CENTRE_VERTICAL</flag>
-              </object>
-              <object class="spacer">
-                <size>5,0</size>
+                <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
               </object>
               <object class="sizeritem">
                 <object class="wxButton" name="BrowseBtn">
                   <label>Browse...</label>
                 </object>
+                <flag>wxBOTTOM|wxRIGHT</flag>
+                <border>5</border>
               </object>
             </object>
+            <flag>wxEXPAND</flag>
           </object>
         </object>
         <flag>wxALL</flag>
@@ -611,4 +603,101 @@
       </object>
     </object>
   </object>
+  <object class="wxDialog" name="DIALOG_PREFS">
+    <title>XRCed Preferences</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxStaticBoxSizer">
+          <label>Defaults for new containes</label>
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxFlexGridSizer">
+              <cols>2</cols>
+              <rows>2</rows>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="check_proportion_panel">
+                  <label>proportion</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxSpinCtrl" name="spin_proportion_panel">
+                  <size>50,-1</size>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="check_flag_panel">
+                  <label>flag</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxTextCtrl" name="text_flag_panel">
+                  <size>150,-1</size>
+                </object>
+              </object>
+              <hgap>10</hgap>
+            </object>
+          </object>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticBoxSizer">
+          <label>Defaults for new controls</label>
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxFlexGridSizer">
+              <cols>2</cols>
+              <rows>2</rows>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="check_proportion_control">
+                  <label>proportion</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxSpinCtrl" name="spin_proportion_control">
+                  <size>50,-1</size>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="check_flag_control">
+                  <label>flag</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxTextCtrl" name="text_flag_control">
+                  <size>150,-1</size>
+                </object>
+              </object>
+              <hgap>10</hgap>
+            </object>
+          </object>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="spacer">
+        <size>0,10</size>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK">
+              <label></label>
+              <label>&amp;Ok</label>
+            </object>
+          </object>
+          <object class="button">
+            <object class="wxButton" name="wxID_CANCEL">
+              <label></label>
+              <label>&amp;Cancel</label>
+            </object>
+          </object>
+        </object>
+        <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
+        <border>10</border>
+      </object>
+    </object>
+  </object>
 </resource>
\ No newline at end of file