List:Commits« Previous MessageNext Message »
From:paul.dubois Date:December 1 2009 6:29pm
Subject:svn commit - mysqldoc@docsrva: r17928 - in trunk: . workbench
View as plain text  
Author: paul
Date: 2009-12-01 19:29:29 +0100 (Tue, 01 Dec 2009)
New Revision: 17928

Log:


Modified:
   trunk/workbench/preferences.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:28291
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:47080
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:28291
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:47082
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546


Modified: trunk/workbench/preferences.xml
===================================================================
--- trunk/workbench/preferences.xml	2009-12-01 18:28:55 UTC (rev 17927)
+++ trunk/workbench/preferences.xml	2009-12-01 18:29:29 UTC (rev 17928)
Changed blocks: 12, Lines Added: 118, Lines Deleted: 356; 15899 bytes

@@ -42,52 +42,36 @@
 
       <listitem>
         <para>
-          <guimenu>Model</guimenu> &ndash;Default object names
+          <guimenu>Model</guimenu> &ndash; Default object names
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <guimenu>Diagram</guimenu> &ndash; EER diagram settings
+          <guimenu>MySQL</guimenu> &ndash;
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <guimenu>Colors</guimenu> &ndash; Add to or edit the colors
-          that appear in the drop down list boxes
+          <guimenu>Diagram</guimenu> &ndash; EER diagram settings
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <guimenu>Fonts</guimenu> &ndash; Associate fonts with specific
-          object properties
+          <guimenu>Appearance</guimenu> &ndash; Change colours and fonts
+          used by various Workbench components
         </para>
       </listitem>
 
-      <listitem>
-        <para>
-          <guimenu>Advanced</guimenu> &ndash; Advanced object
-          configuration
-        </para>
-      </listitem>
-
     </itemizedlist>
 
     A more detailed discussion of these options follows.
   </para>
 
-  <note>
-    <para>
-      The <guimenu>Debug</guimenu> menu option is used for assistance in
-      debugging the beta versions of &workbench;. It will be not appear
-      in the GA release.
-    </para>
-  </note>
+  <section id="wb-preferences-general">
 
-  <section id="wb-options-general">
-
     <title>The General Tab</title>
 
     <para>

@@ -98,6 +82,26 @@
     </para>
 
     <para>
+      If you want the previously worked on model to automatically be
+      reopened when you start Workbench check the
+      <guilabel>Automatically Reopen Previous Model When
+      Started</guilabel> checkbox.
+    </para>
+
+    <para>
+      You can select the language to be used in the GRT shell by chosing
+      a language from the drop down listbox <guilabel>Interactive GRT
+      Shell Language</guilabel>. Currently there is a choice between Lua
+      and Python.
+    </para>
+
+  </section>
+
+  <section id="wb-preferences-model">
+
+    <title>The Model Tab</title>
+
+    <para>
       Use the <guilabel>When Deleting Physical Model Figures in
       Diagram</guilabel> frame to determine the behavior when deleting
       objects from the EER diagram canvas. Choose <literal>Ask</literal>

@@ -130,23 +134,6 @@
     </para>
 
     <para>
-      If you are using &workbench_oss;, check the check box at the
-      bottom of the page to hide menu options that apply only to the
-      commercial version of &workbench;.
-
-      <remark>
-        [PL]Change this to plural when there is more than one commercial
-        version.
-      </remark>
-    </para>
-
-  </section>
-
-  <section id="wb-options-model">
-
-    <title>The Model Tab</title>
-
-    <para>
       Use the model tab to set the default value for various object
       names and the primary key data type. A listing of those items with
       their default values follows:

@@ -167,6 +154,18 @@
 
         <listitem>
           <para>
+            Column Name &ndash; %table%col
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            Column Type &ndash; VARCHAR(45)
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             Foreign Key Name &ndash; fk%stable_%dtable%
           </para>
         </listitem>

@@ -179,6 +178,18 @@
 
         <listitem>
           <para>
+            ON UPDATE &ndash; NO ACTION
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            ON DELETE &ndash; NO ACTION
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             Associative Table Name &ndash; %stable%_has_%dtable%
           </para>
         </listitem>

@@ -187,9 +198,9 @@
 
       The <literal>Primary Key Column Name</literal> is the default
       primary key column name when using the table editor. Likewise with
