[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2972: some bugfixes and improvements at MainWindow and UserAuthori (in vidalia/branches/hidden-services/src/vidalia: . config)
Author: borkdomenik
Date: 2008-08-16 10:47:29 -0400 (Sat, 16 Aug 2008)
New Revision: 2972
Modified:
vidalia/branches/hidden-services/src/vidalia/config/servicepage.cpp
vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui
vidalia/branches/hidden-services/src/vidalia/config/servicesettings.cpp
vidalia/branches/hidden-services/src/vidalia/config/userauthorizationdata.cpp
vidalia/branches/hidden-services/src/vidalia/config/userauthorizationdata.h
vidalia/branches/hidden-services/src/vidalia/mainwindow.cpp
Log:
some bugfixes and improvements at MainWindow and UserAuthorizationData.
removed the attribute enabled from the UserAuthorizationData entity and the column of the serviceAuthWidget.
Modified: vidalia/branches/hidden-services/src/vidalia/config/servicepage.cpp
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/config/servicepage.cpp 2008-08-15 16:03:03 UTC (rev 2971)
+++ vidalia/branches/hidden-services/src/vidalia/config/servicepage.cpp 2008-08-16 14:47:29 UTC (rev 2972)
@@ -66,13 +66,10 @@
ui.serviceWidget->horizontalHeader()->setResizeMode(3, QHeaderView::Stretch);
ui.serviceWidget->verticalHeader()->hide();
ui.serviceAuthWidget->horizontalHeader()->resizeSection(1,180);
- ui.serviceAuthWidget->horizontalHeader()->resizeSection(2,60);
ui.serviceAuthWidget->horizontalHeader()->setResizeMode(0,
QHeaderView::Stretch);
ui.serviceAuthWidget->horizontalHeader()->setResizeMode(1,
QHeaderView::Stretch);
- ui.serviceAuthWidget->horizontalHeader()->setResizeMode(2,
- QHeaderView::Stretch);
ui.serviceAuthWidget->verticalHeader()->hide();
ui.serviceAccessWidget->horizontalHeader()->resizeSection(1,180);
ui.serviceAccessWidget->horizontalHeader()->setResizeMode(0,
@@ -206,15 +203,10 @@
Service s = _services->take(ui.serviceWidget->currentRow());
for(int i = 0; i < ui.serviceAuthWidget->rowCount(); i++) {
QString authdata, identification;
- bool enabled = false;
QTableWidgetItem *selItem = ui.serviceAuthWidget->item(i, 1);
authdata = ui.serviceAuthWidget->item(i,0)->text();
identification = selItem->text();
- if(ui.serviceAuthWidget->item(i,2)->checkState() == Qt::Checked) {
- enabled = true;
- }
UserAuthorizationData u(authdata, identification);
- u.setEnabled(enabled);
users.push_back(u);
}
s.setUsers(users);
@@ -270,11 +262,7 @@
QTableWidgetItem *curItem = ui.serviceAuthWidget->item(i, 1);
authdata = ui.serviceAuthWidget->item(i,0)->text();
identification = curItem->text();
- if(ui.serviceAuthWidget->item(i,2)->checkState() == Qt::Checked) {
- enabled = true;
- }
UserAuthorizationData u(authdata, identification);
- u.setEnabled(enabled);
users.push_back(u);
}
s.setUsers(users);
@@ -293,7 +281,6 @@
QListIterator<Service> it(services);
bool first = true;
while(it.hasNext()) {
- QList<UserAuthorizationData> publishedUsers;
Service temp = it.next();
serviceConfString.append("hiddenservicedir=" +
string_escape(temp.serviceDirectory()) + " ");
@@ -301,21 +288,14 @@
string_escape(temp.virtualPort() +
(temp.physicalAddressPort().isEmpty() ? "" : " " +
temp.physicalAddressPort())));
- QListIterator<UserAuthorizationData> it (temp.users());
- while(it.hasNext()) {
- UserAuthorizationData user = it.next();
- if(user.enabled() == true) {
- publishedUsers.push_back(user);
- }
- }
- if(publishedUsers.size() > 0) {
+ if(temp.users().size() > 0) {
QString stealthMode = "basic";
if(temp.stealth()) {
stealthMode = "stealth";
}
serviceConfString.append(" hiddenserviceversion=\"2\" \
hiddenserviceauthorizeclient="+string_escape(stealthMode+" " +
- createUserAuthStringForTor(publishedUsers)));
+ createUserAuthStringForTor(temp.users())));
}
serviceConfString.append(" "+ temp.additionalServiceOptions());
}
@@ -554,7 +534,6 @@
id = strList2.first();
authdata = onion+" "+cookie;
UserAuthorizationData u(onion+" "+cookie, id);
- u.setEnabled(true);
actualUsers.push_back(u);
}
}
@@ -610,7 +589,6 @@
while(it3.hasNext()) {
UserAuthorizationData user = it3.next();
if(temp2.isMember(user) == false) {
- user.setEnabled(false);
users.push_back(user);
temp2.setUsers(users);
}
@@ -848,10 +826,6 @@
authdata = ui.serviceAuthWidget->item(i, 0)->text();
identification = ui.serviceAuthWidget->item(i, 1)->text();
UserAuthorizationData u(authdata, identification);
- if(ui.serviceAuthWidget->item(i,2)->checkState()==Qt::Checked){
- enabled = true;
- }
- u.setEnabled(enabled);
users.push_back(u);
}
}
@@ -888,14 +862,9 @@
QList<UserAuthorizationData> users;
for(int i = 0; i < ui.serviceAuthWidget->rowCount(); i++) {
QString authdata, identification;
- bool enabled;
authdata = ui.serviceAuthWidget->item(i, 0)->text();
identification = ui.serviceAuthWidget->item(i, 1)->text();
UserAuthorizationData u(authdata, identification);
- if(ui.serviceAuthWidget->item(i,2)->checkState()==Qt::Checked) {
- enabled = true;
- }
- u.setEnabled(enabled);
users.push_back(u);
}
Service s = _services->take(previous->row());
@@ -907,14 +876,9 @@
QList<UserAuthorizationData> users;
for(int i = 0; i < ui.serviceAuthWidget->rowCount(); i++) {
QString authdata, identification;
- bool enabled = false;
authdata = ui.serviceAuthWidget->item(i, 0)->text();
identification = ui.serviceAuthWidget->item(i, 1)->text();
UserAuthorizationData u(authdata, identification);
- if(ui.serviceAuthWidget->item(i,2)->checkState() == Qt::Checked) {
- enabled = true;
- }
- u.setEnabled(enabled);
users.push_back(u);
}
Service s = _services->take(previous->row());
@@ -957,17 +921,19 @@
//show the users with user authorization for the selected service
Service selService = _services->take(ui.serviceWidget->currentRow());
QList<UserAuthorizationData> assoziatedUsers = selService.users();
+ if(selService.stealth()) {
+ ui.checkBox_stealth->setCheckState(Qt::Checked);
+ ui.checkBox_basic->setCheckState(Qt::Unchecked);
+ } else {
+ ui.checkBox_basic->setCheckState(Qt::Checked);
+ ui.checkBox_stealth->setCheckState(Qt::Unchecked);
+ }
if(assoziatedUsers.size() == 0) {
ui.authClientsGroupBox->setVisible(false);
ui.restrictAccessCheckBox->setCheckState(Qt::Unchecked);
} else {
- if(selService.stealth()) {
- ui.checkBox_stealth->setCheckState(Qt::Checked);
- ui.checkBox_basic->setCheckState(Qt::Unchecked);
- } else {
- ui.checkBox_basic->setCheckState(Qt::Checked);
- ui.checkBox_stealth->setCheckState(Qt::Unchecked);
- }
+ ui.authClientsGroupBox->setVisible(true);
+ ui.restrictAccessCheckBox->setCheckState(Qt::Checked);
int rowcount = 0;
QListIterator<UserAuthorizationData> it(assoziatedUsers);
while(it.hasNext()) {
@@ -979,16 +945,8 @@
QTableWidgetItem* identificationItem = new QTableWidgetItem;
identificationItem->setData(32, tempUser.identification());
identificationItem->setText(tempUser.identification());
- QTableWidgetItem *cboxitem = new QTableWidgetItem();
- cboxitem->setFlags(Qt::ItemIsSelectable);
- if(tempUser.enabled()) {
- cboxitem->setCheckState(Qt::Checked);
- } else {
- cboxitem->setCheckState(Qt::Unchecked);
- }
ui.serviceAuthWidget->setItem(rowcount, 0, authdataItem);
ui.serviceAuthWidget->setItem(rowcount, 1, identificationItem);
- ui.serviceAuthWidget->setItem(rowcount, 2, cboxitem);
rowcount++;
}
}
@@ -1114,17 +1072,12 @@
{
QTableWidgetItem *identificationItem = new QTableWidgetItem();
QTableWidgetItem *addressItem = new QTableWidgetItem();
- QTableWidgetItem *cboxItem = new QTableWidgetItem();
- cboxItem->setFlags(Qt::ItemIsSelectable);
- cboxItem->setCheckState(Qt::Checked);
- cboxItem->setTextAlignment(Qt::AlignCenter);
addressItem->setFlags(Qt::ItemIsSelectable);
addressItem->setText("[Created by Tor]");
int rows = ui.serviceAuthWidget->rowCount();
ui.serviceAuthWidget->insertRow(rows);
ui.serviceAuthWidget->setItem(rows, 0, addressItem);
ui.serviceAuthWidget->setItem(rows, 1, identificationItem);
- ui.serviceAuthWidget->setItem(rows, 2, cboxItem);
}
/** Called when the user wants to remove a client with authorization */
@@ -1437,28 +1390,6 @@
QString address = ui.serviceAuthWidget->item(row,0)->text();
bool b = address.contains(".onion");
ui.copyClientAuthBtn->setEnabled(b);
- switch (item->column()) {
- case 2: //checkbox
- Service selectedService = _services->take(ui.serviceWidget->currentRow());
- UserAuthorizationData selectedUser;
- QList<UserAuthorizationData> users = selectedService.users();
- QString identity = ui.serviceAuthWidget->item(item->row(), 1)->text();
- QListIterator<UserAuthorizationData> it(users);
- while(it.hasNext()) {
- UserAuthorizationData temp = it.next();
- if(temp.identification().compare(identity) == 0) {
- selectedUser = temp;
- }
- }
- if(item->checkState() == Qt::Unchecked) {
- item->setCheckState(Qt::Checked);
- selectedUser.setEnabled(true);
- } else {
- item->setCheckState(Qt::Unchecked);
- selectedUser.setEnabled(false);
- }
- break;
- }
}
}
Modified: vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui 2008-08-15 16:03:03 UTC (rev 2971)
+++ vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui 2008-08-16 14:47:29 UTC (rev 2972)
@@ -356,11 +356,6 @@
<string>Identification</string>
</property>
</column>
- <column>
- <property name="text" >
- <string>Enabled</string>
- </property>
- </column>
</widget>
</item>
<item row="0" column="1" >
Modified: vidalia/branches/hidden-services/src/vidalia/config/servicesettings.cpp
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/config/servicesettings.cpp 2008-08-15 16:03:03 UTC (rev 2971)
+++ vidalia/branches/hidden-services/src/vidalia/config/servicesettings.cpp 2008-08-16 14:47:29 UTC (rev 2972)
@@ -220,7 +220,7 @@
QString
ServiceSettings::getHiddenServiceDirectories()
{
- QString value = torControl()->getHiddenServiceConf("hiddenserviceoptions");
+ QString value = torControl()->getHiddenServiceConf("hiddenserviceoptions");
return value;
}
Modified: vidalia/branches/hidden-services/src/vidalia/config/userauthorizationdata.cpp
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/config/userauthorizationdata.cpp 2008-08-15 16:03:03 UTC (rev 2971)
+++ vidalia/branches/hidden-services/src/vidalia/config/userauthorizationdata.cpp 2008-08-16 14:47:29 UTC (rev 2972)
@@ -20,9 +20,3 @@
{
}
-/* Sets the enabled value of a specific user */
-void UserAuthorizationData::setEnabled(bool enabled)
-{
- _enabled = enabled;;
-}
-
Modified: vidalia/branches/hidden-services/src/vidalia/config/userauthorizationdata.h
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/config/userauthorizationdata.h 2008-08-15 16:03:03 UTC (rev 2971)
+++ vidalia/branches/hidden-services/src/vidalia/config/userauthorizationdata.h 2008-08-16 14:47:29 UTC (rev 2972)
@@ -23,15 +23,7 @@
UserAuthorizationData();
/** Constructor to create a new Service with initial settings */
UserAuthorizationData(QString authdata, QString identification);
- /** Returns the enabled value of a specific user */
- bool enabled() const { return _enabled; }
- /** Sets the enabled value of a specific user */
- void setEnabled(bool enabled);
-private:
- /** shows whether a user is enabled for the service or not. */
- bool _enabled;
-
};
Q_DECLARE_METATYPE(UserAuthorizationData);
#endif /*UserAuthorizationData_H_*/
Modified: vidalia/branches/hidden-services/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/branches/hidden-services/src/vidalia/mainwindow.cpp 2008-08-15 16:03:03 UTC (rev 2971)
+++ vidalia/branches/hidden-services/src/vidalia/mainwindow.cpp 2008-08-16 14:47:29 UTC (rev 2972)
@@ -1180,13 +1180,32 @@
QStringList strList = conf.split("250 HiddenServiceDir");
int amount = strList.size()-1;
QString lblText = ui.lblTorStatus->text();
- if(lblText.contains("\n")) {
- QStringList lblList = lblText.split("\n");
- statustext = lblList.first();
+ if(amount < 1) {
+ if(lblText.contains("\n")) {
+ QStringList lblList = lblText.split("\n");
+ statustext = lblList.first();
+ } else {
+ statustext = lblText;
+ }
} else {
- statustext = ui.lblTorStatus->text();
+ if(amount == 1) {
+ if(lblText.contains("\n")) {
+ QStringList lblList = lblText.split("\n");
+ statustext = lblList.first();
+ } else {
+ statustext = ui.lblTorStatus->text();
+ }
+ statustext.append("\n1 Hidden Service running.");
+ } else {
+ if(lblText.contains("\n")) {
+ QStringList lblList = lblText.split("\n");
+ statustext = lblList.first();
+ } else {
+ statustext = ui.lblTorStatus->text();
+ }
+ statustext.append("\n"+QString::number(amount)+" Hidden Services running.");
+ }
}
- ui.lblTorStatus->setText(statustext.append("\n"+
- QString::number(amount)+" Hidden Service(s) running."));
+ ui.lblTorStatus->setText(statustext);
}