Menu
▾
▴
[Tora-cvs] SF.net SVN: tora:[4325] branches/tora-trotl/src
|
From: <ibr...@us...> - 2012-05-29 21:11:44
|
Revision: 4325
http://tora.svn.sourceforge.net/tora/?rev=4325&view=rev
Author: ibre5041
Date: 2012-05-29 21:11:38 +0000 (Tue, 29 May 2012)
Log Message:
-----------
Modified Paths:
--------------
branches/tora-trotl/src/CMakeLists.txt
branches/tora-trotl/src/tologger.h
branches/tora-trotl/src/toresultmodel.cpp
branches/tora-trotl/src/toresulttableview.cpp
branches/tora-trotl/src/trotl_test5.cpp
branches/tora-trotl/src/trotl_test5.h
Modified: branches/tora-trotl/src/CMakeLists.txt
===================================================================
--- branches/tora-trotl/src/CMakeLists.txt 2012-05-29 21:10:20 UTC (rev 4324)
+++ branches/tora-trotl/src/CMakeLists.txt 2012-05-29 21:11:38 UTC (rev 4325)
@@ -699,6 +699,7 @@
)
#SET_TARGET_PROPERTIES(trotl_test0 PROPERTIES COMPILE_FLAGS "-DTROTL_DLL")
TARGET_LINK_LIBRARIES(trotl_test0 ${TORA_LIBS} ${TORA_MOC_LIB})
+ADD_DEPENDENCIES(trotl_test0 revisiontag)
ADD_EXECUTABLE(trotl_test1 ${GUI_TYPE}
trotl_test1.cpp
@@ -708,6 +709,7 @@
)
#SET_TARGET_PROPERTIES(trotl_test1 PROPERTIES COMPILE_FLAGS "-DTROTL_DLL")
TARGET_LINK_LIBRARIES(trotl_test1 ${TORA_LIBS} ${TORA_MOC_LIB})
+ADD_DEPENDENCIES(trotl_test1 revisiontag)
# ADD_EXECUTABLE(trotl_test2 ${GUI_TYPE}
# trotl_test2.cpp
@@ -727,6 +729,7 @@
${TROTL_TEST3_MOC_SOURCES}
)
TARGET_LINK_LIBRARIES(trotl_test3 ${TORA_LIBS} ${TORA_MOC_LIB})
+ADD_DEPENDENCIES(trotl_test3 revisiontag)
QT4_WRAP_CPP(TROTL_TEST4_MOC_SOURCES "trotl_test4.h")
ADD_EXECUTABLE(trotl_test4 ${GUI_TYPE}
@@ -737,6 +740,7 @@
${TROTL_TEST4_MOC_SOURCES}
)
TARGET_LINK_LIBRARIES(trotl_test4 ${TORA_LIBS} ${TORA_MOC_LIB})
+ADD_DEPENDENCIES(trotl_test4 revisiontag)
QT4_WRAP_CPP(TROTL_TEST5_MOC_SOURCES "trotl_test5.h")
ADD_EXECUTABLE(trotl_test5 ${GUI_TYPE}
@@ -747,6 +751,7 @@
${TROTL_TEST5_MOC_SOURCES}
)
TARGET_LINK_LIBRARIES(trotl_test5 ${TORA_LIBS} ${TORA_MOC_LIB})
+ADD_DEPENDENCIES(trotl_test5 revisiontag)
# Install
IF (WIN32)
Modified: branches/tora-trotl/src/tologger.h
===================================================================
--- branches/tora-trotl/src/tologger.h 2012-05-29 21:10:20 UTC (rev 4324)
+++ branches/tora-trotl/src/tologger.h 2012-05-29 21:11:38 UTC (rev 4325)
@@ -19,11 +19,22 @@
#include <QString>
#include <boost/iostreams/device/null.hpp>
#include <boost/iostreams/stream.hpp>
+
using namespace boost;
using namespace boost::iostreams;
#define TLOG(lognumber, decorator, where) get_log(lognumber).ts<decorator>( where)
+#define DISABLE_LOG(lognumber) \
+ template<> \
+ inline thread_safe_log templ_get_log_ownthread(int_to_type<lognumber>*) \
+ { \
+ static s_null_sink nsink; \
+ static std::ostream out(&nsink); \
+ static internal_thread_safe_log_ownthread log( out ); \
+ return thread_safe_log( log); \
+ };
+
typedef Tdecorator<
TSLOG_TYPELIST_6(dashDecorator<4>,
tidDecorator<DEFAULT_THREAD_MANAGER>,
@@ -72,49 +83,15 @@
return thread_safe_log( log);
}
-// generic debug <0> - debugging(enabled)
-/*
-template<>
-inline thread_safe_log templ_get_log_ownthread(int_to_type<0>*)
-{
- static s_null_sink nsink;
- static std::ostream out(&nsink);
- static internal_thread_safe_log_ownthread log( out );
- return thread_safe_log( log);
-}
-*/
-// exceptions debug<1> - debugging(disabled)
-template<>
-inline thread_safe_log templ_get_log_ownthread(int_to_type<1>*)
-{
- static s_null_sink nsink;
- static std::ostream out(&nsink);
- static internal_thread_safe_log_ownthread log( out );
- return thread_safe_log( log);
-}
+DISABLE_LOG(0); // generic debug <0>
+DISABLE_LOG(1); // exceptions debug<1>
+DISABLE_LOG(2);
+DISABLE_LOG(3); // tonoblockquery<3> - debugging(disabled)
+DISABLE_LOG(4); // tonoblockquery<4> - data read(disabled)
-// tonoblockquery<3> - debugging(disabled)
-template<>
-inline thread_safe_log templ_get_log_ownthread(int_to_type<3>*)
-{
- static s_null_sink nsink;
- static std::ostream out(&nsink);
- static internal_thread_safe_log_ownthread log( out );
- return thread_safe_log( log);
-}
-// tonoblockquery<4> - data read(disabled)
-template<>
-inline thread_safe_log templ_get_log_ownthread(int_to_type<4>*)
-{
- static s_null_sink nsink;
- static std::ostream out(&nsink);
- static internal_thread_safe_log_ownthread log( out );
- return thread_safe_log( log);
-}
-
-/*
+/* use this if you want output into the file
thread_safe_log templ_get_log_ownthread<1>( int_to_type< 1> * = NULL )
{
static std::ofstream out( get_out_name< idxLog>( false).c_str() );
@@ -132,6 +109,11 @@
case 2: return templ_get_log_ownthread< 2>(NULL); // qDebug log
case 3: return templ_get_log_ownthread< 3>(NULL); // tonoblockquery log
case 4: return templ_get_log_ownthread< 4>(NULL); // data read log
+ case 5: return templ_get_log_ownthread< 5>(NULL); // not used yet
+ case 6: return templ_get_log_ownthread< 6>(NULL); // not used yet
+ case 7: return templ_get_log_ownthread< 7>(NULL); // not used yet
+ case 8: return templ_get_log_ownthread< 8>(NULL); // not used yet
+ case 9: return templ_get_log_ownthread< 9>(NULL); // not used yet
default:
assert( false);
return templ_get_log_ownthread< 0>(NULL);
Modified: branches/tora-trotl/src/toresultmodel.cpp
===================================================================
--- branches/tora-trotl/src/toresultmodel.cpp 2012-05-29 21:10:20 UTC (rev 4324)
+++ branches/tora-trotl/src/toresultmodel.cpp 2012-05-29 21:11:38 UTC (rev 4325)
@@ -60,7 +60,8 @@
First = true;
Editable = edit;
ReadAll = false;
-
+ SortedOnColumn = -1;
+
MaxRead = MaxNumber = toConfigurationSingle::Instance().maxNumber();
CurrRowKey = 1;
@@ -104,7 +105,8 @@
First = true;
Editable = false;
ReadAll = false;
-
+ SortedOnColumn = -1;
+
CurrRowKey = 1;
Query = 0;
Modified: branches/tora-trotl/src/toresulttableview.cpp
===================================================================
--- branches/tora-trotl/src/toresulttableview.cpp 2012-05-29 21:10:20 UTC (rev 4324)
+++ branches/tora-trotl/src/toresulttableview.cpp 2012-05-29 21:11:38 UTC (rev 4325)
@@ -119,6 +119,7 @@
Editable = editable;
ReadAll = false;
Filter = 0;
+ VisibleColumns = 0;
ReadableColumns = readable;
NumberColumn = numberColumn;
ColumnsResized = false;
@@ -342,7 +343,7 @@
void toResultTableView::resizeEvent(QResizeEvent *event)
{
- if(VisibleColumns == 1 && ReadableColumns)
+ if(ReadableColumns && VisibleColumns == 1)
setColumnWidth(1, viewport()->width());
QTableView::resizeEvent(event);
}
@@ -389,7 +390,7 @@
if (toConfigurationSingle::Instance().multiLineResults())
resizeRowsToContents();
- if (VisibleColumns == 1 && ReadableColumns)
+ if (ReadableColumns && VisibleColumns == 1)
setColumnWidth(1, viewport()->width());
}
Modified: branches/tora-trotl/src/trotl_test5.cpp
===================================================================
--- branches/tora-trotl/src/trotl_test5.cpp 2012-05-29 21:10:20 UTC (rev 4324)
+++ branches/tora-trotl/src/trotl_test5.cpp 2012-05-29 21:11:38 UTC (rev 4325)
@@ -84,7 +84,7 @@
m_describeAction = new QAction("&Describe", this);
- createDocklets(); // Must be called after Wokspace is initialized
+ //createDocklets(); // Must be called after Wokspace is initialized
this->setCentralWidget(splitter);
statusbar = new QStatusBar(this);
@@ -93,7 +93,7 @@
show();
- createDockbars();
+ //createDockbars();
oraCon = new toConnection(
QString("Oracle"),
@@ -112,9 +112,9 @@
i != ToolsRegistrySing::Instance().end();
++i)
{
- if(i.value()->name() == "SQL Editor")
+ //if(i.value()->name() == "SQL Editor")
//if(i.value()->name() == "Security Manager")
- //if(i.value()->name() == "Schema Browser")
+ if(i.value()->name() == "Schema Browser")
{
i.value()->customSetup();
i.value()->createWindow();
@@ -128,6 +128,7 @@
foreach(toDocklet *let, toDocklet::docklets())
addDockWidget(Qt::LeftDockWidgetArea, let);
}
+
void TrotlTest5Window::moveDocklet(toDocklet *let, Qt::DockWidgetArea area)
{
if(area == Qt::RightDockWidgetArea)
@@ -142,12 +143,14 @@
leftDockbar->addDocklet(let);
}
}
+
toDockbar* TrotlTest5Window::dockbar(toDocklet *let)
{
if(rightDockbar->contains(let))
return rightDockbar;
return leftDockbar;
}
+
void TrotlTest5Window::createDockbars()
{
leftDockbar = new toDockbar(Qt::LeftToolBarArea,
@@ -181,6 +184,15 @@
rightDockbar->restoreState(toConfigurationSingle::Instance().rightDockbarState());
}
+void TrotlTest5Window::showBusy() {
+ qApp->setOverrideCursor(Qt::WaitCursor);
+}
+
+
+void TrotlTest5Window::removeBusy() {
+ qApp->restoreOverrideCursor();
+}
+
int main(int argc, char **argv)
{
int p = 0;
Modified: branches/tora-trotl/src/trotl_test5.h
===================================================================
--- branches/tora-trotl/src/trotl_test5.h 2012-05-29 21:10:20 UTC (rev 4324)
+++ branches/tora-trotl/src/trotl_test5.h 2012-05-29 21:11:38 UTC (rev 4325)
@@ -125,6 +125,24 @@
toEditWidget* editWidget() { return NULL; };
void createDefault(void) {};
+
+public slots:
+ /**
+ * 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);
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|