Skip to content

Commit

Permalink
Merge pull request #1523 from Rotzbua/fix_https
Browse files Browse the repository at this point in the history
fix(doc): use https for meshlab homepage
  • Loading branch information
alemuntoni authored Sep 2, 2024
2 parents 41e9b4a + 61100b2 commit afcb02e
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ The MeshLab repository is organized as follows:

```
MeshLab
http://www.meshlab.net
https://www.meshlab.net
All rights reserved.
VCGLib http://www.vcglib.net o o
Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MeshLab
http://www.meshlab.net
https://www.meshlab.net
All rights reserved.

VCGLib http://www.vcglib.net o o
Expand Down
2 changes: 1 addition & 1 deletion docs/readme.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MeshLab
http://www.meshlab.net
https://www.meshlab.net
All rights reserved.

VCGLib http://www.vcglib.net o o
Expand Down
2 changes: 1 addition & 1 deletion resources/readme.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MeshLab
http://www.meshlab.net
https://www.meshlab.net
All rights reserved.

VCGLib http://www.vcglib.net o o
Expand Down
2 changes: 1 addition & 1 deletion resources/windows/meshlab.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
!define PRODUCT_NAME "MeshLab"
!define PRODUCT_VERSION "MESHLAB_VERSION"
!define PRODUCT_PUBLISHER "Paolo Cignoni - VCG - ISTI - CNR"
!define PRODUCT_WEB_SITE "http://www.meshlab.net"
!define PRODUCT_WEB_SITE "https://www.meshlab.net"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\meshlab.exe"
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
Expand Down
4 changes: 2 additions & 2 deletions src/common/mlapplication.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ class MeshLabApplication : public QApplication
static const QString completeName(const HW_ARCHITECTURE hw){return appArchitecturalName(hw) + " v" + appVer(); }
static const QString organization(){return tr("VCG");}
static const QString organizationHost() {return tr("http://vcg.isti.cnr.it");}
static const QString webSite() {return tr("http://www.meshlab.net/");}
static const QString downloadSite() {return tr("http://www.meshlab.net/#download");}
static const QString webSite() {return tr("https://www.meshlab.net/");}
static const QString downloadSite() {return tr("https://www.meshlab.net/#download");}

static const QString pluginsPathRegisterKeyName() {return tr("pluginsPath");}
static const QString versionRegisterKeyName() {return tr("version");}
Expand Down
4 changes: 2 additions & 2 deletions src/meshlab/dialogs/about_dialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@
</size>
</property>
<property name="text">
<string>&lt;p&gt;&lt;strong&gt;General Info:&amp;nbsp;&lt;a href=&quot;http://www.meshlab.net&quot;&gt;www.meshlab.net&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
<string>&lt;p&gt;&lt;strong&gt;General Info:&amp;nbsp;&lt;a href=&quot;https://www.meshlab.net&quot;&gt;www.meshlab.net&lt;/a&gt;&lt;/strong&gt;&lt;/p&gt;
&lt;p&gt;MeshLab is the most used open source system for processing and editing 3D triangular meshes. It provides a set of tools for editing, cleaning, healing, inspecting, rendering, texturing and converting meshes. It offers features for processing raw data produced by 3D digitization tools/devices and for preparing models for 3D printing. The system is heavily based on the &lt;a href=&quot;http://www.vcglib.net&quot;&gt;VCG library&lt;/a&gt;. &lt;br /&gt;Source code is available on &lt;a href=&quot;https://github.com/cnr-isti-vclab/meshlab&quot;&gt;GitHub &lt;/a&gt;(protected by GPL).&lt;/p&gt;
&lt;p&gt;&lt;strong&gt;References&lt;/strong&gt;&lt;br /&gt;Remember that the simplest way to show your appreciation of the MeshLab system is to cite it whenever you have used some of its functionality. Please check the &lt;a href=&quot;http://www.meshlab.net/#references&quot;&gt;list of the many publications&lt;/a&gt; related with MeshLab.&lt;/p&gt;</string>
&lt;p&gt;&lt;strong&gt;References&lt;/strong&gt;&lt;br /&gt;Remember that the simplest way to show your appreciation of the MeshLab system is to cite it whenever you have used some of its functionality. Please check the &lt;a href=&quot;https://www.meshlab.net/#references&quot;&gt;list of the many publications&lt;/a&gt; related with MeshLab.&lt;/p&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
Expand Down
2 changes: 1 addition & 1 deletion src/meshlab/mainwindow_RunTime.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2510,7 +2510,7 @@ void MainWindow::helpOnscreen()
void MainWindow::helpOnline()
{
checkForUpdates(false);
QDesktopServices::openUrl(QUrl("http://www.meshlab.net/#support"));
QDesktopServices::openUrl(QUrl("https://www.meshlab.net/#support"));
}

void MainWindow::showToolbarFile(){
Expand Down
2 changes: 1 addition & 1 deletion src/meshlabplugins/io_x3d/export_x3d.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ namespace io {
QDomProcessingInstruction proc = doc.createProcessingInstruction("xml", "version=\"1.0\" encoding=\"UTF-8\"");
doc.appendChild(proc);
QString metaName[] = {"title", "description", "created", "generator"};
QString metaContent[] = {QFileInfo(filename).fileName(), "Generated from Meshlab X3D Exported", QDate::currentDate().toString("d MMMM yyyy"), "Meshlab X3D Exported, http://www.meshlab.net"};
QString metaContent[] = {QFileInfo(filename).fileName(), "Generated from Meshlab X3D Exported", QDate::currentDate().toString("d MMMM yyyy"), "Meshlab X3D Exported, https://www.meshlab.net"};
QDomElement root = doc.createElement("X3D");
root.setAttribute("profile", "Immersive");
root.setAttribute("version", "3.1");
Expand Down

0 comments on commit afcb02e

Please sign in to comment.