[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3985: Extensive ui work for the HerdictWeb plugin. Tentatively add (in vidalia/branches/extension-api/src/vidalia: . HerdictWebReporterPlugin res res/herdict)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r3985: Extensive ui work for the HerdictWeb plugin. Tentatively add (in vidalia/branches/extension-api/src/vidalia: . HerdictWebReporterPlugin res res/herdict)
From: tyree731@xxxxxxxxxxxxxxxxxxx
Date: Tue, 28 Jul 2009 19:40:14 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Tue, 28 Jul 2009 19:40:17 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx
Author: tyree731
Date: 2009-07-28 19:40:14 -0400 (Tue, 28 Jul 2009)
New Revision: 3985

Added:
   vidalia/branches/extension-api/src/vidalia/res/herdict/
   vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-button-accessible.gif
   vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-button-inaccessible.gif
   vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-header-background.gif
   vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-logo.gif
Modified:
   vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp
   vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.h
   vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.ui
   vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
   vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc
Log:
Extensive ui work for the HerdictWeb plugin. Tentatively added their icons to use in the ui; should probably ask them if thats ok.

Modified: vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp	2009-07-28 13:36:39 UTC (rev 3984)
+++ vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp	2009-07-28 23:40:14 UTC (rev 3985)
@@ -36,40 +36,36 @@
 
   /* Create a network proxy for the Tor webview and a NAM to use it. */
   QNetworkProxy torProxy(QNetworkProxy::Socks5Proxy, hostname, port);
+
   QNetworkAccessManager* networkAccessManager = new QNetworkAccessManager(this);
   networkAccessManager->setProxy(torProxy);
 
   /* Make the Tor Web View use this network access manager */
   ui.webViewTor->page()->setNetworkAccessManager(networkAccessManager);
 
+  /* Default to hiding the progress bars */
+  ui.progressPlain->hide();
+  ui.progressTor->hide();
+
   /* Connect button actions and URL actions to the WebView widgets. */
-  connect(ui.buttonBack, SIGNAL(clicked()), 
-          ui.webViewPlain, SLOT(back()));
-  connect(ui.buttonBack, SIGNAL(clicked()),
-          ui.webViewTor, SLOT(back()));
-
-  connect(ui.buttonForward, SIGNAL(clicked()),
-          ui.webViewPlain, SLOT(forward()));
-  connect(ui.buttonForward, SIGNAL(clicked()),
-          ui.webViewTor, SLOT(forward()));
-
-  connect(ui.buttonRefresh, SIGNAL(clicked()),
-          ui.webViewPlain, SLOT(reload()));
-  connect(ui.buttonRefresh, SIGNAL(clicked()),
-          ui.webViewTor, SLOT(reload()));
-
   connect(ui.lineUrlEntry, SIGNAL(returnPressed()),
           this, SLOT(loadUrl()));
 
   /* Connect page signals to their respective handlers */
+  connect(ui.webViewPlain, SIGNAL(loadStarted()),
+          this, SLOT(loadStarted()));
   connect(ui.webViewPlain, SIGNAL(loadFinished(bool)), 
           this, SLOT(plainLoadFinished(bool)));
   connect(ui.webViewTor, SIGNAL(loadFinished(bool)), 
           this, SLOT(torLoadFinished(bool)));
-  connect(ui.webViewPlain, SIGNAL(statusBarMessage(const QString&)),
-          this, SLOT(changeStatusMessage(const QString&)));
-  connect(ui.webViewTor, SIGNAL(statusBarMessage(const QString&)),
-          this, SLOT(changeStatusMessage(const QString&)));
+  connect(ui.webViewPlain, SIGNAL(statusBarMessage(QString)),
+          this, SLOT(changeStatusMessage(QString)));
+  connect(ui.webViewTor, SIGNAL(statusBarMessage(QString)),
+          this, SLOT(changeStatusMessage(QString)));
+  connect(ui.webViewPlain, SIGNAL(loadProgress(int)),
+          ui.progressPlain, SLOT(setValue(int)));
+  connect(ui.webViewTor, SIGNAL(loadProgress(int)),
+          ui.progressTor, SLOT(setValue(int)));
 }
 
 HerdictWebReporterPanel::~HerdictWebReporterPanel()
