removed wiki+python from help menu, removed centos6 from INSTALL_LINU…

…X, added missing png to documentation/guide
MX-05 · Apr 18, 2016 · 373e559 · 373e559
1 parent ed20f53
commit 373e559
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 84 deletions.
diff --git a/Documentation/source/guide/_static/logo.png b/Documentation/source/guide/_static/logo.png
diff --git a/Global/Macros.h b/Global/Macros.h
@@ -69,8 +69,6 @@ namespace NATRON_PYTHON_NAMESPACE { }
 #define NATRON_APPLICATION_NAME "Natron"
 #define NATRON_WEBSITE_URL "http://www.natron.fr"
 #define NATRON_FORUM_URL "https://forum.natron.fr"
-#define NATRON_PYTHON_URL "https://natron.readthedocs.org/en/master/"
-#define NATRON_WIKI_URL "https://github.com/MrKepzie/Natron/wiki"
 #define NATRON_ISSUE_TRACKER_URL "https://github.com/MrKepzie/Natron/issues"
 #define NATRON_DOCUMENTATION_ONLINE "http://help.natron.fr"
 // The MIME types for Natron documents are:

diff --git a/Gui/Gui.cpp b/Gui/Gui.cpp
@@ -658,16 +658,6 @@ Gui::createMenuActions()
     _imp->menuHelp->addAction(_imp->actionHelpIssues);
     QObject::connect( _imp->actionHelpIssues, SIGNAL(triggered()), this, SLOT(openHelpIssues()) );
 
-    _imp->actionHelpWiki = new QAction(this);
-    _imp->actionHelpWiki->setText(QObject::tr("Wiki"));
-    _imp->menuHelp->addAction(_imp->actionHelpWiki);
-    QObject::connect( _imp->actionHelpWiki, SIGNAL(triggered()), this, SLOT(openHelpWiki()) );
-
-    _imp->actionHelpPython = new QAction(this);
-    _imp->actionHelpPython->setText(QObject::tr("Python API"));
-    _imp->menuHelp->addAction(_imp->actionHelpPython);
-    QObject::connect( _imp->actionHelpPython, SIGNAL(triggered()), this, SLOT(openHelpPython()) );
-
 #ifndef __APPLE__
     _imp->menuHelp->addSeparator();
     _imp->menuHelp->addAction(_imp->actionShowAboutWindow);
@@ -698,12 +688,6 @@ Gui::openHelpIssues()
     QDesktopServices::openUrl(QUrl(QString::fromUtf8(NATRON_ISSUE_TRACKER_URL)));
 }
 
-void
-Gui::openHelpWiki()
-{
-    QDesktopServices::openUrl(QUrl(QString::fromUtf8(NATRON_WIKI_URL)));
-}
-
 void
 Gui::openHelpDocumentation()
 {
@@ -724,12 +708,6 @@ Gui::openHelpDocumentation()
     }
 }
 
-void
-Gui::openHelpPython()
-{
-    QDesktopServices::openUrl(QUrl(QString::fromUtf8(NATRON_PYTHON_URL)));
-}
-
 NATRON_NAMESPACE_EXIT;
 
 NATRON_NAMESPACE_USING;

diff --git a/Gui/Gui.h b/Gui/Gui.h
@@ -726,8 +726,6 @@ public Q_SLOTS:
     void openHelpWebsite();
     void openHelpForum();
     void openHelpIssues();
-    void openHelpPython();
-    void openHelpWiki();
     void openHelpDocumentation();
 
 private:

