diff options
| -rw-r--r-- | newpicsdialog.cpp | 8 | ||||
| -rw-r--r-- | newpicsdialog.h | 1 | ||||
| -rw-r--r-- | pictureviewer2.cpp | 4 | ||||
| -rw-r--r-- | shemov.cpp | 6 | ||||
| -rw-r--r-- | smglobals.cpp | 2 |
5 files changed, 15 insertions, 6 deletions
diff --git a/newpicsdialog.cpp b/newpicsdialog.cpp index 5f4009b..2d56ddc 100644 --- a/newpicsdialog.cpp +++ b/newpicsdialog.cpp @@ -97,6 +97,14 @@ void NewPicsDialog::addFiles(const QStringList &files){ } } +void NewPicsDialog::setFile(const QString &file){ + clearFiles(); + mFilesModel->addFile(file); + for(int i = 0; i < NewPicFilesModel::NumFields; ++i){ + mFilesV->resizeColumnToContents(i); + } +} + void NewPicsDialog::clearFiles(){ mFilesV->setSortingEnabled(false); SmTreeItem *rootItem = new SmTreeItem(NewPicFilesModel::NumFields); diff --git a/newpicsdialog.h b/newpicsdialog.h index 3f8a87b..f706ee8 100644 --- a/newpicsdialog.h +++ b/newpicsdialog.h @@ -31,6 +31,7 @@ class NewPicsDialog : public QDialog { void selectFiles(); void removeFiles(); void addFiles(const QStringList &files); + void setFile(const QString &file); void clearFiles(); void accept(); diff --git a/pictureviewer2.cpp b/pictureviewer2.cpp index f4592c1..3f1669b 100644 --- a/pictureviewer2.cpp +++ b/pictureviewer2.cpp @@ -250,11 +250,11 @@ void PictureViewer2::copyCurrent(){ } void PictureViewer2::showNewPicsDialog(){ - mNewPicsDlg->show(); + mNewPicsDlg->exec(); } void PictureViewer2::addToNewPics(){ - mNewPicsDlg->addFiles(QStringList() << mCurPicData.at(PicFilesModel::FullPath).toString()); + mNewPicsDlg->setFile(mCurPicData.at(PicFilesModel::FullPath).toString()); } void PictureViewer2::wheelEvent(QWheelEvent *event){ @@ -547,11 +547,11 @@ void SheMov::createActions(){ // NewPicsDialog actions mPVShowNPDialogA = new QAction(tr("Show new pics dialog..."), this); - mPVShowNPDialogA->setShortcut(tr("Meta+s")); + mPVShowNPDialogA->setShortcut(tr("CTRL+s")); connect(mPVShowNPDialogA, SIGNAL(triggered()), picViewer, SLOT(showNewPicsDialog())); picViewer->addAction(mPVShowNPDialogA); - mPVAddToNPA = new QAction(tr("Add to new pics dialog"), this); - mPVAddToNPA->setShortcut(tr("Meta+a")); + mPVAddToNPA = new QAction(tr("Set file in new pics dialog"), this); + mPVAddToNPA->setShortcut(tr("CTRL+a")); connect(mPVAddToNPA, SIGNAL(triggered()), picViewer, SLOT(addToNewPics())); picViewer->addAction(mPVAddToNPA); diff --git a/smglobals.cpp b/smglobals.cpp index 949b5ae..2e3a13e 100644 --- a/smglobals.cpp +++ b/smglobals.cpp @@ -83,7 +83,7 @@ QAbstractItemModel *SmGlobals::model(const QString &which){ } }else if(which == "MappingTree"){ if(!mModels.contains("MappingTree")){ - QStringList headers = QStringList() << tr("Name") << tr("Id") << tr("Date") << tr("Parent"); + QStringList headers = QStringList() << tr("Name") << tr("Id") << tr("Date") << tr("Parent") << tr("PPID"); MappingTreeModel *model = new MappingTreeModel(headers); mModels.insert(which, model); } |