From: <mrj...@us...> - 2008-07-20 21:17:46
|
Revision: 2898 http://tora.svn.sourceforge.net/tora/?rev=2898&view=rev Author: mrjohnson0 Date: 2008-07-20 21:17:12 +0000 (Sun, 20 Jul 2008) Log Message: ----------- adds a config test and a way to cancel queries on older postgres databases that don't have pg_cancel_backend. this is awesome if you're stuck on an old postgres version which is behind a firewall with an absurdly low timeout configuration -- because the network admins are crazy paranoid -- like i am. Modified Paths: -------------- trunk/tora/INSTALL trunk/tora/configure.ac trunk/tora/src/toqsqlconnection.cpp Added Paths: ----------- trunk/tora/config/m4/postgresql.m4 Modified: trunk/tora/INSTALL =================================================================== --- trunk/tora/INSTALL 2008-07-20 21:08:49 UTC (rev 2897) +++ trunk/tora/INSTALL 2008-07-20 21:17:12 UTC (rev 2898) @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free -Software Foundation, Inc. +Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, +2006, 2007 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -10,7 +10,10 @@ Basic Installation ================== -These are generic installation instructions. +Briefly, the shell commands `./configure; make; make install' should +configure, build, and install this package. The following +more-detailed instructions are generic; see the `README' file for +instructions specific to this package. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -23,9 +26,9 @@ It can also use an optional file (typically called `config.cache' and enabled with `--cache-file=config.cache' or simply `-C') that saves -the results of its tests to speed up reconfiguring. (Caching is +the results of its tests to speed up reconfiguring. Caching is disabled by default to prevent problems with accidental use of stale -cache files.) +cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail @@ -35,20 +38,17 @@ may remove or edit it. The file `configure.ac' (or `configure.in') is used to create -`configure' by a program called `autoconf'. You only need -`configure.ac' if you want to change it or regenerate `configure' using -a newer version of `autoconf'. +`configure' by a program called `autoconf'. You need `configure.ac' if +you want to change it or regenerate `configure' using a newer version +of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type - `./configure' to configure the package for your system. If you're - using `csh' on an old version of System V, you might need to type - `sh ./configure' instead to prevent `csh' from trying to execute - `configure' itself. + `./configure' to configure the package for your system. - Running `configure' takes awhile. While running, it prints some - messages telling which features it is checking for. + Running `configure' might take a while. While running, it prints + some messages telling which features it is checking for. 2. Type `make' to compile the package. @@ -67,6 +67,9 @@ all sorts of other programs in order to regenerate files that came with the distribution. + 6. Often, you can also type `make uninstall' to remove the installed + files again. + Compilers and Options ===================== @@ -78,7 +81,7 @@ by setting variables in the command line or in the environment. Here is an example: - ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix + ./configure CC=c99 CFLAGS=-g LIBS=-lposix *Note Defining Variables::, for more details. @@ -87,17 +90,15 @@ 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 +own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. - If you have to use a `make' that does not support the `VPATH' -variable, you have to compile the package for one architecture at a -time in the source code directory. After you have installed the -package for one architecture, use `make distclean' before reconfiguring -for another architecture. + With a non-GNU `make', it is safer to compile the package for one +architecture at a time in the source code directory. After you have +installed the package for one architecture, use `make distclean' before +reconfiguring for another architecture. Installation Names ================== @@ -190,12 +191,12 @@ ./configure CC=/usr/local2/bin/gcc 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: +overridden in the site shell script). - /bin/bash ./configure CONFIG_SHELL=/bin/bash +Unfortunately, this technique does not work for `CONFIG_SHELL' due to +an Autoconf bug. Until the bug is fixed you can use this workaround: -Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent -configuration-related scripts to be executed by `/bin/bash'. + CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation ====================== Added: trunk/tora/config/m4/postgresql.m4 =================================================================== --- trunk/tora/config/m4/postgresql.m4 (rev 0) +++ trunk/tora/config/m4/postgresql.m4 2008-07-20 21:17:12 UTC (rev 2898) @@ -0,0 +1,14 @@ +## -*- mode: autoconf; tab-width: 2; -*- + +dnl mrj: set default prefix for tora +AC_DEFUN([TORA_CHECK_POSTGRES], +[ + AC_CHECK_DECL([PQcancel], + [ac_pg_cancel=yes], + [ac_pg_cancel=no], + [#include <postgresql/libpq-fe.h>]) + + if test $ac_pg_cancel = yes; then + AC_DEFINE([LIBPQ_DECL_CHECK], 1, [Define if libpg-fe.h declares PQcancel.]) + fi +]) Modified: trunk/tora/configure.ac =================================================================== --- trunk/tora/configure.ac 2008-07-20 21:08:49 UTC (rev 2897) +++ trunk/tora/configure.ac 2008-07-20 21:17:12 UTC (rev 2898) @@ -48,6 +48,7 @@ AC_PATH_MOC AC_PATH_UIC AC_PATH_RCC +TORA_CHECK_POSTGRES TORA_CHECK_ORACLE TORA_CHECK_QSCINTILLA AX_PATH_LIB_PCRE Modified: trunk/tora/src/toqsqlconnection.cpp =================================================================== --- trunk/tora/src/toqsqlconnection.cpp 2008-07-20 21:08:49 UTC (rev 2897) +++ trunk/tora/src/toqsqlconnection.cpp 2008-07-20 21:17:12 UTC (rev 2898) @@ -62,6 +62,9 @@ #include <QGridLayout> #include <QString> +#ifdef HAVE_POSTGRESQL_LIBPQ_FE_H + #include <postgresql/libpq-fe.h> +#endif static toSQL SQLVersion("toQSqlConnection:Version", "SHOW VARIABLES LIKE 'version'", @@ -197,10 +200,38 @@ static toSQL SQLCancelPg("toQSqlConnection:Cancel", "SELECT pg_cancel_backend(:pid)", "", - "", + "8.0", "PostgreSQL"); +// seems to be the only way for < 8.0 to not get pg_cancel_backend +static toSQL SQLCancelPgOld("toQSqlConnection:Cancel", + "native", + "", + "", + "PostgreSQL"); + +void native_cancel(QSqlDriver *driver) { + QVariant v = driver->handle(); + if(v.isValid() && v.typeName() == QString("PGconn*")) { +#ifdef LIBPQ_DECL_CHECK + PGconn *handle = *static_cast<PGconn **>(v.data()); + if(!handle) + return; + + PGcancel *cancel = PQgetCancel(handle); + if(!cancel) + return; + + char *errbuf = new char[1024]; + PQcancel(cancel, errbuf, 1024); + PQfreeCancel(cancel); + delete[] errbuf; +#endif + } +} + + struct toQSqlProviderAggregate { enum aggregateType @@ -1093,17 +1124,17 @@ QString ConnectionID; qSqlSub(QSqlDatabase conn, const QString &name) - : Lock(1), Connection(conn), Name(name) - { } + : Lock(1), Connection(conn), Name(name) { + } void lockUp() { - Lock.up(); +// Lock.up(); } void lockDown () { - Lock.down(); +// Lock.down(); } int getLockValue() @@ -1189,14 +1220,14 @@ try { toConnection &conn = query()->connection(); - toQList pars; - pars.insert(pars.end(), Connection->ConnectionID); - conn.execute(SQLCancel, pars); - // don't reconnect. causes lots of problems, if - // this doesn't work may need to emulate by adding - // Canceled bool member and manually throwing - // exceptions -// Connection->reconnect(conn); + const QString &sql = toSQL::sql(SQLCancel, conn); + if(!sql.isEmpty() && sql != "native") { + toQList pars; + pars.insert(pars.end(), Connection->ConnectionID); + conn.execute(sql, pars); + } + else + native_cancel(Connection->Connection.driver()); } catch (...) {} @@ -1751,11 +1782,11 @@ void toQSqlProvider::qSqlQuery::execute(void) { - while (Connection->getLockValue() > 1) - { - Connection->lockDown(); - toStatusMessage(QString::fromLatin1("Too high value on connection lock semaphore")); - } +// while (Connection->getLockValue() > 1) +// { +// Connection->lockDown(); +// toStatusMessage(QString::fromLatin1("Too high value on connection lock semaphore")); +// } Connection->lockDown(); Query = NULL; try @@ -1792,10 +1823,10 @@ void toQSqlProvider::qSqlQuery::checkQuery(void) // Must call with lockDown!!!! { - while (Connection->getLockValue() > 0) - { - toStatusMessage(QString::fromLatin1("Too high value on connection lock semaphore for checkQuery")); - } +// while (Connection->getLockValue() > 0) +// { +// toStatusMessage(QString::fromLatin1("Too high value on connection lock semaphore for checkQuery")); +// } do { if (!Query->isActive()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-07-28 08:44:52
|
Revision: 2911 http://tora.svn.sourceforge.net/tora/?rev=2911&view=rev Author: subik Date: 2008-07-28 08:45:01 +0000 (Mon, 28 Jul 2008) Log Message: ----------- adopt help path changes into cfg and cmake scripts Modified Paths: -------------- trunk/tora/CMakeLists.txt trunk/tora/doc/help/CMakeLists.txt trunk/tora/doc/help/images/CMakeLists.txt trunk/tora/src/toconfiguration.cpp Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-07-27 22:29:44 UTC (rev 2910) +++ trunk/tora/CMakeLists.txt 2008-07-28 08:45:01 UTC (rev 2911) @@ -59,10 +59,10 @@ 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}\\\"") +#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 ########## @@ -257,6 +257,7 @@ NEWS README README.BINARIES + README.CMAKE README.CODESTYLE README.LAYOUT README.LICENSE Modified: trunk/tora/doc/help/CMakeLists.txt =================================================================== --- trunk/tora/doc/help/CMakeLists.txt 2008-07-27 22:29:44 UTC (rev 2910) +++ trunk/tora/doc/help/CMakeLists.txt 2008-07-28 08:45:01 UTC (rev 2911) @@ -1,12 +1,12 @@ -FILE( GLOB TORA_DOC_FILES *.htm* ) -#FILE( GLOB TORA_API_FILES ./api/*.htm* ) +#FILE( GLOB TORA_DOC_FILES *.htm* ) +##FILE( GLOB TORA_API_FILES ./api/*.htm* ) -IF (WIN32) - INSTALL(FILES ${TORA_DOC_FILES} DESTINATION help/) - INSTALL(FILES ${TORA_API_FILES} DESTINATION help/api/) -ELSE (WIN32) - INSTALL(FILES ${TORA_DOC_FILES} DESTINATION ${TORA_HELP_DIR}) -# INSTALL(FILES ${TORA_API_FILES} DESTINATION ${TORA_HELP_DIR}/api/) -ENDIF (WIN32) +#IF (WIN32) +# INSTALL(FILES ${TORA_DOC_FILES} DESTINATION help/) +## INSTALL(FILES ${TORA_API_FILES} DESTINATION help/api/) +#ELSE (WIN32) +# INSTALL(FILES ${TORA_DOC_FILES} DESTINATION ${TORA_HELP_DIR}) +## INSTALL(FILES ${TORA_API_FILES} DESTINATION ${TORA_HELP_DIR}/api/) +#ENDIF (WIN32) -SUBDIRS(images) +#SUBDIRS(images) Modified: trunk/tora/doc/help/images/CMakeLists.txt =================================================================== --- trunk/tora/doc/help/images/CMakeLists.txt 2008-07-27 22:29:44 UTC (rev 2910) +++ trunk/tora/doc/help/images/CMakeLists.txt 2008-07-28 08:45:01 UTC (rev 2911) @@ -1,2 +1,2 @@ -FILE( GLOB TORA_DOC_IMAGES *.png ) -INSTALL(FILES ${TORA_DOC_IMAGES} DESTINATION ${TORA_HELP_DIR}/images/) +#FILE( GLOB TORA_DOC_IMAGES *.png ) +#INSTALL(FILES ${TORA_DOC_IMAGES} DESTINATION ${TORA_HELP_DIR}/images/) Modified: trunk/tora/src/toconfiguration.cpp =================================================================== --- trunk/tora/src/toconfiguration.cpp 2008-07-27 22:29:44 UTC (rev 2910) +++ trunk/tora/src/toconfiguration.cpp 2008-07-28 08:45:01 UTC (rev 2911) @@ -13,12 +13,6 @@ #include <QSettings> #include "toconf.h" -// FIXME: this should be set in autohell too -#ifndef TORA_HELP_DIR -#define TORA_HELP_DIR "" -#endif - - // static one void toConfiguration::setQSettingsEnv() { @@ -66,7 +60,7 @@ m_dbTitle = s.value(CONF_DB_TITLE, true).toBool(); m_sizeUnit = s.value(CONF_SIZE_UNIT, DEFAULT_SIZE_UNIT).toString(); - m_helpPath = s.value(CONF_HELP_PATH, TORA_HELP_DIR + QString("/toc.html")).toString(); + m_helpPath = s.value(CONF_HELP_PATH, "qrc:/help/toc.html").toString(); m_statusSave = s.value(CONF_STATUS_SAVE, DEFAULT_STATUS_SAVE).toInt(); m_autoCommit = s.value(CONF_AUTO_COMMIT, false).toBool(); m_changeConnection = s.value(CONF_CHANGE_CONNECTION, true).toBool(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-08-04 01:09:11
|
Revision: 2928 http://tora.svn.sourceforge.net/tora/?rev=2928&view=rev Author: mrjohnson0 Date: 2008-08-04 01:09:20 +0000 (Mon, 04 Aug 2008) Log Message: ----------- renamed symbol Modified Paths: -------------- trunk/tora/config/m4/postgresql.m4 trunk/tora/src/toqsqlconnection.cpp Modified: trunk/tora/config/m4/postgresql.m4 =================================================================== --- trunk/tora/config/m4/postgresql.m4 2008-08-03 23:34:45 UTC (rev 2927) +++ trunk/tora/config/m4/postgresql.m4 2008-08-04 01:09:20 UTC (rev 2928) @@ -9,6 +9,6 @@ [#include <postgresql/libpq-fe.h>]) if test $ac_pg_cancel = yes; then - AC_DEFINE([LIBPQ_DECL_CHECK], 1, [Define if libpg-fe.h declares PQcancel.]) + AC_DEFINE([LIBPQ_DECL_CANCEL], 1, [Define if libpg-fe.h declares PQcancel.]) fi ]) Modified: trunk/tora/src/toqsqlconnection.cpp =================================================================== --- trunk/tora/src/toqsqlconnection.cpp 2008-08-03 23:34:45 UTC (rev 2927) +++ trunk/tora/src/toqsqlconnection.cpp 2008-08-04 01:09:20 UTC (rev 2928) @@ -216,7 +216,7 @@ void native_cancel(QSqlDriver *driver) { QVariant v = driver->handle(); if(v.isValid() && v.typeName() == QString("PGconn*")) { -#ifdef LIBPQ_DECL_CHECK +#ifdef LIBPQ_DECL_CANCEL PGconn *handle = *static_cast<PGconn **>(v.data()); if(!handle) return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-08-12 08:57:10
|
Revision: 2937 http://tora.svn.sourceforge.net/tora/?rev=2937&view=rev Author: subik Date: 2008-08-12 08:56:53 +0000 (Tue, 12 Aug 2008) Log Message: ----------- New tool: PL/SQL Editor. It can be used without debug grants and it can compile units without debug symbols + Error marks for editors are QMap based now to save memory with its implicit sharing. Modified Paths: -------------- trunk/tora/doc/help/Index.html trunk/tora/doc/help/alert.html trunk/tora/doc/help/analyze.html trunk/tora/doc/help/api.html trunk/tora/doc/help/browser.html trunk/tora/doc/help/current.html trunk/tora/doc/help/debugger.html trunk/tora/doc/help/extendingtora.html trunk/tora/doc/help/index.html trunk/tora/doc/help/invalid.html trunk/tora/doc/help/output.html trunk/tora/doc/help/rollback.html trunk/tora/doc/help/script.html trunk/tora/doc/help/security.html trunk/tora/doc/help/session.html trunk/tora/doc/help/sqledit.html trunk/tora/doc/help/storage.html trunk/tora/doc/help/template.html trunk/tora/doc/help/toc.html trunk/tora/doc/help/tools.html trunk/tora/doc/help/tools.texi trunk/tora/doc/help/tora.texi trunk/tora/doc/help/trace.html trunk/tora/doc/help/tuning.html trunk/tora/doc/help/unittest.html trunk/tora/src/CMakeLists.txt trunk/tora/src/Makefile.am trunk/tora/src/help/Index.html trunk/tora/src/help/alert.html trunk/tora/src/help/analyze.html trunk/tora/src/help/api.html trunk/tora/src/help/browser.html trunk/tora/src/help/current.html trunk/tora/src/help/debugger.html trunk/tora/src/help/extendingtora.html trunk/tora/src/help/index.html trunk/tora/src/help/invalid.html trunk/tora/src/help/output.html trunk/tora/src/help/rollback.html trunk/tora/src/help/script.html trunk/tora/src/help/security.html trunk/tora/src/help/session.html trunk/tora/src/help/sqledit.html trunk/tora/src/help/storage.html trunk/tora/src/help/template.html trunk/tora/src/help/toc.html trunk/tora/src/help/tools.html trunk/tora/src/help/trace.html trunk/tora/src/help/tuning.html trunk/tora/src/help/unittest.html trunk/tora/src/todebugtext.cpp trunk/tora/src/tohighlightedtext.cpp trunk/tora/src/tohighlightedtext.h trunk/tora/src/toinvalid.cpp trunk/tora/src/tora.qrc trunk/tora/src/tosyntaxsetup.cpp Added Paths: ----------- trunk/tora/doc/help/plsqleditor.html trunk/tora/doc/help/plsqleditor.texi trunk/tora/src/help/plsqleditor.html trunk/tora/src/icons/compilewarning.xpm trunk/tora/src/toplsqleditor.cpp trunk/tora/src/toplsqleditor.h trunk/tora/src/toplsqltext.cpp trunk/tora/src/toplsqltext.h Modified: trunk/tora/doc/help/Index.html =================================================================== --- trunk/tora/doc/help/Index.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/Index.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -35,38 +35,39 @@ <ul class="index-cp" compact> <li><a href="additionalhelp.html#index-Additional-Help-Settings-13">Additional Help Settings</a>: <a href="additionalhelp.html#additionalhelp">additionalhelp</a></li> -<li><a href="alert.html#index-Alert-Tool-30">Alert Tool</a>: <a href="alert.html#alert">alert</a></li> +<li><a href="alert.html#index-Alert-Tool-31">Alert Tool</a>: <a href="alert.html#alert">alert</a></li> <li><a href="tools.html#index-Available-tools-16">Available tools</a>: <a href="tools.html#tools">tools</a></li> <li><a href="newconnection.html#index-Connecting-to-a-database-5">Connecting to a database</a>: <a href="newconnection.html#newconnection">newconnection</a></li> -<li><a href="current.html#index-Current-Session-27">Current Session</a>: <a href="current.html#current">current</a></li> +<li><a href="current.html#index-Current-Session-28">Current Session</a>: <a href="current.html#current">current</a></li> <li><a href="browser.html#index-Database-Browser-18">Database Browser</a>: <a href="browser.html#browser">browser</a></li> <li><a href="database.html#index-Database-Settings-11">Database Settings</a>: <a href="database.html#database">database</a></li> <li><a href="window.html#index-Elements-of-the-main-window-4">Elements of the main window</a>: <a href="window.html#window">window</a></li> -<li><a href="extendingtora.html#index-Extending-TOra-35">Extending TOra</a>: <a href="extendingtora.html#extendingtora">extendingtora</a></li> +<li><a href="extendingtora.html#index-Extending-TOra-36">Extending TOra</a>: <a href="extendingtora.html#extendingtora">extendingtora</a></li> <li><a href="fonts.html#index-Font-Settings-12">Font Settings</a>: <a href="fonts.html#fonts">fonts</a></li> <li><a href="workspace.html#index-Getting-to-know-your-workspace-3">Getting to know your workspace</a>: <a href="workspace.html#workspace">workspace</a></li> <li><a href="history.html#index-History-and-future-of-TOra-2">History and future of TOra</a>: <a href="history.html#history">history</a></li> -<li><a href="invalid.html#index-Invalid-Objects-31">Invalid Objects</a>: <a href="invalid.html#invalid">invalid</a></li> +<li><a href="invalid.html#index-Invalid-Objects-32">Invalid Objects</a>: <a href="invalid.html#invalid">invalid</a></li> <li><a href="lists.html#index-lists-7">lists</a>: <a href="lists.html#lists">lists</a></li> <li><a href="preferences.html#index-Options-10">Options</a>: <a href="preferences.html#preferences">preferences</a></li> <li><a href="common.html#index-Other-common-elements-15">Other common elements</a>: <a href="common.html#common">common</a></li> -<li><a href="debugger.html#index-PL_002fSQL-Debugger-19">PL/SQL Debugger</a>: <a href="debugger.html#debugger">debugger</a></li> -<li><a href="unittest.html#index-PL_002fSQL-Unit-Tester-20">PL/SQL Unit Tester</a>: <a href="unittest.html#unittest">unittest</a></li> -<li><a href="rollback.html#index-Rollback-Segments-25">Rollback Segments</a>: <a href="rollback.html#rollback">rollback</a></li> -<li><a href="script.html#index-Schema-extraction_002c-compare-and-search-28">Schema extraction, compare and search</a>: <a href="script.html#script">script</a></li> +<li><a href="debugger.html#index-PL_002fSQL-Debugger-20">PL/SQL Debugger</a>: <a href="debugger.html#debugger">debugger</a></li> +<li><a href="plsqleditor.html#index-PL_002fSQL-Editor-19">PL/SQL Editor</a>: <a href="plsqleditor.html#plsqleditor">plsqleditor</a></li> +<li><a href="unittest.html#index-PL_002fSQL-Unit-Tester-21">PL/SQL Unit Tester</a>: <a href="unittest.html#unittest">unittest</a></li> +<li><a href="rollback.html#index-Rollback-Segments-26">Rollback Segments</a>: <a href="rollback.html#rollback">rollback</a></li> +<li><a href="script.html#index-Schema-extraction_002c-compare-and-search-29">Schema extraction, compare and search</a>: <a href="script.html#script">script</a></li> <li><a href="searchreplace.html#index-Search-_0026-Replace-9">Search & Replace</a>: <a href="searchreplace.html#searchreplace">searchreplace</a></li> -<li><a href="security.html#index-Security-Manager-22">Security Manager</a>: <a href="security.html#security">security</a></li> -<li><a href="tuning.html#index-Server-Tuning-21">Server Tuning</a>: <a href="tuning.html#tuning">tuning</a></li> -<li><a href="session.html#index-Session-Manager-24">Session Manager</a>: <a href="session.html#session">session</a></li> -<li><a href="trace.html#index-SGA-Trace-26">SGA Trace</a>: <a href="trace.html#trace">trace</a></li> -<li><a href="sqledit.html#index-SQL-Editor-34">SQL Editor</a>: <a href="sqledit.html#sqledit">sqledit</a></li> -<li><a href="output.html#index-SQL-Output-32">SQL Output</a>: <a href="output.html#output">output</a></li> +<li><a href="security.html#index-Security-Manager-23">Security Manager</a>: <a href="security.html#security">security</a></li> +<li><a href="tuning.html#index-Server-Tuning-22">Server Tuning</a>: <a href="tuning.html#tuning">tuning</a></li> +<li><a href="session.html#index-Session-Manager-25">Session Manager</a>: <a href="session.html#session">session</a></li> +<li><a href="trace.html#index-SGA-Trace-27">SGA Trace</a>: <a href="trace.html#trace">trace</a></li> +<li><a href="sqledit.html#index-SQL-Editor-35">SQL Editor</a>: <a href="sqledit.html#sqledit">sqledit</a></li> +<li><a href="output.html#index-SQL-Output-33">SQL Output</a>: <a href="output.html#output">output</a></li> <li><a href="worksheet.html#index-SQL-Worksheet-17">SQL Worksheet</a>: <a href="worksheet.html#worksheet">worksheet</a></li> -<li><a href="analyze.html#index-Statistics-manager-29">Statistics manager</a>: <a href="analyze.html#analyze">analyze</a></li> -<li><a href="storage.html#index-Storage-Manager-23">Storage Manager</a>: <a href="storage.html#storage">storage</a></li> -<li><a href="template.html#index-Template-Help-33">Template Help</a>: <a href="template.html#template">template</a></li> +<li><a href="analyze.html#index-Statistics-manager-30">Statistics manager</a>: <a href="analyze.html#analyze">analyze</a></li> +<li><a href="storage.html#index-Storage-Manager-24">Storage Manager</a>: <a href="storage.html#storage">storage</a></li> +<li><a href="template.html#index-Template-Help-34">Template Help</a>: <a href="template.html#template">template</a></li> <li><a href="toolsetting.html#index-Tool-Settings-14">Tool Settings</a>: <a href="toolsetting.html#toolsetting">toolsetting</a></li> -<li><a href="api.html#index-TOra-Tool-Tutorial-36">TOra Tool Tutorial</a>: <a href="api.html#api">api</a></li> +<li><a href="api.html#index-TOra-Tool-Tutorial-37">TOra Tool Tutorial</a>: <a href="api.html#api">api</a></li> <li><a href="charts.html#index-Using-charts-8">Using charts</a>: <a href="charts.html#charts">charts</a></li> <li><a href="editors.html#index-Using-editors-6">Using editors</a>: <a href="editors.html#editors">editors</a></li> <li><a href="help.html#index-Using-the-help-browser-1">Using the help browser</a>: <a href="help.html#help">help</a></li> Modified: trunk/tora/doc/help/alert.html =================================================================== --- trunk/tora/doc/help/alert.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/alert.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.14 Alert Tool</h3> +<h3 class="section">4.15 Alert Tool</h3> -<p><a name="index-Alert-Tool-30"></a>This tool is usefull for debugging database packages that send or depend on receiving dbms alerts. +<p><a name="index-Alert-Tool-31"></a>This tool is usefull for debugging database packages that send or depend on receiving dbms alerts. <div class="block-image"><img src="images/alert.png" alt="images/alert.png"></div> Modified: trunk/tora/doc/help/analyze.html =================================================================== --- trunk/tora/doc/help/analyze.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/analyze.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.13 Statistics manager</h3> +<h3 class="section">4.14 Statistics manager</h3> -<p><a name="index-Statistics-manager-29"></a> +<p><a name="index-Statistics-manager-30"></a> This tool is usefull for collecting statistics and analyze tables in parallel. You can also use it to browse collected statistics. <div class="block-image"><img src="images/analyze.png" alt="images/analyze.png"></div> Modified: trunk/tora/doc/help/api.html =================================================================== --- trunk/tora/doc/help/api.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/api.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,7 +34,7 @@ <h3 class="section">5.1 TOra Tool Tutorial</h3> -<p><a name="index-TOra-Tool-Tutorial-36"></a> +<p><a name="index-TOra-Tool-Tutorial-37"></a> This tutorial will create a simple tool that can execute an SQL statement and display it's content in a list. This tutorial assumes you have knowledge of C++ and Qt programming. <p>First of all we create an include file which defines the tool widget. This is the window that will be displayed when the a tool window is created. How that happens comes later. Modified: trunk/tora/doc/help/browser.html =================================================================== --- trunk/tora/doc/help/browser.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/browser.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -7,7 +7,7 @@ <link title="Top" rel="start" href="index.html#Top"> <link rel="up" href="tools.html#tools" title="tools"> <link rel="prev" href="worksheet.html#worksheet" title="worksheet"> -<link rel="next" href="debugger.html#debugger" title="debugger"> +<link rel="next" href="plsqleditor.html#plsqleditor" title="plsqleditor"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- This manual is for TOra, version 1.4.0.--> @@ -28,7 +28,7 @@ <div class="node"> <p> <a name="browser"></a> -Next: <a rel="next" accesskey="n" href="debugger.html#debugger">debugger</a>, +Next: <a rel="next" accesskey="n" href="plsqleditor.html#plsqleditor">plsqleditor</a>, Previous: <a rel="previous" accesskey="p" href="worksheet.html#worksheet">worksheet</a>, Up: <a rel="up" accesskey="u" href="tools.html#tools">tools</a> <hr> Modified: trunk/tora/doc/help/current.html =================================================================== --- trunk/tora/doc/help/current.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/current.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.11 Current Session</h3> +<h3 class="section">4.12 Current Session</h3> -<p><a name="index-Current-Session-27"></a> +<p><a name="index-Current-Session-28"></a> This tool provides information about the current session. <div class="block-image"><img src="images/current.png" alt="images/current.png"></div> Modified: trunk/tora/doc/help/debugger.html =================================================================== --- trunk/tora/doc/help/debugger.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/debugger.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -6,7 +6,7 @@ <meta name="generator" content="makeinfo 4.11"> <link title="Top" rel="start" href="index.html#Top"> <link rel="up" href="tools.html#tools" title="tools"> -<link rel="prev" href="browser.html#browser" title="browser"> +<link rel="prev" href="plsqleditor.html#plsqleditor" title="plsqleditor"> <link rel="next" href="unittest.html#unittest" title="unittest"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- @@ -29,14 +29,14 @@ <p> <a name="debugger"></a> Next: <a rel="next" accesskey="n" href="unittest.html#unittest">unittest</a>, -Previous: <a rel="previous" accesskey="p" href="browser.html#browser">browser</a>, +Previous: <a rel="previous" accesskey="p" href="plsqleditor.html#plsqleditor">plsqleditor</a>, Up: <a rel="up" accesskey="u" href="tools.html#tools">tools</a> <hr> </div> -<h3 class="section">4.3 PL/SQL Debugger</h3> +<h3 class="section">4.4 PL/SQL Debugger</h3> -<p><a name="index-PL_002fSQL-Debugger-19"></a> +<p><a name="index-PL_002fSQL-Debugger-20"></a> This tool provides you with an advanced editor and debugger for developing PL/SQL objects. <div class="block-image"><img src="images/debugger.png" alt="images/debugger.png"></div> Modified: trunk/tora/doc/help/extendingtora.html =================================================================== --- trunk/tora/doc/help/extendingtora.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/extendingtora.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -35,7 +35,7 @@ <h2 class="chapter">5 Extending TOra</h2> -<p><a name="index-Extending-TOra-35"></a> +<p><a name="index-Extending-TOra-36"></a> <ul class="menu"> <li><a accesskey="1" href="api.html#api">TOra Tool Tutorial</a> Modified: trunk/tora/doc/help/index.html =================================================================== --- trunk/tora/doc/help/index.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/index.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -59,22 +59,23 @@ <ul> <li><a href="worksheet.html#worksheet">4.1 SQL Worksheet</a> <li><a href="browser.html#browser">4.2 Database Browser</a> -<li><a href="debugger.html#debugger">4.3 PL/SQL Debugger</a> -<li><a href="unittest.html#unittest">4.4 PL/SQL Unit Tester</a> -<li><a href="tuning.html#tuning">4.5 Server Tuning</a> -<li><a href="security.html#security">4.6 Security Manager</a> -<li><a href="storage.html#storage">4.7 Storage Manager</a> -<li><a href="session.html#session">4.8 Session Manager</a> -<li><a href="rollback.html#rollback">4.9 Rollback Segments</a> -<li><a href="trace.html#trace">4.10 SGA Trace</a> -<li><a href="current.html#current">4.11 Current Session</a> -<li><a href="script.html#script">4.12 Schema extraction, compare and search</a> -<li><a href="analyze.html#analyze">4.13 Statistics manager</a> -<li><a href="alert.html#alert">4.14 Alert Tool</a> -<li><a href="invalid.html#invalid">4.15 Invalid Objects</a> -<li><a href="output.html#output">4.16 SQL Output</a> -<li><a href="template.html#template">4.17 Template Help</a> -<li><a href="sqledit.html#sqledit">4.18 SQL Editor</a> +<li><a href="plsqleditor.html#plsqleditor">4.3 PL/SQL Editor</a> +<li><a href="debugger.html#debugger">4.4 PL/SQL Debugger</a> +<li><a href="unittest.html#unittest">4.5 PL/SQL Unit Tester</a> +<li><a href="tuning.html#tuning">4.6 Server Tuning</a> +<li><a href="security.html#security">4.7 Security Manager</a> +<li><a href="storage.html#storage">4.8 Storage Manager</a> +<li><a href="session.html#session">4.9 Session Manager</a> +<li><a href="rollback.html#rollback">4.10 Rollback Segments</a> +<li><a href="trace.html#trace">4.11 SGA Trace</a> +<li><a href="current.html#current">4.12 Current Session</a> +<li><a href="script.html#script">4.13 Schema extraction, compare and search</a> +<li><a href="analyze.html#analyze">4.14 Statistics manager</a> +<li><a href="alert.html#alert">4.15 Alert Tool</a> +<li><a href="invalid.html#invalid">4.16 Invalid Objects</a> +<li><a href="output.html#output">4.17 SQL Output</a> +<li><a href="template.html#template">4.18 Template Help</a> +<li><a href="sqledit.html#sqledit">4.19 SQL Editor</a> </li></ul> <li><a name="toc_extendingtora" href="extendingtora.html#extendingtora">5 Extending TOra</a> <ul> Modified: trunk/tora/doc/help/invalid.html =================================================================== --- trunk/tora/doc/help/invalid.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/invalid.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.15 Invalid Objects</h3> +<h3 class="section">4.16 Invalid Objects</h3> -<p><a name="index-Invalid-Objects-31"></a> +<p><a name="index-Invalid-Objects-32"></a> This tool is usefull to recompile invalid objects in the database. <div class="block-image"><img src="images/invalid.png" alt="images/invalid.png"></div> Modified: trunk/tora/doc/help/output.html =================================================================== --- trunk/tora/doc/help/output.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/output.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.16 SQL Output</h3> +<h3 class="section">4.17 SQL Output</h3> -<p><a name="index-SQL-Output-32"></a> +<p><a name="index-SQL-Output-33"></a> This tool display the output from the DBMS_OUTPUT package (For more information see the Oracle PL/SQL Supplied Packages manual). <div class="block-image"><img src="images/output.png" alt="images/output.png"></div> Added: trunk/tora/doc/help/plsqleditor.html =================================================================== --- trunk/tora/doc/help/plsqleditor.html (rev 0) +++ trunk/tora/doc/help/plsqleditor.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -0,0 +1,83 @@ +<html lang="en"> +<head> +<title>plsqleditor - TOra</title> +<meta http-equiv="Content-Type" content="text/html"> +<meta name="description" content="TOra"> +<meta name="generator" content="makeinfo 4.11"> +<link title="Top" rel="start" href="index.html#Top"> +<link rel="up" href="tools.html#tools" title="tools"> +<link rel="prev" href="browser.html#browser" title="browser"> +<link rel="next" href="debugger.html#debugger" title="debugger"> +<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> +<!-- +This manual is for TOra, version 1.4.0.--> +<meta http-equiv="Content-Style-Type" content="text/css"> +<style type="text/css"><!-- + pre.display { font-family:inherit } + pre.format { font-family:inherit } + pre.smalldisplay { font-family:inherit; font-size:smaller } + pre.smallformat { font-family:inherit; font-size:smaller } + pre.smallexample { font-size:smaller } + pre.smalllisp { font-size:smaller } + span.sc { font-variant:small-caps } + span.roman { font-family:serif; font-weight:normal; } + span.sansserif { font-family:sans-serif; font-weight:normal; } +--></style> +</head> +<body> +<div class="node"> +<p> +<a name="plsqleditor"></a> +Next: <a rel="next" accesskey="n" href="debugger.html#debugger">debugger</a>, +Previous: <a rel="previous" accesskey="p" href="browser.html#browser">browser</a>, +Up: <a rel="up" accesskey="u" href="tools.html#tools">tools</a> +<hr> +</div> + +<h3 class="section">4.3 PL/SQL Editor</h3> + +<p><a name="index-PL_002fSQL-Editor-19"></a> +This tool provides you with an advanced editor for developing PL/SQL objects. + +<h4 class="subheading">Elements of the editor window</h4> + +<p>On the top of the screen is the toolbar for the editor. + + <p>Below that are two panes. +The left one Objects contains the available objects in the selected schema. +The schema is selectable through the toolbar. +Select the code object you want to edit in this list or start +a new object before starting to edit the code. + + <p>The right pane contains more widgets: Contents, Message Log, and the editor itself. +In the Contents list you can find declared methods of packages and also +variables or even anonymous blocks in your code. +Selecting a line in this pane will move the cursor to where the element +is in your code, for instance where a variable or method is declared. + + <p>The Message Log contains all errors and optional warnings for given PL/SQL code. +Clicking the log items will take you to the exact place in the editor. + +<h4 class="subheading">Toolbar & menu</h4> + +<p>The toolbar and menu contain pretty much the same commands with a few exceptions. + + <dl> +<dt><strong>Refresh object list</strong><dd> Update the <strong>Object</strong> list to the left of the screen. This is first on the toolbar and close to the end in the menu. + The keyboard shortcut for this is <strong>F5</strong>. + Observe that this list is read from the object cache and will not be updated unless you reread the object cache as well + (Available from the File menu. +<br><dt><strong>Select schema</strong><dd> In the toolbar this is a combobox listing the available schemas. Changing the schema will change the objects displayed in the <strong>Object</strong> list. + Selecting it in the menu (Close to the end) or selecting the <strong>ALT+S</strong> keyboard shortcut will move the keyboard focus to the toolbar combobox. +<br><dt><strong>New sheet</strong><dd> Start editing a new object. +<br><dt><strong>Compile</strong><dd> Compile the current editor. This will compile the procedure with the debug option, + if you don't have the debug options you need to recompile it in order to be able to see watches. The keyboard shortcut for this is <strong>F9</strong>. +<br><dt><strong>Compile with Warnings</strong><dd> Compile the current editor with suggested Oracle's PL/SQL Warnings (PLW). Fixing these warnings can speed up your code. +<br><dt><strong>Next error</strong><dd> Move the cursor to the next syntax error in the current editor. For more information about syntax errors in editors see the editor section. + The keyboard shortcut for this is <strong>CTRL+N</strong>. +<br><dt><strong>Previous error</strong><dd> Move the cursor to the previous syntax error in the current editor. For more information about syntax errors in editors see the editor section. + The keyboard shortcut for this is CTRL+P. +</dl> + + </body></html> + Added: trunk/tora/doc/help/plsqleditor.texi =================================================================== --- trunk/tora/doc/help/plsqleditor.texi (rev 0) +++ trunk/tora/doc/help/plsqleditor.texi 2008-08-12 08:56:53 UTC (rev 2937) @@ -0,0 +1,54 @@ +@node plsqleditor +@section PL/SQL Editor +@cindex PL/SQL Editor + +This tool provides you with an advanced editor for developing PL/SQL objects. + + +@subheading Elements of the editor window + +On the top of the screen is the toolbar for the editor. + +Below that are two panes. +The left one Objects contains the available objects in the selected schema. +The schema is selectable through the toolbar. +Select the code object you want to edit in this list or start +a new object before starting to edit the code. + +The right pane contains more widgets: Contents, Message Log, and the editor itself. +In the Contents list you can find declared methods of packages and also +variables or even anonymous blocks in your code. +Selecting a line in this pane will move the cursor to where the element +is in your code, for instance where a variable or method is declared. + +The Message Log contains all errors and optional warnings for given PL/SQL code. +Clicking the log items will take you to the exact place in the editor. + +@subheading Toolbar & menu + +The toolbar and menu contain pretty much the same commands with a few exceptions. + +@table @asis +@item @strong{Refresh object list} + Update the @strong{Object} list to the left of the screen. This is first on the toolbar and close to the end in the menu. + The keyboard shortcut for this is @strong{F5}. + Observe that this list is read from the object cache and will not be updated unless you reread the object cache as well + (Available from the File menu. +@item @strong{Select schema} + In the toolbar this is a combobox listing the available schemas. Changing the schema will change the objects displayed in the @strong{Object} list. + Selecting it in the menu (Close to the end) or selecting the @strong{ALT+S} keyboard shortcut will move the keyboard focus to the toolbar combobox. +@item @strong{New sheet} + Start editing a new object. +@item @strong{Compile} + Compile the current editor. This will compile the procedure with the debug option, + if you don't have the debug options you need to recompile it in order to be able to see watches. The keyboard shortcut for this is @strong{F9}. +@item @strong{Compile with Warnings} + Compile the current editor with suggested Oracle's PL/SQL Warnings (PLW). Fixing these warnings can speed up your code. +@item @strong{Next error} + Move the cursor to the next syntax error in the current editor. For more information about syntax errors in editors see the editor section. + The keyboard shortcut for this is @strong{CTRL+N}. +@item @strong{Previous error} + Move the cursor to the previous syntax error in the current editor. For more information about syntax errors in editors see the editor section. + The keyboard shortcut for this is CTRL+P. +@end table + Modified: trunk/tora/doc/help/rollback.html =================================================================== --- trunk/tora/doc/help/rollback.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/rollback.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.9 Rollback Segments</h3> +<h3 class="section">4.10 Rollback Segments</h3> -<p><a name="index-Rollback-Segments-25"></a> +<p><a name="index-Rollback-Segments-26"></a> This tool is used to manage rollback segments in the database. <div class="block-image"><img src="images/rollback.png" alt="images/rollback.png"></div> Modified: trunk/tora/doc/help/script.html =================================================================== --- trunk/tora/doc/help/script.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/script.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.12 Schema extraction, compare and search</h3> +<h3 class="section">4.13 Schema extraction, compare and search</h3> -<p><a name="index-Schema-extraction_002c-compare-and-search-28"></a> +<p><a name="index-Schema-extraction_002c-compare-and-search-29"></a> This tool is used to either extract a script to recreate database objects, compare database objects or search database objects. <div class="block-image"><img src="images/script.png" alt="images/script.png"></div> Modified: trunk/tora/doc/help/security.html =================================================================== --- trunk/tora/doc/help/security.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/security.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.6 Security Manager</h3> +<h3 class="section">4.7 Security Manager</h3> -<p><a name="index-Security-Manager-22"></a> +<p><a name="index-Security-Manager-23"></a> This tool provides an easy interface to manipulate users, roles and their privileges. <div class="block-image"><img src="images/security.png" alt="images/security.png"></div> Modified: trunk/tora/doc/help/session.html =================================================================== --- trunk/tora/doc/help/session.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/session.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.8 Session Manager</h3> +<h3 class="section">4.9 Session Manager</h3> -<p><a name="index-Session-Manager-24"></a> +<p><a name="index-Session-Manager-25"></a> This tool is used to manage the connections made to the database. <div class="block-image"><img src="images/session.png" alt="images/session.png"></div> Modified: trunk/tora/doc/help/sqledit.html =================================================================== --- trunk/tora/doc/help/sqledit.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/sqledit.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -32,9 +32,9 @@ <hr> </div> -<h3 class="section">4.18 SQL Editor</h3> +<h3 class="section">4.19 SQL Editor</h3> -<p><a name="index-SQL-Editor-34"></a> +<p><a name="index-SQL-Editor-35"></a> When TOra needs to run an SQL statement it will not actually use the SQL needed directly. It will fetch an SQL statement by addressing it with a string. The string is built up by a module name, followed by a colon and a unique name for the SQL (Example: toBrowser:ListIndex which will contain the SQL statement for getting all the indexes for a schema). <p>For each SQL name there may be a number of actual SQL strings that are available, each are associated with a version number. When TOra requests an SQL statement by a name it will receive the string with the statement with the highest version number lower than the version of Oracle for the current connection that will be used to run it. Each SQL name also has a description associated with it so you can understand what the SQL is supposed to do. Modified: trunk/tora/doc/help/storage.html =================================================================== --- trunk/tora/doc/help/storage.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/storage.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.7 Storage Manager</h3> +<h3 class="section">4.8 Storage Manager</h3> -<p><a name="index-Storage-Manager-23"></a> +<p><a name="index-Storage-Manager-24"></a> This tool provides an easy interface to administrate tablespaces and datafiles. <div class="block-image"><img src="images/storage.png" alt="images/storage.png"></div> Modified: trunk/tora/doc/help/template.html =================================================================== --- trunk/tora/doc/help/template.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/template.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.17 Template Help</h3> +<h3 class="section">4.18 Template Help</h3> -<p><a name="index-Template-Help-33"></a> +<p><a name="index-Template-Help-34"></a> This tool provides help for writing PL/SQL and SQL queries by allowing a non obtrusive database browser and help lookup. <p>The template help is implemented as a docked window if these are available. They are available in Qt 3.0 (Released only as beta as of 2001-07-11) and KDE. Modified: trunk/tora/doc/help/toc.html =================================================================== --- trunk/tora/doc/help/toc.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/toc.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -48,6 +48,7 @@ <DL> <DD><A HREF="worksheet.html">SQL Worksheet</A></DD> <DD><A HREF="browser.html">Schema Browser</A></DD> + <DD><A HREF="plsqleditor.html">PL/SQL Editor</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> Modified: trunk/tora/doc/help/tools.html =================================================================== --- trunk/tora/doc/help/tools.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/tools.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -41,13 +41,14 @@ <ul class="menu"> <li><a accesskey="1" href="worksheet.html#worksheet">SQL Worksheet</a> <li><a accesskey="2" href="browser.html#browser">Schema Browser</a> -<li><a accesskey="3" href="debugger.html#debugger">PL/SQL Debugger</a> -<li><a accesskey="4" href="unittest.html#unittest">PL/SQL Unit Tester</a> -<li><a accesskey="5" href="tuning.html#tuning">Server Tuning</a> -<li><a accesskey="6" href="security.html#security">Security Manager</a> -<li><a accesskey="7" href="storage.html#storage">Storage Manager</a> -<li><a accesskey="8" href="session.html#session">Sessions</a> -<li><a accesskey="9" href="rollback.html#rollback">Rollback Segments</a> +<li><a accesskey="3" href="plsqleditor.html#plsqleditor">PL/SQL Editor</a> +<li><a accesskey="4" href="debugger.html#debugger">PL/SQL Debugger</a> +<li><a accesskey="5" href="unittest.html#unittest">PL/SQL Unit Tester</a> +<li><a accesskey="6" href="tuning.html#tuning">Server Tuning</a> +<li><a accesskey="7" href="security.html#security">Security Manager</a> +<li><a accesskey="8" href="storage.html#storage">Storage Manager</a> +<li><a accesskey="9" href="session.html#session">Sessions</a> +<li><a href="rollback.html#rollback">Rollback Segments</a> <li><a href="trace.html#trace">SGA Trace</a> <li><a href="current.html#current">Current Session</a> <li><a href="script.html#script">DB Extraction/Compare/Search</a> Modified: trunk/tora/doc/help/tools.texi =================================================================== --- trunk/tora/doc/help/tools.texi 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/tools.texi 2008-08-12 08:56:53 UTC (rev 2937) @@ -7,6 +7,7 @@ @menu * SQL Worksheet: worksheet. * Schema Browser: browser. +* PL/SQL Editor: plsqleditor. * PL/SQL Debugger: debugger. * PL/SQL Unit Tester: unittest. * Server Tuning: tuning. Modified: trunk/tora/doc/help/tora.texi =================================================================== --- trunk/tora/doc/help/tora.texi 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/tora.texi 2008-08-12 08:56:53 UTC (rev 2937) @@ -56,6 +56,7 @@ @include tools.texi @include worksheet.texi @include browser.texi +@include plsqleditor.texi @include debugger.texi @include unittest.texi @include tuning.texi Modified: trunk/tora/doc/help/trace.html =================================================================== --- trunk/tora/doc/help/trace.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/trace.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.10 SGA Trace</h3> +<h3 class="section">4.11 SGA Trace</h3> -<p><a name="index-SGA-Trace-26"></a> +<p><a name="index-SGA-Trace-27"></a> This tool is used investigate the statements available in the SGA. <div class="block-image"><img src="images/sgatrace.png" alt="images/sgatrace.png"></div> Modified: trunk/tora/doc/help/tuning.html =================================================================== --- trunk/tora/doc/help/tuning.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/tuning.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.5 Server Tuning</h3> +<h3 class="section">4.6 Server Tuning</h3> -<p><a name="index-Server-Tuning-21"></a> +<p><a name="index-Server-Tuning-22"></a> This tool provides easy access to important server indicators as well as server statistics and an editor for database parameters. <div class="block-image"><img src="images/tuning.png" alt="images/tuning.png"></div> Modified: trunk/tora/doc/help/unittest.html =================================================================== --- trunk/tora/doc/help/unittest.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/doc/help/unittest.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.4 PL/SQL Unit Tester</h3> +<h3 class="section">4.5 PL/SQL Unit Tester</h3> -<p><a name="index-PL_002fSQL-Unit-Tester-20"></a> +<p><a name="index-PL_002fSQL-Unit-Tester-21"></a> This tool allows you to run procedures, functions, and package members independently. Selecting proper PL/SQL unit will result in anonymous PL/SQL block Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/src/CMakeLists.txt 2008-08-12 08:56:53 UTC (rev 2937) @@ -132,6 +132,8 @@ tooutput.h toparamget.h topiechart.h + toplsqleditor.h + toplsqltext.h topreferences.h toprofiler.h toproject.h @@ -274,6 +276,8 @@ toparamget.cpp topassword.cpp topiechart.cpp + toplsqleditor.cpp + toplsqltext.cpp topreferences.cpp toprofiler.cpp toproject.cpp Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/src/Makefile.am 2008-08-12 08:56:53 UTC (rev 2937) @@ -78,6 +78,8 @@ toeventquerytask.cpp toeventquerytask.h \ toparamget.cpp toparamget.h \ topreferences.cpp topreferences.h \ + toplsqleditor.cpp toplsqleditor.h \ + toplsqltext.cpp toplsqltext.h \ toresult.cpp toresult.h \ toresultfield.cpp toresultfield.h \ toresultitem.cpp toresultitem.h \ @@ -305,6 +307,8 @@ moc_tooutput.cpp \ moc_toparamget.cpp \ moc_topiechart.cpp \ + moc_toplsqleditor.cpp \ + moc_toplsqltext.cpp \ moc_topreferences.cpp \ moc_toprofiler.cpp \ moc_toproject.cpp \ Modified: trunk/tora/src/help/Index.html =================================================================== --- trunk/tora/src/help/Index.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/src/help/Index.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -35,38 +35,39 @@ <ul class="index-cp" compact> <li><a href="additionalhelp.html#index-Additional-Help-Settings-13">Additional Help Settings</a>: <a href="additionalhelp.html#additionalhelp">additionalhelp</a></li> -<li><a href="alert.html#index-Alert-Tool-30">Alert Tool</a>: <a href="alert.html#alert">alert</a></li> +<li><a href="alert.html#index-Alert-Tool-31">Alert Tool</a>: <a href="alert.html#alert">alert</a></li> <li><a href="tools.html#index-Available-tools-16">Available tools</a>: <a href="tools.html#tools">tools</a></li> <li><a href="newconnection.html#index-Connecting-to-a-database-5">Connecting to a database</a>: <a href="newconnection.html#newconnection">newconnection</a></li> -<li><a href="current.html#index-Current-Session-27">Current Session</a>: <a href="current.html#current">current</a></li> +<li><a href="current.html#index-Current-Session-28">Current Session</a>: <a href="current.html#current">current</a></li> <li><a href="browser.html#index-Database-Browser-18">Database Browser</a>: <a href="browser.html#browser">browser</a></li> <li><a href="database.html#index-Database-Settings-11">Database Settings</a>: <a href="database.html#database">database</a></li> <li><a href="window.html#index-Elements-of-the-main-window-4">Elements of the main window</a>: <a href="window.html#window">window</a></li> -<li><a href="extendingtora.html#index-Extending-TOra-35">Extending TOra</a>: <a href="extendingtora.html#extendingtora">extendingtora</a></li> +<li><a href="extendingtora.html#index-Extending-TOra-36">Extending TOra</a>: <a href="extendingtora.html#extendingtora">extendingtora</a></li> <li><a href="fonts.html#index-Font-Settings-12">Font Settings</a>: <a href="fonts.html#fonts">fonts</a></li> <li><a href="workspace.html#index-Getting-to-know-your-workspace-3">Getting to know your workspace</a>: <a href="workspace.html#workspace">workspace</a></li> <li><a href="history.html#index-History-and-future-of-TOra-2">History and future of TOra</a>: <a href="history.html#history">history</a></li> -<li><a href="invalid.html#index-Invalid-Objects-31">Invalid Objects</a>: <a href="invalid.html#invalid">invalid</a></li> +<li><a href="invalid.html#index-Invalid-Objects-32">Invalid Objects</a>: <a href="invalid.html#invalid">invalid</a></li> <li><a href="lists.html#index-lists-7">lists</a>: <a href="lists.html#lists">lists</a></li> <li><a href="preferences.html#index-Options-10">Options</a>: <a href="preferences.html#preferences">preferences</a></li> <li><a href="common.html#index-Other-common-elements-15">Other common elements</a>: <a href="common.html#common">common</a></li> -<li><a href="debugger.html#index-PL_002fSQL-Debugger-19">PL/SQL Debugger</a>: <a href="debugger.html#debugger">debugger</a></li> -<li><a href="unittest.html#index-PL_002fSQL-Unit-Tester-20">PL/SQL Unit Tester</a>: <a href="unittest.html#unittest">unittest</a></li> -<li><a href="rollback.html#index-Rollback-Segments-25">Rollback Segments</a>: <a href="rollback.html#rollback">rollback</a></li> -<li><a href="script.html#index-Schema-extraction_002c-compare-and-search-28">Schema extraction, compare and search</a>: <a href="script.html#script">script</a></li> +<li><a href="debugger.html#index-PL_002fSQL-Debugger-20">PL/SQL Debugger</a>: <a href="debugger.html#debugger">debugger</a></li> +<li><a href="plsqleditor.html#index-PL_002fSQL-Editor-19">PL/SQL Editor</a>: <a href="plsqleditor.html#plsqleditor">plsqleditor</a></li> +<li><a href="unittest.html#index-PL_002fSQL-Unit-Tester-21">PL/SQL Unit Tester</a>: <a href="unittest.html#unittest">unittest</a></li> +<li><a href="rollback.html#index-Rollback-Segments-26">Rollback Segments</a>: <a href="rollback.html#rollback">rollback</a></li> +<li><a href="script.html#index-Schema-extraction_002c-compare-and-search-29">Schema extraction, compare and search</a>: <a href="script.html#script">script</a></li> <li><a href="searchreplace.html#index-Search-_0026-Replace-9">Search & Replace</a>: <a href="searchreplace.html#searchreplace">searchreplace</a></li> -<li><a href="security.html#index-Security-Manager-22">Security Manager</a>: <a href="security.html#security">security</a></li> -<li><a href="tuning.html#index-Server-Tuning-21">Server Tuning</a>: <a href="tuning.html#tuning">tuning</a></li> -<li><a href="session.html#index-Session-Manager-24">Session Manager</a>: <a href="session.html#session">session</a></li> -<li><a href="trace.html#index-SGA-Trace-26">SGA Trace</a>: <a href="trace.html#trace">trace</a></li> -<li><a href="sqledit.html#index-SQL-Editor-34">SQL Editor</a>: <a href="sqledit.html#sqledit">sqledit</a></li> -<li><a href="output.html#index-SQL-Output-32">SQL Output</a>: <a href="output.html#output">output</a></li> +<li><a href="security.html#index-Security-Manager-23">Security Manager</a>: <a href="security.html#security">security</a></li> +<li><a href="tuning.html#index-Server-Tuning-22">Server Tuning</a>: <a href="tuning.html#tuning">tuning</a></li> +<li><a href="session.html#index-Session-Manager-25">Session Manager</a>: <a href="session.html#session">session</a></li> +<li><a href="trace.html#index-SGA-Trace-27">SGA Trace</a>: <a href="trace.html#trace">trace</a></li> +<li><a href="sqledit.html#index-SQL-Editor-35">SQL Editor</a>: <a href="sqledit.html#sqledit">sqledit</a></li> +<li><a href="output.html#index-SQL-Output-33">SQL Output</a>: <a href="output.html#output">output</a></li> <li><a href="worksheet.html#index-SQL-Worksheet-17">SQL Worksheet</a>: <a href="worksheet.html#worksheet">worksheet</a></li> -<li><a href="analyze.html#index-Statistics-manager-29">Statistics manager</a>: <a href="analyze.html#analyze">analyze</a></li> -<li><a href="storage.html#index-Storage-Manager-23">Storage Manager</a>: <a href="storage.html#storage">storage</a></li> -<li><a href="template.html#index-Template-Help-33">Template Help</a>: <a href="template.html#template">template</a></li> +<li><a href="analyze.html#index-Statistics-manager-30">Statistics manager</a>: <a href="analyze.html#analyze">analyze</a></li> +<li><a href="storage.html#index-Storage-Manager-24">Storage Manager</a>: <a href="storage.html#storage">storage</a></li> +<li><a href="template.html#index-Template-Help-34">Template Help</a>: <a href="template.html#template">template</a></li> <li><a href="toolsetting.html#index-Tool-Settings-14">Tool Settings</a>: <a href="toolsetting.html#toolsetting">toolsetting</a></li> -<li><a href="api.html#index-TOra-Tool-Tutorial-36">TOra Tool Tutorial</a>: <a href="api.html#api">api</a></li> +<li><a href="api.html#index-TOra-Tool-Tutorial-37">TOra Tool Tutorial</a>: <a href="api.html#api">api</a></li> <li><a href="charts.html#index-Using-charts-8">Using charts</a>: <a href="charts.html#charts">charts</a></li> <li><a href="editors.html#index-Using-editors-6">Using editors</a>: <a href="editors.html#editors">editors</a></li> <li><a href="help.html#index-Using-the-help-browser-1">Using the help browser</a>: <a href="help.html#help">help</a></li> Modified: trunk/tora/src/help/alert.html =================================================================== --- trunk/tora/src/help/alert.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/src/help/alert.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.14 Alert Tool</h3> +<h3 class="section">4.15 Alert Tool</h3> -<p><a name="index-Alert-Tool-30"></a>This tool is usefull for debugging database packages that send or depend on receiving dbms alerts. +<p><a name="index-Alert-Tool-31"></a>This tool is usefull for debugging database packages that send or depend on receiving dbms alerts. <div class="block-image"><img src="images/alert.png" alt="images/alert.png"></div> Modified: trunk/tora/src/help/analyze.html =================================================================== --- trunk/tora/src/help/analyze.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/src/help/analyze.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.13 Statistics manager</h3> +<h3 class="section">4.14 Statistics manager</h3> -<p><a name="index-Statistics-manager-29"></a> +<p><a name="index-Statistics-manager-30"></a> This tool is usefull for collecting statistics and analyze tables in parallel. You can also use it to browse collected statistics. <div class="block-image"><img src="images/analyze.png" alt="images/analyze.png"></div> Modified: trunk/tora/src/help/api.html =================================================================== --- trunk/tora/src/help/api.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/src/help/api.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,7 +34,7 @@ <h3 class="section">5.1 TOra Tool Tutorial</h3> -<p><a name="index-TOra-Tool-Tutorial-36"></a> +<p><a name="index-TOra-Tool-Tutorial-37"></a> This tutorial will create a simple tool that can execute an SQL statement and display it's content in a list. This tutorial assumes you have knowledge of C++ and Qt programming. <p>First of all we create an include file which defines the tool widget. This is the window that will be displayed when the a tool window is created. How that happens comes later. Modified: trunk/tora/src/help/browser.html =================================================================== --- trunk/tora/src/help/browser.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/src/help/browser.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -7,7 +7,7 @@ <link title="Top" rel="start" href="index.html#Top"> <link rel="up" href="tools.html#tools" title="tools"> <link rel="prev" href="worksheet.html#worksheet" title="worksheet"> -<link rel="next" href="debugger.html#debugger" title="debugger"> +<link rel="next" href="plsqleditor.html#plsqleditor" title="plsqleditor"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- This manual is for TOra, version 1.4.0.--> @@ -28,7 +28,7 @@ <div class="node"> <p> <a name="browser"></a> -Next: <a rel="next" accesskey="n" href="debugger.html#debugger">debugger</a>, +Next: <a rel="next" accesskey="n" href="plsqleditor.html#plsqleditor">plsqleditor</a>, Previous: <a rel="previous" accesskey="p" href="worksheet.html#worksheet">worksheet</a>, Up: <a rel="up" accesskey="u" href="tools.html#tools">tools</a> <hr> Modified: trunk/tora/src/help/current.html =================================================================== --- trunk/tora/src/help/current.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/src/help/current.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.11 Current Session</h3> +<h3 class="section">4.12 Current Session</h3> -<p><a name="index-Current-Session-27"></a> +<p><a name="index-Current-Session-28"></a> This tool provides information about the current session. <div class="block-image"><img src="images/current.png" alt="images/current.png"></div> Modified: trunk/tora/src/help/debugger.html =================================================================== --- trunk/tora/src/help/debugger.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/src/help/debugger.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -6,7 +6,7 @@ <meta name="generator" content="makeinfo 4.11"> <link title="Top" rel="start" href="index.html#Top"> <link rel="up" href="tools.html#tools" title="tools"> -<link rel="prev" href="browser.html#browser" title="browser"> +<link rel="prev" href="plsqleditor.html#plsqleditor" title="plsqleditor"> <link rel="next" href="unittest.html#unittest" title="unittest"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- @@ -29,14 +29,14 @@ <p> <a name="debugger"></a> Next: <a rel="next" accesskey="n" href="unittest.html#unittest">unittest</a>, -Previous: <a rel="previous" accesskey="p" href="browser.html#browser">browser</a>, +Previous: <a rel="previous" accesskey="p" href="plsqleditor.html#plsqleditor">plsqleditor</a>, Up: <a rel="up" accesskey="u" href="tools.html#tools">tools</a> <hr> </div> -<h3 class="section">4.3 PL/SQL Debugger</h3> +<h3 class="section">4.4 PL/SQL Debugger</h3> -<p><a name="index-PL_002fSQL-Debugger-19"></a> +<p><a name="index-PL_002fSQL-Debugger-20"></a> This tool provides you with an advanced editor and debugger for developing PL/SQL objects. <div class="block-image"><img src="images/debugger.png" alt="images/debugger.png"></div> Modified: trunk/tora/src/help/extendingtora.html =================================================================== --- trunk/tora/src/help/extendingtora.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/src/help/extendingtora.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -35,7 +35,7 @@ <h2 class="chapter">5 Extending TOra</h2> -<p><a name="index-Extending-TOra-35"></a> +<p><a name="index-Extending-TOra-36"></a> <ul class="menu"> <li><a accesskey="1" href="api.html#api">TOra Tool Tutorial</a> Modified: trunk/tora/src/help/index.html =================================================================== --- trunk/tora/src/help/index.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/src/help/index.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -59,22 +59,23 @@ <ul> <li><a href="worksheet.html#worksheet">4.1 SQL Worksheet</a> <li><a href="browser.html#browser">4.2 Database Browser</a> -<li><a href="debugger.html#debugger">4.3 PL/SQL Debugger</a> -<li><a href="unittest.html#unittest">4.4 PL/SQL Unit Tester</a> -<li><a href="tuning.html#tuning">4.5 Server Tuning</a> -<li><a href="security.html#security">4.6 Security Manager</a> -<li><a href="storage.html#storage">4.7 Storage Manager</a> -<li><a href="session.html#session">4.8 Session Manager</a> -<li><a href="rollback.html#rollback">4.9 Rollback Segments</a> -<li><a href="trace.html#trace">4.10 SGA Trace</a> -<li><a href="current.html#current">4.11 Current Session</a> -<li><a href="script.html#script">4.12 Schema extraction, compare and search</a> -<li><a href="analyze.html#analyze">4.13 Statistics manager</a> -<li><a href="alert.html#alert">4.14 Alert Tool</a> -<li><a href="invalid.html#invalid">4.15 Invalid Objects</a> -<li><a href="output.html#output">4.16 SQL Output</a> -<li><a href="template.html#template">4.17 Template Help</a> -<li><a href="sqledit.html#sqledit">4.18 SQL Editor</a> +<li><a href="plsqleditor.html#plsqleditor">4.3 PL/SQL Editor</a> +<li><a href="debugger.html#debugger">4.4 PL/SQL Debugger</a> +<li><a href="unittest.html#unittest">4.5 PL/SQL Unit Tester</a> +<li><a href="tuning.html#tuning">4.6 Server Tuning</a> +<li><a href="security.html#security">4.7 Security Manager</a> +<li><a href="storage.html#storage">4.8 Storage Manager</a> +<li><a href="session.html#session">4.9 Session Manager</a> +<li><a href="rollback.html#rollback">4.10 Rollback Segments</a> +<li><a href="trace.html#trace">4.11 SGA Trace</a> +<li><a href="current.html#current">4.12 Current Session</a> +<li><a href="script.html#script">4.13 Schema extraction, compare and search</a> +<li><a href="analyze.html#analyze">4.14 Statistics manager</a> +<li><a href="alert.html#alert">4.15 Alert Tool</a> +<li><a href="invalid.html#invalid">4.16 Invalid Objects</a> +<li><a href="output.html#output">4.17 SQL Output</a> +<li><a href="template.html#template">4.18 Template Help</a> +<li><a href="sqledit.html#sqledit">4.19 SQL Editor</a> </li></ul> <li><a name="toc_extendingtora" href="extendingtora.html#extendingtora">5 Extending TOra</a> <ul> Modified: trunk/tora/src/help/invalid.html =================================================================== --- trunk/tora/src/help/invalid.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/src/help/invalid.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.15 Invalid Objects</h3> +<h3 class="section">4.16 Invalid Objects</h3> -<p><a name="index-Invalid-Objects-31"></a> +<p><a name="index-Invalid-Objects-32"></a> This tool is usefull to recompile invalid objects in the database. <div class="block-image"><img src="images/invalid.png" alt="images/invalid.png"></div> Modified: trunk/tora/src/help/output.html =================================================================== --- trunk/tora/src/help/output.html 2008-08-08 14:44:17 UTC (rev 2936) +++ trunk/tora/src/help/output.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -34,9 +34,9 @@ <hr> </div> -<h3 class="section">4.16 SQL Output</h3> +<h3 class="section">4.17 SQL Output</h3> -<p><a name="index-SQL-Output-32"></a> +<p><a name="index-SQL-Output-33"></a> This tool display the output from the DBMS_OUTPUT package (For more information see the Oracle PL/SQL Supplied Packages manual). <div class="block-image"><img src="images/output.png" alt="images/output.png"></div> Added: trunk/tora/src/help/plsqleditor.html =================================================================== --- trunk/tora/src/help/plsqleditor.html (rev 0) +++ trunk/tora/src/help/plsqleditor.html 2008-08-12 08:56:53 UTC (rev 2937) @@ -0,0 +1,83 @@ +<html lang="en"> +<head> +<title>plsqleditor - TOra</title> +<meta http-equiv="Content-Type" content="text/html"> +<meta name="description" content="TOra"> +<meta name="generator" content="makeinfo 4.11"> +<link title="Top" rel="start" href="index.html#Top"> +<link rel="up" href="tools.html#tools" title="tools"> +<link rel="prev" href="browser.html#browser" title="browser"> +<link rel="next" href="debugger.html#debugger" title="debugger"> +<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> +<!-- +This manual is for TOra, version 1.4.0.--> +<meta http-equiv="Content-Style-Type" content="text/css"> +<style type="text/css"><!-- + pre.display { font-family:inherit } + pre.format { font-family:inherit } + pre.smalldisplay { font-family:inherit; font-size:smaller } + pre.smallformat { font-family:inherit; font-size:smaller } + pre.smallexample { font-size:smaller } + pre.smalllisp { font-size:smaller } + span.sc { font-variant:small-caps } + span.roman { font-family:serif; font-weight:normal; } + span.sansserif { font-family:sans-serif; font-weight:normal; } +--></style> +</head> +<body> +<div class="node"> +<p> +<a name="plsqleditor"></a> +Next: <a rel="next" accesskey="n" href="debugger.html#debugger">debugger</a>, +Previous: <a rel="previous" accesskey="p" href="browser.html#browser">browser</a>, +Up: <a rel="up" accesskey="u" href="tools.html#tools">tools</a> +<hr> +</div> + +<h3 class="section">4.3 PL/SQL Editor</h3> + +<p><a name="index-PL_002fSQL-Editor-19"></a> +This tool provides you with an advanced editor for developing PL/SQL objects. + +<h4 class="subheading">Elements of the editor window</h4> + +<p>On the top of the screen is the toolbar for the editor. + + <p>Below that are two panes. +The left one Objects contains the available objects in the selected schema. +The schema is selectable through the toolbar. +Select the code object you want to edit in this list or start +a new object before starting to edit the code. + + <p>The right pane contains more widgets: Contents, Message Log, and the editor itself. +In the Contents list you can find declared methods of packages and also +variables or even anonymous blocks in your code. +Selecting a line in this pane will move the cursor to where the element +is in your code, for instance where a variable or method is declared. + + <p>The Message Log contains all errors and optional warnings for given PL/SQL code. +Clicking the log items will take you to the exact place in the editor. + +<h4 class="subheading">Toolbar & menu</h4> + +<p>The toolbar and menu contain pretty much the same commands with a few exceptions. + + <dl> +<dt><strong>Refresh object list</strong><dd> Update the <strong>Object</strong> list to the left of the screen. This is first on the toolbar and close to the end in the menu. + The keyboard shortcut for this is <strong>F5</strong>. + Observe that this list is read from the object cache and will not be updated unless you reread the object cache as well + (Available from the File menu. +<br><dt><strong>Select schema</strong><dd> In the toolbar this is a combobox listing the available schemas. Changing the schema will change the objects displayed in the <strong>Object</strong> list. + Selecting it in the menu (Close to the end) or selecting the <strong>ALT+S</strong> keyboard shortcut will move the keyboard focus to the toolbar combobox. +<br><dt><strong>New sheet</strong><dd> Start editing a new object. +<br><dt><strong>Compile</strong><dd> Compile th... [truncated message content] |
From: <su...@us...> - 2008-08-14 14:04:56
|
Revision: 2939 http://tora.svn.sourceforge.net/tora/?rev=2939&view=rev Author: subik Date: 2008-08-14 14:04:59 +0000 (Thu, 14 Aug 2008) Log Message: ----------- cmake: native support for pgsql in toqsqlconnection. Maybe it's working, but it's still magic for me. Note: It requires pgsql libs/dev environment intalled too. There are no qt4 symbols exported as we thought... Modified Paths: -------------- trunk/tora/CMakeLists.txt trunk/tora/README.CMAKE trunk/tora/src/CMakeLists.txt trunk/tora/src/toqsqlconnection.cpp Added Paths: ----------- trunk/tora/cmake/modules/FindPostgreSQL.cmake Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-08-14 12:39:07 UTC (rev 2938) +++ trunk/tora/CMakeLists.txt 2008-08-14 14:04:59 UTC (rev 2939) @@ -195,6 +195,22 @@ ADD_DEFINITIONS("-DTO_NO_ORACLE") ENDIF(ORACLE_FOUND) + +FIND_PACKAGE(PostgreSQL) +IF (POSTGRESQL_FOUND) + ADD_DEFINITIONS(-DLIBPQ_DECL_CANCEL) + ADD_DEFINITIONS(-DHAVE_POSTGRESQL_LIBPQ_FE_H) + MESSAGE(STATUS "PostgreSQL environment found: ${POSTGRESQL_INCLUDE_DIR} ${POSTGRESQL_LIBRARIES}") +ELSE (POSTGRESQL_FOUND) + MESSAGE(" ") + MESSAGE(WARNING " No PostgreSQL environment has been found.") + MESSAGE(WARNING " Specify -DPOSTGRESQL_PATH_INCLUDES=path") + MESSAGE(WARNING " and -DPOSTGRESQL_PATH_LIB manually") + MESSAGE(" ") +ENDIF (POSTGRESQL_FOUND) + + + ############################################################################################################## ########## Include Setup ########## Modified: trunk/tora/README.CMAKE =================================================================== --- trunk/tora/README.CMAKE 2008-08-14 12:39:07 UTC (rev 2938) +++ trunk/tora/README.CMAKE 2008-08-14 14:04:59 UTC (rev 2939) @@ -43,8 +43,19 @@ You have to specify -DORACLE_OCI_VERSION for one of values: [8, 8I, 9I, 10G, 10G_R2]. Example: -cmake -DORACLE_OCI_VERSION=10G_R2 +-DORACLE_OCI_VERSION=10G_R2 + +TOra requires PostgreSQL development environment to enable +full PgSQL support (native cancel etc.). +This environment shoud be found automatically on UNIXes. But you can +specify path for alternative location and/or for Windows too. +-DPOSTGRESQL_PATH_INCLUDES=/home/devel/pgsql/include +-DPOSTGRESQL_PATH_INCLUDES=d:\pgsql\include +-DPOSTGRESQL_PATH_LIB=/home/devel/pgsql/lib +etc. + + Search following for more info: http://cmake.org http://docs.scribus.net/index.php?lang=en&page=install4 Added: trunk/tora/cmake/modules/FindPostgreSQL.cmake =================================================================== --- trunk/tora/cmake/modules/FindPostgreSQL.cmake (rev 0) +++ trunk/tora/cmake/modules/FindPostgreSQL.cmake 2008-08-14 14:04:59 UTC (rev 2939) @@ -0,0 +1,36 @@ +# - Find PostgreSQL +# Find the PostgreSQL includes and client library +# This module defines +# POSTGRESQL_INCLUDE_DIR, where to find POSTGRESQL.h +# POSTGRESQL_LIBRARIES, the libraries needed to use POSTGRESQL. +# POSTGRESQL_FOUND, If false, do not try to use PostgreSQL. + +# Copyright (c) 2006, Jaroslaw Staniek, <js...@ii...> +# Modifications for TOra by Petr Vanek <pe...@sc...> +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + + +if (POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) + # Already in cache, be silent + set(PostgreSQL_FIND_QUIETLY TRUE) +endif (POSTGRESQL_INCLUDE_DIR AND POSTGRESQL_LIBRARIES) + + +find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h + ${DPOSTGRESQL_PATH_INCLUDES}/ + /usr/include/pgsql/ + /usr/local/include/pgsql/ + /usr/include/postgresql/ +) + +find_library(POSTGRESQL_LIBRARIES NAMES pq + PATH ${POSTGRESQL_PATH_LIB}) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(PostgreSQL DEFAULT_MSG + POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES ) + +mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES) + Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-08-14 12:39:07 UTC (rev 2938) +++ trunk/tora/src/CMakeLists.txt 2008-08-14 14:04:59 UTC (rev 2939) @@ -390,6 +390,7 @@ ${ORACLE_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR}/loki/include ${CMAKE_CURRENT_SOURCE_DIR}/otl + ${POSTGRESQL_INCLUDE_DIR} ) IF (WANT_INTERNAL_QSCINTILLA) INCLUDE_DIRECTORIES( @@ -427,6 +428,7 @@ ${ORACLE_LIBRARIES} ${LIBXML2_LIBRARIES} ${QSCINTILLA_LIBRARIES} + ${POSTGRESQL_LIBRARIES} ) # static Modified: trunk/tora/src/toqsqlconnection.cpp =================================================================== --- trunk/tora/src/toqsqlconnection.cpp 2008-08-14 12:39:07 UTC (rev 2938) +++ trunk/tora/src/toqsqlconnection.cpp 2008-08-14 14:04:59 UTC (rev 2939) @@ -63,10 +63,10 @@ #include <QString> #ifdef HAVE_POSTGRESQL_LIBPQ_FE_H - #include <postgresql/libpq-fe.h> + #include <libpq-fe.h> #endif -#include <QDebug> +// #include <QDebug> static toSQL SQLVersion("toQSqlConnection:Version", "SHOW VARIABLES LIKE 'version'", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-08-18 07:54:53
|
Revision: 2956 http://tora.svn.sourceforge.net/tora/?rev=2956&view=rev Author: subik Date: 2008-08-18 07:55:02 +0000 (Mon, 18 Aug 2008) Log Message: ----------- native postgresql stuff should work for autotools and cmake correctly now Modified Paths: -------------- trunk/tora/CMakeLists.txt trunk/tora/src/CMakeLists.txt trunk/tora/src/toqsqlconnection.cpp Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-08-18 03:21:57 UTC (rev 2955) +++ trunk/tora/CMakeLists.txt 2008-08-18 07:55:02 UTC (rev 2956) @@ -46,6 +46,8 @@ SET (EXE_NAME "tora") ADD_DEFINITIONS("-DTOVERSION=\\\"${VERSION}\\\"") +# Allow using CMAKE-related ifdefs in the code. See e.g. toqsqlconnection.cpp. +ADD_DEFINITIONS("-DCMAKE_BUILD") #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) Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-08-18 03:21:57 UTC (rev 2955) +++ trunk/tora/src/CMakeLists.txt 2008-08-18 07:55:02 UTC (rev 2956) @@ -438,7 +438,7 @@ ) IF (POSTGRESQL_LIBRARIES) - TARGET_LINK_LIBRARIES (${POSTGRESQL_LIBRARIES}) + TARGET_LINK_LIBRARIES (${EXE_NAME} ${POSTGRESQL_LIBRARIES}) ENDIF (POSTGRESQL_LIBRARIES) # static Modified: trunk/tora/src/toqsqlconnection.cpp =================================================================== --- trunk/tora/src/toqsqlconnection.cpp 2008-08-18 03:21:57 UTC (rev 2955) +++ trunk/tora/src/toqsqlconnection.cpp 2008-08-18 07:55:02 UTC (rev 2956) @@ -64,8 +64,16 @@ #include <QString> #ifdef HAVE_POSTGRESQL_LIBPQ_FE_H +#ifdef CMAKE_BUILD + // There is different location of pgsql includes sometimes + // E.g. /usr/include/pgsql on suse etc. Cmake hadles it + // easily for us. + #include <libpq-fe.h> +#else + // This is for autotools #include <postgresql/libpq-fe.h> #endif +#endif // #include <QDebug> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-08-21 08:27:10
|
Revision: 2962 http://tora.svn.sourceforge.net/tora/?rev=2962&view=rev Author: subik Date: 2008-08-21 08:27:18 +0000 (Thu, 21 Aug 2008) Log Message: ----------- removed unused cmake stuff Modified Paths: -------------- trunk/tora/CMakeLists.txt Removed Paths: ------------- trunk/tora/ConfigureChecks.cmake Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-08-20 12:21:24 UTC (rev 2961) +++ trunk/tora/CMakeLists.txt 2008-08-21 08:27:18 UTC (rev 2962) @@ -242,7 +242,7 @@ #Create configure files.. config.h and uninstall #config.h -INCLUDE (ConfigureChecks.cmake) +# INCLUDE (ConfigureChecks.cmake) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h) ADD_DEFINITIONS("-DHAVE_CONFIG_H") Deleted: trunk/tora/ConfigureChecks.cmake =================================================================== --- trunk/tora/ConfigureChecks.cmake 2008-08-20 12:21:24 UTC (rev 2961) +++ trunk/tora/ConfigureChecks.cmake 2008-08-21 08:27:18 UTC (rev 2962) @@ -1,101 +0,0 @@ -#http://websvn.kde.org/trunk/KDE/kdeaddons/ConfigureChecks.cmake?rev=520160&view=log - -include(CheckIncludeFile) -include(CheckIncludeFiles) -#include(CheckSymbolExists) -include(CheckFunctionExists) -include(CheckLibraryExists) -#include(CheckPrototypeExists) -include(CheckTypeSize) - - -#check for libz using the cmake supplied FindZLIB.cmake -if(ZLIB_FOUND) - set(HAVE_LIBZ 1) -else(ZLIB_FOUND) - set(HAVE_LIBZ 0) -endif(ZLIB_FOUND) - -if(JPEG_FOUND) - set(HAVE_LIBJPEG 1) -else(JPEG_FOUND) - set(HAVE_LIBJPEG 0) -endif(JPEG_FOUND) - -#check for png -if(PNG_FOUND) - set(HAVE_LIBPNG 1) -else(PNG_FOUND) - set(HAVE_LIBPNG 0) -endif(PNG_FOUND) - -if(BZIP2_FOUND) - set(HAVE_BZIP2_SUPPORT 1) - if(BZIP2_NEED_PREFIX) - set(NEED_BZ2_PREFIX 1) - endif(BZIP2_NEED_PREFIX) -else(BZIP2_FOUND) - set(HAVE_BZIP2_SUPPORT 0) -endif(BZIP2_FOUND) - -if(CAIRO_FOUND) - set(HAVE_LIBART 0) - set(HAVE_CAIRO 1) -else(CAIRO_FOUND) - set(HAVE_LIBART 1) - set(HAVE_CAIRO 0) -endif(CAIRO_FOUND) - -if(CARBON_FOUND) - set(HAVE_CARBON 1) -else(CARBON_FOUND) - set(HAVE_CARBON 0) -endif(CARBON_FOUND) - -if(OPENSSL_FOUND) - set(HAVE_SSL 1) -else(OPENSSL_FOUND) - set(HAVE_SSL 0) -endif(OPENSSL_FOUND) - - -check_include_files(endian.h HAVE_ENDIAN_H) -check_include_files(fcntl.h HAVE_FCNTL_H) -check_include_files(dlfcn.h HAVE_DLFCN_H) -#check_include_files(crt_externs.h HAVE_CRT_EXTERNS_H) -#check_include_files(inttypes.h HAVE_INTTYPES_H) -#check_include_files(memory.h HAVE_MEMORY_H) -#check_include_files(stdint.h HAVE_STDINT_H) -#check_include_files(stdlib.h HAVE_STDLIB_H) -#check_include_files(strings.h HAVE_STRINGS_H) -#check_include_files(string.h HAVE_STRING_H) -#check_include_files(sys/bitypes.h HAVE_SYS_BITYPES_H) -#check_include_files(sys/stat.h HAVE_SYS_STAT_H) -#check_include_files(sys/types.h HAVE_SYS_TYPES_H) -check_include_files(unistd.h HAVE_UNISTD_H) - -#check_function_exists(_NSGetEnviron HAVE_NSGETENVIRON) -#check_function_exists(initgroups HAVE_INITGROUPS) -#check_function_exists(setenv HAVE_SETENV) -#check_function_exists(strlcat HAVE_STRLCAT) -#check_function_exists(strlcpy HAVE_STRLCPY) - -#check_symbol_exists(res_init "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT) -#check_symbol_exists(snprintf "stdio.h" HAVE_SNPRINTF) -#check_symbol_exists(vsnprintf "stdio.h" HAVE_VSNPRINTF) - - -#check_prototype_exists(res_init "sys/types.h;netinet/in.h;arpa/nameser.h;resolv.h" HAVE_RES_INIT_PROTO) -#check_prototype_exists(initgroups "unistd.h;sys/types.h;unistd.h;grp.h" HAVE_INITGROUPS_PROTO) -#check_prototype_exists(setenv stdlib.h HAVE_SETENV_PROTO) -#check_prototype_exists(strlcat string.h HAVE_STRLCAT_PROTO) -#check_prototype_exists(strlcpy string.h HAVE_STRLCPY_PROTO) - - -#check_type_size("int" SIZEOF_INT) -#check_type_size("char *" SIZEOF_CHAR_P) -#check_type_size("long" SIZEOF_LONG) -#check_type_size("short" SIZEOF_SHORT) -#check_type_size("size_t" SIZEOF_SIZE_T) -#check_type_size("unsigned long" SIZEOF_UNSIGNED_LONG) - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-09-08 12:48:01
|
Revision: 2981 http://tora.svn.sourceforge.net/tora/?rev=2981&view=rev Author: subik Date: 2008-09-08 12:48:12 +0000 (Mon, 08 Sep 2008) Log Message: ----------- make it compilable with pgsql libs on windows Modified Paths: -------------- trunk/tora/CMakeLists.txt trunk/tora/cmake/modules/FindPostgreSQL.cmake Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-09-08 00:57:11 UTC (rev 2980) +++ trunk/tora/CMakeLists.txt 2008-09-08 12:48:12 UTC (rev 2981) @@ -208,6 +208,8 @@ MESSAGE(WARNING " No PostgreSQL environment has been found.") MESSAGE(WARNING " Specify -DPOSTGRESQL_PATH_INCLUDES=path") MESSAGE(WARNING " and -DPOSTGRESQL_PATH_LIB manually") + #MESSAGE (STATUS "PostgreSQL includes: ${POSTGRESQL_INCLUDE_DIR} vs. ${POSTGRESQL_PATH_INCLUDES}") + #MESSAGE (STATUS "PostgreSQL libs: ${POSTGRESQL_LIBRARIES} vs. ${POSTGRESQL_PATH_LIB}") MESSAGE(" ") ENDIF (POSTGRESQL_FOUND) Modified: trunk/tora/cmake/modules/FindPostgreSQL.cmake =================================================================== --- trunk/tora/cmake/modules/FindPostgreSQL.cmake 2008-09-08 00:57:11 UTC (rev 2980) +++ trunk/tora/cmake/modules/FindPostgreSQL.cmake 2008-09-08 12:48:12 UTC (rev 2981) @@ -19,13 +19,13 @@ find_path(POSTGRESQL_INCLUDE_DIR libpq-fe.h - ${DPOSTGRESQL_PATH_INCLUDES}/ + ${POSTGRESQL_PATH_INCLUDES}/ /usr/include/pgsql/ /usr/local/include/pgsql/ /usr/include/postgresql/ ) -find_library(POSTGRESQL_LIBRARIES NAMES pq +find_library(POSTGRESQL_LIBRARIES NAMES pq libpq PATH ${POSTGRESQL_PATH_LIB}) include(FindPackageHandleStandardArgs) @@ -34,3 +34,6 @@ mark_as_advanced(POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES) +#MESSAGE (STATUS "PostgreSQL includes: ${POSTGRESQL_INCLUDE_DIR} vs. ${POSTGRESQL_PATH_INCLUDES}") +#MESSAGE (STATUS "PostgreSQL libs: ${POSTGRESQL_LIBRARIES} vs. ${POSTGRESQL_PATH_LIB}") + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-09-08 13:55:36
|
Revision: 2982 http://tora.svn.sourceforge.net/tora/?rev=2982&view=rev Author: subik Date: 2008-09-08 13:55:43 +0000 (Mon, 08 Sep 2008) Log Message: ----------- use an icon for the executable under windows Modified Paths: -------------- trunk/tora/CMakeLists.txt trunk/tora/src/CMakeLists.txt Added Paths: ----------- trunk/tora/src/icons/tora.ico trunk/tora/src/tora.rc Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-09-08 12:48:12 UTC (rev 2981) +++ trunk/tora/CMakeLists.txt 2008-09-08 13:55:43 UTC (rev 2982) @@ -58,7 +58,11 @@ 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}/") + IF (UNIX) + SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/tora/") # it would be pain for upgrade configs -${VERSION}/") + ELSE (UNIX) + SET (TORA_DOC_DIR "${CMAKE_INSTALL_PREFIX}/doc/") + ENDIF (UNIX) endif (NOT TORA_DOC_DIR) #if (NOT TORA_HELP_DIR) Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-09-08 12:48:12 UTC (rev 2981) +++ trunk/tora/src/CMakeLists.txt 2008-09-08 13:55:43 UTC (rev 2982) @@ -360,7 +360,12 @@ migratetool/squirrelsql.cpp migratetool/tora3.cpp ) +# compiled in icons for windows +IF (WIN32 AND MSVC) + SET (TORA_SOURCES ${TORA_SOURCES} tora.rc) +ENDIF (WIN32 AND MSVC) + QT4_ADD_TRANSLATION(TORA_I18N_QM ${TORA_I18N_TS}) QT4_WRAP_UI(TORA_UI_SOURCES ${TORA_UI_SRC} ) QT4_WRAP_CPP(TORA_MOC_SOURCES ${TORA_MOC_CLASSES}) Property changes on: trunk/tora/src/icons/tora.ico ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/tora/src/tora.rc =================================================================== --- trunk/tora/src/tora.rc (rev 0) +++ trunk/tora/src/tora.rc 2008-09-08 13:55:43 UTC (rev 2982) @@ -0,0 +1,2 @@ +IDI_ICON1 ICON DISCARDABLE "icons/tora.ico" + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-09-12 05:32:45
|
Revision: 2989 http://tora.svn.sourceforge.net/tora/?rev=2989&view=rev Author: subik Date: 2008-09-12 05:32:53 +0000 (Fri, 12 Sep 2008) Log Message: ----------- fix for doc's index vs Index filenames for windows Modified Paths: -------------- trunk/tora/doc/help/extendingtora.html trunk/tora/doc/help/index.html trunk/tora/doc/help/tora.texi trunk/tora/src/help/extendingtora.html trunk/tora/src/help/index.html Added Paths: ----------- trunk/tora/doc/help/Index_002dlist.html trunk/tora/src/help/Index_002dlist.html Removed Paths: ------------- trunk/tora/doc/help/Index.html trunk/tora/src/help/Index.html Deleted: trunk/tora/doc/help/Index.html =================================================================== --- trunk/tora/doc/help/Index.html 2008-09-11 18:16:27 UTC (rev 2988) +++ trunk/tora/doc/help/Index.html 2008-09-12 05:32:53 UTC (rev 2989) @@ -1,75 +0,0 @@ -<html lang="en"> -<head> -<title>Index - TOra</title> -<meta http-equiv="Content-Type" content="text/html"> -<meta name="description" content="TOra"> -<meta name="generator" content="makeinfo 4.11"> -<link title="Top" rel="start" href="index.html#Top"> -<link rel="prev" href="extendingtora.html#extendingtora" title="extendingtora"> -<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> -<!-- -This manual is for TOra, version 1.4.0.--> -<meta http-equiv="Content-Style-Type" content="text/css"> -<style type="text/css"><!-- - pre.display { font-family:inherit } - pre.format { font-family:inherit } - pre.smalldisplay { font-family:inherit; font-size:smaller } - pre.smallformat { font-family:inherit; font-size:smaller } - pre.smallexample { font-size:smaller } - pre.smalllisp { font-size:smaller } - span.sc { font-variant:small-caps } - span.roman { font-family:serif; font-weight:normal; } - span.sansserif { font-family:sans-serif; font-weight:normal; } ---></style> -</head> -<body> -<div class="node"> -<p> -<a name="Index"></a> -Previous: <a rel="previous" accesskey="p" href="extendingtora.html#extendingtora">extendingtora</a>, -Up: <a rel="up" accesskey="u" href="index.html#Top">Top</a> -<hr> -</div> - -<h2 class="unnumbered">Index</h2> - -<ul class="index-cp" compact> -<li><a href="additionalhelp.html#index-Additional-Help-Settings-13">Additional Help Settings</a>: <a href="additionalhelp.html#additionalhelp">additionalhelp</a></li> -<li><a href="alert.html#index-Alert-Tool-31">Alert Tool</a>: <a href="alert.html#alert">alert</a></li> -<li><a href="tools.html#index-Available-tools-16">Available tools</a>: <a href="tools.html#tools">tools</a></li> -<li><a href="newconnection.html#index-Connecting-to-a-database-5">Connecting to a database</a>: <a href="newconnection.html#newconnection">newconnection</a></li> -<li><a href="current.html#index-Current-Session-28">Current Session</a>: <a href="current.html#current">current</a></li> -<li><a href="browser.html#index-Database-Browser-18">Database Browser</a>: <a href="browser.html#browser">browser</a></li> -<li><a href="database.html#index-Database-Settings-11">Database Settings</a>: <a href="database.html#database">database</a></li> -<li><a href="window.html#index-Elements-of-the-main-window-4">Elements of the main window</a>: <a href="window.html#window">window</a></li> -<li><a href="extendingtora.html#index-Extending-TOra-36">Extending TOra</a>: <a href="extendingtora.html#extendingtora">extendingtora</a></li> -<li><a href="fonts.html#index-Font-Settings-12">Font Settings</a>: <a href="fonts.html#fonts">fonts</a></li> -<li><a href="workspace.html#index-Getting-to-know-your-workspace-3">Getting to know your workspace</a>: <a href="workspace.html#workspace">workspace</a></li> -<li><a href="history.html#index-History-and-future-of-TOra-2">History and future of TOra</a>: <a href="history.html#history">history</a></li> -<li><a href="invalid.html#index-Invalid-Objects-32">Invalid Objects</a>: <a href="invalid.html#invalid">invalid</a></li> -<li><a href="lists.html#index-lists-7">lists</a>: <a href="lists.html#lists">lists</a></li> -<li><a href="preferences.html#index-Options-10">Options</a>: <a href="preferences.html#preferences">preferences</a></li> -<li><a href="common.html#index-Other-common-elements-15">Other common elements</a>: <a href="common.html#common">common</a></li> -<li><a href="debugger.html#index-PL_002fSQL-Debugger-20">PL/SQL Debugger</a>: <a href="debugger.html#debugger">debugger</a></li> -<li><a href="plsqleditor.html#index-PL_002fSQL-Editor-19">PL/SQL Editor</a>: <a href="plsqleditor.html#plsqleditor">plsqleditor</a></li> -<li><a href="unittest.html#index-PL_002fSQL-Unit-Tester-21">PL/SQL Unit Tester</a>: <a href="unittest.html#unittest">unittest</a></li> -<li><a href="rollback.html#index-Rollback-Segments-26">Rollback Segments</a>: <a href="rollback.html#rollback">rollback</a></li> -<li><a href="script.html#index-Schema-extraction_002c-compare-and-search-29">Schema extraction, compare and search</a>: <a href="script.html#script">script</a></li> -<li><a href="searchreplace.html#index-Search-_0026-Replace-9">Search & Replace</a>: <a href="searchreplace.html#searchreplace">searchreplace</a></li> -<li><a href="security.html#index-Security-Manager-23">Security Manager</a>: <a href="security.html#security">security</a></li> -<li><a href="tuning.html#index-Server-Tuning-22">Server Tuning</a>: <a href="tuning.html#tuning">tuning</a></li> -<li><a href="session.html#index-Session-Manager-25">Session Manager</a>: <a href="session.html#session">session</a></li> -<li><a href="trace.html#index-SGA-Trace-27">SGA Trace</a>: <a href="trace.html#trace">trace</a></li> -<li><a href="sqledit.html#index-SQL-Editor-35">SQL Editor</a>: <a href="sqledit.html#sqledit">sqledit</a></li> -<li><a href="output.html#index-SQL-Output-33">SQL Output</a>: <a href="output.html#output">output</a></li> -<li><a href="worksheet.html#index-SQL-Worksheet-17">SQL Worksheet</a>: <a href="worksheet.html#worksheet">worksheet</a></li> -<li><a href="analyze.html#index-Statistics-manager-30">Statistics manager</a>: <a href="analyze.html#analyze">analyze</a></li> -<li><a href="storage.html#index-Storage-Manager-24">Storage Manager</a>: <a href="storage.html#storage">storage</a></li> -<li><a href="template.html#index-Template-Help-34">Template Help</a>: <a href="template.html#template">template</a></li> -<li><a href="toolsetting.html#index-Tool-Settings-14">Tool Settings</a>: <a href="toolsetting.html#toolsetting">toolsetting</a></li> -<li><a href="api.html#index-TOra-Tool-Tutorial-37">TOra Tool Tutorial</a>: <a href="api.html#api">api</a></li> -<li><a href="charts.html#index-Using-charts-8">Using charts</a>: <a href="charts.html#charts">charts</a></li> -<li><a href="editors.html#index-Using-editors-6">Using editors</a>: <a href="editors.html#editors">editors</a></li> -<li><a href="help.html#index-Using-the-help-browser-1">Using the help browser</a>: <a href="help.html#help">help</a></li> - </ul></body></html> - Added: trunk/tora/doc/help/Index_002dlist.html =================================================================== --- trunk/tora/doc/help/Index_002dlist.html (rev 0) +++ trunk/tora/doc/help/Index_002dlist.html 2008-09-12 05:32:53 UTC (rev 2989) @@ -0,0 +1,76 @@ +<html lang="en"> +<head> +<title>Index-list - TOra</title> +<meta http-equiv="Content-Type" content="text/html"> +<meta name="description" content="TOra"> +<meta name="generator" content="makeinfo 4.11"> +<link title="Top" rel="start" href="index.html#Top"> +<link rel="prev" href="extendingtora.html#extendingtora" title="extendingtora"> +<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> +<!-- +This manual is for TOra, version 1.4.0.--> +<meta http-equiv="Content-Style-Type" content="text/css"> +<style type="text/css"><!-- + pre.display { font-family:inherit } + pre.format { font-family:inherit } + pre.smalldisplay { font-family:inherit; font-size:smaller } + pre.smallformat { font-family:inherit; font-size:smaller } + pre.smallexample { font-size:smaller } + pre.smalllisp { font-size:smaller } + span.sc { font-variant:small-caps } + span.roman { font-family:serif; font-weight:normal; } + span.sansserif { font-family:sans-serif; font-weight:normal; } +--></style> +</head> +<body> +<div class="node"> +<p> +<a name="Index-list"></a> +<a name="Index_002dlist"></a> +Previous: <a rel="previous" accesskey="p" href="extendingtora.html#extendingtora">extendingtora</a>, +Up: <a rel="up" accesskey="u" href="index.html#Top">Top</a> +<hr> +</div> + +<h2 class="unnumbered">Index-list</h2> + +<ul class="index-cp" compact> +<li><a href="additionalhelp.html#index-Additional-Help-Settings-13">Additional Help Settings</a>: <a href="additionalhelp.html#additionalhelp">additionalhelp</a></li> +<li><a href="alert.html#index-Alert-Tool-31">Alert Tool</a>: <a href="alert.html#alert">alert</a></li> +<li><a href="tools.html#index-Available-tools-16">Available tools</a>: <a href="tools.html#tools">tools</a></li> +<li><a href="newconnection.html#index-Connecting-to-a-database-5">Connecting to a database</a>: <a href="newconnection.html#newconnection">newconnection</a></li> +<li><a href="current.html#index-Current-Session-28">Current Session</a>: <a href="current.html#current">current</a></li> +<li><a href="browser.html#index-Database-Browser-18">Database Browser</a>: <a href="browser.html#browser">browser</a></li> +<li><a href="database.html#index-Database-Settings-11">Database Settings</a>: <a href="database.html#database">database</a></li> +<li><a href="window.html#index-Elements-of-the-main-window-4">Elements of the main window</a>: <a href="window.html#window">window</a></li> +<li><a href="extendingtora.html#index-Extending-TOra-36">Extending TOra</a>: <a href="extendingtora.html#extendingtora">extendingtora</a></li> +<li><a href="fonts.html#index-Font-Settings-12">Font Settings</a>: <a href="fonts.html#fonts">fonts</a></li> +<li><a href="workspace.html#index-Getting-to-know-your-workspace-3">Getting to know your workspace</a>: <a href="workspace.html#workspace">workspace</a></li> +<li><a href="history.html#index-History-and-future-of-TOra-2">History and future of TOra</a>: <a href="history.html#history">history</a></li> +<li><a href="invalid.html#index-Invalid-Objects-32">Invalid Objects</a>: <a href="invalid.html#invalid">invalid</a></li> +<li><a href="lists.html#index-lists-7">lists</a>: <a href="lists.html#lists">lists</a></li> +<li><a href="preferences.html#index-Options-10">Options</a>: <a href="preferences.html#preferences">preferences</a></li> +<li><a href="common.html#index-Other-common-elements-15">Other common elements</a>: <a href="common.html#common">common</a></li> +<li><a href="debugger.html#index-PL_002fSQL-Debugger-20">PL/SQL Debugger</a>: <a href="debugger.html#debugger">debugger</a></li> +<li><a href="plsqleditor.html#index-PL_002fSQL-Editor-19">PL/SQL Editor</a>: <a href="plsqleditor.html#plsqleditor">plsqleditor</a></li> +<li><a href="unittest.html#index-PL_002fSQL-Unit-Tester-21">PL/SQL Unit Tester</a>: <a href="unittest.html#unittest">unittest</a></li> +<li><a href="rollback.html#index-Rollback-Segments-26">Rollback Segments</a>: <a href="rollback.html#rollback">rollback</a></li> +<li><a href="script.html#index-Schema-extraction_002c-compare-and-search-29">Schema extraction, compare and search</a>: <a href="script.html#script">script</a></li> +<li><a href="searchreplace.html#index-Search-_0026-Replace-9">Search & Replace</a>: <a href="searchreplace.html#searchreplace">searchreplace</a></li> +<li><a href="security.html#index-Security-Manager-23">Security Manager</a>: <a href="security.html#security">security</a></li> +<li><a href="tuning.html#index-Server-Tuning-22">Server Tuning</a>: <a href="tuning.html#tuning">tuning</a></li> +<li><a href="session.html#index-Session-Manager-25">Session Manager</a>: <a href="session.html#session">session</a></li> +<li><a href="trace.html#index-SGA-Trace-27">SGA Trace</a>: <a href="trace.html#trace">trace</a></li> +<li><a href="sqledit.html#index-SQL-Editor-35">SQL Editor</a>: <a href="sqledit.html#sqledit">sqledit</a></li> +<li><a href="output.html#index-SQL-Output-33">SQL Output</a>: <a href="output.html#output">output</a></li> +<li><a href="worksheet.html#index-SQL-Worksheet-17">SQL Worksheet</a>: <a href="worksheet.html#worksheet">worksheet</a></li> +<li><a href="analyze.html#index-Statistics-manager-30">Statistics manager</a>: <a href="analyze.html#analyze">analyze</a></li> +<li><a href="storage.html#index-Storage-Manager-24">Storage Manager</a>: <a href="storage.html#storage">storage</a></li> +<li><a href="template.html#index-Template-Help-34">Template Help</a>: <a href="template.html#template">template</a></li> +<li><a href="toolsetting.html#index-Tool-Settings-14">Tool Settings</a>: <a href="toolsetting.html#toolsetting">toolsetting</a></li> +<li><a href="api.html#index-TOra-Tool-Tutorial-37">TOra Tool Tutorial</a>: <a href="api.html#api">api</a></li> +<li><a href="charts.html#index-Using-charts-8">Using charts</a>: <a href="charts.html#charts">charts</a></li> +<li><a href="editors.html#index-Using-editors-6">Using editors</a>: <a href="editors.html#editors">editors</a></li> +<li><a href="help.html#index-Using-the-help-browser-1">Using the help browser</a>: <a href="help.html#help">help</a></li> + </ul></body></html> + Modified: trunk/tora/doc/help/extendingtora.html =================================================================== --- trunk/tora/doc/help/extendingtora.html 2008-09-11 18:16:27 UTC (rev 2988) +++ trunk/tora/doc/help/extendingtora.html 2008-09-12 05:32:53 UTC (rev 2989) @@ -6,7 +6,7 @@ <meta name="generator" content="makeinfo 4.11"> <link title="Top" rel="start" href="index.html#Top"> <link rel="prev" href="tools.html#tools" title="tools"> -<link rel="next" href="Index.html#Index" title="Index"> +<link rel="next" href="Index_002dlist.html#Index_002dlist" title="Index-list"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- This manual is for TOra, version 1.4.0.--> @@ -27,7 +27,7 @@ <div class="node"> <p> <a name="extendingtora"></a> -Next: <a rel="next" accesskey="n" href="Index.html#Index">Index</a>, +Next: <a rel="next" accesskey="n" href="Index_002dlist.html#Index_002dlist">Index-list</a>, Previous: <a rel="previous" accesskey="p" href="tools.html#tools">tools</a>, Up: <a rel="up" accesskey="u" href="index.html#Top">Top</a> <hr> Modified: trunk/tora/doc/help/index.html =================================================================== --- trunk/tora/doc/help/index.html 2008-09-11 18:16:27 UTC (rev 2988) +++ trunk/tora/doc/help/index.html 2008-09-12 05:32:53 UTC (rev 2989) @@ -82,7 +82,7 @@ <li><a href="api.html#api">5.1 TOra Tool Tutorial</a> <li><a href="externalapi.html#externalapi">5.2 API Reference</a> </li></ul> -<li><a name="toc_Index" href="Index.html#Index">Index</a> +<li><a name="toc_Index_002dlist" href="Index_002dlist.html#Index_002dlist">Index-list</a> </li></ul> </div> @@ -106,7 +106,7 @@ <li><a accesskey="3" href="workspace.html#workspace">Getting to know your workspace</a> <li><a accesskey="4" href="tools.html#tools">Available tools</a> <li><a accesskey="5" href="extendingtora.html#extendingtora">Extending TOra</a> -<li><a accesskey="6" href="Index.html#Index">Index</a>: Complete index. +<li><a accesskey="6" href="Index_002dlist.html#Index_002dlist">Index-list</a>: Complete index. </ul> </body></html> Modified: trunk/tora/doc/help/tora.texi =================================================================== --- trunk/tora/doc/help/tora.texi 2008-09-11 18:16:27 UTC (rev 2988) +++ trunk/tora/doc/help/tora.texi 2008-09-12 05:32:53 UTC (rev 2989) @@ -35,7 +35,7 @@ * Getting to know your workspace: workspace. * Available tools: tools. * Extending TOra: extendingtora. -* Index:: Complete index. +* Index-list:: Complete index. @end menu @include help.texi @@ -76,8 +76,8 @@ @include extendingtora.texi @include api.texi @include externalapi.texi -@node Index -@unnumbered Index +@node Index-list +@unnumbered Index-list @printindex cp @bye Deleted: trunk/tora/src/help/Index.html =================================================================== --- trunk/tora/src/help/Index.html 2008-09-11 18:16:27 UTC (rev 2988) +++ trunk/tora/src/help/Index.html 2008-09-12 05:32:53 UTC (rev 2989) @@ -1,75 +0,0 @@ -<html lang="en"> -<head> -<title>Index - TOra</title> -<meta http-equiv="Content-Type" content="text/html"> -<meta name="description" content="TOra"> -<meta name="generator" content="makeinfo 4.11"> -<link title="Top" rel="start" href="index.html#Top"> -<link rel="prev" href="extendingtora.html#extendingtora" title="extendingtora"> -<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> -<!-- -This manual is for TOra, version 1.4.0.--> -<meta http-equiv="Content-Style-Type" content="text/css"> -<style type="text/css"><!-- - pre.display { font-family:inherit } - pre.format { font-family:inherit } - pre.smalldisplay { font-family:inherit; font-size:smaller } - pre.smallformat { font-family:inherit; font-size:smaller } - pre.smallexample { font-size:smaller } - pre.smalllisp { font-size:smaller } - span.sc { font-variant:small-caps } - span.roman { font-family:serif; font-weight:normal; } - span.sansserif { font-family:sans-serif; font-weight:normal; } ---></style> -</head> -<body> -<div class="node"> -<p> -<a name="Index"></a> -Previous: <a rel="previous" accesskey="p" href="extendingtora.html#extendingtora">extendingtora</a>, -Up: <a rel="up" accesskey="u" href="index.html#Top">Top</a> -<hr> -</div> - -<h2 class="unnumbered">Index</h2> - -<ul class="index-cp" compact> -<li><a href="additionalhelp.html#index-Additional-Help-Settings-13">Additional Help Settings</a>: <a href="additionalhelp.html#additionalhelp">additionalhelp</a></li> -<li><a href="alert.html#index-Alert-Tool-31">Alert Tool</a>: <a href="alert.html#alert">alert</a></li> -<li><a href="tools.html#index-Available-tools-16">Available tools</a>: <a href="tools.html#tools">tools</a></li> -<li><a href="newconnection.html#index-Connecting-to-a-database-5">Connecting to a database</a>: <a href="newconnection.html#newconnection">newconnection</a></li> -<li><a href="current.html#index-Current-Session-28">Current Session</a>: <a href="current.html#current">current</a></li> -<li><a href="browser.html#index-Database-Browser-18">Database Browser</a>: <a href="browser.html#browser">browser</a></li> -<li><a href="database.html#index-Database-Settings-11">Database Settings</a>: <a href="database.html#database">database</a></li> -<li><a href="window.html#index-Elements-of-the-main-window-4">Elements of the main window</a>: <a href="window.html#window">window</a></li> -<li><a href="extendingtora.html#index-Extending-TOra-36">Extending TOra</a>: <a href="extendingtora.html#extendingtora">extendingtora</a></li> -<li><a href="fonts.html#index-Font-Settings-12">Font Settings</a>: <a href="fonts.html#fonts">fonts</a></li> -<li><a href="workspace.html#index-Getting-to-know-your-workspace-3">Getting to know your workspace</a>: <a href="workspace.html#workspace">workspace</a></li> -<li><a href="history.html#index-History-and-future-of-TOra-2">History and future of TOra</a>: <a href="history.html#history">history</a></li> -<li><a href="invalid.html#index-Invalid-Objects-32">Invalid Objects</a>: <a href="invalid.html#invalid">invalid</a></li> -<li><a href="lists.html#index-lists-7">lists</a>: <a href="lists.html#lists">lists</a></li> -<li><a href="preferences.html#index-Options-10">Options</a>: <a href="preferences.html#preferences">preferences</a></li> -<li><a href="common.html#index-Other-common-elements-15">Other common elements</a>: <a href="common.html#common">common</a></li> -<li><a href="debugger.html#index-PL_002fSQL-Debugger-20">PL/SQL Debugger</a>: <a href="debugger.html#debugger">debugger</a></li> -<li><a href="plsqleditor.html#index-PL_002fSQL-Editor-19">PL/SQL Editor</a>: <a href="plsqleditor.html#plsqleditor">plsqleditor</a></li> -<li><a href="unittest.html#index-PL_002fSQL-Unit-Tester-21">PL/SQL Unit Tester</a>: <a href="unittest.html#unittest">unittest</a></li> -<li><a href="rollback.html#index-Rollback-Segments-26">Rollback Segments</a>: <a href="rollback.html#rollback">rollback</a></li> -<li><a href="script.html#index-Schema-extraction_002c-compare-and-search-29">Schema extraction, compare and search</a>: <a href="script.html#script">script</a></li> -<li><a href="searchreplace.html#index-Search-_0026-Replace-9">Search & Replace</a>: <a href="searchreplace.html#searchreplace">searchreplace</a></li> -<li><a href="security.html#index-Security-Manager-23">Security Manager</a>: <a href="security.html#security">security</a></li> -<li><a href="tuning.html#index-Server-Tuning-22">Server Tuning</a>: <a href="tuning.html#tuning">tuning</a></li> -<li><a href="session.html#index-Session-Manager-25">Session Manager</a>: <a href="session.html#session">session</a></li> -<li><a href="trace.html#index-SGA-Trace-27">SGA Trace</a>: <a href="trace.html#trace">trace</a></li> -<li><a href="sqledit.html#index-SQL-Editor-35">SQL Editor</a>: <a href="sqledit.html#sqledit">sqledit</a></li> -<li><a href="output.html#index-SQL-Output-33">SQL Output</a>: <a href="output.html#output">output</a></li> -<li><a href="worksheet.html#index-SQL-Worksheet-17">SQL Worksheet</a>: <a href="worksheet.html#worksheet">worksheet</a></li> -<li><a href="analyze.html#index-Statistics-manager-30">Statistics manager</a>: <a href="analyze.html#analyze">analyze</a></li> -<li><a href="storage.html#index-Storage-Manager-24">Storage Manager</a>: <a href="storage.html#storage">storage</a></li> -<li><a href="template.html#index-Template-Help-34">Template Help</a>: <a href="template.html#template">template</a></li> -<li><a href="toolsetting.html#index-Tool-Settings-14">Tool Settings</a>: <a href="toolsetting.html#toolsetting">toolsetting</a></li> -<li><a href="api.html#index-TOra-Tool-Tutorial-37">TOra Tool Tutorial</a>: <a href="api.html#api">api</a></li> -<li><a href="charts.html#index-Using-charts-8">Using charts</a>: <a href="charts.html#charts">charts</a></li> -<li><a href="editors.html#index-Using-editors-6">Using editors</a>: <a href="editors.html#editors">editors</a></li> -<li><a href="help.html#index-Using-the-help-browser-1">Using the help browser</a>: <a href="help.html#help">help</a></li> - </ul></body></html> - Added: trunk/tora/src/help/Index_002dlist.html =================================================================== --- trunk/tora/src/help/Index_002dlist.html (rev 0) +++ trunk/tora/src/help/Index_002dlist.html 2008-09-12 05:32:53 UTC (rev 2989) @@ -0,0 +1,76 @@ +<html lang="en"> +<head> +<title>Index-list - TOra</title> +<meta http-equiv="Content-Type" content="text/html"> +<meta name="description" content="TOra"> +<meta name="generator" content="makeinfo 4.11"> +<link title="Top" rel="start" href="index.html#Top"> +<link rel="prev" href="extendingtora.html#extendingtora" title="extendingtora"> +<link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> +<!-- +This manual is for TOra, version 1.4.0.--> +<meta http-equiv="Content-Style-Type" content="text/css"> +<style type="text/css"><!-- + pre.display { font-family:inherit } + pre.format { font-family:inherit } + pre.smalldisplay { font-family:inherit; font-size:smaller } + pre.smallformat { font-family:inherit; font-size:smaller } + pre.smallexample { font-size:smaller } + pre.smalllisp { font-size:smaller } + span.sc { font-variant:small-caps } + span.roman { font-family:serif; font-weight:normal; } + span.sansserif { font-family:sans-serif; font-weight:normal; } +--></style> +</head> +<body> +<div class="node"> +<p> +<a name="Index-list"></a> +<a name="Index_002dlist"></a> +Previous: <a rel="previous" accesskey="p" href="extendingtora.html#extendingtora">extendingtora</a>, +Up: <a rel="up" accesskey="u" href="index.html#Top">Top</a> +<hr> +</div> + +<h2 class="unnumbered">Index-list</h2> + +<ul class="index-cp" compact> +<li><a href="additionalhelp.html#index-Additional-Help-Settings-13">Additional Help Settings</a>: <a href="additionalhelp.html#additionalhelp">additionalhelp</a></li> +<li><a href="alert.html#index-Alert-Tool-31">Alert Tool</a>: <a href="alert.html#alert">alert</a></li> +<li><a href="tools.html#index-Available-tools-16">Available tools</a>: <a href="tools.html#tools">tools</a></li> +<li><a href="newconnection.html#index-Connecting-to-a-database-5">Connecting to a database</a>: <a href="newconnection.html#newconnection">newconnection</a></li> +<li><a href="current.html#index-Current-Session-28">Current Session</a>: <a href="current.html#current">current</a></li> +<li><a href="browser.html#index-Database-Browser-18">Database Browser</a>: <a href="browser.html#browser">browser</a></li> +<li><a href="database.html#index-Database-Settings-11">Database Settings</a>: <a href="database.html#database">database</a></li> +<li><a href="window.html#index-Elements-of-the-main-window-4">Elements of the main window</a>: <a href="window.html#window">window</a></li> +<li><a href="extendingtora.html#index-Extending-TOra-36">Extending TOra</a>: <a href="extendingtora.html#extendingtora">extendingtora</a></li> +<li><a href="fonts.html#index-Font-Settings-12">Font Settings</a>: <a href="fonts.html#fonts">fonts</a></li> +<li><a href="workspace.html#index-Getting-to-know-your-workspace-3">Getting to know your workspace</a>: <a href="workspace.html#workspace">workspace</a></li> +<li><a href="history.html#index-History-and-future-of-TOra-2">History and future of TOra</a>: <a href="history.html#history">history</a></li> +<li><a href="invalid.html#index-Invalid-Objects-32">Invalid Objects</a>: <a href="invalid.html#invalid">invalid</a></li> +<li><a href="lists.html#index-lists-7">lists</a>: <a href="lists.html#lists">lists</a></li> +<li><a href="preferences.html#index-Options-10">Options</a>: <a href="preferences.html#preferences">preferences</a></li> +<li><a href="common.html#index-Other-common-elements-15">Other common elements</a>: <a href="common.html#common">common</a></li> +<li><a href="debugger.html#index-PL_002fSQL-Debugger-20">PL/SQL Debugger</a>: <a href="debugger.html#debugger">debugger</a></li> +<li><a href="plsqleditor.html#index-PL_002fSQL-Editor-19">PL/SQL Editor</a>: <a href="plsqleditor.html#plsqleditor">plsqleditor</a></li> +<li><a href="unittest.html#index-PL_002fSQL-Unit-Tester-21">PL/SQL Unit Tester</a>: <a href="unittest.html#unittest">unittest</a></li> +<li><a href="rollback.html#index-Rollback-Segments-26">Rollback Segments</a>: <a href="rollback.html#rollback">rollback</a></li> +<li><a href="script.html#index-Schema-extraction_002c-compare-and-search-29">Schema extraction, compare and search</a>: <a href="script.html#script">script</a></li> +<li><a href="searchreplace.html#index-Search-_0026-Replace-9">Search & Replace</a>: <a href="searchreplace.html#searchreplace">searchreplace</a></li> +<li><a href="security.html#index-Security-Manager-23">Security Manager</a>: <a href="security.html#security">security</a></li> +<li><a href="tuning.html#index-Server-Tuning-22">Server Tuning</a>: <a href="tuning.html#tuning">tuning</a></li> +<li><a href="session.html#index-Session-Manager-25">Session Manager</a>: <a href="session.html#session">session</a></li> +<li><a href="trace.html#index-SGA-Trace-27">SGA Trace</a>: <a href="trace.html#trace">trace</a></li> +<li><a href="sqledit.html#index-SQL-Editor-35">SQL Editor</a>: <a href="sqledit.html#sqledit">sqledit</a></li> +<li><a href="output.html#index-SQL-Output-33">SQL Output</a>: <a href="output.html#output">output</a></li> +<li><a href="worksheet.html#index-SQL-Worksheet-17">SQL Worksheet</a>: <a href="worksheet.html#worksheet">worksheet</a></li> +<li><a href="analyze.html#index-Statistics-manager-30">Statistics manager</a>: <a href="analyze.html#analyze">analyze</a></li> +<li><a href="storage.html#index-Storage-Manager-24">Storage Manager</a>: <a href="storage.html#storage">storage</a></li> +<li><a href="template.html#index-Template-Help-34">Template Help</a>: <a href="template.html#template">template</a></li> +<li><a href="toolsetting.html#index-Tool-Settings-14">Tool Settings</a>: <a href="toolsetting.html#toolsetting">toolsetting</a></li> +<li><a href="api.html#index-TOra-Tool-Tutorial-37">TOra Tool Tutorial</a>: <a href="api.html#api">api</a></li> +<li><a href="charts.html#index-Using-charts-8">Using charts</a>: <a href="charts.html#charts">charts</a></li> +<li><a href="editors.html#index-Using-editors-6">Using editors</a>: <a href="editors.html#editors">editors</a></li> +<li><a href="help.html#index-Using-the-help-browser-1">Using the help browser</a>: <a href="help.html#help">help</a></li> + </ul></body></html> + Modified: trunk/tora/src/help/extendingtora.html =================================================================== --- trunk/tora/src/help/extendingtora.html 2008-09-11 18:16:27 UTC (rev 2988) +++ trunk/tora/src/help/extendingtora.html 2008-09-12 05:32:53 UTC (rev 2989) @@ -6,7 +6,7 @@ <meta name="generator" content="makeinfo 4.11"> <link title="Top" rel="start" href="index.html#Top"> <link rel="prev" href="tools.html#tools" title="tools"> -<link rel="next" href="Index.html#Index" title="Index"> +<link rel="next" href="Index_002dlist.html#Index_002dlist" title="Index-list"> <link href="http://www.gnu.org/software/texinfo/" rel="generator-home" title="Texinfo Homepage"> <!-- This manual is for TOra, version 1.4.0.--> @@ -27,7 +27,7 @@ <div class="node"> <p> <a name="extendingtora"></a> -Next: <a rel="next" accesskey="n" href="Index.html#Index">Index</a>, +Next: <a rel="next" accesskey="n" href="Index_002dlist.html#Index_002dlist">Index-list</a>, Previous: <a rel="previous" accesskey="p" href="tools.html#tools">tools</a>, Up: <a rel="up" accesskey="u" href="index.html#Top">Top</a> <hr> Modified: trunk/tora/src/help/index.html =================================================================== --- trunk/tora/src/help/index.html 2008-09-11 18:16:27 UTC (rev 2988) +++ trunk/tora/src/help/index.html 2008-09-12 05:32:53 UTC (rev 2989) @@ -82,7 +82,7 @@ <li><a href="api.html#api">5.1 TOra Tool Tutorial</a> <li><a href="externalapi.html#externalapi">5.2 API Reference</a> </li></ul> -<li><a name="toc_Index" href="Index.html#Index">Index</a> +<li><a name="toc_Index_002dlist" href="Index_002dlist.html#Index_002dlist">Index-list</a> </li></ul> </div> @@ -106,7 +106,7 @@ <li><a accesskey="3" href="workspace.html#workspace">Getting to know your workspace</a> <li><a accesskey="4" href="tools.html#tools">Available tools</a> <li><a accesskey="5" href="extendingtora.html#extendingtora">Extending TOra</a> -<li><a accesskey="6" href="Index.html#Index">Index</a>: Complete index. +<li><a accesskey="6" href="Index_002dlist.html#Index_002dlist">Index-list</a>: Complete index. </ul> </body></html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-09-12 07:38:20
|
Revision: 2992 http://tora.svn.sourceforge.net/tora/?rev=2992&view=rev Author: subik Date: 2008-09-12 07:38:30 +0000 (Fri, 12 Sep 2008) Log Message: ----------- Edit Sql and Chart Manager menu options enter infinite loop. Modified Paths: -------------- trunk/tora/ISSUES trunk/tora/src/tochartmanager.cpp trunk/tora/src/tosqledit.cpp Modified: trunk/tora/ISSUES =================================================================== --- trunk/tora/ISSUES 2008-09-12 06:33:38 UTC (rev 2991) +++ trunk/tora/ISSUES 2008-09-12 07:38:30 UTC (rev 2992) @@ -5,11 +5,8 @@ Walk through basic tasks and dialogs and test its functionality. (create table, drop, alter etc.) -Edit Sql and Chart Manager menu options enter infinite loop. These did -work but may have been broken since the QMdiArea change. - Minor Issues that would be nice to fix before release ----------------------------------------------------- @@ -34,6 +31,9 @@ Resolved Issues --------------- +[FIXED- PV] Edit Sql and Chart Manager menu options enter infinite loop. These did +work but may have been broken since the QMdiArea change. + [working?] Oracle: better handling on extents tab if no access to dba_extents view. [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. ] Modified: trunk/tora/src/tochartmanager.cpp =================================================================== --- trunk/tora/src/tochartmanager.cpp 2008-09-12 06:33:38 UTC (rev 2991) +++ trunk/tora/src/tochartmanager.cpp 2008-09-12 07:38:30 UTC (rev 2992) @@ -85,14 +85,10 @@ if (!Window) { Window = new toChartManager(toMainWidget()->workspace()); - toMainWidget()->workspace()->addSubWindow(Window); Window->setWindowTitle(qApp->translate("toChartTool", "Chart Manager")); Window->setWindowIcon(QPixmap(const_cast<const char**>(chart_xpm))); } Window->refresh(); - Window->show(); - Window->raise(); - Window->setFocus(); return Window; } virtual void customSetup() Modified: trunk/tora/src/tosqledit.cpp =================================================================== --- trunk/tora/src/tosqledit.cpp 2008-09-12 06:33:38 UTC (rev 2991) +++ trunk/tora/src/tosqledit.cpp 2008-09-12 07:38:30 UTC (rev 2992) @@ -92,12 +92,12 @@ else { Window = new toSQLEdit(toMainWidget()->workspace(), connection); - toMainWidget()->workspace()->addSubWindow(Window); + Window->setWindowIcon(QPixmap(const_cast<const char**>(tosqledit_xpm))); +// toMainWidget()->workspace()->addSubWindow(Window); } - Window->raise(); - Window->setFocus(); - Window->setWindowIcon(QPixmap(const_cast<const char**>(tosqledit_xpm))); +// Window->raise(); +// Window->setFocus(); return Window; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2008-09-14 20:19:28
|
Revision: 3004 http://tora.svn.sourceforge.net/tora/?rev=3004&view=rev Author: nneul Date: 2008-09-14 20:19:36 +0000 (Sun, 14 Sep 2008) Log Message: ----------- add common files in top-level for copyright text Added Paths: ----------- trunk/tora/copyright.h trunk/tora/copyright.txt Removed Paths: ------------- trunk/tora/src/copyright.h Copied: trunk/tora/copyright.h (from rev 3003, trunk/tora/src/copyright.h) =================================================================== --- trunk/tora/copyright.h (rev 0) +++ trunk/tora/copyright.h 2008-09-14 20:19:36 UTC (rev 3004) @@ -0,0 +1,41 @@ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* +* TOra - An Oracle Toolkit for DBA's and developers +* +* Shared/mixed copyright is held throughout files in this product +* +* Portions Copyright (C) 2000-2001 Underscore AB +* Portions Copyright (C) 2003-2005 Quest Software, Inc. +* Portions Copyright (C) 2004-2008 Numerous Other Contributors +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; only version 2 of +* the License is valid for this program. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* +* As a special exception, you have permission to link this program +* with the Oracle Client libraries and distribute executables, as long +* as you follow the requirements of the GNU GPL in regard to all of the +* software in the executable aside from Oracle client libraries. +* +* Specifically you are not permitted to link this program with the +* Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. +* And you are not permitted to distribute binaries compiled against +* these libraries. +* +* You may link this product with any GPL'd Qt library. +* +* All trademarks belong to their respective owners. +* +* +* END_COMMON_COPYRIGHT_HEADER */ + Added: trunk/tora/copyright.txt =================================================================== --- trunk/tora/copyright.txt (rev 0) +++ trunk/tora/copyright.txt 2008-09-14 20:19:36 UTC (rev 3004) @@ -0,0 +1,41 @@ +* BEGIN_COMMON_COPYRIGHT_HEADER +* +* TOra - An Oracle Toolkit for DBA's and developers +* +* Shared/mixed copyright is held throughout files in this product +* +* Portions Copyright (C) 2000-2001 Underscore AB +* Portions Copyright (C) 2003-2005 Quest Software, Inc. +* Portions Copyright (C) 2004-2008 Numerous Other Contributors +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License +* as published by the Free Software Foundation; only version 2 of +* the License is valid for this program. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with this program; if not, write to the Free Software +* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +* +* As a special exception, you have permission to link this program +* with the Oracle Client libraries and distribute executables, as long +* as you follow the requirements of the GNU GPL in regard to all of the +* software in the executable aside from Oracle client libraries. +* +* Specifically you are not permitted to link this program with the +* Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. +* And you are not permitted to distribute binaries compiled against +* these libraries. +* +* You may link this product with any GPL'd Qt library. +* +* All trademarks belong to their respective owners. +* +* +* END_COMMON_COPYRIGHT_HEADER + Property changes on: trunk/tora/copyright.txt ___________________________________________________________________ Added: svn:eol-style + native Deleted: trunk/tora/src/copyright.h =================================================================== --- trunk/tora/src/copyright.h 2008-09-14 20:18:03 UTC (rev 3003) +++ trunk/tora/src/copyright.h 2008-09-14 20:19:36 UTC (rev 3004) @@ -1,41 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* -* TOra - An Oracle Toolkit for DBA's and developers -* -* Shared/mixed copyright is held throughout files in this product -* -* Portions Copyright (C) 2000-2001 Underscore AB -* Portions Copyright (C) 2003-2005 Quest Software, Inc. -* Portions Copyright (C) 2004-2008 Numerous Other Contributors -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; only version 2 of -* the License is valid for this program. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* -* As a special exception, you have permission to link this program -* with the Oracle Client libraries and distribute executables, as long -* as you follow the requirements of the GNU GPL in regard to all of the -* software in the executable aside from Oracle client libraries. -* -* Specifically you are not permitted to link this program with the -* Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. -* And you are not permitted to distribute binaries compiled against -* these libraries. -* -* You may link this product with any GPL'd Qt library. -* -* All trademarks belong to their respective owners. -* -* -* END_COMMON_COPYRIGHT_HEADER */ - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2008-09-14 20:31:30
|
Revision: 3005 http://tora.svn.sourceforge.net/tora/?rev=3005&view=rev Author: nneul Date: 2008-09-14 20:31:36 +0000 (Sun, 14 Sep 2008) Log Message: ----------- consolidate/cleanup license text/copyright/etc. Modified Paths: -------------- trunk/tora/CMakeLists.txt trunk/tora/Makefile.am trunk/tora/README trunk/tora/README.LICENSE trunk/tora/copyright.h trunk/tora/copyright.txt trunk/tora/rpm/tora.spec.in Removed Paths: ------------- trunk/tora/LICENSE.txt trunk/tora/src/windows/readme.txt Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-09-14 20:19:36 UTC (rev 3004) +++ trunk/tora/CMakeLists.txt 2008-09-14 20:31:36 UTC (rev 3005) @@ -277,7 +277,6 @@ ChangeLog COPYING INSTALL - LICENSE.txt NEWS README README.BINARIES Deleted: trunk/tora/LICENSE.txt =================================================================== --- trunk/tora/LICENSE.txt 2008-09-14 20:19:36 UTC (rev 3004) +++ trunk/tora/LICENSE.txt 2008-09-14 20:31:36 UTC (rev 3005) @@ -1,350 +0,0 @@ - - The Toolkit for Oracle is Copyright (C) 2003-2005 Quest Software, Inc. - Portions Copyright (C) 2005 Other Contributors - - You may use, distribute and copy Toolkit for Oracle under the terms of - GNU General Public License version 2, which is displayed below. - -------------------------------------------------------------------------- - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - Appendix: How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. - -------------------------------------------------------------------------- Modified: trunk/tora/Makefile.am =================================================================== --- trunk/tora/Makefile.am 2008-09-14 20:19:36 UTC (rev 3004) +++ trunk/tora/Makefile.am 2008-09-14 20:31:36 UTC (rev 3005) @@ -13,7 +13,6 @@ Makefile.OSX \ Makefile.mingw \ $(READMES) \ - LICENSE.txt \ config/m4 \ autogen.sh Modified: trunk/tora/README =================================================================== --- trunk/tora/README 2008-09-14 20:19:36 UTC (rev 3004) +++ trunk/tora/README 2008-09-14 20:31:36 UTC (rev 3005) @@ -1,19 +1,20 @@ TOra - Toolkit for Oracle ========================= -Copyright (C) 2003-2005 Quest Software, Inc (http://www.quest.com/) -Portions Copyright (C) 2005 Other Contributors -For information about license see the LICENSE.txt file. It is distributed -under the GPL which basically means that any derivatory work must be -released under an open source license as well. +* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER +For information about license see the COPYING file. TOra is +distributed under the GPL which basically means that any derivatory +work must be released under the GPL license as well. + TOra is supported for running with an Oracle 8.1.7 or newer -client installation. It has been verified to work with Oracle 10g. +client installation. It has been verified to work with Oracle 10g and 11g. In addition, TOra also supports postgres and mysql if your Qt library is compiled with that support. -Toolkit for Oracle is a program for Oracle developers and administrators. The +Toolkit for Oracle is a program for database developers and administrators. The features that are available so far is (As of version 1.2): * Handles multiple connections Modified: trunk/tora/README.LICENSE =================================================================== --- trunk/tora/README.LICENSE 2008-09-14 20:19:36 UTC (rev 3004) +++ trunk/tora/README.LICENSE 2008-09-14 20:31:36 UTC (rev 3005) @@ -1,5 +1,5 @@ TOra is licensed under the GPL. Copyright in the code is held by a combination of the various authors. Originally there was a license exception for commercial binary-only -builds with the closed source Qt. This is no longer the case, and the relase is fully +builds with the closed source Qt. This is no longer the case, and the release is fully GPL'd. Builds for windows can be made using any Qt release that is compatible with the GPL. Modified: trunk/tora/copyright.h =================================================================== --- trunk/tora/copyright.h 2008-09-14 20:19:36 UTC (rev 3004) +++ trunk/tora/copyright.h 2008-09-14 20:31:36 UTC (rev 3005) @@ -38,4 +38,3 @@ * * * END_COMMON_COPYRIGHT_HEADER */ - Modified: trunk/tora/copyright.txt =================================================================== --- trunk/tora/copyright.txt 2008-09-14 20:19:36 UTC (rev 3004) +++ trunk/tora/copyright.txt 2008-09-14 20:31:36 UTC (rev 3005) @@ -38,4 +38,3 @@ * * * END_COMMON_COPYRIGHT_HEADER - Modified: trunk/tora/rpm/tora.spec.in =================================================================== --- trunk/tora/rpm/tora.spec.in 2008-09-14 20:19:36 UTC (rev 3004) +++ trunk/tora/rpm/tora.spec.in 2008-09-14 20:31:36 UTC (rev 3005) @@ -37,91 +37,8 @@ %description +See README file from TOra distribution. -TOra - Toolkit for Oracle -========================= -Copyright (C) 2003-2005 Quest Software, Inc (http://www.quest.com/) -Portions Copyright (C) 2005 Other Contributors - -For information about license see the LICENSE.txt file. It is distributed -under the GPL which basically means that any derivatory work must be -released under an open source license as well. - -TOra is supported for running with an Oracle 8.1.7 or newer -client installation. It has been verified to work with Oracle 10g. - -In addition, TOra also supports postgres and mysql if your Qt library -is compiled with that support. - -Toolkit for Oracle is a program for Oracle developers and administrators. The -features that are available so far is (As of version 1.2): - -* Handles multiple connections -* Support Oracle & MySQL -* Advanced SQL Worksheet - * Explain plan - * PL/SQL auto indentation - * Statement statistics - * Error location indication - * SQL syntax highlighting - * Code completion - * Visualization of result - * PL/SQL block parsing - * Statement statistics comparison -* Schema browser - * Table & view editing - * References & dependencies - * Reverse engeneering of objects - * Tab & tree based browsing - * Object & data filtering -* PL/SQL Editor/Debugger - * Breakpoints - * Watches - * Line stepping - * SQL Output viewing - * Structure tree parsing -* Server tuning - * Server overview - * Tuning charts - * Wait state analyzer - * I/O by tablespace & file - * Performance indicators - * Server statistics - * Parameter editor (P-file editor) -* Security manager -* Storage manager with object & extent viewer - -* Session manager -* Rollback manager with snapshot too old detection -* SGA and long operations trace -* Current session information - -* PL/SQL profiler -* Explain plan browser -* Statistics manager -* DBMS alert tool -* Invalid object browser -* SQL Output viewer -* Database/schema comparison and search -* Extract schema objects to SQL script - -* Easily extendable -* Possible to add support for new or older Oracle versions without programming. -* SQL template help -* Full UNICODE support -* Printing of any list, text or chart - -For installation instructions se the file INSTALL. - -TOra is developed by a community of Open Source developers. The original -(pre 1.3.15) development was done by Henrik Johnson of Quest Software, Inc. - -The homepage for the TOra project is http://tora.sourceforge.net. If you -encounter problems you can find both mailinglists and bugtracking tools -from this page. - -Oracle is copyright of Oracle Corporation. - %package oracle Summary: Oracle specific plugins for %{_name} Group: Development/Databases @@ -193,7 +110,7 @@ %files %defattr(-,root,root) -%doc BUGS INSTALL LICENSE.txt NEWS README TODO +%doc BUGS INSTALL COPYING NEWS README TODO %{_prefix}/bin/* %{_prefix}/lib/*.a %{_prefix}/lib/*.la Deleted: trunk/tora/src/windows/readme.txt =================================================================== --- trunk/tora/src/windows/readme.txt 2008-09-14 20:19:36 UTC (rev 3004) +++ trunk/tora/src/windows/readme.txt 2008-09-14 20:31:36 UTC (rev 3005) @@ -1,83 +0,0 @@ -TOra - Toolkit for Oracle -========================= -Copyright (C) 2003-2005 Quest Software, Inc (http://www.quest.com/) -Portions Copyright (C) 2005 Other Contributors - -For information about license see the LICENSE.txt file. It is distributed -under the GPL which basically means that any derivatory work must be -released under an open source license as well. - -TOra is supported for running with an Oracle 8.1.7 or newer -client installation. It has been verified to work with Oracle 10g. - -In addition, TOra also supports postgres and mysql if your Qt library -is compiled with that support. - -Toolkit for Oracle is a program for Oracle developers and administrators. The -features that are available so far is (As of version 1.2): - -* Handles multiple connections -* Support Oracle & MySQL -* Advanced SQL Worksheet - * Explain plan - * PL/SQL auto indentation - * Statement statistics - * Error location indication - * SQL syntax highlighting - * Code completion - * Visualization of result - * PL/SQL block parsing - * Statement statistics comparison -* Schema browser - * Table & view editing - * References & dependencies - * Reverse engeneering of objects - * Tab & tree based browsing - * Object & data filtering -* PL/SQL Editor/Debugger - * Breakpoints - * Watches - * Line stepping - * SQL Output viewing - * Structure tree parsing -* Server tuning - * Server overview - * Tuning charts - * Wait state analyzer - * I/O by tablespace & file - * Performance indicators - * Server statistics - * Parameter editor (P-file editor) -* Security manager -* Storage manager with object & extent viewer - -* Session manager -* Rollback manager with snapshot too old detection -* SGA and long operations trace -* Current session information - -* PL/SQL profiler -* Explain plan browser -* Statistics manager -* DBMS alert tool -* Invalid object browser -* SQL Output viewer -* Database/schema comparison and search -* Extract schema objects to SQL script - -* Easily extendable -* Possible to add support for new or older Oracle versions without programming. -* SQL template help -* Full UNICODE support -* Printing of any list, text or chart - -For installation instructions se the file INSTALL. - -TOra is developed by a community of Open Source developers. The original -(pre 1.3.15) development was done by Henrik Johnson of Quest Software, Inc. - -The homepage for the TOra project is http://tora.sourceforge.net. If you -encounter problems you can find both mailinglists and bugtracking tools -from this page. - -Oracle is copyright of Oracle Corporation. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2008-09-14 20:51:42
|
Revision: 3008 http://tora.svn.sourceforge.net/tora/?rev=3008&view=rev Author: nneul Date: 2008-09-14 20:51:52 +0000 (Sun, 14 Sep 2008) Log Message: ----------- remove separate versions of copyright file Modified Paths: -------------- trunk/tora/copyright.txt Removed Paths: ------------- trunk/tora/copyright.h Deleted: trunk/tora/copyright.h =================================================================== --- trunk/tora/copyright.h 2008-09-14 20:49:08 UTC (rev 3007) +++ trunk/tora/copyright.h 2008-09-14 20:51:52 UTC (rev 3008) @@ -1,40 +0,0 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* -* TOra - An Oracle Toolkit for DBA's and developers -* -* Shared/mixed copyright is held throughout files in this product -* -* Portions Copyright (C) 2000-2001 Underscore AB -* Portions Copyright (C) 2003-2005 Quest Software, Inc. -* Portions Copyright (C) 2004-2008 Numerous Other Contributors -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; only version 2 of -* the License is valid for this program. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* -* As a special exception, you have permission to link this program -* with the Oracle Client libraries and distribute executables, as long -* as you follow the requirements of the GNU GPL in regard to all of the -* software in the executable aside from Oracle client libraries. -* -* Specifically you are not permitted to link this program with the -* Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. -* And you are not permitted to distribute binaries compiled against -* these libraries. -* -* You may link this product with any GPL'd Qt library. -* -* All trademarks belong to their respective owners. -* -* -* END_COMMON_COPYRIGHT_HEADER */ Modified: trunk/tora/copyright.txt =================================================================== --- trunk/tora/copyright.txt 2008-09-14 20:49:08 UTC (rev 3007) +++ trunk/tora/copyright.txt 2008-09-14 20:51:52 UTC (rev 3008) @@ -1,40 +1,35 @@ -* BEGIN_COMMON_COPYRIGHT_HEADER -* -* TOra - An Oracle Toolkit for DBA's and developers -* -* Shared/mixed copyright is held throughout files in this product -* -* Portions Copyright (C) 2000-2001 Underscore AB -* Portions Copyright (C) 2003-2005 Quest Software, Inc. -* Portions Copyright (C) 2004-2008 Numerous Other Contributors -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; only version 2 of -* the License is valid for this program. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -* -* As a special exception, you have permission to link this program -* with the Oracle Client libraries and distribute executables, as long -* as you follow the requirements of the GNU GPL in regard to all of the -* software in the executable aside from Oracle client libraries. -* -* Specifically you are not permitted to link this program with the -* Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. -* And you are not permitted to distribute binaries compiled against -* these libraries. -* -* You may link this product with any GPL'd Qt library. -* -* All trademarks belong to their respective owners. -* -* -* END_COMMON_COPYRIGHT_HEADER +TOra - An Oracle Toolkit for DBA's and developers + +Shared/mixed copyright is held throughout files in this product + +Portions Copyright (C) 2000-2001 Underscore AB +Portions Copyright (C) 2003-2005 Quest Software, Inc. +Portions Copyright (C) 2004-2008 Numerous Other Contributors + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; only version 2 of +the License is valid for this program. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + As a special exception, you have permission to link this program + with the Oracle Client libraries and distribute executables, as long + as you follow the requirements of the GNU GPL in regard to all of the + software in the executable aside from Oracle client libraries. + + Specifically you are not permitted to link this program with the + Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + And you are not permitted to distribute binaries compiled against + these libraries. + + You may link this product with any GPL'd Qt library. + +All trademarks belong to their respective owners. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2008-09-14 21:10:07
|
Revision: 3009 http://tora.svn.sourceforge.net/tora/?rev=3009&view=rev Author: nneul Date: 2008-09-14 21:10:16 +0000 (Sun, 14 Sep 2008) Log Message: ----------- Add initial work on refresh script Modified Paths: -------------- trunk/tora/src/LICENSE.h trunk/tora/src/toabout.cpp Added Paths: ----------- trunk/tora/refresh-copyright-and-license.pl trunk/tora/src/COPYRIGHT.h Added: trunk/tora/refresh-copyright-and-license.pl =================================================================== --- trunk/tora/refresh-copyright-and-license.pl (rev 0) +++ trunk/tora/refresh-copyright-and-license.pl 2008-09-14 21:10:16 UTC (rev 3009) @@ -0,0 +1,50 @@ +#!/usr/bin/perl +$| = 1; + +# +# Load in master files +# +my $lic_text = do { local ($/); my $fh; open( $fh, "COPYING" ); <$fh> }; +my $copy_text = do { local ($/); my $fh; open( $fh, "copyright.txt" ); <$fh> }; + +# +# Generate the src/LICENSE.h file +# +print "Refreshing src/LICENSE.h\n"; +my $tmp = "static const char *LicenseText = "; +$tmp .= " \"<html><body><pre>\\n\"\n"; +foreach my $ln ( split( /[\r\n]/, $lic_text ) ) { + $ln =~ s/\\/\\\\/g; + $ln =~ s/"/\\"/g; + $tmp .= " \"$ln\\n\"\n"; +} +$tmp .= " \"</pre></body></html>\\n\"\n;"; +open( LICOUT, ">src/LICENSE.h" ); +print LICOUT $tmp; +close(LICOUT); + +# +# Generate the src/COPYRIGHT.h file +# +print "Refreshing src/COPYRIGHT.h\n"; +my $tmp = "static const char *CopyrightText = "; +$tmp .= " \"<pre>\\n\"\n"; +foreach my $ln ( split( /[\r\n]/, $copy_text ) ) { + $ln =~ s/\\/\\\\/g; + $ln =~ s/"/\\"/g; + $tmp .= " \"$ln\\n\"\n"; +} +$tmp .= " \"</pre>\\n\"\n;"; +open( COPYOUT, ">src/COPYRIGHT.h" ); +print COPYOUT $tmp; +close(COPYOUT); + +# +# Update all the C-style copyright text entries +# +foreach $file ( glob("src/*.h"), glob("src/*/*.h"), glob("src/*.cpp"), + glob("src/*/*.cpp") ) +{ + print "Refreshing $file.\n"; +} + Property changes on: trunk/tora/refresh-copyright-and-license.pl ___________________________________________________________________ Added: svn:executable + * Added: trunk/tora/src/COPYRIGHT.h =================================================================== --- trunk/tora/src/COPYRIGHT.h (rev 0) +++ trunk/tora/src/COPYRIGHT.h 2008-09-14 21:10:16 UTC (rev 3009) @@ -0,0 +1,38 @@ +static const char *CopyrightText = "<pre>\n" + "TOra - An Oracle Toolkit for DBA's and developers\n" + "\n" + "Shared/mixed copyright is held throughout files in this product\n" + "\n" + "Portions Copyright (C) 2000-2001 Underscore AB\n" + "Portions Copyright (C) 2003-2005 Quest Software, Inc.\n" + "Portions Copyright (C) 2004-2008 Numerous Other Contributors\n" + "\n" + "This program is free software; you can redistribute it and/or\n" + "modify it under the terms of the GNU General Public License\n" + "as published by the Free Software Foundation; only version 2 of\n" + "the License is valid for this program.\n" + "\n" + "This program is distributed in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" + "GNU General Public License for more details.\n" + "\n" + "You should have received a copy of the GNU General Public License\n" + "along with this program; if not, write to the Free Software\n" + "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.\n" + "\n" + " As a special exception, you have permission to link this program\n" + " with the Oracle Client libraries and distribute executables, as long\n" + " as you follow the requirements of the GNU GPL in regard to all of the\n" + " software in the executable aside from Oracle client libraries.\n" + "\n" + " Specifically you are not permitted to link this program with the\n" + " Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech.\n" + " And you are not permitted to distribute binaries compiled against\n" + " these libraries. \n" + "\n" + " You may link this product with any GPL'd Qt library.\n" + "\n" + "All trademarks belong to their respective owners.\n" + "</pre>\n" +; \ No newline at end of file Property changes on: trunk/tora/src/COPYRIGHT.h ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/tora/src/LICENSE.h =================================================================== --- trunk/tora/src/LICENSE.h 2008-09-14 20:51:52 UTC (rev 3008) +++ trunk/tora/src/LICENSE.h 2008-09-14 21:10:16 UTC (rev 3009) @@ -1,285 +1,343 @@ -static const char *LicenseText = - "<html><body><p>" - " The Toolkit for Oracle is Copyright (C) 2003-2008 Quest Software, Inc." - " Portions Copyright (C) 2008 Other Contributors" - "</p><p>" - " You may use, distribute and copy Toolkit for Oracle under the terms of" - " GNU General Public License version 2, which is displayed below." - "</p><p>" - "<h1>GNU GENERAL PUBLIC LICENSE</h1>" - "<p>Version 2, June 1991</p>" - "<p>Copyright (C) 1989, 1991 Free Software Foundation, Inc." - " 675 Mass Ave, Cambridge, MA 02139, USA</p>" - "<p>Everyone is permitted to copy and distribute verbatim copies" - " of this license document, but changing it is not allowed.</p>" - "<h2>Preamble</h2>" - "<p>The licenses for most software are designed to take away your" - "freedom to share and change it. By contrast, the GNU General Public" - "License is intended to guarantee your freedom to share and change free" - "software--to make sure the software is free for all its users. This" - "General Public License applies to most of the Free Software" - "Foundation's software and to any other program whose authors commit to" - "using it. (Some other Free Software Foundation software is covered by" - "the GNU Library General Public License instead.) You can apply it to" - "your programs, too." - "</p><p>" - " When we speak of free software, we are referring to freedom, not" - "price. Our General Public Licenses are designed to make sure that you" - "have the freedom to distribute copies of free software (and charge for" - "this service if you wish), that you receive source code or can get it" - "if you want it, that you can change the software or use pieces of it" - "in new free programs; and that you know you can do these things." - "</p><p>" - " To protect your rights, we need to make restrictions that forbid" - "anyone to deny you these rights or to ask you to surrender the rights." - "These restrictions translate to certain responsibilities for you if you" - "distribute copies of the software, or if you modify it." - "</p><p>" - " For example, if you distribute copies of such a program, whether" - "gratis or for a fee, you must give the recipients all the rights that" - "you have. You must make sure that they, too, receive or can get the" - "source code. And you must show them these terms so they know their" - "rights." - "</p><p>" - " We protect your rights with two steps: (1) copyright the software, and" - "(2) offer you this license which gives you legal permission to copy," - "distribute and/or modify the software." - "</p><p>" - " Also, for each author's protection and ours, we want to make certain" - "that everyone understands that there is no warranty for this free" - "software. If the software is modified by someone else and passed on, we" - "want its recipients to know that what they have is not the original, so" - "that any problems introduced by others will not reflect on the original" - "authors' reputations." - "</p><p>" - " Finally, any free program is threatened constantly by software" - "patents. We wish to avoid the danger that redistributors of a free" - "program will individually obtain patent licenses, in effect making the" - "program proprietary. To prevent this, we have made it clear that any" - "patent must be licensed for everyone's free use or not licensed at all." - "</p><p>" - " The precise terms and conditions for copying, distribution and" - "modification follow." - "</p>" - "<h2>GNU GENERAL PUBLIC LICENSE" - " TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</h2>" - "<p>0. This License applies to any program or other work which contains" - "a notice placed by the copyright holder saying it may be distributed" - "under the terms of this General Public License. The \"Program\", below," - "refers to any such program or work, and a \"work based on the Program\"" - "means either the Program or any derivative work under copyright law:" - "that is to say, a work containing the Program or a portion of it," - "either verbatim or with modifications and/or translated into another" - "language. (Hereinafter, translation is included without limitation in" - "the term \"modification\".) Each licensee is addressed as \"you\"." - "</p><p>" - "Activities other than copying, distribution and modification are not" - "covered by this License; they are outside its scope. The act of" - "running the Program is not restricted, and the output from the Program" - "is covered only if its contents constitute a work based on the" - "Program (independent of having been made by running the Program)." - "Whether that is true depends on what the Program does." - "</p><p>" - " 1. You may copy and distribute verbatim copies of the Program's" - "source code as you receive it, in any medium, provided that you" - "conspicuously and appropriately publish on each copy an appropriate" - "copyright notice and disclaimer of warranty; keep intact all the" - "notices that refer to this License and to the absence of any warranty;" - "and give any other recipients of the Program a copy of this License" - "along with the Program." - "</p><p>" - "You may charge a fee for the physical act of transferring a copy, and" - "you may at your option offer warranty protection in exchange for a fee." - "</p><p>" - " 2. You may modify your copy or copies of the Program or any portion" - "of it, thus forming a work based on the Program, and copy and" - "distribute such modifications or work under the terms of Section 1" - "above, provided that you also meet all of these conditions:" - "</p><p>" - " a) You must cause the modified files to carry prominent notices" - " stating that you changed the files and the date of any change." - "</p><p>" - " b) You must cause any work that you distribute or publish, that in" - " whole or in part contains or is derived from the Program or any" - " part thereof, to be licensed as a whole at no charge to all third" - " parties under the terms of this License." - "</p><p>" - " c) If the modified program normally reads commands interactively" - " when run, you must cause it, when started running for such" - " interactive use in the most ordinary way, to print or display an" - " announcement including an appropriate copyright notice and a" - " notice that there is no warranty (or else, saying that you provide" - " a warranty) and that users may redistribute the program under" - " these conditions, and telling the user how to view a copy of this" - " License. (Exception: if the Program itself is interactive but" - " does not normally print such an announcement, your work based on" - " the Program is not required to print an announcement.)" - "</p><p>" - "These requirements apply to the modified work as a whole. If" - "identifiable sections of that work are not derived from the Program," - "and can be reasonably considered independent and separate works in" - "themselves, then this License, and its terms, do not apply to those" - "sections when you distribute them as separate works. But when you" - "distribute the same sections as part of a whole which is a work based" - "on the Program, the distribution of the whole must be on the terms of" - "this License, whose permissions for other licensees extend to the" - "entire whole, and thus to each and every part regardless of who wrote it." - "</p><p>" - "Thus, it is not the intent of this section to claim rights or contest" - "your rights to work written entirely by you; rather, the intent is to" - "exercise the right to control the distribution of derivative or" - "collective works based on the Program." - "</p><p>" - "In addition, mere aggregation of another work not based on the Program" - "with the Program (or with a work based on the Program) on a volume of" - "a storage or distribution medium does not bring the other work under" - "the scope of this License." - "</p><p>" - " 3. You may copy and distribute the Program (or a work based on it," - "under Section 2) in object code or executable form under the terms of" - "Sections 1 and 2 above provided that you also do one of the following:" - "</p><p>" - " a) Accompany it with the complete corresponding machine-readable" - " source code, which must be distributed under the terms of Sections" - " 1 and 2 above on a medium customarily used for software interchange; or," - "</p><p>" - " b) Accompany it with a written offer, valid for at least three" - " years, to give any third party, for a charge no more than your" - " cost of physically performing source distribution, a complete" - " machine-readable copy of the corresponding source code, to be" - " distributed under the terms of Sections 1 and 2 above on a medium" - " customarily used for software interchange; or," - "</p><p>" - " c) Accompany it with the information you received as to the offer" - " to distribute corresponding source code. (This alternative is" - " allowed only for noncommercial distribution and only if you" - " received the program in object code or executable form with such" - " an offer, in accord with Subsection b above.)" - "</p><p>" - "The source code for a work means the preferred form of the work for" - "making modifications to it. For an executable work, complete source" - "code means all the source code for all modules it contains, plus any" - "associated interface definition files, plus the scripts used to" - "control compilation and installation of the executable. However, as a" - "special exception, the source code distributed need not include" - "anything that is normally distributed (in either source or binary" - "form) with the major components (compiler, kernel, and so on) of the" - "operating system on which the executable runs, unless that component" - "itself accompanies the executable." - "</p><p>" - "If distribution of executable or object code is made by offering" - "access to copy from a designated place, then offering equivalent" - "access to copy the source code from the same place counts as" - "distribution of the source code, even though third parties are not" - "compelled to copy the source along with the object code." - "</p><p>" - " 4. You may not copy, modify, sublicense, or distribute the Program" - "except as expressly provided under this License. Any attempt" - "otherwise to copy, modify, sublicense or distribute the Program is" - "void, and will automatically terminate your rights under this License." - "However, parties who have received copies, or rights, from you under" - "this License will not have their licenses terminated so long as such" - "parties remain in full compliance." - "</p><p>" - " 5. You are not required to accept this License, since you have not" - "signed it. However, nothing else grants you permission to modify or" - "distribute the Program or its derivative works. These actions are" - "prohibited by law if you do not accept this License. Therefore, by" - "modifying or distributing the Program (or any work based on the" - "Program), you indicate your acceptance of this License to do so, and" - "all its terms and conditions for copying, distributing or modifying" - "the Program or works based on it." - "</p><p>" - " 6. Each time you redistribute the Program (or any work based on the" - "Program), the recipient automatically receives a license from the" - "original licensor to copy, distribute or modify the Program subject to" - "these terms and conditions. You may not impose any further" - "restrictions on the recipients' exercise of the rights granted herein." - "You are not responsible for enforcing compliance by third parties to" - "this License." - "</p><p>" - " 7. If, as a consequence of a court judgment or allegation of patent" - "infringement or for any other reason (not limited to patent issues)," - "conditions are imposed on you (whether by court order, agreement or" - "otherwise) that contradict the conditions of this License, they do not" - "excuse you from the conditions of this License. If you cannot" - "distribute so as to satisfy simultaneously your obligations under this" - "License and any other pertinent obligations, then as a consequence you" - "may not distribute the Program at all. For example, if a patent" - "license would not permit royalty-free redistribution of the Program by" - "all those who receive copies directly or indirectly through you, then" - "the only way you could satisfy both it and this License would be to" - "refrain entirely from distribution of the Program." - "</p><p>" - "If any portion of this section is held invalid or unenforceable under" - "any particular circumstance, the balance of the section is intended to" - "apply and the section as a whole is intended to apply in other" - "circumstances." - "</p><p>" - "It is not the purpose of this section to induce you to infringe any" - "patents or other property right claims or to contest validity of any" - "such claims; this section has the sole purpose of protecting the" - "integrity of the free software distribution system, which is" - "implemented by public license practices. Many people have made" - "generous contributions to the wide range of software distributed" - "through that system in reliance on consistent application of that" - "system; it is up to the author/donor to decide if he or she is willing" - "to distribute software through any other system and a licensee cannot" - "impose that choice." - "</p><p>" - "This section is intended to make thoroughly clear what is believed to" - "be a consequence of the rest of this License." - "</p><p>" - " 8. If the distribution and/or use of the Program is restricted in" - "certain countries either by patents or by copyrighted interfaces, the" - "original copyright holder who places the Program under this License" - "may add an explicit geographical distribution limitation excluding" - "those countries, so that distribution is permitted only in or among" - "countries not thus excluded. In such case, this License incorporates" - "the limitation as if written in the body of this License." - "</p><p>" - " 9. The Free Software Foundation may publish revised and/or new versions" - "of the General Public License from time to time. Such new versions will" - "be similar in spirit to the present version, but may differ in detail to" - "address new problems or concerns." - "</p><p>" - "Each version is given a distinguishing version number. If the Program" - "specifies a version number of this License which applies to it and \"any" - "later version\", you have the option of following the terms and conditions" - "either of that version or of any later version published by the Free" - "Software Foundation. If the Program does not specify a version number of" - "this License, you may choose any version ever published by the Free Software" - "Foundation." - "</p><p>" - " 10. If you wish to incorporate parts of the Program into other free" - "programs whose distribution conditions are different, write to the author" - "to ask for permission. For software which is copyrighted by the Free" - "Software Foundation, write to the Free Software Foundation; we sometimes" - "make exceptions for this. Our decision will be guided by the two goals" - "of preserving the free status of all derivatives of our free software and" - "of promoting the sharing and reuse of software generally." - "</p>" - "<h2>NO WARRANTY</h2>" - "<p>" - " 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY" - "FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN" - "OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES" - "PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED" - "OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF" - "MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS" - "TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE" - "PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING," - "REPAIR OR CORRECTION." - "</p><p>" - " 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING" - "WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR" - "REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES," - "INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING" - "OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED" - "TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY" - "YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER" - "PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE" - "POSSIBILITY OF SUCH DAMAGES." - "</p><p>" - " END OF TERMS AND CONDITIONS" - "</p><p></body></html>"; +static const char *LicenseText = "<html><body><pre>\n" + " GNU GENERAL PUBLIC LICENSE\n" + " Version 2, June 1991\n" + "\n" + " Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n" + " 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n" + " Everyone is permitted to copy and distribute verbatim copies\n" + " of this license document, but changing it is not allowed.\n" + "\n" + " Preamble\n" + "\n" + " The licenses for most software are designed to take away your\n" + "freedom to share and change it. By contrast, the GNU General Public\n" + "License is intended to guarantee your freedom to share and change free\n" + "software--to make sure the software is free for all its users. This\n" + "General Public License applies to most of the Free Software\n" + "Foundation's software and to any other program whose authors commit to\n" + "using it. (Some other Free Software Foundation software is covered by\n" + "the GNU Library General Public License instead.) You can apply it to\n" + "your programs, too.\n" + "\n" + " When we speak of free software, we are referring to freedom, not\n" + "price. Our General Public Licenses are designed to make sure that you\n" + "have the freedom to distribute copies of free software (and charge for\n" + "this service if you wish), that you receive source code or can get it\n" + "if you want it, that you can change the software or use pieces of it\n" + "in new free programs; and that you know you can do these things.\n" + "\n" + " To protect your rights, we need to make restrictions that forbid\n" + "anyone to deny you these rights or to ask you to surrender the rights.\n" + "These restrictions translate to certain responsibilities for you if you\n" + "distribute copies of the software, or if you modify it.\n" + "\n" + " For example, if you distribute copies of such a program, whether\n" + "gratis or for a fee, you must give the recipients all the rights that\n" + "you have. You must make sure that they, too, receive or can get the\n" + "source code. And you must show them these terms so they know their\n" + "rights.\n" + "\n" + " We protect your rights with two steps: (1) copyright the software, and\n" + "(2) offer you this license which gives you legal permission to copy,\n" + "distribute and/or modify the software.\n" + "\n" + " Also, for each author's protection and ours, we want to make certain\n" + "that everyone understands that there is no warranty for this free\n" + "software. If the software is modified by someone else and passed on, we\n" + "want its recipients to know that what they have is not the original, so\n" + "that any problems introduced by others will not reflect on the original\n" + "authors' reputations.\n" + "\n" + " Finally, any free program is threatened constantly by software\n" + "patents. We wish to avoid the danger that redistributors of a free\n" + "program will individually obtain patent licenses, in effect making the\n" + "program proprietary. To prevent this, we have made it clear that any\n" + "patent must be licensed for everyone's free use or not licensed at all.\n" + "\n" + " The precise terms and conditions for copying, distribution and\n" + "modification follow.\n" + "\n" + " GNU GENERAL PUBLIC LICENSE\n" + " TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION\n" + "\n" + " 0. This License applies to any program or other work which contains\n" + "a notice placed by the copyright holder saying it may be distributed\n" + "under the terms of this General Public License. The \"Program\", below,\n" + "refers to any such program or work, and a \"work based on the Program\"\n" + "means either the Program or any derivative work under copyright law:\n" + "that is to say, a work containing the Program or a portion of it,\n" + "either verbatim or with modifications and/or translated into another\n" + "language. (Hereinafter, translation is included without limitation in\n" + "the term \"modification\".) Each licensee is addressed as \"you\".\n" + "\n" + "Activities other than copying, distribution and modification are not\n" + "covered by this License; they are outside its scope. The act of\n" + "running the Program is not restricted, and the output from the Program\n" + "is covered only if its contents constitute a work based on the\n" + "Program (independent of having been made by running the Program).\n" + "Whether that is true depends on what the Program does.\n" + "\n" + " 1. You may copy and distribute verbatim copies of the Program's\n" + "source code as you receive it, in any medium, provided that you\n" + "conspicuously and appropriately publish on each copy an appropriate\n" + "copyright notice and disclaimer of warranty; keep intact all the\n" + "notices that refer to this License and to the absence of any warranty;\n" + "and give any other recipients of the Program a copy of this License\n" + "along with the Program.\n" + "\n" + "You may charge a fee for the physical act of transferring a copy, and\n" + "you may at your option offer warranty protection in exchange for a fee.\n" + "\n" + " 2. You may modify your copy or copies of the Program or any portion\n" + "of it, thus forming a work based on the Program, and copy and\n" + "distribute such modifications or work under the terms of Section 1\n" + "above, provided that you also meet all of these conditions:\n" + "\n" + " a) You must cause the modified files to carry prominent notices\n" + " stating that you changed the files and the date of any change.\n" + "\n" + " b) You must cause any work that you distribute or publish, that in\n" + " whole or in part contains or is derived from the Program or any\n" + " part thereof, to be licensed as a whole at no charge to all third\n" + " parties under the terms of this License.\n" + "\n" + " c) If the modified program normally reads commands interactively\n" + " when run, you must cause it, when started running for such\n" + " interactive use in the most ordinary way, to print or display an\n" + " announcement including an appropriate copyright notice and a\n" + " notice that there is no warranty (or else, saying that you provide\n" + " a warranty) and that users may redistribute the program under\n" + " these conditions, and telling the user how to view a copy of this\n" + " License. (Exception: if the Program itself is interactive but\n" + " does not normally print such an announcement, your work based on\n" + " the Program is not required to print an announcement.)\n" + "\n" + "These requirements apply to the modified work as a whole. If\n" + "identifiable sections of that work are not derived from the Program,\n" + "and can be reasonably considered independent and separate works in\n" + "themselves, then this License, and its terms, do not apply to those\n" + "sections when you distribute them as separate works. But when you\n" + "distribute the same sections as part of a whole which is a work based\n" + "on the Program, the distribution of the whole must be on the terms of\n" + "this License, whose permissions for other licensees extend to the\n" + "entire whole, and thus to each and every part regardless of who wrote it.\n" + "\n" + "Thus, it is not the intent of this section to claim rights or contest\n" + "your rights to work written entirely by you; rather, the intent is to\n" + "exercise the right to control the distribution of derivative or\n" + "collective works based on the Program.\n" + "\n" + "In addition, mere aggregation of another work not based on the Program\n" + "with the Program (or with a work based on the Program) on a volume of\n" + "a storage or distribution medium does not bring the other work under\n" + "the scope of this License.\n" + "\n" + " 3. You may copy and distribute the Program (or a work based on it,\n" + "under Section 2) in object code or executable form under the terms of\n" + "Sections 1 and 2 above provided that you also do one of the following:\n" + "\n" + " a) Accompany it with the complete corresponding machine-readable\n" + " source code, which must be distributed under the terms of Sections\n" + " 1 and 2 above on a medium customarily used for software interchange; or,\n" + "\n" + " b) Accompany it with a written offer, valid for at least three\n" + " years, to give any third party, for a charge no more than your\n" + " cost of physically performing source distribution, a complete\n" + " machine-readable copy of the corresponding source code, to be\n" + " distributed under the terms of Sections 1 and 2 above on a medium\n" + " customarily used for software interchange; or,\n" + "\n" + " c) Accompany it with the information you received as to the offer\n" + " to distribute corresponding source code. (This alternative is\n" + " allowed only for noncommercial distribution and only if you\n" + " received the program in object code or executable form with such\n" + " an offer, in accord with Subsection b above.)\n" + "\n" + "The source code for a work means the preferred form of the work for\n" + "making modifications to it. For an executable work, complete source\n" + "code means all the source code for all modules it contains, plus any\n" + "associated interface definition files, plus the scripts used to\n" + "control compilation and installation of the executable. However, as a\n" + "special exception, the source code distributed need not include\n" + "anything that is normally distributed (in either source or binary\n" + "form) with the major components (compiler, kernel, and so on) of the\n" + "operating system on which the executable runs, unless that component\n" + "itself accompanies the executable.\n" + "\n" + "If distribution of executable or object code is made by offering\n" + "access to copy from a designated place, then offering equivalent\n" + "access to copy the source code from the same place counts as\n" + "distribution of the source code, even though third parties are not\n" + "compelled to copy the source along with the object code.\n" + "\n" + " 4. You may not copy, modify, sublicense, or distribute the Program\n" + "except as expressly provided under this License. Any attempt\n" + "otherwise to copy, modify, sublicense or distribute the Program is\n" + "void, and will automatically terminate your rights under this License.\n" + "However, parties who have received copies, or rights, from you under\n" + "this License will not have their licenses terminated so long as such\n" + "parties remain in full compliance.\n" + "\n" + " 5. You are not required to accept this License, since you have not\n" + "signed it. However, nothing else grants you permission to modify or\n" + "distribute the Program or its derivative works. These actions are\n" + "prohibited by law if you do not accept this License. Therefore, by\n" + "modifying or distributing the Program (or any work based on the\n" + "Program), you indicate your acceptance of this License to do so, and\n" + "all its terms and conditions for copying, distributing or modifying\n" + "the Program or works based on it.\n" + "\n" + " 6. Each time you redistribute the Program (or any work based on the\n" + "Program), the recipient automatically receives a license from the\n" + "original licensor to copy, distribute or modify the Program subject to\n" + "these terms and conditions. You may not impose any further\n" + "restrictions on the recipients' exercise of the rights granted herein.\n" + "You are not responsible for enforcing compliance by third parties to\n" + "this License.\n" + "\n" + " 7. If, as a consequence of a court judgment or allegation of patent\n" + "infringement or for any other reason (not limited to patent issues),\n" + "conditions are imposed on you (whether by court order, agreement or\n" + "otherwise) that contradict the conditions of this License, they do not\n" + "excuse you from the conditions of this License. If you cannot\n" + "distribute so as to satisfy simultaneously your obligations under this\n" + "License and any other pertinent obligations, then as a consequence you\n" + "may not distribute the Program at all. For example, if a patent\n" + "license would not permit royalty-free redistribution of the Program by\n" + "all those who receive copies directly or indirectly through you, then\n" + "the only way you could satisfy both it and this License would be to\n" + "refrain entirely from distribution of the Program.\n" + "\n" + "If any portion of this section is held invalid or unenforceable under\n" + "any particular circumstance, the balance of the section is intended to\n" + "apply and the section as a whole is intended to apply in other\n" + "circumstances.\n" + "\n" + "It is not the purpose of this section to induce you to infringe any\n" + "patents or other property right claims or to contest validity of any\n" + "such claims; this section has the sole purpose of protecting the\n" + "integrity of the free software distribution system, which is\n" + "implemented by public license practices. Many people have made\n" + "generous contributions to the wide range of software distributed\n" + "through that system in reliance on consistent application of that\n" + "system; it is up to the author/donor to decide if he or she is willing\n" + "to distribute software through any other system and a licensee cannot\n" + "impose that choice.\n" + "\n" + "This section is intended to make thoroughly clear what is believed to\n" + "be a consequence of the rest of this License.\n" + "\n" + " 8. If the distribution and/or use of the Program is restricted in\n" + "certain countries either by patents or by copyrighted interfaces, the\n" + "original copyright holder who places the Program under this License\n" + "may add an explicit geographical distribution limitation excluding\n" + "those countries, so that distribution is permitted only in or among\n" + "countries not thus excluded. In such case, this License incorporates\n" + "the limitation as if written in the body of this License.\n" + "\n" + " 9. The Free Software Foundation may publish revised and/or new versions\n" + "of the General Public License from time to time. Such new versions will\n" + "be similar in spirit to the present version, but may differ in detail to\n" + "address new problems or concerns.\n" + "\n" + "Each version is given a distinguishing version number. If the Program\n" + "specifies a version number of this License which applies to it and \"any\n" + "later version\", you have the option of following the terms and conditions\n" + "either of that version or of any later version published by the Free\n" + "Software Foundation. If the Program does not specify a version number of\n" + "this License, you may choose any version ever published by the Free Software\n" + "Foundation.\n" + "\n" + " 10. If you wish to incorporate parts of the Program into other free\n" + "programs whose distribution conditions are different, write to the author\n" + "to ask for permission. For software which is copyrighted by the Free\n" + "Software Foundation, write to the Free Software Foundation; we sometimes\n" + "make exceptions for this. Our decision will be guided by the two goals\n" + "of preserving the free status of all derivatives of our free software and\n" + "of promoting the sharing and reuse of software generally.\n" + "\n" + " NO WARRANTY\n" + "\n" + " 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY\n" + "FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN\n" + "OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES\n" + "PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED\n" + "OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF\n" + "MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS\n" + "TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE\n" + "PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,\n" + "REPAIR OR CORRECTION.\n" + "\n" + " 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\n" + "WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR\n" + "REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,\n" + "INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING\n" + "OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED\n" + "TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY\n" + "YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER\n" + "PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE\n" + "POSSIBILITY OF SUCH DAMAGES.\n" + "\n" + " END OF TERMS AND CONDITIONS\n" + "\n" + " How to Apply These Terms to Your New Programs\n" + "\n" + " If you develop a new program, and you want it to be of the greatest\n" + "possible use to the public, the best way to achieve this is to make it\n" + "free software which everyone can redistribute and change under these terms.\n" + "\n" + " To do so, attach the following notices to the program. It is safest\n" + "to attach them to the start of each source file to most effectively\n" + "convey the exclusion of warranty; and each file should have at least\n" + "the \"copyright\" line and a pointer to where the full notice is found.\n" + "\n" + " <one line to give the program's name and a brief idea of what it does.>\n" + " Copyright (C) <year> <name of author>\n" + "\n" + " This program is free software; you can redistribute it and/or modify\n" + " it under the terms of the GNU General Public License as published by\n" + " the Free Software Foundation; either version 2 of the License, or\n" + " (at your option) any later version.\n" + "\n" + " This program is distributed in the hope that it will be useful,\n" + " but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + " MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" + " GNU General Public License for more details.\n" + "\n" + " You should have received a copy of the GNU General Public License\n" + " along with this program; if not, write to the Free Software\n" + " Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA\n" + "\n" + "\n" + "Also add information on how to contact you by electronic and paper mail.\n" + "\n" + "If the program is interactive, make it output a short notice like this\n" + "when it starts in an interactive mode:\n" + "\n" + " Gnomovision version 69, Copyright (C) year name of author\n" + " Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n" + " This is free software, and you are welcome to redistribute it\n" + " under certain conditions; type `show c' for details.\n" + "\n" + "The hypothetical commands `show w' and `show c' should show the appropriate\n" + "parts of the General Public License. Of course, the commands you use may\n" + "be called something other than `show w' and `show c'; they could even be\n" + "mouse-clicks or menu items--whatever suits your program.\n" + "\n" + "You should also get your employer (if you work as a programmer) or your\n" + "school, if any, to sign a \"copyright disclaimer\" for the program, if\n" + "necessary. Here is a sample; alter the names:\n" + "\n" + " Yoyodyne, Inc., hereby disclaims all copyright interest in the program\n" + " `Gnomovision' (which makes passes at compilers) written by James Hacker.\n" + "\n" + " <signature of Ty Coon>, 1 April 1989\n" + " Ty Coon, President of Vice\n" + "\n" + "This General Public License does not permit incorporating your program into\n" + "proprietary programs. If your program is a subroutine library, you may\n" + "consider it more useful to permit linking proprietary applications with the\n" + "library. If this is what you want to do, use the GNU Library General\n" + "Public License instead of this License.\n" + "</pre></body></html>\n" +; \ No newline at end of file Modified: trunk/tora/src/toabout.cpp =================================================================== --- trunk/tora/src/toabout.cpp 2008-09-14 20:51:52 UTC (rev 3008) +++ trunk/tora/src/toabout.cpp 2008-09-14 21:10:16 UTC (rev 3009) @@ -12,6 +12,7 @@ #include "toconf.h" #include "LICENSE.h" +#include "COPYRIGHT.h" #include "icons/largelogo.xpm" @@ -19,7 +20,7 @@ "<IMG SRC=':/icons/largelogo.xpm'><BR>\n" "Version %1 (<A HREF=http://tora.sourceforge.net>http://tora.sourceforge.net</A>)\n" "<P>\n" - "© 2003-2008 Quest Software, Inc. and numerous other contributors in the Open Source community.<P>\n" + "%2<P>\n" "SourceForge project administered by Nathan Neulinger <A HREF=\"mailto:nn...@ne...\">nn...@ne...</A><P>\n" "This program is available under the GNU General Public License.\n" "Uses the Qt library by TrollTech\n" @@ -121,7 +122,7 @@ else { setWindowTitle(tr(ABOUT_CAPTION).arg(QString::fromLatin1(TOVERSION))); - QString buffer = tr(AboutText).arg(QString::fromLatin1(TOVERSION)); + QString buffer = tr(AboutText).arg(QString::fromLatin1(TOVERSION),QString::fromLatin1(CopyrightText)); TextView->setHtml(buffer); CancelButton->hide(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2008-09-14 21:23:21
|
Revision: 3010 http://tora.svn.sourceforge.net/tora/?rev=3010&view=rev Author: nneul Date: 2008-09-14 21:22:53 +0000 (Sun, 14 Sep 2008) Log Message: ----------- update refresh script with c-style comments and run refresh files Modified Paths: -------------- trunk/tora/refresh-copyright-and-license.pl trunk/tora/src/main.cpp trunk/tora/src/migratetool/sqldeveloper.cpp trunk/tora/src/migratetool/sqldeveloper.h trunk/tora/src/migratetool/squirrelsql.cpp trunk/tora/src/migratetool/squirrelsql.h trunk/tora/src/migratetool/tora3.cpp trunk/tora/src/migratetool/tora3.h trunk/tora/src/toabout.cpp trunk/tora/src/toabout.h trunk/tora/src/toalert.cpp trunk/tora/src/toalert.h trunk/tora/src/toanalyze.cpp trunk/tora/src/toanalyze.h trunk/tora/src/tobackup.cpp trunk/tora/src/tobackup.h trunk/tora/src/tobarchart.cpp trunk/tora/src/tobarchart.h trunk/tora/src/tobrowser.cpp trunk/tora/src/tobrowser.h trunk/tora/src/tobrowserconstraint.cpp trunk/tora/src/tobrowserconstraint.h trunk/tora/src/tobrowserindex.cpp trunk/tora/src/tobrowserindex.h trunk/tora/src/tobrowsertable.cpp trunk/tora/src/tobrowsertable.h trunk/tora/src/tochangeconnection.cpp trunk/tora/src/tochangeconnection.h trunk/tora/src/tochartmanager.cpp trunk/tora/src/tochartmanager.h trunk/tora/src/tocodemodel.cpp trunk/tora/src/tocodemodel.h trunk/tora/src/toconf.h trunk/tora/src/toconnection.cpp trunk/tora/src/toconnection.h trunk/tora/src/toconnectionimport.cpp trunk/tora/src/toconnectionimport.h trunk/tora/src/toconnectionmodel.cpp trunk/tora/src/toconnectionmodel.h trunk/tora/src/toconnectionpool.cpp trunk/tora/src/toconnectionpool.h trunk/tora/src/tocurrent.cpp trunk/tora/src/tocurrent.h trunk/tora/src/todatatype.cpp trunk/tora/src/todatatype.h trunk/tora/src/todebug.cpp trunk/tora/src/todebug.h trunk/tora/src/todebugtext.cpp trunk/tora/src/todebugtext.h trunk/tora/src/todefaultkeywords.h trunk/tora/src/toeditablemenu.cpp trunk/tora/src/toeditablemenu.h trunk/tora/src/toeditextensions.cpp trunk/tora/src/toeditextensions.h trunk/tora/src/toeditwidget.cpp trunk/tora/src/toeditwidget.h trunk/tora/src/toeventquery.cpp trunk/tora/src/toeventquery.h trunk/tora/src/toeventquerytask.cpp trunk/tora/src/toeventquerytask.h trunk/tora/src/toextract.cpp trunk/tora/src/toextract.h trunk/tora/src/toextratranslations.cpp trunk/tora/src/tofilesize.cpp trunk/tora/src/tofilesize.h trunk/tora/src/toglobalsetting.cpp trunk/tora/src/toglobalsetting.h trunk/tora/src/tohelp.cpp trunk/tora/src/tohelp.h trunk/tora/src/tohelpbrowser.h trunk/tora/src/tohelpsetup.h trunk/tora/src/tohighlightedtext.cpp trunk/tora/src/tohighlightedtext.h trunk/tora/src/tohtml.cpp trunk/tora/src/tohtml.h trunk/tora/src/toinvalid.cpp trunk/tora/src/toinvalid.h trunk/tora/src/tolegendchart.cpp trunk/tora/src/tolegendchart.h trunk/tora/src/tolinechart.cpp trunk/tora/src/tolinechart.h trunk/tora/src/tolistviewformatter.cpp trunk/tora/src/tolistviewformatter.h trunk/tora/src/tolistviewformattercsv.cpp trunk/tora/src/tolistviewformattercsv.h trunk/tora/src/tolistviewformatterfactory.h trunk/tora/src/tolistviewformatterhtml.cpp trunk/tora/src/tolistviewformatterhtml.h trunk/tora/src/tolistviewformatteridentifier.h trunk/tora/src/tolistviewformattersql.h trunk/tora/src/tolistviewformattertabdel.cpp trunk/tora/src/tolistviewformattertabdel.h trunk/tora/src/tolistviewformattertext.cpp trunk/tora/src/tolistviewformattertext.h trunk/tora/src/tomain.cpp trunk/tora/src/tomain.h trunk/tora/src/tomainwindow.cpp trunk/tora/src/tomainwindow.h trunk/tora/src/tomainwindow.kde.h trunk/tora/src/tomarkedtext.cpp trunk/tora/src/tomarkedtext.h trunk/tora/src/tomemoeditor.cpp trunk/tora/src/tomemoeditor.h trunk/tora/src/tomessage.cpp trunk/tora/src/tomessage.h trunk/tora/src/tomodeleditor.cpp trunk/tora/src/tomodeleditor.h trunk/tora/src/tomysqlkeywords.h trunk/tora/src/tonewconnection.cpp trunk/tora/src/tonewconnection.h trunk/tora/src/tonoblockquery.cpp trunk/tora/src/tonoblockquery.h trunk/tora/src/toocistub.cpp trunk/tora/src/tooracleconnection.cpp trunk/tora/src/tooracleextract.cpp trunk/tora/src/tooraclepreload.cpp trunk/tora/src/tooraclesetting.h trunk/tora/src/tooutput.cpp trunk/tora/src/tooutput.h trunk/tora/src/toparamget.cpp trunk/tora/src/toparamget.h trunk/tora/src/topassword.cpp trunk/tora/src/topiechart.cpp trunk/tora/src/topiechart.h trunk/tora/src/toplsqleditor.cpp trunk/tora/src/toplsqleditor.h trunk/tora/src/toplsqltext.cpp trunk/tora/src/toplsqltext.h trunk/tora/src/topreferences.cpp trunk/tora/src/topreferences.h trunk/tora/src/toprofiler.cpp trunk/tora/src/toprofiler.h trunk/tora/src/toproject.cpp trunk/tora/src/toproject.h trunk/tora/src/toqsqlconnection.cpp trunk/tora/src/toqvalue.cpp trunk/tora/src/toqvalue.h trunk/tora/src/toreport.cpp trunk/tora/src/toreport.h trunk/tora/src/toresult.cpp trunk/tora/src/toresult.h trunk/tora/src/toresultbar.cpp trunk/tora/src/toresultbar.h trunk/tora/src/toresultcols.cpp trunk/tora/src/toresultcols.h trunk/tora/src/toresultcolscomment.cpp trunk/tora/src/toresultcolscomment.h trunk/tora/src/toresultcombo.cpp trunk/tora/src/toresultcombo.h trunk/tora/src/toresultdata.cpp trunk/tora/src/toresultdata.h trunk/tora/src/toresultdatasingle.cpp trunk/tora/src/toresultdatasingle.h trunk/tora/src/toresultdepend.cpp trunk/tora/src/toresultdepend.h trunk/tora/src/toresultextract.cpp trunk/tora/src/toresultextract.h trunk/tora/src/toresultfield.cpp trunk/tora/src/toresultfield.h trunk/tora/src/toresultitem.cpp trunk/tora/src/toresultitem.h trunk/tora/src/toresultlabel.cpp trunk/tora/src/toresultlabel.h trunk/tora/src/toresultline.cpp trunk/tora/src/toresultline.h trunk/tora/src/toresultlistformat.cpp trunk/tora/src/toresultlistformat.h trunk/tora/src/toresultlock.cpp trunk/tora/src/toresultlock.h trunk/tora/src/toresultlong.cpp trunk/tora/src/toresultlong.h trunk/tora/src/toresultmodel.cpp trunk/tora/src/toresultmodel.h trunk/tora/src/toresultparam.cpp trunk/tora/src/toresultparam.h trunk/tora/src/toresultpie.cpp trunk/tora/src/toresultpie.h trunk/tora/src/toresultplan.cpp trunk/tora/src/toresultplan.h trunk/tora/src/toresultresources.h trunk/tora/src/toresultschema.cpp trunk/tora/src/toresultschema.h trunk/tora/src/toresultstats.cpp trunk/tora/src/toresultstats.h trunk/tora/src/toresultstorage.cpp trunk/tora/src/toresultstorage.h trunk/tora/src/toresulttableview.cpp trunk/tora/src/toresulttableview.h trunk/tora/src/toresulttableviewedit.cpp trunk/tora/src/toresulttableviewedit.h trunk/tora/src/toresultview.cpp trunk/tora/src/toresultview.h trunk/tora/src/torollback.cpp trunk/tora/src/torollback.h trunk/tora/src/torunnable.cpp trunk/tora/src/torunnable.h trunk/tora/src/toscript.cpp trunk/tora/src/toscript.h trunk/tora/src/toscriptschemawidget.cpp trunk/tora/src/toscriptschemawidget.h trunk/tora/src/toscripttreeitem.cpp trunk/tora/src/toscripttreeitem.h trunk/tora/src/toscripttreemodel.cpp trunk/tora/src/toscripttreemodel.h trunk/tora/src/tosearchreplace.cpp trunk/tora/src/tosearchreplace.h trunk/tora/src/tosecurity.cpp trunk/tora/src/tosecurity.h trunk/tora/src/tosecuritytreeitem.cpp trunk/tora/src/tosecuritytreeitem.h trunk/tora/src/tosecuritytreemodel.cpp trunk/tora/src/tosecuritytreemodel.h trunk/tora/src/tosession.cpp trunk/tora/src/tosession.h trunk/tora/src/tosgastatement.cpp trunk/tora/src/tosgastatement.h trunk/tora/src/tosgatrace.cpp trunk/tora/src/tosgatrace.h trunk/tora/src/tosmtp.cpp trunk/tora/src/tosmtp.h trunk/tora/src/tosplash.cpp trunk/tora/src/tosplash.h trunk/tora/src/tosql.cpp trunk/tora/src/tosql.h trunk/tora/src/tosqledit.cpp trunk/tora/src/tosqledit.h trunk/tora/src/tosqlparse.cpp trunk/tora/src/tosqlparse.h trunk/tora/src/tostorage.cpp trunk/tora/src/tostorage.h trunk/tora/src/tostoragedefinition.cpp trunk/tora/src/tostoragedefinition.h trunk/tora/src/tosyntaxsetup.cpp trunk/tora/src/tosyntaxsetup.h trunk/tora/src/totabwidget.cpp trunk/tora/src/totabwidget.h trunk/tora/src/totemplate.cpp trunk/tora/src/totemplate.h trunk/tora/src/totemplateprovider.cpp trunk/tora/src/totemporary.cpp trunk/tora/src/totemporary.h trunk/tora/src/totextview.cpp trunk/tora/src/totextview.h trunk/tora/src/tothread.cpp trunk/tora/src/tothread.h trunk/tora/src/tothread_p.h trunk/tora/src/totool.h trunk/tora/src/totreewidget.cpp trunk/tora/src/totreewidget.h trunk/tora/src/totuning.cpp trunk/tora/src/totuning.h trunk/tora/src/tounittest.cpp trunk/tora/src/tounittest.h trunk/tora/src/tovisualize.cpp trunk/tora/src/tovisualize.h trunk/tora/src/towaitevents.cpp trunk/tora/src/towaitevents.h trunk/tora/src/toworkingwidget.cpp trunk/tora/src/toworkingwidget.h trunk/tora/src/toworksheet.cpp trunk/tora/src/toworksheet.h trunk/tora/src/toworksheetstatistic.cpp trunk/tora/src/toworksheetstatistic.h trunk/tora/src/toworksheettext.cpp trunk/tora/src/toworksheettext.h trunk/tora/src/toworksheetwidget.cpp trunk/tora/src/toworksheetwidget.h trunk/tora/src/utils.cpp trunk/tora/src/utils.h Modified: trunk/tora/refresh-copyright-and-license.pl =================================================================== --- trunk/tora/refresh-copyright-and-license.pl 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/refresh-copyright-and-license.pl 2008-09-14 21:22:53 UTC (rev 3010) @@ -40,11 +40,58 @@ close(COPYOUT); # +# Generate the replacement C-style copyright +# +my $c_style = "\n/* BEGIN_COMMON_COPYRIGHT_HEADER\n *\n"; +foreach my $ln ( split( /[\r\n]/, $copy_text ) ) { + $c_style .= " * $ln\n"; +} +$c_style .= " *\n * END_COMMON_COPYRIGHT_HEADER */\n\n"; + +# # Update all the C-style copyright text entries # foreach $file ( glob("src/*.h"), glob("src/*/*.h"), glob("src/*.cpp"), glob("src/*/*.cpp") ) { + next if ( $file eq "src/LICENSE.h" ); + next if ( $file eq "src/COPYRIGHT.h" ); + print "Refreshing $file.\n"; + + local ($/); + my $filetext = do { local ($/); my $fh; open( $fh, "<", $file ); <$fh> }; + $filetext =~ +s|\s*/\*\s*BEGIN_COMMON_COPYRIGHT_HEADER.*END_COMMON_COPYRIGHT_HEADER\s*\*/\s*|$c_style|sx; + + open( OUT, ">", $file ); + print OUT $filetext; + close(OUT); } +#!/usr/bin/perl + +$/ = undef; + +open( IN, "/tmp/copy-chunk" ); +my $lic = join( "", <IN> ); +close(IN); +my $qlic = quotemeta($lic); + +#print "QLIC = $qlic\n"; + +$newlic = "/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ +"; + +foreach $file (@ARGV) { + open( IN, $file ); + my $filetext = join( "", <IN> ); + close(IN); + + $filetext =~ s/$qlic/$newlic/sx; + + open( OUT, ">$file" ); + print OUT $filetext; + close(OUT); +} Modified: trunk/tora/src/main.cpp =================================================================== --- trunk/tora/src/main.cpp 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/main.cpp 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,43 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ #include "utils.h" Modified: trunk/tora/src/migratetool/sqldeveloper.cpp =================================================================== --- trunk/tora/src/migratetool/sqldeveloper.cpp 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/migratetool/sqldeveloper.cpp 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #include "sqldeveloper.h" #include <QMessageBox> Modified: trunk/tora/src/migratetool/sqldeveloper.h =================================================================== --- trunk/tora/src/migratetool/sqldeveloper.h 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/migratetool/sqldeveloper.h 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef SQLDEVELOPER_H #define SQLDEVELOPER_H Modified: trunk/tora/src/migratetool/squirrelsql.cpp =================================================================== --- trunk/tora/src/migratetool/squirrelsql.cpp 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/migratetool/squirrelsql.cpp 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #include "squirrelsql.h" #include <QMessageBox> Modified: trunk/tora/src/migratetool/squirrelsql.h =================================================================== --- trunk/tora/src/migratetool/squirrelsql.h 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/migratetool/squirrelsql.h 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef SQURRELSQL_H #define SQURRELSQL_H Modified: trunk/tora/src/migratetool/tora3.cpp =================================================================== --- trunk/tora/src/migratetool/tora3.cpp 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/migratetool/tora3.cpp 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #include "config.h" #include "tora3.h" #include "utils.h" Modified: trunk/tora/src/migratetool/tora3.h =================================================================== --- trunk/tora/src/migratetool/tora3.h 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/migratetool/tora3.h 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef TORA3_H #define TORA3_H Modified: trunk/tora/src/toabout.cpp =================================================================== --- trunk/tora/src/toabout.cpp 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/toabout.cpp 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #include "toabout.h" #include <qmime.h> Modified: trunk/tora/src/toabout.h =================================================================== --- trunk/tora/src/toabout.h 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/toabout.h 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef TOABOUT_H #define TOABOUT_H Modified: trunk/tora/src/toalert.cpp =================================================================== --- trunk/tora/src/toalert.cpp 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/toalert.cpp 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #include "toalert.h" #include "utils.h" Modified: trunk/tora/src/toalert.h =================================================================== --- trunk/tora/src/toalert.h 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/toalert.h 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef TOALERT_H #define TOALERT_H Modified: trunk/tora/src/toanalyze.cpp =================================================================== --- trunk/tora/src/toanalyze.cpp 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/toanalyze.cpp 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #include "utils.h" #include "toanalyze.h" Modified: trunk/tora/src/toanalyze.h =================================================================== --- trunk/tora/src/toanalyze.h 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/toanalyze.h 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef TOANALYZE_H #define TOANALYZE_H Modified: trunk/tora/src/tobackup.cpp =================================================================== --- trunk/tora/src/tobackup.cpp 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/tobackup.cpp 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #include "utils.h" #include "tobackup.h" Modified: trunk/tora/src/tobackup.h =================================================================== --- trunk/tora/src/tobackup.h 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/tobackup.h 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef TOBACKUP_H #define TOBACKUP_H Modified: trunk/tora/src/tobarchart.cpp =================================================================== --- trunk/tora/src/tobarchart.cpp 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/tobarchart.cpp 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #include "config.h" #include <qpainter.h> Modified: trunk/tora/src/tobarchart.h =================================================================== --- trunk/tora/src/tobarchart.h 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/tobarchart.h 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef TOBARCHART_H #define TOBARCHART_H Modified: trunk/tora/src/tobrowser.cpp =================================================================== --- trunk/tora/src/tobrowser.cpp 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/tobrowser.cpp 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #include "utils.h" #include "tobrowser.h" Modified: trunk/tora/src/tobrowser.h =================================================================== --- trunk/tora/src/tobrowser.h 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/tobrowser.h 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef TOBROWSER_H #define TOBROWSER_H Modified: trunk/tora/src/tobrowserconstraint.cpp =================================================================== --- trunk/tora/src/tobrowserconstraint.cpp 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/tobrowserconstraint.cpp 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #include "utils.h" #include "tobrowserconstraint.h" Modified: trunk/tora/src/tobrowserconstraint.h =================================================================== --- trunk/tora/src/tobrowserconstraint.h 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/tobrowserconstraint.h 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #ifndef TOBROWSERCONSTRAINT_H #define TOBROWSERCONSTRAINT_H Modified: trunk/tora/src/tobrowserindex.cpp =================================================================== --- trunk/tora/src/tobrowserindex.cpp 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/tobrowserindex.cpp 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * As a special exception, you have permission to link this program + * with the Oracle Client libraries and distribute executables, as long + * as you follow the requirements of the GNU GPL in regard to all of the + * software in the executable aside from Oracle client libraries. + * + * Specifically you are not permitted to link this program with the + * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + * And you are not permitted to distribute binaries compiled against + * these libraries. + * + * You may link this product with any GPL'd Qt library. + * + * All trademarks belong to their respective owners. + * + * END_COMMON_COPYRIGHT_HEADER */ + #include "utils.h" #include "tobrowserindex.h" Modified: trunk/tora/src/tobrowserindex.h =================================================================== --- trunk/tora/src/tobrowserindex.h 2008-09-14 21:10:16 UTC (rev 3009) +++ trunk/tora/src/tobrowserindex.h 2008-09-14 21:22:53 UTC (rev 3010) @@ -1,6 +1,44 @@ -/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ +/* BEGIN_COMMON_COPYRIGHT_HEADER + * + * TOra - An Oracle Toolkit for DBA's and developers + * + * Shared/mixed copyright is held throughout files in this product + * + * Portions Copyright (C) 2000-2001 Underscore AB + * Portions Copyright (C) 2003-2005 Quest Software, Inc. + * Portions Copyright (C) 2004-2008 Numerous Other Contributors + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; only version 2 of + * the License is valid for this program. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General P... [truncated message content] |
From: <nn...@us...> - 2008-09-14 21:28:40
|
Revision: 3011 http://tora.svn.sourceforge.net/tora/?rev=3011&view=rev Author: nneul Date: 2008-09-14 21:28:51 +0000 (Sun, 14 Sep 2008) Log Message: ----------- add plain style refresh Modified Paths: -------------- trunk/tora/README trunk/tora/refresh-copyright-and-license.pl Modified: trunk/tora/README =================================================================== --- trunk/tora/README 2008-09-14 21:22:53 UTC (rev 3010) +++ trunk/tora/README 2008-09-14 21:28:51 UTC (rev 3011) @@ -1,9 +1,46 @@ TOra - Toolkit for Oracle ========================= -* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER +BEGIN_COMMON_COPYRIGHT_HEADER +TOra - An Oracle Toolkit for DBA's and developers + +Shared/mixed copyright is held throughout files in this product + +Portions Copyright (C) 2000-2001 Underscore AB +Portions Copyright (C) 2003-2005 Quest Software, Inc. +Portions Copyright (C) 2004-2008 Numerous Other Contributors + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; only version 2 of +the License is valid for this program. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + As a special exception, you have permission to link this program + with the Oracle Client libraries and distribute executables, as long + as you follow the requirements of the GNU GPL in regard to all of the + software in the executable aside from Oracle client libraries. + + Specifically you are not permitted to link this program with the + Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. + And you are not permitted to distribute binaries compiled against + these libraries. + + You may link this product with any GPL'd Qt library. + +All trademarks belong to their respective owners. + +END_COMMON_COPYRIGHT_HEADER + For information about license see the COPYING file. TOra is distributed under the GPL which basically means that any derivatory work must be released under the GPL license as well. @@ -80,5 +117,3 @@ The homepage for the TOra project is http://tora.sourceforge.net. If you encounter problems you can find both mailinglists and bugtracking tools from this page. - -Oracle is copyright of Oracle Corporation. Modified: trunk/tora/refresh-copyright-and-license.pl =================================================================== --- trunk/tora/refresh-copyright-and-license.pl 2008-09-14 21:22:53 UTC (rev 3010) +++ trunk/tora/refresh-copyright-and-license.pl 2008-09-14 21:28:51 UTC (rev 3011) @@ -69,29 +69,28 @@ close(OUT); } -#!/usr/bin/perl +# +# Generate the replacement plain-style copyright +# +my $plain_style = "\n\nBEGIN_COMMON_COPYRIGHT_HEADER\n\n"; +foreach my $ln ( split( /[\r\n]/, $copy_text ) ) { + $plain_style .= "$ln\n"; +} +$plain_style .= "\nEND_COMMON_COPYRIGHT_HEADER\n\n"; -$/ = undef; +# +# Update all the C-style copyright text entries +# +foreach $file ("README") { + print "Refreshing $file.\n"; -open( IN, "/tmp/copy-chunk" ); -my $lic = join( "", <IN> ); -close(IN); -my $qlic = quotemeta($lic); + local ($/); + my $filetext = do { local ($/); my $fh; open( $fh, "<", $file ); <$fh> }; + $filetext =~ +s|\s*BEGIN_COMMON_COPYRIGHT_HEADER.*END_COMMON_COPYRIGHT_HEADER\s*|$plain_style|sx; -#print "QLIC = $qlic\n"; - -$newlic = "/* BEGIN_COMMON_COPYRIGHT_HEADER -* END_COMMON_COPYRIGHT_HEADER */ -"; - -foreach $file (@ARGV) { - open( IN, $file ); - my $filetext = join( "", <IN> ); - close(IN); - - $filetext =~ s/$qlic/$newlic/sx; - - open( OUT, ">$file" ); + open( OUT, ">", $file ); print OUT $filetext; close(OUT); } + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2008-09-14 21:52:56
|
Revision: 3016 http://tora.svn.sourceforge.net/tora/?rev=3016&view=rev Author: nneul Date: 2008-09-14 21:53:07 +0000 (Sun, 14 Sep 2008) Log Message: ----------- add trailing newline Modified Paths: -------------- trunk/tora/refresh-copyright-and-license.pl trunk/tora/src/COPYRIGHT.h trunk/tora/src/LICENSE.h Modified: trunk/tora/refresh-copyright-and-license.pl =================================================================== --- trunk/tora/refresh-copyright-and-license.pl 2008-09-14 21:50:38 UTC (rev 3015) +++ trunk/tora/refresh-copyright-and-license.pl 2008-09-14 21:53:07 UTC (rev 3016) @@ -50,7 +50,7 @@ $ln =~ s/"/\\"/g; $tmp .= " \"$ln\\n\"\n"; } -$tmp .= " \"</pre></body></html>\\n\"\n;"; +$tmp .= " \"</pre></body></html>\\n\"\n;\n"; write_if_changed( $origtext, $tmp, $file ); # @@ -66,7 +66,7 @@ $ln =~ s/"/\\"/g; $tmp .= " \"$ln\\n\"\n"; } -$tmp .= " \"</pre>\\n\"\n;"; +$tmp .= " \"</pre>\\n\"\n;\n"; write_if_changed( $origtext, $tmp, $file ); # Modified: trunk/tora/src/COPYRIGHT.h =================================================================== --- trunk/tora/src/COPYRIGHT.h 2008-09-14 21:50:38 UTC (rev 3015) +++ trunk/tora/src/COPYRIGHT.h 2008-09-14 21:53:07 UTC (rev 3016) @@ -35,4 +35,4 @@ "\n" "All trademarks belong to their respective owners.\n" "</pre>\n" -; \ No newline at end of file +; Modified: trunk/tora/src/LICENSE.h =================================================================== --- trunk/tora/src/LICENSE.h 2008-09-14 21:50:38 UTC (rev 3015) +++ trunk/tora/src/LICENSE.h 2008-09-14 21:53:07 UTC (rev 3016) @@ -340,4 +340,4 @@ "library. If this is what you want to do, use the GNU Library General\n" "Public License instead of this License.\n" "</pre></body></html>\n" -; \ No newline at end of file +; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2008-09-14 22:22:14
|
Revision: 3018 http://tora.svn.sourceforge.net/tora/?rev=3018&view=rev Author: nneul Date: 2008-09-14 22:22:25 +0000 (Sun, 14 Sep 2008) Log Message: ----------- Tweaks for license/about appearance Modified Paths: -------------- trunk/tora/refresh-copyright-and-license.pl trunk/tora/src/LICENSE.h trunk/tora/src/toabout.cpp trunk/tora/src/toaboutui.ui Modified: trunk/tora/refresh-copyright-and-license.pl =================================================================== --- trunk/tora/refresh-copyright-and-license.pl 2008-09-14 21:57:57 UTC (rev 3017) +++ trunk/tora/refresh-copyright-and-license.pl 2008-09-14 22:22:25 UTC (rev 3018) @@ -44,13 +44,13 @@ my $origtext = slurp($file); my $tmp = "static const char *LicenseText = "; -$tmp .= " \"<html><body><pre>\\n\"\n"; +$tmp .= " \"<html><body><pre><font size=-1>\\n\"\n"; foreach my $ln ( split( /[\r\n]/, $lic_text ) ) { $ln =~ s/\\/\\\\/g; $ln =~ s/"/\\"/g; $tmp .= " \"$ln\\n\"\n"; } -$tmp .= " \"</pre></body></html>\\n\"\n;\n"; +$tmp .= " \"</font></pre></body></html>\\n\"\n;\n"; write_if_changed( $origtext, $tmp, $file ); # Modified: trunk/tora/src/LICENSE.h =================================================================== --- trunk/tora/src/LICENSE.h 2008-09-14 21:57:57 UTC (rev 3017) +++ trunk/tora/src/LICENSE.h 2008-09-14 22:22:25 UTC (rev 3018) @@ -1,4 +1,4 @@ -static const char *LicenseText = "<html><body><pre>\n" +static const char *LicenseText = "<html><body><pre><font size=-1>\n" " GNU GENERAL PUBLIC LICENSE\n" " Version 2, June 1991\n" "\n" @@ -339,5 +339,5 @@ "consider it more useful to permit linking proprietary applications with the\n" "library. If this is what you want to do, use the GNU Library General\n" "Public License instead of this License.\n" - "</pre></body></html>\n" + "</font></pre></body></html>\n" ; Modified: trunk/tora/src/toabout.cpp =================================================================== --- trunk/tora/src/toabout.cpp 2008-09-14 21:57:57 UTC (rev 3017) +++ trunk/tora/src/toabout.cpp 2008-09-14 22:22:25 UTC (rev 3018) @@ -58,7 +58,6 @@ "<IMG SRC=':/icons/largelogo.xpm'><BR>\n" "Version %1 (<A HREF=http://tora.sourceforge.net>http://tora.sourceforge.net</A>)\n" "<P>\n" - "%2<P>\n" "SourceForge project administered by Nathan Neulinger <A HREF=\"mailto:nn...@ne...\">nn...@ne...</A><P>\n" "This program is available under the GNU General Public License.\n" "Uses the Qt library by TrollTech\n" @@ -135,6 +134,8 @@ "<B>Joachim Zetzsche</B>,\n" "<B>Massimiliano Ziccardi</B>,\n" "<B>Raj Thukral</B>...\n" + "<HR BREAK=ALL>\n" + "<P><FONT SIZE=-1>%2</FONT><P>\n" "</body></html>"; #define ABOUT_CAPTION TOAPPNAME " %1" Modified: trunk/tora/src/toaboutui.ui =================================================================== --- trunk/tora/src/toaboutui.ui 2008-09-14 21:57:57 UTC (rev 3017) +++ trunk/tora/src/toaboutui.ui 2008-09-14 22:22:25 UTC (rev 3018) @@ -5,8 +5,8 @@ <rect> <x>0</x> <y>0</y> - <width>475</width> - <height>400</height> + <width>625</width> + <height>500</height> </rect> </property> <property name="windowTitle" > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-09-16 06:53:17
|
Revision: 3020 http://tora.svn.sourceforge.net/tora/?rev=3020&view=rev Author: subik Date: 2008-09-16 06:53:28 +0000 (Tue, 16 Sep 2008) Log Message: ----------- improved cmake win build docs Modified Paths: -------------- trunk/tora/README.CMAKE trunk/tora/README.WINDOWS Modified: trunk/tora/README.CMAKE =================================================================== --- trunk/tora/README.CMAKE 2008-09-16 06:40:17 UTC (rev 3019) +++ trunk/tora/README.CMAKE 2008-09-16 06:53:28 UTC (rev 3020) @@ -53,6 +53,8 @@ -DPOSTGRESQL_PATH_INCLUDES=/home/devel/pgsql/include -DPOSTGRESQL_PATH_INCLUDES=d:\pgsql\include -DPOSTGRESQL_PATH_LIB=/home/devel/pgsql/lib +Windows note: Sometimes (dunno why) it doesn't find pgsql libs. + You can use "set LIB=%LIB%;pathtopgsqllibs" then. etc. Modified: trunk/tora/README.WINDOWS =================================================================== --- trunk/tora/README.WINDOWS 2008-09-16 06:40:17 UTC (rev 3019) +++ trunk/tora/README.WINDOWS 2008-09-16 06:53:28 UTC (rev 3020) @@ -82,30 +82,47 @@ Building with MSVC - 0. All related steps are done in the "Visual Studio Command Prompt" + 0. All related steps are done in the "Visual Studio Command Prompt" + I have MS Visual Studio 2008 Express (aka version 9). It contains + all basic tools propably so there is no more stuff from Microsoft + required. - 1. Downaload Qt4 source version for Windows - Trolltech doesn't provide - MSVC binaries at all. + 1. Downaload Qt4 source version for Windows - Trolltech doesn't provide + MSVC binaries at all. - 2. Install Oracle client - instant or standard one. + 2. Install Oracle client - instant or standard one. - 3. Download and install Postgresql development packages. It's a part - of default installer - just check its component. - NOTE: Install it to the path *without* space in its name - Qt has - problems with compilation in the case of space. + 3. Download and install Postgresql development packages. It's a part + of default installer - just check its component. + NOTE: Install it to the path *without* space in its name - Qt has + problems with compilation in the case of space. - 4. Download and install Mysql development packages. It's a part - of default installer - just check its component. - NOTE: Install it to the path *without* space in its name - Qt has - problems with compilation in the case of space. + 4. Download and install Mysql development packages. It's a part + of default installer - just check its component. + NOTE: Install it to the path *without* space in its name - Qt has + problems with compilation in the case of space. - 5. Update system environment paths in variables: INCLUDE and LIB to - fit Postgresql and Mysql includes and libraries. - Note: Mysql uses subdirectories in its lib directory. + 5. Update system environment paths in variables: INCLUDE and LIB to + fit Postgresql and Mysql includes and libraries. + Note: Mysql uses subdirectories in its lib directory. + Example: +set INCLUDE=%INCLUDE%;d:\Qt\sqlite\;D:\Qt\pgsql\include\;d:\Qt\mysql\include\ +set LIB=%LIB%;d:\Qt\sqlite\;d:\Qt\pgsql\lib\;d:\Qt\mysql\lib\opt\ - 6. Compile Qt4 with MSVC. Don't forget to specify -qt-sql-mysql - -qt-sql-psql -qt-sql-odbc -plugin-sql-mysql -plugin-sql-psql - -plugin-sql-odbc parameters for configure script. + 6. Compile Qt4 with MSVC. Don't forget to specify -qt-sql-mysql + -qt-sql-psql -qt-sql-odbc -plugin-sql-mysql -plugin-sql-psql + -plugin-sql-odbc parameters for configure script. + Example: +configure.exe -plugin-sql-sqlite -system-sqlite -plugin-sql-mysql -plugin-sql-psql -plugin-sql-odbc + but it dependes on your system mood. I mean it's not deterministic. + Sometimes you will need to hack more paths etc. But building DB + plugins is described in the Qt documentation. - 7. Compile Tora - read README.CMAKE - + 7. Compile Tora - read README.CMAKE + Example: +set ORACLE_HOME=d:\oracle-xe\... +set LIB=%LIB%;d:\Qt\pgsql\lib +cmake -G "NMake Makefiles" -DWANT_INTERNAL_QSCINTILLA=1 -DCMAKE_INSTALL_PREFIX=d:\oss\tora\RELEASE -DORACLE_OCI_VERSION=10G_R2 -DPOSTGRESQL_PATH_INCLUDES=d:\Qt\pgsql\include -DPOSTGRESQL_PATH_LIB=d:\Qt\pgsql\lib\ ..\tora + Misc notes: seting ORACLE_HOME is a good thing (TM) + building with internal qscintilla is easier for beginners ;) + prepare for longer headache (if you're a windows devel newbie) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <m0...@us...> - 2008-10-08 11:50:25
|
Revision: 3051 http://tora.svn.sourceforge.net/tora/?rev=3051&view=rev Author: m0m Date: 2008-10-08 11:50:20 +0000 (Wed, 08 Oct 2008) Log Message: ----------- added CMake related dirs/files to svn:ignore Property Changed: ---------------- trunk/tora/ trunk/tora/doc/ trunk/tora/doc/help/ trunk/tora/doc/help/images/ trunk/tora/src/ trunk/tora/src/templates/ Property changes on: trunk/tora ___________________________________________________________________ Modified: svn:ignore - .depends LICENSE.h Makefile objs plugins toabout.moc toaboutui.cpp toaboutui.h toaboutui.moc toalert.moc toanalyze.moc tobackup.moc tobarchart.moc tobrowser.moc tobrowserconstraint.moc tobrowserconstraintui.cpp tobrowserconstraintui.h tobrowserconstraintui.moc tobrowserfilterui.cpp tobrowserfilterui.h tobrowserfilterui.moc tobrowserindex.moc tobrowserindexui.cpp tobrowserindexui.h tobrowserindexui.moc tobrowsertable.moc tobrowsertableui.cpp tobrowsertableui.h tobrowsertableui.moc tochangeconnection.moc tochartalarmui.cpp tochartalarmui.h tochartalarmui.moc tochartmanager.moc tochartsetupui.cpp tochartsetupui.h tochartsetupui.moc tocurrent.moc todatabasesettingui.cpp todatabasesettingui.h todatabasesettingui.moc todatatype.moc todebug.moc todebugchangeui.cpp todebugchangeui.h todebugchangeui.moc todebugwatch.cpp todebugwatch.h todebugwatch.moc toeditextensiongotoui.cpp toeditextensiongotoui.h toeditextensiongotoui.moc toeditextensions.moc toeditextensionsetupui.cpp toeditextensionsetupui.h toeditextensionsetupui.moc tofilesize.moc toglobalsettingui.cpp toglobalsettingui.h toglobalsettingui.moc tohelp.moc tohelpaddfileui.cpp tohelpaddfileui.h tohelpaddfileui.moc tohelpbrowser.moc tohelpsetupui.cpp tohelpsetupui.h tohelpsetupui.moc tohighlightedtext.moc toinvalid.moc tolegendchart.moc tolinechart.moc tolinechartsetupui.cpp tolinechartsetupui.h tolinechartsetupui.moc tomain.moc tomainwindow.kde.moc tomainwindow.moc tomarkedtext.2.moc tomarkedtext.3.moc tomarkedtext.moc tomemoeditor.moc tomessageui.cpp tomessageui.h tomessageui.moc tonewconnection.moc tonewconnectionui.cpp tonewconnectionui.h tonewconnectionui.moc tooraclesettingui.cpp tooraclesettingui.h tooraclesettingui.moc tooutput.moc toparamget.moc topiechart.moc topreferences.moc topreferencesui.cpp topreferencesui.h topreferencesui.moc toprofiler.moc toproject.moc tora tora-mono tora.pro tora_fr.qm tora_it.qm tora_se.qm tora_toad.h tora_toad.qm toresult.moc toresultbar.moc toresultcols.moc toresultcombo.moc toresultconstraint.moc toresultcontent.moc toresultcontentfilterui.cpp toresultcontentfilterui.h toresultcontentfilterui.moc toresultdepend.moc toresultextract.moc toresultfield.moc toresultindexes.moc toresultitem.moc toresultlabel.moc toresultline.moc toresultlistformatui.cpp toresultlistformatui.h toresultlistformatui.moc toresultlock.moc toresultlong.moc toresultparam.moc toresultpie.moc toresultplan.moc toresultreferences.moc toresultstats.moc toresultstorage.moc toresultview.moc torollback.moc torollbackdialogui.cpp torollbackdialogui.h torollbackdialogui.moc toscript.moc toscriptui.cpp toscriptui.h toscriptui.moc tosearchreplace.moc tosearchreplaceui.cpp tosearchreplaceui.h tosearchreplaceui.moc tosecurity.moc tosecurityquotaui.cpp tosecurityquotaui.h tosecurityquotaui.moc tosecurityroleui.cpp tosecurityroleui.h tosecurityroleui.moc tosecurityuserui.cpp tosecurityuserui.h tosecurityuserui.moc tosession.moc tosgastatement.moc tosgatrace.moc tosmtp.moc tosqledit.moc tostorage.moc tostoragedatafileui.cpp tostoragedatafileui.h tostoragedatafileui.moc tostoragedefinitionui.cpp tostoragedefinitionui.h tostoragedefinitionui.moc tostoragedialogui.cpp tostoragedialogui.h tostoragedialogui.moc tostorageprefsui.cpp tostorageprefsui.h tostorageprefsui.moc tostoragetablespaceui.cpp tostoragetablespaceui.h tostoragetablespaceui.moc tosyntaxsetup.moc tosyntaxsetupui.cpp tosyntaxsetupui.h tosyntaxsetupui.moc totableselect.moc totabwidget.moc totemplate.moc totemplateaddfileui.cpp totemplateaddfileui.h totemplateaddfileui.moc totemplateeditui.cpp totemplateeditui.h totemplateeditui.moc totemplatesetupui.cpp totemplatesetupui.h totemplatesetupui.moc totemporary.moc totool.moc totoolsettingui.cpp totoolsettingui.h totoolsettingui.moc totuning.moc totuningoverviewui.cpp totuningoverviewui.h totuningoverviewui.moc totuningsettingui.cpp totuningsettingui.h totuningsettingui.moc tovisualize.moc towaitevents.moc toworksheet.moc toworksheetsetupui.cpp toworksheetsetupui.h toworksheetsetupui.moc toworksheetstatistic.moc utils.moc *.lo *.la *.moc .deps .libs COPYING Makefile.in autom4te.cache ccache.log config.guess config.h.in config.log config.status config.sub depcomp install-sh libtool missing mkinstalldirs stamp-h1 aclocal.m4 config.h configure *.tar.gz + .depends LICENSE.h Makefile objs plugins toabout.moc toaboutui.cpp toaboutui.h toaboutui.moc toalert.moc toanalyze.moc tobackup.moc tobarchart.moc tobrowser.moc tobrowserconstraint.moc tobrowserconstraintui.cpp tobrowserconstraintui.h tobrowserconstraintui.moc tobrowserfilterui.cpp tobrowserfilterui.h tobrowserfilterui.moc tobrowserindex.moc tobrowserindexui.cpp tobrowserindexui.h tobrowserindexui.moc tobrowsertable.moc tobrowsertableui.cpp tobrowsertableui.h tobrowsertableui.moc tochangeconnection.moc tochartalarmui.cpp tochartalarmui.h tochartalarmui.moc tochartmanager.moc tochartsetupui.cpp tochartsetupui.h tochartsetupui.moc tocurrent.moc todatabasesettingui.cpp todatabasesettingui.h todatabasesettingui.moc todatatype.moc todebug.moc todebugchangeui.cpp todebugchangeui.h todebugchangeui.moc todebugwatch.cpp todebugwatch.h todebugwatch.moc toeditextensiongotoui.cpp toeditextensiongotoui.h toeditextensiongotoui.moc toeditextensions.moc toeditextensionsetupui.cpp toeditextensionsetupui.h toeditextensionsetupui.moc tofilesize.moc toglobalsettingui.cpp toglobalsettingui.h toglobalsettingui.moc tohelp.moc tohelpaddfileui.cpp tohelpaddfileui.h tohelpaddfileui.moc tohelpbrowser.moc tohelpsetupui.cpp tohelpsetupui.h tohelpsetupui.moc tohighlightedtext.moc toinvalid.moc tolegendchart.moc tolinechart.moc tolinechartsetupui.cpp tolinechartsetupui.h tolinechartsetupui.moc tomain.moc tomainwindow.kde.moc tomainwindow.moc tomarkedtext.2.moc tomarkedtext.3.moc tomarkedtext.moc tomemoeditor.moc tomessageui.cpp tomessageui.h tomessageui.moc tonewconnection.moc tonewconnectionui.cpp tonewconnectionui.h tonewconnectionui.moc tooraclesettingui.cpp tooraclesettingui.h tooraclesettingui.moc tooutput.moc toparamget.moc topiechart.moc topreferences.moc topreferencesui.cpp topreferencesui.h topreferencesui.moc toprofiler.moc toproject.moc tora tora-mono tora.pro tora_fr.qm tora_it.qm tora_se.qm tora_toad.h tora_toad.qm toresult.moc toresultbar.moc toresultcols.moc toresultcombo.moc toresultconstraint.moc toresultcontent.moc toresultcontentfilterui.cpp toresultcontentfilterui.h toresultcontentfilterui.moc toresultdepend.moc toresultextract.moc toresultfield.moc toresultindexes.moc toresultitem.moc toresultlabel.moc toresultline.moc toresultlistformatui.cpp toresultlistformatui.h toresultlistformatui.moc toresultlock.moc toresultlong.moc toresultparam.moc toresultpie.moc toresultplan.moc toresultreferences.moc toresultstats.moc toresultstorage.moc toresultview.moc torollback.moc torollbackdialogui.cpp torollbackdialogui.h torollbackdialogui.moc toscript.moc toscriptui.cpp toscriptui.h toscriptui.moc tosearchreplace.moc tosearchreplaceui.cpp tosearchreplaceui.h tosearchreplaceui.moc tosecurity.moc tosecurityquotaui.cpp tosecurityquotaui.h tosecurityquotaui.moc tosecurityroleui.cpp tosecurityroleui.h tosecurityroleui.moc tosecurityuserui.cpp tosecurityuserui.h tosecurityuserui.moc tosession.moc tosgastatement.moc tosgatrace.moc tosmtp.moc tosqledit.moc tostorage.moc tostoragedatafileui.cpp tostoragedatafileui.h tostoragedatafileui.moc tostoragedefinitionui.cpp tostoragedefinitionui.h tostoragedefinitionui.moc tostoragedialogui.cpp tostoragedialogui.h tostoragedialogui.moc tostorageprefsui.cpp tostorageprefsui.h tostorageprefsui.moc tostoragetablespaceui.cpp tostoragetablespaceui.h tostoragetablespaceui.moc tosyntaxsetup.moc tosyntaxsetupui.cpp tosyntaxsetupui.h tosyntaxsetupui.moc totableselect.moc totabwidget.moc totemplate.moc totemplateaddfileui.cpp totemplateaddfileui.h totemplateaddfileui.moc totemplateeditui.cpp totemplateeditui.h totemplateeditui.moc totemplatesetupui.cpp totemplatesetupui.h totemplatesetupui.moc totemporary.moc totool.moc totoolsettingui.cpp totoolsettingui.h totoolsettingui.moc totuning.moc totuningoverviewui.cpp totuningoverviewui.h totuningoverviewui.moc totuningsettingui.cpp totuningsettingui.h totuningsettingui.moc tovisualize.moc towaitevents.moc toworksheet.moc toworksheetsetupui.cpp toworksheetsetupui.h toworksheetsetupui.moc toworksheetstatistic.moc utils.moc *.lo *.la *.moc .deps .libs COPYING Makefile.in autom4te.cache ccache.log config.guess config.h.in config.log config.status config.sub depcomp install-sh libtool missing mkinstalldirs stamp-h1 aclocal.m4 config.h configure *.tar.gz CMakeFiles CMakeCache.txt cmake_uninstall.cmake _CPack_Packages cmake_install.cmake CPackConfig.cmake CPackSourceConfig.cmake Property changes on: trunk/tora/doc ___________________________________________________________________ Modified: svn:ignore - Makefile.in Makefile + Makefile.in Makefile CMakeFiles cmake_install.cmake Property changes on: trunk/tora/doc/help ___________________________________________________________________ Modified: svn:ignore - Makefile Makefile.in tora.info tora + Makefile Makefile.in tora.info tora CMakeFiles cmake_install.cmake Property changes on: trunk/tora/doc/help/images ___________________________________________________________________ Modified: svn:ignore - .xvpics + .xvpics CMakeFiles Makefile cmake_install.cmake Property changes on: trunk/tora/src ___________________________________________________________________ Modified: svn:ignore - .deps .libs Makefile Makefile.in CMakeFiles cmake_install.cmake *.moc *.orig moc_*.cxx qrc_*.cxx ui_*.h 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 + .deps .libs Makefile Makefile.in CMakeFiles cmake_install.cmake CMakeCache.txt *.moc *.orig moc_*.cxx qrc_*.cxx ui_*.h 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/templates ___________________________________________________________________ Added: svn:ignore + CMakeFiles cmake_install.cmake Makefile This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <m0...@us...> - 2008-10-08 21:52:39
|
Revision: 3054 http://tora.svn.sourceforge.net/tora/?rev=3054&view=rev Author: m0m Date: 2008-10-08 21:52:27 +0000 (Wed, 08 Oct 2008) Log Message: ----------- using --defines make trouble when rebuilding package from src.rpm so let's create proper spec from spec.in template before rpmbuild Modified Paths: -------------- trunk/tora/CMakeLists.txt trunk/tora/rpm/tora.spec.in Modified: trunk/tora/CMakeLists.txt =================================================================== --- trunk/tora/CMakeLists.txt 2008-10-08 15:01:12 UTC (rev 3053) +++ trunk/tora/CMakeLists.txt 2008-10-08 21:52:27 UTC (rev 3054) @@ -313,15 +313,20 @@ # get svn revision in rpmbuild time (and not in Makefile generation time) SET(SVN_REVISION - "\"$$(" ${Subversion_SVN_EXECUTABLE} info | awk '/Revision:/ {print \$\$2 }' ")\"" + "\"$$(" ${Subversion_SVN_EXECUTABLE} info ${CMAKE_SOURCE_DIR} | awk '/Revision:/ {print \$\$2 }' ")\"" ) SET(RPM_DEFINES - --define "_version ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" - --define "_release 0.${SVN_REVISION}svn" --define "_sourcedir ${CMAKE_SOURCE_DIR}" ) -SET(RPM_SPEC "rpm/tora.spec.in") +SET(SPEC_IN_SUBST + "\"" + "s/(%define\\s+_version) .*/\\\\1 ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}/\;" + "s/(%define\\s+_release) .*/\\\\1 0.${SVN_REVISION}svn/\;" + "\"" + ) +SET(RPM_SPEC "rpm/tora.spec") ADD_CUSTOM_TARGET(package-rpm + COMMAND sed -r ${SPEC_IN_SUBST} "${RPM_SPEC}.in" >"${RPM_SPEC}" COMMAND make package_source COMMAND rpmbuild -ba ${RPM_DEFINES} "${RPM_SPEC}" ) Modified: trunk/tora/rpm/tora.spec.in =================================================================== --- trunk/tora/rpm/tora.spec.in 2008-10-08 15:01:12 UTC (rev 3053) +++ trunk/tora/rpm/tora.spec.in 2008-10-08 21:52:27 UTC (rev 3054) @@ -7,9 +7,8 @@ %define _name tora -%{!?_version:%define _version @VERSION@} -%{!?_release:%define _release 1} -%{!?_prefix: %define _prefix /usr/X11R6} +%define _version @VERSION@ +%define _release 1 # filter out oracle libraries because oracle-instantclient rpm doesn't provide them %define _use_internal_dependency_generator 0 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-10-29 15:24:38
|
Revision: 3066 http://tora.svn.sourceforge.net/tora/?rev=3066&view=rev Author: mrjohnson0 Date: 2008-10-29 15:24:31 +0000 (Wed, 29 Oct 2008) Log Message: ----------- updated EXTRA_DIST to include cmake files and other docs Modified Paths: -------------- trunk/tora/Makefile.am trunk/tora/src/Makefile.am Modified: trunk/tora/Makefile.am =================================================================== --- trunk/tora/Makefile.am 2008-10-23 21:43:38 UTC (rev 3065) +++ trunk/tora/Makefile.am 2008-10-29 15:24:31 UTC (rev 3066) @@ -45,6 +45,9 @@ README.CODESTYLE \ README.LICENSE \ README.OSX \ + README.CMAKE \ + README.SVN \ + README.BINARIES \ README.RELEASE \ README.WINDOWS @@ -56,7 +59,13 @@ Makefile.mingw \ $(READMES) \ config/m4 \ - autogen.sh + autogen.sh \ + CMakeLists.txt \ + doc/CMakeLists.txt \ + utils/chex/CMakeLists.txt \ + cmake_uninstall.cmake.in \ + config.h.cmake \ + cmake dist-hook: rm -rf `find $(distdir) -name .svn` Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2008-10-23 21:43:38 UTC (rev 3065) +++ trunk/tora/src/Makefile.am 2008-10-29 15:24:31 UTC (rev 3066) @@ -237,8 +237,12 @@ EXTRA_DIST = icons \ templates \ windows \ + COPYRIGHT.h \ + help \ $(LOKIDIR_INC) \ $(UI_FILES) \ + CMakeLists.txt \ + loki/CMakeLists.txt \ Makefile.am \ toconf.h \ todefaultkeywords.h \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2008-10-31 16:10:47
|
Revision: 3069 http://tora.svn.sourceforge.net/tora/?rev=3069&view=rev Author: ibre5041 Date: 2008-10-31 16:10:35 +0000 (Fri, 31 Oct 2008) Log Message: ----------- add missing denedency on libpq, fixes compile problems on Ubuntu Modified Paths: -------------- trunk/tora/config/m4/postgresql.m4 trunk/tora/src/Makefile.am Modified: trunk/tora/config/m4/postgresql.m4 =================================================================== --- trunk/tora/config/m4/postgresql.m4 2008-10-31 15:42:26 UTC (rev 3068) +++ trunk/tora/config/m4/postgresql.m4 2008-10-31 16:10:35 UTC (rev 3069) @@ -10,5 +10,6 @@ if test $ac_pg_cancel = yes; then AC_DEFINE([LIBPQ_DECL_CANCEL], 1, [Define if libpg-fe.h declares PQcancel.]) + AC_SUBST(PQ_LIBS, -lpq) fi ]) Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2008-10-31 15:42:26 UTC (rev 3068) +++ trunk/tora/src/Makefile.am 2008-10-31 16:10:35 UTC (rev 3069) @@ -35,7 +35,7 @@ # fix for annoying automake naming problems. tora_CXXFLAGS = $(AM_CXXFLAGS) -tora_LDADD = $(ORACLE_LIBS) $(@TORA_LINK_OTHERS@) +tora_LDADD = $(ORACLE_LIBS) $(PQ_LIBS) $(@TORA_LINK_OTHERS@) if HAVE_ORACLE EXTRA_ORACLE_MONO_SOURCE = tooracleconnection.cpp tooraclesetting.h \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <m0...@us...> - 2008-11-18 14:02:34
|
Revision: 3079 http://tora.svn.sourceforge.net/tora/?rev=3079&view=rev Author: m0m Date: 2008-11-18 14:02:27 +0000 (Tue, 18 Nov 2008) Log Message: ----------- applied cmake-2.4 patch from Alexander 'Leo' Bergolth Modified Paths: -------------- trunk/tora/cmake/modules/FindOracle.cmake trunk/tora/cmake/modules/FindPostgreSQL.cmake trunk/tora/src/CMakeLists.txt Added Paths: ----------- trunk/tora/cmake/modules/ToraCompat.cmake trunk/tora/cmake/modules/ToraFindPackageHandleStandardArgs.cmake Modified: trunk/tora/cmake/modules/FindOracle.cmake =================================================================== --- trunk/tora/cmake/modules/FindOracle.cmake 2008-11-16 22:45:35 UTC (rev 3078) +++ trunk/tora/cmake/modules/FindOracle.cmake 2008-11-18 14:02:27 UTC (rev 3079) @@ -70,7 +70,9 @@ # guess OCI version IF (NOT DEFINED ORACLE_OCI_VERSION AND UNIX) FIND_PROGRAM(AWK awk) - SET (sqlplus_version "${ORACLE_HOME}/bin/sqlplus -version | ${AWK} '/Release/ {print $3}'") + FIND_PROGRAM(SQLPLUS sqlplus PATHS ENV ORACLE_HOME NO_DEFAULT_PATH) + FIND_PROGRAM(SQLPLUS sqlplus) + SET (sqlplus_version "${SQLPLUS} -version | ${AWK} '/Release/ {print $3}'") EXEC_PROGRAM(${sqlplus_version} OUTPUT_VARIABLE sqlplus_out) MESSAGE(STATUS "found sqlplus version: ${sqlplus_out}") Modified: trunk/tora/cmake/modules/FindPostgreSQL.cmake =================================================================== --- trunk/tora/cmake/modules/FindPostgreSQL.cmake 2008-11-16 22:45:35 UTC (rev 3078) +++ trunk/tora/cmake/modules/FindPostgreSQL.cmake 2008-11-18 14:02:27 UTC (rev 3079) @@ -31,7 +31,7 @@ /usr/lib/ ) -include(FindPackageHandleStandardArgs) +include(ToraFindPackageHandleStandardArgs) find_package_handle_standard_args(PostgreSQL DEFAULT_MSG POSTGRESQL_INCLUDE_DIR POSTGRESQL_LIBRARIES ) Added: trunk/tora/cmake/modules/ToraCompat.cmake =================================================================== --- trunk/tora/cmake/modules/ToraCompat.cmake (rev 0) +++ trunk/tora/cmake/modules/ToraCompat.cmake 2008-11-18 14:02:27 UTC (rev 3079) @@ -0,0 +1,25 @@ +# This file was copied from CMake 2.6. +# +IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5) + FIND_PROGRAM(QT_LRELEASE_EXECUTABLE + NAMES lrelease + PATHS ${QT_BINARY_DIR} + NO_DEFAULT_PATH + ) + + MACRO(QT4_ADD_TRANSLATION _qm_files) + FOREACH (_current_FILE ${ARGN}) + GET_FILENAME_COMPONENT(_abs_FILE ${_current_FILE} ABSOLUTE) + GET_FILENAME_COMPONENT(qm ${_abs_FILE} NAME_WE) + SET(qm "${CMAKE_CURRENT_BINARY_DIR}/${qm}.qm") + + ADD_CUSTOM_COMMAND(OUTPUT ${qm} + COMMAND ${QT_LRELEASE_EXECUTABLE} + ARGS ${_abs_FILE} -qm ${qm} + DEPENDS ${_abs_FILE} + ) + SET(${_qm_files} ${${_qm_files}} ${qm}) + ENDFOREACH (_current_FILE) + ENDMACRO(QT4_ADD_TRANSLATION) +ENDIF(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5) + Added: trunk/tora/cmake/modules/ToraFindPackageHandleStandardArgs.cmake =================================================================== --- trunk/tora/cmake/modules/ToraFindPackageHandleStandardArgs.cmake (rev 0) +++ trunk/tora/cmake/modules/ToraFindPackageHandleStandardArgs.cmake 2008-11-18 14:02:27 UTC (rev 3079) @@ -0,0 +1,66 @@ +# This file was copied from CMake 2.5. It's used to permit CMake 2.4 +# to use the CMake 2.5-derived find scripts here. +# +IF (NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5) + # Use the original from cmake 2.5 if possible + INCLUDE(FindPackageHandleStandardArgs) +ELSE(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5) + # or define our own... + +# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME (DEFAULT_MSG|"Custom failure message") VAR1 ... ) +# This macro is intended to be used in FindXXX.cmake modules files. +# It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and +# it also sets the <UPPERCASED_NAME>_FOUND variable. +# The package is found if all variables listed are TRUE. +# Example: +# +# FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2 DEFAULT_MSG LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR) +# +# LibXml2 is considered to be found, if both LIBXML2_LIBRARIES and +# LIBXML2_INCLUDE_DIR are valid. Then also LIBXML2_FOUND is set to TRUE. +# If it is not found and REQUIRED was used, it fails with FATAL_ERROR, +# independent whether QUIET was used or not. +# If it is found, the location is reported using the VAR1 argument, so +# here a message "Found LibXml2: /usr/lib/libxml2.so" will be printed out. +# If the second argument is DEFAULT_MSG, the message in the failure case will +# be "Could NOT find LibXml2", if you don't like this message you can specify +# your own custom failure message there. + +MACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 ) + + IF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") + SET(_FAIL_MESSAGE "Could NOT find ${_NAME}") + ELSE("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") + SET(_FAIL_MESSAGE "${_FAIL_MSG}") + ENDIF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG") + + STRING(TOUPPER ${_NAME} _NAME_UPPER) + + SET(${_NAME_UPPER}_FOUND TRUE) + IF(NOT ${_VAR1}) + SET(${_NAME_UPPER}_FOUND FALSE) + ENDIF(NOT ${_VAR1}) + + FOREACH(_CURRENT_VAR ${ARGN}) + IF(NOT ${_CURRENT_VAR}) + SET(${_NAME_UPPER}_FOUND FALSE) + ENDIF(NOT ${_CURRENT_VAR}) + ENDFOREACH(_CURRENT_VAR) + + IF (${_NAME_UPPER}_FOUND) + IF (NOT ${_NAME}_FIND_QUIETLY) + MESSAGE(STATUS "Found ${_NAME}: ${${_VAR1}}") + ENDIF (NOT ${_NAME}_FIND_QUIETLY) + ELSE (${_NAME_UPPER}_FOUND) + IF (${_NAME}_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE}") + ELSE (${_NAME}_FIND_REQUIRED) + IF (NOT ${_NAME}_FIND_QUIETLY) + MESSAGE(STATUS "${_FAIL_MESSAGE}") + ENDIF (NOT ${_NAME}_FIND_QUIETLY) + ENDIF (${_NAME}_FIND_REQUIRED) + ENDIF (${_NAME_UPPER}_FOUND) +ENDMACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS) + +ENDIF(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5) + Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-11-16 22:45:35 UTC (rev 3078) +++ trunk/tora/src/CMakeLists.txt 2008-11-18 14:02:27 UTC (rev 3079) @@ -1,3 +1,5 @@ +INCLUDE(ToraCompat) + #Subdirectories # ADD_SUBDIRECTORY(i18n) ADD_SUBDIRECTORY(loki) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |