modifications to import-schedule dialog

 - closed automatically after parsing/importing schedule

diff --git a/src/gui/importscheduledialog.cpp b/src/gui/importscheduledialog.cpp
index c42d18d61ef56a544a54b5f455b1296f2d6a6a4c..a87f36fcc155af24c0df520767f43f8c331d9cbc 100644 (file)
--- a/src/gui/importscheduledialog.cpp
+++ b/src/gui/importscheduledialog.cpp
@@ -15,7 +15,9 @@ ImportScheduleDialog::ImportScheduleDialog(SqlEngine *aSqlEngine, QWidget *aPare
     setupUi(this);
 
     mXmlParser = new ScheduleXmlParser(this);
     setupUi(this);
 
     mXmlParser = new ScheduleXmlParser(this);

-    connect(mXmlParser, SIGNAL(progressStatus(int)), this, SLOT(showParsingProgress(int)));
+    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();
     connect(import, SIGNAL(clicked()), SLOT(importSchedule()));
     connect(search, SIGNAL(clicked()), SLOT(searchSchedule()));
     progressBar->hide();


@@ -39,7 +41,6 @@ void ImportScheduleDialog::showParsingProgress(int progress)
 void ImportScheduleDialog::searchSchedule()
 {
     mScheduleFileName = QFileDialog::getOpenFileName(this, tr("Select Conference Schedule"), QDir::homePath(), tr("Schedule Files (*.xml)"));
 void ImportScheduleDialog::searchSchedule()
 {
     mScheduleFileName = QFileDialog::getOpenFileName(this, tr("Select Conference Schedule"), QDir::homePath(), tr("Schedule Files (*.xml)"));

-    fileName->setText(mScheduleFileName);

     if(QFile::exists(mScheduleFileName))
         import->setEnabled(true);
     else
     if(QFile::exists(mScheduleFileName))
         import->setEnabled(true);
     else


@@ -63,6 +64,7 @@ void ImportScheduleDialog::importSchedule()
     {
         progressBar->show();
         mXmlParser->parseData(data,mSqlEngine);
     {
         progressBar->show();
         mXmlParser->parseData(data,mSqlEngine);

+        close();

     }
 }
 
     }
 }
 

diff --git a/src/gui/importscheduledialog.ui b/src/gui/importscheduledialog.ui
index d7771a5bba1b563be084767bf5956aae2576d715..cea270f9e7f347250ed8191424e439b524dbcee7 100644 (file)
--- a/src/gui/importscheduledialog.ui
+++ b/src/gui/importscheduledialog.ui
@@ -5,47 +5,22 @@
    <rect>
     <x>0</x>
     <y>0</y>
    <rect>
     <x>0</x>
     <y>0</y>

-    <width>408</width>
-    <height>118</height>
+    <width>330</width>
+    <height>74</height>

    </rect>
   </property>
    </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" >
   <property name="windowTitle" >
    <string>Import schedule</string>
   </property>
   <layout class="QGridLayout" name="gridLayout" >
    <item row="0" column="0" >
     <layout class="QVBoxLayout" name="verticalLayout" >

-     <item>
-      <layout class="QHBoxLayout" name="horizontalLayout" >
-       <item>
-        <widget class="QLabel" name="fileName" >
-         <property name="text" >
-          <string>Select conference schedule file</string>
-         </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="search" >
-         <property name="text" >
-          <string>Search</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>

      <item>
       <widget class="QProgressBar" name="progressBar" >
        <property name="value" >
      <item>
       <widget class="QProgressBar" name="progressBar" >
        <property name="value" >


@@ -58,6 +33,13 @@
      </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout_2" >
      </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" >
        <item>
         <spacer name="horizontalSpacer_2" >
          <property name="orientation" >

diff --git a/src/sql/schedulexmlparser.cpp b/src/sql/schedulexmlparser.cpp
index 88c46861eee492d93af00ae6b9d09634ad9a3203..01ddeb57165fdb77c162cdf5f89759ce6807d974 100644 (file)
--- a/src/sql/schedulexmlparser.cpp
+++ b/src/sql/schedulexmlparser.cpp
@@ -40,6 +40,7 @@ void ScheduleXmlParser::parseData(const QByteArray &aData, SqlEngine *aDBEngine)
             conference["timeslot_duration"] = conferenceElement.firstChildElement("timeslot_duration").text(); // time
             aDBEngine->addConferenceToDB(conference);
             confId = conference["id"].toInt();
             conference["timeslot_duration"] = conferenceElement.firstChildElement("timeslot_duration").text(); // time
             aDBEngine->addConferenceToDB(conference);
             confId = conference["id"].toInt();

+            emit(parsingSchedule(conference["title"]));

         }
 
         // we need to get count of all events in order to emit 'progressStatus' signal
         }
 
         // we need to get count of all events in order to emit 'progressStatus' signal

diff --git a/src/sql/schedulexmlparser.h b/src/sql/schedulexmlparser.h
index 13df2a9a58116517cac24a68dc60b700d41bc6b8..f5ecfb52d4a8937fbb9d89d741b49057ec1eb20b 100644 (file)
--- a/src/sql/schedulexmlparser.h
+++ b/src/sql/schedulexmlparser.h
@@ -16,6 +16,7 @@ class ScheduleXmlParser : public QObject
 \r
     signals:\r
         void progressStatus(int aStatus);\r
 \r
     signals:\r
         void progressStatus(int aStatus);\r

+        void parsingSchedule(const QString &aTitle);\r

 };\r
 \r
 #endif /* SCHEDULEXMLPARSER_H_ */\r
 };\r
 \r
 #endif /* SCHEDULEXMLPARSER_H_ */\r