installer removed and appimage support

Artanidos · May 20, 2019 · 29dcc17 · 29dcc17
1 parent 30fc6aa
commit 29dcc17
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 173 deletions.
diff --git a/App.pro b/App.pro
@@ -47,7 +47,6 @@ DISTFILES += \
     todo.txt \
     changelog.txt \
     build.txt \
-    buildAppImage.sh \
     default.desktop \
     default.svg \
     AppRun \

diff --git a/AppRun b/AppRun
@@ -1,4 +1,4 @@
 #!/bin/bash
 HERE="$(dirname "$(readlink -f "${0}")")"
-export LD_LIBRARY_PATH=${HERE}/usr/lib:$LD_LIBRARY_PATH
-exec "${HERE}/usr/bin/AnimationMaker" "$@"
+export LD_LIBRARY_PATH=${HERE}:$LD_LIBRARY_PATH
+exec "${HERE}/AnimationMaker" "$@"
diff --git a/Widgets/Widgets.pro b/Widgets/Widgets.pro
@@ -44,7 +44,6 @@ SOURCES += \
     colorrect.cpp \
     xmleditor.cpp \
     xmlhighlighter.cpp \
-    installer.cpp \
     transition.cpp \
     keyframehandle.cpp \
     transitionhandleright.cpp \
@@ -84,7 +83,6 @@ HEADERS +=\
     colorrect.h \
     xmleditor.h \
     xmlhighlighter.h \
-    installer.h \
     transition.h \
     keyframehandle.h \
     transitionhandleright.h \

diff --git a/Widgets/installer.cpp b/Widgets/installer.cpp
diff --git a/Widgets/installer.h b/Widgets/installer.h
diff --git a/Widgets/mainwindow.cpp b/Widgets/mainwindow.cpp
@@ -22,7 +22,6 @@
 #include "animationscene.h"
 #include "vectorgraphic.h"
 #include "interfaces.h"
-#include "installer.h"
 #include "plugins.h"
 #include "bitmap.h"
 #include "itempropertyeditor.h"
@@ -51,7 +50,6 @@ MainWindow::MainWindow(QWidget *parent) :
     m_undoStack = new QUndoStack(this);
 
     setDockNestingEnabled(true);
-    install();
     loadPlugins();
     createStatusBar();
     createActions();
@@ -98,20 +96,6 @@ void MainWindow::loadPlugins()
     }
 }
 
-void MainWindow::install()
-{
-    QDir installDir(QDir::homePath() + "/AnimationMaker");
-    if(!installDir.exists())
-    {
-        qDebug() << "Installing plugins";
-        installDir.setPath(QDir::homePath());
-        installDir.mkdir("AnimationMaker");
-        installDir.cd("AnimationMaker");
-    }
-
-    Installer::installFiles(QCoreApplication::applicationDirPath() + "/../../plugins", installDir.absolutePath() + "/plugins", true, false);
-}
-
 void MainWindow::save()
 {
     writeFile(loadedFile.filePath());

diff --git a/buildAppImage.sh b/buildAppImage.sh
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,7 @@
+1.8.4
+- Setup program added (Appimage is not supported anymore)
+- Use AppRun to start the application
+
 1.8.2
 ---
 - New animateable properties for transformation (scale, shear, translate and rotate) added

diff --git a/main.cpp b/main.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "winmainwindow.h"
+#include "mainwindow.h"
 #include <QApplication>
 #include <QStyleFactory>
 #include <QTest>
@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
     QApplication a(argc, argv);
 
     QCoreApplication::setApplicationName("AnimationMaker");
-    QCoreApplication::setApplicationVersion("1.8.3");
+    QCoreApplication::setApplicationVersion("1.8.4");
     QCoreApplication::setOrganizationName("Artanidos");
 
     QFont newFont("Sans Serif", 10);