1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 02:36:34 +01:00

Fixed showing suggested file types in Open File... dialog

This commit is contained in:
nowrep 2012-03-10 23:24:54 +01:00
parent 6ab65168fb
commit 043babced9
5 changed files with 14 additions and 10 deletions

View File

@ -45,7 +45,7 @@ Then you can start compiling by running this commands:
After a successful compilation the executable binary can be found in the bin/ directory. After a successful compilation the executable binary can be found in the bin/ directory.
To install QupZilla, you will have to run this command: (it may be neccessary to run it as root) To install QupZilla, you will have to run this command: (it may be necessary to run it as root)
$ make install $ make install
@ -53,7 +53,7 @@ Current version
---------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------
The current released version of QupZilla is 1.1.8. You can download precompiled packages The current released version of QupZilla is 1.1.8. You can download precompiled packages
and the sources from the download section. and the sources from the download section at [homepage](http://www.qupzilla.com/download).
However, if you want the latest revision, just take the latest code snapshot either by However, if you want the latest revision, just take the latest code snapshot either by
downloading a tarball or running: downloading a tarball or running:

View File

@ -1408,8 +1408,8 @@ void QupZilla::searchOnPage()
void QupZilla::openFile() void QupZilla::openFile()
{ {
const QString &fileTypes = QString("%1(*.html *.htm *.shtml *.shtm);;" const QString &fileTypes = QString("%1(*.html *.htm *.shtml *.shtm);;"
"%2(*.txt);;" "%2(*.png *.jpg *.jpeg *.bmp *.gif *.svg *.tiff);;"
"%3(*.png *.jpg *.jpeg *.bmp *.gif *.svg);;" "%3(*.txt);;"
"%4(*.*)").arg(tr("HTML files"), tr("Image files"), tr("Text files"), tr("All files")); "%4(*.*)").arg(tr("HTML files"), tr("Image files"), tr("Text files"), tr("All files"));
const QString &filePath = QFileDialog::getOpenFileName(this, tr("Open file..."), QDir::homePath(), fileTypes); const QString &filePath = QFileDialog::getOpenFileName(this, tr("Open file..."), QDir::homePath(), fileTypes);

View File

@ -87,7 +87,9 @@ void EditSearchEngine::hideIconLabels()
void EditSearchEngine::chooseIcon() void EditSearchEngine::chooseIcon()
{ {
QString path = QFileDialog::getOpenFileName(this, tr("Choose icon...")); const QString &fileTypes = QString("%3(*.png *.jpg *.jpeg *.bmp *.gif *.svg *.tiff)").arg(tr("Image files"));
QString path = QFileDialog::getOpenFileName(this, tr("Choose icon..."), QDir::homePath(), fileTypes);
if (path.isEmpty()) { if (path.isEmpty()) {
return; return;
} }

View File

@ -55,7 +55,7 @@ void AboutDialog::showAbout()
{ {
ui->authorsButton->setText(tr("Authors and Contributors")); ui->authorsButton->setText(tr("Authors and Contributors"));
if (m_aboutHtml.isEmpty()) { if (m_aboutHtml.isEmpty()) {
m_aboutHtml.append("<div style='margin:10px;'>"); m_aboutHtml.append("<center><div style='margin:10px;'>");
m_aboutHtml.append(tr("<p><b>Application version %1</b><br/>").arg(QupZilla::VERSION m_aboutHtml.append(tr("<p><b>Application version %1</b><br/>").arg(QupZilla::VERSION
#ifdef GIT_REVISION #ifdef GIT_REVISION
+ " (" + GIT_REVISION + ")" + " (" + GIT_REVISION + ")"
@ -66,7 +66,7 @@ void AboutDialog::showAbout()
m_aboutHtml.append(tr("<small>Build time: %1 </small></p>").arg(QupZilla::BUILDTIME)); m_aboutHtml.append(tr("<small>Build time: %1 </small></p>").arg(QupZilla::BUILDTIME));
m_aboutHtml.append(QString("<p><a href=%1>%1</a></p>").arg(QupZilla::WWWADDRESS)); m_aboutHtml.append(QString("<p><a href=%1>%1</a></p>").arg(QupZilla::WWWADDRESS));
m_aboutHtml.append("<p>" + mApp->getWindow()->weView()->webPage()->userAgentForUrl(QUrl()) + "</p>"); m_aboutHtml.append("<p>" + mApp->getWindow()->weView()->webPage()->userAgentForUrl(QUrl()) + "</p>");
m_aboutHtml.append("</div>"); m_aboutHtml.append("</div></center>");
} }
ui->textBrowser->setHtml(m_aboutHtml); ui->textBrowser->setHtml(m_aboutHtml);
} }
@ -75,7 +75,7 @@ void AboutDialog::showAuthors()
{ {
ui->authorsButton->setText(tr("< About QupZilla")); ui->authorsButton->setText(tr("< About QupZilla"));
if (m_authorsHtml.isEmpty()) { if (m_authorsHtml.isEmpty()) {
m_authorsHtml.append("<div style='margin:10px;'>"); m_authorsHtml.append("<center><div style='margin:10px;'>");
m_authorsHtml.append(tr("<p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p>").arg(QupZilla::AUTHOR, "<a href=mailto:nowrep@gmail.com>nowrep@gmail.com</a>")); m_authorsHtml.append(tr("<p><b>Main developer:</b><br/>%1 &lt;%2&gt;</p>").arg(QupZilla::AUTHOR, "<a href=mailto:nowrep@gmail.com>nowrep@gmail.com</a>"));
m_authorsHtml.append(tr("<p><b>Contributors:</b><br/>%1</p>").arg( m_authorsHtml.append(tr("<p><b>Contributors:</b><br/>%1</p>").arg(
QString::fromUtf8("Mladen Pejaković<br/>" QString::fromUtf8("Mladen Pejaković<br/>"
@ -108,7 +108,7 @@ void AboutDialog::showAuthors()
"Beqa Arabuli<br/>" "Beqa Arabuli<br/>"
"Daiki Noda") "Daiki Noda")
)); ));
m_authorsHtml.append("</div>"); m_authorsHtml.append("</div></center>");
} }
ui->textBrowser->setHtml(m_authorsHtml); ui->textBrowser->setHtml(m_authorsHtml);
} }

View File

@ -275,7 +275,9 @@ void SpeedDial::removeImageForUrl(const QString &url)
QString SpeedDial::getOpenFileName() QString SpeedDial::getOpenFileName()
{ {
return QFileDialog::getOpenFileName(0, tr("Select image..."), QDir::homePath(), "(*.png *.jpg *.jpeg *.bmp *.gif *.tiff)"); const QString &fileTypes = QString("%3(*.png *.jpg *.jpeg *.bmp *.gif *.svg *.tiff)").arg(tr("Image files"));
return QFileDialog::getOpenFileName(0, tr("Select image..."), QDir::homePath(), fileTypes);
} }
QString SpeedDial::urlFromUserInput(const QString &url) QString SpeedDial::urlFromUserInput(const QString &url)