From: Shamus Hammons <jlhamm@acm.org>
Date: Wed, 3 Oct 2012 15:18:48 +0000 (-0500)
Subject: Added error messages to SQL Connection dialog.
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=schematic;a=commitdiff_plain;h=6b758d361f9183c0dd3a0993fbd351b1900000b9

Added error messages to SQL Connection dialog.
---

diff --git a/src/mainwin.cpp b/src/mainwin.cpp
index c360a4e..d453103 100644
--- a/src/mainwin.cpp
+++ b/src/mainwin.cpp
@@ -135,12 +135,14 @@ db.setPassword("xcdr");
 		db.setPassword(dbPassword);
 		ok = db.open();
 
-//printf("Error: %s\n", db.lastError().databaseText().toAscii().data());
-//printf("Error: %s\n", db.lastError().driverText().toAscii().data());
-
 		// If unsuccessful, run the SQL settings/test dialog
 		if (!ok)
 		{
+//printf("Error: %s\n", db.lastError().databaseText().toAscii().data());
+//printf("Error: %s\n", db.lastError().driverText().toAscii().data());
+			sqlSettings.error1->setText(db.lastError().databaseText());
+			sqlSettings.error2->setText(db.lastError().driverText());
+
 			if (sqlSettings.exec())
 			{
 				// User thinks this will work (hit OK button), so prime the variables
diff --git a/src/sqlsettingsdialog.cpp b/src/sqlsettingsdialog.cpp
index 0decb03..6a9eeca 100644
--- a/src/sqlsettingsdialog.cpp
+++ b/src/sqlsettingsdialog.cpp
@@ -19,12 +19,16 @@ SQLSettingsDialog::SQLSettingsDialog(QWidget * parent/*= 0*/): QDialog(parent),
 	edit2(new QLineEdit()),
 	edit3(new QLineEdit()),
 	edit4(new QLineEdit()),
-	edit5(new QLineEdit())
+	edit5(new QLineEdit()),
+	error1(new QLabel()),
+	error2(new QLabel())
 {
 	connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
 	connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
 
 	edit5->setEchoMode(QLineEdit::Password);
+	error1->setWordWrap(true);
+	error2->setWordWrap(true);
 
 	QFormLayout * formLayout = new QFormLayout;
 	formLayout->addRow(tr("&Database Driver:"), edit1);
@@ -35,6 +39,8 @@ SQLSettingsDialog::SQLSettingsDialog(QWidget * parent/*= 0*/): QDialog(parent),
 
 	QVBoxLayout * mainLayout = new QVBoxLayout;
 	mainLayout->addLayout(formLayout);
+	mainLayout->addWidget(error1);
+	mainLayout->addWidget(error2);
 	mainLayout->addWidget(buttonBox);
 	setLayout(mainLayout);
 
diff --git a/src/sqlsettingsdialog.h b/src/sqlsettingsdialog.h
index e72a1ee..bb4e46d 100644
--- a/src/sqlsettingsdialog.h
+++ b/src/sqlsettingsdialog.h
@@ -22,6 +22,8 @@ class SQLSettingsDialog: public QDialog
 		QLineEdit * edit3;
 		QLineEdit * edit4;
 		QLineEdit * edit5;
+		QLabel * error1;
+		QLabel * error2;
 };
 
 #endif	// __SQLSETTINGSDIALOG_H__