From 7b8ca0ff5fa907e0689cea387f710c5c7819f516 Mon Sep 17 00:00:00 2001 From: Petr Kubiznak Date: Tue, 5 Apr 2011 00:20:01 +0200 Subject: [PATCH] mines3d.pro: Config modified to reflect changes in .ui files. ui/qt/ui_*.h files removed (they are generated by uic, as called in Makefile). --- mines3d.pro | 49 ++++++++----- ui/qt/ui_AboutForm.h | 82 ---------------------- ui/qt/ui_MainForm.h | 157 ----------------------------------------- ui/qt/ui_ScoresForm.h | 79 --------------------- ui/qt/ui_SettingsForm.h | 181 ------------------------------------------------ 5 files changed, 33 insertions(+), 515 deletions(-) delete mode 100644 ui/qt/ui_AboutForm.h delete mode 100644 ui/qt/ui_MainForm.h delete mode 100644 ui/qt/ui_ScoresForm.h delete mode 100644 ui/qt/ui_SettingsForm.h diff --git a/mines3d.pro b/mines3d.pro index 4f919cf..6a06cad 100644 --- a/mines3d.pro +++ b/mines3d.pro @@ -1,9 +1,9 @@ ###################################################################### -# Automatically generated by qmake (2.01a) st 1 20 14:24:02 2010 +# Automatically generated by qmake (2.01a) �t 4 5 00:09:28 2011 ###################################################################### TEMPLATE = app -TARGET = +TARGET = mines3d win32 { LIBS += -lmysql -lglut32 -lglu32 -lpthreadGC2 @@ -13,28 +13,45 @@ unix { } CONFIG += opengl debug -DEPENDPATH += . core exceptions ui/console ui/qt threads sqlconn opengl -INCLUDEPATH += . ui/console ui/qt exceptions core threads sqlconn opengl +DEPENDPATH += . \ + core \ + exceptions \ + opengl \ + sqlconn \ + threads \ + ui/console \ + ui/qt +INCLUDEPATH += . \ + ui/console \ + ui/qt \ + exceptions \ + core \ + opengl \ + threads \ + sqlconn # Input HEADERS += asserts.h \ core/board.h \ core/field.h \ exceptions/AccessForbiddenException.h \ + exceptions/CAudioException.h \ exceptions/GeneralException.h \ exceptions/OutOfBoundsException.h \ + opengl/readtex.h \ + opengl/runGlutMainLoop.h \ + opengl/trackball.h \ + sound/CAudio.h \ + sqlconn/sql_connector.h \ + threads/thread_controller.h \ + sound/test/CAudio.h \ ui/console/console.h \ ui/qt/AboutForm.h \ ui/qt/MainForm.h \ ui/qt/qt_gui.h \ ui/qt/ScoreRecord.h \ ui/qt/ScoresForm.h \ - ui/qt/SettingsForm.h \ - threads/thread_controller.h \ - sqlconn/sql_connector.h \ - opengl/runGlutMainLoop.h \ - opengl/trackball.h \ - opengl/readtex.h + ui/qt/SettingsForm.h FORMS += ui/qt/AboutForm.ui \ ui/qt/MainForm.ui \ ui/qt/ScoresForm.ui \ @@ -43,16 +60,16 @@ SOURCES += main.cpp \ core/board.cpp \ core/field.cpp \ exceptions/AccessForbiddenException.cpp \ + exceptions/CAudioException.cpp \ exceptions/GeneralException.cpp \ exceptions/OutOfBoundsException.cpp \ + opengl/runGlutMainLoop.cpp \ + opengl/trackball.cpp \ + sqlconn/sql_connector.cpp \ + threads/thread_controller.cpp \ ui/console/console.cpp \ ui/qt/AboutForm.cpp \ ui/qt/MainForm.cpp \ ui/qt/qt_gui.cpp \ ui/qt/ScoresForm.cpp \ - ui/qt/SettingsForm.cpp \ - threads/thread_controller.cpp \ - sqlconn/sql_connector.cpp \ - opengl/runGlutMainLoop.cpp \ - opengl/trackball.cpp - \ No newline at end of file + ui/qt/SettingsForm.cpp diff --git a/ui/qt/ui_AboutForm.h b/ui/qt/ui_AboutForm.h deleted file mode 100644 index a6d9f9b..0000000 --- a/ui/qt/ui_AboutForm.h +++ /dev/null @@ -1,82 +0,0 @@ -/******************************************************************************** -** Form generated from reading ui file 'AboutForm.ui' -** -** Created: Tue Jan 26 11:59:40 2010 -** by: Qt User Interface Compiler version 4.5.3 -** -** WARNING! All changes made in this file will be lost when recompiling ui file! -********************************************************************************/ - -#ifndef UI_ABOUTFORM_H -#define UI_ABOUTFORM_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Ui_AboutForm -{ -public: - QVBoxLayout *verticalLayout; - QLabel *AboutLbl; - QDialogButtonBox *buttonBox; - - void setupUi(QDialog *AboutForm) - { - if (AboutForm->objectName().isEmpty()) - AboutForm->setObjectName(QString::fromUtf8("AboutForm")); - AboutForm->resize(447, 186); - verticalLayout = new QVBoxLayout(AboutForm); - verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); - AboutLbl = new QLabel(AboutForm); - AboutLbl->setObjectName(QString::fromUtf8("AboutLbl")); - - verticalLayout->addWidget(AboutLbl); - - buttonBox = new QDialogButtonBox(AboutForm); - buttonBox->setObjectName(QString::fromUtf8("buttonBox")); - buttonBox->setOrientation(Qt::Horizontal); - buttonBox->setStandardButtons(QDialogButtonBox::Close); - buttonBox->setCenterButtons(false); - - verticalLayout->addWidget(buttonBox); - - - retranslateUi(AboutForm); - QObject::connect(buttonBox, SIGNAL(rejected()), AboutForm, SLOT(close())); - - QMetaObject::connectSlotsByName(AboutForm); - } // setupUi - - void retranslateUi(QDialog *AboutForm) - { - AboutForm->setWindowTitle(QApplication::translate("AboutForm", "About Mines3D", 0, QApplication::UnicodeUTF8)); - AboutLbl->setText(QApplication::translate("AboutForm", "\n" -"\n" -"

