Changed the event dialog layout hoping to improve issue #48.

diff --git a/src/gui/eventdialog.cpp b/src/gui/eventdialog.cpp
index c95104c008a21d2b4b4c7b45316c236bba2e7331..28e59143533cd4e14583ba5a9ff29b10d72923e0 100644 (file)
--- a/src/gui/eventdialog.cpp
+++ b/src/gui/eventdialog.cpp
@@ -36,14 +36,35 @@ EventDialog::EventDialog(int conferenceId, int eventId, QWidget *parent): QDialo
 
     Event event = Event::getById(mEventId, mConferenceId);
 
 
     Event event = Event::getById(mEventId, mConferenceId);
 

-    title->setText(event.title());
-    persons->setText(event.persons().join(" and "));
-    abstract->setText(event.abstract());
-    description->setText(event.description());
-    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/>"));
+    QString info;
+    // title
+    info.append(QString("<h1>%1</h1>\n").arg(event.title()));
+
+    // persons
+    info += QString("<h2>%1</h2>\n").arg(tr("Persons"));
+    info += QString("<p>%1</p>\n").arg(event.persons().join(", "));
+
+    // abstract
+    info += QString("<h2>%1</h2>\n").arg(tr("Abstract"));
+    info += QString("<p>%1</p>\n").arg(event.abstract());
+
+    // description
+    info += QString("<h2>%1</h2>\n").arg(tr("Description"));
+    info += QString("<p>%1</p>\n").arg(event.description());
+
+    // links
+    info += QString("<h2>%1</h2>\n<ul>\n").arg(tr("Links"));
+    QMapIterator<QString, QString> i(event.links());
+    while (i.hasNext()) {
+        i.next();
+        QString url(i.value());
+        QString name(i.key());
+        if (url.isEmpty() || url == "http://") continue;
+        if (name.isEmpty()) name = url;
+        info += QString("<li><a href=\"%1\">%2</a></li>\n").arg(url, name);
+    }
+    info += QString("</ul>\n");
+    eventInfoTextBrowser->setHtml(info);

 
     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 1ab6a55a26d0aedbd9fdcdf337ed03ae3c547d76..73e0f90320e51aa8056e1cfa1da5741de37312d8 100644 (file)
--- a/src/gui/eventdialog.ui
+++ b/src/gui/eventdialog.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
    <rect>
     <x>0</x>
     <y>0</y>

-    <width>485</width>
-    <height>368</height>
+    <width>539</width>
+    <height>404</height>

    </rect>
   </property>
   <property name="sizePolicy">
    </rect>
   </property>
   <property name="sizePolicy">


@@ -22,323 +22,72 @@
   <property name="autoFillBackground">
    <bool>false</bool>
   </property>
   <property name="autoFillBackground">
    <bool>false</bool>
   </property>

-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <layout class="QVBoxLayout" name="verticalLayout">
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QTextBrowser" name="eventInfoTextBrowser">
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">

      <item>
      <item>

-      <widget class="QLabel" name="title">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-         <underline>true</underline>
-        </font>
-       </property>
+      <widget class="QToolButton" name="alarmButton">

        <property name="text">
        <property name="text">

-        <string>Title goes here</string>
+        <string>...</string>

        </property>
        </property>

-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
+       <property name="icon">
+        <iconset resource="../icons.qrc">
+         <normaloff>:/icons/alarm-off.png</normaloff>:/icons/alarm-off.png</iconset>

        </property>
        </property>

-       <property name="wordWrap">
-        <bool>true</bool>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
+       <property name="shortcut">
+        <string>CapsLock</string>

        </property>
       </widget>
      </item>
      <item>
        </property>
       </widget>
      </item>
      <item>

-      <widget class="QScrollArea" name="scrollArea">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
+      <widget class="QToolButton" name="favouriteButton">
+       <property name="text">
+        <string>...</string>

        </property>
        </property>

-       <property name="widgetResizable">
-        <bool>true</bool>
+       <property name="icon">
+        <iconset resource="../icons.qrc">
+         <normaloff>:/icons/favourite-off.png</normaloff>:/icons/favourite-off.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>

        </property>
        </property>

