diff --git a/src/meshlab/mainwindow.h b/src/meshlab/mainwindow.h index fbe75abf0..cca792dc0 100644 --- a/src/meshlab/mainwindow.h +++ b/src/meshlab/mainwindow.h @@ -170,7 +170,6 @@ private: QAction *setCustomizeAct; ///////////Action Menu Help //////////////////////// QAction *aboutAct; - QAction *aboutQtAct; QAction *aboutPluginsAct; ///////////////////////////////////////////// vector TotalRenderList; diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp index f10ca3211..a4e894380 100644 --- a/src/meshlab/mainwindow_Init.cpp +++ b/src/meshlab/mainwindow_Init.cpp @@ -24,6 +24,9 @@ History $Log$ +Revision 1.6 2005/12/03 19:05:39 davide_portelli +Added About menu. + Revision 1.5 2005/12/03 17:04:34 glvertex Added backface culling action and slots Added shortcuts for fancy and double lighting @@ -379,9 +382,6 @@ void MainWindow::createActions() aboutAct = new QAction(tr("&About"), this); connect(aboutAct, SIGNAL(triggered()), this, SLOT(about())); - aboutQtAct = new QAction(tr("About &Qt"), this); - connect(aboutQtAct, SIGNAL(triggered()), qApp, SLOT(aboutQt())); - aboutPluginsAct = new QAction(tr("About &Plugins"), this); connect(aboutPluginsAct, SIGNAL(triggered()), this, SLOT(aboutPlugins())); } @@ -464,7 +464,6 @@ void MainWindow::createMenus() //////////////////// Menu Help //////////////////////////////////////////////////////////////// helpMenu = menuBar()->addMenu(tr("&Help")); helpMenu->addAction(aboutAct); - helpMenu->addAction(aboutQtAct); helpMenu->addAction(aboutPluginsAct); } diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp index 0afb4cce4..e95f4eb5f 100644 --- a/src/meshlab/mainwindow_RunTime.cpp +++ b/src/meshlab/mainwindow_RunTime.cpp @@ -24,6 +24,9 @@ History $Log$ +Revision 1.8 2005/12/03 19:05:39 davide_portelli +Added About menu. + Revision 1.7 2005/12/03 17:04:34 glvertex Added backface culling action and slots Added shortcuts for fancy and double lighting @@ -215,7 +218,7 @@ First rough version. It simply load a mesh. #include "glarea.h" #include "plugindialog.h" #include "customDialog.h" - +#include "ui_aboutForm.h" //QProgressBar *MainWindow::qb; void MainWindow::updateRecentFileActions() @@ -540,9 +543,10 @@ bool MainWindow::saveSnapshot() } void MainWindow::about() { - QMessageBox::about(this, tr("About Plug & Paint"), - tr("The Plug & Paint example demonstrates how to write Qt " - "applications that can be extended through plugins.")); + QDialog *about_dialog = new QDialog(); + Ui::aboutDialog temp; + temp.setupUi(about_dialog); + about_dialog->show(); } void MainWindow::aboutPlugins() diff --git a/src/meshlab/meshlab.pro b/src/meshlab/meshlab.pro index ddda871b9..a8cfefa69 100644 --- a/src/meshlab/meshlab.pro +++ b/src/meshlab/meshlab.pro @@ -20,7 +20,8 @@ SOURCES = main.cpp \ ../../../sf/wrap/gui/trackball.cpp\ ../../../sf/wrap/gui/trackmode.cpp -FORMS = ui/custom.ui +FORMS = ui/custom.ui\ + ui/aboutForm.ui RESOURCES = meshlab.qrc diff --git a/src/meshlab/ui/aboutForm.ui b/src/meshlab/ui/aboutForm.ui new file mode 100644 index 000000000..d8d14f466 --- /dev/null +++ b/src/meshlab/ui/aboutForm.ui @@ -0,0 +1,78 @@ + + + + + aboutDialog + + + + 0 + 0 + 622 + 429 + + + + About + + + + + 160 + 240 + 431 + 111 + + + + <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">MeshLab, a mesh processing system, aimed to the user assisted cleaning, filtering, </p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">editing and rendering of unstructured 3D triangular meshes like the ones that usually </p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">arise in 3d scanning. The system is heavily based on the VCG library (vcg.sf.net).</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;"> Please, when using this tool, cite the following reference:</p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> P. Cignoni, F. Ponchio, A. Mochi, A. Buzzelli, D. Portelli,</p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> F. Mazzanti, G. Gangemi, A. Venturi, D. Vacca, L. Colombini,</p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"> M. Latronico ,P. Pirro , F. Vannini.</p></body></html> + + + + + + 250 + 390 + 75 + 23 + + + + OK + + + + + + 360 + 30 + 231 + 171 + + + + <html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:MS Shell Dlg; font-weight:400; font-style:normal; text-decoration:none;"><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">VCGLib http://vcg.sf.net </p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Visual and Computer Graphics Library</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;">Copyright(C) 2005-2006</p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Visual Computing Lab http://vcg.isti.cnr.it </p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">ISTI - Italian National Research Council</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;"><span style=" font-weight:600;">MeshLab</span> v0.3</p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">http://meshlab.sourceforge.net/ </p><p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">All rights reserved.</p></body></html> + + + + + + + + okButton + clicked() + aboutDialog + close() + + + 251 + 266 + + + 96 + 254 + + + + + diff --git a/src/meshlab/ui/ui_custom.h b/src/meshlab/ui/ui_custom.h deleted file mode 100644 index 8b53405d5..000000000 --- a/src/meshlab/ui/ui_custom.h +++ /dev/null @@ -1,178 +0,0 @@ -#ifndef UI_CUSTOM_H -#define UI_CUSTOM_H - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -class Ui_CDialogCustom -{ -public: - QVBoxLayout *vboxLayout; - QHBoxLayout *hboxLayout; - QLabel *labelBCB; - QPushButton *ButtonBCB; - QHBoxLayout *hboxLayout1; - QLabel *labelBCT; - QPushButton *ButtonBCT; - QHBoxLayout *hboxLayout2; - QLabel *labelLC; - QPushButton *ButtonLC; - QHBoxLayout *hboxLayout3; - QSpacerItem *spacerItem; - QPushButton *okButton; - QPushButton *cancelButton; - - void setupUi(QDialog *CDialogCustom) - { - CDialogCustom->setObjectName(QString::fromUtf8("CDialogCustom")); - CDialogCustom->resize(QSize(197, 159).expandedTo(CDialogCustom->minimumSizeHint())); - vboxLayout = new QVBoxLayout(CDialogCustom); - vboxLayout->setSpacing(6); - vboxLayout->setMargin(8); - vboxLayout->setObjectName(QString::fromUtf8("vboxLayout")); - hboxLayout = new QHBoxLayout(); - hboxLayout->setSpacing(6); - hboxLayout->setMargin(0); - hboxLayout->setObjectName(QString::fromUtf8("hboxLayout")); - labelBCB = new QLabel(CDialogCustom); - labelBCB->setObjectName(QString::fromUtf8("labelBCB")); - QFont font; - font.setFamily(QString::fromUtf8("MS Shell Dlg")); - font.setPointSize(11); - font.setBold(false); - font.setItalic(false); - font.setUnderline(false); - font.setWeight(50); - font.setStrikeOut(false); - labelBCB->setFont(font); - - hboxLayout->addWidget(labelBCB); - - ButtonBCB = new QPushButton(CDialogCustom); - ButtonBCB->setObjectName(QString::fromUtf8("ButtonBCB")); - QSizePolicy sizePolicy((QSizePolicy::Policy)1, (QSizePolicy::Policy)0); - sizePolicy.setHorizontalStretch(0); - sizePolicy.setVerticalStretch(0); - sizePolicy.setHeightForWidth(ButtonBCB->sizePolicy().hasHeightForWidth()); - ButtonBCB->setSizePolicy(sizePolicy); - ButtonBCB->setMinimumSize(QSize(21, 21)); - ButtonBCB->setMaximumSize(QSize(21, 21)); - - hboxLayout->addWidget(ButtonBCB); - - - vboxLayout->addLayout(hboxLayout); - - hboxLayout1 = new QHBoxLayout(); - hboxLayout1->setSpacing(6); - hboxLayout1->setMargin(0); - hboxLayout1->setObjectName(QString::fromUtf8("hboxLayout1")); - labelBCT = new QLabel(CDialogCustom); - labelBCT->setObjectName(QString::fromUtf8("labelBCT")); - QFont font1; - font1.setFamily(QString::fromUtf8("MS Shell Dlg")); - font1.setPointSize(11); - font1.setBold(false); - font1.setItalic(false); - font1.setUnderline(false); - font1.setWeight(50); - font1.setStrikeOut(false); - labelBCT->setFont(font1); - - hboxLayout1->addWidget(labelBCT); - - ButtonBCT = new QPushButton(CDialogCustom); - ButtonBCT->setObjectName(QString::fromUtf8("ButtonBCT")); - ButtonBCT->setMinimumSize(QSize(21, 21)); - ButtonBCT->setMaximumSize(QSize(21, 21)); - - hboxLayout1->addWidget(ButtonBCT); - - - vboxLayout->addLayout(hboxLayout1); - - hboxLayout2 = new QHBoxLayout(); - hboxLayout2->setSpacing(6); - hboxLayout2->setMargin(0); - hboxLayout2->setObjectName(QString::fromUtf8("hboxLayout2")); - labelLC = new QLabel(CDialogCustom); - labelLC->setObjectName(QString::fromUtf8("labelLC")); - QFont font2; - font2.setFamily(QString::fromUtf8("MS Shell Dlg")); - font2.setPointSize(11); - font2.setBold(false); - font2.setItalic(false); - font2.setUnderline(false); - font2.setWeight(50); - font2.setStrikeOut(false); - labelLC->setFont(font2); - - hboxLayout2->addWidget(labelLC); - - ButtonLC = new QPushButton(CDialogCustom); - ButtonLC->setObjectName(QString::fromUtf8("ButtonLC")); - ButtonLC->setMinimumSize(QSize(21, 21)); - ButtonLC->setMaximumSize(QSize(21, 21)); - - hboxLayout2->addWidget(ButtonLC); - - - vboxLayout->addLayout(hboxLayout2); - - hboxLayout3 = new QHBoxLayout(); - hboxLayout3->setSpacing(6); - hboxLayout3->setMargin(0); - hboxLayout3->setObjectName(QString::fromUtf8("hboxLayout3")); - spacerItem = new QSpacerItem(131, 31, QSizePolicy::Expanding, QSizePolicy::Minimum); - - hboxLayout3->addItem(spacerItem); - - okButton = new QPushButton(CDialogCustom); - okButton->setObjectName(QString::fromUtf8("okButton")); - - hboxLayout3->addWidget(okButton); - - cancelButton = new QPushButton(CDialogCustom); - cancelButton->setObjectName(QString::fromUtf8("cancelButton")); - - hboxLayout3->addWidget(cancelButton); - - - vboxLayout->addLayout(hboxLayout3); - - retranslateUi(CDialogCustom); - QObject::connect(okButton, SIGNAL(clicked()), CDialogCustom, SLOT(accept())); - QObject::connect(cancelButton, SIGNAL(clicked()), CDialogCustom, SLOT(reject())); - - QMetaObject::connectSlotsByName(CDialogCustom); - } // setupUi - - void retranslateUi(QDialog *CDialogCustom) - { - CDialogCustom->setWindowTitle(QApplication::translate("CDialogCustom", "Customize", 0, QApplication::UnicodeUTF8)); - labelBCB->setText(QApplication::translate("CDialogCustom", "

Background Color Bottom

", 0, QApplication::UnicodeUTF8)); - ButtonBCB->setText(QApplication::translate("CDialogCustom", "", 0, QApplication::UnicodeUTF8)); - labelBCT->setText(QApplication::translate("CDialogCustom", "

Background Color Top

", 0, QApplication::UnicodeUTF8)); - ButtonBCT->setText(QApplication::translate("CDialogCustom", "", 0, QApplication::UnicodeUTF8)); - labelLC->setText(QApplication::translate("CDialogCustom", "Log Color", 0, QApplication::UnicodeUTF8)); - ButtonLC->setText(QApplication::translate("CDialogCustom", "", 0, QApplication::UnicodeUTF8)); - okButton->setText(QApplication::translate("CDialogCustom", "OK", 0, QApplication::UnicodeUTF8)); - cancelButton->setText(QApplication::translate("CDialogCustom", "Cancel", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(CDialogCustom); - } // retranslateUi - -}; - -namespace Ui { - class CDialogCustom: public Ui_CDialogCustom {}; -} // namespace Ui - -#endif // UI_CUSTOM_H