reimplemented 'import schedule'

diff --git a/src/gui/importschedulewidget.cpp b/src/gui/importschedulewidget.cpp
index 20d48acfc9de1f0cfc1eff13c23a6984ad03cdd8..c23ee88f704077677b8946b2c27d6c9c93a937e4 100644 (file)
--- a/src/gui/importschedulewidget.cpp
+++ b/src/gui/importschedulewidget.cpp
@@ -16,12 +16,10 @@ ImportScheduleWidget::ImportScheduleWidget(QWidget *aParent)
 
     mXmlParser = new ScheduleXmlParser(this);
     connect(mXmlParser, SIGNAL(progressStatus(int)), SLOT(showParsingProgress(int)));
 
     mXmlParser = new ScheduleXmlParser(this);
     connect(mXmlParser, SIGNAL(progressStatus(int)), SLOT(showParsingProgress(int)));

-    connect(mXmlParser, SIGNAL(parsingSchedule(const QString &)), SLOT(setWindowTitle(const QString &)));
+    connect(mXmlParser, SIGNAL(parsingSchedule(const QString &)), SLOT(parsingSchedule(const QString &)));

 
 

-    connect(import, SIGNAL(clicked()), SLOT(importSchedule()));
-    connect(search, SIGNAL(clicked()), SLOT(searchSchedule()));
+    connect(browse, SIGNAL(clicked()), SLOT(browseSchedule()));

     progressBar->hide();
     progressBar->hide();

-    import->setEnabled(false);

 }
 
 ImportScheduleWidget::~ImportScheduleWidget()
 }
 
 ImportScheduleWidget::~ImportScheduleWidget()


@@ -40,48 +38,44 @@ void ImportScheduleWidget::setSqlEngine(SqlEngine *aSqlEngine)
     mSqlEngine = aSqlEngine;
 }
 
     mSqlEngine = aSqlEngine;
 }
 

+void ImportScheduleWidget::parsingSchedule(const QString &aTitle)
+{
+    importScheduleLabel->setText("Importing: " + aTitle);
+}
+

 void ImportScheduleWidget::showParsingProgress(int progress)
 {
     progressBar->setValue(progress);
 }
 
 void ImportScheduleWidget::showParsingProgress(int progress)
 {
     progressBar->setValue(progress);
 }
 

-void ImportScheduleWidget::searchSchedule()
+void ImportScheduleWidget::browseSchedule()

 {
     Q_ASSERT(mSqlEngine != NULL);
 
 {
     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
+    QString scheduleFileName = QFileDialog::getOpenFileName(this, tr("Select Conference Schedule"), QDir::homePath(), tr("Schedule Files (*.xml)"));
+    if(QFile::exists(scheduleFileName))

     {
     {

-        import->setEnabled(false);
+        QFile file(scheduleFileName);
+        if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+        {
+            qDebug() << "can't open " << file.fileName();
+            return;
+        }
+
+        QByteArray data = file.readAll();
+        browse->hide();
+        progressBar->show();
+        int confId = mXmlParser->parseData(data,mSqlEngine);
+

         progressBar->hide();
         progressBar->hide();

-    }
-}
+        browse->show();
+        importScheduleLabel->setText("Import schedule: ");

 
 

-void ImportScheduleWidget::importSchedule()
-{
-    if(!mSqlEngine)
-    {
-        qDebug() << "ImportScheduleWidget::importSchedule(): sqlEngine not set";
-        return;
+        emit(scheduleImported(confId));

     }
     }

-
-    QFile file(mScheduleFileName);
-    if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+    else

     {
     {

-        qDebug() << "can't open " << file.fileName();
-        return;
+        progressBar->hide();

     }
     }

-
-    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
index b9d8a1e22a4702653cb22e5d77caf76b351e3b90..71a76fa01c9f4cc901491d86c7d7b42283b2d3cf 100644 (file)
--- a/src/gui/importschedulewidget.h
+++ b/src/gui/importschedulewidget.h
@@ -15,15 +15,14 @@ class ImportScheduleWidget : public QWidget, Ui::ImportScheduleWidget
         ~ImportScheduleWidget();
         void setSqlEngine(SqlEngine *aSqlEngine);
     private slots:
         ~ImportScheduleWidget();
         void setSqlEngine(SqlEngine *aSqlEngine);
     private slots:

-        void searchSchedule();
-        void importSchedule();
+        void browseSchedule();
+        void parsingSchedule(const QString &aTitle);

         void showParsingProgress(int progress);
     signals:
         void scheduleImported(int confId);
     private:
         ScheduleXmlParser *mXmlParser;
         SqlEngine *mSqlEngine; // uses it
         void showParsingProgress(int progress);
     signals:
         void scheduleImported(int confId);
     private:
         ScheduleXmlParser *mXmlParser;
         SqlEngine *mSqlEngine; // uses it

-        QString mScheduleFileName;

 };
 
 #endif /* IMPORTSCHEDULEWIDGET_H */
 };
 
 #endif /* IMPORTSCHEDULEWIDGET_H */

diff --git a/src/gui/importschedulewidget.ui b/src/gui/importschedulewidget.ui
index bf7687552aae370137f39af7977d7764276cedc1..e746ebfe7bbfb89144fe7802880b55acd637a882 100644 (file)
--- a/src/gui/importschedulewidget.ui
+++ b/src/gui/importschedulewidget.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>379</width>
     <x>0</x>
     <y>0</y>
     <width>379</width>

-    <height>82</height>
+    <height>48</height>

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


@@ -20,7 +20,33 @@
   </property>
   <layout class="QGridLayout" name="gridLayout" >
    <item row="0" column="0" >
   </property>
   <layout class="QGridLayout" name="gridLayout" >
    <item row="0" column="0" >

-    <layout class="QVBoxLayout" name="verticalLayout" >
+    <layout class="QHBoxLayout" name="horizontalLayout_2" >
+     <item>
+      <widget class="QLabel" name="importScheduleLabel" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Import schedule: </string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="browse" >
+       <property name="sizePolicy" >
+        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text" >
+        <string>Browse</string>
+       </property>
+      </widget>
+     </item>

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


@@ -31,44 +57,6 @@
        </property>
       </widget>
      </item>
        </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>
     </layout>
    </item>
   </layout>

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
index 118b82312ec76754fac16834ca51918ce904a666..d7d3fec1abcf91c14844fb08449d8da6c16c98bf 100644 (file)
--- a/src/gui/mainwindow.cpp
+++ b/src/gui/mainwindow.cpp
@@ -44,6 +44,8 @@ MainWindow::MainWindow(int aEventId, QWidget *aParent)
     {
         if(AppSettings::confId() == 0)
             AppSettings::setConfId(confs[0].id());
     {
         if(AppSettings::confId() == 0)
             AppSettings::setConfId(confs[0].id());

+
+        setWindowTitle(confs[0].title());

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