record Permission Changes and pass to libretroshare.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7206 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2014-03-25 12:22:16 +00:00
parent 0fac6fecf9
commit a9a1b054dd
3 changed files with 117 additions and 13 deletions

View File

@ -30,6 +30,10 @@
#include <iostream> #include <iostream>
#include <QTimer> #include <QTimer>
#define PermissionStateUserRole (Qt::UserRole)
#define ServiceIdUserRole (Qt::UserRole + 1)
#define PeerIdUserRole (Qt::UserRole + 2)
ServicePermissionsPage::ServicePermissionsPage(QWidget * parent, Qt::WindowFlags flags) ServicePermissionsPage::ServicePermissionsPage(QWidget * parent, Qt::WindowFlags flags)
: ConfigPage(parent, flags) : ConfigPage(parent, flags)
{ {
@ -54,7 +58,91 @@ QString ServicePermissionsPage::helpText() const
/** Saves the changes on this page */ /** Saves the changes on this page */
bool ServicePermissionsPage::save(QString &/*errmsg*/) bool ServicePermissionsPage::save(QString &/*errmsg*/)
{ {
std::cerr << "ServicePermissionsPage::save()";
std::cerr << std::endl;
size_t row, column;
for(row = 0; row < mStdRowCount; ++row)
{
bool requiresSaving = false;
bool defaultOn = true;
uint32_t serviceId;
{
QTableWidgetItem *item = ui.tableWidget->item (row, 0);
QVariant qvDefault = item->data(PermissionStateUserRole);
QVariant qvServiceId = item->data(ServiceIdUserRole);
serviceId = qvServiceId.toUInt();
Qt::CheckState currentState = item->checkState();
Qt::CheckState origState = (Qt::CheckState) qvDefault.toUInt();
if (currentState != origState)
{
requiresSaving = true;
}
defaultOn = (currentState == Qt::Checked);
}
if (!requiresSaving)
{
for(column = 1; column < mStdColumnCount; ++column)
{
QTableWidgetItem *item = ui.tableWidget->item (row, column);
Qt::CheckState currentState = item->checkState();
QVariant qvOrigState = item->data(PermissionStateUserRole);
Qt::CheckState origState = (Qt::CheckState) qvOrigState.toUInt();
if (currentState != origState)
{
requiresSaving = true;
break;
}
}
}
if (requiresSaving)
{
RsServicePermissions permissions;
permissions.mDefaultAllowed = defaultOn;
permissions.mServiceId = serviceId;
std::cerr << "ServicePermissionsPage::save() saving row: " << row;
std::cerr << " serviceId: " << serviceId;
std::cerr << " defaultAllowed: " << defaultOn;
std::cerr << std::endl;
for(column = 1; column < mStdColumnCount; ++column)
{
QTableWidgetItem *item = ui.tableWidget->item (row, column);
Qt::CheckState currentState = item->checkState();
QTableWidgetItem *iditem = ui.tableWidget->item (0, column);
RsPeerId peerId(iditem->data(PeerIdUserRole).toString().toStdString());
switch(currentState)
{
case Qt::Checked:
std::cerr << "ServicePermissionsPage::save() peer: " << peerId.toStdString();
std::cerr << " Allowed";
std::cerr << std::endl;
permissions.mPeersAllowed.insert(peerId);
break;
case Qt::Unchecked:
std::cerr << "ServicePermissionsPage::save() peer: " << peerId.toStdString();
std::cerr << " Allowed";
std::cerr << std::endl;
permissions.mPeersDenied.insert(peerId);
break;
case Qt::PartiallyChecked:
std::cerr << "ServicePermissionsPage::save() peer: " << peerId.toStdString();
std::cerr << " Default";
std::cerr << std::endl;
/* default */
break;
}
}
rsServiceControl->updateServicePermissions(serviceId, permissions);
}
}
return true; return true;
} }
@ -95,8 +183,10 @@ void ServicePermissionsPage::load()
std::map<uint32_t, RsServiceInfo>::const_iterator sit; std::map<uint32_t, RsServiceInfo>::const_iterator sit;
rsServiceControl->getOwnServices(ownServices); rsServiceControl->getOwnServices(ownServices);
ui.tableWidget->setRowCount(ownServices.mServiceList.size()); mStdRowCount = ownServices.mServiceList.size();
ui.tableWidget->setColumnCount(peerList.size() + 1); mStdColumnCount = peerList.size() + 1;
ui.tableWidget->setRowCount(mStdRowCount);
ui.tableWidget->setColumnCount(mStdColumnCount);
QStringList columnHeaders; QStringList columnHeaders;
QStringList rowHeaders; QStringList rowHeaders;
@ -107,8 +197,8 @@ void ServicePermissionsPage::load()
} }
// Fill in CheckBoxes. // Fill in CheckBoxes.
int row; size_t row;
int column; size_t column;
for(row = 0, sit = ownServices.mServiceList.begin(); sit != ownServices.mServiceList.end(); sit++, row++) for(row = 0, sit = ownServices.mServiceList.begin(); sit != ownServices.mServiceList.end(); sit++, row++)
{ {
rowHeaders.push_back(QString::fromStdString(sit->second.mServiceName)); rowHeaders.push_back(QString::fromStdString(sit->second.mServiceName));
@ -127,11 +217,14 @@ void ServicePermissionsPage::load()
if (permissions.mDefaultAllowed) if (permissions.mDefaultAllowed)
{ {
item->setCheckState(Qt::Checked); item->setCheckState(Qt::Checked);
item->setData(PermissionStateUserRole, QVariant((int) (Qt::Checked)));
} }
else else
{ {
item->setCheckState(Qt::Unchecked); item->setCheckState(Qt::Unchecked);
item->setData(PermissionStateUserRole, QVariant((int) (Qt::Unchecked)));
} }
item->setData(ServiceIdUserRole, QVariant((uint) sit->first));
ui.tableWidget->setItem(row, 0, item); ui.tableWidget->setItem(row, 0, item);
} }
@ -146,23 +239,30 @@ void ServicePermissionsPage::load()
if (permissions.mPeersAllowed.end() != permissions.mPeersAllowed.find(*pit)) if (permissions.mPeersAllowed.end() != permissions.mPeersAllowed.find(*pit))
{ {
item->setCheckState(Qt::Checked); item->setCheckState(Qt::Checked);
item->setData(PermissionStateUserRole, QVariant((int) (Qt::Checked)));
} }
else if (permissions.mPeersDenied.end() != permissions.mPeersDenied.find(*pit)) else if (permissions.mPeersDenied.end() != permissions.mPeersDenied.find(*pit))
{ {
item->setCheckState(Qt::Unchecked); item->setCheckState(Qt::Unchecked);
item->setData(PermissionStateUserRole, QVariant((int) (Qt::Unchecked)));
} }
else else
{ {
item->setCheckState(Qt::PartiallyChecked); item->setCheckState(Qt::PartiallyChecked);
item->setData(PermissionStateUserRole, QVariant((int) (Qt::PartiallyChecked)));
} }
ui.tableWidget->setItem(row, column, item); ui.tableWidget->setItem(row, column, item);
if (row == 0)
{
item->setData(PeerIdUserRole, QVariant(QString::fromStdString(pit->toStdString())));
}
} }
} }
// Now Get a List of Services Provided by Peers - and add text. // Now Get a List of Services Provided by Peers - and add text.
int stdRowCount = ownServices.mServiceList.size(); int maxRowCount = mStdRowCount;
int maxRowCount = stdRowCount;
for(column = 1, pit = peerList.begin(); for(column = 1, pit = peerList.begin();
pit != peerList.end(); pit++, column++) pit != peerList.end(); pit++, column++)
{ {
@ -175,7 +275,7 @@ void ServicePermissionsPage::load()
sit2 = peerInfo.mServiceList.begin(); sit2 = peerInfo.mServiceList.begin();
eit2 = peerInfo.mServiceList.end(); eit2 = peerInfo.mServiceList.end();
row = 0; row = 0;
int extraRowIndex = stdRowCount; int extraRowIndex = mStdRowCount;
while((sit != eit) && (sit2 != eit2)) while((sit != eit) && (sit2 != eit2))
{ {
@ -254,7 +354,7 @@ void ServicePermissionsPage::load()
} }
else else
{ {
for(row = 0; row < stdRowCount; row++) for(row = 0; row < mStdRowCount; row++)
{ {
QTableWidgetItem *item = ui.tableWidget->item(row, column); QTableWidgetItem *item = ui.tableWidget->item(row, column);
item->setText(tr("N/A")); item->setText(tr("N/A"));
@ -302,8 +402,3 @@ void ServicePermissionsPage::tableItemChanged ( QTableWidgetItem * item )

View File

@ -48,6 +48,8 @@ class ServicePermissionsPage: public ConfigPage
void tableItemChanged ( QTableWidgetItem * item ); void tableItemChanged ( QTableWidgetItem * item );
private: private:
size_t mStdRowCount;
size_t mStdColumnCount;
Ui::ServicePermissionsPage ui; Ui::ServicePermissionsPage ui;
}; };

View File

@ -57,6 +57,13 @@
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Permissions changes are not saved permanently. (TODO)</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QTableWidget" name="tableWidget"> <widget class="QTableWidget" name="tableWidget">
<row> <row>