Changeset 2354

Timestamp:

02/23/08 23:02:19 (11 months ago)

Author:

edmanm

Message:

r129@lysithea: edmanm | 2008-02-23 23:02:10 -0500
Remove our tray icon implementation for X11 and Win32. We haven't used it
since we started requiring Qt >= 4.2.0 and part of the X11 implementation
is derived from another GPL'ed project. Removing it makes it easier to
add our OpenSSL license exception.

Location:

vidalia/trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• config.h.in (modified) (1 diff)
• src/vidalia/CMakeLists.txt (modified) (1 diff)
• src/vidalia/mainwindow.cpp (modified) (2 diffs)
• src/vidalia/tray/trayicon.cpp (modified) (8 diffs)
• src/vidalia/tray/trayicon.h (modified) (2 diffs)
• src/vidalia/tray/trayicon_win.cpp (deleted)
• src/vidalia/tray/trayicon_win.h (deleted)
• src/vidalia/tray/trayicon_x11.cpp (deleted)
• src/vidalia/tray/trayicon_x11.h (deleted)

vidalia/trunk/CMakeLists.txt

@@ -5 +5 @@
 #
 #  Copyright (C) 2006-2007,  Matt Edman, Justin Hipple
+#  Copyright (C) 2008,  Matt Edman
 #
 #  This program is free software; you can redistribute it and/or
@@ -57 +58 @@
 endif(APPLE)
 
-## Check for QSystemTrayIcon
+## Check for QSslSocket
 set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${QT_INCLUDES})
-if (NOT APPLE)
-  check_include_file_cxx("qsystemtrayicon.h" HAVE_QSYSTEMTRAYICON_H)
-  if (HAVE_QSYSTEMTRAYICON_H)
-    option(USE_QSYSTEMTRAYICON "Use Qt's tray icon implementation." ON)
-  endif(HAVE_QSYSTEMTRAYICON_H)
-endif(NOT APPLE)
-
-## Check for QSslSocket
 check_include_file_cxx("qsslsocket.h" HAVE_QSSLSOCKET_H)
 if (HAVE_QSSLSOCKET_H)

vidalia/trunk/config.h.in

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

vidalia/trunk/src/vidalia/CMakeLists.txt

@@ -153 +153 @@
 set(vidalia_SRCS ${vidalia_SRCS} tray/trayicon.cpp)
 qt4_wrap_cpp(vidalia_SRCS tray/trayicon.h)
-if(USE_QSYSTEMTRAYICON AND NOT APPLE)
+if(APPLE)
+  set(vidalia_SRCS ${vidalia_SRCS} tray/trayicon_mac.cpp)
+  qt4_wrap_cpp(vidalia_SRCS tray/trayicon_mac.h)
+else(APPLE)
   ## Use Qt's QSystemTrayIcon implementation
   set(vidalia_SRCS ${vidalia_SRCS} tray/trayicon_qt.cpp)
   qt4_wrap_cpp(vidalia_SRCS tray/trayicon_qt.h)
-else(USE_QSYSTEMTRAYICON AND NOT APPLE)
-  ## Use our custom tray icon implementation
-  if(WIN32)
-    set(vidalia_SRCS ${vidalia_SRCS} tray/trayicon_win.cpp)
-    qt4_wrap_cpp(vidalia_SRCS tray/trayicon_win.h)
-  else(WIN32)
-    if(APPLE)
-      set(vidalia_SRCS ${vidalia_SRCS} tray/trayicon_mac.cpp)
-      qt4_wrap_cpp(vidalia_SRCS tray/trayicon_mac.h)
-    else(APPLE)
-      set(vidalia_SRCS ${vidalia_SRCS} tray/trayicon_x11.cpp)
-      qt4_wrap_cpp(vidalia_SRCS tray/trayicon_x11.h)
-    endif(APPLE)
-  endif(WIN32)
-endif(USE_QSYSTEMTRAYICON AND NOT APPLE)
+endif(APPLE)
 
 ## Main Vidalia sources

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(USE_QSYSTEMTRAYICON)
 /* QSystemTrayIcon on Windows wants 16x16 .png files */
 #define IMG_TOR_STOPPED  ":/images/16x16/tor-off.png"
@@ -74 +73 @@
 #define IMG_TOR_STARTING ":/images/16x16/tor-starting.png"
 #define IMG_TOR_STOPPING ":/images/16x16/tor-stopping.png"
-#else
-/* Use the .ico files */
-#include "res/vidalia_win.rc.h"
-#define IMG_TOR_STOPPED    QString::number(IDI_TOR_OFF)
-#define IMG_TOR_RUNNING    QString::number(IDI_TOR_ON)
-#define IMG_TOR_STARTING   QString::number(IDI_TOR_STARTING)
-#define IMG_TOR_STOPPING   QString::number(IDI_TOR_STOPPING)
-#endif
 #elif defined(Q_WS_MAC)
 /* On Mac, we always go straight to Carbon to load our dock images 

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

@@ -40 +40 @@
   : TrayIconImpl(parent)
 {
-  _contextMenu = 0;
 }
 
@@ -48 +47 @@
 {
   switch (event->type()) {
-    case QEvent::MouseButtonPress:
-      mouseButtonPress((QMouseEvent *)event);
-      break;
-
-    case QEvent::MouseButtonRelease:
-      mouseButtonRelease((QMouseEvent *)event);
-      break;
-
     case QEvent::MouseButtonDblClick:
       mouseButtonDblClick((QMouseEvent *)event);
@@ -65 +56 @@
   event->accept();
   return true;
-}
-
-/** Responds to a single mouse button press. On X11, we display the menu when
- * a mouse button is pressed. */
-void
-TrayIcon::mouseButtonPress(QMouseEvent *event)
-{
-#if defined(Q_WS_X11) && !defined(USE_QSYSTEMTRAYICON)
-  if (_contextMenu) {
-    _contextMenu->popup(event->globalPos());
-  }
-#else
-  Q_UNUSED(event);
-#endif
-}
-
-/** Responds to a single mouse button release. On Windows, we display the menu
- * when a mouse button is released. */
-void
-TrayIcon::mouseButtonRelease(QMouseEvent *event)
-{
-#if defined(Q_WS_WIN)
-  if (_contextMenu) {
-    /* This little activateWindow() dance is necessary to make menu closing
-     * work properly on Windows. */
-    _contextMenu->activateWindow();
-    _contextMenu->popup(event->globalPos());
-    _contextMenu->activateWindow();
-  }
-#else
-  Q_UNUSED(event);
-#endif
 }
 
@@ -153 +112 @@
 #if defined(Q_WS_MAC)
   qt_mac_set_dock_menu(menu);
-#elif defined(USE_QSYSTEMTRAYICON)
+#else
   TrayIconImpl::setContextMenu(menu);
-#else
-  _contextMenu = menu;
 #endif
 }
@@ -165 +122 @@
                              BalloonMessageIcon balloonIcon)
 {
-#if defined(USE_QSYSTEMTRAYICON)
+#if defined(Q_WS_MAC)
+  Q_UNUSED(title)
+  Q_UNUSED(message)
+  Q_UNUSED(balloonIcon)
+#else
   QSystemTrayIcon::MessageIcon icon;
   switch (balloonIcon) {
@@ -174 +135 @@
   }
   TrayIconImpl::showMessage(title, message, icon);
-#else
-  Q_UNUSED(title)
-  Q_UNUSED(message)
-  Q_UNUSED(balloonIcon)
 #endif
 }
@@ -189 +146 @@
   /* We always have a tray on Win32 or a dock on OS X */
   return true;
-#elif defined(USE_QSYSTEMTRAYICON)
+#else
   /* Ask Qt if there is a tray available */
   return QSystemTrayIcon::isSystemTrayAvailable();
-#else
-  /* XXX:This is too optimistic, but we need to make our own tray icon
-   * implementation smart enough to detect a system tray on X11. */
-  return true;
 #endif
 }
@@ -204 +157 @@
 TrayIcon::supportsBalloonMessages()
 {
-#if defined(USE_QSYSTEMTRAYICON)
 #if defined(Q_WS_WIN)
   return (QSystemTrayIcon::supportsMessages()
             && QSysInfo::WindowsVersion > QSysInfo::WV_2000);
+#elif defined(Q_WS_MAC)
+  return false;
 #else
   return QSystemTrayIcon::supportsMessages();
 #endif
-#else
-  return false;    
-#endif
 }
 

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

@@ -36 +36 @@
 
 /* Include the correct tray icon implementation */
-#if defined(USE_QSYSTEMTRAYICON)
+#if defined(Q_WS_MAC)
+#include "trayicon_mac.h"
+#else
 #include "trayicon_qt.h"
-#elif defined(Q_WS_WIN)
-#include "trayicon_win.h"
-#elif defined(Q_WS_X11)
-#include "trayicon_x11.h"
-#else
-#include "trayicon_mac.h"
 #endif
 
@@ -93 +89 @@
   /** Override's QObject' event() method to catch mouse-related events. */
   bool event(QEvent *);
-  /** Respond to a mouse button being pressed. */ 
-  void mouseButtonPress(QMouseEvent *event);
-  /** Respond to a mouse button being released. */
-  void mouseButtonRelease(QMouseEvent *event);
   /** Respond to a mouse button being double-clicked. */
   void mouseButtonDblClick(QMouseEvent *event);
-
-private:
-  QMenu* _contextMenu; /**< Menu to display when the tray icon is clicked. */
 };