admin/OpenSimConsoleClient
1
0
Fork 0
mirror of https://github.com/MelanieT/OpenSimConsoleClient.git synced 2026-08-14 00:57:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Lots of bug fixes and the addition of dynamic host groups.

Browse Source
This commit is contained in:
Melanie
2016-11-20 01:00:04 +00:00
parent d10b7efdc5
commit 113ac98acb
8 changed files with 307 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ConsoleClient.pro.user
+3 -3
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.1.0, 2016-11-18T11:17:18. -->
<!-- Written by QtCreator 4.1.0, 2016-11-20T00:59:48. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
@@ -62,7 +62,7 @@
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.7.0 clang 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.7.0 clang 64bit</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.57.clang_64_kit</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
@@ -310,7 +310,7 @@
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">ConsoleClient.pro</value>
<value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/Users/melanie/yrgrid/build-ConsoleClient-Desktop_Qt_5_7_0_clang_64bit-Debug/ConsoleClient.app/Contents/MacOS</value>
<value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory.default">/Users/melanie/yrgrid/build-ConsoleClient-Desktop_Qt_5_7_0_clang_64bit-Release/ConsoleClient.app/Contents/MacOS</value>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
<value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
addgroupdialog.cpp
+4
View File
@@ -9,6 +9,10 @@ AddGroupDialog::AddGroupDialog(QWidget *parent) :
Name = ui->Name;
Dns = ui->Dns;
Dynamic = ui->dynamic;
Source = ui->source;
User = ui->user;
Pass = ui->pass;
connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(OnOK()));
connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(OnCancel()));
addgroupdialog.h
+5
View File
@@ -4,6 +4,7 @@
#include <QDialog>
class QLineEdit;
class QCheckBox;
namespace Ui {
class AddGroupDialog;
@@ -19,6 +20,10 @@ public:
QLineEdit *Name;
QLineEdit *Dns;
QCheckBox *Dynamic;
QLineEdit *Source;
QLineEdit *User;
QLineEdit *Pass;
protected slots:
void OnOK();
addgroupdialog.ui
+104 -6
View File
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>400</width>
<height>120</height>
<height>319</height>
</rect>
</property>
<property name="windowTitle">
@@ -32,8 +32,8 @@
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>13</x>
<y>65</y>
<x>10</x>
<y>60</y>
<width>74</width>
<height>16</height>
</rect>
@@ -45,8 +45,8 @@
<widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>13</x>
<y>11</y>
<x>10</x>
<y>10</y>
<width>36</width>
<height>16</height>
</rect>
@@ -59,7 +59,7 @@
<property name="geometry">
<rect>
<x>10</x>
<y>26</y>
<y>30</y>
<width>269</width>
<height>21</height>
</rect>
@@ -75,6 +75,104 @@
</rect>
</property>
</widget>
<widget class="QGroupBox" name="groupBox">
<property name="geometry">
<rect>
<x>10</x>
<y>110</y>
<width>271</width>
<height>191</height>
</rect>
</property>
<property name="title">
<string/>
</property>
<widget class="QCheckBox" name="dynamic">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>211</width>
<height>20</height>
</rect>
</property>
<property name="text">
<string>Dynamic group</string>
</property>
</widget>
<widget class="QLabel" name="label_3">
<property name="geometry">
<rect>
<x>10</x>
<y>40</y>
<width>191</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Server list source URL</string>
</property>
</widget>
<widget class="QLineEdit" name="source">
<property name="geometry">
<rect>
<x>10</x>
<y>60</y>
<width>251</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_4">
<property name="geometry">
<rect>
<x>10</x>
<y>90</y>
<width>161</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Default user name</string>
</property>
</widget>
<widget class="QLineEdit" name="user">
<property name="geometry">
<rect>
<x>10</x>
<y>110</y>
<width>251</width>
<height>21</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label_5">
<property name="geometry">
<rect>
<x>10</x>
<y>140</y>
<width>59</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>TextLabel</string>
</property>
</widget>
<widget class="QLineEdit" name="pass">
<property name="geometry">
<rect>
<x>10</x>
<y>160</y>
<width>251</width>
<height>21</height>
</rect>
</property>
<property name="echoMode">
<enum>QLineEdit::PasswordEchoOnEdit</enum>
</property>
</widget>
</widget>
</widget>
<resources/>
<connections>
connectiondata.h
+1
View File
@@ -18,6 +18,7 @@ public:
int Port;
QString User;
QString Pass;
bool Dynamic;
};
#endif // CONNECTIONDATA_H
groupdata.h
+5
View File
@@ -13,6 +13,11 @@ public:
QUuid Uuid;
QString Name;
QHostAddress Dns;
bool Dynamic;
QString Source;
QString User;
QString Pass;
};
#endif // GROUPDATA_H
mainwindow.cpp
+180 -13
View File
@@ -10,8 +10,10 @@
#include <QTreeWidget>
#include <QTreeWidgetItem>
#include <QTreeWidgetItemIterator>
#include <QDebug>
#include <QDnsLookup>
#include <QNetworkAccessManager>
#include <QNetworkRequest>
#include <QNetworkReply>
#include "addconndialog.h"
#include "addgroupdialog.h"
@@ -30,6 +32,8 @@ MainWindow::MainWindow(QWidget *parent) :
{
ui->setupUi(this);
manager = new QNetworkAccessManager(this);
ui->connList->setColumnCount(1);
ui->connList->setHeaderLabel("Connections");
ui->connList->setHeaderHidden(true);
@@ -66,6 +70,11 @@ MainWindow::MainWindow(QWidget *parent) :
grp->Name = settings.value("Name").toString();
grp->Uuid = settings.value("Uuid").toUuid();
grp->Dynamic = settings.value("Dynamic", QVariant(false)).toBool();
grp->Source = settings.value("Source", QVariant("")).toString();
grp->User = settings.value("User", QVariant("")).toString();
grp->Pass = settings.value("Pass", QVariant("")).toString();
QVariant dnsAddress = settings.value("Dns");
if (dnsAddress.isValid())
grp->Dns = QHostAddress(dnsAddress.toString());
@@ -78,6 +87,9 @@ MainWindow::MainWindow(QWidget *parent) :
if (settings.value("Expanded").toBool())
grpItem->setExpanded(true);
if (grp->Dynamic)
loadGroup(grpItem);
}
settings.endArray();
@@ -95,6 +107,7 @@ MainWindow::MainWindow(QWidget *parent) :
c->User = settings.value("User").toString();
c->Pass = settings.value("Pass").toString();
c->Uuid = settings.value("Uuid").toUuid();
c->Dynamic = false;
connections[c->Uuid] = c;
@@ -116,6 +129,7 @@ MainWindow::MainWindow(QWidget *parent) :
connItem->setIcon(0, QIcon(":/Icons/computer.png"));
connItem->setData(0, Qt::UserRole, c->Uuid);
connItem->setFlags(connItem->flags() | Qt::ItemIsEditable);
}
settings.endArray();
@@ -247,6 +261,10 @@ void MainWindow::on_action_Edit_triggered()
dlg.Name->setEnabled(false);
dlg.Name->setText(g->Name);
dlg.Dns->setText(g->Dns.toString());
dlg.Dynamic->setChecked(g->Dynamic);
dlg.Source->setText(g->Source);
dlg.User->setText(g->User);
dlg.Pass->setText(g->Pass);
if (dlg.exec() < 0)
return;
@@ -255,6 +273,23 @@ void MainWindow::on_action_Edit_triggered()
g->Dns = QHostAddress(dlg.Dns->text());
else
g->Dns = QHostAddress();
bool reload = false;
if (dlg.Dynamic && (dlg.Dynamic->isChecked() != g->Dynamic))
reload = true;
if (g->Dynamic && (dlg.Source->text() != g->Source))
reload = true;
g->Dynamic = dlg.Dynamic->isChecked();
g->Source = dlg.Source->text();
g->User = dlg.User->text();
g->Pass = dlg.Pass->text();
while (item->childCount())
delete item->child(0);
loadGroup(item);
}
WriteSettings();
@@ -387,17 +422,24 @@ void MainWindow::WriteSettings()
if (!(*it)->Dns.isNull())
settings.setValue("Dns", (*it)->Dns.toString());
settings.setValue("Expanded", QVariant(grpItem->isExpanded()));
settings.setValue("Dynamic", QVariant((*it)->Dynamic));
settings.setValue("Source", QVariant((*it)->Source));
settings.setValue("User", QVariant((*it)->User));
settings.setValue("Pass", QVariant((*it)->Pass));
}
settings.endArray();
settings.beginWriteArray(QString("Connections"), connections.count());
settings.beginWriteArray(QString("Connections"));
idx = 0;
for (QMap<QUuid, ConnectionData *>::iterator it = connections.begin() ; it != connections.end() ; it++, idx++)
{
QUuid parent;
if ((*it)->Dynamic)
continue;
if (!(*it)->Uuid.isNull())
{
QTreeWidgetItem *item = findItem((*it)->Uuid);
@@ -405,17 +447,29 @@ void MainWindow::WriteSettings()
continue;
if (item->parent() != 0)
{
parent = item->parent()->data(0, Qt::UserRole).toUuid();
}
settings.setArrayIndex(idx);
settings.setValue("Uuid", QVariant((*it)->Uuid));
settings.setValue("Name", QVariant((*it)->Name));
settings.setValue("Host", QVariant((*it)->Host));
settings.setValue("Port", QVariant((*it)->Port));
settings.setValue("User", QVariant((*it)->User));
settings.setValue("Pass", QVariant((*it)->Pass));
settings.setValue("Parent", (QVariant(parent)));
// Check for a dynamic group. We don't save those connections
if (groups.contains(parent))
{
if (groups[parent]->Dynamic)
continue;
}
}
settings.setArrayIndex(idx);
settings.setValue("Uuid", QVariant((*it)->Uuid));
settings.setValue("Name", QVariant((*it)->Name));
settings.setValue("Host", QVariant((*it)->Host));
settings.setValue("Port", QVariant((*it)->Port));
settings.setValue("User", QVariant((*it)->User));
settings.setValue("Pass", QVariant((*it)->Pass));
settings.setValue("Parent", (QVariant(parent)));
}
else
{
idx--;
}
}
settings.endArray();
@@ -476,12 +530,24 @@ void MainWindow::ConnContext(const QPoint &pos)
{
connect (ctx.addAction("Add ..."), SIGNAL(triggered()), this, SLOT(addRootConnection()));
}
if (item != 0)
ConnectionData *conn = 0;
QUuid uuid = item->data(0, Qt::UserRole).toUuid();
if (!uuid.isNull() && connections.contains(uuid))
conn = connections[uuid];
if (item != 0 && (conn == 0 || conn->Dynamic == false))
{
connect (ctx.addAction("Edit ..."), SIGNAL(triggered()), ui->action_Edit, SLOT(trigger()));
}
if (item != 0 && item->type() != GroupItem)
connect (ctx.addAction("Delete"), SIGNAL(triggered()), ui->actionDelete, SLOT(trigger()));
{
if (conn == 0 || (!conn->Dynamic))
connect (ctx.addAction("Delete"), SIGNAL(triggered()), ui->actionDelete, SLOT(trigger()));
}
else if (item != 0 && item->childCount() == 0)
{
connect (ctx.addAction("Delete"), SIGNAL(triggered()), ui->actionDelete_group, SLOT(trigger()));
}
ctx.addSeparator();
connect (ctx.addAction("Add Group..."), SIGNAL(triggered()), ui->actionNew_group, SLOT(trigger()));
@@ -647,6 +713,7 @@ ConnectionData *MainWindow::createConnection()
c->User = dlg.User->text();
c->Pass = dlg.Pass->text();
c->Uuid = QUuid::createUuid();
c->Dynamic = false;
connections[c->Uuid.toString()] = c;
@@ -672,6 +739,16 @@ void MainWindow::addChildConnection()
if (parent == 0)
return;
if (parent->type() != GroupItem)
return;
QUuid uuid = parent->data(0, Qt::UserRole).toUuid();
if (!groups.contains(uuid))
return;
GroupData *g = groups[uuid];
if (g->Dynamic)
return;
ConnectionData *c = createConnection();
if (c == 0)
@@ -730,6 +807,8 @@ void MainWindow::on_actionDelete_triggered()
if (connections.contains(id))
{
ConnectionData *c = connections[id];
if (c->Dynamic)
return;
connections.remove(c->Uuid);
delete c;
}
@@ -765,3 +844,91 @@ void MainWindow::on_action_Preferences_triggered()
WriteSettings();
}
void MainWindow::loadGroup(QTreeWidgetItem *item)
{
QUuid grpUuid = item->data(0, Qt::UserRole).toUuid();
GroupData *grp = groups[grpUuid];
QUrl url(grp->Source);
if (!url.isValid())
return;
QNetworkRequest req(url);
req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
QNetworkReply *reply = manager->get(req);
reply->setProperty("Group", grpUuid);
connect(reply, SIGNAL(finished()), this, SLOT(groupLoaded()));
}
void MainWindow::groupLoaded()
{
QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
if (reply->error() != QNetworkReply::NoError)
return;
QUuid grpUuid = reply->property("Group").toUuid();
if (grpUuid.isNull())
return;
QTreeWidgetItem *grpItem = findItem(grpUuid);
if (!grpItem)
return;
if (!groups.contains(grpUuid))
return;
GroupData *grp = groups[grpUuid];
QString members = QString(reply->readAll());
QList<QString> lines = members.split("\n");
ui->connList->blockSignals(true);
QString line;
foreach (line, lines)
{
QList<QString> pieces = line.split(" ");
if (pieces.count() < 2)
continue;
QString host = pieces[0];
pieces.removeFirst();
QString name = pieces.join(" ");
if (name.trimmed() == "")
continue;
int port = 9000;
QList<QString> addrparts = host.split(":");
if (addrparts.count() > 1)
{
host = addrparts[0];
port = addrparts[1].toInt();
}
ConnectionData *c = new ConnectionData();
c->Name = name;
c->Uuid = QUuid::createUuid();
c->Group = grp->Uuid;
c->Host = host;
c->Port = port;
c->User = grp->User;
c->Pass = grp->Pass;
c->Dynamic = true;
connections[c->Uuid] = c;
// Dynamic items are not editable
QTreeWidgetItem *item = new QTreeWidgetItem(grpItem, QStringList(name), ConnectionItem);
item->setData(0, Qt::UserRole, c->Uuid);
item->setIcon(0, QIcon(":/Icons/computer.png"));
}
ui->connList->blockSignals(false);
ui->connList->sortByColumn(0, Qt::AscendingOrder);
reply->deleteLater();
}
mainwindow.h
+5
View File
@@ -13,6 +13,8 @@ class QTreeWidgetItem;
class ConnectionData;
class GroupData;
class QSettings;
class QNetworkAccessManager;
class QNetworkReply;
namespace Ui {
class MainWindow;
@@ -73,11 +75,14 @@ protected:
void AddNewTab(GroupData *grp, ConnectionData *conn, QHostAddress addr);
bool blackOnWhite;
bool systemFont;
QNetworkAccessManager *manager;
void loadGroup(QTreeWidgetItem *item);
protected slots:
void addRootConnection();
void addChildConnection();
void treeWidgetItemChanged(QTreeWidgetItem *item, int column);
void groupLoaded();
private:
QTreeWidgetItem *findOrAddGroup(QString groupName);
Ui::MainWindow *ui;