Rename menu item text methods to label, update native accessors

Author: lijy91

src/capi/menu_c.cpp

@@ -218,27 +218,27 @@ native_menu_item_type_t native_menu_item_get_type(native_menu_item_t item) {
   }
 }
 
-void native_menu_item_set_text(native_menu_item_t item, const char* text) {
-  if (!item || !text)
+void native_menu_item_set_label(native_menu_item_t item, const char* label) {
+  if (!item || !label)
     return;
 
   try {
     auto menu_item = static_cast<MenuItem*>(item);
-    menu_item->SetText(text);
+    menu_item->SetLabel(label);
   } catch (...) {
     // Ignore exceptions
   }
 }
 
-int native_menu_item_get_text(native_menu_item_t item,
-                              char* buffer,
-                              size_t buffer_size) {
+int native_menu_item_get_label(native_menu_item_t item,
+                               char* buffer,
+                               size_t buffer_size) {
   if (!item || !buffer || buffer_size == 0)
     return -1;
 
   try {
     auto menu_item = static_cast<MenuItem*>(item);
-    std::string text = menu_item->GetText();
+    std::string text = menu_item->GetLabel();
 
     if (text.length() >= buffer_size) {
       return -1;

src/capi/menu_c.h

@@ -180,22 +180,22 @@ FFI_PLUGIN_EXPORT
 native_menu_item_type_t native_menu_item_get_type(native_menu_item_t item);
 
 /**
- * Set the text of a menu item
+ * Set the label of a menu item
  * @param item The menu item
- * @param text The text to set
+ * @param label The label to set
  */
 FFI_PLUGIN_EXPORT
-void native_menu_item_set_text(native_menu_item_t item, const char* text);
+void native_menu_item_set_label(native_menu_item_t item, const char* label);
 
 /**
- * Get the text of a menu item
+ * Get the label of a menu item
  * @param item The menu item
- * @param buffer Buffer to store the text (caller allocated)
+ * @param buffer Buffer to store the label (caller allocated)
  * @param buffer_size Size of the buffer
- * @return Length of the text, or -1 if buffer too small
+ * @return Length of the label, or -1 if buffer too small
  */
 FFI_PLUGIN_EXPORT
-int native_menu_item_get_text(native_menu_item_t item, char* buffer, size_t buffer_size);
+int native_menu_item_get_label(native_menu_item_t item, char* buffer, size_t buffer_size);
 
 /**
  * Set the icon of a menu item

src/menu.h

@@ -235,28 +235,28 @@ class MenuItem : public EventEmitter {
   MenuItemType GetType() const;
 
   /**
-   * @brief Set the display text for the menu item.
+   * @brief Set the display label for the menu item.
    *
-   * The text is what appears in the menu. On some platforms,
+   * The label is what appears in the menu. On some platforms,
    * ampersand characters (&) can be used to indicate mnemonics
    * (keyboard navigation keys).
    *
-   * @param text The text to display
+   * @param label The label to display
    *
    * @example
    * ```cpp
-   * item->SetText("&File");  // 'F' becomes the mnemonic on Windows/Linux
-   * item->SetText("Open Recent");
+   * item->SetLabel("&File");  // 'F' becomes the mnemonic on Windows/Linux
+   * item->SetLabel("Open Recent");
    * ```
    */
-  void SetText(const std::string& text);
+  void SetLabel(const std::string& label);
 
   /**
-   * @brief Get the current display text of the menu item.
+   * @brief Get the current display label of the menu item.
    *
-   * @return The current text as a string
+   * @return The current label as a string
    */
-  std::string GetText() const;
+  std::string GetLabel() const;
 
   /**
    * @brief Set the icon for the menu item.
@@ -455,7 +455,7 @@ class MenuItem : public EventEmitter {
    *
    * @return Pointer to the native menu item object
    */
-  void* GetNativeItem() const;
+  void* GetNativeObject() const;
 
   /**
    * @brief Emit a menu item selected event.
@@ -816,7 +816,7 @@ class Menu : public EventEmitter {
    *
    * @return Pointer to the native menu object
    */
-  void* GetNativeMenu() const;
+  void* GetNativeObject() const;
 
   /**
    * @brief Emit a menu opened event.

src/platform/linux/menu_linux.cpp

@@ -90,14 +90,14 @@ MenuItemType MenuItem::GetType() const {
   return pimpl_->type_;
 }
 
-void MenuItem::SetText(const std::string& text) {
-  pimpl_->title_ = text;
+void MenuItem::SetLabel(const std::string& label) {
+  pimpl_->title_ = label;
   if (pimpl_->gtk_menu_item_ && pimpl_->type_ != MenuItemType::Separator) {
-    gtk_menu_item_set_label(GTK_MENU_ITEM(pimpl_->gtk_menu_item_), text.c_str());
+    gtk_menu_item_set_label(GTK_MENU_ITEM(pimpl_->gtk_menu_item_), label.c_str());
   }
 }
 
-std::string MenuItem::GetText() const {
+std::string MenuItem::GetLabel() const {
   return pimpl_->title_;
 }
 
@@ -186,7 +186,7 @@ int MenuItem::GetRadioGroup() const {
 void MenuItem::SetSubmenu(std::shared_ptr<Menu> submenu) {
   pimpl_->submenu_ = submenu;
   if (pimpl_->gtk_menu_item_ && submenu) {
-    gtk_menu_item_set_submenu(GTK_MENU_ITEM(pimpl_->gtk_menu_item_), (GtkWidget*)submenu->GetNativeMenu());
+    gtk_menu_item_set_submenu(GTK_MENU_ITEM(pimpl_->gtk_menu_item_), (GtkWidget*)submenu->GetNativeObject());
   }
 }
 
@@ -210,7 +210,7 @@ bool MenuItem::Trigger() {
   return false;
 }
 
-void* MenuItem::GetNativeItem() const {
+void* MenuItem::GetNativeObject() const {
   return (void*)pimpl_->gtk_menu_item_;
 }
 
@@ -264,9 +264,9 @@ Menu::~Menu() {
 }
 
 void Menu::AddItem(std::shared_ptr<MenuItem> item) {
-  if (pimpl_->gtk_menu_ && item && item->GetNativeItem()) {
+  if (pimpl_->gtk_menu_ && item && item->GetNativeObject()) {
     pimpl_->items_.push_back(item);
-    gtk_menu_shell_append(GTK_MENU_SHELL(pimpl_->gtk_menu_), (GtkWidget*)item->GetNativeItem());
+    gtk_menu_shell_append(GTK_MENU_SHELL(pimpl_->gtk_menu_), (GtkWidget*)item->GetNativeObject());
   }
 }
 
@@ -279,17 +279,17 @@ void Menu::InsertItem(size_t index, std::shared_ptr<MenuItem> item) {
   }
 
   pimpl_->items_.insert(pimpl_->items_.begin() + index, item);
-  if (pimpl_->gtk_menu_ && item->GetNativeItem()) {
-    gtk_menu_shell_insert(GTK_MENU_SHELL(pimpl_->gtk_menu_), (GtkWidget*)item->GetNativeItem(), index);
+  if (pimpl_->gtk_menu_ && item->GetNativeObject()) {
+    gtk_menu_shell_insert(GTK_MENU_SHELL(pimpl_->gtk_menu_), (GtkWidget*)item->GetNativeObject(), index);
   }
 }
 
 bool Menu::RemoveItem(std::shared_ptr<MenuItem> item) {
-  if (pimpl_->gtk_menu_ && item && item->GetNativeItem()) {
+  if (pimpl_->gtk_menu_ && item && item->GetNativeObject()) {
     auto it = std::find(pimpl_->items_.begin(), pimpl_->items_.end(), item);
     if (it != pimpl_->items_.end()) {
       pimpl_->items_.erase(it);
-      gtk_container_remove(GTK_CONTAINER(pimpl_->gtk_menu_), (GtkWidget*)item->GetNativeItem());
+      gtk_container_remove(GTK_CONTAINER(pimpl_->gtk_menu_), (GtkWidget*)item->GetNativeObject());
       return true;
     }
   }
@@ -355,7 +355,7 @@ std::vector<std::shared_ptr<MenuItem>> Menu::GetAllItems() const {
 
 std::shared_ptr<MenuItem> Menu::FindItemByText(const std::string& text, bool case_sensitive) const {
   for (const auto& item : pimpl_->items_) {
-    std::string item_text = item->GetText();
+    std::string item_text = item->GetLabel();
     if (case_sensitive) {
       if (item_text == text) {
         return item;
@@ -430,7 +430,7 @@ std::shared_ptr<MenuItem> Menu::CreateAndAddSubmenu(const std::string& text, std
   return item;
 }
 
-void* Menu::GetNativeMenu() const {
+void* Menu::GetNativeObject() const {
   return (void*)pimpl_->gtk_menu_;
 }
 

src/platform/linux/tray_icon_linux.cpp

@@ -13,7 +13,7 @@ namespace nativeapi {
 class TrayIcon::Impl {
  public:
   Impl(GtkStatusIcon* tray) : gtk_status_icon_(tray), title_(""), tooltip_(""), context_menu_(nullptr) {}
-  
+
   GtkStatusIcon* gtk_status_icon_;
   std::shared_ptr<Menu> context_menu_;  // Store menu shared_ptr to keep it alive
   std::string title_;  // GTK StatusIcon doesn't have title, so we store it
@@ -50,32 +50,32 @@ void TrayIcon::SetIcon(std::string icon) {
     size_t pos = icon.find("base64,");
     if (pos != std::string::npos) {
       std::string base64Icon = icon.substr(pos + 7);
-      
+
       // Decode base64 data
       gsize decoded_len;
       guchar* decoded_data = g_base64_decode(base64Icon.c_str(), &decoded_len);
-      
+
       if (decoded_data) {
         // Create pixbuf from decoded data
         GInputStream* stream = g_memory_input_stream_new_from_data(
             decoded_data, decoded_len, g_free);
         GError* error = nullptr;
         GdkPixbuf* pixbuf = gdk_pixbuf_new_from_stream(stream, nullptr, &error);
-        
+
         if (pixbuf && !error) {
           // Scale pixbuf to appropriate size (24x24 is common for tray icons)
           GdkPixbuf* scaled_pixbuf = gdk_pixbuf_scale_simple(
               pixbuf, 24, 24, GDK_INTERP_BILINEAR);
-          
+
           gtk_status_icon_set_from_pixbuf(pimpl_->gtk_status_icon_, scaled_pixbuf);
-          
+
           g_object_unref(scaled_pixbuf);
           g_object_unref(pixbuf);
         } else if (error) {
           std::cerr << "Error loading icon from base64: " << error->message << std::endl;
           g_error_free(error);
         }
-        
+
         g_object_unref(stream);
       }
     }
@@ -117,7 +117,7 @@ void TrayIcon::SetContextMenu(std::shared_ptr<Menu> menu) {
   pimpl_->context_menu_ = menu;
 
   // Note: Full GTK integration would need to connect popup-menu signal
-  // and show the GTK menu from the Menu object's GetNativeMenu()
+  // and show the GTK menu from the Menu object's GetNativeObject()
 }
 
 std::shared_ptr<Menu> TrayIcon::GetContextMenu() {
@@ -126,20 +126,20 @@ std::shared_ptr<Menu> TrayIcon::GetContextMenu() {
 
 Rectangle TrayIcon::GetBounds() {
   Rectangle bounds = {0, 0, 0, 0};
-  
+
   if (pimpl_->gtk_status_icon_) {
     GdkScreen* screen;
     GdkRectangle area;
     GtkOrientation orientation;
-    
+
     if (gtk_status_icon_get_geometry(pimpl_->gtk_status_icon_, &screen, &area, &orientation)) {
       bounds.x = area.x;
       bounds.y = area.y;
       bounds.width = area.width;
       bounds.height = area.height;
     }
   }
-  
+
   return bounds;
 }
 
@@ -167,7 +167,7 @@ bool TrayIcon::IsVisible() {
 }
 
 bool TrayIcon::ShowContextMenu(double x, double y) {
-  if (!pimpl_->context_menu_ || !pimpl_->context_menu_->GetNativeMenu()) {
+  if (!pimpl_->context_menu_ || !pimpl_->context_menu_->GetNativeObject()) {
     return false;
   }
 
@@ -177,7 +177,7 @@ bool TrayIcon::ShowContextMenu(double x, double y) {
 }
 
 bool TrayIcon::ShowContextMenu() {
-  if (!pimpl_->context_menu_ || !pimpl_->context_menu_->GetNativeMenu()) {
+  if (!pimpl_->context_menu_ || !pimpl_->context_menu_->GetNativeObject()) {
     return false;
   }
 
@@ -211,4 +211,4 @@ void TrayIcon::HandleDoubleClick() {
   }
 }
 
-}  // namespace nativeapi
+}  // namespace nativeapi