-      the default primary key data type. The remaining items are the
-      default names used when using the relationship tools on an EER
-      diagram.
+      the default primary key data type, and column name and column
+      type. The remaining items are the default names used when using
+      the relationship tools on an EER diagram.
     </para>
 
     <para>

@@ -228,6 +239,52 @@
     </para>
 
     <para>
+      Legitimate values for the foreign key delete or update rules are:
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            <literal>RESTRICT</literal>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <literal>CASCADE</literal>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <literal>SET NULL</literal>
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <literal>NO ACTION</literal> (default)
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
+      For more information about these actions see
+      <xref linkend="wb-table-editor-foreign-keys"/>.
+    </para>
+
+  </section>
+
+  <section id="wb-preferences-mysql">
+
+    <title>The MySQL Tab</title>
+
+    <para>
+      This allows you to set the default table storage engine, the
+      default SQL Mode, and the utility to be used for MySQL dumps.
+    </para>
+
+    <para>
       The document property <literal>SqlMode</literal> defines
       <literal>SQL_MODE</literal> for all operations affecting SQL
       parsing at the document scope. The purpose of this option is to

@@ -295,13 +352,14 @@
     </para>
 
     <para>
-      This property can be set at the global level using the
-      <guimenu>Tools</guimenu>, <guimenu>Preferences</guimenu> dialog.
+      The <guilabel>Path to mysqldump tool</guilabel> textfield allows
+      you to enter the name of the MySQL Dump tool you wish to use.
+      Leave this textfield blank to use the default Workbench dump tool.
     </para>
 
   </section>
 
-  <section id="wb-options-diagram">
+  <section id="wb-preferences-diagram">
 
     <title>The Diagram Tab</title>
 

@@ -314,10 +372,6 @@
       <guilabel>Expand New Objects</guilabel> check box and select
       whether to draw line crossings by checking the <guilabel>Draw Line
       Crossings</guilabel> check box.
-
-      <remark>
-        What does this mean?
-      </remark>
     </para>
 
     <para>

@@ -352,9 +406,9 @@
 
   </section>
 
-  <section id="wb-options-colors">
+  <section id="wb-preferences-appearance">
 
-    <title>The Colors Tab</title>
+    <title>The Appearance Tab</title>
 
     <para>
       Use this tab to set the available colors for the objects that

@@ -369,21 +423,15 @@
       <xref linkend="wb-tool-specific-toolbar-items"/>.
     </para>
 
-  </section>
-
-  <section id="wb-options-fonts">
-
-    <title>The Fonts Tab</title>
-
     <para>
-      Use this tab to set the font face, font size, and the font style
-      for the following list of items:
+      You can also use this tab to set the font face, font size, and the
+      font style for the following list of items:
 
       <itemizedlist>
 
         <listitem>
           <para>
-            Connection Figure Caption
+            Editor
           </para>
         </listitem>
 

@@ -395,351 +443,65 @@
 
         <listitem>
           <para>
-            Note Figure Text
-
-            <remark>
-              [PL]Is this the final name?
-            </remark>
+            Text Figure Text
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Routine Group Figure Item
+            Text Figure Title
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Routine Group Figure Title
+            Connection Caption
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Table Figure Items
+            Routine Group Figure Item
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Table Figure Section
+            Routine Group Figure Title
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Table Figure Title
+            Table Figure Items
           </para>
         </listitem>
 
         <listitem>
           <para>
-            View Figure Title
+            Table Figure Section
           </para>
         </listitem>
 
-      </itemizedlist>
-    </para>
-
-    <para>
-      Choose from the drop down list of fonts and font sizes. You may
-      also check the <literal>Bold</literal> and
-      <literal>Italic</literal> check boxes.
-    </para>
-
-  </section>
-
-  <section id="wb-options-advanced">
-
-    <title>The Advanced Tab</title>
-
-    <para>
-      Use this tab for setting the defaults for various application
-      objects. The options and their default values are shown in the
-      following:
-
-      <itemizedlist>
-
         <listitem>
           <para>
-            <literal>DefaultConnectionNotation</literal> &ndash;
-            crowsfoot
+            Table Figure Title
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <literal>DefaultFigureNotation</literal> &ndash;
-            workbench/default
+            View Figure Title
           </para>
         </listitem>
 
