Rewritten dbus to dbus-c++

Added possibility to call daemon methods via dbus

1 files changed, 48 insertions, 5 deletions

diff --git a/src/Applet/CCApplet.cpp b/src/Applet/CCApplet.cpp
index fd9741ae..17ff6f92 100644
--- a/src/Applet/CCApplet.cpp
+++ b/src/Applet/CCApplet.cpp
@@ -19,33 +19,66 @@
 
 #include "CCApplet.h"
 #include <iostream>
+#include <cstdarg>
+#include <sstream>
 
 CApplet::CApplet()
 {
-    
     m_nStatusIcon = Gtk::StatusIcon::create(Gtk::Stock::DIALOG_WARNING);
     m_nStatusIcon->set_visible(false);
-    // LTM click
+    // LMB click
     m_nStatusIcon->signal_activate().connect(sigc::mem_fun(*this, &CApplet::OnAppletActivate_CB));
-    SetIconToolip("Pending events:");
+    m_nStatusIcon->signal_popup_menu().connect(sigc::mem_fun(*this, &CApplet::OnMenuPopup_cb));
+    SetIconTooltip("Pending events: %i",m_mapEvents.size());
+
 }
 
 CApplet::~CApplet()
 {
 }
 
-void CApplet::SetIconToolip(const Glib::ustring& tip)
+void CApplet::SetIconTooltip(const char *format, ...)
 {
-      m_nStatusIcon->set_tooltip(tip);
+    va_list args;
+    // change to smth sane like MAX_TOOLTIP length or rewrite this whole sh*t
+    size_t n,size = 10; 
+    char *buf = new char[size];
+    va_start (args, format);
+    while((n = vsnprintf (buf, size, format, args)) > size)
+    {
+        // string was larger than our buffer
+        // alloc larger buffer
+        size = n+1;
+        delete[] buf;
+        buf = new char[size];
+    }
+    va_end (args);
+    if (n != -1)
+    {
+        m_nStatusIcon->set_tooltip(Glib::ustring((const char*)buf));
+    }
+    else
+    {
+        m_nStatusIcon->set_tooltip("Error while setting tooltip!");
+    }
+    delete[] buf;
 }
 
 void CApplet::OnAppletActivate_CB()
 {
     m_nStatusIcon->set_visible(false);
     //std::cout << "Activate" << std::endl;
+    //if(m_pMenuPopup)
+      //m_pMenuPopup->show();
     
 }
 
+void CApplet::OnMenuPopup_cb(guint button, guint32 activate_time)
+{
+    /* for now just hide the icon on RMB */
+    m_nStatusIcon->set_blinking(false);
+}
+
 void CApplet::ShowIcon()
 {
     m_nStatusIcon->set_visible(true);
@@ -56,6 +89,16 @@ void CApplet::HideIcon()
     m_nStatusIcon->set_visible(false);
 }
 
+int CApplet::AddEvent(int pUUID, const std::string& pProgname)
+{
+    m_mapEvents[pUUID] = "pProgname";
+    SetIconTooltip("Pending events: %i",m_mapEvents.size());
+}
+
+int CApplet::RemoveEvent(int pUUID)
+{
+     m_mapEvents.erase(pUUID);
+}
 void CApplet::BlinkIcon(bool pBlink)
 {
     m_nStatusIcon->set_blinking(pBlink);