From: fortefr Date: Thu, 14 Jan 2010 11:17:43 +0000 (+0000) Subject: Testing svn, tabs added, misprint fixed X-Git-Tag: 0.5.0~310 X-Git-Url: https://git.toastfreeware.priv.at/toast/confclerk.git/commitdiff_plain/f3f61625b04f5650a7783abbc02b3a290168659a Testing svn, tabs added, misprint fixed --- diff --git a/src/gui/about.ui b/src/gui/about.ui index 2941aa8..ddd9914 100644 --- a/src/gui/about.ui +++ b/src/gui/about.ui @@ -1,10 +1,11 @@ - + + AboutDialog - - + + Qt::WindowModal - + 0 0 @@ -12,39 +13,39 @@ 300 - - + + 0 0 - + 77 77 - + 500 300 - + - - - + + + 239 235 231 - - - + + + 239 235 231 @@ -53,18 +54,18 @@ - - - + + + 239 235 231 - - - + + + 239 235 231 @@ -73,18 +74,18 @@ - - - + + + 255 255 255 - - - + + + 239 235 231 @@ -94,39 +95,39 @@ - + About application - - + + - - - + + + - + - - - + + + 0 0 - + - - :/icons/fosdem.png + + :/icons/fosdem.png - - + + Qt::Vertical - + 20 40 @@ -137,56 +138,56 @@ - + - - + + true - + true - - + + - + QFrame::NoFrame - + QFrame::Plain - + true - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; color:#000000;">Qt FOSDEM/Maemo</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><span style=" font-family:'Sans Serif'; font-size:9pt; color:#000000;">Version 1.0.0.</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;">The FOSDEM Maemo is an application making the conference schedule available offline. Supports searches on various items (speaker, speech topic, location, etc.). For Nokia N8x0 and N900 Internet Tablets.</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><span style=" font-weight:600; color:#000000;">Developers:</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><span style=" color:#000000;">Berendova Monika, Hanzes Matus, Komara Martin, Korinek Pavol,</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt; color:#000000;">Pavelka Pavol, Timko Marek, Uzak Matus</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><span style=" color:#000000;">Copyright (C) Ixonos, 2010</span></p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><span style=" font-size:7pt; color:#000000;">This program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR PARTICULAR PURPOSE.</span></p></body></html> +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt; font-weight:600; color:#000000;">Qt FOSDEM/Maemo</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt; color:#000000;">Version 1.0.0.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">The FOSDEM Maemo is an application making the conference schedule available offline. Supports searches on various items (speaker, speech topic, location, etc.). For Nokia N8x0 and N900 Internet Tablets.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; color:#000000;">Developers:</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; color:#000000;">Berendova Monika, Hanzes Matus, Komara Martin, Korinek Pavol,</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; color:#000000;">Pavelka Pavol, Timko Marek, Uzak Matus, Fortes Francisco.</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt; color:#000000;">Copyright (C) Ixonos, 2010</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:7pt; color:#000000;">This program is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR PARTICULAR PURPOSE.</span></p></body></html> - + false - + true - - + + QDialogButtonBox::Ok @@ -197,10 +198,7 @@ p, li { white-space: pre-wrap; } - - - - + buttonOK @@ -208,11 +206,11 @@ p, li { white-space: pre-wrap; } AboutDialog close() - + 292 272 - + 249 149 diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index 548054b..f64817b 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -1,7 +1,8 @@ - + + MainWindow - - + + 0 0 @@ -9,29 +10,29 @@ 558 - + MainWindow - - - - - - 0 + + + + + + 4 - - + + Day View - - - + + + - + - - + + 16777215 16777215 @@ -43,53 +44,68 @@ - - - Favourities + + + Activities + + + + + Favourites + + + + + Search + + + + + Map - - + + 0 0 856 - 26 + 24 - - + + File - + - - + + Help - - + + - - + + - - - + + + Import Schedule - - + + About Qt - - + + About application diff --git a/src/orm/ormrecord.h b/src/orm/ormrecord.h index 3c93461..0017921 100644 --- a/src/orm/ormrecord.h +++ b/src/orm/ormrecord.h @@ -106,8 +106,8 @@ QList OrmRecord::load(QSqlQuery query) QString start = "START\n"; QString end = "\nEND\n"; QString message = start + query.lastError().text() + end; - const char *data = message.toLatin1().data(); - qDebug(data); + const char *data = message.toLatin1().data(); + qDebug(data); throw new OrmSqlException(query.lastError().text()); } }