4 files changed, 11 insertions, 60 deletions

diff --git a/mappingtreemodel.cpp b/mappingtreemodel.cpp
index 2cf4445..25d7921 100644
--- a/mappingtreemodel.cpp
+++ b/mappingtreemodel.cpp
@@ -520,6 +520,7 @@ QList<QVariant> MappingTreeResultModel::columnValues(int column) const {
 
 void MappingTreeResultModel::clearData(){
     setRoot(new SmTreeItem(NumFields));
+    mCurrentData.clear();
 }
 
 int MappingTreeResultModel::hasChild(SmTreeItem *item, const QVariant &name, int column) const{
diff --git a/newpicsdialog.cpp b/newpicsdialog.cpp
index 6aba6b9..a86c566 100644
--- a/newpicsdialog.cpp
+++ b/newpicsdialog.cpp
@@ -60,35 +60,17 @@ void NewPicsDialog::setupDlg(){
     filesLayout->addWidget(mFilesV);
     filesLayout->addLayout(fileButtonLayout);
     mFilesWidget->setLayout(filesLayout);
-    mPosL = new QLabel("(0000x0000");
     setWindowTitle(tr("SheMov - Archive pictures"));
 
     //mapping widget
     mMappingEditWidget = new MappingEditWidget;
 
-    //presets
-    mPresetMenu = new QMenu(this);
-    mPresets = new QPushButton(tr("Presets"));
-    QAction *posA = new QAction(tr("Save pos"), this);
-    connect(posA, SIGNAL(triggered()), this, SLOT(savePos()));
-    mPresetMenu->addAction(posA);
-    mPresetMenu->addSeparator();
-    QAction *loadPresetA = new QAction(tr("Load preset"), this);
-    connect(loadPresetA, SIGNAL(triggered()), this, SLOT(loadPreset()));
-    mPresetMenu->addAction(loadPresetA);
-    QAction *savePresetA = new QAction(tr("Save preset"), this);
-    connect(savePresetA, SIGNAL(triggered()), this, SLOT(savePreset()));
-    mPresetMenu->addAction(savePresetA);
-    mPresets->setMenu(mPresetMenu);
-
     //dialog buttons
     mOk = new QPushButton(tr("Ok"));
     connect(mOk, SIGNAL(clicked()), this, SLOT(accept()));
     mCancel = new QPushButton(tr("Cancel"));
     connect(mCancel, SIGNAL(clicked()), this, SLOT(reject()));
     QHBoxLayout *dlgButtonLayout = new QHBoxLayout;
-    dlgButtonLayout->addWidget(mPresets);
-    dlgButtonLayout->addWidget(mPosL);
     dlgButtonLayout->addStretch();
     dlgButtonLayout->addWidget(mCancel);
     dlgButtonLayout->addWidget(mOk);
@@ -104,13 +86,9 @@ void NewPicsDialog::setupDlg(){
     mainLayout->addLayout(dlgButtonLayout);
     setLayout(mainLayout);
 
-    //get pos
-    QSettings s;
-    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()));
+    readSettings();
 }
 
 void NewPicsDialog::selectFiles(){
@@ -186,6 +164,7 @@ void NewPicsDialog::removeFiles(){
 }
 
 void NewPicsDialog::accept(){
+    writeSettings();
     QList<FileData> files = mFilesModel->validFiles();
     if(files.isEmpty()){
         return QDialog::accept();
@@ -230,39 +209,18 @@ void NewPicsDialog::accept(){
     return QDialog::accept();
 }
 
-void NewPicsDialog::savePos(){
+void NewPicsDialog::writeSettings(){
+    mMappingEditWidget->saveMappings("ui/newpicmappings");
     QSettings s;
     QPoint curPos = pos();
     s.setValue("ui/newpicsdialogpos", curPos);
 }
 
-void NewPicsDialog::loadPreset() const {
-    QSettings s;
-    QByteArray val = s.value("ui/newpicsdialogpreset").toByteArray();
-    QDataStream out(&val, QIODevice::ReadOnly);
-    MappingData md;
-    while(!out.atEnd()){
-        out >> md;
-        mMappingEditWidget->model()->addItem(md);
-    }
-    mMappingEditWidget->expandAllResults();
-}
-
-void NewPicsDialog::savePreset(){
-    const QList<MappingData> mappingData = mMappingEditWidget->model()->mappingData();
-    QByteArray saveVal;
-    QDataStream in(&saveVal, QIODevice::WriteOnly);
-    foreach(MappingData md, mappingData){
-        in << md;
-    }
+void NewPicsDialog::readSettings(){
+    mMappingEditWidget->loadMappings("ui/newpicmappings");
     QSettings s;
-    s.setValue("ui/newpicsdialogpreset", saveVal);
-}
-
-void NewPicsDialog::moveEvent(QMoveEvent *e){
-    const QPoint pos = e->pos();
-    const QString posStr = QString("(%1x%2)").arg(pos.x()).arg(pos.y());
-    mPosL->setText(posStr);
+    QPoint p = s.value("ui/newpicsdialogpos", QPoint(0,0)).toPoint();
+    move(p);
 }
 
 NewPicFilesModel::NewPicFilesModel(const QStringList &header, QObject *parent) : SmTreeModel(header, parent){
diff --git a/newpicsdialog.h b/newpicsdialog.h
index 1f0e587..d526e58 100644
--- a/newpicsdialog.h
+++ b/newpicsdialog.h
@@ -40,12 +40,8 @@ class NewPicsDialog : public QDialog {
         void accept();
 
     private slots:
-        void savePos();
-        void loadPreset() const;
-        void savePreset();
-
-    protected:
-        virtual void moveEvent(QMoveEvent *e);
+        void writeSettings();
+        void readSettings();
 
     private:
         void setupDlg();
@@ -55,13 +51,10 @@ class NewPicsDialog : public QDialog {
         SmTreeView *mFilesV;
         NewPicFilesModel *mFilesModel;
         QSortFilterProxyModel *mFilesProxy;
-        QPushButton *mPresets;
         QPushButton *mAddFiles;
         QPushButton *mRemoveFiles;
         QPushButton *mOk;
         QPushButton *mCancel;
-        QLabel *mPosL;
-        QMenu *mPresetMenu;
         QSqlDatabase mDb;
         QPoint mPos;
 };
diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp
index 2a7a236..16f9e98 100644
--- a/pictureviewer2.cpp
+++ b/pictureviewer2.cpp
@@ -81,7 +81,6 @@ PictureViewer2::PictureViewer2(QWidget *parent) : QGraphicsView(parent), mCur(0)
 
     //setup gui
     mScene = new PictureViewerGraphicsScene(this);
-    connect(mScene, SIGNAL(itemClicked(QGraphicsItem*)), this, SLOT(doControl(QGraphicsItem*)));
     setScene(mScene);
     readSettings();
     setMinimumSize(QSize(800, 600));