gui updates: load multiple libraries in library widge

confirmation dialog when deleting all peaks from tablewidget
eugenemel · Apr 27, 2018 · 6bd62d8 · 6bd62d8
1 parent 2df87e4
commit 6bd62d8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/maven/librarydialog.cpp b/src/maven/librarydialog.cpp
@@ -81,7 +81,9 @@ void LibraryMangerDialog::loadCompoundsFile() {
             "All Known Formats(*.csv *.tab *.txt *.msp *.sptxt *.pepXML);;Tab Delimited(*.tab);;CSV File(*.csv);;NIST Library(*.msp);;SpectraST(*.sptxt) pepXML(*.pepXML)");
 
     if ( filelist.size() == 0 || filelist[0].isEmpty() ) return;
-    loadCompoundsFile(filelist[0]);
+    for( QString filename: filelist) {
+        loadCompoundsFile(filename);
+    }
 }
 
 void LibraryMangerDialog::reloadMethodsFolder() {

diff --git a/src/maven/tabledockwidget.cpp b/src/maven/tabledockwidget.cpp
@@ -131,7 +131,7 @@ TableDockWidget::TableDockWidget(MainWindow* mw, QString title, int numColms) {
     QToolButton *btnX = new QToolButton(toolBar);
     btnX->setIcon(style()->standardIcon(QStyle::SP_DialogCloseButton));
     //btnX->setIcon(QIcon(rsrcPath + "/hide.png"));
-    connect(btnX, SIGNAL(clicked()),SLOT(hide()));
+    connect(btnX, SIGNAL(clicked()),this,SLOT(deleteAll()));
 
     QLineEdit*  filterEditor = new QLineEdit(toolBar);
     filterEditor->setMinimumWidth(15);
@@ -435,6 +435,12 @@ QList<PeakGroup*> TableDockWidget::getGroups() {
 }
 
 void TableDockWidget::deleteAll() {
+
+    if (QMessageBox::No == QMessageBox::question(this, "Delete Confirmation",
+          "Do you want to delete all peakgroups from this table?", QMessageBox::Yes | QMessageBox::No)) {
+        return;
+    }
+
     treeWidget->clear();
     allgroups.clear();
     this->hide();