Merge pull request #4 from Soundux/rewrite

Merge Rewrite changes

Author: Curve

.github/workflows/build_linux.yml

@@ -1,11 +1,9 @@
 on:
     push:
-        branches: [master]
         paths-ignore:
             - "**/README.md"
             - "**/build_windows.yml"
     pull_request:
-        branches: [master]
 
 name: Build on Linux
 jobs:

.github/workflows/build_windows.yml

@@ -1,11 +1,9 @@
 on:
     push:
-        branches: [master]
         paths-ignore:
             - "**/README.md"
             - "**/build_linux.yml"
     pull_request:
-        branches: [master]
 
 name: Build on Windows
 jobs:

CMakeLists.txt

@@ -1,10 +1,11 @@
 cmake_minimum_required(VERSION 3.1)
-project(tray VERSION 0.1 DESCRIPTION "A cross-platform C++ system tray library")
+project(tray VERSION 0.2 DESCRIPTION "A cross-platform C++ system tray library")
 
 file(GLOB src
-    "src/*.cpp"
-    "src/*/*.cpp"
-    "src/*/*/*.cpp"
+    "tray/main.cpp"
+    "tray/src/*.cpp"
+    "tray/src/*/*.cpp"
+    "tray/src/*/*/*.cpp"
 )
 
 add_library(tray STATIC ${src})
@@ -15,12 +16,11 @@ if (UNIX)
     pkg_check_modules(APPINDICATOR REQUIRED appindicator3-0.1)
 
     target_link_libraries(tray INTERFACE ${GTK3_LIBRARIES} ${APPINDICATOR_LIBRARIES})
-    target_compile_options(tray INTERFACE -Wall -Wextra -Werror -pedantic -Wno-unused-lambda-capture)
+    target_compile_options(tray PRIVATE -Wall -Wextra -Werror -pedantic -Wno-unused-lambda-capture)
     target_include_directories(tray SYSTEM PUBLIC ${GTK3_INCLUDE_DIRS} ${APPINDICATOR_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR})
 endif()
 
-target_include_directories(tray SYSTEM PUBLIC "src/")
-target_include_directories(tray SYSTEM PUBLIC "lib/json/single_include/nlohmann")
+target_include_directories(tray SYSTEM PUBLIC "tray/include")
 
 target_compile_features(tray PUBLIC cxx_std_17)
 set_target_properties(tray PROPERTIES CMAKE_CXX_STANDARD 17)

example/simple/CMakeLists.txt

@@ -1,13 +1,13 @@
-cmake_minimum_required(VERSION 3.1)
-project(tray-example VERSION 0.1)
-
-add_executable(tray-example "main.cpp")
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../ ${CMAKE_CURRENT_SOURCE_DIR}/../../example_build EXCLUDE_FROM_ALL)
-target_link_libraries(tray-example tray)
-
-target_compile_features(tray-example PUBLIC cxx_std_17)
-set_target_properties(tray-example PROPERTIES CMAKE_CXX_STANDARD 17)
-set_target_properties(tray-example PROPERTIES CMAKE_CXX_EXTENSIONS Off)
-set_target_properties(tray-example PROPERTIES CMAKE_CXX_STANDARD_REQUIRED On)
-set_target_properties(tray-example PROPERTIES VERSION ${PROJECT_VERSION})
+cmake_minimum_required(VERSION 3.1)
+project(tray-example VERSION 0.1)
+
+add_executable(tray-example "main.cpp")
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../ ${CMAKE_CURRENT_SOURCE_DIR}/../../example_build EXCLUDE_FROM_ALL)
+target_link_libraries(tray-example tray)
+
+target_compile_features(tray-example PUBLIC cxx_std_17)
+set_target_properties(tray-example PROPERTIES CMAKE_CXX_STANDARD 17)
+set_target_properties(tray-example PROPERTIES CMAKE_CXX_EXTENSIONS Off)
+set_target_properties(tray-example PROPERTIES CMAKE_CXX_STANDARD_REQUIRED On)
+set_target_properties(tray-example PROPERTIES VERSION ${PROJECT_VERSION})
 set_target_properties(tray-example PROPERTIES PROJECT_NAME ${PROJECT_NAME})

example/simple/main.cpp

@@ -1,31 +1,20 @@
-#include "tray.hpp"
-#include <iostream>
-
-int main()
-{
-#if defined(__linux__)
-    Soundux::Tray tray(
-        "TestTray", "icon.png",
-        Soundux::TrayCheck("Test Check", false, [](bool state) { std::cout << "Checked: " << state << std::endl; }),
-        Soundux::TrayCheck("Test Check 2", true, [](bool state) { std::cout << "Checked 2: " << state << std::endl; }));
-#elif defined(_WIN32)
-    Soundux::Tray tray(
-        "TestTray", "icon.ico" /*ICON_PATH, ICON_RESOURCE or HICON*/,
-        Soundux::TrayCheck("Test Check", false, [](bool state) { std::cout << "Checked: " << state << std::endl; }),
-        Soundux::TrayCheck("Test Check 2", true, [](bool state) { std::cout << "Checked 2: " << state << std::endl; }));
-#endif
-
-    tray.addItem(Soundux::TraySubmenu(
-                     "Submenu", Soundux::TrayButton("Some button",
-                                                    []() { std::cout << "Submenu Button 1 pressed!" << std::endl; })))
-        ->addItem(
-            Soundux::TrayButton("Another button", []() { std::cout << "Submenu Button 2 pressed!" << std::endl; }));
-
-    tray.addItem(Soundux::TrayButton("Exit", [&] { tray.exit(); }));
-
-    while (tray.run())
-    {
-    }
-
-    return 0;
+#include <iostream>
+#include <tray.hpp>
+
+int main()
+{
+    Tray::Tray tray("test", "icon.ico");
+
+    tray.addEntry(Tray::Button("Exit", [&] { tray.exit(); }));
+    tray.addEntry(Tray::Button("Test"))->setDisabled(true);
+    tray.addEntry(Tray::Seperator());
+    tray.addEntry(Tray::Label("Test Label"));
+    tray.addEntry(Tray::Toggle("Test Toggle", false, [](bool state) { printf("State: %i\n", state); }));
+
+    tray.addEntry(Tray::Seperator());
+    tray.addEntry(Tray::Submenu("Test Submenu"))->addEntry(Tray::Button("Submenu button!"))->setDisabled(true);
+
+    tray.run();
+
+    return 0;
 }