[vidalia-svn] r2218: Add a WITH_QSYSTEMTRAYICON option (defaults to ON) to allow (in trunk: . src/vidalia/tray)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2007-12-16 03:07:34 -0500 (Sun, 16 Dec 2007)
New Revision: 2218

Modified:
   trunk/
   trunk/CMakeLists.txt
   trunk/src/vidalia/tray/trayicon.cpp
   trunk/src/vidalia/tray/trayicon.h
   trunk/src/vidalia/tray/trayicon_mac.cpp
   trunk/src/vidalia/tray/trayicon_mac.h
   trunk/src/vidalia/tray/trayicon_win.cpp
   trunk/src/vidalia/tray/trayicon_win.h
   trunk/src/vidalia/tray/trayicon_x11.cpp
   trunk/src/vidalia/tray/trayicon_x11.h
Log:
 r2307@lysithea:  edmanm | 2007-12-16 03:03:26 -0500
 Add a WITH_QSYSTEMTRAYICON option (defaults to ON) to allow compiling with our
 own tray icon implementation when QSystemTrayIcon is available. Also, make our
 tray icon implementation build again.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /local/vidalia/trunk [r2307] on 0108964c-5b0b-4c9e-969f-e2288315d100

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2007-12-16 07:24:36 UTC (rev 2217)
+++ trunk/CMakeLists.txt	2007-12-16 08:07:34 UTC (rev 2218)
@@ -53,6 +53,13 @@
 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(WITH_QSYSTEMTRAYICON "Use Qt's tray icon implementation." ON)
+    if (NOT WITH_QSYSTEMTRAYICON)
+      ## Disable the use of QSystemTrayIcon
+      set(HAVE_QSYSTEMTRAYICON_H "")
+    endif(NOT WITH_QSYSTEMTRAYICON)
+  endif(HAVE_QSYSTEMTRAYICON_H)
 endif(NOT APPLE)
 
 ## Write out a configuration file

Modified: trunk/src/vidalia/tray/trayicon.cpp
===================================================================
--- trunk/src/vidalia/tray/trayicon.cpp	2007-12-16 07:24:36 UTC (rev 2217)
+++ trunk/src/vidalia/tray/trayicon.cpp	2007-12-16 08:07:34 UTC (rev 2218)
@@ -36,7 +36,7 @@
 
 
 /** Default constructor. */
-TrayIcon::TrayIcon(QObject *parent)
+TrayIcon::TrayIcon(QWidget *parent)
   : TrayIconImpl(parent)
 {
   _contextMenu = 0;
@@ -176,7 +176,7 @@
 #else
   Q_UNUSED(title)
   Q_UNUSED(message)
-  Q_UNUSED(icon)
+  Q_UNUSED(balloonIcon)
 #endif
 }
 

Modified: trunk/src/vidalia/tray/trayicon.h
===================================================================
--- trunk/src/vidalia/tray/trayicon.h	2007-12-16 07:24:36 UTC (rev 2217)
+++ trunk/src/vidalia/tray/trayicon.h	2007-12-16 08:07:34 UTC (rev 2218)
@@ -60,7 +60,7 @@
   };
 
   /** Default constructor. */
-  TrayIcon(QObject *parent = 0);
+  TrayIcon(QWidget *parent = 0);
 
   /** Show the tray icon. */
   void show();

Modified: trunk/src/vidalia/tray/trayicon_mac.cpp
===================================================================
--- trunk/src/vidalia/tray/trayicon_mac.cpp	2007-12-16 07:24:36 UTC (rev 2217)
+++ trunk/src/vidalia/tray/trayicon_mac.cpp	2007-12-16 08:07:34 UTC (rev 2218)
@@ -31,7 +31,7 @@
 
 
 /** Default constructor */
-TrayIconImpl::TrayIconImpl(QObject *parent)
+TrayIconImpl::TrayIconImpl(QWidget *parent)
   : QWidget(parent)
 {
   setObjectName("trayiconimpl");

Modified: trunk/src/vidalia/tray/trayicon_mac.h
===================================================================
--- trunk/src/vidalia/tray/trayicon_mac.h	2007-12-16 07:24:36 UTC (rev 2217)
+++ trunk/src/vidalia/tray/trayicon_mac.h	2007-12-16 08:07:34 UTC (rev 2218)
@@ -40,7 +40,7 @@
 
 protected:
   /** Default Constructor */
-  TrayIconImpl(QObject *parent = 0);
+  TrayIconImpl(QWidget *parent = 0);
   /** Destructor */
   ~TrayIconImpl();
 

Modified: trunk/src/vidalia/tray/trayicon_win.cpp
===================================================================
--- trunk/src/vidalia/tray/trayicon_win.cpp	2007-12-16 07:24:36 UTC (rev 2217)
+++ trunk/src/vidalia/tray/trayicon_win.cpp	2007-12-16 08:07:34 UTC (rev 2218)
@@ -55,7 +55,7 @@
 
 
 /** Default constructor. */
-TrayIconImpl::TrayIconImpl(QObject *parent)
+TrayIconImpl::TrayIconImpl(QWidget *parent)
   : QWidget(parent)
 {
   setObjectName("trayiconimpl");

Modified: trunk/src/vidalia/tray/trayicon_win.h
===================================================================
--- trunk/src/vidalia/tray/trayicon_win.h	2007-12-16 07:24:36 UTC (rev 2217)
+++ trunk/src/vidalia/tray/trayicon_win.h	2007-12-16 08:07:34 UTC (rev 2218)
@@ -42,7 +42,7 @@
 
 protected:
   /** Default constructor. */
-  TrayIconImpl(QObject *parent = 0);
+  TrayIconImpl(QWidget *parent = 0);
 
   /** Show the tray icon. */
   void show();

Modified: trunk/src/vidalia/tray/trayicon_x11.cpp
===================================================================
--- trunk/src/vidalia/tray/trayicon_x11.cpp	2007-12-16 07:24:36 UTC (rev 2217)
+++ trunk/src/vidalia/tray/trayicon_x11.cpp	2007-12-16 08:07:34 UTC (rev 2218)
@@ -60,7 +60,7 @@
 
 
 /* Default constructor */
-TrayIconImpl::TrayIconImpl(QObject *parent)
+TrayIconImpl::TrayIconImpl(QWidget *parent)
   : QLabel(parent)
 {
   setObjectName("trayiconimpl");

Modified: trunk/src/vidalia/tray/trayicon_x11.h
===================================================================
--- trunk/src/vidalia/tray/trayicon_x11.h	2007-12-16 07:24:36 UTC (rev 2217)
+++ trunk/src/vidalia/tray/trayicon_x11.h	2007-12-16 08:07:34 UTC (rev 2218)
@@ -60,7 +60,7 @@
 
 protected:
   /** Default constructor. */
-  TrayIconImpl(QObject *parent = 0);
+  TrayIconImpl(QWidget *parent = 0);
 
   /** Show the tray icon image. */
   void show();