import schedule dialog

 - changed to widget
 - moved to 'conference' tab

diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index 601720d3685b86f7ce90cdbbda579b0f8f77394c..50def416cc97fd297eaef445fe8d1e5f5d75c818 100644 (file)
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -25,21 +25,21 @@ maemo {
 
 FORMS += mainwindow.ui \
          daynavigatorwidget.ui \
 
 FORMS += mainwindow.ui \
          daynavigatorwidget.ui \

-         importscheduledialog.ui \
+         importschedulewidget.ui \

          about.ui \
          eventdialog.ui \
          mapwindow.ui
 
 HEADERS += mainwindow.h \
            daynavigatorwidget.h \
          about.ui \
          eventdialog.ui \
          mapwindow.ui
 
 HEADERS += mainwindow.h \
            daynavigatorwidget.h \

-           importscheduledialog.h \
+           importschedulewidget.h \

            eventdialog.h \
            tabwidget.h \
            mapwindow.h
 
 SOURCES += mainwindow.cpp \
            daynavigatorwidget.cpp \
            eventdialog.h \
            tabwidget.h \
            mapwindow.h
 
 SOURCES += mainwindow.cpp \
            daynavigatorwidget.cpp \

-           importscheduledialog.cpp \
+           importschedulewidget.cpp \

            eventdialog.cpp \
            tabwidget.cpp \
            mapwindow.cpp
            eventdialog.cpp \
            tabwidget.cpp \
            mapwindow.cpp

diff --git a/src/gui/importscheduledialog.cpp b/src/gui/importscheduledialog.cpp
deleted file mode 100644 (file)
index a87f36f..0000000
--- a/src/gui/importscheduledialog.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include "importscheduledialog.h"
-
-#include <schedulexmlparser.h>
-#include <sqlengine.h>
-
-#include <QDir>
-#include <QFile>
-#include <QFileDialog>
-#include <QDebug>
-
-ImportScheduleDialog::ImportScheduleDialog(SqlEngine *aSqlEngine, QWidget *aParent)
-    : QDialog(aParent)
-    , mSqlEngine(aSqlEngine)
-{
-    setupUi(this);
-
-    mXmlParser = new ScheduleXmlParser(this);
-    connect(mXmlParser, SIGNAL(progressStatus(int)), SLOT(showParsingProgress(int)));
-    connect(mXmlParser, SIGNAL(parsingSchedule(const QString &)), SLOT(setWindowTitle(const QString &)));
-
-    connect(import, SIGNAL(clicked()), SLOT(importSchedule()));
-    connect(search, SIGNAL(clicked()), SLOT(searchSchedule()));
-    progressBar->hide();
-    import->setEnabled(false);
-}
-
-ImportScheduleDialog::~ImportScheduleDialog()
-{
-    if(mXmlParser)
-    {
-        delete mXmlParser;
-        mXmlParser = NULL;
-    }
-}
-
-void ImportScheduleDialog::showParsingProgress(int progress)
-{
-    progressBar->setValue(progress);
-}
-
-void ImportScheduleDialog::searchSchedule()
-{
-    mScheduleFileName = QFileDialog::getOpenFileName(this, tr("Select Conference Schedule"), QDir::homePath(), tr("Schedule Files (*.xml)"));
-    if(QFile::exists(mScheduleFileName))
-        import->setEnabled(true);
-    else
-    {
-        import->setEnabled(false);
-        progressBar->hide();
-    }
-}
-
-void ImportScheduleDialog::importSchedule()
-{
-    QFile file(mScheduleFileName);
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
-    {
-        qDebug() << "can't open " << file.fileName();
-        return;
-    }
-
-    QByteArray data = file.readAll();
-    if(mSqlEngine)
-    {
-        progressBar->show();
-        mXmlParser->parseData(data,mSqlEngine);
-        close();
-    }
-}
-

diff --git a/src/gui/importscheduledialog.h b/src/gui/importscheduledialog.h
deleted file mode 100644 (file)
index 7fef281..0000000
--- a/src/gui/importscheduledialog.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef IMPORTSCHEDULEDIALOG_H
-#define IMPORTSCHEDULEDIALOG_H
-
-#include <QDialog>
-#include "ui_importscheduledialog.h"
-
-class ScheduleXmlParser;
-class SqlEngine;
-
-class ImportScheduleDialog : public QDialog, Ui::ImportScheduleDialog
-{
-    Q_OBJECT
-    public:
-        ImportScheduleDialog(SqlEngine *aSqlEngine, QWidget *aParent = NULL);
-        ~ImportScheduleDialog();
-    private slots:
-        void searchSchedule();
-        void importSchedule();
-        void showParsingProgress(int progress);
-    private:
-        ScheduleXmlParser *mXmlParser;
-        SqlEngine *mSqlEngine; // uses it
-        QString mScheduleFileName;
-};
-
-#endif /* IMPORTSCHEDULEDIALOG_H */
-

diff --git a/src/gui/importscheduledialog.ui b/src/gui/importscheduledialog.ui
deleted file mode 100644 (file)
index cea270f..0000000
--- a/src/gui/importscheduledialog.ui
+++ /dev/null
@@ -1,95 +0,0 @@
-<ui version="4.0" >
- <class>ImportScheduleDialog</class>
- <widget class="QDialog" name="ImportScheduleDialog" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>330</width>
-    <height>74</height>
-   </rect>
-  </property>
-  <property name="sizePolicy" >
-   <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle" >
-   <string>Import schedule</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <item row="0" column="0" >
-    <layout class="QVBoxLayout" name="verticalLayout" >
-     <item>
-      <widget class="QProgressBar" name="progressBar" >
-       <property name="value" >
-        <number>0</number>
-       </property>
-       <property name="textVisible" >
-        <bool>false</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout_2" >
-       <item>
-        <widget class="QPushButton" name="search" >
-         <property name="text" >
-          <string>Search</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_2" >
-         <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="import" >
-         <property name="text" >
-          <string>Import</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QPushButton" name="cancel" >
-         <property name="text" >
-          <string>Cancel</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>cancel</sender>
-   <signal>clicked()</signal>
-   <receiver>ImportScheduleDialog</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>515</x>
-     <y>124</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>283</x>
-     <y>80</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>

diff --git a/src/gui/importschedulewidget.cpp b/src/gui/importschedulewidget.cpp
new file mode 100644 (file)
index 0000000..20d48ac
--- /dev/null
+++ b/src/gui/importschedulewidget.cpp
@@ -0,0 +1,87 @@
+#include "importschedulewidget.h"
+
+#include <schedulexmlparser.h>
+#include <sqlengine.h>
+
+#include <QDir>
+#include <QFile>
+#include <QFileDialog>
+#include <QDebug>
+
+ImportScheduleWidget::ImportScheduleWidget(QWidget *aParent)
+    : QWidget(aParent)
+    , mSqlEngine(NULL)
+{
+    setupUi(this);
+
+    mXmlParser = new ScheduleXmlParser(this);
+    connect(mXmlParser, SIGNAL(progressStatus(int)), SLOT(showParsingProgress(int)));
+    connect(mXmlParser, SIGNAL(parsingSchedule(const QString &)), SLOT(setWindowTitle(const QString &)));
+
+    connect(import, SIGNAL(clicked()), SLOT(importSchedule()));
+    connect(search, SIGNAL(clicked()), SLOT(searchSchedule()));
+    progressBar->hide();
+    import->setEnabled(false);
+}
+
+ImportScheduleWidget::~ImportScheduleWidget()
+{
+    if(mXmlParser)
+    {
+        delete mXmlParser;
+        mXmlParser = NULL;
+    }
+}
+
+void ImportScheduleWidget::setSqlEngine(SqlEngine *aSqlEngine)
+{
+    Q_ASSERT(aSqlEngine != NULL);
+
+    mSqlEngine = aSqlEngine;
+}
+
+void ImportScheduleWidget::showParsingProgress(int progress)
+{
+    progressBar->setValue(progress);
+}
+
+void ImportScheduleWidget::searchSchedule()
+{
+    Q_ASSERT(mSqlEngine != NULL);
+
+    mScheduleFileName = QFileDialog::getOpenFileName(this, tr("Select Conference Schedule"), QDir::homePath(), tr("Schedule Files (*.xml)"));
+    if(QFile::exists(mScheduleFileName))
+        import->setEnabled(true);
+    else
+    {
+        import->setEnabled(false);
+        progressBar->hide();
+    }
+}
+
+void ImportScheduleWidget::importSchedule()
+{
+    if(!mSqlEngine)
+    {
+        qDebug() << "ImportScheduleWidget::importSchedule(): sqlEngine not set";
+        return;
+    }
+
+    QFile file(mScheduleFileName);
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    {
+        qDebug() << "can't open " << file.fileName();
+        return;
+    }
+
+    QByteArray data = file.readAll();
+    progressBar->show();
+    int confId = mXmlParser->parseData(data,mSqlEngine);
+
+    // hide stuff
+    import->setEnabled(false);
+    progressBar->hide();
+
+    emit(scheduleImported(confId));
+}
+

diff --git a/src/gui/importschedulewidget.h b/src/gui/importschedulewidget.h
new file mode 100644 (file)
index 0000000..b9d8a1e
--- /dev/null
+++ b/src/gui/importschedulewidget.h
@@ -0,0 +1,30 @@
+#ifndef IMPORTSCHEDULEWIDGET_H
+#define IMPORTSCHEDULEWIDGET_H
+
+#include <QWidget>
+#include "ui_importschedulewidget.h"
+
+class ScheduleXmlParser;
+class SqlEngine;
+
+class ImportScheduleWidget : public QWidget, Ui::ImportScheduleWidget
+{
+    Q_OBJECT
+    public:
+        ImportScheduleWidget(QWidget *aParent = NULL); // don't forget to use setSqlEngine()
+        ~ImportScheduleWidget();
+        void setSqlEngine(SqlEngine *aSqlEngine);
+    private slots:
+        void searchSchedule();
+        void importSchedule();
+        void showParsingProgress(int progress);
+    signals:
+        void scheduleImported(int confId);
+    private:
+        ScheduleXmlParser *mXmlParser;
+        SqlEngine *mSqlEngine; // uses it
+        QString mScheduleFileName;
+};
+
+#endif /* IMPORTSCHEDULEWIDGET_H */
+

diff --git a/src/gui/importschedulewidget.ui b/src/gui/importschedulewidget.ui
new file mode 100644 (file)
index 0000000..bf76875
--- /dev/null
+++ b/src/gui/importschedulewidget.ui
@@ -0,0 +1,78 @@
+<ui version="4.0" >
+ <class>ImportScheduleWidget</class>
+ <widget class="QWidget" name="ImportScheduleWidget" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>379</width>
+    <height>82</height>
+   </rect>
+  </property>
+  <property name="sizePolicy" >
+   <sizepolicy vsizetype="MinimumExpanding" hsizetype="Preferred" >
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle" >
+   <string>Import schedule</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout" >
+   <item row="0" column="0" >
+    <layout class="QVBoxLayout" name="verticalLayout" >
+     <item>
+      <widget class="QProgressBar" name="progressBar" >
+       <property name="value" >
+        <number>0</number>
+       </property>
+       <property name="textVisible" >
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout_2" >
+       <item>
+        <widget class="QLabel" name="label" >
+         <property name="text" >
+          <string>Import schedule: </string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="search" >
+         <property name="text" >
+          <string>Search</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_2" >
+         <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="import" >
+         <property name="text" >
+          <string>Import</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 17ae65bd6e3bfd08dd40f6230579de91495db5e1..aa6aee5888fad15401cadd221659470286479898 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -18,7 +18,7 @@
 #include "ui_about.h"
 #include "eventdialog.h"
 #include "daynavigatorwidget.h"
 #include "ui_about.h"
 #include "eventdialog.h"
 #include "daynavigatorwidget.h"

-#include "importscheduledialog.h"
+#include "importschedulewidget.h"

 #include "mapwindow.h"
 
 MainWindow::MainWindow(int aEventId, QWidget *aParent)
 #include "mapwindow.h"
 
 MainWindow::MainWindow(int aEventId, QWidget *aParent)


@@ -30,6 +30,7 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
     // opens DB connection (needed for EventModel)
     mSqlEngine = new SqlEngine(this);
     mSqlEngine->initialize();
     // opens DB connection (needed for EventModel)
     mSqlEngine = new SqlEngine(this);
     mSqlEngine->initialize();

+    importScheduleWidget->setSqlEngine(mSqlEngine);

 
     // Sanity check for existence of any Conference in the DB
     // it AppSettings::confId() is 0, but there are any Conference(s) in the DB
 
     // Sanity check for existence of any Conference in the DB
     // it AppSettings::confId() is 0, but there are any Conference(s) in the DB


@@ -45,8 +46,9 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
             AppSettings::setConfId(confs[0].id());
     }
 
             AppSettings::setConfId(confs[0].id());
     }
 

