From: <ibr...@us...> - 2013-09-16 16:44:46
|
Revision: 4838 http://sourceforge.net/p/tora/code/4838 Author: ibre5041 Date: 2013-09-16 16:44:43 +0000 (Mon, 16 Sep 2013) Log Message: ----------- Disable connection actions when there are no connections Modified Paths: -------------- trunk/tora/src/core/tomain.cpp Modified: trunk/tora/src/core/tomain.cpp =================================================================== --- trunk/tora/src/core/tomain.cpp 2013-09-16 16:43:41 UTC (rev 4837) +++ trunk/tora/src/core/tomain.cpp 2013-09-16 16:44:43 UTC (rev 4838) @@ -1014,16 +1014,27 @@ // now, loop through tools and enable/disable try { - toConnection &conn = toConnectionRegistrySing::Instance().currentConnection(); - - commitAct->setEnabled(conn.needCommit()); - rollbackAct->setEnabled(conn.needCommit()); stopAct->setEnabled(false); closeConn->setEnabled(enabled); refreshAct->setEnabled(enabled); openAct->setEnabled(enabled); recentMenu->setEnabled(enabled); + // Handle situation when there are no connections open + if(toConnectionRegistrySing::Instance().isEmpty()) + { + for (ToolsRegistrySing::ObjectType::iterator i = ToolsRegistrySing::Instance().begin(); i != ToolsRegistrySing::Instance().end(); ++i) + { + toTool *pTool = i.value(); + pTool->enableAction(false); + } + return; + } + + toConnection &conn = toConnectionRegistrySing::Instance().currentConnection(); + commitAct->setEnabled(conn.needCommit()); + rollbackAct->setEnabled(conn.needCommit()); + for (ToolsRegistrySing::ObjectType::iterator i = ToolsRegistrySing::Instance().begin(); i != ToolsRegistrySing::Instance().end(); ++i) { toTool *pTool = i.value(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2013-10-15 23:36:15
|
Revision: 4878 http://sourceforge.net/p/tora/code/4878 Author: ibre5041 Date: 2013-10-15 23:36:11 +0000 (Tue, 15 Oct 2013) Log Message: ----------- Modified Paths: -------------- trunk/tora/src/core/tomain.cpp Modified: trunk/tora/src/core/tomain.cpp =================================================================== --- trunk/tora/src/core/tomain.cpp 2013-10-15 22:47:55 UTC (rev 4877) +++ trunk/tora/src/core/tomain.cpp 2013-10-15 23:36:11 UTC (rev 4878) @@ -1243,7 +1243,7 @@ void toMain::slotActiveToolChaged(toToolWidget *tool) { - setNeedCommit(tool, tool->hasTransaction()); + setNeedCommit(tool, tool ? tool->hasTransaction() : false); } void toMain::checkCaching(void) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ibr...@us...> - 2013-11-06 14:11:02
|
Revision: 4925 http://sourceforge.net/p/tora/code/4925 Author: ibre5041 Date: 2013-11-06 14:10:57 +0000 (Wed, 06 Nov 2013) Log Message: ----------- Do not block UI when switching tabs and bg query is running TODO: implement non-blocking version of hasTransaction() Modified Paths: -------------- trunk/tora/src/core/tomain.cpp Modified: trunk/tora/src/core/tomain.cpp =================================================================== --- trunk/tora/src/core/tomain.cpp 2013-11-06 13:56:12 UTC (rev 4924) +++ trunk/tora/src/core/tomain.cpp 2013-11-06 14:10:57 UTC (rev 4925) @@ -1189,7 +1189,9 @@ void toMain::slotActiveToolChaged(toToolWidget *tool) { - setNeedCommit(tool, tool ? tool->hasTransaction() : false); + // NOTE: a call to hasTransaction gets blocked until bg query finishes + // TODO: implement non-blocking version of hasTransaction + //setNeedCommit(tool, tool ? tool->hasTransaction() : false); lastToolWidget = tool; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |