Added classes to manage simple tabular data of known structure using a
popup containing a wxGrid object.
BasePicker : Abstract class adding a popup to wxPickerBase styled with
a wxTextCtrl.
BaseGridPicker : Abstract class adding a wxGrid in the popup.
JsonGridPickerCtrl : UI control storing the tabular data in a JSON
array.
LBoundJsonGridPicker : connect JsonGridPicker to database.
LGridJsonCellEditor : use LBoundJsonGridPicker in other wxGrid objects.
LGridJsonCellRenderer : render cell JSON data.
XmlGridPickerCtrl : UI control storing the tabular data in as XML
document.
LBoundXmlGridPicker : connect XmlGridPicker to database.
LGridXmlCellEditor : grid editor for LBoundXmlGridPicker.
LGridXmlCellRenderer : grid renderer for LBoundXmlGridPicker.
JsonHelper and XmlHelper : for applications to quickly get intent value
from database data..
The structure of managed tabular data :
Column 1 : Intent - this is what we want to store/edit. This can be
telephone numbers, email addresses, instant messaging addresses...
any single line piece of information that can exist many times for one
entity (person, company...).
Column 2 : Type - A short description of the intent : 'Home, Work,
Mobile, Fax, Other...'. It is displayed in a non editable wxComboBox.
Column 3 : Preferred - One line of data can be selected as the preferred
one. It is not mandatory, but it must be a single choice.
Column 4 : Notes - single line notes.
Adjust sql scripts and L7.dox.
Applied ANSI formatting style to all files.
Other changes :
Work around a nasty misbehavior.
Grid columns edited by a translated combobox expect full string
data as cell values. LResultSet::BEData() will report these mapped strings,
instead of database real data. LBoundComboBox::IsDirty() will always be
true even if the editor is unchanged once created.
Simplest workaround : disconnect m_BoundComboBox if unchanged.
LGridTextEditor::ProvideFormEditor() : set the form editor's value
explicitely.; wxTextCtrl does not interpret data it receives
LBoundControl::SetNull must be void.
LBoundGrid : Unbind:: instructions should limit to the widget's id, like Bind::
LConnection::GetReturnedKeys should return NULL.
LConnection::SetData should return void.
Notes : wxJSON must be configured with the same prefix as wxWidgets,
here /usr/local/{wxWidgets,wxWidgets-Release}.
This commit is contained in:
@@ -163,17 +163,17 @@ void LBoundComboBox::Clear()
|
||||
SetWindowStyleFlag(wsflags);
|
||||
}
|
||||
|
||||
bool LBoundComboBox::SetData(const wxAny& data)
|
||||
void LBoundComboBox::SetData(const wxAny& data)
|
||||
{
|
||||
const wxString sData = data.As<wxString>();
|
||||
if (IsTranslated())
|
||||
{
|
||||
if (data.IsNull()
|
||||
|| sData.IsEmpty()
|
||||
|| sData == L_SQLNULL)
|
||||
|| sData.IsEmpty()
|
||||
|| sData == L_SQLNULL)
|
||||
{
|
||||
SetNull();
|
||||
return (GetSelection() != wxNOT_FOUND); // ?
|
||||
return;
|
||||
}
|
||||
for (unsigned int i = 0; i < GetCount(); i++)
|
||||
{
|
||||
@@ -183,18 +183,16 @@ bool LBoundComboBox::SetData(const wxAny& data)
|
||||
if (x->GetData().As<wxString>() == sData)
|
||||
{
|
||||
SetSelection(i);
|
||||
return true;
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
bool hasData = FindString(sData, true);
|
||||
//bool hasData = FindString(sData, true);
|
||||
SetValue(sData);
|
||||
return hasData;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
const wxAny LBoundComboBox::GetData()
|
||||
@@ -245,7 +243,7 @@ bool LBoundComboBox::IsNull()
|
||||
}
|
||||
}
|
||||
|
||||
bool LBoundComboBox::SetNull()
|
||||
void LBoundComboBox::SetNull()
|
||||
{
|
||||
if (IsTranslated())
|
||||
{
|
||||
@@ -255,17 +253,16 @@ bool LBoundComboBox::SetNull()
|
||||
if (x == NULL)
|
||||
{
|
||||
SetSelection(i);
|
||||
return true;
|
||||
return;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
return;
|
||||
}
|
||||
long wsflags = GetWindowStyleFlag();
|
||||
SetWindowStyleFlag(0);
|
||||
SetSelection(wxNOT_FOUND);
|
||||
SetValue(wxEmptyString);
|
||||
SetWindowStyleFlag(wsflags);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool LBoundComboBox::IsDirty()
|
||||
|
||||
Reference in New Issue
Block a user