[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r4002: Moved herdict resources into its directory, but its strangel (in vidalia/branches/extension-api/src: plugins/HerdictWebReporterPlugin vidalia/res vidalia/res/herdict)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r4002: Moved herdict resources into its directory, but its strangel (in vidalia/branches/extension-api/src: plugins/HerdictWebReporterPlugin vidalia/res vidalia/res/herdict)
From: tyree731@xxxxxxxxxxxxxxxxxxx
Date: Mon, 3 Aug 2009 22:39:14 -0400 (EDT)
Delivered-to: archiver@xxxxxxxx
Delivered-to: vidalia-svn-outgoing@xxxxxxxx
Delivered-to: vidalia-svn@xxxxxxxx
Delivery-date: Mon, 03 Aug 2009 22:39:17 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx
Author: tyree731
Date: 2009-08-03 22:39:14 -0400 (Mon, 03 Aug 2009)
New Revision: 4002

Added:
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/EquifaxSecureCA.crt
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.qrc
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/herdict-button-accessible.gif
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/herdict-button-inaccessible.gif
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/herdict-header-background.gif
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/herdict-logo.gif
Removed:
   vidalia/branches/extension-api/src/vidalia/res/herdict/EquifaxSecureCA.crt
   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/plugins/HerdictWebReporterPlugin/CMakeLists.txt
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp
   vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.ui
   vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc
Log:
Moved herdict resources into its directory, but its strangely not working

Modified: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/CMakeLists.txt
===================================================================
--- vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/CMakeLists.txt	2009-08-04 02:12:11 UTC (rev 4001)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/CMakeLists.txt	2009-08-04 02:39:14 UTC (rev 4002)
@@ -36,6 +36,9 @@
 qt4_wrap_ui(herdictwebreporterplugin_SRCS
   HerdictWebReporterPanel.ui
 )
+qt4_add_resources(herdictwebreporterplugin_SRCS
+  HerdictWebReporterPlugin.qrc
+)
 
 add_library(herdictwebreporterplugin STATIC  ${herdictwebreporterplugin_SRCS})
 target_link_libraries(herdictwebreporterplugin

Copied: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/EquifaxSecureCA.crt (from rev 4000, vidalia/branches/extension-api/src/vidalia/res/herdict/EquifaxSecureCA.crt)
===================================================================
--- vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/EquifaxSecureCA.crt	                        (rev 0)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/EquifaxSecureCA.crt	2009-08-04 02:39:14 UTC (rev 4002)
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
+UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
+dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
+MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
+dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
+BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
+cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
+AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
+aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
+ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
+IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
+MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
+A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
+7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
+1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
+-----END CERTIFICATE-----

Modified: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp
===================================================================
--- vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp	2009-08-04 02:12:11 UTC (rev 4001)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.cpp	2009-08-04 02:39:14 UTC (rev 4002)
@@ -377,7 +377,7 @@
 
   /* Make a list of ceritificates which only uses HerdictWeb's CA */
   QList<QSslCertificate> caCertificates;
-  QFile* caFile = new QFile(":herdict/EquifaxSecureCA.crt");
+  QFile* caFile = new QFile(":herdict/pki/EquifaxSecureCA.crt");
   QSslCertificate ca(caFile);
   caCertificates.append(ca);
 

Modified: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.ui
===================================================================
--- vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.ui	2009-08-04 02:12:11 UTC (rev 4001)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPanel.ui	2009-08-04 02:39:14 UTC (rev 4002)
@@ -294,8 +294,8 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../vidalia/res/vidalia.qrc">
-            <normaloff>:/herdict/herdict/herdict-button-inaccessible.gif</normaloff>:/herdict/herdict/herdict-button-inaccessible.gif</iconset>
+           <iconset resource="HerdictWebReporterPlugin.qrc">
+            <normaloff>:/herdict/images/herdict-button-inaccessible.gif</normaloff>:/herdict/images/herdict-button-inaccessible.gif</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -320,8 +320,8 @@
            <string/>
           </property>
           <property name="icon">
-           <iconset resource="../../vidalia/res/vidalia.qrc">
-            <normaloff>:/herdict/herdict/herdict-button-accessible.gif</normaloff>:/herdict/herdict/herdict-button-accessible.gif</iconset>
+           <iconset resource="HerdictWebReporterPlugin.qrc">
+            <normaloff>:/herdict/images/herdict-button-accessible.gif</normaloff>:/herdict/images/herdict-button-accessible.gif</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -353,7 +353,7 @@
        <string/>
       </property>
       <property name="pixmap">
-       <pixmap resource="../../vidalia/res/vidalia.qrc">:/herdict/herdict/herdict-header-background.gif</pixmap>
+       <pixmap resource="HerdictWebReporterPlugin.qrc">:/herdict/images/herdict-header-background.gif</pixmap>
       </property>
       <property name="scaledContents">
        <bool>true</bool>
@@ -505,7 +505,7 @@
      <string/>
     </property>
     <property name="pixmap">
-     <pixmap resource="../../vidalia/res/vidalia.qrc">:/herdict/herdict/herdict-logo.gif</pixmap>
+     <pixmap resource="HerdictWebReporterPlugin.qrc">:/herdict/images/herdict-logo.gif</pixmap>
     </property>
    </widget>
    <widget class="QLabel" name="lblSiteInformation">
@@ -535,8 +535,7 @@
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../vidalia/res/vidalia.qrc"/>
-  <include location="../res/vidalia.qrc"/>
+  <include location="HerdictWebReporterPlugin.qrc"/>
  </resources>
  <connections/>
 </ui>

Added: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.qrc
===================================================================
--- vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.qrc	                        (rev 0)
+++ vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.qrc	2009-08-04 02:39:14 UTC (rev 4002)
@@ -0,0 +1,11 @@
+<RCC>
+    <qresource prefix="herdict/images">
+        <file>herdict-button-accessible.gif</file>
+        <file>herdict-button-inaccessible.gif</file>
+        <file>herdict-header-background.gif</file>
+        <file>herdict-logo.gif</file>
+    </qresource>
+    <qresource prefix="herdict/pki">
+        <file>EquifaxSecureCA.crt</file>
+    </qresource>
+</RCC>
\ No newline at end of file


Property changes on: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/HerdictWebReporterPlugin.qrc
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Copied: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/herdict-button-accessible.gif (from rev 3992, vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-button-accessible.gif)
===================================================================
(Binary files differ)

Copied: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/herdict-button-inaccessible.gif (from rev 3992, vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-button-inaccessible.gif)
===================================================================
(Binary files differ)

Copied: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/herdict-header-background.gif (from rev 3992, vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-header-background.gif)
===================================================================
(Binary files differ)

Copied: vidalia/branches/extension-api/src/plugins/HerdictWebReporterPlugin/herdict-logo.gif (from rev 3992, vidalia/branches/extension-api/src/vidalia/res/herdict/herdict-logo.gif)
===================================================================
(Binary files differ)

Modified: vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc
===================================================================
--- vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc	2009-08-04 02:12:11 UTC (rev 4001)
+++ vidalia/branches/extension-api/src/vidalia/res/vidalia.qrc	2009-08-04 02:39:14 UTC (rev 4002)
@@ -294,13 +294,6 @@
     <qresource prefix="/images">
         <file>map/world-map.png</file>
     </qresource>
-    <qresource prefix="herdict">
-        <file>herdict/EquifaxSecureCA.crt</file>
-        <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>