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

Can now remove multiple samples at once from folders and other minor fixes.

This commit is contained in:
apoorv569 2021-06-03 07:56:17 +05:30
parent 46e6317335
commit 5d935b6ed4
3 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Database.cpp
View File

@ -119,7 +119,7 @@ void Database::InsertSamples(std::vector<Sample> samples)
type = sample.GetType(); type = sample.GetType();
path = sample.GetPath(); path = sample.GetPath();
std::string folder; std::string folder = "Favourites";
rc = sqlite3_bind_int(m_Stmt, 1, sample.GetFavorite()); rc = sqlite3_bind_int(m_Stmt, 1, sample.GetFavorite());
rc = sqlite3_bind_text(m_Stmt, 2, filename.c_str(), filename.size(), SQLITE_STATIC); rc = sqlite3_bind_text(m_Stmt, 2, filename.c_str(), filename.size(), SQLITE_STATIC);

82
src/MainFrame.cpp
View File

@ -117,8 +117,8 @@ MainFrame::MainFrame()
// Adding root to CollectionView // Adding root to CollectionView
// rootNode = m_CollectionView->AddRoot("ROOT"); // rootNode = m_CollectionView->AddRoot("ROOT");
root_node = m_CollectionView->AppendContainer(wxDataViewItem(wxNullPtr), "Default"); favorites_folder = m_CollectionView->AppendContainer(wxDataViewItem(wxNullPtr), "Favourites");
m_CollectionView->AppendItem(root_node, "sample.xyz"); m_CollectionView->AppendItem(favorites_folder, "sample.xyz");
// Addubg root to TrashedItems // Addubg root to TrashedItems
trash_root_node = m_TrashedItems->AddRoot("ROOT"); trash_root_node = m_TrashedItems->AddRoot("ROOT");
@ -559,7 +559,7 @@ void MainFrame::OnDragAndDropToCollectionView(wxDropFilesEvent& event)
int row = m_SampleListView->ItemToRow(items[i]); int row = m_SampleListView->ItemToRow(items[i]);
wxString name = m_SampleListView->GetTextValue(row, 1); wxString name = m_SampleListView->GetTextValue(row, 1);
file_data.AddFile(name); file_data.AddFile(name.BeforeLast('.'));
files = file_data.GetFilenames(); files = file_data.GetFilenames();
@ -570,10 +570,10 @@ void MainFrame::OnDragAndDropToCollectionView(wxDropFilesEvent& event)
{ {
m_SampleListView->SetToggleValue(true, row, 0); m_SampleListView->SetToggleValue(true, row, 0);
m_CollectionView->AppendItem(drop_target, files[i]); // m_CollectionView->AppendItem(drop_target, files[i]);
db.UpdateFavoriteColumn(name.ToStdString(), 1); // db.UpdateFavoriteColumn(name.ToStdString(), 1);
db.UpdateFavoriteFolder(name.ToStdString(), folder_name.ToStdString()); // db.UpdateFavoriteFolder(name.ToStdString(), folder_name.ToStdString());
} }
else else
wxLogDebug("%s is not a folder. Try dropping on folder.", wxLogDebug("%s is not a folder. Try dropping on folder.",
@ -1088,7 +1088,7 @@ void MainFrame::LoadDatabase()
{ {
wxVector<wxVector<wxVariant>> dataset; wxVector<wxVector<wxVariant>> dataset;
if (db.LoadDatabase(dataset, *m_CollectionView, root_node, if (db.LoadDatabase(dataset, *m_CollectionView, favorites_folder,
*m_TrashedItems, trash_root_node, *m_TrashedItems, trash_root_node,
settings.IsShowFileExtension()).empty()) settings.IsShowFileExtension()).empty())
{ {
@ -1199,14 +1199,14 @@ void MainFrame::OnCheckFavorite(wxDataViewEvent& event)
if(selected.IsOk() && m_CollectionView->IsContainer(selected)) if(selected.IsOk() && m_CollectionView->IsContainer(selected))
{ {
msg = "Not a folder."; folder = m_CollectionView->GetItemText(selected);
// folder = m_CollectionView->GetItemText(selected); m_CollectionView->AppendItem(selected, selection);
// m_CollectionView->AppendItem(selected, selection);
} }
else else
{ {
folder = m_CollectionView->GetItemText(wxDataViewItem(wxNullPtr)); // msg = "Not a folder.";
m_CollectionView->AppendItem(wxDataViewItem(wxNullPtr), selection); // folder = m_CollectionView->GetItemText(wxDataViewItem(wxNullPtr));
m_CollectionView->AppendItem(favorites_folder, selection);
} }
db.UpdateFavoriteColumn(selection.ToStdString(), 1); db.UpdateFavoriteColumn(selection.ToStdString(), 1);
@ -1226,19 +1226,19 @@ void MainFrame::OnCheckFavorite(wxDataViewEvent& event)
wxDataViewItem current_item = nodes.front(); wxDataViewItem current_item = nodes.front();
nodes.pop_front(); nodes.pop_front();
msg = wxString::Format("%s folder name is: %s", selection, folder_name); wxLogDebug("%s folder name is: %s", selection, folder_name);
if (m_CollectionView->GetItemText(current_item) == selection) if (m_CollectionView->GetItemText(current_item) == folder_name)
{ {
found_item = current_item; found_item = current_item;
msg = wxString::Format(m_CollectionView->GetItemText(found_item)); wxLogDebug("Found folder: %s", m_CollectionView->GetItemText(found_item));
break; // break;
} }
// wxTreeItemIdValue cookie; // wxTreeItemIdValue cookie;
// wxTreeItemId child = m_CollectionView->GetFirstChild(current_item, cookie); // wxTreeItemId child = m_CollectionView->GetFirstChild(current_item, cookie);
msg = wxString::Format("Current item: %s", m_CollectionView->GetItemText(current_item)); wxLogDebug("Current item: %s", m_CollectionView->GetItemText(current_item));
while(current_item.IsOk()) while(current_item.IsOk())
{ {
@ -1256,15 +1256,15 @@ void MainFrame::OnCheckFavorite(wxDataViewEvent& event)
break; break;
current_item = m_CollectionView->GetNthChild(wxDataViewItem(wxNullPtr), container_row); current_item = m_CollectionView->GetNthChild(wxDataViewItem(wxNullPtr), container_row);
msg = wxString::Format("Inside.. Current item: %s", m_CollectionView->GetItemText(current_item)); wxLogDebug("Inside.. Current item: %s", m_CollectionView->GetItemText(current_item));
continue; continue;
} }
child = m_CollectionView->GetNthChild(current_item, row); child = m_CollectionView->GetNthChild(current_item, row);
msg = wxString::Format("Child item: %s", m_CollectionView->GetItemText(child)); wxLogDebug("Child item: %s", m_CollectionView->GetItemText(child));
// child = m_CollectionView->GetNextChild(current_item, cookie); // child = m_CollectionView->GetNextChild(current_item, cookie);
if (m_CollectionView->GetItemText(current_item) == folder_name) if (m_CollectionView->GetItemText(child) == selection)
{ {
found_item = child; found_item = child;
wxLogDebug("Will delete %s", m_CollectionView->GetItemText(found_item)); wxLogDebug("Will delete %s", m_CollectionView->GetItemText(found_item));
@ -1281,37 +1281,35 @@ void MainFrame::OnCheckFavorite(wxDataViewEvent& event)
if (found_item.IsOk()) if (found_item.IsOk())
{ {
int child_count; // int child_count;
// m_CollectionView->DeleteItem(found_item); // m_CollectionView->DeleteItem(found_item);
// db.UpdateFavoriteColumn(selection.ToStdString(), 0); // db.UpdateFavoriteColumn(selection.ToStdString(), 0);
if(folder_name == "") // if(folder_name == "")
msg = "Folder not found."; // msg = "Folder not found.";
// m_CollectionView->DeleteItem(wxDataViewItem(wxNullPtr)); // m_CollectionView->DeleteItem(wxDataViewItem(wxNullPtr));
else // else
{ // {
msg = wxString::Format("Folder found: %s", folder_name); wxLogDebug("Folder: %s :: Child: %s", folder_name, m_CollectionView->GetItemText(found_item));
if(m_CollectionView->GetItemText(found_item) == selection) // if(m_CollectionView->GetItemText(found_item) == selection)
{ // {
child_count = m_CollectionView->GetChildCount(found_item); // child_count = m_CollectionView->GetChildCount(found_item);
m_CollectionView->DeleteItem(found_item);
}
}
// m_CollectionView->DeleteItem(found_item); // m_CollectionView->DeleteItem(found_item);
// }
// }
m_CollectionView->DeleteItem(found_item);
// wxLogDebug("Found %s folder name is: %s", selection, folder_name); // wxLogDebug("Found %s folder name is: %s", selection, folder_name);
// wxMessageBox("// TODO", "Delete sample", wxOK | wxCENTER, this, wxDefaultCoord, wxDefaultCoord); // wxMessageBox("// TODO", "Delete sample", wxOK | wxCENTER, this, wxDefaultCoord, wxDefaultCoord);
} }
else else
{ {
msg = wxString::Format("%s not added as favorite, cannot delete.", selection); wxLogDebug("%s not added as favorite, cannot delete.", selection);
// wxMessageDialog msgDialog(NULL, msg, "Info", wxOK | wxICON_INFORMATION); // wxMessageDialog msgDialog(NULL, msg, "Info", wxOK | wxICON_INFORMATION);
// msgDialog.ShowModal(); // msgDialog.ShowModal();
} }
} }
wxLogDebug(msg);
} }
void MainFrame::OnExpandTrash(wxCollapsiblePaneEvent& event) void MainFrame::OnExpandTrash(wxCollapsiblePaneEvent& event)
@ -1430,13 +1428,16 @@ void MainFrame::OnClickCollectionRemove(wxCommandEvent& event)
switch (deleteEmptyFolderDialog.ShowModal()) switch (deleteEmptyFolderDialog.ShowModal())
{ {
case wxID_YES: case wxID_YES:
if (selected.IsOk()) if (selected.IsOk() && m_CollectionView->IsContainer(selected) && folder_name != "Favourites")
{ {
m_CollectionView->DeleteItem(selected); m_CollectionView->DeleteItem(selected);
msg = wxString::Format("%s deleted from collections successfully.", folder_name); msg = wxString::Format("%s deleted from collections successfully.", folder_name);
} }
else else
msg = wxString::Format("Error! Cannot delete %s from collections.", folder_name); if(folder_name == "Favourites")
msg = wxString::Format("Error! Default folder %s cannot be deleted.", folder_name);
else
msg = wxString::Format("Error! %s is not a folder, cannot delete from collections.", folder_name);
break; break;
case wxID_NO: case wxID_NO:
break; break;
@ -1449,7 +1450,7 @@ void MainFrame::OnClickCollectionRemove(wxCommandEvent& event)
switch (deleteFilledFolderDialog.ShowModal()) switch (deleteFilledFolderDialog.ShowModal())
{ {
case wxID_YES: case wxID_YES:
if (selected.IsOk()) if (selected.IsOk() && m_CollectionView->IsContainer(selected) && folder_name != "Favourites")
{ {
m_CollectionView->DeleteChildren(selected); m_CollectionView->DeleteChildren(selected);
m_CollectionView->DeleteItem(selected); m_CollectionView->DeleteItem(selected);
@ -1457,7 +1458,10 @@ void MainFrame::OnClickCollectionRemove(wxCommandEvent& event)
folder_name, folder_name); folder_name, folder_name);
} }
else else
msg = wxString::Format("Error! Cannot delete %s from collections.", folder_name); if(folder_name == "Favourites")
msg = wxString::Format("Error! Default folder %s cannot be deleted.", folder_name);
else
msg = wxString::Format("Error! %s is not a folder, cannot delete from collections.", folder_name);
break; break;
case wxID_NO: case wxID_NO:
break; break;

2
src/MainFrame.hpp
View File

@ -94,7 +94,7 @@ class MainFrame : public wxFrame
wxSizerItem *m_CollectionViewTrashSizerItem; wxSizerItem *m_CollectionViewTrashSizerItem;
wxDirCtrl* m_DirCtrl; wxDirCtrl* m_DirCtrl;
wxDataViewTreeCtrl* m_CollectionView; wxDataViewTreeCtrl* m_CollectionView;
wxDataViewItem root_node; wxDataViewItem favorites_folder;
wxTreeItemId trash_root_node; wxTreeItemId trash_root_node;
wxCollapsiblePane* m_TrashPane; wxCollapsiblePane* m_TrashPane;
wxTreeCtrl* m_TrashedItems; wxTreeCtrl* m_TrashedItems;