From: <mrj...@us...> - 2008-02-11 06:59:02
|
Revision: 2565 http://tora.svn.sourceforge.net/tora/?rev=2565&view=rev Author: mrjohnson0 Date: 2008-02-10 22:59:03 -0800 (Sun, 10 Feb 2008) Log Message: ----------- moved toresultlistformat to it's own class -- need to use from toresulttableview Modified Paths: -------------- trunk/tora/src/CMakeLists.txt trunk/tora/src/Makefile.am trunk/tora/src/toresultview.cpp Added Paths: ----------- trunk/tora/src/toresultlistformat.cpp trunk/tora/src/toresultlistformat.h Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-02-11 06:58:05 UTC (rev 2564) +++ trunk/tora/src/CMakeLists.txt 2008-02-11 06:59:03 UTC (rev 2565) @@ -145,6 +145,7 @@ toresultdata.h toresultdatasingle.h toresultview.h + toresultlistformat.h torollback.h toscript.h tosearchreplace.h @@ -263,6 +264,7 @@ toresultdata.cpp toresultdatasingle.cpp toresultview.cpp + toresultlistformat.cpp torollback.cpp toscript.cpp tosearchreplace.cpp Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2008-02-11 06:58:05 UTC (rev 2564) +++ trunk/tora/src/Makefile.am 2008-02-11 06:59:03 UTC (rev 2565) @@ -85,6 +85,7 @@ toresultitem.cpp toresultitem.h \ toresultstats.cpp toresultstats.h \ toresultview.cpp toresultview.h \ + toresultlistformat.cpp toresultlistformat.h \ toresultmodel.cpp toresultmodel.h \ toresulttableview.cpp toresulttableview.h \ toresulttableviewedit.cpp toresulttableviewedit.h \ @@ -306,6 +307,7 @@ moc_toresultstats.cpp \ moc_toresultstorage.cpp \ moc_toresultview.cpp \ + moc_toresultlistformat.cpp \ moc_toresultmodel.cpp \ moc_toresulttableview.cpp \ moc_toresulttableviewedit.cpp \ Added: trunk/tora/src/toresultlistformat.cpp =================================================================== --- trunk/tora/src/toresultlistformat.cpp (rev 0) +++ trunk/tora/src/toresultlistformat.cpp 2008-02-11 06:59:03 UTC (rev 2565) @@ -0,0 +1,86 @@ +/***** +* +* TOra - An Oracle Toolkit for DBA's and developers +* Copyright (C) 2003-2005 Quest Software, Inc +* Portions Copyright (C) 2005 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 without written consent from Quest Software, Inc. +* Observe that this does not disallow linking to the Qt Free Edition. +* +* You may link this product with any GPL'd Qt library such as Qt/Free +* +* All trademarks belong to their respective owners. +* +*****/ + +#include "config.h" +#include "toconf.h" +#include "utils.h" + +#include "toresultlistformat.h" +#include "toconfiguration.h" + + +toResultListFormat::toResultListFormat(QWidget *parent, const char *name) + : QDialog(parent) { + + setupUi(this); + setModal(true); + Format->addItem(tr("Text")); + Format->addItem(tr("Tab delimited")); + Format->addItem(tr("CSV")); + Format->addItem(tr("HTML")); + Format->addItem(tr("SQL")); + int num = toConfigurationSingle::Instance().globalConfig( + CONF_DEFAULT_FORMAT, "").toInt(); + Format->setCurrentIndex(num); + formatChanged(num); + + Delimiter->setText(toConfigurationSingle::Instance().globalConfig( + CONF_CSV_DELIMITER, + DEFAULT_CSV_DELIMITER)); + Separator->setText(toConfigurationSingle::Instance().globalConfig( + CONF_CSV_SEPARATOR, + DEFAULT_CSV_SEPARATOR)); +} + + +void toResultListFormat::formatChanged(int pos) { + Separator->setEnabled(pos == 2); + Delimiter->setEnabled(pos == 2); +} + + +void toResultListFormat::saveDefault(void) { + toConfigurationSingle::Instance().globalSetConfig( + CONF_CSV_DELIMITER, + Delimiter->text()); + toConfigurationSingle::Instance().globalSetConfig( + CONF_CSV_SEPARATOR, + Separator->text()); + toConfigurationSingle::Instance().globalSetConfig( + CONF_DEFAULT_FORMAT, + QString::number(Format->currentIndex())); +} Added: trunk/tora/src/toresultlistformat.h =================================================================== --- trunk/tora/src/toresultlistformat.h (rev 0) +++ trunk/tora/src/toresultlistformat.h 2008-02-11 06:59:03 UTC (rev 2565) @@ -0,0 +1,64 @@ +/***** +* +* TOra - An Oracle Toolkit for DBA's and developers +* Copyright (C) 2003-2005 Quest Software, Inc +* Portions Copyright (C) 2005 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 without written consent from Quest Software, Inc. +* Observe that this does not disallow linking to the Qt Free Edition. +* +* You may link this product with any GPL'd Qt library such as Qt/Free +* +* All trademarks belong to their respective owners. +* +*****/ + +#ifndef TORESULTLISTFORMAT_H +#define TORESULTLISTFORMAT_H + +#include "ui_toresultlistformatui.h" + +#include "config.h" + +#include <QDialog> + + +/** + * Used internally by toListView. + * + * @internal + */ +class toResultListFormat : public QDialog, public Ui::toResultListFormatUI { + Q_OBJECT; + +public: + toResultListFormat(QWidget *parent, const char *name); + void saveDefault(void); + +public slots: + virtual void formatChanged(int pos); +}; + +#endif Modified: trunk/tora/src/toresultview.cpp =================================================================== --- trunk/tora/src/toresultview.cpp 2008-02-11 06:58:05 UTC (rev 2564) +++ trunk/tora/src/toresultview.cpp 2008-02-11 06:59:03 UTC (rev 2565) @@ -48,6 +48,7 @@ #include "tosearchreplace.h" #include "tosql.h" #include "totool.h" +#include "toresultlistformat.h" #include <qapplication.h> #include <qclipboard.h> @@ -1307,34 +1308,6 @@ setSorting(lastSort, lastAsc); } -toResultListFormat::toResultListFormat(QWidget *parent, const char *name) - : QDialog(parent) { - setupUi(this); - setModal(true); - Format->addItem(tr("Text")); - Format->addItem(tr("Tab delimited")); - Format->addItem(tr("CSV")); - Format->addItem(tr("HTML")); - Format->addItem(tr("SQL")); - int num = toConfigurationSingle::Instance().globalConfig(CONF_DEFAULT_FORMAT, "").toInt(); - Format->setCurrentIndex(num); - formatChanged(num); - - Delimiter->setText(toConfigurationSingle::Instance().globalConfig(CONF_CSV_DELIMITER, DEFAULT_CSV_DELIMITER)); - Separator->setText(toConfigurationSingle::Instance().globalConfig(CONF_CSV_SEPARATOR, DEFAULT_CSV_SEPARATOR)); -} - -void toResultListFormat::formatChanged(int pos) { - Separator->setEnabled(pos == 2); - Delimiter->setEnabled(pos == 2); -} - -void toResultListFormat::saveDefault(void) { - toConfigurationSingle::Instance().globalSetConfig(CONF_CSV_DELIMITER, Delimiter->text()); - toConfigurationSingle::Instance().globalSetConfig(CONF_CSV_SEPARATOR, Separator->text()); - toConfigurationSingle::Instance().globalSetConfig(CONF_DEFAULT_FORMAT, QString::number(Format->currentIndex())); -} - void toResultFilter::exportData(std::map<QString, QString> &, const QString &) {} void toResultFilter::importData(std::map<QString, QString> &, const QString &) {} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-11 07:02:23
|
Revision: 2568 http://tora.svn.sourceforge.net/tora/?rev=2568&view=rev Author: mrjohnson0 Date: 2008-02-10 23:02:27 -0800 (Sun, 10 Feb 2008) Log Message: ----------- add an overridden method for exporting toresultmodel. text export currently working, the rest are stubs Modified Paths: -------------- trunk/tora/src/tolistviewformatter.h trunk/tora/src/tolistviewformattercsv.cpp trunk/tora/src/tolistviewformattercsv.h trunk/tora/src/tolistviewformatterhtml.cpp trunk/tora/src/tolistviewformatterhtml.h trunk/tora/src/tolistviewformattersql.cpp 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 Modified: trunk/tora/src/tolistviewformatter.h =================================================================== --- trunk/tora/src/tolistviewformatter.h 2008-02-11 07:00:02 UTC (rev 2567) +++ trunk/tora/src/tolistviewformatter.h 2008-02-11 07:02:27 UTC (rev 2568) @@ -40,14 +40,43 @@ #include <qstring.h> class toListView; +class toResultModel; -class toListViewFormatter -{ +/** + * Class for storing settings for export. + * + */ +class toExportSettings { public: + bool IncludeHeader; + bool OnlySelection; + int Type; + QString Separator; + QString Delimiter; + + + toExportSettings(bool _header, + bool _selection, + int _type, + const QString &_sep, + const QString &_del) { + IncludeHeader = _header; + OnlySelection = _selection; + Type = _type; + Separator = _sep; + Delimiter = _del; + } +}; + + +class toListViewFormatter { +public: toListViewFormatter(); virtual ~toListViewFormatter(); virtual QString getFormattedString(toListView& tListView) = 0; + virtual QString getFormattedString(toExportSettings &settings, + const toResultModel *model) = 0; }; #endif Modified: trunk/tora/src/tolistviewformattercsv.cpp =================================================================== --- trunk/tora/src/tolistviewformattercsv.cpp 2008-02-11 07:00:02 UTC (rev 2567) +++ trunk/tora/src/tolistviewformattercsv.cpp 2008-02-11 07:02:27 UTC (rev 2568) @@ -182,3 +182,9 @@ } } + + +QString toListViewFormatterCSV::getFormattedString(toExportSettings &settings, + const toResultModel *model) { + return QString::null; +} Modified: trunk/tora/src/tolistviewformattercsv.h =================================================================== --- trunk/tora/src/tolistviewformattercsv.h 2008-02-11 07:00:02 UTC (rev 2567) +++ trunk/tora/src/tolistviewformattercsv.h 2008-02-11 07:02:27 UTC (rev 2568) @@ -48,6 +48,8 @@ toListViewFormatterCSV(); virtual ~toListViewFormatterCSV(); virtual QString getFormattedString(toListView& tListView); + virtual QString getFormattedString(toExportSettings &settings, + const toResultModel *model); }; #endif Modified: trunk/tora/src/tolistviewformatterhtml.cpp =================================================================== --- trunk/tora/src/tolistviewformatterhtml.cpp 2008-02-11 07:00:02 UTC (rev 2567) +++ trunk/tora/src/tolistviewformatterhtml.cpp 2008-02-11 07:02:27 UTC (rev 2568) @@ -187,3 +187,9 @@ throw; } } + + +QString toListViewFormatterHTML::getFormattedString(toExportSettings &settings, + const toResultModel *model) { + return QString::null; +} Modified: trunk/tora/src/tolistviewformatterhtml.h =================================================================== --- trunk/tora/src/tolistviewformatterhtml.h 2008-02-11 07:00:02 UTC (rev 2567) +++ trunk/tora/src/tolistviewformatterhtml.h 2008-02-11 07:02:27 UTC (rev 2568) @@ -46,6 +46,8 @@ toListViewFormatterHTML(); virtual ~toListViewFormatterHTML(); virtual QString getFormattedString(toListView& tListView); + virtual QString getFormattedString(toExportSettings &settings, + const toResultModel *model); }; #endif Modified: trunk/tora/src/tolistviewformattersql.cpp =================================================================== --- trunk/tora/src/tolistviewformattersql.cpp 2008-02-11 07:00:02 UTC (rev 2567) +++ trunk/tora/src/tolistviewformattersql.cpp 2008-02-11 07:02:27 UTC (rev 2568) @@ -170,3 +170,9 @@ throw; } } + + +QString toListViewFormatterSQL::getFormattedString(toExportSettings &settings, + const toResultModel *model) { + return QString::null; +} Modified: trunk/tora/src/tolistviewformattersql.h =================================================================== --- trunk/tora/src/tolistviewformattersql.h 2008-02-11 07:00:02 UTC (rev 2567) +++ trunk/tora/src/tolistviewformattersql.h 2008-02-11 07:02:27 UTC (rev 2568) @@ -57,6 +57,8 @@ toListViewFormatterSQL(); virtual ~toListViewFormatterSQL(); virtual QString getFormattedString(toListView& tListView); + virtual QString getFormattedString(toExportSettings &settings, + const toResultModel *model); }; Modified: trunk/tora/src/tolistviewformattertabdel.cpp =================================================================== --- trunk/tora/src/tolistviewformattertabdel.cpp 2008-02-11 07:00:02 UTC (rev 2567) +++ trunk/tora/src/tolistviewformattertabdel.cpp 2008-02-11 07:02:27 UTC (rev 2568) @@ -167,3 +167,9 @@ } } + + +QString toListViewFormatterTabDel::getFormattedString(toExportSettings &settings, + const toResultModel *model) { + return QString::null; +} Modified: trunk/tora/src/tolistviewformattertabdel.h =================================================================== --- trunk/tora/src/tolistviewformattertabdel.h 2008-02-11 07:00:02 UTC (rev 2567) +++ trunk/tora/src/tolistviewformattertabdel.h 2008-02-11 07:02:27 UTC (rev 2568) @@ -46,6 +46,8 @@ toListViewFormatterTabDel(); virtual ~toListViewFormatterTabDel(); virtual QString getFormattedString(toListView& tListView); + virtual QString getFormattedString(toExportSettings &settings, + const toResultModel *model); }; #endif Modified: trunk/tora/src/tolistviewformattertext.cpp =================================================================== --- trunk/tora/src/tolistviewformattertext.cpp 2008-02-11 07:00:02 UTC (rev 2567) +++ trunk/tora/src/tolistviewformattertext.cpp 2008-02-11 07:02:27 UTC (rev 2568) @@ -39,37 +39,32 @@ #include "tolistviewformatterfactory.h" #include "tolistviewformatteridentifier.h" #include "toresultview.h" +#include "toresultmodel.h" #include <iostream> -namespace -{ -toListViewFormatter* createText() -{ +namespace { +toListViewFormatter* createText() { return new toListViewFormatterText(); } const bool registered = toListViewFormatterFactory::Instance().Register(toListViewFormatterIdentifier::TEXT, createText); } -toListViewFormatterText::toListViewFormatterText() : toListViewFormatter() -{ +toListViewFormatterText::toListViewFormatterText() : toListViewFormatter() { } -toListViewFormatterText::~toListViewFormatterText() -{ +toListViewFormatterText::~toListViewFormatterText() { } -QString toListViewFormatterText::getFormattedString(toListView& tListView) -{ +QString toListViewFormatterText::getFormattedString(toListView& tListView) { std::cout << "Yep, im FORMATTERTEXT\n"; int column_count = tListView.columns(); QString separator = tListView.getSep(); QString delimiter = tListView.getDel(); int *sizes = NULL; - try - { + try { sizes = new int[column_count]; int level = 0; for (int i = 0;i < column_count;i++) @@ -80,15 +75,12 @@ { toTreeWidgetItem *next = NULL; - for (toTreeWidgetItem *item = tListView.firstChild();item;item = next) - { + for (toTreeWidgetItem *item = tListView.firstChild();item;item = next) { toResultViewItem * resItem = dynamic_cast<toResultViewItem *>(item); toResultViewCheck *chkItem = dynamic_cast<toResultViewCheck *>(item); - if (!tListView.getOnlySelection() || item->isSelected()) - { - for (int i = 0;i < column_count;i++) - { + if (!tListView.getOnlySelection() || item->isSelected()) { + for (int i = 0;i < column_count;i++) { int csiz; if (resItem) csiz = resItem->allText(i).length(); @@ -103,18 +95,15 @@ } } - if (item->firstChild()) - { + if (item->firstChild()) { level++; next = item->firstChild(); } else if (item->nextSibling()) next = item->nextSibling(); - else - { + else { next = item; - do - { + do { next = next->parent(); level--; } @@ -131,8 +120,7 @@ QString indent; QString bgcolor; - if (tListView.getIncludeHeader()) - { + if (tListView.getIncludeHeader()) { if (bgcolor.isEmpty()) bgcolor = QString::fromLatin1("nonull"); else @@ -140,7 +128,7 @@ for (int j = 0;j < column_count;j++) output += QString::fromLatin1("%1 ").arg((tListView.headerItem())->text(j), -sizes[j]); - if (output.length() > 0 ) + if (output.length() > 0) output = output.left(output.length() - 1); #ifdef Q_OS_WIN32 @@ -151,8 +139,7 @@ output += "\n"; #endif - for (int k = 0;k < column_count;k++) - { + for (int k = 0;k < column_count;k++) { for (int l = 0;l < sizes[k];l++) output += QString::fromLatin1("="); if (k != column_count - 1) @@ -171,10 +158,8 @@ toTreeWidgetItem *next = NULL; - for (toTreeWidgetItem *item = tListView.firstChild();item;item = next) - { - if (!tListView.getOnlySelection() || item->isSelected()) - { + for (toTreeWidgetItem *item = tListView.firstChild();item;item = next) { + if (!tListView.getOnlySelection() || item->isSelected()) { toResultViewItem * resItem = dynamic_cast<toResultViewItem *>(item); toResultViewCheck *chkItem = dynamic_cast<toResultViewCheck *>(item); @@ -185,8 +170,7 @@ bgcolor = QString::null; QString line; - for (int i = 0;i < column_count;i++) - { + for (int i = 0;i < column_count;i++) { QString text; if (resItem) @@ -212,19 +196,16 @@ output += line; } - if (item->firstChild()) - { + if (item->firstChild()) { indent += QString::fromLatin1(" "); next = item->firstChild(); } else if (item->nextSibling()) next = item->nextSibling(); - else - { + else { next = item; - do - { + do { next = next->parent(); indent.truncate(indent.length() - 1); } @@ -236,10 +217,112 @@ delete[] sizes; return output; } - catch (...) - { + catch (...) { delete[] sizes; throw; } } + + +void endLine(QString &output) { +#ifdef Q_OS_WIN32 + output += "\r\n"; +#else + output += "\n"; +#endif +} + + +QString toListViewFormatterText::getFormattedString(toExportSettings &settings, + const toResultModel *model) { + int columns = model->columnCount(); + int rows = model->rowCount(); + QString separator = settings.Separator; + QString delimiter = settings.Delimiter; + + int *sizes = NULL; + QString output; + try { + sizes = new int[columns]; + + // must get widest length for each column + + // zero array or (if writing headers, set their size) + for(int i = 0; i < columns; i++) { + if(settings.IncludeHeader) { + sizes[i] = model->headerData( + i, + Qt::Horizontal, + Qt::DisplayRole).toString().length(); + } + else + sizes[i] = 0; + } + + // loop through model and get column widths + for(int row = 0; row < rows; row++) { + for(int column = 0; column < columns; column++) { + QVariant data = model->data(row, column); + QString v; + if(data.isNull()) + v = "{null}"; + else + v = data.toString(); + + int len = v.length(); + if(len > sizes[column]) + sizes[column] = len; + } + } + + // write header data to fixed widths + if(settings.IncludeHeader) { + for(int column = 0; column < columns; column++) { + QString value = model->headerData( + column, + Qt::Horizontal, + Qt::DisplayRole).toString(); + + output += value; + for(int left = value.length(); left <= sizes[column]; left++) + output += ' '; + } + + endLine(output); + + // write ==== border + for(int column = 0; column < columns; column++) { + for(int left = 0; left < sizes[column]; left++) + output += '='; + output += ' '; + } + + endLine(output); + } + + // write data + for(int row = 0; row < rows; row++) { + for(int column = 0; column < columns; column++) { + QVariant data = model->data(row, column); + QString value; + if(data.isNull()) + value = "{null}"; + else + value = data.toString(); + + output += value; + for(int left = value.length(); left <= sizes[column]; left++) + output += ' '; + } + + endLine(output); + } + } + catch(...) { + delete[] sizes; + throw; + } + + return output; +} Modified: trunk/tora/src/tolistviewformattertext.h =================================================================== --- trunk/tora/src/tolistviewformattertext.h 2008-02-11 07:00:02 UTC (rev 2567) +++ trunk/tora/src/tolistviewformattertext.h 2008-02-11 07:02:27 UTC (rev 2568) @@ -46,6 +46,8 @@ toListViewFormatterText(); virtual ~toListViewFormatterText(); virtual QString getFormattedString(toListView& tListView); + virtual QString getFormattedString(toExportSettings &settings, + const toResultModel *model); }; #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ku...@us...> - 2008-02-11 11:35:33
|
Revision: 2575 http://tora.svn.sourceforge.net/tora/?rev=2575&view=rev Author: kuem01 Date: 2008-02-11 03:35:35 -0800 (Mon, 11 Feb 2008) Log Message: ----------- replace QT3 calls in Windows registry related code Modified Paths: -------------- trunk/tora/src/toconfiguration.cpp trunk/tora/src/utils.cpp Modified: trunk/tora/src/toconfiguration.cpp =================================================================== --- trunk/tora/src/toconfiguration.cpp 2008-02-11 11:34:02 UTC (rev 2574) +++ trunk/tora/src/toconfiguration.cpp 2008-02-11 11:35:35 UTC (rev 2575) @@ -23,7 +23,7 @@ QString ret = str.mid(0, pos); if (buf) free(buf); - buf = strdup(ret); + buf = strdup(ret.toLatin1()); RegCreateKey(HKEY_CURRENT_USER, buf, &key); RegCloseKey(key); return buf; @@ -40,7 +40,7 @@ throw QT_TRANSLATE_NOOP("toKeyValue", "Couldn't find \\ in path"); if (buf) free(buf); - buf = strdup(str.mid(pos + 1)); + buf = strdup(str.mid(pos + 1).toLatin1()); return buf; } @@ -164,7 +164,7 @@ { toStatusMessage(QT_TRANSLATE_NOOP( "toTool", - "Couldn't open key %1").arg((const char *) path)); + "Couldn't open key %1").arg(path)); break; } @@ -178,7 +178,7 @@ { toStatusMessage(QT_TRANSLATE_NOOP( "toTool", - "Couldn't save empty value at key %1").arg((const char *) path)); + "Couldn't save empty value at key %1").arg(path)); } } else @@ -192,7 +192,7 @@ { toStatusMessage(QT_TRANSLATE_NOOP( "toTool", - "Couldn't save %1 value at key %2").arg((const char *) value).arg((const char *) path)); + "Couldn't save %1 value at key %2").arg(value).arg(path)); } free(t); } @@ -263,7 +263,7 @@ { toStatusMessage(QT_TRANSLATE_NOOP( "toTool", - "Couldn't open key %1").arg((const char *) path)); + "Couldn't open key %1").arg(path)); } else { @@ -290,7 +290,7 @@ { toStatusMessage(QT_TRANSLATE_NOOP( "toTool", - "Couldn't get value at key %1").arg((const char *) path)); + "Couldn't get value at key %1").arg(path)); } #endif @@ -341,7 +341,7 @@ QString path = tag; path.prepend(APPLICATION_NAME); path.replace(':', '\\'); - RegDeleteKeyA(HKEY_CURRENT_USER, path); // Don't really care if it works. + RegDeleteKeyA(HKEY_CURRENT_USER, path.toLatin1()); // Don't really care if it works. #endif } Modified: trunk/tora/src/utils.cpp =================================================================== --- trunk/tora/src/utils.cpp 2008-02-11 11:34:02 UTC (rev 2574) +++ trunk/tora/src/utils.cpp 2008-02-11 11:35:35 UTC (rev 2575) @@ -582,7 +582,7 @@ { str = buffer; static QRegExp findQuotes("\"([^\"]*)\""); - if (findQuotes.search(str) >= 0) + if (findQuotes.indexIn(str) >= 0) str = findQuotes.cap(1); int ind = str.lastIndexOf('\\'); if (ind >= 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-14 06:06:04
|
Revision: 2578 http://tora.svn.sourceforge.net/tora/?rev=2578&view=rev Author: mrjohnson0 Date: 2008-02-13 22:06:08 -0800 (Wed, 13 Feb 2008) Log Message: ----------- corrected for slow databases Modified Paths: -------------- trunk/tora/src/toresultmodel.cpp trunk/tora/src/toresultmodel.h Modified: trunk/tora/src/toresultmodel.cpp =================================================================== --- trunk/tora/src/toresultmodel.cpp 2008-02-12 02:18:38 UTC (rev 2577) +++ trunk/tora/src/toresultmodel.cpp 2008-02-14 06:06:08 UTC (rev 2578) @@ -56,6 +56,9 @@ First = true; Editable = edit; + MaxRead = MaxNumber = toConfigurationSingle::Instance().globalConfig( + CONF_MAX_NUMBER, DEFAULT_MAX_NUMBER).toInt(); + CurrentRow = 0; Query = QPointer<toNoBlockQuery>(query); @@ -91,10 +94,6 @@ return; } - int MaxNumber = toConfigurationSingle::Instance().globalConfig( - CONF_MAX_NUMBER, DEFAULT_MAX_NUMBER).toInt(); - MaxNumber += CurrentRow; - try { if(!Query->poll()) { if(!Timer.isActive()) @@ -135,19 +134,20 @@ Rows << tmp; CurrentRow = current; endInsertRows(); - } // not really first, but just be sure to emit before done() // must be emitted even if there's no data.... if(First) { - First = !First; - emit firstResult(Query->sql(), - tr("Statement executed"), // todo - false); + if(tmp.size() > 0 || !Query || Query->eof()) { + First = !First; + emit firstResult(Query->sql(), + tr("Statement executed"), // todo + false); - // need to reset view(s) since we have to poll for data - reset(); + // need to reset view(s) since we have to poll for data + reset(); + } } if(!Query) @@ -412,6 +412,11 @@ void toResultModel::fetchMore(const QModelIndex &parent) { + // sometimes the view calls this before the query has even + // run. don't actually increase max until we've hit it. + if(MaxNumber < 0 || MaxNumber <= CurrentRow) + MaxNumber += MaxRead; + readData(); } Modified: trunk/tora/src/toresultmodel.h =================================================================== --- trunk/tora/src/toresultmodel.h 2008-02-12 02:18:38 UTC (rev 2577) +++ trunk/tora/src/toresultmodel.h 2008-02-14 06:06:08 UTC (rev 2578) @@ -75,6 +75,12 @@ RowList Rows; HeaderList Headers; + // max rows to read until + int MaxNumber; + + // how much to read at a time + int MaxRead; + int CurrentRow; // Timer to poll for new data. @@ -313,8 +319,8 @@ */ void rowDeleted(const toResultModel::Row &row); -public slots: - +protected slots: + /** * reads ands sets up Rows and Columns * This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-16 05:07:44
|
Revision: 2581 http://tora.svn.sourceforge.net/tora/?rev=2581&view=rev Author: mrjohnson0 Date: 2008-02-15 21:07:46 -0800 (Fri, 15 Feb 2008) Log Message: ----------- add fileOpened signal Modified Paths: -------------- trunk/tora/src/tomarkedtext.cpp trunk/tora/src/tomarkedtext.h trunk/tora/src/toworksheettext.cpp Modified: trunk/tora/src/tomarkedtext.cpp =================================================================== --- trunk/tora/src/tomarkedtext.cpp 2008-02-16 04:35:34 UTC (rev 2580) +++ trunk/tora/src/tomarkedtext.cpp 2008-02-16 05:07:46 UTC (rev 2581) @@ -311,6 +311,7 @@ try { openFilename(fname); + emit fileOpened(); return true; } TOCATCH Modified: trunk/tora/src/tomarkedtext.h =================================================================== --- trunk/tora/src/tomarkedtext.h 2008-02-16 04:35:34 UTC (rev 2580) +++ trunk/tora/src/tomarkedtext.h 2008-02-16 05:07:46 UTC (rev 2581) @@ -242,6 +242,8 @@ signals: void displayMenu(QMenu *); + // emitted when a new file is opened + void fileOpened(void); protected: virtual void newLine(void); Modified: trunk/tora/src/toworksheettext.cpp =================================================================== --- trunk/tora/src/toworksheettext.cpp 2008-02-16 04:35:34 UTC (rev 2580) +++ trunk/tora/src/toworksheettext.cpp 2008-02-16 05:07:46 UTC (rev 2581) @@ -98,6 +98,8 @@ openFilename(fname); Worksheet->setCaption(); } + + emit fileOpened(); return true; } TOCATCH; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-16 22:50:51
|
Revision: 2588 http://tora.svn.sourceforge.net/tora/?rev=2588&view=rev Author: mrjohnson0 Date: 2008-02-16 14:50:57 -0800 (Sat, 16 Feb 2008) Log Message: ----------- session management for pg Modified Paths: -------------- trunk/tora/src/tosession.cpp trunk/tora/src/tosession.h trunk/tora/src/tosgastatement.cpp Modified: trunk/tora/src/tosession.cpp =================================================================== --- trunk/tora/src/tosession.cpp 2008-02-16 20:41:23 UTC (rev 2587) +++ trunk/tora/src/tosession.cpp 2008-02-16 22:50:57 UTC (rev 2588) @@ -53,6 +53,7 @@ #include "tosql.h" #include "totool.h" #include "towaitevents.h" +#include "toresulttableview.h" #include <qcombobox.h> #include <qlabel.h> @@ -66,6 +67,7 @@ #include <qworkspace.h> #include <qworkspace.h> +#include <QTabWidget> #include <QList> #include <QPixmap> @@ -84,28 +86,19 @@ return const_cast<const char**>(tosession_xpm); } public: - toSessionTool() - : toTool(210, "Sessions") { } + toSessionTool() : toTool(210, "Sessions") + { } virtual const char *menuItem() { return "Sessions"; } virtual QWidget *toolWindow(QWidget *parent, toConnection &connection) { - if (toIsOracle(connection)) + if(toIsOracle(connection) || toIsPostgreSQL(connection)) return new toSession(parent, connection); -#ifdef TOSESSIONMYSQL_H - else if (toIsMySQL(connection)) - return new toSessionMySQL(*this, parent, connection); -#endif - return NULL; } virtual bool canHandle(toConnection &conn) { - return toIsOracle(conn) -#ifdef TOSESSIONMYSQL_H - || toIsMySQL(conn) -#endif - ; + return toIsOracle(conn) || toIsPostgreSQL(conn); } virtual void closeWindow(toConnection &connection) {}; }; @@ -116,6 +109,7 @@ "select authentication_type,osuser,network_service_banner\n" " from v$session_connect_info where sid = :f1<char[101]>", "Get connection info for a session"); + static toSQL SQLLockedObject("toSession:LockedObject", "select b.Object_Name \"Object Name\",\n" " b.Object_Type \"Type\",\n" @@ -126,6 +120,26 @@ " where a.object_id = b.object_id\n" " and a.session_id = :f1<char[101]>", "Display info about objects locked by this session"); + +static toSQL SQLLockedObjectPg( + "toSession:LockedObject", + "SELECT c.relname AS \"Name\",\n" + " l.locktype,\n" + " n.nspname,\n" + " l.TRANSACTION,\n" + " l.MODE,\n" + " l.granted,\n" + " l.pid\n" + " FROM pg_catalog.pg_locks l,\n" + " pg_class c,\n" + " pg_namespace n\n" + " WHERE l.relation = c.OID\n" + " AND c.relnamespace = n.OID\n" + " AND l.pid = :f1<int>", + "", + "", + "PostgreSQL"); + static toSQL SQLOpenCursors("toSession:OpenCursor", "select SQL_Text \"SQL\", Address||':'||Hash_Value \" Address\"\n" " from v$open_cursor where sid = :f1<char[101]>", @@ -213,8 +227,24 @@ " AND (d.child_number = 0 OR d.child_number IS NULL)\n" " AND a.paddr = e.addr(+)\n" "%1 ORDER BY a.Sid", - "List sessions, must have same number of culumns and the first and last 2 must be the same"); + "List sessions, must have same number of columns and the first and last 2 must be the same"); +static toSQL SQLSessionsPg( + "toSession:ListSession", + "SELECT pg_stat_get_backend_pid ( s.backendid ) AS \"Backend ID\",\n" + " ( SELECT u.usename\n" + " FROM pg_user u\n" + " WHERE u.usesysid = pg_stat_get_backend_userid ( s.backendid ) ) AS \"User\",\n" + " pg_stat_get_backend_client_addr ( s.backendid ) AS \"From\",\n" + " pg_stat_get_backend_client_port ( s.backendid ) AS \"Port\",\n" + " pg_stat_get_backend_activity_start ( s.backendid ) AS \"Started\",\n" + " pg_stat_get_backend_waiting ( s.backendid ) AS \"Waiting\",\n" + " pg_stat_get_backend_activity ( s.backendid ) AS \"Current Query\"\n" + " FROM ( SELECT pg_stat_get_backend_idset ( ) AS backendid ) AS s", + "", + "", + "PostgreSQL"); + toSession::toSession(QWidget *main, toConnection &connection) : toToolWidget(SessionTool, "session.html", main, connection) { @@ -229,46 +259,59 @@ SLOT(refresh(void))); refreshAct->setShortcut(QKeySequence::Refresh); - toolbar->addSeparator(); + if(toIsOracle(connection)) { + toolbar->addSeparator(); - Select = new toResultCombo(toolbar, TO_TOOLBAR_WIDGET_NAME); - Select->setSelected(tr("Only active users")); - Select->additionalItem(tr("Only active users")); - Select->additionalItem(tr("All")); - Select->additionalItem(tr("No background")); - Select->additionalItem(tr("No system")); - Select->query(toSQL::sql(toSQL::TOSQL_USERLIST)); - toolbar->addWidget(Select); + Select = new toResultCombo(toolbar, TO_TOOLBAR_WIDGET_NAME); + Select->setSelected(tr("Only active users")); + Select->additionalItem(tr("Only active users")); + Select->additionalItem(tr("All")); + Select->additionalItem(tr("No background")); + Select->additionalItem(tr("No system")); + Select->query(toSQL::sql(toSQL::TOSQL_USERLIST)); + toolbar->addWidget(Select); - connect(Select, SIGNAL(activated(int)), this, SLOT(refresh())); + connect(Select, SIGNAL(activated(int)), this, SLOT(refresh())); - toolbar->addSeparator(); + toolbar->addSeparator(); - enableTimedAct = - toolbar->addAction( - QIcon(QPixmap(const_cast<const char**>(clock_xpm))), - tr("Enable timed statistics"), - this, - SLOT(enableStatistics(void))); + enableTimedAct = + toolbar->addAction( + QIcon(QPixmap(const_cast<const char**>(clock_xpm))), + tr("Enable timed statistics"), + this, + SLOT(enableStatistics(void))); - disableTimedAct = - toolbar->addAction( - QIcon(QPixmap(const_cast<const char**>(noclock_xpm))), - tr("Disable timed statistics"), - this, - SLOT(disableStatistics(void))); + disableTimedAct = + toolbar->addAction( + QIcon(QPixmap(const_cast<const char**>(noclock_xpm))), + tr("Disable timed statistics"), + this, + SLOT(disableStatistics(void))); - toolbar->addSeparator(); + toolbar->addSeparator(); - disconnectAct = - toolbar->addAction( - QIcon(QPixmap(const_cast<const char**>(kill_xpm))), - tr("Disconnect selected session"), - this, - SLOT(disconnectSession(void))); + disconnectAct = + toolbar->addAction( + QIcon(QPixmap(const_cast<const char**>(kill_xpm))), + tr("Disconnect selected session"), + this, + SLOT(disconnectSession(void))); - toolbar->addSeparator(); + toolbar->addSeparator(); + } + else { + enableTimedAct = NULL; + disableTimedAct = NULL; + disconnectAct = + toolbar->addAction( + QIcon(QPixmap(const_cast<const char**>(kill_xpm))), + tr("Cancel selected backend"), + this, + SLOT(cancelBackend(void))); + } + toolbar->addWidget( new QLabel(tr("Refresh") + " ", toolbar)); @@ -278,24 +321,26 @@ this, SLOT(changeRefresh(const QString &))); toolbar->addWidget(Refresh); - toolbar->addSeparator(); + if(toIsOracle(connection)) { + toolbar->addSeparator(); - QToolButton *btn = new QToolButton(toolbar); - btn->setCheckable(true); - btn->setIcon(QIcon(filter_xpm)); - connect(btn, SIGNAL(toggled(bool)), this, SLOT(excludeSelection(bool))); - btn->setToolTip(tr("Exclude selected sessions")); - toolbar->addWidget(btn); + QToolButton *btn = new QToolButton(toolbar); + btn->setCheckable(true); + btn->setIcon(QIcon(filter_xpm)); + connect(btn, SIGNAL(toggled(bool)), this, SLOT(excludeSelection(bool))); + btn->setToolTip(tr("Exclude selected sessions")); + toolbar->addWidget(btn); - toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(add_xpm))), - tr("Select all sessions"), - this, - SLOT(selectAll(void))); + toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(add_xpm))), + tr("Select all sessions"), + this, + SLOT(selectAll(void))); - toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(minus_xpm))), - tr("Deselect all sessions"), - this, - SLOT(selectNone(void))); + toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(minus_xpm))), + tr("Deselect all sessions"), + this, + SLOT(selectNone(void))); + } toolbar->addWidget(new toSpacer()); @@ -322,54 +367,79 @@ CurrentStatement = new toSGAStatement(ResultTab); ResultTab->addTab(CurrentStatement, tr("Current Statement")); - QString sql = toSQL::string(TOSQL_LONGOPS, connection); - sql += " AND b.sid = :sid<char[101]> AND b.serial# = :ser<char[101]> order by b.start_time desc"; - LongOps = new toResultLong(true, false, toQuery::Background, ResultTab); - LongOps->setSQL(sql); - ResultTab->addTab(LongOps, tr("Long ops")); + if(toIsOracle(connection)) { + QString sql = toSQL::string(TOSQL_LONGOPS, connection); + sql += " AND b.sid = :sid<char[101]> AND b.serial# = :ser<char[101]> order by b.start_time desc"; + LongOps = new toResultLong(true, false, toQuery::Background, ResultTab); + LongOps->setSQL(sql); + ResultTab->addTab(LongOps, tr("Long ops")); - StatisticSplitter = new QSplitter(Qt::Horizontal, ResultTab); - SessionStatistics = new toResultStats(false, 0, StatisticSplitter); - WaitBar = new toResultBar(StatisticSplitter); - WaitBar->setSQL(SQLSessionWait); - WaitBar->setTitle(tr("Session wait states")); - WaitBar->setYPostfix(QString::fromLatin1("ms/s")); - IOBar = new toResultBar(StatisticSplitter); - IOBar->setSQL(SQLSessionIO); - IOBar->setTitle(tr("Session I/O")); - IOBar->setYPostfix(QString::fromLatin1("blocks/s")); - ResultTab->addTab(StatisticSplitter, tr("Statistics")); + StatisticSplitter = new QSplitter(Qt::Horizontal, ResultTab); + SessionStatistics = new toResultStats(false, 0, StatisticSplitter); + WaitBar = new toResultBar(StatisticSplitter); + WaitBar->setSQL(SQLSessionWait); + WaitBar->setTitle(tr("Session wait states")); + WaitBar->setYPostfix(QString::fromLatin1("ms/s")); + IOBar = new toResultBar(StatisticSplitter); + IOBar->setSQL(SQLSessionIO); + IOBar->setTitle(tr("Session I/O")); + IOBar->setYPostfix(QString::fromLatin1("blocks/s")); + ResultTab->addTab(StatisticSplitter, tr("Statistics")); - Waits = new toWaitEvents(0, ResultTab, "waits"); - ResultTab->addTab(Waits, tr("Wait events")); + Waits = new toWaitEvents(0, ResultTab, "waits"); + ResultTab->addTab(Waits, tr("Wait events")); - ConnectInfo = new toResultLong(true, false, toQuery::Background, ResultTab); - ConnectInfo->setSQL(SQLConnectInfo); - ResultTab->addTab(ConnectInfo, tr("Connect Info")); - PendingLocks = new toResultLock(ResultTab); - ResultTab->addTab(PendingLocks, tr("Pending Locks")); - LockedObjects = new toResultLong(false, false, toQuery::Background, ResultTab); - ResultTab->addTab(LockedObjects, tr("Locked Objects")); - LockedObjects->setSQL(SQLLockedObject); - AccessedObjects = new toResultLong(false, false, toQuery::Background, ResultTab); - AccessedObjects->setSQL(SQLAccessedObjects); - ResultTab->addTab(AccessedObjects, tr("Accessing")); + ConnectInfo = new toResultLong(true, false, toQuery::Background, ResultTab); + ConnectInfo->setSQL(SQLConnectInfo); + ResultTab->addTab(ConnectInfo, tr("Connect Info")); - PreviousStatement = new toSGAStatement(ResultTab); - ResultTab->addTab(PreviousStatement, tr("Previous Statement")); + PendingLocks = new toResultLock(ResultTab); + ResultTab->addTab(PendingLocks, tr("Pending Locks")); - OpenSplitter = new QSplitter(Qt::Horizontal, ResultTab); - ResultTab->addTab(OpenSplitter, tr("Open Cursors")); - OpenCursors = new toResultLong(false, true, toQuery::Background, OpenSplitter); - OpenCursors->setSQL(SQLOpenCursors); - OpenStatement = new toSGAStatement(OpenSplitter); + LockedObjects = new toResultTableView(false, false, ResultTab); + ResultTab->addTab(LockedObjects, tr("Locked Objects")); + LockedObjects->setSQL(SQLLockedObject); + AccessedObjects = new toResultLong(false, false, toQuery::Background, ResultTab); + AccessedObjects->setSQL(SQLAccessedObjects); + ResultTab->addTab(AccessedObjects, tr("Accessing")); + + PreviousStatement = new toSGAStatement(ResultTab); + ResultTab->addTab(PreviousStatement, tr("Previous Statement")); + + OpenSplitter = new QSplitter(Qt::Horizontal, ResultTab); + ResultTab->addTab(OpenSplitter, tr("Open Cursors")); + OpenCursors = new toResultLong(false, true, toQuery::Background, OpenSplitter); + OpenCursors->setSQL(SQLOpenCursors); + OpenStatement = new toSGAStatement(OpenSplitter); + + OpenCursors->setSelectionMode(toTreeWidget::Single); + connect(OpenCursors, SIGNAL(selectionChanged(toTreeWidgetItem *)), + this, SLOT(changeCursor(toTreeWidgetItem *))); + } + else { + LongOps = NULL; + StatisticSplitter = NULL; + SessionStatistics = NULL; + WaitBar = NULL; + IOBar = NULL; + Waits = NULL; + ConnectInfo = NULL; + PendingLocks = NULL; + AccessedObjects = NULL; + PreviousStatement = NULL; + OpenSplitter = NULL; + OpenCursors = NULL; + OpenStatement = NULL; + + LockedObjects = new toResultTableView(false, false, ResultTab); + ResultTab->addTab(LockedObjects, tr("Locked Objects")); + LockedObjects->setSQL(SQLLockedObject); + } + Sessions->setSelectionMode(toTreeWidget::Single); - OpenCursors->setSelectionMode(toTreeWidget::Single); connect(Sessions, SIGNAL(selectionChanged(toTreeWidgetItem *)), this, SLOT(changeItem(toTreeWidgetItem *))); - connect(OpenCursors, SIGNAL(selectionChanged(toTreeWidgetItem *)), - this, SLOT(changeCursor(toTreeWidgetItem *))); connect(ResultTab, SIGNAL(currentChanged(QWidget *)), this, SLOT(changeTab(QWidget *))); @@ -379,7 +449,7 @@ } TOCATCH; - CurrentTab = StatisticSplitter; + CurrentTab = CurrentStatement; ToolMenu = NULL; connect(toMainWidget()->workspace(), SIGNAL(windowActivated(QWidget *)), @@ -390,7 +460,7 @@ } bool toSession::canHandle(toConnection &conn) { - return toIsOracle(conn); + return toIsOracle(conn) || toIsPostgreSQL(conn); } void toSession::excludeSelection(bool tgl) { @@ -422,7 +492,7 @@ toTreeWidgetItem *toSessionList::createItem(toTreeWidgetItem *last, const QString &str) { sessionFilter *filt = dynamic_cast<sessionFilter *>(filter()); - if (filt && filt->show()) + if (filt && filt->show() && toIsOracle(connection())) return new toResultViewCheck(this, last, str, toTreeWidgetCheck::CheckBox); else return new toResultViewItem(this, last, str); @@ -479,19 +549,27 @@ if (!ToolMenu) { ToolMenu = new QMenu(tr("&Session"), this); - ToolMenu->addAction(refreshAct); + // don't use toIs<connection type> here. causes crash on + // shutdown when windows are closed/changed. + if(refreshAct) + ToolMenu->addAction(refreshAct); + ToolMenu->addSeparator(); - ToolMenu->addAction(enableTimedAct); - ToolMenu->addAction(disableTimedAct); + if(enableTimedAct) + ToolMenu->addAction(enableTimedAct); + if(disableTimedAct) + ToolMenu->addAction(disableTimedAct); - ToolMenu->addSeparator(); + if(enableTimedAct || disableTimedAct) + ToolMenu->addSeparator(); - ToolMenu->addAction(disconnectAct); + if(disconnectAct) { + ToolMenu->addAction(disconnectAct); + ToolMenu->addSeparator(); + } - ToolMenu->addSeparator(); - toMainWidget()->addCustomMenu(ToolMenu); } } @@ -511,18 +589,24 @@ else Session = Serial = QString::null; QString sql = toSQL::string(SQLSessions, connection()); - QString extra; - if (Select->currentIndex() == 0) - extra = " AND a.Type != 'BACKGROUND' AND a.Status != 'INACTIVE'\n"; - else if (Select->currentIndex() == 1) - ; // Do nothing - else if (Select->currentIndex() == 2) - extra = " AND a.Type != 'BACKGROUND'\n"; - else if (Select->currentIndex() == 3) - extra = " AND a.SchemaName NOT IN ('SYS','SYSTEM')\n"; - else - extra = " AND a.SchemaName = '" + Select->currentText() + "'\n"; - Sessions->setSQL(sql.arg(extra)); + + if(toIsOracle(connection())) { + QString extra; + if (Select->currentIndex() == 0) + extra = " AND a.Type != 'BACKGROUND' AND a.Status != 'INACTIVE'\n"; + else if (Select->currentIndex() == 1) + ; // Do nothing + else if (Select->currentIndex() == 2) + extra = " AND a.Type != 'BACKGROUND'\n"; + else if (Select->currentIndex() == 3) + extra = " AND a.SchemaName NOT IN ('SYS','SYSTEM')\n"; + else + extra = " AND a.SchemaName = '" + Select->currentText() + "'\n"; + + sql = sql.arg(extra); + } + + Sessions->setSQL(sql); Sessions->refresh(); } TOCATCH; @@ -624,9 +708,20 @@ OpenStatement->changeAddress(item->text(2)); } -void toSession::disconnectSession(void) { +void toSession::cancelBackend() { toTreeWidgetItem *item = Sessions->selectedItem(); if (item) { + try { + connection().execute( + QString("SELECT pg_cancel_backend ( %1 )").arg(item->text(0))); + } + TOCATCH; + } +} + +void toSession::disconnectSession() { + toTreeWidgetItem *item = Sessions->selectedItem(); + if (item) { QString sess = QString::fromLatin1("'"); sess.append(item->text(0)); sess.append(QString::fromLatin1(",")); @@ -670,9 +765,12 @@ void toSession::changeItem(toTreeWidgetItem *item) { if (item && LastSession != item->text(0)) { if (!item->text(0).isEmpty()) { - WaitBar->changeParams(item->text(0)); - IOBar->changeParams(item->text(0)); - Waits->setSession(item->text(0).toInt()); + if(WaitBar) + WaitBar->changeParams(item->text(0)); + if(IOBar) + IOBar->changeParams(item->text(0)); + if(Waits) + Waits->setSession(item->text(0).toInt()); } LastSession = item->text(0); } Modified: trunk/tora/src/tosession.h =================================================================== --- trunk/tora/src/tosession.h 2008-02-16 20:41:23 UTC (rev 2587) +++ trunk/tora/src/tosession.h 2008-02-16 22:50:57 UTC (rev 2588) @@ -59,6 +59,7 @@ class toResultStats; class toSGAStatement; class toWaitEvents; +class toResultTableView; #define TO_SESSION_WAIT "toSession:SessionWait" #define TO_SESSION_IO "toSession:SessionIO" @@ -129,25 +130,25 @@ toResultCombo *Select; - toSGAStatement *CurrentStatement; - toSGAStatement *PreviousStatement; - toResultStats *SessionStatistics; - toResultLong *LongOps; - toResultLong *ConnectInfo; - toResultLong *LockedObjects; - toResultLock *PendingLocks; - toResultLong *AccessedObjects; - toResultBar *WaitBar; - toResultBar *IOBar; - toWaitEvents *Waits; - QSplitter *OpenSplitter; - QSplitter *StatisticSplitter; - toSGAStatement *OpenStatement; - toResultLong *OpenCursors; - QString LastSession; - QMenu *ToolMenu; - QComboBox *Refresh; - QLabel *Total; + toSGAStatement *CurrentStatement; + toSGAStatement *PreviousStatement; + toResultStats *SessionStatistics; + toResultLong *LongOps; + toResultLong *ConnectInfo; + toResultTableView *LockedObjects; + toResultLock *PendingLocks; + toResultLong *AccessedObjects; + toResultBar *WaitBar; + toResultBar *IOBar; + toWaitEvents *Waits; + QSplitter *OpenSplitter; + QSplitter *StatisticSplitter; + toSGAStatement *OpenStatement; + toResultLong *OpenCursors; + QString LastSession; + QMenu *ToolMenu; + QComboBox *Refresh; + QLabel *Total; QAction *refreshAct; QAction *enableTimedAct; @@ -177,6 +178,7 @@ void disableStatistics(void) { enableStatistics(false); } + void cancelBackend(void); void disconnectSession(void); void windowActivated(QWidget *widget); void done(void); Modified: trunk/tora/src/tosgastatement.cpp =================================================================== --- trunk/tora/src/tosgastatement.cpp 2008-02-16 20:41:23 UTC (rev 2587) +++ trunk/tora/src/tosgastatement.cpp 2008-02-16 22:50:57 UTC (rev 2588) @@ -50,58 +50,75 @@ #include "totool.h" -void toSGAStatement::viewResources(void) -{ - try - { +void toSGAStatement::viewResources(void) { + try { Resources->changeParams(Address); } - catch (...) - { + catch (...) { toStatusMessage(tr("Couldn't find SQL statement in SGA"), false, false); } } -static toSQL SQLParsingSchema("toSGAStatement:ParsingSchema", - "SELECT username\n" - " FROM v$sql a,\n" - " all_users b\n" - " WHERE b.user_id = a.parsing_schema_id\n" - " AND a.address || ':' || a.hash_value = :f1<char[101]> AND a.child_number = 0", - "Get the schema that parsed a statement"); +static toSQL SQLParsingSchema( + "toSGAStatement:ParsingSchema", + "SELECT username\n" + " FROM v$sql a,\n" + " all_users b\n" + " WHERE b.user_id = a.parsing_schema_id\n" + " AND a.address || ':' || a.hash_value = :f1<char[101]> AND a.child_number = 0", + "Get the schema that parsed a statement"); +static toSQL SQLBackendSql( + "toSGAStatement:BackendSql", + "SELECT pg_stat_get_backend_activity ( :backend<int> )", + "Get the backend's SQL statement.", + "", + "PostgreSQL"); + toSGAStatement::toSGAStatement(QWidget *parent) - : QTabWidget(parent) -{ + : QTabWidget(parent) { + SQLText = new toResultField(this); addTab(SQLText, tr("SQL")); - Plan = new toResultPlan(this); - addTab(Plan, tr("Execution plan")); - Resources = new toResultResources(this); - addTab(Resources, tr("Information")); + + if (toIsOracle(toCurrentConnection(this))) { + Plan = new toResultPlan(this); + addTab(Plan, tr("Execution plan")); + Resources = new toResultResources(this); + addTab(Resources, tr("Information")); + } + else + QTabWidget::tabBar()->hide(); + connect(this, SIGNAL(currentChanged(int)), this, SLOT(changeTab(int))); CurrentTab = SQLText; } -void toSGAStatement::changeTab(int index) -{ +void toSGAStatement::changeTab(int index) { QWidget *widget = QTabWidget::widget(index); - try - { + try { CurrentTab = widget; - if (!Address.isEmpty()) - { - if (CurrentTab == SQLText) - { - if (!toConfigurationSingle::Instance().globalConfig(CONF_AUTO_INDENT_RO, "Yes").isEmpty()) - SQLText->setText(toSQLParse::indent(toSQLString(toCurrentConnection(this), - Address))); - else - SQLText->setText(toSQLString(toCurrentConnection(this), Address)); + if (!Address.isEmpty()) { + if (CurrentTab == SQLText) { + QString sql; + toConnection &conn = toCurrentConnection(this); + + if(toIsOracle(conn)) + sql = toSQLString(conn, Address); + else if(toIsPostgreSQL(conn)) { + toQList vals = toQuery::readQuery(conn, SQLBackendSql, Address); + + for(toQList::iterator i = vals.begin(); i != vals.end(); i++) + sql.append(*i); + } + + if(!toConfigurationSingle::Instance().globalConfig( + CONF_AUTO_INDENT_RO, "Yes").isEmpty()) + sql = toSQLParse::indent(sql); + SQLText->setText(sql); } - else if (CurrentTab == Plan) - { + else if (CurrentTab == Plan) { Plan->query(toSQLString(toCurrentConnection(this), Address), toQuery::readQuery(toCurrentConnection(this), SQLParsingSchema, Address)); @@ -110,11 +127,10 @@ viewResources(); } } - TOCATCH + TOCATCH; } -void toSGAStatement::changeAddress(const QString &str) -{ +void toSGAStatement::changeAddress(const QString &str) { Address = str; changeTab(QTabWidget::indexOf(CurrentTab)); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-17 00:58:20
|
Revision: 2591 http://tora.svn.sourceforge.net/tora/?rev=2591&view=rev Author: mrjohnson0 Date: 2008-02-16 16:58:25 -0800 (Sat, 16 Feb 2008) Log Message: ----------- - fix navigation if there is no currently selection - move to new record on add Modified Paths: -------------- trunk/tora/src/toresultdata.cpp trunk/tora/src/toresultdata.h Modified: trunk/tora/src/toresultdata.cpp =================================================================== --- trunk/tora/src/toresultdata.cpp 2008-02-17 00:40:49 UTC (rev 2590) +++ trunk/tora/src/toresultdata.cpp 2008-02-17 00:58:25 UTC (rev 2591) @@ -119,7 +119,7 @@ addAct = toolbar->addAction( QIcon(QPixmap(const_cast<const char**>(addrecord_xpm))), tr("Add a new record")); - connect(addAct, SIGNAL(triggered()), Edit, SLOT(addRecord())); + connect(addAct, SIGNAL(triggered()), this, SLOT(addRecord())); duplicateAct = toolbar->addAction( QIcon(QPixmap(const_cast<const char**>(duplicaterecord_xpm))), @@ -234,9 +234,14 @@ void toResultData::navigate(QAction *action) { + Edit->setFocus(); QModelIndex current = Edit->selectionModel()->currentIndex(); int row = current.row(); + int col = current.column(); + if(col < 1) + col = 1; // can't select hidden first column + if(action == firstAct) row = 0; else if(action == previousAct) @@ -253,7 +258,7 @@ if(row >= Edit->model()->rowCount()) row = Edit->model()->rowCount() - 1; - QModelIndex left = Edit->model()->createIndex(row, current.column()); + QModelIndex left = Edit->model()->createIndex(row, col); Edit->selectionModel()->select(QItemSelection(left, left), QItemSelectionModel::ClearAndSelect); Edit->setCurrentIndex(left); @@ -396,3 +401,9 @@ if(Edit->commitChanges()) emit changesSaved(); } + + +void toResultData::addRecord() { + Edit->addRecord(); + navigate(lastAct); +} Modified: trunk/tora/src/toresultdata.h =================================================================== --- trunk/tora/src/toresultdata.h 2008-02-17 00:40:49 UTC (rev 2590) +++ trunk/tora/src/toresultdata.h 2008-02-17 00:58:25 UTC (rev 2591) @@ -171,6 +171,7 @@ void singleRecordForm(bool display); void updateForm(void); void save(void); + void addRecord(void); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-17 02:47:27
|
Revision: 2592 http://tora.svn.sourceforge.net/tora/?rev=2592&view=rev Author: mrjohnson0 Date: 2008-02-16 18:47:33 -0800 (Sat, 16 Feb 2008) Log Message: ----------- two places where copying a connection is not needed. probably accidental copy constructor calls. Modified Paths: -------------- trunk/tora/src/toalert.h trunk/tora/src/tolistviewformattersql.cpp Modified: trunk/tora/src/toalert.h =================================================================== --- trunk/tora/src/toalert.h 2008-02-17 00:58:25 UTC (rev 2591) +++ trunk/tora/src/toalert.h 2008-02-17 02:47:33 UTC (rev 2592) @@ -71,7 +71,7 @@ QLineEdit *Name; QLineEdit *Message; QTimer Timer; - toConnection Connection; + toConnection &Connection; toConnection *SendConnection; QMenu *ToolMenu; Modified: trunk/tora/src/tolistviewformattersql.cpp =================================================================== --- trunk/tora/src/tolistviewformattersql.cpp 2008-02-17 00:58:25 UTC (rev 2591) +++ trunk/tora/src/tolistviewformattersql.cpp 2008-02-17 02:47:33 UTC (rev 2592) @@ -34,7 +34,7 @@ SQLTypeMap toListViewFormatterSQL::getSQLTypes( toListView& tListView ) { SQLTypeMap m; - toConnection conn = toCurrentConnection( &tListView ); + toConnection &conn = toCurrentConnection( &tListView ); toConnection::objectName on = toConnection::objectName( tListView.getOwner(), tListView.getObjectName() ); toQDescList desc = conn.columns( on ); for ( toQDescList::iterator i = desc.begin();i != desc.end(); ++i ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-17 17:53:31
|
Revision: 2594 http://tora.svn.sourceforge.net/tora/?rev=2594&view=rev Author: mrjohnson0 Date: 2008-02-17 09:53:36 -0800 (Sun, 17 Feb 2008) Log Message: ----------- fixes secondtab handling. not all of the objects cast to widget, but this patch (and fixes to totabwidget) make it unnecessary. Modified Paths: -------------- trunk/tora/src/tobrowser.cpp trunk/tora/src/tobrowser.h Modified: trunk/tora/src/tobrowser.cpp =================================================================== --- trunk/tora/src/tobrowser.cpp 2008-02-17 17:52:20 UTC (rev 2593) +++ trunk/tora/src/tobrowser.cpp 2008-02-17 17:53:36 UTC (rev 2594) @@ -1282,6 +1282,9 @@ toBrowser::toBrowser(QWidget *parent, toConnection &connection) : toToolWidget(BrowserTool, "browser.html", parent, connection) { + SecondTab = NULL; + SecondText = QString::null; + Filter = new toBrowserFilter(false); QToolBar *toolbar = toAllocBar(this, tr("DB Browser")); @@ -1426,7 +1429,6 @@ toResultCols *resultCols = new toResultCols(curr, TAB_TABLE_COLUMNS); curr->addTab(resultCols, tr("&Columns")); - SecondTab = resultCols; SecondMap[TAB_TABLES] = resultCols; SecondMap[TAB_TABLE_COLUMNS] = resultCols; @@ -1486,6 +1488,9 @@ curr->addTab(resultExtract, tr("Script")); SecondMap[TAB_TABLE_EXTRACT] = resultExtract; + // make sure this gets setup as SecondTab + //curr->setCurrentWidget(resultCols); + changeSecondTab(resultCols); connect(curr, SIGNAL(currentTabChanged(QWidget *)), this, SLOT(changeSecondTab(QWidget *))); splitter = new QSplitter(Qt::Horizontal, TopTab); @@ -1946,15 +1951,12 @@ this, SLOT(windowActivated(QWidget *))); - refresh(); - connect(TopTab, SIGNAL(currentTabChanged(QWidget *)), this, SLOT(changeTab(QWidget *))); connect(this, SIGNAL(connectionChange()), this, SLOT(changeConnection())); Schema->setFocus(); - connect(&Poll, SIGNAL(timeout()), this, SLOT(changeSecond())); setNewFilter(NULL); } @@ -2103,14 +2105,12 @@ QModelIndex item = selectedItem(); if(item.isValid()) { SecondText = item.data(Qt::EditRole).toString(); - if(SecondTab && !SecondText.isEmpty()) { - Poll.setSingleShot(true); - Poll.start(250); - } + if(SecondTab && !SecondText.isEmpty()) + changeSecond(); } } -void toBrowser::changeSecond(void) { +void toBrowser::changeSecond() { QWidget *tab = TopTab->currentWidget(); QWidget *tab2 = dynamic_cast<QWidget *>(SecondTab); @@ -2156,28 +2156,17 @@ void toBrowser::changeSecondTab(QWidget *tab) { - for (QWidget *t = tab->parentWidget();t != TopTab->currentWidget();t = t->parentWidget()) - if (!t) - return; + if(!tab) + return; - if (tab) { - toResult *newtab = SecondMap[tab->objectName()]; - if (newtab == SecondTab) - return; + toResult *result = dynamic_cast<toResult *>(tab); + if(!result) + return; - // The change second tab can get called for other tabs than - // the current one. Ignore those calls. - QWidget *t = dynamic_cast<QWidget *>(newtab); - while (t && t != CurrentTop) - t = t->parentWidget(); - if (!t) - return; - - SecondTab = newtab; - SecondMap[TopTab->currentWidget()->objectName()] = SecondTab; - if (SecondTab && !SecondText.isEmpty()) - changeSecond(); - } + SecondTab = result; + SecondMap[TopTab->currentWidget()->objectName()] = SecondTab; + if (SecondTab && !SecondText.isEmpty()) + changeSecond(); } void toBrowser::changeTab(QWidget *tab) @@ -2532,8 +2521,12 @@ void toBrowser::closeEvent(QCloseEvent *event) { if(ViewContent->maybeSave() && TableContent->maybeSave() && - AccessContent->maybeSave()) + AccessContent->maybeSave()) { + + // prevent further queries after close + SecondText = QString::null; event->accept(); + } else event->ignore(); } Modified: trunk/tora/src/tobrowser.h =================================================================== --- trunk/tora/src/tobrowser.h 2008-02-17 17:52:20 UTC (rev 2593) +++ trunk/tora/src/tobrowser.h 2008-02-17 17:53:36 UTC (rev 2594) @@ -82,7 +82,6 @@ std::map<QString, toResultTableView *> Map; std::map<QString, toResult *> SecondMap; void setNewFilter(toBrowserFilter *filter); - QTimer Poll; QString schema(void); void enableDisableConstraints(const QString &); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-17 21:42:35
|
Revision: 2595 http://tora.svn.sourceforge.net/tora/?rev=2595&view=rev Author: mrjohnson0 Date: 2008-02-17 13:42:40 -0800 (Sun, 17 Feb 2008) Log Message: ----------- cleanups, refine commit/save logic. connect to tomain and save our changes if commit clicked. Modified Paths: -------------- trunk/tora/src/toresulttableviewedit.cpp trunk/tora/src/toresulttableviewedit.h Modified: trunk/tora/src/toresulttableviewedit.cpp =================================================================== --- trunk/tora/src/toresulttableviewedit.cpp 2008-02-17 17:53:36 UTC (rev 2594) +++ trunk/tora/src/toresulttableviewedit.cpp 2008-02-17 21:42:40 UTC (rev 2595) @@ -1,39 +1,39 @@ /***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 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 without written consent from Quest Software, Inc. -* Observe that this does not disallow linking to the Qt Free Edition. -* -* You may link this product with any GPL'd Qt library such as Qt/Free -* -* All trademarks belong to their respective owners. -* -*****/ + * + * TOra - An Oracle Toolkit for DBA's and developers + * Copyright (C) 2003-2005 Quest Software, Inc + * Portions Copyright (C) 2005 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 without written consent from Quest Software, Inc. + * Observe that this does not disallow linking to the Qt Free Edition. + * + * You may link this product with any GPL'd Qt library such as Qt/Free + * + * All trademarks belong to their respective owners. + * + *****/ #include "config.h" #include "toresulttableviewedit.h" @@ -112,6 +112,11 @@ this, SLOT(recordDelete(const toResultModel::Row &))); + connect(toMainWidget(), + SIGNAL(willCommit(toConnection &, bool)), + this, + SLOT(commitChanges(toConnection &, bool))); + verticalHeader()->setVisible(true); } @@ -123,7 +128,7 @@ // they all get inserted as one. toQValue rowid = row[0]; for(int changeIndex = 0; changeIndex < Changes.size(); changeIndex++) { - if(Changes[changeIndex].added && Changes[changeIndex].row[0] == rowid) { + if(Changes[changeIndex].kind == Add && Changes[changeIndex].row[0] == rowid) { Changes[changeIndex].row[index.column()] = newValue; return; } @@ -137,7 +142,7 @@ change.newValue = newValue; change.row = row; change.column = index.column(); - change.added = false; + change.kind = Update; Changes.append(change); } @@ -147,7 +152,7 @@ struct ChangeSet change; change.row = row; - change.added = true; + change.kind = Add; Changes.append(change); } @@ -157,7 +162,7 @@ struct ChangeSet change; change.row = row; - change.deleted = true; + change.kind = Delete; Changes.append(change); } @@ -208,7 +213,11 @@ } conn.execute(sql, args); - conn.commit(); + + if(!toConfigurationSingle::Instance().globalConfig(CONF_AUTO_COMMIT, "").isEmpty()) + conn.commit(); + else + toMainWidget()->setNeedCommit(conn); } @@ -259,7 +268,10 @@ toQuery q(conn, sql, args); - conn.commit(); + if(!toConfigurationSingle::Instance().globalConfig(CONF_AUTO_COMMIT, "").isEmpty()) + conn.commit(); + else + toMainWidget()->setNeedCommit(conn); } @@ -365,14 +377,19 @@ } toQuery q(conn, sql, args); - conn.commit(); + + if(!toConfigurationSingle::Instance().globalConfig(CONF_AUTO_COMMIT, "").isEmpty()) + conn.commit(); + else + toMainWidget()->setNeedCommit(conn); } -bool toResultTableViewEdit::commitChanges(void) { +bool toResultTableViewEdit::commitChanges(bool status) { // Check to make sure some changes were actually made if(Changes.size() < 1) { - toStatusMessage(tr("No changes made"), false, false); + if(status) + toStatusMessage(tr("No changes made"), false, false); return false; } @@ -381,14 +398,21 @@ bool error = false; for(int changeIndex = 0; changeIndex < Changes.size(); changeIndex++) { try { - struct ChangeSet change = Changes[changeIndex]; + struct ChangeSet &change = Changes[changeIndex]; - if(change.deleted) + switch(change.kind) { + case Delete: commitDelete(change, conn); - else if(change.added) + break; + case Add: commitAdd(change, conn); - else + break; + case Update: commitUpdate(change, conn); + break; + default: + toStatusMessage(tr("Internal error.")); + } toStatusMessage(tr("Saved"), false, false); } @@ -408,6 +432,23 @@ } +void toResultTableViewEdit::commitChanges(toConnection &conn, bool cmt) { + // make sure this is the same connection, we don't want to commit + // this connection when somebody clicked 'commit' when in another + // tool and another database. + if(&conn != &connection()) + return; + + if(cmt) { + commitChanges(false); + connection().commit(); // make sure to commit connection + // where our changes are. + } + else + refresh(); +} + + void toResultTableViewEdit::revertChanges() { Changes.clear(); } @@ -438,5 +479,5 @@ void toResultTableViewEdit::deleteRecord(void) { QModelIndex ind = selectionModel()->currentIndex(); if(ind.isValid()) - Model->deleteRow(ind); + Model->deleteRow(ind); } Modified: trunk/tora/src/toresulttableviewedit.h =================================================================== --- trunk/tora/src/toresulttableviewedit.h 2008-02-17 17:53:36 UTC (rev 2594) +++ trunk/tora/src/toresulttableviewedit.h 2008-02-17 21:42:40 UTC (rev 2595) @@ -58,9 +58,14 @@ class toResultTableViewEdit : public toResultTableView { Q_OBJECT; + enum ChangeKind { + Add, + Delete, + Update + }; + struct ChangeSet { - bool added; /* is row new */ - bool deleted; /* row removed */ + ChangeKind kind; /* sql change mode */ QString columnName; /* column name */ int column; /* the real column number * after adjusting for @@ -76,7 +81,6 @@ QString Owner; QString Table; - void commitDelete(ChangeSet &change, toConnection &conn); void commitAdd(ChangeSet &change, toConnection &conn); void commitUpdate(ChangeSet &change, toConnection &conn); @@ -171,12 +175,22 @@ /** * Writes cached changes to database. * + * @param status Should display a status message. * @return success */ - bool commitChanges(void); + bool commitChanges(bool status = true); /** + * Handle connection toolbar's commit and rollback. + * + * @param conn Connection that is commited. + * @param cmt true for commit, false for rollback + */ + void commitChanges(toConnection &conn, bool cmt); + + + /** * Clears Changes * */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-02-18 16:08:30
|
Revision: 2598 http://tora.svn.sourceforge.net/tora/?rev=2598&view=rev Author: subik Date: 2008-02-18 08:08:09 -0800 (Mon, 18 Feb 2008) Log Message: ----------- line numbers for sql editor (it's the killer feature for me ;)) Modified Paths: -------------- trunk/tora/src/tomarkedtext.cpp trunk/tora/src/tomarkedtext.h Modified: trunk/tora/src/tomarkedtext.cpp =================================================================== --- trunk/tora/src/tomarkedtext.cpp 2008-02-17 23:39:44 UTC (rev 2597) +++ trunk/tora/src/tomarkedtext.cpp 2008-02-18 16:08:09 UTC (rev 2598) @@ -85,9 +85,11 @@ setEdit(); Search = false; setFont(toStringToFont(toConfigurationSingle::Instance().globalConfig(CONF_TEXT, ""))); + setMarginLineNumbers(0, true); connect(this, SIGNAL(textChanged()), this, SLOT(setTextChanged())); connect(this, SIGNAL(copyAvailable(bool)), this, SLOT(setCopyAvailable(bool))); + connect(this, SIGNAL(linesChanged()), this, SLOT(linesChanged())); /* is this still neccessary after switch to sqcintilla?!? QPalette pal = palette(); @@ -113,6 +115,12 @@ setEdit(); } +void toMarkedText::linesChanged() +{ + int x = QString::number(lines()).length() + 1; + setMarginWidth(0, QString().fill('0', x)); +} + void toMarkedText::setEdit(void) { if (isReadOnly()) Modified: trunk/tora/src/tomarkedtext.h =================================================================== --- trunk/tora/src/tomarkedtext.h 2008-02-17 23:39:44 UTC (rev 2597) +++ trunk/tora/src/tomarkedtext.h 2008-02-18 16:08:09 UTC (rev 2598) @@ -262,6 +262,8 @@ private slots: void setTextChanged(); void setCopyAvailable(bool yes); + //! \brief Handle line numbers in the editor on text change + void linesChanged(); public slots: /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-18 22:36:59
|
Revision: 2599 http://tora.svn.sourceforge.net/tora/?rev=2599&view=rev Author: mrjohnson0 Date: 2008-02-18 14:36:45 -0800 (Mon, 18 Feb 2008) Log Message: ----------- adds a warning before reverting data. connects signal to save action minor reorg of the toolbar Modified Paths: -------------- trunk/tora/src/toresultdata.cpp trunk/tora/src/toresultdata.h trunk/tora/src/toresulttableviewedit.cpp trunk/tora/src/toresulttableviewedit.h Modified: trunk/tora/src/toresultdata.cpp =================================================================== --- trunk/tora/src/toresultdata.cpp 2008-02-18 16:08:09 UTC (rev 2598) +++ trunk/tora/src/toresultdata.cpp 2008-02-18 22:36:45 UTC (rev 2599) @@ -60,9 +60,10 @@ #include "icons/nofilter.xpm" #include "icons/previous.xpm" #include "icons/rewind.xpm" -#include "icons/saverecord.xpm" +#include "icons/filesave.xpm" #include "icons/single.xpm" #include "icons/trash.xpm" +#include "icons/stop.xpm" toResultData::toResultData(QWidget *parent, @@ -109,13 +110,14 @@ tr("Remove filters")); connect(removeAct, SIGNAL(triggered(bool)), this, SLOT(removeFilter(bool))); - refreshAct = toolbar->addAction( - QIcon(QPixmap(const_cast<const char**>(refresh_xpm))), - tr("Refresh data")); - connect(refreshAct, SIGNAL(triggered()), Edit, SLOT(refresh())); - toolbar->addSeparator(); + saveAct = toolbar->addAction( + QIcon(QPixmap(const_cast<const char**>(filesave_xpm))), + tr("Save changes")); + connect(saveAct, SIGNAL(triggered()), this, SLOT(save())); + connect(Edit, SIGNAL(changed(bool)), saveAct, SLOT(setEnabled(bool))); + addAct = toolbar->addAction( QIcon(QPixmap(const_cast<const char**>(addrecord_xpm))), tr("Add a new record")); @@ -126,16 +128,6 @@ tr("Duplicate an existing record")); connect(duplicateAct, SIGNAL(triggered()), Edit, SLOT(duplicateRecord())); - saveAct = toolbar->addAction( - QIcon(QPixmap(const_cast<const char**>(saverecord_xpm))), - tr("Save changes")); - connect(saveAct, SIGNAL(triggered()), this, SLOT(save())); - - discardAct = toolbar->addAction( - QIcon(QPixmap(const_cast<const char**>(canceledit_xpm))), - tr("Discard changes")); - connect(discardAct, SIGNAL(triggered()), Edit, SLOT(refresh())); - deleteAct = toolbar->addAction( QIcon(QPixmap(const_cast<const char**>(trash_xpm))), tr("Delete current record from table")); @@ -143,6 +135,13 @@ toolbar->addSeparator(); + refreshAct = toolbar->addAction( + QIcon(QPixmap(const_cast<const char**>(refresh_xpm))), + tr("Refresh data")); + connect(refreshAct, SIGNAL(triggered()), this, SLOT(refreshWarn())); + + toolbar->addSeparator(); + firstAct = toolbar->addAction( QIcon(QPixmap(const_cast<const char**>(rewind_xpm))), tr("Go to first row")); @@ -407,3 +406,24 @@ Edit->addRecord(); navigate(lastAct); } + + +void toResultData::refreshWarn() { + if(Edit->changed()) { + switch(TOMessageBox( + QMessageBox::Warning, + tr("Warning"), + tr("Refreshing from the database will lose current changes."), + QMessageBox::Ok | QMessageBox::Cancel, + this).exec()) { + case QMessageBox::Ok: + break; + case QMessageBox::Cancel: + return; + default: + return; + } + } + + Edit->refresh(); +} Modified: trunk/tora/src/toresultdata.h =================================================================== --- trunk/tora/src/toresultdata.h 2008-02-18 16:08:09 UTC (rev 2598) +++ trunk/tora/src/toresultdata.h 2008-02-18 22:36:45 UTC (rev 2599) @@ -172,6 +172,7 @@ void updateForm(void); void save(void); void addRecord(void); + void refreshWarn(void); }; Modified: trunk/tora/src/toresulttableviewedit.cpp =================================================================== --- trunk/tora/src/toresulttableviewedit.cpp 2008-02-18 16:08:09 UTC (rev 2598) +++ trunk/tora/src/toresulttableviewedit.cpp 2008-02-18 22:36:45 UTC (rev 2599) @@ -84,6 +84,8 @@ toQList empty; toResultTableView::query(SQL, empty); + emit changed(false); + if(!Model) return; // error @@ -145,6 +147,7 @@ change.kind = Update; Changes.append(change); + emit changed(changed()); } @@ -155,6 +158,7 @@ change.kind = Add; Changes.append(change); + emit changed(changed()); } @@ -165,6 +169,7 @@ change.kind = Delete; Changes.append(change); + emit changed(changed()); } @@ -428,6 +433,7 @@ else Changes.clear(); + emit changed(changed()); return !error; } @@ -451,6 +457,7 @@ void toResultTableViewEdit::revertChanges() { Changes.clear(); + emit changed(changed()); } Modified: trunk/tora/src/toresulttableviewedit.h =================================================================== --- trunk/tora/src/toresulttableviewedit.h 2008-02-18 16:08:09 UTC (rev 2598) +++ trunk/tora/src/toresulttableviewedit.h 2008-02-18 22:36:45 UTC (rev 2599) @@ -127,6 +127,14 @@ } +signals: + /** + * Parameter is true after changes, false after save or load. + * + */ + void changed(bool edit); + + public slots: /** * Append change to Changes This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-24 18:46:35
|
Revision: 2602 http://tora.svn.sourceforge.net/tora/?rev=2602&view=rev Author: mrjohnson0 Date: 2008-02-24 10:46:25 -0800 (Sun, 24 Feb 2008) Log Message: ----------- make completions window a popup. must use an empty qwidget as a container because qlistwidget overrides mouse handling code to select items that breaks qt::popup handling. Modified Paths: -------------- trunk/tora/src/tohighlightedtext.cpp trunk/tora/src/tohighlightedtext.h Modified: trunk/tora/src/tohighlightedtext.cpp =================================================================== --- trunk/tora/src/tohighlightedtext.cpp 2008-02-18 23:52:47 UTC (rev 2601) +++ trunk/tora/src/tohighlightedtext.cpp 2008-02-24 18:46:25 UTC (rev 2602) @@ -45,7 +45,6 @@ #include <ctype.h> - #include <qapplication.h> #include <qpainter.h> #include <qpalette.h> @@ -53,10 +52,12 @@ #include <qkeysequence.h> #include <Qsci/qsciapis.h> #include <qnamespace.h> +#include <QListWidget> #include <Qsci/qscilexersql.h> #include <qpoint.h> #include <QKeyEvent> +#include <QVBoxLayout> #include "todefaultkeywords.h" @@ -268,9 +269,17 @@ } toComplPopup::toComplPopup(toHighlightedText* edit) - : QListWidget(edit) // 0, "popup", Qt::WType_Popup | Qt::WStyle_NoBorder | Qt::WStyle_Customize -{ - this->editor = edit; + : QWidget(edit, Qt::Popup) { + List = new QListWidget(this); + Editor = edit; + + QVBoxLayout *vbox = new QVBoxLayout; + vbox->setSpacing(0); + vbox->setContentsMargins(0, 0, 0, 0); + + vbox->addWidget(List); + setLayout(vbox); + setFocusProxy(List); } toComplPopup::~toComplPopup() @@ -295,26 +304,20 @@ if ((!e->text().isNull() && e->text().length() > 0 && e->key() != Qt::Key_Return && e->text() != " ") || e->key() == Qt::Key_Backspace) { - this->editor->keyPressEvent(e); - this->editor->autoCompleteFromAPIs(); + this->Editor->keyPressEvent(e); + this->Editor->autoCompleteFromAPIs(); } else if (!e->text().isNull() && e->text().length() > 0 && e->text() == " ") { - this->editor->keyPressEvent(e); + this->Editor->keyPressEvent(e); this->hide(); } else - QListWidget::keyPressEvent(e); + QWidget::keyPressEvent(e); } -void toComplPopup::focusOutEvent(QFocusEvent *e) { - hide(); - QListWidget::focusOutEvent(e); -} - - toHighlightedText::toHighlightedText(QWidget *parent, const char *name) : toMarkedText(parent, name), lexer(0), syntaxColoring(false) { @@ -345,8 +348,14 @@ connect( timer, SIGNAL(timeout()), this, SLOT(autoCompleteFromAPIs()) ); popup = new toComplPopup(this); popup->hide(); - connect(popup, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(completeFromAPI(QListWidgetItem*))); - connect(popup, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(completeFromAPI(QListWidgetItem*))); + connect(popup->list(), + SIGNAL(itemClicked(QListWidgetItem*)), + this, + SLOT(completeFromAPI(QListWidgetItem*))); + connect(popup->list(), + SIGNAL(itemActivated(QListWidgetItem*)), + this, + SLOT(completeFromAPI(QListWidgetItem*))); } toHighlightedText::~toHighlightedText() @@ -380,15 +389,13 @@ void toHighlightedText::autoCompleteFromAPIs() { + QListWidget *list = popup->list(); QString partial; QStringList compleList = this->getCompletionList(&partial); + if (compleList.count() == 1 && compleList.first() == partial) - { this->completeWithText(compleList.first()); - if (popup->isVisible()) - popup->hide(); - } - else if (!compleList.isEmpty() || popup->isVisible()) + else { long position, posx, posy; int curCol, curRow; @@ -398,30 +405,35 @@ posy = this->SendScintilla(SCI_POINTYFROMPOSITION, 0, position) + this->SendScintilla(SCI_TEXTHEIGHT, curRow); QPoint p(posx, posy); + p = mapToGlobal(p); popup->move(p); - popup->clear(); - popup->addItems(compleList); + list->clear(); + list->addItems(compleList); if (!partial.isNull() && partial.length() > 0) { int i; - for (i = 0;i < popup->model()->rowCount();i++) + for (i = 0;i < list->model()->rowCount();i++) { - if (popup->item(i)->text().indexOf(partial) == 0) + if (list->item(i)->text().indexOf(partial) == 0) { - popup->item(i)->setSelected(true); - popup->setCurrentItem(popup->item(i)); + list->item(i)->setSelected(true); + list->setCurrentItem(list->item(i)); break; } } + } + // if there's no current selection, select the first + // item. that way arrow keys work as intended. + QList<QListWidgetItem *> selected = list->selectedItems(); + if(selected.size() < 1 && list->count() > 0) { + list->item(0)->setSelected(true); + list->setCurrentItem(list->item(0)); } + popup->show(); popup->setFocus(); } - else - { - popup->hide(); - } } bool toHighlightedText::invalidToken(int line, int col) @@ -828,8 +840,6 @@ void toHighlightedText::completeFromAPI(QListWidgetItem* item) { if (item) - { this->completeWithText(item->text()); - } popup->hide(); } Modified: trunk/tora/src/tohighlightedtext.h =================================================================== --- trunk/tora/src/tohighlightedtext.h 2008-02-18 23:52:47 UTC (rev 2601) +++ trunk/tora/src/tohighlightedtext.h 2008-02-24 18:46:25 UTC (rev 2602) @@ -52,8 +52,9 @@ #include <map> #include <qtimer.h> #include <qstringlist.h> -#include <QListWidget> +#include <QWidget> +class QListWidget; class QListWidgetItem; class QPainter; class toSyntaxSetup; @@ -180,22 +181,26 @@ static toSyntaxAnalyzer &defaultAnalyzer(); }; -class toComplPopup : public QListWidget { +class toComplPopup : public QWidget { Q_OBJECT; private: - toHighlightedText* editor; + toHighlightedText *Editor; + QListWidget *List; public: toComplPopup(toHighlightedText* high); virtual ~toComplPopup(); + QListWidget* list(void) { + return this->List; + } + public slots: void hide(void); protected: virtual void keyPressEvent(QKeyEvent * e); - virtual void focusOutEvent(QFocusEvent *e); }; /** * A simple editor which supports syntax highlighting. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-02-28 00:58:43
|
Revision: 2607 http://tora.svn.sourceforge.net/tora/?rev=2607&view=rev Author: mrjohnson0 Date: 2008-02-27 16:58:37 -0800 (Wed, 27 Feb 2008) Log Message: ----------- add action to count rows. it's nice not to have to manually find the bottom to get a count. Modified Paths: -------------- trunk/tora/src/toresulttableview.cpp trunk/tora/src/toresulttableview.h Modified: trunk/tora/src/toresulttableview.cpp =================================================================== --- trunk/tora/src/toresulttableview.cpp 2008-02-28 00:45:01 UTC (rev 2606) +++ trunk/tora/src/toresulttableview.cpp 2008-02-28 00:58:37 UTC (rev 2607) @@ -55,6 +55,7 @@ #include <QSize> #include <QFont> #include <QFontMetrics> +#include <QMessageBox> /** @@ -214,6 +215,7 @@ selectAllAct = new QAction(tr("Select &all"), this); exportAct = new QAction(tr("E&xport to file..."), this); editAct = new QAction(tr("&Edit SQL..."), this); + rowCountAct = new QAction(tr("C&ount Rows"), this); readAllAct = new QAction(tr("&Read All"), this); } @@ -299,6 +301,7 @@ Menu->addSeparator(); + Menu->addAction(rowCountAct); Menu->addAction(readAllAct); connect(Menu, @@ -335,10 +338,18 @@ editSelectAll(); else if(action == editAct) toMainWidget()->editSQL(sqlName()); - else if(action == readAllAct) { + else if(action == readAllAct || action == rowCountAct) { QModelIndex index; while(Model->canFetchMore(index)) Model->fetchMore(index); + + if(action == rowCountAct) { + int count = Model->rowCount(); + TOMessageBox::information( + this, + tr("Row Count"), + tr("%1 row%2.").arg(count).arg(count > 1 ? "s" : 0)); + } } else if(action == refreshAct) refresh(); Modified: trunk/tora/src/toresulttableview.h =================================================================== --- trunk/tora/src/toresulttableview.h 2008-02-28 00:45:01 UTC (rev 2606) +++ trunk/tora/src/toresulttableview.h 2008-02-28 00:58:37 UTC (rev 2607) @@ -104,6 +104,7 @@ QAction *selectAllAct; QAction *exportAct; QAction *editAct; + QAction *rowCountAct; QAction *readAllAct; void createActions(void); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-03-01 20:02:22
|
Revision: 2609 http://tora.svn.sourceforge.net/tora/?rev=2609&view=rev Author: mrjohnson0 Date: 2008-03-01 12:02:26 -0800 (Sat, 01 Mar 2008) Log Message: ----------- ug. lots of things happen when you delete query. works around a crash when using statistics on exit. basically, using a qpointer to protect access in tonoblockquery and deleting toresultstats in worksheet before qobject deletes the children. Modified Paths: -------------- trunk/tora/src/tonoblockquery.h trunk/tora/src/toresultstats.cpp trunk/tora/src/toresultstats.h trunk/tora/src/toworksheet.cpp Modified: trunk/tora/src/tonoblockquery.h =================================================================== --- trunk/tora/src/tonoblockquery.h 2008-02-28 01:05:21 UTC (rev 2608) +++ trunk/tora/src/tonoblockquery.h 2008-03-01 20:02:26 UTC (rev 2609) @@ -106,7 +106,7 @@ toQList Param; /** Statistics to be used if any. */ - toResultStats *Statistics; + QPointer<toResultStats> Statistics; /** Description of result */ toQDescList Description; Modified: trunk/tora/src/toresultstats.cpp =================================================================== --- trunk/tora/src/toresultstats.cpp 2008-02-28 01:05:21 UTC (rev 2608) +++ trunk/tora/src/toresultstats.cpp 2008-03-01 20:02:26 UTC (rev 2609) @@ -61,12 +61,17 @@ return toIsOracle(conn); } -toResultStats::~toResultStats() -{ +bool toResultStats::close() { delete Query; delete SessionIO; + + return true; } +toResultStats::~toResultStats() { + close(); +} + static toSQL SQLSession("toResultStats:Session", "SELECT MIN(SID) FROM V$MYSTAT", "Get session id of current session"); Modified: trunk/tora/src/toresultstats.h =================================================================== --- trunk/tora/src/toresultstats.h 2008-02-28 01:05:21 UTC (rev 2608) +++ trunk/tora/src/toresultstats.h 2008-03-01 20:02:26 UTC (rev 2609) @@ -104,6 +104,11 @@ */ ~toResultStats(); + /** + * close this object + */ + bool close(void); + /** Reset statistics. Read in last values without updating widget data. */ void resetStats(void); Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-02-28 01:05:21 UTC (rev 2608) +++ trunk/tora/src/toworksheet.cpp 2008-03-01 20:02:26 UTC (rev 2609) @@ -713,7 +713,13 @@ } bool toWorksheet::close() { - if (checkSave(true)) { + if(Statistics) { + Statistics->close(); + delete Statistics; + Statistics = NULL; + } + + if(checkSave(true)) { Result->stop(); return toToolWidget::close(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-03-02 02:01:04
|
Revision: 2612 http://tora.svn.sourceforge.net/tora/?rev=2612&view=rev Author: mrjohnson0 Date: 2008-03-01 18:01:09 -0800 (Sat, 01 Mar 2008) Log Message: ----------- patch consolidates editor preferences for tabs and spaced tab stops to the editor settings, so you don't have to make the same change twice. also applies these settings to qscintilla in tomarkedtext. cleans up the members a bit -- two copies of the same data as a static member and another in file scope. Modified Paths: -------------- trunk/tora/src/main.cpp trunk/tora/src/toconf.h trunk/tora/src/toeditextensions.cpp trunk/tora/src/toeditextensionsetupui.ui trunk/tora/src/tomarkedtext.cpp trunk/tora/src/tomarkedtext.h trunk/tora/src/tosyntaxsetup.cpp trunk/tora/src/tosyntaxsetupui.ui Modified: trunk/tora/src/main.cpp =================================================================== --- trunk/tora/src/main.cpp 2008-03-01 21:02:41 UTC (rev 2611) +++ trunk/tora/src/main.cpp 2008-03-02 02:01:09 UTC (rev 2612) @@ -268,6 +268,8 @@ toMarkedText::setDefaultTabWidth( toConfigurationSingle::Instance().globalConfig(CONF_TAB_STOP, DEFAULT_TAB_STOP).toInt()); + toMarkedText::setDefaultTabSpaces( + !toConfigurationSingle::Instance().globalConfig(CONF_TAB_SPACES, DEFAULT_TAB_SPACES).isEmpty()); toUpdateIndicateEmpty(); Modified: trunk/tora/src/toconf.h =================================================================== --- trunk/tora/src/toconf.h 2008-03-01 21:02:41 UTC (rev 2611) +++ trunk/tora/src/toconf.h 2008-03-02 02:01:09 UTC (rev 2612) @@ -144,6 +144,8 @@ #define DEFAULT_CACHE_TIMEOUT "7" #define CONF_TAB_STOP "TabStop" #define DEFAULT_TAB_STOP "8" +#define CONF_TAB_SPACES "TabSpaces" +#define DEFAULT_TAB_SPACES "" #define CONF_TOAD_BINDINGS "ToadBindings" #define DEFAULT_TOAD_BINDINGS "" #define CONF_DISPLAY_GRIDLINES "Gridlines" Modified: trunk/tora/src/toeditextensions.cpp =================================================================== --- trunk/tora/src/toeditextensions.cpp 2008-03-01 21:02:41 UTC (rev 2611) +++ trunk/tora/src/toeditextensions.cpp 2008-03-02 02:01:09 UTC (rev 2612) @@ -57,15 +57,12 @@ #include "icons/deindent.xpm" #include "icons/indent.xpm" -#define CONF_EXPAND_SPACES "ExpandSpaces" #define CONF_COMMA_BEFORE "CommaBefore" #define CONF_BLOCK_OPEN_LINE "BlockOpenLine" #define CONF_OPERATOR_SPACE "OperatorSpace" #define CONF_KEYWORD_UPPER "KeywordUpper" #define CONF_RIGHT_SEPARATOR "RightSeparator" #define CONF_END_BLOCK_NEWLINE "EndBlockNewline" -#define CONF_INDENT_LEVEL "IndentLevel" -#define DEFAULT_INDENT_LEVEL "4" #define CONF_COMMENT_COLUMN "CommentColumn" #define DEFAULT_COMMENT_COLUMN "60" @@ -188,7 +185,7 @@ } void toEditExtensions::deindentBlock(void) { - intIndent(-toSQLParse::getSetting().IndentLevel); + intIndent(toSQLParse::getSetting().IndentLevel); } void toEditExtensions::indentBlock(void) { @@ -377,14 +374,12 @@ Current = toSQLParse::getSetting(); Started = false; - ExpandSpaces->setChecked(Current.ExpandSpaces); CommaBefore->setChecked(Current.CommaBefore); BlockOpenLine->setChecked(Current.BlockOpenLine); OperatorSpace->setChecked(Current.OperatorSpace); KeywordUpper->setChecked(Current.KeywordUpper); RightSeparator->setChecked(Current.RightSeparator); EndBlockNewline->setChecked(Current.EndBlockNewline); - IndentLevel->setValue(Current.IndentLevel); CommentColumn->setValue(Current.CommentColumn); AutoIndent->setChecked( !toConfigurationSingle::Instance().globalConfig( @@ -447,14 +442,14 @@ void toEditExtensionSetup::saveCurrent(void) { - Current.ExpandSpaces = ExpandSpaces->isChecked(); + Current.ExpandSpaces = toMarkedText::defaultTabSpaces(); Current.CommaBefore = CommaBefore->isChecked(); Current.BlockOpenLine = BlockOpenLine->isChecked(); Current.OperatorSpace = OperatorSpace->isChecked(); Current.KeywordUpper = KeywordUpper->isChecked(); Current.RightSeparator = RightSeparator->isChecked(); Current.EndBlockNewline = EndBlockNewline->isChecked(); - Current.IndentLevel = IndentLevel->value(); + Current.IndentLevel = toMarkedText::defaultTabWidth(); Current.CommentColumn = CommentColumn->value(); toSQLParse::setSetting(Current); } @@ -486,14 +481,14 @@ public: toEditExtensionTool() : toTool(910, "Editor Extensions") { toSQLParse::settings cur; - cur.ExpandSpaces = !config(CONF_EXPAND_SPACES, "Yes").isEmpty(); + cur.ExpandSpaces = toMarkedText::defaultTabSpaces(); cur.CommaBefore = !config(CONF_COMMA_BEFORE, "").isEmpty(); cur.BlockOpenLine = !config(CONF_BLOCK_OPEN_LINE, "").isEmpty(); cur.OperatorSpace = !config(CONF_OPERATOR_SPACE, "Yes").isEmpty(); cur.KeywordUpper = !config(CONF_KEYWORD_UPPER, "Yes").isEmpty(); cur.RightSeparator = !config(CONF_RIGHT_SEPARATOR, "Yes").isEmpty(); cur.EndBlockNewline = !config(CONF_END_BLOCK_NEWLINE, "Yes").isEmpty(); - cur.IndentLevel = config(CONF_INDENT_LEVEL, DEFAULT_INDENT_LEVEL).toInt(); + cur.IndentLevel = toMarkedText::defaultTabWidth(); cur.CommentColumn = config(CONF_COMMENT_COLUMN, DEFAULT_COMMENT_COLUMN).toInt(); toSQLParse::setSetting(cur); } @@ -630,14 +625,12 @@ void toEditExtensionSetup::saveSetting(void) { Ok = true; - Tool->setConfig(CONF_EXPAND_SPACES, ExpandSpaces->isChecked() ? "Yes" : ""); Tool->setConfig(CONF_COMMA_BEFORE, CommaBefore->isChecked() ? "Yes" : ""); Tool->setConfig(CONF_BLOCK_OPEN_LINE, BlockOpenLine->isChecked() ? "Yes" : ""); Tool->setConfig(CONF_OPERATOR_SPACE, OperatorSpace->isChecked() ? "Yes" : ""); Tool->setConfig(CONF_KEYWORD_UPPER, KeywordUpper->isChecked() ? "Yes" : ""); Tool->setConfig(CONF_RIGHT_SEPARATOR, RightSeparator->isChecked() ? "Yes" : ""); Tool->setConfig(CONF_END_BLOCK_NEWLINE, EndBlockNewline->isChecked() ? "Yes" : ""); - Tool->setConfig(CONF_INDENT_LEVEL, QString::number(IndentLevel->value())); Tool->setConfig(CONF_COMMENT_COLUMN, QString::number(CommentColumn->value())); toConfigurationSingle::Instance().globalSetConfig(CONF_AUTO_INDENT_RO, AutoIndent->isChecked() ? "Yes" : ""); saveCurrent(); Modified: trunk/tora/src/toeditextensionsetupui.ui =================================================================== --- trunk/tora/src/toeditextensionsetupui.ui 2008-03-01 21:02:41 UTC (rev 2611) +++ trunk/tora/src/toeditextensionsetupui.ui 2008-03-02 02:01:09 UTC (rev 2612) @@ -1,242 +1,267 @@ -<ui version="4.0" stdsetdef="1" > - <author></author> - <comment></comment> - <exportmacro></exportmacro> - <class>toEditExtensionSetupUI</class> - <widget class="QWidget" name="toEditExtensionSetupUI" > - <property name="geometry" > - <rect> - <x>0</x> - <y>0</y> - <width>533</width> - <height>394</height> - </rect> - </property> - <property name="windowTitle" > - <string>Form1</string> - </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>11</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item rowspan="1" row="11" column="0" colspan="2" > - <widget class="toHighlightedText" name="Example" > - <property name="sizePolicy" > - <sizepolicy> - <hsizetype>5</hsizetype> - <vsizetype>7</vsizetype> - </sizepolicy> - </property> - </widget> - </item> - <item rowspan="1" row="7" column="0" colspan="2" > - <widget class="QCheckBox" name="RightSeparator" > - <property name="text" > - <string>&Right align keywords in each statement.</string> - </property> - <property name="toolTip" > - <string/> - </property> - </widget> - </item> - <item rowspan="1" row="8" column="0" colspan="2" > - <widget class="QCheckBox" name="EndBlockNewline" > - <property name="text" > - <string>Insert a &newline after each block</string> - </property> - </widget> - </item> - <item rowspan="1" row="4" column="0" colspan="2" > - <widget class="QCheckBox" name="BlockOpenLine" > - <property name="text" > - <string>Place THEN, LOOP, AS and IS on new line at b&eginning of new block</string> - </property> - <property name="toolTip" > - <string/> - </property> - </widget> - </item> - <item rowspan="1" row="3" column="0" colspan="2" > - <widget class="QCheckBox" name="CommaBefore" > - <property name="text" > - <string>Place &comma on new line before item instead of after on same line</string> - </property> - <property name="toolTip" > - <string/> - </property> - </widget> - </item> - <item rowspan="1" row="2" column="0" colspan="2" > - <widget class="QCheckBox" name="ExpandSpaces" > - <property name="text" > - <string>&Expand spaces to tabs when indenting</string> - </property> - <property name="toolTip" > - <string>Transform spaces to tabs whenever posible when indenting.</string> - </property> - </widget> - </item> - <item rowspan="1" row="5" column="0" colspan="2" > - <widget class="QCheckBox" name="OperatorSpace" > - <property name="text" > - <string>Put spaces around operators</string> - </property> - <property name="toolTip" > - <string>Insert extra spaces between operators.</string> - </property> - </widget> - </item> - <item rowspan="1" row="6" column="0" colspan="2" > - <widget class="QCheckBox" name="KeywordUpper" > - <property name="text" > - <string>Transform keywords to &uppercase</string> - </property> - <property name="toolTip" > - <string/> - </property> - </widget> - </item> - <item row="0" column="0" > - <widget class="QLabel" name="TextLabel1" > - <property name="text" > - <string>&Indentation level</string> - </property> - <property name="buddy" > - <cstring>IndentLevel</cstring> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="0" column="1" > - <widget class="QSpinBox" name="IndentLevel" /> - </item> - <item row="1" column="0" > - <widget class="QLabel" name="TextLabel1_2" > - <property name="text" > - <string>&Same line comment column</string> - </property> - <property name="buddy" > - <cstring>CommentColumn</cstring> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="1" column="1" > - <widget class="QSpinBox" name="CommentColumn" /> - </item> - <item rowspan="1" row="10" column="0" colspan="2" > - <widget class="QLabel" name="ExampleLabel" > - <property name="text" > - <string>Example</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item rowspan="1" row="9" column="0" colspan="2" > - <widget class="QCheckBox" name="AutoIndent" > - <property name="text" > - <string>Auto indent read only SQL text editors</string> - </property> - </widget> - </item> - </layout> - </widget> - <customwidgets> - <customwidget> - <class>toHighlightedText</class> - <extends>QWidget</extends> - <header location="local" >tohighlightedtext.h</header> - <sizehint> - <width>100</width> - <height>100</height> - </sizehint> - <container>0</container> - <sizepolicy> - <hordata>5</hordata> - <verdata>5</verdata> +<ui version="4.0" > + <class>toEditExtensionSetupUI</class> + <widget class="QWidget" name="toEditExtensionSetupUI" > + <property name="geometry" > + <rect> + <x>0</x> + <y>0</y> + <width>533</width> + <height>394</height> + </rect> + </property> + <property name="windowTitle" > + <string>Form1</string> + </property> + <layout class="QGridLayout" > + <property name="leftMargin" > + <number>11</number> + </property> + <property name="topMargin" > + <number>11</number> + </property> + <property name="rightMargin" > + <number>11</number> + </property> + <property name="bottomMargin" > + <number>11</number> + </property> + <property name="horizontalSpacing" > + <number>6</number> + </property> + <property name="verticalSpacing" > + <number>6</number> + </property> + <item row="11" column="0" colspan="2" > + <widget class="toHighlightedText" native="1" name="Example" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Expanding" hsizetype="Preferred" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> </sizepolicy> - <pixmap>image0</pixmap> - </customwidget> - </customwidgets> - <tabstops> - <tabstop>IndentLevel</tabstop> - <tabstop>CommentColumn</tabstop> - <tabstop>ExpandSpaces</tabstop> - <tabstop>CommaBefore</tabstop> - <tabstop>BlockOpenLine</tabstop> - <tabstop>OperatorSpace</tabstop> - <tabstop>KeywordUpper</tabstop> - <tabstop>RightSeparator</tabstop> - <tabstop>EndBlockNewline</tabstop> - </tabstops> - <images> - <image name="image0" > - <data format="XPM.GZ" length="646" >789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data> - </image> - </images> - <connections> - <connection> - <sender>IndentLevel</sender> - <signal>valueChanged(int)</signal> - <receiver>toEditExtensionSetupUI</receiver> - <slot>changed()</slot> - </connection> - <connection> - <sender>ExpandSpaces</sender> - <signal>toggled(bool)</signal> - <receiver>toEditExtensionSetupUI</receiver> - <slot>changed()</slot> - </connection> - <connection> - <sender>CommaBefore</sender> - <signal>toggled(bool)</signal> - <receiver>toEditExtensionSetupUI</receiver> - <slot>changed()</slot> - </connection> - <connection> - <sender>BlockOpenLine</sender> - <signal>toggled(bool)</signal> - <receiver>toEditExtensionSetupUI</receiver> - <slot>changed()</slot> - </connection> - <connection> - <sender>KeywordUpper</sender> - <signal>toggled(bool)</signal> - <receiver>toEditExtensionSetupUI</receiver> - <slot>changed()</slot> - </connection> - <connection> - <sender>RightSeparator</sender> - <signal>toggled(bool)</signal> - <receiver>toEditExtensionSetupUI</receiver> - <slot>changed()</slot> - </connection> - <connection> - <sender>EndBlockNewline</sender> - <signal>toggled(bool)</signal> - <receiver>toEditExtensionSetupUI</receiver> - <slot>changed()</slot> - </connection> - <connection> - <sender>OperatorSpace</sender> - <signal>toggled(bool)</signal> - <receiver>toEditExtensionSetupUI</receiver> - <slot>changed()</slot> - </connection> - <connection> - <sender>CommentColumn</sender> - <signal>valueChanged(int)</signal> - <receiver>toEditExtensionSetupUI</receiver> - <slot>changed()</slot> - </connection> - </connections> + </property> + </widget> + </item> + <item row="7" column="0" colspan="2" > + <widget class="QCheckBox" name="RightSeparator" > + <property name="toolTip" > + <string/> + </property> + <property name="text" > + <string>&Right align keywords in each statement.</string> + </property> + </widget> + </item> + <item row="8" column="0" colspan="2" > + <widget class="QCheckBox" name="EndBlockNewline" > + <property name="text" > + <string>Insert a &newline after each block</string> + </property> + </widget> + </item> + <item row="4" column="0" colspan="2" > + <widget class="QCheckBox" name="BlockOpenLine" > + <property name="toolTip" > + <string/> + </property> + <property name="text" > + <string>Place THEN, LOOP, AS and IS on new line at b&eginning of new block</string> + </property> + </widget> + </item> + <item row="3" column="0" colspan="2" > + <widget class="QCheckBox" name="CommaBefore" > + <property name="toolTip" > + <string/> + </property> + <property name="text" > + <string>Place &comma on new line before item instead of after on same line</string> + </property> + </widget> + </item> + <item row="5" column="0" colspan="2" > + <widget class="QCheckBox" name="OperatorSpace" > + <property name="toolTip" > + <string>Insert extra spaces between operators.</string> + </property> + <property name="text" > + <string>Put spaces around operators</string> + </property> + </widget> + </item> + <item row="6" column="0" colspan="2" > + <widget class="QCheckBox" name="KeywordUpper" > + <property name="toolTip" > + <string/> + </property> + <property name="text" > + <string>Transform keywords to &uppercase</string> + </property> + </widget> + </item> + <item row="1" column="0" > + <widget class="QLabel" name="TextLabel1_2" > + <property name="text" > + <string>&Same line comment column</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="buddy" > + <cstring>CommentColumn</cstring> + </property> + </widget> + </item> + <item row="1" column="1" > + <widget class="QSpinBox" name="CommentColumn" /> + </item> + <item row="10" column="0" colspan="2" > + <widget class="QLabel" name="ExampleLabel" > + <property name="text" > + <string>Example</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + </widget> + </item> + <item row="9" column="0" colspan="2" > + <widget class="QCheckBox" name="AutoIndent" > + <property name="text" > + <string>Auto indent read only SQL text editors</string> + </property> + </widget> + </item> + </layout> + </widget> + <customwidgets> + <customwidget> + <class>toHighlightedText</class> + <extends>QWidget</extends> + <header>tohighlightedtext.h</header> + </customwidget> + </customwidgets> + <tabstops> + <tabstop>CommentColumn</tabstop> + <tabstop>CommaBefore</tabstop> + <tabstop>BlockOpenLine</tabstop> + <tabstop>OperatorSpace</tabstop> + <tabstop>KeywordUpper</tabstop> + <tabstop>RightSeparator</tabstop> + <tabstop>EndBlockNewline</tabstop> + </tabstops> + <resources/> + <connections> + <connection> + <sender>CommaBefore</sender> + <signal>toggled(bool)</signal> + <receiver>toEditExtensionSetupUI</receiver> + <slot>changed()</slot> + <hints> + <hint type="sourcelabel" > + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel" > + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>BlockOpenLine</sender> + <signal>toggled(bool)</signal> + <receiver>toEditExtensionSetupUI</receiver> + <slot>changed()</slot> + <hints> + <hint type="sourcelabel" > + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel" > + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>KeywordUpper</sender> + <signal>toggled(bool)</signal> + <receiver>toEditExtensionSetupUI</receiver> + <slot>changed()</slot> + <hints> + <hint type="sourcelabel" > + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel" > + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>RightSeparator</sender> + <signal>toggled(bool)</signal> + <receiver>toEditExtensionSetupUI</receiver> + <slot>changed()</slot> + <hints> + <hint type="sourcelabel" > + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel" > + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>EndBlockNewline</sender> + <signal>toggled(bool)</signal> + <receiver>toEditExtensionSetupUI</receiver> + <slot>changed()</slot> + <hints> + <hint type="sourcelabel" > + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel" > + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>OperatorSpace</sender> + <signal>toggled(bool)</signal> + <receiver>toEditExtensionSetupUI</receiver> + <slot>changed()</slot> + <hints> + <hint type="sourcelabel" > + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel" > + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + <connection> + <sender>CommentColumn</sender> + <signal>valueChanged(int)</signal> + <receiver>toEditExtensionSetupUI</receiver> + <slot>changed()</slot> + <hints> + <hint type="sourcelabel" > + <x>20</x> + <y>20</y> + </hint> + <hint type="destinationlabel" > + <x>20</x> + <y>20</y> + </hint> + </hints> + </connection> + </connections> </ui> Modified: trunk/tora/src/tomarkedtext.cpp =================================================================== --- trunk/tora/src/tomarkedtext.cpp 2008-03-01 21:02:41 UTC (rev 2611) +++ trunk/tora/src/tomarkedtext.cpp 2008-03-02 02:01:09 UTC (rev 2612) @@ -74,11 +74,10 @@ #define ACCEL_KEY(k) "\t" + QString("Ctrl+" #k) +// static value for default tabs +int defTabWidth = 8; +bool defTabSpaces = false; -// static value for default tab width -int toMarkedText::defTabWidth = 8; - - toMarkedText::toMarkedText(QWidget *parent, const char *name) : QsciScintilla(parent), toEditWidget() { @@ -98,6 +97,7 @@ // sets default tab width setTabWidth(defaultTabWidth()); + setIndentationsUseTabs(!defaultTabSpaces()); this->setUtf8(true); } @@ -105,6 +105,23 @@ { } +int toMarkedText::defaultTabWidth() { + return defTabWidth; +} + +void toMarkedText::setDefaultTabWidth(int width) { + if(width > 0) + defTabWidth = width; +} + +bool toMarkedText::defaultTabSpaces(void) { + return defTabSpaces; +} + +void toMarkedText::setDefaultTabSpaces(bool on) { + defTabSpaces = on; +} + void toMarkedText::setCopyAvailable(bool yes) { setEdit(); Modified: trunk/tora/src/tomarkedtext.h =================================================================== --- trunk/tora/src/tomarkedtext.h 2008-03-01 21:02:41 UTC (rev 2611) +++ trunk/tora/src/tomarkedtext.h 2008-03-02 02:01:09 UTC (rev 2612) @@ -83,8 +83,6 @@ int CursorTimerID; - static int defTabWidth; - #if 0 /** Print one page to printer. * @param printer Printer to print to. @@ -119,23 +117,26 @@ /** * Returns the default tab width. */ - static int defaultTabWidth() - { - return defTabWidth; - } + static int defaultTabWidth(); /** * Sets the default tab width. * @param width the new default tab width; */ - static void setDefaultTabWidth(int width) - { - if (width > 0) - { - defTabWidth = width; - } - } + static void setDefaultTabWidth(int width); + /** + * Returns default setting for tabs. + * + */ + static bool defaultTabSpaces(void); + + /** + * If true, editor will use spaces not tabs. + * + */ + static void setDefaultTabSpaces(bool on); + /** Insert text and optionallly mark inserted text. * @param str String to insert. * @param mark True if mark inserted as selected. Modified: trunk/tora/src/tosyntaxsetup.cpp =================================================================== --- trunk/tora/src/tosyntaxsetup.cpp 2008-03-01 21:02:41 UTC (rev 2611) +++ trunk/tora/src/tosyntaxsetup.cpp 2008-03-02 02:01:09 UTC (rev 2612) @@ -73,6 +73,7 @@ AutoIndent->setChecked(!toConfigurationSingle::Instance().globalConfig(CONF_AUTO_INDENT, "Yes").isEmpty()); Extensions->setText(toConfigurationSingle::Instance().globalConfig(CONF_EXTENSIONS, DEFAULT_EXTENSIONS)); TabStop->setValue(toMarkedText::defaultTabWidth()); + TabSpaces->setChecked(!toConfigurationSingle::Instance().globalConfig(CONF_TAB_SPACES, DEFAULT_TAB_SPACES).isEmpty()); { QFont font(toStringToFont(toConfigurationSingle::Instance().globalConfig(CONF_CODE, ""))); @@ -312,6 +313,8 @@ toConfigurationSingle::Instance().globalSetConfig(CONF_AUTO_INDENT, AutoIndent->isChecked() ? "Yes" : ""); toMarkedText::setDefaultTabWidth(TabStop->value()); toConfigurationSingle::Instance().globalSetConfig(CONF_TAB_STOP, QString::number(toMarkedText::defaultTabWidth())); + toMarkedText::setDefaultTabSpaces(TabSpaces->isChecked()); + toConfigurationSingle::Instance().globalSetConfig(CONF_TAB_SPACES, TabSpaces->isChecked() ? "Yes" : ""); for (std::map<QString, QColor>::iterator i = Colors.begin();i != Colors.end();i++) { QString str(CONF_COLOR); str += ":"; Modified: trunk/tora/src/tosyntaxsetupui.ui =================================================================== --- trunk/tora/src/tosyntaxsetupui.ui 2008-03-01 21:02:41 UTC (rev 2611) +++ trunk/tora/src/tosyntaxsetupui.ui 2008-03-02 02:01:09 UTC (rev 2612) @@ -178,7 +178,7 @@ </property> </widget> </item> - <item row="10" column="1" > + <item row="11" column="1" > <spacer> <property name="orientation" > <enum>Qt::Vertical</enum> @@ -220,6 +220,16 @@ </property> </widget> </item> + <item row="10" column="0" > + <widget class="QCheckBox" name="TabSpaces" > + <property name="toolTip" > + <string>If set the editor will insert spaces rather than tabs</string> + </property> + <property name="text" > + <string>Use only spaces when indenting</string> + </property> + </widget> + </item> </layout> </widget> </item> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-03-02 04:07:13
|
Revision: 2614 http://tora.svn.sourceforge.net/tora/?rev=2614&view=rev Author: mrjohnson0 Date: 2008-03-01 20:07:13 -0800 (Sat, 01 Mar 2008) Log Message: ----------- one more compat signal warning Modified Paths: -------------- trunk/tora/src/tosession.cpp trunk/tora/src/tosession.h Modified: trunk/tora/src/tosession.cpp =================================================================== --- trunk/tora/src/tosession.cpp 2008-03-02 03:58:15 UTC (rev 2613) +++ trunk/tora/src/tosession.cpp 2008-03-02 04:07:13 UTC (rev 2614) @@ -440,8 +440,8 @@ Sessions->setSelectionMode(toTreeWidget::Single); connect(Sessions, SIGNAL(selectionChanged(toTreeWidgetItem *)), this, SLOT(changeItem(toTreeWidgetItem *))); - connect(ResultTab, SIGNAL(currentChanged(QWidget *)), - this, SLOT(changeTab(QWidget *))); + connect(ResultTab, SIGNAL(currentChanged(int)), + this, SLOT(changeTab(int))); try { connect(timer(), SIGNAL(timeout(void)), this, SLOT(refreshTabs(void))); @@ -646,7 +646,9 @@ } } -void toSession::changeTab(QWidget *tab) { +void toSession::changeTab(int index) { + QWidget *tab = ResultTab->widget(index); + if (tab != CurrentTab) { CurrentTab = tab; toTreeWidgetItem *item = Sessions->selectedItem(); @@ -776,7 +778,7 @@ } QWidget *t = CurrentTab; CurrentTab = NULL; - changeTab(t); + changeTab(ResultTab->indexOf(t)); } void toSession::refreshTabs(void) { Modified: trunk/tora/src/tosession.h =================================================================== --- trunk/tora/src/tosession.h 2008-03-02 03:58:15 UTC (rev 2613) +++ trunk/tora/src/tosession.h 2008-03-02 04:07:13 UTC (rev 2614) @@ -166,7 +166,7 @@ virtual bool canHandle(toConnection &conn); public slots: - void changeTab(QWidget *tab); + void changeTab(int); void changeItem(toTreeWidgetItem *item); void changeCursor(toTreeWidgetItem *item); void changeRefresh(const QString &str); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-03-02 17:16:16
|
Revision: 2615 http://tora.svn.sourceforge.net/tora/?rev=2615&view=rev Author: mrjohnson0 Date: 2008-03-02 09:16:20 -0800 (Sun, 02 Mar 2008) Log Message: ----------- protect access to tableview Modified Paths: -------------- trunk/tora/src/toresulttableview.cpp trunk/tora/src/toresulttableview.h Modified: trunk/tora/src/toresulttableview.cpp =================================================================== --- trunk/tora/src/toresulttableview.cpp 2008-03-02 04:07:13 UTC (rev 2614) +++ trunk/tora/src/toresulttableview.cpp 2008-03-02 17:16:20 UTC (rev 2615) @@ -582,7 +582,7 @@ void toTableViewIterator::updateIndex(void) { - if(_row < _view->model()->rowCount()) + if(_view && _row < _view->model()->rowCount()) _index = _view->model()->index(_row, 1); // skip numbercolumn else _index = QModelIndex(); Modified: trunk/tora/src/toresulttableview.h =================================================================== --- trunk/tora/src/toresulttableview.h 2008-03-02 04:07:13 UTC (rev 2614) +++ trunk/tora/src/toresulttableview.h 2008-03-02 17:16:20 UTC (rev 2615) @@ -420,9 +420,9 @@ * */ class toTableViewIterator { - int _row; - toResultTableView *_view; - QModelIndex _index; + int _row; + QPointer<toResultTableView> _view; + QModelIndex _index; friend class toTableViewIteratorItem; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-03-02 19:22:17
|
Revision: 2616 http://tora.svn.sourceforge.net/tora/?rev=2616&view=rev Author: mrjohnson0 Date: 2008-03-02 10:24:31 -0800 (Sun, 02 Mar 2008) Log Message: ----------- smarter logic for unhiding results pane. try not to pop up for creating objects and such -- it's annoying when it springs open when you're running sql that doesn't return rows. Modified Paths: -------------- trunk/tora/src/toworksheet.cpp trunk/tora/src/toworksheet.h Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-03-02 17:16:20 UTC (rev 2615) +++ trunk/tora/src/toworksheet.cpp 2008-03-02 18:24:31 UTC (rev 2616) @@ -433,6 +433,14 @@ SLOT(addLog(const QString &, const toConnection::exception &, bool))); + connect(Result, + SIGNAL(firstResult(const QString &, + const toConnection::exception &, + bool)), + this, + SLOT(unhideResults(const QString &, + const toConnection::exception &, + bool))); Columns = new toResultCols(container, "description"); box->addWidget(Columns); @@ -862,6 +870,10 @@ return ; } + // unhide the results pane if there's something to show + if(first == "SELECT" || ResultTab->currentIndex() != 0) + unhideResults(); + toQList param; if (!nobinds) try { @@ -1172,23 +1184,31 @@ t = t.mid(i); } - if (t.trimmed().length() && EditSplitter) { - // move splitter if currently hidden - QList<int> list = EditSplitter->sizes(); - if(list[1] == 0) { - list[0] = 1; - list[1] = 1; - EditSplitter->setSizes(list); - } + if (t.trimmed().length() && EditSplitter) + query(t, type); +} - query(t, type); +void toWorksheet::unhideResults(const QString &, + const toConnection::exception &, + bool error) { + if(!error && Result->model()->rowCount() > 0) + unhideResults(); +} + +void toWorksheet::unhideResults() { + // move splitter if currently hidden + QList<int> list = EditSplitter->sizes(); + if(list[1] == 0) { + list[0] = 1; + list[1] = 1; + EditSplitter->setSizes(list); } } void toWorksheet::execute() { - if (Editor->hasSelectedText()) { + if(Editor->hasSelectedText()) { query(Editor->selectedText(), Normal); - return ; + return; } toSQLParse::editorTokenizer tokens(Editor); Modified: trunk/tora/src/toworksheet.h =================================================================== --- trunk/tora/src/toworksheet.h 2008-03-02 17:16:20 UTC (rev 2615) +++ trunk/tora/src/toworksheet.h 2008-03-02 18:24:31 UTC (rev 2616) @@ -235,9 +235,13 @@ * */ void createPopupMenu(const QPoint &pos); + private slots: void poll(void); void changeConnection(void); + + void unhideResults(const QString &, const toConnection::exception &, bool); + void unhideResults(void); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-03-15 18:13:30
|
Revision: 2619 http://tora.svn.sourceforge.net/tora/?rev=2619&view=rev Author: mrjohnson0 Date: 2008-03-15 11:12:49 -0700 (Sat, 15 Mar 2008) Log Message: ----------- set tool caption on modification to provide some feedback Modified Paths: -------------- trunk/tora/src/toworksheet.cpp trunk/tora/src/toworksheet.h Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-03-15 17:58:23 UTC (rev 2618) +++ trunk/tora/src/toworksheet.cpp 2008-03-15 18:12:49 UTC (rev 2619) @@ -416,6 +416,7 @@ Editor = new toWorksheetText(this, EditSplitter); // stop any running query when a file is loaded connect(Editor, SIGNAL(fileOpened()), this, SLOT(stop())); + connect(Editor, SIGNAL(modificationChanged(bool)), this, SLOT(setCaption())); ResultTab = new toTabWidget(EditSplitter); QWidget *container = new QWidget(ResultTab); @@ -1811,7 +1812,10 @@ QString name = WorksheetTool.name(); if (! Editor->filename().isEmpty()) { QFileInfo file(Editor->filename()); - name += QString::fromLatin1(" ") + file.fileName(); + name += (Editor->isModified() ? + QString(" *") : + QString(" ")) + + file.fileName(); } toToolCaption(this, name); } Modified: trunk/tora/src/toworksheet.h =================================================================== --- trunk/tora/src/toworksheet.h 2008-03-15 17:58:23 UTC (rev 2618) +++ trunk/tora/src/toworksheet.h 2008-03-15 18:12:49 UTC (rev 2619) @@ -189,7 +189,6 @@ virtual void importData(std::map<QString, QString> &data, const QString &prefix); static toWorksheet *fileWorksheet(const QString &file); - void setCaption(void); signals: void executed(void); @@ -236,6 +235,12 @@ */ void createPopupMenu(const QPoint &pos); + /** + * Updates tool caption. + * + */ + void setCaption(void); + private slots: void poll(void); void changeConnection(void); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-03-15 23:56:19
|
Revision: 2622 http://tora.svn.sourceforge.net/tora/?rev=2622&view=rev Author: mrjohnson0 Date: 2008-03-15 16:56:14 -0700 (Sat, 15 Mar 2008) Log Message: ----------- fixes intermittent bug where columns were not resized Modified Paths: -------------- trunk/tora/src/toresultmodel.cpp trunk/tora/src/toresultmodel.h trunk/tora/src/toresulttableview.cpp trunk/tora/src/toresulttableview.h Modified: trunk/tora/src/toresultmodel.cpp =================================================================== --- trunk/tora/src/toresultmodel.cpp 2008-03-15 19:18:55 UTC (rev 2621) +++ trunk/tora/src/toresultmodel.cpp 2008-03-15 23:56:14 UTC (rev 2622) @@ -96,7 +96,7 @@ try { if(!Query->poll()) { - if(!Timer.isActive()) + if(!Timer.isActive() && First) Timer.start(TO_POLL_CHECK); return; } @@ -141,12 +141,10 @@ if(First) { if(tmp.size() > 0 || !Query || Query->eof()) { First = !First; - emit firstResult(Query->sql(), - tr("Statement executed"), // todo - false); // need to reset view(s) since we have to poll for data reset(); + emit firstResult(tr("Statement executed"), false); } } @@ -160,10 +158,7 @@ catch(const toConnection::exception &str) { if(First) { First = !First; - emit firstResult( - Query != NULL ? Query->sql() : (const QString) NULL, - str, - true); + emit firstResult(str, true); } cleanup(); return; @@ -171,10 +166,7 @@ catch(const QString &str) { if(First) { First = !First; - emit firstResult( - Query != NULL ? Query->sql() : (const QString) NULL, - str, - true); + emit firstResult(str, true); } cleanup(); return; @@ -399,6 +391,11 @@ bool toResultModel::canFetchMore(const QModelIndex &parent) const { + // sometimes the view calls this before the query has even + // run. + if(First) + return false; + try { return Query && Query->poll(); } Modified: trunk/tora/src/toresultmodel.h =================================================================== --- trunk/tora/src/toresultmodel.h 2008-03-15 19:18:55 UTC (rev 2621) +++ trunk/tora/src/toresultmodel.h 2008-03-15 23:56:14 UTC (rev 2622) @@ -285,12 +285,10 @@ /** * Emitted when the first result is available. * - * @param sql SQL that was run. * @param res String describing result. * @param error Error has occurred. */ - void firstResult(const QString &sql, - const toConnection::exception &res, + void firstResult(const toConnection::exception &res, bool error); Modified: trunk/tora/src/toresulttableview.cpp =================================================================== --- trunk/tora/src/toresulttableview.cpp 2008-03-15 19:18:55 UTC (rev 2621) +++ trunk/tora/src/toresulttableview.cpp 2008-03-15 23:56:14 UTC (rev 2622) @@ -60,8 +60,7 @@ /** * This is a simple class for providing sensible size hints to the - * view. This will probably be extended to support editing and moved - * to it's own class. + * view. * */ class toResultTableViewDelegate : public QItemDelegate { @@ -173,13 +172,9 @@ connect(Model, SIGNAL(done()), this, SLOT(handleDone())); connect(Model, SIGNAL(modelReset()), this, SLOT(handleReset())); connect(Model, - SIGNAL(firstResult(const QString &, - const toConnection::exception &, - bool)), + SIGNAL(firstResult(const toConnection::exception &, bool)), this, - SLOT(handleFirst(const QString &, - const toConnection::exception &, - bool))); + SLOT(handleFirst(const toConnection::exception &, bool))); setSortingEnabled(true); } @@ -220,7 +215,7 @@ } -void toResultTableView::applyFilter(void) { +void toResultTableView::applyFilter() { if(!Filter) return; @@ -372,15 +367,13 @@ while(Model->canFetchMore(index)) Model->fetchMore(index); } - - applyColumnRules(); } -void toResultTableView::handleFirst(const QString &sql, - const toConnection::exception &res, +void toResultTableView::handleFirst(const toConnection::exception &res, bool error) { - emit firstResult(sql, res, error); + applyColumnRules(); + emit firstResult(sql(), res, error); } Modified: trunk/tora/src/toresulttableview.h =================================================================== --- trunk/tora/src/toresulttableview.h 2008-03-15 19:18:55 UTC (rev 2621) +++ trunk/tora/src/toresulttableview.h 2008-03-15 23:56:14 UTC (rev 2622) @@ -121,8 +121,7 @@ void menuCallback(QAction *action); void handleDone(void); void handleReset(void); - void handleFirst(const QString &sql, - const toConnection::exception &res, + void handleFirst(const toConnection::exception &res, bool error); void handleDoubleClick(const QModelIndex &); // override parent This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-03-21 05:45:41
|
Revision: 2628 http://tora.svn.sourceforge.net/tora/?rev=2628&view=rev Author: mrjohnson0 Date: 2008-03-20 22:45:47 -0700 (Thu, 20 Mar 2008) Log Message: ----------- updates tonewconnection dialog for instant client and converts the qtreewidget to qtablewidget Modified Paths: -------------- trunk/tora/src/main.cpp trunk/tora/src/tomain.cpp trunk/tora/src/tonewconnection.cpp trunk/tora/src/tonewconnection.h trunk/tora/src/tonewconnectionui.ui Modified: trunk/tora/src/main.cpp =================================================================== --- trunk/tora/src/main.cpp 2008-03-18 01:10:49 UTC (rev 2627) +++ trunk/tora/src/main.cpp 2008-03-21 05:45:47 UTC (rev 2628) @@ -96,11 +96,15 @@ #endif # ifndef Q_OS_WIN32 - if (toConfigurationSingle::Instance().globalConfig(CONF_DESKTOP_AWARE, "Yes").isEmpty()) QApplication::setDesktopSettingsAware(false); # endif + // QSettings uses these. + QCoreApplication::setOrganizationName("TOra"); + QCoreApplication::setOrganizationDomain("tora.sourceforge.net"); + QCoreApplication::setApplicationName("TOra"); + new QApplication(argc, argv); try Modified: trunk/tora/src/tomain.cpp =================================================================== --- trunk/tora/src/tomain.cpp 2008-03-18 01:10:49 UTC (rev 2627) +++ trunk/tora/src/tomain.cpp 2008-03-21 05:45:47 UTC (rev 2628) @@ -185,11 +185,11 @@ toConnection *conn; do { - toNewConnection newConnection(this, tr("First connection"), true); + toNewConnection newConnection(this); conn = NULL; if(newConnection.exec()) - conn = newConnection.makeConnection(); + conn = newConnection.connection(); else break; } @@ -903,12 +903,12 @@ { try { - toNewConnection newConnection(this, "New connection", true); + toNewConnection newConnection(this); toConnection *conn = NULL; if (newConnection.exec()) - conn = newConnection.makeConnection(); + conn = newConnection.connection(); if (conn) addConnection(conn); Modified: trunk/tora/src/tonewconnection.cpp =================================================================== --- trunk/tora/src/tonewconnection.cpp 2008-03-18 01:10:49 UTC (rev 2627) +++ trunk/tora/src/tonewconnection.cpp 2008-03-21 05:45:47 UTC (rev 2628) @@ -41,326 +41,339 @@ #include "toconnection.h" #include "tonewconnection.h" #include "tomain.h" -#include "toresultview.h" #include "totool.h" -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qfile.h> -#include <qinputdialog.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qlineedit.h> -#include <totreewidget.h> -#include <qmessagebox.h> -#include <qpushbutton.h> -#include <qspinbox.h> -#include <qtooltip.h> -#include <qtooltip.h> -#include <qvariant.h> +#include "icons/trash.xpm" -#include <QString> -#include <QFrame> -#include <QVBoxLayout> +#include <QMessageBox> +#include <QHeaderView> +#include <QStringList> +#include <QMenu> +#include <QIcon> +#define MAX_HISTORY 50 -toNewConnection::toNewConnection(QWidget* parent, - QString name, - bool modal, - Qt::WFlags fl) - : QDialog(parent, fl), - toHelpContext(QString::fromLatin1("newconnection.html")) -{ + +toNewConnection::toNewConnection( + QWidget* parent, + Qt::WFlags fl) : QDialog(parent, fl), + toHelpContext(QString::fromLatin1("newconnection.html")) { setupUi(this); + toHelp::connectDialog(this); - if(!name.isNull()) - setObjectName(name); - setModal(modal); + std::list<QString> lst = toConnectionProvider::providers(); - toHelp::connectDialog(this); + Q_FOREACH(QString s, lst) + Provider->addItem(s); - Database->addItem(toConfigurationSingle::Instance().globalConfig( - CONF_DATABASE, DEFAULT_DATABASE)); - Previous->addColumn(tr("Provider")); - Previous->addColumn(tr("Host")); - Previous->addColumn(tr("Database")); - Previous->addColumn(tr("Username")); - Previous->setSelectionMode(toTreeWidget::Single); - Previous->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, - QSizePolicy::Expanding)); - Previous->setMinimumWidth(325); - Previous->setColumnWidth(0, 80); - Previous->setColumnWidth(1, 80); - Previous->setColumnWidth(2, 80); - Previous->setColumnWidth(3, 80); + if(Provider->count() < 1) { + TOMessageBox::information( + this, + tr("No connection provider"), + tr("No available connection provider")); - QMenu *menu = new QMenu(Previous); - QAction *deleteAct = menu->addAction("Delete"); - Previous->setDisplayMenu(menu); + reject(); + return; + } - connect(deleteAct, SIGNAL(triggered()), this, SLOT(historyDelete())); + NewConnection = 0; + + Previous->setContextMenuPolicy(Qt::CustomContextMenu); + + PreviousContext = new QMenu(this); + QAction *delact = PreviousContext->addAction( + QIcon(trash_xpm), + tr("&Delete")); + connect(delact, + SIGNAL(triggered()), + this, + SLOT(historyDelete())); + connect(Previous, - SIGNAL(selectionChanged()), + SIGNAL(customContextMenuRequested(const QPoint &)), this, - SLOT(historySelection())); + SLOT(previousMenu(const QPoint &))); + + Previous->setColumnCount(5); + Previous->setHorizontalHeaderItem(IndexColumn, new QTableWidgetItem(tr("Index"))); + Previous->setHorizontalHeaderItem(ProviderColumn, new QTableWidgetItem(tr("Provider"))); + Previous->setHorizontalHeaderItem(HostColumn, new QTableWidgetItem(tr("Host"))); + Previous->setHorizontalHeaderItem(DatabaseColumn, new QTableWidgetItem(tr("Database"))); + Previous->setHorizontalHeaderItem(UsernameColumn, new QTableWidgetItem(tr("Username"))); + Previous->sortItems(IndexColumn, Qt::AscendingOrder); + + Settings.beginGroup("connections"); + readSettings(); + + Previous->verticalHeader()->setVisible(false); + Previous->resizeRowsToContents(); + Previous->resizeColumnsToContents(); + Previous->horizontalHeader()->setHighlightSections(false); + Previous->hideColumn(IndexColumn); + Previous->setCurrentCell(0, ProviderColumn); + connect(Previous, - SIGNAL(doubleClicked(toTreeWidgetItem *)), + SIGNAL(currentCellChanged(int, int, int, int)), this, - SLOT(historyConnect())); + SLOT(previousCellChanged(int, int, int, int))); - std::list<QString> lst = toConnectionProvider::providers(); - int sel = 0, cur = 0; - QString provider = toConfigurationSingle::Instance().globalConfig( - CONF_PROVIDER, DEFAULT_PROVIDER).toLatin1(); - for(std::list<QString>::iterator i = lst.begin(); i != lst.end(); i++) { - Provider->addItem((*i)); - if(*i == provider) - sel = cur; - cur++; - } + connect(Provider, + SIGNAL(currentIndexChanged(int)), + this, + SLOT(changeProvider(int))); - if(cur == 0) { - TOMessageBox::information( + connect(Previous, + SIGNAL(cellActivated(int, int)), this, - tr("No connection provider"), - tr("No available connection provider, plugins probably missing")); - reject(); - return ; + SLOT(accept())); + + // must make sure this gets called manually. + changeProvider(Provider->currentIndex()); + // must call after connecting signals + loadPrevious(0); + + Password->setFocus(Qt::OtherFocusReason); +} + + +void toNewConnection::readSettings() { + resize(Settings.value("size", QSize(657, 550)).toSize()); + + Previous->setSortingEnabled(false); + for(int pos = 0; pos < MAX_HISTORY; pos++) { + Settings.beginGroup("history/" + QString::number(pos)); + if(!Settings.contains("provider")) { + Settings.endGroup(); + break; + } + + Previous->setRowCount(pos + 1); + + QString provider = Settings.value("provider", "").toString(); + QString host = Settings.value("host", "").toString(); + QString database = Settings.value("database", "").toString(); + QString username = Settings.value("username", "").toString(); + QString password = toUnobfuscate(Settings.value("password", "").toString()); + + Settings.beginGroup("options"); + std::set<QString> options; + QStringList keys = Settings.allKeys(); + Q_FOREACH(QString s, keys) { + if(Settings.value(s, false).toBool()) + options.insert(s); + } + Settings.endGroup(); + + toConnectionOptions opt( + provider, + host, + database, + username, + password, + Settings.value("port", 0).toInt(), + options); + OptionMap[pos] = opt; + + Previous->setItem(pos, IndexColumn, new QTableWidgetItem(QString::number(pos))); + Previous->setItem(pos, ProviderColumn, new QTableWidgetItem(provider)); + Previous->setItem(pos, HostColumn, new QTableWidgetItem(host)); + Previous->setItem(pos, DatabaseColumn, new QTableWidgetItem(database)); + Previous->setItem(pos, UsernameColumn, new QTableWidgetItem(username)); + + Settings.endGroup(); } - Provider->setCurrentIndex(sel); - changeProvider(); - processOptions(toConfigurationSingle::Instance().globalConfig( - CONF_OPTIONS, DEFAULT_OPTIONS)); + Previous->setSortingEnabled(true); +} - QString host = toConfigurationSingle::Instance().globalConfig( - CONF_HOST, DEFAULT_HOST); - int portix = host.indexOf(":"); - if(portix >= 0) { - Host->lineEdit()->setText(host.mid(0, portix)); - Port->setValue(host.mid(portix + 1).toInt()); +void toNewConnection::writeSettings() { + Settings.setValue("size", size()); + + Settings.remove("history"); + + Settings.beginGroup("history/0"); + Settings.setValue("provider", Provider->currentText()); + Settings.setValue("username", Username->text()); + Settings.setValue("password", toObfuscate(Password->text())); + Settings.setValue("host", Host->currentText()); + Settings.setValue("port", Port->value()); + Settings.setValue("database", Database->currentText()); + + Settings.beginGroup("options"); + QList<QCheckBox *> widgets = OptionGroup->findChildren<QCheckBox *>(); + Q_FOREACH(QCheckBox *box, widgets) + Settings.setValue(box->text(), box->isChecked()); + Settings.endGroup(); + Settings.endGroup(); + + // find history item with same options. will skip later. + int skip = findHistory(Provider->currentText(), + Username->text(), + Host->currentText(), + Database->currentText()); + + int skipped = 0; + for(int row = 0; row < Previous->rowCount() && row < MAX_HISTORY; row++) { + if(row == skip && ++skipped) + continue; + + toConnectionOptions &opt = + OptionMap[Previous->item(row, IndexColumn)->text().toInt()]; + + Settings.beginGroup("history/" + QString::number(row + 1 - skipped)); + Settings.setValue("provider", Previous->item(row, ProviderColumn)->text()); + Settings.setValue("username", Previous->item(row, UsernameColumn)->text()); + Settings.setValue("host", Previous->item(row, HostColumn)->text()); + Settings.setValue("database", Previous->item(row, DatabaseColumn)->text()); + + Settings.setValue("port", opt.port); + Settings.setValue("password", toObfuscate(opt.password)); + + Settings.beginGroup("options"); + Q_FOREACH(QString s, opt.options) + Settings.setValue(s, true); + Settings.endGroup(); + + Settings.endGroup(); } - else - Host->lineEdit()->setText(host); +} - Username->setText(toConfigurationSingle::Instance().globalConfig( - CONF_USER, DEFAULT_USER)); - Username->setFocus(); - bool pass = toConfigurationSingle::Instance().globalConfig( - CONF_SAVE_PWD, DEFAULT_SAVE_PWD).isEmpty(); - if(pass) - Password->setText(QString::fromLatin1(DEFAULT_PASSWORD)); - else - Password->setText(toUnobfuscate( - toConfigurationSingle::Instance().globalConfig( - CONF_PASSWORD, DEFAULT_PASSWORD))); +int toNewConnection::findHistory(const QString &provider, + const QString &username, + const QString &host, + const QString &database) { + for(int row = 0; row < Previous->rowCount(); row++) { + if(provider == Previous->item(row, ProviderColumn)->text() && + username == Previous->item(row, UsernameColumn)->text() && + host == Previous->item(row, HostColumn)->text() && + database == Previous->item(row, DatabaseColumn)->text()) + return row; + } - QString defdb = toConfigurationSingle::Instance().globalConfig( - CONF_DATABASE, DEFAULT_DATABASE); - Database->setEditable(true); + return -1; +} - { - int maxHist = toConfigurationSingle::Instance().globalConfig( - CONF_CONNECT_CURRENT, 0).toInt(); - Previous->setSorting(-1); - toTreeWidgetItem *last = NULL; - for(int i = 0;i < maxHist;i++) { - QString path = CONF_CONNECT_HISTORY; - path += ":"; - path += QString::number(i).toLatin1(); - QString tmp = path; - tmp += CONF_USER; - QString user = toConfigurationSingle::Instance().globalConfig(tmp, ""); - tmp = path; - tmp += CONF_PASSWORD; - QString passstr = (pass ? QString::fromLatin1(DEFAULT_PASSWORD) : - (toUnobfuscate(toConfigurationSingle::Instance().globalConfig( - tmp, DEFAULT_PASSWORD)))); +void toNewConnection::loadPrevious(int row) { + QTableWidgetItem *item = Previous->item(row, IndexColumn); + if(!item) + return; - tmp = path; - tmp += CONF_HOST; - QString host = toConfigurationSingle::Instance().globalConfig( - tmp, DEFAULT_HOST); + bool ok; + int index = item->text().toInt(&ok); + if(!ok) + return; - tmp = path; - tmp += CONF_DATABASE; - QString database = toConfigurationSingle::Instance().globalConfig( - tmp, DEFAULT_DATABASE); + toConnectionOptions &opt = OptionMap[index]; - tmp = path; - tmp += CONF_PROVIDER; - QString provider = toConfigurationSingle::Instance().globalConfig( - tmp, DEFAULT_PROVIDER); + Provider->setCurrentIndex(Provider->findText(opt.provider)); + Host->lineEdit()->setText(opt.host); + Database->lineEdit()->setText(opt.database); + Username->setText(opt.username); + Password->setText(opt.password); + Port->setValue(opt.port); - tmp = path; - tmp += CONF_OPTIONS; - QString options = toConfigurationSingle::Instance().globalConfig( - tmp, DEFAULT_OPTIONS); + QList<QCheckBox *> widgets = OptionGroup->findChildren<QCheckBox *>(); + Q_FOREACH(QCheckBox *box, widgets) + box->setChecked(opt.options.find(box->text()) != opt.options.end()); +} - last = new toTreeWidgetItem(Previous, - last, - provider, - host, - database, - user, - passstr, - options); - } + +void toNewConnection::done(int r) { + if(!r) { + QDialog::done(r); + return; } - adjustSize(); + + NewConnection = makeConnection(); + if(!NewConnection) + return; + + writeSettings(); + QDialog::done(r); } -toNewConnection::~toNewConnection() -{} -void toNewConnection::changeProvider(void) -{ +void toNewConnection::previousCellChanged(int currentRow, + int currentColumn, + int previousRow, + int previousColumn) { + Q_UNUSED(currentColumn); + Q_UNUSED(previousColumn); + + if(currentRow != previousRow) + loadPrevious(currentRow); +} + + +void toNewConnection::changeProvider(int current) { try { - std::list<QString> hosts = toConnectionProvider::hosts(Provider->currentText().toLatin1()); - QString current = Host->currentText(); + std::list<QString> hosts = toConnectionProvider::hosts( + Provider->currentText()); bool sqlNet = false; - Host->clear(); DefaultPort = 0; - for(std::list<QString>::iterator i = hosts.begin();i != hosts.end();i++) { + for(std::list<QString>::iterator i = hosts.begin(); i != hosts.end(); i++) { if((*i).isEmpty()) sqlNet = true; - else if((*i).startsWith(":")) { + else if((*i).startsWith(":")) DefaultPort = (*i).mid(1).toInt(); - } else Host->addItem(*i); } - Port->setValue(DefaultPort); - if(sqlNet) { - HostLabel->hide(); - Host->hide(); - PortLabel->hide(); - Port->hide(); - } - else { - HostLabel->show(); - Host->show(); - PortLabel->show(); - Port->show(); - } - Host->lineEdit()->setText(current); - for(std::list<QWidget *>::iterator k = OptionWidgets.begin();k != OptionWidgets.end();k++) { - // char* are QString-ized here due the correct warning: - // "comparison with string literal results in unspecified behaviour" - if(QString((*k)->metaObject()->className()) == QString("QCheckBox")) { - QCheckBox *box = (QCheckBox *)(*k); - Options[box->text()] = box->isChecked(); - } - delete *k; + // seems broke this + if(!DefaultPort) { + QString prov = Provider->currentText(); + if(prov == "Oracle") + DefaultPort = 1521; } - OptionWidgets.clear(); - std::list<QString> options = toConnectionProvider::options(Provider->currentText().toLatin1()); - for(std::list<QString>::iterator j = options.begin();j != options.end();j++) { - if((*j) == "-") { - QFrame *frame = new QFrame(OptionGroup); - frame->setFrameShape(QFrame::HLine); - frame->setFrameShadow(QFrame::Sunken); - OptionGroup->layout()->addWidget(frame); - frame->show(); - OptionWidgets.insert(OptionWidgets.end(), frame); - } - else { - QString option = *j; - bool defOn = false; - if(option.startsWith("*")) { - defOn = true; - option = option.mid(1); - } + Port->setValue(DefaultPort); - QCheckBox *ow = new QCheckBox(OptionGroup); - ow->setText(option); - if(Options.find(option) != Options.end()) - ow->setChecked((*(Options.find(option))).second); - else - ow->setChecked(defOn); - OptionGroup->layout()->addWidget(ow); - ow->show(); - OptionWidgets.insert(OptionWidgets.end(), ow); + QList<QWidget *> widgets = OptionGroup->findChildren<QWidget *>(); + Q_FOREACH(QWidget *w, widgets) + delete w; + + std::list<QString> options = toConnectionProvider::options( + Provider->currentText()); + for(std::list<QString>::iterator j = options.begin(); + j != options.end(); + j++) { + + if(*j == "-") + continue; + + QString option = *j; + bool defOn = false; + if(option.startsWith("*")) { + defOn = true; + option = option.mid(1); } + + QCheckBox *ow = new QCheckBox(OptionGroup); + ow->setText(option); + ow->setChecked(defOn); + OptionGroup->layout()->addWidget(ow); + ow->show(); } + if(options.empty()) OptionGroup->hide(); else OptionGroup->show(); - } catch(const QString &str) { - Host->clear(); toStatusMessage(str); } } -void toNewConnection::changeHost(void) -{ - try { - if(!Host->isHidden()) { - QString host; - host = Host->currentText(); - std::list<QString> databases = toConnectionProvider::databases(Provider->currentText().toLatin1(), - host, - Username->text(), - Password->text()); - QString current = Database->currentText(); - Database->clear(); - for(std::list<QString>::iterator i = databases.begin();i != databases.end();i++) - Database->addItem(*i); - Database->lineEdit()->setText(current); - } - } - catch(const QString &str) { - Database->clear(); - toStatusMessage(str); - } -} - -void toNewConnection::processOptions(const QString &str) -{ - QStringList options = str.split(","); - std::map<QString, bool> values; - for(int i = 0;i < options.count();i++) { - QString val = options[i]; - if(val.startsWith("*")) - values[val.mid(1)] = true; - else - values[val] = false; - } - for(std::list<QWidget *>::iterator k = OptionWidgets.begin();k != OptionWidgets.end();k++) { - // char* are QString-ized here due the correct warning: - // "comparison with string literal results in unspecified behaviour" - if(QString((*k)->metaObject()->className()) == QString("QCheckBox")) { - QCheckBox *box = (QCheckBox *)(*k); - if(values.find(box->text()) != values.end()) - box->setChecked(values[box->text()]); - } - } -} - - -toConnection *toNewConnection::makeConnection(void) { - // make sure widgets don't change on us - disconnect(Previous, - SIGNAL(selectionChanged()), - this, - SLOT(historySelection())); - +toConnection* toNewConnection::makeConnection(void) { try { - toConfigurationSingle::Instance().globalSetConfig( - CONF_PROVIDER, Provider->currentText()); - toConfigurationSingle::Instance().globalSetConfig( - CONF_USER, Username->text()); QString pass; QString host; if(!Host->isHidden()) @@ -369,80 +382,62 @@ QString optionstring; std::set<QString> options; - for(std::list<QWidget *>::iterator k = OptionWidgets.begin(); - k != OptionWidgets.end(); - k++) - { - QCheckBox *box = dynamic_cast<QCheckBox *>(*k); - if(box) { - if(!optionstring.isEmpty()) - optionstring += ","; - if(box->isChecked()) { - optionstring += "*"; - options.insert(box->text()); - } - optionstring += box->text(); + QList<QCheckBox *> widgets = OptionGroup->findChildren<QCheckBox *>(); + Q_FOREACH(QCheckBox *box, widgets) { + if(!optionstring.isEmpty()) + optionstring += ","; + + if(box->isChecked()) { + optionstring += "*"; + + // ug. this is awesome. i broke it when i added + // accelerators. + options.insert(box->text().replace("&", "")); } + + optionstring += box->text(); } - toConfigurationSingle::Instance().globalSetConfig(CONF_OPTIONS, optionstring); + + // checks for existing connection std::list<QString> con = toMainWidget()->connections(); for(std::list<QString>::iterator i = con.begin();i != con.end();i++) { try { toConnection &conn = toMainWidget()->connection(*i); if(conn.user() == Username->text() && - conn.provider() == Provider->currentText().toLatin1() && - conn.host() == host && - conn.database() == Database->currentText()) + conn.provider() == Provider->currentText().toLatin1() && + conn.host() == host && + conn.database() == Database->currentText()) return &conn; } catch(...) {} } - if(Port->value() != 0 && Port->value() != DefaultPort) + + QString provider = Provider->currentText(); + + if(Port->value() != 0 && Port->value()) host += ":" + QString::number(Port->value()); - toConfigurationSingle::Instance().globalSetConfig(CONF_HOST, host); + QString database = Database->currentText(); + if(provider == "Oracle") { + // create the rest of the connect string. this will work + // without an ORACLE_HOME. + int port = Port->value(); + database = "//" + Host->currentText() + + ":" + QString::number(port) + + "/" + database; + host = ""; + } + toConnection *retCon = new toConnection( - Provider->currentText().toLatin1(), + provider, Username->text(), Password->text(), host, - Database->currentText(), + database, options); - { - QTreeWidgetItemIterator it(Previous); - for(; (*it); it++) { - if((*it)->text(0) == Provider->currentText() && - (((*it)->text(1) == host) || ((*it)->text(1).isEmpty() && - host.isEmpty())) && - (*it)->text(2) == Database->currentText() && - (*it)->text(3) == Username->text()) { - delete (*it); - break; - } - } - } - if(!toConfigurationSingle::Instance().globalConfig( - CONF_SAVE_PWD, DEFAULT_SAVE_PWD).isEmpty()) - pass = retCon->password(); - else - pass = DEFAULT_PASSWORD; - toConfigurationSingle::Instance().globalSetConfig( - CONF_PASSWORD, toObfuscate(pass)); - toConfigurationSingle::Instance().globalSetConfig( - CONF_DATABASE, Database->currentText()); - - new toTreeWidgetItem(Previous, - NULL, - Provider->currentText(), - host, - Database->currentText(), - Username->text(), - retCon->password(), - optionstring); - historySave(); return retCon; } catch(const QString &exc) { @@ -455,124 +450,15 @@ } } -void toNewConnection::historySave(void) -{ - int siz = toConfigurationSingle::Instance().globalConfig( - CONF_CONNECT_SIZE, - DEFAULT_CONNECT_SIZE).toInt(); - int i = 0; - int j = 0; - - QTreeWidgetItemIterator it(Previous); - for(; i < siz; it++, i++) { - QString path = CONF_CONNECT_HISTORY; - path += ":"; - path += QString::number(i).toLatin1(); - - QString tmp = path; - tmp += CONF_PROVIDER; - if(i < siz && (*it)) - toConfigurationSingle::Instance().globalSetConfig(tmp, (*it)->text(0)); - else - toConfigurationSingle::Instance().globalEraseConfig(tmp); - - tmp = path; - tmp += CONF_HOST; - if(i < siz && (*it)) - toConfigurationSingle::Instance().globalSetConfig(tmp, (*it)->text(1)); - else - toConfigurationSingle::Instance().globalEraseConfig(tmp); - - tmp = path; - tmp += CONF_DATABASE; - if(i < siz && (*it)) - toConfigurationSingle::Instance().globalSetConfig(tmp, (*it)->text(2)); - else - toConfigurationSingle::Instance().globalEraseConfig(tmp); - - tmp = path; - tmp += CONF_USER; - if(i < siz && (*it)) - toConfigurationSingle::Instance().globalSetConfig(tmp, (*it)->text(3)); - else - toConfigurationSingle::Instance().globalEraseConfig(tmp); - - tmp = path; - tmp += CONF_PASSWORD; - if(i < siz && (*it)) - toConfigurationSingle::Instance().globalSetConfig(tmp, toObfuscate((*it)->text(4))); - else - toConfigurationSingle::Instance().globalEraseConfig(tmp); - - tmp = path; - tmp += CONF_OPTIONS; - if(i < siz && (*it)) - toConfigurationSingle::Instance().globalSetConfig(tmp, (*it)->text(5)); - else - toConfigurationSingle::Instance().globalEraseConfig(tmp); - - if(i < siz && (*it)) - j++; - } - toConfigurationSingle::Instance().globalSetConfig( - CONF_CONNECT_CURRENT, QString::number(j)); - toConfigurationSingle::Instance().saveConfig(); +void toNewConnection::previousMenu(const QPoint &pos) { + Q_UNUSED(pos); + PreviousContext->exec(QCursor::pos()); } -void toNewConnection::historySelection(void) -{ - toTreeWidgetItem *item = Previous->selectedItem(); - if(item) { - for(int i = 0;i < Provider->count();i++) - if(Provider->itemText(i) == item->text(0)) { - Provider->setCurrentIndex(i); - break; - } - changeProvider(); - QString host = item->text(1); - int portix = host.indexOf(":"); - if(portix >= 0) { - Host->lineEdit()->setText(host.mid(0, portix)); - Port->setValue(host.mid(portix + 1).toInt()); - } - else { - Host->lineEdit()->setText(host); - Port->setValue(DefaultPort); - } - - processOptions(item->text(5)); - - Database->lineEdit()->setText(item->text(2)); - Username->setText(item->text(3)); - if(item->text(4) != DEFAULT_PASSWORD) - Password->setText(item->text(4)); - } +void toNewConnection::historyDelete() { + QModelIndexList list = Previous->selectionModel()->selectedIndexes(); + if(list.size() > 0) + Previous->removeRow(list.at(0).row()); } - -void toNewConnection::historyConnect(void) -{ - bool ok = true; - if(toConfigurationSingle::Instance().globalConfig(CONF_SAVE_PWD, DEFAULT_SAVE_PWD).isEmpty()) { - ok = false; - QString name = QInputDialog::getText(this, - tr("Enter password"), - tr("Enter password to use for connection."), - QLineEdit::Password, - QString::null, &ok); - if(ok) - Password->setText(name); - } - if(ok) - accept(); -} - -void toNewConnection::historyDelete() -{ - toTreeWidgetItem *item = Previous->selectedItem(); - if(item) { - delete item; - historySave(); - } -} Modified: trunk/tora/src/tonewconnection.h =================================================================== --- trunk/tora/src/tonewconnection.h 2008-03-18 01:10:49 UTC (rev 2627) +++ trunk/tora/src/tonewconnection.h 2008-03-21 05:45:47 UTC (rev 2628) @@ -1,79 +1,175 @@ +/* -*- Mode: C++ -*- */ /***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 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 without written consent from Quest Software, Inc. -* Observe that this does not disallow linking to the Qt Free Edition. -* -* You may link this product with any GPL'd Qt library such as Qt/Free -* -* All trademarks belong to their respective owners. -* -*****/ + * + * TOra - An Oracle Toolkit for DBA's and developers + * Copyright (C) 2003-2005 Quest Software, Inc + * Portions Copyright (C) 2005 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 without written consent from Quest Software, Inc. + * Observe that this does not disallow linking to the Qt Free Edition. + * + * You may link this product with any GPL'd Qt library such as Qt/Free + * + * All trademarks belong to their respective owners. + * + *****/ #ifndef TONEWCONNECTION_H #define TONEWCONNECTION_H -#define TONEWCONNECTION_DELETE 1 - #include "config.h" #include "ui_tonewconnectionui.h" #include "tohelp.h" +#include "toconnection.h" +#include <QMap> +#include <QVector> +#include <QSettings> + +#include <set> + class toConnection; +class QMenu; +/** + * Simple class for storing connection options and comparisons. + * + */ +class toConnectionOptions { +public: + QString provider; + QString host; + QString database; + QString username; + QString password; + int port; + std::set<QString> options; + + // must have for qmap + toConnectionOptions() { + } + + toConnectionOptions(const QString &_prov, + const QString &_host, + const QString &_data, + const QString &_user, + const QString &_pass, + int _port, + std::set<QString> _options) { + provider = _prov; + host = _host; + database = _data; + username = _user; + password = _pass; + port = _port; + options = _options; + } + + bool operator==(const toConnectionOptions &other) { + return provider == other.provider && + host == other.host && + database == other.database && + username == other.username; + } + + bool operator!=(const toConnectionOptions &other) { + return !operator==(other); + } +}; + + class toNewConnection : public QDialog, - public Ui::toNewConnectionUI, - public toHelpContext { + public Ui::toNewConnectionUI, + public toHelpContext { Q_OBJECT; +private: + QSettings Settings; + // provider's default port int DefaultPort; - std::map<QString, bool> Options; - std::list<QWidget *> OptionWidgets; + QMenu *PreviousContext; - void processOptions(const QString &); + // an enum to keep the columns in qtablewidget straight + enum PreviousColumns { + IndexColumn = 0, + ProviderColumn, + HostColumn, + DatabaseColumn, + UsernameColumn + }; + // stores connection options by unique id. these are read from the + // settings class. + QMap<int, toConnectionOptions> OptionMap; + + // connection created by dialog + toConnection *NewConnection; + + void readSettings(void); + void writeSettings(void); + int findHistory(const QString &provider, + const QString &username, + const QString &host, + const QString &database); + // fills form with data from previous connection at param row + void loadPrevious(int row); + + toConnection* makeConnection(); + +public slots: + virtual void done(int r); + public: toNewConnection(QWidget* parent = 0, - QString name = QString(), - bool modal = false, Qt::WFlags fl = 0); - ~toNewConnection(); - toConnection *makeConnection(); + toConnection* connection() { + return NewConnection; + } + public slots: - virtual void historyDelete(void); - virtual void historySelection(void); - virtual void changeProvider(void); - virtual void changeHost(void); - virtual void historyConnect(void); - virtual void historySave(void); + + /** + * Handles selection changes in Previous. On selecting a new row, + * will load details from history. + * + */ + void previousCellChanged(int currentRow, + int currentColumn, + int previousRow, + int previousColumn); + void previousMenu(const QPoint &pos); + void historyDelete(void); +// virtual void historySelection(void); + void changeProvider(int current); +// virtual void changeHost(void); +// virtual void historyConnect(void); +// virtual void historySave(void); }; + #endif // TONEWCONNECTION_H Modified: trunk/tora/src/tonewconnectionui.ui =================================================================== --- trunk/tora/src/tonewconnectionui.ui 2008-03-18 01:10:49 UTC (rev 2627) +++ trunk/tora/src/tonewconnectionui.ui 2008-03-21 05:45:47 UTC (rev 2628) @@ -5,313 +5,382 @@ <rect> <x>0</x> <y>0</y> - <width>750</width> - <height>473</height> + <width>593</width> + <height>559</height> </rect> </property> <property name="windowTitle" > <string>New connection</string> </property> - <layout class="QGridLayout" > - <property name="leftMargin" > - <number>11</number> - </property> - <property name="topMargin" > - <number>11</number> - </property> - <property name="rightMargin" > - <number>11</number> - </property> - <property name="bottomMargin" > - <number>11</number> - </property> - <property name="horizontalSpacing" > - <number>6</number> - </property> - <property name="verticalSpacing" > - <number>6</number> - </property> - <item row="13" column="3" > - <widget class="QPushButton" name="CancelButton" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text" > - <string>Cancel</string> - </property> - </widget> + <layout class="QVBoxLayout" > + <item> + <layout class="QHBoxLayout" > + <item> + <layout class="QVBoxLayout" > + <item> + <widget class="QLabel" name="TextLabel2" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip" > + <string>A list of previous connections. Select to bring over to the right.</string> + </property> + <property name="text" > + <string>Previous &connections</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="buddy" > + <cstring>Previous</cstring> + </property> + </widget> + </item> + <item> + <widget class="QTableWidget" name="Previous" > + <property name="editTriggers" > + <set>QAbstractItemView::NoEditTriggers</set> + </property> + <property name="dragDropOverwriteMode" > + <bool>false</bool> + </property> + <property name="dragDropMode" > + <enum>QAbstractItemView::InternalMove</enum> + </property> + <property name="alternatingRowColors" > + <bool>true</bool> + </property> + <property name="selectionMode" > + <enum>QAbstractItemView::SingleSelection</enum> + </property> + <property name="selectionBehavior" > + <enum>QAbstractItemView::SelectRows</enum> + </property> + <property name="showGrid" > + <bool>false</bool> + </property> + <property name="gridStyle" > + <enum>Qt::NoPen</enum> + </property> + <property name="sortingEnabled" > + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </item> + <item> + <layout class="QVBoxLayout" > + <property name="spacing" > + <number>2</number> + </property> + <item> + <widget class="QLabel" name="ProviderLabel" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Preferred" hsizetype="Minimum" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text" > + <string>Connection pro&vider</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="buddy" > + <cstring>Provider</cstring> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="Provider" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="TextLabel1" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip" > + <string>Username to connect with</string> + </property> + <property name="text" > + <string>&Username</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="buddy" > + <cstring>Username</cstring> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="Username" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize" > + <size> + <width>200</width> + <height>0</height> + </size> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="TextLabel1_2" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Minimum" hsizetype="Minimum" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip" > + <string>Password to connect with.</string> + </property> + <property name="text" > + <string>&Password</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="buddy" > + <cstring>Password</cstring> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="Password" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="echoMode" > + <enum>QLineEdit::Password</enum> + </property> + </widget> + </item> + <item> + <widget class="QLabel" name="HostLabel" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Preferred" hsizetype="Minimum" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="toolTip" > + <string>Select the database ID to connect to.</string> + </property> + <property name="text" > + <string>&Host</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="buddy" > + <cstring>Host</cstring> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="Host" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Maximum" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize" > + <size> + <width>200</width> + <height>0</height> + </size> + </property> + <property name="editable" > + <bool>true</bool> + </property> + <property name="autoCompletion" > + <bool>true</bool> + </property> + <property name="duplicatesEnabled" > + <bool>false</bool> + </property> + </widget> + </item> + <item> + <layout class="QHBoxLayout" > + <property name="spacing" > + <number>0</number> + </property> + <item> + <widget class="QLabel" name="PortLabel" > + <property name="toolTip" > + <string>Select the database ID to connect to.</string> + </property> + <property name="text" > + <string>P&ort</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="buddy" > + <cstring>Port</cstring> + </property> + </widget> + </item> + <item> + <widget class="QSpinBox" name="Port" > + <property name="maximum" > + <number>65535</number> + </property> + </widget> + </item> + </layout> + </item> + <item> + <widget class="QLabel" name="TextLabel3" > + <property name="toolTip" > + <string>Select the database ID to connect to.</string> + </property> + <property name="text" > + <string>&Database</string> + </property> + <property name="wordWrap" > + <bool>false</bool> + </property> + <property name="textInteractionFlags" > + <set>Qt::NoTextInteraction</set> + </property> + <property name="buddy" > + <cstring>Database</cstring> + </property> + </widget> + </item> + <item> + <widget class="QComboBox" name="Database" > + <property name="sizePolicy" > + <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize" > + <size> + <width>200</width> + <height>0</height> + </size> + </property> + <property name="editable" > + <bool>true</bool> + </property> + <property name="autoCompletion" > + <bool>true</bool> + </property> + <property name="duplicatesEnabled" > + <bool>false</bool> + </property> + </widget> + </item> + <item> + <widget class="QGroupBox" name="OptionGroup" > + <property name="focusPolicy" > + <enum>Qt::NoFocus</enum> + </property> + <property name="title" > + <string>Options</string> + </property> + <layout class="QVBoxLayout" > + <property name="spacing" > + <number>3</number> + </property> + <property name="leftMargin" > + <number>6</number> + </property> + <property name="topMargin" > + <number>0</number> + </property> + <property name="rightMargin" > + <number>0</number> + </property> + <property name="bottomMargin" > + <number>0</number> + </property> + <item> + <widget class="QCheckBox" name="SqlNet" > + <property name="text" > + <string>SQL*&Net</string> + </property> + <property name="checked" > + <bool>true</bool> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="SysDba" > + <property name="text" > + <string>S&YSDBA</string> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="SysOper" > + <property name="text" > + <string>SYSOP&ER</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + <item> + <spacer> + <property name="orientation" > + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" > + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> + </layout> + </item> + </layout> </item> - <item row="13" column="2" > - <widget class="QPushButton" name="OkButton" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="text" > - <string>&Ok</string> - </property> - <property name="default" > - <bool>true</bool> - </property> - </widget> - </item> - <item row="13" column="0" colspan="2" > - <spacer> + <item> + <widget class="QDialogButtonBox" name="ButtonBox" > <property name="orientation" > <enum>Qt::Horizontal</enum> </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> + <property name="standardButtons" > + <set>QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok</set> </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item rowspan="12" row="1" column="0" > - <widget class="toListView" native="1" name="Previous" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Expanding" hsizetype="Expanding" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="focusPolicy" > - <enum>Qt::StrongFocus</enum> - </property> </widget> </item> - <item row="0" column="0" > - <widget class="QLabel" name="TextLabel2" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip" > - <string>A list of previous connections. Select to bring over to the right.</string> - </property> - <property name="text" > - <string>&Previous connections</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - <property name="buddy" > - <cstring>Previous</cstring> - </property> - </widget> - </item> - <item row="5" column="1" colspan="3" > - <widget class="QLineEdit" name="Password" > - <property name="echoMode" > - <enum>QLineEdit::Password</enum> - </property> - </widget> - </item> - <item row="2" column="1" colspan="3" > - <widget class="QLabel" name="TextLabel1" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Fixed" hsizetype="Minimum" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip" > - <string>Username to connect with</string> - </property> - <property name="text" > - <string>&Username</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - <property name="buddy" > - <cstring>Username</cstring> - </property> - </widget> - </item> - <item row="4" column="1" colspan="3" > - <widget class="QLabel" name="TextLabel1_2" > - <property name="sizePolicy" > - <sizepolicy vsizetype="Minimum" hsizetype="Expanding" > - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="toolTip" > - <string>Password to connect with.</string> - </property> - <property name="text" > - <string>&Password</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - <property name="buddy" > - <cstring>Password</cstring> - </property> - </widget> - </item> - <item row="3" column="1" colspan="3" > - <widget class="QLineEdit" name="Username" /> - </item> - <item row="0" column="1" colspan="3" > - <widget class="QLabel" name="ProviderLabel" > - <property name="text" > - <string>Connection provider</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - <property name="buddy" > - <cstring>Provider</cstring> - </property> - </widget> - </item> - <item row="1" column="1" colspan="3" > - <widget class="QComboBox" name="Provider" /> - </item> - <item row="10" column="1" colspan="3" > - <widget class="QComboBox" name="Database" > - <property name="editable" > - <bool>true</bool> - </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> - <property name="duplicatesEnabled" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="9" column="1" colspan="3" > - <widget class="QLabel" name="TextLabel3" > - <property name="toolTip" > - <string>Select the database ID to connect to.</string> - </property> - <property name="text" > - <string>&Database</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - <property name="buddy" > - <cstring>Database</cstring> - </property> - </widget> - </item> - <item row="7" column="1" colspan="3" > - <widget class="QComboBox" name="Host" > - <property name="editable" > - <bool>true</bool> - </property> - <property name="autoCompletion" > - <bool>true</bool> - </property> - <property name="duplicatesEnabled" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="6" column="1" colspan="3" > - <widget class="QLabel" name="HostLabel" > - <property name="toolTip" > - <string>Select the database ID to connect to.</string> - </property> - <property name="text" > - <string>&Host</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - <property name="buddy" > - <cstring>Host</cstring> - </property> - </widget> - </item> - <item row="8" column="1" colspan="2" > - <widget class="QLabel" name="PortLabel" > - <property name="toolTip" > - <string>Select the database ID to connect to.</string> - </property> - <property name="text" > - <string>&Port</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - <property name="buddy" > - <cstring>Host</cstring> - </property> - </widget> - </item> - <item row="8" column="3" > - <widget class="QSpinBox" name="Port" > - <property name="maximum" > - <number>65535</number> - </property> - </widget> - </item> - <item row="11" column="1" colspan="3" > - <widget class="QGroupBox" name="OptionGroup" > - <property name="focusPolicy" > - <enum>Qt::StrongFocus</enum> - </property> - <property name="title" > - <string>Options</string> - </property> - <layout class="QVBoxLayout" > - <property name="leftMargin" > - <number>11</number> - </property> - <property name="topMargin" > - <number>11</number> - </property> - <property name="rightMargin" > - <number>11</number> - </property> - <property name="bottomMargin" > - <number>6</number> - </property> - </layout> - </widget> - </item> - <item row="12" column="1" > - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - ... [truncated message content] |
From: <mrj...@us...> - 2008-03-22 20:53:52
|
Revision: 2630 http://tora.svn.sourceforge.net/tora/?rev=2630&view=rev Author: mrjohnson0 Date: 2008-03-22 13:53:58 -0700 (Sat, 22 Mar 2008) Log Message: ----------- add support for using either oracle tns or instant client at runtime Modified Paths: -------------- trunk/tora/src/tonewconnection.cpp trunk/tora/src/tonewconnection.h Modified: trunk/tora/src/tonewconnection.cpp =================================================================== --- trunk/tora/src/tonewconnection.cpp 2008-03-22 19:25:11 UTC (rev 2629) +++ trunk/tora/src/tonewconnection.cpp 2008-03-22 20:53:58 UTC (rev 2630) @@ -53,7 +53,10 @@ #define MAX_HISTORY 50 +static const QString ORACLE_INSTANT = "Oracle (Instant Client)"; +static const QString ORACLE_TNS = "Oracle (TNS)"; + toNewConnection::toNewConnection( QWidget* parent, Qt::WFlags fl) : QDialog(parent, fl), @@ -63,8 +66,15 @@ std::list<QString> lst = toConnectionProvider::providers(); - Q_FOREACH(QString s, lst) - Provider->addItem(s); + Q_FOREACH(QString s, lst) { + if(s == "Oracle") { + Provider->addItem(ORACLE_INSTANT); + if(getenv("ORACLE_HOME")) + Provider->addItem(ORACLE_TNS); + } + else + Provider->addItem(s); + } if(Provider->count() < 1) { TOMessageBox::information( @@ -75,16 +85,6 @@ reject(); return; } -#if !defined(TO_INSTANT_CLIENT) && !defined(TO_NO_ORACLE) - else if(!getenv("ORACLE_HOME") && Provider->findText("Oracle") > -1) { - QMessageBox::warning( - this, - tr("Warning"), - tr("No ORACLE_HOME defined. If you're using an instant client " - "you should recompile with --with-instant-client or " - "TO_INSTANT_CLIENT defined.")); - } -#endif NewConnection = 0; @@ -146,6 +146,15 @@ } +QString toNewConnection::realProvider() { + QString p = Provider->currentText(); + if(p.startsWith("Oracle")) + return "Oracle"; + + return p; +} + + void toNewConnection::readSettings() { resize(Settings.value("size", QSize(657, 550)).toSize()); @@ -320,15 +329,16 @@ void toNewConnection::changeProvider(int current) { try { - std::list<QString> hosts = toConnectionProvider::hosts( - Provider->currentText()); + QString provider = realProvider(); + if(provider.isNull() || provider.isEmpty()) + return; - bool sqlNet = false; + std::list<QString> hosts = toConnectionProvider::hosts(provider); DefaultPort = 0; for(std::list<QString>::iterator i = hosts.begin(); i != hosts.end(); i++) { if((*i).isEmpty()) - sqlNet = true; + continue; else if((*i).startsWith(":")) DefaultPort = (*i).mid(1).toInt(); else @@ -337,15 +347,13 @@ // seems i broke this for oracle if(!DefaultPort) { - QString prov = Provider->currentText(); - if(prov == "Oracle") + if(provider.startsWith("Oracle")) DefaultPort = 1521; } Port->setValue(DefaultPort); -#ifndef TO_INSTANT_CLIENT - if(sqlNet) { + if(Provider->currentText() == ORACLE_TNS) { HostLabel->hide(); Host->hide(); PortLabel->hide(); @@ -357,14 +365,12 @@ PortLabel->show(); Port->show(); } -#endif QList<QWidget *> widgets = OptionGroup->findChildren<QWidget *>(); Q_FOREACH(QWidget *w, widgets) delete w; - std::list<QString> options = toConnectionProvider::options( - Provider->currentText()); + std::list<QString> options = toConnectionProvider::options(provider); for(std::list<QString>::iterator j = options.begin(); j != options.end(); j++) { @@ -430,7 +436,7 @@ try { toConnection &conn = toMainWidget()->connection(*i); if(conn.user() == Username->text() && - conn.provider() == Provider->currentText().toLatin1() && + conn.provider() == realProvider() && conn.host() == host && conn.database() == Database->currentText()) return &conn; @@ -438,15 +444,14 @@ catch(...) {} } - QString provider = Provider->currentText(); + QString provider = realProvider(); if(Port->value() != 0 && Port->value()) host += ":" + QString::number(Port->value()); QString database = Database->currentText(); -#ifdef TO_INSTANT_CLIENT - if(provider == "Oracle") { + if(Provider->currentText() == ORACLE_INSTANT) { // create the rest of the connect string. this will work // without an ORACLE_HOME. @@ -456,7 +461,6 @@ "/" + database; host = ""; } -#endif toConnection *retCon = new toConnection( provider, Modified: trunk/tora/src/tonewconnection.h =================================================================== --- trunk/tora/src/tonewconnection.h 2008-03-22 19:25:11 UTC (rev 2629) +++ trunk/tora/src/tonewconnection.h 2008-03-22 20:53:58 UTC (rev 2630) @@ -129,6 +129,7 @@ // connection created by dialog toConnection *NewConnection; + QString realProvider(void); void readSettings(void); void writeSettings(void); int findHistory(const QString &provider, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-03-24 05:11:30
|
Revision: 2632 http://tora.svn.sourceforge.net/tora/?rev=2632&view=rev Author: mrjohnson0 Date: 2008-03-23 22:11:36 -0700 (Sun, 23 Mar 2008) Log Message: ----------- call processEvents so the gui doesn't hang while reading data into model. moves readall logic to model Modified Paths: -------------- trunk/tora/src/toresultmodel.cpp trunk/tora/src/toresultmodel.h trunk/tora/src/toresulttableview.cpp Modified: trunk/tora/src/toresultmodel.cpp =================================================================== --- trunk/tora/src/toresultmodel.cpp 2008-03-22 21:02:44 UTC (rev 2631) +++ trunk/tora/src/toresultmodel.cpp 2008-03-24 05:11:36 UTC (rev 2632) @@ -88,6 +88,16 @@ } +void toResultModel::readAll() { + QModelIndex index; + + while(canFetchMore(index)) { + fetchMore(index); + qApp->processEvents(); + } +} + + void toResultModel::readData() { if(!Query) { cleanup(); @@ -386,11 +396,14 @@ * returning the number of children of parent. */ int toResultModel::columnCount(const QModelIndex &parent) const { + Q_UNUSED(parent); return Headers.size(); } bool toResultModel::canFetchMore(const QModelIndex &parent) const { + Q_UNUSED(parent); + // sometimes the view calls this before the query has even // run. if(First) @@ -409,6 +422,8 @@ void toResultModel::fetchMore(const QModelIndex &parent) { + Q_UNUSED(parent); + // sometimes the view calls this before the query has even // run. don't actually increase max until we've hit it. if(MaxNumber < 0 || MaxNumber <= CurrentRow) Modified: trunk/tora/src/toresultmodel.h =================================================================== --- trunk/tora/src/toresultmodel.h 2008-03-22 21:02:44 UTC (rev 2631) +++ trunk/tora/src/toresultmodel.h 2008-03-24 05:11:36 UTC (rev 2632) @@ -194,7 +194,7 @@ * otherwise false. * */ - virtual bool canFetchMore(const QModelIndex &parent) const; + virtual bool canFetchMore(const QModelIndex &parent = QModelIndex()) const; /** @@ -317,6 +317,15 @@ */ void rowDeleted(const toResultModel::Row &row); + +public slots: + /** + * Load all data into model until end of query + * + */ + void readAll(void); + + protected slots: /** Modified: trunk/tora/src/toresulttableview.cpp =================================================================== --- trunk/tora/src/toresulttableview.cpp 2008-03-22 21:02:44 UTC (rev 2631) +++ trunk/tora/src/toresulttableview.cpp 2008-03-24 05:11:36 UTC (rev 2632) @@ -334,9 +334,7 @@ else if(action == editAct) toMainWidget()->editSQL(sqlName()); else if(action == readAllAct || action == rowCountAct) { - QModelIndex index; - while(Model->canFetchMore(index)) - Model->fetchMore(index); + Model->readAll(); if(action == rowCountAct) { int count = Model->rowCount(); @@ -362,11 +360,8 @@ void toResultTableView::handleReset(void) { - if(ReadAll) { - QModelIndex index; - while(Model->canFetchMore(index)) - Model->fetchMore(index); - } + if(ReadAll) + Model->readAll(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-03-25 12:47:33
|
Revision: 2633 http://tora.svn.sourceforge.net/tora/?rev=2633&view=rev Author: subik Date: 2008-03-25 05:47:34 -0700 (Tue, 25 Mar 2008) Log Message: ----------- license is "human readable" in the Help/License dialog. Some contributors names are encoded with html entities to be displayed correctly Modified Paths: -------------- trunk/tora/src/LICENSE.h trunk/tora/src/toabout.cpp Modified: trunk/tora/src/LICENSE.h =================================================================== --- trunk/tora/src/LICENSE.h 2008-03-24 05:11:36 UTC (rev 2632) +++ trunk/tora/src/LICENSE.h 2008-03-25 12:47:34 UTC (rev 2633) @@ -1,351 +1,285 @@ static const char *LicenseText = - "\n" - " The Toolkit for Oracle is Copyright (C) 2003-2005 Quest Software, Inc.\n" - " Portions Copyright (C) 2005 Other Contributors\n" - " \n" - " You may use, distribute and copy Toolkit for Oracle under the terms of\n" - " GNU General Public License version 2, which is displayed below.\n" - "\n" - "-------------------------------------------------------------------------\n" - "\n" - " GNU GENERAL PUBLIC LICENSE\n" - " Version 2, June 1991\n" - "\n" - " Copyright (C) 1989, 1991 Free Software Foundation, Inc.\n" - " 675 Mass Ave, Cambridge, MA 02139, 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" - " Appendix: 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) 19yy <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., 675 Mass Ave, Cambridge, MA 02139, USA.\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) 19yy 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" - "\n" - "-------------------------------------------------------------------------\n"; + "<html><body><p>" + " The Toolkit for Oracle is Copyright (C) 2003-2005 Quest Software, Inc." + " Portions Copyright (C) 2005 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>"; Modified: trunk/tora/src/toabout.cpp =================================================================== --- trunk/tora/src/toabout.cpp 2008-03-24 05:11:36 UTC (rev 2632) +++ trunk/tora/src/toabout.cpp 2008-03-25 12:47:34 UTC (rev 2633) @@ -74,15 +74,15 @@ "<LI><B>Oliver Jehle</B>\n" "<LI><B>Raj Thukral</B>\n" "<LI><B>Thomas Porschberg</B>\n" - "<LI><B>Volker G�tz</B>\n" + "<LI><B>Volker Götz</B>\n" "<LI><B>Henrik Johnson</B>\n" "</UL>\n" "Contributors (In alphabetical order):<P>\n" "<UL>\n" "<LI><B>Alexander (Leo) Bergolth</B> - Access to Oracle 7 database.\n" - "<LI><B>Volker G�tz</B> - Improved PostgreSQL support.\n" + "<LI><B>Volker Götz</B> - Improved PostgreSQL support.\n" "<LI><B>Oliver Jehle</B> - Object caching to disc, SAP and much more.\n" - "<LI><B>Christoph K\xFCmmel-Schulte</B> - Various work on qt4 port and windows support.\n" + "<LI><B>Christoph Kümmel-Schulte</B> - Various work on qt4 port and windows support.\n" "<LI><B>Sergei Kuchin</B> - Oracle Template Library.\n" "<LI><B>Michael Meskes</B> - Debian maintainer (<A HREF=http://www.debian.org>http://www.debian.org/</A>).\n" "<LI><B>Selcuk Ozturk</B> - Improved content editor.\n" @@ -106,7 +106,7 @@ "<B>Frits Hoogland</B>,\n" "<B>Mihai Ibanescu</B>,\n" "<B>Bo Johansson</B>,\n" - "<B>Olof J�nsson</B>,\n" + "<B>Olof Jönsson</B>,\n" "<B>Michael Kaes</B>,\n" "<B>Norbert Kiesel</B>,\n" "<B>Pawe=B3 Kucharczyk</B>,\n" @@ -147,7 +147,7 @@ if(page == License) { setWindowTitle(tr("GNU General Public License")); - TextView->setPlainText(tr(LicenseText)); + TextView->setHtml(tr(LicenseText)); if (parent) CancelButton->hide(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |