From: Tiina Kivilinna-Korhola Date: Wed, 17 Mar 2010 09:48:03 +0000 (+0200) Subject: Added resultdialog back to UI.pro. X-Git-Tag: v0.1~41 X-Git-Url: https://vcs.maemo.org/git/?a=commitdiff_plain;h=b3509f310144f92881f982a2aa6aa9d5ef626f26;p=speedfreak Added resultdialog back to UI.pro. --- diff --git a/Client/UI.pro.user b/Client/UI.pro.user index f4af51a..0856073 100644 --- a/Client/UI.pro.user +++ b/Client/UI.pro.user @@ -114,7 +114,7 @@ CONFIG+=debug /home/tkk/qtsdk-2010.01/qt/bin/qmake - true + false /home/tkk/speedfreak/Client @@ -165,6 +165,44 @@ buildconfiguration-Debug-cleanstep0 Debug + + DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-51tDZ2Xnqs,guid=d9736a446700e43c64f1e7f04ba083b3 + DESKTOP_SESSION=gnome + DISPLAY=:0.0 + GDMSESSION=gnome + GDM_KEYBOARD_LAYOUT=fi classic + GDM_LANG=en_US.UTF-8 + GNOME_DESKTOP_SESSION_ID=this-is-deprecated + GNOME_KEYRING_SOCKET=/tmp/keyring-GEEl2F/socket + GTK_MODULES=canberra-gtk-module + GTK_RC_FILES=/etc/gtk/gtkrc:/home/tkk/.gtkrc-1.2-gnome2 + HOME=/home/tkk + LANG=en_US.UTF-8 + LD_LIBRARY_PATH=/home/tkk/qtsdk-2010.01/lib/qtcreator: + LOGNAME=tkk + ORBIT_SOCKETDIR=/tmp/orbit-tkk + PATH=/home/tkk/qtsdk-2010.01/qt/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games + PWD=/home/tkk/qtsdk-2010.01/bin + QTDIR=/home/tkk/qtsdk-2010.01/qt + SESSION_MANAGER=local/tkk-laptop:@/tmp/.ICE-unix/1211,unix/tkk-laptop:/tmp/.ICE-unix/1211 + SHELL=/bin/bash + SPEECHD_PORT=7560 + SSH_AGENT_PID=1380 + SSH_AUTH_SOCK=/tmp/keyring-GEEl2F/socket.ssh + USER=tkk + USERNAME=tkk + XAUTHORITY=/var/run/gdm/auth-for-tkk-r3DlIx/database + XDG_DATA_DIRS=/usr/share/gnome:/usr/local/share/:/usr/share/ + XDG_SESSION_COOKIE=cac5a30ec2a4b235840876964b6a848d-1268810656.39871-1736995145 + + true + + clean + -w + + /usr/bin/make + true + /home/tkk/speedfreak/Client true clean diff --git a/Client/carmainwindow.cpp b/Client/carmainwindow.cpp index 5b1e1f4..1e3b7c7 100644 --- a/Client/carmainwindow.cpp +++ b/Client/carmainwindow.cpp @@ -424,14 +424,12 @@ void CarMainWindow::regUserToServer() myHttpClient->requestRegistration(); } -<<<<<<< HEAD:Client/carmainwindow.cpp + void CarMainWindow::on_drawRoutePushButton_clicked() { myRoute->show(); } -======= ->>>>>>> Added fuction for checking username registration on the server.:Client/carmainwindow.cpp void CarMainWindow::userLogin() { myHttpClient->checkLogin(); diff --git a/Client/ui_carmainwindow.h b/Client/ui_carmainwindow.h index ec4b824..2e19b43 100644 --- a/Client/ui_carmainwindow.h +++ b/Client/ui_carmainwindow.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'carmainwindow.ui' ** -** Created: Wed Mar 17 10:18:14 2010 +** Created: Wed Mar 17 11:45:21 2010 ** by: Qt User Interface Compiler version 4.6.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file! @@ -36,9 +36,17 @@ class Ui_CarMainWindow public: QWidget *centralWidget; QTabWidget *tabWidget; + QWidget *tabTop; + QPushButton *buttonTopRefresh; + QListView *listViewTopList; + QWidget *layoutWidget; + QVBoxLayout *verticalLayout_3; + QLabel *labelCategory; + QComboBox *comboBoxTopCategory; + QLabel *labelTopList; QWidget *StartTab; QListView *listViewStartTabAccelerationCategories; - QWidget *layoutWidget; + QWidget *layoutWidget1; QVBoxLayout *verticalLayout_2; QLabel *startLabel; QLineEdit *lineEditStartTabMin; @@ -48,14 +56,6 @@ public: QComboBox *comboBoxStartTabUnits; QPushButton *autoStartButton; QPushButton *manualStartButton; - QWidget *tabTop; - QPushButton *buttonTopRefresh; - QListView *listViewTopList; - QWidget *layoutWidget1; - QVBoxLayout *verticalLayout_3; - QLabel *labelCategory; - QComboBox *comboBoxTopCategory; - QLabel *labelTopList; QWidget *settingsTab; QLabel *userNameLabel; QPushButton *setUserPushButton; @@ -90,45 +90,94 @@ public: tabWidget = new QTabWidget(centralWidget); tabWidget->setObjectName(QString::fromUtf8("tabWidget")); tabWidget->setGeometry(QRect(0, 0, 781, 361)); + tabTop = new QWidget(); + tabTop->setObjectName(QString::fromUtf8("tabTop")); + buttonTopRefresh = new QPushButton(tabTop); + buttonTopRefresh->setObjectName(QString::fromUtf8("buttonTopRefresh")); + buttonTopRefresh->setGeometry(QRect(10, 210, 221, 71)); + QFont font; + font.setFamily(QString::fromUtf8("Bitstream Charter")); + font.setPointSize(16); + font.setBold(true); + font.setWeight(75); + buttonTopRefresh->setFont(font); + listViewTopList = new QListView(tabTop); + listViewTopList->setObjectName(QString::fromUtf8("listViewTopList")); + listViewTopList->setGeometry(QRect(360, 10, 411, 311)); + QFont font1; + font1.setFamily(QString::fromUtf8("Bitstream Charter")); + font1.setPointSize(10); + listViewTopList->setFont(font1); + listViewTopList->setFlow(QListView::LeftToRight); + layoutWidget = new QWidget(tabTop); + layoutWidget->setObjectName(QString::fromUtf8("layoutWidget")); + layoutWidget->setGeometry(QRect(10, 10, 341, 141)); + verticalLayout_3 = new QVBoxLayout(layoutWidget); + verticalLayout_3->setSpacing(6); + verticalLayout_3->setContentsMargins(11, 11, 11, 11); + verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3")); + verticalLayout_3->setContentsMargins(0, 0, 0, 0); + labelCategory = new QLabel(layoutWidget); + labelCategory->setObjectName(QString::fromUtf8("labelCategory")); + QFont font2; + font2.setFamily(QString::fromUtf8("Bitstream Charter")); + font2.setPointSize(16); + labelCategory->setFont(font2); + + verticalLayout_3->addWidget(labelCategory); + + comboBoxTopCategory = new QComboBox(layoutWidget); + comboBoxTopCategory->setObjectName(QString::fromUtf8("comboBoxTopCategory")); + + verticalLayout_3->addWidget(comboBoxTopCategory); + + labelTopList = new QLabel(tabTop); + labelTopList->setObjectName(QString::fromUtf8("labelTopList")); + labelTopList->setGeometry(QRect(380, 10, 371, 311)); + QFont font3; + font3.setPointSize(9); + labelTopList->setFont(font3); + labelTopList->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter); + tabWidget->addTab(tabTop, QString()); StartTab = new QWidget(); StartTab->setObjectName(QString::fromUtf8("StartTab")); listViewStartTabAccelerationCategories = new QListView(StartTab); listViewStartTabAccelerationCategories->setObjectName(QString::fromUtf8("listViewStartTabAccelerationCategories")); listViewStartTabAccelerationCategories->setGeometry(QRect(0, 10, 151, 301)); - layoutWidget = new QWidget(StartTab); - layoutWidget->setObjectName(QString::fromUtf8("layoutWidget")); - layoutWidget->setGeometry(QRect(160, 10, 311, 301)); - verticalLayout_2 = new QVBoxLayout(layoutWidget); + layoutWidget1 = new QWidget(StartTab); + layoutWidget1->setObjectName(QString::fromUtf8("layoutWidget1")); + layoutWidget1->setGeometry(QRect(160, 10, 311, 301)); + verticalLayout_2 = new QVBoxLayout(layoutWidget1); verticalLayout_2->setSpacing(6); verticalLayout_2->setContentsMargins(11, 11, 11, 11); verticalLayout_2->setObjectName(QString::fromUtf8("verticalLayout_2")); verticalLayout_2->setContentsMargins(0, 0, 0, 0); - startLabel = new QLabel(layoutWidget); + startLabel = new QLabel(layoutWidget1); startLabel->setObjectName(QString::fromUtf8("startLabel")); verticalLayout_2->addWidget(startLabel); - lineEditStartTabMin = new QLineEdit(layoutWidget); + lineEditStartTabMin = new QLineEdit(layoutWidget1); lineEditStartTabMin->setObjectName(QString::fromUtf8("lineEditStartTabMin")); verticalLayout_2->addWidget(lineEditStartTabMin); - stopLabel = new QLabel(layoutWidget); + stopLabel = new QLabel(layoutWidget1); stopLabel->setObjectName(QString::fromUtf8("stopLabel")); verticalLayout_2->addWidget(stopLabel); - lineEditStartTabMax = new QLineEdit(layoutWidget); + lineEditStartTabMax = new QLineEdit(layoutWidget1); lineEditStartTabMax->setObjectName(QString::fromUtf8("lineEditStartTabMax")); verticalLayout_2->addWidget(lineEditStartTabMax); - unitLabel = new QLabel(layoutWidget); + unitLabel = new QLabel(layoutWidget1); unitLabel->setObjectName(QString::fromUtf8("unitLabel")); verticalLayout_2->addWidget(unitLabel); - comboBoxStartTabUnits = new QComboBox(layoutWidget); + comboBoxStartTabUnits = new QComboBox(layoutWidget1); comboBoxStartTabUnits->setObjectName(QString::fromUtf8("comboBoxStartTabUnits")); verticalLayout_2->addWidget(comboBoxStartTabUnits); @@ -136,61 +185,12 @@ public: autoStartButton = new QPushButton(StartTab); autoStartButton->setObjectName(QString::fromUtf8("autoStartButton")); autoStartButton->setGeometry(QRect(520, 40, 201, 71)); - QFont font; - font.setFamily(QString::fromUtf8("Bitstream Charter")); - font.setPointSize(16); - font.setBold(true); - font.setWeight(75); autoStartButton->setFont(font); manualStartButton = new QPushButton(StartTab); manualStartButton->setObjectName(QString::fromUtf8("manualStartButton")); manualStartButton->setGeometry(QRect(520, 180, 201, 71)); manualStartButton->setFont(font); tabWidget->addTab(StartTab, QString()); - tabTop = new QWidget(); - tabTop->setObjectName(QString::fromUtf8("tabTop")); - buttonTopRefresh = new QPushButton(tabTop); - buttonTopRefresh->setObjectName(QString::fromUtf8("buttonTopRefresh")); - buttonTopRefresh->setGeometry(QRect(10, 210, 221, 71)); - buttonTopRefresh->setFont(font); - listViewTopList = new QListView(tabTop); - listViewTopList->setObjectName(QString::fromUtf8("listViewTopList")); - listViewTopList->setGeometry(QRect(360, 10, 411, 311)); - QFont font1; - font1.setFamily(QString::fromUtf8("Bitstream Charter")); - font1.setPointSize(10); - listViewTopList->setFont(font1); - listViewTopList->setFlow(QListView::LeftToRight); - layoutWidget1 = new QWidget(tabTop); - layoutWidget1->setObjectName(QString::fromUtf8("layoutWidget1")); - layoutWidget1->setGeometry(QRect(10, 10, 341, 141)); - verticalLayout_3 = new QVBoxLayout(layoutWidget1); - verticalLayout_3->setSpacing(6); - verticalLayout_3->setContentsMargins(11, 11, 11, 11); - verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3")); - verticalLayout_3->setContentsMargins(0, 0, 0, 0); - labelCategory = new QLabel(layoutWidget1); - labelCategory->setObjectName(QString::fromUtf8("labelCategory")); - QFont font2; - font2.setFamily(QString::fromUtf8("Bitstream Charter")); - font2.setPointSize(16); - labelCategory->setFont(font2); - - verticalLayout_3->addWidget(labelCategory); - - comboBoxTopCategory = new QComboBox(layoutWidget1); - comboBoxTopCategory->setObjectName(QString::fromUtf8("comboBoxTopCategory")); - - verticalLayout_3->addWidget(comboBoxTopCategory); - - labelTopList = new QLabel(tabTop); - labelTopList->setObjectName(QString::fromUtf8("labelTopList")); - labelTopList->setGeometry(QRect(380, 10, 371, 311)); - QFont font3; - font3.setPointSize(9); - labelTopList->setFont(font3); - labelTopList->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter); - tabWidget->addTab(tabTop, QString()); settingsTab = new QWidget(); settingsTab->setObjectName(QString::fromUtf8("settingsTab")); userNameLabel = new QLabel(settingsTab); @@ -296,16 +296,16 @@ public: void retranslateUi(QMainWindow *CarMainWindow) { CarMainWindow->setWindowTitle(QApplication::translate("CarMainWindow", "Speed freak", 0, QApplication::UnicodeUTF8)); + buttonTopRefresh->setText(QApplication::translate("CarMainWindow", "Refresh list", 0, QApplication::UnicodeUTF8)); + labelCategory->setText(QApplication::translate("CarMainWindow", "Category:", 0, QApplication::UnicodeUTF8)); + labelTopList->setText(QApplication::translate("CarMainWindow", "TopList", 0, QApplication::UnicodeUTF8)); + tabWidget->setTabText(tabWidget->indexOf(tabTop), QApplication::translate("CarMainWindow", "Top", 0, QApplication::UnicodeUTF8)); startLabel->setText(QApplication::translate("CarMainWindow", "Start:", 0, QApplication::UnicodeUTF8)); stopLabel->setText(QApplication::translate("CarMainWindow", "Stop:", 0, QApplication::UnicodeUTF8)); unitLabel->setText(QApplication::translate("CarMainWindow", "Unit:", 0, QApplication::UnicodeUTF8)); autoStartButton->setText(QApplication::translate("CarMainWindow", "Auto start", 0, QApplication::UnicodeUTF8)); manualStartButton->setText(QApplication::translate("CarMainWindow", "Manual start", 0, QApplication::UnicodeUTF8)); tabWidget->setTabText(tabWidget->indexOf(StartTab), QApplication::translate("CarMainWindow", "Start", 0, QApplication::UnicodeUTF8)); - buttonTopRefresh->setText(QApplication::translate("CarMainWindow", "Refresh list", 0, QApplication::UnicodeUTF8)); - labelCategory->setText(QApplication::translate("CarMainWindow", "Category:", 0, QApplication::UnicodeUTF8)); - labelTopList->setText(QApplication::translate("CarMainWindow", "TopList", 0, QApplication::UnicodeUTF8)); - tabWidget->setTabText(tabWidget->indexOf(tabTop), QApplication::translate("CarMainWindow", "Top", 0, QApplication::UnicodeUTF8)); userNameLabel->setText(QApplication::translate("CarMainWindow", "User:", 0, QApplication::UnicodeUTF8)); setUserPushButton->setText(QApplication::translate("CarMainWindow", "Set User", 0, QApplication::UnicodeUTF8)); tabWidget->setTabText(tabWidget->indexOf(settingsTab), QApplication::translate("CarMainWindow", "Settings", 0, QApplication::UnicodeUTF8)); diff --git a/Client/ui_resultdialog.h b/Client/ui_resultdialog.h index 3e029b2..bd85efe 100644 --- a/Client/ui_resultdialog.h +++ b/Client/ui_resultdialog.h @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading UI file 'resultdialog.ui' ** -** Created: Wed Mar 17 10:18:14 2010 +** Created: Wed Mar 17 11:45:21 2010 ** by: Qt User Interface Compiler version 4.6.1 ** ** WARNING! All changes made in this file will be lost when recompiling UI file!