Changeset 2320

Timestamp:

01/24/08 16:34:10 (12 months ago)

Author:

edmanm

Message:

r74@lysithea: edmanm | 2008-01-24 16:34:07 -0500
Here's the other, uh, 90% of r2319.

Location:

vidalia/trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• config.h.in (modified) (1 diff)
• src/vidalia/mainwindow.cpp (modified) (1 diff)
• src/vidalia/tray/trayicon.cpp (modified) (5 diffs)
• src/vidalia/tray/trayicon.h (modified) (1 diff)

vidalia/trunk/CMakeLists.txt

@@ -55 +55 @@
   check_include_file_cxx("qsystemtrayicon.h" HAVE_QSYSTEMTRAYICON_H)
   if (HAVE_QSYSTEMTRAYICON_H)
-    option(WITH_QSYSTEMTRAYICON "Use Qt's tray icon implementation." ON)
-    if (NOT USE_QSYSTEMTRAYICON)
-      ## Disable the use of QSystemTrayIcon
-      set(HAVE_QSYSTEMTRAYICON_H "")
-    endif(NOT USE_QSYSTEMTRAYICON)
+    option(USE_QSYSTEMTRAYICON "Use Qt's tray icon implementation." ON)
   endif(HAVE_QSYSTEMTRAYICON_H)
 endif(NOT APPLE)

vidalia/trunk/config.h.in

@@ -1 +1 @@
 
 #cmakedefine HAVE_QSYSTEMTRAYICON_H
+
+#cmakedefine USE_QSYSTEMTRAYICON
 
 #cmakedefine HAVE_QSSLSOCKET_H

vidalia/trunk/src/vidalia/mainwindow.cpp

@@ -68 +68 @@
 /* Decide which of our four sets of tray icons to use. */
 #if defined(Q_WS_WIN)
-#if defined(HAVE_QSYSTEMTRAYICON_H)
+#if defined(USE_QSYSTEMTRAYICON)
 /* QSystemTrayIcon on Windows wants 16x16 .png files */
 #define IMG_TOR_STOPPED  ":/images/16x16/tor-off.png"

vidalia/trunk/src/vidalia/tray/trayicon.cpp

@@ -72 +72 @@
 TrayIcon::mouseButtonPress(QMouseEvent *event)
 {
-#if defined(Q_WS_X11) && !defined(HAVE_QSYSTEMTRAYICON_H)
+#if defined(Q_WS_X11) && !defined(USE_QSYSTEMTRAYICON)
   if (_contextMenu) {
     _contextMenu->popup(event->globalPos());
@@ -153 +153 @@
 #if defined(Q_WS_MAC)
   qt_mac_set_dock_menu(menu);
-#elif defined(HAVE_QSYSTEMTRAYICON_H)
+#elif defined(USE_QSYSTEMTRAYICON)
   TrayIconImpl::setContextMenu(menu);
 #else
@@ -165 +165 @@
                              BalloonMessageIcon balloonIcon)
 {
-#if defined(HAVE_QSYSTEMTRAYICON_H)
+#if defined(USE_QSYSTEMTRAYICON)
   QSystemTrayIcon::MessageIcon icon;
   switch (balloonIcon) {
@@ -189 +189 @@
   /* We always have a tray on Win32 or a dock on OS X */
   return true;
-#elif defined(HAVE_QSYSTEMTRAYICON_H)
+#elif defined(USE_QSYSTEMTRAYICON)
   /* Ask Qt if there is a tray available */
   return QSystemTrayIcon::isSystemTrayAvailable();
@@ -204 +204 @@
 TrayIcon::supportsBalloonMessages()
 {
-#if defined(HAVE_QSYSTEMTRAYICON_H)
+#if defined(USE_QSYSTEMTRAYICON)
 #if defined(Q_WS_WIN)
   return (QSystemTrayIcon::supportsMessages()

vidalia/trunk/src/vidalia/tray/trayicon.h

@@ -36 +36 @@
 
 /* Include the correct tray icon implementation */
-#if defined(HAVE_QSYSTEMTRAYICON_H)
+#if defined(USE_QSYSTEMTRAYICON)
 #include "trayicon_qt.h"
 #elif defined(Q_WS_WIN)