mirror of
https://github.com/lucaspalomodevelop/meshlab.git
synced 2026-03-19 11:04:39 +00:00
- i got (auto) promotion!
This commit is contained in:
Guido Ranzuglia granzuglia
parent
3e4a7ac69b
commit
7a74896286
@ -5,18 +5,18 @@
|
||||
|
||||
!define MAINDIR $PROGRAMFILES64
|
||||
!define PRODUCT_NAME "MeshLab_64b"
|
||||
!define PRODUCT_VERSION "1.3.2"
|
||||
!define PRODUCT_VERSION "1.3.3"
|
||||
!define PRODUCT_PUBLISHER "Paolo Cignoni - Guido Ranzuglia VCG - ISTI - CNR"
|
||||
!define PRODUCT_WEB_SITE "http://meshlab.sourceforge.net"
|
||||
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\meshlab.exe"
|
||||
!define PRODUCT_DIR_REGKEY_S "Software\Microsoft\Windows\CurrentVersion\App Paths\meshlabserver.exe"
|
||||
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
|
||||
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
|
||||
!define QT_BASE "D:\qt-everywhere-opensource-src-4.7.2"
|
||||
!define QT_BASE "C:\Qt\qt-everywhere-opensource-src-5.1.0\qtbase"
|
||||
!define DISTRIB_FOLDER "../distrib"
|
||||
!define MICROSOFT_VS2008_REDIST_KEYDIR "Software\Microsoft\Windows\CurrentVersion\Uninstall\"
|
||||
!define MICROSOFT_VS2008_X64 "{8220EEFE-38CD-377E-8595-13398D740ACE}"
|
||||
!define MICROSOFT_VS2008_IA64 "{5827ECE1-AEB0-328E-B813-6FC68622C1F9}"
|
||||
!define MICROSOFT_VS2010_REDIST_KEYDIR "Software\Microsoft\Windows\CurrentVersion\Uninstall\"
|
||||
!define MICROSOFT_VS2010_X64 "{1D8E6291-B0D5-35EC-8441-6616F567A0F7}"
|
||||
!define MICROSOFT_VS2010_IA64 "{88C73C1C-2DE5-3B01-AFB8-B46EF4AB41CD}"
|
||||
|
||||
|
||||
|
||||
@ -55,7 +55,7 @@
|
||||
!define /date NOW "%Y_%m_%d"
|
||||
|
||||
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
|
||||
OutFile "MeshLabDevel_v132BETA_64bit_${NOW}.exe"
|
||||
OutFile "MeshLabDevel_v133_64bit_${NOW}.exe"
|
||||
;InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
|
||||
InstallDir "${MAINDIR}\VCG\MeshLab"
|
||||
ShowInstDetails show
|
||||
@ -96,17 +96,17 @@ Section -Prerequisites
|
||||
;MessageBox MB_OK "Letto : $0"
|
||||
;Quit
|
||||
|
||||
!insertmacro IfKeyExists HKLM ${MICROSOFT_VS2008_REDIST_KEYDIR} ${MICROSOFT_VS2008_X64}
|
||||
!insertmacro IfKeyExists HKLM ${MICROSOFT_VS2010_REDIST_KEYDIR} ${MICROSOFT_VS2010_X64}
|
||||
Pop $R0
|
||||
${If} $R0 == "1"
|
||||
Goto endPrerequisites
|
||||
${Else}
|
||||
!insertmacro IfKeyExists HKLM ${MICROSOFT_VS2008_REDIST_KEYDIR} ${MICROSOFT_VS2008_IA64}
|
||||
!insertmacro IfKeyExists HKLM ${MICROSOFT_VS2010_REDIST_KEYDIR} ${MICROSOFT_VS2010_IA64}
|
||||
Pop $R0
|
||||
${If} $R0 == "1"
|
||||
Goto endPrerequisites
|
||||
${Else}
|
||||
MessageBox MB_OK "Your system does not appear to have $\"Microsoft Visual C++ 2008 SP1 Redistributable Package (x64) installed$\".$\r MeshLab's Installation process will be aborted.$\r Please, install it and restart the MeshLab installer!"
|
||||
MessageBox MB_OK "Your system does not appear to have $\"Microsoft Visual C++ 2010 SP1 Redistributable Package (x64) installed$\".$\r MeshLab's Installation process will be aborted.$\r Please, install it and restart the MeshLab installer!"
|
||||
Quit
|
||||
${Endif}
|
||||
${Endif}
|
||||
@ -218,8 +218,8 @@ Section "MainSection" SEC01
|
||||
File "${DISTRIB_FOLDER}/plugins\samplefilter.dll"
|
||||
File "${DISTRIB_FOLDER}/plugins\samplefilterdyn.dll"
|
||||
|
||||
File "${DISTRIB_FOLDER}/plugins\filtergeodesic.dll"
|
||||
File "${DISTRIB_FOLDER}/plugins\filtercreateiso.dll"
|
||||
File "${DISTRIB_FOLDER}/plugins\filter_geodesic.dll"
|
||||
File "${DISTRIB_FOLDER}/plugins\filter_createiso.dll"
|
||||
|
||||
|
||||
; edit plugins (14)
|
||||
@ -290,18 +290,19 @@ Section "MainSection" SEC01
|
||||
SetOutPath "$INSTDIR\samples\images"
|
||||
File "${DISTRIB_FOLDER}/sample\images\duckCM.jpg"
|
||||
SetOutPath "$INSTDIR\imageformats"
|
||||
File ${QT_BASE}\plugins\imageformats\qjpeg4.dll
|
||||
File ${QT_BASE}\plugins\imageformats\qgif4.dll
|
||||
File ${QT_BASE}\plugins\imageformats\qtiff4.dll
|
||||
File ${QT_BASE}\plugins\imageformats\qjpeg.dll
|
||||
File ${QT_BASE}\plugins\imageformats\qgif.dll
|
||||
File ${QT_BASE}\plugins\imageformats\qtiff.dll
|
||||
SetOutPath "$INSTDIR"
|
||||
;File "${DISTRIB_FOLDER}\common.lib"
|
||||
File "${QT_BASE}\bin\QtCore4.dll"
|
||||
File "${QT_BASE}\bin\QtGui4.dll"
|
||||
File "${QT_BASE}\bin\QtOpenGL4.dll"
|
||||
File "${QT_BASE}\bin\QtXml4.dll"
|
||||
File "${QT_BASE}\bin\QtNetwork4.dll"
|
||||
File "${QT_BASE}\bin\QtScript4.dll"
|
||||
File "${QT_BASE}\bin\QtXmlPatterns4.dll"
|
||||
File "${QT_BASE}\bin\Qt5Core.dll"
|
||||
File "${QT_BASE}\bin\Qt5Gui.dll"
|
||||
File "${QT_BASE}\bin\Qt5OpenGL.dll"
|
||||
File "${QT_BASE}\bin\Qt5Xml.dll"
|
||||
File "${QT_BASE}\bin\Qt5Network.dll"
|
||||
File "${QT_BASE}\bin\Qt5Script.dll"
|
||||
File "${QT_BASE}\bin\Qt5XmlPatterns.dll"
|
||||
File "${QT_BASE}\bin\Qt5Widgets.dll"
|
||||
;File "C:\MinGW\bin\mingwm10.dll"
|
||||
;File "${QT_BASE}\..\mingw\bin\mingwm10.dll"
|
||||
;File "${QT_BASE}\..\mingw\bin\libgcc_s_dw2-1.dll"
|
||||
|
||||
@ -654,8 +654,8 @@ void MainWindow::createMenus()
|
||||
|
||||
//////////////////// Menu Preferences /////////////////////////////////////////////////////////////////////
|
||||
preferencesMenu=menuBar()->addMenu(tr("&Tools"));
|
||||
preferencesMenu->addAction(showFilterEditAct);
|
||||
preferencesMenu->addSeparator();
|
||||
//preferencesMenu->addAction(showFilterEditAct);
|
||||
//preferencesMenu->addSeparator();
|
||||
preferencesMenu->addAction(setCustomizeAct);
|
||||
|
||||
|
||||
@ -1139,7 +1139,7 @@ void MainWindow::saveRecentFileList(const QString &fileName)
|
||||
temp.buttonBox->addButton("Send Mail", QDialogButtonBox::AcceptRole);
|
||||
congratsDialog->exec();
|
||||
if(congratsDialog->result()==QDialog::Accepted)
|
||||
QDesktopServices::openUrl(QUrl("mailto:p.cignoni@isti.cnr.it?cc=g.ranzuglia@isti.cnr.it&subject=[MeshLab] Reporting Info on MeshLab Usage"));
|
||||
QDesktopServices::openUrl(QUrl("mailto:p.cignoni@isti.cnr.it;g.ranzuglia@isti.cnr.it?subject=[MeshLab] Reporting Info on MeshLab Usage"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>808</width>
|
||||
<height>643</height>
|
||||
<height>751</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
@ -139,12 +139,12 @@ p, li { white-space: pre-wrap; }
|
||||
<string><!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:'Lucida Grande'; font-size:13pt; 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-size:10pt; font-weight:600;">General Info</span><span style=" font-size:10pt;"> <br />MeshLab is an extensible mesh processing system, aimed to the user assisted cleaning, filtering, editing and rendering of unstructured 3D triangular meshes. The tool found its natural use for the processing of the meshes that usually arise in 3D scanning. The system is heavily based on the VCG library (</span><a href="http://vcg.sf.net"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">http://vcg.sf.net</span></a><span style=" font-size:10pt;">). <br /></span><span style=" font-size:10pt; font-weight:600;">References</span><span style=" font-size:10pt;"><br />Please, when using this tool in any academic activity, cite its use with the following reference:<br /></span><span style=" font-size:10pt; font-style:italic;">MeshLab<br />Visual Computing Lab - ISTI - CNR<br />http://meshlab.sourceforge.net/</span><span style=" font-size:10pt;"> <br /></span><span style=" font-size:10pt; font-weight:600;">Contacts</span><span style=" font-size:10pt;"><br />For bug reports, feature requests and technical issues please use the following sourceforge services.<br /> - </span><a href="http://sourceforge.net/forum/forum.php?forum_id=499533"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">help forum</span></a><span style=" font-size:10pt;"><br /> - </span><a href="http://sourceforge.net/tracker/?group_id=149444&amp;atid=774731"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">bug report tracking system </span></a><span style=" font-size:10pt;"><br /> - </span><a href="http://sourceforge.net/tracker/?group_id=149444&amp;atid=774734"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">feature request tracking system</span></a><span style=" font-size:10pt;"><br />For any other general, high level, question about MeshLab (no bug issue or feature request please) please contact: <br /></span><a href="mailto:p.cignoni@isti.cnr.it?subject=%5BMeshLab%5D%20Info%20request"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">Paolo Cignoni ( p.cignoni@isti.cnr.it ) </span></a><span style=" font-size:10pt;"><br /></span><span style=" font-size:10pt; font-weight:600;">Authors</span><span style=" font-size:10pt;"> <br /></span><span style=" font-size:10pt; font-style:italic;">Main Designer</span><span style=" font-size:10pt;">:<br /> - Paolo Cignoni</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-size:10pt; font-style:italic;">Release Manager</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-size:10pt;"> - Guido Ranzuglia<br /></span><span style=" font-size:10pt; font-style:italic;">Stable Contributors</span><span style=" font-size:10pt;">:<br /> - Marco Callieri<br /> - Massimiliano Corsini<br /> - Fabio Ganovelli</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-size:10pt;"> - Nico Pietroni</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-size:10pt;"> - Marco Tarini<br />The complete list of authors is available </span><a href="http://meshlab.sourceforge.net/wiki/index.php/Developers"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">here </span></a><span style=" font-size:10pt;"><br />Some of the authors of MeshLab have received financial support from various projects, acknowledged </span><a href="http://meshlab.sourceforge.net/wiki/index.php/Licenses#Acknowledgments"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">here </span></a><span style=" font-size:10pt;"><br /></span></p></body></html></string>
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; 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:'Lucida Grande'; font-size:10pt; font-weight:600;">General Info</span><span style=" font-family:'Lucida Grande'; font-size:10pt;"> <br />MeshLab is an extensible mesh processing system, aimed to the user assisted cleaning, filtering, editing and rendering of unstructured 3D triangular meshes. The tool found its natural use for the processing of the meshes that usually arise in 3D scanning. The system is heavily based on the VCG library (</span><a href="http://vcg.sf.net"><span style=" font-family:'Lucida Grande'; font-size:10pt; text-decoration: underline; color:#0000ff;">http://vcg.sf.net</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;">). <br /></span><span style=" font-family:'Lucida Grande'; font-size:10pt; font-weight:600;">References</span><span style=" font-family:'Lucida Grande'; font-size:10pt;"><br />Please, when using this tool in any academic activity, cite its use with the following reference:<br /></span><span style=" font-family:'Lucida Grande'; font-size:10pt; font-style:italic;">MeshLab<br />Visual Computing Lab - ISTI - CNR<br />http://meshlab.sourceforge.net/</span><span style=" font-family:'Lucida Grande'; font-size:10pt;"> <br /></span><span style=" font-family:'Lucida Grande'; font-size:10pt; font-weight:600;">Contacts</span><span style=" font-family:'Lucida Grande'; font-size:10pt;"><br />For bug reports, feature requests and technical issues please use the following sourceforge services.<br /> - </span><a href="http://sourceforge.net/forum/forum.php?forum_id=499533"><span style=" font-family:'Lucida Grande'; font-size:10pt; text-decoration: underline; color:#0000ff;">help forum</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"><br /> - </span><a href="http://sourceforge.net/tracker/?group_id=149444&amp;atid=774731"><span style=" font-family:'Lucida Grande'; font-size:10pt; text-decoration: underline; color:#0000ff;">bug report tracking system </span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"><br /> - </span><a href="http://sourceforge.net/tracker/?group_id=149444&amp;atid=774734"><span style=" font-family:'Lucida Grande'; font-size:10pt; text-decoration: underline; color:#0000ff;">feature request tracking system</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"><br />For any other general, high level, question about MeshLab (no bug issue or feature request please) please contact: <br /></span><a href="mailto:p.cignoni@isti.cnr.it?subject=%5BMeshLab%5D%20Info%20request"><span style=" font-family:'Lucida Grande'; font-size:10pt; text-decoration: underline; color:#0000ff;">Paolo Cignoni ( p.cignoni@isti.cnr.it ) </span></a></p>
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="mailto:p.cignoni@isti.cnr.it?subject=%5BMeshLab%5D%20Info%20request"><span style=" font-family:'Lucida Grande'; font-size:10pt; text-decoration: underline; color:#0000ff;">Guido Ranzuglia ( guido.ranzuglia@isti.cnr.it ) </span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"><br /></span><span style=" font-family:'Lucida Grande'; font-size:10pt; font-weight:600;">Authors</span><span style=" font-family:'Lucida Grande'; font-size:10pt;"> <br /></span><span style=" font-family:'Lucida Grande'; font-size:10pt; font-style:italic;">Main Designers</span><span style=" font-family:'Lucida Grande'; font-size:10pt;">:<br /> - Paolo Cignoni</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:'Lucida Grande'; font-size:10pt;"> - Guido Ranzuglia<br /></span><span style=" font-family:'Lucida Grande'; font-size:10pt; font-style:italic;">Stable Contributors</span><span style=" font-family:'Lucida Grande'; font-size:10pt;">:<br /> - Marco Callieri<br /> - Massimiliano Corsini<br /> - Fabio Ganovelli</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:'Lucida Grande'; font-size:10pt;"> - Nico Pietroni</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:'Lucida Grande'; font-size:10pt;"> - Marco Tarini<br />The complete list of authors is available </span><a href="http://meshlab.sourceforge.net/wiki/index.php/Developers"><span style=" font-family:'Lucida Grande'; font-size:10pt; text-decoration: underline; color:#0000ff;">here </span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"><br />Some of the authors of MeshLab have received financial support from various projects, acknowledged </span><a href="http://meshlab.sourceforge.net/wiki/index.php/Licenses#Acknowledgments"><span style=" font-family:'Lucida Grande'; font-size:10pt; text-decoration: underline; color:#0000ff;">here </span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"><br /></span></p></body></html></string>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
@ -188,8 +188,8 @@ p, li { white-space: pre-wrap; }
|
||||
<string><!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:'Lucida Grande'; font-size:13pt; 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-size:10pt;">Copyright(C) 2005-2010<br /><br />Paolo Cignoni <br /></span><a href="http://vcg.isti.cnr.it/%7Ecignoni"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">http://vcg.isti.cnr.it/~cignoni</span></a><span style=" font-size:10pt;"> <br />Visual Computing Lab <br /></span><a href="http://vcg.isti.cnr.it"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;"> http://vcg.isti.cnr.it</span></a><span style=" font-size:10pt;"><br />ISTI - Italian National Research Council<br /></span><a href="http://www.isti.cnr.it"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;"> http://www.isti.cnr.it</span></a><span style=" font-size:10pt;"><br /></span></p></body></html></string>
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; 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:'Lucida Grande'; font-size:10pt;">Copyright(C) 2005-2013<br /><br />Paolo Cignoni <br /></span><a href="http://vcg.isti.cnr.it/%7Ecignoni"><span style=" font-family:'Lucida Grande'; font-size:10pt; text-decoration: underline; color:#0000ff;">http://vcg.isti.cnr.it/~cignoni</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"> <br />Visual Computing Lab <br /></span><a href="http://vcg.isti.cnr.it"><span style=" font-family:'Lucida Grande'; font-size:10pt; text-decoration: underline; color:#0000ff;"> http://vcg.isti.cnr.it</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"><br />ISTI - Italian National Research Council<br /></span><a href="http://www.isti.cnr.it"><span style=" font-family:'Lucida Grande'; font-size:10pt; text-decoration: underline; color:#0000ff;"> http://www.isti.cnr.it</span></a><span style=" font-family:'Lucida Grande'; font-size:10pt;"><br /></span></p></body></html></string>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user