Changeset 23

Timestamp:

01/08/06 17:42:57 (3 years ago)

Author:

edmanm

Message:

Add a Vidalia application icon based on tor_logo.
Use Justin's new icons.

Location:

trunk/src/gui

Files:

• gui.pri (modified) (1 diff)
• mainwindow.cpp (modified) (1 diff)
• res/vidalia.icns (added)
• res/vidalia.ico (added)
• res/vidalia.qrc (modified) (1 diff)

trunk/src/gui/gui.pri

@@ -28 +28 @@
 RESOURCES += $$PWD/res/vidalia.qrc
 
-# Uncomment the following when we have the right icons made
-#
 #macx {
-#  ICON = $$PWD/res/vidalia.icns
+  ICON = $$PWD/res/vidalia.icns
 #}
-#win32 {
-#  RC_FILE = $$PWD/res/vidalia.rc
-#}
+win32 {
+  RC_FILE = $$PWD/res/vidalia.rc
+}
 
 include($$PWD/trayicon/trayicon.pri)

trunk/src/gui/mainwindow.cpp

@@ -29 +29 @@
 {
   /* Set Vidalia's application icon */
-  setWindowIcon(QIcon(":/images/tor_on.png"));
+  setWindowIcon(QIcon(":/images/tor_on32.png"));
   
   /* Put an icon in the system tray to indicate the status of Tor */
-  _trayIcon = new TrayIcon(QPixmap(":/images/tor_on.png"),
+  _trayIcon = new TrayIcon(QPixmap(":/images/tor_on32.png"),
                            tr("Vidalia"), 0, this);
   _trayIcon->show();

trunk/src/gui/res/vidalia.qrc

@@ -1 +1 @@
 <!DOCTYPE RCC><RCC version="1.0">
   <qresource prefix="/images">
-    <file>tor_on.png</file>
-    <file>tor_off.png</file>
+    <file>vidalia.ico</file>
+    <file>vidalia.icns</file>
+    <file>tor_logo32.ico</file>
+    <file>tor_off32.png</file>
+    <file>tor_off48.png</file>
+    <file>tor_off128.png</file>
+    <file>tor_on32.png</file>
+    <file>tor_on48.png</file>
+    <file>tor_on128.png</file>
   </qresource>
 </RCC>