@@ -102,6 +98,16 @@
 }
 
 void
+HerdictWebReporterPanel::loadStarted()
+{
+  /* Show the progress bars */
+  ui.progressPlain->setValue(0);
+  ui.progressPlain->show();
+  ui.progressTor->setValue(0);
+  ui.progressTor->show();
+}
+
+void
 HerdictWebReporterPanel::loadUrl()
 {
   QString url = ui.lineUrlEntry->text();
@@ -112,6 +118,8 @@
 void
 HerdictWebReporterPanel::plainLoadFinished(bool result)
 {
+  /* Hide the statusbar */
+  ui.progressPlain->hide();
   if (!result)
     ui.webViewPlain->load(QUrl("about:blank"));
 }
@@ -119,6 +127,8 @@
 void
 HerdictWebReporterPanel::torLoadFinished(bool result)
 {
+  /* Hide the statusbar */
+  ui.progressTor->hide();
   if (!result)
     ui.webViewTor->load(QUrl("about:blank"));
 }

Modified: vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.h
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.h	2009-07-28 13:36:39 UTC (rev 3984)
+++ vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.h	2009-07-28 23:40:14 UTC (rev 3985)
@@ -43,6 +43,8 @@
 private slots:
   /* Change the status bar message */
   void changeStatusMessage(const QString& message);
+  /* Slot to handle the signal loadStarted */
+  void loadStarted();
   /* Loads the Url in the text box */
   void loadUrl();
   /* Handle webViewPlain finishing */

Modified: vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.ui
===================================================================
--- vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.ui	2009-07-28 13:36:39 UTC (rev 3984)
+++ vidalia/branches/extension-api/src/vidalia/HerdictWebReporterPlugin/HerdictWebReporterPanel.ui	2009-07-28 23:40:14 UTC (rev 3985)
@@ -6,10 +6,28 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>750</width>
-    <height>694</height>
+    <width>971</width>
+    <height>682</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>800</width>
+    <height>600</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>16777215</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>MainWindow</string>
   </property>
@@ -17,38 +35,313 @@
    <bool>true</bool>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QGridLayout" name="gridLayout_2">
-    <item row="0" column="0">
-     <widget class="QPushButton" name="buttonBack">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="minimumSize">
+    <size>
+     <width>800</width>
+     <height>600</height>
+    </size>
+   </property>
+   <property name="autoFillBackground">
+    <bool>false</bool>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <property name="verticalSpacing">
+     <number>0</number>
+    </property>
+    <property name="margin">
+     <number>0</number>
+    </property>
+    <item row="1" column="0">
+     <layout class="QVBoxLayout" name="verticalLayoutFields">
+      <property name="sizeConstraint">
+       <enum>QLayout::SetFixedSize</enum>
       </property>
-      <property name="text">
-       <string/>
+      <property name="leftMargin">
+       <number>10</number>
       </property>
-      <property name="icon">
-       <iconset resource="../CompSci/vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc">
-        <normaloff>:/images/32x32/go-previous.png</normaloff>
-        <normalon>:/images/32x32/go-previous.png</normalon>:/images/32x32/go-previous.png</iconset>
-      </property>
-      <property name="iconSize">
-       <size>
-        <width>32</width>
-        <height>32</height>
-       </size>
-      </property>
-      <property name="flat">
-       <bool>true</bool>
-      </property>
-     </widget>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayoutUrl">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="lblUrl">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>URL</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="lineUrlEntry">
+          <property name="statusTip">
+           <string>URL</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayoutCountry">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="lblCountry">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Country</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="comboCountryEntry">
+          <property name="statusTip">
+           <string>Country</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayoutISP">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="lblISP">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>ISP</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLineEdit" name="lineISPEntry">
+          <property name="statusTip">
+           <string>ISP</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayoutAccess">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="lblLocation">
+          <property name="text">
+           <string>Access Location</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="comboLocationEntry">
+          <property name="statusTip">
+           <string>Access Location</string>
+          </property>
+          <property name="editable">
+           <bool>false</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayoutCategory">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="lblCategory">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Site Category</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="comboCategoryEntry">
+          <property name="statusTip">
+           <string>Site Category</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayoutUsefulness">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="lblUsefulness">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Usefulness</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="comboUsefulnessEntry">
+          <property name="statusTip">
+           <string>Usefulness</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayoutCause">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="lblCause">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Cause of Inaccessibility</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="comboCauseEntry">
+          <property name="statusTip">
+           <string>Cause of Inaccessibility</string>
+          </property>
+          <property name="frame">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayoutComments">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <item>
+         <widget class="QLabel" name="lblComment">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Comments</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QTextEdit" name="textCommentEntry"/>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayoutSubmit">
+        <property name="sizeConstraint">
+         <enum>QLayout::SetFixedSize</enum>
+        </property>
+        <item>
+         <widget class="QPushButton" name="buttonInAccessible">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset resource="../res/vidalia.qrc">
+            <normaloff>:/herdict/herdict/herdict-button-inaccessible.gif</normaloff>:/herdict/herdict/herdict-button-inaccessible.gif</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>122</width>
+            <height>39</height>
+           </size>
+          </property>
+          <property name="flat">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="buttonAccessible">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="icon">
+           <iconset resource="../res/vidalia.qrc">
+            <normaloff>:/herdict/herdict/herdict-button-accessible.gif</normaloff>:/herdict/herdict/herdict-button-accessible.gif</iconset>
+          </property>
+          <property name="iconSize">
+           <size>
+            <width>122</width>
+            <height>39</height>
+           </size>
+          </property>
+          <property name="flat">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
     </item>
-    <item row="0" column="1">
-     <widget class="QPushButton" name="buttonForward">
+    <item row="0" column="0" colspan="2">
+     <widget class="QLabel" name="lblHeaderBackground">
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
@@ -56,85 +349,129 @@
       <property name="text">
        <string/>
       </property>
-      <property name="icon">
-       <iconset resource="../CompSci/vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc">
-        <normaloff>:/images/32x32/go-next.png</normaloff>
-        <normalon>:/images/32x32/go-next.png</normalon>:/images/32x32/go-next.png</iconset>
+      <property name="pixmap">
+       <pixmap resource="../res/vidalia.qrc">:/herdict/herdict/herdict-header-background.gif</pixmap>
       </property>
-      <property name="iconSize">
-       <size>
-        <width>32</width>
-        <height>32</height>
-       </size>
-      </property>
-      <property name="flat">
+      <property name="scaledContents">
        <bool>true</bool>
       </property>
      </widget>
     </item>
-    <item row="0" column="2">
-     <widget class="QPushButton" name="buttonRefresh">
+    <item row="1" column="1">
+     <widget class="QSplitter" name="splitter">
       <property name="sizePolicy">
-       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
         <horstretch>0</horstretch>
         <verstretch>0</verstretch>
        </sizepolicy>
       </property>
-      <property name="text">
-       <string/>
-      </property>
-      <property name="icon">
-       <iconset resource="../CompSci/vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc">
-        <normaloff>:/images/32x32/view-refresh.png</normaloff>:/images/32x32/view-refresh.png</iconset>
-      </property>
-      <property name="iconSize">
-       <size>
-        <width>32</width>
-        <height>32</height>
-       </size>
-      </property>
-      <property name="flat">
-       <bool>true</bool>
-      </property>
-     </widget>
-    </item>
-    <item row="0" column="3">
-     <widget class="QLineEdit" name="lineUrlEntry"/>
-    </item>
-    <item row="1" column="0" colspan="4">
-     <widget class="QSplitter" name="splitter">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
       </property>
-      <widget class="QWebView" name="webViewTor">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="url">
-        <url>
-         <string>about:blank</string>
-        </url>
-       </property>
+      <widget class="QWidget" name="layoutWidgetTor">
+       <layout class="QVBoxLayout" name="verticalLayoutTor">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <property name="sizeConstraint">
+         <enum>QLayout::SetNoConstraint</enum>
+        </property>
+        <item>
+         <widget class="QWebView" name="webViewTor">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="url">
+           <url>
+            <string>about:blank</string>
+           </url>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QProgressBar" name="progressTor">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="value">
+           <number>24</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </widget>
-      <widget class="QWebView" name="webViewPlain">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="url">
-        <url>
-         <string>about:blank</string>
-        </url>
-       </property>
+      <widget class="QWidget" name="layoutWidgetPlain">
+       <layout class="QVBoxLayout" name="verticalLayoutPlain">
+        <property name="spacing">
+         <number>0</number>
+        </property>
+        <property name="sizeConstraint">
+         <enum>QLayout::SetNoConstraint</enum>
+        </property>
+        <item>
+         <widget class="QWebView" name="webViewPlain">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="url">
+           <url>
+            <string>about:blank</string>
+           </url>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QProgressBar" name="progressPlain">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="value">
+           <number>24</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </widget>
      </widget>
     </item>
    </layout>
+   <widget class="QLabel" name="lblHerdictLogo">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>10</y>
+      <width>291</width>
+      <height>53</height>
+     </rect>
+    </property>
+    <property name="sizePolicy">
+     <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+      <horstretch>0</horstretch>
+      <verstretch>0</verstretch>
+     </sizepolicy>
+    </property>
+    <property name="text">
+     <string/>
+    </property>
+    <property name="pixmap">
+     <pixmap resource="../res/vidalia.qrc">:/herdict/herdict/herdict-logo.gif</pixmap>
+    </property>
+   </widget>
+   <zorder>lblHeaderBackground</zorder>
+   <zorder>splitter</zorder>
+   <zorder>lblHerdictLogo</zorder>
   </widget>
  </widget>
  <customwidgets>
@@ -145,7 +482,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../CompSci/vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc"/>
+  <include location="../res/vidalia.qrc"/>
  </resources>
  <connections/>
 </ui>

Modified: vidalia/branches/extension-api/src/vidalia/MainWindow.cpp
===================================================================
--- vidalia/branches/extension-api/src/vidalia/MainWindow.cpp	2009-07-28 13:36:39 UTC (rev 3984)
+++ vidalia/branches/extension-api/src/vidalia/MainWindow.cpp	2009-07-28 23:40:14 UTC (rev 3985)
@@ -176,6 +176,7 @@
   /* Populate the tab bar with plugins */
   populateTabs(_pluginManager->plugins());
 
+  /* Tab moving causes "issues" on OSX */
 #if defined(Q_OS_MAC)
   ui.tabMainPanel->setMovable(false);
 #endif

Added: vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-button-accessible.gif
===================================================================
(Binary files differ)


Property changes on: vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-button-accessible.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-button-inaccessible.gif
===================================================================
(Binary files differ)


Property changes on: vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-button-inaccessible.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-header-background.gif
===================================================================
(Binary files differ)


Property changes on: vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-header-background.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-logo.gif
===================================================================
(Binary files differ)


Property changes on: vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-logo.gif
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc
===================================================================
--- vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc	2009-07-28 13:36:39 UTC (rev 3984)
+++ vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc	2009-07-28 23:40:14 UTC (rev 3985)
@@ -294,6 +294,12 @@
     <qresource prefix="/images">
         <file>map/world-map.png</file>
     </qresource>
+    <qresource prefix="herdict">
+        <file>herdict/herdict-button-accessible.gif</file>
+        <file>herdict/herdict-button-inaccessible.gif</file>
+        <file>herdict/herdict-header-background.gif</file>
+        <file>herdict/herdict-logo.gif</file>
+    </qresource>
     <qresource prefix="/pki">
         <file>cacert_root.crt</file>
         <file>EntrustSecureServerCA.crt</file>
Prev by Author: [vidalia-svn] r3972: Tabs not movable on OSX, but movable anywhere else. Toolbar (vidalia/branches/extension-api/src/vidalia)
Next by Author: [vidalia-svn] r3986: Added QJSON library to HerdictWeb source tree. Used that to (in vidalia/branches/extension-api: . src/vidalia/HerdictWebReporterPlugin)
Previous by thread: [vidalia-svn] r3984: Fix yet more bogus lines in the new Spanish translations. (vidalia/trunk/src/vidalia/i18n/es)
Next by thread: [vidalia-svn] r3986: Added QJSON library to HerdictWeb source tree. Used that to (in vidalia/branches/extension-api: . src/vidalia/HerdictWebReporterPlugin)
Index(es):
- Author
- Thread