+    connect(importScheduleWidget, SIGNAL(scheduleImported(int)), SLOT(scheduleImported(int)));
+

     // connect Menu actions
     // connect Menu actions

-    connect(actionImportSchedule, SIGNAL(triggered()), SLOT(importSchedule()));

     connect(actionAboutQt, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
     connect(actionAboutApplication, SIGNAL(triggered()), SLOT(aboutApp()));
 
     connect(actionAboutQt, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
     connect(actionAboutApplication, SIGNAL(triggered()), SLOT(aboutApp()));
 


@@ -199,10 +201,9 @@ MainWindow::~MainWindow()
     }
 }
 
     }
 }
 

-void MainWindow::importSchedule()
+void MainWindow::scheduleImported(int aConfId)

 {
 {

-    ImportScheduleDialog dialog(mSqlEngine,this);
-    dialog.exec();
+    Q_UNUSED(aConfId);

 
     QList<Conference> confs = Conference::getAll();
     if(!confs.count()) // no conference(s) in the DB
 
     QList<Conference> confs = Conference::getAll();
     if(!confs.count()) // no conference(s) in the DB

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
index 58e24f847cf46e7802e114b3a022f9a6a85c6e5f..6986e1598aa05baaeb0150d40b3dd2d1311cd11f 100644 (file)
--- a/src/gui/mainwindow.h
+++ b/src/gui/mainwindow.h
@@ -16,7 +16,7 @@ public:
     MainWindow(int aEventId = 0, QWidget *aParent = NULL);
     ~MainWindow();
 private slots:
     MainWindow(int aEventId = 0, QWidget *aParent = NULL);
     ~MainWindow();
 private slots:

-    void importSchedule();
+    void scheduleImported(int aConfId);

     void aboutApp();
     void updateDayView(const QDate &aDate);
     void updateTracksView(const QDate &aDate);
     void aboutApp();
     void updateDayView(const QDate &aDate);
     void updateTracksView(const QDate &aDate);

diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui
index d6932b2b705d3f0dfd76c076937940c23c992f66..e1b2069215a2dc00478fdffe2221bf95e82dfaff 100644 (file)
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>935</width>
     <x>0</x>
     <y>0</y>
     <width>935</width>

-    <height>530</height>
+    <height>514</height>

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


@@ -118,67 +118,67 @@
         </item>
        </layout>
       </widget>
         </item>
        </layout>
       </widget>

-      <widget class="QWidget" name="searchTab">
-       <attribute name="title">
+      <widget class="QWidget" name="searchTab" >
+       <attribute name="title" >

         <string>Search</string>
        </attribute>
         <string>Search</string>
        </attribute>

-       <layout class="QHBoxLayout" name="horizontalLayout_1">
+       <layout class="QHBoxLayout" name="horizontalLayout_1" >

         <item>
         <item>

-         <widget class="QWidget" name="searchVerticalWidget" native="true">
-          <property name="enabled">
+         <widget class="QWidget" native="1" name="searchVerticalWidget" >
+          <property name="enabled" >

            <bool>true</bool>
           </property>
            <bool>true</bool>
           </property>

-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Expanding" hsizetype="Minimum" >

             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>

-          <layout class="QVBoxLayout" name="searchDayNavigatorVerticalLayout">
-           <property name="margin">
+          <layout class="QVBoxLayout" name="searchDayNavigatorVerticalLayout" >
+           <property name="margin" >

             <number>0</number>
            </property>
            <item>
             <number>0</number>
            </property>
            <item>

-            <widget class="QToolButton" name="searchAgainButton">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <widget class="QToolButton" name="searchAgainButton" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >

                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>

-             <property name="toolTip">
+             <property name="toolTip" >

               <string>Search again</string>
              </property>
               <string>Search again</string>
              </property>

-             <property name="autoFillBackground">
+             <property name="autoFillBackground" >

               <bool>false</bool>
              </property>
               <bool>false</bool>
              </property>

-             <property name="text">
+             <property name="text" >

               <string>S</string>
              </property>
               <string>S</string>
              </property>

-             <property name="icon">
-              <iconset resource="../icons.qrc">
+             <property name="icon" >
+              <iconset resource="../icons.qrc" >

                <normaloff>:/icons/search.png</normaloff>:/icons/search.png</iconset>
              </property>
                <normaloff>:/icons/search.png</normaloff>:/icons/search.png</iconset>
              </property>

-             <property name="iconSize">
+             <property name="iconSize" >

               <size>
                <width>24</width>
                <height>24</height>
               </size>
              </property>
               <size>
                <width>24</width>
                <height>24</height>
               </size>
              </property>

-             <property name="toolButtonStyle">
+             <property name="toolButtonStyle" >

               <enum>Qt::ToolButtonIconOnly</enum>
              </property>
             </widget>
            </item>
            <item>
               <enum>Qt::ToolButtonIconOnly</enum>
              </property>
             </widget>
            </item>
            <item>

-            <widget class="DayNavigatorWidget" name="searchDayNavigator" native="true">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+            <widget class="DayNavigatorWidget" native="1" name="searchDayNavigator" >
+             <property name="sizePolicy" >
+              <sizepolicy vsizetype="Expanding" hsizetype="Minimum" >

                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
                <horstretch>0</horstretch>
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>

-             <property name="maximumSize">
+             <property name="maximumSize" >

               <size>
                <width>16777215</width>
                <height>16777215</height>
               <size>
                <width>16777215</width>
                <height>16777215</height>


@@ -190,108 +190,108 @@
          </widget>
         </item>
         <item>
          </widget>
         </item>
         <item>

-         <layout class="QVBoxLayout" name="verticalLayout_3">
+         <layout class="QVBoxLayout" name="verticalLayout_3" >

           <item>
           <item>

-           <widget class="QWidget" name="searchHead" native="true">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+           <widget class="QWidget" native="1" name="searchHead" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >

               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>

-            <property name="maximumSize">
+            <property name="maximumSize" >

              <size>
               <width>16777215</width>
               <height>16777215</height>
              </size>
             </property>
              <size>
               <width>16777215</width>
               <height>16777215</height>
              </size>
             </property>

-            <layout class="QGridLayout" name="searchHeadLayout">
-             <property name="sizeConstraint">
+            <layout class="QGridLayout" name="searchHeadLayout" >
+             <property name="sizeConstraint" >

               <enum>QLayout::SetDefaultConstraint</enum>
              </property>
               <enum>QLayout::SetDefaultConstraint</enum>
              </property>

-             <item row="2" column="0">
-              <layout class="QHBoxLayout" name="horizontalLayout">
+             <item row="2" column="0" >
+              <layout class="QHBoxLayout" name="horizontalLayout" >

                <item>
                <item>

-                <widget class="QLineEdit" name="searchEdit">
-                 <property name="enabled">
+                <widget class="QLineEdit" name="searchEdit" >
+                 <property name="enabled" >

                   <bool>true</bool>
                  </property>
                   <bool>true</bool>
                  </property>

-                 <property name="toolTip">
+                 <property name="toolTip" >

                   <string>type a keyword to search</string>
                  </property>
                 </widget>
                </item>
                <item>
                   <string>type a keyword to search</string>
                  </property>
                 </widget>
                </item>
                <item>

-                <widget class="QPushButton" name="searchButton">
-                 <property name="text">
+                <widget class="QPushButton" name="searchButton" >
+                 <property name="text" >

                   <string>Search</string>
                  </property>
                   <string>Search</string>
                  </property>

-                 <property name="icon">
-                  <iconset resource="../icons.qrc">
+                 <property name="icon" >
+                  <iconset resource="../icons.qrc" >

                    <normaloff>:/icons/search.png</normaloff>:/icons/search.png</iconset>
                  </property>
                    <normaloff>:/icons/search.png</normaloff>:/icons/search.png</iconset>
                  </property>

-                 <property name="checkable">
+                 <property name="checkable" >

                   <bool>false</bool>
                  </property>
                   <bool>false</bool>
                  </property>

-                 <property name="autoDefault">
+                 <property name="autoDefault" >

                   <bool>true</bool>
                  </property>
                   <bool>true</bool>
                  </property>

-                 <property name="default">
+                 <property name="default" >

                   <bool>true</bool>
                  </property>
                   <bool>true</bool>
                  </property>

-                 <property name="flat">
+                 <property name="flat" >

                   <bool>false</bool>
                  </property>
                 </widget>
                </item>
               </layout>
              </item>
                   <bool>false</bool>
                  </property>
                 </widget>
                </item>
               </layout>
              </item>

-             <item row="0" column="0">
-              <layout class="QHBoxLayout" name="horizontalLayout_6">
+             <item row="0" column="0" >
+              <layout class="QHBoxLayout" name="horizontalLayout_6" >

                <item>
                <item>

-                <widget class="QCheckBox" name="searchTitle">
-                 <property name="text">
+                <widget class="QCheckBox" name="searchTitle" >
+                 <property name="text" >

                   <string>Title</string>
                  </property>
                   <string>Title</string>
                  </property>

-                 <property name="checked">
+                 <property name="checked" >

                   <bool>true</bool>
                  </property>
                 </widget>
                </item>
                <item>
                   <bool>true</bool>
                  </property>
                 </widget>
                </item>
                <item>

-                <widget class="QCheckBox" name="searchAbstract">
-                 <property name="text">
+                <widget class="QCheckBox" name="searchAbstract" >
+                 <property name="text" >

                   <string>Abstract</string>
                  </property>
                 </widget>
                </item>
                <item>
                   <string>Abstract</string>
                  </property>
                 </widget>
                </item>
                <item>

-                <widget class="QCheckBox" name="searchSpeaker">
-                 <property name="text">
+                <widget class="QCheckBox" name="searchSpeaker" >
+                 <property name="text" >

                   <string>Speaker</string>
                  </property>
                 </widget>
                </item>
                <item>
                   <string>Speaker</string>
                  </property>
                 </widget>
                </item>
                <item>

-                <widget class="QCheckBox" name="searchTag">
-                 <property name="text">
+                <widget class="QCheckBox" name="searchTag" >
+                 <property name="text" >

                   <string>Tag</string>
                  </property>
                 </widget>
                </item>
                <item>
                   <string>Tag</string>
                  </property>
                 </widget>
                </item>
                <item>

-                <widget class="QCheckBox" name="searchRoom">
-                 <property name="text">
+                <widget class="QCheckBox" name="searchRoom" >
+                 <property name="text" >

                   <string>Room</string>
                  </property>
                 </widget>
                </item>
                <item>
                   <string>Room</string>
                  </property>
                 </widget>
                </item>
                <item>

-                <spacer name="horizontalSpacer">
-                 <property name="orientation">
+                <spacer name="horizontalSpacer" >
+                 <property name="orientation" >

                   <enum>Qt::Horizontal</enum>
                  </property>
                   <enum>Qt::Horizontal</enum>
                  </property>

-                 <property name="sizeHint" stdset="0">
+                 <property name="sizeHint" stdset="0" >

                   <size>
                    <width>40</width>
                    <height>20</height>
                   <size>
                    <width>40</width>
                    <height>20</height>


@@ -305,39 +305,36 @@
            </widget>
           </item>
           <item>
            </widget>
           </item>
           <item>

-           <widget class="TreeView" name="searchTreeView">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+           <widget class="TreeView" name="searchTreeView" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" >

               <horstretch>0</horstretch>
               <verstretch>1</verstretch>
              </sizepolicy>
             </property>
               <horstretch>0</horstretch>
               <verstretch>1</verstretch>
              </sizepolicy>
             </property>

-            <property name="minimumSize">
+            <property name="minimumSize" >

              <size>
               <width>0</width>
               <height>0</height>
              </size>
             </property>
              <size>
               <width>0</width>
               <height>0</height>
              </size>
             </property>

-            <property name="maximumSize">
+            <property name="maximumSize" >

              <size>
               <width>16777215</width>
               <height>16777215</height>
              </size>
             </property>
              <size>
               <width>16777215</width>
               <height>16777215</height>
              </size>
             </property>

-            <attribute name="headerDefaultSectionSize">
-             <number>100</number>
-            </attribute>

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

-           <spacer name="verticalSpacer_2">
-            <property name="orientation">
+           <spacer name="verticalSpacer_2" >
+            <property name="orientation" >

              <enum>Qt::Vertical</enum>
             </property>
              <enum>Qt::Vertical</enum>
             </property>

-            <property name="sizeType">
+            <property name="sizeType" >

              <enum>QSizePolicy::Expanding</enum>
             </property>
              <enum>QSizePolicy::Expanding</enum>
             </property>

-            <property name="sizeHint" stdset="0">
+            <property name="sizeHint" stdset="0" >

              <size>
               <width>20</width>
               <height>1</height>
              <size>
               <width>20</width>
               <height>1</height>


@@ -496,7 +493,7 @@
             <item row="0" column="1" >
              <widget class="QLabel" name="spacer" >
               <property name="text" >
             <item row="0" column="1" >
              <widget class="QLabel" name="spacer" >
               <property name="text" >

-               <string>   </string>
+               <string/>

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


@@ -509,6 +506,16 @@
             </property>
            </widget>
           </item>
             </property>
            </widget>
           </item>

+          <item>
+           <widget class="ImportScheduleWidget" native="1" name="importScheduleWidget" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>

           <item>
            <spacer name="verticalSpacer" >
             <property name="orientation" >
           <item>
            <spacer name="verticalSpacer" >
             <property name="orientation" >


@@ -606,6 +613,12 @@
    <header>tabwidget.h</header>
    <container>1</container>
   </customwidget>
    <header>tabwidget.h</header>
    <container>1</container>
   </customwidget>

+  <customwidget>
+   <class>ImportScheduleWidget</class>
+   <extends>QWidget</extends>
+   <header>importschedulewidget.h</header>
+   <container>1</container>
+  </customwidget>

  </customwidgets>
  <resources>
   <include location="../icons.qrc" />
  </customwidgets>
  <resources>
   <include location="../icons.qrc" />

diff --git a/src/sql/schedulexmlparser.cpp b/src/sql/schedulexmlparser.cpp
index 01ddeb57165fdb77c162cdf5f89759ce6807d974..bb83f8aee50351116d1365dfd908052fae128c4b 100644 (file)
--- a/src/sql/schedulexmlparser.cpp
+++ b/src/sql/schedulexmlparser.cpp
@@ -12,7 +12,7 @@ ScheduleXmlParser::ScheduleXmlParser(QObject *aParent)
 {
 }
 
 {
 }
 

-void ScheduleXmlParser::parseData(const QByteArray &aData, SqlEngine *aDBEngine)
+int ScheduleXmlParser::parseData(const QByteArray &aData, SqlEngine *aDBEngine)

 {
     Q_ASSERT(NULL != aDBEngine);
 
 {
     Q_ASSERT(NULL != aDBEngine);
 


@@ -21,9 +21,9 @@ void ScheduleXmlParser::parseData(const QByteArray &aData, SqlEngine *aDBEngine)
 
     QDomElement scheduleElement = document.firstChildElement("schedule");
 
 
     QDomElement scheduleElement = document.firstChildElement("schedule");
 

+    int confId = 0;

     if (!scheduleElement.isNull())
     {
     if (!scheduleElement.isNull())
     {

-        int confId = 0;

         QDomElement conferenceElement = scheduleElement.firstChildElement("conference");
         if (!conferenceElement.isNull())
         {
         QDomElement conferenceElement = scheduleElement.firstChildElement("conference");
         if (!conferenceElement.isNull())
         {


@@ -128,5 +128,7 @@ void ScheduleXmlParser::parseData(const QByteArray &aData, SqlEngine *aDBEngine)
             } // parsing room elements
         } // parsing day elements
     } // schedule element
             } // parsing room elements
         } // parsing day elements
     } // schedule element

+
+    return confId;

 }
 
 }
 

diff --git a/src/sql/schedulexmlparser.h b/src/sql/schedulexmlparser.h
index f5ecfb52d4a8937fbb9d89d741b49057ec1eb20b..26cf5562ffbd4ccacdacde1476defe75e44e8e6f 100644 (file)
--- a/src/sql/schedulexmlparser.h
+++ b/src/sql/schedulexmlparser.h
@@ -12,7 +12,7 @@ class ScheduleXmlParser : public QObject
         ScheduleXmlParser (QObject *aParent = NULL);\r
 \r
     public slots:\r
         ScheduleXmlParser (QObject *aParent = NULL);\r
 \r
     public slots:\r

-        void parseData(const QByteArray &aData, SqlEngine *aDBEngine);\r
+        int parseData(const QByteArray &aData, SqlEngine *aDBEngine); // returns 'confId' of parsed conference schedule\r

 \r
     signals:\r
         void progressStatus(int aStatus);\r
 \r
     signals:\r
         void progressStatus(int aStatus);\r