-       <widget class="QWidget" name="scrollAreaWidgetContents">
-        <property name="geometry">
-         <rect>
-          <x>0</x>
-          <y>-1</y>
-          <width>446</width>
-          <height>262</height>
-         </rect>
-        </property>
-        <layout class="QGridLayout" name="gridLayout_2">
-         <item row="0" column="0">
-          <widget class="QWidget" name="content" native="true">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <layout class="QVBoxLayout" name="verticalLayout_2">
-            <item>
-             <widget class="QGroupBox" name="personsGB">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="font">
-               <font>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="title">
-               <string>Persons</string>
-              </property>
-              <layout class="QVBoxLayout" name="verticalLayout_3">
-               <item>
-                <widget class="QLabel" name="persons">
-                 <property name="font">
-                  <font>
-                   <weight>50</weight>
-                   <bold>false</bold>
-                  </font>
-                 </property>
-                 <property name="text">
-                  <string>PERSONS</string>
-                 </property>
-                 <property name="wordWrap">
-                  <bool>true</bool>
-                 </property>
-                 <property name="openExternalLinks">
-                  <bool>true</bool>
-                 </property>
-                 <property name="textInteractionFlags">
-                  <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="abstractGB">
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-              <property name="font">
-               <font>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="title">
-               <string>Abstract</string>
-              </property>
-              <layout class="QVBoxLayout" name="verticalLayout_4">
-               <item>
-                <widget class="QLabel" name="abstract">
-                 <property name="font">
-                  <font>
-                   <weight>50</weight>
-                   <bold>false</bold>
-                  </font>
-                 </property>
-                 <property name="text">
-                  <string>ABSTRACT</string>
-                 </property>
-                 <property name="wordWrap">
-                  <bool>true</bool>
-                 </property>
-                 <property name="openExternalLinks">
-                  <bool>true</bool>
-                 </property>
-                 <property name="textInteractionFlags">
-                  <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="descriptionGB">
-              <property name="font">
-               <font>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="title">
-               <string>Description</string>
-              </property>
-              <layout class="QVBoxLayout" name="verticalLayout_5">
-               <item>
-                <widget class="QLabel" name="description">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="font">
-                  <font>
-                   <weight>50</weight>
-                   <bold>false</bold>
-                  </font>
-                 </property>
-                 <property name="text">
-                  <string>DESCRIPTION</string>
-                 </property>
-                 <property name="wordWrap">
-                  <bool>true</bool>
-                 </property>
-                 <property name="openExternalLinks">
-                  <bool>true</bool>
-                 </property>
-                 <property name="textInteractionFlags">
-                  <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QGroupBox" name="linksGB">
-              <property name="font">
-               <font>
-                <weight>75</weight>
-                <bold>true</bold>
-               </font>
-              </property>
-              <property name="title">
-               <string>Links</string>
-              </property>
-              <layout class="QVBoxLayout" name="verticalLayout_6">
-               <item>
-                <widget class="QLabel" name="links">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="font">
-                  <font>
-                   <weight>50</weight>
-                   <bold>false</bold>
-                  </font>
-                 </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="textInteractionFlags">
-                  <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-        </layout>
-       </widget>

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

-      <spacer name="verticalSpacer_2">
+      <spacer name="horizontalSpacer">

        <property name="orientation">
        <property name="orientation">

-        <enum>Qt::Vertical</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Minimum</enum>
+        <enum>Qt::Horizontal</enum>

        </property>
        <property name="sizeHint" stdset="0">
         <size>
        </property>
        <property name="sizeHint" stdset="0">
         <size>

-         <width>20</width>
-         <height>10</height>
+         <width>40</width>
+         <height>20</height>

         </size>
        </property>
       </spacer>
      </item>
      <item>
         </size>
        </property>
       </spacer>
      </item>
      <item>

-      <layout class="QHBoxLayout" name="horizontalLayout">
-       <item>
-        <widget class="QToolButton" name="alarmButton">
-         <property name="text">
-          <string>...</string>
-         </property>
-         <property name="icon">
-          <iconset resource="../icons.qrc">
-           <normaloff>:/icons/alarm-off.png</normaloff>:/icons/alarm-off.png</iconset>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>32</width>
-           <height>32</height>
-          </size>
-         </property>
-         <property name="shortcut">
-          <string>CapsLock</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QToolButton" name="favouriteButton">
-         <property name="text">
-          <string>...</string>
-         </property>
-         <property name="icon">
-          <iconset resource="../icons.qrc">
-           <normaloff>:/icons/favourite-off.png</normaloff>:/icons/favourite-off.png</iconset>
-         </property>
-         <property name="iconSize">
-          <size>
-           <width>32</width>
-           <height>32</height>
-          </size>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item>
-        <widget class="QPushButton" name="okButton">
-         <property name="text">
-          <string>OK</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
+      <widget class="QPushButton" name="okButton">
+       <property name="text">
+        <string>OK</string>
+       </property>
+      </widget>

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