From 6c515a78077ed97f93a3c4839bbb5bc3732e3b1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Cerveau?= Date: Mon, 13 Mar 2017 21:38:06 +0100 Subject: [PATCH] Clarify open/save Give a gpi extension. Save with the given extension. --- src/MainWindow.cpp | 30 ++++++++++++++++++++---------- src/MainWindow.h | 4 ++-- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp index 4b6dc04..d03f92e 100644 --- a/src/MainWindow.cpp +++ b/src/MainWindow.cpp @@ -44,8 +44,8 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags): connect(pactAdd, SIGNAL(triggered()), SLOT(AddPlugin())); - QAction *pactOpenFile = ptb -> addAction("Open File..."); - connect(pactOpenFile, SIGNAL(triggered()), SLOT(OpenFile())); + QAction *pactOpenFile = ptb -> addAction("Open Media File..."); + connect(pactOpenFile, SIGNAL(triggered()), SLOT(OpenMediaFile())); ptb -> addSeparator(); @@ -122,6 +122,9 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags): QAction *pactOpen = pmenu -> addAction ("Open...", this, SLOT(Open()), QKeySequence::Open); addAction (pactOpen); + + QAction *pactOpenMediaFile = pmenu -> addAction ("Open Media File...", this, SLOT(OpenMediaFile()), QKeySequence::Open); + addAction (pactOpenMediaFile); QAction *pactSave = pmenu -> addAction ("Save", this, SLOT(Save()), QKeySequence::Save); addAction (pactSave); @@ -136,8 +139,8 @@ MainWindow::MainWindow(QWidget *parent, Qt::WindowFlags flags): pmenu = menuBar() -> addMenu("&Graph"); pmenu -> addAction(pactAdd); - pmenu -> addAction(pactOpenFile); - pmenu -> addAction ("Open Uri...", this, SLOT(OpenUri())); + pmenu -> addAction(pactOpenMediaFile); + pmenu -> addAction ("Open Media Uri...", this, SLOT(OpenMediaUri())); pmenu -> addSeparator(); pmenu -> addAction(pactPlay); pmenu -> addAction(pactPause); @@ -186,11 +189,11 @@ void MainWindow::AddPlugin() -void MainWindow::OpenFile() +void MainWindow::OpenMediaFile() { QString dir = CustomSettings::lastIODirectory(); - QString path = QFileDialog::getOpenFileName(this, "Open File...", dir ); + QString path = QFileDialog::getOpenFileName(this, "Open File...", dir); if(!path.isEmpty()) { gchar *uri = gst_filename_to_uri(path.toStdString().c_str(), NULL); @@ -211,7 +214,7 @@ void MainWindow::OpenFile() } -void MainWindow::OpenUri() +void MainWindow::OpenMediaUri() { QString uri = QInputDialog::getText(this, "Open Uri...", "Uri:"); @@ -329,8 +332,15 @@ void MainWindow::Save() { if(m_fileName.isEmpty()) SaveAs(); - else + else { + QFileInfo fileInfo(m_fileName); + if (fileInfo.completeSuffix().isEmpty() || fileInfo.completeSuffix() != "gpi") + m_fileName = m_fileName + ".gpi"; + + PipelineIE::Export(m_pGraph, m_fileName); + + } } @@ -338,7 +348,7 @@ void MainWindow::SaveAs() { QString dir = CustomSettings::lastIODirectory(); - QString path = QFileDialog::getSaveFileName(this, "Save As...", dir); + QString path = QFileDialog::getSaveFileName(this, "Save As...", dir, tr("*.gpi")); if(!path.isEmpty()) { @@ -355,7 +365,7 @@ void MainWindow::Open() { QString dir = CustomSettings::lastIODirectory(); - QString path = QFileDialog::getOpenFileName(this, "Open...", dir); + QString path = QFileDialog::getOpenFileName(this, "Open...", dir, tr("GPI (*.gpi *.xpm);;All files (*.*)")); if(!path.isEmpty()) { diff --git a/src/MainWindow.h b/src/MainWindow.h index 9e2d6c7..4791eb5 100644 --- a/src/MainWindow.h +++ b/src/MainWindow.h @@ -29,8 +29,8 @@ class MainWindow: public QMainWindow private slots: void AddPlugin(); - void OpenFile(); - void OpenUri(); + void OpenMediaFile(); + void OpenMediaUri(); void Play(); void Pause(); void Stop();