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

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/userevents

Files:

• usereventcommon.h (modified) (1 diff)
• usersendcommon.cpp (modified) (1 diff)
• userviewevent.cpp (modified) (3 diffs)

trunk/qt4-gui/src/userevents/usereventcommon.h

@@ -124 +124 @@
   void finished(QString id, unsigned long ppid);
   void encodingChanged();
-  void viewUrl(QWidget*, QString);
 };
 

trunk/qt4-gui/src/userevents/usersendcommon.cpp

@@ -404 +404 @@
     gUserManager.DropUser(u);
 
-    connect(myHistoryView, SIGNAL(viewurl(QWidget*, QString)),
-        LicqGui::instance(), SLOT(viewUrl(QWidget*, QString)));
     connect(gMainWindow, SIGNAL(signal_sentevent(ICQEvent*)),
         myHistoryView, SLOT(addMsg(ICQEvent*)));

trunk/qt4-gui/src/userevents/userviewevent.cpp

@@ -91 +91 @@
   connect(gMainWindow, SIGNAL(signal_sentevent(ICQEvent*)),
       SLOT(sentEvent(ICQEvent*)));
-  connect(myMessageView, SIGNAL(viewurl(QWidget*, QString)),
-      LicqGui::instance(), SLOT(viewUrl(QWidget*, QString)));
 
   QGroupBox* h_action = new QGroupBox();
@@ -404 +402 @@
       url.prepend("file://");
 
-#ifdef USE_KDE
-      // If no URL viewer is set, use KDE default
-      if (!gLicqDaemon->getUrlViewer())
-        KToolInvocation::invokeBrowser(url);
-      else
-#endif
-      {
-        if (!gLicqDaemon->ViewUrl(url.toLocal8Bit().data()))
-          WarnUser(this, 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."));
-      }
+      LicqGui::instance()->viewUrl(url);
+
       break;
     }
@@ -590 +579 @@
 
     case ICQ_CMDxSUB_URL:   // view a url
-      emit viewUrl(this, dynamic_cast<CEventUrl*>(myCurrentEvent)->Url());
+      LicqGui::instance()->viewUrl(dynamic_cast<CEventUrl*>(myCurrentEvent)->Url());
       break;
   } // switch