Mercurial > hg > svgui
changeset 460:5f9a257598d8
* Ensure text models are exported with text properties in RDF, and
imported back into text models again (instead of time/value models)
author | Chris Cannam |
---|---|
date | Mon, 08 Dec 2008 11:53:10 +0000 |
parents | 0acf803e2c79 |
children | 272e58f0bf8b |
files | view/Pane.cpp view/View.cpp widgets/FileFinder.cpp widgets/PluginParameterDialog.cpp |
diffstat | 4 files changed, 14 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/view/Pane.cpp Mon Dec 08 11:15:13 2008 +0000 +++ b/view/Pane.cpp Mon Dec 08 11:53:10 2008 +0000 @@ -84,7 +84,7 @@ updateHeadsUpDisplay(); - std::cerr << "Pane::Pane(" << this << ") returning" << std::endl; +// std::cerr << "Pane::Pane(" << this << ") returning" << std::endl; } void
--- a/view/View.cpp Mon Dec 08 11:15:13 2008 +0000 +++ b/view/View.cpp Mon Dec 08 11:53:10 2008 +0000 @@ -66,7 +66,7 @@ View::~View() { - std::cerr << "View::~View(" << this << ")" << std::endl; +// std::cerr << "View::~View(" << this << ")" << std::endl; m_deleting = true; delete m_propertyContainer;
--- a/widgets/FileFinder.cpp Mon Dec 08 11:15:13 2008 +0000 +++ b/widgets/FileFinder.cpp Mon Dec 08 11:53:10 2008 +0000 @@ -153,31 +153,31 @@ if (!fi.exists()) { QMessageBox::critical(0, tr("File does not exist"), - tr("File \"%1\" does not exist").arg(path)); + tr("<b>File not found</b><p>File \"%1\" does not exist").arg(path)); path = ""; } else if (!fi.isReadable()) { QMessageBox::critical(0, tr("File is not readable"), - tr("File \"%1\" can not be read").arg(path)); + tr("<b>File is not readable</b><p>File \"%1\" can not be read").arg(path)); path = ""; } else if (fi.isDir()) { QMessageBox::critical(0, tr("Directory selected"), - tr("File \"%1\" is a directory").arg(path)); + tr("<b>Directory selected</b><p>File \"%1\" is a directory").arg(path)); path = ""; } else if (!fi.isFile()) { QMessageBox::critical(0, tr("Non-file selected"), - tr("Path \"%1\" is not a file").arg(path)); + tr("<b>Not a file</b><p>Path \"%1\" is not a file").arg(path)); path = ""; } else if (fi.size() == 0) { QMessageBox::critical(0, tr("File is empty"), - tr("File \"%1\" is empty").arg(path)); + tr("<b>File is empty</b><p>File \"%1\" is empty").arg(path)); path = ""; } } @@ -317,13 +317,13 @@ if (fi.isDir()) { QMessageBox::critical(0, tr("Directory selected"), - tr("File \"%1\" is a directory").arg(path)); + tr("<b>Directory selected</b><p>File \"%1\" is a directory").arg(path)); continue; } if (fi.exists()) { if (QMessageBox::question(0, tr("File exists"), - tr("The file \"%1\" already exists.\nDo you want to overwrite it?").arg(path), + tr("<b>File exists</b><p>The file \"%1\" already exists.\nDo you want to overwrite it?").arg(path), QMessageBox::Ok, QMessageBox::Cancel) != QMessageBox::Ok) { continue; @@ -455,9 +455,9 @@ { QString question; if (type == AudioFile) { - question = tr("Audio file \"%1\" could not be opened.\nDo you want to locate it?"); + question = tr("<b>File not found</b><p>Audio file \"%1\" could not be opened.\nDo you want to locate it?"); } else { - question = tr("File \"%1\" could not be opened.\nDo you want to locate it?"); + question = tr("<b>File not found</b><p>File \"%1\" could not be opened.\nDo you want to locate it?"); } QString path = ""; @@ -500,7 +500,7 @@ } else { QMessageBox::critical (0, tr("Failed to open location"), - tr("URL \"%1\" could not be opened").arg(path)); + tr("<b>Failed to open location</b><p>URL \"%1\" could not be opened").arg(path)); path = ""; } }
--- a/widgets/PluginParameterDialog.cpp Mon Dec 08 11:15:13 2008 +0000 +++ b/widgets/PluginParameterDialog.cpp Mon Dec 08 11:53:10 2008 +0000 @@ -249,6 +249,7 @@ hbox->addWidget(bb); connect(bb, SIGNAL(accepted()), this, SLOT(dialogAccepted())); connect(bb, SIGNAL(rejected()), this, SLOT(reject())); + bb->button(QDialogButtonBox::Ok)->setDefault(true); setAdvancedVisible(m_advancedVisible); } @@ -604,7 +605,7 @@ m_advancedButton->setChecked(false); } - std::cerr << "resize to " << sizeHint().width() << " x " << sizeHint().height() << std::endl; +// std::cerr << "resize to " << sizeHint().width() << " x " << sizeHint().height() << std::endl; // setMinimumHeight(sizeHint().height()); adjustSize();