-        <listitem>
-          <para>
-            <literal>FKDeleteRule</literal> &ndash; NO ACTION
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>FKUpdateRule</literal> &ndash; NO ACTION
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>ProxyServer</literal>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>ProxyType</literal> &ndash; HTTP
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>ProxyUserPwd</literal>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>VersionsFileURL</literal> &ndash;
-            http://dev.mysql.com/workbench/versions.php
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>workbench.model.layer:Color</literal> &ndash;
-            #F0F1FE
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>workbench.model.NoteFigure:Color</literal> &ndash;
-            #FEFDED
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>workbench.physical.RoutineGroupFigure:Color</literal>
-            &ndash; #98D8A5
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>workbench.physical.TableFigure:Color</literal>
-            &ndash; #98BFDA
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>workbench.physical.ViewFigure:Color</literal>
-            &ndash; #FEDE58
-          </para>
-        </listitem>
-
       </itemizedlist>
-
-      To change the default value simply click the field you wish to
-      change and enter the new value.
     </para>
 
     <para>
-      Legitimate values for connection notation are:
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            <literal>classic</literal>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>idef1x</literal>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>crowsfoot</literal> (default)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>uml</literal>
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-      For more information about these notation styles see
-      <xref linkend="wb-relationship-notation-menu"/>.
+      Choose from the drop down list of fonts, font sizes and styles.
     </para>
 
-    <para>
-      Legitimate values for object notation are:
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            <literal>workbench/default</literal> (default)
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>workbench/simple</literal>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>workbench/pkonly</literal>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>idef1x</literal>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>classic</literal>
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-      For more information about these notation styles see
-      <xref linkend="wb-object-notation-menu"/>.
-    </para>
-
-    <para>
-      Legitimate values for the foreign key delete or update rules are:
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            <literal>RESTRICT</literal>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>CASCADE</literal>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>SET NULL</literal>
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>NO ACTION</literal> (default)
-          </para>
-        </listitem>
-
-      </itemizedlist>
-
-      For more information about these actions see
-      <xref linkend="wb-table-editor-foreign-keys"/>.
-    </para>
-
-    <para>
-      The <literal>VersionsFileURL</literal> option is used to support
-      the automatic update feature of &workbench;. The default value is
-      <literal>http://dev.mysql.com/workbench/versions.php</literal>.
-      Normally this value would not be changed by the user.
-    </para>
-
-    <para>
-      For more information about the proxy server options see
-      <xref linkend="wb-proxy-server"/>.
-    </para>
-
-    <para>
-      Use the remaining options to set the color of various objects. Use
-      hexadecimal values preceded by the
-      &lsquo;<literal>#</literal>&rsquo; character.
-    </para>
-
-    <section id="wb-proxy-server">
-
-      <title>Proxy Server Settings</title>
-
-      <para>
-        The proxy server group of settings are
-        <literal>ProxyServer</literal>, <literal>ProxyType</literal>,
-        and <literal>ProxyUserPassword</literal>. Use these settings if
-        you are connecting to a database server through a proxy server.
-      </para>
-
-      <para>
-        The <literal>ProxyServer</literal> option is used to set the
-        host name and port of a proxy server. This is specified using a
-        host name or IP address followed by a colon and the port number.
-        For example, <replaceable>192.168.0.9:8080</replaceable> or
-        <replaceable>proxy.some-provider.com:80</replaceable>. The
-        default value is an empty string, indicating that no proxy
-        server is used.
-      </para>
-
-      <para>
-        The <literal>ProxyType</literal> option defines the protocol for
-        the proxy server. Legitimate values are:
-
-        <itemizedlist>
-
-          <listitem>
-            <para>
-              <literal>HTTP</literal> (default)
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>SOCKS4</literal>
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
-              <literal>SOCKS5</literal>
-            </para>
-          </listitem>
-
-        </itemizedlist>
-      </para>
-
-      <para>
-        The <literal>ProxyUserPassword</literal> option specifies a
-        user's proxy server credentials. Separate your user name from
-        your password using a colon, for example,
-        <replaceable>user_name:password</replaceable>. The default value
-        for this option is an empty string.
-      </para>
-
-    </section>
-
   </section>
 
 </section>


Thread
svn commit - mysqldoc@docsrva: r17928 - in trunk: . workbenchpaul.dubois1 Dec