From: <nn...@us...> - 2007-09-15 22:20:24
|
Revision: 2122 http://tora.svn.sourceforge.net/tora/?rev=2122&view=rev Author: nneul Date: 2007-09-15 15:19:54 -0700 (Sat, 15 Sep 2007) Log Message: ----------- change to using .html consistently Modified Paths: -------------- trunk/tora/NEWS trunk/tora/doc/Makefile.am trunk/tora/doc/help/additionalhelp.texi trunk/tora/doc/help/preferences.texi trunk/tora/src/tohelp.cpp trunk/tora/src/tohelp.h trunk/tora/src/tomain.cpp trunk/tora/src/utils.cpp Modified: trunk/tora/NEWS =================================================================== --- trunk/tora/NEWS 2007-09-13 15:52:31 UTC (rev 2121) +++ trunk/tora/NEWS 2007-09-15 22:19:54 UTC (rev 2122) @@ -25,6 +25,7 @@ 2007-09-13: Applied patches from Andreas Piesk for config build support for Ora 10gR2 2007-09-13: Updated to latest OTL release 4.0.157 2007-09-13: Fixed Makefile.am for building html in docs +2007-09-15: Change code to consistently use .html extension 1.3.21: Modified: trunk/tora/doc/Makefile.am =================================================================== --- trunk/tora/doc/Makefile.am 2007-09-13 15:52:31 UTC (rev 2121) +++ trunk/tora/doc/Makefile.am 2007-09-15 22:19:54 UTC (rev 2122) @@ -8,7 +8,7 @@ install-data-hook: rm -rf $(tora_docdir)/help cp -dpR $(top_builddir)/doc/help/tora $(tora_docdir)/help - cp $(tora_docdir)/help/index.html $(tora_docdir)/help/toc.htm + cp $(tora_docdir)/help/index.html $(tora_docdir)/help/toc.html cp -dpR $(top_srcdir)/doc/help/images $(tora_docdir)/help cp -dpR $(top_srcdir)/doc/help/api $(tora_docdir)/help Modified: trunk/tora/doc/help/additionalhelp.texi =================================================================== --- trunk/tora/doc/help/additionalhelp.texi 2007-09-13 15:52:31 UTC (rev 2121) +++ trunk/tora/doc/help/additionalhelp.texi 2007-09-15 22:19:54 UTC (rev 2122) @@ -18,7 +18,7 @@ @samp{Oracle Manuals} @item Add path -Add a manual to the list of manuals. This pop up a dialog asking for the name of the manual and the location of the manuals table of contents HTML file (toc.htm). +Add a manual to the list of manuals. This pop up a dialog asking for the name of the manual and the location of the manuals table of contents HTML file (toc.html). @samp{Add path} @end table Modified: trunk/tora/doc/help/preferences.texi =================================================================== --- trunk/tora/doc/help/preferences.texi 2007-09-13 15:52:31 UTC (rev 2121) +++ trunk/tora/doc/help/preferences.texi 2007-09-15 22:19:54 UTC (rev 2122) @@ -32,7 +32,7 @@ @multitable @columnfractions .2 .8 @item @strong{Custom SQL} @tab The file in which to store your custom SQL. For more information about custom SQL and the SQL dictionary (@pxref{sqledit,SQL Editor tool}. The string @strong{@env{$HOME}} will be replaced by your home directory on UNIX or documents directory in Windows. -@item @strong{Help directory} @tab Should point to where the TOra help table of contents file is stored (toc.htm). This should be set up correctly if you made a normal install. +@item @strong{Help directory} @tab Should point to where the TOra help table of contents file is stored (toc.html). This should be set up correctly if you made a normal install. @item @strong{Plugin directory} @tab This option is only available in a plugin based TOra installation. It should point to the directory where the plugins for TOra are located. It should be set up correctly on installation if needed. @item @strong{Cache directory} @tab Should point to where the TOra Disk Cache files are stored. There is one file for each Connection. @item @strong{Change current connection with active window} @tab If this option is set, changing the current window will also change the current connection to that of the active window. The connection is only changed when you change window so if you want to change the connection to something else you can still do so as long as you don't change the window. Modified: trunk/tora/src/tohelp.cpp =================================================================== --- trunk/tora/src/tohelp.cpp 2007-09-13 15:52:31 UTC (rev 2121) +++ trunk/tora/src/tohelp.cpp 2007-09-15 22:19:54 UTC (rev 2122) @@ -534,7 +534,7 @@ } cur = cur->parentWidget(); } - toHelp::displayHelp(QString::fromLatin1("toc.htm"), parent); + toHelp::displayHelp(QString::fromLatin1("toc.html"), parent); } void toHelp::connectDialog(QDialog *dialog) @@ -587,7 +587,7 @@ { QString path = toHelp::path(parent->text(2)); QString filename = path; - filename += QString::fromLatin1("index.htm"); + filename.append(QString::fromLatin1("index.html")); try { toHtml file(toReadFile(filename)); Modified: trunk/tora/src/tohelp.h =================================================================== --- trunk/tora/src/tohelp.h 2007-09-13 15:52:31 UTC (rev 2121) +++ trunk/tora/src/tohelp.h 2007-09-15 22:19:54 UTC (rev 2122) @@ -114,7 +114,7 @@ * Display a help browser. A help manual consists of HTML pages where at least * two pages are mandatory. * - * The first one is toc.htm which is parsed for links which are added to the left + * The first one is toc.html which is parsed for links which are added to the left * pane tree view. Indentation is handled with the tag dl which open and close a * tree branch. * Modified: trunk/tora/src/tomain.cpp =================================================================== --- trunk/tora/src/tomain.cpp 2007-09-13 15:52:31 UTC (rev 2121) +++ trunk/tora/src/tomain.cpp 2007-09-15 22:19:54 UTC (rev 2122) @@ -812,7 +812,7 @@ contextHelp(); break; case TO_HELP_CONTENTS: - toHelp::displayHelp(QString::fromLatin1("toc.htm")); + toHelp::displayHelp(QString::fromLatin1("toc.html")); break; case TO_HELP_ABOUT: case TO_HELP_LICENSE: Modified: trunk/tora/src/utils.cpp =================================================================== --- trunk/tora/src/utils.cpp 2007-09-13 15:52:31 UTC (rev 2121) +++ trunk/tora/src/utils.cpp 2007-09-15 22:19:54 UTC (rev 2122) @@ -820,7 +820,7 @@ if (str.isEmpty()) { str = toPluginPath(); - str += QString::fromLatin1("/help/toc.htm"); + str += QString::fromLatin1("/help/toc.html"); } return str; } @@ -1533,7 +1533,7 @@ int countChars(const QString &source, const char find) { int found = 0; - int i; + unsigned int i; for(i = 0; i < source.length(); i++) { if(source[i] == find) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2007-09-17 21:21:09
|
Revision: 2126 http://tora.svn.sourceforge.net/tora/?rev=2126&view=rev Author: nneul Date: 2007-09-17 14:21:05 -0700 (Mon, 17 Sep 2007) Log Message: ----------- add more ignore entries Property Changed: ---------------- trunk/tora/config/ trunk/tora/doc/help/ trunk/tora/src/ trunk/tora/src/i18n/ trunk/tora/test/ trunk/tora/test/configuration/ Property changes on: trunk/tora/config ___________________________________________________________________ Name: svn:ignore - depcomp missing config.guess ltmain.sh config.sub install-sh + depcomp missing config.guess ltmain.sh config.sub install-sh mkinstalldirs texinfo.tex Property changes on: trunk/tora/doc/help ___________________________________________________________________ Name: svn:ignore + Makefile Makefile.in tora.info tora Property changes on: trunk/tora/src ___________________________________________________________________ Name: svn:ignore - .deps .libs Makefile Makefile.in *.moc *.orig qtlegacy toaboutui.cpp toaboutui.h tobrowserconstraintui.cpp tobrowserconstraintui.h tobrowserfilterui.cpp tobrowserfilterui.h tobrowserindexui.cpp tobrowserindexui.h tobrowsertableui.cpp tobrowsertableui.h tochartalarmui.cpp tochartalarmui.h tochartsetupui.cpp tochartsetupui.h todatabasesettingui.cpp todatabasesettingui.h todebugchangeui.cpp todebugchangeui.h todebugwatch.cpp todebugwatch.h toeditextensiongotoui.cpp toeditextensiongotoui.h toeditextensionsetupui.cpp toeditextensionsetupui.h toglobalsettingui.cpp toglobalsettingui.h tohelpaddfileui.cpp tohelpaddfileui.h tohelpsetupui.cpp tohelpsetupui.h tolinechartsetupui.cpp tolinechartsetupui.h tomessageui.cpp tomessageui.h tonewconnectionui.cpp tonewconnectionui.h tooraclesettingui.cpp tooraclesettingui.h topreferencesui.cpp topreferencesui.h tora tora_fr.qm tora_it.qm tora_se.qm tora_toad.h tora_toad.qm toresultcontentfilterui.cpp toresultcontentfilterui.h toresultlistformatui.cpp toresultlistformatui.h torollbackdialogui.cpp torollbackdialogui.h toscriptui.cpp toscriptui.h tosearchreplaceui.cpp tosearchreplaceui.h tosecurityquotaui.cpp tosecurityquotaui.h tosecurityroleui.cpp tosecurityroleui.h tosecurityuserui.cpp tosecurityuserui.h tostoragedatafileui.cpp tostoragedatafileui.h tostoragedefinitionui.cpp tostoragedefinitionui.h tostoragedialogui.cpp tostoragedialogui.h tostorageprefsui.cpp tostorageprefsui.h tostoragetablespaceui.cpp tostoragetablespaceui.h tosyntaxsetupui.cpp tosyntaxsetupui.h totemplateaddfileui.cpp totemplateaddfileui.h totemplateeditui.cpp totemplateeditui.h totemplatesetupui.cpp totemplatesetupui.h totoolsettingui.cpp totoolsettingui.h totuningoverviewui.cpp totuningoverviewui.h totuningsettingui.cpp totuningsettingui.h toworksheetsetupui.cpp toworksheetsetupui.h utils.moc + .deps .libs Makefile Makefile.in *.moc *.orig qtlegacy toaboutui.cpp toaboutui.h tobrowserconstraintui.cpp tobrowserconstraintui.h tobrowserfilterui.cpp tobrowserfilterui.h tobrowserindexui.cpp tobrowserindexui.h tobrowsertableui.cpp tobrowsertableui.h tochartalarmui.cpp tochartalarmui.h tochartsetupui.cpp tochartsetupui.h todatabasesettingui.cpp todatabasesettingui.h todebugchangeui.cpp todebugchangeui.h todebugwatch.cpp todebugwatch.h todroptablespaceui.h todroptablespaceui.cpp toeditextensiongotoui.cpp toeditextensiongotoui.h toeditextensionsetupui.cpp toeditextensionsetupui.h toglobalsettingui.cpp toglobalsettingui.h tohelpaddfileui.cpp tohelpaddfileui.h tohelpsetupui.cpp tohelpsetupui.h tolinechartsetupui.cpp tolinechartsetupui.h tomessageui.cpp tomessageui.h tonewconnectionui.cpp tonewconnectionui.h tooraclesettingui.cpp tooraclesettingui.h topreferencesui.cpp topreferencesui.h tora tora_fr.qm tora_it.qm tora_se.qm tora_toad.h tora_toad.qm toresultcontentfilterui.cpp toresultcontentfilterui.h toresultlistformatui.cpp toresultlistformatui.h torollbackdialogui.cpp torollbackdialogui.h toscriptui.cpp toscriptui.h tosearchreplaceui.cpp tosearchreplaceui.h tosecurityquotaui.cpp tosecurityquotaui.h tosecurityroleui.cpp tosecurityroleui.h tosecurityuserui.cpp tosecurityuserui.h tostoragedatafileui.cpp tostoragedatafileui.h tostoragedefinitionui.cpp tostoragedefinitionui.h tostoragedialogui.cpp tostoragedialogui.h tostorageprefsui.cpp tostorageprefsui.h tostoragetablespaceui.cpp tostoragetablespaceui.h tosyntaxsetupui.cpp tosyntaxsetupui.h totemplateaddfileui.cpp totemplateaddfileui.h totemplateeditui.cpp totemplateeditui.h totemplatesetupui.cpp totemplatesetupui.h totoolsettingui.cpp totoolsettingui.h totuningoverviewui.cpp totuningoverviewui.h totuningsettingui.cpp totuningsettingui.h toworksheetsetupui.cpp toworksheetsetupui.h utils.moc Property changes on: trunk/tora/src/i18n ___________________________________________________________________ Name: svn:ignore + tora_fr.qm tora_se.qm tora_toad.qm tora_it.qm Property changes on: trunk/tora/test ___________________________________________________________________ Name: svn:ignore + Makefile.in Makefile Property changes on: trunk/tora/test/configuration ___________________________________________________________________ Name: svn:ignore + Makefile.in .deps Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2007-09-18 13:33:20
|
Revision: 2130 http://tora.svn.sourceforge.net/tora/?rev=2130&view=rev Author: nneul Date: 2007-09-18 06:33:17 -0700 (Tue, 18 Sep 2007) Log Message: ----------- update to 1.3.22 version number instead of 1.3.22svn Modified Paths: -------------- trunk/tora/INSTALL trunk/tora/configure.ac Modified: trunk/tora/INSTALL =================================================================== --- trunk/tora/INSTALL 2007-09-18 00:03:17 UTC (rev 2129) +++ trunk/tora/INSTALL 2007-09-18 13:33:17 UTC (rev 2130) @@ -1,13 +1,16 @@ -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software -Foundation, Inc. +Installation Instructions +************************* - This file is free documentation; the Free Software Foundation gives +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free +Software Foundation, Inc. + +This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. Basic Installation ================== - These are generic installation instructions. +These are generic installation instructions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -67,9 +70,9 @@ Compilers and Options ===================== - Some systems require unusual options for compilation or linking that -the `configure' script does not know about. Run `./configure --help' -for details on some of the pertinent environment variables. +Some systems require unusual options for compilation or linking that the +`configure' script does not know about. Run `./configure --help' for +details on some of the pertinent environment variables. You can give `configure' initial values for configuration parameters by setting variables in the command line or in the environment. Here @@ -82,7 +85,7 @@ Compiling For Multiple Architectures ==================================== - You can compile the package for more than one kind of computer at the +You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their own directory. To do this, you must use a version of `make' that supports the `VPATH' variable, such as GNU `make'. `cd' to the @@ -99,19 +102,19 @@ Installation Names ================== - By default, `make install' will install the package's files in -`/usr/local/bin', `/usr/local/man', etc. You can specify an -installation prefix other than `/usr/local' by giving `configure' the -option `--prefix=PATH'. +By default, `make install' installs the package's commands under +`/usr/local/bin', include files under `/usr/local/include', etc. You +can specify an installation prefix other than `/usr/local' by giving +`configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you -give `configure' the option `--exec-prefix=PATH', the package will use -PATH as the prefix for installing programs and libraries. -Documentation and other data files will still use the regular prefix. +pass the option `--exec-prefix=PREFIX' to `configure', the package uses +PREFIX as the prefix for installing programs and libraries. +Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give -options like `--bindir=PATH' to specify different values for particular +options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. @@ -122,7 +125,7 @@ Optional Features ================= - Some packages pay attention to `--enable-FEATURE' options to +Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE is something like `gnu-as' or `x' (for the X Window System). The @@ -137,11 +140,11 @@ Specifying the System Type ========================== - There may be some features `configure' cannot figure out -automatically, but needs to determine by the type of machine the package -will run on. Usually, assuming the package is built to be run on the -_same_ architectures, `configure' can figure that out, but if it prints -a message saying it cannot guess the machine type, give it the +There may be some features `configure' cannot figure out automatically, +but needs to determine by the type of machine the package will run on. +Usually, assuming the package is built to be run on the _same_ +architectures, `configure' can figure that out, but if it prints a +message saying it cannot guess the machine type, give it the `--build=TYPE' option. TYPE can either be a short name for the system type, such as `sun4', or a canonical name which has the form: @@ -156,7 +159,7 @@ need to know the machine type. If you are _building_ compiler tools for cross-compiling, you should -use the `--target=TYPE' option to select the type of system they will +use the option `--target=TYPE' to select the type of system they will produce code for. If you want to _use_ a cross compiler, that generates code for a @@ -167,9 +170,9 @@ Sharing Defaults ================ - If you want to set default values for `configure' scripts to share, -you can create a site shell script called `config.site' that gives -default values for variables like `CC', `cache_file', and `prefix'. +If you want to set default values for `configure' scripts to share, you +can create a site shell script called `config.site' that gives default +values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the `CONFIG_SITE' environment variable to the location of the site script. @@ -178,7 +181,7 @@ Defining Variables ================== - Variables not defined in a site shell script can be set in the +Variables not defined in a site shell script can be set in the environment passed to `configure'. However, some packages may run configure again during the build, and the customized values of these variables may be lost. In order to avoid this problem, you should set @@ -186,14 +189,18 @@ ./configure CC=/usr/local2/bin/gcc -will cause the specified gcc to be used as the C compiler (unless it is -overridden in the site shell script). +causes the specified `gcc' to be used as the C compiler (unless it is +overridden in the site shell script). Here is a another example: + /bin/bash ./configure CONFIG_SHELL=/bin/bash + +Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent +configuration-related scripts to be executed by `/bin/bash'. + `configure' Invocation ====================== - `configure' recognizes the following options to control how it -operates. +`configure' recognizes the following options to control how it operates. `--help' `-h' Modified: trunk/tora/configure.ac =================================================================== --- trunk/tora/configure.ac 2007-09-18 00:03:17 UTC (rev 2129) +++ trunk/tora/configure.ac 2007-09-18 13:33:17 UTC (rev 2130) @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. -AC_INIT([tora],[1.3.22svn],[tor...@li...]) +AC_INIT([tora],[1.3.22],[tor...@li...]) AC_PREREQ([2.59]) AC_CONFIG_AUX_DIR(config) # Every other copy of the package version number gets its value from here This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2007-09-19 13:41:26
|
Revision: 2136 http://tora.svn.sourceforge.net/tora/?rev=2136&view=rev Author: nneul Date: 2007-09-19 06:41:29 -0700 (Wed, 19 Sep 2007) Log Message: ----------- start work on 1.3.23 Modified Paths: -------------- trunk/tora/NEWS trunk/tora/configure.ac Added Paths: ----------- trunk/tora/README.SVN Removed Paths: ------------- trunk/tora/README.CVS Modified: trunk/tora/NEWS =================================================================== --- trunk/tora/NEWS 2007-09-18 16:39:25 UTC (rev 2135) +++ trunk/tora/NEWS 2007-09-19 13:41:29 UTC (rev 2136) @@ -1,4 +1,7 @@ -1.3.22svn: +1.3.23: + + +1.3.22: 2006-03-01: Autocompletion first step 2006-03-03: Autocompletion second step 2006-03-03: Fixed bug #1437575 Deleted: trunk/tora/README.CVS =================================================================== --- trunk/tora/README.CVS 2007-09-18 16:39:25 UTC (rev 2135) +++ trunk/tora/README.CVS 2007-09-19 13:41:29 UTC (rev 2136) @@ -1,15 +0,0 @@ -General Policies about CVS Commits: ------------------------------------ - -If it's controversial or sigificant, please discuss on tora-develop first. - -Don't break stuff. Let's try and make sure to test a compile at least on a -few standard platforms first. - -Mandrake -Fedora Core - -Work on windows support is primarily directed at getting functional with the -QT/Free for windows port, with eventual move to the QT/4 GPL release. For now -Henrik may be able to do some binary builds for us when he has time with -the existing QT/Windows commercial release. Copied: trunk/tora/README.SVN (from rev 2135, trunk/tora/README.CVS) =================================================================== --- trunk/tora/README.SVN (rev 0) +++ trunk/tora/README.SVN 2007-09-19 13:41:29 UTC (rev 2136) @@ -0,0 +1,13 @@ +General Policies about SVN Commits: +----------------------------------- + +If it's controversial or sigificant, please discuss on tora-develop first. + +Don't break stuff. Let's try and make sure to test a compile at least on a +few standard platforms first. + +Mandrake +Fedora Core + +Work on windows support is primarily directed at getting functional with the +QT/Free for windows port, with eventual move to the QT/4 GPL release. Modified: trunk/tora/configure.ac =================================================================== --- trunk/tora/configure.ac 2007-09-18 16:39:25 UTC (rev 2135) +++ trunk/tora/configure.ac 2007-09-19 13:41:29 UTC (rev 2136) @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. -AC_INIT([tora],[1.3.22],[tor...@li...]) +AC_INIT([tora],[1.3.23],[tor...@li...]) AC_PREREQ([2.59]) AC_CONFIG_AUX_DIR(config) # Every other copy of the package version number gets its value from here This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2007-09-25 16:54:48
|
Revision: 2163 http://tora.svn.sourceforge.net/tora/?rev=2163&view=rev Author: nneul Date: 2007-09-25 09:54:51 -0700 (Tue, 25 Sep 2007) Log Message: ----------- updates from Andreas for sort order and version detection Modified Paths: -------------- trunk/tora/NEWS trunk/tora/src/tooracleconnection.cpp trunk/tora/src/tosession.cpp Modified: trunk/tora/NEWS =================================================================== --- trunk/tora/NEWS 2007-09-25 15:25:00 UTC (rev 2162) +++ trunk/tora/NEWS 2007-09-25 16:54:51 UTC (rev 2163) @@ -1,5 +1,8 @@ 1.3.23: 2007-09-19: removing all Qt < 3.2 support and KDE integration in preparation for future Qt4 work +2007-09-25: update to tostorage.cpp query +2007-09-25: fix broken db version detection +2007-09-05: sort order for long ops 1.3.22: 2006-03-01: Autocompletion first step Modified: trunk/tora/src/tooracleconnection.cpp =================================================================== --- trunk/tora/src/tooracleconnection.cpp 2007-09-25 15:25:00 UTC (rev 2162) +++ trunk/tora/src/tooracleconnection.cpp 2007-09-25 16:54:51 UTC (rev 2163) @@ -829,7 +829,7 @@ try { otl_stream version(1, - "SELECT version FROM product_component_version where product like 'Oracle Database %'", + "SELECT version FROM product_component_version where product like 'Oracle%'", *(conn->Connection)); if (!version.eof()) { Modified: trunk/tora/src/tosession.cpp =================================================================== --- trunk/tora/src/tosession.cpp 2007-09-25 15:25:00 UTC (rev 2162) +++ trunk/tora/src/tosession.cpp 2007-09-25 16:54:51 UTC (rev 2163) @@ -301,7 +301,7 @@ ResultTab->addTab(CurrentStatement, tr("Current Statement")); QString sql = toSQL::string(TOSQL_LONGOPS, connection); - sql += " AND b.sid = :sid<char[101]> AND b.serial# = :ser<char[101]>"; + sql += " AND b.sid = :sid<char[101]> AND b.serial# = :ser<char[101]> order by b.start_time desc"; LongOps = new toResultLong(true, false, toQuery::Background, ResultTab); LongOps->setSQL(sql); ResultTab->addTab(LongOps, tr("Long ops")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <me...@us...> - 2007-11-26 16:03:56
|
Revision: 2283 http://tora.svn.sourceforge.net/tora/?rev=2283&view=rev Author: meskes Date: 2007-11-26 08:03:55 -0800 (Mon, 26 Nov 2007) Log Message: ----------- I will try to keep the debian dir in sync with the Debian packaging. Modified Paths: -------------- trunk/tora/debian/changelog trunk/tora/debian/control trunk/tora/debian/docs trunk/tora/debian/menu trunk/tora/debian/rules Added Paths: ----------- trunk/tora/tora.links Modified: trunk/tora/debian/changelog =================================================================== --- trunk/tora/debian/changelog 2007-11-08 21:13:40 UTC (rev 2282) +++ trunk/tora/debian/changelog 2007-11-26 16:03:55 UTC (rev 2283) @@ -1,3 +1,28 @@ +tora (1.3.22-4) UNRELEASED; urgency=low + + * Removed build dependency on g++, closes: #452976 + * Also removed build dependency on libqt3-mt-dev because kdelibs4-dev + depends on it. + * Made menu file adhere new standard. + * Do not install sources for help files. + + -- Michael Meskes <me...@de...> Mon, 26 Nov 2007 14:29:47 +0000 + +tora (1.3.22-3) unstable; urgency=low + + * Moved to team maintenance: + Debian KDE Extras Team <pkg...@li...>. + + -- Michael Meskes <me...@de...> Thu, 22 Nov 2007 11:12:43 +0100 + +tora (1.3.22-2) unstable; urgency=low + + * Fixed help system + * Moved translations to /usr/share, closes: #448950 + * Remove deprecated debian.patch file. + + -- Michael Meskes <me...@de...> Tue, 20 Nov 2007 13:05:47 +0100 + tora (1.3.22-1) unstable; urgency=low * New upstream version. Modified: trunk/tora/debian/control =================================================================== --- trunk/tora/debian/control 2007-11-08 21:13:40 UTC (rev 2282) +++ trunk/tora/debian/control 2007-11-26 16:03:55 UTC (rev 2283) @@ -1,8 +1,9 @@ Source: tora Section: misc Priority: optional -Maintainer: Michael Meskes <me...@de...> -Build-Depends: debhelper (>> 4.0.0), g++, libqt3-mt-dev (>= 3.1.1-1), libqt3-compat-headers, kdelibs4-dev, docbook-xml (>= 4.2), xsltproc, docbook-xsl, kdebase-bin, libqscintilla-dev, texinfo, dpatch +Maintainer: Debian KDE Extras Team <pkg...@li...> +Uploaders: Michael Meskes <me...@de...> +Build-Depends: debhelper (>> 4.0.0), libqt3-compat-headers, kdelibs4-dev, docbook-xml (>= 4.2), xsltproc, docbook-xsl, kdebase-bin, libqscintilla-dev, texinfo, dpatch Standards-Version: 3.7.2 Package: tora Modified: trunk/tora/debian/docs =================================================================== --- trunk/tora/debian/docs 2007-11-08 21:13:40 UTC (rev 2282) +++ trunk/tora/debian/docs 2007-11-26 16:03:55 UTC (rev 2283) @@ -2,4 +2,3 @@ NEWS README TODO -debian/debian.patch Modified: trunk/tora/debian/menu =================================================================== --- trunk/tora/debian/menu 2007-11-08 21:13:40 UTC (rev 2282) +++ trunk/tora/debian/menu 2007-11-26 16:03:55 UTC (rev 2283) @@ -1,8 +1,7 @@ ?package(tora):\ needs="X11"\ - section="Apps/Databases"\ + section="Applications/Data Management"\ title="TOra"\ command="/usr/bin/tora"\ - kderemove="y"\ icon32x32="/usr/share/icons/hicolor/32x32/apps/tora.xpm"\ icon16x16="/usr/share/icons/hicolor/16x16/apps/tora.xpm" Modified: trunk/tora/debian/rules =================================================================== --- trunk/tora/debian/rules 2007-11-08 21:13:40 UTC (rev 2282) +++ trunk/tora/debian/rules 2007-11-26 16:03:55 UTC (rev 2283) @@ -28,7 +28,7 @@ dh_testdir # Add here commands to compile the package. - $(MAKE) CFLAGS_GLOB="-O2 -W -g -fPIC -Wall -Wno-unused" libdir=/usr/lib/tora + $(MAKE) CFLAGS_GLOB="-O2 -W -g -fPIC -Wall -Wno-unused" libdir=/usr/share/tora $(XP) $(DB2MAN) debian/tora.xml touch build-stamp @@ -52,12 +52,7 @@ dh_installdirs # Add here commands to install the package into debian/tora. - $(MAKE) install DESTDIR=$(CURDIR)/debian/tora libdir=/usr/lib/tora - -install --owner root --group root --mode=644 $(CURDIR)/doc/help/* $(CURDIR)/debian/tora/usr/share/tora/help - -install --owner root --group root --mode=644 $(CURDIR)/doc/help/images/* $(CURDIR)/debian/tora/usr/share/tora/help/images - -mv $(CURDIR)/debian/tora/usr/lib/tora/help $(CURDIR)/debian/tora/usr/share/tora - dh_link usr/share/tora/help usr/lib/tora/help - dh_link usr/share/tora/help usr/share/doc/tora/help + $(MAKE) install DESTDIR=$(CURDIR)/debian/tora libdir=/usr/share/tora -install --owner root --group root --mode=644 $(CURDIR)/src/icons/tora.xpm $(CURDIR)/debian/tora/usr/share/icons/hicolor/32x32/apps -install --owner root --group root --mode=644 $(CURDIR)/src/icons/toramini.xpm $(CURDIR)/debian/tora/usr/share/icons/hicolor/16x16/apps/tora.xpm -install --owner root --group root --mode=644 $(CURDIR)/debian/tora.desktop $(CURDIR)/debian/tora/usr/share/applications Added: trunk/tora/tora.links =================================================================== --- trunk/tora/tora.links (rev 0) +++ trunk/tora/tora.links 2007-11-26 16:03:55 UTC (rev 2283) @@ -0,0 +1,3 @@ +usr/share/tora/help usr/lib/tora/help +usr/share/tora/help usr/share/doc/tora/help + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-02-14 14:54:32
|
Revision: 2579 http://tora.svn.sourceforge.net/tora/?rev=2579&view=rev Author: subik Date: 2008-02-14 06:54:33 -0800 (Thu, 14 Feb 2008) Log Message: ----------- DB links are included now (only when there is Oracle found) and ported to Qt4 Modified Paths: -------------- trunk/tora/CMakeLists.txt trunk/tora/src/tobrowser.cpp trunk/tora/src/tobrowser.h Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-02-14 06:06:08 UTC (rev 2578) +++ trunk/tora/CMakeLists.txt 2008-02-14 14:54:33 UTC (rev 2579) @@ -178,6 +178,8 @@ FIND_PACKAGE(Oracle) IF(ORACLE_FOUND) MESSAGE("Oracle OCI Library Found OK") + # what else is hidden in the ifdef hell?! + ADD_DEFINITIONS("-DDBLINK") ELSE(ORACLE_FOUND) MESSAGE(STATUS "No Oracle OCI found. TOra will be build without Oracle support") ADD_DEFINITIONS("-DTO_NO_ORACLE") Modified: trunk/tora/src/tobrowser.cpp =================================================================== --- trunk/tora/src/tobrowser.cpp 2008-02-14 06:06:08 UTC (rev 2578) +++ trunk/tora/src/tobrowser.cpp 2008-02-14 14:54:33 UTC (rev 2579) @@ -1781,24 +1781,24 @@ #ifdef DBLINK - splitter = new QSplitter(Qt::Horizontal, TopTab, TAB_DBLINK); + splitter = new QSplitter(Qt::Horizontal, TopTab); + splitter->setObjectName(TAB_DBLINK); TopTab->addTab(splitter, tr("DBLinks")); box = new QWidget(splitter); - QVBoxLayout *vbox = new QVBoxLayout; + + vbox = new QVBoxLayout; vbox->setSpacing(0); vbox->setContentsMargins(0, 0, 0, 0); box->setLayout(vbox); toolbar = toAllocBar(box, tr("Database browser")); - vbox->addWidget(box); + vbox->addWidget(toolbar); - toolbar->addWidget( - new toBrowseButton(QPixmap(const_cast<const char**>(modconstraint_xpm)), - tr("Test DBLink"), - tr("Test DBLink"), - this, SLOT(testDBLink()), - toolbar)); + testDBLinkAct = new QAction(QPixmap(const_cast<const char**>(modconstraint_xpm)), + tr("Test DBLink"), this); + connect(testDBLinkAct, SIGNAL(triggered()), this, SLOT(testDBLink())); + toolbar->addAction(testDBLinkAct); toolbar->addSeparator(); tableView = new toResultTableView(true, false, box); @@ -1809,7 +1809,7 @@ tableView->setTabWidget(TopTab); tableView->setSQL(SQLListDBLink); tableView->resize(FIRST_WIDTH, tableView->height()); - tableView->setResizeMode(toTreeWidget::AllColumns); + connect(tableView, SIGNAL(selectionChanged()), this, @@ -1818,11 +1818,13 @@ SIGNAL(displayMenu(QMenu *)), this, SLOT(displayIndexMenu(QMenu *))); - box->resize(FIRST_WIDTH, tableView->height()); - splitter->setResizeMode(box, QSplitter::KeepSize); + curr = new toTabWidget(splitter); - splitter->setResizeMode(curr, QSplitter::Stretch); + box->resize(FIRST_WIDTH, tableView->height()); + splitter->setStretchFactor(splitter->indexOf(tableView), 0); + splitter->setStretchFactor(splitter->indexOf(curr), 1); + toResultItem *resultDBLink = new toResultItem( 2, true, @@ -3221,6 +3223,7 @@ { if (SecondText.isEmpty()) return ; + toQList resultset; try { resultset = toQuery::readQueryNull(toCurrentConnection(this), @@ -3230,6 +3233,6 @@ // } catch (...) { // TOMessageBox::information(this, "Database link", SecondText); // } - if (!resultset.empty()) - TOMessageBox::information(this, "Database link", SecondText); + QString status(resultset.empty() ? tr("status: FAILED") : tr("status: OK")); + TOMessageBox::information(this, "Database link", SecondText + " " + status); } Modified: trunk/tora/src/tobrowser.h =================================================================== --- trunk/tora/src/tobrowser.h 2008-02-14 06:06:08 UTC (rev 2578) +++ trunk/tora/src/tobrowser.h 2008-02-14 14:54:33 UTC (rev 2579) @@ -100,6 +100,7 @@ QAction *dropTableAct; QAction *enableConstraintAct; QAction *disableConstraintAct; + QAction *testDBLinkAct; #ifdef TOEXTENDED_MYSQL toMySQLUser *UserPanel; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2008-04-01 02:27:45
|
Revision: 2658 http://tora.svn.sourceforge.net/tora/?rev=2658&view=rev Author: nneul Date: 2008-03-31 19:27:51 -0700 (Mon, 31 Mar 2008) Log Message: ----------- email addr update Modified Paths: -------------- trunk/tora/README.BINARIES trunk/tora/debian/copyright trunk/tora/rpm/tora.spec.in Modified: trunk/tora/README.BINARIES =================================================================== --- trunk/tora/README.BINARIES 2008-04-01 00:16:03 UTC (rev 2657) +++ trunk/tora/README.BINARIES 2008-04-01 02:27:51 UTC (rev 2658) @@ -5,7 +5,7 @@ Current Binary Maintainers: --------------------------- -Mandrake Cooker - Nathan Neulinger <nn...@um...> +Mandrake Cooker - Nathan Neulinger <nn...@ne...> Windows - Alexey Danilchenko <al...@da...> Modified: trunk/tora/debian/copyright =================================================================== --- trunk/tora/debian/copyright 2008-04-01 00:16:03 UTC (rev 2657) +++ trunk/tora/debian/copyright 2008-04-01 02:27:51 UTC (rev 2658) @@ -4,7 +4,7 @@ It was downloaded from http://tora.sourceforge.net/ Upstream Author: Henrik Johnson <to...@un...> - Nathan Neulinger <nn...@um...> + Nathan Neulinger <nn...@ne...> Copyright: Toolkit for Oracle is Copyright (C) 2000-2001,2001 Underscore AB Modified: trunk/tora/rpm/tora.spec.in =================================================================== --- trunk/tora/rpm/tora.spec.in 2008-04-01 00:16:03 UTC (rev 2657) +++ trunk/tora/rpm/tora.spec.in 2008-04-01 02:27:51 UTC (rev 2658) @@ -136,7 +136,7 @@ it is available as a choice in the installer. %changelog -* Mon Jun 29 2005 Nathan Neulinger <nn...@um...> +* Mon Jun 29 2005 Nathan Neulinger <nn...@ne...> - standardize on a single tora spec file %prep This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-04-01 09:44:20
|
Revision: 2662 http://tora.svn.sourceforge.net/tora/?rev=2662&view=rev Author: subik Date: 2008-04-01 02:44:08 -0700 (Tue, 01 Apr 2008) Log Message: ----------- removed obsolete config variables (confirmation from Trolltech arrived) Modified Paths: -------------- trunk/tora/ISSUES trunk/tora/src/main.cpp trunk/tora/src/toconf.h trunk/tora/src/toconfiguration.cpp trunk/tora/src/toconfiguration.h trunk/tora/src/toglobalsetting.cpp trunk/tora/src/toglobalsettingui.ui trunk/tora/src/utils.cpp Modified: trunk/tora/ISSUES =================================================================== --- trunk/tora/ISSUES 2008-04-01 06:37:17 UTC (rev 2661) +++ trunk/tora/ISSUES 2008-04-01 09:44:08 UTC (rev 2662) @@ -5,7 +5,7 @@ Crash if you click trashcan/delete-row on empty table in schema browser -New prefs code not saving anything? Showing dialog every time TOra opens +[FIXED] New prefs code not saving anything? Showing dialog every time TOra opens and not retaining default tool. Drag and drop in schema browser to copy table cells. Modified: trunk/tora/src/main.cpp =================================================================== --- trunk/tora/src/main.cpp 2008-04-01 06:37:17 UTC (rev 2661) +++ trunk/tora/src/main.cpp 2008-04-01 09:44:08 UTC (rev 2662) @@ -96,14 +96,6 @@ QCoreApplication::setOrganizationDomain("tora.sourceforge.net"); QCoreApplication::setApplicationName("TOra"); -// These vars are not useful for Qt4 anymore -// #ifdef ENABLE_QT_XFT -// toSetEnv("QT_XFT", toConfigurationSingle::Instance().QtXft()); -// #endif -// # ifndef Q_OS_WIN32 -// QApplication::setDesktopSettingsAware(toConfigurationSingle::Instance().desktopAware()); -// # endif - new QApplication(argc, argv); try @@ -125,14 +117,11 @@ qApp->installTranslator(&toadbindings); } -#ifdef ENABLE_STYLE QString style(toConfigurationSingle::Instance().style()); if (!style.isEmpty()) toSetSessionType(style); -#endif #ifndef TOMONOLITHIC - { toSplash splash(NULL, "About " TOAPPNAME, false); splash.show(); Modified: trunk/tora/src/toconf.h =================================================================== --- trunk/tora/src/toconf.h 2008-04-01 06:37:17 UTC (rev 2661) +++ trunk/tora/src/toconf.h 2008-04-01 09:44:08 UTC (rev 2662) @@ -79,11 +79,8 @@ #define DEFAULT_CACHE_DISK true #define CONF_SQL_FILE "SQLDictionary" #define DEFAULT_SQL_FILE "$HOME/.torasql" -#define CONF_DESKTOP_AWARE "DesktopAware" #define CONF_STATUS_MESSAGE "StatusMessage" #define DEFAULT_STATUS_MESSAGE "5" -#define CONF_QT_XFT "Xft" -#define DEFAULT_QT_XFT "false" #define CONF_DOCK_TOOLBAR "DockToolbar" #define CONF_DB_TITLE "DBTitle" #define CONF_SIZE_UNIT "SizeUnit" @@ -225,14 +222,6 @@ #define CONF_TOPLEVEL_DESCRIBE "ToplevelDescribe" -# ifndef Q_OS_WIN32 -// Undefining this will leave out the style selection option stuff from the program -# define ENABLE_STYLE -// Undefining this will enable choosing Qt_Xft support -# define ENABLE_QT_XFT -# endif - - // Version of TOra, must also change rpm files #ifndef TOAPPNAME # define TOAPPNAME "TOra" Modified: trunk/tora/src/toconfiguration.cpp =================================================================== --- trunk/tora/src/toconfiguration.cpp 2008-04-01 06:37:17 UTC (rev 2661) +++ trunk/tora/src/toconfiguration.cpp 2008-04-01 09:44:08 UTC (rev 2662) @@ -40,15 +40,11 @@ m_highlight = s.value(CONF_HIGHLIGHT, true).toBool(); m_keywordUpper = s.value(CONF_KEYWORD_UPPER, DEFAULT_KEYWORD_UPPER).toBool(); -// #define CONF_COLOR "KeywordColor" - m_pluginDir = s.value(CONF_PLUGIN_DIR, DEFAULT_PLUGIN_DIR).toString(); m_cacheDir = s.value(CONF_CACHE_DIR, "").toString(); m_cacheDisk = s.value(CONF_CACHE_DISK, DEFAULT_CACHE_DISK).toBool(); m_sqlFile = s.value(CONF_SQL_FILE, DEFAULT_SQL_FILE).toString(); - m_desktopAware = s.value(CONF_DESKTOP_AWARE, true).toBool(); m_statusMessage = s.value(CONF_STATUS_MESSAGE, DEFAULT_STATUS_MESSAGE).toInt(); - m_QtXft = s.value(CONF_QT_XFT, DEFAULT_QT_XFT).toString(); // #define CONF_DOCK_TOOLBAR "DockToolbar" @@ -250,9 +246,7 @@ s.setValue(CONF_CACHE_DIR, m_cacheDir); s.setValue(CONF_CACHE_DISK, m_cacheDisk); s.setValue(CONF_SQL_FILE, m_sqlFile); - s.setValue(CONF_DESKTOP_AWARE, m_desktopAware); s.setValue(CONF_STATUS_MESSAGE, m_statusMessage); - s.setValue(CONF_QT_XFT, m_QtXft); s.setValue(CONF_DB_TITLE, m_dbTitle); s.setValue(CONF_SIZE_UNIT, m_sizeUnit); s.setValue(CONF_HELP_PATH, m_helpPath); Modified: trunk/tora/src/toconfiguration.h =================================================================== --- trunk/tora/src/toconfiguration.h 2008-04-01 06:37:17 UTC (rev 2661) +++ trunk/tora/src/toconfiguration.h 2008-04-01 09:44:08 UTC (rev 2662) @@ -338,15 +338,6 @@ m_sqlFile = v; }; - bool desktopAware() - { - return m_desktopAware; - }; - void setDesktopAware(bool v) - { - m_desktopAware = v; - }; - int statusMessage() { return m_statusMessage; @@ -356,17 +347,6 @@ m_statusMessage = v; }; - /*! \brief This property is handled as string "true"/"false" values - due the ENV settings (set env = "foo") */ - QString QtXft() - { - return m_QtXft; - }; - void setQtXft(const QString & v) - { - m_QtXft = v; - }; - bool dbTitle() { return m_dbTitle; @@ -1272,9 +1252,7 @@ QString m_cacheDir; bool m_cacheDisk; QString m_sqlFile; - bool m_desktopAware; int m_statusMessage; - QString m_QtXft; bool m_dbTitle; QString m_sizeUnit; QString m_helpPath; Modified: trunk/tora/src/toglobalsetting.cpp =================================================================== --- trunk/tora/src/toglobalsetting.cpp 2008-04-01 06:37:17 UTC (rev 2661) +++ trunk/tora/src/toglobalsetting.cpp 2008-04-01 09:44:08 UTC (rev 2662) @@ -74,7 +74,6 @@ setupUi(this); SavePassword->setChecked(toConfigurationSingle::Instance().savePassword()); - DesktopAware->setChecked(toConfigurationSingle::Instance().desktopAware()); ToolsLeft->setChecked(toConfigurationSingle::Instance().toolsLeft()); toRefreshCreate(OptionGroup, TO_TOOLBAR_WIDGET_NAME, QString::null, Refresh); DefaultSession->setText(toConfigurationSingle::Instance().defaultSession()); @@ -112,16 +111,6 @@ else if (typ == "MB") SizeUnit->setCurrentIndex(2); -#ifdef ENABLE_QT_XFT - - AntialiaseFonts->setChecked(toConfigurationSingle::Instance().QtXft() != "false"); -#else - - AntialiaseFonts->hide(); -#endif - -#ifdef ENABLE_STYLE - Style->addItems(toGetSessionTypes()); QString str = toGetSessionType(); for (int i = 0;i < Style->count();i++) @@ -132,10 +121,6 @@ break; } } -#else - Style->hide(); - StyleLabel->hide(); -#endif #ifdef Q_OS_WIN32 DesktopAware->hide(); @@ -212,7 +197,6 @@ toConfigurationSingle::Instance().setDefaultSession(DefaultSession->text()); toConfigurationSingle::Instance().setRefresh(Refresh->currentText()); toConfigurationSingle::Instance().setSavePassword(SavePassword->isChecked()); - toConfigurationSingle::Instance().setDesktopAware(DesktopAware->isChecked()); toConfigurationSingle::Instance().setStatusMessage(Status->value()); toConfigurationSingle::Instance().setStatusSave(HistorySize->value()); toConfigurationSingle::Instance().setChartSamples(ChartSamples->value()); @@ -228,13 +212,8 @@ toConfigurationSingle::Instance().setSizeUnit(SizeUnit->currentText()); toConfigurationSingle::Instance().setHelpPath(HelpDirectory->text()); -#ifdef ENABLE_STYLE toConfigurationSingle::Instance().setStyle(Style->currentText()); toSetSessionType(Style->currentText()); -#endif -#ifdef ENABLE_QT_XFT - toConfigurationSingle::Instance().setQtXft(AntialiaseFonts->isChecked() ? "true" : "false"); -#endif if (AllSamples->isChecked()) toConfigurationSingle::Instance().setDisplaySamples(-1); Modified: trunk/tora/src/toglobalsettingui.ui =================================================================== --- trunk/tora/src/toglobalsettingui.ui 2008-04-01 06:37:17 UTC (rev 2661) +++ trunk/tora/src/toglobalsettingui.ui 2008-04-01 09:44:08 UTC (rev 2662) @@ -5,8 +5,8 @@ <rect> <x>0</x> <y>0</y> - <width>733</width> - <height>629</height> + <width>785</width> + <height>652</height> </rect> </property> <property name="windowTitle" > @@ -14,7 +14,7 @@ </property> <layout class="QGridLayout" > <property name="margin" > - <number>11</number> + <number>9</number> </property> <property name="spacing" > <number>6</number> @@ -168,11 +168,61 @@ </property> <layout class="QGridLayout" > <property name="margin" > - <number>11</number> + <number>9</number> </property> <property name="spacing" > <number>6</number> </property> + <item row="3" column="1" colspan="2" > + <widget class="QCheckBox" name="DiskCaching" > + <property name="toolTip" > + <string>Use Disk Caching of ObjectLists and Synonyms</string> + </property> + <property name="text" > + <string>Use Disk Caching</string> + </property> + </widget> + </item> + <item row="4" column="0" > + <widget class="QCheckBox" name="DockToolbar" > + <property name="toolTip" > + <string>Check this if docks are to use toolbars instead of normal frames.</string> + </property> + <property name="text" > + <string>Docks use toolbars</string> + </property> + </widget> + </item> + <item row="4" column="5" > + <widget class="QCheckBox" name="AllSamples" > + <property name="toolTip" > + <string>Display all available samples</string> + </property> + <property name="text" > + <string>All</string> + </property> + </widget> + </item> + <item row="4" column="1" colspan="2" > + <widget class="QCheckBox" name="DisplayGrid" > + <property name="toolTip" > + <string>Show grid lines in output results table.</string> + </property> + <property name="text" > + <string>Display gridlines in results</string> + </property> + </widget> + </item> + <item row="2" column="1" colspan="2" > + <widget class="QCheckBox" name="ToolsLeft" > + <property name="toolTip" > + <string>Start using the tools toolbar on the left of the main window instead of at the top.</string> + </property> + <property name="text" > + <string>Tools toolbar on left</string> + </property> + </widget> + </item> <item row="1" column="0" > <widget class="QCheckBox" name="SavePassword" > <property name="toolTip" > @@ -292,16 +342,6 @@ </property> </widget> </item> - <item row="3" column="1" colspan="2" > - <widget class="QCheckBox" name="ToolsLeft" > - <property name="toolTip" > - <string>Start using the tools toolbar on the left of the main window instead of at the top.</string> - </property> - <property name="text" > - <string>Tools toolbar on left</string> - </property> - </widget> - </item> <item row="3" column="0" > <widget class="QCheckBox" name="RestoreSession" > <property name="text" > @@ -309,36 +349,6 @@ </property> </widget> </item> - <item row="4" column="0" > - <widget class="QCheckBox" name="DesktopAware" > - <property name="toolTip" > - <string>Colors get really weird in KDE if you select this.</string> - </property> - <property name="text" > - <string>&Desktop aware</string> - </property> - </widget> - </item> - <item row="5" column="0" > - <widget class="QCheckBox" name="AntialiaseFonts" > - <property name="toolTip" > - <string>Use antialiase fonts if Qt supports this. You need to restart for this to take affect.</string> - </property> - <property name="text" > - <string>&Antialiase fonts</string> - </property> - </widget> - </item> - <item row="6" column="0" > - <widget class="QCheckBox" name="DockToolbar" > - <property name="toolTip" > - <string>Check this if docks are to use toolbars instead of normal frames.</string> - </property> - <property name="text" > - <string>Docks use toolbars</string> - </property> - </widget> - </item> <item row="8" column="3" > <widget class="QLabel" name="StyleLabel" > <property name="toolTip" > @@ -508,26 +518,6 @@ </property> </widget> </item> - <item row="4" column="5" > - <widget class="QCheckBox" name="AllSamples" > - <property name="toolTip" > - <string>Display all available samples</string> - </property> - <property name="text" > - <string>All</string> - </property> - </widget> - </item> - <item row="4" column="1" colspan="2" > - <widget class="QCheckBox" name="DiskCaching" > - <property name="toolTip" > - <string>Use Disk Caching of ObjectLists and Synonyms</string> - </property> - <property name="text" > - <string>Use Disk Caching</string> - </property> - </widget> - </item> <item row="8" column="1" > <widget class="QLabel" name="LocaleLabel" > <property name="sizePolicy" > @@ -561,26 +551,6 @@ </property> </widget> </item> - <item row="6" column="1" colspan="2" > - <widget class="QCheckBox" name="DisplayGrid" > - <property name="toolTip" > - <string>Show grid lines in output results table.</string> - </property> - <property name="text" > - <string>Display gridlines in results</string> - </property> - </widget> - </item> - <item row="7" column="1" colspan="2" > - <widget class="QCheckBox" name="ToadBindings" > - <property name="toolTip" > - <string>Use TOAD keybindings instead of classic TOra.</string> - </property> - <property name="text" > - <string>Prefer TOAD key bindings</string> - </property> - </widget> - </item> <item row="9" column="0" colspan="6" > <layout class="QHBoxLayout" > <property name="margin" > @@ -618,6 +588,16 @@ </item> </layout> </item> + <item row="5" column="0" colspan="2" > + <widget class="QCheckBox" name="ToadBindings" > + <property name="toolTip" > + <string>Use TOAD keybindings instead of classic TOra.</string> + </property> + <property name="text" > + <string>Prefer TOAD key bindings</string> + </property> + </widget> + </item> </layout> </widget> </item> @@ -638,8 +618,6 @@ <tabstop>SavePassword</tabstop> <tabstop>IncludeDB</tabstop> <tabstop>RestoreSession</tabstop> - <tabstop>DesktopAware</tabstop> - <tabstop>AntialiaseFonts</tabstop> <tabstop>DockToolbar</tabstop> <tabstop>Statusbar</tabstop> <tabstop>ToolsLeft</tabstop> Modified: trunk/tora/src/utils.cpp =================================================================== --- trunk/tora/src/utils.cpp 2008-04-01 06:37:17 UTC (rev 2661) +++ trunk/tora/src/utils.cpp 2008-04-01 09:44:08 UTC (rev 2662) @@ -72,7 +72,10 @@ #include <QFileDialog> #include <QDockWidget> #include <QTextStream> +#include <QStyleFactory> +#include <QStyle> + #ifdef Q_OS_WIN32 # include "windows/cregistry.h" # include "windows.h" @@ -399,11 +402,6 @@ return QString(str.data(), str.length()); } -// Why is this optional? -#ifdef ENABLE_STYLE -# include <qstylefactory.h> -# include <qstyle.h> - QStringList toGetSessionTypes(void) { return QStyleFactory::keys(); @@ -443,7 +441,6 @@ else toStatusMessage(qApp->translate("toSetSessionType", "Failed to find style %1").arg(str)); } -#endif QToolBar *toAllocBar(QWidget *parent, const QString &str) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-04-16 09:32:41
|
Revision: 2711 http://tora.svn.sourceforge.net/tora/?rev=2711&view=rev Author: subik Date: 2008-04-16 02:32:45 -0700 (Wed, 16 Apr 2008) Log Message: ----------- Project templates readed correctly. Modified Paths: -------------- trunk/tora/CMakeLists.txt trunk/tora/README.CMAKE trunk/tora/doc/help/CMakeLists.txt trunk/tora/doc/help/images/CMakeLists.txt trunk/tora/src/main.cpp trunk/tora/src/totemplate.cpp trunk/tora/src/utils.cpp trunk/tora/src/utils.h Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-04-16 08:45:27 UTC (rev 2710) +++ trunk/tora/CMakeLists.txt 2008-04-16 09:32:45 UTC (rev 2711) @@ -41,11 +41,21 @@ #Set the permissions to be used when installing plugins SET(PLUGIN_PERMISSIONS WORLD_EXECUTE GROUP_EXECUTE OWNER_EXECUTE WORLD_READ GROUP_READ OWNER_READ OWNER_WRITE) -SET (DEFAULT_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/lib/tora") -ADD_DEFINITIONS("-DDEFAULT_PLUGIN_DIR=\\\"${DEFAULT_PLUGIN_DIR}\\\"") +if (NOT TORA_PLUGIN_DIR) + SET (TORA_PLUGIN_DIR "${CMAKE_INSTALL_PREFIX}/share/tora/") +endif (NOT TORA_PLUGIN_DIR) +ADD_DEFINITIONS("-DDEFAULT_PLUGIN_DIR=\\\"${TORA_PLUGIN_DIR}\\\"") +if (NOT TORA_DOC_DIR) + SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/tora/") # it would be pain for upgrade configs -${VERSION}/") +endif (NOT TORA_DOC_DIR) +if (NOT TORA_HELP_DIR) + SET (TORA_HELP_DIR "${TORA_PLUGIN_DIR}/help/") +endif (NOT TORA_HELP_DIR) +ADD_DEFINITIONS("-DTORA_HELP_DIR=\\\"${TORA_HELP_DIR}\\\"") + ############################################################################################################## ########## check for the CPU we build for ########## @@ -268,5 +278,5 @@ README.SVN README.WINDOWS TODO - DESTINATION ${DEFAULT_PLUGIN_DIR} + DESTINATION ${TORA_DOC_DIR} ) Modified: trunk/tora/README.CMAKE =================================================================== --- trunk/tora/README.CMAKE 2008-04-16 08:45:27 UTC (rev 2710) +++ trunk/tora/README.CMAKE 2008-04-16 09:32:45 UTC (rev 2711) @@ -14,6 +14,8 @@ Cmake installs TOra into /usr/local as default. You can change it for your location: -DCMAKE_INSTALL_PREFIX:PATH=/home/username/toradevelopment +If you want to set special paths for help files or whatever see +"Paths for installation" below. Note for Windows: if you don't specify install prefix, you can get compile-time errorrs in some cases. It looks like some MSVC @@ -46,3 +48,22 @@ Search following for more info: http://cmake.org http://docs.scribus.net/index.php?lang=en&page=install4 + + +Paths for installation +The base install prefix is set with -DCMAKE_INSTALL_PREFIX (see above). +You can specify installation of additional files with some variables. +Changing these variables will affects TOra compilation too. +List of the settings: +-DTORA_PLUGIN_DIR=path + It sets the path for functionality addons (binary plugins (if it's + used) or template description files etc.) + The default value is CMAKE_INSTALL_PREFIX/share/tora +-DTORA_DOC_DIR=path + It sets the path for basic system-wide documentation fles (README, + AUTHORS, LICENSE etc.). It is not read by anybody propably but it's + pretty standard for Linux packages ;) + The default value is CMAKE_INSTALL_PREFIX/share/doc/tora +-DTORA_HELP_DIR=path + It sets the location of help files (manual and API docs). + The default value is TORA_PLUGIN_DIR/help Modified: trunk/tora/doc/help/CMakeLists.txt =================================================================== --- trunk/tora/doc/help/CMakeLists.txt 2008-04-16 08:45:27 UTC (rev 2710) +++ trunk/tora/doc/help/CMakeLists.txt 2008-04-16 09:32:45 UTC (rev 2711) @@ -5,8 +5,8 @@ INSTALL(FILES ${TORA_DOC_FILES} DESTINATION help/) INSTALL(FILES ${TORA_API_FILES} DESTINATION help/api/) ELSE (WIN32) - INSTALL(FILES ${TORA_DOC_FILES} DESTINATION ${DEFAULT_PLUGIN_DIR}/help/) - INSTALL(FILES ${TORA_API_FILES} DESTINATION ${DEFAULT_PLUGIN_DIR}/help/api/) + INSTALL(FILES ${TORA_DOC_FILES} DESTINATION ${TORA_HELP_DIR}) + INSTALL(FILES ${TORA_API_FILES} DESTINATION ${TORA_HELP_DIR}/api/) ENDIF (WIN32) SUBDIRS(images) Modified: trunk/tora/doc/help/images/CMakeLists.txt =================================================================== --- trunk/tora/doc/help/images/CMakeLists.txt 2008-04-16 08:45:27 UTC (rev 2710) +++ trunk/tora/doc/help/images/CMakeLists.txt 2008-04-16 09:32:45 UTC (rev 2711) @@ -1,2 +1,2 @@ FILE( GLOB TORA_DOC_IMAGES *.png ) -INSTALL(FILES ${TORA_DOC_IMAGES} DESTINATION ${DEFAULT_PLUGIN_DIR}/help/images/) +INSTALL(FILES ${TORA_DOC_IMAGES} DESTINATION ${TORA_HELP_DIR}/images/) Modified: trunk/tora/src/main.cpp =================================================================== --- trunk/tora/src/main.cpp 2008-04-16 08:45:27 UTC (rev 2710) +++ trunk/tora/src/main.cpp 2008-04-16 09:32:45 UTC (rev 2711) @@ -101,7 +101,7 @@ // qApp->setDefaultCodec(QTextCodec::codecForName(getenv("LANG"))); QTranslator torats(0); - torats.load(toPluginPath() + "/" + QString("tora_") + toConfigurationSingle::Instance().locale(), "."); + torats.load(toConfigurationSingle::Instance().pluginDir()/*toPluginPath()*/ + "/" + QString("tora_") + toConfigurationSingle::Instance().locale(), "."); qApp->installTranslator(&torats); QTranslator toadbindings(0); if (toConfigurationSingle::Instance().toadBindings()) @@ -109,7 +109,7 @@ // qt4 - hot candidate for a builtin resource // if (!toadbindings.load(tora_toad, sizeof(tora_toad))) // printf("Internal error, couldn't load TOAD bindings"); - toadbindings.load(toPluginPath() + "/" + "tora_toad.qm"); + toadbindings.load(toConfigurationSingle::Instance().pluginDir()/*toPluginPath()*/ + "/" + "tora_toad.qm"); qApp->installTranslator(&toadbindings); } @@ -122,7 +122,7 @@ toSplash splash(NULL, "About " TOAPPNAME, false); splash.show(); std::list<QString> failed; - QString dirPath = toPluginPath(); + QString dirPath = toConfigurationSingle::Instance().pluginDir();/*toPluginPath()*/; QDir d(dirPath, QString::fromLatin1("*.tso"), QDir::Name, QDir::Files); if (!d.exists()) { Modified: trunk/tora/src/totemplate.cpp =================================================================== --- trunk/tora/src/totemplate.cpp 2008-04-16 08:45:27 UTC (rev 2710) +++ trunk/tora/src/totemplate.cpp 2008-04-16 09:32:45 UTC (rev 2711) @@ -66,17 +66,13 @@ static std::map<QString, QString> DefaultText(void) { std::map<QString, QString> def; - QString file = toPluginPath(); + QString file(toConfigurationSingle::Instance().pluginDir()); //toPluginPath(); #if !defined(TO_NO_ORACLE) file += QString::fromLatin1("/sqlfunctions.tpl"); - def["PL/SQL Functions"] = file; - file = toPluginPath(); - file += QString::fromLatin1("/hints.tpl"); - def["Optimizer Hints"] = file; - file = toPluginPath(); - file += QString::fromLatin1("/log4plsql.tpl"); - def["Log4PL/SQL"] = file; + def["PL/SQL Functions"] = file + "/sqlfunctions.tpl"; + def["Optimizer Hints"] = file + "/hints.tpl"; + def["Log4PL/SQL"] = file + "/log4plsql.tpl"; #endif return def; Modified: trunk/tora/src/utils.cpp =================================================================== --- trunk/tora/src/utils.cpp 2008-04-16 08:45:27 UTC (rev 2710) +++ trunk/tora/src/utils.cpp 2008-04-16 09:32:45 UTC (rev 2711) @@ -527,81 +527,81 @@ return 1; } -QString toPluginPath(void) -{ - QString str; +// QString toPluginPath(void) +// { +// QString str; +// +// #ifdef Q_OS_WIN32 +// +// CRegistry registry; +// DWORD siz = 1024; +// char buffer[1024]; +// +// try +// { +// if (registry.GetStringValue(HKEY_LOCAL_MACHINE, +// "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\TOra", +// "UninstallString", +// buffer, siz)) +// { +// if (siz > 0) +// { +// str = buffer; +// static QRegExp findQuotes("\"([^\"]*)\""); +// if (findQuotes.indexIn(str) >= 0) +// str = findQuotes.cap(1); +// int ind = str.lastIndexOf('\\'); +// if (ind >= 0) +// str = str.mid(0, ind); +// str += "\\templates"; +// } +// } +// } +// catch (...) +// {} +// +// #elif defined( Q_OS_MACX ) +// { +// // MacOS +// char resourcePath[MAXPATHLEN]; +// memset( &resourcePath[0], 0, MAXPATHLEN ); +// CFBundleRef appBundle = ::CFBundleGetMainBundle(); +// if ( appBundle ) +// { +// CFURLRef urlRef = CFBundleCopyResourcesDirectoryURL( appBundle ); +// if ( urlRef ) +// { +// UInt8* _p = (UInt8*) & resourcePath[0]; +// bool isOK = CFURLGetFileSystemRepresentation( +// urlRef, TRUE, _p, MAXPATHLEN ); +// if ( !isOK ) +// { +// // QMessageBox::warning( 0, "File error", +// // QString( "Unexpected: no file system representation") ); +// } +// } +// else +// { +// // QMessageBox::warning( 0, "File error", +// // QString( "Unexpected: unable to get resource directory") ); +// } +// CFRelease( urlRef ); +// str = &resourcePath[0]; +// } +// else +// { +// // QMessageBox::warning( 0, "File error", +// // QString( "Unexpected: unable to get main bundle") ); +// } +// } // MacOS +// +// #else +// str = toConfigurationSingle::Instance().pluginDir(); +// #endif +// +// return str; +// } -#ifdef Q_OS_WIN32 - - CRegistry registry; - DWORD siz = 1024; - char buffer[1024]; - - try - { - if (registry.GetStringValue(HKEY_LOCAL_MACHINE, - "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\TOra", - "UninstallString", - buffer, siz)) - { - if (siz > 0) - { - str = buffer; - static QRegExp findQuotes("\"([^\"]*)\""); - if (findQuotes.indexIn(str) >= 0) - str = findQuotes.cap(1); - int ind = str.lastIndexOf('\\'); - if (ind >= 0) - str = str.mid(0, ind); - str += "\\templates"; - } - } - } - catch (...) - {} - -#elif defined( Q_OS_MACX ) - { - // MacOS - char resourcePath[MAXPATHLEN]; - memset( &resourcePath[0], 0, MAXPATHLEN ); - CFBundleRef appBundle = ::CFBundleGetMainBundle(); - if ( appBundle ) - { - CFURLRef urlRef = CFBundleCopyResourcesDirectoryURL( appBundle ); - if ( urlRef ) - { - UInt8* _p = (UInt8*) & resourcePath[0]; - bool isOK = CFURLGetFileSystemRepresentation( - urlRef, TRUE, _p, MAXPATHLEN ); - if ( !isOK ) - { - // QMessageBox::warning( 0, "File error", - // QString( "Unexpected: no file system representation") ); - } - } - else - { - // QMessageBox::warning( 0, "File error", - // QString( "Unexpected: unable to get resource directory") ); - } - CFRelease( urlRef ); - str = &resourcePath[0]; - } - else - { - // QMessageBox::warning( 0, "File error", - // QString( "Unexpected: unable to get main bundle") ); - } - } // MacOS - -#else - str = toConfigurationSingle::Instance().pluginDir(); -#endif - - return str; -} - // QString toHelpPath(void) // { // QString str = toConfigurationSingle::Instance().helpPath(); Modified: trunk/tora/src/utils.h =================================================================== --- trunk/tora/src/utils.h 2008-04-16 08:45:27 UTC (rev 2710) +++ trunk/tora/src/utils.h 2008-04-16 09:32:45 UTC (rev 2711) @@ -301,7 +301,7 @@ * target on windows). * @return String containing directory */ -QString toPluginPath(void); +// QString toPluginPath(void); /** Get a brush for a chart item. * @param index Indicating which chart item to get color for. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-04-19 21:06:53
|
Revision: 2720 http://tora.svn.sourceforge.net/tora/?rev=2720&view=rev Author: mrjohnson0 Date: 2008-04-19 14:06:59 -0700 (Sat, 19 Apr 2008) Log Message: ----------- everything uses src directory Modified Paths: -------------- trunk/tora/Makefile.am trunk/tora/configure.ac trunk/tora/src/Makefile.am Removed Paths: ------------- trunk/tora/ext/ Modified: trunk/tora/Makefile.am =================================================================== --- trunk/tora/Makefile.am 2008-04-19 20:25:02 UTC (rev 2719) +++ trunk/tora/Makefile.am 2008-04-19 21:06:59 UTC (rev 2720) @@ -20,4 +20,4 @@ dist-hook: rm -rf `find $(distdir) -name .svn` -SUBDIRS = utils src ext test doc +SUBDIRS = utils src test doc Modified: trunk/tora/configure.ac =================================================================== --- trunk/tora/configure.ac 2008-04-19 20:25:02 UTC (rev 2719) +++ trunk/tora/configure.ac 2008-04-19 21:06:59 UTC (rev 2720) @@ -28,7 +28,7 @@ fi # Checks for header files. # AC_HEADER_STDC -AC_CHECK_HEADERS(unistd.h sys/param.h sys/time.h time.h sys/mkdev.h sys/sysmacros.h string.h memory.h fcntl.h dirent.h sys/ndir.h ndir.h alloca.h locale.h utime.h) +AC_CHECK_HEADERS(unistd.h sys/param.h sys/time.h time.h sys/mkdev.h sys/sysmacros.h string.h memory.h fcntl.h dirent.h sys/ndir.h ndir.h alloca.h locale.h utime.h postgresql/libpq-fe.h) AC_HEADER_MAJOR AC_FUNC_ALLOCA AC_FUNC_MALLOC @@ -60,7 +60,6 @@ AC_CONFIG_FILES([src/Makefile]) AC_CONFIG_FILES([test/Makefile]) AC_CONFIG_FILES([test/configuration/Makefile]) -AC_CONFIG_FILES([ext/Makefile]) AC_CONFIG_FILES([doc/Makefile]) AC_CONFIG_FILES([doc/help/Makefile]) AC_CONFIG_FILES([rpm/tora.spec]) Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2008-04-19 20:25:02 UTC (rev 2719) +++ trunk/tora/src/Makefile.am 2008-04-19 21:06:59 UTC (rev 2720) @@ -14,7 +14,7 @@ LOKIDIR_INC=$(top_srcdir)/src/loki/include LOKIDIR_SRC=$(top_srcdir)/src/loki/src -AM_CPPFLAGS = -I$(top_srcdir)/ext/otl -I$(LOKIDIR_INC) $(KDE_INCLUDES) $(QT_INCLUDES) $(LTDLINCL) +AM_CPPFLAGS = -I./otl -I$(LOKIDIR_INC) $(KDE_INCLUDES) $(QT_INCLUDES) $(LTDLINCL) AM_CPPFLAGS += $(PCRE_CFLAGS) \ -DDEFAULT_PLUGIN_DIR=\"$(libdir)\" \ -DTOVERSION=\"$(PACKAGE_VERSION)\" \ @@ -48,7 +48,7 @@ if HAVE_ORACLE EXTRA_ORACLE_MONO_SOURCE = tooracleconnection.cpp tooraclesetting.h \ - tooracleextract.cpp + tooracleextract.cpp otl/otlv4.h EXTRA_ORACLE_MONO_SOURCE_MOC = moc_tooraclesetting.cpp endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-04-29 13:55:46
|
Revision: 2736 http://tora.svn.sourceforge.net/tora/?rev=2736&view=rev Author: subik Date: 2008-04-29 06:54:47 -0700 (Tue, 29 Apr 2008) Log Message: ----------- fixed: QAction::eventFilter: Ambiguous shortcut overload: F3 - use F6 for explain plan; fixed: Search Next (F3) is working again Modified Paths: -------------- trunk/tora/ISSUES trunk/tora/src/tomain.cpp trunk/tora/src/toworksheet.cpp Modified: trunk/tora/ISSUES =================================================================== --- trunk/tora/ISSUES 2008-04-29 12:36:29 UTC (rev 2735) +++ trunk/tora/ISSUES 2008-04-29 13:54:47 UTC (rev 2736) @@ -12,9 +12,6 @@ <ERROR>SELECT TO_CHAR(SYSDATE) FROM sys.DUAL propably used as "keep session alive" (?) -Explain Plan shortcut prints to stdout: -QAction::eventFilter: Ambiguous shortcut overload: F3 - Clicking on either of the "sql bookmark" toolbar icons instantly crashes tora. Batch(script) run in SQL Editor. See: @@ -44,6 +41,10 @@ Resolved Issues --------------- +[FIXED] Explain Plan shortcut prints to stdout: +QAction::eventFilter: Ambiguous shortcut overload: F3 + - explain plan mode uses F6 now. F3 (search next) is working again. + [Mike] Storage manager functionality [DONE - some issues can be found by testing of course] [Petr] Completion of conversion to use QSettings Modified: trunk/tora/src/tomain.cpp =================================================================== --- trunk/tora/src/tomain.cpp 2008-04-29 12:36:29 UTC (rev 2735) +++ trunk/tora/src/tomain.cpp 2008-04-29 13:54:47 UTC (rev 2736) @@ -890,6 +890,13 @@ Search = new toSearchReplace(this); Search->show(); } + else if (action == searchNextAct) + { + if (Search) + Search->searchNext(); + else + searchReplaceAct->activate(QAction::Trigger); + } else if (action == openAct) edit->editOpen(); else if (action == saveAsAct) Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-04-29 12:36:29 UTC (rev 2735) +++ trunk/tora/src/toworksheet.cpp 2008-04-29 13:54:47 UTC (rev 2736) @@ -266,7 +266,7 @@ explainAct = new QAction(QPixmap(const_cast<const char**>(explainplan_xpm)), tr("Explain plan of current statement"), this); - explainAct->setShortcut(Qt::Key_F3); + explainAct->setShortcut(Qt::Key_F6); connect(explainAct, SIGNAL(triggered()), this, SLOT(explainPlan(void))); stopAct = new QAction(QPixmap(const_cast<const char**>(stop_xpm)), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-05-03 21:08:14
|
Revision: 2741 http://tora.svn.sourceforge.net/tora/?rev=2741&view=rev Author: mrjohnson0 Date: 2008-05-03 14:08:09 -0700 (Sat, 03 May 2008) Log Message: ----------- favor finding qt4 tools, compile qrc into tora Modified Paths: -------------- trunk/tora/config/m4/qtkde.m4 trunk/tora/src/Makefile.am Modified: trunk/tora/config/m4/qtkde.m4 =================================================================== --- trunk/tora/config/m4/qtkde.m4 2008-05-03 20:24:08 UTC (rev 2740) +++ trunk/tora/config/m4/qtkde.m4 2008-05-03 21:08:09 UTC (rev 2741) @@ -856,6 +856,18 @@ ]) ]) +AC_DEFUN([KDE_RCC_ERROR_MESSAGE], +[ + AC_MSG_ERROR([No Qt resource compiler (rcc) found! +Please check whether you installed Qt correctly. +You need to have a running rcc binary. +configure tried to run $ac_cv_path_rcc and the test didn't +succeed. If configure shouldn't have tried this one, set +the environment variable RCC to the right one before running +configure. +]) +]) + AC_DEFUN([KDE_UIC_ERROR_MESSAGE], [ AC_MSG_WARN([No Qt ui compiler (uic) found! @@ -944,6 +956,7 @@ KDE_FIND_PATH(lrelease, LRELEASE, [$qt_bindirs], [KDE_LRELEASE_ERROR_MESSAGE]) KDE_FIND_PATH(lupdate, LUPDATE, [$qt_bindirs], [KDE_LUPDATE_ERROR_MESSAGE]) + KDE_FIND_PATH(rcc, RCC, [$qt_bindirs], [KDE_RCC_ERROR_MESSAGE]) KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE]) if test -z "$UIC_NOT_NEEDED"; then @@ -971,6 +984,7 @@ AC_SUBST(LUPDATE) AC_SUBST(MOC) AC_SUBST(UIC) + AC_SUBST(RCC) ]) AC_DEFUN([KDE_MISC_TESTS], @@ -1202,32 +1216,45 @@ AC_CACHE_VAL(kde_cv_path_$kde_cache, [ kde_cv_path="NONE" - dirs="$3" - kde_save_IFS=$IFS - IFS=':' - for dir in $PATH; do - dirs="$dirs $dir" + dirs="$3" + kde_save_IFS=$IFS + IFS=':' + for dir in $PATH; do + dirs="$dirs $dir" done - dnl add qtdir/bin, because not everybody will have this in PATH - dnl also, set it to be checked first. if the user has qtdir, then we - dnl should try that binary first - dirs="$QTDIR/bin $dirs" + dnl add qtdir/bin, because not everybody will have this in PATH + dnl also, set it to be checked first. if the user has qtdir, then we + dnl should try that binary first + dirs="$QTDIR/bin $dirs" - IFS=$kde_save_IFS + IFS=$kde_save_IFS - for dir in $dirs; do - if test -x "$dir/$1${EXEEXT}"; then - if test -n "$5"; then - evalstr="$dir/$1 $5 2>&1 " - if eval $evalstr; then - kde_cv_path="$dir/$1" + dnl look for qt4 binaries + exts="-4 + -qt4" + + found=no + for ext in $exts ""; do + for dir in $dirs; do + if test -x "$dir/$1${ext}${EXEEXT}"; then + if test -n "$5"; then + evalstr="$dir/$1${ext} $5 2>&1 " + if eval $evalstr; then + kde_cv_path="$dir/$1${ext}" + found=yes + break + fi + else + kde_cv_path="$dir/$1${ext}" + found=yes break fi - else - kde_cv_path="$dir/$1" - break fi + done + + if test $found = yes; then + break fi done Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2008-05-03 20:24:08 UTC (rev 2740) +++ trunk/tora/src/Makefile.am 2008-05-03 21:08:09 UTC (rev 2741) @@ -237,7 +237,8 @@ toqvalue.h \ toresultresources.h \ $(TRANSLATIONS) \ - LICENSE.h + LICENSE.h \ + tora.qrc # this is a hack (but it *is* mentioned in the automake manual, of all # places). EXTRA_DIST includes all files, even things like CVS @@ -391,7 +392,8 @@ ui_tohelpui.h \ $(EXTRA_ORACLE_MONO_SOURCE_MOC) \ $(filter %.qm,$(TRANSLATIONS:%.ts=%.qm)) \ - tora_toad.h + tora_toad.h \ + qrc_tora.cpp #.ui.h: # $(UIC) -o $@ $< This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-05-22 12:11:01
|
Revision: 2788 http://tora.svn.sourceforge.net/tora/?rev=2788&view=rev Author: subik Date: 2008-05-22 05:10:22 -0700 (Thu, 22 May 2008) Log Message: ----------- Error warning dialogs aren't modal anymore. Modified Paths: -------------- trunk/tora/ISSUES trunk/tora/src/CMakeLists.txt trunk/tora/src/Makefile.am trunk/tora/src/tomain.cpp trunk/tora/src/tomain.h trunk/tora/src/tomessageui.ui Modified: trunk/tora/ISSUES =================================================================== --- trunk/tora/ISSUES 2008-05-22 05:47:08 UTC (rev 2787) +++ trunk/tora/ISSUES 2008-05-22 12:10:22 UTC (rev 2788) @@ -33,16 +33,11 @@ - Create table/create index isn't working in the Schema Browser. - MIGRATE extraction doesn't work (and I suppose it never did) -[FIXED - is it suitable?] "Waiting..." shows up in right pane in schema browser until you click on a table name also stays up if no tables in schema. - When switching in schema browser from looking at columns of a table to a schema with no tables, the column list never gets cleared. It stays as the column list from the original table. ">|" arrow on schema browser view just scrolls to bottom of display instead of reading all rows as it used to. -Error warning dialogs are modal, and have to be closed in the right order. Ideally - would like to see the error popups -be a single window, something in the style of the javascript error console in firefox perhaps? - MySQL: numerous crashes in schema browser - running under gdb hides a lot of these unfortunately... has been stable Oracle: error "result should be 18 in segment attributes was 2" in toExtract on Script tab @@ -110,3 +105,10 @@ the selected text to be pasted at the end of the entry area as if you middle-clicked. Picture normal behavior of selecting it all to copy it, then single clicking to unselect it and move to something else... + +[FIXED - is it suitable?] "Waiting..." shows up in right pane in schema browser +until you click on a table name also stays up if no tables in schema. + +[RESOLVED - see toMessage class and its comments - I faced a real DoS flooding by this dialog today - Petr] +Error warning dialogs are modal, and have to be closed in the right order. Ideally - would like to see the error popups +be a single window, something in the style of the javascript error console in firefox perhaps? \ No newline at end of file Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-05-22 05:47:08 UTC (rev 2787) +++ trunk/tora/src/CMakeLists.txt 2008-05-22 12:10:22 UTC (rev 2788) @@ -115,6 +115,7 @@ # tomainwindow.kde.h tomarkedtext.h tomemoeditor.h + tomessage.h # tomysqlkeywords.h tonewconnection.h # tonoblockquery.h @@ -241,6 +242,7 @@ tomainwindow.cpp tomarkedtext.cpp tomemoeditor.cpp + tomessage.cpp tonewconnection.cpp tonoblockquery.cpp #win only? toocistub.cpp Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2008-05-22 05:47:08 UTC (rev 2787) +++ trunk/tora/src/Makefile.am 2008-05-22 12:10:22 UTC (rev 2788) @@ -78,6 +78,7 @@ tomain.cpp tomain.h \ tomarkedtext.cpp tomarkedtext.h \ tomemoeditor.cpp tomemoeditor.h \ + tomessage.cpp tomessage.h \ tonewconnection.cpp tonewconnection.h \ tonoblockquery.cpp tonoblockquery.h \ toeventquery.cpp toeventquery.h \ @@ -292,6 +293,7 @@ moc_tomainwindow.cpp \ moc_tomarkedtext.cpp \ moc_tomemoeditor.cpp \ + moc_tomessage.cpp \ moc_tonewconnection.cpp \ moc_tooutput.cpp \ moc_toparamget.cpp \ Modified: trunk/tora/src/tomain.cpp =================================================================== --- trunk/tora/src/tomain.cpp 2008-05-22 05:47:08 UTC (rev 2787) +++ trunk/tora/src/tomain.cpp 2008-05-22 12:10:22 UTC (rev 2788) @@ -52,6 +52,7 @@ #include "tosearchreplace.h" #include "totemplate.h" #include "totool.h" +#include "tomessage.h" #include <qapplication.h> #include <qcombobox.h> @@ -103,6 +104,8 @@ Workspace = new QWorkspace(this); setCentralWidget(Workspace); + Message = new toMessage(this); + // setup all QAction objects createActions(); @@ -1715,12 +1718,7 @@ if (StatusMessages.size() < 1) return; - QDialog dialog; - Ui::toMessageUI uidialog; - uidialog.setupUi(&dialog); - uidialog.Message->setReadOnly(true); - uidialog.Message->setText(*(--StatusMessages.end())); - dialog.exec(); + Message->appendText(*(--StatusMessages.end())); } void toMain::toolWidgetAdded(toToolWidget *tool) Modified: trunk/tora/src/tomain.h =================================================================== --- trunk/tora/src/tomain.h 2008-05-22 05:47:08 UTC (rev 2787) +++ trunk/tora/src/tomain.h 2008-05-22 12:10:22 UTC (rev 2788) @@ -69,7 +69,9 @@ class toSearchReplace; class toTool; class toToolWidget; +class toMessage; + /** This class defines the main window. Observe that this class will have different baseclass * depending on if TOra is a Qt or KDE application. In the case of Qt this will be a * QMainWindow descendant. @@ -103,6 +105,11 @@ QString SQLEditor; /** + * A reference to the error dialog. + */ + toMessage * Message; + + /** * Status message storage for status bar */ std::list<QString> StatusMessages; Modified: trunk/tora/src/tomessageui.ui =================================================================== --- trunk/tora/src/tomessageui.ui 2008-05-22 05:47:08 UTC (rev 2787) +++ trunk/tora/src/tomessageui.ui 2008-05-22 12:10:22 UTC (rev 2788) @@ -12,7 +12,7 @@ <property name="windowTitle" > <string>Warning message</string> </property> - <layout class="QGridLayout" > + <layout class="QGridLayout" name="gridLayout" > <item row="0" column="0" > <widget class="toMarkedText" native="1" name="Message" > <property name="sizePolicy" > @@ -29,7 +29,7 @@ <enum>Qt::Horizontal</enum> </property> <property name="standardButtons" > - <set>QDialogButtonBox::Close</set> + <set>QDialogButtonBox::Close|QDialogButtonBox::Reset</set> </property> </widget> </item> @@ -43,22 +43,5 @@ </customwidget> </customwidgets> <resources/> - <connections> - <connection> - <sender>buttonBox</sender> - <signal>rejected()</signal> - <receiver>toMessageUI</receiver> - <slot>reject()</slot> - <hints> - <hint type="sourcelabel" > - <x>380</x> - <y>252</y> - </hint> - <hint type="destinationlabel" > - <x>413</x> - <y>254</y> - </hint> - </hints> - </connection> - </connections> + <connections/> </ui> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-05-26 13:45:52
|
Revision: 2804 http://tora.svn.sourceforge.net/tora/?rev=2804&view=rev Author: subik Date: 2008-05-26 06:45:40 -0700 (Mon, 26 May 2008) Log Message: ----------- code completion shoudl work now in the sql editor (timer issues fixed) + it suggests keywords/functions when there is no "." parsed stuff + it does not display completion dialog when there is nothing to suggest. Modified Paths: -------------- trunk/tora/src/tohighlightedtext.cpp trunk/tora/src/tohighlightedtext.h trunk/tora/src/tora.qrc Added Paths: ----------- trunk/tora/src/templates/completion.api trunk/tora/utils/codecompletion/ trunk/tora/utils/codecompletion/codecompletion.pro trunk/tora/utils/codecompletion/main.cpp Added: trunk/tora/src/templates/completion.api =================================================================== --- trunk/tora/src/templates/completion.api (rev 0) +++ trunk/tora/src/templates/completion.api 2008-05-26 13:45:40 UTC (rev 2804) @@ -0,0 +1,885 @@ +ABORT +ACCESS +ACCESSED +ACCOUNT +ACTIVATE +ADD +ADMIN +ADMINISTER +ADMINISTRATOR +ADVISE +AFTER +ALGORITHM +ALL +ALLOCATE +ALLOW +ALL_ROWS +ALTER +ALWAYS +ANALYZE +ANCILLARY +AND +ANY +APPLY +ARCHIVE +ARCHIVELOG +ARRAY +AS +ASC +ASSOCIATE +AT +ATTRIBUTE +ATTRIBUTES +AUDIT +AUTHENTICATED +AUTHID +AUTHORIZATION +AUTO +AUTOALLOCATE +AUTOEXTEND +AUTOMATIC +BACKUP +BECOME +BEFORE +BEGIN +BEHALF +BETWEEN +BFILE +BINDING +BITMAP +BITS +BLOB +BLOCK +BLOCKSIZE +BLOCK_RANGE +BODY +BOTH +BOOLEAN +BOUND +BROADCAST +BUFFER_POOL +BUILD +BULK +BY +BYTE +CACHE +CACHE_INSTANCES +CALL +CANCEL +CASCADE +CASE +CAST +CATEGORY +CERTIFICATE +CFILE +CHAINED +CHANGE +CHAR +CHARACTER +CHAR_CS +CHECK +CHECKPOINT +CHILD +CHOOSE +CHUNK +CLEAR +CLOB +CLONE +CLOSE +CLOSE_CACHED_OPEN_CURSORS +CLUSTER +COALESCE +COLLECT +COLUMN +COLUMNS +COLUMN_VALUE +COMMENT +COMMIT +COMMITTED +COMPATIBILITY +COMPILE +COMPLETE +COMPOSITE_LIMIT +COMPRESS +COMPUTE +CONFORMING +CONNECT +CONNECT_TIME +CONSIDER +CONSISTENT +CONSTRAINT +CONSTRAINTS +CONTAINER +CONTENTS +CONTEXT +CONTINUE +CONTROLFILE +CONVERT +CORRUPTION +COST +CPU_PER_CALL +CPU_PER_SESSION +CREATE +CREATE_STORED_OUTLINES +CROSS +CUBE +CURRENT +CURRENT_DATE +CURRENT_SCHEMA +CURRENT_TIME +CURRENT_TIMESTAMP +CURRENT_USER +CURSOR +CURSOR_SPECIFIC_SEGMENT +CYCLE +DANGLING +DATA +DATABASE +DATAFILE +DATAFILES +DATAOBJNO +DATE +DATE_MODE +DBA +DBTIMEZONE +DDL +DEALLOCATE +DEBUG +DEC +DECIMAL +DECLARE +DECODE +DEFAULT +DEFERRABLE +DEFERRED +DEFINED +DEFINER +DEGREE +DELAY +DELETE +DEMAND +DENSE_RANK +DEREF +DESC +DETACHED +DETERMINES +DICTIONARY +DIMENSION +DIRECTORY +DISABLE +DISASSOCIATE +DISCONNECT +DISMOUNT +DISPATCHERS +DISTINCT +DISTINGUISHED +DISTRIBUTED +DML +DOUBLE +DROP +DUMP +DYNAMIC +EACH +ELEMENT +ELSE +ELSIF +ENABLE +ENCRYPTED +ENCRYPTION +END +ENFORCE +ENTRY +ERROR_ON_OVERLAP_TIME +ESCAPE +ESTIMATE +EVENTS +EXCEPT +EXCEPTION +EXCEPTIONS +EXCHANGE +EXCLUDING +EXCLUSIVE +EXECUTE +EXEMPT +EXISTS +EXIT +EXPIRE +EXPLAIN +EXPLOSION +EXTEND +EXTENDS +EXTENT +EXTENTS +EXTERNAL +EXTERNALLY +EXTRACT +FAILED_LOGIN_ATTEMPTS +FALSE +FAST +FILE +FILTER +FINAL +FINISH +FIRST +FIRST_ROWS +FLAGGER +FLOAT +FLOB +FLUSH +FOLLOWING +FOR +FORCE +FOREIGN +FREELIST +FREELISTS +FRESH +FROM +FULL +FUNCTION +FUNCTIONS +GENERATED +GLOBAL +GLOBALLY +GLOBAL_NAME +GLOBAL_TOPIC_ENABLED +GRANT +GROUP +GROUPS +GUARD +HASH +HASHKEYS +HAVING +HEADER +HEAP +HIERARCHY +HOUR +IDENTIFIED +IDENTIFIER +IDGENERATORS +IDLE_TIME +IF +IMMEDIATE +IN +INCLUDING +INCREMENT +INCREMENTAL +INDEX +INDEXED +INDEXES +INDEXTYPE +INDEXTYPES +INDICATOR +INITIAL +INITIALIZED +INITIALLY +INITRANS +INNER +INSERT +INSTANCE +INSTANCES +INSTANTIABLE +INSTEAD +INT +INTEGER +INTEGRITY +INTERMEDIATE +INTERNAL_CONVERT +INTERNAL_USE +INTERSECT +INTERVAL +INTO +INVALIDATE +IN_MEMORY_METADATA +IS +ISOLATION +ISOLATION_LEVEL +JAVA +JOIN +KEEP +KERBEROS +KEY +KEYFILE +KEYS +KEYSIZE +KILL +LABEL +LAST +LATERAL +LAYER +LDAP_REGISTRATION +LDAP_REGISTRATION_ENABLED +LDAP_REG_SYNC_INTERVAL +LEADING +LEFT +LESS +LEVEL +LEVELS +LIBRARY +LIKE +LIKE2 +LIKE4 +LIKEC +LIMIT +LINK +LIST +LOB +LOCAL +LOCALTIME +LOCALTIMESTAMP +LOCATION +LOCATOR +LOCK +LOCKED +LOG +LOGFILE +LOGGING +LOGICAL +LOGICAL_READS_PER_CALL +LOGICAL_READS_PER_SESSION +LOGOFF +LOGON +LONG +LOOP +MANAGE +MANAGED +MANAGEMENT +MANUAL +MAPPING +MASTER +MATCHED +MATERIALIZED +MAXARCHLOGS +MAXDATAFILES +MAXEXTENTS +MAXINSTANCES +MAXLOGFILES +MAXLOGHISTORY +MAXLOGMEMBERS +MAXSIZE +MAXTRANS +MAXVALUE +MEMBER +MEMORY +MERGE +METHOD +MINEXTENTS +MINIMIZE +MINIMUM +MINUS +MINVALUE +MLSLABEL +MODE +MODIFY +MONITORING +MOUNT +MOVE +MOVEMENT +MTS_DISPATCHERS +MULTISET +NAMED +NCHAR +NCHAR_CS +NCLOB +NEEDED +NESTED +NESTED_TABLE_ID +NETWORK +NEVER +NEXT +NLS_CALENDAR +NLS_CHARACTERSET +NLS_COMP +NLS_CURRENCY +NLS_DATE_FORMAT +NLS_DATE_LANGUAGE +NLS_ISO_CURRENCY +NLS_LANG +NLS_LANGUAGE +NLS_LENGTH_SEMANTICS +NLS_NCHAR_CONV_EXCP +NLS_NUMERIC_CHARACTERS +NLS_SORT +NLS_SPECIAL_CHARS +NLS_TERRITORY +NO +NOARCHIVELOG +NOAUDIT +NOCACHE +NOCOMPRESS +NOCOPY +NOCYCLE +NODELAY +NOFORCE +NOLOGGING +NOMAPPING +NOMAXVALUE +NOMINIMIZE +NOMINVALUE +NOMONITORING +NONE +NOORDER +NOOVERRIDE +NOPARALLEL +NORELY +NORESETLOGS +NOREVERSE +NORMAL +NOROWDEPENDENCIES +NOSEGMENT +NOSORT +NOSWITCH +NOT +NOTHING +NOVALIDATE +NOWAIT +NULL +NULLS +NUMBER +NUMERIC +NVARCHAR2 +OBJECT +OBJNO +OBJNO_REUSE +OF +OFF +OFFLINE +OID +OIDINDEX +OLD +ON +ONLINE +ONLY +OPAQUE +OPCODE +OPEN +OPERATOR +OPTIMAL +OPTIMIZER_GOAL +OPTION +OR +ORDER +ORGANIZATION +OTHERS +OUT +OUTER +OUTLINE +OVER +OVERFLOW +OVERLAPS +OWN +PACKAGE +PACKAGES +PARALLEL +PARAMETERS +PARENT +PARTITION +PARTITIONS +PARTITION_HASH +PARTITION_LIST +PARTITION_RANGE +PASSWORD +PASSWORD_GRACE_TIME +PASSWORD_LIFE_TIME +PASSWORD_LOCK_TIME +PASSWORD_REUSE_MAX +PASSWORD_REUSE_TIME +PASSWORD_VERIFY_FUNCTION +PCTFREE +PCTINCREASE +PCTTHRESHOLD +PCTUSED +PCTVERSION +PERCENT +PERMANENT +PFILE +PHYSICAL +PLAN +PLSQL_DEBUG +POLICY +POST_TRANSACTION +PRAGMA +PREBUILT +PRECEDING +PRECISION +PREPARE +PRESERVE +PRIMARY +PRIOR +PRIVATE +PRIVATE_SGA +PRIVILEGE +PRIVILEGES +PROCEDURE +PROFILE +PROTECTED +PUBLIC +PURGE +PX_GRANULE +QUERY +QUEUE +QUIESCE +QUOTA +RANDOM +RANGE +RAW +RBA +READ +READS +REAL +REBUILD +RECORDS_PER_BLOCK +RECOVER +RECOVERABLE +RECOVERY +RECYCLE +REDUCED +REF +REFERENCES +REFERENCING +REFRESH +REGISTER +REJECT +REKEY +RELATIONAL +RELY +RENAME +REPLACE +RESET +RESETLOGS +RESIZE +RESOLVE +RESOLVER +RESOURCE +RESTRICT +RESTRICTED +RESUMABLE +RESUME +RETURN +RETURNING +REUSE +REVERSE +REVOKE +REWRITE +RIGHT +ROLE +ROLES +ROLLBACK +ROLLUP +ROWDEPENDENCIES +ROWID +ROWNUM +ROWS +ROWTYPE +RULE +SAMPLE +SAVEPOINT +SB4 +SCAN +SCAN_INSTANCES +SCHEMA +SCN +SCOPE +SD_ALL +SD_INHIBIT +SD_SHOW +SECURITY +SEGMENT +SEG_BLOCK +SEG_FILE +SELECT +SELECTIVITY +SEQUENCE +SEQUENCED +SERIALIZABLE +SERVERERROR +SESSION +SESSIONS_PER_USER +SESSIONTIMEZONE +SESSIONTZNAME +SESSION_CACHED_CURSORS +SET +SETS +SHARE +SHARED +SHARED_POOL +SHRINK +SHUTDOWN +SIBLINGS +SINGLE +SINGLETASK +SIZE +SKIP +SKIP_UNUSABLE_INDEXES +SMALLINT +SNAPSHOT +SOME +SORT +SOURCE +SPACE +SPECIFICATION +SPFILE +SPLIT +SQL_TRACE +STANDBY +START +STARTUP +STATEMENT_ID +STATIC +STATISTICS +STOP +STORAGE +STORE +STRUCTURE +SUBPARTITION +SUBPARTITIONS +SUBPARTITION_REL +SUBSTITUTABLE +SUCCESSFUL +SUMMARY +SUPPLEMENTAL +SUSPEND +SWITCH +SWITCHOVER +SYNONYM +SYSDATE +SYSDBA +SYSOPER +SYSTEM +SYSTIMESTAMP +SYS_OP_BITVEC +SYS_OP_COL_PRESENT +SYS_OP_ENFORCE_NOT_NULL$ +SYS_OP_MINE_VALUE +SYS_OP_NOEXPAND +SYS_OP_NTCIMG$ +TABLE +TABLES +TABLESPACE +TABLESPACE_NO +TABNO +TEMPFILE +TEMPORARY +THAN +THEN +THREAD +THROUGH +TIMEOUT +TIMESTAMP +TIMEZONE_ABBR +TIMEZONE_HOUR +TIMEZONE_MINUTE +TIMEZONE_REGION +TIME_ZONE +TO +TOPLEVEL +TRACE +TRACING +TRAILING +TRANSACTION +TRANSITIONAL +TREAT +TRIGGER +TRIGGERS +TRUE +TRUNCATE +TX +TYPE +TYPES +TZ_OFFSET +UB2 +UBA +UID +UNARCHIVED +UNBOUND +UNBOUNDED +UNDER +UNDO +UNIFORM +UNION +UNIQUE +UNLIMITED +UNLOCK +UNPROTECTED +UNQUIESCE +UNRECOVERABLE +UNTIL +UNUSABLE +UNUSED +UPDATABLE +UPDATE +UPD_INDEXES +UPD_JOININDEX +UPGRADE +UROWID +USAGE +USE +USER_DEFINED +USE_PRIVATE_OUTLINES +USE_STORED_OUTLINES +USING +VALIDATE +VALIDATION +VALUES +VARCHAR +VARCHAR2 +VARRAY +VARYING +VIEW +WAIT +WHEN +WHENEVER +WHERE +WHILE +WITH +WITHIN +WITHOUT +WORK +WRITE +XID +XMLSCHEMA +XMLTYPE +ZONE +COVAR_POP +COVAR_SAMP +GROUPING +MAX +MIN +REGR_AVGX +REGR_AVGY +REGR_COUNT +REGR_INTERCEPT +REGR_R2 +REGR_SLOPE +REGR_SXX +REGR_SXY +REGR_SYY +STDDEV +STDDEV_POP +STDDEV_SAMP +SUM +VARIANCE +VAR_POP +VAR_SAMP +AVG +CORR +COUNT +COVAR_POP +COVAR_SAMP +CUME_DIST +DENSE_RANK +FIRST_VALUE +LAG +LAST_VALUE +LEAD +MAX +MIN +NTILE +PERCENT_RANK +RANK +RATIO_TO_REPORT +REGR_AVGX +REGR_AVGY +REGR_COUNT +REGR_INTERCEPT +REGR_R2 +REGR_SLOPE +REGR_SXX +REGR_SXY +REGR_SYY +ROW_NUMBER +STDDEV +STDDEV_POP +STDDEV_SAMP +SUM +VARIANCE +VAR_POP +VAR_SAMP +CHR +CONCAT +INITCAP +LOWER +LPAD +LTRIM +NLSSORT +NLS_INITCAP +NLS_LOWER +NLS_UPPER +REPLACE +RPAD +RTRIM +SOUNDEX +SUBSTR +SUBSTRB +TRANSLATE +TRIM +UPPER +ASCII +INSTR +INSTRB +LENGTH +LENGTHB +CHARTOROWID +CONVERT +HEXTORAW +NUMTODSINTERVAL +NUMTOYMINTERVAL +RAWTOHEX +ROWIDTOCHAR +TO_CHAR +TO_DATE +TO_LOB +TO_MULTI_BYTE +TO_NUMBER +TO_SINGLE_BYTE +TRANSLATE +ADD_MONTHS +LAST_DAY +MONTHS_BETWEEN +NEW_TIME +NEXT_DAY +ROUND +TRUNC +BFILENAME +DUMP +EMPTY_BLOB +EMPTY_CLOB +GREATEST +LEAST +NLS_CHARSET_DECL_LEN +NLS_CHARSET_ID +NLS_CHARSET_NAME +NVL +NVL2 +SYS_CONTEXT +SYS_GUID +USERENV +VSIZE +ABS +ACOS +ADD_MONTHS +ASIN +ATAN +ATAN2 +BITAND +CEIL +COS +COSH +EXP +FLOOR +LN +LOG +MOD +POWER +ROUND +SIGN +SIN +SINH +SQRT +TAN +TANH +TRUNC +DEREF +MAKE_REF +REF +REFTOHEX +VALUE \ No newline at end of file Modified: trunk/tora/src/tohighlightedtext.cpp =================================================================== --- trunk/tora/src/tohighlightedtext.cpp 2008-05-26 11:41:49 UTC (rev 2803) +++ trunk/tora/src/tohighlightedtext.cpp 2008-05-26 13:45:40 UTC (rev 2804) @@ -58,6 +58,8 @@ #include <qpoint.h> #include <QKeyEvent> #include <QVBoxLayout> +#include <QFile> +#include <QMessageBox> #include "todefaultkeywords.h" @@ -326,6 +328,21 @@ { sqlLexer.setDefaultFont(toStringToFont(toConfigurationSingle::Instance().codeFont())); + // set default keywords for code completion + QFile api(":/templates/completion.api"); + defaultCompletion.clear(); + if (!api.open(QIODevice::ReadOnly | QIODevice::Text)) + QMessageBox::warning(this, tr("Init error"), + tr("Cannot read code completion API from %1").arg(api.fileName())); + else + { + while (!api.atEnd()) + { + QString s(api.readLine()); + defaultCompletion.append(s.trimmed()); + } + } + // set default SQL lexer (syntax colouring as well) setLexer (&sqlLexer); @@ -373,7 +390,7 @@ { if (col > 0 && this->text(row)[col-1] == '.') { - timer->setSingleShot(500); + timer->start(500); } else { @@ -392,10 +409,15 @@ void toHighlightedText::autoCompleteFromAPIs() { + timer->stop(); // it's a must to prevent infinite reopening + QListWidget *list = popup->list(); QString partial; QStringList compleList = this->getCompletionList(&partial); + if (compleList.count() == 0) + return; + if (compleList.count() == 1 && compleList.first() == partial) this->completeWithText(compleList.first()); else @@ -713,94 +735,107 @@ QString line = text(curline); - if (!isReadOnly() && curcol >= 0) + if (isReadOnly() || curcol == 0 || !toConfigurationSingle::Instance().codeCompletion()) + return toReturn; + + toSQLParse::editorTokenizer tokens(this, curcol, curline); + if (curcol > 0 && line[curcol-1] != '.') { - if (!toConfigurationSingle::Instance().codeCompletion()) - return toReturn; + *partial = tokens.getToken(false); + } + else + { + *partial = ""; + } - toSQLParse::editorTokenizer tokens(this, curcol, curline); - if (curcol > 0 && line[curcol-1] != '.') + QString name = tokens.getToken(false); + QString owner; + if (name == ".") + { + name = tokens.getToken(false); + } + + QString token = tokens.getToken(false); + if (token == ".") + owner = tokens.getToken(false); + else + { + QString cmp = UpperIdent(name); + QString lastToken; + while ((invalidToken(tokens.line(), tokens.offset() + token.length()) || UpperIdent(token) != cmp || lastToken == ".") && token != ";" && !token.isEmpty()) { - *partial = tokens.getToken(false); + lastToken = token; + token = tokens.getToken(false); } - else - { - *partial = ""; - } - QString name = tokens.getToken(false); - QString owner; - if (name == ".") + if (token == ";" || token.isEmpty()) { - name = tokens.getToken(false); + tokens.setLine(curline); + tokens.setOffset(curcol); + token = tokens.getToken(); + while ((invalidToken(tokens.line(), tokens.offset()) || UpperIdent(token) != cmp && lastToken != ".") && token != ";" && !token.isEmpty()) + token = tokens.getToken(); + lastToken = token; + tokens.getToken(false); } - - QString token = tokens.getToken(false); - if (token == ".") - owner = tokens.getToken(false); - else + if (token != ";" && !token.isEmpty()) { - QString cmp = UpperIdent(name); - QString lastToken; - while ((invalidToken(tokens.line(), tokens.offset() + token.length()) || UpperIdent(token) != cmp || lastToken == ".") && token != ";" && !token.isEmpty()) + token = tokens.getToken(false); + if (token != "TABLE" && token != "UPDATE" && token != "FROM" && token != "INTO" && (toIsIdent(token[0]) || token[0] == '\"')) { - lastToken = token; + name = token; token = tokens.getToken(false); + if (token == ".") + owner = tokens.getToken(false); } - - if (token == ";" || token.isEmpty()) - { - tokens.setLine(curline); - tokens.setOffset(curcol); - token = tokens.getToken(); - while ((invalidToken(tokens.line(), tokens.offset()) || UpperIdent(token) != cmp && lastToken != ".") && token != ";" && !token.isEmpty()) - token = tokens.getToken(); - lastToken = token; - tokens.getToken(false); - } - if (token != ";" && !token.isEmpty()) - { - token = tokens.getToken(false); - if (token != "TABLE" && token != "UPDATE" && token != "FROM" && token != "INTO" && (toIsIdent(token[0]) || token[0] == '\"')) - { - name = token; - token = tokens.getToken(false); - if (token == ".") - owner = tokens.getToken(false); - } - else if (token == ")") - { - return toReturn; - } - } + else if (token == ")") + return toReturn; } - if (!owner.isEmpty()) + } + if (!owner.isEmpty()) + { + name = owner + QString::fromLatin1(".") + name; + } + if (!name.isEmpty()) + { + try { - name = owner + QString::fromLatin1(".") + name; - } - if (!name.isEmpty()) - { - try + toConnection &conn = toCurrentConnection(this); + toQDescList &desc = conn.columns(conn.realName(name, false)); + for (toQDescList::iterator i = desc.begin();i != desc.end();i++) { - toConnection &conn = toCurrentConnection(this); - toQDescList &desc = conn.columns(conn.realName(name, false)); - for (toQDescList::iterator i = desc.begin();i != desc.end();i++) - { - QString t; - int ind = (*i).Name.indexOf("("); - if (ind < 0) - ind = (*i).Name.indexOf("RETURNING") - 1; //it could be a function or procedure without parameters. -1 to remove the space - if (ind >= 0) - t = conn.quote((*i).Name.mid(0, ind)) + (*i).Name.mid(ind); - else - t = conn.quote((*i).Name); - if (t.indexOf(*partial) == 0) - toReturn.append(t); - } + QString t; + int ind = (*i).Name.indexOf("("); + if (ind < 0) + ind = (*i).Name.indexOf("RETURNING") - 1; //it could be a function or procedure without parameters. -1 to remove the space + if (ind >= 0) + t = conn.quote((*i).Name.mid(0, ind)) + (*i).Name.mid(ind); + else + t = conn.quote((*i).Name); + if (t.indexOf(*partial) == 0) + toReturn.append(t); } - catch (...){} } + catch (...){} } + // if is toReturn empty fill it with keywords... + if (toReturn.count() == 0) + { +// QFile api(":/templates/completion.api"); +// api.open(QIODevice::ReadOnly | QIODevice::Text); +// while (!api.atEnd()) +// { +// QString s(api.readLine()); +// if (s.startsWith(*partial, Qt::CaseInsensitive)) +// toReturn.append(s.trimmed()); +// } + for (int i = 0; i < defaultCompletion.size(); ++i) + { + if (defaultCompletion.at(i).startsWith(*partial, Qt::CaseInsensitive)) + toReturn.append(defaultCompletion.at(i)); + } + } + toReturn.sort(); return toReturn; } Modified: trunk/tora/src/tohighlightedtext.h =================================================================== --- trunk/tora/src/tohighlightedtext.h 2008-05-26 11:41:49 UTC (rev 2803) +++ trunk/tora/src/tohighlightedtext.h 2008-05-26 13:45:40 UTC (rev 2804) @@ -226,6 +226,13 @@ std::map<int, QString> Errors; QsciAPIs* complAPI; QTimer* timer; + + /*! List of default keywords/functions/whatever to use in + the code completion when the SQL parser doesn't find any + table/view structure to use. + See getCompletionList() */ + QStringList defaultCompletion; + protected: int debugMarker; int errorMarker; @@ -344,7 +351,16 @@ void updateSyntaxColor(toSyntaxAnalyzer::infoType t); protected: + /*! \brief Guess what should be used for code completion + in this time. + When SQL parser can decide the editor is in FOO.bar state + it will suggest "bar" related columns etc. + When SQL parser couldn't find any suggestion it will list + keywords/functions from templates/completion.api list. + \param partial a QString reference with starting char sequence + */ QStringList getCompletionList(QString* partial); + void completeWithText(QString itemText); private: Modified: trunk/tora/src/tora.qrc =================================================================== --- trunk/tora/src/tora.qrc 2008-05-26 11:41:49 UTC (rev 2803) +++ trunk/tora/src/tora.qrc 2008-05-26 13:45:40 UTC (rev 2804) @@ -132,5 +132,7 @@ <file>templates/log4plsql.tpl</file> <file>templates/sqlfunctions.tpl</file> + <file>templates/completion.api</file> + </qresource> </RCC> Added: trunk/tora/utils/codecompletion/codecompletion.pro =================================================================== --- trunk/tora/utils/codecompletion/codecompletion.pro (rev 0) +++ trunk/tora/utils/codecompletion/codecompletion.pro 2008-05-26 13:45:40 UTC (rev 2804) @@ -0,0 +1,11 @@ +###################################################################### +# Automatically generated by qmake (2.01a) po kv? 26 14:36:13 2008 +###################################################################### + +TEMPLATE = app +TARGET = +DEPENDPATH += . +INCLUDEPATH += . + +# Input +SOURCES += main.cpp Added: trunk/tora/utils/codecompletion/main.cpp =================================================================== --- trunk/tora/utils/codecompletion/main.cpp (rev 0) +++ trunk/tora/utils/codecompletion/main.cpp 2008-05-26 13:45:40 UTC (rev 2804) @@ -0,0 +1,51 @@ +/* +A helper co-called API generator for code completion. +It takes TOra internals DefaultKeywords and function definition +from templates - then is the result written into "cpmpletion.api". + +compile: qmake; make + +Petr Vanek <pe...@sc...> +*/ + +#include <QFile> +#include <QTextStream> +#include <QtDebug> + +#include "../../src/todefaultkeywords.h" + +int main(int /*argc*/, char** /*argv*/) +{ + qDebug() << "Code completion generator for TOra started"; + + QFile of("../../src/templates/completion.api"); + of.open(QIODevice::WriteOnly); + QTextStream out(&of); + + qDebug() << "DefaultKeywords..."; + // default keywords + for (int i = 0; DefaultKeywords[i]; i++) + { + out << DefaultKeywords[i] << "\n"; + } + qDebug() << "done."; + + qDebug() << "Additional functions..."; + // functions and the other stuff + QFile f("../../src/templates/sqlfunctions.tpl"); + f.open(QIODevice::ReadOnly | QIODevice::Text); + while (!f.atEnd()) + { + QString s(f.readLine()); + int start = s.indexOf(":") + 1; + int end = s.indexOf(" ", start); + if (end == -1) + end = s.indexOf("(", start); + + out << s.mid(start, end - start) << "\n"; + } + qDebug() << "done."; + + of.close(); + qDebug() << "Code completion generator for TOra finished"; +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-05-29 13:33:44
|
Revision: 2814 http://tora.svn.sourceforge.net/tora/?rev=2814&view=rev Author: subik Date: 2008-05-29 06:33:40 -0700 (Thu, 29 May 2008) Log Message: ----------- Stray/unecessary "save changes to editor" dialogs that don't make much sense or no modified data. Modified Paths: -------------- trunk/tora/ISSUES trunk/tora/src/toworksheet.h trunk/tora/src/toworksheetwidget.cpp trunk/tora/src/toworksheetwidget.h Modified: trunk/tora/ISSUES =================================================================== --- trunk/tora/ISSUES 2008-05-29 13:14:14 UTC (rev 2813) +++ trunk/tora/ISSUES 2008-05-29 13:33:40 UTC (rev 2814) @@ -59,7 +59,7 @@ Oracle: better handling on extents tab if no access to dba_extents view. -Stray/unecessary "save changes to editor" dialogs that don't make much sense or no modified data. +[DONE in revision #2812?] Stray/unecessary "save changes to editor" dialogs that don't make much sense or no modified data. Modified: trunk/tora/src/toworksheet.h =================================================================== --- trunk/tora/src/toworksheet.h 2008-05-29 13:14:14 UTC (rev 2813) +++ trunk/tora/src/toworksheet.h 2008-05-29 13:33:40 UTC (rev 2814) @@ -160,7 +160,7 @@ void saveHistory(void); void viewResources(void); void query(const QString &str, execType type); - bool checkSave(bool input); + virtual bool checkSave(bool input); void saveDefaults(void); void setup(bool autoLoad); Modified: trunk/tora/src/toworksheetwidget.cpp =================================================================== --- trunk/tora/src/toworksheetwidget.cpp 2008-05-29 13:14:14 UTC (rev 2813) +++ trunk/tora/src/toworksheetwidget.cpp 2008-05-29 13:33:40 UTC (rev 2814) @@ -177,7 +177,12 @@ return false; } +bool toWorksheetWidget::checkSave(bool input) +{ + return false; +} + // override parent. void toWorksheetWidget::windowActivated(QWidget *widget) { Modified: trunk/tora/src/toworksheetwidget.h =================================================================== --- trunk/tora/src/toworksheetwidget.h 2008-05-29 13:14:14 UTC (rev 2813) +++ trunk/tora/src/toworksheetwidget.h 2008-05-29 13:33:40 UTC (rev 2814) @@ -56,6 +56,14 @@ void windowActivated(QWidget *widget); virtual bool describe(const QString &query); + /*! \brief Prevent unecessary "save changes to editor" + that don't make much sense. + toWorksheetWidget objects are used for diplaying data + only - so no saving is required at all. + This method cuts off toWorksheet::checkSave()s + */ + bool checkSave(bool input); + public slots: /** * create context menus This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-06-02 08:55:20
|
Revision: 2833 http://tora.svn.sourceforge.net/tora/?rev=2833&view=rev Author: subik Date: 2008-06-02 01:55:26 -0700 (Mon, 02 Jun 2008) Log Message: ----------- schema switch cleanup in schema browser Modified Paths: -------------- trunk/tora/ISSUES trunk/tora/src/tobrowser.cpp Modified: trunk/tora/ISSUES =================================================================== --- trunk/tora/ISSUES 2008-06-02 08:05:07 UTC (rev 2832) +++ trunk/tora/ISSUES 2008-06-02 08:55:26 UTC (rev 2833) @@ -21,6 +21,7 @@ - Create table/create index isn't working in the Schema Browser. - MIGRATE extraction doesn't work (and I suppose it never did) +[PARTIALLY FIXED - Petr - there is no clear() method for toResult(). So you can get an error message "foo doesn't exist" in some schema changes (Data tab). All other tabs should work fine. Content is cleared in all cases. ] When switching in schema browser from looking at columns of a table to a schema with no tables, the column list never gets cleared. It stays as the column list from the original table. Modified: trunk/tora/src/tobrowser.cpp =================================================================== --- trunk/tora/src/tobrowser.cpp 2008-06-02 08:05:07 UTC (rev 2832) +++ trunk/tora/src/tobrowser.cpp 2008-06-02 08:55:26 UTC (rev 2833) @@ -2052,6 +2052,7 @@ void toBrowser::changeSchema(int) { SecondText = QString::fromLatin1(""); + changeSecond(); refresh(); updateTabs(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2008-06-24 15:13:24
|
Revision: 2870 http://tora.svn.sourceforge.net/tora/?rev=2870&view=rev Author: nneul Date: 2008-06-24 08:12:52 -0700 (Tue, 24 Jun 2008) Log Message: ----------- eliminate error on switching schemas Modified Paths: -------------- trunk/tora/ISSUES trunk/tora/src/toresultdata.cpp Modified: trunk/tora/ISSUES =================================================================== --- trunk/tora/ISSUES 2008-06-24 13:12:09 UTC (rev 2869) +++ trunk/tora/ISSUES 2008-06-24 15:12:52 UTC (rev 2870) @@ -10,14 +10,12 @@ - MIGRATE extraction doesn't work (and I suppose it never did) [PARTIALLY FIXED - Petr - there is no clear() method for toResult(). So you can get an error message "foo doesn't exist" in some schema changes (Data tab). All other tabs should work fine. Content is cleared in all cases. ] +[PARTIALLY FIXED - resolved the error message, but column list still doesn't get cleared] When switching in schema browser from looking at columns of a table to a schema with no tables, the column list never gets cleared. It stays as the column list from the original table. ">|" arrow on schema browser view just scrolls to bottom of display instead of reading all rows as it used to. -Oracle: error "result should be 18 in segment attributes was 2" in toExtract on Script tab -[i don't get this error, can you send a table create script that'll reproduce?] - Row number in first column of schema browser for 'Data' tab - needs to resize to fit contents - right now, it truncates. @@ -47,6 +45,9 @@ Resolved Issues --------------- +[MOSTLY WORKED AROUND - no perms to tables] Oracle: error "result should be 18 in segment attributes was 2" in toExtract on Script tab +[i don't get this error, can you send a table create script that'll reproduce?] + [FIXED] - petr CRASH - fix crash in the DB Extract tool on "Search" and/or "Compare" feature. It looks like there is an infinite loop somewhere. Modified: trunk/tora/src/toresultdata.cpp =================================================================== --- trunk/tora/src/toresultdata.cpp 2008-06-24 13:12:09 UTC (rev 2869) +++ trunk/tora/src/toresultdata.cpp 2008-06-24 15:12:52 UTC (rev 2870) @@ -187,8 +187,13 @@ par++; Table = *par; } - else if (Owner.isEmpty() || Table.isEmpty()) + + /* Always check, if either is empty, query will fail */ + if (Owner.isEmpty() || Table.isEmpty()) + { + /* Need to clear columns here */ return; + } FilterName = filterName(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-07-07 11:14:16
|
Revision: 2884 http://tora.svn.sourceforge.net/tora/?rev=2884&view=rev Author: subik Date: 2008-07-07 04:14:12 -0700 (Mon, 07 Jul 2008) Log Message: ----------- documentation for unit tester Modified Paths: -------------- trunk/tora/doc/help/toc.html trunk/tora/doc/help/tools.texi trunk/tora/src/tounittest.cpp Added Paths: ----------- trunk/tora/doc/help/unittest.texi Modified: trunk/tora/doc/help/toc.html =================================================================== --- trunk/tora/doc/help/toc.html 2008-07-07 09:35:49 UTC (rev 2883) +++ trunk/tora/doc/help/toc.html 2008-07-07 11:14:12 UTC (rev 2884) @@ -49,6 +49,7 @@ <DD><A HREF="worksheet.html">SQL Worksheet</A></DD> <DD><A HREF="browser.html">Schema Browser</A></DD> <DD><A HREF="debugger.html">PL/SQL Debugger</A></DD> + <DD><A HREF="unittest.html">PL/SQL Unit Tester</A></DD> <DD><A HREF="tuning.html">Server Tuning</A></DD> <DD><A HREF="security.html">Security Manager</A></DD> <DD><A HREF="storage.html">Storage Manager</A></DD> Modified: trunk/tora/doc/help/tools.texi =================================================================== --- trunk/tora/doc/help/tools.texi 2008-07-07 09:35:49 UTC (rev 2883) +++ trunk/tora/doc/help/tools.texi 2008-07-07 11:14:12 UTC (rev 2884) @@ -8,6 +8,7 @@ * SQL Worksheet: worksheet. * Schema Browser: browser. * PL/SQL Debugger: debugger. +* PL/SQL Unit Tester: unittest. * Server Tuning: tuning. * Security Manager:security. * Storage Manager: storage. Added: trunk/tora/doc/help/unittest.texi =================================================================== --- trunk/tora/doc/help/unittest.texi (rev 0) +++ trunk/tora/doc/help/unittest.texi 2008-07-07 11:14:12 UTC (rev 2884) @@ -0,0 +1,41 @@ +@node unittest +@section PL/SQL Unit Tester +@cindex PL/SQL Unit Tester + +This tool allows you to run procedures, functions, +and package members independently. Selecting proper +PL/SQL unit will result in anonymous PL/SQL block +containing given unit and an environment with +setting variables and required outputs with unit +results (via DBMS_OUTPUT). + +Automatically created code blocks can be modified +by user. + +What is the Unit Test Script? The anonymous PL/SQL block with the following +structure: + +@example +DECLARE + -- declarations of IN/OUT parameters + foo number; + bar varchar2(22); +BEGIN + -- definitions of parameters + foo := 1; + bar := 2; + -- calling requested unit + MYOWN.COOLPACKAGE.FOOBAR( + foo => foo, + bar => bar + ); + -- printing of the results + sys.dbms_output.put_line('foo: ' || foo); + sys.dbms_output.put_line('bar: ' || bar); +END; +@end example + +It can handle only basic data types currently. +No PLSQLdata (record of etc.) supported yet. + +@bye Modified: trunk/tora/src/tounittest.cpp =================================================================== --- trunk/tora/src/tounittest.cpp 2008-07-07 09:35:49 UTC (rev 2883) +++ trunk/tora/src/tounittest.cpp 2008-07-07 11:14:12 UTC (rev 2884) @@ -132,9 +132,8 @@ static toUnitTestTool UnitTestTool; -//TODO: helpfile for this tool! toUnitTest::toUnitTest(QWidget * parent, toConnection &connection) - : toToolWidget(UnitTestTool, "todo!!!html", parent, connection, "toUnitTest"), + : toToolWidget(UnitTestTool, "unittest.html", parent, connection, "toUnitTest"), m_model(0) { setObjectName("unitTest"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-07-12 15:55:12
|
Revision: 2890 http://tora.svn.sourceforge.net/tora/?rev=2890&view=rev Author: mrjohnson0 Date: 2008-07-12 08:55:21 -0700 (Sat, 12 Jul 2008) Log Message: ----------- fixes build, add qtxml Modified Paths: -------------- trunk/tora/config/m4/qtkde.m4 trunk/tora/src/Makefile.am Modified: trunk/tora/config/m4/qtkde.m4 =================================================================== --- trunk/tora/config/m4/qtkde.m4 2008-07-10 10:59:11 UTC (rev 2889) +++ trunk/tora/config/m4/qtkde.m4 2008-07-12 15:55:21 UTC (rev 2890) @@ -324,7 +324,7 @@ fi dnl all qt libary names needed for tora: - pv_qt_libs="QtCore QtGui QtGui QtSql QtNetwork" + pv_qt_libs="QtCore QtGui QtGui QtSql QtNetwork QtXml" all_qt_libs= dnl loop through libs and append type @@ -400,7 +400,7 @@ QT_DEFINES="" dnl mrj - TODO this is just a hack for now, should test each -I - QT_INCLUDES="-I$qt_includes -I$qt_incdir/Qt -I$qt_incdir/QtCore -I$qt_incdir/QtGui -I$qt_incdir/QtSql -I$qt_incdir/QtNetwork" + QT_INCLUDES="-I$qt_includes -I$qt_incdir/Qt -I$qt_incdir/QtCore -I$qt_incdir/QtGui -I$qt_incdir/QtSql -I$qt_incdir/QtNetwork -I$qt_incdir/QtXml" all_includes="$QT_INCLUDES $all_includes" QT_LDFLAGS="$all_qt_libs" Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2008-07-10 10:59:11 UTC (rev 2889) +++ trunk/tora/src/Makefile.am 2008-07-12 15:55:21 UTC (rev 2890) @@ -59,7 +59,7 @@ tobackgroundlabel.cpp tobackgroundlabel.h \ toconfiguration.cpp toconfiguration.h \ toconnection.cpp toconnection.h \ - toconnectionimport.cpp toconnectionimport.h \ + toconnectionimport.cpp toconnectionimport.h \ toconnectionpool.cpp toconnectionpool.h \ torunnable.cpp torunnable.h \ toeditwidget.cpp toeditwidget.h \ @@ -284,6 +284,7 @@ moc_tochartmanager.cpp \ moc_toconnection.cpp \ moc_toconnectionpool.cpp \ + moc_toconnectionimport.cpp \ moc_torunnable.cpp \ moc_tonoblockquery.cpp \ moc_toeventquery.cpp \ @@ -369,12 +370,14 @@ moc_toscriptschemawidget.cpp \ moc_toscripttreemodel.cpp \ moc_toworkingwidget.cpp \ + migratetool/moc_connectionmodel.cpp \ ui_toaboutui.h \ ui_todroptablespaceui.h \ ui_tobrowserconstraintui.h \ ui_tobrowserfilterui.h \ ui_tobrowserindexui.h \ ui_tobrowsertableui.h \ + ui_toconnectionimportui.h \ ui_tochartalarmui.h \ ui_tochartsetupui.h \ ui_todatabasesettingui.h \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-07-12 16:45:47
|
Revision: 2892 http://tora.svn.sourceforge.net/tora/?rev=2892&view=rev Author: mrjohnson0 Date: 2008-07-12 09:45:19 -0700 (Sat, 12 Jul 2008) Log Message: ----------- bunch of cleanups, removing kde stuff not used anymore Modified Paths: -------------- trunk/tora/config/m4/qtkde.m4 trunk/tora/src/Makefile.am Modified: trunk/tora/config/m4/qtkde.m4 =================================================================== --- trunk/tora/config/m4/qtkde.m4 2008-07-12 16:02:52 UTC (rev 2891) +++ trunk/tora/config/m4/qtkde.m4 2008-07-12 16:45:19 UTC (rev 2892) @@ -209,7 +209,8 @@ qt_includes="" AC_ARG_WITH(qt-dir, [ --with-qt-dir=DIR where the root of Qt is installed ], - [ ac_qt_includes="$withval"/include + [ QTDIR="$withval" + ac_qt_includes="$withval"/include ac_qt_libraries="$withval"/lib ac_qt_bindir="$withval"/bin ]) @@ -341,7 +342,8 @@ dnl separate the qt tests into testing linking/compiling and finding QTDIR. TORA_CHECK_MAC_NATIVE - K_PATH_X + dnl shouldn't need anymore + dnl K_PATH_X ac_cxxflags_safe="$CXXFLAGS" ac_ldflags_safe="$LDFLAGS" @@ -414,410 +416,7 @@ AC_PATH_QT_MOC_UIC ]) -dnl ------------------------------------------------------------------------ -dnl Find the header files and libraries for X-Windows. Extended the -dnl macro AC_PATH_X -dnl ------------------------------------------------------------------------ -dnl -AC_DEFUN([K_PATH_X], -[ -AC_REQUIRE([KDE_MISC_TESTS])dnl - may not have kde -AC_REQUIRE([KDE_CHECK_LIB64]) -AC_ARG_ENABLE( - embedded, - [ --enable-embedded link to Qt-embedded, don't use X], - kde_use_qt_emb=$enableval, - kde_use_qt_emb=no -) - -AC_ARG_ENABLE( - qtopia, - [ --enable-qtopia link to Qt-embedded, link to the Qtopia Environment], - kde_use_qt_emb_palm=$enableval, - kde_use_qt_emb_palm=no -) - -case $host_os in -cygwin* | mingw*) - # no x for windows - ;; -*) - if test "$kde_use_qt_emb" = "no"; then - AC_MSG_CHECKING(for X) - AC_LANG_PUSH(C) - AC_CACHE_VAL(kde_cv_have_x, - [# One or both of the vars are not set, and there is no cached value. - if test "{$x_includes+set}" = set || test "$x_includes" = NONE; then - kde_x_includes=NO - else - kde_x_includes=$x_includes - fi - if test "{$x_libraries+set}" = set || test "$x_libraries" = NONE; then - kde_x_libraries=NO - else - kde_x_libraries=$x_libraries - fi - - # below we use the standard autoconf calls - ac_x_libraries=$kde_x_libraries - ac_x_includes=$kde_x_includes - - KDE_PATH_X_DIRECT - dnl AC_PATH_X_XMKMF picks /usr/lib as the path for the X libraries. - dnl Unfortunately, if compiling with the N32 ABI, this is not the correct - dnl location. The correct location is /usr/lib32 or an undefined value - dnl (the linker is smart enough to pick the correct default library). - dnl Things work just fine if you use just AC_PATH_X_DIRECT. - dnl Solaris has a similar problem. AC_PATH_X_XMKMF forces x_includes to - dnl /usr/openwin/include, which doesn't work. /usr/include does work, so - dnl x_includes should be left alone. - case "$host" in - mips-sgi-irix6*) - ;; - *-*-solaris*) - ;; - *) - _AC_PATH_X_XMKMF - if test -z "$ac_x_includes"; then - ac_x_includes="." - fi - if test -z "$ac_x_libraries"; then - ac_x_libraries="/usr/lib${kdelibsuff}" - fi - esac - #from now on we use our own again - - # when the user already gave --x-includes, we ignore - # what the standard autoconf macros told us. - if test "$kde_x_includes" = NO; then - kde_x_includes=$ac_x_includes - fi - - # for --x-libraries too - if test "$kde_x_libraries" = NO; then - kde_x_libraries=$ac_x_libraries - fi - - if test "$kde_x_includes" = NO; then - AC_MSG_ERROR([Can't find X includes. Please check your installation and add the correct paths!]) - fi - - if test "$kde_x_libraries" = NO; then - AC_MSG_ERROR([Can't find X libraries. Please check your installation and add the correct paths!]) - fi - - # Record where we found X for the cache. - kde_cv_have_x="have_x=yes \ - kde_x_includes=$kde_x_includes kde_x_libraries=$kde_x_libraries" - ])dnl - - eval "$kde_cv_have_x" - - if test "$have_x" != yes; then - AC_MSG_RESULT($have_x) - no_x=yes - else - AC_MSG_RESULT([libraries $kde_x_libraries, headers $kde_x_includes]) - fi - - if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then - X_INCLUDES="" - x_includes="."; dnl better than nothing :- - else - x_includes=$kde_x_includes - X_INCLUDES="-I$x_includes" - fi - - if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then - X_LDFLAGS="" - x_libraries="/usr/lib"; dnl better than nothing :- - else - x_libraries=$kde_x_libraries - X_LDFLAGS="-L$x_libraries" - fi - all_includes="$X_INCLUDES" - all_libraries="$X_LDFLAGS" - - AC_SUBST(X_INCLUDES) - AC_SUBST(X_LDFLAGS) - AC_SUBST(x_libraries) - AC_SUBST(x_includes) - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $X_LDFLAGS" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # --i...@ul..., kb...@cs.... - AC_CHECK_LIB(ICE, IceConnectionNumber, - [LIBSM="-lSM -lICE"], , $X_EXTRA_LIBS) - AC_SUBST(LIBSM) - LDFLAGS="$ac_save_LDFLAGS" - - AC_SUBST(X_PRE_LIBS) - - LIB_X11='-lX11 $(LIBSOCKET)' - AC_SUBST(LIB_X11) - - AC_MSG_CHECKING(for libXext) - AC_CACHE_VAL(kde_cv_have_libXext, - [ - kde_ldflags_safe="$LDFLAGS" - kde_libs_safe="$LIBS" - - LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS" - LIBS="-lXext -lX11 $LIBSOCKET" - - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <stdio.h> - #ifdef STDC_HEADERS - # include <stdlib.h> - #endif - ]], - [[printf("hello Xext\n");]])], - kde_cv_have_libXext=yes, - kde_cv_have_libXext=no - ) - - LDFLAGS=$kde_ldflags_safe - LIBS=$kde_libs_safe - ]) - - AC_MSG_RESULT($kde_cv_have_libXext) - - if test "$kde_cv_have_libXext" = "no"; then - AC_MSG_ERROR([We need a working libXext to proceed. Since configure - can't find it itself, we stop here assuming that make wouldn't find - them either.]) - fi - - AC_MSG_CHECKING(for Xinerama) - - AC_ARG_WITH(xinerama, - [ --with-xinerama enable support for Xinerama ], - [ - no_xinerama=no - ], [ - no_xinerama=yes - ] - ) - - kde_save_LDFLAGS="$LDFLAGS" - kde_save_CFLAGS="$CFLAGS" - kde_save_LIBS="$LIBS" - LDFLAGS="$LDFLAGS $X_LDFLAGS $USER_LDFLAGS" - CFLAGS="$CFLAGS -I$x_includes" - LIBS="-lXinerama -lXext" - - if test "x$no_xinerama" = "xno"; then - - AC_CACHE_VAL(ac_cv_have_xinerama, - [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <X11/Xlib.h> - #include <X11/extensions/Xinerama.h>]], - [[XineramaIsActive(NULL);]])], - [ac_cv_have_xinerama="yes"], - [ac_cv_have_xinerama="no"]) - ]) - else - ac_cv_have_xinerama=no; - fi - - AC_MSG_RESULT($ac_cv_have_xinerama) - - LIBXINERAMA="" - - if test "$ac_cv_have_xinerama" = "yes"; then - AC_DEFINE(HAVE_XINERAMA, 1, [Define if you want Xinerama support]) - LIBXINERAMA="-lXinerama" - fi - - AC_SUBST(LIBXINERAMA) - - LDFLAGS="$kde_save_LDFLAGS" - CFLAGS="$kde_save_CFLAGS" - LIBS="$kde_save_LIBS" - - LIB_XEXT="-lXext" - QTE_NORTTI="" - else - dnl We're using QT Embedded - CXXFLAGS=-DQWS - CXXFLAGS="$CXXFLAGS -fno-rtti" - QTE_NORTTI="-fno-rtti -DQWS" - X_PRE_LIBS="" - LIB_X11="" - LIB_XEXT="" - LIBSM="" - X_INCLUDES="" - X_LDFLAGS="" - x_includes="" - x_libraries="" - AC_SUBST(X_PRE_LIBS) - AC_SUBST(LIB_X11) - AC_SUBST(LIBSM) - AC_SUBST(X_INCLUDES) - AC_SUBST(X_LDFLAGS) - AC_SUBST(x_includes) - AC_SUBST(x_libraries) - fi - ;; - # end host case -esac - -AC_SUBST(QTE_NORTTI) -AC_SUBST(LIB_XEXT) - -AC_LANG_POP([C]) -]) - -# KDE_PATH_X_DIRECT -dnl Internal subroutine of AC_PATH_X. -dnl Set ac_x_includes and/or ac_x_libraries. -AC_DEFUN([KDE_PATH_X_DIRECT], -[ -AC_REQUIRE([KDE_CHECK_LIB64]) - -if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. - test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h - - # First, try using that file with no special directory specified. -AC_PREPROC_IFELSE([#include <$x_direct_test_include>], -[# We can compile using X headers with no special include directory. -ac_x_includes=], -[# Look for the header file in a standard set of common directories. -# Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in \ - /usr/X11/include \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11 \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11/include \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11 \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - \ - /usr/openwin/include \ - /usr/openwin/share/include \ - ; \ - do - if test -r "$ac_dir/$x_direct_test_include"; then - ac_x_includes=$ac_dir - break - fi - done]) -fi # $ac_x_includes = NO - -if test "$ac_x_libraries" = NO; then - # Check for the libraries. - - test -z "$x_direct_test_library" && x_direct_test_library=Xt - test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc - - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" - -AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[${x_direct_test_function}()]])], -# AC_TRY_LINK(, [${x_direct_test_function}()], -[LIBS="$ac_save_LIBS" -# We can link X programs with no special library path. -ac_x_libraries=], -[LIBS="$ac_save_LIBS" -# First see if replacing the include by lib works. -# Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ - /usr/X11/lib \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ - /usr/X11R4/lib \ - \ - /usr/lib/X11 \ - /usr/lib/X11R6 \ - /usr/lib/X11R5 \ - /usr/lib/X11R4 \ - \ - /usr/local/X11/lib \ - /usr/local/X11R6/lib \ - /usr/local/X11R5/lib \ - /usr/local/X11R4/lib \ - \ - /usr/local/lib/X11 \ - /usr/local/lib/X11R6 \ - /usr/local/lib/X11R5 \ - /usr/local/lib/X11R4 \ - \ - /usr/X386/lib \ - /usr/x386/lib \ - /usr/XFree86/lib/X11 \ - \ - /usr/lib \ - /usr/local/lib \ - /usr/unsupported/lib \ - /usr/athena/lib \ - /usr/local/x11r5/lib \ - /usr/lpp/Xamples/lib \ - /lib/usr/lib/X11 \ - \ - /usr/openwin/lib \ - /usr/openwin/share/lib \ - ; \ -do -dnl Don't even attempt the hair of trying to link an X program! - -dnl mrj: i removed the suffix {kdelibsuff} references above, so we -dnl have to also test them here, too. this is needed because not all 64 bit -dnl platforms use lib64 path exclusively (debian amd64 for one). - - for ac_extension in a so sl; do - if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then - echo "tried x dir $ac_dir" >&AS_MESSAGE_LOG_FD() - ac_x_libraries=$ac_dir - break 2 - fi - - for kdelibsuff in 32 64; do - ac_x_dir_with_suff=`echo $ac_dir | sed "s/lib/lib${kdelibsuff}/"` - if test -r $ac_x_dir_with_suff/lib${x_direct_test_library}.$ac_extension; then - echo "tried x dir $ac_dir" >&AS_MESSAGE_LOG_FD() - ac_x_libraries=$ac_dir - break 3 - fi - done - done -done]) -fi # $ac_x_libraries = NO -]) - AC_DEFUN([KDE_CHECK_LIB64], [ kdelibsuff=none Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2008-07-12 16:02:52 UTC (rev 2891) +++ trunk/tora/src/Makefile.am 2008-07-12 16:45:19 UTC (rev 2892) @@ -14,7 +14,7 @@ LOKIDIR_INC=$(top_srcdir)/src/loki/include LOKIDIR_SRC=$(top_srcdir)/src/loki/src -AM_CPPFLAGS = -I./otl -I$(LOKIDIR_INC) $(KDE_INCLUDES) $(QT_INCLUDES) $(LTDLINCL) +AM_CPPFLAGS = -I./otl -I$(LOKIDIR_INC) $(QT_INCLUDES) $(LTDLINCL) AM_CPPFLAGS += $(PCRE_CFLAGS) \ -DDEFAULT_PLUGIN_DIR=\"$(libdir)\" \ -DTOVERSION=\"$(PACKAGE_VERSION)\" \ @@ -24,17 +24,8 @@ $(QSCINTILLA_CXXFLAGS) AM_LDFLAGS = $(PCRE_LIBS) \ - $(KDE_LDFLAGS) \ - $(X_LDFLAGS) \ $(QT_LDFLAGS) \ - $(LIB_KPARTS) \ - $(LIB_KDEPRINT) \ - $(LIB_KDECORE) \ - $(LIB_KDEUI) \ - $(LIB_KIO) \ - $(LIB_KFILE) \ $(LIB_DCOP) \ - $(LIB_KHTML) \ -lstdc++ \ $(LIBPTHREAD) \ $(ORACLE_LDFLAGS) \ @@ -112,88 +103,88 @@ totool.cpp totool.h \ utils.cpp utils.h \ toalert.cpp toalert.h \ - toanalyze.cpp toanalyze.h \ - tobackup.cpp tobackup.h \ - tobackuptool.cpp tobackuptool.h \ - tobrowser.cpp tobrowser.h \ - tobarchart.cpp tobarchart.h \ - tocurrent.cpp tocurrent.h \ - todebug.cpp todebug.h \ - toeditextensions.cpp toeditextensions.h \ - todatatype.cpp todatatype.h \ - toinvalid.cpp toinvalid.h \ - tooutput.cpp tooutput.h \ - topassword.cpp \ - toprofiler.cpp toprofiler.h \ - toproject.cpp toproject.h \ - toqsqlconnection.cpp \ - torollback.cpp torollback.h \ - toscript.cpp toscript.h \ - toscriptschemawidget.cpp toscriptschemawidget.h \ - toscripttreeitem.cpp toscripttreeitem.h \ - toscripttreemodel.cpp toscripttreemodel.h \ - tosecurity.cpp tosecurity.h \ - tosession.cpp tosession.h \ - tosgatrace.cpp tosgatrace.h \ - tosqledit.cpp tosqledit.h \ - tostorage.cpp tostorage.h \ - tostoragedefinition.cpp tostoragedefinition.h \ - totemplate.cpp totemplate.h \ - totemporary.cpp totemporary.h \ - totuning.cpp totuning.h \ - tounittest.cpp tounittest.h \ - tochangeconnection.cpp tochangeconnection.h \ - toworkingwidget.cpp toworkingwidget.h \ - toworksheet.cpp toworksheet.h \ - toeditablemenu.cpp toeditablemenu.h \ - toworksheetwidget.cpp toworksheetwidget.h \ - toworksheettext.cpp toworksheettext.h \ - toworksheetstatistic.cpp toworksheetstatistic.h \ - tobrowserconstraint.cpp tobrowserconstraint.h \ - tobrowserindex.cpp tobrowserindex.h \ - tobrowsertable.cpp tobrowsertable.h \ - tochartmanager.cpp tochartmanager.h \ - tolegendchart.cpp tolegendchart.h \ - tolinechart.cpp tolinechart.h \ - topiechart.cpp topiechart.h \ - toresultbar.cpp toresultbar.h \ - toresultline.cpp toresultline.h \ - toresultpie.cpp toresultpie.h \ - todebugtext.cpp todebugtext.h \ - toextract.cpp toextract.h \ - toreport.cpp toreport.h \ - toresultextract.cpp toresultextract.h \ - toresultcols.cpp toresultcols.h \ + toanalyze.cpp toanalyze.h \ + tobackup.cpp tobackup.h \ + tobackuptool.cpp tobackuptool.h \ + tobrowser.cpp tobrowser.h \ + tobarchart.cpp tobarchart.h \ + tocurrent.cpp tocurrent.h \ + todebug.cpp todebug.h \ + toeditextensions.cpp toeditextensions.h \ + todatatype.cpp todatatype.h \ + toinvalid.cpp toinvalid.h \ + tooutput.cpp tooutput.h \ + topassword.cpp \ + toprofiler.cpp toprofiler.h \ + toproject.cpp toproject.h \ + toqsqlconnection.cpp \ + torollback.cpp torollback.h \ + toscript.cpp toscript.h \ + toscriptschemawidget.cpp toscriptschemawidget.h \ + toscripttreeitem.cpp toscripttreeitem.h \ + toscripttreemodel.cpp toscripttreemodel.h \ + tosecurity.cpp tosecurity.h \ + tosession.cpp tosession.h \ + tosgatrace.cpp tosgatrace.h \ + tosqledit.cpp tosqledit.h \ + tostorage.cpp tostorage.h \ + tostoragedefinition.cpp tostoragedefinition.h \ + totemplate.cpp totemplate.h \ + totemporary.cpp totemporary.h \ + totuning.cpp totuning.h \ + tounittest.cpp tounittest.h \ + tochangeconnection.cpp tochangeconnection.h \ + toworkingwidget.cpp toworkingwidget.h \ + toworksheet.cpp toworksheet.h \ + toeditablemenu.cpp toeditablemenu.h \ + toworksheetwidget.cpp toworksheetwidget.h \ + toworksheettext.cpp toworksheettext.h \ + toworksheetstatistic.cpp toworksheetstatistic.h \ + tobrowserconstraint.cpp tobrowserconstraint.h \ + tobrowserindex.cpp tobrowserindex.h \ + tobrowsertable.cpp tobrowsertable.h \ + tochartmanager.cpp tochartmanager.h \ + tolegendchart.cpp tolegendchart.h \ + tolinechart.cpp tolinechart.h \ + topiechart.cpp topiechart.h \ + toresultbar.cpp toresultbar.h \ + toresultline.cpp toresultline.h \ + toresultpie.cpp toresultpie.h \ + todebugtext.cpp todebugtext.h \ + toextract.cpp toextract.h \ + toreport.cpp toreport.h \ + toresultextract.cpp toresultextract.h \ + toresultcols.cpp toresultcols.h \ toresultcolscomment.cpp toresultcolscomment.h \ - toresultcombo.cpp toresultcombo.h \ - toresultschema.cpp toresultschema.h \ - toresultdepend.cpp toresultdepend.h \ - toresultlabel.cpp toresultlabel.h \ - toresultlock.cpp toresultlock.h \ - toresultlong.cpp toresultlong.h \ - toresultplan.cpp toresultplan.h \ - toresultparam.cpp toresultparam.h \ - toresultstorage.cpp toresultstorage.h \ - tofilesize.cpp tofilesize.h \ - tosgastatement.cpp tosgastatement.h \ - totableselect.cpp totableselect.h \ - tovisualize.cpp tovisualize.h \ - towaitevents.cpp towaitevents.h \ - migratetool/connectionmodel.cpp migratetool/connectionmodel.h \ - migratetool/sqldeveloper.cpp migratetool/sqldeveloper.h \ - migratetool/squirrelsql.cpp migratetool/squirrelsql.h \ - $(EXTRA_ORACLE_MONO_SOURCE) \ + toresultcombo.cpp toresultcombo.h \ + toresultschema.cpp toresultschema.h \ + toresultdepend.cpp toresultdepend.h \ + toresultlabel.cpp toresultlabel.h \ + toresultlock.cpp toresultlock.h \ + toresultlong.cpp toresultlong.h \ + toresultplan.cpp toresultplan.h \ + toresultparam.cpp toresultparam.h \ + toresultstorage.cpp toresultstorage.h \ + tofilesize.cpp tofilesize.h \ + tosgastatement.cpp tosgastatement.h \ + totableselect.cpp totableselect.h \ + tovisualize.cpp tovisualize.h \ + towaitevents.cpp towaitevents.h \ + migratetool/connectionmodel.cpp migratetool/connectionmodel.h \ + migratetool/sqldeveloper.cpp migratetool/sqldeveloper.h \ + migratetool/squirrelsql.cpp migratetool/squirrelsql.h \ + $(EXTRA_ORACLE_MONO_SOURCE) \ $(LOKIDIR_SRC)/SmallObj.cpp \ $(LOKIDIR_SRC)/Singleton.cpp \ $(EXTRA_tora_SOURCES) \ $(BUILT_SOURCES) -UI_FILES = toaboutui.ui \ +UI_FILES = toaboutui.ui \ tobrowserconstraintui.ui \ tobrowserfilterui.ui \ tobrowserindexui.ui \ tobrowsertableui.ui \ - toconnectionimportui.ui \ + toconnectionimportui.ui \ tooraclesettingui.ui \ tostoragetablespaceui.ui \ tochartalarmui.ui \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-07-12 18:38:54
|
Revision: 2893 http://tora.svn.sourceforge.net/tora/?rev=2893&view=rev Author: mrjohnson0 Date: 2008-07-12 11:39:02 -0700 (Sat, 12 Jul 2008) Log Message: ----------- make tests for moc, uic and rcc to ensure they work before compiling Modified Paths: -------------- trunk/tora/config/m4/qtkde.m4 trunk/tora/configure.ac Modified: trunk/tora/config/m4/qtkde.m4 =================================================================== --- trunk/tora/config/m4/qtkde.m4 2008-07-12 16:45:19 UTC (rev 2892) +++ trunk/tora/config/m4/qtkde.m4 2008-07-12 18:39:02 UTC (rev 2893) @@ -443,42 +443,6 @@ fi ]) -AC_DEFUN([KDE_MOC_ERROR_MESSAGE], -[ - AC_MSG_ERROR([No Qt meta object compiler (moc) found! -Please check whether you installed Qt correctly. -You need to have a running moc binary. -configure tried to run $ac_cv_path_moc and the test didn't -succeed. If configure shouldn't have tried this one, set -the environment variable MOC to the right one before running -configure. -]) -]) - -AC_DEFUN([KDE_RCC_ERROR_MESSAGE], -[ - AC_MSG_ERROR([No Qt resource compiler (rcc) found! -Please check whether you installed Qt correctly. -You need to have a running rcc binary. -configure tried to run $ac_cv_path_rcc and the test didn't -succeed. If configure shouldn't have tried this one, set -the environment variable RCC to the right one before running -configure. -]) -]) - -AC_DEFUN([KDE_UIC_ERROR_MESSAGE], -[ - AC_MSG_WARN([No Qt ui compiler (uic) found! -Please check whether you installed Qt correctly. -You need to have a running uic binary. -configure tried to run $ac_cv_path_uic and the test didn't -succeed. If configure shouldn't have tried this one, set -the environment variable UIC to the right one before running -configure. -]) -]) - AC_DEFUN([KDE_LRELEASE_ERROR_MESSAGE], [ AC_MSG_WARN([No lrelease found! @@ -532,6 +496,150 @@ fi ]) +AC_DEFUN([AC_PATH_MOC], +[ + ac_path_moc=NO + AC_ARG_WITH([moc], + AC_HELP_STRING([--with-moc], + [path to moc (default searches PATH)]), + [ ac_path_moc="$withval" ]) + + if test "$ac_path_moc" = NO; then + AC_PATH_PROGS([ac_path_moc], [moc-qt4 moc], [NO], [$QTDIR/bin:$PATH]) + fi + + if test "$ac_path_moc" = NO; then + AC_MSG_ERROR([ + moc binary not found. + + You can change this by using --with-moc=PATH + + Please check you have the moc program installed. For more + details about this problem, look at the end of config.log.]) + fi + + MOC="$ac_path_moc" + AC_MSG_CHECKING([$MOC works]) + + dnl should probably write out a test header, but this will work for now + ac_path_moc_cmd="$MOC src/toabout.h -o test.cpp" + echo "trying moc $ac_path_moc_cmd" >&AS_MESSAGE_LOG_FD() + $ac_path_moc_cmd 2>conftest.err + ac_path_moc_status=$? + cat conftest.err >&5 + echo "status $ac_path_moc_status" >&5 + rm -f conftest.err + rm -f test.cpp + + if test "$ac_path_moc_status" != "0"; then + AC_MSG_ERROR([ + + Running $MOC failed. It is likely the wrong version. Please + check your installation. + + You can change this by using --with-moc=PATH]) + fi + + AC_MSG_RESULT(yes) + AC_SUBST(MOC) +]) + +AC_DEFUN([AC_PATH_UIC], +[ + ac_path_uic=NO + AC_ARG_WITH([uic], + AC_HELP_STRING([--with-uic], + [path to uic (default searches PATH)]), + [ ac_path_uic="$withval" ]) + + if test "$ac_path_uic" = NO; then + AC_PATH_PROGS([ac_path_uic], [uic-qt4 uic], [NO], [$QTDIR/bin:$PATH]) + fi + + if test "$ac_path_uic" = NO; then + AC_MSG_ERROR([ + uic binary not found. + + You can change this by using --with-uic=PATH + + Please check you have the uic program installed. For more + details about this problem, look at the end of config.log.]) + fi + + UIC="$ac_path_uic" + AC_MSG_CHECKING([$UIC works]) + + dnl should probably write out a test header, but this will work for now + ac_path_uic_cmd="$UIC src/toaboutui.ui -o test.h" + echo "trying uic $ac_path_uic_cmd" >&AS_MESSAGE_LOG_FD() + $ac_path_uic_cmd 2>conftest.err + ac_path_uic_status=$? + cat conftest.err >&5 + echo "status $ac_path_uic_status" >&5 + rm -f conftest.err + rm -f test.h + + if test "$ac_path_uic_status" != "0"; then + AC_MSG_ERROR([ + + Running $UIC failed. It is likely the wrong version. Please + check your installation. + + You can change this by using --with-uic=PATH]) + fi + + AC_MSG_RESULT(yes) + AC_SUBST(UIC) +]) + +AC_DEFUN([AC_PATH_RCC], +[ + ac_path_rcc=NO + AC_ARG_WITH([rcc], + AC_HELP_STRING([--with-rcc], + [path to rcc (default searches PATH)]), + [ ac_path_rcc="$withval" ]) + + if test "$ac_path_rcc" = NO; then + AC_PATH_PROGS([ac_path_rcc], [rcc-qt4 rcc], [NO], [$QTDIR/bin:$PATH]) + fi + + if test "$ac_path_rcc" = NO; then + AC_MSG_ERROR([ + rcc binary not found. $QTDIR/bin:$PATH + + You can change this by using --with-rcc=PATH + + Please check you have the rcc program installed. For more + details about this problem, look at the end of config.log.]) + fi + + RCC="$ac_path_rcc" + AC_MSG_CHECKING([$RCC works]) + + dnl should probably write out a test header, but this will work for now + ac_path_rcc_cmd="$RCC src/tora.qrc -o test.cpp" + echo "trying rcc $ac_path_rcc_cmd" >&AS_MESSAGE_LOG_FD() + $ac_path_rcc_cmd 2>conftest.err + ac_path_rcc_status=$? + cat conftest.err >&5 + echo "status $ac_path_rcc_status" >&5 + rm -f conftest.err + rm -f test.cpp + + if test "$ac_path_rcc_status" != "0"; then + AC_MSG_ERROR([ + + Running $RCC failed. It is likely the wrong version. Please + check your installation. + + You can change this by using --with-rcc=PATH]) + fi + + AC_MSG_RESULT(yes) + AC_SUBST(RCC) +]) + dnl ------------------------------------------------------------------------ dnl mrj: hacked to find lrelease and lupdate, too dnl Find the meta object compiler and the ui compiler in the PATH, @@ -549,41 +657,11 @@ qt_bindirs="$ac_qt_bindir $qt_bindirs" fi - dnl AC_ARG_VAR([LRELEASE]) - dnl AC_ARG_VAR([LUPDATE]) - dnl AC_ARG_VAR([MOC]) - KDE_FIND_PATH(lrelease, LRELEASE, [$qt_bindirs], [KDE_LRELEASE_ERROR_MESSAGE]) KDE_FIND_PATH(lupdate, LUPDATE, [$qt_bindirs], [KDE_LUPDATE_ERROR_MESSAGE]) - KDE_FIND_PATH(rcc, RCC, [$qt_bindirs], [KDE_RCC_ERROR_MESSAGE]) - KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE]) - if test -z "$UIC_NOT_NEEDED"; then - KDE_FIND_PATH(uic, UIC_PATH, [$qt_bindirs], [UIC_PATH=""]) - if test -z "$UIC_PATH" ; then - KDE_UIC_ERROR_MESSAGE - exit 1 - else - KDE_CHECK_UIC_FLAG(L,[/nonexistant],ac_uic_supports_libpath=yes,ac_uic_supports_libpath=no) - KDE_CHECK_UIC_FLAG(nounload,,ac_uic_supports_nounload=yes,ac_uic_supports_nounload=no) - - UIC=$UIC_PATH - if test x$ac_uic_supports_libpath = xyes; then - UIC="$UIC -L \$(kde_widgetdir)" - fi - if test x$ac_uic_supports_nounload = xyes; then - UIC="$UIC -nounload" - fi - fi - else - UIC="echo uic not available: " - fi - AC_SUBST(LRELEASE) AC_SUBST(LUPDATE) - AC_SUBST(MOC) - AC_SUBST(UIC) - AC_SUBST(RCC) ]) AC_DEFUN([KDE_MISC_TESTS], Modified: trunk/tora/configure.ac =================================================================== --- trunk/tora/configure.ac 2008-07-12 16:45:19 UTC (rev 2892) +++ trunk/tora/configure.ac 2008-07-12 18:39:02 UTC (rev 2893) @@ -45,6 +45,9 @@ TORA_LIBTOOL_ALL TORA_WINDOWS AC_PATH_QT +AC_PATH_MOC +AC_PATH_UIC +AC_PATH_RCC TORA_CHECK_ORACLE TORA_CHECK_QSCINTILLA AX_PATH_LIB_PCRE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |