From: <tom...@us...> - 2010-03-22 17:01:38
|
Revision: 3467 http://tora.svn.sourceforge.net/tora/?rev=3467&view=rev Author: tomasstraupis Date: 2010-03-22 17:01:22 +0000 (Mon, 22 Mar 2010) Log Message: ----------- 1. Add editor option for upper/lowercase object names (fix table creation dialog to cope with this change). 2. Split editor options to two tabs. 3. Update documentation. Modified Paths: -------------- trunk/tora/doc/help/editor.html trunk/tora/doc/help/editor.texi trunk/tora/doc/help/images/editor.png trunk/tora/src/tobrowsertable.cpp trunk/tora/src/toconf.h trunk/tora/src/toconfiguration.cpp trunk/tora/src/toconfiguration.h trunk/tora/src/tooracleconnection.cpp trunk/tora/src/tooracleextract.cpp trunk/tora/src/topreferencesui.ui trunk/tora/src/tosyntaxsetup.cpp trunk/tora/src/tosyntaxsetupui.ui Added Paths: ----------- trunk/tora/doc/help/images/editor_syntax.png trunk/tora/src/help/images/editor_syntax.png Modified: trunk/tora/doc/help/editor.html =================================================================== --- trunk/tora/doc/help/editor.html 2010-03-21 16:03:40 UTC (rev 3466) +++ trunk/tora/doc/help/editor.html 2010-03-22 17:01:22 UTC (rev 3467) @@ -37,45 +37,51 @@ <h4 class="subsection">3.8.2 Editor Settings</h4> <p><a name="index-Editor-Settings-12"></a> -This page of the options contains settings on how to use TOra editors. +This page of the options contains settings for TOra editors. Editor settings are organised in two tabs: Options and Syntax. - <p>TODO + <p><strong>Options tab</strong> <div class="block-image"><img src="images/editor.png" alt="images/editor.png"></div> <dl> -<dt><strong>Syntax components</strong><dd> This list contains different parts of the SQL syntax. You can change the color used for the element by selecting the item in this list and then pressing the Pick button to select a color. The current color of the currently selected item in the list is displayed just to the left of the Pick button. - - <p>The available elements are as follows. - <p><table summary=""> <tr align="left"><td valign="top" width="30%"><strong>Background</strong> </td><td valign="top" width="70%">The normal background color for text. - <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Comment</strong> </td><td valign="top" width="70%">An SQL comment. Currently this only includes – comments, not rem comments. - <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Current background</strong> </td><td valign="top" width="70%">This is the background to use for the current line of execution in the PL/SQL debugger. - <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Error background</strong> </td><td valign="top" width="70%">This is the background to use for lines that have SQL errors in the in the PL/SQL debugger/editor. - <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Keyword</strong> </td><td valign="top" width="70%">This is the color to use for the text of an SQL keyword. - <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Normal</strong> </td><td valign="top" width="70%">Normal text color. - <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>String</strong> </td><td valign="top" width="70%">Color to use for text in strings. - <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Unfinished string</strong> </td><td valign="top" width="70%">Color to use for strings that miss their terminating ' or ". - <br></td></tr></table> - At the bottom of this dialog is a text field that displays en example of the current setting. - - <br><dt><strong>Syntax highlighting</strong><dd> Use this to control whether you want syntax highlighting or not. Observe that without syntax highlighting you will not see the indications for errors and current lines in the PL/SQL editor. -<br><dt><strong>Use maximum text width mark</strong><dd> TODO. +<dt><strong>Syntax highlighting</strong><dd> Use this to control whether you want syntax highlighting or not. Observe that without syntax highlighting you will not see the indications for errors and current lines in the PL/SQL editor. +<br><dt><strong>Use maximum text width mark</strong><dd> Check this option and specify maximum length of text. A vertical line indicating this margin will be displayed in text editor. Note that this option will <strong>not</strong> prevent text to be writen beyond maximum text width margin. this option is purely for visual representation. <br><dt><strong>Keyword upper</strong><dd> Check this box to convert all keywords to uppercase before displaying them. The text itself is not changed so resetting this not changed and the text sent to the database still contain lowercase letters. This setting is disabled if you do not have a monospaced font selected. +<br><dt><strong>Object names upper</strong><dd> Extract all names of objects (tables, views, columns etc.) from database as uppercase (default). For example this setting will be used when generating object creation scripts. <br><dt><strong>Code completion</strong><dd> Check this box to enable code completion in SQL editors. -<br><dt><strong>Editor shortcuts (TAB replacement)</strong><dd> TODO. +<br><dt><strong>Editor shortcuts (TAB replacement)</strong><dd> By checking this option and pressing a button "Edit..." you can add/modify/delete editor shortcuts. Editor shortcut is a short word which can be replaced to a long phrase by pressing TAB button. For example you can set that a short word "selsysd" be replaced with "select sysdate from dual". <br><dt><strong>Sort completion rows</strong><dd> If checked the completion alternatives are sorted in alphabetical order, otherwise they are in the same order as in the source. <br><dt><strong>Indent same as previous line</strong><dd> When inserting a new line indent it to the same level as the previous one. <br><dt><strong>Text example</strong><dd> This is the font to use for all editors in TOra that are not syntax highlighted. Choose the <strong>Choose</strong> button immediately to the right of the label to select a new font. <br><dt><strong>Code example</strong><dd> This is the font to use for all syntax highlighted SQL editors in TOra. Choose the <strong>Choose</strong> button immediately to the right of the label to select a new font. <br><dt><strong>List example</strong><dd> This is the font to use for all lists in TOra. Choose the <strong>Choose</strong> button immediately to the right of the label to select a new font. <br><dt><strong>Filename extensions</strong><dd> TODO. -<br><dt><strong>Tab stop width</strong><dd> TODO. +<br><dt><strong>Tab stop width</strong><dd> With of tab character. This value is also used when indenting automatically generated/formated scripts. <br><dt><strong>Use only spaces when indenting</strong><dd> TODO. <br><dt><strong>Static checker</strong><dd> Specifies static checker to be used. This configuration option should contain %1 which will be replaced with a filename (with full path) containing code to be checked. For example: <pre class="example"> perl /usr/bin/staticChecker.pl --output=TORA --file=%1 </pre> </dl> - There may also be pages under this for each individual database provider. Currently only Oracle uses this feature. That setup looks like this. + <p><strong>Syntax tab</strong> + + <div class="block-image"><img src="images/editor_syntax.png" alt="images/editor_syntax.png"></div> + + <dl> +<dt><strong>Syntax components</strong><dd> This list contains different parts of the SQL syntax. You can change the color used for the element by selecting the item in this list and then pressing the Pick button to select a color. The current color of the currently selected item in the list is displayed just to the left of the Pick button. + + <p>The available elements are as follows. + <p><table summary=""> <tr align="left"><td valign="top" width="30%"><strong>Background</strong> </td><td valign="top" width="70%">The normal background color for text. + <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Comment</strong> </td><td valign="top" width="70%">An SQL comment. Currently this only includes – comments, not rem comments. + <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Current background</strong> </td><td valign="top" width="70%">This is the background to use for the current line of execution in the PL/SQL debugger. + <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Error background</strong> </td><td valign="top" width="70%">This is the background to use for lines that have SQL errors in the in the PL/SQL debugger/editor. + <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Keyword</strong> </td><td valign="top" width="70%">This is the color to use for the text of an SQL keyword. + <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Normal</strong> </td><td valign="top" width="70%">Normal text color. + <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>String</strong> </td><td valign="top" width="70%">Color to use for text in strings. + <br></td></tr><tr align="left"><td valign="top" width="30%"><strong>Unfinished string</strong> </td><td valign="top" width="70%">Color to use for strings that miss their terminating ' or ". + <br></td></tr></table> + At the bottom of this dialog is a text field that displays en example of the current setting. +</dl> + </body></html> Modified: trunk/tora/doc/help/editor.texi =================================================================== --- trunk/tora/doc/help/editor.texi 2010-03-21 16:03:40 UTC (rev 3466) +++ trunk/tora/doc/help/editor.texi 2010-03-22 17:01:22 UTC (rev 3467) @@ -2,53 +2,39 @@ @subsection Editor Settings @cindex Editor Settings -This page of the options contains settings on how to use TOra editors. +This page of the options contains settings for TOra editors. Editor settings are organised in two tabs: Options and Syntax. -TODO +@strong{Options tab} @image{images/editor,15cm} @table @asis -@item @strong{Syntax components} - This list contains different parts of the SQL syntax. You can change the color used for the element by selecting the item in this list and then pressing the Pick button to select a color. The current color of the currently selected item in the list is displayed just to the left of the Pick button. - -The available elements are as follows. - @multitable @columnfractions .3 .7 - @item @strong{Background} @tab The normal background color for text. - @item @strong{Comment} @tab An SQL comment. Currently this only includes -- comments, not rem comments. - @item @strong{Current background} @tab This is the background to use for the current line of execution in the PL/SQL debugger. - @item @strong{Error background} @tab This is the background to use for lines that have SQL errors in the in the PL/SQL debugger/editor. - @item @strong{Keyword} @tab This is the color to use for the text of an SQL keyword. - @item @strong{Normal} @tab Normal text color. - @item @strong{String} @tab Color to use for text in strings. - @item @strong{Unfinished string} @tab Color to use for strings that miss their terminating ' or ". - @end multitable - At the bottom of this dialog is a text field that displays en example of the current setting. - @item @strong{Syntax highlighting} Use this to control whether you want syntax highlighting or not. Observe that without syntax highlighting you will not see the indications for errors and current lines in the PL/SQL editor. @item @strong{Use maximum text width mark} - TODO. + Check this option and specify maximum length of text. A vertical line indicating this margin will be displayed in text editor. Note that this option will @strong{not} prevent text to be writen beyond maximum text width margin. this option is purely for visual representation. @item @strong{Keyword upper} - Check this box to convert all keywords to uppercase before displaying them. The text itself is not changed so resetting this not changed and the text sent to the database still contain lowercase letters. This setting is disabled if you do not have a monospaced font selected. + Check this box to convert all keywords to uppercase before displaying them. The text itself is not changed so resetting this not changed and the text sent to the database still contain lowercase letters. This setting is disabled if you do not have a monospaced font selected. +@item @strong{Object names upper} + Extract all names of objects (tables, views, columns etc.) from database as uppercase (default). For example this setting will be used when generating object creation scripts. @item @strong{Code completion} - Check this box to enable code completion in SQL editors. + Check this box to enable code completion in SQL editors. @item @strong{Editor shortcuts (TAB replacement)} - TODO. + By checking this option and pressing a button "Edit..." you can add/modify/delete editor shortcuts. Editor shortcut is a short word which can be replaced to a long phrase by pressing TAB button. For example you can set that a short word "selsysd" be replaced with "select sysdate from dual". @item @strong{Sort completion rows} - If checked the completion alternatives are sorted in alphabetical order, otherwise they are in the same order as in the source. + If checked the completion alternatives are sorted in alphabetical order, otherwise they are in the same order as in the source. @item @strong{Indent same as previous line} When inserting a new line indent it to the same level as the previous one. @item @strong{Text example} - This is the font to use for all editors in TOra that are not syntax highlighted. Choose the @strong{Choose} button immediately to the right of the label to select a new font. + This is the font to use for all editors in TOra that are not syntax highlighted. Choose the @strong{Choose} button immediately to the right of the label to select a new font. @item @strong{Code example} - This is the font to use for all syntax highlighted SQL editors in TOra. Choose the @strong{Choose} button immediately to the right of the label to select a new font. + This is the font to use for all syntax highlighted SQL editors in TOra. Choose the @strong{Choose} button immediately to the right of the label to select a new font. @item @strong{List example} This is the font to use for all lists in TOra. Choose the @strong{Choose} button immediately to the right of the label to select a new font. @item @strong{Filename extensions} TODO. @item @strong{Tab stop width} - TODO. + With of tab character. This value is also used when indenting automatically generated/formated scripts. @item @strong{Use only spaces when indenting} TODO. @item @strong{Static checker} @@ -57,4 +43,25 @@ perl /usr/bin/staticChecker.pl --output=TORA --file=%1 @end example @end table -There may also be pages under this for each individual database provider. Currently only Oracle uses this feature. That setup looks like this. + +@strong{Syntax tab} + +@image{images/editor_syntax,15cm} + +@table @asis +@item @strong{Syntax components} + This list contains different parts of the SQL syntax. You can change the color used for the element by selecting the item in this list and then pressing the Pick button to select a color. The current color of the currently selected item in the list is displayed just to the left of the Pick button. + +The available elements are as follows. + @multitable @columnfractions .3 .7 + @item @strong{Background} @tab The normal background color for text. + @item @strong{Comment} @tab An SQL comment. Currently this only includes -- comments, not rem comments. + @item @strong{Current background} @tab This is the background to use for the current line of execution in the PL/SQL debugger. + @item @strong{Error background} @tab This is the background to use for lines that have SQL errors in the in the PL/SQL debugger/editor. + @item @strong{Keyword} @tab This is the color to use for the text of an SQL keyword. + @item @strong{Normal} @tab Normal text color. + @item @strong{String} @tab Color to use for text in strings. + @item @strong{Unfinished string} @tab Color to use for strings that miss their terminating ' or ". + @end multitable + At the bottom of this dialog is a text field that displays en example of the current setting. +@end table Modified: trunk/tora/doc/help/images/editor.png =================================================================== (Binary files differ) Added: trunk/tora/doc/help/images/editor_syntax.png =================================================================== (Binary files differ) Property changes on: trunk/tora/doc/help/images/editor_syntax.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/tora/src/help/images/editor_syntax.png =================================================================== --- trunk/tora/src/help/images/editor_syntax.png (rev 0) +++ trunk/tora/src/help/images/editor_syntax.png 2010-03-22 17:01:22 UTC (rev 3467) @@ -0,0 +1 @@ +link ../../../doc/help/images/editor_syntax.png \ No newline at end of file Property changes on: trunk/tora/src/help/images/editor_syntax.png ___________________________________________________________________ Added: svn:special + * Modified: trunk/tora/src/tobrowsertable.cpp =================================================================== --- trunk/tora/src/tobrowsertable.cpp 2010-03-21 16:03:40 UTC (rev 3466) +++ trunk/tora/src/tobrowsertable.cpp 2010-03-22 17:01:22 UTC (rev 3467) @@ -524,7 +524,7 @@ // when creating new table tablespace must always be specified if (OriginalDescription.empty()) { - addParameters(migrateTable, ctx, "TABLESPACE", Tablespace->currentText()); + addParameters(migrateTable, ctx, "TABLESPACE", cnct->quote(Tablespace->currentText())); } else { @@ -534,7 +534,7 @@ { // "quote" should be used for tablespace, but for tablespace // it will always do toLower anyway - addParameters(migrateTable, ctx, "PARAMETERS", "TABLESPACE " + Tablespace->currentText()); + addParameters(migrateTable, ctx, "PARAMETERS", "TABLESPACE " + cnct->quote(Tablespace->currentText())); } } Modified: trunk/tora/src/toconf.h =================================================================== --- trunk/tora/src/toconf.h 2010-03-21 16:03:40 UTC (rev 3466) +++ trunk/tora/src/toconf.h 2010-03-22 17:01:22 UTC (rev 3467) @@ -76,6 +76,8 @@ #define CONF_HIGHLIGHT "SyntaxHighlight" #define CONF_KEYWORD_UPPER "KeywordUpper" #define DEFAULT_KEYWORD_UPPER false +#define CONF_OBJECT_NAMES_UPPER "ObjectNamesUpper" +#define DEFAULT_OBJECT_NAMES_UPPER false #define CONF_COLOR "KeywordColor" #define CONF_PLUGIN_DIR "PluginDir" #define CONF_CACHE_DIR "CacheDir" Modified: trunk/tora/src/toconfiguration.cpp =================================================================== --- trunk/tora/src/toconfiguration.cpp 2010-03-21 16:03:40 UTC (rev 3466) +++ trunk/tora/src/toconfiguration.cpp 2010-03-22 17:01:22 UTC (rev 3467) @@ -81,6 +81,7 @@ QString m_refresh; bool m_highlight; bool m_keywordUpper; + bool m_objectNamesUpper; QString m_pluginDir; QString m_cacheDir; bool m_cacheDisk; @@ -303,6 +304,7 @@ m_refresh = s.value(CONF_REFRESH, DEFAULT_REFRESH).toString(); m_highlight = s.value(CONF_HIGHLIGHT, true).toBool(); m_keywordUpper = s.value(CONF_KEYWORD_UPPER, DEFAULT_KEYWORD_UPPER).toBool(); + m_objectNamesUpper = s.value(CONF_OBJECT_NAMES_UPPER, DEFAULT_OBJECT_NAMES_UPPER).toBool(); m_pluginDir = s.value(CONF_PLUGIN_DIR, DEFAULT_PLUGIN_DIR).toString(); m_cacheDir = s.value(CONF_CACHE_DIR, "").toString(); @@ -540,6 +542,7 @@ s.setValue(CONF_REFRESH, m_refresh); s.setValue(CONF_HIGHLIGHT, m_highlight); s.setValue(CONF_KEYWORD_UPPER, m_keywordUpper); + s.setValue(CONF_OBJECT_NAMES_UPPER, m_objectNamesUpper); s.setValue(CONF_PLUGIN_DIR, m_pluginDir); s.setValue(CONF_CACHE_DIR, m_cacheDir); s.setValue(CONF_CACHE_DISK, m_cacheDisk); @@ -1144,6 +1147,15 @@ p->m_keywordUpper = v; } +bool toConfiguration::objectNamesUpper() +{ + return p->m_objectNamesUpper; +} +void toConfiguration::setObjectNamesUpper(bool v) +{ + p->m_objectNamesUpper = v; +} + QString toConfiguration::pluginDir() { return p->m_pluginDir; Modified: trunk/tora/src/toconfiguration.h =================================================================== --- trunk/tora/src/toconfiguration.h 2010-03-21 16:03:40 UTC (rev 3466) +++ trunk/tora/src/toconfiguration.h 2010-03-22 17:01:22 UTC (rev 3467) @@ -115,6 +115,9 @@ bool keywordUpper(); void setKeywordUpper(bool v); + bool objectNamesUpper(); + void setObjectNamesUpper(bool v); + QString pluginDir(); void setPluginDir(const QString & v); Modified: trunk/tora/src/tooracleconnection.cpp =================================================================== --- trunk/tora/src/tooracleconnection.cpp 2010-03-21 16:03:40 UTC (rev 3466) +++ trunk/tora/src/tooracleconnection.cpp 2010-03-22 17:01:22 UTC (rev 3467) @@ -83,6 +83,7 @@ #include "otlv4.h" #include "toconf.h" +#include "toconfiguration.h" #include "toconnection.h" #include "tomain.h" #include "tosql.h" @@ -663,7 +664,12 @@ i++; } if (ok) - return name.toUpper(); + { + if (toConfigurationSingle::Instance().objectNamesUpper()) + return name.toUpper(); + else + return name.toLower(); + } else return QString::fromLatin1("\"") + name + QString::fromLatin1("\""); } Modified: trunk/tora/src/tooracleextract.cpp =================================================================== --- trunk/tora/src/tooracleextract.cpp 2010-03-21 16:03:40 UTC (rev 3466) +++ trunk/tora/src/tooracleextract.cpp 2010-03-22 17:01:22 UTC (rev 3467) @@ -1,4 +1,3 @@ - /* BEGIN_COMMON_COPYRIGHT_HEADER * * TOra - An Oracle Toolkit for DBA's and developers @@ -4442,7 +4441,7 @@ " , t.min_extents\n" " , DECODE(\n" " t.max_extents\n" - " ,2147483645,'unlimited'\n" + " ,2147483645,'UNLIMITED'\n" " , t.max_extents\n" " ) AS max_extents\n" " , NVL(t.pct_increase,0)\n" Modified: trunk/tora/src/topreferencesui.ui =================================================================== --- trunk/tora/src/topreferencesui.ui 2010-03-21 16:03:40 UTC (rev 3466) +++ trunk/tora/src/topreferencesui.ui 2010-03-22 17:01:22 UTC (rev 3467) @@ -1,7 +1,8 @@ -<ui version="4.0" > +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> <class>toPreferencesUI</class> - <widget class="QDialog" name="toPreferencesUI" > - <property name="geometry" > + <widget class="QDialog" name="toPreferencesUI"> + <property name="geometry"> <rect> <x>0</x> <y>0</y> @@ -9,98 +10,77 @@ <height>480</height> </rect> </property> - <property name="windowTitle" > + <property name="windowTitle"> <string>Preferences</string> </property> - <layout class="QGridLayout" > - <property name="leftMargin" > - <number>11</number> - </property> - <property name="topMargin" > - <number>11</number> - </property> - <property name="rightMargin" > - <number>11</number> - </property> - <property name="bottomMargin" > - <number>11</number> - </property> - <property name="horizontalSpacing" > - <number>6</number> - </property> - <property name="verticalSpacing" > - <number>6</number> - </property> - <item row="0" column="0" > - <widget class="QListWidget" name="TabSelection" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Maximum" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> + <property name="sizeGripEnabled"> + <bool>false</bool> + </property> + <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0"> + <item> + <widget class="QSplitter" name="splitter"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> </property> - <property name="minimumSize" > - <size> - <width>150</width> - <height>0</height> - </size> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QFrame" name="Parent" > - <property name="frameShape" > - <enum>QFrame::NoFrame</enum> - </property> - <property name="frameShadow" > - <enum>QFrame::Plain</enum> - </property> - <layout class="QVBoxLayout" > - <property name="spacing" > - <number>0</number> + <widget class="QListWidget" name="TabSelection"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> </property> - <property name="leftMargin" > - <number>0</number> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> </property> - <property name="topMargin" > - <number>0</number> + </widget> + <widget class="QFrame" name="Parent"> + <property name="frameShape"> + <enum>QFrame::NoFrame</enum> </property> - <property name="rightMargin" > - <number>0</number> + <property name="frameShadow"> + <enum>QFrame::Plain</enum> </property> - <property name="bottomMargin" > - <number>0</number> - </property> - </layout> + <layout class="QVBoxLayout"> + <property name="spacing"> + <number>0</number> + </property> + <property name="margin"> + <number>0</number> + </property> + </layout> + </widget> </widget> </item> - <item row="1" column="0" colspan="2" > - <layout class="QHBoxLayout" > + <item> + <layout class="QHBoxLayout"> <item> - <widget class="QPushButton" name="HelpButton" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Maximum" > + <widget class="QPushButton" name="HelpButton"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="text" > + <property name="text"> <string>&Help</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+H</string> </property> </widget> </item> <item> <spacer> - <property name="orientation" > + <property name="orientation"> <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > + <property name="sizeType"> <enum>QSizePolicy::Preferred</enum> </property> - <property name="sizeHint" > + <property name="sizeHint" stdset="0"> <size> <width>20</width> <height>20</height> @@ -109,28 +89,28 @@ </spacer> </item> <item> - <widget class="QPushButton" name="PushButton2_2" > - <property name="text" > + <widget class="QPushButton" name="PushButton2_2"> + <property name="text"> <string>Apply</string> </property> </widget> </item> <item> - <widget class="QPushButton" name="PushButton1" > - <property name="text" > + <widget class="QPushButton" name="PushButton1"> + <property name="text"> <string>&Ok</string> </property> - <property name="shortcut" > + <property name="shortcut"> <string>Alt+O</string> </property> - <property name="default" > + <property name="default"> <bool>true</bool> </property> </widget> </item> <item> - <widget class="QPushButton" name="PushButton2" > - <property name="text" > + <widget class="QPushButton" name="PushButton2"> + <property name="text"> <string>Cancel</string> </property> </widget> @@ -139,7 +119,7 @@ </item> </layout> </widget> - <layoutdefault spacing="6" margin="11" /> + <layoutdefault spacing="6" margin="11"/> <tabstops> <tabstop>TabSelection</tabstop> <tabstop>HelpButton</tabstop> @@ -155,11 +135,11 @@ <receiver>toPreferencesUI</receiver> <slot>accept()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>20</x> <y>20</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>20</x> <y>20</y> </hint> @@ -171,11 +151,11 @@ <receiver>toPreferencesUI</receiver> <slot>reject()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>20</x> <y>20</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>20</x> <y>20</y> </hint> @@ -187,11 +167,11 @@ <receiver>toPreferencesUI</receiver> <slot>selectTab(QListWidgetItem*)</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>20</x> <y>20</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>20</x> <y>20</y> </hint> @@ -203,11 +183,11 @@ <receiver>toPreferencesUI</receiver> <slot>help()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>20</x> <y>20</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>20</x> <y>20</y> </hint> @@ -219,11 +199,11 @@ <receiver>toPreferencesUI</receiver> <slot>saveSetting()</slot> <hints> - <hint type="sourcelabel" > + <hint type="sourcelabel"> <x>20</x> <y>20</y> </hint> - <hint type="destinationlabel" > + <hint type="destinationlabel"> <x>20</x> <y>20</y> </hint> Modified: trunk/tora/src/tosyntaxsetup.cpp =================================================================== --- trunk/tora/src/tosyntaxsetup.cpp 2010-03-21 16:03:40 UTC (rev 3466) +++ trunk/tora/src/tosyntaxsetup.cpp 2010-03-22 17:01:22 UTC (rev 3467) @@ -73,6 +73,7 @@ setupUi(this); KeywordUpper->setChecked(toConfigurationSingle::Instance().keywordUpper()); + ObjectNamesUpper->setChecked(toConfigurationSingle::Instance().objectNamesUpper()); SyntaxHighlighting->setChecked(toConfigurationSingle::Instance().highlight()); EdgeMarkCheckBox->setChecked(toConfigurationSingle::Instance().useMaxTextWidthMark()); EdgeSizeSpinBox->setValue(toConfigurationSingle::Instance().maxTextWidthMark()); @@ -359,6 +360,7 @@ toConfigurationSingle::Instance().setUseMaxTextWidthMark(EdgeMarkCheckBox->isChecked()); toConfigurationSingle::Instance().setMaxTextWidthMark(EdgeSizeSpinBox->value()); toConfigurationSingle::Instance().setKeywordUpper(KeywordUpper->isChecked()); + toConfigurationSingle::Instance().setObjectNamesUpper(ObjectNamesUpper->isChecked()); toConfigurationSingle::Instance().setCodeCompletion(highlight && CodeCompletion->isChecked()); toConfigurationSingle::Instance().setCodeCompletionSort(CompletionSort->isChecked()); toConfigurationSingle::Instance().setUseEditorShortcuts(EditorShortcuts->isChecked()); Modified: trunk/tora/src/tosyntaxsetupui.ui =================================================================== --- trunk/tora/src/tosyntaxsetupui.ui 2010-03-21 16:03:40 UTC (rev 3466) +++ trunk/tora/src/tosyntaxsetupui.ui 2010-03-22 17:01:22 UTC (rev 3467) @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>840</width> - <height>648</height> + <width>528</width> + <height>557</height> </rect> </property> <property name="windowTitle"> @@ -16,291 +16,342 @@ <property name="toolTip"> <string/> </property> - <layout class="QGridLayout"> + <layout class="QHBoxLayout" name="horizontalLayout_7"> + <property name="spacing"> + <number>6</number> + </property> <property name="margin"> <number>0</number> </property> - <property name="spacing"> - <number>6</number> - </property> - <item row="1" column="0" colspan="2"> - <widget class="toHighlightedText" name="Example" native="true"/> - </item> - <item row="0" column="0"> - <widget class="QGroupBox" name="GroupBox2"> - <property name="title"> - <string>Sy&ntax components</string> + <item> + <widget class="QTabWidget" name="tabWidget"> + <property name="currentIndex"> + <number>0</number> </property> - <layout class="QGridLayout"> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <item row="1" column="0"> - <widget class="QLabel" name="ExampleColor"> - <property name="text"> - <string/> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QPushButton" name="PushButton3"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text"> - <string>&Pick</string> - </property> - </widget> - </item> - <item row="0" column="0" colspan="2"> - <widget class="QListWidget" name="SyntaxComponent"/> - </item> - </layout> + <widget class="QWidget" name="OptionsTab"> + <attribute name="title"> + <string>Options</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QCheckBox" name="SyntaxHighlighting"> + <property name="toolTip"> + <string>Enable syntax highlighting, or use simple text editor</string> + </property> + <property name="text"> + <string>S&yntax highlighting</string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout"> + <item> + <widget class="QCheckBox" name="EdgeMarkCheckBox"> + <property name="toolTip"> + <string>Display the line/column marker at the specified position</string> + </property> + <property name="text"> + <string>Use &maximum text width mark</string> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="EdgeSizeSpinBox"> + <property name="toolTip"> + <string>Specify the column (text width) where to show marker</string> + </property> + <property name="minimum"> + <number>1</number> + </property> + <property name="maximum"> + <number>999999</number> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QCheckBox" name="KeywordUpper"> + <property name="toolTip"> + <string>Convert all keywords to uppercase when displayingsyntaxhighlighted text. Only available for monospaced fonts.</string> + </property> + <property name="text"> + <string>&Keyword upper</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="ObjectNamesUpper"> + <property name="toolTip"> + <string>Table, view, column names etc. are extracted in upper-case</string> + </property> + <property name="text"> + <string>Object names upper</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="CodeCompletion"> + <property name="toolTip"> + <string>Activate code completion in SQL editors. Not recommended on slow connections.</string> + </property> + <property name="text"> + <string>&Code completion</string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QCheckBox" name="EditorShortcuts"> + <property name="text"> + <string>&Editor shortcuts (TAB replacement)</string> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="EditorShortcutsEdit"> + <property name="text"> + <string>E&dit...</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QCheckBox" name="CompletionSort"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="toolTip"> + <string>Sort the available completion rows alphabetically or in the order the are.</string> + </property> + <property name="text"> + <string>&Sort completion rows</string> + </property> + <property name="checked"> + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="AutoIndent"> + <property name="toolTip"> + <string>Indent a new line in an editor to the same column as the previous line</string> + </property> + <property name="text"> + <string>&Indent same as previous line</string> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_3"> + <item> + <widget class="QLabel" name="TextExample"> + <property name="text"> + <string>Text example</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="PushButton1_2_2"> + <property name="text"> + <string>Choose</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_4"> + <item> + <widget class="QLabel" name="CodeExample"> + <property name="text"> + <string>Code example</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="PushButton1_2"> + <property name="text"> + <string>Choose</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_5"> + <item> + <widget class="QLabel" name="ResultExample"> + <property name="text"> + <string>List example</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QPushButton" name="PushButton1"> + <property name="text"> + <string>Choose</string> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QLabel" name="TextLabel1"> + <property name="text"> + <string>Filename extensions</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="Extensions"/> + </item> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_6"> + <item> + <widget class="QLabel" name="TextLabel1_2"> + <property name="toolTip"> + <string>Number of character width of tabstops</string> + </property> + <property name="whatsThis"> + <string>Number of character width of tabstops</string> + </property> + <property name="text"> + <string>Tab stop width</string> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + <property name="buddy"> + <cstring>TabStop</cstring> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="TabStop"> + <property name="minimum"> + <number>1</number> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QCheckBox" name="TabSpaces"> + <property name="toolTip"> + <string>If set the editor will insert spaces rather than tabs</string> + </property> + <property name="text"> + <string>Use only spaces when indenting</string> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="LSyntaxChecker"> + <property name="text"> + <string>Static checker:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="EStaticChecker"/> + </item> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> + </widget> + <widget class="QWidget" name="SyntaxTab"> + <attribute name="title"> + <string>Syntax</string> + </attribute> + <layout class="QHBoxLayout" name="horizontalLayout_8" stretch="1,2"> + <item> + <widget class="QGroupBox" name="GroupBox2"> + <property name="title"> + <string>Sy&ntax components</string> + </property> + <layout class="QGridLayout"> + <property name="margin"> + <number>11</number> + </property> + <property name="spacing"> + <number>6</number> + </property> + <item row="1" column="0"> + <widget class="QLabel" name="ExampleColor"> + <property name="text"> + <string/> + </property> + <property name="wordWrap"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QPushButton" name="PushButton3"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>&Pick</string> + </property> + </widget> + </item> + <item row="0" column="0" colspan="2"> + <widget class="QListWidget" name="SyntaxComponent"/> + </item> + </layout> + </widget> + </item> + <item> + <widget class="toHighlightedText" name="Example" native="true"> + <property name="minimumSize"> + <size> + <width>200</width> + <height>0</height> + </size> + </property> + </widget> + </item> + </layout> + </widget> </widget> </item> - <item row="0" column="1"> - <widget class="QGroupBox" name="Options"> - <property name="title"> - <string>Options</string> - </property> - <layout class="QGridLayout"> - <property name="margin"> - <number>11</number> - </property> - <property name="spacing"> - <number>6</number> - </property> - <item row="2" column="0" colspan="3"> - <widget class="QCheckBox" name="KeywordUpper"> - <property name="toolTip"> - <string>Convert all keywords to uppercase when displayingsyntaxhighlighted text. Only available for monospaced fonts.</string> - </property> - <property name="text"> - <string>&Keyword upper</string> - </property> - </widget> - </item> - <item row="3" column="0" colspan="3"> - <widget class="QCheckBox" name="CodeCompletion"> - <property name="toolTip"> - <string>Activate code completion in SQL editors. Not recommended on slow connections.</string> - </property> - <property name="text"> - <string>&Code completion</string> - </property> - </widget> - </item> - <item row="5" column="0" colspan="3"> - <widget class="QCheckBox" name="CompletionSort"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="toolTip"> - <string>Sort the available completion rows alphabetically or in the order the are.</string> - </property> - <property name="text"> - <string>&Sort completion rows</string> - </property> - <property name="checked"> - <bool>true</bool> - </property> - </widget> - </item> - <item row="0" column="0" colspan="3"> - <widget class="QCheckBox" name="SyntaxHighlighting"> - <property name="toolTip"> - <string>Enable syntax highlighting, or use simple text editor</string> - </property> - <property name="text"> - <string>S&yntax highlighting</string> - </property> - </widget> - </item> - <item row="6" column="0" colspan="3"> - <widget class="QCheckBox" name="AutoIndent"> - <property name="toolTip"> - <string>Indent a new line in an editor to the same column as the previous line</string> - </property> - <property name="text"> - <string>&Indent same as previous line</string> - </property> - </widget> - </item> - <item row="9" column="2"> - <widget class="QPushButton" name="PushButton1"> - <property name="text"> - <string>Choose</string> - </property> - </widget> - </item> - <item row="9" column="0"> - <widget class="QLabel" name="ResultExample"> - <property name="text"> - <string>List example</string> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="8" column="0"> - <widget class="QLabel" name="CodeExample"> - <property name="text"> - <string>Code example</string> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="8" column="2"> - <widget class="QPushButton" name="PushButton1_2"> - <property name="text"> - <string>Choose</string> - </property> - </widget> - </item> - <item row="7" column="0"> - <widget class="QLabel" name="TextExample"> - <property name="text"> - <string>Text example</string> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="10" column="0"> - <widget class="QLabel" name="TextLabel1"> - <property name="text"> - <string>Filename extensions</string> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - </widget> - </item> - <item row="16" column="1"> - <spacer> - <property name="orientation"> - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType"> - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="12" column="2"> - <widget class="QSpinBox" name="TabStop"> - <property name="minimum"> - <number>1</number> - </property> - </widget> - </item> - <item row="12" column="0" colspan="2"> - <widget class="QLabel" name="TextLabel1_2"> - <property name="toolTip"> - <string>Number of character width of tabstops</string> - </property> - <property name="whatsThis"> - <string>Number of character width of tabstops</string> - </property> - <property name="text"> - <string>Tab stop width</string> - </property> - <property name="wordWrap"> - <bool>false</bool> - </property> - <property name="buddy"> - <cstring>TabStop</cstring> - </property> - </widget> - </item> - <item row="13" column="0"> - <widget class="QCheckBox" name="TabSpaces"> - <property name="toolTip"> - <string>If set the editor will insert spaces rather than tabs</string> - </property> - <property name="text"> - <string>Use only spaces when indenting</string> - </property> - </widget> - </item> - <item row="7" column="2"> - <widget class="QPushButton" name="PushButton1_2_2"> - <property name="text"> - <string>Choose</string> - </property> - </widget> - </item> - <item row="4" column="0"> - <widget class="QCheckBox" name="EditorShortcuts"> - <property name="text"> - <string>&Editor shortcuts (TAB replacement)</string> - </property> - </widget> - </item> - <item row="4" column="2"> - <widget class="QPushButton" name="EditorShortcutsEdit"> - <property name="text"> - <string>E&dit...</string> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QCheckBox" name="EdgeMarkCheckBox"> - <property name="toolTip"> - <string>Display the line/column marker at the specified position</string> - </property> - <property name="text"> - <string>Use &maximum text width mark</string> - </property> - </widget> - </item> - <item row="1" column="2"> - <widget class="QSpinBox" name="EdgeSizeSpinBox"> - <property name="toolTip"> - <string>Specify the column (text width) where to show marker</string> - </property> - <property name="minimum"> - <number>1</number> - </property> - <property name="maximum"> - <number>999999</number> - </property> - </widget> - </item> - <item row="14" column="0"> - <widget class="QLabel" name="LSyntaxChecker"> - <property name="text"> - <string>Static checker:</string> - </property> - </widget> - </item> - <item row="15" column="0" colspan="3"> - <widget class="QLineEdit" name="EStaticChecker"/> - </item> - <item row="11" column="0" colspan="3"> - <widget class="QLineEdit" name="Extensions"/> - </item> - </layout> - </widget> - </item> </layout> </widget> <customwidgets> @@ -313,16 +364,6 @@ <tabstops> <tabstop>SyntaxComponent</tabstop> <tabstop>PushButton3</tabstop> - <tabstop>SyntaxHighlighting</tabstop> - <tabstop>KeywordUpper</tabstop> - <tabstop>CodeCompletion</tabstop> - <tabstop>AutoIndent</tabstop> - <tabstop>PushButton1_2_2</tabstop> - <tabstop>PushButton1_2</tabstop> - <tabstop>PushButton1</tabstop> - <tabstop>TabStop</tabstop> - <tabstop>Example</tabstop> - <tabstop>CompletionSort</tabstop> </tabstops> <resources/> <connections> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |