Changeset 6160 for trunk/qt4-gui/src/core

Timestamp:

04/18/08 09:40:19 (8 months ago)

Author:

eugene

Message:

• Somewhat remade the chat settings page layout to make it look good in non-KDE mode;
• fixed some typos;
• simplified URL viewer invocation (no more signals);
• made KDE mode be fully dependent on desktop setting of browser/mailer, while non-KDE mode can still fallback to daemon's settings in case Qt autodetection failes (current Qt rules could be found here: http://psi-im.org/wiki/Browser_X11).

Location:

trunk/qt4-gui/src/core

Files:

• licqgui.cpp (modified) (5 diffs)
• licqgui.h (modified) (2 diffs)

trunk/qt4-gui/src/core/licqgui.cpp

@@ -40 +40 @@
 #include <KDE/KUrl>
 #else
+# include <QDesktopServices>
 # include <QStyle>
 # include <QStyleFactory>
+# include <QUrl>
 #endif
 
@@ -858 +860 @@
 
   UserViewEvent* e = new UserViewEvent(id, ppid);
-  connect(e, SIGNAL(viewUrl(QWidget*, QString)), SLOT(viewUrl(QWidget*, QString)));
 
   e->show();
@@ -969 +970 @@
   if (e == NULL) return NULL;
 
-  connect(e, SIGNAL(viewUrl(QWidget*, QString)), SLOT(viewUrl(QWidget*, QString)));
-
   QWidget* msgWindow = e;
   if (Config::Chat::instance()->tabbedChatting())
@@ -1042 +1041 @@
 }
 
-void LicqGui::viewUrl(QWidget* parent, QString url)
+void LicqGui::viewUrl(QString url)
 {
 #ifdef USE_KDE
@@ -1048 +1047 @@
     KToolInvocation::invokeMailer(KUrl(url));
   else
-  // If no URL viewer is set, use KDE default
-  if (!myLicqDaemon->getUrlViewer())
     KToolInvocation::invokeBrowser(url);
-  else
 #else
-  // If no URL viewer is set, try DEFAULT_URL_VIEWER (mozilla)
-  if (!myLicqDaemon->getUrlViewer())
-    myLicqDaemon->setUrlViewer(DEFAULT_URL_VIEWER);
+  if (!QDesktopServices::openUrl(QUrl(url)))
+  {
+    if (!myLicqDaemon->getUrlViewer())
+      myLicqDaemon->setUrlViewer(DEFAULT_URL_VIEWER);
+    if (!myLicqDaemon->ViewUrl(url.toLocal8Bit().data()))
+      WarnUser(NULL, tr("Licq is unable to start your browser and open the URL.\n"
+            "You will need to start the browser and open the URL manually."));
+  }
 #endif
-  {
-    if (!myLicqDaemon->ViewUrl(url.toLocal8Bit().data()))
-      WarnUser(parent,
-          tr("Licq is unable to start your browser and open the URL.\n"
-            "You will need to start the browser and open the URL manually."));
-  }
 }
 

trunk/qt4-gui/src/core/licqgui.h

@@ -194 +194 @@
   void changeStatus(unsigned long status, unsigned long ppid, bool invisible = false);
 
+  /**
+   * Invoke the desktop-aware URL viewer
+   *
+   * @param url The URL to open
+   */
+  void viewUrl(QString url);
+
 public slots:
   /**
@@ -222 +229 @@
   void sendFileTransfer(QString id, unsigned long ppid, const QString& filename, const QString& description);
   void sendChatRequest(QString id, unsigned long ppid);
-
-  void viewUrl(QWidget* parent, QString url);
 
 private slots: