fixing #1910
This commit is contained in:
parent
ea1982a2ea
commit
5ad021fde3
campcaster/src/products/gLiveSupport/src
|
@ -81,7 +81,7 @@ BrowseItem :: BrowseItem(
|
||||||
treeModel = Gtk::ListStore::create(modelColumns);
|
treeModel = Gtk::ListStore::create(modelColumns);
|
||||||
|
|
||||||
metadataValues = Gtk::manage(wf->createTreeView(treeModel));
|
metadataValues = Gtk::manage(wf->createTreeView(treeModel));
|
||||||
metadataValues->appendColumn("", modelColumns.column, 200);
|
metadataValues->appendColumn("", modelColumns.displayedColumn, 200);
|
||||||
metadataValues->set_size_request(230, 150);
|
metadataValues->set_size_request(230, 150);
|
||||||
metadataValues->set_headers_visible(false);
|
metadataValues->set_headers_visible(false);
|
||||||
metadataValues->signal_cursor_changed().connect(sigc::mem_fun(*this,
|
metadataValues->signal_cursor_changed().connect(sigc::mem_fun(*this,
|
||||||
|
@ -120,7 +120,7 @@ BrowseItem :: getSearchCriteria(void) throw (std::invalid_argument)
|
||||||
Gtk::TreeModel::iterator iter = refSelection->get_selected();
|
Gtk::TreeModel::iterator iter = refSelection->get_selected();
|
||||||
if (iter) {
|
if (iter) {
|
||||||
found = true;
|
found = true;
|
||||||
metadataValue = (*iter)[modelColumns.column];
|
metadataValue = (*iter)[modelColumns.originalColumn];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -162,13 +162,15 @@ BrowseItem :: onShow(void) throw ()
|
||||||
|
|
||||||
treeModel->clear();
|
treeModel->clear();
|
||||||
Gtk::TreeModel::Row row = *treeModel->append();
|
Gtk::TreeModel::Row row = *treeModel->append();
|
||||||
row[modelColumns.column] = allString;
|
row[modelColumns.originalColumn] = allString;
|
||||||
|
row[modelColumns.displayedColumn] = allString;
|
||||||
metadataValues->get_selection()->select(*row);
|
metadataValues->get_selection()->select(*row);
|
||||||
|
|
||||||
std::vector<Glib::ustring>::const_iterator valuesIt;
|
std::vector<Glib::ustring>::const_iterator valuesIt;
|
||||||
for (valuesIt = values->begin(); valuesIt != values->end(); ++valuesIt) {
|
for (valuesIt = values->begin(); valuesIt != values->end(); ++valuesIt) {
|
||||||
row = *treeModel->append();
|
row = *treeModel->append();
|
||||||
row[modelColumns.column] = Glib::Markup::escape_text(
|
row[modelColumns.originalColumn] = *valuesIt;
|
||||||
|
row[modelColumns.displayedColumn] = Glib::Markup::escape_text(
|
||||||
*valuesIt);
|
*valuesIt);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -114,17 +114,23 @@ class BrowseItem : public Gtk::VBox,
|
||||||
class ModelColumns : public ZebraTreeModelColumnRecord
|
class ModelColumns : public ZebraTreeModelColumnRecord
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
/**
|
||||||
|
* The original (unescaped) value of metadata.
|
||||||
|
*/
|
||||||
|
Gtk::TreeModelColumn<Glib::ustring> originalColumn;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The single displayed column.
|
* The single displayed column.
|
||||||
*/
|
*/
|
||||||
Gtk::TreeModelColumn<Glib::ustring> column;
|
Gtk::TreeModelColumn<Glib::ustring> displayedColumn;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor.
|
* Constructor.
|
||||||
*/
|
*/
|
||||||
ModelColumns(void) throw ()
|
ModelColumns(void) throw ()
|
||||||
{
|
{
|
||||||
add(column);
|
add(originalColumn);
|
||||||
|
add(displayedColumn);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue