diff --git a/src/App/Application.cpp b/src/App/Application.cpp index db242cddb3..c2f1c6bd8c 100644 --- a/src/App/Application.cpp +++ b/src/App/Application.cpp @@ -1568,7 +1568,7 @@ void Application::ParseOptions(int ac, char ** av) if (vm.count("help")) { std::stringstream str; str << mConfig["ExeName"] << endl << endl; - str << "For detailed descripton see http://free-cad.sf.net" << endl<" << endl << "" << endl; writer.Stream() << "" << endl; diff --git a/src/Doc/Start_Page.html b/src/Doc/Start_Page.html index fad7a508b1..ad3145e0ca 100644 --- a/src/Doc/Start_Page.html +++ b/src/Doc/Start_Page.html @@ -1290,7 +1290,7 @@ FreeCAD is also fully multi-platform, and currently runs flawlessly on Windows a 
There are different ways to get help:
 * Use the help system with the Help menu
-* Visit the FreeCAD documentation wiki: http://sourceforge.net/apps/mediawiki/free-cad/index.php
+* Visit the FreeCAD documentation wiki: http://www.freecadweb.org/wiki/index.php
 * Or use the on line help forum to ask questions: http://sourceforge.net/apps/phpbb/free-cad/index.php
@@ -12306,4 +12306,4 @@ if(useJavaSaver) - \ No newline at end of file + diff --git a/src/Doc/mainpage.dox b/src/Doc/mainpage.dox index 14d579167c..e871d2a13a 100644 --- a/src/Doc/mainpage.dox +++ b/src/Doc/mainpage.dox @@ -35,13 +35,13 @@ utility to browse through the sources. If you seek informations on FreeCAD at large, please consult our - Wiki + Wiki FreeCAD being a fast moving target, don't hesitate to rebuild an up to date doc from svn source as often as needed. CPU cycles are cheap nowadays! - The homepage of FreeCAD on SourceForge is here. + The homepage of FreeCAD is here. */ /** \namespace std diff --git a/src/FCConfig.h b/src/FCConfig.h index 68b2d4e904..cdb00c36e3 100644 --- a/src/FCConfig.h +++ b/src/FCConfig.h @@ -114,7 +114,7 @@ //#elif defined(__GNU__) //# define FC_OS_GNU #else -# error "FreeCAD is not ported to this OS yet. For help see free-cad.sourceforge.net" +# error "FreeCAD is not ported to this OS yet. For help see www.freecadweb.org" #endif #ifdef FC_OS_WIN32 diff --git a/src/Gui/DlgTipOfTheDayImp.cpp b/src/Gui/DlgTipOfTheDayImp.cpp index 55062ee9eb..5a4b8d1643 100644 --- a/src/Gui/DlgTipOfTheDayImp.cpp +++ b/src/Gui/DlgTipOfTheDayImp.cpp @@ -91,13 +91,13 @@ void DlgTipOfTheDayImp::on_buttonNextTip_clicked() void DlgTipOfTheDayImp::reload() { // set the host and start the download - _http->setHost(QLatin1String("apps.sourceforge.net")); - _http->get(QLatin1String("/mediawiki/free-cad/index.php?title=Tip_of_the_day"), 0); + _http->setHost(QLatin1String("www.freecadweb.org")); + _http->get(QLatin1String("/wiki/index.php?title=Tip_of_the_day"), 0); _iCurrentTip = 0; _lTips << tr("If you want to learn more about FreeCAD you must go to %1 or press the Help item in the Help menu.") - .arg(QLatin1String("" - "http://apps.sourceforge.net/mediawiki/free-cad/")); + .arg(QLatin1String("" + "http://www.freecadweb.org/wiki/")); } void DlgTipOfTheDayImp::onResponseHeaderReceived(const QHttpResponseHeader & responseHeader) diff --git a/src/Gui/DlgTipOfTheDayImp.h b/src/Gui/DlgTipOfTheDayImp.h index 59227827ba..8329069733 100644 --- a/src/Gui/DlgTipOfTheDayImp.h +++ b/src/Gui/DlgTipOfTheDayImp.h @@ -43,7 +43,7 @@ namespace Dialog { * also possible to use the program \a wget specifying the options -r, -k, -E and the * URL of the homepage of FreeCAD. * - * For more details have a look at the FreeCAD homepage (http://apps.sourceforge.net/mediawiki/free-cad/). + * For more details have a look at the FreeCAD homepage (http://www.freecadweb.org/wiki/). * * You can simply append a new tip by clicking the "EditText" hyperlink * and writing a text, e.g: "** this is a new tip" diff --git a/src/Gui/Document.cpp b/src/Gui/Document.cpp index 84aac6696c..4d7ce8c9f6 100644 --- a/src/Gui/Document.cpp +++ b/src/Gui/Document.cpp @@ -751,7 +751,7 @@ void Document::SaveDocFile (Base::Writer &writer) const { writer.Stream() << "" << std::endl << "" << std::endl; writer.Stream() << "" << std::endl; diff --git a/src/Gui/NetworkRetriever.cpp b/src/Gui/NetworkRetriever.cpp index 8bde8d23cb..1288cc204a 100644 --- a/src/Gui/NetworkRetriever.cpp +++ b/src/Gui/NetworkRetriever.cpp @@ -458,7 +458,7 @@ void StdCmdDownloadOnlineHelp::activated(int iMsg) if (!wget->isDownloading()) { ParameterGrp::handle hGrp = App::GetApplication().GetUserParameter().GetGroup("BaseApp"); hGrp = hGrp->GetGroup("Preferences")->GetGroup("OnlineHelp"); - std::string url = hGrp->GetASCII("DownloadURL", "http://apps.sourceforge.net/mediawiki/free-cad/"); + std::string url = hGrp->GetASCII("DownloadURL", "www.freecadweb.org/wiki/"); std::string prx = hGrp->GetASCII("ProxyText", ""); bool bUseProxy = hGrp->GetBool ("UseProxy", false); bool bAuthor = hGrp->GetBool ("Authorize", false); diff --git a/src/Gui/SoFCOffscreenRenderer.cpp b/src/Gui/SoFCOffscreenRenderer.cpp index 025ac69d7c..0cef2ab2a5 100644 --- a/src/Gui/SoFCOffscreenRenderer.cpp +++ b/src/Gui/SoFCOffscreenRenderer.cpp @@ -135,7 +135,7 @@ void SoFCOffscreenRenderer::writeToImageFile(const char* filename, const char* c // set keywords for PNG format if (file.hasExtension("PNG")) { img.setText(QLatin1String("Title"), QString::fromUtf8(filename)); - img.setText(QLatin1String("Author"), QLatin1String("FreeCAD (http://free-cad.sourceforge.net)")); + img.setText(QLatin1String("Author"), QLatin1String("FreeCAD (http://www.freecadweb.org)")); if (strcmp(comment,"")==0) img.setText(QLatin1String("Description"), QLatin1String("Screenshot created by FreeCAD")); else if (strcmp(comment,"$MIBA")==0) diff --git a/src/Gui/SoFCVectorizeSVGAction.cpp b/src/Gui/SoFCVectorizeSVGAction.cpp index 56b8638af6..4325059174 100644 --- a/src/Gui/SoFCVectorizeSVGAction.cpp +++ b/src/Gui/SoFCVectorizeSVGAction.cpp @@ -377,7 +377,7 @@ void SoFCVectorizeSVGAction::printHeader(void) const { std::ostream& str = this->getSVGOutput()->getFileStream(); str << "" << std::endl; - str << "" << std::endl; + str << "" << std::endl; str << "diffuseColor.size() == rPoints.size()); out << "ply" << std::endl << "format binary_little_endian 1.0" << std::endl - << "comment Created by FreeCAD " << std::endl + << "comment Created by FreeCAD " << std::endl << "element vertex " << v_count << std::endl << "property float32 x" << std::endl << "property float32 y" << std::endl @@ -1780,7 +1780,7 @@ bool MeshOutput::SaveAsciiPLY (std::ostream &out) const && _material->diffuseColor.size() == rPoints.size()); out << "ply" << std::endl << "format ascii 1.0" << std::endl - << "comment Created by FreeCAD " << std::endl + << "comment Created by FreeCAD " << std::endl << "element vertex " << v_count << std::endl << "property float32 x" << std::endl << "property float32 y" << std::endl @@ -1950,7 +1950,7 @@ bool MeshOutput::SaveInventor (std::ostream &rstrOut) const // Header info rstrOut << "#Inventor V2.1 ascii\n" << std::endl; - rstrOut << "# Created by FreeCAD " << std::endl; + rstrOut << "# Created by FreeCAD " << std::endl; rstrOut << "# Triangle mesh contains " << _rclMesh.CountPoints() << " vertices" << " and " << _rclMesh.CountFacets() << " faces" << std::endl; rstrOut << "Separator {\n" << std::endl; @@ -2184,7 +2184,7 @@ bool MeshVRML::Save (std::ostream &rstrOut, const std::vector &raclC rstrOut << "WorldInfo {\n" << " title \"Exported tringle mesh to VRML97\"\n" << " info [\"Created by FreeCAD\"\n" - << " \"\"]\n" + << " \"\"]\n" << "}\n"; // Write background diff --git a/src/Mod/OpenSCAD/OpenSCAD2Dgeom.py b/src/Mod/OpenSCAD/OpenSCAD2Dgeom.py index 709c087969..d83cd60227 100644 --- a/src/Mod/OpenSCAD/OpenSCAD2Dgeom.py +++ b/src/Mod/OpenSCAD/OpenSCAD2Dgeom.py @@ -22,7 +22,7 @@ __title__="FreeCAD OpenSCAD Workbench - 2D helper fuctions" __author__ = "Sebastian Hoogen" -__url__ = ["http://free-cad.sourceforge.net"] +__url__ = ["http://www.freecadweb.org"] ''' This Script includes python functions to convert imported dxf geometry to Faces diff --git a/src/Mod/OpenSCAD/OpenSCADCommands.py b/src/Mod/OpenSCAD/OpenSCADCommands.py index 9b3a971437..d1750c7187 100644 --- a/src/Mod/OpenSCAD/OpenSCADCommands.py +++ b/src/Mod/OpenSCAD/OpenSCADCommands.py @@ -22,7 +22,7 @@ __title__="FreeCAD OpenSCAD Workbench - GUI Commands" __author__ = "Sebastian Hoogen" -__url__ = ["http://free-cad.sourceforge.net"] +__url__ = ["http://www.freecadweb.org"] ''' This Script includes the GUI Commands of the OpenSCAD module diff --git a/src/Mod/OpenSCAD/OpenSCADFeatures.py b/src/Mod/OpenSCAD/OpenSCADFeatures.py index 869039efe5..464c058909 100644 --- a/src/Mod/OpenSCAD/OpenSCADFeatures.py +++ b/src/Mod/OpenSCAD/OpenSCADFeatures.py @@ -22,7 +22,7 @@ __title__="FreeCAD OpenSCAD Workbench - Parametric Features" __author__ = "Sebastian Hoogen" -__url__ = ["http://free-cad.sourceforge.net"] +__url__ = ["http://www.freecadweb.org"] ''' This Script includes python Features to represent OpenSCAD Operations diff --git a/src/Mod/OpenSCAD/OpenSCADUtils.py b/src/Mod/OpenSCAD/OpenSCADUtils.py index c42cf7456f..e395b56207 100644 --- a/src/Mod/OpenSCAD/OpenSCADUtils.py +++ b/src/Mod/OpenSCAD/OpenSCADUtils.py @@ -22,7 +22,7 @@ __title__="FreeCAD OpenSCAD Workbench - Utility Fuctions" __author__ = "Sebastian Hoogen" -__url__ = ["http://free-cad.sourceforge.net"] +__url__ = ["http://www.freecadweb.org"] ''' This Script includes various pyhton helper functions that are shared across diff --git a/src/Mod/OpenSCAD/colorcodeshapes.py b/src/Mod/OpenSCAD/colorcodeshapes.py index 2149534889..405a93045b 100644 --- a/src/Mod/OpenSCAD/colorcodeshapes.py +++ b/src/Mod/OpenSCAD/colorcodeshapes.py @@ -22,7 +22,7 @@ __title__="FreeCAD OpenSCAD Workbench - 2D helper fuctions" __author__ = "Sebastian Hoogen" -__url__ = ["http://free-cad.sourceforge.net"] +__url__ = ["http://www.freecadweb.org"] ''' This Script includes python functions to ifind out the most basic shape type diff --git a/src/Mod/OpenSCAD/expandplacements.py b/src/Mod/OpenSCAD/expandplacements.py index d4c1b9c632..a3229fc8bd 100644 --- a/src/Mod/OpenSCAD/expandplacements.py +++ b/src/Mod/OpenSCAD/expandplacements.py @@ -22,7 +22,7 @@ __title__="FreeCAD OpenSCAD Workbench - expand placements and matrices fuctions" __author__ = "Sebastian Hoogen" -__url__ = ["http://free-cad.sourceforge.net"] +__url__ = ["http://www.freecadweb.org"] ''' This Script includes python functions to shift all placements down the diff --git a/src/Mod/OpenSCAD/replaceobj.py b/src/Mod/OpenSCAD/replaceobj.py index a4b94e4c06..384267b221 100644 --- a/src/Mod/OpenSCAD/replaceobj.py +++ b/src/Mod/OpenSCAD/replaceobj.py @@ -22,7 +22,7 @@ __title__="FreeCAD OpenSCAD Workbench - replace object fuction" __author__ = "Sebastian Hoogen" -__url__ = ["http://free-cad.sourceforge.net"] +__url__ = ["http://www.freecadweb.org"] ''' This fucntions allows to replace an object in the feature hierarchy diff --git a/src/Mod/Raytracing/App/PovTools.cpp b/src/Mod/Raytracing/App/PovTools.cpp index 862d6c621d..dee18dd275 100644 --- a/src/Mod/Raytracing/App/PovTools.cpp +++ b/src/Mod/Raytracing/App/PovTools.cpp @@ -61,7 +61,7 @@ std::string PovTools::getCamera(const CamDef& Cam) { std::stringstream out; out << "// declares positon and view direction\n" << endl - << "// Generated by FreeCAD (http://free-cad.sf.net/)" << endl + << "// Generated by FreeCAD (http://www.freecadweb.org/)" << endl // writing Camera positions << "#declare cam_location = <" << Cam.CamPos.X() <<"," << Cam.CamPos.Z() <<"," << Cam.CamPos.Y()<<">;" << endl @@ -103,7 +103,7 @@ void PovTools::writeCameraVec(const char* FileName, const std::vector& C std::stringstream out; std::vector::const_iterator It; out << "// declares positon and view directions\n" - << "// Generated by FreeCAD (http://free-cad.sf.net/)\n\n" + << "// Generated by FreeCAD (http://www.freecadweb.org/)\n\n" << "// Total number of camera positions\n" << "#declare nCamPos = " << CamVec.size() << ";\n\n"; @@ -155,7 +155,7 @@ void PovTools::writeData(const char *FileName, const char *PartName, // open the file and write Base::ofstream fout(FileName); // write the file - fout << "// Written by FreeCAD http://free-cad.sf.net/" << endl; + fout << "// Written by FreeCAD http://www.freecadweb.org/" << endl; unsigned long count = data->countSubElements("Face"); for (unsigned long i=0; i')" onMouseout="show('')" - href="http://free-cad.sf.net/">FreeCAD Homepage + href="http://www.freecadweb.org/">FreeCAD Homepage
diff --git a/src/Mod/Web/Gui/Command.cpp b/src/Mod/Web/Gui/Command.cpp index 597d22f523..bdb9217bd4 100644 --- a/src/Mod/Web/Gui/Command.cpp +++ b/src/Mod/Web/Gui/Command.cpp @@ -59,7 +59,7 @@ CmdWebOpenWebsite::CmdWebOpenWebsite() void CmdWebOpenWebsite::activated(int iMsg) { doCommand(Doc,"import WebGui"); - doCommand(Command::Gui,"WebGui.openBrowser('http://free-cad.sf.net/')"); + doCommand(Command::Gui,"WebGui.openBrowser('http://www.freecadweb.org/')"); } //=========================================================================== diff --git a/src/Tools/embedded/Win32/FreeCAD_widget/FreeCAD_widget.cpp b/src/Tools/embedded/Win32/FreeCAD_widget/FreeCAD_widget.cpp index 55d31f101e..1eab848c11 100644 --- a/src/Tools/embedded/Win32/FreeCAD_widget/FreeCAD_widget.cpp +++ b/src/Tools/embedded/Win32/FreeCAD_widget/FreeCAD_widget.cpp @@ -208,7 +208,7 @@ INT_PTR CALLBACK About(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) #include -// See also http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Embedding_FreeCAD +// See also http://www.freecadweb.org/wiki/index.php?title=Embedding_FreeCAD std::string OnFileOpen(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) { diff --git a/src/Tools/offlinedoc/buildpdf.py b/src/Tools/offlinedoc/buildpdf.py index c6dbf246fd..9b0a7b810c 100755 --- a/src/Tools/offlinedoc/buildpdf.py +++ b/src/Tools/offlinedoc/buildpdf.py @@ -24,7 +24,7 @@ __title__="buildpdf" __author__ = "Yorik van Havre " -__url__ = "http://free-cad.sf.net" +__url__ = "http://www.freecadweb.org" """ This script builds a pdf file from a local copy of the wiki diff --git a/src/Tools/offlinedoc/buildqhelp.py b/src/Tools/offlinedoc/buildqhelp.py index 1ce14409f5..f1d8399b9c 100755 --- a/src/Tools/offlinedoc/buildqhelp.py +++ b/src/Tools/offlinedoc/buildqhelp.py @@ -24,7 +24,7 @@ __title__="wiki2qhelp" __author__ = "Yorik van Havre " -__url__ = "http://free-cad.sf.net" +__url__ = "http://www.freecadweb.org" """ This script builds qhrlp files from a local copy of the wiki @@ -85,7 +85,7 @@ def generate(qhcpfile): "generates qassistant-specific settings like icon, title, ..." txt="""
FreeCAD """+RELEASE+""" help files
-http://free-cad.sf.net
+http://www.freecadweb.org """ about=open(FOLDER + os.sep + "about.txt","w") about.write(txt) diff --git a/src/Tools/offlinedoc/buildwikiindex.py b/src/Tools/offlinedoc/buildwikiindex.py index e685aed48a..31e665d718 100755 --- a/src/Tools/offlinedoc/buildwikiindex.py +++ b/src/Tools/offlinedoc/buildwikiindex.py @@ -24,7 +24,7 @@ __title__="buildwikiindex.py" __author__ = "Yorik van Havre " -__url__ = "http://free-cad.sf.net" +__url__ = "http://www.freecadweb.org" """ This script parses the contents of a wiki site and saves a file containing @@ -36,7 +36,7 @@ from urllib2 import urlopen, HTTPError # CONFIGURATION ################################################# -URL = "http://sourceforge.net/apps/mediawiki/free-cad" #default URL if no URL is passed +URL = "http://www.freecadweb.org/wiki" #default URL if no URL is passed INDEX = "Online_Help_Toc" # the start page from where to crawl the wiki NORETRIEVE = ['Manual','Developer_hub','Power_users_hub','Users_hub','Source_documentation', 'User_hub','Main_Page','About_this_site'] # pages that won't be fetched (kept online) GETTRANSLATIONS = False # Set true if you want to get the translations too. diff --git a/src/Tools/offlinedoc/downloadwiki.py b/src/Tools/offlinedoc/downloadwiki.py index 4fc0bdadf9..6e0aebd511 100755 --- a/src/Tools/offlinedoc/downloadwiki.py +++ b/src/Tools/offlinedoc/downloadwiki.py @@ -24,7 +24,7 @@ __title__="downloadwiki" __author__ = "Yorik van Havre " -__url__ = "http://free-cad.sf.net" +__url__ = "http://www.freecadweb.org" """ This script retrieves the contents of a wiki site from a pages list @@ -35,7 +35,7 @@ from urllib2 import urlopen, HTTPError # CONFIGURATION ################################################# -DEFAULTURL = "http://sourceforge.net/apps/mediawiki/free-cad" #default URL if no URL is passed +DEFAULTURL = "http://www.freecadweb.org/wiki" #default URL if no URL is passed INDEX = "Online_Help_Toc" # the start page from where to crawl the wiki NORETRIEVE = ['Manual','Developer_hub','Power_users_hub','Users_hub','Source_documentation', 'User_hub','Main_Page','About_this_site'] # pages that won't be fetched (kept online) GETTRANSLATIONS = False # Set true if you want to get the translations too. diff --git a/src/Tools/thumbs/ThumbnailProvider/FCConfig.h b/src/Tools/thumbs/ThumbnailProvider/FCConfig.h index 649518e866..c86499d099 100644 --- a/src/Tools/thumbs/ThumbnailProvider/FCConfig.h +++ b/src/Tools/thumbs/ThumbnailProvider/FCConfig.h @@ -84,7 +84,7 @@ # define HAVE_UINTPTR_T #endif #else -# error "FreeCAD is not ported to this OS yet. For help see free-cad.sourceforge.net" +# error "FreeCAD is not ported to this OS yet. For help see www.freecadweb.org" #endif #ifdef FC_OS_WIN32 diff --git a/src/Tools/wiki2qhelp.py b/src/Tools/wiki2qhelp.py index dc52f38152..7c8c3d1710 100755 --- a/src/Tools/wiki2qhelp.py +++ b/src/Tools/wiki2qhelp.py @@ -24,7 +24,7 @@ __title__="wiki2qhelp" __author__ = "Yorik van Havre " -__url__ = "http://yorik.uncreated.net" +__url__ = "http://www.freecadweb.org" """ This script retrieves the contents of a wiki site and saves it locally, @@ -38,7 +38,7 @@ from urllib2 import urlopen, HTTPError # CONFIGURATION ################################################# -DEFAULTURL = "http://sourceforge.net/apps/mediawiki/free-cad" #default URL if no URL is passed +DEFAULTURL = "www.freecadweb.org/wiki" #default URL if no URL is passed INDEX = "Online_Help_Toc" # the start page from where to crawl the wiki NORETRIEVE = ['Manual','Developer_hub','Power_users_hub','Users_hub','Source_documentation', 'User_hub','Main_Page','About_this_site'] # pages that won't be fetched (kept online) GETTRANSLATIONS = True # Set true if you want to get the translations too. diff --git a/src/WindowsInstaller/FreeCAD.wxs b/src/WindowsInstaller/FreeCAD.wxs index 7d270448cf..816f91ba28 100644 --- a/src/WindowsInstaller/FreeCAD.wxs +++ b/src/WindowsInstaller/FreeCAD.wxs @@ -40,7 +40,7 @@ Version='$(var.ProductVersion)' Manufacturer="Juergen Riegel (FreeCAD@juergen-riegel.net)"> Greatest CAD ever ;-) Juergen Riegel (FreeCAD@juergen-riegel.net) http://sourceforge.net/forum/forum.php?forum_id=161659 - http://free-cad.sourceforge.net/ + http://www.freecadweb.org/ https://sourceforge.net/projects/free-cad/files/ 1