diff --git a/Gui/GuiPrivate.cpp b/Gui/GuiPrivate.cpp
@@ -195,8 +195,6 @@ GuiPrivate::GuiPrivate(GuiAppInstance* app,
 , actionHelpWebsite(0)
 , actionHelpForum(0)
 , actionHelpIssues(0)
-, actionHelpPython(0)
-, actionHelpWiki(0)
 , actionHelpDocumentation(0)
 , _centralWidget(0)
 , _mainLayout(0)

diff --git a/Gui/GuiPrivate.h b/Gui/GuiPrivate.h
@@ -124,8 +124,6 @@ struct GuiPrivate
     QAction* actionHelpWebsite;
     QAction* actionHelpForum;
     QAction* actionHelpIssues;
-    QAction* actionHelpPython;
-    QAction* actionHelpWiki;
     QAction* actionHelpDocumentation;
 
     ///the main "central" widget

diff --git a/INSTALL_LINUX.md b/INSTALL_LINUX.md
@@ -22,7 +22,6 @@ Natron on GNU/Linux.
     - [Arch Linux](#arch-linux)
     - [Debian-based](#debian-based)
     - [CentOS7/Fedora](#centos7)
-    - [CentOS6](#centos6-64-bit)
 
 
 # Libraries
@@ -287,56 +286,3 @@ shiboken {
 }
 ```
 
-## CentOS6+ (64-bit)
-
-### Install dependencies
-```
-yum -y install gcc-c++ wget libX*devel *GL*devel *xcb*devel xorg*devel libdrm-devel mesa*devel *glut*devel dbus-devel bison flex expat-devel libtool-ltdl-devel git make glibc-devel glibc-devel.i686
-```
-
-### Download SDK (third-party software)
-```
-wget http://downloads.natron.fr/Third_Party_Binaries/Natron-CY2015-Linux-x86_64-SDK.tar.xz
-tar xvf Natron-CY2015-Linux-x86_64-SDK.tar.xz -C /opt/
-```
-
-### Download Natron and plugins
-```
-git clone https://github.com/MrKepzie/Natron
-git clone https://github.com/MrKepzie/openfx-io
-git clone https://github.com/devernay/openfx-misc
-git clone https://github.com/olear/openfx-arena
-for i in $(echo "Natron openfx-io openfx-misc openfx-arena");do cd $i ; git submodule update -i --recursive ; cd .. ; done
-```
-
-### Build Natron and plugins
-```
-export INSTALL_PATH=/opt/Natron-CY2015
-export PKG_CONFIG_PATH=$INSTALL_PATH/lib/pkgconfig:$INSTALL_PATH/ffmpeg-gpl/lib/pkgconfig
-export LD_LIBRARY_PATH=$INSTALL_PATH/gcc/lib64:$INSTALL_PATH/lib:$INSTALL_PATH/ffmpeg-gpl/lib
-export PATH=$INSTALL_PATH/gcc/bin:$INSTALL_PATH/bin:$INSTALL_PATH/ffmpeg-gpl/bin:$PATH
-export QTDIR=$INSTALL_PATH
-export BOOST_ROOT=$INSTALL_PATH
-export PYTHON_HOME=$INSTALL_PATH
-export PYTHON_PATH=$INSTALL_PATH/lib/python2.7
-export PYTHON_INCLUDE=$INSTALL_PATH/include/python2.7
-
-cd Natron
-wget https://raw.githubusercontent.com/MrKepzie/Natron/master/tools/linux/include/natron/config.pri
-mkdir build && cd build
-$INSTALL_PATH/bin/qmake -r CONFIG+=release ../Project.pro
-make || exit 1
-cd ../..
-
-cd openfx-io
-CPPFLAGS="-I${INSTALL_PATH}/include -I${INSTALL_PATH}/ffmpeg-gpl/include" LDFLAGS="-L${INSTALL_PATH}/lib -L${INSTALL_PATH}/ffmpeg-gpl/lib" make CONFIG=release || exit 1
-cd ..
-
-cd openfx-misc
-CPPFLAGS="-I${INSTALL_PATH}/include" LDFLAGS="-L${INSTALL_PATH}/lib" make CONFIG=release || exit 1
-cd ..
-
-cd openfx-arena
-CPPFLAGS="-I${INSTALL_PATH}/include" LDFLAGS="-L${INSTALL_PATH}/lib" make USE_SVG=1 USE_PANGO=1 STATIC=1 CONFIG=release || exit 1
-cd ..
-```