Standard debian installation

21 files changed, 201 insertions, 15 deletions

diff --git a/ldmicro/CMakeLists.txt b/ldmicro/CMakeLists.txt
index 35ffc05..adb0c0f 100644
--- a/ldmicro/CMakeLists.txt
+++ b/ldmicro/CMakeLists.txt
@@ -103,6 +103,7 @@ IF(UNIX)
 
     set(CMAKE_AUTOMOC ON)
     set(CMAKE_AUTOUIC ON)
+    set(CMAKE_AUTORCC ON)
     set(CMAKE_INCLUDE_CURRENT_DIR ON)
     find_package(Qt5Widgets CONFIG REQUIRED)
     find_package(Qt5Core CONFIG REQUIRED)
@@ -165,19 +166,40 @@ endif()
     target_link_libraries (ldinterpret LinuxUI)
     
     ## Build main LDMicro executable
-    add_executable (LDMicro ${COMPILE_CPP_SOURCES})
+    add_executable (LDMicro ${COMPILE_CPP_SOURCES} ldmicro.qrc)
     add_dependencies(LDMicro LDMicro_SCRIPT_GENERATED_FILES)
-    install (TARGETS LDMicro DESTINATION bin)
     target_link_libraries (LDMicro LinuxUI)
     target_link_libraries (LDMicro FreezeLD)
     target_link_libraries(LDMicro ${Qt5Widgets_LIBRARIES})
     target_link_libraries(LDMicro ${Qt5Core_LIBRARIES})
     target_link_libraries(LDMicro ${Qt5Gui_LIBRARIES})
 
-    INSTALL(TARGETS LDMicro DESTINATION /usr/local/bin/ldmicro)
-    INSTALL(FILES ldmicro.ico DESTINATION /usr/local/bin/ldmicro)
-    INSTALL(FILES LDMicro.desktop DESTINATION /usr/share/applications)
+    # Package Creation
 
+    if( NOT DEFAULT_INSTALL_PATH )
+    set( DEFAULT_INSTALL_PATH "${CMAKE_INSTALL_PREFIX}"
+         CACHE
+         PATH
+         "Location of LDMicro data files." )
+    endif()
+
+    # Set paths
+    set( UNIX_ICON_FILES icons/ )
+    set( UNIX_APPLICATIONS_FILES applications/ )
+    set( LDMICRO_BIN bin CACHE PATH "LDmicro binaries.")
+
+    install( DIRECTORY ${UNIX_ICON_FILES}
+        DESTINATION share/icons
+        COMPONENT resources
+        )
+
+    install( DIRECTORY ${UNIX_APPLICATIONS_FILES}
+        DESTINATION share/applications
+        COMPONENT resources
+        )
+    install( TARGETS LDMicro
+    DESTINATION bin
+    )
     ##Debian package creation
     set(CPACK_GENERATOR "DEB")
     set(CPACK_PACKAGE_VERSION_MAJOR ${LDMicro_VERSION_MAJOR})
