[SVN-NetXMS] revision 3354

* { 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:3354
Author:alk

Date:2008-06-30 03:24:49 +0300 (Mon, 30 Jun 2008)

Comment:- Initial version of User Selection Dialog

Changes
U trunk/src/client/console/include/nxmc_api.h
A trunk/src/client/console/libnxmc/userSelectionDialog.cpp
A trunk/src/client/console/libnxmc/userSelectionDialog.h
U trunk/src/client/console/nxmc/rc/nxmc.fbp
U trunk/src/client/console/nxmc/rc/wxfb_code.xrc

Diff
Modified: trunk/src/client/console/include/nxmc_api.h
===================================================================
--- trunk/src/client/console/include/nxmc_api.h 2008-06-29 12:21:00 UTC (rev 3353)
+++ trunk/src/client/console/include/nxmc_api.h 2008-06-30 00:24:49 UTC (rev 3354)
@@ -322,6 +322,7 @@
 #include "../libnxmc/heading.h"
 #include "../libnxmc/graph.h"
 #include "../libnxmc/objseldlg.h"
+#include "../libnxmc/userSelectionDialog.h"
 
 
 //

Added: trunk/src/client/console/libnxmc/userSelectionDialog.cpp
===================================================================
--- trunk/src/client/console/libnxmc/userSelectionDialog.cpp (rev 0)
+++ trunk/src/client/console/libnxmc/userSelectionDialog.cpp 2008-06-30 00:24:49 UTC (rev 3354)
@@ -0,0 +1,124 @@
+/* $Id$ */
+/*
+** NetXMS - Network Management System
+** Portable management console
+** Copyright (C) 2008 Alex Kirhenshtein
+**
+** 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 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+**
+**/
+
+#include "libnxmc.h"
+#include "userSelectionDialog.h"
+
+//
+// Event table
+//
+
+BEGIN_EVENT_TABLE(nxUserSelectionDialog, wxDialog)
+ EVT_INIT_DIALOG(nxUserSelectionDialog::OnInitDialog)
+ EVT_LIST_COL_CLICK(XRCID("wndListCtrl"), nxUserSelectionDialog::OnListColumnClick)
+ EVT_LIST_ITEM_ACTIVATED(XRCID("wndListCtrl"), nxUserSelectionDialog::OnListItemActivate)
+END_EVENT_TABLE()
+
+
+//
+// Constructor
+//
+
+nxUserSelectionDialog::nxUserSelectionDialog(wxWindow *parent)
+ : wxDialog()
+{
+ wxConfig::Get()->Read(_T("/UserSelDlg/SortMode"), &m_sortMode, 0);
+ wxConfig::Get()->Read(_T("/UserSelDlg/SortDir"), &m_sortDir, 1);
+
+ wxXmlResource::Get()->LoadDialog(this, parent, _T("nxUserSelDlg"));
+ GetSizer()->Fit(this);
+}
+
+
+//
+// Destructor
+//
+
+nxUserSelectionDialog::~nxUserSelectionDialog()
+{
+ wxConfig::Get()->Write(_T("/UserSelDlg/SortMode"), m_sortMode);
+ wxConfig::Get()->Write(_T("/UserSelDlg/SortDir"), m_sortDir);
+}
+
+
+//
+// Data exchange
+//
+
+bool nxUserSelectionDialog::TransferDataFromWindow(void)
+{
+ return true;
+}
+
+bool nxUserSelectionDialog::TransferDataToWindow(void)
+{
+ wxListCtrl *wndListCtrl = XRCCTRL(*this, "wndListCtrl", wxListCtrl);
+
+ int width = wndListCtrl->GetClientSize().x;
+
+ wndListCtrl->InsertColumn(0, _T("Name"), wxLIST_FORMAT_LEFT, 150);
+ wndListCtrl->InsertColumn(1, _T("Full Name"), wxLIST_FORMAT_LEFT, width - 150 - wxSystemSettings::GetMetric(wxSYS_VSCROLL_X));
+
+ return true;
+}
+
+
+//
+// Dialog initialization handler
+//
+
+void nxUserSelectionDialog::OnInitDialog(wxInitDialogEvent &event)
+{
+ wxWindow *wnd;
+
+ wnd = FindWindowById(wxID_OK, this);
+ if (wnd != NULL)
+ {
+ ((wxButton *)wnd)->SetDefault();
+ }
+ else
+ {
+ wxLogDebug(_T("nxUserSelectionDialog::OnInitDialog(): cannot find child with id wxID_OK"));
+ }
+
+ event.Skip();
+}
+
+
+//
+// Handler for column click
+//
+
+void nxUserSelectionDialog::OnListColumnClick(wxListEvent &event)
+{
+
+}
+
+
+//
+// Handler for item activate (Enter or Double click)
+//
+
+void nxUserSelectionDialog::OnListItemActivate(wxListEvent &event)
+{
+
+}
\ No newline at end of file

Property changes on: trunk/src/client/console/libnxmc/userSelectionDialog.cpp
___________________________________________________________________
Added: svn:eol-style
   + native

Added: trunk/src/client/console/libnxmc/userSelectionDialog.h
===================================================================
--- trunk/src/client/console/libnxmc/userSelectionDialog.h (rev 0)
+++ trunk/src/client/console/libnxmc/userSelectionDialog.h 2008-06-30 00:24:49 UTC (rev 3354)
@@ -0,0 +1,47 @@
+/* $Id$ */
+/*
+** NetXMS - Network Management System
+** Portable management console
+** Copyright (C) 2008 Alex Kirhenshtein
+**
+** 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 2 of the License, or
+** (at your option) any later version.
+**
+** This program is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with this program; if not, write to the Free Software
+** Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+**
+**/
+
+#ifndef userSelectionDialog_h__
+#define userSelectionDialog_h__
+
+class LIBNXMC_EXPORTABLE nxUserSelectionDialog : public wxDialog
+{
+public:
+ nxUserSelectionDialog(wxWindow *parent);
+ virtual ~nxUserSelectionDialog();
+
+protected:
+ virtual bool TransferDataFromWindow(void);
+ virtual bool TransferDataToWindow(void);
+
+private:
+ int m_sortMode;
+ int m_sortDir;
+
+ void OnInitDialog(wxInitDialogEvent &event);
+ void OnListColumnClick(wxListEvent &event);
+ void OnListItemActivate(wxListEvent &event);
+
+ DECLARE_EVENT_TABLE()
+};
+
+#endif // userSelectionDialog_h__
\ No newline at end of file

Property changes on: trunk/src/client/console/libnxmc/userSelectionDialog.h
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/src/client/console/nxmc/rc/nxmc.fbp
===================================================================
--- trunk/src/client/console/nxmc/rc/nxmc.fbp 2008-06-29 12:21:00 UTC (rev 3353)
+++ trunk/src/client/console/nxmc/rc/nxmc.fbp 2008-06-30 00:24:49 UTC (rev 3354)
@@ -1341,7 +1341,7 @@
                 </object>
             </object>
         </object>
- <object class="Dialog" expanded="0">
+ <object class="Dialog" expanded="1">
             <property name="bg"></property>
             <property name="center">wxBOTH</property>
             <property name="context_help"></property>
@@ -1855,5 +1855,159 @@
                 </object>
             </object>
         </object>
+ <object class="Dialog" expanded="0">
+ <property name="bg"></property>
+ <property name="center"></property>
+ <property name="context_help"></property>
+ <property name="enabled">1</property>
+ <property name="extra_style"></property>
+ <property name="fg"></property>
+ <property name="font"></property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+ <property name="maximum_size"></property>
+ <property name="minimum_size"></property>
+ <property name="name">nxUserSelDlg</property>
+ <property name="pos"></property>
+ <property name="size">438,292</property>
+ <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
+ <property name="subclass"></property>
+ <property name="title">Select User</property>
+ <property name="tooltip"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnActivate"></event>
+ <event name="OnActivateApp"></event>
+ <event name="OnChar"></event>
+ <event name="OnClose"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnHibernate"></event>
+ <event name="OnIconize"></event>
+ <event name="OnIdle"></event>
+ <event name="OnInitDialog"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ <object class="wxBoxSizer" expanded="0">
+ <property name="minimum_size"></property>
+ <property name="name">bSizer8</property>
+ <property name="orient">wxVERTICAL</property>
+ <property name="permission">none</property>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALL|wxEXPAND</property>
+ <property name="proportion">1</property>
+ <object class="wxListCtrl" expanded="1">
+ <property name="bg"></property>
+ <property name="context_help"></property>
+ <property name="enabled">1</property>
+ <property name="fg"></property>
+ <property name="font"></property>
+ <property name="hidden">0</property>
+ <property name="id">wxID_ANY</property>
+ <property name="maximum_size"></property>
+ <property name="minimum_size"></property>
+ <property name="name">wndListCtrl</property>
+ <property name="permission">protected</property>
+ <property name="pos"></property>
+ <property name="size"></property>
+ <property name="style">wxLC_REPORT</property>
+ <property name="subclass"></property>
+ <property name="tooltip"></property>
+ <property name="window_extra_style"></property>
+ <property name="window_name"></property>
+ <property name="window_style"></property>
+ <event name="OnChar"></event>
+ <event name="OnEnterWindow"></event>
+ <event name="OnEraseBackground"></event>
+ <event name="OnKeyDown"></event>
+ <event name="OnKeyUp"></event>
+ <event name="OnKillFocus"></event>
+ <event name="OnLeaveWindow"></event>
+ <event name="OnLeftDClick"></event>
+ <event name="OnLeftDown"></event>
+ <event name="OnLeftUp"></event>
+ <event name="OnListBeginDrag"></event>
+ <event name="OnListBeginLabelEdit"></event>
+ <event name="OnListBeginRDrag"></event>
+ <event name="OnListCacheHint"></event>
+ <event name="OnListColBeginDrag"></event>
+ <event name="OnListColClick"></event>
+ <event name="OnListColDragging"></event>
+ <event name="OnListColEndDrag"></event>
+ <event name="OnListColRightClick"></event>
+ <event name="OnListDeleteAllItems"></event>
+ <event name="OnListDeleteItem"></event>
+ <event name="OnListEndLabelEdit"></event>
+ <event name="OnListInsertItem"></event>
+ <event name="OnListItemActivated"></event>
+ <event name="OnListItemDeselected"></event>
+ <event name="OnListItemFocused"></event>
+ <event name="OnListItemMiddleClick"></event>
+ <event name="OnListItemRightClick"></event>
+ <event name="OnListItemSelected"></event>
+ <event name="OnListKeyDown"></event>
+ <event name="OnMiddleDClick"></event>
+ <event name="OnMiddleDown"></event>
+ <event name="OnMiddleUp"></event>
+ <event name="OnMotion"></event>
+ <event name="OnMouseEvents"></event>
+ <event name="OnMouseWheel"></event>
+ <event name="OnPaint"></event>
+ <event name="OnRightDClick"></event>
+ <event name="OnRightDown"></event>
+ <event name="OnRightUp"></event>
+ <event name="OnSetFocus"></event>
+ <event name="OnSize"></event>
+ <event name="OnUpdateUI"></event>
+ </object>
+ </object>
+ <object class="sizeritem" expanded="1">
+ <property name="border">5</property>
+ <property name="flag">wxALIGN_RIGHT|wxBOTTOM</property>
+ <property name="proportion">0</property>
+ <object class="wxStdDialogButtonSizer" expanded="1">
+ <property name="Apply">0</property>
+ <property name="Cancel">1</property>
+ <property name="ContextHelp">0</property>
+ <property name="Help">0</property>
+ <property name="No">0</property>
+ <property name="OK">1</property>
+ <property name="Save">0</property>
+ <property name="Yes">0</property>
+ <property name="minimum_size"></property>
+ <property name="name">m_sdbSizer4</property>
+ <property name="permission">protected</property>
+ <event name="OnApplyButtonClick"></event>
+ <event name="OnCancelButtonClick"></event>
+ <event name="OnContextHelpButtonClick"></event>
+ <event name="OnHelpButtonClick"></event>
+ <event name="OnNoButtonClick"></event>
+ <event name="OnOKButtonClick"></event>
+ <event name="OnSaveButtonClick"></event>
+ <event name="OnYesButtonClick"></event>
+ </object>
+ </object>
+ </object>
+ </object>
     </object>
 </wxFormBuilder_Project>

Modified: trunk/src/client/console/nxmc/rc/wxfb_code.xrc
===================================================================
--- trunk/src/client/console/nxmc/rc/wxfb_code.xrc 2008-06-29 12:21:00 UTC (rev 3353)
+++ trunk/src/client/console/nxmc/rc/wxfb_code.xrc 2008-06-30 00:24:49 UTC (rev 3354)
@@ -424,13 +424,13 @@
                         </object>
                         <object class="sizeritem">
                                 <option>0</option>
- <flag>wxALIGN_RIGHT|wxALL</flag>
+ <flag>wxALIGN_RIGHT|wxBOTTOM|wxRIGHT</flag>
                                 <border>5</border>
                                 <object class="wxBoxSizer">
                                         <orient>wxHORIZONTAL</orient>
                                         <object class="sizeritem">
                                                 <option>0</option>
- <flag>wxTOP|wxBOTTOM|wxLEFT</flag>
+ <flag>wxALL</flag>
                                                 <border>5</border>
                                                 <object class="wxButton" name="btnNone">
                                                         <label>_None</label>
@@ -439,7 +439,7 @@
                                         </object>
                                         <object class="sizeritem">
                                                 <option>0</option>
- <flag>wxEXPAND|wxALL</flag>
+ <flag>wxEXPAND</flag>
                                                 <border>5</border>
                                                 <object class="wxStdDialogButtonSizer">
                                                         <object class="button">
@@ -528,4 +528,41 @@
                         </object>
                 </object>
         </object>
+ <object class="wxDialog" name="nxUserSelDlg">
+ <style>wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</style>
+ <size>438,292</size>
+ <title>Select User</title>
+ <object class="wxBoxSizer">
+ <orient>wxVERTICAL</orient>
+ <object class="sizeritem">
+ <option>1</option>
+ <flag>wxALL|wxEXPAND</flag>
+ <border>5</border>
+ <object class="wxListCtrl" name="wndListCtrl">
+ <style>wxLC_REPORT</style>
+ </object>
+ </object>
+ <object class="sizeritem">
+ <option>0</option>
+ <flag>wxALIGN_RIGHT|wxBOTTOM</flag>
+ <border>5</border>
+ <object class="wxStdDialogButtonSizer">
+ <object class="button">
+ <flag>wxALIGN_CENTER_HORIZONTAL|wxALL</flag>
+ <border>5</border>
+ <object class="wxButton" name="wxID_OK">
+ <label>&OK</label>
+ </object>
+ </object>
+ <object class="button">
+ <flag>wxALIGN_CENTER_HORIZONTAL|wxALL</flag>
+ <border>5</border>
+ <object class="wxButton" name="wxID_CANCEL">
+ <label>&Cancel</label>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
+ </object>
 </resource>
Received on Mon Jun 30 2008 - 03:24:50 EEST