From: <mrj...@us...> - 2008-08-17 18:22:15
|
Revision: 2949 http://tora.svn.sourceforge.net/tora/?rev=2949&view=rev Author: mrjohnson0 Date: 2008-08-17 18:22:25 +0000 (Sun, 17 Aug 2008) Log Message: ----------- use tocodemodel with plsql editor Modified Paths: -------------- trunk/tora/src/toplsqleditor.cpp trunk/tora/src/toplsqleditor.h Modified: trunk/tora/src/toplsqleditor.cpp =================================================================== --- trunk/tora/src/toplsqleditor.cpp 2008-08-17 18:07:41 UTC (rev 2948) +++ trunk/tora/src/toplsqleditor.cpp 2008-08-17 18:22:25 UTC (rev 2949) @@ -39,7 +39,9 @@ #include <QMdiSubWindow> #include <QMdiArea> #include <QSettings> +#include <QTreeView> +#include "config.h" #include "utils.h" #include "toconnection.h" #include "totreewidget.h" @@ -49,6 +51,7 @@ #include "tosql.h" #include "toresultview.h" #include "toplsqltext.h" +#include "tocodemodel.h" #include "icons/close.xpm" #include "icons/compile.xpm" @@ -175,7 +178,7 @@ } toPLSQLEditor::toPLSQLEditor(QWidget *main, toConnection &connection) - : toToolWidget(PLSQLEditorTool, "plsqleditor.html", main, connection, "toPLSQLEditor") + : toToolWidget(PLSQLEditorTool, "plsqleditor.html", main, connection, "toPLSQLEditor") { createActions(); QToolBar *toolbar = toAllocBar(this, tr("PLSQLEditor")); @@ -209,15 +212,16 @@ splitter = new QSplitter(Qt::Horizontal, this); layout()->addWidget(splitter); - Objects = new toListView(this);//objSplitter); - Objects->addColumn(tr("Objects")); - Objects->setRootIsDecorated(true); - Objects->setTreeStepSize(10); - Objects->setSorting(0); - Objects->setSelectionMode(toTreeWidget::Single); - Objects->setResizeMode(toTreeWidget::AllColumns); - connect(Objects, SIGNAL(selectionChanged(toTreeWidgetItem *)), - this, SLOT(changePackage(toTreeWidgetItem *))); + Objects = new QTreeView(splitter); + CodeModel = new toCodeModel(Objects); + Objects->setModel(CodeModel); + QString selected = Schema->currentText(); + if(!selected.isEmpty()) + CodeModel->refresh(connection, selected); + connect(Objects->selectionModel(), + SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), + this, + SLOT(changePackage(const QModelIndex &, const QModelIndex &))); splitter->addWidget(Objects); @@ -354,69 +358,20 @@ } if (!selected.isEmpty()) { + for (int i = 0;i < Schema->count();i++) { - for (int i = 0;i < Schema->count();i++) - if (Schema->itemText(i) == selected) - { - Schema->setCurrentIndex(i); - break; - } - } - Objects->clear(); - - // refresh the objects - connection().rereadCache(); - std::list<toConnection::objectName> &objs = connection().objects(true); - - std::map<QString, toTreeWidgetItem *> typeItems; - bool any = false; - for (std::list<toConnection::objectName>::iterator i = objs.begin(); - i != objs.end();i++) - { - if ((*i).Owner == selected) + if (Schema->itemText(i) == selected) { - any = true; - QString type = (*i).Type; - if (type == QString::fromLatin1("FUNCTION") || - type == QString::fromLatin1("PACKAGE") || - type == QString::fromLatin1("PROCEDURE") || - type == QString::fromLatin1("TYPE")) - { - toTreeWidgetItem *typeItem; - std::map<QString, toTreeWidgetItem *>::iterator j = typeItems.find(type); - if (j == typeItems.end()) - { - typeItem = new toTreeWidgetItem(Objects, type); - typeItems[type] = typeItem; -#ifndef AUTOEXPAND - - typeItem->setSelectable(false); -#endif - - } - else - typeItem = (*j).second; - - QString bodyType(type); - bodyType += QString::fromLatin1(" BODY"); - QString name = (*i).Name; - toTreeWidgetItem *item = new toTreeWidgetItem(typeItem, name, type); - if (selected == currentEditor()->editor()->schema() && - (type == currentEditor()->editor()->type() || - bodyType == currentEditor()->editor()->type()) && - name == currentEditor()->editor()->object()) - { - Objects->setOpen(typeItem, true); - Objects->setSelected(item, true); - } - } - } - else if (any) + Schema->setCurrentIndex(i); break; + } } + + CodeModel->refresh(connection(), selected); } } - TOCATCH + TOCATCH; + QApplication::restoreOverrideCursor(); } @@ -442,20 +397,29 @@ TOCATCH } -void toPLSQLEditor::changePackage(toTreeWidgetItem *item) +void toPLSQLEditor::changePackage(const QModelIndex ¤t, const QModelIndex &previous) { - QApplication::setOverrideCursor(Qt::WaitCursor); + toBusy busy; + +// qDebug() << "toDebug::changePackage 1"; + QTreeWidgetItem *item = static_cast<QTreeWidgetItem*>(current.internalPointer()); if (item && item->parent()) { - viewSource(Schema->currentText(), item->text(0), item->text(1), 0); - if (item->text(1) == "PACKAGE" || item->text(1) == "TYPE") - viewSource(Schema->currentText(), item->text(0), item->text(1) + " BODY", 0); + QString ctype = item->parent()->text(0); + if(ctype.isEmpty() || ctype == "Code") + return; + ctype = ctype.toUpper(); + + if (ctype == "PACKAGE" || ctype == "TYPE") + ctype += " BODY"; + + viewSource(Schema->currentText(), item->text(0), ctype, 0); } #ifdef AUTOEXPAND else if (item && !item->parent()) item->setOpen(true); #endif - QApplication::restoreOverrideCursor(); +// qDebug() << "toDebug::changePackage 2"; } void toPLSQLEditor::compileWarn() @@ -565,10 +529,10 @@ if (editor) { QString name = editor->objectName(); - if (Objects->selectedItem() && - Objects->selectedItem()->text(0) == editor->editor()->object() && - Schema->currentText() == editor->editor()->schema()) - Objects->clearSelection(); +// if (Objects->selectedItem() && +// Objects->selectedItem()->text(0) == editor->editor()->object() && +// Schema->currentText() == editor->editor()->schema()) +// Objects->clearSelection(); Editors->removeTab(Editors->indexOf(editor)); delete editor; Modified: trunk/tora/src/toplsqleditor.h =================================================================== --- trunk/tora/src/toplsqleditor.h 2008-08-17 18:07:41 UTC (rev 2948) +++ trunk/tora/src/toplsqleditor.h 2008-08-17 18:22:25 UTC (rev 2949) @@ -43,15 +43,15 @@ #include "tohighlightedtext.h" #include "tosqlparse.h" +class QMdiSubWindow; +class QTreeView; +class toCodeModel; +class toConnection; +class toPLSQLWidget; class toTreeWidget; class toTreeWidgetItem; -class toConnection; -class QMdiSubWindow; -class toPLSQLWidget; - - /*! \brief Advanced PL/SQL Editor. It's based on Debugger code. But it can compile PL/SQL unit in all cases. Even if is the user without debug grants/roles. @@ -80,8 +80,9 @@ QMenu *ToolMenu; // Content pane - toTreeWidget *Objects; - QSplitter *splitter; + QTreeView *Objects; + toCodeModel *CodeModel; + QSplitter *splitter; // Editors QTabWidget *Editors; @@ -116,7 +117,7 @@ void compileWarn(void); void changeSchema(int); void refresh(void); - void changePackage(toTreeWidgetItem *); + void changePackage(const QModelIndex &, const QModelIndex &); void prevError(void); void nextError(void); void showSource(toTreeWidgetItem *); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-08-17 19:46:49
|
Revision: 2950 http://tora.svn.sourceforge.net/tora/?rev=2950&view=rev Author: mrjohnson0 Date: 2008-08-17 19:46:58 +0000 (Sun, 17 Aug 2008) Log Message: ----------- fixes toBusy Modified Paths: -------------- trunk/tora/src/toconnection.cpp trunk/tora/src/tomain.cpp trunk/tora/src/tomain.h trunk/tora/src/utils.cpp trunk/tora/src/utils.h Modified: trunk/tora/src/toconnection.cpp =================================================================== --- trunk/tora/src/toconnection.cpp 2008-08-17 18:22:25 UTC (rev 2949) +++ trunk/tora/src/toconnection.cpp 2008-08-17 19:46:58 UTC (rev 2950) @@ -609,7 +609,6 @@ toQList toQuery::readQueryNull(toConnection &conn, const QString &sql, toQList ¶ms) { - toBusy busy; toQuery query(conn, sql, params); toQList ret; while (!query.eof()) @@ -652,7 +651,6 @@ if (!Connection) return toQValue(0); - toBusy busy; if (Connection->Abort) throw qApp->translate("toQuery", "Query aborted"); return toNull(Query->readValue()); @@ -663,7 +661,6 @@ if (!Connection) return toQValue(0); - toBusy busy; if (Connection->Abort) throw qApp->translate("toQuery", "Query aborted"); return Query->readValue(); Modified: trunk/tora/src/tomain.cpp =================================================================== --- trunk/tora/src/tomain.cpp 2008-08-17 18:22:25 UTC (rev 2949) +++ trunk/tora/src/tomain.cpp 2008-08-17 19:46:58 UTC (rev 2950) @@ -1463,6 +1463,16 @@ } +void toMain::showBusy() { + qApp->setOverrideCursor(Qt::WaitCursor); +} + + +void toMain::removeBusy() { + qApp->restoreOverrideCursor(); +} + + void toMain::showMessage(const QString &str, bool save, bool log) { // this function can be called from any thread. Modified: trunk/tora/src/tomain.h =================================================================== --- trunk/tora/src/tomain.h 2008-08-17 18:22:25 UTC (rev 2949) +++ trunk/tora/src/tomain.h 2008-08-17 19:46:58 UTC (rev 2950) @@ -525,6 +525,23 @@ */ void showMessage(const QString &str, bool save, bool log); + /** + * Show a busy cursor or other indicators. Must be called from the + * main thread. + * + * class toBusy calls this method. + * + */ + void showBusy(void); + + /** + * Remove busy cursor or other indicators. Must be called from the + * main thread. + * + * class toBusy calls this method. + */ + void removeBusy(void); + protected: /** intercept close event from parent */ Modified: trunk/tora/src/utils.cpp =================================================================== --- trunk/tora/src/utils.cpp 2008-08-17 18:22:25 UTC (rev 2949) +++ trunk/tora/src/utils.cpp 2008-08-17 19:46:58 UTC (rev 2950) @@ -896,41 +896,18 @@ throw qApp->translate("toCurrentConnection", "Couldn't find parent connection. Internal error."); } -unsigned int toBusy::Count = 0; - -static toLock BusyLock; - -void toBusy::clear() -{ - BusyLock.lock(); - Count = 0; - BusyLock.unlock(); - qApp->restoreOverrideCursor(); -} - toBusy::toBusy() { - BusyLock.lock(); - if (toThread::mainThread()) - { - if (!Count) - qApp->setOverrideCursor(Qt::WaitCursor); - Count++; - } - BusyLock.unlock(); + QMetaObject::invokeMethod(toMainWidget(), + "showBusy", + Qt::QueuedConnection); } toBusy::~toBusy() { - BusyLock.lock(); - if (toThread::mainThread()) - { - if (Count > 0) - Count--; - if (!Count) - qApp->restoreOverrideCursor(); - } - BusyLock.unlock(); + QMetaObject::invokeMethod(toMainWidget(), + "removeBusy", + Qt::QueuedConnection); } void toReadableColumn(QString &name) Modified: trunk/tora/src/utils.h =================================================================== --- trunk/tora/src/utils.h 2008-08-17 18:22:25 UTC (rev 2949) +++ trunk/tora/src/utils.h 2008-08-17 19:46:58 UTC (rev 2950) @@ -390,9 +390,7 @@ */ class toBusy { - static unsigned int Count; public: - static void clear(void); toBusy(); ~toBusy(); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-08-17 22:03:14
|
Revision: 2952 http://tora.svn.sourceforge.net/tora/?rev=2952&view=rev Author: mrjohnson0 Date: 2008-08-17 22:03:23 +0000 (Sun, 17 Aug 2008) Log Message: ----------- fixes status bar background movie. i plan on more improvements for this thing Modified Paths: -------------- trunk/tora/src/Makefile.am trunk/tora/src/tobackgroundlabel.cpp trunk/tora/src/tobackgroundlabel.h trunk/tora/src/tomain.cpp trunk/tora/src/tora.qrc Added Paths: ----------- trunk/tora/src/icons/backgroundlabel.gif Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2008-08-17 20:32:25 UTC (rev 2951) +++ trunk/tora/src/Makefile.am 2008-08-17 22:03:23 UTC (rev 2952) @@ -273,6 +273,7 @@ moc_toanalyze.cpp \ moc_tobackup.cpp \ moc_tobarchart.cpp \ + moc_tobackgroundlabel.cpp \ moc_tobrowser.cpp \ moc_tobrowserconstraint.cpp \ moc_tobrowserindex.cpp \ Property changes on: trunk/tora/src/icons/backgroundlabel.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/tora/src/tobackgroundlabel.cpp =================================================================== --- trunk/tora/src/tobackgroundlabel.cpp 2008-08-17 20:32:25 UTC (rev 2951) +++ trunk/tora/src/tobackgroundlabel.cpp 2008-08-17 22:03:23 UTC (rev 2952) @@ -15,263 +15,23 @@ #include "tomain.h" #include "toconnection.h" -const char toBackgroundLabel::data[] = "\x47\x49\x46\x38\x39\x61\x17\x00\x17\x00\xe7\x00\x00\x02\x66\x9a\x92\xbe\xd2\x66\xa2\xc2\x46\x8e\xb6\xca\xde\xea\x2a\x7e\xaa\xaa\xca\xde\x0e\x6e\x9e\x82\xb2\xce" - "\xb6\xd2\xe2\x16\x72\xa2\x52\x96\xba\x3e\x8a\xb2\x6e\xa6\xc6\xe2\xee\xf2\x9a\xc2\xd6\x22\x7a\xa6\xba\xd6\xe2\x36\x86\xae\x7a\xae\xca\xd6\xe6\xee\x5e\x9e\xbe\x86" - "\xb6\xce\x0a\x6e\x9e\xbe\xd6\xe6\xa2\xc6\xda\x76\xae\xc6\x16\x76\xa2\x2a\x82\xaa\x5a\x9e\xbe\x8a\xba\xce\x4e\x96\xb6\xd2\xe6\xee\xaa\xce\xde\xbe\xda\xe6\x02\x6a" - "\x9a\xde\xee\xf2\x12\x72\x9e\xc2\xda\xe6\x56\x9a\xba\x26\x7e\xa6\xae\xce\xde\x36\x8a\xae\x1a\x76\xa2\x6e\xaa\xc6\x1e\x7a\xa6\x2e\x82\xaa\xa2\xca\xda\x7a\xb2\xca" - "\x66\xa6\xc2\x32\x86\xae\xc2\xde\xe6\x3e\x8e\xb2\xae\xd2\xde\x96\xc2\xd6\x0a\x6a\x9e\x9a\xc6\xd6\x62\xa2\xbe\xde\xea\xf2\x4a\x92\xb6\x8e\xba\xd2\x82\xb6\xce\x72" - "\xaa\xc6\xd2\xe2\xee\xca\xe2\xea\x46\x92\xb6\xd6\xea\xee\x8e\xbe\xd2\x1e\x76\xa6\xb6\xd6\xe2\xe6\xee\xf6\x52\x9a\xba\x32\x82\xae\x96\xbe\xd6\x5a\x9a\xbe\x06\x6a" - "\x9a\x12\x6e\x9e\x6a\xa6\xc2\x7e\xb2\xca\x42\x8e\xb2\x3a\x86\xae\xa6\xca\xda\xe6\xf2\xf6\x26\x7a\xa6\xce\xe2\xea\x1a\x76\xa6\x2e\x82\xae\x8a\xb6\xce\x06\x6a\x9e" - "\x4e\x92\xb6\x6a\xa6\xc6\x7e\xb2\xce\x92\xbe\xd6\x56\x9a\xbe\x42\x8e\xb6\xa6\xca\xde\x62\x9e\xbe\xb2\xce\xde\x76\xaa\xc6\xb2\xd2\xe2\xea\xf2\xf6\x9e\xc2\xd6\xc6" - "\xde\xea\xba\xd6\xe6\x8a\xba\xd2\x3a\x8a\xae\x4e\x96\xba\x9e\xc6\xda\x12\x72\xa2\x26\x7e\xaa\x62\xa2\xc2\xda\xea\xf2\x76\xae\xca\xc6\xda\xe6\xce\xe2\xee\x12\x6e" - "\xa2\x3a\x8a\xb2\xc6\xde\xe6\xb2\xd2\xde\x9e\xc6\xd6\xda\xea\xee\x8a\xb6\xd2\x26\x7a\xaa\xb2\xce\xe2\x4e\x92\xba\x62\x9e\xc2\x9e\xc2\xda\x0e\x6e\xa2\xe2\xee\xf6" - "\x36\x86\xb2\x3a\x86\xb2\x76\xaa\xca\x36\x8a\xb2\xc6\xda\xea\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" - "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x21\xff\x0b\x4e\x45\x54\x53\x43\x41\x50\x45\x32\x2e\x30\x03\x01\x00\x00\x00" - "\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\xfc\x67\x06\xcd\x02\x08\x08\x25\x2c\x48\x30\xb0\xa1\x43\x12\x09\xae" - "\x7c\x60\x73\xe1\x02\x80\x8b\x6c\x1a\x80\x70\xf8\x90\x84\xc0\x38\x57\xd6\xac\xf1\xf0\x61\x04\x00\x08\x66\x1a\x92\xd8\xc8\xb1\x01\x1b\x08\x2a\xb4\x64\xc8\xf0\x01" - "\xc0\x07\x32\x03\xc9\x64\x70\x08\x42\x0d\x00\x8b\x17\x01\x2c\x98\xd1\xe0\x82\x99\x0c\x2c\xd1\xa4\x14\x48\xe6\x8a\x87\x04\x71\xee\x34\x01\x1a\x28\xce\x02\x3b\x1e" - "\x16\xe0\xfc\x70\xa5\x61\xa1\x19\x1e\x05\x16\xf9\x00\xc1\x26\x85\x1f\x71\x46\x34\xf8\x01\xa1\x81\x40\x10\x07\x17\x14\x0a\x2b\x50\x87\xc1\x1f\xff\x66\xcc\x29\x91" - "\x81\x8d\x8a\x7f\x3a\x24\x00\x68\x52\x67\x81\x5b\x81\x2c\xee\x34\x2c\x32\x82\xcd\x1a\x08\x12\xfe\xb1\x30\x2b\x98\xc5\x3f\xb8\x00\xd8\x2c\xfd\xd7\x00\x80\x84\x0c" - "\x37\x08\x25\xa8\x68\xc2\xe7\x8d\x3a\x71\xca\x5e\x8c\xfc\x2f\xce\x1c\x9b\x1e\x84\x36\x01\xd0\x20\xc1\xea\x7f\x0b\x82\x5e\x5c\xf0\xcf\x27\x80\x3c\xb3\x3d\x08\xce" - "\x30\x79\x04\x43\x10\x82\x2f\x8e\x40\x03\xa2\x04\x00\x15\x09\x98\x00\x30\x03\xe1\x42\x11\xc1\xbc\x05\xda\xb9\x71\x72\x67\xec\x12\x09\xb4\xa2\x78\xfe\x07\x81\x49" - "\x86\xb2\x3b\x07\xde\xf9\x80\xb7\xb7\x84\x04\xb1\xd9\x30\x84\xc0\xc6\xc2\x8d\x1b\x33\x2e\x37\xc8\xa0\xa3\x61\x1d\x33\x4d\xb0\xa1\x46\x1c\x02\x1d\x54\x47\x4d\x66" - "\xe8\x00\x42\x4d\x19\x6d\x06\x02\x52\x0d\x65\xf5\x0f\x19\x12\xdc\x51\x44\x13\xd4\x5d\xc4\x44\x6d\x24\x50\x70\x87\x07\x38\x09\x54\x07\x1a\x02\x15\x72\x85\x19\x73" - "\x78\x10\x87\x0a\x58\x04\x05\xc1\x1c\x12\x6c\x26\x50\x02\x21\x92\xa0\x83\x0a\x00\xb0\x60\x82\x05\x64\x29\x70\x43\x1a\x2c\xa9\x14\xa2\x40\x63\x48\x07\x41\x62\x77" - "\x64\x60\x41\x21\x03\xd1\xc5\x11\x41\xbe\x01\xa0\x00\x42\x10\x2c\x80\x46\x06\xed\x3d\x39\x90\x1d\x2c\xc8\xa0\x42\x20\x12\x34\x71\x45\x7e\x03\x05\x04\x00\x21\xf9" - "\x04\x09\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\xd4\x31\xa6\x8c\x16\x09\x2b\x88\xb4\x90\x70\x22\x81\xc0\x87\x10\x1f\xea\xa0" - "\xf2\xaf\x4b\x17\x19\x05\xd8\x00\x58\x82\x64\x02\x88\x88\x20\x1f\x06\x68\x62\x21\xc0\x16\x06\x58\x20\x34\x09\x19\xd1\xc0\x00\x24\x6c\x5a\xd0\x80\xf3\x00\x8e\x8b" - "\x02\x49\x20\xbe\x91\x03\xd1\x44\x00\x30\x3b\xa0\x10\xb9\x31\xa2\x00\x8c\x3c\x69\x62\x50\x14\x48\x25\x0a\x44\x11\x21\x12\xd4\xb1\x63\x61\xc0\x05\x00\x05\x7a\x88" - "\xf1\x11\xe2\x81\xc3\x7f\x6b\x1e\x5a\x50\x32\xa1\x08\x05\x81\x09\x26\x48\x28\xc1\x20\xc0\x98\x04\x02\x7a\x50\xe9\xd0\xe0\x1f\x09\x18\x32\x68\x4c\xe0\x91\x02\x22" - "\x90\x00\x5d\x32\xfc\xa8\xf3\x41\xc2\x83\x1c\x1f\xfe\x4d\x98\xe2\x82\x47\x0f\x2f\x15\x1e\x36\xc9\xf9\x50\x04\x83\x39\x1a\x18\x14\x48\xc0\xe1\x06\x0f\x0b\x05\x96" - "\xc0\xf9\x37\xa6\xc2\x9c\x2a\x4e\x05\x26\x69\xa1\xc0\x02\x1d\x19\x2c\x96\x9c\xb0\x13\xba\x85\x1d\x03\x05\x46\x00\x00\x30\x40\xa0\x99\x20\x37\xe8\xf0\x20\x82\x24" - "\xd0\x12\x1b\x4e\x76\xd7\xf5\x71\x63\x37\x80\x0b\x6a\xfe\x59\xb8\x5a\x01\xc1\x08\x35\x2d\x88\x64\x60\xb0\x44\x82\x43\x13\x41\x9c\xd9\x1f\x40\x60\x22\xf7\x0a\x2e" - "\x47\x3c\xb7\x40\xe2\xa1\xc5\x0a\x18\x0f\x6d\x94\xe0\xd8\xe3\x9f\x87\x1b\x2b\x58\x78\x38\x40\xa4\x0e\x11\x15\x5a\x1c\x20\x48\x18\x10\x0d\xc1\x82\x08\x02\x2d\x80" - "\x44\x03\x3c\x30\x50\x42\x10\xff\xa4\xd1\x41\x1e\x28\xa8\x01\x04\x1e\x21\x34\xf0\xc0\x52\x02\xd9\xe0\x81\x13\x41\xb4\xd1\xd0\x3f\x0d\x28\x51\x07\x0b\x39\x60\x70" - "\x46\x12\x34\xdc\x20\x01\x17\x66\x08\x04\x44\x0a\x30\x28\x81\xc0\x43\x77\x08\xf4\xc5\x10\x06\x38\x61\x81\x13\x44\x00\x70\xc0\x0e\x01\x10\x20\x44\x02\x51\x98\x00" - "\xd1\x18\x1f\xfd\x83\x01\x01\x39\x3c\x11\x00\x1c\x10\x00\x90\xd2\x0e\x60\x34\xc1\x83\x92\x0f\xe1\x61\x84\x44\x08\x40\x90\x86\x0d\x49\x54\x50\x40\x09\x7f\x40\xd0" - "\xc0\x0b\x2c\x41\xa4\x04\x11\x0a\x74\x90\x04\x17\x08\x34\xd1\x83\x1d\x6d\xf6\x54\x01\x11\x23\x2c\x31\x05\x1d\x0c\x54\xa0\x84\x40\x6f\xe4\x89\x96\x0f\x32\xc8\x80" - "\x84\x0c\x6a\x34\xb1\x46\x06\x1c\x06\x04\x00\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\xfc\xf7\x26\x01\x02\x35" - "\x6d\x14\xac\x68\x41\xe7\x44\x82\x81\x10\x23\xea\x20\x21\x70\xc2\x07\x41\x0a\x00\x54\x39\x12\xb1\x63\x44\x37\x1d\x9c\x78\x68\x52\x40\x81\x12\x03\x1e\x21\x12\x98" - "\x90\xf0\x00\x04\x3e\x79\x7a\x04\xd9\x10\x43\x44\xca\x7f\x64\x70\x58\xe0\xe1\x64\x47\x8b\x11\x37\x4e\xf0\x78\x22\xa1\xc8\x40\x07\x20\x22\x86\x89\x23\xe4\x5f\x06" - "\x16\x44\x00\xcc\x69\xc2\x43\x8f\x01\x03\x40\x70\xa2\xfc\x57\xc4\x47\x20\x09\x0d\xa8\x0c\x0c\x31\x60\x05\x84\x07\x3e\x8a\xe4\x99\x40\xe6\x1f\x02\x81\x15\x20\x04" - "\x19\x62\x03\xce\x1d\x88\x5c\x3e\xb0\x00\x41\xe5\x81\x8c\x14\xff\x3e\x24\xe0\xb3\x61\x41\x12\x1f\x10\xbc\x0c\x14\xe0\x01\xa5\x05\x81\x08\xaa\x68\x19\x22\x81\xc5" - "\x0a\x09\x77\x2a\xb0\xb9\xe1\x64\xcc\x03\x01\x55\x20\x3c\x16\x98\x40\xc9\x81\x0a\x4a\xf4\xd0\x01\x60\xc1\xc6\x01\x00\x05\xfe\x79\x28\xb0\x04\x00\x80\x05\x03\x59" - "\x40\x20\x02\x23\x88\x8b\x16\x10\xd6\xec\x00\xa0\x20\xca\x3f\x1e\x25\x6c\x03\x60\xb3\xe3\x5f\x82\x29\x23\x68\x5c\x21\x22\x83\x08\x83\x1e\x10\x56\xe0\xfe\x57\xe3" - "\x83\x72\x05\x3e\xfe\xcb\x79\x01\xb0\xc4\x87\x06\x00\x27\xb4\x9f\x60\xa2\x66\xcd\xc0\x09\x1b\x2e\x30\x68\xf2\x80\xc7\x85\x03\x3b\x78\xd0\x69\x81\xc6\x05\x82\x2e" - "\x07\xbc\xf5\x8f\x0d\xff\xa4\x00\xc3\x10\x21\x08\xb4\x03\x1b\x0b\x78\x70\xc2\x01\x03\x98\x81\xdb\x1d\x6d\xe0\xf0\x06\x05\x13\x28\x91\x04\x44\x08\x54\xd0\x83\x0d" - "\x6a\x54\x41\x07\x64\x02\xb9\xf1\x40\x02\xad\xad\x70\x80\x12\x11\x0c\x44\x00\x02\x12\x40\x01\x46\x00\x02\x19\xf5\x0f\x06\x0f\xa4\x20\x43\x66\x07\x8c\xa0\x07\x0b" - "\x0f\xfd\x90\xc1\x43\x10\xe9\xd0\xd6\x3f\x24\x18\x50\xc0\x02\x5c\xec\x70\x01\x00\x28\x74\x60\x43\x08\x38\xac\x71\xa4\x47\x29\x9c\x50\x45\x05\x87\x41\xc1\xc6\x01" - "\x2b\x14\x20\x00\x06\x37\x09\xf4\xc0\x0e\x1b\x5c\xc7\x83\x06\x0b\x7c\xe0\x41\x52\x65\x0e\x54\xd6\x08\x6d\x0c\xa0\xc4\x68\x71\x0e\x34\x86\x0f\x50\xc8\xe0\x42\x01" - "\x12\x2c\x80\x40\x19\x3f\x40\x14\x10\x00\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\x14\xa8\x83\xc0\x84\x20\x1b" - "\xe6\xac\x80\x40\xe7\xc4\xc0\x87\x10\x1f\x62\x08\xa0\x24\xcd\x8d\x0b\x12\x7a\x44\xdc\x08\xe2\x1f\x18\x1a\x27\x26\x0c\x59\xb0\x01\xc9\x9a\x8d\x0f\x75\xbc\xc8\x71" - "\xe3\x00\x9b\x29\x02\xf2\x9c\x50\x40\xe4\x24\xca\x7f\x26\x0c\x7c\x89\xc0\x63\xc7\x86\x11\x12\x9c\x08\x18\xe1\x03\x65\x0a\x38\x3b\x10\x98\x11\x68\x21\xcb\x92\x1b" - "\x1f\xca\x7c\x50\x43\x61\xa0\x03\x81\x51\x38\x2c\x59\xe0\x24\xc3\x1b\x81\x63\x04\xb4\x58\x01\x63\xc2\x84\x14\x29\x3a\x2e\x75\x82\x64\x45\x8c\x17\x13\x06\x68\x78" - "\xc8\x45\x50\x10\x03\x67\xbe\x80\x29\xf2\x0f\x8e\x0f\x41\x44\x1a\xf0\x20\xe9\xa2\xc1\xc0\x09\x09\x7a\x28\xe9\x58\xe7\x00\x02\x20\x3b\xe8\x1c\x88\x71\x87\xc1\x8d" - "\x12\x30\x44\x78\x10\x80\x02\x42\xd1\x81\x36\x98\x30\xc8\xd0\x06\x42\x89\x0c\x43\x01\x74\xf9\x27\x40\xcf\x12\x00\x23\x1c\x0a\x0c\xb0\xe0\xc2\x82\x06\x10\x88\x0c" - "\xb0\xa0\xa7\x04\x9d\x04\xff\xa2\x54\x01\x40\xbc\x8a\x40\x33\x0b\x14\xb4\x81\x31\xc0\xca\x06\x30\x47\x4a\x0c\x98\x20\x30\x84\x1a\xe2\x00\x14\x54\xf8\xd7\xe4\x02" - "\x80\x0f\x3c\x14\xc6\xc8\x40\xc1\x05\xc9\x85\x00\x0f\x9b\x28\x38\xf0\xa4\x42\x94\x3c\x2b\xb0\x14\x70\x52\xa1\xc4\x89\x1d\x11\x62\xdc\x30\xf1\x0f\x04\x9c\x07\x45" - "\x08\x10\xc5\x03\xff\x20\x20\xc1\x0d\x74\x6c\x21\xd6\x00\x68\x50\x17\xc2\x09\x63\xc4\x91\x42\x10\x0c\x78\xf0\x50\x07\x32\x08\x60\x83\x06\x2d\x28\x80\xc0\x3f\x54" - "\xfc\x13\xc7\x1a\x06\xf4\xc0\x83\x18\x07\x40\xe0\xc4\x52\x22\x66\x60\x01\x18\x23\x30\x31\xd7\x3f\x52\x08\x04\xc2\x0f\x3b\xb8\xf1\x82\x17\x58\xdc\xb0\x00\x7a\xff" - "\x14\xb1\xc5\x00\x3e\xd8\x80\x52\x07\x00\x4c\xd0\x03\x12\x00\x6c\x70\x42\x14\x14\x84\x11\x42\x88\x37\xf1\xc0\x84\x67\x4e\xec\xa0\xc0\x0d\x63\x9d\x70\xc7\x57\x37" - "\xfd\x83\x46\x67\x02\x3c\x30\x81\x1a\x05\x74\x91\x41\x21\x61\x0e\x04\x43\x1a\x07\x6c\x30\x40\x13\x49\xf0\xd5\xe6\x43\x2c\xd0\x81\x84\x0b\x6d\xa0\xb0\x03\x75\x3a" - "\x40\x14\x10\x00\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\x1c\xe8\x40\xc7\xbf\x05\x4c\xd8\xac\x40\x41\x68\xa0" - "\xc3\x87\x0f\x43\xd8\x00\x63\x05\x00\x11\x25\x09\x20\x6a\x14\xb1\x63\x01\x04\x25\x1e\x26\xc8\x28\xb1\x40\xe3\xc3\x04\x57\x04\x40\xb8\xa0\x20\x90\x06\x16\x0a\x36" - "\x20\x30\xf9\x4f\xce\xbf\x14\x45\x4c\x98\xe8\xa1\x02\xc0\x14\x16\x08\x38\x48\x30\xa1\x91\xc7\x13\x09\x12\x10\x50\x10\xd8\x60\x05\x80\x02\x2f\x04\x20\xc9\x70\x52" - "\xcd\x0a\x0e\x31\x32\x78\x08\x41\x42\xa0\x0d\x0e\x07\x06\xdc\x41\x91\x22\xe3\x3f\x23\xff\x62\x1c\x68\xf1\x20\x45\x90\x36\x39\x1c\x4e\x90\xc0\x81\xc7\x96\x1a\x01" - "\x44\xfc\x93\x92\x06\x02\x83\x3c\x5b\x0a\xdc\xd0\xd3\xe3\x1f\x95\x7f\x0d\x12\x3c\xe8\x10\xe5\x87\x89\x26\x1e\x04\x42\xb8\xc1\xc3\x49\x1b\x00\x2b\x72\x44\xb0\x90" - "\x03\x49\x0b\x16\x02\x41\xfc\x33\x53\x60\xc1\x99\x2e\x2b\xd2\xd8\x80\x32\x82\x0d\x97\x7f\x1d\x88\x2c\x01\x00\x60\x01\x51\x81\x3c\xfe\xa0\x08\xd1\x62\x05\x98\x0e" - "\x6c\x5c\x94\xfc\x97\x00\x02\x6d\x00\x10\x06\xfa\x60\x70\x60\x41\x03\x08\x2d\x92\x10\xb9\x61\x61\xa0\x9d\x1d\xc7\x15\x94\xcc\xd0\x62\x89\x84\x2b\x50\x5c\xbf\x1c" - "\x49\xd1\xb7\xce\x3f\xd1\x69\x37\x94\xa0\x71\x22\x8a\x0f\x0e\x00\xaa\xe4\x80\x71\x81\x8e\x40\x0d\x5a\x08\xe0\x49\xc1\xa2\x6c\x07\x3b\x6b\xfc\x63\x83\x15\x58\xb4" - "\x20\xc0\x20\x0c\x14\x70\x84\x40\x7b\xf0\x60\x07\x0f\x43\x14\x60\xc5\x04\x0e\x2d\x40\x04\x0a\x3c\xd8\x80\xc2\x12\x14\x92\x21\x50\x02\x63\x20\x61\x80\x04\x37\xa4" - "\x11\x82\x40\x66\x3c\xb0\xc5\x0b\x3e\x04\x72\x00\x07\x66\x38\x44\x02\x0f\x05\x68\xf0\x40\x0b\x16\xf9\x20\x10\x15\x57\x20\x21\x81\x0b\x02\x68\x34\x46\x01\x12\xac" - "\xa1\x05\x04\x23\xd0\x61\xc3\x1b\x04\x44\x51\xc4\x3f\xb7\x69\xc4\x42\x09\x12\x4c\x90\x83\x1e\x07\x28\x00\x05\x0b\x3c\x98\x45\xd3\x3f\x50\x5c\xf0\x84\x07\x16\x2c" - "\xb0\x82\x0b\x3e\xa4\xf0\xe5\x40\x45\x08\x40\xc4\x01\x0c\x34\x61\x03\x55\x6b\x3e\x44\xc7\x8f\x05\x40\x70\x02\x4d\x01\x01\x00\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c" - "\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\x1c\x48\x50\x89\x02\x05\x44\x20\x10\x5c\xc8\x70\x60\x94\x21\x0b\x4a\xb0\x41\xc2\xa2\xe1\x42\x32\x18\xb8" - "\xa4\x61\x50\xa0\xc1\x1d\x35\x07\x24\xc0\xb0\x48\xf0\x85\x87\x06\x28\x2e\xb4\x58\x00\x63\xc0\x01\x25\x54\x1a\xbe\x41\xc3\x62\x47\x12\x02\x04\x44\x08\xa8\xc2\xa4" - "\xc3\x83\x27\x0a\x26\x30\x9c\x50\x61\xc5\x8d\x05\x39\x6a\x50\x10\xf8\xe1\xc6\x0d\x37\x08\x2e\x34\x59\xd8\xc3\x05\x93\x1d\x1e\x92\x70\x81\x73\x46\xa0\x9d\x1d\x37" - "\x24\xf0\x08\x72\x42\x0a\x41\x28\x25\x3a\x60\x10\xa0\xe2\x6a\x83\x81\x1d\x24\x94\x08\xd0\x27\x4f\x8a\xae\xff\x50\xcc\xe9\xe0\x21\xc6\x8d\x25\x44\xee\xfc\x03\xf1" - "\xaf\x41\x88\x22\x0b\x34\x14\xc1\xc0\x23\x89\x40\x22\x2d\x12\x74\x99\xb3\x84\xce\x93\x28\x68\x4e\x48\x58\x51\xb1\x82\x01\x10\x40\x34\x54\x20\xf3\x4f\xc1\x89\x26" - "\x10\xd8\x08\x2a\xf2\xcf\x89\x82\x25\x00\x00\xec\x30\x31\xd0\x84\x0b\x06\x76\xdc\x40\xe0\x31\x65\x89\x80\x81\x06\xda\xc4\x06\xd0\x86\x20\x9c\x0b\x05\x32\x40\xc8" - "\xb1\xc6\x4a\x01\xda\x02\x13\xd0\x18\xae\x60\xc1\x3f\x33\x0b\x56\x54\x11\x00\x46\x21\x99\x1d\x1a\xe4\xbc\x50\x18\x03\xe7\x5f\x93\x12\x1b\x90\x74\xb0\xd1\x01\xec" - "\x9f\x1d\x6b\x5a\xc8\x10\x88\xe0\x8e\x09\x11\xa2\x4d\xbc\x70\xf2\x42\x70\x18\x3d\x17\x2c\xb1\x83\x0f\xd9\xd1\x21\x50\x11\x19\x04\x20\x06\x0f\x07\xe8\xf1\x96\x40" - "\x15\xa8\xb1\x04\x04\x0b\xbc\xd0\x41\x09\x7c\x0c\xe4\xc0\x1b\x6a\x54\xc0\x05\x07\x07\x9c\x60\x86\x40\x6b\xe4\xe0\x84\x05\x3c\xa8\x71\x01\x12\x0f\x2c\x74\xc2\x1f" - "\x01\x2c\x70\xc3\x05\xd6\xfd\x43\xc0\x1e\x3e\x54\x70\x00\x13\x14\x31\xd4\x04\x13\x27\x84\x90\xc5\x01\x2b\xc0\x81\x07\x08\x29\x0c\x11\x44\x0c\x4d\xa4\xd0\x90\x09" - "\x41\x28\x50\xc1\x04\x0c\xb0\xc1\x04\x03\x3d\xac\x61\x00\x49\x03\xb1\xe0\x02\x1b\x15\x64\xe0\x06\x11\x53\x64\x61\x41\x11\xa4\x71\xf9\x0f\x02\x69\xac\x30\x45\x0e" - "\x01\xd8\x40\x98\x9a\x0b\xa9\x80\x44\x01\x6f\x72\x19\x10\x00\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\x1c\x48" - "\xf0\x5f\x0e\x36\x0a\x20\x14\x5c\xc8\xf0\xdf\x97\x09\x0c\x6e\x10\xa1\xd1\xb0\xa0\x94\x28\x1a\x0a\x48\xa0\xe3\x81\x05\x11\x05\x13\x2a\x92\x20\x00\x23\x8c\x01\x1b" - "\x4d\x14\x1c\x28\xc0\x82\x05\x04\x08\x3e\x18\x8a\x61\x61\x45\x86\x15\x1e\x14\xcc\x84\xa0\xb1\x84\xc1\x83\x05\x58\x04\x80\x28\x88\xa0\xca\x12\x09\x02\x3c\xe4\xf9" - "\x21\x50\x0c\x91\x25\x34\x7a\x48\x80\x10\x81\x60\x90\x16\x2e\x04\x04\xc8\xe0\x46\x0d\x8f\x81\x4d\x0e\x28\xc0\x91\xc3\xca\x1a\x82\x2d\x20\x58\x48\x31\xa0\xca\x01" - "\x0e\x4d\x08\x06\xda\xd0\xc7\x82\x02\x02\x03\x21\x30\xe9\x31\xe1\x09\x00\x89\x29\x52\x0c\xfd\x17\x20\x4e\x1a\xaf\x6b\xed\x08\x9c\x98\xc7\xc5\x08\x05\x31\xfe\x21" - "\x40\x30\x80\x4e\x0b\x1f\x51\x1a\x4c\x00\x01\xc4\x8f\x8f\x19\xff\x88\x38\x91\x70\x40\x85\x12\x81\x2f\x56\x2c\x01\x00\x20\x90\x99\x81\x75\x06\x0d\xc0\xf3\x4f\xc0" - "\x9d\x36\x0a\x0c\x0c\xbc\x53\x80\x35\x00\x14\x04\xc7\xb4\x90\x90\x22\xee\x0f\x09\x3e\x80\x0c\x4c\xd0\x9b\xb5\x82\x81\x1a\x06\xdc\x60\xc0\xa3\xc5\xbf\x22\x31\x42" - "\xfc\xa0\x80\xc6\x43\x88\x26\x2b\x36\xb3\x4c\xe9\x00\xe3\x1f\x1c\x08\x23\x38\xf4\xd8\x01\xfc\x5f\x86\x14\x01\x92\xec\xa0\x61\xc2\x49\x06\x2e\x19\x92\x44\x40\x72" - "\x00\x80\x8b\x18\x3e\x28\x20\x81\x40\x78\xd4\x01\x81\x0d\x4a\xdc\x90\x06\x41\x3e\xd0\x71\x03\x1b\x12\x58\x30\x41\x0b\x48\x10\x84\xc6\x14\x3e\xd8\xc0\x06\x1b\xe5" - "\x09\xe4\x83\x0a\x03\x58\x80\x46\x1f\x05\xa0\xe0\x06\x41\x5f\x6c\x10\x44\x00\x12\x00\x00\x01\x1c\x02\x99\x81\x06\x0f\x2c\x0c\xb0\xc4\x01\x5f\x11\x64\xc2\x09\x07" - "\x34\x60\x01\x12\x00\x0c\x20\x02\x05\x04\x78\x00\x81\x0c\x1b\xec\xc0\x00\x43\x4a\x30\x21\x83\x05\x02\x10\x71\x81\x0b\x6b\x85\x20\x82\x18\x09\x14\x51\x91\x13\x69" - "\x69\xf0\x23\x11\x48\x65\x20\x45\x45\x56\xa1\xd0\xc2\x0e\x08\xd8\x20\x42\x18\x64\x32\x24\x81\x0b\x10\x08\xd0\x66\x40\x00\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00" - "\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\x1c\x48\x50\x60\x97\x15\x44\x20\x14\x5c\x58\x10\x84\xc0\x14\x7d\x36\xb0\x29\xc0\x90\x61\x9c\x24\x1d\x0a\xb8" - "\x50\x12\x40\xc6\x01\x06\x68\x2a\x86\x18\x82\x40\xcd\x97\x10\x19\x4e\x5c\x50\xb0\xc0\x03\x83\x25\x2c\x16\xda\x68\xc0\xa0\x04\x93\x27\x0c\x52\xe0\x29\xa4\xe1\x00" - "\x04\x18\x5a\x6e\x30\x78\x51\x30\x0b\x80\x12\x1d\x3c\x04\x88\x12\x85\x82\xc0\x13\x00\x20\x78\x58\x70\x00\x01\xc1\x02\x07\xf8\x58\xc8\xd0\xe4\x89\x84\x0a\x06\x04" - "\xf2\x50\x70\x20\x46\x8f\x0b\x70\x06\x42\xd8\xf0\xe4\x01\x82\x36\x7f\x46\xb4\x69\x40\x70\x07\x13\x06\x3c\xa0\x34\x20\x23\x90\x48\x8b\x07\x27\x20\x00\x50\x80\x04" - "\x47\x04\x11\x29\x04\x16\x51\x21\x21\x8a\x8c\x28\x66\x04\x42\x10\x70\x62\xc3\x81\x34\x16\x04\xfa\x28\xf0\xa4\x8d\x96\x14\x08\x16\xec\xc9\x60\x20\x83\xc3\x0a\x5f" - "\x20\x60\x49\x2b\xb0\x50\x81\x11\x00\x00\x10\x49\x6c\x03\x04\x88\x14\x4a\x22\x08\xc4\x50\xa0\x42\x9c\x81\x38\x64\xc4\x06\x20\xe3\xce\x40\x13\x15\x18\x10\x78\xb8" - "\xa3\xc8\x1b\x0a\x19\xfe\xdd\x29\x31\xbc\x0a\xc1\x1e\x07\x5c\x24\xc8\xf1\xcf\x4c\x80\x10\x29\x6a\xbf\x54\x78\x90\x00\x0c\x04\x08\x07\x4e\x08\xb4\x71\x82\x49\x89" - "\x0a\x1a\xda\xb4\x36\x30\x20\x84\x0c\x24\x63\xfe\xd5\x41\xc3\x23\x43\x88\x01\x44\x60\x41\x84\x1a\x5c\x68\x24\x90\x03\x1d\xb4\x85\xc4\x05\x15\x5c\x87\xc4\x0d\x17" - "\xac\x50\x81\x05\x69\x4c\x11\xc8\x40\x02\x1c\x30\xc4\x02\x37\x40\x60\x83\x40\x68\x3c\x51\x00\x04\x0b\xa0\xa1\xc1\x00\x6c\x30\x40\x10\x0b\x07\x34\x11\x40\x0b\x58" - "\x2c\x20\x10\x01\x19\xdc\xc1\x83\x07\x39\x28\x00\x80\x00\x05\xf1\x50\xc0\x14\x62\xe4\xb0\x02\x1b\x16\xe8\x00\x42\x06\x03\x04\xf1\xc7\x05\x2d\x34\x11\xc2\x42\x31" - "\x00\xa0\x06\x0f\x03\x1c\xb0\x42\x03\x18\xbc\x60\x07\x1f\x3e\x68\x01\x43\x45\x36\x64\x31\x07\x0d\x49\x2c\xb0\x82\x0b\x7c\x24\x51\x47\x45\x0b\xa9\x50\x00\x07\x4d" - "\xdc\x11\x42\x14\x33\xb0\xc9\x90\x04\x32\xf4\x66\xa7\x40\x01\x01\x00\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09" - "\x1c\x48\x70\xe0\x8e\x29\x10\x0a\x2a\x2c\x68\x04\x84\xc0\x33\x5e\x98\xb4\x58\x48\x90\x44\x02\x11\xff\xc2\xf0\xd8\x01\x85\xc6\x16\x25\x4b\xda\x04\x59\x98\x40\x40" - "\x03\x19\x4f\x76\xa4\x08\xf1\x40\xc6\x01\x0e\x08\x2a\x00\x60\x90\xa0\xe0\x91\x0f\x37\x6e\x20\x79\xd2\x41\x09\x01\x02\x67\xa0\x1c\x50\x33\x21\xcd\x81\x26\x05\xdb" - "\x00\xf8\x30\x61\x88\x09\x2e\x3d\x80\x08\x74\xd2\x42\x41\x0f\x37\x17\x04\x38\x14\x48\xe4\x40\x03\x0f\x01\xe8\x14\x58\x41\xa7\xc7\x40\x24\x00\xa0\x38\xb1\x42\xe4" - "\x8b\x40\x08\x2b\xdc\xf0\x50\xa3\x00\xc0\x01\x08\x3e\x08\x36\x51\x50\x20\xc1\x13\x1a\x11\x04\x16\x18\xe0\xc4\xc5\x01\xbe\x5d\x10\xd4\x09\x41\x40\xa0\x0d\x19\x44" - "\x02\x2c\xd8\x61\x44\xe0\x82\x08\x32\x6e\x08\x42\x2a\x50\xc9\x94\x27\x48\x04\x60\xe0\x41\x07\xcd\x89\x28\x45\x06\x26\x70\x21\x23\xb0\x40\x02\x32\x46\x00\x00\xa0" - "\x20\xc0\xbf\x26\x04\x0a\x45\xb1\xb1\x35\x05\xa1\x28\x5b\xff\x85\x40\x3b\x5b\x82\xeb\x7f\x54\x32\xec\xc0\x20\x30\x4e\x80\x14\x54\xa8\x6c\xf9\xe7\x81\xc9\x6c\x00" - "\x09\x07\x9a\x90\xc0\xc0\x84\xc0\x37\x63\xbe\xc6\xb0\x40\xf3\xa4\x0c\x86\x05\x28\x50\x5c\xf8\x30\xd0\x82\x97\x39\x34\xcc\x1c\x11\x88\x67\x80\x80\x00\x6c\xda\x08" - "\xac\x63\x03\x4e\x88\x21\x3e\xd0\x01\xc1\x5d\x57\x2c\x20\x81\x40\x5f\xb8\xf0\x41\x11\x2d\xac\x60\x01\x41\x1e\x14\xc0\x86\x5d\x34\x38\xe1\x06\x04\x81\x38\x36\x07" - "\x03\x01\x28\x45\xc7\x40\x02\x20\x71\xc3\x0a\x6d\xb0\xe0\x43\x05\x07\xc8\x30\x50\x21\x47\x28\x30\x01\x0b\x6c\x40\xf0\xe0\x3f\x18\x4c\xd0\x43\x14\x1e\x34\xa0\xc6" - "\x08\x82\x14\x74\xc2\x12\x59\xc0\x00\xc5\x0d\x4f\x80\x80\x87\x08\x0d\x08\xb0\xc3\x13\x07\x00\x50\x41\x5e\x04\x8d\xa1\xc6\x12\x4d\xc0\xd1\x02\x1b\x03\x8c\x11\x45" - "\x08\x4f\x30\xc0\x84\x17\x0b\x98\xb1\xd0\x02\x05\x6c\x00\xc6\x04\x2e\x14\x90\x46\x00\x63\xfc\x33\xc6\x03\x35\x51\x24\x10\x12\x6d\x2c\x90\x40\x06\x51\x98\x50\x99" - "\x9c\x0a\x49\x90\xc6\x02\x7c\x0e\x14\x10\x00\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\x1c\x48\x90\x20\x03\x09" - "\x2e\x0a\x2a\x2c\x08\x02\x84\xc0\x0c\x55\x14\x40\x58\x48\xf0\x0c\x97\x00\xff\x32\x58\x90\xb0\xa0\x02\x8c\x15\x0a\x12\x2a\x6c\x20\xc0\x45\x8b\x16\x56\x76\x60\x08" - "\xa1\xe1\x82\x82\x3e\x5b\x0e\xb4\x59\x50\xd0\x05\x87\x03\x10\x16\x08\xd0\xc0\x82\x87\x0e\x13\x1a\x46\x14\xd0\x50\x61\x89\x1b\x82\x10\x36\xb0\xf1\x11\x40\x23\x9c" - "\x2b\x3c\x28\xfc\xb3\xb1\x63\x89\xc7\x15\x48\x06\xba\x20\x42\x24\x89\x93\x1c\x4c\x14\x94\x28\xe1\x26\x84\xc0\x05\x58\x0e\x58\x78\x52\xc5\x8e\x40\x3a\x10\xbe\xa2" - "\xc0\x32\xa2\x04\x91\x09\x0d\x06\xda\x00\xd9\x23\x87\x02\x04\x02\x83\x64\x38\x31\x67\x49\xa0\x01\x43\xfe\xd9\x49\xe1\x50\xa0\x04\x05\x2c\x7c\xb8\xb0\x31\xb0\x08" - "\x83\x1b\x4c\x07\x7a\x29\xc0\x80\x4e\x87\x04\x5c\x0e\xe4\x69\xc2\x40\xaa\x40\x11\x2e\x9c\x10\xa8\x2c\x01\x80\xeb\x15\x3c\x7a\x1c\xb1\x81\x26\x41\x8a\x81\x85\x2c" - "\x24\x20\x41\xe1\xc5\xbf\x04\x2e\x5c\x03\x90\x50\xe7\x5f\x92\x1f\x14\x0c\xf0\x68\x4c\x25\x43\x02\x1c\x49\x9a\x3c\xe0\xb1\x41\x78\x01\x82\x66\xb6\x30\x58\xfd\x4f" - "\xc7\x0f\x06\x13\xae\xc2\xcc\xb1\x91\xe2\x49\x01\x08\x25\x9e\x0c\x34\xe0\xa4\xc4\x09\x13\x03\x2d\xb4\x41\x13\xe3\x80\x0c\x81\x76\xd6\xc0\xc9\x90\xb1\xc3\x0e\x00" - "\x7f\x34\x91\x42\x10\x02\xf9\xc0\x84\x06\x62\x1c\xa0\x87\x59\x02\x21\x80\x06\x07\x44\x2c\xb1\x44\x01\x15\xc8\x97\xc5\x43\x6c\x74\xc0\xc5\x05\x37\x28\x21\x10\x0f" - "\x1f\x1c\x70\xc1\x01\x37\x7c\x10\x43\x0f\x05\x70\xa0\x9e\x40\x44\xa4\xf6\xc1\x08\x1f\x18\xf0\x4f\x1d\x16\x0c\x72\x42\x03\x68\x4c\x20\x80\x02\x05\x48\x40\x50\x05" - "\x37\x0c\xd2\x80\x02\x23\x58\xf0\x06\x08\x01\x0c\xe2\x01\x0b\x47\xb4\x71\x43\x1a\x04\x12\xc4\x02\x07\x1b\x58\xd0\x01\x13\x2d\xf0\xb0\x47\x79\x48\x94\x10\x16\x0b" - "\x79\x2c\x24\x41\x01\x05\x38\xb1\x80\x0b\x32\x78\x10\xc5\x3f\x79\xc0\x81\x11\x45\x8e\x21\x61\x45\x14\x06\xd8\x61\xc2\x0f\x70\x2e\xf4\x04\x1f\x2b\xe6\x29\x50\x40" - "\x00\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\x1c\x48\xb0\xa0\x9a\x2e\x05\x13\x26\x24\x00\x42\x60\x83\x15\x10" - "\x14\x0a\x44\xe3\xa1\x09\x0b\x1f\x4d\xfe\x25\x71\x42\x87\x05\x1a\x06\x0a\x22\x26\x94\xc0\x00\x0b\x1b\x05\x6c\x02\x09\x10\x91\x01\x24\x92\x35\x05\x14\x48\x28\x08" - "\x61\x83\x82\x13\x0d\x78\x3c\xe0\xd1\x20\x02\x08\x11\x31\x4f\x78\x60\x63\x05\xc6\x40\x08\x2b\xa0\x3c\xb8\x12\xe0\x44\x85\x0e\x3e\x30\x08\x9c\x70\x83\xc1\x84\x27" - "\x07\x78\x08\xec\x02\xe1\xc9\x9d\x0a\x0c\x6e\x2c\x19\xbb\xc3\x82\xc0\x26\x2b\xb0\xf4\x58\xc0\x24\xe3\xbf\x05\x3e\xf2\x58\xd9\x30\xa2\x84\x8b\x02\x08\x7a\x0c\xb4" - "\x23\x63\xc9\x02\x27\x1b\xdc\x10\x54\x72\xa0\x00\x8b\x05\x09\xfe\x3d\xc0\x60\x66\xa0\x17\x2c\x15\x78\x1c\x10\x30\xd0\xc1\x8e\x27\x22\x06\x82\xa8\x80\x02\x4a\x10" - "\x25\x2f\x1e\x1c\x50\xc2\xc3\x85\x5e\x81\x75\x06\x25\xa0\x30\x30\x44\xa0\x11\x00\x46\x10\x79\xf0\xe0\x03\x9c\x06\x27\xf0\x0c\x34\x61\x63\x8c\x08\x13\x7a\xa3\x14" - "\x00\x40\xdc\x45\x91\x7f\x5a\x44\x14\xd9\x93\xa1\xf2\x8f\x1c\x3d\x7c\x28\x31\x60\x43\x01\xf1\x11\x48\x08\x52\x49\xb1\xa5\xa1\x40\x16\x48\xee\xbc\x2c\xb8\x90\x24" - "\x09\x67\x22\x0a\x9e\x10\x14\xe1\xa5\x82\x91\x81\x5d\xe6\xd4\x5e\x72\xe2\x1f\x88\x3b\x49\xb6\x68\x35\xd3\xc0\x82\x8b\x15\x3e\x10\x74\x42\x0b\x38\x78\xb1\x04\x1d" - "\x8d\x09\x94\xc4\x10\x4f\x48\xd0\xc2\x0d\x73\x58\xf1\xc0\x04\x0b\x08\x94\x85\x02\x0d\xb0\xb0\x04\x11\x0d\x9c\x35\x00\x16\x4b\xc4\x26\xc3\x09\x77\x7c\xd0\x46\x87" - "\xff\x58\x00\x80\x12\x70\x14\x70\xc3\x69\x76\x80\xb5\x03\x0d\x3e\xf4\x27\x41\x1b\x33\x09\xc4\x43\x1a\x0a\x24\xb1\xc3\x01\x12\xe0\x41\x81\x1d\x08\x94\x17\x40\x0e" - "\x27\xb0\x31\x85\x0a\x05\xa9\x00\x41\x1a\x38\x70\xb0\xc2\x02\x11\x44\x91\x03\x1d\x25\xb4\x70\xc0\x08\x59\x54\x38\x52\x01\x59\xe4\x41\xc3\x0e\x83\x3c\xf0\x8f\x1b" - "\x15\xec\x20\xc3\x10\xcd\x49\x24\x81\x0b\x01\xca\x61\x06\x01\x12\xd5\xa9\x85\x97\x75\x12\x14\x10\x00\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00" - "\x17\x00\x00\x08\xfe\x00\xff\x09\x1c\x48\xb0\xe0\x04\x16\x3e\x0a\x2a\xfc\x97\xe1\x07\x88\x7f\x64\x08\x3c\xfc\x27\x08\x49\x81\x85\xff\xd4\xc4\x50\x41\x43\x42\x87" - "\x05\x22\x3c\xf8\xd8\x91\xa4\xc7\x01\x08\x0b\x21\x10\x01\x30\x05\x82\x8c\x29\x32\xae\xa4\xb0\x30\x02\x85\x80\x23\x27\x09\x16\x80\xa0\x00\xc9\x16\x0b\x18\x86\x44" - "\xb1\xd1\x80\x42\x9c\x26\x07\x90\xd8\x28\xd0\xe2\x89\x40\x1f\x2a\x4a\x9c\x88\xe2\xa3\x89\x0c\x24\x32\x2a\xe4\xa1\xf0\xcf\x00\x0a\x22\x4d\x9a\x00\xe8\x22\xb0\xc1" - "\x80\x1e\x4d\x24\xac\x1c\x71\xe3\x06\x0a\x2d\x67\x04\x7e\x00\xe0\x86\x05\x11\x06\x02\x27\xfc\xbb\xa2\xc0\xad\x84\x2c\x3b\xb4\xac\x21\xb8\x60\x04\x92\x32\x1b\x68" - "\x3c\x18\xe8\x64\x84\x16\x03\x04\xcf\x40\x16\x08\xe6\x82\x0c\x04\x12\x0a\xd4\x11\x68\xc6\x4d\x00\x2a\x04\xe1\x40\xe0\x70\xe2\xc4\xbf\x1e\x3d\xef\x40\x58\x60\x42" - "\x20\x06\x1e\x21\x28\x50\x18\xf3\x2f\x05\x03\x00\x00\xb0\xb4\x28\x93\xc0\x45\x85\x24\x28\x7a\x0c\x74\x40\xe0\x8a\x07\x91\xff\x3c\xac\xc0\x0d\x00\x82\x8d\x7f\x27" - "\xd0\x68\xd8\x42\x80\x20\x8b\x02\x6b\x94\x48\xc0\xf0\x60\x39\x6e\xbc\x5d\x41\xd0\x50\xf9\x72\x67\x60\x02\x2f\x48\xbe\xa0\x38\xe0\xe4\x9f\x86\x02\x25\x56\xd0\x21" - "\x68\x86\x87\x8f\x89\x09\x56\x0c\xf0\xd0\xe6\x00\x0c\x81\x0f\xc0\x61\x01\x41\x09\xf8\x70\x81\x07\x03\x59\x80\x84\x0b\x7b\xb4\x81\x05\x18\x04\xa5\x30\x81\x1b\x15" - "\xa8\xe1\xc2\x05\x7a\xf8\xf1\x8f\x5e\xff\x14\x50\xc0\x04\x73\xa9\x21\x50\x06\x27\xb8\x70\xc0\x05\xb8\x11\x51\x80\x0f\x01\x3c\xd1\x80\x40\x62\x39\x51\x01\x1b\x05" - "\x88\xf0\x8f\x19\x70\xa8\xa1\x00\x04\x28\x7c\x90\x83\x0d\x39\x28\xb0\x43\x7b\xff\x7c\xd0\x82\x0c\xc0\x31\xd1\x03\x05\x66\x20\x60\xc3\x03\x16\x7c\x01\x47\x03\x3b" - "\xc9\x40\x03\x41\x12\x40\x50\x81\x00\x1b\x28\xf0\xc0\x1a\x1e\x20\x61\xc5\x00\x10\x4c\x01\x80\x15\x84\x2c\x24\x81\x1e\x08\x4c\xe0\x83\x00\x3c\x10\xf0\x81\x1a\x2b" - "\x1c\x39\x81\x00\x18\xd1\xb0\xc3\x00\x02\xc5\x61\x02\x19\xff\x98\x60\x40\x42\x18\x31\xc6\x02\x87\x85\x12\x14\x10\x00\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00\x00" - "\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\x1c\x48\xb0\xa0\x0e\x34\x36\x0a\x2a\xbc\x03\xe7\x41\x08\x10\xff\xc8\x50\x19\x38\x40\x89\x42\x81\x1c\x02\x4d\x39" - "\x40\x64\xca\x82\x0e\x09\x92\xc0\xf9\x97\x20\x08\x04\x08\x05\x4f\x2a\x38\xb0\xe3\x49\x87\x20\x0c\xa6\x8c\xc1\x71\x02\x49\x05\x1f\x17\x50\x0e\x54\xa2\x47\xc1\x82" - "\x17\x68\xc2\xf0\xa8\xc1\xc5\xc2\x9a\x1f\x21\x4a\x28\x98\xb0\xe3\x00\x07\x81\x36\x3e\x7c\xf0\xc1\x94\x41\x0b\x05\x10\x24\x08\xc0\xf0\x2f\x82\x92\x0b\x03\x78\x5c" - "\x40\x22\x30\x0f\xc9\x05\x2b\x6f\x8c\x38\xc0\xf1\x44\xc2\x7f\x4e\x4a\xd0\x98\x90\xa6\x45\x92\x81\x22\x50\x1c\xe8\xd0\xa4\x02\x02\x35\x45\x08\x0a\x58\x42\xe4\x8e" - "\x15\x26\x30\x06\x0a\x38\x61\x27\x02\xc1\x35\x0f\x20\xfe\x43\xa3\x94\xe9\x8a\xb7\x26\x6c\x84\xa0\x40\x90\x87\x82\x2a\x60\x04\x0a\x20\x02\x21\x8a\x97\x15\x0f\x04" - "\xea\xc0\x90\x22\x84\x89\x00\xff\xc6\xec\x58\x02\xe0\x02\x91\x24\x20\xda\x48\x18\x22\xe8\x83\x99\x81\x3d\x14\x24\x69\x12\x03\xee\x0d\x00\xc8\x0f\xf4\xf8\x77\x22" - "\x86\x85\x12\x3c\x06\x26\x60\x10\x84\x4b\x81\x36\x20\x3c\xb0\x19\x01\x60\xc9\x8e\xdf\x08\x4c\xd3\xf8\x71\x3d\x90\x47\x89\x13\x19\xaa\xac\xf0\xf1\xef\x0a\x14\x00" - "\x0a\x0a\x52\x79\xf0\x62\xe0\x16\x05\x02\x10\x30\x51\x90\x41\xe0\x9d\x26\x13\x10\x24\xc2\x1e\x4a\x6c\x31\x50\x03\x37\x7c\x70\xc5\x06\x07\xb0\x37\x90\x19\x6e\xd8" - "\xe0\x83\x05\x02\xac\x20\x01\x01\x11\xfd\x73\x07\x04\x41\x4c\xc0\xc1\x01\x16\x08\x04\xc3\x11\x10\x28\x30\xc7\x05\x25\x5c\x30\x47\x0e\x75\x4c\x26\x50\x20\x07\x3c" - "\x20\xc8\x05\x31\x40\xb4\xc7\x02\x44\xb0\xa1\x14\x12\x03\x68\x60\xc1\x02\x6a\xdc\xf5\x0f\x21\x10\x9c\x30\xc8\x1c\x53\xd4\x01\xc2\x1d\x3c\xf0\x90\xc4\x04\x1e\xf8" - "\xc0\xc3\x02\x55\x20\xe1\xa0\x40\x32\x40\xa0\x41\x10\x6d\x54\x90\xc1\x17\x2b\xec\x70\x42\x07\x5e\x3c\xf1\x47\x56\x12\x14\x24\x81\x04\x0b\xa4\x90\x42\x13\x49\x88" - "\xd0\xc1\x0e\x25\x30\x81\x45\x01\x2d\x5d\xf4\x0f\x0b\x1f\x0c\x54\x87\x14\xff\x98\x61\x41\x0c\x4d\xd8\xa1\xe7\x40\x36\xa0\x71\xe8\x45\x01\x01\x00\x21\xf9\x04\x09" - "\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\x1c\x48\xb0\xe0\x3f\x0a\x6b\xcc\x18\x24\x58\x41\xc3\x89\x21\x36\x40\xfc\x23\x33\xb0" - "\x81\x18\x38\x0b\x21\x10\x99\x73\xe0\x00\x00\x08\x47\xfe\xa5\x30\xc0\xe3\x9f\x85\x02\x41\x08\xc2\x09\x42\x44\x81\x8b\x18\x13\xc4\x68\x58\xe0\xe5\xc4\x99\x1e\x2e" - "\xdc\xbc\x90\xa0\x60\x60\x9c\x41\x32\xe8\xb0\xb8\x03\xa3\xc7\x04\x1f\x29\xbe\x08\x30\x21\x62\x81\x82\x27\x2c\x98\x40\x10\xb8\x86\x85\x85\x3b\x5e\x34\x7a\x2c\x41" - "\xe4\x83\x05\x89\x77\x96\xe8\x09\xd0\x86\x88\x40\x1d\x13\x2b\xcc\x59\x52\x00\x42\x95\x15\x73\x24\x34\xa0\xf0\xef\x81\x0b\x22\x0d\x3a\x94\x48\x29\xd0\x06\x91\x13" - "\x6b\xb8\xfc\x4b\xf0\x2f\x42\x00\x82\x2e\x0e\xc0\xa8\x70\xa1\xc1\xc0\x17\x49\x08\x14\x74\xb2\x46\xe2\x60\x08\x00\x1a\x28\x39\xd0\x45\x20\x09\x3b\x63\x44\x50\x00" - "\x22\xf0\xc1\x06\x05\x02\x06\xa2\x28\xd1\x44\x0b\x00\x0f\x03\xa3\x2c\x70\x92\x47\xcb\xbf\x22\x0b\x6e\x00\x38\x40\xc4\x02\x85\x29\x2d\x32\x7c\x50\x60\x41\x60\x02" - "\x06\x3b\x52\x7c\xf8\x10\x66\xc2\x12\x00\xd0\x2f\x6c\x79\xe1\x65\x41\x14\x06\x0b\x14\xfe\x83\x73\xa0\xc2\x9a\x39\x1b\x28\xda\xf8\xd8\x30\x02\xc0\x85\x13\x85\xfe" - "\x1d\xb9\x22\x20\x48\x98\x81\x1a\x00\x58\x00\x73\x00\x89\xc0\x00\x0c\x00\xf4\x14\x48\x00\x44\x91\x04\x45\x0c\xf4\x04\x1b\x3e\xe4\x80\x45\x01\xda\xdd\x21\x80\x6d" - "\x04\xc5\x61\xc1\x18\x03\x71\x07\x83\x1b\x37\xc8\x40\xd0\x1d\x92\x29\x14\x42\x14\x5d\x58\x11\xc5\x40\x6a\x09\x10\x43\x09\x32\x84\xf0\x0f\x06\x6a\xd0\xb0\xc1\x14" - "\x6d\x20\x81\xc4\x05\x2b\x88\x41\x11\x5d\xff\x70\x20\x01\x0f\x0a\x1c\x40\x98\x19\x1a\x30\x70\xc3\x05\xe6\xb5\xa0\x00\x1f\x35\x0c\xc1\xc2\x03\x02\x49\x80\x82\x0f" - "\x0c\xac\x20\x00\x08\x61\x38\x11\xc5\x10\x1d\x54\x90\x43\x0c\x43\x4c\xc0\x00\x14\x70\xd4\x31\x90\x15\x03\x94\x31\x40\x01\x49\xd4\xb0\xc0\x0e\x4a\x20\xd0\xc4\x20" - "\x4a\x14\xa0\x87\x0b\x15\x6c\xc1\x90\x04\x1e\x80\x10\x40\x06\x10\x2e\xe0\xd1\x05\x4c\x10\xe1\x42\x20\x0b\xf5\x00\x87\x63\x02\x51\x54\x87\x06\x15\x30\xd0\x83\x06" - "\x0b\x0d\x34\x83\x0d\x8d\x46\x1a\x10\x00\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\x1c\x28\xd0\x0e\x41\x82\x20" - "\xc6\x1c\x24\x08\x01\xc9\x00\x2f\x03\xb6\x24\x01\x71\xd0\x43\x8a\x85\x12\x20\x6c\x38\xb0\x82\xc3\x81\x12\x10\x2a\xfc\x1b\x63\x46\xe0\x11\x37\x04\x53\xb8\x29\x40" - "\x64\x01\x8f\x07\x3c\xee\x68\xc8\x42\x07\x4d\x06\x0d\x41\x78\xe4\x21\x22\x41\xe0\x98\x2b\x47\x86\x04\x68\x72\xe2\x48\x07\x35\x3d\x02\x78\x70\x62\x26\xc9\x85\x20" - "\x01\x14\xb4\x10\x88\x47\x60\x06\x24\x25\x0e\x00\x00\x80\x65\x49\x01\x1f\x18\x74\x98\x90\xc0\xa4\xc1\x0e\x05\x10\x08\xb2\xc0\x12\xa8\x82\x1a\x28\x56\xd8\x14\x38" - "\x71\xf1\x5f\x8e\x03\x0b\x26\x60\x41\x32\x10\x83\x8f\x0c\x75\x0e\x1a\x20\x28\x00\xc0\x11\x0b\x0a\x54\x0c\x1c\x13\xa5\x90\x0e\x82\x15\x0c\x50\x19\x48\x03\xc0\x09" - "\x0d\x10\x9e\xd4\x10\x08\xc2\x82\x07\x20\x83\xff\x05\x40\x51\x42\xc0\xc0\x34\x37\x76\x20\xc0\xb2\x43\x60\x82\x20\x12\x92\xf8\x30\x9d\x82\xcf\x05\x00\x07\xa6\xf8" - "\xf8\x57\x60\x89\x93\x26\x6c\x26\x08\x14\xc3\xa4\xcb\x90\x16\x2a\x4c\x58\x58\xb2\x15\xc0\x05\x34\x11\x54\x14\x40\x73\xb6\x87\xc0\x18\x0a\x10\x34\x00\xa0\xe7\x5f" - "\x07\x22\xcc\x2f\xd3\x2c\x10\xf1\x6f\x81\x0f\x1e\x2e\xc0\x94\xfc\x87\x64\x45\x86\x27\x4b\x3e\x08\xf4\xc0\x00\x80\x82\x81\x6b\x08\x88\xd9\xf2\x46\x60\x18\x1a\x2e" - "\xc0\x30\xc0\x12\x41\x0c\xf4\x80\x0f\x5d\x20\x84\x41\x14\x75\xfd\x33\xc0\x0a\x49\xd0\x01\x80\x69\x8b\x1d\x64\xc6\x1d\x70\x4c\x26\x90\x04\x6c\x20\xf0\xc4\x01\x0d" - "\x08\x94\xc4\x0e\x19\xd1\x10\x44\x13\x0d\x30\x70\xc0\x16\x04\x05\x32\x97\x00\x07\x7c\xf0\xc6\x0f\x11\x54\xc0\x46\x73\xce\xb1\x11\x84\x41\xff\xfc\x20\x90\x0c\x56" - "\x70\x81\xc2\x0a\x29\x14\xd1\x03\x0f\x3d\x34\xf1\xc4\x13\x03\x64\xd1\x40\x06\x0f\x9c\xe0\x41\x14\x02\x7d\x80\x04\x0f\x3c\xc4\xa0\xc1\x17\x79\xa4\x71\xc2\x16\x5c" - "\x4c\x80\x00\x0c\x27\xe8\xe1\x82\x00\x21\x10\x14\x43\x82\xff\x44\x60\x50\x05\x25\x64\xc5\x81\x02\x4c\xa0\x80\x84\x1a\x0b\xa5\x60\xc1\x41\x26\xc0\xa1\x04\x0a\x3b" - "\x74\x10\x04\x21\x0b\x0d\x94\x01\x79\x85\x9a\x50\xe8\x3f\x01\x01\x00\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09" - "\x1c\x28\xb0\x49\x0a\x82\x03\x49\xbc\x41\x38\xb0\x00\x84\x87\x0e\x9f\x6c\xc9\x80\x90\x8a\x01\x84\x6b\x3a\x14\x50\x30\x47\xc6\x0e\x28\x07\x88\xa8\x88\xf1\x8f\x00" - "\x08\x81\x1a\xd6\x0c\x34\x20\xe6\x83\x1b\x16\x19\x6c\xa0\xc9\x10\xa1\x81\x20\x17\x22\x78\xa0\x11\x38\x40\x89\x40\x1d\x27\xff\x0d\x41\x52\xa0\x8d\x04\x19\x03\x1e" - "\x24\xa9\x90\x21\xca\x02\x2f\x0f\x2a\x40\x28\xf0\x4f\x8a\x40\x2a\x41\x0e\x2c\x29\x71\x60\xc4\x88\x0d\x4a\x78\xfc\xa0\x32\x41\x81\x84\x26\x25\x20\x0c\x34\x33\x61" - "\x81\x93\x35\x5b\x76\x28\x99\x32\x25\x0d\x0c\x1d\xff\xee\x2c\x29\xb0\x06\x8b\x5a\x81\x26\x02\xa4\xf8\x81\xd0\x44\x83\x81\x68\x14\x14\xb0\xe0\x70\x20\x1e\x11\x2f" - "\x84\x04\xfd\xa7\xe5\xc1\x41\x81\x4a\x4a\x48\x98\x90\xa6\x85\x1a\x81\x0d\xaa\x34\x08\xe0\x44\xa0\x07\x2b\x25\x2a\x58\x10\x98\x63\x89\x0b\x34\x05\xa6\x1c\x44\x80" - "\x62\xc0\x9d\x05\x3b\x32\x04\xd8\x71\x01\xc0\x01\x2b\x87\x05\x01\x18\x90\xe4\x46\x10\x81\x02\x88\x4c\x40\xc3\x86\x03\x88\x2d\x00\xa2\x03\xb8\x60\x01\x84\x84\x15" - "\x01\x9a\x28\x80\x23\xd0\x45\x0b\x0c\x48\x00\xe3\xec\xf8\xd7\xa4\xc0\x08\x00\x4b\xb2\x3c\xf0\x40\x43\x49\x00\x42\x48\x78\xfc\x0b\xb3\x82\x81\x05\x14\x00\x7c\x08" - "\x44\x90\x66\x44\x0b\xfd\xff\xb0\xc0\x83\x12\x2b\xac\xf6\x4f\x0c\x05\x04\x31\x41\x01\x1b\xb8\x31\x90\x13\x0d\x2c\x30\x10\x08\x20\x3c\x20\x82\x03\x0d\xc9\xd0\x03" - "\x11\x0a\xd8\x30\x90\x07\x75\x54\x94\x41\x19\x04\xc9\x40\x44\x19\x2b\x1c\x60\xc7\x3f\x66\x08\xc0\x00\x07\x67\xb9\x61\x83\x01\x4e\x28\x81\xc6\x64\x12\xb4\xd1\x00" - "\x12\x44\x0c\x01\x02\x01\x08\x0c\xd0\xdb\x12\x0a\x6c\x70\xc3\x06\x1d\x50\x20\x10\x09\xff\xd0\x00\x85\x00\x16\x30\xa0\x44\x0a\x43\xb0\x10\xc0\x04\x56\x4c\x55\x40" - "\x7d\x14\xfd\x03\x04\x61\xe4\x7d\xf0\x8f\x08\x13\x24\x41\x40\x0b\x3b\xc0\x90\x42\x0f\x2c\xf4\xb0\xc6\x04\x4d\x64\x31\x48\x97\xff\xac\x31\x08\x60\x21\x0a\xe0\x02" - "\x11\x6c\x40\xf1\x84\x15\x0a\x40\x20\x41\x0c\x19\x10\x40\x90\x4a\x08\x21\xa0\x44\x0b\x2d\x48\xe0\x68\x20\x34\x30\x24\x10\x08\x4c\x32\x84\x81\x81\x0c\x05\x04\x00" - "\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\x1c\x28\x50\x42\x13\x3b\x04\x09\x92\x48\x68\x26\x80\x92\x02\x44\x56" - "\xb0\x61\x73\x23\x08\x8f\x31\x0a\x7f\x24\xfc\xe2\x43\x06\x0a\x09\x27\x04\xc4\x40\xb2\x01\x42\x85\x84\x45\xbe\x98\xf9\xe7\x80\x42\x84\x7f\x29\xd6\xf8\xf0\xa1\xe1" - "\x4a\x82\x24\x27\x64\x74\x49\x90\x41\x84\x40\x1f\x3c\x04\x92\x11\x98\x40\xd0\x1f\x05\x2d\x92\x82\xc9\x60\xe1\x44\x04\x04\x03\x60\xba\x50\x42\x70\xcc\x93\x0b\x32" - "\x18\x14\x00\x00\x60\x04\x87\x00\x36\xde\x24\xb8\x90\xe5\x4e\x15\x14\x03\x75\x3c\x08\x10\x67\x46\x86\x7f\x08\x18\x10\x21\xb2\x00\xc3\x3f\x13\x32\xe6\x88\x41\xb2" - "\x62\x20\x89\x33\x63\x28\x24\x34\x31\x84\x85\xc0\x28\x74\x56\xb0\xd8\xa1\x60\xa0\x0d\x25\x15\x42\xf8\x14\xc8\xc3\x82\x01\x82\x82\x88\x34\x51\xc2\x46\xc2\xbf\x24" - "\x03\xd2\x70\x71\xe8\xe4\x5f\x00\x19\x17\x3e\xbc\xfd\x67\x61\x49\x0b\x18\x47\x0e\xa8\xf9\xe7\x43\x41\x8e\x24\x44\x0a\x8c\xc9\x93\xe6\x06\x80\x0b\x9e\xff\x1d\x01" - "\x00\xe1\x01\x04\x26\x29\xfe\xc9\x28\xfe\x61\x84\x0b\x0a\x1a\xb8\x72\xc5\xd2\x03\x8f\x04\x00\x15\x9c\xb0\x09\xf2\x2f\x0c\x00\x2f\x7e\x56\xdb\x00\x68\xf2\x8f\x47" - "\x81\x11\x00\x96\x30\xe0\x91\x81\x03\x87\x07\x0b\x56\xf4\xf8\x17\xa3\x84\x80\xda\x17\x92\x08\x74\xe2\x02\x00\x8a\x00\xff\x08\x90\x05\x0f\x5b\x48\xb0\xc0\x5b\x81" - "\x6c\xe0\x46\x0e\x73\xa8\x40\x90\x06\x5a\x10\x24\x42\x06\x3b\x54\x70\x99\x40\x28\x84\x54\xc2\x00\x2f\xfd\xe3\x86\x1f\x04\x24\x44\x85\x1d\x26\x10\xe4\xc2\x13\x3e" - "\x6c\xa8\x03\x4c\x34\xa0\xd0\xc6\x09\x5c\xfc\x53\x84\x09\x85\xf4\x80\xd0\x40\x5a\xf9\x51\x40\x0b\x20\x10\x90\x81\x76\x5c\x1d\x40\xc7\x00\x74\x94\xd0\xc5\x64\x3f" - "\x49\x60\x40\x06\x4f\x0c\x11\x42\x05\x79\x78\x10\x84\x02\x0a\xac\x50\xc2\x1c\x3b\x94\xc8\x92\x40\x5c\xf8\x20\x50\x0a\x65\x60\x70\x02\x03\x60\x24\x61\x43\x03\x6e" - "\x68\x01\xc3\x18\x09\xfc\x93\x00\x01\x82\xb9\x95\xd0\x3f\x6a\x54\xa9\x02\x18\x4a\x2c\xa0\x95\x04\x2c\x44\x31\x58\x42\x0f\xc4\x00\x01\x00\x1b\xb4\x30\x05\x12\x74" - "\xf8\x10\xc0\x4a\x04\x09\x36\xe7\x5d\x16\xcc\xf6\x68\x40\x00\x21\xf9\x04\x09\x0a\x00\xff\x00\x2c\x00\x00\x00\x00\x17\x00\x17\x00\x00\x08\xfe\x00\xff\x09\x14\xb8" - "\x00\x82\x41\x09\x4d\x42\x0c\x5c\xc8\x50\xe0\x18\x38\x34\x88\xac\x60\x73\x63\xc9\x85\x23\x29\x18\x92\x20\x31\xd0\x41\x9d\x24\x1d\x7c\xe4\x68\xe0\x61\x88\x8f\x29" - "\x4c\xda\xf0\x58\xa8\xa3\xd0\x40\x32\x64\x04\x26\x59\xe0\x65\x87\x80\x35\x67\x26\xc8\x80\x02\x03\x43\x1d\x81\x0f\xc6\x30\x8c\xf2\xa1\xc4\x8d\x03\x07\x2e\x20\x19" - "\x12\xe0\x48\x9e\x17\x79\x04\x2a\x11\xb3\xf0\x4c\x0f\x01\x1a\xe0\x74\x80\x30\x02\xc0\x0a\x92\x19\x8a\xb8\x61\x60\x43\x8b\x84\x05\x03\x31\x64\x10\xf1\x43\x20\x0f" - "\x31\x53\x14\xc8\x40\x43\x81\x80\x8f\x0d\x4a\x2a\x6c\x40\x21\x30\x42\x06\x0b\x21\x28\x0c\x6d\x10\x40\xe0\x84\x03\x41\x1a\x30\x81\x20\xd0\x07\x07\x25\x36\x78\x0c" - "\x11\x68\x87\x45\x82\x85\x02\x2e\xec\x70\x82\x85\x31\x97\x39\x69\xca\xc4\x90\xb0\x72\x8d\x84\x25\x74\xce\x08\x0c\xe0\xe2\x80\x1b\x18\x58\x24\xfc\xa3\xa3\x00\x8d" - "\x13\x26\x44\xcc\x70\x99\x82\x05\xc0\x92\x27\x02\x11\x2c\xb9\xc1\x43\xc9\x12\x35\x29\x46\x48\x48\xc1\x35\xc8\x3f\x37\x00\xa2\x03\x18\x31\xe1\x1f\x83\x11\x48\x1e" - "\x28\x60\x13\xa2\x09\x00\x1f\x13\x6e\xe3\xdc\x28\x6c\xa7\x40\xf4\x25\x05\x02\x88\x40\xb1\xc2\x83\x8f\x03\x68\x55\xdc\xf0\xa0\xe6\x86\x84\x35\x02\x3d\xac\x00\x60" - "\x25\xe3\x20\x24\x0d\xf0\x80\xc4\x0a\x19\xfc\x23\xc1\x0a\x5b\x30\xb0\x44\x03\x0b\x6d\x51\xc1\x40\x30\x78\xc0\x43\x10\x32\xf4\x20\x10\x21\x05\x68\x40\xc7\x01\x68" - "\x08\x04\x87\x18\x97\x2d\x04\x42\x06\x08\x44\x61\x86\x40\x50\x70\x20\xc0\x07\xed\xd5\x35\x41\x1b\x2d\x48\x80\x06\x7e\xff\x00\x91\x40\x14\x18\x0c\xd4\xc0\x0e\x3e" - "\xf0\x30\x00\x0b\x45\xdc\xe1\xc1\x09\x17\x00\x60\x5f\x03\x08\x68\x20\x40\x00\x3f\x0d\x04\x87\x12\xff\xdc\x61\xc1\x5f\x4a\x70\x01\x47\x0b\xc3\x5d\x70\x40\x0b\x15" - "\xd4\xc0\x50\x0d\x2b\xfd\x23\x82\x09\x4e\x40\x01\x85\x05\x51\x68\xb0\x40\x10\x0c\xe4\x60\x80\x40\x52\x70\x24\x90\x42\x0d\xb2\xc1\x44\x01\x2c\xc0\x80\xc0\x04\x0d" - "\x4c\xd0\x41\x12\x09\x08\x26\x10\x05\x72\x0e\xd4\x83\x79\xc3\x29\x80\x02\x0a\x3b\xc0\x21\x54\x43\x90\x46\x70\xc5\x07\x2a\x04\x22\x01\x83\x0b\x05\x04\x00\x3b\x00"; - QMovie* toBackgroundLabel::Animation = 0; + toBackgroundLabel::toBackgroundLabel(QWidget *parent) : QLabel(parent) { - /* qt4 - The new QByteArray has no assign() function. Calls to QMemArray::assign(const QMemArray &) can be replaced by calls to QByteArray::operator=(). Calls to QMemArray::assign(const T *, uint) have no equivalent in Qt 4; if you use it, the solution is either to use QByteArray::fromRawData() and to call free() yourself to avoid a memory leak, or to use the QByteArray(const char *, int) constructor, which will take a deep copy of the data. */ - QByteArray arr = QByteArray::fromRawData(data, sizeof(data)); -// arr.assign(data, sizeof(data)); - Animation = new QMovie(arr); + Animation = new QMovie(":/icons/backgroundlabel.gif"); setMovie(Animation); -// Animation->unpause(); } void toBackgroundLabel::unpause() { -// Animation->unpause(); + Animation->setPaused(false); } void toBackgroundLabel::pause() { -// Animation->pause(); + Animation->setPaused(true); } void toBackgroundLabel::setTip(QString tip) @@ -307,7 +67,7 @@ num++; } } -// toMainWidget()->displayMessage(str); + toStatusMessage(str); e->accept(); } else Modified: trunk/tora/src/tobackgroundlabel.h =================================================================== --- trunk/tora/src/tobackgroundlabel.h 2008-08-17 20:32:25 UTC (rev 2951) +++ trunk/tora/src/tobackgroundlabel.h 2008-08-17 22:03:23 UTC (rev 2952) @@ -16,6 +16,8 @@ class toBackgroundLabel : public QLabel { + Q_OBJECT; + public: //static toBackgroundLabel createToBackgroundLabel(); virtual void mouseReleaseEvent(QMouseEvent* e); @@ -26,8 +28,6 @@ toBackgroundLabel(QWidget *parent); private: static QMovie* Animation; - static const char data[]; - }; Modified: trunk/tora/src/tomain.cpp =================================================================== --- trunk/tora/src/tomain.cpp 2008-08-17 20:32:25 UTC (rev 2951) +++ trunk/tora/src/tomain.cpp 2008-08-17 22:03:23 UTC (rev 2952) @@ -186,6 +186,10 @@ show(); + statusBar()->addPermanentWidget(BackgroundLabel, 0); + BackgroundLabel->show(); + BackgroundLabel->setToolTip(tr("No background queries.")); + if (Connections.empty()) { try @@ -209,10 +213,6 @@ } TOCATCH; } - - statusBar()->addPermanentWidget(BackgroundLabel, 0); - BackgroundLabel->show(); - BackgroundLabel->setToolTip(tr("No background queries.")); } void toMain::createActions() Modified: trunk/tora/src/tora.qrc =================================================================== --- trunk/tora/src/tora.qrc 2008-08-17 20:32:25 UTC (rev 2951) +++ trunk/tora/src/tora.qrc 2008-08-17 22:03:23 UTC (rev 2952) @@ -1,5 +1,108 @@ <RCC> <qresource prefix="/" > + <file>help/Explain-plan.html</file> + <file>help/Getting-bind-parameters.html</file> + <file>help/Index.html</file> + <file>help/Memo-editor.html</file> + <file>help/Object-description.html</file> + <file>help/SGA-Statement.html</file> + <file>help/What-privileges-do-you-need-to-run-TOra.html</file> + <file>help/additionalhelp.html</file> + <file>help/alert.html</file> + <file>help/analyze.html</file> + <file>help/api.html</file> + <file>help/browser.html</file> + <file>help/charts.html</file> + <file>help/common.html</file> + <file>help/current.html</file> + <file>help/database.html</file> + <file>help/debugger.html</file> + <file>help/editors.html</file> + <file>help/extendingtora.html</file> + <file>help/externalapi.html</file> + <file>help/fonts.html</file> + <file>help/globalsettings.html</file> + <file>help/help.html</file> + <file>help/history.html</file> + <file>help/images/additionalhelp.png</file> + <file>help/images/addwatch.png</file> + <file>help/images/alert.png</file> + <file>help/images/analyze.png</file> + <file>help/images/browser.png</file> + <file>help/images/browserfilter.png</file> + <file>help/images/changewatch.png</file> + <file>help/images/charts.png</file> + <file>help/images/chartsetup.png</file> + <file>help/images/contentfilter.png</file> + <file>help/images/current.png</file> + <file>help/images/database.png</file> + <file>help/images/debugger.png</file> + <file>help/images/describe.png</file> + <file>help/images/difference.png</file> + <file>help/images/editmenu.png</file> + <file>help/images/filemenu.png</file> + <file>help/images/fonts.png</file> + <file>help/images/getparam.png</file> + <file>help/images/help.png</file> + <file>help/images/helpmenu.png</file> + <file>help/images/invalid.png</file> + <file>help/images/largelogo.png</file> + <file>help/images/lists.png</file> + <file>help/images/memo.png</file> + <file>help/images/newconnection.png</file> + <file>help/images/oracle.png</file> + <file>help/images/output.png</file> + <file>help/images/pfileeditor.png</file> + <file>help/images/preferences.png</file> + <file>help/images/priviledges.png</file> + <file>help/images/quota.png</file> + <file>help/images/resize.png</file> + <file>help/images/rollback.png</file> + <file>help/images/rollbacksetup.png</file> + <file>help/images/script.png</file> + <file>help/images/searchreplace.png</file> + <file>help/images/security.png</file> + <file>help/images/session.png</file> + <file>help/images/sgastatement.png</file> + <file>help/images/sgatrace.png</file> + <file>help/images/sqledit.png</file> + <file>help/images/storage.png</file> + <file>help/images/template.png</file> + <file>help/images/templateeditor.png</file> + <file>help/images/templatesetup.png</file> + <file>help/images/toolbar.png</file> + <file>help/images/tools.png</file> + <file>help/images/toolsmenu.png</file> + <file>help/images/tuning.png</file> + <file>help/images/visualize.png</file> + <file>help/images/windowsmenu.png</file> + <file>help/images/worksheet.png</file> + <file>help/images/worksheetsetup.png</file> + <file>help/images/workspace.png</file> + <file>help/index.html</file> + <file>help/invalid.html</file> + <file>help/lists.html</file> + <file>help/newconnection.html</file> + <file>help/output.html</file> + <file>help/plsqleditor.html</file> + <file>help/preferences.html</file> + <file>help/rollback.html</file> + <file>help/script.html</file> + <file>help/searchreplace.html</file> + <file>help/security.html</file> + <file>help/session.html</file> + <file>help/sqledit.html</file> + <file>help/storage.html</file> + <file>help/template.html</file> + <file>help/toc.html</file> + <file>help/tools.html</file> + <file>help/toolsetting.html</file> + <file>help/trace.html</file> + <file>help/tuning.html</file> + <file>help/unittest.html</file> + <file>help/window.html</file> + <file>help/worksheet.html</file> + <file>help/workspace.html</file> <file>icons/add.xpm</file> <file>icons/addfile.xpm</file> <file>icons/addindex.xpm</file> @@ -14,6 +117,7 @@ <file>icons/addwatch.xpm</file> <file>icons/axis.xpm</file> <file>icons/background.xpm</file> + <file>icons/backgroundlabel.gif</file> <file>icons/breakpoint.xpm</file> <file>icons/canceledit.xpm</file> <file>icons/changeconnect.xpm</file> @@ -131,108 +235,5 @@ <file>templates/hints.tpl</file> <file>templates/log4plsql.tpl</file> <file>templates/sqlfunctions.tpl</file> - <file>help/Explain-plan.html</file> - <file>help/Getting-bind-parameters.html</file> - <file>help/Index.html</file> - <file>help/Memo-editor.html</file> - <file>help/Object-description.html</file> - <file>help/SGA-Statement.html</file> - <file>help/What-privileges-do-you-need-to-run-TOra.html</file> - <file>help/additionalhelp.html</file> - <file>help/alert.html</file> - <file>help/analyze.html</file> - <file>help/api.html</file> - <file>help/browser.html</file> - <file>help/charts.html</file> - <file>help/common.html</file> - <file>help/current.html</file> - <file>help/database.html</file> - <file>help/plsqleditor.html</file> - <file>help/debugger.html</file> - <file>help/editors.html</file> - <file>help/extendingtora.html</file> - <file>help/externalapi.html</file> - <file>help/fonts.html</file> - <file>help/globalsettings.html</file> - <file>help/help.html</file> - <file>help/history.html</file> - <file>help/images/additionalhelp.png</file> - <file>help/images/addwatch.png</file> - <file>help/images/alert.png</file> - <file>help/images/analyze.png</file> - <file>help/images/browser.png</file> - <file>help/images/browserfilter.png</file> - <file>help/images/changewatch.png</file> - <file>help/images/charts.png</file> - <file>help/images/chartsetup.png</file> - <file>help/images/contentfilter.png</file> - <file>help/images/current.png</file> - <file>help/images/database.png</file> - <file>help/images/debugger.png</file> - <file>help/images/describe.png</file> - <file>help/images/difference.png</file> - <file>help/images/editmenu.png</file> - <file>help/images/filemenu.png</file> - <file>help/images/fonts.png</file> - <file>help/images/getparam.png</file> - <file>help/images/help.png</file> - <file>help/images/helpmenu.png</file> - <file>help/images/invalid.png</file> - <file>help/images/largelogo.png</file> - <file>help/images/lists.png</file> - <file>help/images/memo.png</file> - <file>help/images/newconnection.png</file> - <file>help/images/oracle.png</file> - <file>help/images/output.png</file> - <file>help/images/pfileeditor.png</file> - <file>help/images/preferences.png</file> - <file>help/images/priviledges.png</file> - <file>help/images/quota.png</file> - <file>help/images/resize.png</file> - <file>help/images/rollback.png</file> - <file>help/images/rollbacksetup.png</file> - <file>help/images/script.png</file> - <file>help/images/searchreplace.png</file> - <file>help/images/security.png</file> - <file>help/images/session.png</file> - <file>help/images/sgastatement.png</file> - <file>help/images/sgatrace.png</file> - <file>help/images/sqledit.png</file> - <file>help/images/storage.png</file> - <file>help/images/template.png</file> - <file>help/images/templateeditor.png</file> - <file>help/images/templatesetup.png</file> - <file>help/images/toolbar.png</file> - <file>help/images/tools.p... [truncated message content] |
From: <su...@us...> - 2008-08-20 09:34:27
|
Revision: 2960 http://tora.svn.sourceforge.net/tora/?rev=2960&view=rev Author: subik Date: 2008-08-20 09:34:37 +0000 (Wed, 20 Aug 2008) Log Message: ----------- fixed restoring state of toolbars (growing space after editToolbar) Modified Paths: -------------- trunk/tora/src/toeditextensions.cpp trunk/tora/src/tomain.cpp trunk/tora/src/tomain.h Modified: trunk/tora/src/toeditextensions.cpp =================================================================== --- trunk/tora/src/toeditextensions.cpp 2008-08-19 20:42:10 UTC (rev 2959) +++ trunk/tora/src/toeditextensions.cpp 2008-08-20 09:34:37 UTC (rev 2960) @@ -666,8 +666,9 @@ AutoComplete->setShortcut(Qt::CTRL + Qt::Key_Space); // add buttons to main window - toMainWidget()->addButtonApplication(Deindent); - toMainWidget()->addButtonApplication(Indent); + // disabled due the problems in the state of toolbars +// toMainWidget()->addButtonApplication(Deindent); +// toMainWidget()->addButtonApplication(Indent); EditExtensions.receivedFocus(NULL); Modified: trunk/tora/src/tomain.cpp =================================================================== --- trunk/tora/src/tomain.cpp 2008-08-19 20:42:10 UTC (rev 2959) +++ trunk/tora/src/tomain.cpp 2008-08-20 09:34:37 UTC (rev 2960) @@ -531,7 +531,7 @@ addToolBarBreak(); } - +//! \warning Do not use it. It screw realoading of the state of toolbars void toMain::addButtonApplication(QAction *act) { editToolbar->addAction(act); Modified: trunk/tora/src/tomain.h =================================================================== --- trunk/tora/src/tomain.h 2008-08-19 20:42:10 UTC (rev 2959) +++ trunk/tora/src/tomain.h 2008-08-20 09:34:37 UTC (rev 2960) @@ -438,6 +438,10 @@ /** * add a button to the application toolbar + \warning Do not use it. It screw realoading of the state of toolbars + \warning The toolbar just after editToolbar the top row of the schema + browser is migrating to the right - basically the whitespace after + the editToolbar is expanding too far. */ void addButtonApplication(QAction *); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-08-31 20:07:46
|
Revision: 2965 http://tora.svn.sourceforge.net/tora/?rev=2965&view=rev Author: mrjohnson0 Date: 2008-08-31 20:07:50 +0000 (Sun, 31 Aug 2008) Log Message: ----------- set model on change Modified Paths: -------------- trunk/tora/src/toresultdatasingle.cpp trunk/tora/src/toresultdatasingle.h Modified: trunk/tora/src/toresultdatasingle.cpp =================================================================== --- trunk/tora/src/toresultdatasingle.cpp 2008-08-31 20:06:17 UTC (rev 2964) +++ trunk/tora/src/toresultdatasingle.cpp 2008-08-31 20:07:50 UTC (rev 2965) @@ -117,17 +117,18 @@ btn->setSizePolicy(QSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed)); connect(btn, SIGNAL(clicked(int)), this, SLOT(showMemo(int))); connect(box, SIGNAL(toggled(bool)), btn, SLOT(setDisabled(bool))); + connect(box, SIGNAL(toggled(bool)), this, SLOT(saveRow())); + connect(edit, SIGNAL(editingFinished()), this, SLOT(saveRow())); grid->addWidget(btn, row, col++); Value.append(edit); Null.append(box); } - // add widget at bottom of grid that can resize + // add widget at bottom of grid so it can resize grid->addWidget(new QLabel(this), row, 0); grid->setRowStretch(row, 1); - Row = _row; changeRow(Row); } @@ -139,10 +140,9 @@ QList<QLineEdit *>::iterator val = Value.begin(); for (int i = 1; - i < Model->columnCount() && chk != Null.end() && val != Value.end(); - i++, chk++, val++) + i < Model->columnCount() && chk != Null.end() && val != Value.end(); + i++, chk++, val++) { - QVariant str = Model->data(row, i); if (!str.isNull()) any = true; Modified: trunk/tora/src/toresultdatasingle.h =================================================================== --- trunk/tora/src/toresultdatasingle.h 2008-08-31 20:06:17 UTC (rev 2964) +++ trunk/tora/src/toresultdatasingle.h 2008-08-31 20:07:50 UTC (rev 2965) @@ -70,10 +70,14 @@ void changeSource(toResultModel *, int row); void changeRow(int row); - void saveRow(void); + inline int currentRow(void) const { + return Row; + } + private slots: virtual void showMemo(int row); + void saveRow(void); }; #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-08-31 23:13:18
|
Revision: 2966 http://tora.svn.sourceforge.net/tora/?rev=2966&view=rev Author: mrjohnson0 Date: 2008-08-31 23:13:19 +0000 (Sun, 31 Aug 2008) Log Message: ----------- add model editor to fix navigation, editing with tableview Modified Paths: -------------- trunk/tora/src/CMakeLists.txt trunk/tora/src/Makefile.am trunk/tora/src/toresultdatasingle.cpp trunk/tora/src/toresultdatasingle.h trunk/tora/src/toresulttableview.cpp Added Paths: ----------- trunk/tora/src/tomodeleditor.cpp trunk/tora/src/tomodeleditor.h Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-08-31 20:07:50 UTC (rev 2965) +++ trunk/tora/src/CMakeLists.txt 2008-08-31 23:13:19 UTC (rev 2966) @@ -127,6 +127,7 @@ # tomainwindow.kde.h tomarkedtext.h tomemoeditor.h + tomodeleditor.h tomessage.h # tomysqlkeywords.h tonewconnection.h @@ -267,6 +268,7 @@ tomainwindow.cpp tomarkedtext.cpp tomemoeditor.cpp + tomodeleditor.cpp tomessage.cpp tonewconnection.cpp tonoblockquery.cpp Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2008-08-31 20:07:50 UTC (rev 2965) +++ trunk/tora/src/Makefile.am 2008-08-31 23:13:19 UTC (rev 2966) @@ -71,6 +71,7 @@ tomain.cpp tomain.h \ tomarkedtext.cpp tomarkedtext.h \ tomemoeditor.cpp tomemoeditor.h \ + tomodeleditor.cpp tomodeleditor.h \ tomessage.cpp tomessage.h \ tonewconnection.cpp tonewconnection.h \ tonoblockquery.cpp tonoblockquery.h \ @@ -126,6 +127,7 @@ toscriptschemawidget.cpp toscriptschemawidget.h \ toscripttreeitem.cpp toscripttreeitem.h \ tocodemodel.cpp tocodemodel.h \ + torunningmodel.cpp torunningmodel.h \ toscripttreemodel.cpp toscripttreemodel.h \ tosecurity.cpp tosecurity.h \ tosecuritytreemodel.cpp tosecuritytreemodel.h \ @@ -283,6 +285,7 @@ moc_toconnection.cpp \ moc_toconnectionmodel.cpp \ moc_tocodemodel.cpp \ + moc_torunningmodel.cpp \ moc_toconnectionpool.cpp \ moc_toconnectionimport.cpp \ moc_torunnable.cpp \ @@ -306,6 +309,7 @@ moc_tomainwindow.cpp \ moc_tomarkedtext.cpp \ moc_tomemoeditor.cpp \ + moc_tomodeleditor.cpp \ moc_tomessage.cpp \ moc_tonewconnection.cpp \ moc_tooutput.cpp \ Added: trunk/tora/src/tomodeleditor.cpp =================================================================== --- trunk/tora/src/tomodeleditor.cpp (rev 0) +++ trunk/tora/src/tomodeleditor.cpp 2008-08-31 23:13:19 UTC (rev 2966) @@ -0,0 +1,354 @@ +/***** + * + * 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 "utils.h" + +#include "toconf.h" +#include "tohighlightedtext.h" +#include "tomarkedtext.h" +#include "tomodeleditor.h" +#include "toresultview.h" +#include "tomain.h" + +#include <qcheckbox.h> +#include <qlayout.h> +#include <qpixmap.h> +#include <qtoolbutton.h> + +#include <QKeyEvent> +#include <QVBoxLayout> +#include <QDesktopWidget> +#include <QSettings> +#include <QAbstractItemModel> + +#include "icons/commit.xpm" +#include "icons/copy.xpm" +#include "icons/cut.xpm" +#include "icons/fileopen.xpm" +#include "icons/filesave.xpm" +#include "icons/forward.xpm" +#include "icons/next.xpm" +#include "icons/paste.xpm" +#include "icons/previous.xpm" +#include "icons/rewind.xpm" + +class toMemoText : public toMarkedText +{ + toModelEditor *MemoEditor; + +public: + toMemoText(toModelEditor *edit, QWidget *parent, const char *name = NULL) + : toMarkedText(parent, name), MemoEditor(edit) + { } + + virtual void keyPressEvent(QKeyEvent *e) + { + if (toCheckKeyEvent(e, QKeySequence(qApp->translate("toModelEditor", "Ctrl+Return", "Memo Editor|Save changes")))) + { + MemoEditor->store(); + e->accept(); + } + else + { + toMarkedText::keyPressEvent(e); + } + } +}; + + +class toMemoSQL : public toHighlightedText +{ + toModelEditor *MemoEditor; + +public: + toMemoSQL(toModelEditor *edit, QWidget *parent, const char *name = NULL) + : toHighlightedText(parent, name), MemoEditor(edit) + { } + + virtual void keyPressEvent(QKeyEvent *e) + { + if (toCheckKeyEvent(e, QKeySequence(qApp->translate("toModelEditor", "Ctrl+Return", "Memo Editor|Save changes")))) + { + MemoEditor->store(); + e->accept(); + } + else + { + toHighlightedText::keyPressEvent(e); + } + } +}; + +void toModelEditor::openFile() +{ + Editor->editOpen(); +} + +void toModelEditor::saveFile() +{ + Editor->editSave(true); +} + +toModelEditor::toModelEditor(QWidget *parent, + QAbstractItemModel *model, + QModelIndex current, + bool sql, + bool modal) : QDialog(parent), + Model(model), + Current(current) +{ + setModal(modal); + setMinimumSize(400, 300); + QDesktopWidget *paramDesktop = new QDesktopWidget; + setMaximumWidth(paramDesktop->availableGeometry(this).width()*2 / 3); + + setWindowTitle("Memo Editor"); + + QVBoxLayout *vbox = new QVBoxLayout; + vbox->setSpacing(0); + vbox->setContentsMargins(0, 0, 0, 0); + setLayout(vbox); + + Toolbar = toAllocBar(this, tr("Memo Editor")); + vbox->addWidget(Toolbar); + + if (sql) + Editor = new toMemoSQL(this, this); + else + Editor = new toMemoText(this, this); + vbox->addWidget(Editor); + + Editable = Model->flags(Current) & Qt::ItemIsEditable; + Editor->setReadOnly(!Editable); + Editor->setFocus(); + + if (Editable) + { + Toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(commit_xpm))), + tr("Save changes"), + this, + SLOT(store(void))); + + Toolbar->addSeparator(); + + Toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(fileopen_xpm))), + tr("Open file"), + this, + SLOT(openFile())); + + Toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(filesave_xpm))), + tr("Save file"), + this, + SLOT(saveFile())); + + Toolbar->addSeparator(); + + QAction *act = + Toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(cut_xpm))), + tr("Cut to clipboard"), + Editor, + SLOT(cut())); + + connect(Editor, + SIGNAL(copyAvailable(bool)), + act, + SLOT(setEnabled(bool))); + act->setEnabled(false); + } + else + { + Toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(filesave_xpm))), + tr("Save changes"), + this, + SLOT(saveFile(void))); + Toolbar->addSeparator(); + } + + QAction *act = + Toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(copy_xpm))), + tr("Copy to clipboard"), + Editor, + SLOT(copy())); + connect(Editor, + SIGNAL(copyAvailable(bool)), + act, + SLOT(setEnabled(bool))); + act->setEnabled(false); + + if (Editable) + { + Toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(paste_xpm))), + tr("Paste from clipboard"), + Editor, + SLOT(paste())); + } + + Toolbar->addSeparator(); + + Toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(rewind_xpm))), + tr("First column"), + this, + SLOT(firstColumn())); + + Toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(previous_xpm))), + tr("Previous column"), + this, + SLOT(previousColumn())); + + Toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(next_xpm))), + tr("Next column"), + this, + SLOT(nextColumn())); + + Toolbar->addAction(QIcon(QPixmap(const_cast<const char**>(forward_xpm))), + tr("Last column"), + this, + SLOT(lastColumn())); + + Toolbar->addSeparator(); + + NullCheck = new QCheckBox(tr("NULL"), Toolbar); + NullCheck->setObjectName(TO_TOOLBAR_WIDGET_NAME); + Toolbar->addWidget(NullCheck); + connect(NullCheck, SIGNAL(toggled(bool)), this, SLOT(null(bool))); + NullCheck->setEnabled(!Editor->isReadOnly()); + NullCheck->setFocusPolicy(Qt::StrongFocus); + + Label = new QLabel(Toolbar); + Label->setObjectName(TO_TOOLBAR_WIDGET_NAME); + Label->setAlignment(Qt::AlignRight | Qt::AlignVCenter); + Label->setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, + QSizePolicy::Minimum)); + Toolbar->addWidget(Label); + + readSettings(); + + connect(this, + SIGNAL(finished(int)), + this, + SLOT(writeSettings())); + + changePosition(Current); + if (!modal) + show(); +} + +void toModelEditor::readSettings() +{ + QSettings settings; + settings.beginGroup("memoEditor"); + resize(settings.value("size", QSize(400, 300)).toSize()); +} + +void toModelEditor::writeSettings() const +{ + QSettings settings; + settings.beginGroup("memoEditor"); + settings.setValue("size", size()); +} + +void toModelEditor::setText(const QString &str) +{ + Editor->setText(str); + NullCheck->setChecked(str.isNull()); + Editor->setModified(false); +} + +void toModelEditor::setNull(bool nul) +{ + Editor->setModified(true); + Editor->setDisabled(nul); +} + +void toModelEditor::store() +{ + if (Editor->isReadOnly()) + return; + if (Editor->isModified()) + { + if (!Editor->isEnabled()) + Model->setData(Current, QVariant(QString::null)); + else + Model->setData(Current, Editor->text()); + } + accept(); +} + +void toModelEditor::changePosition(QModelIndex index) +{ + Current = index; + if(Editable) + setText(Model->data(Current, Qt::EditRole).toString()); + else + setText(Model->data(Current, Qt::DisplayRole).toString()); +} + +void toModelEditor::firstColumn() +{ + QModelIndex index = Model->index(Current.row(), 1); + changePosition(index); + Label->setText("<B>" + Model->headerData(index.column(), Qt::Horizontal).toString() + "</B>"); +} + +void toModelEditor::previousColumn() +{ + if(Current.column() <= 1) + return; + + QModelIndex index = Model->index(Current.row(), Current.column() - 1); + changePosition(index); + Label->setText("<B>" + Model->headerData(index.column(), Qt::Horizontal).toString() + "</B>"); +} + +void toModelEditor::nextColumn() +{ + if(Current.column() >= Model->columnCount() - 1) { + printf("ignore\n"); + return; + } + + QModelIndex index = Model->index(Current.row(), Current.column() + 1); + changePosition(index); + Label->setText("<B>" + Model->headerData(index.column(), Qt::Horizontal).toString() + "</B>"); +} + +void toModelEditor::lastColumn() +{ + QModelIndex index = Model->index(Current.row(), Model->columnCount() - 1); + changePosition(index); + Label->setText("<B>" + Model->headerData(index.column(), Qt::Horizontal).toString() + "</B>"); +} Added: trunk/tora/src/tomodeleditor.h =================================================================== --- trunk/tora/src/tomodeleditor.h (rev 0) +++ trunk/tora/src/tomodeleditor.h 2008-08-31 23:13:19 UTC (rev 2966) @@ -0,0 +1,141 @@ +/***** + * + * 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 TOMEMOEDITOR_H +#define TOMEMOEDITOR_H + +#include "config.h" + +#include <qdialog.h> +#include <QLabel> +#include <QToolBar> +#include <QModelIndex> + +class QCheckBox; +class QToolBar; +class toMarkedText; +class QAbstractItemModel; + + +/** + * A dialog for displaying and editing a row and column of a model. + * + */ +class toModelEditor : public QDialog +{ + Q_OBJECT; + + // Editor of widget + toMarkedText *Editor; + + QToolBar *Toolbar; + QLabel *Label; + QCheckBox *NullCheck; + + bool Editable; + QModelIndex Current; + QAbstractItemModel *Model; + +private slots: + void openFile(void); + void saveFile(void); + void readSettings(void); + void writeSettings(void) const; + virtual void setNull(bool); + +protected: + QToolBar *toolbar() + { + return Toolbar; + } + toMarkedText *editor() + { + return Editor; + } + QLabel *label() + { + return Label; + } + +public: + /** + * Create this editor. + * + * @param parent Parent widget. + * @param model data source + * @param row Optional location specifier, pass on in @ref changeData call. + * @param col Optional location specifier, pass on in @ref changeData call. + * @param sql Use SQL syntax highlighting of widget. + * @param modal Display in modal dialog + */ + toModelEditor(QWidget *parent, + QAbstractItemModel *model, + QModelIndex current, + bool sql = false, + bool modal = false); + +public slots: + /** Save changes and close. + */ + virtual void store(void); + + /** Goto first column. + */ + virtual void firstColumn(); + + /** Goto next column. + */ + virtual void nextColumn(); + + /** Goto previous column. + */ + virtual void previousColumn(); + + /** Goto last column. + */ + virtual void lastColumn(); + + /** Change position in whatever it is your displaying. + */ + virtual void changePosition(QModelIndex index); + + /** Change value of editor. + */ + virtual void setText(const QString &); +}; + +#endif Modified: trunk/tora/src/toresultdatasingle.cpp =================================================================== --- trunk/tora/src/toresultdatasingle.cpp 2008-08-31 20:07:50 UTC (rev 2965) +++ trunk/tora/src/toresultdatasingle.cpp 2008-08-31 23:13:19 UTC (rev 2966) @@ -41,7 +41,7 @@ #include "toconfiguration.h" #include "toresultdatasingle.h" #include "toparamget.h" -#include "tomemoeditor.h" +#include "tomodeleditor.h" #include <QScrollArea> #include <QCheckBox> @@ -130,8 +130,22 @@ grid->setRowStretch(row, 1); changeRow(Row); + + connect(Model, + SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)), + this, + SLOT(dataChanged(const QModelIndex &, const QModelIndex &))); } + +void toResultDataSingle::dataChanged(const QModelIndex &topLeft, + const QModelIndex &bottomRight) +{ + if(topLeft.row() >= Row && bottomRight.row() <= Row) + changeRow(Row); // update +} + + void toResultDataSingle::changeRow(int row) { bool any = false; @@ -181,20 +195,17 @@ } -void toResultDataSingle::showMemo(int row) +void toResultDataSingle::showMemo(int col) { - QLineEdit *obj = findChild<QLineEdit *>(QString::number(row)); - if (obj) - { - toMemoEditor *memo = new toMemoEditor( + QModelIndex index = Model->index(Row, col); + if(index.isValid()) { + toModelEditor *memo = new toModelEditor( this, - obj->text(), - row, - 0, + Model, + index, false, true); - if (memo->exec()) - obj->setText(memo->text()); + memo->exec(); } } Modified: trunk/tora/src/toresultdatasingle.h =================================================================== --- trunk/tora/src/toresultdatasingle.h 2008-08-31 20:07:50 UTC (rev 2965) +++ trunk/tora/src/toresultdatasingle.h 2008-08-31 23:13:19 UTC (rev 2966) @@ -76,8 +76,9 @@ } private slots: - virtual void showMemo(int row); + virtual void showMemo(int col); void saveRow(void); + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight); }; #endif Modified: trunk/tora/src/toresulttableview.cpp =================================================================== --- trunk/tora/src/toresulttableview.cpp 2008-08-31 20:07:50 UTC (rev 2965) +++ trunk/tora/src/toresulttableview.cpp 2008-08-31 23:13:19 UTC (rev 2966) @@ -43,7 +43,7 @@ #include "utils.h" #include "toconfiguration.h" #include "toconnection.h" -#include "tomemoeditor.h" +#include "tomodeleditor.h" #include "tomain.h" #include "toresultlistformat.h" #include "tolistviewformatter.h" @@ -377,7 +377,7 @@ if (action == displayAct) { QVariant data = model()->data(index, Qt::EditRole); - toMemoEditor *ed = new toMemoEditor(this, data.toString()); + toModelEditor *ed = new toModelEditor(this, model(), index); ed->exec(); } else if (action == leftAct) @@ -462,7 +462,7 @@ return; QVariant data = model()->data(index, Qt::EditRole); - toMemoEditor *ed = new toMemoEditor(this, data.toString()); + toModelEditor *ed = new toModelEditor(this, model(), index); ed->exec(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-09-01 23:46:27
|
Revision: 2968 http://tora.svn.sourceforge.net/tora/?rev=2968&view=rev Author: mrjohnson0 Date: 2008-09-01 23:46:36 +0000 (Mon, 01 Sep 2008) Log Message: ----------- implements drag and drop for toresulttable-based widgets. move is not yet supported. take a look at this patch you're wondering why i've been putting this off. drag and drop is one of my favorite things to do, right after picking up after my dog and stubbing my toe. Modified Paths: -------------- trunk/tora/src/Makefile.am trunk/tora/src/toresultmodel.cpp trunk/tora/src/toresultmodel.h trunk/tora/src/toresulttableview.cpp trunk/tora/src/toresulttableviewedit.cpp Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2008-09-01 18:26:27 UTC (rev 2967) +++ trunk/tora/src/Makefile.am 2008-09-01 23:46:36 UTC (rev 2968) @@ -127,7 +127,6 @@ toscriptschemawidget.cpp toscriptschemawidget.h \ toscripttreeitem.cpp toscripttreeitem.h \ tocodemodel.cpp tocodemodel.h \ - torunningmodel.cpp torunningmodel.h \ toscripttreemodel.cpp toscripttreemodel.h \ tosecurity.cpp tosecurity.h \ tosecuritytreemodel.cpp tosecuritytreemodel.h \ @@ -285,7 +284,6 @@ moc_toconnection.cpp \ moc_toconnectionmodel.cpp \ moc_tocodemodel.cpp \ - moc_torunningmodel.cpp \ moc_toconnectionpool.cpp \ moc_toconnectionimport.cpp \ moc_torunnable.cpp \ Modified: trunk/tora/src/toresultmodel.cpp =================================================================== --- trunk/tora/src/toresultmodel.cpp 2008-09-01 18:26:27 UTC (rev 2967) +++ trunk/tora/src/toresultmodel.cpp 2008-09-01 23:46:36 UTC (rev 2968) @@ -82,6 +82,11 @@ this, SLOT(fetchMore())); + if(Editable) + setSupportedDragActions(Qt::CopyAction | Qt::MoveAction); + else + setSupportedDragActions(Qt::CopyAction); + query->start(); } @@ -266,6 +271,196 @@ } +QStringList toResultModel::mimeTypes() const +{ + QStringList types; + types << "text/plain"; + types << "application/vnd.text.list"; + return types; +} + + +QMimeData* toResultModel::mimeData(const QModelIndexList &indexes) const { + QMimeData *mimeData = new QMimeData(); + QByteArray encodedData; + QDataStream stream(&encodedData, QIODevice::WriteOnly); + + int valid = 0; + QString text; + QModelIndex validIndex; + + // qt sends list by column (all indexes from column 1, then column + // column2). Need to figure out the number of columns and + // rows. It'd be awesome if we could get the selection but there's + // no good way to do that from the model. + + // it also needs to be first in the serialized data, so we have to + // loop here. + { + int rows = 0; + int columns = 0; + int currentRow = -1; + int currentCol = -1; + foreach (QModelIndex index, indexes) + { + if (index.isValid()) + { + if(index.row() > currentRow) + { + currentRow = index.row(); + rows++; + } + + if(currentCol != index.column()) + { + currentCol = index.column(); + columns++; + } + } + } + + stream << rows; + stream << columns; + } + + foreach (QModelIndex index, indexes) + { + if (index.isValid()) + { + valid++; + validIndex = index; + text = data(index, Qt::DisplayRole).toString(); + stream << text; + } + } + + if(valid < 1) + return 0; + + if(valid == 1) { + mimeData->setText(text); + + QByteArray sourceData; + QDataStream sourceStream(&sourceData, QIODevice::WriteOnly); + sourceStream << validIndex.row(); + sourceStream << validIndex.column(); + mimeData->setData("application/vnd.int.list", sourceData); + } + else + mimeData->setData("application/vnd.text.list", encodedData); + + return mimeData; +} + + +bool toResultModel::dropMimeData(const QMimeData *data, + Qt::DropAction action, + int row, + int column, + const QModelIndex &parent) +{ + if (action == Qt::IgnoreAction) + return true; + if (!Editable) + return false; + if (row == 1) + return false; // can't change row number + + if(row < 0 || column < 0) + { + // friggen qt expects me to figure it out. you'd think -1 + // wouldn't happen often but you'd be wrong. + row = parent.row(); + column = parent.column(); + } + + if(row < 0) { + row = addRow() - 1; + if(row < 0) + return false; + } + + if (data->hasText()) + { + // can't do anything with an item without a valid column + if(column < 0) + { + if (data->hasFormat("application/vnd.int.list")) + { + QByteArray source = data->data("application/vnd.int.list"); + QDataStream stream(&source, QIODevice::ReadOnly); + int sourceRow = 0; + int sourceCol = 0; + stream >> sourceRow; + stream >> sourceCol; + + if(sourceCol > 0) + column = sourceCol; + else + return false; + } + else + return false; + } + + QModelIndex ind = index(row, column); + setData(ind, QVariant(data->text())); + return true; + } + else if (data->hasFormat("application/vnd.text.list")) + { + QByteArray source = data->data("application/vnd.text.list"); + QDataStream stream(&source, QIODevice::ReadOnly); + + if (column < 0) + column = 1; + + int rows; + int columns; + stream >> rows; + stream >> columns; + + // count of rows down we've gone so far + int counter = 0; + while (!stream.atEnd() && column <= columnCount()) + { + QString text; + stream >> text; + + QModelIndex ind = index(row, column); + setData(ind, QVariant(text)); + + row++; + counter++; + if (counter >= rows) + { + row -= counter; + counter = 0; + column++; + } + + if (!stream.atEnd() && row >= rowCount()) + row = addRow() - 1; + + if (column >= columnCount()) + return true; // drop data past end of columns + } + + return true; + } + + return false; +} + + +Qt::DropActions toResultModel::supportedDropActions() const +{ + if(Editable) + return Qt::CopyAction | Qt::MoveAction; + return Qt::IgnoreAction; +} + + int toResultModel::rowCount(const QModelIndex &parent) const { if (parent.isValid()) @@ -500,10 +695,23 @@ Qt::ItemFlags toResultModel::flags(const QModelIndex &index) const { - Qt::ItemFlags fl = Qt::ItemIsEnabled | Qt::ItemIsSelectable; + Qt::ItemFlags defaultFlags = QAbstractTableModel::flags(index); + Qt::ItemFlags fl = Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled; + + if (index.column() == 0) + return fl; // row number column + + if (!index.isValid()) + { + if(Editable) + return Qt::ItemIsDropEnabled | defaultFlags; + else + return defaultFlags; + } + if (Editable) - fl = fl | Qt::ItemIsEditable; - return fl; + return fl | defaultFlags | Qt::ItemIsEditable | Qt::ItemIsDropEnabled; + return fl | defaultFlags; } Modified: trunk/tora/src/toresultmodel.h =================================================================== --- trunk/tora/src/toresultmodel.h 2008-09-01 18:26:27 UTC (rev 2967) +++ trunk/tora/src/toresultmodel.h 2008-09-01 23:46:36 UTC (rev 2968) @@ -267,7 +267,7 @@ * a new row. * * @param ind if valid, the row to duplicate - * @returns the row added or -1 + * @return the CurrentRow (length) or -1 */ int addRow(QModelIndex ind = QModelIndex()); @@ -279,6 +279,69 @@ */ void deleteRow(QModelIndex); + + /** + * Returns a list of MIME types that can be used to describe a + * list of model indexes. + * + */ + virtual QStringList mimeTypes() const; + + + /** + * Returns an object that contains serialized items of data + * corresponding to the list of indexes specified. The formats + * used to describe the encoded data is obtained from the + * mimeTypes() function. + * + * If the list of indexes is empty, or there are no supported MIME + * types, 0 is returned rather than a serialized empty list. + * + */ + virtual QMimeData* mimeData(const QModelIndexList &indexes) const; + + + /** + * Handles the data supplied by a drag and drop operation that + * ended with the given action. Returns true if the data and + * action can be handled by the model; otherwise returns false. + * + * Although the specified row, column and parent indicate the + * location of an item in the model where the operation ended, it + * is the responsibility of the view to provide a suitable + * location for where the data should be inserted. + * + * For instance, a drop action on an item in a QTreeView can + * result in new items either being inserted as children of the + * item specified by row, column, and parent, or as siblings of + * the item. + * + * When row and column are -1 it means that it is up to the model + * to decide where to place the data. This can occur in a tree + * when data is dropped on a parent. Models will usually append + * the data to the parent in this case. + * + * Returns true if the dropping was successful otherwise false. + * + */ + virtual bool dropMimeData(const QMimeData *data, + Qt::DropAction action, + int row, + int column, + const QModelIndex &parent); + + + /** + * Returns the drop actions supported by this model. + * + * The default implementation returns Qt::CopyAction. Reimplement + * this function if you wish to support additional actions. Note + * that you must also reimplement the dropMimeData() function to + * handle the additional operations. + * + */ + virtual Qt::DropActions supportedDropActions() const; + signals: /** Modified: trunk/tora/src/toresulttableview.cpp =================================================================== --- trunk/tora/src/toresulttableview.cpp 2008-09-01 18:26:27 UTC (rev 2967) +++ trunk/tora/src/toresulttableview.cpp 2008-09-01 23:46:36 UTC (rev 2968) @@ -133,8 +133,8 @@ createActions(); - setSelectionBehavior(QAbstractItemView::SelectRows); - setSelectionMode(QAbstractItemView::ExtendedSelection); + setSelectionBehavior(QAbstractItemView::SelectItems); + setSelectionMode(QAbstractItemView::ContiguousSelection); setAlternatingRowColors(true); setContextMenuPolicy(Qt::CustomContextMenu); @@ -150,6 +150,14 @@ SIGNAL(doubleClicked(const QModelIndex &)), this, SLOT(handleDoubleClick(const QModelIndex &))); + + setDragEnabled(true); + if(Editable) + viewport()->setAcceptDrops(true); + setDropIndicatorShown(true); + + if(Editable) + setDragDropMode(QAbstractItemView::DragDrop); } Modified: trunk/tora/src/toresulttableviewedit.cpp =================================================================== --- trunk/tora/src/toresulttableviewedit.cpp 2008-09-01 18:26:27 UTC (rev 2967) +++ trunk/tora/src/toresulttableviewedit.cpp 2008-09-01 23:46:36 UTC (rev 2968) @@ -62,7 +62,7 @@ { setSelectionBehavior(QAbstractItemView::SelectItems); - setSelectionMode(QAbstractItemView::SingleSelection); + setSelectionMode(QAbstractItemView::ContiguousSelection); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Neulinger, N. <nn...@ms...> - 2008-09-02 01:33:37
|
Ok, seriously... that's scary... I was hoping it would be something like: widget->setDragDrop(ENABLED); :) Clearly not. Patch works quite nicely though, thank you for re-implementing that. It's very nice to have that functionality again. -- Nathan ------------------------------------------------------------ Nathan Neulinger nn...@ms... Missouri S&T Information Technology (573) 341-6679 System Administrator - Principal KD0DMH > -----Original Message----- > From: tor...@li... [mailto:tora-cvs- > bo...@li...] On Behalf Of > mrj...@us... > Sent: Monday, September 01, 2008 6:47 PM > To: tor...@li... > Subject: [Tora-cvs] SF.net SVN: tora:[2968] trunk/tora/src > > Revision: 2968 > http://tora.svn.sourceforge.net/tora/?rev=2968&view=rev > Author: mrjohnson0 > Date: 2008-09-01 23:46:36 +0000 (Mon, 01 Sep 2008) > > Log Message: > ----------- > implements drag and drop for toresulttable-based widgets. > > move is not yet supported. > > take a look at this patch you're wondering why i've been putting this > off. drag and drop is one of my favorite things to do, right after > picking up after my dog and stubbing my toe. > > Modified Paths: > -------------- > trunk/tora/src/Makefile.am > trunk/tora/src/toresultmodel.cpp > trunk/tora/src/toresultmodel.h > trunk/tora/src/toresulttableview.cpp > trunk/tora/src/toresulttableviewedit.cpp > > Modified: trunk/tora/src/Makefile.am > =================================================================== > --- trunk/tora/src/Makefile.am 2008-09-01 18:26:27 UTC (rev 2967) > +++ trunk/tora/src/Makefile.am 2008-09-01 23:46:36 UTC (rev 2968) > @@ -127,7 +127,6 @@ > toscriptschemawidget.cpp toscriptschemawidget.h \ > toscripttreeitem.cpp toscripttreeitem.h \ > tocodemodel.cpp tocodemodel.h \ > - torunningmodel.cpp torunningmodel.h \ > toscripttreemodel.cpp toscripttreemodel.h \ > tosecurity.cpp tosecurity.h \ > tosecuritytreemodel.cpp tosecuritytreemodel.h \ > @@ -285,7 +284,6 @@ > moc_toconnection.cpp \ > moc_toconnectionmodel.cpp \ > moc_tocodemodel.cpp \ > - moc_torunningmodel.cpp \ > moc_toconnectionpool.cpp \ > moc_toconnectionimport.cpp \ > moc_torunnable.cpp \ > > Modified: trunk/tora/src/toresultmodel.cpp > =================================================================== > --- trunk/tora/src/toresultmodel.cpp 2008-09-01 18:26:27 UTC (rev > 2967) > +++ trunk/tora/src/toresultmodel.cpp 2008-09-01 23:46:36 UTC (rev > 2968) > @@ -82,6 +82,11 @@ > this, > SLOT(fetchMore())); > > + if(Editable) > + setSupportedDragActions(Qt::CopyAction | Qt::MoveAction); > + else > + setSupportedDragActions(Qt::CopyAction); > + > query->start(); > } > > @@ -266,6 +271,196 @@ > } > > > +QStringList toResultModel::mimeTypes() const > +{ > + QStringList types; > + types << "text/plain"; > + types << "application/vnd.text.list"; > + return types; > +} > + > + > +QMimeData* toResultModel::mimeData(const QModelIndexList &indexes) > const { > + QMimeData *mimeData = new QMimeData(); > + QByteArray encodedData; > + QDataStream stream(&encodedData, QIODevice::WriteOnly); > + > + int valid = 0; > + QString text; > + QModelIndex validIndex; > + > + // qt sends list by column (all indexes from column 1, then column > + // column2). Need to figure out the number of columns and > + // rows. It'd be awesome if we could get the selection but there's > + // no good way to do that from the model. > + > + // it also needs to be first in the serialized data, so we have to > + // loop here. > + { > + int rows = 0; > + int columns = 0; > + int currentRow = -1; > + int currentCol = -1; > + foreach (QModelIndex index, indexes) > + { > + if (index.isValid()) > + { > + if(index.row() > currentRow) > + { > + currentRow = index.row(); > + rows++; > + } > + > + if(currentCol != index.column()) > + { > + currentCol = index.column(); > + columns++; > + } > + } > + } > + > + stream << rows; > + stream << columns; > + } > + > + foreach (QModelIndex index, indexes) > + { > + if (index.isValid()) > + { > + valid++; > + validIndex = index; > + text = data(index, Qt::DisplayRole).toString(); > + stream << text; > + } > + } > + > + if(valid < 1) > + return 0; > + > + if(valid == 1) { > + mimeData->setText(text); > + > + QByteArray sourceData; > + QDataStream sourceStream(&sourceData, QIODevice::WriteOnly); > + sourceStream << validIndex.row(); > + sourceStream << validIndex.column(); > + mimeData->setData("application/vnd.int.list", sourceData); > + } > + else > + mimeData->setData("application/vnd.text.list", encodedData); > + > + return mimeData; > +} > + > + > +bool toResultModel::dropMimeData(const QMimeData *data, > + Qt::DropAction action, > + int row, > + int column, > + const QModelIndex &parent) > +{ > + if (action == Qt::IgnoreAction) > + return true; > + if (!Editable) > + return false; > + if (row == 1) > + return false; // can't change row number > + > + if(row < 0 || column < 0) > + { > + // friggen qt expects me to figure it out. you'd think -1 > + // wouldn't happen often but you'd be wrong. > + row = parent.row(); > + column = parent.column(); > + } > + > + if(row < 0) { > + row = addRow() - 1; > + if(row < 0) > + return false; > + } > + > + if (data->hasText()) > + { > + // can't do anything with an item without a valid column > + if(column < 0) > + { > + if (data->hasFormat("application/vnd.int.list")) > + { > + QByteArray source = data- > >data("application/vnd.int.list"); > + QDataStream stream(&source, QIODevice::ReadOnly); > + int sourceRow = 0; > + int sourceCol = 0; > + stream >> sourceRow; > + stream >> sourceCol; > + > + if(sourceCol > 0) > + column = sourceCol; > + else > + return false; > + } > + else > + return false; > + } > + > + QModelIndex ind = index(row, column); > + setData(ind, QVariant(data->text())); > + return true; > + } > + else if (data->hasFormat("application/vnd.text.list")) > + { > + QByteArray source = data->data("application/vnd.text.list"); > + QDataStream stream(&source, QIODevice::ReadOnly); > + > + if (column < 0) > + column = 1; > + > + int rows; > + int columns; > + stream >> rows; > + stream >> columns; > + > + // count of rows down we've gone so far > + int counter = 0; > + while (!stream.atEnd() && column <= columnCount()) > + { > + QString text; > + stream >> text; > + > + QModelIndex ind = index(row, column); > + setData(ind, QVariant(text)); > + > + row++; > + counter++; > + if (counter >= rows) > + { > + row -= counter; > + counter = 0; > + column++; > + } > + > + if (!stream.atEnd() && row >= rowCount()) > + row = addRow() - 1; > + > + if (column >= columnCount()) > + return true; // drop data past end of columns > + } > + > + return true; > + } > + > + return false; > +} > + > + > +Qt::DropActions toResultModel::supportedDropActions() const > +{ > + if(Editable) > + return Qt::CopyAction | Qt::MoveAction; > + return Qt::IgnoreAction; > +} > + > + > int toResultModel::rowCount(const QModelIndex &parent) const > { > if (parent.isValid()) > @@ -500,10 +695,23 @@ > > Qt::ItemFlags toResultModel::flags(const QModelIndex &index) const > { > - Qt::ItemFlags fl = Qt::ItemIsEnabled | Qt::ItemIsSelectable; > + Qt::ItemFlags defaultFlags = QAbstractTableModel::flags(index); > + Qt::ItemFlags fl = Qt::ItemIsEnabled | Qt::ItemIsSelectable | > Qt::ItemIsDragEnabled; > + > + if (index.column() == 0) > + return fl; // row number column > + > + if (!index.isValid()) > + { > + if(Editable) > + return Qt::ItemIsDropEnabled | defaultFlags; > + else > + return defaultFlags; > + } > + > if (Editable) > - fl = fl | Qt::ItemIsEditable; > - return fl; > + return fl | defaultFlags | Qt::ItemIsEditable | > Qt::ItemIsDropEnabled; > + return fl | defaultFlags; > } > > > > Modified: trunk/tora/src/toresultmodel.h > =================================================================== > --- trunk/tora/src/toresultmodel.h 2008-09-01 18:26:27 UTC (rev 2967) > +++ trunk/tora/src/toresultmodel.h 2008-09-01 23:46:36 UTC (rev 2968) > @@ -267,7 +267,7 @@ > * a new row. > * > * @param ind if valid, the row to duplicate > - * @returns the row added or -1 > + * @return the CurrentRow (length) or -1 > */ > int addRow(QModelIndex ind = QModelIndex()); > > @@ -279,6 +279,69 @@ > */ > void deleteRow(QModelIndex); > > + > + /** > + * Returns a list of MIME types that can be used to describe a > + * list of model indexes. > + * > + */ > + virtual QStringList mimeTypes() const; > + > + > + /** > + * Returns an object that contains serialized items of data > + * corresponding to the list of indexes specified. The formats > + * used to describe the encoded data is obtained from the > + * mimeTypes() function. > + * > + * If the list of indexes is empty, or there are no supported MIME > + * types, 0 is returned rather than a serialized empty list. > + * > + */ > + virtual QMimeData* mimeData(const QModelIndexList &indexes) const; > + > + > + /** > + * Handles the data supplied by a drag and drop operation that > + * ended with the given action. Returns true if the data and > + * action can be handled by the model; otherwise returns false. > + * > + * Although the specified row, column and parent indicate the > + * location of an item in the model where the operation ended, it > + * is the responsibility of the view to provide a suitable > + * location for where the data should be inserted. > + * > + * For instance, a drop action on an item in a QTreeView can > + * result in new items either being inserted as children of the > + * item specified by row, column, and parent, or as siblings of > + * the item. > + * > + * When row and column are -1 it means that it is up to the model > + * to decide where to place the data. This can occur in a tree > + * when data is dropped on a parent. Models will usually append > + * the data to the parent in this case. > + * > + * Returns true if the dropping was successful otherwise false. > + * > + */ > + virtual bool dropMimeData(const QMimeData *data, > + Qt::DropAction action, > + int row, > + int column, > + const QModelIndex &parent); > + > + > + /** > + * Returns the drop actions supported by this model. > + * > + * The default implementation returns Qt::CopyAction. Reimplement > + * this function if you wish to support additional actions. Note > + * that you must also reimplement the dropMimeData() function to > + * handle the additional operations. > + * > + */ > + virtual Qt::DropActions supportedDropActions() const; > + > signals: > > /** > > Modified: trunk/tora/src/toresulttableview.cpp > =================================================================== > --- trunk/tora/src/toresulttableview.cpp 2008-09-01 18:26:27 UTC (rev > 2967) > +++ trunk/tora/src/toresulttableview.cpp 2008-09-01 23:46:36 UTC (rev > 2968) > @@ -133,8 +133,8 @@ > > createActions(); > > - setSelectionBehavior(QAbstractItemView::SelectRows); > - setSelectionMode(QAbstractItemView::ExtendedSelection); > + setSelectionBehavior(QAbstractItemView::SelectItems); > + setSelectionMode(QAbstractItemView::ContiguousSelection); > setAlternatingRowColors(true); > > setContextMenuPolicy(Qt::CustomContextMenu); > @@ -150,6 +150,14 @@ > SIGNAL(doubleClicked(const QModelIndex &)), > this, > SLOT(handleDoubleClick(const QModelIndex &))); > + > + setDragEnabled(true); > + if(Editable) > + viewport()->setAcceptDrops(true); > + setDropIndicatorShown(true); > + > + if(Editable) > + setDragDropMode(QAbstractItemView::DragDrop); > } > > > > Modified: trunk/tora/src/toresulttableviewedit.cpp > =================================================================== > --- trunk/tora/src/toresulttableviewedit.cpp 2008-09-01 18:26:27 UTC > (rev 2967) > +++ trunk/tora/src/toresulttableviewedit.cpp 2008-09-01 23:46:36 UTC > (rev 2968) > @@ -62,7 +62,7 @@ > { > > setSelectionBehavior(QAbstractItemView::SelectItems); > - setSelectionMode(QAbstractItemView::SingleSelection); > + setSelectionMode(QAbstractItemView::ContiguousSelection); > } > > > > > This was sent by the SourceForge.net collaborative development > platform, the world's largest Open Source development site. > > ----------------------------------------------------------------------- > -- > This SF.Net email is sponsored by the Moblin Your Move Developer's > challenge > Build the coolest Linux based applications with Moblin SDK & win great > prizes > Grand prize is a trip for two to an Open Source event anywhere in the > world > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > _______________________________________________ > Tora-cvs mailing list > Tor...@li... > https://lists.sourceforge.net/lists/listinfo/tora-cvs |
From: Mike J. <mrj...@us...> - 2008-09-02 01:43:31
|
Thanks :-) I'm still working some bugs out. I just wanted to have something to revert to if I screwed up. It works a bit differently than the old one, but better I hope. On Mon, 2008-09-01 at 20:33 -0500, Neulinger, Nathan wrote: > Ok, seriously... that's scary... > > I was hoping it would be something like: > > widget->setDragDrop(ENABLED); > > :) > > Clearly not. > > Patch works quite nicely though, thank you for re-implementing that. > It's very nice to have that functionality again. > > -- Nathan > > ------------------------------------------------------------ > Nathan Neulinger nn...@ms... > Missouri S&T Information Technology (573) 341-6679 > System Administrator - Principal KD0DMH > > > > -----Original Message----- > > From: tor...@li... [mailto:tora-cvs- > > bo...@li...] On Behalf Of > > mrj...@us... > > Sent: Monday, September 01, 2008 6:47 PM > > To: tor...@li... > > Subject: [Tora-cvs] SF.net SVN: tora:[2968] trunk/tora/src > > > > Revision: 2968 > > http://tora.svn.sourceforge.net/tora/?rev=2968&view=rev > > Author: mrjohnson0 > > Date: 2008-09-01 23:46:36 +0000 (Mon, 01 Sep 2008) > > > > Log Message: > > ----------- > > implements drag and drop for toresulttable-based widgets. > > > > move is not yet supported. > > > > take a look at this patch you're wondering why i've been putting this > > off. drag and drop is one of my favorite things to do, right after > > picking up after my dog and stubbing my toe. > > > > Modified Paths: > > -------------- > > trunk/tora/src/Makefile.am > > trunk/tora/src/toresultmodel.cpp > > trunk/tora/src/toresultmodel.h > > trunk/tora/src/toresulttableview.cpp > > trunk/tora/src/toresulttableviewedit.cpp > > > > Modified: trunk/tora/src/Makefile.am > > =================================================================== > > --- trunk/tora/src/Makefile.am 2008-09-01 18:26:27 UTC (rev > 2967) > > +++ trunk/tora/src/Makefile.am 2008-09-01 23:46:36 UTC (rev > 2968) > > @@ -127,7 +127,6 @@ > > toscriptschemawidget.cpp toscriptschemawidget.h \ > > toscripttreeitem.cpp toscripttreeitem.h \ > > tocodemodel.cpp tocodemodel.h \ > > - torunningmodel.cpp torunningmodel.h \ > > toscripttreemodel.cpp toscripttreemodel.h \ > > tosecurity.cpp tosecurity.h \ > > tosecuritytreemodel.cpp tosecuritytreemodel.h \ > > @@ -285,7 +284,6 @@ > > moc_toconnection.cpp \ > > moc_toconnectionmodel.cpp \ > > moc_tocodemodel.cpp \ > > - moc_torunningmodel.cpp \ > > moc_toconnectionpool.cpp \ > > moc_toconnectionimport.cpp \ > > moc_torunnable.cpp \ > > > > Modified: trunk/tora/src/toresultmodel.cpp > > =================================================================== > > --- trunk/tora/src/toresultmodel.cpp 2008-09-01 18:26:27 UTC (rev > > 2967) > > +++ trunk/tora/src/toresultmodel.cpp 2008-09-01 23:46:36 UTC (rev > > 2968) > > @@ -82,6 +82,11 @@ > > this, > > SLOT(fetchMore())); > > > > + if(Editable) > > + setSupportedDragActions(Qt::CopyAction | Qt::MoveAction); > > + else > > + setSupportedDragActions(Qt::CopyAction); > > + > > query->start(); > > } > > > > @@ -266,6 +271,196 @@ > > } > > > > > > +QStringList toResultModel::mimeTypes() const > > +{ > > + QStringList types; > > + types << "text/plain"; > > + types << "application/vnd.text.list"; > > + return types; > > +} > > + > > + > > +QMimeData* toResultModel::mimeData(const QModelIndexList &indexes) > > const { > > + QMimeData *mimeData = new QMimeData(); > > + QByteArray encodedData; > > + QDataStream stream(&encodedData, QIODevice::WriteOnly); > > + > > + int valid = 0; > > + QString text; > > + QModelIndex validIndex; > > + > > + // qt sends list by column (all indexes from column 1, then > column > > + // column2). Need to figure out the number of columns and > > + // rows. It'd be awesome if we could get the selection but > there's > > + // no good way to do that from the model. > > + > > + // it also needs to be first in the serialized data, so we have > to > > + // loop here. > > + { > > + int rows = 0; > > + int columns = 0; > > + int currentRow = -1; > > + int currentCol = -1; > > + foreach (QModelIndex index, indexes) > > + { > > + if (index.isValid()) > > + { > > + if(index.row() > currentRow) > > + { > > + currentRow = index.row(); > > + rows++; > > + } > > + > > + if(currentCol != index.column()) > > + { > > + currentCol = index.column(); > > + columns++; > > + } > > + } > > + } > > + > > + stream << rows; > > + stream << columns; > > + } > > + > > + foreach (QModelIndex index, indexes) > > + { > > + if (index.isValid()) > > + { > > + valid++; > > + validIndex = index; > > + text = data(index, Qt::DisplayRole).toString(); > > + stream << text; > > + } > > + } > > + > > + if(valid < 1) > > + return 0; > > + > > + if(valid == 1) { > > + mimeData->setText(text); > > + > > + QByteArray sourceData; > > + QDataStream sourceStream(&sourceData, QIODevice::WriteOnly); > > + sourceStream << validIndex.row(); > > + sourceStream << validIndex.column(); > > + mimeData->setData("application/vnd.int.list", sourceData); > > + } > > + else > > + mimeData->setData("application/vnd.text.list", encodedData); > > + > > + return mimeData; > > +} > > + > > + > > +bool toResultModel::dropMimeData(const QMimeData *data, > > + Qt::DropAction action, > > + int row, > > + int column, > > + const QModelIndex &parent) > > +{ > > + if (action == Qt::IgnoreAction) > > + return true; > > + if (!Editable) > > + return false; > > + if (row == 1) > > + return false; // can't change row number > > + > > + if(row < 0 || column < 0) > > + { > > + // friggen qt expects me to figure it out. you'd think -1 > > + // wouldn't happen often but you'd be wrong. > > + row = parent.row(); > > + column = parent.column(); > > + } > > + > > + if(row < 0) { > > + row = addRow() - 1; > > + if(row < 0) > > + return false; > > + } > > + > > + if (data->hasText()) > > + { > > + // can't do anything with an item without a valid column > > + if(column < 0) > > + { > > + if (data->hasFormat("application/vnd.int.list")) > > + { > > + QByteArray source = data- > > >data("application/vnd.int.list"); > > + QDataStream stream(&source, QIODevice::ReadOnly); > > + int sourceRow = 0; > > + int sourceCol = 0; > > + stream >> sourceRow; > > + stream >> sourceCol; > > + > > + if(sourceCol > 0) > > + column = sourceCol; > > + else > > + return false; > > + } > > + else > > + return false; > > + } > > + > > + QModelIndex ind = index(row, column); > > + setData(ind, QVariant(data->text())); > > + return true; > > + } > > + else if (data->hasFormat("application/vnd.text.list")) > > + { > > + QByteArray source = data->data("application/vnd.text.list"); > > + QDataStream stream(&source, QIODevice::ReadOnly); > > + > > + if (column < 0) > > + column = 1; > > + > > + int rows; > > + int columns; > > + stream >> rows; > > + stream >> columns; > > + > > + // count of rows down we've gone so far > > + int counter = 0; > > + while (!stream.atEnd() && column <= columnCount()) > > + { > > + QString text; > > + stream >> text; > > + > > + QModelIndex ind = index(row, column); > > + setData(ind, QVariant(text)); > > + > > + row++; > > + counter++; > > + if (counter >= rows) > > + { > > + row -= counter; > > + counter = 0; > > + column++; > > + } > > + > > + if (!stream.atEnd() && row >= rowCount()) > > + row = addRow() - 1; > > + > > + if (column >= columnCount()) > > + return true; // drop data past end of columns > > + } > > + > > + return true; > > + } > > + > > + return false; > > +} > > + > > + > > +Qt::DropActions toResultModel::supportedDropActions() const > > +{ > > + if(Editable) > > + return Qt::CopyAction | Qt::MoveAction; > > + return Qt::IgnoreAction; > > +} > > + > > + > > int toResultModel::rowCount(const QModelIndex &parent) const > > { > > if (parent.isValid()) > > @@ -500,10 +695,23 @@ > > > > Qt::ItemFlags toResultModel::flags(const QModelIndex &index) const > > { > > - Qt::ItemFlags fl = Qt::ItemIsEnabled | Qt::ItemIsSelectable; > > + Qt::ItemFlags defaultFlags = QAbstractTableModel::flags(index); > > + Qt::ItemFlags fl = Qt::ItemIsEnabled | Qt::ItemIsSelectable | > > Qt::ItemIsDragEnabled; > > + > > + if (index.column() == 0) > > + return fl; // row number column > > + > > + if (!index.isValid()) > > + { > > + if(Editable) > > + return Qt::ItemIsDropEnabled | defaultFlags; > > + else > > + return defaultFlags; > > + } > > + > > if (Editable) > > - fl = fl | Qt::ItemIsEditable; > > - return fl; > > + return fl | defaultFlags | Qt::ItemIsEditable | > > Qt::ItemIsDropEnabled; > > + return fl | defaultFlags; > > } > > > > > > > > Modified: trunk/tora/src/toresultmodel.h > > =================================================================== > > --- trunk/tora/src/toresultmodel.h 2008-09-01 18:26:27 UTC (rev > 2967) > > +++ trunk/tora/src/toresultmodel.h 2008-09-01 23:46:36 UTC (rev > 2968) > > @@ -267,7 +267,7 @@ > > * a new row. > > * > > * @param ind if valid, the row to duplicate > > - * @returns the row added or -1 > > + * @return the CurrentRow (length) or -1 > > */ > > int addRow(QModelIndex ind = QModelIndex()); > > > > @@ -279,6 +279,69 @@ > > */ > > void deleteRow(QModelIndex); > > > > + > > + /** > > + * Returns a list of MIME types that can be used to describe a > > + * list of model indexes. > > + * > > + */ > > + virtual QStringList mimeTypes() const; > > + > > + > > + /** > > + * Returns an object that contains serialized items of data > > + * corresponding to the list of indexes specified. The formats > > + * used to describe the encoded data is obtained from the > > + * mimeTypes() function. > > + * > > + * If the list of indexes is empty, or there are no supported > MIME > > + * types, 0 is returned rather than a serialized empty list. > > + * > > + */ > > + virtual QMimeData* mimeData(const QModelIndexList &indexes) > const; > > + > > + > > + /** > > + * Handles the data supplied by a drag and drop operation that > > + * ended with the given action. Returns true if the data and > > + * action can be handled by the model; otherwise returns false. > > + * > > + * Although the specified row, column and parent indicate the > > + * location of an item in the model where the operation ended, it > > + * is the responsibility of the view to provide a suitable > > + * location for where the data should be inserted. > > + * > > + * For instance, a drop action on an item in a QTreeView can > > + * result in new items either being inserted as children of the > > + * item specified by row, column, and parent, or as siblings of > > + * the item. > > + * > > + * When row and column are -1 it means that it is up to the model > > + * to decide where to place the data. This can occur in a tree > > + * when data is dropped on a parent. Models will usually append > > + * the data to the parent in this case. > > + * > > + * Returns true if the dropping was successful otherwise false. > > + * > > + */ > > + virtual bool dropMimeData(const QMimeData *data, > > + Qt::DropAction action, > > + int row, > > + int column, > > + const QModelIndex &parent); > > + > > + > > + /** > > + * Returns the drop actions supported by this model. > > + * > > + * The default implementation returns Qt::CopyAction. Reimplement > > + * this function if you wish to support additional actions. Note > > + * that you must also reimplement the dropMimeData() function to > > + * handle the additional operations. > > + * > > + */ > > + virtual Qt::DropActions supportedDropActions() const; > > + > > signals: > > > > /** > > > > Modified: trunk/tora/src/toresulttableview.cpp > > =================================================================== > > --- trunk/tora/src/toresulttableview.cpp 2008-09-01 18:26:27 UTC > (rev > > 2967) > > +++ trunk/tora/src/toresulttableview.cpp 2008-09-01 23:46:36 UTC > (rev > > 2968) > > @@ -133,8 +133,8 @@ > > > > createActions(); > > > > - setSelectionBehavior(QAbstractItemView::SelectRows); > > - setSelectionMode(QAbstractItemView::ExtendedSelection); > > + setSelectionBehavior(QAbstractItemView::SelectItems); > > + setSelectionMode(QAbstractItemView::ContiguousSelection); > > setAlternatingRowColors(true); > > > > setContextMenuPolicy(Qt::CustomContextMenu); > > @@ -150,6 +150,14 @@ > > SIGNAL(doubleClicked(const QModelIndex &)), > > this, > > SLOT(handleDoubleClick(const QModelIndex &))); > > + > > + setDragEnabled(true); > > + if(Editable) > > + viewport()->setAcceptDrops(true); > > + setDropIndicatorShown(true); > > + > > + if(Editable) > > + setDragDropMode(QAbstractItemView::DragDrop); > > } > > > > > > > > Modified: trunk/tora/src/toresulttableviewedit.cpp > > =================================================================== > > --- trunk/tora/src/toresulttableviewedit.cpp 2008-09-01 18:26:27 UTC > > (rev 2967) > > +++ trunk/tora/src/toresulttableviewedit.cpp 2008-09-01 23:46:36 UTC > > (rev 2968) > > @@ -62,7 +62,7 @@ > > { > > > > setSelectionBehavior(QAbstractItemView::SelectItems); > > - setSelectionMode(QAbstractItemView::SingleSelection); > > + setSelectionMode(QAbstractItemView::ContiguousSelection); > > } > > > > > > > > > > This was sent by the SourceForge.net collaborative development > > platform, the world's largest Open Source development site. > > > > > ----------------------------------------------------------------------- > > -- > > This SF.Net email is sponsored by the Moblin Your Move Developer's > > challenge > > Build the coolest Linux based applications with Moblin SDK & win great > > prizes > > Grand prize is a trip for two to an Open Source event anywhere in the > > world > > http://moblin-contest.org/redirect.php?banner_id=100&url=/ > > _______________________________________________ > > Tora-cvs mailing list > > Tor...@li... > > https://lists.sourceforge.net/lists/listinfo/tora-cvs |
From: <mrj...@us...> - 2008-09-02 02:55:09
|
Revision: 2969 http://tora.svn.sourceforge.net/tora/?rev=2969&view=rev Author: mrjohnson0 Date: 2008-09-02 02:55:18 +0000 (Tue, 02 Sep 2008) Log Message: ----------- use signal for navigating to new row, changes model addRow to return row number of record added in case it changes. fixes dragging data off the grid to add new Modified Paths: -------------- trunk/tora/src/toresultmodel.cpp trunk/tora/src/toresultmodel.h trunk/tora/src/toresulttableviewedit.cpp trunk/tora/src/toresulttableviewedit.h Modified: trunk/tora/src/toresultmodel.cpp =================================================================== --- trunk/tora/src/toresultmodel.cpp 2008-09-01 23:46:36 UTC (rev 2968) +++ trunk/tora/src/toresultmodel.cpp 2008-09-02 02:55:18 UTC (rev 2969) @@ -229,18 +229,18 @@ if (!Editable) return -1; - CurrentRow++; - beginInsertRows(QModelIndex(), CurrentRow, CurrentRow); + beginInsertRows(QModelIndex(), CurrentRow + 1, CurrentRow + 1); + int newRow = CurrentRow++; Row row; if (ind.isValid()) { row = Rows[ind.row()]; - row[0] = CurrentRow; + row[0] = newRow; } else { - row.append(toQValue(CurrentRow)); + row.append(toQValue(newRow)); // null out the rest of the row int cols = Headers.size(); @@ -251,7 +251,7 @@ Rows.append(row); endInsertRows(); emit rowAdded(row); - return CurrentRow; + return newRow; } @@ -363,7 +363,7 @@ return true; if (!Editable) return false; - if (row == 1) + if (column == 0) return false; // can't change row number if(row < 0 || column < 0) @@ -375,7 +375,7 @@ } if(row < 0) { - row = addRow() - 1; + row = addRow(); if(row < 0) return false; } @@ -440,7 +440,7 @@ } if (!stream.atEnd() && row >= rowCount()) - row = addRow() - 1; + row = addRow(); if (column >= columnCount()) return true; // drop data past end of columns Modified: trunk/tora/src/toresultmodel.h =================================================================== --- trunk/tora/src/toresultmodel.h 2008-09-01 23:46:36 UTC (rev 2968) +++ trunk/tora/src/toresultmodel.h 2008-09-02 02:55:18 UTC (rev 2969) @@ -267,7 +267,7 @@ * a new row. * * @param ind if valid, the row to duplicate - * @return the CurrentRow (length) or -1 + * @return added row */ int addRow(QModelIndex ind = QModelIndex()); Modified: trunk/tora/src/toresulttableviewedit.cpp =================================================================== --- trunk/tora/src/toresulttableviewedit.cpp 2008-09-01 23:46:36 UTC (rev 2968) +++ trunk/tora/src/toresulttableviewedit.cpp 2008-09-02 02:55:18 UTC (rev 2969) @@ -109,6 +109,11 @@ SLOT(recordAdd(const toResultModel::Row &))); connect(Model, + SIGNAL(rowsInserted(const QModelIndex &, int, int)), + this, + SLOT(handleNewRows(const QModelIndex &, int, int))); + + connect(Model, SIGNAL(modelReset()), this, SLOT(revertChanges())); @@ -512,31 +517,30 @@ } -void toResultTableViewEdit::addRecord(void) +void toResultTableViewEdit::handleNewRows(const QModelIndex &parent, + int start, + int end) { int col = selectionModel()->currentIndex().column(); - int row = Model->addRow() - 1; // selection starts at 0 - if (row >= 0) - { - QModelIndex left = Model->createIndex(row, col); - selectionModel()->select(QItemSelection(left, left), - QItemSelectionModel::ClearAndSelect); - setCurrentIndex(left); - } + if(col < 1) + col = 1; + QModelIndex index = Model->index(start - 1, col); + + selectionModel()->select(QItemSelection(index, index), + QItemSelectionModel::ClearAndSelect); + setCurrentIndex(index); } +void toResultTableViewEdit::addRecord(void) +{ + Model->addRow(); +} + + void toResultTableViewEdit::duplicateRecord(void) { - int col = selectionModel()->currentIndex().column(); - int row = Model->addRow(selectionModel()->currentIndex()) - 1; - if (row >= 0) - { - QModelIndex left = Model->createIndex(row, col); - selectionModel()->select(QItemSelection(left, left), - QItemSelectionModel::ClearAndSelect); - setCurrentIndex(left); - } + Model->addRow(selectionModel()->currentIndex()); } Modified: trunk/tora/src/toresulttableviewedit.h =================================================================== --- trunk/tora/src/toresulttableviewedit.h 2008-09-01 23:46:36 UTC (rev 2968) +++ trunk/tora/src/toresulttableviewedit.h 2008-09-02 02:55:18 UTC (rev 2969) @@ -209,6 +209,12 @@ */ void revertChanges(void); + + /** + * Handle signal from model when rows are added + * + */ + void handleNewRows(const QModelIndex &parent, int start, int end); }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-09-07 21:13:42
|
Revision: 2973 http://tora.svn.sourceforge.net/tora/?rev=2973&view=rev Author: mrjohnson0 Date: 2008-09-07 21:13:49 +0000 (Sun, 07 Sep 2008) Log Message: ----------- cleaned up some unused database preferences, add firewallMode preference to read data periodically on idle queries to keep connection alive. Modified Paths: -------------- trunk/tora/src/toconf.h trunk/tora/src/toconfiguration.cpp trunk/tora/src/toconfiguration.h trunk/tora/src/todatabasesettingui.ui trunk/tora/src/toeventquerytask.cpp trunk/tora/src/toeventquerytask.h trunk/tora/src/toglobalsetting.cpp Modified: trunk/tora/src/toconf.h =================================================================== --- trunk/tora/src/toconf.h 2008-09-06 17:35:27 UTC (rev 2972) +++ trunk/tora/src/toconf.h 2008-09-07 21:13:49 UTC (rev 2973) @@ -109,6 +109,7 @@ #define CONF_OBJECT_CACHE "ObjectCache" #define DEFAULT_OBJECT_CACHE 1 #define CONF_BKGND_CONNECT "BackgroundConnect" +#define CONF_FIREWALL_MODE "FirewallMode" #define CONF_MAX_CONTENT "MaxContent" #define DEFAULT_MAX_CONTENT 100 #define CONF_KEEP_PLANS "KeepPlans" Modified: trunk/tora/src/toconfiguration.cpp =================================================================== --- trunk/tora/src/toconfiguration.cpp 2008-09-06 17:35:27 UTC (rev 2972) +++ trunk/tora/src/toconfiguration.cpp 2008-09-07 21:13:49 UTC (rev 2973) @@ -82,6 +82,7 @@ m_tabbedTools = s.value(CONF_TABBED_TOOLS, false).toBool(); m_objectCache = s.value(CONF_OBJECT_CACHE, DEFAULT_OBJECT_CACHE).toInt(); m_bkgndConnect = s.value(CONF_BKGND_CONNECT, false).toBool(); + m_firewallMode = s.value(CONF_FIREWALL_MODE, false).toBool(); m_maxContent = s.value(CONF_MAX_CONTENT, DEFAULT_MAX_CONTENT).toInt(); m_keepPlans = s.value(CONF_KEEP_PLANS, false).toBool(); m_restoreSession = s.value(CONF_RESTORE_SESSION, false).toBool(); @@ -279,6 +280,7 @@ s.setValue(CONF_TABBED_TOOLS, m_tabbedTools); s.setValue(CONF_OBJECT_CACHE, m_objectCache); s.setValue(CONF_BKGND_CONNECT, m_bkgndConnect); + s.setValue(CONF_FIREWALL_MODE, m_firewallMode); s.setValue(CONF_MAX_CONTENT, m_maxContent); s.setValue(CONF_KEEP_PLANS, m_keepPlans); s.setValue(CONF_RESTORE_SESSION, m_restoreSession); Modified: trunk/tora/src/toconfiguration.h =================================================================== --- trunk/tora/src/toconfiguration.h 2008-09-06 17:35:27 UTC (rev 2972) +++ trunk/tora/src/toconfiguration.h 2008-09-07 21:13:49 UTC (rev 2973) @@ -422,6 +422,15 @@ m_bkgndConnect = v; }; + bool firewallMode() + { + return m_firewallMode; + } + void setFirewallMode(bool v) + { + m_firewallMode = v; + } + int maxContent() { return m_maxContent; @@ -1188,6 +1197,7 @@ bool m_tabbedTools; int m_objectCache; bool m_bkgndConnect; + bool m_firewallMode; int m_maxContent; bool m_keepPlans; bool m_restoreSession; Modified: trunk/tora/src/todatabasesettingui.ui =================================================================== --- trunk/tora/src/todatabasesettingui.ui 2008-09-06 17:35:27 UTC (rev 2972) +++ trunk/tora/src/todatabasesettingui.ui 2008-09-07 21:13:49 UTC (rev 2973) @@ -13,12 +13,24 @@ <string>toDatabaseSettingUI</string> </property> <layout class="QGridLayout" > - <property name="margin" > + <property name="leftMargin" > <number>11</number> </property> - <property name="spacing" > + <property name="topMargin" > + <number>11</number> + </property> + <property name="rightMargin" > + <number>11</number> + </property> + <property name="bottomMargin" > + <number>11</number> + </property> + <property name="horizontalSpacing" > <number>6</number> </property> + <property name="verticalSpacing" > + <number>6</number> + </property> <item row="0" column="0" > <widget class="QCheckBox" name="AutoCommit" > <property name="toolTip" > @@ -62,12 +74,24 @@ <string>Query settings</string> </property> <layout class="QGridLayout" > - <property name="margin" > + <property name="leftMargin" > <number>11</number> </property> - <property name="spacing" > + <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="2" column="0" > <widget class="QLabel" name="TextLabel6_2_2" > <property name="toolTip" > @@ -79,6 +103,9 @@ <property name="wordWrap" > <bool>false</bool> </property> + <property name="buddy" > + <cstring>MaxColDisp</cstring> + </property> </widget> </item> <item row="0" column="2" > @@ -102,6 +129,9 @@ <property name="wordWrap" > <bool>false</bool> </property> + <property name="buddy" > + <cstring>InitialFetch</cstring> + </property> </widget> </item> <item row="1" column="0" > @@ -110,11 +140,14 @@ <string>Number of rows to initially start reading in content editor, use unlimited on slow connections.</string> </property> <property name="text" > - <string>Initially read in content editor</string> + <string>Initially &read in content editor</string> </property> <property name="wordWrap" > <bool>false</bool> </property> + <property name="buddy" > + <cstring>MaxContent</cstring> + </property> </widget> </item> <item row="1" column="2" > @@ -141,115 +174,43 @@ </property> </widget> </item> - </layout> - </widget> - </item> - <item row="5" column="0" > - <widget class="QCheckBox" name="KeepAlive" > - <property name="toolTip" > - <string>Make sure connections are kept alive by periodically (5 minutes) sending a query on all idle connections.</string> - </property> - <property name="text" > - <string>Keep alive by periodically executing statements on unused connections if they are not used.</string> - </property> - </widget> - </item> - <item row="4" column="0" > - <widget class="QGroupBox" name="GroupBox2" > - <property name="title" > - <string>UI feedback settings</string> - </property> - <layout class="QGridLayout" > - <property name="margin" > - <number>11</number> - </property> - <property name="spacing" > - <number>6</number> - </property> - <item row="2" column="0" colspan="2" > - <widget class="QCheckBox" name="AutoLong" > - <property name="toolTip" > - <string>Reexecute a query taking more than 30 seconds in its own connection to prevent blocking other database access.</string> - </property> - <property name="text" > - <string>Abort long running queries and reexecute in own connection</string> - </property> - </widget> - </item> <item row="3" column="0" > - <widget class="QLabel" name="TextLabel1" > - <property name="text" > - <string>Move to own connection after</string> - </property> - <property name="wordWrap" > - <bool>false</bool> - </property> - </widget> - </item> - <item row="3" column="1" > - <widget class="QSpinBox" name="MoveAfter" > - <property name="enabled" > - <bool>false</bool> - </property> - <property name="suffix" > - <string> seconds</string> - </property> - <property name="minimum" > - <number>5</number> - </property> - </widget> - </item> - <item row="0" column="0" colspan="2" > - <widget class="QCheckBox" name="BkgndConnect" > + <widget class="QCheckBox" name="FirewallMode" > <property name="toolTip" > - <string>Let the background queries normally running on the main connection run in a separate connection.</string> + <string>When enabled idle queries will request data at regular intervals to keep the connection alive.</string> </property> <property name="text" > - <string>Run UI blocking queries exclusively in main connection</string> + <string>&Firewall Mode</string> </property> </widget> </item> - <item row="1" column="0" colspan="2" > - <widget class="QCheckBox" name="DontReread" > - <property name="toolTip" > - <string>If checked will not refresh a result if it is reexecuted exactly the same two times in a row.</string> - </property> - <property name="text" > - <string>Don't reread data if parameters are exactly same</string> - </property> - </widget> - </item> </layout> </widget> </item> - <item row="6" column="0" > - <spacer> - <property name="orientation" > - <enum>Qt::Vertical</enum> - </property> - <property name="sizeType" > - <enum>QSizePolicy::Expanding</enum> - </property> - <property name="sizeHint" > - <size> - <width>20</width> - <height>20</height> - </size> - </property> - </spacer> - </item> <item row="3" column="0" > <widget class="QGroupBox" name="GroupBox3" > <property name="title" > <string>Dataformat</string> </property> <layout class="QGridLayout" > - <property name="margin" > + <property name="leftMargin" > <number>11</number> </property> - <property name="spacing" > + <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="1" column="0" > <widget class="QLabel" name="TextLabel1_2" > <property name="toolTip" > @@ -279,7 +240,7 @@ <item row="0" column="0" colspan="2" > <widget class="QCheckBox" name="IndicateEmpty" > <property name="text" > - <string>Indicate empty values as '' instead of NULL as {null}.</string> + <string>Indicate empty values as '' instead of &NULL as {null}.</string> </property> </widget> </item> @@ -315,16 +276,32 @@ <string>Number of decimals for fixed decimal format.</string> </property> <property name="text" > - <string>Decimals</string> + <string>&Decimals</string> </property> <property name="wordWrap" > <bool>false</bool> </property> + <property name="buddy" > + <cstring>Decimals</cstring> + </property> </widget> </item> </layout> </widget> </item> + <item row="4" column="0" > + <spacer> + <property name="orientation" > + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" > + <size> + <width>20</width> + <height>40</height> + </size> + </property> + </spacer> + </item> </layout> </widget> <layoutdefault spacing="6" margin="11" /> @@ -336,31 +313,10 @@ <tabstop>IndicateEmpty</tabstop> <tabstop>NumberFormat</tabstop> <tabstop>Decimals</tabstop> - <tabstop>BkgndConnect</tabstop> - <tabstop>DontReread</tabstop> - <tabstop>AutoLong</tabstop> - <tabstop>MoveAfter</tabstop> - <tabstop>KeepAlive</tabstop> </tabstops> <resources/> <connections> <connection> - <sender>AutoLong</sender> - <signal>toggled(bool)</signal> - <receiver>MoveAfter</receiver> - <slot>setEnabled(bool)</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>NumberFormat</sender> <signal>activated(QString)</signal> <receiver>toDatabaseSettingUI</receiver> Modified: trunk/tora/src/toeventquerytask.cpp =================================================================== --- trunk/tora/src/toeventquerytask.cpp 2008-09-06 17:35:27 UTC (rev 2972) +++ trunk/tora/src/toeventquerytask.cpp 2008-09-07 21:13:49 UTC (rev 2973) @@ -42,11 +42,16 @@ #include "toresultstats.h" #include "totool.h" #include "toresultstats.h" +#include "toconfiguration.h" #include <QApplication> #include <QMutexLocker> +#include <QTimer> +static const int FIREWALL_TIMEOUT = 240000; + + #define CATCH_ALL \ catch(const toConnection::exception &str) { \ if(!Closed) { \ @@ -108,6 +113,9 @@ else { read(); + if(toConfigurationSingle::Instance().firewallMode()) + QTimer::singleShot(FIREWALL_TIMEOUT, this, SLOT(timeout())); + // begin thread's event loop thread()->exec(); } @@ -198,3 +206,16 @@ } CATCH_ALL; } + + +void toEventQueryTask::timeout() +{ + if(Closed) + return; + + pread(false); + + // check again in case config changes + if(toConfigurationSingle::Instance().firewallMode()) + QTimer::singleShot(FIREWALL_TIMEOUT, this, SLOT(timeout())); +} Modified: trunk/tora/src/toeventquerytask.h =================================================================== --- trunk/tora/src/toeventquerytask.h 2008-09-06 17:35:27 UTC (rev 2972) +++ trunk/tora/src/toeventquerytask.h 2008-09-07 21:13:49 UTC (rev 2973) @@ -114,6 +114,7 @@ private slots: void pread(bool all); + void timeout(void); public slots: Modified: trunk/tora/src/toglobalsetting.cpp =================================================================== --- trunk/tora/src/toglobalsetting.cpp 2008-09-06 17:35:27 UTC (rev 2972) +++ trunk/tora/src/toglobalsetting.cpp 2008-09-07 21:13:49 UTC (rev 2973) @@ -278,10 +278,11 @@ Decimals->setEnabled(true); AutoCommit->setChecked(toConfigurationSingle::Instance().autoCommit()); - DontReread->setChecked(toConfigurationSingle::Instance().dontReread()); +// DontReread->setChecked(toConfigurationSingle::Instance().dontReread()); ObjectCache->setCurrentIndex(toConfigurationSingle::Instance().objectCache()); - BkgndConnect->setChecked(toConfigurationSingle::Instance().bkgndConnect()); +// BkgndConnect->setChecked(toConfigurationSingle::Instance().bkgndConnect()); IndicateEmpty->setChecked(toConfigurationSingle::Instance().indicateEmpty()); + FirewallMode->setChecked(toConfigurationSingle::Instance().firewallMode()); QColor nullColor; nullColor.setNamedColor(toConfigurationSingle::Instance().indicateEmptyColor()); @@ -289,10 +290,10 @@ palette.setColor(IndicateEmptyColor->backgroundRole(), nullColor); IndicateEmptyColor->setPalette(palette); - int val = toConfigurationSingle::Instance().autoLong(); - AutoLong->setChecked(val); - MoveAfter->setValue(val); - KeepAlive->setChecked(toConfigurationSingle::Instance().keepAlive()); +// int val = toConfigurationSingle::Instance().autoLong(); +// AutoLong->setChecked(val); +// MoveAfter->setValue(val); +// KeepAlive->setChecked(toConfigurationSingle::Instance().keepAlive()); } void toUpdateIndicateEmpty(void); @@ -322,13 +323,14 @@ toConfigurationSingle::Instance().setMaxContent(maxnum); } toConfigurationSingle::Instance().setAutoCommit(AutoCommit->isChecked()); - toConfigurationSingle::Instance().setDontReread(DontReread->isChecked()); +// toConfigurationSingle::Instance().setDontReread(DontReread->isChecked()); toConfigurationSingle::Instance().setObjectCache(ObjectCache->currentIndex()); - toConfigurationSingle::Instance().setBkgndConnect(BkgndConnect->isChecked()); - toConfigurationSingle::Instance().setAutoLong(AutoLong->isChecked() ? MoveAfter->value() : 0); +// toConfigurationSingle::Instance().setBkgndConnect(BkgndConnect->isChecked()); +// toConfigurationSingle::Instance().setAutoLong(AutoLong->isChecked() ? MoveAfter->value() : 0); toConfigurationSingle::Instance().setIndicateEmpty(IndicateEmpty->isChecked()); toConfigurationSingle::Instance().setIndicateEmptyColor(IndicateEmptyColor->palette().color(IndicateEmptyColor->backgroundRole()).name()); - toConfigurationSingle::Instance().setKeepAlive(KeepAlive->isChecked() ? DEFAULT_KEEP_ALIVE : -1); //FIXME: there was "" +// toConfigurationSingle::Instance().setKeepAlive(KeepAlive->isChecked() ? DEFAULT_KEEP_ALIVE : -1); //FIXME: there was "" + toConfigurationSingle::Instance().setFirewallMode(FirewallMode->isChecked()); toConfigurationSingle::Instance().setNumberFormat(NumberFormat->currentIndex()); toConfigurationSingle::Instance().setNumberDecimals(Decimals->value()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2008-09-08 00:16:19
|
Revision: 2977 http://tora.svn.sourceforge.net/tora/?rev=2977&view=rev Author: nneul Date: 2008-09-08 00:16:28 +0000 (Mon, 08 Sep 2008) Log Message: ----------- fix license header Modified Paths: -------------- trunk/tora/src/LICENSE.h trunk/tora/src/Makefile.am Modified: trunk/tora/src/LICENSE.h =================================================================== --- trunk/tora/src/LICENSE.h 2008-09-08 00:15:34 UTC (rev 2976) +++ trunk/tora/src/LICENSE.h 2008-09-08 00:16:28 UTC (rev 2977) @@ -1,7 +1,7 @@ static const char *LicenseText = "<html><body><p>" - " The Toolkit for Oracle is Copyright (C) 2003-2005 Quest Software, Inc." - " Portions Copyright (C) 2005 Other Contributors" + " The Toolkit for Oracle is Copyright (C) 2003-2008 Quest Software, Inc." + " Portions Copyright (C) 2008 Other Contributors" "</p><p>" " You may use, distribute and copy Toolkit for Oracle under the terms of" " GNU General Public License version 2, which is displayed below." Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2008-09-08 00:15:34 UTC (rev 2976) +++ trunk/tora/src/Makefile.am 2008-09-08 00:16:28 UTC (rev 2977) @@ -241,7 +241,6 @@ $(LOKIDIR_INC) \ $(UI_FILES) \ Makefile.am \ - LICENSE.h \ toconf.h \ todefaultkeywords.h \ toextratranslations.cpp \ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2008-09-08 00:22:42
|
Revision: 2978 http://tora.svn.sourceforge.net/tora/?rev=2978&view=rev Author: nneul Date: 2008-09-08 00:22:24 +0000 (Mon, 08 Sep 2008) Log Message: ----------- update copyright dates Modified Paths: -------------- trunk/tora/src/main.cpp trunk/tora/src/toabout.cpp trunk/tora/src/toabout.h trunk/tora/src/toalert.cpp trunk/tora/src/toalert.h trunk/tora/src/toanalyze.cpp trunk/tora/src/toanalyze.h trunk/tora/src/tobackup.cpp trunk/tora/src/tobackup.h trunk/tora/src/tobarchart.cpp trunk/tora/src/tobarchart.h trunk/tora/src/tobrowser.cpp trunk/tora/src/tobrowser.h trunk/tora/src/tobrowserconstraint.cpp trunk/tora/src/tobrowserconstraint.h trunk/tora/src/tobrowserindex.cpp trunk/tora/src/tobrowserindex.h trunk/tora/src/tobrowsertable.cpp trunk/tora/src/tobrowsertable.h trunk/tora/src/tochangeconnection.cpp trunk/tora/src/tochangeconnection.h trunk/tora/src/tochartmanager.cpp trunk/tora/src/tochartmanager.h trunk/tora/src/tocodemodel.cpp trunk/tora/src/tocodemodel.h trunk/tora/src/toconf.h trunk/tora/src/toconnection.cpp trunk/tora/src/toconnection.h trunk/tora/src/toconnectionimport.cpp trunk/tora/src/toconnectionimport.h trunk/tora/src/toconnectionmodel.cpp trunk/tora/src/toconnectionmodel.h trunk/tora/src/toconnectionpool.cpp trunk/tora/src/toconnectionpool.h trunk/tora/src/tocurrent.cpp trunk/tora/src/tocurrent.h trunk/tora/src/todatatype.cpp trunk/tora/src/todatatype.h trunk/tora/src/todebug.cpp trunk/tora/src/todebug.h trunk/tora/src/todebugtext.cpp trunk/tora/src/todebugtext.h trunk/tora/src/todefaultkeywords.h trunk/tora/src/toeditablemenu.cpp trunk/tora/src/toeditablemenu.h trunk/tora/src/toeditextensions.cpp trunk/tora/src/toeditextensions.h trunk/tora/src/toeditwidget.cpp trunk/tora/src/toeditwidget.h trunk/tora/src/toeventquery.cpp trunk/tora/src/toeventquery.h trunk/tora/src/toeventquerytask.cpp trunk/tora/src/toeventquerytask.h trunk/tora/src/toextract.cpp trunk/tora/src/toextract.h trunk/tora/src/toextratranslations.cpp trunk/tora/src/tofilesize.cpp trunk/tora/src/tofilesize.h trunk/tora/src/toglobalsetting.cpp trunk/tora/src/toglobalsetting.h trunk/tora/src/tohelp.cpp trunk/tora/src/tohelp.h trunk/tora/src/tohelpbrowser.h trunk/tora/src/tohelpsetup.h trunk/tora/src/tohighlightedtext.cpp trunk/tora/src/tohighlightedtext.h trunk/tora/src/tohtml.cpp trunk/tora/src/tohtml.h trunk/tora/src/toinvalid.cpp trunk/tora/src/toinvalid.h trunk/tora/src/tolegendchart.cpp trunk/tora/src/tolegendchart.h trunk/tora/src/tolinechart.cpp trunk/tora/src/tolinechart.h trunk/tora/src/tolistviewformatter.cpp trunk/tora/src/tolistviewformatter.h trunk/tora/src/tolistviewformattercsv.cpp trunk/tora/src/tolistviewformattercsv.h trunk/tora/src/tolistviewformatterfactory.h trunk/tora/src/tolistviewformatterhtml.cpp trunk/tora/src/tolistviewformatterhtml.h trunk/tora/src/tolistviewformatteridentifier.h trunk/tora/src/tolistviewformattersql.h trunk/tora/src/tolistviewformattertabdel.cpp trunk/tora/src/tolistviewformattertabdel.h trunk/tora/src/tolistviewformattertext.cpp trunk/tora/src/tolistviewformattertext.h trunk/tora/src/tomain.cpp trunk/tora/src/tomain.h trunk/tora/src/tomainwindow.cpp trunk/tora/src/tomainwindow.h trunk/tora/src/tomainwindow.kde.h trunk/tora/src/tomarkedtext.cpp trunk/tora/src/tomarkedtext.h trunk/tora/src/tomemoeditor.cpp trunk/tora/src/tomemoeditor.h trunk/tora/src/tomessage.cpp trunk/tora/src/tomessage.h trunk/tora/src/tomodeleditor.cpp trunk/tora/src/tomodeleditor.h trunk/tora/src/tomysqlkeywords.h trunk/tora/src/tonewconnection.cpp trunk/tora/src/tonewconnection.h trunk/tora/src/tonoblockquery.cpp trunk/tora/src/tonoblockquery.h trunk/tora/src/toocistub.cpp trunk/tora/src/tooracleconnection.cpp trunk/tora/src/tooracleextract.cpp trunk/tora/src/tooraclepreload.cpp trunk/tora/src/tooraclesetting.h trunk/tora/src/tooutput.cpp trunk/tora/src/tooutput.h trunk/tora/src/toparamget.cpp trunk/tora/src/toparamget.h trunk/tora/src/topassword.cpp trunk/tora/src/topiechart.cpp trunk/tora/src/topiechart.h trunk/tora/src/toplsqleditor.cpp trunk/tora/src/toplsqleditor.h trunk/tora/src/toplsqltext.cpp trunk/tora/src/toplsqltext.h trunk/tora/src/topreferences.cpp trunk/tora/src/topreferences.h trunk/tora/src/toprofiler.cpp trunk/tora/src/toprofiler.h trunk/tora/src/toproject.cpp trunk/tora/src/toproject.h trunk/tora/src/toqsqlconnection.cpp trunk/tora/src/toqvalue.cpp trunk/tora/src/toqvalue.h trunk/tora/src/toreport.cpp trunk/tora/src/toreport.h trunk/tora/src/toresult.cpp trunk/tora/src/toresult.h trunk/tora/src/toresultbar.cpp trunk/tora/src/toresultbar.h trunk/tora/src/toresultcols.cpp trunk/tora/src/toresultcols.h trunk/tora/src/toresultcolscomment.cpp trunk/tora/src/toresultcolscomment.h trunk/tora/src/toresultcombo.cpp trunk/tora/src/toresultcombo.h trunk/tora/src/toresultdata.cpp trunk/tora/src/toresultdata.h trunk/tora/src/toresultdatasingle.cpp trunk/tora/src/toresultdatasingle.h trunk/tora/src/toresultdepend.cpp trunk/tora/src/toresultdepend.h trunk/tora/src/toresultextract.cpp trunk/tora/src/toresultextract.h trunk/tora/src/toresultfield.cpp trunk/tora/src/toresultfield.h trunk/tora/src/toresultitem.cpp trunk/tora/src/toresultitem.h trunk/tora/src/toresultlabel.cpp trunk/tora/src/toresultlabel.h trunk/tora/src/toresultline.cpp trunk/tora/src/toresultline.h trunk/tora/src/toresultlistformat.cpp trunk/tora/src/toresultlistformat.h trunk/tora/src/toresultlock.cpp trunk/tora/src/toresultlock.h trunk/tora/src/toresultlong.cpp trunk/tora/src/toresultlong.h trunk/tora/src/toresultmodel.cpp trunk/tora/src/toresultmodel.h trunk/tora/src/toresultparam.cpp trunk/tora/src/toresultparam.h trunk/tora/src/toresultpie.cpp trunk/tora/src/toresultpie.h trunk/tora/src/toresultplan.cpp trunk/tora/src/toresultplan.h trunk/tora/src/toresultresources.h trunk/tora/src/toresultschema.cpp trunk/tora/src/toresultschema.h trunk/tora/src/toresultstats.cpp trunk/tora/src/toresultstats.h trunk/tora/src/toresultstorage.cpp trunk/tora/src/toresultstorage.h trunk/tora/src/toresulttableview.cpp trunk/tora/src/toresulttableview.h trunk/tora/src/toresulttableviewedit.cpp trunk/tora/src/toresulttableviewedit.h trunk/tora/src/toresultview.cpp trunk/tora/src/toresultview.h trunk/tora/src/torollback.cpp trunk/tora/src/torollback.h trunk/tora/src/torunnable.cpp trunk/tora/src/torunnable.h trunk/tora/src/toscript.cpp trunk/tora/src/toscript.h trunk/tora/src/toscriptschemawidget.cpp trunk/tora/src/toscriptschemawidget.h trunk/tora/src/toscripttreeitem.cpp trunk/tora/src/toscripttreeitem.h trunk/tora/src/toscripttreemodel.cpp trunk/tora/src/toscripttreemodel.h trunk/tora/src/tosearchreplace.cpp trunk/tora/src/tosearchreplace.h trunk/tora/src/tosecurity.cpp trunk/tora/src/tosecurity.h trunk/tora/src/tosecuritytreeitem.cpp trunk/tora/src/tosecuritytreeitem.h trunk/tora/src/tosecuritytreemodel.cpp trunk/tora/src/tosecuritytreemodel.h trunk/tora/src/tosession.cpp trunk/tora/src/tosession.h trunk/tora/src/tosgastatement.cpp trunk/tora/src/tosgastatement.h trunk/tora/src/tosgatrace.cpp trunk/tora/src/tosgatrace.h trunk/tora/src/tosmtp.cpp trunk/tora/src/tosmtp.h trunk/tora/src/tosplash.cpp trunk/tora/src/tosplash.h trunk/tora/src/tosql.cpp trunk/tora/src/tosql.h trunk/tora/src/tosqledit.cpp trunk/tora/src/tosqledit.h trunk/tora/src/tosqlparse.cpp trunk/tora/src/tosqlparse.h trunk/tora/src/tostorage.cpp trunk/tora/src/tostorage.h trunk/tora/src/tostoragedefinition.cpp trunk/tora/src/tostoragedefinition.h trunk/tora/src/tosyntaxsetup.cpp trunk/tora/src/tosyntaxsetup.h trunk/tora/src/totabwidget.cpp trunk/tora/src/totabwidget.h trunk/tora/src/totemplate.cpp trunk/tora/src/totemplate.h trunk/tora/src/totemplateprovider.cpp trunk/tora/src/totemporary.cpp trunk/tora/src/totemporary.h trunk/tora/src/totextview.cpp trunk/tora/src/totextview.h trunk/tora/src/tothread.cpp trunk/tora/src/tothread.h trunk/tora/src/tothread_p.h trunk/tora/src/totool.h trunk/tora/src/totreewidget.cpp trunk/tora/src/totreewidget.h trunk/tora/src/totuning.cpp trunk/tora/src/totuning.h trunk/tora/src/tounittest.cpp trunk/tora/src/tounittest.h trunk/tora/src/tovisualize.cpp trunk/tora/src/tovisualize.h trunk/tora/src/towaitevents.cpp trunk/tora/src/towaitevents.h trunk/tora/src/toworkingwidget.cpp trunk/tora/src/toworkingwidget.h trunk/tora/src/toworksheet.cpp trunk/tora/src/toworksheet.h trunk/tora/src/toworksheetstatistic.cpp trunk/tora/src/toworksheetstatistic.h trunk/tora/src/toworksheettext.cpp trunk/tora/src/toworksheettext.h trunk/tora/src/toworksheetwidget.cpp trunk/tora/src/toworksheetwidget.h trunk/tora/src/utils.cpp trunk/tora/src/utils.h Modified: trunk/tora/src/main.cpp =================================================================== --- trunk/tora/src/main.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/main.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toabout.cpp =================================================================== --- trunk/tora/src/toabout.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toabout.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toabout.h =================================================================== --- trunk/tora/src/toabout.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toabout.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toalert.cpp =================================================================== --- trunk/tora/src/toalert.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toalert.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toalert.h =================================================================== --- trunk/tora/src/toalert.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toalert.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toanalyze.cpp =================================================================== --- trunk/tora/src/toanalyze.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toanalyze.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers - * Copyright (C) 2003-2005 Quest Software, Inc - * Portions Copyright (C) 2005 Other Contributors + * Copyright (C) 2003-2008 Quest Software, Inc + * Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toanalyze.h =================================================================== --- trunk/tora/src/toanalyze.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toanalyze.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tobackup.cpp =================================================================== --- trunk/tora/src/tobackup.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tobackup.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tobackup.h =================================================================== --- trunk/tora/src/tobackup.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tobackup.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tobarchart.cpp =================================================================== --- trunk/tora/src/tobarchart.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tobarchart.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tobarchart.h =================================================================== --- trunk/tora/src/tobarchart.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tobarchart.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tobrowser.cpp =================================================================== --- trunk/tora/src/tobrowser.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tobrowser.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tobrowser.h =================================================================== --- trunk/tora/src/tobrowser.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tobrowser.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tobrowserconstraint.cpp =================================================================== --- trunk/tora/src/tobrowserconstraint.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tobrowserconstraint.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tobrowserconstraint.h =================================================================== --- trunk/tora/src/tobrowserconstraint.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tobrowserconstraint.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tobrowserindex.cpp =================================================================== --- trunk/tora/src/tobrowserindex.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tobrowserindex.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tobrowserindex.h =================================================================== --- trunk/tora/src/tobrowserindex.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tobrowserindex.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tobrowsertable.cpp =================================================================== --- trunk/tora/src/tobrowsertable.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tobrowsertable.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers - * Copyright (C) 2003-2005 Quest Software, Inc - * Portions Copyright (C) 2005 Other Contributors + * Copyright (C) 2003-2008 Quest Software, Inc + * Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tobrowsertable.h =================================================================== --- trunk/tora/src/tobrowsertable.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tobrowsertable.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tochangeconnection.cpp =================================================================== --- trunk/tora/src/tochangeconnection.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tochangeconnection.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tochangeconnection.h =================================================================== --- trunk/tora/src/tochangeconnection.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tochangeconnection.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tochartmanager.cpp =================================================================== --- trunk/tora/src/tochartmanager.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tochartmanager.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tochartmanager.h =================================================================== --- trunk/tora/src/tochartmanager.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tochartmanager.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tocodemodel.cpp =================================================================== --- trunk/tora/src/tocodemodel.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tocodemodel.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tocodemodel.h =================================================================== --- trunk/tora/src/tocodemodel.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tocodemodel.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toconf.h =================================================================== --- trunk/tora/src/toconf.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toconf.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toconnection.cpp =================================================================== --- trunk/tora/src/toconnection.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toconnection.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toconnection.h =================================================================== --- trunk/tora/src/toconnection.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toconnection.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers - * Copyright (C) 2003-2005 Quest Software, Inc - * Portions Copyright (C) 2005 Other Contributors + * Copyright (C) 2003-2008 Quest Software, Inc + * Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toconnectionimport.cpp =================================================================== --- trunk/tora/src/toconnectionimport.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toconnectionimport.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers - * Copyright (C) 2003-2005 Quest Software, Inc - * Portions Copyright (C) 2005 Other Contributors + * Copyright (C) 2003-2008 Quest Software, Inc + * Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toconnectionimport.h =================================================================== --- trunk/tora/src/toconnectionimport.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toconnectionimport.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers - * Copyright (C) 2003-2005 Quest Software, Inc - * Portions Copyright (C) 2005 Other Contributors + * Copyright (C) 2003-2008 Quest Software, Inc + * Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toconnectionmodel.cpp =================================================================== --- trunk/tora/src/toconnectionmodel.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toconnectionmodel.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers - * Copyright (C) 2003-2005 Quest Software, Inc - * Portions Copyright (C) 2005 Other Contributors + * Copyright (C) 2003-2008 Quest Software, Inc + * Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toconnectionmodel.h =================================================================== --- trunk/tora/src/toconnectionmodel.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toconnectionmodel.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers - * Copyright (C) 2003-2005 Quest Software, Inc - * Portions Copyright (C) 2005 Other Contributors + * Copyright (C) 2003-2008 Quest Software, Inc + * Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toconnectionpool.cpp =================================================================== --- trunk/tora/src/toconnectionpool.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toconnectionpool.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toconnectionpool.h =================================================================== --- trunk/tora/src/toconnectionpool.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toconnectionpool.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers - * Copyright (C) 2003-2005 Quest Software, Inc - * Portions Copyright (C) 2005 Other Contributors + * Copyright (C) 2003-2008 Quest Software, Inc + * Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tocurrent.cpp =================================================================== --- trunk/tora/src/tocurrent.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tocurrent.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tocurrent.h =================================================================== --- trunk/tora/src/tocurrent.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tocurrent.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/todatatype.cpp =================================================================== --- trunk/tora/src/todatatype.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/todatatype.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/todatatype.h =================================================================== --- trunk/tora/src/todatatype.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/todatatype.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/todebug.cpp =================================================================== --- trunk/tora/src/todebug.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/todebug.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/todebug.h =================================================================== --- trunk/tora/src/todebug.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/todebug.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/todebugtext.cpp =================================================================== --- trunk/tora/src/todebugtext.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/todebugtext.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/todebugtext.h =================================================================== --- trunk/tora/src/todebugtext.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/todebugtext.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/todefaultkeywords.h =================================================================== --- trunk/tora/src/todefaultkeywords.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/todefaultkeywords.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toeditablemenu.cpp =================================================================== --- trunk/tora/src/toeditablemenu.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toeditablemenu.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers - * Copyright (C) 2003-2005 Quest Software, Inc - * Portions Copyright (C) 2005 Other Contributors + * Copyright (C) 2003-2008 Quest Software, Inc + * Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toeditablemenu.h =================================================================== --- trunk/tora/src/toeditablemenu.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toeditablemenu.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers - * Copyright (C) 2003-2005 Quest Software, Inc - * Portions Copyright (C) 2005 Other Contributors + * Copyright (C) 2003-2008 Quest Software, Inc + * Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toeditextensions.cpp =================================================================== --- trunk/tora/src/toeditextensions.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toeditextensions.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toeditextensions.h =================================================================== --- trunk/tora/src/toeditextensions.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toeditextensions.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toeditwidget.cpp =================================================================== --- trunk/tora/src/toeditwidget.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toeditwidget.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toeditwidget.h =================================================================== --- trunk/tora/src/toeditwidget.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toeditwidget.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toeventquery.cpp =================================================================== --- trunk/tora/src/toeventquery.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toeventquery.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toeventquery.h =================================================================== --- trunk/tora/src/toeventquery.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toeventquery.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toeventquerytask.cpp =================================================================== --- trunk/tora/src/toeventquerytask.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toeventquerytask.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toeventquerytask.h =================================================================== --- trunk/tora/src/toeventquerytask.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toeventquerytask.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toextract.cpp =================================================================== --- trunk/tora/src/toextract.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toextract.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toextract.h =================================================================== --- trunk/tora/src/toextract.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toextract.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toextratranslations.cpp =================================================================== --- trunk/tora/src/toextratranslations.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toextratranslations.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tofilesize.cpp =================================================================== --- trunk/tora/src/tofilesize.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tofilesize.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tofilesize.h =================================================================== --- trunk/tora/src/tofilesize.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tofilesize.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toglobalsetting.cpp =================================================================== --- trunk/tora/src/toglobalsetting.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toglobalsetting.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toglobalsetting.h =================================================================== --- trunk/tora/src/toglobalsetting.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toglobalsetting.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tohelp.cpp =================================================================== --- trunk/tora/src/tohelp.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tohelp.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tohelp.h =================================================================== --- trunk/tora/src/tohelp.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tohelp.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tohelpbrowser.h =================================================================== --- trunk/tora/src/tohelpbrowser.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tohelpbrowser.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ // /***** // * // * TOra - An Oracle Toolkit for DBA's and developers -// * Copyright (C) 2003-2005 Quest Software, Inc -// * Portions Copyright (C) 2005 Other Contributors +// * Copyright (C) 2003-2008 Quest Software, Inc +// * Portions Copyright (C) 2008 Other Contributors // * // * This program is free software; you can redistribute it and/or // * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tohelpsetup.h =================================================================== --- trunk/tora/src/tohelpsetup.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tohelpsetup.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tohighlightedtext.cpp =================================================================== --- trunk/tora/src/tohighlightedtext.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tohighlightedtext.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tohighlightedtext.h =================================================================== --- trunk/tora/src/tohighlightedtext.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tohighlightedtext.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tohtml.cpp =================================================================== --- trunk/tora/src/tohtml.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tohtml.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tohtml.h =================================================================== --- trunk/tora/src/tohtml.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tohtml.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toinvalid.cpp =================================================================== --- trunk/tora/src/toinvalid.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toinvalid.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers - * Copyright (C) 2003-2005 Quest Software, Inc - * Portions Copyright (C) 2005 Other Contributors + * Copyright (C) 2003-2008 Quest Software, Inc + * Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/toinvalid.h =================================================================== --- trunk/tora/src/toinvalid.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/toinvalid.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tolegendchart.cpp =================================================================== --- trunk/tora/src/tolegendchart.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tolegendchart.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tolegendchart.h =================================================================== --- trunk/tora/src/tolegendchart.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tolegendchart.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tolinechart.cpp =================================================================== --- trunk/tora/src/tolinechart.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tolinechart.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tolinechart.h =================================================================== --- trunk/tora/src/tolinechart.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tolinechart.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tolistviewformatter.cpp =================================================================== --- trunk/tora/src/tolistviewformatter.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tolistviewformatter.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tolistviewformatter.h =================================================================== --- trunk/tora/src/tolistviewformatter.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tolistviewformatter.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc +* Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tolistviewformattercsv.cpp =================================================================== --- trunk/tora/src/tolistviewformattercsv.cpp 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tolistviewformattercsv.cpp 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers - * Copyright (C) 2003-2005 Quest Software, Inc - * Portions Copyright (C) 2005 Other Contributors + * Copyright (C) 2003-2008 Quest Software, Inc + * Portions Copyright (C) 2008 Other Contributors * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License Modified: trunk/tora/src/tolistviewformattercsv.h =================================================================== --- trunk/tora/src/tolistviewformattercsv.h 2008-09-08 00:16:28 UTC (rev 2977) +++ trunk/tora/src/tolistviewformattercsv.h 2008-09-08 00:22:24 UTC (rev 2978) @@ -1,8 +1,8 @@ /***** * * TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2005 Quest Software, Inc -* Portions Copyright (C) 2005 Other Contributors +* Copyright (C) 2003-2008 Quest Software, Inc... [truncated message content] |
From: <mrj...@us...> - 2008-09-14 04:57:57
|
Revision: 2997 http://tora.svn.sourceforge.net/tora/?rev=2997&view=rev Author: mrjohnson0 Date: 2008-09-14 04:58:07 +0000 (Sun, 14 Sep 2008) Log Message: ----------- hide actions for tools that don't support the current connection for without oracle builds. this is different than the oracle build because it doesn't make sense to have a bunch of icons jumping around. But without oracle, it doesn't make sense to have the oracle-only tools present. Modified Paths: -------------- trunk/tora/src/tomain.cpp trunk/tora/src/totool.h Modified: trunk/tora/src/tomain.cpp =================================================================== --- trunk/tora/src/tomain.cpp 2008-09-14 03:47:07 UTC (rev 2996) +++ trunk/tora/src/tomain.cpp 2008-09-14 04:58:07 UTC (rev 2997) @@ -614,13 +614,17 @@ int priority = (*i).second->priority(); if (priority / 100 != lastPriorityPix / 100 && pixmap) { +#ifndef TO_NO_ORACLE toolsToolbar->addSeparator(); +#endif lastPriorityPix = priority; } if (priority / 100 != lastPriorityMenu / 100 && menuName) { +#ifndef TO_NO_ORACLE toolsMenu->addSeparator(); +#endif lastPriorityMenu = priority; } @@ -1346,6 +1350,15 @@ // now, loop through tools and enable/disable + toConnection *conn = 0; + try + { + conn = ¤tConnection(); + } + catch(...) + { + } + std::map<QString, toTool *> &tools = toTool::tools(); for (std::map<QString, toTool *>::iterator i = tools.begin(); i != tools.end(); @@ -1355,13 +1368,25 @@ if (!(*i).second) continue; +#ifdef TO_NO_ORACLE + // hide icon if tool doesn't support connection. this is to + // hide all of the oracle tools that don't make sense if + // compiled without it. + if(conn) + (*i).second->setActionVisible(*conn); + else + (*i).second->setActionVisible(false); +#else if (!enabled) (*i).second->enableAction(false); else { - toConnection &conn = currentConnection(); - (*i).second->enableAction(conn); + if(conn) + (*i).second->enableAction(*conn); + else + (*i).second->enableAction(false); } +#endif } } Modified: trunk/tora/src/totool.h =================================================================== --- trunk/tora/src/totool.h 2008-09-14 03:47:07 UTC (rev 2996) +++ trunk/tora/src/totool.h 2008-09-14 04:58:07 UTC (rev 2997) @@ -286,6 +286,26 @@ enableAction(canHandle(conn)); } + /** + * Set action visibility if tool can support toConnection + * provider. + * + */ + void setActionVisible(toConnection &conn) + { + getAction()->setVisible(canHandle(conn)); + } + + /** + * Set action visibility if tool can support toConnection + * provider. + * + */ + void setActionVisible(bool en) + { + getAction()->setVisible(en); + } + public slots: /** * Create a window of the current tool. This function sets up a toolwindow for This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-09-14 17:34:40
|
Revision: 2999 http://tora.svn.sourceforge.net/tora/?rev=2999&view=rev Author: mrjohnson0 Date: 2008-09-14 17:34:40 +0000 (Sun, 14 Sep 2008) Log Message: ----------- if there's a schema set on the connection object, prefer to use that. also keeps it updated when the actual schema in use changes. Modified Paths: -------------- trunk/tora/src/toconnection.h trunk/tora/src/toresultschema.cpp Modified: trunk/tora/src/toconnection.h =================================================================== --- trunk/tora/src/toconnection.h 2008-09-14 05:06:27 UTC (rev 2998) +++ trunk/tora/src/toconnection.h 2008-09-14 17:34:40 UTC (rev 2999) @@ -797,6 +797,14 @@ { return Schema; } + /** + * Set connection's current schema + * + */ + inline void setSchema(const QString &schema) + { + Schema = schema; + } /** Get version of connection. */ const QString &version() const Modified: trunk/tora/src/toresultschema.cpp =================================================================== --- trunk/tora/src/toresultschema.cpp 2008-09-14 05:06:27 UTC (rev 2998) +++ trunk/tora/src/toresultschema.cpp 2008-09-14 17:34:40 UTC (rev 2999) @@ -54,10 +54,16 @@ conn.host() + "-" + conn.database(); - QSettings s; - QString sel = s.value("schema/" + ConnectionKey).toString(); + QString sel = conn.schema(); - if(sel.isNull()) { + if(sel.isEmpty()) + { + QSettings s; + sel = s.value("schema/" + ConnectionKey).toString(); + } + + if(sel.isEmpty()) + { if (toIsMySQL(conn)) sel = conn.database(); else if (toIsOracle(conn) || toIsSapDB(conn)) @@ -66,6 +72,7 @@ sel = conn.user(); } + conn.setSchema(sel); setSelected(sel); connect(this, SIGNAL(currentIndexChanged(const QString &)), @@ -107,6 +114,8 @@ conn.allExecute(CHANGE_CURRENT_SCHEMA_PG.arg(schema)); else throw QString("No support for changing schema for this database"); + + conn.setSchema(schema); } TOCATCH; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-09-14 18:56:07
|
Revision: 3001 http://tora.svn.sourceforge.net/tora/?rev=3001&view=rev Author: mrjohnson0 Date: 2008-09-14 18:56:16 +0000 (Sun, 14 Sep 2008) Log Message: ----------- when prompting to save changes, setFocus() so the current window will always display. this is nice during shutdown or disconnecting so you can decide which changes to save only prompt once in toresultdata Modified Paths: -------------- trunk/tora/src/toresultdata.cpp trunk/tora/src/toresultdata.h trunk/tora/src/tosqledit.cpp trunk/tora/src/toworksheet.cpp trunk/tora/src/toworksheettext.cpp Modified: trunk/tora/src/toresultdata.cpp =================================================================== --- trunk/tora/src/toresultdata.cpp 2008-09-14 18:27:10 UTC (rev 3000) +++ trunk/tora/src/toresultdata.cpp 2008-09-14 18:56:16 UTC (rev 3001) @@ -68,10 +68,10 @@ toResultData::toResultData(QWidget *parent, const char *name, Qt::WindowFlags f) - : QWidget(parent, f) + : QWidget(parent, f) { - AllFilter = false; + Discard = false; if (name) setObjectName(name); @@ -180,6 +180,8 @@ if (!maybeSave()) return; + Discard = false; + if (params.size() == 2) { toQList::const_iterator par = params.begin(); @@ -375,11 +377,16 @@ { if (!Edit->changed()) return true; + if (!isVisible()) + return true; + // grab focus so user can see file and decide to save + setFocus(Qt::OtherFocusReason); + int ret = TOMessageBox::information( this, - "Save changes", - QString("Save changes to %1.%2?").arg(Owner).arg(Table), + tr("Save changes"), + tr("Save changes to %1.%2?").arg(Owner).arg(Table), QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel); @@ -391,7 +398,7 @@ return true; } else if (ret == QMessageBox::Discard) - return true; + return Discard = true; else return false; } Modified: trunk/tora/src/toresultdata.h =================================================================== --- trunk/tora/src/toresultdata.h 2008-09-14 18:27:10 UTC (rev 3000) +++ trunk/tora/src/toresultdata.h 2008-09-14 18:56:16 UTC (rev 3001) @@ -105,6 +105,10 @@ // generate filtername QString filterName(); + // true if user has elected to discard current changes. + // should be reset on every query + bool Discard; + public: toResultData(QWidget *parent = 0, const char *name = 0, Modified: trunk/tora/src/tosqledit.cpp =================================================================== --- trunk/tora/src/tosqledit.cpp 2008-09-14 18:27:10 UTC (rev 3000) +++ trunk/tora/src/tosqledit.cpp 2008-09-14 18:56:16 UTC (rev 3001) @@ -438,6 +438,9 @@ Description->isModified()) && Version->currentText().length() > 0) { + // grab focus so user can see file and decide to save + setFocus(Qt::OtherFocusReason); + switch (TOMessageBox::information(this, tr("Modified SQL dictionary"), tr("Save changes into the SQL dictionary"), tr("&Yes"), tr("&No"), tr("Cancel"), 0, 2)) Modified: trunk/tora/src/toworksheet.cpp =================================================================== --- trunk/tora/src/toworksheet.cpp 2008-09-14 18:27:10 UTC (rev 3000) +++ trunk/tora/src/toworksheet.cpp 2008-09-14 18:56:16 UTC (rev 3001) @@ -703,6 +703,9 @@ conn += QString::fromLatin1("unknown connection"); } + // grab focus so user can see file and decide to save + setFocus(Qt::OtherFocusReason); + QString str = tr("Save changes to editor for %1?").arg(conn); if (!Editor->filename().isEmpty()) str += QString::fromLatin1("\n(") + Modified: trunk/tora/src/toworksheettext.cpp =================================================================== --- trunk/tora/src/toworksheettext.cpp 2008-09-14 18:27:10 UTC (rev 3000) +++ trunk/tora/src/toworksheettext.cpp 2008-09-14 18:56:16 UTC (rev 3001) @@ -66,6 +66,9 @@ int ret = 1; if (isModified()) { + // grab focus so user can see file and decide to save + setFocus(Qt::OtherFocusReason); + ret = TOMessageBox::information( this, qApp->translate("toWorksheetText", "Save changes?"), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nn...@us...> - 2008-09-14 20:49:49
|
Revision: 3007 http://tora.svn.sourceforge.net/tora/?rev=3007&view=rev Author: nneul Date: 2008-09-14 20:49:08 +0000 (Sun, 14 Sep 2008) Log Message: ----------- strip copyright information from all files Modified Paths: -------------- trunk/tora/src/main.cpp trunk/tora/src/migratetool/sqldeveloper.cpp trunk/tora/src/migratetool/sqldeveloper.h trunk/tora/src/migratetool/squirrelsql.cpp trunk/tora/src/migratetool/squirrelsql.h trunk/tora/src/migratetool/tora3.cpp trunk/tora/src/migratetool/tora3.h trunk/tora/src/toabout.cpp trunk/tora/src/toabout.h trunk/tora/src/toalert.cpp trunk/tora/src/toalert.h trunk/tora/src/toanalyze.cpp trunk/tora/src/toanalyze.h trunk/tora/src/tobackup.cpp trunk/tora/src/tobackup.h trunk/tora/src/tobarchart.cpp trunk/tora/src/tobarchart.h trunk/tora/src/tobrowser.cpp trunk/tora/src/tobrowser.h trunk/tora/src/tobrowserconstraint.cpp trunk/tora/src/tobrowserconstraint.h trunk/tora/src/tobrowserindex.cpp trunk/tora/src/tobrowserindex.h trunk/tora/src/tobrowsertable.cpp trunk/tora/src/tobrowsertable.h trunk/tora/src/tochangeconnection.cpp trunk/tora/src/tochangeconnection.h trunk/tora/src/tochartmanager.cpp trunk/tora/src/tochartmanager.h trunk/tora/src/tocodemodel.cpp trunk/tora/src/tocodemodel.h trunk/tora/src/toconf.h trunk/tora/src/toconnection.cpp trunk/tora/src/toconnection.h trunk/tora/src/toconnectionimport.cpp trunk/tora/src/toconnectionimport.h trunk/tora/src/toconnectionmodel.cpp trunk/tora/src/toconnectionmodel.h trunk/tora/src/toconnectionpool.cpp trunk/tora/src/toconnectionpool.h trunk/tora/src/tocurrent.cpp trunk/tora/src/tocurrent.h trunk/tora/src/todatatype.cpp trunk/tora/src/todatatype.h trunk/tora/src/todebug.cpp trunk/tora/src/todebug.h trunk/tora/src/todebugtext.cpp trunk/tora/src/todebugtext.h trunk/tora/src/todefaultkeywords.h trunk/tora/src/toeditablemenu.cpp trunk/tora/src/toeditablemenu.h trunk/tora/src/toeditextensions.cpp trunk/tora/src/toeditextensions.h trunk/tora/src/toeditwidget.cpp trunk/tora/src/toeditwidget.h trunk/tora/src/toeventquery.cpp trunk/tora/src/toeventquery.h trunk/tora/src/toeventquerytask.cpp trunk/tora/src/toeventquerytask.h trunk/tora/src/toextract.cpp trunk/tora/src/toextract.h trunk/tora/src/toextratranslations.cpp trunk/tora/src/tofilesize.cpp trunk/tora/src/tofilesize.h trunk/tora/src/toglobalsetting.cpp trunk/tora/src/toglobalsetting.h trunk/tora/src/tohelp.cpp trunk/tora/src/tohelp.h trunk/tora/src/tohelpbrowser.h trunk/tora/src/tohelpsetup.h trunk/tora/src/tohighlightedtext.cpp trunk/tora/src/tohighlightedtext.h trunk/tora/src/tohtml.cpp trunk/tora/src/tohtml.h trunk/tora/src/toinvalid.cpp trunk/tora/src/toinvalid.h trunk/tora/src/tolegendchart.cpp trunk/tora/src/tolegendchart.h trunk/tora/src/tolinechart.cpp trunk/tora/src/tolinechart.h trunk/tora/src/tolistviewformatter.cpp trunk/tora/src/tolistviewformatter.h trunk/tora/src/tolistviewformattercsv.cpp trunk/tora/src/tolistviewformattercsv.h trunk/tora/src/tolistviewformatterfactory.h trunk/tora/src/tolistviewformatterhtml.cpp trunk/tora/src/tolistviewformatterhtml.h trunk/tora/src/tolistviewformatteridentifier.h trunk/tora/src/tolistviewformattersql.h trunk/tora/src/tolistviewformattertabdel.cpp trunk/tora/src/tolistviewformattertabdel.h trunk/tora/src/tolistviewformattertext.cpp trunk/tora/src/tolistviewformattertext.h trunk/tora/src/tomain.cpp trunk/tora/src/tomain.h trunk/tora/src/tomainwindow.cpp trunk/tora/src/tomainwindow.h trunk/tora/src/tomainwindow.kde.h trunk/tora/src/tomarkedtext.cpp trunk/tora/src/tomarkedtext.h trunk/tora/src/tomemoeditor.cpp trunk/tora/src/tomemoeditor.h trunk/tora/src/tomessage.cpp trunk/tora/src/tomessage.h trunk/tora/src/tomodeleditor.cpp trunk/tora/src/tomodeleditor.h trunk/tora/src/tomysqlkeywords.h trunk/tora/src/tonewconnection.cpp trunk/tora/src/tonewconnection.h trunk/tora/src/tonoblockquery.cpp trunk/tora/src/tonoblockquery.h trunk/tora/src/toocistub.cpp trunk/tora/src/tooracleconnection.cpp trunk/tora/src/tooracleextract.cpp trunk/tora/src/tooraclepreload.cpp trunk/tora/src/tooraclesetting.h trunk/tora/src/tooutput.cpp trunk/tora/src/tooutput.h trunk/tora/src/toparamget.cpp trunk/tora/src/toparamget.h trunk/tora/src/topassword.cpp trunk/tora/src/topiechart.cpp trunk/tora/src/topiechart.h trunk/tora/src/toplsqleditor.cpp trunk/tora/src/toplsqleditor.h trunk/tora/src/toplsqltext.cpp trunk/tora/src/toplsqltext.h trunk/tora/src/topreferences.cpp trunk/tora/src/topreferences.h trunk/tora/src/toprofiler.cpp trunk/tora/src/toprofiler.h trunk/tora/src/toproject.cpp trunk/tora/src/toproject.h trunk/tora/src/toqsqlconnection.cpp trunk/tora/src/toqvalue.cpp trunk/tora/src/toqvalue.h trunk/tora/src/toreport.cpp trunk/tora/src/toreport.h trunk/tora/src/toresult.cpp trunk/tora/src/toresult.h trunk/tora/src/toresultbar.cpp trunk/tora/src/toresultbar.h trunk/tora/src/toresultcols.cpp trunk/tora/src/toresultcols.h trunk/tora/src/toresultcolscomment.cpp trunk/tora/src/toresultcolscomment.h trunk/tora/src/toresultcombo.cpp trunk/tora/src/toresultcombo.h trunk/tora/src/toresultdata.cpp trunk/tora/src/toresultdata.h trunk/tora/src/toresultdatasingle.cpp trunk/tora/src/toresultdatasingle.h trunk/tora/src/toresultdepend.cpp trunk/tora/src/toresultdepend.h trunk/tora/src/toresultextract.cpp trunk/tora/src/toresultextract.h trunk/tora/src/toresultfield.cpp trunk/tora/src/toresultfield.h trunk/tora/src/toresultitem.cpp trunk/tora/src/toresultitem.h trunk/tora/src/toresultlabel.cpp trunk/tora/src/toresultlabel.h trunk/tora/src/toresultline.cpp trunk/tora/src/toresultline.h trunk/tora/src/toresultlistformat.cpp trunk/tora/src/toresultlistformat.h trunk/tora/src/toresultlock.cpp trunk/tora/src/toresultlock.h trunk/tora/src/toresultlong.cpp trunk/tora/src/toresultlong.h trunk/tora/src/toresultmodel.cpp trunk/tora/src/toresultmodel.h trunk/tora/src/toresultparam.cpp trunk/tora/src/toresultparam.h trunk/tora/src/toresultpie.cpp trunk/tora/src/toresultpie.h trunk/tora/src/toresultplan.cpp trunk/tora/src/toresultplan.h trunk/tora/src/toresultresources.h trunk/tora/src/toresultschema.cpp trunk/tora/src/toresultschema.h trunk/tora/src/toresultstats.cpp trunk/tora/src/toresultstats.h trunk/tora/src/toresultstorage.cpp trunk/tora/src/toresultstorage.h trunk/tora/src/toresulttableview.cpp trunk/tora/src/toresulttableview.h trunk/tora/src/toresulttableviewedit.cpp trunk/tora/src/toresulttableviewedit.h trunk/tora/src/toresultview.cpp trunk/tora/src/toresultview.h trunk/tora/src/torollback.cpp trunk/tora/src/torollback.h trunk/tora/src/torunnable.cpp trunk/tora/src/torunnable.h trunk/tora/src/toscript.cpp trunk/tora/src/toscript.h trunk/tora/src/toscriptschemawidget.cpp trunk/tora/src/toscriptschemawidget.h trunk/tora/src/toscripttreeitem.cpp trunk/tora/src/toscripttreeitem.h trunk/tora/src/toscripttreemodel.cpp trunk/tora/src/toscripttreemodel.h trunk/tora/src/tosearchreplace.cpp trunk/tora/src/tosearchreplace.h trunk/tora/src/tosecurity.cpp trunk/tora/src/tosecurity.h trunk/tora/src/tosecuritytreeitem.cpp trunk/tora/src/tosecuritytreeitem.h trunk/tora/src/tosecuritytreemodel.cpp trunk/tora/src/tosecuritytreemodel.h trunk/tora/src/tosession.cpp trunk/tora/src/tosession.h trunk/tora/src/tosgastatement.cpp trunk/tora/src/tosgastatement.h trunk/tora/src/tosgatrace.cpp trunk/tora/src/tosgatrace.h trunk/tora/src/tosmtp.cpp trunk/tora/src/tosmtp.h trunk/tora/src/tosplash.cpp trunk/tora/src/tosplash.h trunk/tora/src/tosql.cpp trunk/tora/src/tosql.h trunk/tora/src/tosqledit.cpp trunk/tora/src/tosqledit.h trunk/tora/src/tosqlparse.cpp trunk/tora/src/tosqlparse.h trunk/tora/src/tostorage.cpp trunk/tora/src/tostorage.h trunk/tora/src/tostoragedefinition.cpp trunk/tora/src/tostoragedefinition.h trunk/tora/src/tosyntaxsetup.cpp trunk/tora/src/tosyntaxsetup.h trunk/tora/src/totabwidget.cpp trunk/tora/src/totabwidget.h trunk/tora/src/totemplate.cpp trunk/tora/src/totemplate.h trunk/tora/src/totemplateprovider.cpp trunk/tora/src/totemporary.cpp trunk/tora/src/totemporary.h trunk/tora/src/totextview.cpp trunk/tora/src/totextview.h trunk/tora/src/tothread.cpp trunk/tora/src/tothread.h trunk/tora/src/tothread_p.h trunk/tora/src/totool.h trunk/tora/src/totreewidget.cpp trunk/tora/src/totreewidget.h trunk/tora/src/totuning.cpp trunk/tora/src/totuning.h trunk/tora/src/tounittest.cpp trunk/tora/src/tounittest.h trunk/tora/src/tovisualize.cpp trunk/tora/src/tovisualize.h trunk/tora/src/towaitevents.cpp trunk/tora/src/towaitevents.h trunk/tora/src/toworkingwidget.cpp trunk/tora/src/toworkingwidget.h trunk/tora/src/toworksheet.cpp trunk/tora/src/toworksheet.h trunk/tora/src/toworksheetstatistic.cpp trunk/tora/src/toworksheetstatistic.h trunk/tora/src/toworksheettext.cpp trunk/tora/src/toworksheettext.h trunk/tora/src/toworksheetwidget.cpp trunk/tora/src/toworksheetwidget.h trunk/tora/src/utils.cpp trunk/tora/src/utils.h Modified: trunk/tora/src/main.cpp =================================================================== --- trunk/tora/src/main.cpp 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/main.cpp 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #include "utils.h" Modified: trunk/tora/src/migratetool/sqldeveloper.cpp =================================================================== --- trunk/tora/src/migratetool/sqldeveloper.cpp 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/migratetool/sqldeveloper.cpp 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** - * - * 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. - * - *****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #include "sqldeveloper.h" Modified: trunk/tora/src/migratetool/sqldeveloper.h =================================================================== --- trunk/tora/src/migratetool/sqldeveloper.h 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/migratetool/sqldeveloper.h 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** - * - * 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. - * - *****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #ifndef SQLDEVELOPER_H #define SQLDEVELOPER_H Modified: trunk/tora/src/migratetool/squirrelsql.cpp =================================================================== --- trunk/tora/src/migratetool/squirrelsql.cpp 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/migratetool/squirrelsql.cpp 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** - * - * 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. - * - *****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #include "squirrelsql.h" Modified: trunk/tora/src/migratetool/squirrelsql.h =================================================================== --- trunk/tora/src/migratetool/squirrelsql.h 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/migratetool/squirrelsql.h 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** - * - * 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. - * - *****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #ifndef SQURRELSQL_H #define SQURRELSQL_H Modified: trunk/tora/src/migratetool/tora3.cpp =================================================================== --- trunk/tora/src/migratetool/tora3.cpp 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/migratetool/tora3.cpp 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** - * - * 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. - * - *****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #include "config.h" #include "tora3.h" Modified: trunk/tora/src/migratetool/tora3.h =================================================================== --- trunk/tora/src/migratetool/tora3.h 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/migratetool/tora3.h 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** - * - * 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. - * - *****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #ifndef TORA3_H #define TORA3_H Modified: trunk/tora/src/toabout.cpp =================================================================== --- trunk/tora/src/toabout.cpp 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/toabout.cpp 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #include "toabout.h" Modified: trunk/tora/src/toabout.h =================================================================== --- trunk/tora/src/toabout.h 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/toabout.h 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #ifndef TOABOUT_H #define TOABOUT_H Modified: trunk/tora/src/toalert.cpp =================================================================== --- trunk/tora/src/toalert.cpp 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/toalert.cpp 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #include "toalert.h" Modified: trunk/tora/src/toalert.h =================================================================== --- trunk/tora/src/toalert.h 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/toalert.h 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #ifndef TOALERT_H #define TOALERT_H Modified: trunk/tora/src/toanalyze.cpp =================================================================== --- trunk/tora/src/toanalyze.cpp 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/toanalyze.cpp 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** - * - * TOra - An Oracle Toolkit for DBA's and developers - * Copyright (C) 2003-2008 Quest Software, Inc - * Portions Copyright (C) 2008 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. - * - *****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #include "utils.h" Modified: trunk/tora/src/toanalyze.h =================================================================== --- trunk/tora/src/toanalyze.h 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/toanalyze.h 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #ifndef TOANALYZE_H #define TOANALYZE_H Modified: trunk/tora/src/tobackup.cpp =================================================================== --- trunk/tora/src/tobackup.cpp 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/tobackup.cpp 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #include "utils.h" Modified: trunk/tora/src/tobackup.h =================================================================== --- trunk/tora/src/tobackup.h 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/tobackup.h 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #ifndef TOBACKUP_H #define TOBACKUP_H Modified: trunk/tora/src/tobarchart.cpp =================================================================== --- trunk/tora/src/tobarchart.cpp 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/tobarchart.cpp 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #include "config.h" Modified: trunk/tora/src/tobarchart.h =================================================================== --- trunk/tora/src/tobarchart.h 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/tobarchart.h 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #ifndef TOBARCHART_H #define TOBARCHART_H Modified: trunk/tora/src/tobrowser.cpp =================================================================== --- trunk/tora/src/tobrowser.cpp 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/tobrowser.cpp 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #include "utils.h" Modified: trunk/tora/src/tobrowser.h =================================================================== --- trunk/tora/src/tobrowser.h 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/tobrowser.h 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #ifndef TOBROWSER_H #define TOBROWSER_H Modified: trunk/tora/src/tobrowserconstraint.cpp =================================================================== --- trunk/tora/src/tobrowserconstraint.cpp 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/tobrowserconstraint.cpp 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #include "utils.h" Modified: trunk/tora/src/tobrowserconstraint.h =================================================================== --- trunk/tora/src/tobrowserconstraint.h 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/tobrowserconstraint.h 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #ifndef TOBROWSERCONSTRAINT_H #define TOBROWSERCONSTRAINT_H Modified: trunk/tora/src/tobrowserindex.cpp =================================================================== --- trunk/tora/src/tobrowserindex.cpp 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/tobrowserindex.cpp 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #include "utils.h" Modified: trunk/tora/src/tobrowserindex.h =================================================================== --- trunk/tora/src/tobrowserindex.h 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/tobrowserindex.h 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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. -* -*****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #ifndef TOBROWSERINDEX_H #define TOBROWSERINDEX_H Modified: trunk/tora/src/tobrowsertable.cpp =================================================================== --- trunk/tora/src/tobrowsertable.cpp 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/tobrowsertable.cpp 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** - * - * TOra - An Oracle Toolkit for DBA's and developers - * Copyright (C) 2003-2008 Quest Software, Inc - * Portions Copyright (C) 2008 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. - * - *****/ +/* BEGIN_COMMON_COPYRIGHT_HEADER +* END_COMMON_COPYRIGHT_HEADER */ #include "utils.h" Modified: trunk/tora/src/tobrowsertable.h =================================================================== --- trunk/tora/src/tobrowsertable.h 2008-09-14 20:32:44 UTC (rev 3006) +++ trunk/tora/src/tobrowsertable.h 2008-09-14 20:49:08 UTC (rev 3007) @@ -1,39 +1,5 @@ -/***** -* -* TOra - An Oracle Toolkit for DBA's and developers -* Copyright (C) 2003-2008 Quest Software, Inc -* Portions Copyright (C) 2008 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 021... [truncated message content] |
From: <nn...@us...> - 2008-09-14 21:57:48
|
Revision: 3017 http://tora.svn.sourceforge.net/tora/?rev=3017&view=rev Author: nneul Date: 2008-09-14 21:57:57 +0000 (Sun, 14 Sep 2008) Log Message: ----------- remove unused file Modified Paths: -------------- trunk/tora/src/CMakeLists.txt trunk/tora/src/Makefile.am Removed Paths: ------------- trunk/tora/src/tohelpbrowser.h Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-09-14 21:53:07 UTC (rev 3016) +++ trunk/tora/src/CMakeLists.txt 2008-09-14 21:57:57 UTC (rev 3017) @@ -104,7 +104,6 @@ toeventquerytask.h tofilesize.h toglobalsetting.h -# tohelpbrowser.h tohelp.h tohelpsetup.h tohighlightedtext.h Modified: trunk/tora/src/Makefile.am =================================================================== --- trunk/tora/src/Makefile.am 2008-09-14 21:53:07 UTC (rev 3016) +++ trunk/tora/src/Makefile.am 2008-09-14 21:57:57 UTC (rev 3017) @@ -57,7 +57,6 @@ toeditwidget.cpp toeditwidget.h \ toglobalsetting.cpp toglobalsetting.h \ tohelp.cpp tohelp.h tohelpsetup.h \ - tohelpbrowser.h \ tohighlightedtext.cpp tohighlightedtext.h \ tohtml.cpp tohtml.h \ tolistviewformatter.cpp tolistviewformatter.h \ Deleted: trunk/tora/src/tohelpbrowser.h =================================================================== --- trunk/tora/src/tohelpbrowser.h 2008-09-14 21:53:07 UTC (rev 3016) +++ trunk/tora/src/tohelpbrowser.h 2008-09-14 21:57:57 UTC (rev 3017) @@ -1,106 +0,0 @@ - -/* BEGIN_COMMON_COPYRIGHT_HEADER - * - * TOra - An Oracle Toolkit for DBA's and developers - * - * Shared/mixed copyright is held throughout files in this product - * - * Portions Copyright (C) 2000-2001 Underscore AB - * Portions Copyright (C) 2003-2005 Quest Software, Inc. - * Portions Copyright (C) 2004-2008 Numerous Other Contributors - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; only version 2 of - * the License is valid for this program. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * As a special exception, you have permission to link this program - * with the Oracle Client libraries and distribute executables, as long - * as you follow the requirements of the GNU GPL in regard to all of the - * software in the executable aside from Oracle client libraries. - * - * Specifically you are not permitted to link this program with the - * Qt/UNIX, Qt/Windows or Qt Non Commercial products of TrollTech. - * And you are not permitted to distribute binaries compiled against - * these libraries. - * - * You may link this product with any GPL'd Qt library. - * - * All trademarks belong to their respective owners. - * - * END_COMMON_COPYRIGHT_HEADER */ - -// #ifndef TOHELPBROWSER_H -// #define TOHELPBROWSER_H -// -// #include "config.h" -// -// #include <list> -// #include <khtml_part.h> -// -// class KURL; -// -// /** -// * Widget used to display HTML of help pages. -// */ -// -// class toHelpBrowser : public KHTMLPart -// { -// Q_OBJECT -// -// /** List of backward history. The current page is at the end of the list. -// */ -// std::list<QString> Backward; -// /** List of forward history if you have started walking backwards. -// */ -// std::list<QString> Forward; -// private slots: -// /** Reimplemented for internal reasons. -// */ -// void openURLRequest(const KURL &url, const KParts::URLArgs &); -// public: -// /** Create a help browser. -// * @param parent Parent widget. -// * @param name Name of widget. -// */ -// toHelpBrowser(QWidget *parent, const char *name = NULL); -// /** Open an URL in this widget. -// * @param url URL to open. -// * @return Success of operator. -// */ -// virtual bool openURL(const KURL &url); -// /** Get source of URL. -// * @return String containing the current localtion. -// */ -// QString source(void); -// public slots: -// /** Go forward if available. -// */ -// void forward(void); -// /** Go backward if available. -// */ -// void backward(void); -// signals: -// /** Change availability of backward history. -// * @param avail Wether history is available. -// */ -// void backwardAvailable(bool avail); -// /** Change availability of forward history. -// * @param avail Wether history is available. -// */ -// void forwardAvailable(bool avail); -// /** The contents of the browser changed. -// */ -// void textChanged(void); -// }; -// -// #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-09-16 06:40:07
|
Revision: 3019 http://tora.svn.sourceforge.net/tora/?rev=3019&view=rev Author: subik Date: 2008-09-16 06:40:17 +0000 (Tue, 16 Sep 2008) Log Message: ----------- warnings (and possible crashes) fixes Modified Paths: -------------- trunk/tora/src/tomodeleditor.cpp trunk/tora/src/toresultmodel.cpp Modified: trunk/tora/src/tomodeleditor.cpp =================================================================== --- trunk/tora/src/tomodeleditor.cpp 2008-09-14 22:22:25 UTC (rev 3018) +++ trunk/tora/src/tomodeleditor.cpp 2008-09-16 06:40:17 UTC (rev 3019) @@ -132,8 +132,8 @@ QModelIndex current, bool sql, bool modal) : QDialog(parent), - Model(model), - Current(current) + Current(current), + Model(model) { setModal(modal); setMinimumSize(400, 300); Modified: trunk/tora/src/toresultmodel.cpp =================================================================== --- trunk/tora/src/toresultmodel.cpp 2008-09-14 22:22:25 UTC (rev 3018) +++ trunk/tora/src/toresultmodel.cpp 2008-09-16 06:40:17 UTC (rev 3019) @@ -763,8 +763,8 @@ while(left.size() > 0 && right.size() > 0) { - if(order == Qt::AscendingOrder && left.at(0).at(column) <= right.at(0).at(column) || - order == Qt::DescendingOrder && left.at(0).at(column) >= right.at(0).at(column)) + if((order == Qt::AscendingOrder && left.at(0).at(column) <= right.at(0).at(column)) || + (order == Qt::DescendingOrder && left.at(0).at(column) >= right.at(0).at(column))) result.append(left.takeAt(0)); else result.append(right.takeAt(0)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-09-21 19:48:17
|
Revision: 3032 http://tora.svn.sourceforge.net/tora/?rev=3032&view=rev Author: mrjohnson0 Date: 2008-09-21 19:48:12 +0000 (Sun, 21 Sep 2008) Log Message: ----------- blech. ugly code. trying to clean up a bit, this fixes enabling and disabling the Charts tab. previous attempts in here didn't fully fix the root problem, which was hard to grok. Seems to have been setup once upon a time to have charts in their own tabs, but it doesn't look like it ever worked or was completed. This removes a lot of that cruft. Modified Paths: -------------- trunk/tora/src/toconf.h trunk/tora/src/totuning.cpp trunk/tora/src/totuning.h Modified: trunk/tora/src/toconf.h =================================================================== --- trunk/tora/src/toconf.h 2008-09-21 18:03:26 UTC (rev 3031) +++ trunk/tora/src/toconf.h 2008-09-21 19:48:12 UTC (rev 3032) @@ -213,7 +213,7 @@ #define CONF_OVERVIEW "Overview" #define CONF_FILEIO "File I/O" #define CONF_WAITS "Wait events" -#define CONF_CHART "chart" +#define CONF_CHART "Charts" // toworksheet #define CONF_AUTO_SAVE "AutoSave" #define CONF_CHECK_SAVE "CheckSave" Modified: trunk/tora/src/totuning.cpp =================================================================== --- trunk/tora/src/totuning.cpp 2008-09-21 18:03:26 UTC (rev 3031) +++ trunk/tora/src/totuning.cpp 2008-09-21 19:48:12 UTC (rev 3032) @@ -1416,25 +1416,9 @@ toTuning::toTuning(QWidget *main, toConnection &connection) : toToolWidget(TuningTool, "tuning.html", main, connection, "toTuning") { -// if (TuningTool.config(CONF_OVERVIEW, "Undefined") == "Undefined") if (toConfigurationSingle::Instance().tuningFirstRun()) { - bool def = false; //QString def = QString::null; -// if (TOMessageBox::warning( -// toMainWidget(), -// tr("Enable all tuning statistics"), -// tr("Are you sure you want to enable all tuning features.\n" -// "This can put heavy strain on a database and unless you\n" -// "are the DBA you probably don't want this. Selecting\n" -// "no here will give you the option to enable or disable\n" -// "tabs individually as they are needed."), -// tr("Yes"), -// tr("&No"), -// QString::null, -// 1) == 0) -// { -// def = "Yes"; -// } + bool def = false; if (TOMessageBox::warning( toMainWidget(), tr("Enable all tuning statistics"), @@ -1450,9 +1434,7 @@ { def = true; } -// std::list<QString> tabs = TabList(); -// for (std::list<QString>::iterator i = tabs.begin();i != tabs.end();i++) -// TuningTool.setConfig(*i, def); + toConfigurationSingle::Instance().setTuningOverview(def); toConfigurationSingle::Instance().setTuningFileIO(def); toConfigurationSingle::Instance().setTuningWaits(def); @@ -1467,13 +1449,12 @@ QIcon(QPixmap(const_cast<const char**>(refresh_xpm))), tr("Refresh"), this, - SLOT(refresh(void))); + SLOT(refresh())); refreshAct->setShortcut(QKeySequence::Refresh); toolbar->addSeparator(); - toolbar->addWidget( - new QLabel(tr("Refresh") + " ", toolbar)); + toolbar->addWidget(new QLabel(tr("Refresh") + " ", toolbar)); Refresh = toRefreshCreate(toolbar, TO_TOOLBAR_WIDGET_NAME); connect(Refresh, SIGNAL(activated(const QString &)), this, SLOT(changeRefresh(const QString &))); @@ -1516,8 +1497,18 @@ toRefreshParse(timer()); connect(timer(), SIGNAL(timeout()), Overview, SLOT(refresh())); } - TOCATCH + TOCATCH; + ChartContainer = new QScrollArea(Tabs); + QWidget *chartWidget = new QWidget(ChartContainer); + ChartContainer->setWidget(chartWidget); + ChartContainer->setWidgetResizable(true); + chartWidget->setMinimumHeight(1800); + Tabs->addTab(ChartContainer, tr("&Charts")); + + QVBoxLayout *chartBox = new QVBoxLayout; + chartWidget->setLayout(chartBox); + QString unitStr = toConfigurationSingle::Instance().sizeUnit(); toQList unit; unit.insert(unit.end(), toQValue(toSizeDecode(unitStr))); @@ -1532,24 +1523,12 @@ parts.append(parts[2]); parts[2] = QString::fromLatin1("Charts"); } - std::map<QString, QWidget *>::iterator j = Charts.find(QString(CONF_CHART) + parts[2].toLatin1()); - QWidget *cchart; - if (j == Charts.end()) - { - cchart = new QWidget(Tabs); - cchart->setObjectName(QString(CONF_CHART) + parts[2]); - cchart->setLayout(new QGridLayout); - Charts[QString(CONF_CHART) + parts[2].toLatin1()] = cchart; - } - else - cchart = (*j).second; - QGridLayout *grid = dynamic_cast<QGridLayout *>(cchart->layout()); - if (parts[3].mid(1, 1) == QString::fromLatin1("B")) { - toResultBar *chart = new toResultBar(cchart); - grid->addWidget(chart); + toResultBar *chart = new toResultBar(chartWidget); + chartBox->addWidget(chart); + Charts.append(chart); chart->setTitle(parts[3].mid(3)); toQList par; if (parts[3].mid(2, 1) == QString::fromLatin1("B")) @@ -1573,11 +1552,11 @@ { toResultLine *chart; if (parts[3].mid(1, 1) == QString::fromLatin1("C")) - chart = new toTuningMiss(cchart); + chart = new toTuningMiss(chartWidget); else - chart = new toResultLine(cchart); - grid->addWidget(chart); - chart->setTitle(parts[3].mid(3)); + chart = new toResultLine(chartWidget); + chartBox->addWidget(chart); + Charts.append(chart); toQList par; if (parts[3].mid(2, 1) == QString::fromLatin1("B")) chart->setYPostfix(tr(" blocks/s")); @@ -1599,9 +1578,10 @@ } else if (parts[3].mid(1, 1) == QString::fromLatin1("P")) { - toResultPie *chart = new toResultPie(cchart); + toResultPie *chart = new toResultPie(chartWidget); chart->setTitle(parts[3].mid(3)); - grid->addWidget(chart); + chartBox->addWidget(chart); + Charts.append(chart); if (parts[3].mid(2, 1) == QString::fromLatin1("S")) { chart->query(toSQL::sql(*i), unit); @@ -1615,20 +1595,8 @@ } } - for (std::map<QString, QWidget *>::iterator k = Charts.begin(); - k != Charts.end(); - k++) - { - QScrollArea *sc = new QScrollArea(Tabs); - sc->setWidgetResizable(true); - sc->setWidget((*k).second); - // HACK: it's ugly but I cannot find any way how to setup it dynamically - (*k).second->setMinimumHeight(1800); - Tabs->addTab(sc, tr((*k).first.mid(strlen(CONF_CHART)).toAscii().constData())); - } - Waits = new toWaitEvents(this, "waits"); - Tabs->addTab(Waits, tr("Wait events")); + Tabs->addTab(Waits, tr("&Wait events")); FileIO = new toTuningFileIO(Tabs); connect(this, SIGNAL(connectionChange()), FileIO, SLOT(changeConnection())); @@ -1656,7 +1624,7 @@ ControlFiles = new toResultTableView(true, false, Tabs, "control"); ControlFiles->setSQL(SQLControlFiles); - Tabs->addTab(ControlFiles, tr("Control Files")); + Tabs->addTab(ControlFiles, tr("C&ontrol Files")); Options = new toResultTableView(true, false, Tabs, "options"); Options->setSQL(SQLOptions); @@ -1675,10 +1643,6 @@ connect(toMainWidget()->workspace(), SIGNAL(subWindowActivated(QMdiSubWindow *)), this, SLOT(windowActivated(QMdiSubWindow *))); -// std::list<QString> tabs = TabList(); -// for (std::list<QString>::iterator i = tabs.begin();i != tabs.end();i++) -// if (TuningTool.config(*i, "").isEmpty()) -// enableTab(*i, false); if (!toConfigurationSingle::Instance().tuningOverview()) enableTab(CONF_OVERVIEW, false); if (!toConfigurationSingle::Instance().tuningFileIO()) @@ -1706,9 +1670,9 @@ { widget = Waits; } - else if (Charts.find(CONF_CHART + name) != Charts.end()) + else if (name == CONF_CHART) { - widget = Charts[CONF_CHART + name]; + widget = ChartContainer; } return widget; } @@ -1735,10 +1699,9 @@ if (!act) return; - QString text(act->text().toAscii()); - QWidget *widget = tabWidget(text); + QWidget *widget = tabWidget(act->text()); if (widget) - enableTab(text, !Tabs->isTabEnabled(Tabs->indexOf(widget))); + enableTab(act->text(), !Tabs->isTabEnabled(Tabs->indexOf(widget))); } void toTuning::enableTab(const QString &name, bool enable) @@ -1750,15 +1713,15 @@ Overview->start(); else Overview->stop(); + + toConfigurationSingle::Instance().setTuningOverview(enable); widget = Overview; } - else if (Charts.find(QString(CONF_CHART) + name) != Charts.end()) + else if (name == CONF_CHART) { - QWidget *chart = Charts[QString(CONF_CHART) + name]; - QObjectList childs = chart->children(); - for (int i = 0;i < childs.count();i++) + Q_FOREACH(QWidget *child, Charts) { - toResultLine *line = dynamic_cast<toResultLine *>(childs.at(i)); + toResultLine *line = dynamic_cast<toResultLine *>(child); if (line) { if (enable) @@ -1766,7 +1729,7 @@ else line->stop(); } - toResultBar *bar = dynamic_cast<toResultBar *>(childs.at(i)); + toResultBar *bar = dynamic_cast<toResultBar *>(child); if (bar) { if (enable) @@ -1774,7 +1737,7 @@ else bar->stop(); } - toResultPie *pie = dynamic_cast<toResultPie *>(childs.at(i)); + toResultPie *pie = dynamic_cast<toResultPie *>(child); if (pie) { if (enable) @@ -1783,7 +1746,9 @@ pie->stop(); } } - widget = chart; + + toConfigurationSingle::Instance().setTuningCharts(enable); + widget = ChartContainer; } else if (name == CONF_WAITS) { @@ -1791,6 +1756,8 @@ Waits->start(); else Waits->stop(); + + toConfigurationSingle::Instance().setTuningWaits(enable); widget = Waits; } else if (name == CONF_FILEIO) @@ -1799,10 +1766,35 @@ FileIO->start(); else FileIO->stop(); + + toConfigurationSingle::Instance().setTuningFileIO(enable); widget = FileIO; } + if (widget) - Tabs->setTabEnabled(Tabs->indexOf(widget), enable); + { + int ind = Tabs->indexOf(widget); + if(ind < 0) + return; + + if(enable) + Tabs->setCurrentIndex(ind); + else + { + // qtabwidget is enabling some tabs when we disable one, + // so i'm going to pick the next tab to show here + for(int pos = 0; pos < Tabs->count(); pos++) + { + if(pos != ind && Tabs->isTabEnabled(pos)) + { + Tabs->setCurrentIndex(pos); + break; + } + } + } + + Tabs->setTabEnabled(ind, enable); + } } void toTuning::changeTab(int index) Modified: trunk/tora/src/totuning.h =================================================================== --- trunk/tora/src/totuning.h 2008-09-21 18:03:26 UTC (rev 3031) +++ trunk/tora/src/totuning.h 2008-09-21 19:48:12 UTC (rev 3032) @@ -56,6 +56,7 @@ #include <QResizeEvent> #include <QLabel> #include <QScrollArea> +#include <QList> class QAction; class QMenu; @@ -172,23 +173,24 @@ { Q_OBJECT - QTabWidget *Tabs; - toListView *Indicators; - toResultParam *Parameters; + QTabWidget *Tabs; + toListView *Indicators; + toResultParam *Parameters; toResultTableView *Options; - toResultLock *BlockingLocks; - toResultItem *Licenses; - toResultStats *Statistics; + toResultLock *BlockingLocks; + toResultItem *Licenses; + toResultStats *Statistics; toResultTableView *LibraryCache; toResultTableView *ControlFiles; - toWaitEvents *Waits; + toWaitEvents *Waits; + QScrollArea *ChartContainer; - std::map<QString, QWidget *> Charts; + QList<QWidget *> Charts; - QComboBox *Refresh; + QComboBox *Refresh; toTuningOverview *Overview; - toTuningFileIO *FileIO; - QWidget *LastTab; + toTuningFileIO *FileIO; + QWidget *LastTab; QMenu *ToolMenu; QAction *refreshAct; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-09-21 20:33:06
|
Revision: 3033 http://tora.svn.sourceforge.net/tora/?rev=3033&view=rev Author: mrjohnson0 Date: 2008-09-21 20:33:04 +0000 (Sun, 21 Sep 2008) Log Message: ----------- sets the default max recent files to 25, it has it's own menu so might as well save more of them. fixes several bugs showing the recent file menu, reverses order so most recent is on top, adds some accelerators Modified Paths: -------------- trunk/tora/src/toconf.h trunk/tora/src/tomain.cpp Modified: trunk/tora/src/toconf.h =================================================================== --- trunk/tora/src/toconf.h 2008-09-21 19:48:12 UTC (rev 3032) +++ trunk/tora/src/toconf.h 2008-09-21 20:33:04 UTC (rev 3033) @@ -131,7 +131,7 @@ #define CONF_EXTENSIONS "Extensions" #define CONF_RECENT_FILES "RecentFiles" #define CONF_RECENT_MAX "RecentMax" -#define DEFAULT_RECENT_MAX 5 +#define DEFAULT_RECENT_MAX 25 #define CONF_LAST_DIR "LastDir" #define CONF_LOCALE "Locale" #define CONF_KEEP_ALIVE "KeepAlive" Modified: trunk/tora/src/tomain.cpp =================================================================== --- trunk/tora/src/tomain.cpp 2008-09-21 19:48:12 UTC (rev 3032) +++ trunk/tora/src/tomain.cpp 2008-09-21 20:33:04 UTC (rev 3033) @@ -702,54 +702,34 @@ void toMain::updateRecent() { -// static bool first = true; -// int num = toConfigurationSingle::Instance().recentFiles(); -// -// recentMenu->clear(); -// -// if (num > 0) { -// if(first) { -// fileMenu->addSeparator(); -// first = false; -// } -// -// for(int i = 0; i < num; i++) { -// QString file = toConfigurationSingle::Instance().globalConfig( -// QString(CONF_RECENT_FILES ":") + -// QString::number(i), ""); -// -// if(!file.isEmpty()) { -// QFileInfo fi(file); -// -// // store file name in tooltip. this is used later to -// // open the file, and is handy to know what file tora -// // is opening. -// -// QAction *r = new QAction(fi.fileName(), this); -// r->setToolTip(file); -// recentMenu->addAction(r); -// } -// } -// } QStringList files(toConfigurationSingle::Instance().recentFiles()); recentMenu->clear(); - if (files.count() > 0) - recentMenu->addSeparator(); - foreach (QString s, files) + + int index = 1; + QList<QString>::iterator i = files.end(); + while(i != files.begin()) { - QFileInfo fi(s); + i--; + + QFileInfo fi(*i); if (!fi.exists()) { - files.removeAt(files.indexOf(s)); + files.removeAt(files.indexOf(*i)); continue; } + // store file name in tooltip. this is used later to // open the file, and is handy to know what file tora // is opening. - QAction *r = new QAction(fi.fileName(), this); - r->setToolTip(s); + QString caption = fi.fileName(); + if(index < 10) + caption = "&" + QString::number(index++) + " " + caption; + + QAction *r = new QAction(caption, this); + r->setToolTip(*i); recentMenu->addAction(r); } + toConfigurationSingle::Instance().setRecentFiles(files); } @@ -759,33 +739,11 @@ QStringList files(toConfigurationSingle::Instance().recentFiles()); int maxnum = toConfigurationSingle::Instance().recentMax(); - if (files.contains(file)) - return; - if (files.count() > maxnum) + files.removeAll(file); + if (files.count() >= maxnum) files.removeAt(0); files.append(file); toConfigurationSingle::Instance().setRecentFiles(files); -// std::list<QString> files; -// for (int j = 0;j < num;j++) -// { -// QString t = toConfigurationSingle::Instance().globalConfig( -// QString(CONF_RECENT_FILES ":") + QString::number(j), ""); -// if (t != file) -// toPush(files, t); -// } -// toUnShift(files, file); - -// num = 0; -// for (std::list<QString>::iterator i = files.begin();i != files.end();i++) -// { -// toConfigurationSingle::Instance().globalSetConfig( -// QString(CONF_RECENT_FILES ":") + QString::number(num), *i); -// num++; -// if (num >= maxnum) -// break; -// } -// toConfigurationSingle::Instance().globalSetConfig(CONF_RECENT_FILES, QString::number(num)); -// toConfigurationSingle::Instance().saveConfig(); } void toMain::updateWindowsMenu(void) @@ -816,7 +774,7 @@ QString caption = (*it)->windowTitle().trimmed(); if (index < 9) - caption = "&" + QString::number(index + 1) + " " + caption; + caption = "&" + QString::number(index + 1) + " " + caption; QAction *action = new QAction(caption, (*it)); if (index < 9) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <mrj...@us...> - 2008-09-22 00:54:37
|
Revision: 3035 http://tora.svn.sourceforge.net/tora/?rev=3035&view=rev Author: mrjohnson0 Date: 2008-09-22 00:54:27 +0000 (Mon, 22 Sep 2008) Log Message: ----------- fixes setting of modified sql, saving to file Modified Paths: -------------- trunk/tora/src/tosqledit.cpp trunk/tora/src/tosqledit.h Modified: trunk/tora/src/tosqledit.cpp =================================================================== --- trunk/tora/src/tosqledit.cpp 2008-09-22 00:53:55 UTC (rev 3034) +++ trunk/tora/src/tosqledit.cpp 2008-09-22 00:54:27 UTC (rev 3035) @@ -60,7 +60,6 @@ #include <qmessagebox.h> #include <qsplitter.h> #include <qstring.h> -#include <qtoolbar.h> #include <qtoolbutton.h> #include <QMdiArea> @@ -186,17 +185,17 @@ SLOT(saveSQL())); toolbar->addSeparator(); - CommitButton = new QToolButton(toolbar); - CommitButton->setText(tr("Save this entry in the dictionary")); - CommitButton->setIcon(QIcon(commit_xpm)); - connect(CommitButton, SLOT(triggered()), this, SLOT(commitChanges())); - toolbar->addWidget(CommitButton); + CommitButton = toolbar->addAction( + QIcon(commit_xpm), + tr("Save this entry in the dictionary"), + this, + SLOT(commitChanges())); - TrashButton = new QToolButton(toolbar); - TrashButton->setIcon(QIcon(trash_xpm)); - TrashButton->setText(tr("Delete this version from the SQL dictionary")); - connect(CommitButton, SLOT(triggered()), this, SLOT(deleteVersion())); - toolbar->addWidget(TrashButton); + TrashButton = toolbar->addAction( + QIcon(trash_xpm), + tr("Delete this version from the SQL dictionary"), + this, + SLOT(deleteVersion())); toolbar->addAction(QIcon(add_xpm), tr("Start new SQL definition"), @@ -303,6 +302,9 @@ void toSQLEdit::saveSQL(void) { + // must commit changes first for sql to be present in dictionary. + commitChanges(); + QString filename = toSaveFilename(QString::null, QString::null, this); if (!filename.isEmpty()) { Modified: trunk/tora/src/tosqledit.h =================================================================== --- trunk/tora/src/tosqledit.h 2008-09-22 00:53:55 UTC (rev 3034) +++ trunk/tora/src/tosqledit.h 2008-09-22 00:54:27 UTC (rev 3035) @@ -51,7 +51,7 @@ class QComboBox; class QLineEdit; class toTreeWidget; -class QToolButton; +class QAction; class toMarkedText; class toWorksheet; @@ -64,8 +64,8 @@ toMarkedText *Description; QComboBox *Version; toWorksheet *Editor; - QToolButton *TrashButton; - QToolButton *CommitButton; + QAction *TrashButton; + QAction *CommitButton; QString LastVersion; QString Filename; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-10-01 13:33:46
|
Revision: 3041 http://tora.svn.sourceforge.net/tora/?rev=3041&view=rev Author: subik Date: 2008-10-01 13:33:23 +0000 (Wed, 01 Oct 2008) Log Message: ----------- fixed {null} highlighting settings and its change in table model Modified Paths: -------------- trunk/tora/src/main.cpp trunk/tora/src/toglobalsetting.cpp trunk/tora/src/toresultmodel.cpp trunk/tora/src/utils.cpp Modified: trunk/tora/src/main.cpp =================================================================== --- trunk/tora/src/main.cpp 2008-10-01 02:30:40 UTC (rev 3040) +++ trunk/tora/src/main.cpp 2008-10-01 13:33:23 UTC (rev 3041) @@ -93,7 +93,7 @@ #endif } -void toUpdateIndicateEmpty(void); +// void toUpdateIndicateEmpty(void); int main(int argc, char **argv) { @@ -272,7 +272,7 @@ toMarkedText::setDefaultTabWidth(toConfigurationSingle::Instance().tabStop()); toMarkedText::setDefaultTabSpaces(toConfigurationSingle::Instance().tabSpaces()); - toUpdateIndicateEmpty(); +// toUpdateIndicateEmpty(); new toMain; Modified: trunk/tora/src/toglobalsetting.cpp =================================================================== --- trunk/tora/src/toglobalsetting.cpp 2008-10-01 02:30:40 UTC (rev 3040) +++ trunk/tora/src/toglobalsetting.cpp 2008-10-01 13:33:23 UTC (rev 3041) @@ -298,9 +298,12 @@ // AutoLong->setChecked(val); // MoveAfter->setValue(val); // KeepAlive->setChecked(toConfigurationSingle::Instance().keepAlive()); + + connect(IndicateEmpty, SIGNAL(clicked(bool)), + IndicateEmptyColor, SLOT(setEnabled(bool))); } -void toUpdateIndicateEmpty(void); +// void toUpdateIndicateEmpty(void); void toDatabaseSetting::saveSetting(void) { @@ -340,7 +343,7 @@ toConfigurationSingle::Instance().setNumberDecimals(Decimals->value()); toQValue::setNumberFormat(NumberFormat->currentIndex(), Decimals->value()); - toUpdateIndicateEmpty(); +// toUpdateIndicateEmpty(); } toToolSetting::toToolSetting(QWidget *parent, const char *name, Qt::WFlags fl) Modified: trunk/tora/src/toresultmodel.cpp =================================================================== --- trunk/tora/src/toresultmodel.cpp 2008-10-01 02:30:40 UTC (rev 3040) +++ trunk/tora/src/toresultmodel.cpp 2008-10-01 13:33:23 UTC (rev 3041) @@ -499,8 +499,8 @@ return data.toQVariant(); if (role == Qt::BackgroundRole) { - if (data.isNull()) - return QVariant(QColor("#f2ffbc")); + if (data.isNull() && toConfigurationSingle::Instance().indicateEmpty()) + return QVariant(QColor(toConfigurationSingle::Instance().indicateEmptyColor())); return QVariant(); } if (role == Qt::TextAlignmentRole) Modified: trunk/tora/src/utils.cpp =================================================================== --- trunk/tora/src/utils.cpp 2008-10-01 02:30:40 UTC (rev 3040) +++ trunk/tora/src/utils.cpp 2008-10-01 13:33:23 UTC (rev 3041) @@ -1052,17 +1052,17 @@ return false; } -static bool IndicateEmpty = false; +// static bool IndicateEmpty = false; +// +// void toUpdateIndicateEmpty(void) +// { +// IndicateEmpty = toConfigurationSingle::Instance().indicateEmpty(); +// } -void toUpdateIndicateEmpty(void) -{ - IndicateEmpty = toConfigurationSingle::Instance().indicateEmpty(); -} - toQValue toNull(const toQValue &str) { - if (IndicateEmpty) + if (!toConfigurationSingle::Instance().indicateEmpty()) { if (str.isNull()) return str; @@ -1076,7 +1076,7 @@ toQValue toUnnull(const toQValue &str) { - if (IndicateEmpty) + if (!toConfigurationSingle::Instance().indicateEmpty()) { if (QString(str) == QString::fromLatin1("''")) return QString::fromLatin1(""); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-10-10 14:04:48
|
Revision: 3057 http://tora.svn.sourceforge.net/tora/?rev=3057&view=rev Author: subik Date: 2008-10-10 14:04:30 +0000 (Fri, 10 Oct 2008) Log Message: ----------- fixed a bug with multiple error messages on one line (plsql editor tool) Modified Paths: -------------- trunk/tora/src/toplsqltext.cpp trunk/tora/src/toplsqltext.h Modified: trunk/tora/src/toplsqltext.cpp =================================================================== --- trunk/tora/src/toplsqltext.cpp 2008-10-09 13:10:28 UTC (rev 3056) +++ trunk/tora/src/toplsqltext.cpp 2008-10-10 14:04:30 UTC (rev 3057) @@ -285,8 +285,8 @@ try { toQuery errors(conn, SQLReadErrors, Schema, Object, Type); - QMap<int, QString> Errors; - QMap<int, QString> Warnings; + QMultiMap<int, QString> Errors; + QMultiMap<int, QString> Warnings; int line; QString errType; @@ -295,9 +295,9 @@ errType = errors.readValue(); // "ERROR"/"WARNING" etc. line = errors.readValue().toInt(); if (errType == PLSQL_ERROR) - Errors[line] = errors.readValue(); + Errors.insert(line, errors.readValue()); else // "WARNING" - Warnings[line] = errors.readValue(); + Warnings.insert(line, errors.readValue()); } setErrors(Errors); @@ -486,9 +486,9 @@ layout()->addWidget(m_contentSplitter); connect(m_editor, - SIGNAL(errorsChanged(const QString &, const QMap<int,QString>&)), + SIGNAL(errorsChanged(const QString &, const QMultiMap<int,QString>&)), this, - SLOT(applyResult(const QString &, const QMap<int,QString>&))); + SLOT(applyResult(const QString &, const QMultiMap<int,QString>&))); connect(m_result, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, @@ -514,7 +514,7 @@ } void toPLSQLWidget::applyResult(const QString & type, - const QMap<int,QString> & values) + const QMultiMap<int,QString> & values) { QTreeWidgetItem * item = (type == PLSQL_ERROR) ? m_errItem : m_warnItem; Modified: trunk/tora/src/toplsqltext.h =================================================================== --- trunk/tora/src/toplsqltext.h 2008-10-09 13:10:28 UTC (rev 3056) +++ trunk/tora/src/toplsqltext.h 2008-10-10 14:04:30 UTC (rev 3057) @@ -97,7 +97,7 @@ bool compile(CompilationType t); signals: - void errorsChanged(const QString & type, const QMap<int,QString> & values); + void errorsChanged(const QString & type, const QMultiMap<int,QString> & values); void warningsChanged(const QMap<int,QString> values); void contentChanged(); @@ -137,7 +137,7 @@ private slots: void goToError(QTreeWidgetItem *, QTreeWidgetItem *); - void applyResult(const QString &, const QMap<int,QString>&); + void applyResult(const QString &, const QMultiMap<int,QString>&); void updateContent() { updateContent(m_editor); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <su...@us...> - 2008-10-14 09:02:37
|
Revision: 3059 http://tora.svn.sourceforge.net/tora/?rev=3059&view=rev Author: subik Date: 2008-10-14 09:01:33 +0000 (Tue, 14 Oct 2008) Log Message: ----------- improved/fixed Goto Line dialog in some KDE4 themes + standardized key shortcut for it implemented Modified Paths: -------------- trunk/tora/src/CMakeLists.txt trunk/tora/src/toeditextensions.cpp trunk/tora/src/toeditextensions.h trunk/tora/src/tomain.cpp Modified: trunk/tora/src/CMakeLists.txt =================================================================== --- trunk/tora/src/CMakeLists.txt 2008-10-13 11:21:47 UTC (rev 3058) +++ trunk/tora/src/CMakeLists.txt 2008-10-14 09:01:33 UTC (rev 3059) @@ -30,7 +30,7 @@ todebugchangeui.ui todebugwatch.ui todroptablespaceui.ui - toeditextensiongotoui.ui +# toeditextensiongotoui.ui toeditextensionsetupui.ui toglobalsettingui.ui tohelpaddfileui.ui Modified: trunk/tora/src/toeditextensions.cpp =================================================================== --- trunk/tora/src/toeditextensions.cpp 2008-10-13 11:21:47 UTC (rev 3058) +++ trunk/tora/src/toeditextensions.cpp 2008-10-14 09:01:33 UTC (rev 3059) @@ -53,6 +53,7 @@ #include <qmenubar.h> #include <qspinbox.h> #include <qtoolbutton.h> +#include <QInputDialog> #include <QPixmap> #include <QMenu> @@ -156,9 +157,23 @@ { if (Current) { - toEditExtensionGoto dialog(Current); - if (dialog.exec()) - dialog.gotoLine(); +// toEditExtensionGoto dialog(Current); +// if (dialog.exec()) +// dialog.gotoLine(); + bool ok; + int curline, curcol; + Current->getCursorPosition(&curline, &curcol); + int line = QInputDialog::getInteger( + Current, + tr("Go to line"), + tr("Line Number"), + curline, + 1, + Current->lines(), + 1, + &ok); + if (ok) + Current->setCursorPosition(line-1, 0); } } @@ -661,6 +676,7 @@ "Goto Line"), &EditExtensions, SLOT(gotoLine())); + GotoLine->setShortcut(Qt::CTRL + Qt::Key_G); AutoComplete = edit->addAction( qApp->translate("toEditExtensionTool", @@ -705,24 +721,24 @@ static toEditExtensionTool EditExtensionTool; -toEditExtensionGoto::toEditExtensionGoto(toMarkedText *editor) - : QDialog(editor), - Editor(editor) -{ +// toEditExtensionGoto::toEditExtensionGoto(toMarkedText *editor) +// : QDialog(editor), +// Editor(editor) +// { +// +// setupUi(this); +// +// toHelp::connectDialog(this); +// Line->setMaximum(Editor->lines()); +// Line->setMinimum(1); +// { +// int curline, curcol; +// Editor->getCursorPosition(&curline, &curcol); +// Line->setValue(curline); +// } +// } - setupUi(this); - - toHelp::connectDialog(this); - Line->setMaximum(Editor->lines()); - Line->setMinimum(1); - { - int curline, curcol; - Editor->getCursorPosition(&curline, &curcol); - Line->setValue(curline); - } -} - -void toEditExtensionGoto::gotoLine() -{ - Editor->setCursorPosition(Line->value() - 1, 0); -} +// void toEditExtensionGoto::gotoLine() +// { +// Editor->setCursorPosition(Line->value() - 1, 0); +// } Modified: trunk/tora/src/toeditextensions.h =================================================================== --- trunk/tora/src/toeditextensions.h 2008-10-13 11:21:47 UTC (rev 3058) +++ trunk/tora/src/toeditextensions.h 2008-10-14 09:01:33 UTC (rev 3059) @@ -96,18 +96,18 @@ }; -class toEditExtensionGoto : public QDialog, public Ui::toEditExtensionGotoUI -{ - Q_OBJECT; +// class toEditExtensionGoto : public QDialog, public Ui::toEditExtensionGotoUI +// { +// Q_OBJECT; +// +// toMarkedText *Editor; +// +// public: +// toEditExtensionGoto(toMarkedText *editor); +// void gotoLine(); +// }; - toMarkedText *Editor; -public: - toEditExtensionGoto(toMarkedText *editor); - void gotoLine(); -}; - - class toEditExtensionSetup : public QWidget, public Ui::toEditExtensionSetupUI, public toSettingTab Modified: trunk/tora/src/tomain.cpp =================================================================== --- trunk/tora/src/tomain.cpp 2008-10-13 11:21:47 UTC (rev 3058) +++ trunk/tora/src/tomain.cpp 2008-10-14 09:01:33 UTC (rev 3059) @@ -230,7 +230,7 @@ newConnAct = new QAction(QPixmap(const_cast<const char**>(connect_xpm)), tr("&New Connection..."), this); - newConnAct->setShortcut(Qt::CTRL + Qt::Key_G); +// newConnAct->setShortcut(Qt::CTRL + Qt::Key_G); newConnAct->setToolTip(tr("Create a new connection")); connect(newConnAct, SIGNAL(triggered()), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |