Merge branch '0.6.0'

uglide · uglide · commit 00e967a1b041 · 2013-11-05T12:28:27.000+02:00
diff --git a/redis-desktop-manager/forms/connection.ui b/redis-desktop-manager/forms/connection.ui
@@ -98,7 +98,7 @@
     </rect>
    </property>
    <property name="currentIndex">
-    <number>0</number>
+    <number>1</number>
    </property>
    <widget class="QWidget" name="mainTab">
     <attribute name="title">
@@ -122,8 +122,11 @@
       </property>
       <item row="2" column="2">
        <widget class="QSpinBox" name="portSpinBox">
+        <property name="minimum">
+         <number>1</number>
+        </property>
         <property name="maximum">
-         <number>100000</number>
+         <number>65535</number>
         </property>
         <property name="value">
          <number>6379</number>
@@ -249,7 +252,7 @@
          <number>1</number>
         </property>
         <property name="maximum">
-         <number>10000</number>
+         <number>65535</number>
         </property>
         <property name="value">
          <number>22</number>
diff --git a/redis-desktop-manager/include/redis/ConsoleConnectionWrapper.h b/redis-desktop-manager/include/redis/ConsoleConnectionWrapper.h
@@ -1,24 +1,28 @@
 #pragma once
 
 #include <QObject>
+#include "RedisConnectionConfig.h"
 
-class RedisConnectionConfig;
 class RedisConnectionAbstract;
-class consoleTab;
 
 class ConsoleConnectionWrapper : public QObject
 {
 	Q_OBJECT
 
 public:
-	ConsoleConnectionWrapper(RedisConnectionConfig &, consoleTab &);	
+	ConsoleConnectionWrapper(RedisConnectionConfig &);	
 
 	public slots:
+		void init();
 		void executeCommand(QString);
 
+	signals:
+		void changePrompt(QString);
+		void addOutput(QString);
+
 private:
 	RedisConnectionAbstract * connection;
-	consoleTab & consoleView;
+	RedisConnectionConfig config;
 	bool connectionValid;	
 };
 
diff --git a/redis-desktop-manager/include/widgets/consoleTab.h b/redis-desktop-manager/include/widgets/consoleTab.h
@@ -1,12 +1,8 @@
 #pragma once
 
-/**
-	Based on Console Qt widget from RedisConsole 
-	https://github.com/ptrofimov/RedisConsole
-	author Petr Trofimov (petrofimov@yandex.ru)
-**/
 
 #include <QPlainTextEdit>
+#include <QThread>
 
 class RedisConnectionConfig;
 class ConsoleConnectionWrapper;
@@ -18,10 +14,12 @@ class consoleTab: public QPlainTextEdit
 public:
 	consoleTab(RedisConnectionConfig&);
 	~consoleTab(void);
-	void output(QString);
-	void setPrompt(QString);
 	void scrollDown();
 
+public slots:
+	void output(QString);
+	void setPrompt(QString);	
+
 protected:
 	void keyPressEvent(QKeyEvent *);
 	void mousePressEvent(QMouseEvent *);
@@ -33,7 +31,7 @@ class consoleTab: public QPlainTextEdit
 	QStringList *history;
 	int historyPos;
 	ConsoleConnectionWrapper * connection;
-	//QThread connectionThread;
+	QThread connectionThread;
 
 	void onEnter();
 	void insertPrompt(bool insertNewBlock = true);
diff --git a/redis-desktop-manager/source/demo.cpp b/redis-desktop-manager/source/demo.cpp
@@ -151,8 +151,9 @@ void MainWin::OnConnectionTreeClick(const QModelIndex & index)
 				connections->updateFilter();		
 				loadingInProgress = false;
 				
-				if (!connected) {
-					QMessageBox::warning(this, "Can't connect to server", "Can't connect to server. Check connection settings");
+				if (!connected) {					
+					QMessageBox::warning(this, "Can't connect to server", 
+						QString("Check connection settings \nError: %1").arg(server->getConnection()->getLastError()));
 				}				
 			}
 			break;
diff --git a/redis-desktop-manager/source/main.cpp b/redis-desktop-manager/source/main.cpp
@@ -6,7 +6,7 @@ int main(int argc, char *argv[])
 	QApplication a(argc, argv);
 
 	QApplication::setApplicationName("Redis Desktop Manager");
-	QApplication::setApplicationVersion("0.5.1");	
+	QApplication::setApplicationVersion("0.5.2");	
 	QApplication::setOrganizationDomain("redisdesktop.com");
 
 	MainWin w;
diff --git a/redis-desktop-manager/source/redis/ConsoleConnectionWrapper.cpp b/redis-desktop-manager/source/redis/ConsoleConnectionWrapper.cpp
@@ -6,40 +6,45 @@
 #include "consoleTab.h"
 #include "Response.h"
 
-ConsoleConnectionWrapper::ConsoleConnectionWrapper(RedisConnectionConfig &config, consoleTab &view)
-	: consoleView(view) , connectionValid(false)
+ConsoleConnectionWrapper::ConsoleConnectionWrapper(RedisConnectionConfig &config)
+	: config(config), connectionValid(false)
+{
+}
+
+void ConsoleConnectionWrapper::init()
 {
 	if (config.isNull()) 
 	{
-		consoleView.output("Invalid config. Can't create connection.");
+		emit addOutput("Invalid config. Can't create connection.");		
 		return;
 	} 
 
 	connection =  (config.useSshTunnel()) ? (RedisConnectionAbstract *) new RedisConnectionOverSsh(config) 
-										  : (RedisConnectionAbstract *) new RedisConnection(config);
+		: (RedisConnectionAbstract *) new RedisConnection(config);
 
 	if (!connection->connect()) 
 	{
-		consoleView.output("Invalid config. Can't create connection.");
+		emit addOutput("Invalid config. Can't create connection.");	
 		return;
 	}
 
 	connectionValid = true;
-	consoleView.setPrompt(QString("%1:0>").arg(config.name));
-	consoleView.output("Connected.");	
+
+	emit changePrompt(QString("%1:0>").arg(config.name));
+	emit addOutput("Connected.");	
 }
 
 void ConsoleConnectionWrapper::executeCommand(QString cmd)
 {
 	if (!connectionValid) 
 	{
-		consoleView.output("Invalid config. Can't create connection.");
+		emit addOutput("Invalid config. Can't create connection.");
 		return;
 	}
 
 	if (!connection->isConnected() && !connection->connect()) 
 	{
-		consoleView.output("Connection error. Check network connection");
+		emit addOutput("Connection error. Check network connection");
 		return;
 	}
 
@@ -51,12 +56,12 @@ void ConsoleConnectionWrapper::executeCommand(QString cmd)
 
 	if (isSelectCommand) 
 	{		
-		consoleView.setPrompt(
+		emit changePrompt(
 			QString("%1:%2>")
 				.arg(connection->config.name)
 				.arg(selectDbRegex.cap(3))
 			);
 	}
 
-	consoleView.output(Response::valueToString(result));
+	addOutput(Response::valueToString(result));
 }
diff --git a/redis-desktop-manager/source/redis/RedisConnectionOverSsh.cpp b/redis-desktop-manager/source/redis/RedisConnectionOverSsh.cpp
@@ -112,7 +112,7 @@ void RedisConnectionOverSsh::OnSocketReadyRead()
 QString RedisConnectionOverSsh::getLastError()
 {
 	if (socket == NULL) {
-		return QString("Error with ssh connection");
+		return QString("SSH connection error");
 	}
 
 	return socket->errorString();
diff --git a/redis-desktop-manager/source/widgets/consoleTab.cpp b/redis-desktop-manager/source/widgets/consoleTab.cpp
@@ -9,6 +9,7 @@
 consoleTab::consoleTab(RedisConnectionConfig& config)
 {	
 	appendHtml("<span style='color: orange;'>List of unsupported commands: PTTL, DUMP, RESTORE, AUTH, QUIT, MONITOR</span>");
+	appendHtml("Connecting ...");
 
 	QPalette p = palette();
 	p.setColor(QPalette::Base, QColor(57, 57, 57));
@@ -20,16 +21,23 @@ consoleTab::consoleTab(RedisConnectionConfig& config)
 	insertPrompt(false);
 	isLocked = false;
 
-	connection = new ConsoleConnectionWrapper(config, *this);
+	connection = new ConsoleConnectionWrapper(config);
+	connection->moveToThread(&connectionThread);
 
+	connect(&connectionThread, &QThread::finished, connection, &QObject::deleteLater);
 	connect(this, SIGNAL(onCommand(QString)), connection, SLOT(executeCommand(QString)));	
+	connect(connection, SIGNAL(changePrompt(QString)), this, SLOT(setPrompt(QString)));
+	connect(connection, SIGNAL(addOutput(QString)), this, SLOT(output(QString)));
+	connect(&connectionThread, SIGNAL(started()), connection, SLOT(init()));
+	
+	connectionThread.start();
 }
 
 
 consoleTab::~consoleTab(void)
 {
-	//connectionThread.quit();
-	///connectionThread.wait();
+	connectionThread.quit();
+	connectionThread.wait();
 }
 
 void consoleTab::setPrompt(QString str)

Original file line number	Diff line number	Diff line change
`@@ -151,8 +151,9 @@ void MainWin::OnConnectionTreeClick(const QModelIndex & index)`
`151`	`151`	`connections->updateFilter();`
`152`	`152`	`loadingInProgress = false;`
`153`	`153`
`154`		`- if (!connected) {`
`155`		`- QMessageBox::warning(this, "Can't connect to server", "Can't connect to server. Check connection settings");`
	`154`	`+ if (!connected) {`
	`155`	`+ QMessageBox::warning(this, "Can't connect to server",`
	`156`	`+ QString("Check connection settings \nError: %1").arg(server->getConnection()->getLastError()));`
`156`	`157`	`}`
`157`	`158`	`}`
`158`	`159`	`break;`
Original file line number	Diff line number	Diff line change
`@@ -6,40 +6,45 @@`
`6`	`6`	`#include "consoleTab.h"`
`7`	`7`	`#include "Response.h"`
`8`	`8`
`9`		`-ConsoleConnectionWrapper::ConsoleConnectionWrapper(RedisConnectionConfig &config, consoleTab &view)`
`10`		`- : consoleView(view) , connectionValid(false)`
	`9`	`+ConsoleConnectionWrapper::ConsoleConnectionWrapper(RedisConnectionConfig &config)`
	`10`	`+ : config(config), connectionValid(false)`
	`11`	`+{`
	`12`	`+}`
	`13`	`+`
	`14`	`+void ConsoleConnectionWrapper::init()`
`11`	`15`	`{`
`12`	`16`	`if (config.isNull())`
`13`	`17`	`{`
`14`		`- consoleView.output("Invalid config. Can't create connection.");`
	`18`	`+ emit addOutput("Invalid config. Can't create connection.");`
`15`	`19`	`return;`
`16`	`20`	`}`
`17`	`21`
`18`	`22`	`connection = (config.useSshTunnel()) ? (RedisConnectionAbstract *) new RedisConnectionOverSsh(config)`
`19`		`- : (RedisConnectionAbstract *) new RedisConnection(config);`
	`23`	`+ : (RedisConnectionAbstract *) new RedisConnection(config);`
`20`	`24`
`21`	`25`	`if (!connection->connect())`
`22`	`26`	`{`
`23`		`- consoleView.output("Invalid config. Can't create connection.");`
	`27`	`+ emit addOutput("Invalid config. Can't create connection.");`
`24`	`28`	`return;`
`25`	`29`	`}`
`26`	`30`
`27`	`31`	`connectionValid = true;`
`28`		`- consoleView.setPrompt(QString("%1:0>").arg(config.name));`
`29`		`- consoleView.output("Connected.");`
	`32`	`+`
	`33`	`+ emit changePrompt(QString("%1:0>").arg(config.name));`
	`34`	`+ emit addOutput("Connected.");`
`30`	`35`	`}`
`31`	`36`
`32`	`37`	`void ConsoleConnectionWrapper::executeCommand(QString cmd)`
`33`	`38`	`{`
`34`	`39`	`if (!connectionValid)`
`35`	`40`	`{`
`36`		`- consoleView.output("Invalid config. Can't create connection.");`
	`41`	`+ emit addOutput("Invalid config. Can't create connection.");`
`37`	`42`	`return;`
`38`	`43`	`}`
`39`	`44`
`40`	`45`	`if (!connection->isConnected() && !connection->connect())`
`41`	`46`	`{`
`42`		`- consoleView.output("Connection error. Check network connection");`
	`47`	`+ emit addOutput("Connection error. Check network connection");`
`43`	`48`	`return;`
`44`	`49`	`}`
`45`	`50`
`@@ -51,12 +56,12 @@ void ConsoleConnectionWrapper::executeCommand(QString cmd)`
`51`	`56`
`52`	`57`	`if (isSelectCommand)`
`53`	`58`	`{`
`54`		`- consoleView.setPrompt(`
	`59`	`+ emit changePrompt(`
`55`	`60`	`QString("%1:%2>")`
`56`	`61`	`.arg(connection->config.name)`
`57`	`62`	`.arg(selectDbRegex.cap(3))`
`58`	`63`	`);`
`59`	`64`	`}`
`60`	`65`
`61`		`- consoleView.output(Response::valueToString(result));`
	`66`	`+ addOutput(Response::valueToString(result));`
`62`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ void RedisConnectionOverSsh::OnSocketReadyRead()`
`112`	`112`	`QString RedisConnectionOverSsh::getLastError()`
`113`	`113`	`{`
`114`	`114`	`if (socket == NULL) {`
`115`		`- return QString("Error with ssh connection");`
	`115`	`+ return QString("SSH connection error");`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`return socket->errorString();`