[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2648: Try out a new icon theme based on KDE's Oxygen icons (LGPLv3 (in vidalia: . trunk trunk/src/vidalia trunk/src/vidalia/config trunk/src/vidalia/help/browser trunk/src/vidalia/log trunk/src/vidalia/network trunk/src/vidalia/res trunk/src/vidalia/res/16x16 trunk/src/vidalia/res/22x22 trunk/src/vidalia/res/32x32 trunk/src/vidalia/res/48x48)
Author: edmanm
Date: 2008-06-02 23:34:42 -0400 (Mon, 02 Jun 2008)
New Revision: 2648
Added:
vidalia/trunk/src/vidalia/res/16x16/application-exit.png
vidalia/trunk/src/vidalia/res/16x16/applications-system.png
vidalia/trunk/src/vidalia/res/16x16/dialog-information.png
vidalia/trunk/src/vidalia/res/16x16/dialog-warning.png
vidalia/trunk/src/vidalia/res/16x16/emblem-important.png
vidalia/trunk/src/vidalia/res/16x16/media-playback-start.png
vidalia/trunk/src/vidalia/res/16x16/media-playback-stop.png
vidalia/trunk/src/vidalia/res/16x16/preferences-desktop-notification.png
vidalia/trunk/src/vidalia/res/16x16/user-identity.png
vidalia/trunk/src/vidalia/res/16x16/utilities-log-viewer.png
vidalia/trunk/src/vidalia/res/22x22/go-down-search.png
vidalia/trunk/src/vidalia/res/22x22/go-up-search.png
vidalia/trunk/src/vidalia/res/22x22/system-help.png
vidalia/trunk/src/vidalia/res/32x32/applications-system.png
vidalia/trunk/src/vidalia/res/32x32/document-save-all.png
vidalia/trunk/src/vidalia/res/32x32/document-save.png
vidalia/trunk/src/vidalia/res/32x32/edit-clear.png
vidalia/trunk/src/vidalia/res/32x32/edit-copy.png
vidalia/trunk/src/vidalia/res/32x32/edit-find.png
vidalia/trunk/src/vidalia/res/32x32/edit-select-all.png
vidalia/trunk/src/vidalia/res/32x32/go-home.png
vidalia/trunk/src/vidalia/res/32x32/go-next.png
vidalia/trunk/src/vidalia/res/32x32/go-previous.png
vidalia/trunk/src/vidalia/res/32x32/network-workgroup.png
vidalia/trunk/src/vidalia/res/32x32/preferences-desktop-locale.png
vidalia/trunk/src/vidalia/res/32x32/preferences-other.png
vidalia/trunk/src/vidalia/res/32x32/preferences-system-network.png
vidalia/trunk/src/vidalia/res/32x32/services.png
vidalia/trunk/src/vidalia/res/32x32/utilities-log-viewer.png
vidalia/trunk/src/vidalia/res/32x32/view-refresh.png
vidalia/trunk/src/vidalia/res/32x32/window-close.png
vidalia/trunk/src/vidalia/res/32x32/zoom-fit-best.png
vidalia/trunk/src/vidalia/res/32x32/zoom-in.png
vidalia/trunk/src/vidalia/res/32x32/zoom-out.png
vidalia/trunk/src/vidalia/res/48x48/media-playback-start.png
vidalia/trunk/src/vidalia/res/48x48/media-playback-stop.png
vidalia/trunk/src/vidalia/res/48x48/network-workgroup.png
vidalia/trunk/src/vidalia/res/48x48/user-identity.png
vidalia/trunk/src/vidalia/res/vidalia.qrc
Removed:
vidalia/trunk/src/vidalia/res/16x16/emblem-unreadable.png
vidalia/trunk/src/vidalia/res/16x16/format-justify-fill.png
vidalia/trunk/src/vidalia/res/16x16/go-next.png
vidalia/trunk/src/vidalia/res/16x16/go-previous.png
vidalia/trunk/src/vidalia/res/16x16/msg-debug.png
vidalia/trunk/src/vidalia/res/16x16/msg-error.png
vidalia/trunk/src/vidalia/res/16x16/msg-info.png
vidalia/trunk/src/vidalia/res/16x16/msg-notice.png
vidalia/trunk/src/vidalia/res/16x16/msg-warn.png
vidalia/trunk/src/vidalia/res/16x16/network-offline.png
vidalia/trunk/src/vidalia/res/16x16/preferences-desktop.png
vidalia/trunk/src/vidalia/res/16x16/start-tor.png
vidalia/trunk/src/vidalia/res/16x16/stop-tor.png
vidalia/trunk/src/vidalia/res/16x16/system-users.png
vidalia/trunk/src/vidalia/res/16x16/zoom.png
vidalia/trunk/src/vidalia/res/22x22/edit-clear.png
vidalia/trunk/src/vidalia/res/22x22/edit-select-all.png
vidalia/trunk/src/vidalia/res/22x22/emblem-system.png
vidalia/trunk/src/vidalia/res/22x22/emblem-unreadable.png
vidalia/trunk/src/vidalia/res/22x22/format-justify-fill.png
vidalia/trunk/src/vidalia/res/22x22/go-down.png
vidalia/trunk/src/vidalia/res/22x22/go-home.png
vidalia/trunk/src/vidalia/res/22x22/go-next.png
vidalia/trunk/src/vidalia/res/22x22/go-previous.png
vidalia/trunk/src/vidalia/res/22x22/go-up.png
vidalia/trunk/src/vidalia/res/22x22/help-browser.png
vidalia/trunk/src/vidalia/res/22x22/media-floppy.png
vidalia/trunk/src/vidalia/res/22x22/network-server.png
vidalia/trunk/src/vidalia/res/22x22/network-workgroup.png
vidalia/trunk/src/vidalia/res/22x22/preferences-desktop-locale.png
vidalia/trunk/src/vidalia/res/22x22/preferences-desktop.png
vidalia/trunk/src/vidalia/res/22x22/preferences-system.png
vidalia/trunk/src/vidalia/res/22x22/save-all.png
vidalia/trunk/src/vidalia/res/22x22/service.png
vidalia/trunk/src/vidalia/res/22x22/system-search.png
vidalia/trunk/src/vidalia/res/22x22/utilities-system-monitor.png
vidalia/trunk/src/vidalia/res/22x22/view-refresh.png
vidalia/trunk/src/vidalia/res/22x22/zoom-in.png
vidalia/trunk/src/vidalia/res/22x22/zoom-out.png
vidalia/trunk/src/vidalia/res/22x22/zoom-to-fit.png
vidalia/trunk/src/vidalia/res/32x32/format-justify-fill.png
vidalia/trunk/src/vidalia/res/32x32/process-working.png
vidalia/trunk/src/vidalia/res/48x48/network-server.png
vidalia/trunk/src/vidalia/res/48x48/start-tor.png
vidalia/trunk/src/vidalia/res/48x48/stop-tor.png
vidalia/trunk/src/vidalia/res/48x48/system-users.png
vidalia/trunk/src/vidalia/res/qt_license.txt
vidalia/trunk/src/vidalia/res/tor_license.txt
vidalia/trunk/src/vidalia/res/vidalia_common.qrc
vidalia/trunk/src/vidalia/res/vidalia_license.txt
Modified:
vidalia/
vidalia/trunk/LICENSE
vidalia/trunk/src/vidalia/CMakeLists.txt
vidalia/trunk/src/vidalia/config/configdialog.cpp
vidalia/trunk/src/vidalia/config/configdialog.ui
vidalia/trunk/src/vidalia/config/networkpage.ui
vidalia/trunk/src/vidalia/config/serverpage.ui
vidalia/trunk/src/vidalia/config/servicepage.ui
vidalia/trunk/src/vidalia/config/upnptestdialog.ui
vidalia/trunk/src/vidalia/help/browser/helpbrowser.ui
vidalia/trunk/src/vidalia/log/messagelog.ui
vidalia/trunk/src/vidalia/main.cpp
vidalia/trunk/src/vidalia/mainwindow.cpp
vidalia/trunk/src/vidalia/mainwindow.ui
vidalia/trunk/src/vidalia/network/netviewer.ui
vidalia/trunk/src/vidalia/res/16x16/applications-internet.png
vidalia/trunk/src/vidalia/res/16x16/help-browser.png
vidalia/trunk/src/vidalia/res/16x16/preferences-system.png
vidalia/trunk/src/vidalia/res/16x16/utilities-system-monitor.png
vidalia/trunk/src/vidalia/res/22x22/edit-copy.png
vidalia/trunk/src/vidalia/res/22x22/folder.png
vidalia/trunk/src/vidalia/res/22x22/list-add.png
vidalia/trunk/src/vidalia/res/22x22/list-remove.png
vidalia/trunk/src/vidalia/res/32x32/applications-internet.png
vidalia/trunk/src/vidalia/res/32x32/help-browser.png
vidalia/trunk/src/vidalia/res/32x32/preferences-system.png
vidalia/trunk/src/vidalia/res/32x32/utilities-system-monitor.png
vidalia/trunk/src/vidalia/res/48x48/applications-internet.png
Log:
r432@thebe: edmanm | 2008-06-02 23:35:06 -0400
Try out a new icon theme based on KDE's Oxygen icons (LGPLv3) and remove all
Tango icons (CC-BY-SA 2.5). This still needs some tweaking with respect to
which icons to use (e.g., the 'New Identity' icon sucks).
Property changes on: vidalia
___________________________________________________________________
svk:merge ticket from /local/vidalia [r432] on 45a62a8a-8088-484c-baad-c7b3e776dd32
Modified: vidalia/trunk/LICENSE
===================================================================
--- vidalia/trunk/LICENSE 2008-06-03 03:34:27 UTC (rev 2647)
+++ vidalia/trunk/LICENSE 2008-06-03 03:34:42 UTC (rev 2648)
@@ -56,25 +56,6 @@
===================================================================
-The following images used in Vidalia were created by
-The Tango Desktop Project <http://tango-project.org>:
-
- edit-clear.png edit-copy.png edit-select-all.png
- emblem-system.png emblem-unreadable.png format-justify-fill.png
- go-next.png go-previous.png help-browser.png
- media-floppy.png network-server.png preferences-system.png
- utilities-system-monitor.png preferences-desktop-locale.png
- go-down.png go-up.png list-add.png
- list-remove.png system-users.png applications-internet.png
- view-refresh.png
-
-They are licensed by The Tango Desktop Project under the Creative Commons
-Attribution Share-Alike License which can be found at the following address:
-
-http://creativecommons.org/licenses/by-sa/2.5/legalcode
-
-===================================================================
-
Vidalia incorporates icons from KDE's Oxygen icon theme. It is
licensed as follows:
Modified: vidalia/trunk/src/vidalia/CMakeLists.txt
===================================================================
--- vidalia/trunk/src/vidalia/CMakeLists.txt 2008-06-03 03:34:27 UTC (rev 2647)
+++ vidalia/trunk/src/vidalia/CMakeLists.txt 2008-06-03 03:34:42 UTC (rev 2648)
@@ -212,7 +212,7 @@
## Add the resource files (icons, etc.)
qt4_add_resources(vidalia_SRCS
- res/vidalia_common.qrc
+ res/vidalia.qrc
i18n/vidalia_i18n.qrc
help/content/content.qrc
)
Modified: vidalia/trunk/src/vidalia/config/configdialog.cpp
===================================================================
--- vidalia/trunk/src/vidalia/config/configdialog.cpp 2008-06-03 03:34:27 UTC (rev 2647)
+++ vidalia/trunk/src/vidalia/config/configdialog.cpp 2008-06-03 03:34:42 UTC (rev 2648)
@@ -34,15 +34,13 @@
#include "configdialog.h"
/* Images for toolbar icons */
-#define IMAGE_GENERAL ":/images/22x22/preferences-system.png"
-#define IMAGE_NETWORK ":/images/22x22/network-workgroup.png"
-#define IMAGE_SERVER ":/images/22x22/network-server.png"
-#define IMAGE_APPEARANCE ":/images/22x22/preferences-desktop-locale.png"
-#define IMAGE_ADVANCED ":/images/22x22/emblem-system.png"
-#define IMAGE_SAVE ":/images/22x22/media-floppy.png"
-#define IMAGE_CANCEL ":/images/22x22/emblem-unreadable.png"
-#define IMAGE_HELP ":/images/22x22/help-browser.png"
-#define IMAGE_SERVICE ":/images/22x22/service.png"
+#define IMAGE_GENERAL ":/images/32x32/preferences-other.png"
+#define IMAGE_NETWORK ":/images/32x32/preferences-system-network.png"
+#define IMAGE_SERVER ":/images/32x32/network-workgroup.png"
+#define IMAGE_APPEARANCE ":/images/32x32/preferences-desktop-locale.png"
+#define IMAGE_ADVANCED ":/images/32x32/applications-system.png"
+#define IMAGE_HELP ":/images/32x32/help-browser.png"
+#define IMAGE_SERVICE ":/images/32x32/services.png"
/** Constructor */
ConfigDialog::ConfigDialog(QWidget* parent)
@@ -92,6 +90,7 @@
ui.stackPages->add(new AdvancedPage(ui.stackPages),
createPageAction(QIcon(IMAGE_ADVANCED),
tr("Advanced"), grp));
+
foreach (ConfigPage *page, ui.stackPages->pages()) {
connect(page, SIGNAL(helpRequested(QString)),
this, SLOT(help(QString)));
Modified: vidalia/trunk/src/vidalia/config/configdialog.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/configdialog.ui 2008-06-03 03:34:27 UTC (rev 2647)
+++ vidalia/trunk/src/vidalia/config/configdialog.ui 2008-06-03 03:34:42 UTC (rev 2648)
@@ -16,7 +16,7 @@
<string>Settings</string>
</property>
<property name="windowIcon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/32x32/preferences-system.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/preferences-system.png</iconset>
</property>
<property name="iconSize" >
<size>
@@ -544,12 +544,6 @@
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
- <property name="iconSize" >
- <size>
- <width>24</width>
- <height>24</height>
- </size>
- </property>
<attribute name="toolBarArea" >
<number>4</number>
</attribute>
Modified: vidalia/trunk/src/vidalia/config/networkpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/networkpage.ui 2008-06-03 03:34:27 UTC (rev 2647)
+++ vidalia/trunk/src/vidalia/config/networkpage.ui 2008-06-03 03:34:42 UTC (rev 2648)
@@ -370,7 +370,7 @@
<string/>
</property>
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/list-add.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/22x22/list-add.png</iconset>
</property>
</widget>
</item>
@@ -386,7 +386,7 @@
<string/>
</property>
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/list-remove.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/22x22/list-remove.png</iconset>
</property>
</widget>
</item>
@@ -402,7 +402,7 @@
<string/>
</property>
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/edit-copy.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/22x22/edit-copy.png</iconset>
</property>
</widget>
</item>
@@ -445,7 +445,7 @@
<tabstop>chkFascistFirewall</tabstop>
</tabstops>
<resources>
- <include location="../res/vidalia_common.qrc" />
+ <include location="../res/vidalia.qrc" />
</resources>
<connections>
<connection>
Modified: vidalia/trunk/src/vidalia/config/serverpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/serverpage.ui 2008-06-03 03:34:27 UTC (rev 2647)
+++ vidalia/trunk/src/vidalia/config/serverpage.ui 2008-06-03 03:34:42 UTC (rev 2648)
@@ -483,7 +483,7 @@
<string/>
</property>
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/help-browser.png</iconset>
+ <iconset resource="../res/vidalia.qrc">:/images/22x22/system-help.png</iconset>
</property>
<property name="iconSize" >
<size>
@@ -877,7 +877,7 @@
<string/>
</property>
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/help-browser.png</iconset>
+ <iconset resource="../res/vidalia.qrc">:/images/22x22/system-help.png</iconset>
</property>
<property name="iconSize" >
<size>
@@ -1032,7 +1032,7 @@
<string/>
</property>
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/edit-copy.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/22x22/edit-copy.png</iconset>
</property>
</widget>
</item>
@@ -1073,7 +1073,7 @@
<tabstop>btnExitHelp</tabstop>
</tabstops>
<resources>
- <include location="../res/vidalia_common.qrc" />
+ <include location="../res/vidalia.qrc" />
</resources>
<connections>
<connection>
Modified: vidalia/trunk/src/vidalia/config/servicepage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/servicepage.ui 2008-06-03 03:34:27 UTC (rev 2647)
+++ vidalia/trunk/src/vidalia/config/servicepage.ui 2008-06-03 03:34:42 UTC (rev 2648)
@@ -87,7 +87,7 @@
<string/>
</property>
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/list-add.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/22x22/list-add.png</iconset>
</property>
</widget>
</item>
@@ -100,7 +100,7 @@
<string/>
</property>
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/list-remove.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/22x22/list-remove.png</iconset>
</property>
</widget>
</item>
@@ -113,7 +113,7 @@
<string/>
</property>
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/edit-copy.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/22x22/edit-copy.png</iconset>
</property>
</widget>
</item>
@@ -126,7 +126,7 @@
<string/>
</property>
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/folder.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/22x22/folder.png</iconset>
</property>
</widget>
</item>
Modified: vidalia/trunk/src/vidalia/config/upnptestdialog.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/upnptestdialog.ui 2008-06-03 03:34:27 UTC (rev 2647)
+++ vidalia/trunk/src/vidalia/config/upnptestdialog.ui 2008-06-03 03:34:42 UTC (rev 2648)
@@ -13,7 +13,7 @@
<string>Testing UPnP Support</string>
</property>
<property name="windowIcon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/48x48/modem.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/48x48/modem.png</iconset>
</property>
<property name="modal" >
<bool>true</bool>
@@ -63,7 +63,7 @@
<string/>
</property>
<property name="pixmap" >
- <pixmap resource="../res/vidalia_common.qrc" >:/images/48x48/modem.png</pixmap>
+ <pixmap resource="../res/vidalia.qrc" >:/images/48x48/modem.png</pixmap>
</property>
</widget>
<widget class="Line" name="line" >
@@ -94,7 +94,7 @@
</widget>
</widget>
<resources>
- <include location="../res/vidalia_common.qrc" />
+ <include location="../res/vidalia.qrc" />
</resources>
<connections />
</ui>
Modified: vidalia/trunk/src/vidalia/help/browser/helpbrowser.ui
===================================================================
--- vidalia/trunk/src/vidalia/help/browser/helpbrowser.ui 2008-06-03 03:34:27 UTC (rev 2647)
+++ vidalia/trunk/src/vidalia/help/browser/helpbrowser.ui 2008-06-03 03:34:42 UTC (rev 2648)
@@ -33,7 +33,7 @@
<string>Vidalia Help</string>
</property>
<property name="windowIcon" >
- <iconset resource="..\..\res\vidalia_common.qrc" >:/images/32x32/help-browser.png</iconset>
+ <iconset resource="..\..\res\vidalia.qrc" >:/images/32x32/help-browser.png</iconset>
</property>
<property name="statusTip" >
<string/>
@@ -127,7 +127,7 @@
<string/>
</property>
<property name="icon" >
- <iconset resource="..\..\res\vidalia_common.qrc" >:/images/22x22/emblem-unreadable.png</iconset>
+ <iconset resource="..\..\res\vidalia.qrc">:/images/32x32/window-close.png</iconset>
</property>
<property name="iconSize" >
<size>
@@ -174,7 +174,7 @@
<string>Find Previous</string>
</property>
<property name="icon" >
- <iconset resource="..\..\res\vidalia_common.qrc">:/images/22x22/go-up.png</iconset>
+ <iconset resource="..\..\res\vidalia.qrc">:/images/22x22/go-up-search.png</iconset>
</property>
</widget>
</item>
@@ -187,7 +187,7 @@
<string>Find Next</string>
</property>
<property name="icon" >
- <iconset resource="..\..\res\vidalia_common.qrc">:/images/22x22/go-down.png</iconset>
+ <iconset resource="..\..\res\vidalia.qrc">:/images/22x22/go-down-search.png</iconset>
</property>
</widget>
</item>
@@ -478,7 +478,7 @@
</widget>
<action name="actionBack" >
<property name="icon" >
- <iconset resource="..\..\res\vidalia_common.qrc" >:/images/22x22/go-previous.png</iconset>
+ <iconset resource="..\..\res\vidalia.qrc" >:/images/32x32/go-previous.png</iconset>
</property>
<property name="text" >
<string>Back</string>
@@ -492,7 +492,7 @@
</action>
<action name="actionForward" >
<property name="icon" >
- <iconset resource="..\..\res\vidalia_common.qrc" >:/images/22x22/go-next.png</iconset>
+ <iconset resource="..\..\res\vidalia.qrc" >:/images/32x32/go-next.png</iconset>
</property>
<property name="text" >
<string>Forward</string>
@@ -506,7 +506,7 @@
</action>
<action name="actionHome" >
<property name="icon" >
- <iconset resource="..\..\res\vidalia_common.qrc" >:/images/22x22/go-home.png</iconset>
+ <iconset resource="..\..\res\vidalia.qrc" >:/images/32x32/go-home.png</iconset>
</property>
<property name="text" >
<string>Home</string>
@@ -520,7 +520,7 @@
</action>
<action name="actionFind" >
<property name="icon" >
- <iconset resource="..\..\res\vidalia_common.qrc" >:/images/22x22/system-search.png</iconset>
+ <iconset resource="..\..\res\vidalia.qrc" >:/images/32x32/edit-find.png</iconset>
</property>
<property name="checkable" >
<bool>true</bool>
@@ -543,7 +543,7 @@
</action>
<action name="actionClose" >
<property name="icon" >
- <iconset resource="..\..\res\vidalia_common.qrc" >:/images/22x22/emblem-unreadable.png</iconset>
+ <iconset resource="..\..\res\vidalia.qrc" >:/images/32x32/window-close.png</iconset>
</property>
<property name="text" >
<string>Close</string>
@@ -581,8 +581,7 @@
<tabstop>treeSearch</tabstop>
</tabstops>
<resources>
- <include location="../../log/res/vidalia_common.qrc" />
- <include location="../../res/vidalia_common.qrc" />
+ <include location="../../res/vidalia.qrc" />
</resources>
<connections>
<connection>
Modified: vidalia/trunk/src/vidalia/log/messagelog.ui
===================================================================
--- vidalia/trunk/src/vidalia/log/messagelog.ui 2008-06-03 03:34:27 UTC (rev 2647)
+++ vidalia/trunk/src/vidalia/log/messagelog.ui 2008-06-03 03:34:42 UTC (rev 2648)
@@ -19,7 +19,7 @@
<string>Message Log</string>
</property>
<property name="windowIcon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/32x32/format-justify-fill.png</iconset>
+ <iconset resource="..\res\vidalia.qrc" >:/images/32x32/utilities-log-viewer.png</iconset>
</property>
<property name="statusTip" >
<string/>
@@ -217,7 +217,7 @@
<string>Error</string>
</property>
<property name="icon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/16x16/msg-error.png</iconset>
+ <iconset resource="..\res\vidalia.qrc">:/images/16x16/emblem-important.png</iconset>
</property>
</widget>
</item>
@@ -233,7 +233,7 @@
<string>Warning</string>
</property>
<property name="icon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/16x16/msg-warn.png</iconset>
+ <iconset resource="..\res\vidalia.qrc">:/images/16x16/dialog-warning.png</iconset>
</property>
</widget>
</item>
@@ -249,7 +249,7 @@
<string>Notice</string>
</property>
<property name="icon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/16x16/msg-notice.png</iconset>
+ <iconset resource="..\res\vidalia.qrc">:/images/16x16/preferences-desktop-notification.png</iconset>
</property>
</widget>
</item>
@@ -265,7 +265,7 @@
<string>Info</string>
</property>
<property name="icon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/16x16/msg-info.png</iconset>
+ <iconset resource="..\res\vidalia.qrc">:/images/16x16/dialog-information.png</iconset>
</property>
</widget>
</item>
@@ -281,7 +281,7 @@
<string>Debug</string>
</property>
<property name="icon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/16x16/msg-debug.png</iconset>
+ <iconset resource="..\res\vidalia.qrc">:/images/16x16/applications-system.png</iconset>
</property>
</widget>
</item>
@@ -468,7 +468,7 @@
</action>
<action name="actionClear" >
<property name="icon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/22x22/edit-clear.png</iconset>
+ <iconset resource="..\res\vidalia.qrc" >:/images/32x32/edit-clear.png</iconset>
</property>
<property name="text" >
<string>Clear</string>
@@ -485,7 +485,7 @@
</action>
<action name="actionCopy" >
<property name="icon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/22x22/edit-copy.png</iconset>
+ <iconset resource="..\res\vidalia.qrc" >:/images/32x32/edit-copy.png</iconset>
</property>
<property name="text" >
<string>Copy</string>
@@ -505,7 +505,7 @@
</action>
<action name="actionSelect_All" >
<property name="icon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/22x22/edit-select-all.png</iconset>
+ <iconset resource="..\res\vidalia.qrc" >:/images/32x32/edit-select-all.png</iconset>
</property>
<property name="text" >
<string>Select All</string>
@@ -522,7 +522,7 @@
</action>
<action name="actionSave_All" >
<property name="icon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/22x22/save-all.png</iconset>
+ <iconset resource="..\res\vidalia.qrc" >:/images/32x32/document-save-all.png</iconset>
</property>
<property name="text" >
<string>Save All</string>
@@ -533,7 +533,7 @@
</action>
<action name="actionSave_Selected" >
<property name="icon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/22x22/media-floppy.png</iconset>
+ <iconset resource="..\res\vidalia.qrc" >:/images/32x32/document-save.png</iconset>
</property>
<property name="text" >
<string>Save Selected</string>
@@ -547,7 +547,7 @@
<bool>true</bool>
</property>
<property name="icon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/22x22/preferences-desktop.png</iconset>
+ <iconset resource="..\res\vidalia.qrc" >:/images/32x32/preferences-other.png</iconset>
</property>
<property name="text" >
<string>Settings</string>
@@ -561,7 +561,7 @@
</action>
<action name="actionHelp" >
<property name="icon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/22x22/help-browser.png</iconset>
+ <iconset resource="..\res\vidalia.qrc" >:/images/32x32/help-browser.png</iconset>
</property>
<property name="text" >
<string>Help</string>
@@ -575,7 +575,7 @@
</action>
<action name="actionClose" >
<property name="icon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/22x22/emblem-unreadable.png</iconset>
+ <iconset resource="..\res\vidalia.qrc" >:/images/32x32/window-close.png</iconset>
</property>
<property name="text" >
<string>Close</string>
@@ -589,7 +589,7 @@
</action>
<action name="actionFind" >
<property name="icon" >
- <iconset resource="..\res\vidalia_common.qrc" >:/images/22x22/system-search.png</iconset>
+ <iconset resource="..\res\vidalia.qrc" >:/images/32x32/edit-find.png</iconset>
</property>
<property name="text" >
<string>Find</string>
@@ -616,8 +616,7 @@
</customwidget>
</customwidgets>
<resources>
- <include location="res/vidalia_common.qrc" />
- <include location="../res/vidalia_common.qrc" />
+ <include location="../res/vidalia.qrc" />
</resources>
<connections>
<connection>
Modified: vidalia/trunk/src/vidalia/main.cpp
===================================================================
--- vidalia/trunk/src/vidalia/main.cpp 2008-06-03 03:34:27 UTC (rev 2647)
+++ vidalia/trunk/src/vidalia/main.cpp 2008-06-03 03:34:42 UTC (rev 2648)
@@ -51,7 +51,7 @@
int
main(int argc, char *argv[])
{
- Q_INIT_RESOURCE(vidalia_common);
+ Q_INIT_RESOURCE(vidalia);
QStringList args = char_array_to_stringlist(argv+1, argc-1);
/* Construct the application object. Qt strips any command-line arguments
Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp 2008-06-03 03:34:27 UTC (rev 2647)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp 2008-06-03 03:34:42 UTC (rev 2648)
@@ -33,24 +33,24 @@
#define IMG_BWGRAPH ":/images/16x16/utilities-system-monitor.png"
#define IMG_CONTROL_PANEL ":/images/16x16/preferences-desktop.png"
-#define IMG_MESSAGELOG ":/images/16x16/format-justify-fill.png"
+#define IMG_MESSAGELOG ":/images/16x16/utilities-log-viewer.png"
#define IMG_CONFIG ":/images/16x16/preferences-system.png"
-#define IMG_IDENTITY ":/images/16x16/system-users.png"
+#define IMG_IDENTITY ":/images/16x16/user-identity.png"
#define IMG_HELP ":/images/16x16/help-browser.png"
#define IMG_ABOUT ":/images/16x16/help-about.png"
-#define IMG_EXIT ":/images/16x16/emblem-unreadable.png"
+#define IMG_EXIT ":/images/16x16/application-exit.png"
#define IMG_NETWORK ":/images/16x16/applications-internet.png"
-#define IMG_START_TOR_16 ":/images/16x16/start-tor.png"
-#define IMG_STOP_TOR_16 ":/images/16x16/stop-tor.png"
-#define IMG_START_TOR_48 ":/images/48x48/start-tor.png"
-#define IMG_STOP_TOR_48 ":/images/48x48/stop-tor.png"
+#define IMG_START_TOR_16 ":/images/16x16/media-playback-start.png"
+#define IMG_STOP_TOR_16 ":/images/16x16/media-playback-stop.png"
+#define IMG_START_TOR_48 ":/images/48x48/media-playback-start.png"
+#define IMG_STOP_TOR_48 ":/images/48x48/media-playback-stop.png"
#define IMG_TOR_STOPPED_48 ":/images/48x48/tor-off.png"
#define IMG_TOR_RUNNING_48 ":/images/48x48/tor-on.png"
#define IMG_TOR_STARTING_48 ":/images/48x48/tor-starting.png"
#define IMG_TOR_STOPPING_48 ":/images/48x48/tor-stopping.png"
-#define ANIM_PROCESS_WORKING ":/images/32x32/process-working.png"
+//#define //ANIM_PROCESS_WORKING ":/images/32x32/process-working.png"
/* Decide which of our four sets of tray icons to use. */
#if defined(Q_WS_WIN)
@@ -529,7 +529,7 @@
ui.lblStartStopTor->setText(tr("Starting"));
ui.lblStartStopTor->setEnabled(false);
ui.lblStartStopTor->setStatusTip(statusText);
- ui.lblStartStopTor->setAnimation(QPixmap(ANIM_PROCESS_WORKING));
+ //ui.lblStartStopTor->setAnimation(QPixmap(ANIM_PROCESS_WORKING));
} else if (status == CircuitEstablished) {
statusText = tr("Running");
trayIconFile = IMG_TOR_RUNNING;
Modified: vidalia/trunk/src/vidalia/mainwindow.ui
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.ui 2008-06-03 03:34:27 UTC (rev 2647)
+++ vidalia/trunk/src/vidalia/mainwindow.ui 2008-06-03 03:34:42 UTC (rev 2648)
@@ -177,7 +177,7 @@
<string>Start Tor</string>
</property>
<property name="statusTip" >
- <string>Start Tor</string>
+ <string>Start</string>
</property>
<property name="pixmap" >
<pixmap>:/images/48x48/start-tor.png</pixmap>
@@ -190,10 +190,10 @@
<string>Setup Relaying</string>
</property>
<property name="statusTip" >
- <string>Set up a Tor relay and help the network grow</string>
+ <string>Set up a relay and help the network grow</string>
</property>
<property name="pixmap" >
- <pixmap>:/images/48x48/network-server.png</pixmap>
+ <pixmap>:/images/48x48/network-workgroup.png</pixmap>
</property>
</widget>
</item>
@@ -222,7 +222,7 @@
<string>Make subsequent connections appear new</string>
</property>
<property name="pixmap" >
- <pixmap>:/images/48x48/system-users.png</pixmap>
+ <pixmap>:/images/48x48/user-identity.png</pixmap>
</property>
</widget>
</item>
@@ -267,7 +267,7 @@
<string>View Tor's log message history</string>
</property>
<property name="pixmap" >
- <pixmap>:/images/16x16/format-justify-fill.png</pixmap>
+ <pixmap>:/images/16x16/utilities-log-viewer.png</pixmap>
</property>
</widget>
</item>
@@ -327,7 +327,7 @@
<string>Settings</string>
</property>
<property name="statusTip" >
- <string>Configure Tor and Vidalia</string>
+ <string>Configure Vidalia</string>
</property>
<property name="pixmap" >
<pixmap>:/images/16x16/preferences-system.png</pixmap>
@@ -393,7 +393,7 @@
<string>Exit Vidalia</string>
</property>
<property name="pixmap" >
- <pixmap>:/images/16x16/emblem-unreadable.png</pixmap>
+ <pixmap>:/images/16x16/application-exit.png</pixmap>
</property>
</widget>
</item>
Modified: vidalia/trunk/src/vidalia/network/netviewer.ui
===================================================================
--- vidalia/trunk/src/vidalia/network/netviewer.ui 2008-06-03 03:34:27 UTC (rev 2647)
+++ vidalia/trunk/src/vidalia/network/netviewer.ui 2008-06-03 03:34:42 UTC (rev 2648)
@@ -24,7 +24,7 @@
<string>Tor Network Map</string>
</property>
<property name="windowIcon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/32x32/applications-internet.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/applications-internet.png</iconset>
</property>
<property name="toolButtonStyle" >
<enum>Qt::ToolButtonTextUnderIcon</enum>
@@ -230,7 +230,7 @@
<bool>false</bool>
</property>
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/view-refresh.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/view-refresh.png</iconset>
</property>
<property name="text" >
<string>Refresh</string>
@@ -247,7 +247,7 @@
</action>
<action name="actionHelp" >
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/help-browser.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/help-browser.png</iconset>
</property>
<property name="text" >
<string>Help</string>
@@ -264,7 +264,7 @@
</action>
<action name="actionClose" >
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/emblem-unreadable.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/window-close.png</iconset>
</property>
<property name="text" >
<string>Close</string>
@@ -281,7 +281,7 @@
</action>
<action name="actionZoomIn" >
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/zoom-in.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/zoom-in.png</iconset>
</property>
<property name="text" >
<string>Zoom In</string>
@@ -298,7 +298,7 @@
</action>
<action name="actionZoomOut" >
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/zoom-out.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/zoom-out.png</iconset>
</property>
<property name="text" >
<string>Zoom Out</string>
@@ -315,7 +315,7 @@
</action>
<action name="actionZoomToFit" >
<property name="icon" >
- <iconset resource="../res/vidalia_common.qrc" >:/images/22x22/zoom-to-fit.png</iconset>
+ <iconset resource="../res/vidalia.qrc" >:/images/32x32/zoom-fit-best.png</iconset>
</property>
<property name="text" >
<string>Zoom To Fit</string>
@@ -349,7 +349,7 @@
</customwidget>
</customwidgets>
<resources>
- <include location="../res/vidalia_common.qrc" />
+ <include location="../res/vidalia.qrc" />
</resources>
<connections>
<connection>
Added: vidalia/trunk/src/vidalia/res/16x16/application-exit.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/16x16/application-exit.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vidalia/trunk/src/vidalia/res/16x16/applications-internet.png
===================================================================
(Binary files differ)
Added: vidalia/trunk/src/vidalia/res/16x16/applications-system.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/16x16/applications-system.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/16x16/dialog-information.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/16x16/dialog-information.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/16x16/dialog-warning.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/16x16/dialog-warning.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/16x16/emblem-important.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/16x16/emblem-important.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: vidalia/trunk/src/vidalia/res/16x16/emblem-unreadable.png
Deleted: vidalia/trunk/src/vidalia/res/16x16/format-justify-fill.png
Deleted: vidalia/trunk/src/vidalia/res/16x16/go-next.png
Deleted: vidalia/trunk/src/vidalia/res/16x16/go-previous.png
Modified: vidalia/trunk/src/vidalia/res/16x16/help-browser.png
===================================================================
(Binary files differ)
Added: vidalia/trunk/src/vidalia/res/16x16/media-playback-start.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/16x16/media-playback-start.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/16x16/media-playback-stop.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/16x16/media-playback-stop.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: vidalia/trunk/src/vidalia/res/16x16/msg-debug.png
Deleted: vidalia/trunk/src/vidalia/res/16x16/msg-error.png
Deleted: vidalia/trunk/src/vidalia/res/16x16/msg-info.png
Deleted: vidalia/trunk/src/vidalia/res/16x16/msg-notice.png
Deleted: vidalia/trunk/src/vidalia/res/16x16/msg-warn.png
Deleted: vidalia/trunk/src/vidalia/res/16x16/network-offline.png
Added: vidalia/trunk/src/vidalia/res/16x16/preferences-desktop-notification.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/16x16/preferences-desktop-notification.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: vidalia/trunk/src/vidalia/res/16x16/preferences-desktop.png
Modified: vidalia/trunk/src/vidalia/res/16x16/preferences-system.png
===================================================================
(Binary files differ)
Deleted: vidalia/trunk/src/vidalia/res/16x16/start-tor.png
Deleted: vidalia/trunk/src/vidalia/res/16x16/stop-tor.png
Deleted: vidalia/trunk/src/vidalia/res/16x16/system-users.png
Added: vidalia/trunk/src/vidalia/res/16x16/user-identity.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/16x16/user-identity.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/16x16/utilities-log-viewer.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/16x16/utilities-log-viewer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vidalia/trunk/src/vidalia/res/16x16/utilities-system-monitor.png
===================================================================
(Binary files differ)
Deleted: vidalia/trunk/src/vidalia/res/16x16/zoom.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/edit-clear.png
Modified: vidalia/trunk/src/vidalia/res/22x22/edit-copy.png
===================================================================
(Binary files differ)
Deleted: vidalia/trunk/src/vidalia/res/22x22/edit-select-all.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/emblem-system.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/emblem-unreadable.png
Modified: vidalia/trunk/src/vidalia/res/22x22/folder.png
===================================================================
(Binary files differ)
Deleted: vidalia/trunk/src/vidalia/res/22x22/format-justify-fill.png
Added: vidalia/trunk/src/vidalia/res/22x22/go-down-search.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/22x22/go-down-search.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: vidalia/trunk/src/vidalia/res/22x22/go-down.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/go-home.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/go-next.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/go-previous.png
Added: vidalia/trunk/src/vidalia/res/22x22/go-up-search.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/22x22/go-up-search.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: vidalia/trunk/src/vidalia/res/22x22/go-up.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/help-browser.png
Modified: vidalia/trunk/src/vidalia/res/22x22/list-add.png
===================================================================
(Binary files differ)
Modified: vidalia/trunk/src/vidalia/res/22x22/list-remove.png
===================================================================
(Binary files differ)
Deleted: vidalia/trunk/src/vidalia/res/22x22/media-floppy.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/network-server.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/network-workgroup.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/preferences-desktop-locale.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/preferences-desktop.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/preferences-system.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/save-all.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/service.png
Added: vidalia/trunk/src/vidalia/res/22x22/system-help.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/22x22/system-help.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: vidalia/trunk/src/vidalia/res/22x22/system-search.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/utilities-system-monitor.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/view-refresh.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/zoom-in.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/zoom-out.png
Deleted: vidalia/trunk/src/vidalia/res/22x22/zoom-to-fit.png
Modified: vidalia/trunk/src/vidalia/res/32x32/applications-internet.png
===================================================================
(Binary files differ)
Added: vidalia/trunk/src/vidalia/res/32x32/applications-system.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/applications-system.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/document-save-all.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/document-save-all.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/document-save.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/document-save.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/edit-clear.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/edit-clear.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/edit-copy.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/edit-copy.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/edit-find.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/edit-find.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/edit-select-all.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/edit-select-all.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: vidalia/trunk/src/vidalia/res/32x32/format-justify-fill.png
Added: vidalia/trunk/src/vidalia/res/32x32/go-home.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/go-home.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/go-next.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/go-next.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/go-previous.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/go-previous.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vidalia/trunk/src/vidalia/res/32x32/help-browser.png
===================================================================
(Binary files differ)
Added: vidalia/trunk/src/vidalia/res/32x32/network-workgroup.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/network-workgroup.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/preferences-desktop-locale.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/preferences-desktop-locale.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/preferences-other.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/preferences-other.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/preferences-system-network.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/preferences-system-network.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vidalia/trunk/src/vidalia/res/32x32/preferences-system.png
===================================================================
(Binary files differ)
Deleted: vidalia/trunk/src/vidalia/res/32x32/process-working.png
Added: vidalia/trunk/src/vidalia/res/32x32/services.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/services.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/utilities-log-viewer.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/utilities-log-viewer.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vidalia/trunk/src/vidalia/res/32x32/utilities-system-monitor.png
===================================================================
(Binary files differ)
Added: vidalia/trunk/src/vidalia/res/32x32/view-refresh.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/view-refresh.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/window-close.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/window-close.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/zoom-fit-best.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/zoom-fit-best.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/zoom-in.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/zoom-in.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/32x32/zoom-out.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/32x32/zoom-out.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vidalia/trunk/src/vidalia/res/48x48/applications-internet.png
===================================================================
(Binary files differ)
Added: vidalia/trunk/src/vidalia/res/48x48/media-playback-start.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/48x48/media-playback-start.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/src/vidalia/res/48x48/media-playback-stop.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/48x48/media-playback-stop.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: vidalia/trunk/src/vidalia/res/48x48/network-server.png
Added: vidalia/trunk/src/vidalia/res/48x48/network-workgroup.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/48x48/network-workgroup.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: vidalia/trunk/src/vidalia/res/48x48/start-tor.png
Deleted: vidalia/trunk/src/vidalia/res/48x48/stop-tor.png
Deleted: vidalia/trunk/src/vidalia/res/48x48/system-users.png
Added: vidalia/trunk/src/vidalia/res/48x48/user-identity.png
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/src/vidalia/res/48x48/user-identity.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: vidalia/trunk/src/vidalia/res/qt_license.txt
Deleted: vidalia/trunk/src/vidalia/res/tor_license.txt
Copied: vidalia/trunk/src/vidalia/res/vidalia.qrc (from rev 2643, vidalia/trunk/src/vidalia/res/vidalia_common.qrc)
===================================================================
--- vidalia/trunk/src/vidalia/res/vidalia.qrc (rev 0)
+++ vidalia/trunk/src/vidalia/res/vidalia.qrc 2008-06-03 03:34:42 UTC (rev 2648)
@@ -0,0 +1,277 @@
+<RCC>
+ <qresource prefix="/docs">
+ <file>short_license.txt</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>16x16/application-exit.png</file>
+ <file>16x16/applications-internet.png</file>
+ <file>16x16/applications-system.png</file>
+ <file>16x16/dialog-information.png</file>
+ <file>16x16/dialog-warning.png</file>
+ <file>16x16/emblem-important.png</file>
+ <file>16x16/graph-area.png</file>
+ <file>16x16/graph-line.png</file>
+ <file>16x16/help-about.png</file>
+ <file>16x16/help-browser.png</file>
+ <file>16x16/media-playback-start.png</file>
+ <file>16x16/media-playback-stop.png</file>
+ <file>16x16/preferences-desktop-notification.png</file>
+ <file>16x16/preferences-system.png</file>
+ <file>16x16/tor-logo.png</file>
+ <file>16x16/tor-off.png</file>
+ <file>16x16/tor-on.png</file>
+ <file>16x16/tor-starting.png</file>
+ <file>16x16/tor-stopping.png</file>
+ <file>16x16/user-identity.png</file>
+ <file>16x16/utilities-log-viewer.png</file>
+ <file>16x16/utilities-system-monitor.png</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>22x22/folder.png</file>
+ <file>22x22/go-down-search.png</file>
+ <file>22x22/go-up-search.png</file>
+ <file>22x22/list-add.png</file>
+ <file>22x22/list-remove.png</file>
+ <file>22x22/system-help.png</file>
+ <file>22x22/tor-off.png</file>
+ <file>22x22/tor-on.png</file>
+ <file>22x22/tor-starting.png</file>
+ <file>22x22/tor-stopping.png</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>32x32/applications-internet.png</file>
+ <file>32x32/applications-system.png</file>
+ <file>32x32/document-save.png</file>
+ <file>32x32/document-save-all.png</file>
+ <file>32x32/edit-clear.png</file>
+ <file>32x32/edit-copy.png</file>
+ <file>32x32/edit-find.png</file>
+ <file>32x32/edit-select-all.png</file>
+ <file>32x32/go-home.png</file>
+ <file>32x32/go-next.png</file>
+ <file>32x32/go-previous.png</file>
+ <file>32x32/help-about.png</file>
+ <file>32x32/help-browser.png</file>
+ <file>32x32/network-workgroup.png</file>
+ <file>32x32/preferences-desktop-locale.png</file>
+ <file>32x32/preferences-other.png</file>
+ <file>32x32/preferences-system-network.png</file>
+ <file>32x32/services.png</file>
+ <file>32x32/tor-logo.png</file>
+ <file>32x32/tor-off.png</file>
+ <file>32x32/tor-on.png</file>
+ <file>32x32/tor-starting.png</file>
+ <file>32x32/tor-stopping.png</file>
+ <file>32x32/utilities-log-viewer.png</file>
+ <file>32x32/utilities-system-monitor.png</file>
+ <file>32x32/view-refresh.png</file>
+ <file>32x32/window-close.png</file>
+ <file>32x32/zoom-fit-best.png</file>
+ <file>32x32/zoom-in.png</file>
+ <file>32x32/zoom-out.png</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>48x48/applications-internet.png</file>
+ <file>48x48/media-playback-start.png</file>
+ <file>48x48/media-playback-stop.png</file>
+ <file>48x48/modem.png</file>
+ <file>48x48/network-workgroup.png</file>
+ <file>48x48/tor-off.png</file>
+ <file>48x48/tor-on.png</file>
+ <file>48x48/tor-starting.png</file>
+ <file>48x48/tor-stopping.png</file>
+ <file>48x48/user-identity.png</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>128x128/qt-logo.png</file>
+ <file>128x128/tor-logo.png</file>
+ <file>128x128/tor-on.png</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>icons/node-unresponsive.png</file>
+ <file>icons/node-hibernating.png</file>
+ <file>icons/node-bw-none.png</file>
+ <file>icons/node-bw-low.png</file>
+ <file>icons/node-bw-med.png</file>
+ <file>icons/node-bw-high.png</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>flags/ae.png</file>
+ <file>flags/af.png</file>
+ <file>flags/al.png</file>
+ <file>flags/am.png</file>
+ <file>flags/an.png</file>
+ <file>flags/ao.png</file>
+ <file>flags/ar.png</file>
+ <file>flags/at.png</file>
+ <file>flags/au.png</file>
+ <file>flags/aw.png</file>
+ <file>flags/az.png</file>
+ <file>flags/ba.png</file>
+ <file>flags/bb.png</file>
+ <file>flags/bd.png</file>
+ <file>flags/be.png</file>
+ <file>flags/bf.png</file>
+ <file>flags/bg.png</file>
+ <file>flags/bh.png</file>
+ <file>flags/bi.png</file>
+ <file>flags/bj.png</file>
+ <file>flags/bm.png</file>
+ <file>flags/bn.png</file>
+ <file>flags/bo.png</file>
+ <file>flags/br.png</file>
+ <file>flags/bs.png</file>
+ <file>flags/bt.png</file>
+ <file>flags/bw.png</file>
+ <file>flags/by.png</file>
+ <file>flags/bz.png</file>
+ <file>flags/ca.png</file>
+ <file>flags/cf.png</file>
+ <file>flags/cg.png</file>
+ <file>flags/ch.png</file>
+ <file>flags/ci.png</file>
+ <file>flags/ck.png</file>
+ <file>flags/cl.png</file>
+ <file>flags/cm.png</file>
+ <file>flags/cn.png</file>
+ <file>flags/co.png</file>
+ <file>flags/cr.png</file>
+ <file>flags/cs.png</file>
+ <file>flags/cu.png</file>
+ <file>flags/cv.png</file>
+ <file>flags/cy.png</file>
+ <file>flags/cz.png</file>
+ <file>flags/de.png</file>
+ <file>flags/dk.png</file>
+ <file>flags/dz.png</file>
+ <file>flags/ec.png</file>
+ <file>flags/ee.png</file>
+ <file>flags/eg.png</file>
+ <file>flags/er.png</file>
+ <file>flags/es.png</file>
+ <file>flags/et.png</file>
+ <file>flags/eu.png</file>
+ <file>flags/fi.png</file>
+ <file>flags/fj.png</file>
+ <file>flags/fo.png</file>
+ <file>flags/fr.png</file>
+ <file>flags/ga.png</file>
+ <file>flags/gb.png</file>
+ <file>flags/ge.png</file>
+ <file>flags/gi.png</file>
+ <file>flags/gl.png</file>
+ <file>flags/gp.png</file>
+ <file>flags/gr.png</file>
+ <file>flags/gt.png</file>
+ <file>flags/gu.png</file>
+ <file>flags/gy.png</file>
+ <file>flags/hk.png</file>
+ <file>flags/hr.png</file>
+ <file>flags/ht.png</file>
+ <file>flags/hu.png</file>
+ <file>flags/id.png</file>
+ <file>flags/ie.png</file>
+ <file>flags/il.png</file>
+ <file>flags/in.png</file>
+ <file>flags/iq.png</file>
+ <file>flags/ir.png</file>
+ <file>flags/is.png</file>
+ <file>flags/it.png</file>
+ <file>flags/jm.png</file>
+ <file>flags/jo.png</file>
+ <file>flags/jp.png</file>
+ <file>flags/ke.png</file>
+ <file>flags/kg.png</file>
+ <file>flags/kh.png</file>
+ <file>flags/ki.png</file>
+ <file>flags/kp.png</file>
+ <file>flags/kr.png</file>
+ <file>flags/kw.png</file>
+ <file>flags/ky.png</file>
+ <file>flags/kz.png</file>
+ <file>flags/lb.png</file>
+ <file>flags/lc.png</file>
+ <file>flags/lk.png</file>
+ <file>flags/lt.png</file>
+ <file>flags/lu.png</file>
+ <file>flags/lv.png</file>
+ <file>flags/ly.png</file>
+ <file>flags/ma.png</file>
+ <file>flags/mc.png</file>
+ <file>flags/md.png</file>
+ <file>flags/mg.png</file>
+ <file>flags/mk.png</file>
+ <file>flags/mn.png</file>
+ <file>flags/mo.png</file>
+ <file>flags/mp.png</file>
+ <file>flags/ms.png</file>
+ <file>flags/mt.png</file>
+ <file>flags/mx.png</file>
+ <file>flags/my.png</file>
+ <file>flags/mz.png</file>
+ <file>flags/na.png</file>
+ <file>flags/nc.png</file>
+ <file>flags/nf.png</file>
+ <file>flags/nl.png</file>
+ <file>flags/no.png</file>
+ <file>flags/np.png</file>
+ <file>flags/nr.png</file>
+ <file>flags/nz.png</file>
+ <file>flags/om.png</file>
+ <file>flags/pa.png</file>
+ <file>flags/pe.png</file>
+ <file>flags/pf.png</file>
+ <file>flags/ph.png</file>
+ <file>flags/pk.png</file>
+ <file>flags/pl.png</file>
+ <file>flags/pm.png</file>
+ <file>flags/pr.png</file>
+ <file>flags/pt.png</file>
+ <file>flags/py.png</file>
+ <file>flags/qa.png</file>
+ <file>flags/ro.png</file>
+ <file>flags/ru.png</file>
+ <file>flags/sa.png</file>
+ <file>flags/sb.png</file>
+ <file>flags/sd.png</file>
+ <file>flags/se.png</file>
+ <file>flags/sg.png</file>
+ <file>flags/si.png</file>
+ <file>flags/sk.png</file>
+ <file>flags/sl.png</file>
+ <file>flags/sm.png</file>
+ <file>flags/so.png</file>
+ <file>flags/sy.png</file>
+ <file>flags/tc.png</file>
+ <file>flags/tg.png</file>
+ <file>flags/th.png</file>
+ <file>flags/tn.png</file>
+ <file>flags/to.png</file>
+ <file>flags/tp.png</file>
+ <file>flags/tr.png</file>
+ <file>flags/tt.png</file>
+ <file>flags/tv.png</file>
+ <file>flags/tw.png</file>
+ <file>flags/tz.png</file>
+ <file>flags/ua.png</file>
+ <file>flags/ug.png</file>
+ <file>flags/us.png</file>
+ <file>flags/uy.png</file>
+ <file>flags/va.png</file>
+ <file>flags/ve.png</file>
+ <file>flags/vg.png</file>
+ <file>flags/vi.png</file>
+ <file>flags/vn.png</file>
+ <file>flags/ws.png</file>
+ <file>flags/ye.png</file>
+ <file>flags/za.png</file>
+ <file>flags/zw.png</file>
+ <file>flags/unknown.png</file>
+ </qresource>
+ <qresource prefix="/images">
+ <file>map/world-map.png</file>
+ </qresource>
+ <qresource prefix="/geoip">
+ <file>cacert_root.crt</file>
+ </qresource>
+</RCC>
Deleted: vidalia/trunk/src/vidalia/res/vidalia_common.qrc
Deleted: vidalia/trunk/src/vidalia/res/vidalia_license.txt