Links in events are now clickable (resolves ticket #4).

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index a133d25daa77862f05dd299065c7a2b26f679d55..3b834519c75c2995699c4f32fdde1ea00c3e609a 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -44,7 +44,10 @@ EventDialog::EventDialog(const int &aEventId, QWidget *aParent)
     persons->setText(event.persons().join(" and "));
     abstract->setText(event.abstract());
     description->setText(event.description());
     persons->setText(event.persons().join(" and "));
     abstract->setText(event.abstract());
     description->setText(event.description());

-    links->setText(static_cast<QStringList>(event.links().values()).join("\n"));
+    QStringList linksText = static_cast<QStringList>(event.links().values());
+    for (QStringList::iterator linkIterator = linksText.begin(); linkIterator != linksText.end(); ++linkIterator)
+        *linkIterator = QString("<a href=\"%1\">%1</a>").arg(*linkIterator);
+    links->setText(linksText.join("<br/>"));

 
     connect(favouriteButton, SIGNAL(clicked()), SLOT(favouriteClicked()));
     connect(alarmButton, SIGNAL(clicked()), SLOT(alarmClicked()));
 
     connect(favouriteButton, SIGNAL(clicked()), SLOT(favouriteClicked()));
     connect(alarmButton, SIGNAL(clicked()), SLOT(alarmClicked()));

diff --git a/src/gui/eventdialog.ui b/src/gui/eventdialog.ui
index c45b059ace0d2926efefa7c25513fea0e8b9981f..4eff409d4327c5ef40d53d13da1756c84e597142 100644 (file)
--- a/src/gui/eventdialog.ui
+++ b/src/gui/eventdialog.ui
@@ -67,8 +67,8 @@
          <rect>
           <x>0</x>
           <y>0</y>
          <rect>
           <x>0</x>
           <y>0</y>

-          <width>463</width>
-          <height>270</height>
+          <width>461</width>
+          <height>276</height>

          </rect>
         </property>
         <layout class="QGridLayout" name="gridLayout_2">
          </rect>
         </property>
         <layout class="QGridLayout" name="gridLayout_2">


@@ -230,12 +230,18 @@
                  <property name="text">
                   <string>LINKS</string>
                  </property>
                  <property name="text">
                   <string>LINKS</string>
                  </property>

+                 <property name="textFormat">
+                  <enum>Qt::RichText</enum>
+                 </property>

                  <property name="wordWrap">
                   <bool>true</bool>
                  </property>
                  <property name="openExternalLinks">
                   <bool>true</bool>
                  </property>
                  <property name="wordWrap">
                   <bool>true</bool>
                  </property>
                  <property name="openExternalLinks">
                   <bool>true</bool>
                  </property>

+                 <property name="textInteractionFlags">
+                  <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
+                 </property>

                 </widget>
                </item>
               </layout>
                 </widget>
                </item>
               </layout>