From 26752f0c28606b79fd2601be5f37eda66fed4be8 Mon Sep 17 00:00:00 2001
From: jjl
Date: Wed, 22 Sep 2010 20:38:27 +0200
Subject: [PVSGUI] always construct QSystemTrayIcon, even if systray is not
available
---
i18n/pvsgui_ar_JO.ts | 38 +++++++++++++++++++-------------------
i18n/pvsgui_de_DE.ts | 38 +++++++++++++++++++-------------------
i18n/pvsgui_es_MX.ts | 38 +++++++++++++++++++-------------------
i18n/pvsgui_fr_FR.ts | 38 +++++++++++++++++++-------------------
i18n/pvsgui_pl_PL.ts | 38 +++++++++++++++++++-------------------
src/pvsgui.cpp | 14 ++++----------
6 files changed, 99 insertions(+), 105 deletions(-)
diff --git a/i18n/pvsgui_ar_JO.ts b/i18n/pvsgui_ar_JO.ts
index 41291ca..3cda399 100644
--- a/i18n/pvsgui_ar_JO.ts
+++ b/i18n/pvsgui_ar_JO.ts
@@ -399,77 +399,77 @@ p, li { white-space: pre-wrap; }
-
+
&Disconnect
-
+
C&hat
-
+
&Send File
-
+
&Config
-
+
&Information
-
+
&About
-
+
&Quit
-
-
-
+
+
+
PVS Connection
-
+
Please enter password (If not needed leave blank):
-
+
Are you sure you want to disconnect?
-
-
+
+
PVS connection
-
-
+
+
Connected to
-
-
+
+
Disconnected
-
+
New host available:
diff --git a/i18n/pvsgui_de_DE.ts b/i18n/pvsgui_de_DE.ts
index 73aae10..60230ed 100644
--- a/i18n/pvsgui_de_DE.ts
+++ b/i18n/pvsgui_de_DE.ts
@@ -407,77 +407,77 @@ p, li { white-space: pre-wrap; }
Verbinden
-
+
&Disconnect
&Trennen
-
+
C&hat
-
+
&Send File
Datei &Senden
-
+
&Config
&Konfiguration
-
+
&Information
&Information
-
+
&About
&Über
-
+
&Quit
&Beenden
-
-
-
+
+
+
PVS Connection
PVS Verbindung
-
+
Please enter password (If not needed leave blank):
Bitte geben sie ein Passwor ein (Falls nicht erforderlich einfach leer lassen):
-
+
Are you sure you want to disconnect?
Sind sie sicher dass sie die Verbindung trennen möchten?
-
-
+
+
PVS connection
PVS Verbindung
-
-
+
+
Connected to
Verbunden mit
-
-
+
+
Disconnected
Getrennt
-
+
New host available:
Neuer Host verfügbar:
diff --git a/i18n/pvsgui_es_MX.ts b/i18n/pvsgui_es_MX.ts
index effb8d1..5720604 100644
--- a/i18n/pvsgui_es_MX.ts
+++ b/i18n/pvsgui_es_MX.ts
@@ -419,77 +419,77 @@ p, li { white-space: pre-wrap; }
Conectar
-
+
&Disconnect
&Desconectar
-
+
C&hat
???
-
+
&Send File
&Enviar archivo
-
+
&Config
&Configuración
-
+
&Information
&Información
-
+
&About
&Acerca de
-
+
&Quit
&Cerrar
-
-
-
+
+
+
PVS Connection
PVS Connección
-
+
Please enter password (If not needed leave blank):
Porfavor ingrese una contraseña (Deje la seccion vacia si no lo necesita):
-
+
Are you sure you want to disconnect?
Realmente desea desconectarse?
-
-
+
+
PVS connection
PVS Connección
-
-
+
+
Connected to
Connectar a
-
-
+
+
Disconnected
Desconectado
-
+
New host available:
Nuevo Host disponible:
diff --git a/i18n/pvsgui_fr_FR.ts b/i18n/pvsgui_fr_FR.ts
index 41291ca..3cda399 100644
--- a/i18n/pvsgui_fr_FR.ts
+++ b/i18n/pvsgui_fr_FR.ts
@@ -399,77 +399,77 @@ p, li { white-space: pre-wrap; }
-
+
&Disconnect
-
+
C&hat
-
+
&Send File
-
+
&Config
-
+
&Information
-
+
&About
-
+
&Quit
-
-
-
+
+
+
PVS Connection
-
+
Please enter password (If not needed leave blank):
-
+
Are you sure you want to disconnect?
-
-
+
+
PVS connection
-
-
+
+
Connected to
-
-
+
+
Disconnected
-
+
New host available:
diff --git a/i18n/pvsgui_pl_PL.ts b/i18n/pvsgui_pl_PL.ts
index 41291ca..3cda399 100644
--- a/i18n/pvsgui_pl_PL.ts
+++ b/i18n/pvsgui_pl_PL.ts
@@ -399,77 +399,77 @@ p, li { white-space: pre-wrap; }
-
+
&Disconnect
-
+
C&hat
-
+
&Send File
-
+
&Config
-
+
&Information
-
+
&About
-
+
&Quit
-
-
-
+
+
+
PVS Connection
-
+
Please enter password (If not needed leave blank):
-
+
Are you sure you want to disconnect?
-
-
+
+
PVS connection
-
-
+
+
Connected to
-
-
+
+
Disconnected
-
+
New host available:
diff --git a/src/pvsgui.cpp b/src/pvsgui.cpp
index 747d843..5f2ac60 100644
--- a/src/pvsgui.cpp
+++ b/src/pvsgui.cpp
@@ -44,16 +44,10 @@ PVSGUI::PVSGUI(QWidget *parent) :
setupMenu();
- if (QSystemTrayIcon::isSystemTrayAvailable())
- {
- qDebug("[%s] System tray available.", metaObject()->className());
- _trayIcon = new QSystemTrayIcon(QIcon(":cam_off32.svg"), this);
- _trayIcon->setContextMenu(_menu);
- _trayIcon->setVisible(true);
- _chatDialog->setTrayIcon(_trayIcon);
- }
- else
- _trayIcon = NULL;
+ _trayIcon = new QSystemTrayIcon(QIcon(":cam_off32.svg"), this);
+ _trayIcon->setContextMenu(_menu);
+ _trayIcon->setVisible(true);
+ _chatDialog->setTrayIcon(_trayIcon);
// connect to D-Bus and get interface
QDBusConnection dbus = QDBusConnection::sessionBus();
--
cgit v1.2.3-55-g7522