Accept NewPicsDialog with CTRL+Enter

3 files changed, 8 insertions, 1 deletions

diff --git a/mappingtreewidget.cpp b/mappingtreewidget.cpp
index ebd244e..bc64d0e 100644
--- a/mappingtreewidget.cpp
+++ b/mappingtreewidget.cpp
@@ -304,6 +304,9 @@ void MappingTreeView::keyPressEvent(QKeyEvent *e){
         emit shiftFocus();
         return;
     }
+    if(e->key() == Qt::Key_Return && (e->modifiers() & Qt::ControlModifier)){
+        emit acceptPics();
+    }
     if(e->key() == Qt::Key_Right){
         emit addMapping();
     }
@@ -343,7 +346,6 @@ MappingEditWidget::MappingEditWidget(QWidget *parent) : QWidget(parent){
     connect(mMappingTree->mappingTreeView(), SIGNAL(addMapping()), this, SLOT(addMapping()));
     connect(mMappingTree->mappingTreeView(), SIGNAL(clearMappings()), this, SLOT(clearMapping()));
     connect(mMappingTree->mappingTreeView(), SIGNAL(shiftFocus()), this, SLOT(shiftFocusResult()));
-    connect(mMappingTree->mappingTreeView(), SIGNAL(addActor()), this, SLOT(addActor()));
     connect(mMappingResult, SIGNAL(shiftFocus()), this, SLOT(shiftFocusMappings()));
     connect(mMappingResult, SIGNAL(removeMapping()), this, SLOT(removeMapping()));
 
diff --git a/mappingtreewidget.h b/mappingtreewidget.h
index 1533d03..52fd544 100644
--- a/mappingtreewidget.h
+++ b/mappingtreewidget.h
@@ -80,6 +80,7 @@ class MappingTreeView : public SmTreeView {
         void removeMapping();
         void clearMappings();
         void shiftFocus();
+        void acceptPics();
 
     protected:
         virtual void contextMenuEvent(QContextMenuEvent *e);
@@ -104,6 +105,7 @@ class MappingEditWidget : public QWidget {
     public:
         explicit MappingEditWidget(QWidget *parent = 0);
         MappingTreeResultModel *model() const { return mResultModel; }
+        MappingTreeWidget *treeWidget() const { return mMappingTree; }
 
     public slots:
         void addMapping();
diff --git a/newpicsdialog.cpp b/newpicsdialog.cpp
index d1b6d92..bdf6453 100644
--- a/newpicsdialog.cpp
+++ b/newpicsdialog.cpp
@@ -109,6 +109,8 @@ void NewPicsDialog::setupDlg(){
     QPoint p = s.value("ui/newpicsdialogpos", QPoint(0,0)).toPoint();
     move(p);
     loadPreset();
+    mMappingEditWidget->treeWidget()->mappingTreeView()->setFocus();
+    connect(mMappingEditWidget->treeWidget()->mappingTreeView(), SIGNAL(acceptPics()), this, SLOT(accept()));
 }
 
 void NewPicsDialog::selectFiles(){
@@ -193,6 +195,7 @@ void NewPicsDialog::accept(){
     QSqlQuery addMappingQ(mDb);
     addMappingQ.prepare("INSERT INTO pics_mappings(ipics_id, imappings_parents_id) VALUES((SELECT ipicsid FROM pics where cmd5sum = :md5), :mapid)");
     QProgressDialog progress(tr("Processing..."), QString(), 0, files.size(), this);
+    progress.setMinimumWidth(400);
     progress.show();
     int pgctr = 0;
     foreach(FileData d, files){