Menu
▾
▴
[Tora-cvs] tora acinclude.m4,1.9,1.10 Makefile.mingw,1.8,1.9 NEWS,1.997,1.998 otlv4.h,1.26,1.27 todebug.cpp,1.134,1.135 tomarkedtext.cpp,1.70,1.71 tomarkedtext.h,1.49,1.50 tooracleconnection.cpp,1.99,1.100 toresultview.cpp,1.140,1.141
Update of /cvsroot/tora/tora In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17828 Modified Files: acinclude.m4 Makefile.mingw NEWS otlv4.h todebug.cpp tomarkedtext.cpp tomarkedtext.h tooracleconnection.cpp toresultview.cpp Log Message: Upgraded to otl 4.0.126 to obtain the error position in SQL statement Fixed copy from the menu and Ctrl+C Fix from Thomas Porschberg for building with Oracle Instant Client 10g Fix for bug 957911 Index: tooracleconnection.cpp =================================================================== RCS file: /cvsroot/tora/tora/tooracleconnection.cpp,v retrieving revision 1.99 retrieving revision 1.100 diff -C2 -d -r1.99 -r1.100 *** tooracleconnection.cpp 6 Jan 2006 15:08:49 -0000 1.99 --- tooracleconnection.cpp 20 Jan 2006 00:04:54 -0000 1.100 *************** *** 140,144 **** if (exc.code >= 0) { ! QString t = QString::fromUtf8((const char *)exc.stm_text, exc.code); ret.setOffset(t.length()); sql.insert(t.length(), QString::fromLatin1("<ERROR>")); --- 140,144 ---- if (exc.code >= 0) { ! QString t = QString::fromUtf8((const char *)exc.stm_text, exc.error_offset); ret.setOffset(t.length()); sql.insert(t.length(), QString::fromLatin1("<ERROR>")); Index: otlv4.h =================================================================== RCS file: /cvsroot/tora/tora/otlv4.h,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** otlv4.h 8 May 2005 18:50:28 -0000 1.26 --- otlv4.h 20 Jan 2006 00:04:54 -0000 1.27 *************** *** 1,5 **** // ============================================================== ! // Oracle, ODBC and DB2/CLI Template Library, Version 4.0.110, ! // Copyright (C) Sergei Kuchin, 1996,2005 // Author: Sergei Kuchin // This library is free software. Permission to use, copy, --- 1,5 ---- // ============================================================== ! // Oracle, ODBC and DB2/CLI Template Library, Version 4.0.126, ! // Copyright (C) Sergei Kuchin, 1996,2006 // Author: Sergei Kuchin [...49185 lines suppressed...] ! (str_->shell->adb->get_max_long_size())); ! break; #if defined(OTL_BIGINT) ! case otl_var_bigint: ! out_vars_arr_[i]=OTL_RCAST(unsigned char*,new OTL_BIGINT(0)); ! break; ! #endif ! } ! #if defined(OTL_STL) ! var_name2pos_map_[curr_var.name]=i; ! #endif ! #if defined(OTL_ACE) ! var_name2pos_map_.bind(curr_var.name,i); #endif } ! out_vars_constructed_=true; ! } ! }; Index: toresultview.cpp =================================================================== RCS file: /cvsroot/tora/tora/toresultview.cpp,v retrieving revision 1.140 retrieving revision 1.141 diff -C2 -d -r1.140 -r1.141 *** toresultview.cpp 21 Apr 2005 02:33:57 -0000 1.140 --- toresultview.cpp 20 Jan 2006 00:04:54 -0000 1.141 *************** *** 1179,1185 **** int csiz; if (resItem) ! csiz = resItem->text(i).length(); else if (chkItem) ! csiz = chkItem->text(i).length(); else csiz = item->text(i).length(); --- 1179,1185 ---- int csiz; if (resItem) ! csiz = resItem->allText(i).length(); else if (chkItem) ! csiz = chkItem->allText(i).length(); else csiz = item->text(i).length(); *************** *** 1310,1316 **** if (resItem) ! text = resItem->text(i); else if (chkItem) ! text = chkItem->text(i); else text = item->text(i); --- 1310,1316 ---- if (resItem) ! text = resItem->allText(i); else if (chkItem) ! text = chkItem->allText(i); else text = item->text(i); *************** *** 1350,1355 **** text.replace(QRegExp(">"), ">"); #endif ! line += text; line += QString::fromLatin1("</TD>"); break; --- 1350,1356 ---- text.replace(QRegExp(">"), ">"); #endif ! line += QString::fromLatin1("<PRE>"); line += text; + line += QString::fromLatin1("</PRE>"); line += QString::fromLatin1("</TD>"); break; Index: tomarkedtext.h =================================================================== RCS file: /cvsroot/tora/tora/tomarkedtext.h,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** tomarkedtext.h 31 Dec 2005 18:41:04 -0000 1.49 --- tomarkedtext.h 20 Jan 2006 00:04:54 -0000 1.50 *************** *** 294,297 **** --- 294,298 ---- private slots: void setTextChanged(); + void setCopyAvailable(bool yes); private: Index: acinclude.m4 =================================================================== RCS file: /cvsroot/tora/tora/acinclude.m4,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** acinclude.m4 12 Apr 2005 06:54:51 -0000 1.9 --- acinclude.m4 20 Jan 2006 00:04:54 -0000 1.10 *************** *** 219,222 **** --- 219,225 ---- break done + else + ora_ldflags="-L$oracle_user_lib" + ora_cflags="-I$oracle_user_inc" fi elif test "x$ORACLE_HOME" != "x"; then *************** *** 328,332 **** fi ! ora_cflags="$ora_cflags -DOTL_ORA${otl_ver} -DOTL_ORA_TIMESTAMP -DOTL_ANSI_CPP -DOTL_FUNC_THROW_SPEC_ON" # don't change flags for all targets, just export ORA variables. --- 331,335 ---- fi ! ora_cflags="$ora_cflags -DOTL_ORA${otl_ver} -DOTL_ORA_TIMESTAMP -DOTL_ANSI_CPP -DOTL_FUNC_THROW_SPEC_ON -DOTL_EXCEPTION_ENABLE_ERROR_OFFSET" # don't change flags for all targets, just export ORA variables. Index: tomarkedtext.cpp =================================================================== RCS file: /cvsroot/tora/tora/tomarkedtext.cpp,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** tomarkedtext.cpp 31 Dec 2005 18:41:04 -0000 1.70 --- tomarkedtext.cpp 20 Jan 2006 00:04:54 -0000 1.71 *************** *** 75,78 **** --- 75,79 ---- connect(this, SIGNAL(textChanged()), this, SLOT(setTextChanged())); + connect(this,SIGNAL(copyAvailable(bool)),this,SLOT(setCopyAvailable(bool))); QPalette pal = palette(); *************** *** 89,92 **** --- 90,97 ---- } + void toMarkedText::setCopyAvailable(bool yes){ + setEdit(); + } + void toMarkedText::setEdit(void) { Index: Makefile.mingw =================================================================== RCS file: /cvsroot/tora/tora/Makefile.mingw,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Makefile.mingw 15 Sep 2005 09:44:14 -0000 1.8 --- Makefile.mingw 20 Jan 2006 00:04:54 -0000 1.9 *************** *** 39,44 **** # Locations of OCI Dll and home, QT and QScintilla # paths below are just an example ! OCI_DLL=/c/Oracle9/bin/oci.dll ! OCI_HOME=/c/Oracle9/oci QTDIR=/c/qt-3 --- 39,44 ---- # Locations of OCI Dll and home, QT and QScintilla # paths below are just an example ! OCI_DLL=/c/oracle/ora81/bin/oci.dll ! OCI_HOME=/c/oracle/ora81/oci QTDIR=/c/qt-3 *************** *** 121,124 **** --- 121,125 ---- DEFINES+=-DWIN32 -D_WIN32 DEFINES+=-D_int64="long long" + DEFINES+=-DOTL_EXCEPTION_ENABLE_ERROR_OFFSET # Comment out this line if you want more output from compile *************** *** 129,136 **** # Additional flags to set when linking. ! LFLAGS_GLOB=-O3 # Additional flags set when compiling. ! CFLAGS_GLOB=-O3 -W -Wall -c -mthreads -w ############################################################################ --- 130,137 ---- # Additional flags to set when linking. ! LFLAGS_GLOB=-O2 # Additional flags set when compiling. ! CFLAGS_GLOB=-O2 -W -Wall -c -mthreads -w ############################################################################ Index: NEWS =================================================================== RCS file: /cvsroot/tora/tora/NEWS,v retrieving revision 1.997 retrieving revision 1.998 diff -C2 -d -r1.997 -r1.998 *** NEWS 11 Jan 2006 14:28:22 -0000 1.997 --- NEWS 20 Jan 2006 00:04:54 -0000 1.998 *************** *** 6,9 **** --- 6,13 ---- 2006-01-10: Applied patch for bug #1213388 for parsing of RETURN SELF AS RESULT 2006-01-11: Applied patch from Michael Kaes for status bar NULL msg behavior. + 2006-01-20: Upgraded to otl 4.0.126 to obtain the error position in SQL statement + 2006-01-20: Fixed copy from the menu and Ctrl+C + 2006-01-20: Fix from Thomas Porschberg for building with Oracle Instant Client 10g + 2006-01-20: Fix for bug 957911 1.3.19: Index: todebug.cpp =================================================================== RCS file: /cvsroot/tora/tora/todebug.cpp,v retrieving revision 1.134 retrieving revision 1.135 diff -C2 -d -r1.134 -r1.135 *** todebug.cpp 30 Dec 2005 21:43:53 -0000 1.134 --- todebug.cpp 20 Jan 2006 00:04:54 -0000 1.135 *************** *** 1870,1886 **** DebugTabs = new QTabWidget(splitter); DebugTabs->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum)); DebugTabs->hide(); ! ! #if 0 ! ! { ! QValueList<int> sizes = splitter->sizes(); ! sizes[0] += sizes[1] - 200; ! sizes[1] = 200; ! splitter->setSizes(sizes); ! } ! #endif ! splitter->setResizeMode(DebugTabs, QSplitter::KeepSize); QSplitter *objSplitter = new QSplitter(Vertical, hsplitter); --- 1870,1880 ---- DebugTabs = new QTabWidget(splitter); DebugTabs->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum)); + DebugTabs->setMinimumHeight(1); + QValueList<int> sizes = splitter->sizes(); + sizes[1] = 200; + splitter->setSizes(sizes); DebugTabs->hide(); ! //splitter->setResizeMode(DebugTabs, QSplitter::KeepSize); QSplitter *objSplitter = new QSplitter(Vertical, hsplitter); |