Changeset 2972

Timestamp:

08/16/08 10:47:29 (3 months ago)

Author:

borkdomenik

Message:

some bugfixes and improvements at MainWindow? and UserAuthorizationData?.
removed the attribute enabled from the UserAuthorizationData? entity and the column of the serviceAuthWidget.

Location:

vidalia/branches/hidden-services/src/vidalia

Files:

• config/servicepage.cpp (modified) (16 diffs)
• config/servicepage.ui (modified) (1 diff)
• config/servicesettings.cpp (modified) (1 diff)
• config/userauthorizationdata.cpp (modified) (1 diff)
• config/userauthorizationdata.h (modified) (1 diff)
• mainwindow.cpp (modified) (1 diff)

vidalia/branches/hidden-services/src/vidalia/config/servicepage.cpp

@@ -67 +67 @@
   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();
@@ -207 +204 @@
       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);
       }
@@ -271 +263 @@
          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);
        }
@@ -294 +282 @@
   bool first = true;
   while(it.hasNext()) {
-    QList<UserAuthorizationData> publishedUsers;
     Service temp = it.next();
     serviceConfString.append("hiddenservicedir=" +
@@ -302 +289 @@
      (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()) {
@@ -316 +296 @@
       serviceConfString.append(" hiddenserviceversion=\"2\" \
        hiddenserviceauthorizeclient="+string_escape(stealthMode+" " +
-       createUserAuthStringForTor(publishedUsers)));
+       createUserAuthStringForTor(temp.users())));
     }
     serviceConfString.append(" "+ temp.additionalServiceOptions());
@@ -555 +535 @@
            authdata = onion+" "+cookie;
            UserAuthorizationData u(onion+" "+cookie, id);
-           u.setEnabled(true);
            actualUsers.push_back(u);
          }
@@ -611 +590 @@
             UserAuthorizationData user = it3.next();
             if(temp2.isMember(user) == false) {
-              user.setEnabled(false);
               users.push_back(user);
               temp2.setUsers(users);
@@ -849 +827 @@
               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);
             }
@@ -889 +863 @@
              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);
               }
@@ -908 +877 @@
         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);
         }
@@ -958 +922 @@
   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);
@@ -980 +946 @@
         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++;
       }
@@ -1115 +1073 @@
    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]");
@@ -1125 +1079 @@
    ui.serviceAuthWidget->setItem(rows, 0, addressItem);
    ui.serviceAuthWidget->setItem(rows, 1, identificationItem);
-   ui.serviceAuthWidget->setItem(rows, 2, cboxItem);
 }
 
@@ -1438 +1391 @@
     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;
-    }
   }
 }

vidalia/branches/hidden-services/src/vidalia/config/servicepage.ui

@@ -357 +357 @@
                </property>
               </column>
-              <column>
-               <property name="text" >
-                <string>Enabled</string>
-               </property>
-              </column>
              </widget>
             </item>

vidalia/branches/hidden-services/src/vidalia/config/servicesettings.cpp

@@ -221 +221 @@
 ServiceSettings::getHiddenServiceDirectories()
 {
-  QString value =  torControl()->getHiddenServiceConf("hiddenserviceoptions");
+  QString value = torControl()->getHiddenServiceConf("hiddenserviceoptions");
   return value;
 }

vidalia/branches/hidden-services/src/vidalia/config/userauthorizationdata.cpp

@@ -21 +21 @@
 }
 
-/* Sets the enabled value of a specific user */
-void UserAuthorizationData::setEnabled(bool enabled)
-{
-  _enabled = enabled;;
-}
-

vidalia/branches/hidden-services/src/vidalia/config/userauthorizationdata.h

@@ -24 +24 @@
   /** 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;
 
 };

vidalia/branches/hidden-services/src/vidalia/mainwindow.cpp

@@ -1181 +1181 @@
   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();
-  }
-  ui.lblTorStatus->setText(statustext.append("\n"+
-   QString::number(amount)+" Hidden Service(s) running."));
+    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);
 }