diff --git a/CMakeLists.txt b/CMakeLists.txt index c5278bd..68a9d57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.5) -project(VHFMill VERSION 0.1 LANGUAGES CXX) +project(vhfmill VERSION 0.1 LANGUAGES CXX) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOMOC ON) @@ -11,6 +11,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(QT NAMES Qt6 REQUIRED COMPONENTS Widgets) find_package(Qt6 REQUIRED COMPONENTS Widgets SerialPort Network 3DCore 3DRender 3DInput 3DExtras) +find_program(XDG-ICON-RESOURCE_EXECUTABLE xdg-icon-resource) +find_program(XDG-DESKTOP-MENU_EXECUTABLE xdg-desktop-menu) set(PROJECT_SOURCES main.cpp @@ -33,11 +35,18 @@ set(PROJECT_SOURCES mainobject.h ) -qt_add_executable(VHFMill MANUAL_FINALIZATION ${PROJECT_SOURCES}) +qt_add_executable(vhfmill MANUAL_FINALIZATION ${PROJECT_SOURCES}) -target_link_libraries(VHFMill PRIVATE Qt6::Widgets Qt6::SerialPort Qt6::Network Qt6::3DCore Qt6::3DRender Qt6::3DExtras) -target_include_directories(VHFMill PRIVATE .) +target_link_libraries(vhfmill PRIVATE Qt6::Widgets Qt6::SerialPort Qt6::Network Qt6::3DCore Qt6::3DRender Qt6::3DExtras) +target_include_directories(vhfmill PRIVATE .) -install(TARGETS VHFMill BUNDLE DESTINATION . LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) +install(CODE " + message(\"Installing icon\") + execute_process(COMMAND ${XDG-ICON-RESOURCE_EXECUTABLE} install --size 128 ${CMAKE_CURRENT_SOURCE_DIR}/uvos-vhfmill.png) + message(\"Installing .desktop file\") + execute_process(COMMAND ${XDG-DESKTOP-MENU_EXECUTABLE} install --novendor ${CMAKE_CURRENT_SOURCE_DIR}/vhfmill.desktop) +") -qt_finalize_executable(VHFMill) +install(TARGETS vhfmill BUNDLE DESTINATION . LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) + +qt_finalize_executable(vhfmill) diff --git a/uvos-vhfmill.png b/uvos-vhfmill.png new file mode 100644 index 0000000..9ccc31a Binary files /dev/null and b/uvos-vhfmill.png differ diff --git a/vhfmill.cpp b/vhfmill.cpp index a569f0d..aa74f98 100644 --- a/vhfmill.cpp +++ b/vhfmill.cpp @@ -104,7 +104,7 @@ void VhfMill::jog(VhfMill::Axis axis, int jogDirection) jogAxis_ = axis; jogDirection_ = jogDirection; jogDirection = jogDirection == -1 ? 1 : 0; - QByteArray command("GA"); + QByteArray command("GB"); if(axis == AXIS_X) command.append(QByteArray::number(getLimits()[0]*jogDirection)); else diff --git a/vhfmill.desktop b/vhfmill.desktop new file mode 100644 index 0000000..98565e2 --- /dev/null +++ b/vhfmill.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Version=1.0 +Name=VhfMill +Icon=uvos-vhfmill +Exec=vhfmill -tH 10.0.0.3 -p 5000 +Terminal=false +Categories=Engineering;Science +Comment=A NC application for Vhf Mills