Mines3D 1.0

\n" -"

\302\251 Petr Kubiz\305\210\303\241k, Czech Technical University in Prague, 2010
Created as a semestral project on subject Y36PJC.

\n" -"

\n" -"

Thanks to Petra Mertl\303\255kov\303\241 for a theme suggestion and long-term support.

", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(AboutForm); - } // retranslateUi - -}; - -namespace Ui { - class AboutForm: public Ui_AboutForm {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_ABOUTFORM_H diff --git a/ui/qt/ui_MainForm.h b/ui/qt/ui_MainForm.h deleted file mode 100644 index c3e4afd..0000000 --- a/ui/qt/ui_MainForm.h +++ /dev/null @@ -1,157 +0,0 @@ -/******************************************************************************** -** Form generated from reading ui file 'MainForm.ui' -** -** Created: Fri Jan 15 22:28:13 2010 -** by: Qt User Interface Compiler version 4.5.3 -** -** WARNING! All changes made in this file will be lost when recompiling ui file! -********************************************************************************/ - -#ifndef UI_MAINFORM_H -#define UI_MAINFORM_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Ui_MainForm -{ -public: - QAction *actionNew; - QAction *actionSettings; - QAction *actionQuit; - QAction *actionAbout; - QAction *actionScores; - QWidget *centralwidget; - QVBoxLayout *verticalLayout; - QScrollArea *scrollArea; - QWidget *scrollAreaWidgetContents; - QHBoxLayout *horizontalLayout; - QSpacerItem *horizontalSpacer; - QWidget *boardWidget; - QVBoxLayout *verticalLayout_3; - QSpacerItem *horizontalSpacer_2; - QMenuBar *menubar; - QMenu *menuMenu; - QMenu *menuHelp; - QStatusBar *statusbar; - - void setupUi(QMainWindow *MainForm) - { - if (MainForm->objectName().isEmpty()) - MainForm->setObjectName(QString::fromUtf8("MainForm")); - MainForm->resize(525, 462); - actionNew = new QAction(MainForm); - actionNew->setObjectName(QString::fromUtf8("actionNew")); - actionSettings = new QAction(MainForm); - actionSettings->setObjectName(QString::fromUtf8("actionSettings")); - actionQuit = new QAction(MainForm); - actionQuit->setObjectName(QString::fromUtf8("actionQuit")); - actionAbout = new QAction(MainForm); - actionAbout->setObjectName(QString::fromUtf8("actionAbout")); - actionScores = new QAction(MainForm); - actionScores->setObjectName(QString::fromUtf8("actionScores")); - centralwidget = new QWidget(MainForm); - centralwidget->setObjectName(QString::fromUtf8("centralwidget")); - verticalLayout = new QVBoxLayout(centralwidget); - verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); - scrollArea = new QScrollArea(centralwidget); - scrollArea->setObjectName(QString::fromUtf8("scrollArea")); - scrollArea->setFrameShape(QFrame::StyledPanel); - scrollArea->setFrameShadow(QFrame::Sunken); - scrollArea->setWidgetResizable(true); - scrollAreaWidgetContents = new QWidget(); - scrollAreaWidgetContents->setObjectName(QString::fromUtf8("scrollAreaWidgetContents")); - scrollAreaWidgetContents->setGeometry(QRect(0, 0, 505, 397)); - horizontalLayout = new QHBoxLayout(scrollAreaWidgetContents); - horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); - horizontalSpacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - - horizontalLayout->addItem(horizontalSpacer); - - boardWidget = new QWidget(scrollAreaWidgetContents); - boardWidget->setObjectName(QString::fromUtf8("boardWidget")); - QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(boardWidget->sizePolicy().hasHeightForWidth()); - boardWidget->setSizePolicy(sizePolicy); - verticalLayout_3 = new QVBoxLayout(boardWidget); - verticalLayout_3->setObjectName(QString::fromUtf8("verticalLayout_3")); - - horizontalLayout->addWidget(boardWidget); - - horizontalSpacer_2 = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum); - - horizontalLayout->addItem(horizontalSpacer_2); - - scrollArea->setWidget(scrollAreaWidgetContents); - - verticalLayout->addWidget(scrollArea); - - MainForm->setCentralWidget(centralwidget); - menubar = new QMenuBar(MainForm); - menubar->setObjectName(QString::fromUtf8("menubar")); - menubar->setGeometry(QRect(0, 0, 525, 23)); - menuMenu = new QMenu(menubar); - menuMenu->setObjectName(QString::fromUtf8("menuMenu")); - menuHelp = new QMenu(menubar); - menuHelp->setObjectName(QString::fromUtf8("menuHelp")); - MainForm->setMenuBar(menubar); - statusbar = new QStatusBar(MainForm); - statusbar->setObjectName(QString::fromUtf8("statusbar")); - MainForm->setStatusBar(statusbar); - - menubar->addAction(menuMenu->menuAction()); - menubar->addAction(menuHelp->menuAction()); - menuMenu->addAction(actionNew); - menuMenu->addAction(actionSettings); - menuMenu->addSeparator(); - menuMenu->addAction(actionScores); - menuMenu->addSeparator(); - menuMenu->addAction(actionQuit); - menuHelp->addAction(actionAbout); - - retranslateUi(MainForm); - QObject::connect(actionQuit, SIGNAL(triggered()), MainForm, SLOT(close())); - - QMetaObject::connectSlotsByName(MainForm); - } // setupUi - - void retranslateUi(QMainWindow *MainForm) - { - MainForm->setWindowTitle(QApplication::translate("MainForm", "Mines3D", 0, QApplication::UnicodeUTF8)); - actionNew->setText(QApplication::translate("MainForm", "New", 0, QApplication::UnicodeUTF8)); - actionNew->setShortcut(QApplication::translate("MainForm", "Ctrl+N", 0, QApplication::UnicodeUTF8)); - actionSettings->setText(QApplication::translate("MainForm", "Settings...", 0, QApplication::UnicodeUTF8)); - actionQuit->setText(QApplication::translate("MainForm", "Quit", 0, QApplication::UnicodeUTF8)); - actionQuit->setShortcut(QApplication::translate("MainForm", "Ctrl+Q", 0, QApplication::UnicodeUTF8)); - actionAbout->setText(QApplication::translate("MainForm", "About", 0, QApplication::UnicodeUTF8)); - actionAbout->setShortcut(QApplication::translate("MainForm", "F1", 0, QApplication::UnicodeUTF8)); - actionScores->setText(QApplication::translate("MainForm", "Hall of Fame...", 0, QApplication::UnicodeUTF8)); - menuMenu->setTitle(QApplication::translate("MainForm", "Game", 0, QApplication::UnicodeUTF8)); - menuHelp->setTitle(QApplication::translate("MainForm", "Help", 0, QApplication::UnicodeUTF8)); - } // retranslateUi - -}; - -namespace Ui { - class MainForm: public Ui_MainForm {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_MAINFORM_H diff --git a/ui/qt/ui_ScoresForm.h b/ui/qt/ui_ScoresForm.h deleted file mode 100644 index 1f30f2e..0000000 --- a/ui/qt/ui_ScoresForm.h +++ /dev/null @@ -1,79 +0,0 @@ -/******************************************************************************** -** Form generated from reading ui file 'ScoresForm.ui' -** -** Created: Sat Jan 16 00:15:21 2010 -** by: Qt User Interface Compiler version 4.5.3 -** -** WARNING! All changes made in this file will be lost when recompiling ui file! -********************************************************************************/ - -#ifndef UI_SCORESFORM_H -#define UI_SCORESFORM_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Ui_ScoresForm -{ -public: - QVBoxLayout *verticalLayout; - QComboBox *difficultnessCbx; - QTreeView *scoresView; - QDialogButtonBox *buttonBox; - - void setupUi(QDialog *ScoresForm) - { - if (ScoresForm->objectName().isEmpty()) - ScoresForm->setObjectName(QString::fromUtf8("ScoresForm")); - ScoresForm->resize(344, 336); - verticalLayout = new QVBoxLayout(ScoresForm); - verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); - difficultnessCbx = new QComboBox(ScoresForm); - difficultnessCbx->setObjectName(QString::fromUtf8("difficultnessCbx")); - - verticalLayout->addWidget(difficultnessCbx); - - scoresView = new QTreeView(ScoresForm); - scoresView->setObjectName(QString::fromUtf8("scoresView")); - - verticalLayout->addWidget(scoresView); - - buttonBox = new QDialogButtonBox(ScoresForm); - buttonBox->setObjectName(QString::fromUtf8("buttonBox")); - buttonBox->setOrientation(Qt::Horizontal); - buttonBox->setStandardButtons(QDialogButtonBox::Close); - - verticalLayout->addWidget(buttonBox); - - - retranslateUi(ScoresForm); - QObject::connect(buttonBox, SIGNAL(rejected()), ScoresForm, SLOT(close())); - - QMetaObject::connectSlotsByName(ScoresForm); - } // setupUi - - void retranslateUi(QDialog *ScoresForm) - { - ScoresForm->setWindowTitle(QApplication::translate("ScoresForm", "Hall of Fame", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(ScoresForm); - } // retranslateUi - -}; - -namespace Ui { - class ScoresForm: public Ui_ScoresForm {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_SCORESFORM_H diff --git a/ui/qt/ui_SettingsForm.h b/ui/qt/ui_SettingsForm.h deleted file mode 100644 index c370915..0000000 --- a/ui/qt/ui_SettingsForm.h +++ /dev/null @@ -1,181 +0,0 @@ -/******************************************************************************** -** Form generated from reading ui file 'SettingsForm.ui' -** -** Created: Fri Jan 15 22:22:02 2010 -** by: Qt User Interface Compiler version 4.5.3 -** -** WARNING! All changes made in this file will be lost when recompiling ui file! -********************************************************************************/ - -#ifndef UI_SETTINGSFORM_H -#define UI_SETTINGSFORM_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -QT_BEGIN_NAMESPACE - -class Ui_SettingsForm -{ -public: - QGridLayout *gridLayout; - QGroupBox *customGpb; - QGridLayout *gridLayout_2; - QLabel *layersLbl; - QSpinBox *layersSpinBox; - QLabel *rowsLbl; - QSpinBox *rowsSpinBox; - QLabel *columnsLbl; - QSpinBox *columnsSpinBox; - QLabel *minesLbl; - QSpinBox *minesSpinBox; - QDialogButtonBox *buttonBox; - QGroupBox *groupBox; - QGridLayout *gridLayout_3; - QRadioButton *rookieRadio; - QRadioButton *advancedRadio; - QRadioButton *suicideRadio; - QRadioButton *customRadio; - - void setupUi(QDialog *SettingsForm) - { - if (SettingsForm->objectName().isEmpty()) - SettingsForm->setObjectName(QString::fromUtf8("SettingsForm")); - SettingsForm->resize(360, 216); - gridLayout = new QGridLayout(SettingsForm); - gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - customGpb = new QGroupBox(SettingsForm); - customGpb->setObjectName(QString::fromUtf8("customGpb")); - gridLayout_2 = new QGridLayout(customGpb); - gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2")); - layersLbl = new QLabel(customGpb); - layersLbl->setObjectName(QString::fromUtf8("layersLbl")); - - gridLayout_2->addWidget(layersLbl, 0, 0, 1, 1); - - layersSpinBox = new QSpinBox(customGpb); - layersSpinBox->setObjectName(QString::fromUtf8("layersSpinBox")); - layersSpinBox->setMinimum(1); - layersSpinBox->setMaximum(20); - - gridLayout_2->addWidget(layersSpinBox, 0, 1, 1, 1); - - rowsLbl = new QLabel(customGpb); - rowsLbl->setObjectName(QString::fromUtf8("rowsLbl")); - - gridLayout_2->addWidget(rowsLbl, 1, 0, 1, 1); - - rowsSpinBox = new QSpinBox(customGpb); - rowsSpinBox->setObjectName(QString::fromUtf8("rowsSpinBox")); - rowsSpinBox->setMinimum(1); - - gridLayout_2->addWidget(rowsSpinBox, 1, 1, 1, 1); - - columnsLbl = new QLabel(customGpb); - columnsLbl->setObjectName(QString::fromUtf8("columnsLbl")); - - gridLayout_2->addWidget(columnsLbl, 2, 0, 1, 1); - - columnsSpinBox = new QSpinBox(customGpb); - columnsSpinBox->setObjectName(QString::fromUtf8("columnsSpinBox")); - columnsSpinBox->setMinimum(1); - - gridLayout_2->addWidget(columnsSpinBox, 2, 1, 1, 1); - - minesLbl = new QLabel(customGpb); - minesLbl->setObjectName(QString::fromUtf8("minesLbl")); - - gridLayout_2->addWidget(minesLbl, 3, 0, 1, 1); - - minesSpinBox = new QSpinBox(customGpb); - minesSpinBox->setObjectName(QString::fromUtf8("minesSpinBox")); - minesSpinBox->setMinimum(1); - minesSpinBox->setMaximum(300); - - gridLayout_2->addWidget(minesSpinBox, 3, 1, 1, 1); - - - gridLayout->addWidget(customGpb, 0, 2, 1, 1); - - buttonBox = new QDialogButtonBox(SettingsForm); - buttonBox->setObjectName(QString::fromUtf8("buttonBox")); - QSizePolicy sizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(buttonBox->sizePolicy().hasHeightForWidth()); - buttonBox->setSizePolicy(sizePolicy); - buttonBox->setOrientation(Qt::Horizontal); - buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); - - gridLayout->addWidget(buttonBox, 1, 1, 1, 2); - - groupBox = new QGroupBox(SettingsForm); - groupBox->setObjectName(QString::fromUtf8("groupBox")); - gridLayout_3 = new QGridLayout(groupBox); - gridLayout_3->setObjectName(QString::fromUtf8("gridLayout_3")); - rookieRadio = new QRadioButton(groupBox); - rookieRadio->setObjectName(QString::fromUtf8("rookieRadio")); - - gridLayout_3->addWidget(rookieRadio, 0, 0, 1, 1); - - advancedRadio = new QRadioButton(groupBox); - advancedRadio->setObjectName(QString::fromUtf8("advancedRadio")); - - gridLayout_3->addWidget(advancedRadio, 1, 0, 1, 1); - - suicideRadio = new QRadioButton(groupBox); - suicideRadio->setObjectName(QString::fromUtf8("suicideRadio")); - - gridLayout_3->addWidget(suicideRadio, 2, 0, 1, 1); - - customRadio = new QRadioButton(groupBox); - customRadio->setObjectName(QString::fromUtf8("customRadio")); - - gridLayout_3->addWidget(customRadio, 3, 0, 1, 1); - - - gridLayout->addWidget(groupBox, 0, 1, 1, 1); - - - retranslateUi(SettingsForm); - QObject::connect(buttonBox, SIGNAL(accepted()), SettingsForm, SLOT(accept())); - QObject::connect(buttonBox, SIGNAL(rejected()), SettingsForm, SLOT(reject())); - - QMetaObject::connectSlotsByName(SettingsForm); - } // setupUi - - void retranslateUi(QDialog *SettingsForm) - { - SettingsForm->setWindowTitle(QApplication::translate("SettingsForm", "Settings", 0, QApplication::UnicodeUTF8)); - customGpb->setTitle(QApplication::translate("SettingsForm", "Custom", 0, QApplication::UnicodeUTF8)); - layersLbl->setText(QApplication::translate("SettingsForm", "Layers:", 0, QApplication::UnicodeUTF8)); - rowsLbl->setText(QApplication::translate("SettingsForm", "Rows:", 0, QApplication::UnicodeUTF8)); - columnsLbl->setText(QApplication::translate("SettingsForm", "Columns:", 0, QApplication::UnicodeUTF8)); - minesLbl->setText(QApplication::translate("SettingsForm", "Mines:", 0, QApplication::UnicodeUTF8)); - groupBox->setTitle(QApplication::translate("SettingsForm", "Difficultness", 0, QApplication::UnicodeUTF8)); - rookieRadio->setText(QApplication::translate("SettingsForm", "Rookie", 0, QApplication::UnicodeUTF8)); - advancedRadio->setText(QApplication::translate("SettingsForm", "Advanced", 0, QApplication::UnicodeUTF8)); - suicideRadio->setText(QApplication::translate("SettingsForm", "Suicide", 0, QApplication::UnicodeUTF8)); - customRadio->setText(QApplication::translate("SettingsForm", "Custom", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(SettingsForm); - } // retranslateUi - -}; - -namespace Ui { - class SettingsForm: public Ui_SettingsForm {}; -} // namespace Ui - -QT_END_NAMESPACE - -#endif // UI_SETTINGSFORM_H -- 2.11.4.GIT