diff --git a/ldmicro/LDMicro.desktop b/ldmicro/LDMicro.desktop
deleted file mode 100755
index 3d93818..0000000
--- a/ldmicro/LDMicro.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Terminal=false
-Icon[en_IN]=/usr/local/bin/ldmicro/ldmicro.ico
-Name[en_IN]=LDMicro
-Exec=/usr/local/bin/ldmicro/LDMicro
-Name=LDMicro
-Icon=/usr/local/bin/ldmicro/ldmicro.ico
diff --git a/ldmicro/applications/LDMicro.desktop b/ldmicro/applications/LDMicro.desktop
new file mode 100644
index 0000000..28c71d9
--- /dev/null
+++ b/ldmicro/applications/LDMicro.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=2.2
+Terminal=false
+Icon=ldmicro
+Type=Application
+Categories=Education;Development;Electronics;
+Exec=LDMicro
+MimeType=application/x-ldmicro-ld;
+Name=LDMicro
+GenericName=PLC Ladder CAD
+Comment=Ladder Logic editor, simulator and compiler for 8 bit microcontrollers
+X-Desktop-File-Install-Version=2.2
\ No newline at end of file
diff --git a/ldmicro/icons/hicolor/128x128/apps/ldmicro.png b/ldmicro/icons/hicolor/128x128/apps/ldmicro.png
new file mode 100644
index 0000000..9012cc1
--- /dev/null
+++ b/ldmicro/icons/hicolor/128x128/apps/ldmicro.png
diff --git a/ldmicro/icons/hicolor/128x128/mimetypes/application-x-ldmicro-ld.png b/ldmicro/icons/hicolor/128x128/mimetypes/application-x-ldmicro-ld.png
new file mode 100644
index 0000000..9012cc1
--- /dev/null
+++ b/ldmicro/icons/hicolor/128x128/mimetypes/application-x-ldmicro-ld.png
diff --git a/ldmicro/icons/hicolor/16x16/apps/ldmicro.png b/ldmicro/icons/hicolor/16x16/apps/ldmicro.png
new file mode 100644
index 0000000..381071b
--- /dev/null
+++ b/ldmicro/icons/hicolor/16x16/apps/ldmicro.png
diff --git a/ldmicro/icons/hicolor/16x16/mimetypes/application-x-ldmicro-ld.png b/ldmicro/icons/hicolor/16x16/mimetypes/application-x-ldmicro-ld.png
new file mode 100644
index 0000000..381071b
--- /dev/null
+++ b/ldmicro/icons/hicolor/16x16/mimetypes/application-x-ldmicro-ld.png
diff --git a/ldmicro/icons/hicolor/22x22/apps/ldmicro.png b/ldmicro/icons/hicolor/22x22/apps/ldmicro.png
new file mode 100644
index 0000000..97b66ad
--- /dev/null
+++ b/ldmicro/icons/hicolor/22x22/apps/ldmicro.png
diff --git a/ldmicro/icons/hicolor/22x22/mimetypes/application-x-ldmicro-ld.png b/ldmicro/icons/hicolor/22x22/mimetypes/application-x-ldmicro-ld.png
new file mode 100644
index 0000000..97b66ad
--- /dev/null
+++ b/ldmicro/icons/hicolor/22x22/mimetypes/application-x-ldmicro-ld.png
diff --git a/ldmicro/icons/hicolor/24x24/apps/ldmicro.png b/ldmicro/icons/hicolor/24x24/apps/ldmicro.png
new file mode 100644
index 0000000..cb64f40
--- /dev/null
+++ b/ldmicro/icons/hicolor/24x24/apps/ldmicro.png
diff --git a/ldmicro/icons/hicolor/24x24/mimetypes/application-x-ldmicro-ld.png b/ldmicro/icons/hicolor/24x24/mimetypes/application-x-ldmicro-ld.png
new file mode 100644
index 0000000..cb64f40
--- /dev/null
+++ b/ldmicro/icons/hicolor/24x24/mimetypes/application-x-ldmicro-ld.png
diff --git a/ldmicro/icons/hicolor/32x32/apps/ldmicro.png b/ldmicro/icons/hicolor/32x32/apps/ldmicro.png
new file mode 100644
index 0000000..adef79d
--- /dev/null
+++ b/ldmicro/icons/hicolor/32x32/apps/ldmicro.png
diff --git a/ldmicro/icons/hicolor/32x32/mimetypes/application-x-ldmicro-ld.png b/ldmicro/icons/hicolor/32x32/mimetypes/application-x-ldmicro-ld.png
new file mode 100644
index 0000000..adef79d
--- /dev/null
+++ b/ldmicro/icons/hicolor/32x32/mimetypes/application-x-ldmicro-ld.png
diff --git a/ldmicro/icons/hicolor/48x48/apps/ldmicro.png b/ldmicro/icons/hicolor/48x48/apps/ldmicro.png
new file mode 100644
index 0000000..9941fcd
--- /dev/null
+++ b/ldmicro/icons/hicolor/48x48/apps/ldmicro.png
diff --git a/ldmicro/icons/hicolor/48x48/mimetypes/application-x-ldmicro-ld.png b/ldmicro/icons/hicolor/48x48/mimetypes/application-x-ldmicro-ld.png
new file mode 100644
index 0000000..9941fcd
--- /dev/null
+++ b/ldmicro/icons/hicolor/48x48/mimetypes/application-x-ldmicro-ld.png
diff --git a/ldmicro/icons/hicolor/64x64/apps/ldmicro.png b/ldmicro/icons/hicolor/64x64/apps/ldmicro.png
new file mode 100644
index 0000000..5d84300
--- /dev/null
+++ b/ldmicro/icons/hicolor/64x64/apps/ldmicro.png
diff --git a/ldmicro/icons/hicolor/64x64/mimetypes/application-x-ldmicro-ld.png b/ldmicro/icons/hicolor/64x64/mimetypes/application-x-ldmicro-ld.png
new file mode 100644
index 0000000..5d84300
--- /dev/null
+++ b/ldmicro/icons/hicolor/64x64/mimetypes/application-x-ldmicro-ld.png
diff --git a/ldmicro/icons/hicolor/scalable/apps/ldmicro.svg b/ldmicro/icons/hicolor/scalable/apps/ldmicro.svg
new file mode 100644
index 0000000..5c6cbde
--- /dev/null
+++ b/ldmicro/icons/hicolor/scalable/apps/ldmicro.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="48"
+   height="48"
+   viewBox="0 0 128 128"
+   sodipodi:docname="ldmicro.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1299"
+     inkscape:window-height="713"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="1.84375"
+     inkscape:cx="0.81355932"
+     inkscape:cy="64"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <image
+     width="128"
+     height="128"
+     preserveAspectRatio="none"
+     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
+AAAFiQAABYkBbWid+gAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAALoSURB
+VGiB7dhPiFdVFAfwz8z8VBoUDHIoJfBfZAiiC5sgRxcShgthoEW5qkBqo7QLxYWIuFAkIlpGMZuo
+cKEbKYjEcKcLFxK0qEFMqBCbJvLv/HRx7w/fvN+77/dz3vz6MfS+8HjvnXPuuefc8865511q1KhR
+o0YFDCToO/By5v1LXM+8j2N9fL6LCfxVwY5dWInPM7TnsA+f4FZq4GCC/kw0cA9OYE2O/zaORZl1
+WDQHo1tYji8wnaP/jt34oIJu7+MhxnL0M5iqojiDY7iMpwp44/gDq1ODUxH4r/A09uJr3C7gfx/p
+b6UU9NuBrcLneS7B/xsX8UZKQb8d2IY7uFoicwmbsayI2YjMISERB+N9KF4vlihumB3a+2jmZO7l
+3ptRroVRIVlnSub5Ldp1CH8WGXFYWImW8macuBn5ZQ7sz71nIzoiVJjJDK21QC08KyRpGVoObzWH
+wlGlCh3A2Q4yH+NmB5l90YZVRcxe5sCg9k8qjytCJRopkdkgROlGapJeoRsHLghlcnuJjjF8K0Sh
+UKBXGNDZgV/xHd5M2LIJLwg7dSFSDiwVwlpYujIGjmCFULGKdBeuWgYzOImdeKmA/46wS//YQU8b
+jgjJ9Y90EjejzKT2Xgk+xFddzjeBz3K054Xv/pUudczCYgxnrnykluT4RV3tQaGL7SlSdf6e9k0o
+i7td6O4miSuj10ncKQcqo99ldF4m6aXuBe1AN/tAZaQcOCr0OtP4F6/m+N9E+pTwr7w2obtvOXAK
+G3Fc+NXLyy3GgygzimsJ3T2PQKqMTsUreRogrO71Ev6Cz4EF70C9D3SDBn4WVmpGSMxm5j7cwcBf
+zP7HFcfOCJ3qR/NsbxsaeM/j/9lFQuhb99eESlOEJt7VfirXENrrB+bQBj8pGvihhL+iw/jz82fK
+3NDvc6HKqB3oN1I78evCScGWkrFLhFbjDj7V+XynJ0g5MCBE50q88i3DafwUZRZ8FGvUqFHjf4xH
+RIiOcFoW8z0AAAAASUVORK5CYII=
+"
+     id="image10"
+     x="0"
+     y="0" />
+</svg>
diff --git a/ldmicro/icons/hicolor/scalable/mimetypes/application-x-ldmicro-ld.svg b/ldmicro/icons/hicolor/scalable/mimetypes/application-x-ldmicro-ld.svg
new file mode 100644
index 0000000..5c6cbde
--- /dev/null
+++ b/ldmicro/icons/hicolor/scalable/mimetypes/application-x-ldmicro-ld.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg2"
+   width="48"
+   height="48"
+   viewBox="0 0 128 128"
+   sodipodi:docname="ldmicro.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1299"
+     inkscape:window-height="713"
+     id="namedview4"
+     showgrid="false"
+     inkscape:zoom="1.84375"
+     inkscape:cx="0.81355932"
+     inkscape:cy="64"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <image
+     width="128"
+     height="128"
+     preserveAspectRatio="none"
+     xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAYAAABXAvmHAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz
+AAAFiQAABYkBbWid+gAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAALoSURB
+VGiB7dhPiFdVFAfwz8z8VBoUDHIoJfBfZAiiC5sgRxcShgthoEW5qkBqo7QLxYWIuFAkIlpGMZuo
+cKEbKYjEcKcLFxK0qEFMqBCbJvLv/HRx7w/fvN+77/dz3vz6MfS+8HjvnXPuuefc8865511q1KhR
+o0YFDCToO/By5v1LXM+8j2N9fL6LCfxVwY5dWInPM7TnsA+f4FZq4GCC/kw0cA9OYE2O/zaORZl1
+WDQHo1tYji8wnaP/jt34oIJu7+MhxnL0M5iqojiDY7iMpwp44/gDq1ODUxH4r/A09uJr3C7gfx/p
+b6UU9NuBrcLneS7B/xsX8UZKQb8d2IY7uFoicwmbsayI2YjMISERB+N9KF4vlihumB3a+2jmZO7l
+3ptRroVRIVlnSub5Ldp1CH8WGXFYWImW8macuBn5ZQ7sz71nIzoiVJjJDK21QC08KyRpGVoObzWH
+wlGlCh3A2Q4yH+NmB5l90YZVRcxe5sCg9k8qjytCJRopkdkgROlGapJeoRsHLghlcnuJjjF8K0Sh
+UKBXGNDZgV/xHd5M2LIJLwg7dSFSDiwVwlpYujIGjmCFULGKdBeuWgYzOImdeKmA/46wS//YQU8b
+jgjJ9Y90EjejzKT2Xgk+xFddzjeBz3K054Xv/pUudczCYgxnrnykluT4RV3tQaGL7SlSdf6e9k0o
+i7td6O4miSuj10ncKQcqo99ldF4m6aXuBe1AN/tAZaQcOCr0OtP4F6/m+N9E+pTwr7w2obtvOXAK
+G3Fc+NXLyy3GgygzimsJ3T2PQKqMTsUreRogrO71Ev6Cz4EF70C9D3SDBn4WVmpGSMxm5j7cwcBf
+zP7HFcfOCJ3qR/NsbxsaeM/j/9lFQuhb99eESlOEJt7VfirXENrrB+bQBj8pGvihhL+iw/jz82fK
+3NDvc6HKqB3oN1I78evCScGWkrFLhFbjDj7V+XynJ0g5MCBE50q88i3DafwUZRZ8FGvUqFHjf4xH
+RIiOcFoW8z0AAAAASUVORK5CYII=
+"
+     id="image10"
+     x="0"
+     y="0" />
+</svg>
diff --git a/ldmicro/ldmicro.qrc b/ldmicro/ldmicro.qrc
new file mode 100644
index 0000000..a68b238
--- /dev/null
+++ b/ldmicro/ldmicro.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+    <qresource prefix="/">
+        <file alias="ldmicro.ico">ldmicro.ico</file>  
+    </qresource>
+</RCC>
diff --git a/ldmicro/lib/linuxUI/linuxLD.h b/ldmicro/lib/linuxUI/linuxLD.h
index 8b19538..1b2117d 100644
--- a/ldmicro/lib/linuxUI/linuxLD.h
+++ b/ldmicro/lib/linuxUI/linuxLD.h
@@ -26,7 +26,7 @@
 
 /// Image loading flags
 #define IMAGE_ICON 1
-#define LDMICRO_ICON "../ldmicro.ico"
+#define LDMICRO_ICON ":/ldmicro.ico"
 
 /// Typedefs
 //typedef int64_t __int64;