- Timestamp:
- 01/26/10 13:51:56 (13 years ago)
- Branches:
- master, qt5
- Children:
- 830f102
- Parents:
- 01df23f
- Location:
- src/gui
- Files:
-
- 1 added
- 1 deleted
- 4 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
src/gui/gui.pro
r01df23f rc15be10 26 26 FORMS += mainwindow.ui \ 27 27 daynavigatorwidget.ui \ 28 importschedule dialog.ui \28 importschedulewidget.ui \ 29 29 about.ui \ 30 30 eventdialog.ui \ … … 33 33 HEADERS += mainwindow.h \ 34 34 daynavigatorwidget.h \ 35 importschedule dialog.h \35 importschedulewidget.h \ 36 36 eventdialog.h \ 37 37 tabwidget.h \ … … 40 40 SOURCES += mainwindow.cpp \ 41 41 daynavigatorwidget.cpp \ 42 importschedule dialog.cpp \42 importschedulewidget.cpp \ 43 43 eventdialog.cpp \ 44 44 tabwidget.cpp \ -
src/gui/importschedulewidget.cpp
r01df23f rc15be10 1 #include "importschedule dialog.h"1 #include "importschedulewidget.h" 2 2 3 3 #include <schedulexmlparser.h> … … 9 9 #include <QDebug> 10 10 11 ImportSchedule Dialog::ImportScheduleDialog(SqlEngine *aSqlEngine,QWidget *aParent)12 : Q Dialog(aParent)13 , mSqlEngine( aSqlEngine)11 ImportScheduleWidget::ImportScheduleWidget(QWidget *aParent) 12 : QWidget(aParent) 13 , mSqlEngine(NULL) 14 14 { 15 15 setupUi(this); … … 25 25 } 26 26 27 ImportSchedule Dialog::~ImportScheduleDialog()27 ImportScheduleWidget::~ImportScheduleWidget() 28 28 { 29 29 if(mXmlParser) … … 34 34 } 35 35 36 void ImportScheduleDialog::showParsingProgress(int progress) 36 void ImportScheduleWidget::setSqlEngine(SqlEngine *aSqlEngine) 37 { 38 Q_ASSERT(aSqlEngine != NULL); 39 40 mSqlEngine = aSqlEngine; 41 } 42 43 void ImportScheduleWidget::showParsingProgress(int progress) 37 44 { 38 45 progressBar->setValue(progress); 39 46 } 40 47 41 void ImportSchedule Dialog::searchSchedule()48 void ImportScheduleWidget::searchSchedule() 42 49 { 50 Q_ASSERT(mSqlEngine != NULL); 51 43 52 mScheduleFileName = QFileDialog::getOpenFileName(this, tr("Select Conference Schedule"), QDir::homePath(), tr("Schedule Files (*.xml)")); 44 53 if(QFile::exists(mScheduleFileName)) … … 51 60 } 52 61 53 void ImportSchedule Dialog::importSchedule()62 void ImportScheduleWidget::importSchedule() 54 63 { 64 if(!mSqlEngine) 65 { 66 qDebug() << "ImportScheduleWidget::importSchedule(): sqlEngine not set"; 67 return; 68 } 69 55 70 QFile file(mScheduleFileName); 56 71 if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) … … 61 76 62 77 QByteArray data = file.readAll(); 63 if(mSqlEngine) 64 { 65 progressBar->show(); 66 mXmlParser->parseData(data,mSqlEngine); 67 close(); 68 } 78 progressBar->show(); 79 int confId = mXmlParser->parseData(data,mSqlEngine); 80 81 // hide stuff 82 import->setEnabled(false); 83 progressBar->hide(); 84 85 emit(scheduleImported(confId)); 69 86 } 70 87 -
src/gui/importschedulewidget.ui
r01df23f rc15be10 1 1 <ui version="4.0" > 2 <class>ImportSchedule Dialog</class>3 <widget class="Q Dialog" name="ImportScheduleDialog" >2 <class>ImportScheduleWidget</class> 3 <widget class="QWidget" name="ImportScheduleWidget" > 4 4 <property name="geometry" > 5 5 <rect> 6 6 <x>0</x> 7 7 <y>0</y> 8 <width>3 30</width>9 <height> 74</height>8 <width>379</width> 9 <height>82</height> 10 10 </rect> 11 11 </property> … … 35 35 <layout class="QHBoxLayout" name="horizontalLayout_2" > 36 36 <item> 37 <widget class="QLabel" name="label" > 38 <property name="text" > 39 <string>Import schedule: </string> 40 </property> 41 </widget> 42 </item> 43 <item> 37 44 <widget class="QPushButton" name="search" > 38 45 <property name="text" > … … 61 68 </widget> 62 69 </item> 63 <item>64 <widget class="QPushButton" name="cancel" >65 <property name="text" >66 <string>Cancel</string>67 </property>68 </widget>69 </item>70 70 </layout> 71 71 </item> … … 75 75 </widget> 76 76 <resources/> 77 <connections> 78 <connection> 79 <sender>cancel</sender> 80 <signal>clicked()</signal> 81 <receiver>ImportScheduleDialog</receiver> 82 <slot>close()</slot> 83 <hints> 84 <hint type="sourcelabel" > 85 <x>515</x> 86 <y>124</y> 87 </hint> 88 <hint type="destinationlabel" > 89 <x>283</x> 90 <y>80</y> 91 </hint> 92 </hints> 93 </connection> 94 </connections> 77 <connections/> 95 78 </ui> -
src/gui/mainwindow.cpp
r01df23f rc15be10 19 19 #include "eventdialog.h" 20 20 #include "daynavigatorwidget.h" 21 #include "importschedule dialog.h"21 #include "importschedulewidget.h" 22 22 #include "mapwindow.h" 23 23 … … 31 31 mSqlEngine = new SqlEngine(this); 32 32 mSqlEngine->initialize(); 33 importScheduleWidget->setSqlEngine(mSqlEngine); 33 34 34 35 // Sanity check for existence of any Conference in the DB … … 46 47 } 47 48 49 connect(importScheduleWidget, SIGNAL(scheduleImported(int)), SLOT(scheduleImported(int))); 50 48 51 // connect Menu actions 49 connect(actionImportSchedule, SIGNAL(triggered()), SLOT(importSchedule()));50 52 connect(actionAboutQt, SIGNAL(triggered()), qApp, SLOT(aboutQt())); 51 53 connect(actionAboutApplication, SIGNAL(triggered()), SLOT(aboutApp())); … … 200 202 } 201 203 202 void MainWindow::importSchedule() 203 { 204 ImportScheduleDialog dialog(mSqlEngine,this); 205 dialog.exec(); 204 void MainWindow::scheduleImported(int aConfId) 205 { 206 Q_UNUSED(aConfId); 206 207 207 208 QList<Conference> confs = Conference::getAll(); -
src/gui/mainwindow.h
r01df23f rc15be10 17 17 ~MainWindow(); 18 18 private slots: 19 void importSchedule();19 void scheduleImported(int aConfId); 20 20 void aboutApp(); 21 21 void updateDayView(const QDate &aDate); -
src/gui/mainwindow.ui
r01df23f rc15be10 7 7 <y>0</y> 8 8 <width>935</width> 9 <height>5 30</height>9 <height>514</height> 10 10 </rect> 11 11 </property> … … 119 119 </layout> 120 120 </widget> 121 <widget class="QWidget" name="searchTab" >122 <attribute name="title" >121 <widget class="QWidget" name="searchTab" > 122 <attribute name="title" > 123 123 <string>Search</string> 124 124 </attribute> 125 <layout class="QHBoxLayout" name="horizontalLayout_1" >125 <layout class="QHBoxLayout" name="horizontalLayout_1" > 126 126 <item> 127 <widget class="QWidget" na me="searchVerticalWidget" native="true">128 <property name="enabled" >127 <widget class="QWidget" native="1" name="searchVerticalWidget" > 128 <property name="enabled" > 129 129 <bool>true</bool> 130 130 </property> 131 <property name="sizePolicy" >132 <sizepolicy hsizetype="Minimum" vsizetype="Expanding">131 <property name="sizePolicy" > 132 <sizepolicy vsizetype="Expanding" hsizetype="Minimum" > 133 133 <horstretch>0</horstretch> 134 134 <verstretch>0</verstretch> 135 135 </sizepolicy> 136 136 </property> 137 <layout class="QVBoxLayout" name="searchDayNavigatorVerticalLayout" >138 <property name="margin" >137 <layout class="QVBoxLayout" name="searchDayNavigatorVerticalLayout" > 138 <property name="margin" > 139 139 <number>0</number> 140 140 </property> 141 141 <item> 142 <widget class="QToolButton" name="searchAgainButton" >143 <property name="sizePolicy" >144 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">142 <widget class="QToolButton" name="searchAgainButton" > 143 <property name="sizePolicy" > 144 <sizepolicy vsizetype="Preferred" hsizetype="Preferred" > 145 145 <horstretch>0</horstretch> 146 146 <verstretch>0</verstretch> 147 147 </sizepolicy> 148 148 </property> 149 <property name="toolTip" >149 <property name="toolTip" > 150 150 <string>Search again</string> 151 151 </property> 152 <property name="autoFillBackground" >152 <property name="autoFillBackground" > 153 153 <bool>false</bool> 154 154 </property> 155 <property name="text" >155 <property name="text" > 156 156 <string>S</string> 157 157 </property> 158 <property name="icon" >159 <iconset resource="../icons.qrc" >158 <property name="icon" > 159 <iconset resource="../icons.qrc" > 160 160 <normaloff>:/icons/search.png</normaloff>:/icons/search.png</iconset> 161 161 </property> 162 <property name="iconSize" >162 <property name="iconSize" > 163 163 <size> 164 164 <width>24</width> … … 166 166 </size> 167 167 </property> 168 <property name="toolButtonStyle" >168 <property name="toolButtonStyle" > 169 169 <enum>Qt::ToolButtonIconOnly</enum> 170 170 </property> … … 172 172 </item> 173 173 <item> 174 <widget class="DayNavigatorWidget" na me="searchDayNavigator" native="true">175 <property name="sizePolicy" >176 <sizepolicy hsizetype="Minimum" vsizetype="Expanding">174 <widget class="DayNavigatorWidget" native="1" name="searchDayNavigator" > 175 <property name="sizePolicy" > 176 <sizepolicy vsizetype="Expanding" hsizetype="Minimum" > 177 177 <horstretch>0</horstretch> 178 178 <verstretch>0</verstretch> 179 179 </sizepolicy> 180 180 </property> 181 <property name="maximumSize" >181 <property name="maximumSize" > 182 182 <size> 183 183 <width>16777215</width> … … 191 191 </item> 192 192 <item> 193 <layout class="QVBoxLayout" name="verticalLayout_3" >194 <item> 195 <widget class="QWidget" na me="searchHead" native="true">196 <property name="sizePolicy" >197 <sizepolicy hsizetype="Preferred" vsizetype="Preferred">193 <layout class="QVBoxLayout" name="verticalLayout_3" > 194 <item> 195 <widget class="QWidget" native="1" name="searchHead" > 196 <property name="sizePolicy" > 197 <sizepolicy vsizetype="Preferred" hsizetype="Preferred" > 198 198 <horstretch>0</horstretch> 199 199 <verstretch>0</verstretch> 200 200 </sizepolicy> 201 201 </property> 202 <property name="maximumSize" >202 <property name="maximumSize" > 203 203 <size> 204 204 <width>16777215</width> … … 206 206 </size> 207 207 </property> 208 <layout class="QGridLayout" name="searchHeadLayout" >209 <property name="sizeConstraint" >208 <layout class="QGridLayout" name="searchHeadLayout" > 209 <property name="sizeConstraint" > 210 210 <enum>QLayout::SetDefaultConstraint</enum> 211 211 </property> 212 <item row="2" column="0" >213 <layout class="QHBoxLayout" name="horizontalLayout" >214 <item> 215 <widget class="QLineEdit" name="searchEdit" >216 <property name="enabled" >212 <item row="2" column="0" > 213 <layout class="QHBoxLayout" name="horizontalLayout" > 214 <item> 215 <widget class="QLineEdit" name="searchEdit" > 216 <property name="enabled" > 217 217 <bool>true</bool> 218 218 </property> 219 <property name="toolTip" >219 <property name="toolTip" > 220 220 <string>type a keyword to search</string> 221 221 </property> … … 223 223 </item> 224 224 <item> 225 <widget class="QPushButton" name="searchButton" >226 <property name="text" >225 <widget class="QPushButton" name="searchButton" > 226 <property name="text" > 227 227 <string>Search</string> 228 228 </property> 229 <property name="icon" >230 <iconset resource="../icons.qrc" >229 <property name="icon" > 230 <iconset resource="../icons.qrc" > 231 231 <normaloff>:/icons/search.png</normaloff>:/icons/search.png</iconset> 232 232 </property> 233 <property name="checkable" >233 <property name="checkable" > 234 234 <bool>false</bool> 235 235 </property> 236 <property name="autoDefault" >236 <property name="autoDefault" > 237 237 <bool>true</bool> 238 238 </property> 239 <property name="default" >239 <property name="default" > 240 240 <bool>true</bool> 241 241 </property> 242 <property name="flat" >242 <property name="flat" > 243 243 <bool>false</bool> 244 244 </property> … … 247 247 </layout> 248 248 </item> 249 <item row="0" column="0" >250 <layout class="QHBoxLayout" name="horizontalLayout_6" >251 <item> 252 <widget class="QCheckBox" name="searchTitle" >253 <property name="text" >249 <item row="0" column="0" > 250 <layout class="QHBoxLayout" name="horizontalLayout_6" > 251 <item> 252 <widget class="QCheckBox" name="searchTitle" > 253 <property name="text" > 254 254 <string>Title</string> 255 255 </property> 256 <property name="checked" >256 <property name="checked" > 257 257 <bool>true</bool> 258 258 </property> … … 260 260 </item> 261 261 <item> 262 <widget class="QCheckBox" name="searchAbstract" >263 <property name="text" >262 <widget class="QCheckBox" name="searchAbstract" > 263 <property name="text" > 264 264 <string>Abstract</string> 265 265 </property> … … 267 267 </item> 268 268 <item> 269 <widget class="QCheckBox" name="searchSpeaker" >270 <property name="text" >269 <widget class="QCheckBox" name="searchSpeaker" > 270 <property name="text" > 271 271 <string>Speaker</string> 272 272 </property> … … 274 274 </item> 275 275 <item> 276 <widget class="QCheckBox" name="searchTag" >277 <property name="text" >276 <widget class="QCheckBox" name="searchTag" > 277 <property name="text" > 278 278 <string>Tag</string> 279 279 </property> … … 281 281 </item> 282 282 <item> 283 <widget class="QCheckBox" name="searchRoom" >284 <property name="text" >283 <widget class="QCheckBox" name="searchRoom" > 284 <property name="text" > 285 285 <string>Room</string> 286 286 </property> … … 288 288 </item> 289 289 <item> 290 <spacer name="horizontalSpacer" >291 <property name="orientation" >290 <spacer name="horizontalSpacer" > 291 <property name="orientation" > 292 292 <enum>Qt::Horizontal</enum> 293 293 </property> 294 <property name="sizeHint" stdset="0" >294 <property name="sizeHint" stdset="0" > 295 295 <size> 296 296 <width>40</width> … … 306 306 </item> 307 307 <item> 308 <widget class="TreeView" name="searchTreeView" >309 <property name="sizePolicy" >310 <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">308 <widget class="TreeView" name="searchTreeView" > 309 <property name="sizePolicy" > 310 <sizepolicy vsizetype="MinimumExpanding" hsizetype="Expanding" > 311 311 <horstretch>0</horstretch> 312 312 <verstretch>1</verstretch> 313 313 </sizepolicy> 314 314 </property> 315 <property name="minimumSize" >315 <property name="minimumSize" > 316 316 <size> 317 317 <width>0</width> … … 319 319 </size> 320 320 </property> 321 <property name="maximumSize" >321 <property name="maximumSize" > 322 322 <size> 323 323 <width>16777215</width> … … 325 325 </size> 326 326 </property> 327 <attribute name="headerDefaultSectionSize"> 328 <number>100</number> 329 </attribute> 330 </widget> 331 </item> 332 <item> 333 <spacer name="verticalSpacer_2"> 334 <property name="orientation"> 327 </widget> 328 </item> 329 <item> 330 <spacer name="verticalSpacer_2" > 331 <property name="orientation" > 335 332 <enum>Qt::Vertical</enum> 336 333 </property> 337 <property name="sizeType" >334 <property name="sizeType" > 338 335 <enum>QSizePolicy::Expanding</enum> 339 336 </property> 340 <property name="sizeHint" stdset="0" >337 <property name="sizeHint" stdset="0" > 341 338 <size> 342 339 <width>20</width> … … 497 494 <widget class="QLabel" name="spacer" > 498 495 <property name="text" > 499 <string > </string>496 <string/> 500 497 </property> 501 498 </widget> … … 507 504 <property name="orientation" > 508 505 <enum>Qt::Horizontal</enum> 506 </property> 507 </widget> 508 </item> 509 <item> 510 <widget class="ImportScheduleWidget" native="1" name="importScheduleWidget" > 511 <property name="sizePolicy" > 512 <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" > 513 <horstretch>0</horstretch> 514 <verstretch>0</verstretch> 515 </sizepolicy> 509 516 </property> 510 517 </widget> … … 607 614 <container>1</container> 608 615 </customwidget> 616 <customwidget> 617 <class>ImportScheduleWidget</class> 618 <extends>QWidget</extends> 619 <header>importschedulewidget.h</header> 620 <container>1</container> 621 </customwidget> 609 622 </customwidgets> 610 623 <resources>
Note: See TracChangeset
for help on using the changeset viewer.