Superminaren
/
sample-hive
mirror of https://gitlab.com/samplehive/sample-hive.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Favorites Add/Remove Via Icon

This commit is contained in:
Mill J 2021-06-10 03:03:09 +00:00 committed by Apoorv
parent 08aa1df2ca
commit f0f9b8d336
1 changed files with 56 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

247
src/MainFrame.cpp
View File

@ -1504,233 +1504,80 @@ void MainFrame::OnCheckFavorite(wxDataViewEvent& event)
{ {
Database db(*m_InfoBar); Database db(*m_InfoBar);
Serializer serialize(m_ConfigFilepath); Serializer serialize(m_ConfigFilepath);
Settings settings(this,m_ConfigFilepath, m_DatabaseFilepath);
//Get Column
wxDataViewColumn* column = m_SampleListView->GetCurrentColumn(); wxDataViewColumn* column = m_SampleListView->GetCurrentColumn();
if(!column) if(!column) return;
{ else if (column->GetTitle() != "Favorite") return;
wxLogDebug("Column not found");
return;
}
wxLogDebug("Current column: %s", column->GetTitle()); wxLogDebug("Clicked On Favorite Column!");
//Get Filename
int selected_row = m_SampleListView->ItemToRow(event.GetItem()); int selected_row = m_SampleListView->ItemToRow(event.GetItem());
int row = 0, container_row = 0;
wxString msg;
if (selected_row < 0) return; if (selected_row < 0) return;
wxString selection = m_SampleListView->GetTextValue(selected_row, 1).BeforeLast('.'); wxString selection;
// wxString selection = m_SampleListView->GetTextValue(selected_row, 1); if(settings.IsShowFileExtension())
selection = m_SampleListView->GetTextValue(selected_row, 1).BeforeLast('.');
else
selection = m_SampleListView->GetTextValue(selected_row, 1);
// std::deque<wxTreeItemId> nodes; //Get Folder Name and location
std::deque<wxDataViewItem> nodes; std::string folder_name = "Favourites";
// nodes.push_back(m_CollectionView->GetRootItem()); wxDataViewItem folder_selection = m_CollectionView->GetSelection();
nodes.push_back(m_CollectionView->GetNthChild(wxDataViewItem(wxNullPtr), container_row)); if(folder_selection.IsOk() && m_CollectionView->IsContainer(folder_selection))
folder_name = m_CollectionView->GetItemText(folder_selection).ToStdString();
// wxTreeItemId found_item; //Get Root
wxDataViewItem found_item; wxDataViewItem root = wxDataViewItem(wxNullPtr);
wxDataViewItem itm;
wxDataViewItem itm2;
if(column->GetTitle() == "Favorite" && db.GetFavoriteColumnValueByFilename(selection.ToStdString()) == 0) if(db.GetFavoriteColumnValueByFilename(selection.ToStdString()) == 0)
{ {
wxLogDebug("Column matches.. looking!"); m_SampleListView->SetValue(wxVariant(wxDataViewIconText(wxEmptyString, wxIcon(ICON_COLOURED))),
while(!nodes.empty()) selected_row, 0);
{
// wxTreeItemId current_item = nodes.front();
wxDataViewItem current_item = nodes.front();
nodes.pop_front();
if (m_CollectionView->GetItemText(current_item) == selection) db.UpdateFavoriteColumn(selection.ToStdString(), 1);
db.UpdateFavoriteFolder(selection.ToStdString(), folder_name);
for(int i = 0; i < m_CollectionView->GetChildCount(root); i++)
{
itm = m_CollectionView->GetNthChild(root,i);
if(m_CollectionView->GetItemText(itm).ToStdString() == folder_name)
{ {
found_item = current_item; m_CollectionView->AppendItem(itm,selection,-1,NULL);
wxLogDebug(m_CollectionView->GetItemText(current_item));
break; break;
} }
// wxTreeItemIdValue cookie;
// wxTreeItemId child = m_CollectionView->GetFirstChild(current_item, cookie);
wxLogDebug("Current item: %s", m_CollectionView->GetItemText(current_item));
while(current_item.IsOk())
{
wxDataViewItem child;
int child_count = m_CollectionView->GetChildCount(current_item);
int container_count = m_CollectionView->GetChildCount(wxDataViewItem(wxNullPtr));
if(row >= child_count)
{
container_row++;
row = 0;
if(container_row >= container_count)
break;
current_item = m_CollectionView->GetNthChild(wxDataViewItem(wxNullPtr), container_row);
wxLogDebug("Inside.. Current item: %s", m_CollectionView->GetItemText(current_item));
continue;
}
child = m_CollectionView->GetNthChild(current_item, row);
wxLogDebug("Child item: %s", m_CollectionView->GetItemText(child));
nodes.push_back(child);
// child = m_CollectionView->GetNextChild(current_item, cookie);
row++;
}
} }
wxLogDebug("Adding %s to %s", selection, folder_name);
nodes.clear(); }
else
if (found_item.IsOk()) {
{ m_SampleListView->SetValue(wxVariant(wxDataViewIconText(wxEmptyString, wxIcon(ICON_GREYSCALE))),
wxString msg = wxString::Format("%s already added as favorite.", selection);
wxMessageDialog msgDialog(NULL, msg, "Info", wxOK | wxICON_INFORMATION);
msgDialog.ShowModal();
}
else
{
wxLogDebug("Sample not found adding as fav.");
// wxTreeItemId selected = m_CollectionView->GetSelection();
wxDataViewItem selected = m_CollectionView->GetSelection();
wxString folder;
// wxDataViewItem selected = event.GetItem();
if(selected.IsOk() && m_CollectionView->IsContainer(selected))
{
folder = m_CollectionView->GetItemText(selected);
m_CollectionView->AppendItem(selected, selection);
// db.UpdateFavoriteColumn(selection.ToStdString(), 1);
// db.UpdateFavoriteFolder(selection.ToStdString(), folder.ToStdString());
}
else
{
folder = m_CollectionView->GetItemText(favorites_folder);
m_CollectionView->AppendItem(favorites_folder, selection);
// db.UpdateFavoriteColumn(selection.ToStdString(), 1);
// db.UpdateFavoriteFolder(selection.ToStdString(), folder.ToStdString());
}
// column->SetBitmap(wxBitmap(ICON_GREYSCALE));
// icon << wxDataViewIconText(wxEmptyString, wxIcon(ICON_GREYSCALE));
m_SampleListView->SetValue(wxVariant(wxDataViewIconText(wxEmptyString, wxIcon(ICON_COLOURED))),
selected_row, 0); selected_row, 0);
db.UpdateFavoriteColumn(selection.ToStdString(), 1); db.UpdateFavoriteColumn(selection.ToStdString(), 0);
db.UpdateFavoriteFolder(selection.ToStdString(), folder.ToStdString()); db.UpdateFavoriteFolder(selection.ToStdString(), "");
wxLogDebug("Adding %s to folder: %s", selection, folder); for(int i = 0; i < m_CollectionView->GetChildCount(root); i++)
// serialize.SerializeDataViewTreeCtrlItems(*m_CollectionView, rootNode);
}
}
else if(column->GetTitle() == "Favorite" && db.GetFavoriteColumnValueByFilename(selection.ToStdString()) == 1)
{
wxString folder_name = db.GetFavoriteFolderByFilename(selection.ToStdString());
while(!nodes.empty())
{ {
// wxTreeItemId current_item = nodes.front(); itm = m_CollectionView->GetNthChild(root,i);
wxDataViewItem current_item = nodes.front(); for(int j = 0; j < m_CollectionView->GetChildCount(itm); j++)
nodes.pop_front();
wxLogDebug("%s folder name is: %s", selection, folder_name);
if (m_CollectionView->GetItemText(current_item) == folder_name)
{ {
found_item = current_item; itm2 = m_CollectionView->GetNthChild(itm,j);
wxLogDebug("Found folder: %s", m_CollectionView->GetItemText(found_item)); if(m_CollectionView->GetItemText(itm2) == selection)
// break;
}
// wxTreeItemIdValue cookie;
// wxTreeItemId child = m_CollectionView->GetFirstChild(current_item, cookie);
wxLogDebug("Current item: %s", m_CollectionView->GetItemText(current_item));
while(current_item.IsOk())
{
wxDataViewItem child;
int child_count = m_CollectionView->GetChildCount(current_item);
int container_count = m_CollectionView->GetChildCount(wxDataViewItem(wxNullPtr));
if(row >= child_count)
{ {
container_row++; m_CollectionView->DeleteItem(itm2);
row = 0;
if(container_row >= container_count)
break;
current_item = m_CollectionView->GetNthChild(wxDataViewItem(wxNullPtr), container_row);
wxLogDebug("Inside.. Current item: %s", m_CollectionView->GetItemText(current_item));
continue;
}
child = m_CollectionView->GetNthChild(current_item, row);
wxLogDebug("Child item: %s", m_CollectionView->GetItemText(child));
// child = m_CollectionView->GetNextChild(current_item, cookie);
if (m_CollectionView->GetItemText(child) == selection)
{
found_item = child;
wxLogDebug("Will delete %s", m_CollectionView->GetItemText(found_item));
break; break;
} }
nodes.push_back(child);
row++;
} }
} }
wxLogDebug("Removing %s from %s", selection, folder_name);
nodes.clear();
if (found_item.IsOk())
{
// int child_count;
// m_CollectionView->DeleteItem(found_item);
// db.UpdateFavoriteColumn(selection.ToStdString(), 0);
// if(folder_name == "")
// msg = "Folder not found.";
// m_CollectionView->DeleteItem(wxDataViewItem(wxNullPtr));
// else
// {
wxLogDebug("Folder: %s :: Child: %s", folder_name, m_CollectionView->GetItemText(found_item));
// if(m_CollectionView->GetItemText(found_item) == selection)
// {
// child_count = m_CollectionView->GetChildCount(found_item);
// m_CollectionView->DeleteItem(found_item);
// }
// }
m_CollectionView->DeleteItem(found_item);
m_SampleListView->SetValue(wxVariant(wxDataViewIconText(wxEmptyString, wxIcon(ICON_GREYSCALE))),
selected_row, 0);
db.UpdateFavoriteColumn(selection.ToStdString(), 0);
db.UpdateFavoriteFolder(selection.ToStdString(), m_CollectionView->GetItemText(favorites_folder).ToStdString());
// wxLogDebug("Found %s folder name is: %s", selection, folder_name);
// wxMessageBox("// TODO", "Delete sample", wxOK | wxCENTER, this, wxDefaultCoord, wxDefaultCoord);
}
else
{
wxLogDebug("%s not added as favorite, cannot delete.", selection);
// wxMessageDialog msgDialog(NULL, msg, "Info", wxOK | wxICON_INFORMATION);
// msgDialog.ShowModal();
}
} }
} }
@ -1905,6 +1752,8 @@ void MainFrame::OnClickCollectionRemove(wxCommandEvent& event)
void MainFrame::OnClickCollectionView(wxDataViewEvent &event) void MainFrame::OnClickCollectionView(wxDataViewEvent &event)
{ {
return;
Database db(*m_InfoBar); Database db(*m_InfoBar);
// wxDataViewItem selected = m_CollectionView->GetSelection(); // wxDataViewItem selected = m_CollectionView->GetSelection();