From c0876388b8de5cfc8062506b5fe6684ece66c1ec Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Wed, 26 Oct 2011 01:05:22 +0000
Subject: [PATCH] Add a default ARS of "ACTIVE) NOT DELETED)" (Grunged for
pending bugfix)
---
src/sbbs3/userlist/SBBS_User_ListMain.cpp | 34 +++++++++++--------
src/sbbs3/userlist/SBBS_User_ListMain.h | 1 +
.../userlist/wxsmith/SBBS_User_Listframe.wxs | 1 +
3 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/src/sbbs3/userlist/SBBS_User_ListMain.cpp b/src/sbbs3/userlist/SBBS_User_ListMain.cpp
index eada0c4e65..f28632c6f2 100644
--- a/src/sbbs3/userlist/SBBS_User_ListMain.cpp
+++ b/src/sbbs3/userlist/SBBS_User_ListMain.cpp
@@ -179,6 +179,22 @@ void SBBS_User_ListFrame::fillUserList(void)
UserList->Thaw();
}
+void SBBS_User_ListFrame::applyARS(void)
+{
+ static uchar *last_ars=NULL;
+ static ushort last_ars_count=0;
+ ushort count;
+
+ ars=arstr(&count, ARSFilter->GetValue().mb_str(wxConvUTF8), &App->cfg);
+ if(count != last_ars_count || memcmp(last_ars, ars, count)) {
+ if(last_ars != nular)
+ FREE_AND_NULL(last_ars);
+ last_ars=ars;
+ last_ars_count=count;
+ fillUserList();
+ }
+}
+
SBBS_User_ListFrame::SBBS_User_ListFrame(wxWindow* parent,wxWindowID id)
{
//(*Initialize(SBBS_User_ListFrame)
@@ -199,7 +215,7 @@ SBBS_User_ListFrame::SBBS_User_ListFrame(wxWindow* parent,wxWindowID id)
BoxSizer2 = new wxBoxSizer(wxHORIZONTAL);
StaticText1 = new wxStaticText(Panel1, ID_STATICTEXT1, _("ARS Filter"), wxDefaultPosition, wxDefaultSize, 0, _T("ID_STATICTEXT1"));
BoxSizer2->Add(StaticText1, 0, wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5);
- ARSFilter = new wxTextCtrl(Panel1, ID_ARSTEXTCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_ARSTEXTCTRL"));
+ ARSFilter = new wxTextCtrl(Panel1, ID_ARSTEXTCTRL, _("ACTIVE) NOT DELETED)"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_ARSTEXTCTRL"));
ARSFilter->SetToolTip(_("Enter an ARS string to filter users with"));
BoxSizer2->Add(ARSFilter, 1, wxALL|wxALIGN_LEFT|wxALIGN_TOP, 5);
ClearButton = new wxButton(Panel1, ID_CLEARBUTTON, _("Clear"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator, _T("ID_CLEARBUTTON"));
@@ -287,7 +303,7 @@ SBBS_User_ListFrame::SBBS_User_ListFrame(wxWindow* parent,wxWindowID id)
UserList->InsertColumn(12, wxString(_("Logons")));
UserList->InsertColumn(13, wxString(_("First On")));
UserList->InsertColumn(14, wxString(_("Last On")));
- fillUserList();
+ applyARS();
UserList->SetColumnWidth(0, wxLIST_AUTOSIZE);
UserList->SetColumnWidth(1, wxLIST_AUTOSIZE);
UserList->SetColumnWidth(2, wxLIST_AUTOSIZE);
@@ -346,21 +362,9 @@ void SBBS_User_ListFrame::OnRefreshButtonClick(wxCommandEvent& event)
void SBBS_User_ListFrame::OnARSFilterText(wxCommandEvent& event)
{
- static uchar *last_ars=NULL;
- static ushort last_ars_count=0;
- ushort count;
-
if(!ARSFilter->IsModified())
return;
-
- ars=arstr(&count, ARSFilter->GetValue().mb_str(wxConvUTF8), &App->cfg);
- if(count != last_ars_count || memcmp(last_ars, ars, count)) {
- if(last_ars != nular)
- FREE_AND_NULL(last_ars);
- last_ars=ars;
- last_ars_count=count;
- fillUserList();
- }
+ applyARS();
}
void SBBS_User_ListFrame::OnClearButtonClick(wxCommandEvent& event)
diff --git a/src/sbbs3/userlist/SBBS_User_ListMain.h b/src/sbbs3/userlist/SBBS_User_ListMain.h
index 735444c6bd..86832822fb 100644
--- a/src/sbbs3/userlist/SBBS_User_ListMain.h
+++ b/src/sbbs3/userlist/SBBS_User_ListMain.h
@@ -36,6 +36,7 @@ class SBBS_User_ListFrame: public wxFrame
void fillUserList(void);
void CopyItems(int state);
+ void applyARS(void);
int sort;
//(*Handlers(SBBS_User_ListFrame)
diff --git a/src/sbbs3/userlist/wxsmith/SBBS_User_Listframe.wxs b/src/sbbs3/userlist/wxsmith/SBBS_User_Listframe.wxs
index a9dc17e3da..981d913a63 100644
--- a/src/sbbs3/userlist/wxsmith/SBBS_User_Listframe.wxs
+++ b/src/sbbs3/userlist/wxsmith/SBBS_User_Listframe.wxs
@@ -15,6 +15,7 @@
</object>
<object class="sizeritem">
<object class="wxTextCtrl" name="ID_ARSTEXTCTRL" variable="ARSFilter" member="yes">
+ <value>ACTIVE) NOT DELETED)</value>
<tooltip>Enter an ARS string to filter users with</tooltip>
<handler function="OnARSFilterText" entry="EVT_TEXT" />
</object>
--
GitLab