diff --git a/src/qbrowserlib/qbrowserlib_de.ts b/src/qbrowserlib/qbrowserlib_de.ts index 2ae29cc..9b283c9 100644 --- a/src/qbrowserlib/qbrowserlib_de.ts +++ b/src/qbrowserlib/qbrowserlib_de.ts @@ -70,65 +70,70 @@ - - + + browse ... - - Save + + Save As File - + remember save path - + + Open File in Folder + + + + Open in External Application - + remember tool for this type - + Run - + Information - + File: - - - + + + ... - + Type: - + Source - + Done @@ -578,12 +583,14 @@ p, li { white-space: pre-wrap; } qbrowserlib::SaveOrRun - + + File Exists - + + File already exists: %1 @@ -592,12 +599,12 @@ Overwrite? - + No Program - + Not an executable Program: %1 @@ -606,23 +613,23 @@ Specify full path to executable program - + Save File As ... - + Open File With ... - + Dokumente Documents folder in local language - + Arbeitsfläche Desktop folder in local language @@ -631,7 +638,7 @@ Specify full path to executable program qbrowserlib::SaveOrRunDialog - + Unknown File Type diff --git a/src/qbrowserlib/qbrowserlib_en.ts b/src/qbrowserlib/qbrowserlib_en.ts index 54e142f..1eaf2db 100644 --- a/src/qbrowserlib/qbrowserlib_en.ts +++ b/src/qbrowserlib/qbrowserlib_en.ts @@ -70,65 +70,70 @@ - - + + browse ... - - Save + + Save As File - + remember save path - + + Open File in Folder + + + + Open in External Application - + remember tool for this type - + Run - + Information - + File: - - - + + + ... - + Type: - + Source - + Done @@ -578,12 +583,14 @@ p, li { white-space: pre-wrap; } qbrowserlib::SaveOrRun - + + File Exists - + + File already exists: %1 @@ -592,12 +599,12 @@ Overwrite? - + No Program - + Not an executable Program: %1 @@ -606,23 +613,23 @@ Specify full path to executable program - + Save File As ... - + Open File With ... - + Dokumente Documents folder in local language - + Arbeitsfläche Desktop folder in local language @@ -631,7 +638,7 @@ Specify full path to executable program qbrowserlib::SaveOrRunDialog - + Unknown File Type diff --git a/src/qbrowserlib/qbrowserlib_fr.ts b/src/qbrowserlib/qbrowserlib_fr.ts index 60a3c32..58ff554 100644 --- a/src/qbrowserlib/qbrowserlib_fr.ts +++ b/src/qbrowserlib/qbrowserlib_fr.ts @@ -70,65 +70,70 @@ - - + + browse ... - - Save + + Save As File - + remember save path - + + Open File in Folder + + + + Open in External Application - + remember tool for this type - + Run - + Information - + File: - - - + + + ... - + Type: - + Source - + Done @@ -578,12 +583,14 @@ p, li { white-space: pre-wrap; } qbrowserlib::SaveOrRun - + + File Exists - + + File already exists: %1 @@ -592,12 +599,12 @@ Overwrite? - + No Program - + Not an executable Program: %1 @@ -606,23 +613,23 @@ Specify full path to executable program - + Save File As ... - + Open File With ... - + Dokumente Documents folder in local language - + Arbeitsfläche Desktop folder in local language @@ -631,7 +638,7 @@ Specify full path to executable program qbrowserlib::SaveOrRunDialog - + Unknown File Type diff --git a/src/qbrowserlib/qbrowserlib_it.ts b/src/qbrowserlib/qbrowserlib_it.ts index f8608c1..8caf715 100644 --- a/src/qbrowserlib/qbrowserlib_it.ts +++ b/src/qbrowserlib/qbrowserlib_it.ts @@ -70,65 +70,70 @@ - - + + browse ... - - Save + + Save As File - + remember save path - + + Open File in Folder + + + + Open in External Application - + remember tool for this type - + Run - + Information - + File: - - - + + + ... - + Type: - + Source - + Done @@ -578,12 +583,14 @@ p, li { white-space: pre-wrap; } qbrowserlib::SaveOrRun - + + File Exists - + + File already exists: %1 @@ -592,12 +599,12 @@ Overwrite? - + No Program - + Not an executable Program: %1 @@ -606,23 +613,23 @@ Specify full path to executable program - + Save File As ... - + Open File With ... - + Dokumente Documents folder in local language - + Arbeitsfläche Desktop folder in local language @@ -631,7 +638,7 @@ Specify full path to executable program qbrowserlib::SaveOrRunDialog - + Unknown File Type diff --git a/src/qbrowserlib/saveorrun.hxx b/src/qbrowserlib/saveorrun.hxx index 42f45fe..5605116 100644 --- a/src/qbrowserlib/saveorrun.hxx +++ b/src/qbrowserlib/saveorrun.hxx @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -46,8 +47,9 @@ namespace qbrowserlib { QString obj(remoteFilename()); _rememberPath->setVisible(false); _rememberTool->setVisible(false); - _program->setText(QCoreApplication::applicationDirPath() - +QDir::separator()); + // _program->setText(QDesktopServices::storageLocation + // (QDesktopServices::ApplicationsLocation)); + delete _openInExternalApplication; _openInExternalApplication = 0; _object->setText(obj); _type->setText(type); _source->setText(src); @@ -103,7 +105,8 @@ namespace qbrowserlib { QString program() { TRC; - return _program->text(); + return QString(); + // return _program->text(); } public Q_SLOTS: @@ -117,6 +120,16 @@ namespace qbrowserlib { accept(); } + void open() { + TRC; + QFile file(filename()); + file.open(QIODevice::WriteOnly); + file.write(_reply->readAll()); + file.close(); + QDesktopServices::openUrl(QUrl::fromLocalFile(file.fileName())); + accept(); + } + void run() { TRC; LOG<run(_reply, filename(), program()+" %1"); @@ -137,6 +150,18 @@ namespace qbrowserlib { save(); } + void on__openFolder_clicked(bool=true) { + TRC; + if (QFileInfo(filename()).exists() + && QMessageBox::question(this, tr("File Exists"), + tr("File already exists:\n\n" + "%1\n\n" + "Overwrite?").arg(filename()), + QMessageBox::Yes|QMessageBox::No) + == QMessageBox::No) return; + open(); + } + void on__openFileIn_clicked(bool=true) { TRC; if (!QFile::exists(program()) @@ -168,9 +193,9 @@ namespace qbrowserlib { TRC; QString openFile (QFileDialog::getOpenFileName(this, tr("Open File With ..."), - _program->text())); + program())); if (!openFile.size()) return; - _program->setText(openFile); + // _program->setText(openFile); on__openFileIn_clicked(); } diff --git a/src/qbrowserlib/saveorrun.ui b/src/qbrowserlib/saveorrun.ui index c9ea10b..84d4217 100644 --- a/src/qbrowserlib/saveorrun.ui +++ b/src/qbrowserlib/saveorrun.ui @@ -6,8 +6,8 @@ 0 0 - 610 - 154 + 719 + 169 @@ -38,7 +38,20 @@ - + + + + 0 + 0 + + + + + 400 + 0 + + + @@ -53,10 +66,10 @@ - + - Save + Save As File @@ -70,9 +83,16 @@ + + + + Open File in Folder + + + - + Open in External Application