[SVN-NetXMS] revision 3335

* { font-family: Consolas, Lucida Console, Courier New; font-size: 100%; }
h1 { font-size: 150%; }
td.linenos { background-color: #f0f0f0; padding-right: 10px; }
span.lineno { background-color: #f0f0f0; padding: 0 5px 0 5px; }
pre { line-height: 100%; width: 100%; }
.highlight span { width: 100%; display:-moz-inline-stack; display:inline-block; zoom:1; *display:inline; }
body { background: #ffffff; }
body .c { color: #999988; font-style: italic } /* Comment */
body .err { color: #a61717; background-color: #e3d2d2 } /* Error */
body .k { font-weight: bold } /* Keyword */
body .o { font-weight: bold } /* Operator */
body .cm { color: #999988; font-style: italic } /* Comment.Multiline */
body .cp { color: #999999; font-weight: bold } /* Comment.Preproc */
body .c1 { color: #999988; font-style: italic } /* Comment.Single */
body .cs { color: #999999; font-weight: bold; font-style: italic } /* Comment.Special */
body .gd { color: #000000; background-color: #ffdddd } /* Generic.Deleted */
body .ge { font-style: italic } /* Generic.Emph */
body .gr { color: #aa0000 } /* Generic.Error */
body .gh { color: #999999 } /* Generic.Heading */
body .gi { color: #000000; background-color: #ddffdd } /* Generic.Inserted */
body .go { color: #888888 } /* Generic.Output */
body .gp { color: #555555 } /* Generic.Prompt */
body .gs { font-weight: bold } /* Generic.Strong */
body .gu { color: #aaaaaa } /* Generic.Subheading */
body .gt { color: #aa0000 } /* Generic.Traceback */
body .kc { font-weight: bold } /* Keyword.Constant */
body .kd { font-weight: bold } /* Keyword.Declaration */
body .kp { font-weight: bold } /* Keyword.Pseudo */
body .kr { font-weight: bold } /* Keyword.Reserved */
body .kt { color: #445588; font-weight: bold } /* Keyword.Type */
body .m { color: #009999 } /* Literal.Number */
body .s { color: #bb8844 } /* Literal.String */
body .na { color: #008080 } /* Name.Attribute */
body .nb { color: #999999 } /* Name.Builtin */
body .nc { color: #445588; font-weight: bold } /* Name.Class */
body .no { color: #008080 } /* Name.Constant */
body .ni { color: #800080 } /* Name.Entity */
body .ne { color: #990000; font-weight: bold } /* Name.Exception */
body .nf { color: #990000; font-weight: bold } /* Name.Function */
body .nn { color: #555555 } /* Name.Namespace */
body .nt { color: #000080 } /* Name.Tag */
body .nv { color: #008080 } /* Name.Variable */
body .ow { font-weight: bold } /* Operator.Word */
body .w { color: #bbbbbb } /* Text.Whitespace */
body .mf { color: #009999 } /* Literal.Number.Float */
body .mh { color: #009999 } /* Literal.Number.Hex */
body .mi { color: #009999 } /* Literal.Number.Integer */
body .mo { color: #009999 } /* Literal.Number.Oct */
body .sb { color: #bb8844 } /* Literal.String.Backtick */
body .sc { color: #bb8844 } /* Literal.String.Char */
body .sd { color: #bb8844 } /* Literal.String.Doc */
body .s2 { color: #bb8844 } /* Literal.String.Double */
body .se { color: #bb8844 } /* Literal.String.Escape */
body .sh { color: #bb8844 } /* Literal.String.Heredoc */
body .si { color: #bb8844 } /* Literal.String.Interpol */
body .sx { color: #bb8844 } /* Literal.String.Other */
body .sr { color: #808000 } /* Literal.String.Regex */
body .s1 { color: #bb8844 } /* Literal.String.Single */
body .ss { color: #bb8844 } /* Literal.String.Symbol */
body .bp { color: #999999 } /* Name.Builtin.Pseudo */
body .vc { color: #008080 } /* Name.Variable.Class */
body .vg { color: #008080 } /* Name.Variable.Global */
body .vi { color: #008080 } /* Name.Variable.Instance */
body .il { color: #009999 } /* Literal.Number.Integer.Long */

Info

Revision:3335
Author:victor

Date:2008-06-25 09:49:30 +0300 (Wed, 25 Jun 2008)

Comment:now can specify icon when registering control panel item

Changes
U trunk/src/client/console/include/nxmc_api.h
U trunk/src/client/console/libnxmc/main.cpp
U trunk/src/client/console/nxmc/ctrlpanel.cpp

Diff
Modified: trunk/src/client/console/include/nxmc_api.h
===================================================================
--- trunk/src/client/console/include/nxmc_api.h 2008-06-24 18:36:19 UTC (rev 3334)
+++ trunk/src/client/console/include/nxmc_api.h 2008-06-25 06:49:30 UTC (rev 3335)
@@ -237,14 +237,17 @@
         int m_id;
         int m_type;
         void (*m_fpHandler)(int);
+ const wxIcon *m_icon;
 
 public:
- nxmcItemRegistration(NXMC_PLUGIN_HANDLE plugin, const TCHAR *name, int id, int type, void (*fpHandler)(int));
+ nxmcItemRegistration(NXMC_PLUGIN_HANDLE plugin, const TCHAR *name, int id,
+ int type, const wxIcon &icon, void (*fpHandler)(int));
         ~nxmcItemRegistration();
 
         const TCHAR *GetName() { return m_name; }
         int GetType() { return m_type; }
         int GetId() { return m_id; }
+ const wxIcon GetIcon() { return *m_icon; }
         NXMC_PLUGIN_HANDLE GetPlugin() { return m_plugin; }
 
         void CallHandler(int param) { m_fpHandler(param); }
@@ -342,7 +345,7 @@
 
 bool LIBNXMC_EXPORTABLE NXMCLoadResources(const TCHAR *name, NXMC_LIB_INSTANCE instance, TCHAR *resName);
 
-bool LIBNXMC_EXPORTABLE NXMCAddControlPanelItem(NXMC_PLUGIN_HANDLE handle, const TCHAR *name, int id);
+bool LIBNXMC_EXPORTABLE NXMCAddControlPanelItem(NXMC_PLUGIN_HANDLE handle, const TCHAR *name, int id, const wxIcon &icon = wxNullIcon);
 bool LIBNXMC_EXPORTABLE NXMCAddViewMenuItem(NXMC_PLUGIN_HANDLE handle, const TCHAR *name, int id);
 
 wxWindow LIBNXMC_EXPORTABLE *NXMCGetDefaultParent();

Modified: trunk/src/client/console/libnxmc/main.cpp
===================================================================
--- trunk/src/client/console/libnxmc/main.cpp 2008-06-24 18:36:19 UTC (rev 3334)
+++ trunk/src/client/console/libnxmc/main.cpp 2008-06-25 06:49:30 UTC (rev 3335)
@@ -59,12 +59,14 @@
 // Registration item class implementation
 //
 
-nxmcItemRegistration::nxmcItemRegistration(NXMC_PLUGIN_HANDLE plugin, const TCHAR *name, int id, int type, void (*fpHandler)(int))
+nxmcItemRegistration::nxmcItemRegistration(NXMC_PLUGIN_HANDLE plugin, const TCHAR *name, int id,
+ int type, const wxIcon &icon, void (*fpHandler)(int))
 {
         m_plugin = plugin;
         m_name = _tcsdup(name);
         m_id = id;
         m_type = type;
+ m_icon = &icon;
         m_fpHandler = fpHandler;
 }
 
@@ -81,7 +83,7 @@
 // Add Control Panel item
 //
 
-bool LIBNXMC_EXPORTABLE NXMCAddControlPanelItem(NXMC_PLUGIN_HANDLE handle, const TCHAR *name, int id)
+bool LIBNXMC_EXPORTABLE NXMCAddControlPanelItem(NXMC_PLUGIN_HANDLE handle, const TCHAR *name, int id, const wxIcon &icon)
 {
         if (s_isUiInitialized)
                 return false; // Currently this registration is not allowed after initialization
@@ -89,7 +91,7 @@
         if ((id < 0) || (id >= NXMC_PLUGIN_ID_LIMIT))
                 return false; // ID is out of allowed range
 
- s_regItemList.Add(new nxmcItemRegistration(handle, name, id, REGITEM_CONTROL_PANEL, NULL));
+ s_regItemList.Add(new nxmcItemRegistration(handle, name, id, REGITEM_CONTROL_PANEL, icon, NULL));
         return true;
 }
 
@@ -106,7 +108,7 @@
         if ((id < 0) || (id >= NXMC_PLUGIN_ID_LIMIT))
                 return false; // ID is out of allowed range
 
- s_regItemList.Add(new nxmcItemRegistration(handle, name, id, REGITEM_VIEW_MENU, NULL));
+ s_regItemList.Add(new nxmcItemRegistration(handle, name, id, REGITEM_VIEW_MENU, wxNullIcon, NULL));
         return true;
 }
 

Modified: trunk/src/client/console/nxmc/ctrlpanel.cpp
===================================================================
--- trunk/src/client/console/nxmc/ctrlpanel.cpp 2008-06-24 18:36:19 UTC (rev 3334)
+++ trunk/src/client/console/nxmc/ctrlpanel.cpp 2008-06-25 06:49:30 UTC (rev 3335)
@@ -64,7 +64,7 @@
         {
                 if (regList[i].GetType() == REGITEM_CONTROL_PANEL)
                 {
- AddItem(regList[i].GetId() + ((nxmcPlugin *)regList[i].GetPlugin())->GetBaseId(), regList[i].GetName(), wxNullIcon, imageList);
+ AddItem(regList[i].GetId() + ((nxmcPlugin *)regList[i].GetPlugin())->GetBaseId(), regList[i].GetName(), regList[i].GetIcon(), imageList);
                 }
         }
         
Received on Wed Jun 25 2008 - 09:49:30 EEST