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

Merge branch 'testing' into 'testing' 

Replace wxBusyInfo with wxProgressDialog

See merge request apoorv569/sample-hive!2
This commit is contained in:
Apoorv 2021-04-27 01:40:18 +00:00
parent 265febe09a 966daa1c32
commit 46c966bec2
3 changed files with 37 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/Browser.cpp
View File

@ -409,20 +409,18 @@ void Browser::OnDragAndDropToSampleListView(wxDropFilesEvent& event)
{ {
wxString* dropped = event.GetFiles(); wxString* dropped = event.GetFiles();
wxASSERT(dropped); wxASSERT(dropped);
wxBusyCursor busy_cursor; wxBusyCursor busy_cursor;
wxWindowDisabler window_disabler; wxWindowDisabler window_disabler;
wxBusyInfo busy_info("Adding files, please wait...", this);
wxString name; wxString name;
wxArrayString files; wxArrayString files;
wxProgressDialog* progressDialog = new wxProgressDialog("Adding files..", "Adding files, please wait...",
// wxProgressDialog* progressDialog = new wxProgressDialog("Adding files..", "Adding files, please wait...", event.GetNumberOfFiles(), this,
// event.GetNumberOfFiles(), this, wxPD_APP_MODAL | wxPD_SMOOTH | wxPD_CAN_ABORT |
// wxPD_APP_MODAL | wxPD_SMOOTH | wxPD_CAN_ABORT | wxPD_AUTO_HIDE);
// wxPD_CAN_SKIP); progressDialog->CenterOnParent(wxBOTH);
// progressDialog->CenterOnParent(wxBOTH);
for (int i = 0; i < event.GetNumberOfFiles(); i++) for (int i = 0; i < event.GetNumberOfFiles(); i++)
{ {
name = dropped[i]; name = dropped[i];
@ -434,29 +432,40 @@ void Browser::OnDragAndDropToSampleListView(wxDropFilesEvent& event)
{ {
wxDir::GetAllFiles(name, &files); wxDir::GetAllFiles(name, &files);
} }
progressDialog->Pulse("Reading Samples",NULL);
} }
progressDialog->SetRange(files.size());
for (size_t i = 0; i < files.size(); i++) for (size_t i = 0; i < files.size(); i++)
{ {
Browser::AddSamples(files[i]); Browser::AddSamples(files[i]);
progressDialog->Update(i, wxString::Format("Adding %s", files[i].AfterLast('/')));
if(progressDialog->WasCancelled())
break;
} }
progressDialog->Destroy();
} }
} }
void Browser::OnAutoImportDir() void Browser::OnAutoImportDir()
{ {
Settings settings(m_ConfigFilepath, m_DatabaseFilepath); Settings settings(this,m_ConfigFilepath, m_DatabaseFilepath);
wxBusyCursor busy_cursor; wxBusyCursor busy_cursor;
wxWindowDisabler window_disabler; wxWindowDisabler window_disabler;
wxBusyInfo busy_info("Adding files, please wait...", this);
wxString dir = settings.GetImportDirPath(); wxString dir = settings.GetImportDirPath();
wxString name; wxString name;
wxArrayString files; wxArrayString files;
size_t number_of_files = wxDir::GetAllFiles(dir, &files, wxEmptyString, wxDIR_DEFAULT); size_t number_of_files = wxDir::GetAllFiles(dir, &files, wxEmptyString, wxDIR_DEFAULT);
wxProgressDialog* progressDialog = new wxProgressDialog("Adding files..", "Adding files, please wait...",
(int)number_of_files, this,
wxPD_APP_MODAL | wxPD_SMOOTH | wxPD_CAN_ABORT |
wxPD_AUTO_HIDE);
progressDialog->CenterOnParent(wxBOTH);
for ( size_t i = 0; i < number_of_files; i++) for ( size_t i = 0; i < number_of_files; i++)
{ {
name = files[i]; name = files[i];
@ -468,12 +477,20 @@ void Browser::OnAutoImportDir()
{ {
wxDir::GetAllFiles(name, &files); wxDir::GetAllFiles(name, &files);
} }
progressDialog->Pulse("Reading Samples",NULL);
} }
progressDialog->SetRange(files.size());
for (size_t i = 0; i < files.size(); i++) for (size_t i = 0; i < files.size(); i++)
{ {
Browser::AddSamples(files[i]); Browser::AddSamples(files[i]);
progressDialog->Update(i, wxString::Format("Adding %s", files[i].AfterLast('/')));
if(progressDialog->WasCancelled())
break;
} }
progressDialog->Destroy();
} }
void LogDragResult(wxDragResult result) void LogDragResult(wxDragResult result)

1
src/Browser.hpp
View File

@ -15,6 +15,7 @@
#include <wx/mediactrl.h> #include <wx/mediactrl.h>
#include <wx/notebook.h> #include <wx/notebook.h>
#include <wx/panel.h> #include <wx/panel.h>
#include <wx/progdlg.h>
#include <wx/setup.h> #include <wx/setup.h>
#include <wx/srchctrl.h> #include <wx/srchctrl.h>
#include <wx/sizer.h> #include <wx/sizer.h>

6
src/Database.cpp
View File

@ -111,9 +111,9 @@ void Database::InsertSample(int favorite, std::string filename,
rc = sqlite3_bind_int(m_Stmt, 9, bitrate); rc = sqlite3_bind_int(m_Stmt, 9, bitrate);
rc = sqlite3_bind_text(m_Stmt, 10, path.c_str(), path.size(), SQLITE_STATIC); rc = sqlite3_bind_text(m_Stmt, 10, path.c_str(), path.size(), SQLITE_STATIC);
rc = sqlite3_bind_int(m_Stmt, 11, trashed); rc = sqlite3_bind_int(m_Stmt, 11, trashed);
rc = sqlite3_step(m_Stmt); rc = sqlite3_step(m_Stmt);
if (rc != SQLITE_DONE) if (rc != SQLITE_DONE)
{ {
wxLogDebug("No data inserted. Error code: %d: Msg: %s", rc , sqlite3_errmsg(m_Database)); wxLogDebug("No data inserted. Error code: %d: Msg: %s", rc , sqlite3_errmsg(m_Database));