Menu
▾
▴
[Tora-cvs] SF.net SVN: tora: [2788] trunk/tora
|
From: <su...@us...> - 2008-05-22 12:11:01
|
Revision: 2788
http://tora.svn.sourceforge.net/tora/?rev=2788&view=rev
Author: subik
Date: 2008-05-22 05:10:22 -0700 (Thu, 22 May 2008)
Log Message:
-----------
Error warning dialogs aren't modal anymore.
Modified Paths:
--------------
trunk/tora/ISSUES
trunk/tora/src/CMakeLists.txt
trunk/tora/src/Makefile.am
trunk/tora/src/tomain.cpp
trunk/tora/src/tomain.h
trunk/tora/src/tomessageui.ui
Modified: trunk/tora/ISSUES
===================================================================
--- trunk/tora/ISSUES 2008-05-22 05:47:08 UTC (rev 2787)
+++ trunk/tora/ISSUES 2008-05-22 12:10:22 UTC (rev 2788)
@@ -33,16 +33,11 @@
- Create table/create index isn't working in the Schema Browser.
- MIGRATE extraction doesn't work (and I suppose it never did)
-[FIXED - is it suitable?] "Waiting..." shows up in right pane in schema browser until you click on a table name also stays up if no tables in schema.
-
When switching in schema browser from looking at columns of a table to a schema with no tables, the column list never gets
cleared. It stays as the column list from the original table.
">|" arrow on schema browser view just scrolls to bottom of display instead of reading all rows as it used to.
-Error warning dialogs are modal, and have to be closed in the right order. Ideally - would like to see the error popups
-be a single window, something in the style of the javascript error console in firefox perhaps?
-
MySQL: numerous crashes in schema browser - running under gdb hides a lot of these unfortunately... has been stable
Oracle: error "result should be 18 in segment attributes was 2" in toExtract on Script tab
@@ -110,3 +105,10 @@
the selected text to be pasted at the end of the entry area as if you
middle-clicked. Picture normal behavior of selecting it all to copy it, then
single clicking to unselect it and move to something else...
+
+[FIXED - is it suitable?] "Waiting..." shows up in right pane in schema browser
+until you click on a table name also stays up if no tables in schema.
+
+[RESOLVED - see toMessage class and its comments - I faced a real DoS flooding by this dialog today - Petr]
+Error warning dialogs are modal, and have to be closed in the right order. Ideally - would like to see the error popups
+be a single window, something in the style of the javascript error console in firefox perhaps?
\ No newline at end of file
Modified: trunk/tora/src/CMakeLists.txt
===================================================================
--- trunk/tora/src/CMakeLists.txt 2008-05-22 05:47:08 UTC (rev 2787)
+++ trunk/tora/src/CMakeLists.txt 2008-05-22 12:10:22 UTC (rev 2788)
@@ -115,6 +115,7 @@
# tomainwindow.kde.h
tomarkedtext.h
tomemoeditor.h
+ tomessage.h
# tomysqlkeywords.h
tonewconnection.h
# tonoblockquery.h
@@ -241,6 +242,7 @@
tomainwindow.cpp
tomarkedtext.cpp
tomemoeditor.cpp
+ tomessage.cpp
tonewconnection.cpp
tonoblockquery.cpp
#win only? toocistub.cpp
Modified: trunk/tora/src/Makefile.am
===================================================================
--- trunk/tora/src/Makefile.am 2008-05-22 05:47:08 UTC (rev 2787)
+++ trunk/tora/src/Makefile.am 2008-05-22 12:10:22 UTC (rev 2788)
@@ -78,6 +78,7 @@
tomain.cpp tomain.h \
tomarkedtext.cpp tomarkedtext.h \
tomemoeditor.cpp tomemoeditor.h \
+ tomessage.cpp tomessage.h \
tonewconnection.cpp tonewconnection.h \
tonoblockquery.cpp tonoblockquery.h \
toeventquery.cpp toeventquery.h \
@@ -292,6 +293,7 @@
moc_tomainwindow.cpp \
moc_tomarkedtext.cpp \
moc_tomemoeditor.cpp \
+ moc_tomessage.cpp \
moc_tonewconnection.cpp \
moc_tooutput.cpp \
moc_toparamget.cpp \
Modified: trunk/tora/src/tomain.cpp
===================================================================
--- trunk/tora/src/tomain.cpp 2008-05-22 05:47:08 UTC (rev 2787)
+++ trunk/tora/src/tomain.cpp 2008-05-22 12:10:22 UTC (rev 2788)
@@ -52,6 +52,7 @@
#include "tosearchreplace.h"
#include "totemplate.h"
#include "totool.h"
+#include "tomessage.h"
#include <qapplication.h>
#include <qcombobox.h>
@@ -103,6 +104,8 @@
Workspace = new QWorkspace(this);
setCentralWidget(Workspace);
+ Message = new toMessage(this);
+
// setup all QAction objects
createActions();
@@ -1715,12 +1718,7 @@
if (StatusMessages.size() < 1)
return;
- QDialog dialog;
- Ui::toMessageUI uidialog;
- uidialog.setupUi(&dialog);
- uidialog.Message->setReadOnly(true);
- uidialog.Message->setText(*(--StatusMessages.end()));
- dialog.exec();
+ Message->appendText(*(--StatusMessages.end()));
}
void toMain::toolWidgetAdded(toToolWidget *tool)
Modified: trunk/tora/src/tomain.h
===================================================================
--- trunk/tora/src/tomain.h 2008-05-22 05:47:08 UTC (rev 2787)
+++ trunk/tora/src/tomain.h 2008-05-22 12:10:22 UTC (rev 2788)
@@ -69,7 +69,9 @@
class toSearchReplace;
class toTool;
class toToolWidget;
+class toMessage;
+
/** This class defines the main window. Observe that this class will have different baseclass
* depending on if TOra is a Qt or KDE application. In the case of Qt this will be a
* QMainWindow descendant.
@@ -103,6 +105,11 @@
QString SQLEditor;
/**
+ * A reference to the error dialog.
+ */
+ toMessage * Message;
+
+ /**
* Status message storage for status bar
*/
std::list<QString> StatusMessages;
Modified: trunk/tora/src/tomessageui.ui
===================================================================
--- trunk/tora/src/tomessageui.ui 2008-05-22 05:47:08 UTC (rev 2787)
+++ trunk/tora/src/tomessageui.ui 2008-05-22 12:10:22 UTC (rev 2788)
@@ -12,7 +12,7 @@
<property name="windowTitle" >
<string>Warning message</string>
</property>
- <layout class="QGridLayout" >
+ <layout class="QGridLayout" name="gridLayout" >
<item row="0" column="0" >
<widget class="toMarkedText" native="1" name="Message" >
<property name="sizePolicy" >
@@ -29,7 +29,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons" >
- <set>QDialogButtonBox::Close</set>
+ <set>QDialogButtonBox::Close|QDialogButtonBox::Reset</set>
</property>
</widget>
</item>
@@ -43,22 +43,5 @@
</customwidget>
</customwidgets>
<resources/>
- <connections>
- <connection>
- <sender>buttonBox</sender>
- <signal>rejected()</signal>
- <receiver>toMessageUI</receiver>
- <slot>reject()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>380</x>
- <y>252</y>
- </hint>
- <hint type="destinationlabel" >
- <x>413</x>
- <y>254</y>
- </hint>
- </hints>
- </connection>
- </connections>
+ <connections/>
</ui>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|