WebSVN – tpanel – Diff – /trunk/src/tbutton.h

 /*
- * Copyright (C) 2020 to 2024 by Andreas Theofilu <andreas@theosys.at>
+ * Copyright (C) 2020 to 2025 by Andreas Theofilu <andreas@theosys.at>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
 #   define STATE_8      7
 #   define STATE_ALL    -1
 #   define HANDLE_UNDEF 0
-    typedef struct SYSTEF_t         // Text effect names
+    typedef struct SYSTEF_t     // Text effect names
+    {
         int idx{0};
         std::string name;
     }SYSTEF_t;
         ORI_ABSOLUT,
         ORI_TOP_LEFT,
         ORI_TOP_MIDDLE,
         ORI_TOP_RIGHT,
         ORI_CENTER_LEFT,
-        ORI_CENTER_MIDDLE,		// default
+        ORI_CENTER_MIDDLE,      // default
         ORI_CENTER_RIGHT,
         ORI_BOTTOM_LEFT,
         ORI_BOTTOM_MIDDLE,
         ORI_BOTTOM_RIGHT,
         ORI_SCALE_FIT,          // G5 scale to fit
         SVP_CENTER,
         SVP_LEFT_TOP,
         SVP_RIGHT_BOTTOM
     }SUBVIEW_POSITION_t;
+    typedef enum BUTTON_ACTION_t
+    {
+        BT_ACTION_LAUNCH,
+        BT_ACTION_PGFLIP
+    }BUTTON_ACTION_t;
+    /**
+     * @brief TP5 button events
+     * This defines the possible event types on a button.
+     */
+    typedef enum BUTTON_EVENT_t
+    {
+        EVENT_NONE,                 // No event
+        EVENT_PRESS,                // Event on button press
+        EVENT_RELEASE,              // Event on button release
+        EVENT_GUESTURE_ANY,         // Event on any guesture
+        EVENT_GUESTURE_UP,          // Event on 1 finger up guesture
+        EVENT_GUESTURE_DOWN,        // Event on 1 finger down guesture
+        EVENT_GUESTURE_LEFT,        // Event on 1 finger left guesture
+        EVENT_GUESTURE_RIGHT,       // Event on 1 finger right guesture
+        EVENT_GUESTURE_DBLTAP,      // Event on double tap
+        EVENT_GUESTURE_2FUP,        // Event on 2 finger up guesture
+        EVENT_GUESTURE_2FDN,        // Event on 2 finger down guesture
+        EVENT_GUESTURE_2FLT,        // Event on 2 finger left guesture
+        EVENT_GUESTURE_2FRT         // Event on 2 finger right guesture
+    }BUTTON_EVENT_t;
     /**
      * Justification values:
      *    0 = absolut
      *    1 = top right
      *    2 = top middle
+    {
         std::string fileName;   // file name of the bitmap (replaces icons)
         ORIENTATION justification{ORI_CENTER_MIDDLE};   // Justification of bitmap
         int offsetX{0};         // Absolut X position (only if justification is 0)
         int offsetY{0};         // Absolut Y position (only if justification is 0)
+        int width{0};           // Internal: The width of the image
+        int height{0};          // Internal: The height of the image
     }BITMAPS_t;
     typedef struct SR_T
+    {
         int number{0};
         std::vector<SR_T> sr;
     }EXTBUTTON_t;
     typedef struct PUSH_FUNC
+    {
-        int item{0};            // TP5: Item number ordered
+        int item{0};            // TP5: Item number
         std::string pfType;     // command to execute when button was pushed
+        std::string pfAction;   // TP5: Action; Used for launching external apps
         std::string pfName;     // Name of popup
+        BUTTON_ACTION_t action{BT_ACTION_PGFLIP};   // TP5: Button action (page flip, ...)
+        int ID{0};              // TP5: An ID for launch buttons
+        BUTTON_EVENT_t event{EVENT_NONE};   // TP5: Type of event
     }PUSH_FUNC_T;
-    typedef struct CALL_APP     // TP5: Call an application
-    {
-        int item{0};            // Item number
-        std::string action;     // The action to take (show, hide, ...)
-        int id{0};              // An ID for the application
-        std::string name;       // The name of the application (Calculator, ...)
-    }CALL_APP_t;
     typedef enum CENTER_CODE
+    {
         SC_ICON = 0,
         SC_BITMAP,
         SC_TEXT
              * The new bitmap file name is set and it will be loaded and created.
+             *
              * @param file      File name of a bitmap file.
              * @param instance  The instance where to put the new bitmap. If
              *                  this is 0, the bitmap is set on all instances.
+             * @param justify   Optional; reserved for TP5: Defines the justification
+             * @param x         Optional; reserved for TP5: Defines the x origin
+             * @param y         Optional; reserved for TP5: Defines the y origin
              * @return TRUE if no errors occures, otherwise FALSE.
              */
-            bool setBitmap(const std::string& file, int instance);
+            bool setBitmap(const std::string& file, int instance, int index, int justify=5, int x=0, int y=0);
             /**
              * @brief setCameleon Sets a new cameleon bitmap to the button
              * If there was already a cameleon bitmap on this button and if this
              * cameleon bitmap is different from the one in \p file, then it is
              * erased. The new cameleon bitmap file name is set and it will be
             bool drawAlongOrder(SkBitmap *imgButton, int instance);
             void getDrawOrder(const std::string& sdo, DRAW_ORDER *order);
             bool buttonFill(SkBitmap *bm, int instance);
             bool buttonBitmap(SkBitmap *bm, int instance);
-            bool buttonBitmap5(SkBitmap *bm, int instance);
+            bool buttonBitmap5(SkBitmap *bm, int instance, bool ignFirst=false);
             bool buttonDynamic(SkBitmap *bm, int instance, bool show, bool *state=nullptr);
             bool buttonIcon(SkBitmap *bm, int instance);
             bool buttonText(SkBitmap *bm, int instance);
             bool buttonBorder(SkBitmap *bm, int instance, TSystemDraw::LINE_TYPE_t lnType=TSystemDraw::LT_OFF);
             bool isPixelTransparent(int x, int y);
             bool isPassThrough();
             SkColor& flipColorLevelsRB(SkColor& color);
             void runBargraphMove(int distance, bool moveUp=false);
             void threadBargraphMove(int distance, bool moveUp);
             TButtonStates *getButtonState();
+            bool isButtonEvent(const std::string& token, const std::vector<std::string>& events);               // TP5: Tests for a button event
+            BUTTON_EVENT_t getButtonEvent(const std::string& token);    // TP5: Returns the button event
             BUTTONTYPE type;
             int bi{0};              // button ID
             std::string na;         // name
             std::string bd;         // Description --> ignored
             std::string we;         // SubPageView: Anchor position: Empty = Center, "l/t" = left/top, "r/b" = right/bottom
             std::string pc;         // Password character for text area
             std::string op;         // String the button send
             bool visible{true};     // TRUE=Button is visible
             std::vector<PUSH_FUNC_T> pushFunc;  // Push functions: This are executed on button press
-            std::vector<CALL_APP_t> callApp;    // TP5: Call an application
             std::vector<SR_T> sr;   // The elements the button consists of
             // ListView settings (G5)
             std::string listSource; // Defines the data source for a list.
             int listEvNum{1401};       // ListView event number.
             std::string listFilter; // ListView filter string.

Subversion Repositories tpanel

(root)/trunk/src/tbutton.h – Rev 480 → 486