Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00
Code Releases Activity

Added new IconProvider interface, improved performance of opening new

Browse Source 
tab and updated themes
This commit is contained in:
nowrep 2011-09-30 21:44:18 +02:00
parent 8e29818bb3
commit 49c2b36071
32 changed files with 295 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/locale/cs_CZ.qm
View File

Binary file not shown.

BIN
bin/locale/sk_SK.qm
View File

Binary file not shown.

6
bin/themes/chrome/windows.css
View File

@ -12,3 +12,9 @@
max-width: 250px;
height: 26px;
}
/*Downloads*/
DownloadItem #progressBar
{
border: 1px solid;
}

5
bin/themes/default/windows.css Normal file
View File

@ -0,0 +1,5 @@
/*Downloads*/
DownloadItem #progressBar
{
border: 1px solid;
}

6
bin/themes/mac/windows.css
View File

@ -12,3 +12,9 @@
max-width: 250px;
height: 26px;
}
/*Downloads*/
DownloadItem #progressBar
{
border: 1px solid;
}

6
bin/themes/windows/windows.css
View File

@ -12,3 +12,9 @@
max-width: 250px;
height: 26px;
}
/*Downloads*/
DownloadItem #progressBar
{
border: 1px solid;
}

6
src/app/mainapplication.cpp
View File

@ -250,11 +250,7 @@ void MainApplication::loadSettings()
m_websettings->setUserStyleSheetUrl(userStyleSheet);
m_websettings->setDefaultTextEncoding("System");
#ifdef Q_WS_X11
m_websettings->setWebGraphic(QWebSettings::DefaultFrameIconGraphic, QIcon::fromTheme("text-plain").pixmap(16,16));
#else
m_websettings->setWebGraphic(QWebSettings::DefaultFrameIconGraphic, QPixmap(":icons/locationbar/unknownpage.png"));
#endif
m_websettings->setWebGraphic(QWebSettings::DefaultFrameIconGraphic, IconProvider::fromTheme("text-plain").pixmap(16,16));
if (allowPersistentStorage) m_websettings->enablePersistentStorage(m_activeProfil);
m_websettings->setMaximumPagesInCache(maxCachedPages);

70
src/app/qupzilla.cpp
View File

@ -150,7 +150,7 @@ void QupZilla::postLaunch()
if (addTab)
m_tabWidget->addView(startUrl);
aboutToShowHistoryMenu();
aboutToShowHistoryMenu(false);
aboutToShowBookmarksMenu();
if (m_tabWidget->count() == 0) //Something went really wrong .. add one tab
@ -264,22 +264,10 @@ void QupZilla::setupMenu()
m_actionShowFullScreen->setCheckable(true);
m_actionShowFullScreen->setShortcut(QKeySequence("F11"));
connect(m_actionShowFullScreen, SIGNAL(triggered(bool)), this, SLOT(fullScreen(bool)));
m_actionStop = new QAction(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_BrowserStop)
#else
QIcon(":/icons/faenza/stop.png")
#endif
, tr("&Stop"), this);
m_actionStop = new QAction(IconProvider::standardIcon(QStyle::SP_BrowserStop), tr("&Stop"), this);
connect(m_actionStop, SIGNAL(triggered()), this, SLOT(stop()));
m_actionStop->setShortcut(QKeySequence("Esc"));
m_actionReload = new QAction(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_BrowserReload)
#else
QIcon(":/icons/faenza/reload.png")
#endif
, tr("&Reload"), this);
m_actionReload = new QAction(IconProvider::standardIcon(QStyle::SP_BrowserReload), tr("&Reload"), this);
connect(m_actionReload, SIGNAL(triggered()), this, SLOT(reload()));
m_actionReload->setShortcut(QKeySequence("F5"));
QAction* actionEncoding = new QAction(tr("Character &Encoding"), this);
@ -491,7 +479,7 @@ void QupZilla::aboutToShowBookmarksMenu()
m_menuBookmarks->clear();
m_menuBookmarks->addAction(tr("Bookmark &This Page"), this, SLOT(bookmarkPage()))->setShortcut(QKeySequence("Ctrl+D"));
m_menuBookmarks->addAction(tr("Bookmark &All Tabs"), this, SLOT(bookmarkAllTabs()));
m_menuBookmarks->addAction(QIcon::fromTheme("user-bookmarks"), tr("Organize &Bookmarks"), this, SLOT(showBookmarksManager()))->setShortcut(QKeySequence("Ctrl+Shift+O"));
m_menuBookmarks->addAction(IconProvider::fromTheme("user-bookmarks"), tr("Organize &Bookmarks"), this, SLOT(showBookmarksManager()))->setShortcut(QKeySequence("Ctrl+Shift+O"));
m_menuBookmarks->addSeparator();
QSqlQuery query;
query.exec("SELECT title, url, icon FROM bookmarks WHERE folder='bookmarksMenu'");
@ -548,7 +536,7 @@ void QupZilla::aboutToShowBookmarksMenu()
}
void QupZilla::aboutToShowHistoryMenu()
void QupZilla::aboutToShowHistoryMenu(bool loadHistory)
{
if (!weView())
return;
@ -556,29 +544,13 @@ void QupZilla::aboutToShowHistoryMenu()
if (!m_historyMenuChanged)
return;
m_historyMenuChanged = false;
if (!loadHistory)
m_historyMenuChanged = true;
m_menuHistory->clear();
m_menuHistory->addAction(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_ArrowBack)
#else
QIcon(":/icons/faenza/back.png")
#endif
, tr("&Back"), this, SLOT(goBack()))->setShortcut(QKeySequence("Ctrl+Left"));
m_menuHistory->addAction(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_ArrowForward)
#else
QIcon(":/icons/faenza/forward.png")
#endif
, tr("&Forward"), this, SLOT(goNext()))->setShortcut(QKeySequence("Ctrl+Right"));
m_menuHistory->addAction(
#ifdef Q_WS_X11
QIcon::fromTheme("go-home")
#else
QIcon(":/icons/faenza/home.png")
#endif
, tr("&Home"), this, SLOT(goHome()))->setShortcut(QKeySequence("Alt+Home"));
m_menuHistory->addAction(IconProvider::standardIcon(QStyle::SP_ArrowBack), tr("&Back"), this, SLOT(goBack()))->setShortcut(QKeySequence("Ctrl+Left"));
m_menuHistory->addAction(IconProvider::standardIcon(QStyle::SP_ArrowForward), tr("&Forward"), this, SLOT(goNext()))->setShortcut(QKeySequence("Ctrl+Right"));
m_menuHistory->addAction(IconProvider::fromTheme("go-home"), tr("&Home"), this, SLOT(goHome()))->setShortcut(QKeySequence("Alt+Home"));
if (!weView()->history()->canGoBack())
m_menuHistory->actions().at(0)->setEnabled(false);
@ -588,18 +560,20 @@ void QupZilla::aboutToShowHistoryMenu()
m_menuHistory->addAction(QIcon(":/icons/menu/history.png"), tr("Show &All History"), this, SLOT(showHistoryManager()));
m_menuHistory->addSeparator();
QSqlQuery query;
query.exec("SELECT title, url FROM history ORDER BY date DESC LIMIT 10");
while(query.next()) {
QUrl url = query.value(1).toUrl();
QString title = query.value(0).toString();
if (title.length()>40) {
title.truncate(40);
title+="..";
if (loadHistory) {
QSqlQuery query;
query.exec("SELECT title, url FROM history ORDER BY date DESC LIMIT 10");
while(query.next()) {
QUrl url = query.value(1).toUrl();
QString title = query.value(0).toString();
if (title.length()>40) {
title.truncate(40);
title+="..";
}
m_menuHistory->addAction(_iconForUrl(url), title, this, SLOT(loadActionUrl()))->setData(url);
}
m_menuHistory->addAction(_iconForUrl(url), title, this, SLOT(loadActionUrl()))->setData(url);
m_menuHistory->addSeparator();
}
m_menuHistory->addSeparator();
m_menuHistory->addMenu(m_menuClosedTabs);
}

2
src/app/qupzilla.h
View File

@ -145,7 +145,7 @@ private slots:
void printPage();
void savePageScreen();
void aboutToShowHistoryMenu();
void aboutToShowHistoryMenu(bool loadHistory = true);
void aboutToShowClosedTabsMenu();
void aboutToShowBookmarksMenu();
void aboutToShowToolsMenu();

9
src/autofill/autofillnotification.cpp
View File

@ -20,6 +20,7 @@
#include "autofillmodel.h"
#include "mainapplication.h"
#include "animatedwidget.h"
#include "iconprovider.h"
AutoFillNotification::AutoFillNotification(QUrl url, QByteArray data, QString pass, QWidget* parent)
:AnimatedWidget(AnimatedWidget::Down, 300, parent)
@ -31,13 +32,7 @@ AutoFillNotification::AutoFillNotification(QUrl url, QByteArray data, QString pa
setAttribute(Qt::WA_DeleteOnClose);
ui->setupUi(widget());
ui->label->setText(tr("Do you want QupZilla to remember password on %1?").arg(url.host()));
ui->closeButton->setIcon(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_DialogCloseButton)
#else
QIcon(":/icons/faenza/close.png")
#endif
);
ui->closeButton->setIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton));
connect(ui->remember, SIGNAL(clicked()), this, SLOT(remember()));
connect(ui->never, SIGNAL(clicked()), this, SLOT(never()));

2
src/bookmarks/bookmarkstoolbar.cpp
View File

@ -52,7 +52,7 @@ void BookmarksToolbar::customContextMenuRequested(const QPoint &pos)
QMenu menu;
menu.addAction(tr("&Bookmark Current Page"), p_QupZilla, SLOT(bookmarkPage()));
menu.addAction(tr("Bookmark &All Tabs"), p_QupZilla, SLOT(bookmarkAllTabs()));
menu.addAction(QIcon::fromTheme("user-bookmarks"), tr("&Organize Bookmarks"), p_QupZilla, SLOT(showBookmarksManager()));
menu.addAction(IconProvider::fromTheme("user-bookmarks"), tr("&Organize Bookmarks"), p_QupZilla, SLOT(showBookmarksManager()));
menu.addSeparator();
menu.addAction(m_bookmarksModel->isShowingMostVisited() ? tr("Hide Most &Visited") : tr("Show Most &Visited"), this, SLOT(showMostVisited()));
menu.addAction(tr("&Hide Toolbar"), this, SLOT(hidePanel()));

1
src/data/icons.qrc
View File

@ -64,5 +64,6 @@
<file>icons/exeicons/qupzilla128.png</file>
<file>icons/exeicons/qupzilla256.png</file>
<file>icons/menu/informations.png</file>
<file>icons/faenza/user-bookmarks.png</file>
</qresource>
</RCC>

BIN
src/data/icons/faenza/user-bookmarks.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 596 B

17
src/downloads/downloadfilehelper.cpp
View File

@ -1,3 +1,20 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2010-2011 nowrep
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* ============================================================ */
#include "downloadfilehelper.h"
#include "webpage.h"
#include "webview.h"

17
src/downloads/downloadfilehelper.h
View File

@ -1,3 +1,20 @@
/* ============================================================
* QupZilla - WebKit based browser
* Copyright (C) 2010-2011 nowrep
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* ============================================================ */
#ifndef DOWNLOADFILEHELPER_H
#define DOWNLOADFILEHELPER_H

13
src/downloads/downloaditem.cpp
View File

@ -22,6 +22,7 @@
#include "tabwidget.h"
#include "webpage.h"
#include "downloadmanager.h"
#include "iconprovider.h"
//#define DOWNMANAGER_DEBUG
@ -49,16 +50,8 @@ DownloadItem::DownloadItem(QListWidgetItem* item, QNetworkReply* reply, const QS
ui->setupUi(this);
setMaximumWidth(525);
#ifdef Q_WS_WIN
ui->progressBar->setStyleSheet("QProgressBar {border: 1px solid;}");
#endif
ui->button->setPixmap(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_BrowserStop).pixmap(20,20)
#else
QIcon(":/icons/faenza/stop.png").pixmap(20,20)
#endif
);
ui->button->setPixmap(IconProvider::standardIcon(QStyle::SP_BrowserStop).pixmap(20,20));
ui->fileName->setText(m_fileName);
ui->downloadInfo->setText(tr("Remaining time unavailable"));
ui->fileIcon->setPixmap(fileIcon);

3
src/navigation/locationbar.cpp
View File

@ -76,12 +76,13 @@ LocationBar::LocationBar(QupZilla* mainClass)
setCompleter(m_locationCompleter);
// LocationPopup* com = new LocationPopup(this);
// connect(down, SIGNAL(clicked(QPoint)), com, SLOT(show()));
connect(this, SIGNAL(textEdited(QString)), this, SLOT(textEdit()));
connect(this, SIGNAL(textEdited(QString)), m_locationCompleter, SLOT(refreshCompleter(QString)));
connect(this, SIGNAL(returnPressed()), this, SLOT(urlEnter()));
connect(m_locationCompleter->popup(), SIGNAL(clicked(QModelIndex)), p_QupZilla, SLOT(urlEnter()));
connect(m_siteIcon, SIGNAL(clicked()), this, SLOT(showSiteInfo()));
// connect(down, SIGNAL(clicked(QPoint)), com, SLOT(show()));
connect(m_goButton, SIGNAL(clicked(QPoint)), this, SLOT(urlEnter()));
connect(m_rssIcon, SIGNAL(clicked(QPoint)), this, SLOT(rssIconClicked()));

28
src/navigation/locationcompleter.cpp
View File

@ -40,7 +40,6 @@ LocationCompleter::LocationCompleter(QObject* parent) :
setCaseSensitivity(Qt::CaseInsensitive);
setWrapAround(true);
setCompletionColumn(1);
QTimer::singleShot(0, this, SLOT(loadInitialHistory()));
}
//QString LocationCompleter::pathFromIndex(const QModelIndex &index) const
@ -79,39 +78,15 @@ QStringList LocationCompleter::splitPath(const QString &path) const
#endif
}
void LocationCompleter::loadInitialHistory()
{
QSqlQuery query;
query.exec("SELECT title, url FROM history LIMIT 5");
int i = 0;
QStandardItemModel* cModel = (QStandardItemModel*)model();
while(query.next()) {
QStandardItem* iconText = new QStandardItem();
QStandardItem* findUrl = new QStandardItem();
QString url = query.value(1).toUrl().toEncoded();
iconText->setIcon(_iconForUrl(query.value(1).toUrl()).pixmap(16,16));
iconText->setText(query.value(0).toString().replace("\n","").append("\n"+url));
findUrl->setText(url);
QList<QStandardItem*> items;
items.append(iconText);
items.append(findUrl);
cModel->insertRow(i, items);
i++;
}
}
void LocationCompleter::refreshCompleter(QString string)
{
QSqlQuery query;
int limit;
if (string.size() < 3)
limit = 25;
else
limit = 15;
QSqlQuery query;
query.exec("SELECT title, url FROM history WHERE title LIKE '%"+string+"%' OR url LIKE '%"+string+"%' ORDER BY count DESC LIMIT "+QString::number(limit));
int i = 0;
QStandardItemModel* cModel = (QStandardItemModel*)model();
@ -155,5 +130,6 @@ void LocationCompleter::refreshCompleter(QString string)
popup()->setMinimumHeight(190);
else
popup()->setMinimumHeight(0);
popup()->setUpdatesEnabled(true);
}

1
src/navigation/locationcompleter.h
View File

@ -40,7 +40,6 @@ public:
signals:
public slots:
void loadInitialHistory();
void refreshCompleter(QString string);
};

9
src/other/sourceviewer.cpp
View File

@ -20,6 +20,7 @@
#include "htmlhighlighter.h"
#include "sourceviewersearch.h"
#include "globalfunctions.h"
#include "iconprovider.h"
SourceViewer::SourceViewer(QWebPage* page, const QString &selectedHtml) :
QWidget(0)
@ -78,13 +79,7 @@ SourceViewer::SourceViewer(QWebPage* page, const QString &selectedHtml) :
menuBar->addMenu(menuEdit);
QMenu* menuView = new QMenu(tr("View"));
menuView->addAction(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_BrowserReload)
#else
QIcon(":/icons/faenza/reload.png")
#endif
, tr("Reload"), this, SLOT(reload()))->setShortcut(QKeySequence("F5"));
menuView->addAction(IconProvider::standardIcon(QStyle::SP_BrowserReload), tr("Reload"), this, SLOT(reload()))->setShortcut(QKeySequence("F5"));
menuView->addSeparator();
menuView->addAction(tr("Editable"), this, SLOT(setTextEditable()))->setCheckable(true);
menuView->addAction(tr("Word Wrap"), this, SLOT(setTextWordWrap()))->setCheckable(true);

25
src/other/sourceviewersearch.cpp
View File

@ -18,6 +18,7 @@
#include "sourceviewersearch.h"
#include "ui_sourceviewersearch.h"
#include "sourceviewer.h"
#include "iconprovider.h"
SourceViewerSearch::SourceViewerSearch(SourceViewer* parent) :
AnimatedWidget(AnimatedWidget::Up)
@ -26,29 +27,11 @@ SourceViewerSearch::SourceViewerSearch(SourceViewer* parent) :
{
setAttribute(Qt::WA_DeleteOnClose);
ui->setupUi(widget());
ui->closeButton->setIcon(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_DialogCloseButton)
#else
QIcon(":/icons/faenza/close.png")
#endif
);
ui->closeButton->setIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton));
ui->next->setIcon(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_ArrowForward)
#else
QIcon(":/icons/faenza/forward.png")
#endif
);
ui->next->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowForward));
ui->previous->setIcon(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_ArrowBack)
#else
QIcon(":/icons/faenza/back.png")
#endif
);
ui->previous->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowBack));
ui->lineEdit->setFocus();
connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(hide()));
connect(ui->lineEdit, SIGNAL(textEdited(QString)), this, SLOT(next()));

9
src/rss/rssnotification.cpp
View File

@ -19,6 +19,7 @@
#include "ui_rssnotification.h"
#include "mainapplication.h"
#include "qupzilla.h"
#include "iconprovider.h"
RSSNotification::RSSNotification(QString host, QWidget* parent) :
AnimatedWidget(AnimatedWidget::Down, 300, parent),
@ -26,13 +27,7 @@ RSSNotification::RSSNotification(QString host, QWidget* parent) :
{
setAttribute(Qt::WA_DeleteOnClose);
ui->setupUi(widget());
ui->closeButton->setIcon(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_DialogCloseButton)
#else
QIcon(":/icons/faenza/close.png")
#endif
);
ui->closeButton->setIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton));
ui->label->setText(tr("You have successfuly added RSS feed \"%1\".").arg(host));
connect(ui->pushButton, SIGNAL(clicked()), mApp->getWindow(), SLOT(showRSSManager()));

7
src/tools/docktitlebarwidget.cpp
View File

@ -16,16 +16,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
* ============================================================ */
#include "docktitlebarwidget.h"
#include "iconprovider.h"
DockTitleBarWidget::DockTitleBarWidget(const QString &title, QWidget* parent) :
QWidget(parent)
{
setupUi(this);
#ifdef Q_WS_X11
closeButton->setIcon(QIcon(style()->standardIcon(QStyle::SP_DialogCloseButton).pixmap(16,16)));
#else
closeButton->setIcon(QIcon(QIcon(":/icons/faenza/close.png").pixmap(16,16)));
#endif
closeButton->setIcon(QIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton).pixmap(16,16)));
label->setText(title);
connect(closeButton, SIGNAL(clicked()), parent, SLOT(close()));
}

73
src/tools/iconprovider.cpp
View File

@ -17,6 +17,7 @@
* ============================================================ */
#include "iconprovider.h"
#include "webview.h"
#include "mainapplication.h"
IconProvider::IconProvider(QObject* parent) :
QObject(parent)
@ -93,6 +94,78 @@ void IconProvider::clearIconDatabase()
m_iconBuffer.clear();
}
QIcon IconProvider::standardIcon(QStyle::StandardPixmap icon)
{
#ifdef Q_WS_X11
return mApp->style()->standardIcon(icon);
#else
switch (icon) {
case QStyle::SP_DialogCloseButton:
return QIcon(":/icons/faenza/close.png");
case QStyle::SP_BrowserStop:
return QIcon(":/icons/faenza/stop.png");
case QStyle::SP_BrowserReload:
return QIcon(":/icons/faenza/reload.png");
case QStyle::SP_ArrowForward:
return QIcon(":/icons/faenza/forward.png");
case QStyle::QStyle::SP_ArrowBack:
return QIcon(":/icons/faenza/back.png");
default:
return QIcon();
break;
}
#endif
}
QPixmap IconProvider::standardPixmap(QStyle::StandardPixmap icon)
{
#ifdef Q_WS_X11
return mApp->style()->standardPixmap(icon);
#else
switch (icon) {
case QStyle::SP_DialogCloseButton:
return QPixmap(":/icons/faenza/close.png");
case QStyle::SP_BrowserStop:
return QPixmap(":/icons/faenza/stop.png");
case QStyle::SP_BrowserReload:
return QPixmap(":/icons/faenza/reload.png");
case QStyle::SP_ArrowForward:
return QPixmap(":/icons/faenza/forward.png");
case QStyle::QStyle::SP_ArrowBack:
return QPixmap(":/icons/faenza/back.png");
default:
return QPixmap();
break;
}
#endif
}
QIcon IconProvider::fromTheme(const QString &icon)
{
#ifdef Q_WS_X11
return QIcon::fromTheme(icon);
#else
if (icon == "go-home")
return QIcon(":/icons/faenza/home.png");
else if (icon == "text-plain")
return QIcon(":icons/locationbar/unknownpage.png");
else if (icon == "user-bookmarks")
return QIcon(":icons/faenza/user-bookmarks.png");
else
return QIcon();
#endif
}
QIcon IconProvider::iconFromBase64(const QByteArray &data)
{
QIcon image;

5
src/tools/iconprovider.h
View File

@ -26,6 +26,7 @@
#include <QSqlQuery>
#include <QBuffer>
#include <QTimer>
#include <QStyle>
class WebView;
class IconProvider : public QObject
@ -41,6 +42,10 @@ public:
static QIcon iconFromBase64(const QByteArray &data);
static QByteArray iconToBase64(const QIcon &icon);
static QIcon standardIcon(QStyle::StandardPixmap icon);
static QPixmap standardPixmap(QStyle::StandardPixmap icon);
static QIcon fromTheme(const QString &icon);
signals:
public slots:

25
src/webview/searchtoolbar.cpp
View File

@ -20,6 +20,7 @@
#include "webview.h"
#include "lineedit.h"
#include "ui_searchtoolbar.h"
#include "iconprovider.h"
SearchToolBar::SearchToolBar(QupZilla* mainClass, QWidget* parent)
: AnimatedWidget(AnimatedWidget::Up, 300, parent)
@ -29,29 +30,11 @@ SearchToolBar::SearchToolBar(QupZilla* mainClass, QWidget* parent)
{
setAttribute(Qt::WA_DeleteOnClose);
ui->setupUi(widget());
ui->closeButton->setIcon(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_DialogCloseButton)
#else
QIcon(":/icons/faenza/close.png")
#endif
);
ui->closeButton->setIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton));
ui->next->setIcon(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_ArrowForward)
#else
QIcon(":/icons/faenza/forward.png")
#endif
);
ui->next->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowForward));
ui->previous->setIcon(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_ArrowBack)
#else
QIcon(":/icons/faenza/back.png")
#endif
);
ui->previous->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowBack));
connect(ui->closeButton, SIGNAL(clicked()), this, SLOT(hide()));
connect(ui->lineEdit, SIGNAL(textChanged(QString)), this, SLOT(searchText(QString)));

23
src/webview/tabbar.cpp
View File

@ -19,6 +19,7 @@
#include "tabwidget.h"
#include "qupzilla.h"
#include "webtab.h"
#include "iconprovider.h"
TabBar::TabBar(QupZilla* mainClass, QWidget* parent) :
QTabBar(parent)
@ -63,23 +64,11 @@ void TabBar::contextMenuRequested(const QPoint &position)
WebTab* webTab = qobject_cast<WebTab*>(tabWidget->widget(m_clickedTab));
if (!webTab)
return;
if (p_QupZilla->weView(m_clickedTab)->isLoading()) {
menu.addAction(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_BrowserStop)
#else
QIcon(":/icons/faenza/stop.png")
#endif
,tr("&Stop Tab"), this, SLOT(stopTab()));
} else {
menu.addAction(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_BrowserReload)
#else
QIcon(":/icons/faenza/reload.png")
#endif
,tr("&Reload Tab"), this, SLOT(reloadTab()));
}
if (p_QupZilla->weView(m_clickedTab)->isLoading())
menu.addAction(IconProvider::standardIcon(QStyle::SP_BrowserStop), tr("&Stop Tab"), this, SLOT(stopTab()));
else
menu.addAction(IconProvider::standardIcon(QStyle::SP_BrowserReload), tr("&Reload Tab"), this, SLOT(reloadTab()));
menu.addAction(tr("&Duplicate Tab"), this, SLOT(duplicateTab()));
menu.addAction(webTab->isPinned() ? tr("Un&pin Tab") : tr("&Pin Tab"), this, SLOT(pinTab()));
menu.addSeparator();

3
src/webview/webpage.cpp
View File

@ -227,7 +227,6 @@ bool WebPage::extension(Extension extension, const ExtensionOption* option, Exte
QString errString = file.readAll();
errString.replace("%TITLE%", tr("AdBlocked Content"));
//QPixmap pixmap = QIcon::fromTheme("dialog-warning").pixmap(45,45);
QPixmap pixmap(":/html/adblock_big.png");
QByteArray bytes;
QBuffer buffer(&bytes);
@ -267,12 +266,10 @@ bool WebPage::extension(Extension extension, const ExtensionOption* option, Exte
QString errString = file.readAll();
errString.replace("%TITLE%", tr("Failed loading page"));
//QPixmap pixmap = QIcon::fromTheme("dialog-warning").pixmap(45,45);
QByteArray image = qz_pixmapToByteArray(MainApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(45,45));
if (!image.isEmpty())
errString.replace("%IMAGE%", image);
//pixmap = QIcon::fromTheme("dialog-warning").pixmap(16,16);
image = qz_pixmapToByteArray(MainApplication::style()->standardIcon(QStyle::SP_MessageBoxWarning).pixmap(16,16));
if (!image.isEmpty())
errString.replace("%FAVICON%", image);

1
src/webview/webpage.h
View File

@ -29,6 +29,7 @@
#include <QMessageBox>
#include <QDesktopServices>
#include <QStyle>
#include <QFileDialog>
class QupZilla;
class WebView;

35
src/webview/webview.cpp
View File

@ -272,7 +272,7 @@ void WebView::iconChanged()
if (!icon_.isNull())
animationLoading(tabIndex(), false)->setPixmap(icon_.pixmap(16,16));
else
animationLoading(tabIndex(), false)->setPixmap(QIcon::fromTheme("text-plain").pixmap(16,16));
animationLoading(tabIndex(), false)->setPixmap(IconProvider::fromTheme("text-plain").pixmap(16,16));
if (isCurrent())
emit siteIconChanged();
@ -465,7 +465,7 @@ void WebView::contextMenuEvent(QContextMenuEvent* event)
menu->addAction(QIcon(":/icons/menu/popup.png"), tr("Open link in new &tab"), this, SLOT(openUrlInNewTab()))->setData(r.linkUrl());
menu->addAction(tr("Open link in new &window"), this, SLOT(openUrlInNewWindow()))->setData(r.linkUrl());
menu->addSeparator();
menu->addAction(QIcon::fromTheme("user-bookmarks"), tr("B&ookmark link"), this, SLOT(bookmarkLink()))->setData(r.linkUrl());
menu->addAction(IconProvider::fromTheme("user-bookmarks"), tr("B&ookmark link"), this, SLOT(bookmarkLink()))->setData(r.linkUrl());
menu->addAction(QIcon::fromTheme("document-save"), tr("&Save link as..."), this, SLOT(downloadLinkToDisk()))->setData(r.linkUrl());
menu->addAction(tr("Send link..."), this, SLOT(sendLinkByMail()))->setData(r.linkUrl());
menu->addAction(QIcon::fromTheme("edit-copy"), tr("&Copy link address"), this, SLOT(copyLinkToClipboard()))->setData(r.linkUrl());
@ -499,39 +499,20 @@ void WebView::contextMenuEvent(QContextMenuEvent* event)
if (menu->isEmpty()) {
QAction* action = menu->addAction(tr("&Back"), this, SLOT(back()));
#ifdef Q_WS_X11
action->setIcon(style()->standardIcon(QStyle::SP_ArrowBack));
#else
action->setIcon(QIcon(":/icons/faenza/back.png"));
#endif
action->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowBack));
history()->canGoBack() ? action->setEnabled(true) : action->setEnabled(false);
action = menu->addAction(tr("&Forward"), this, SLOT(forward()));
#ifdef Q_WS_X11
action->setIcon(style()->standardIcon(QStyle::SP_ArrowForward));
#else
action->setIcon(QIcon(":/icons/faenza/forward.png"));
#endif
action->setIcon(IconProvider::standardIcon(QStyle::SP_ArrowForward));
history()->canGoForward() ? action->setEnabled(true) : action->setEnabled(false);
menu->addAction(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_BrowserReload)
#else
QIcon(":/icons/faenza/reload.png")
#endif
,tr("&Reload"), this, SLOT(slotReload()));
action = menu->addAction(
#ifdef Q_WS_X11
style()->standardIcon(QStyle::SP_BrowserStop)
#else
QIcon(":/icons/faenza/stop.png")
#endif
,tr("S&top"), this, SLOT(stop()));
menu->addAction(IconProvider::standardIcon(QStyle::SP_BrowserReload), tr("&Reload"), this, SLOT(slotReload()));
action = menu->addAction(IconProvider::standardIcon(QStyle::SP_BrowserStop), tr("S&top"), this, SLOT(stop()));
isLoading() ? action->setEnabled(true) : action->setEnabled(false);
menu->addSeparator();
menu->addAction(QIcon::fromTheme("user-bookmarks"), tr("Book&mark page"), this, SLOT(bookmarkLink()));
menu->addAction(IconProvider::fromTheme("user-bookmarks"), tr("Book&mark page"), this, SLOT(bookmarkLink()));
menu->addAction(QIcon::fromTheme("document-save"), tr("&Save page as..."), this, SLOT(downloadLinkToDisk()))->setData(url());
menu->addAction(tr("Send page..."), this, SLOT(sendLinkByMail()))->setData(url());
menu->addSeparator();

85
translations/cs_CZ.ts
View File

@ -835,6 +835,20 @@ p, li { white-space: pre-wrap; }
<translation>konce relace</translation>
</message>
</context>
<context>
<name>DownloadFileHelper</name>
<message>
<location filename="../src/downloads/downloadfilehelper.cpp" line="82"/>
<location filename="../src/downloads/downloadfilehelper.cpp" line="86"/>
<source>Save file as...</source>
<translation>Uložit soubor jako...</translation>
</message>
<message>
<location filename="../src/downloads/downloadfilehelper.cpp" line="172"/>
<source>NoNameDownload</source>
<translation>BezNazvu</translation>
</message>
</context>
<context>
<name>DownloadItem</name>
<message>
@ -853,119 +867,119 @@ p, li { white-space: pre-wrap; }
<translation>Neznámý zbývající čas</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="128"/>
<location filename="../src/downloads/downloaditem.cpp" line="115"/>
<source>Done - %1</source>
<translation>Hotovo - %1</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="180"/>
<location filename="../src/downloads/downloaditem.cpp" line="313"/>
<location filename="../src/downloads/downloaditem.cpp" line="167"/>
<location filename="../src/downloads/downloaditem.cpp" line="300"/>
<source>Cancelled</source>
<translation>Zrušeno</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="186"/>
<location filename="../src/downloads/downloaditem.cpp" line="173"/>
<source>few seconds</source>
<translation>několik sekund</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="188"/>
<location filename="../src/downloads/downloaditem.cpp" line="175"/>
<source>seconds</source>
<translation>sekund</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="190"/>
<location filename="../src/downloads/downloaditem.cpp" line="177"/>
<source>minutes</source>
<translation>minut</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="192"/>
<location filename="../src/downloads/downloaditem.cpp" line="179"/>
<source>hours</source>
<translation>hodin</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="198"/>
<location filename="../src/downloads/downloaditem.cpp" line="185"/>
<source>Unknown speed</source>
<translation>Neznámá rychlost</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="215"/>
<location filename="../src/downloads/downloaditem.cpp" line="251"/>
<location filename="../src/downloads/downloaditem.cpp" line="202"/>
<location filename="../src/downloads/downloaditem.cpp" line="238"/>
<source>Unknown size</source>
<translation>Neznámá velikost</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="252"/>
<location filename="../src/downloads/downloaditem.cpp" line="239"/>
<source>%2 of %3 (%4)</source>
<translation>%2 z %3 (%4)</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="254"/>
<location filename="../src/downloads/downloaditem.cpp" line="241"/>
<source>Remaining %1 - %2 of %3 (%4)</source>
<translation>Zbývá %1 - %2 z %3 (%4)</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="267"/>
<location filename="../src/downloads/downloaditem.cpp" line="254"/>
<source>Cancelled - %1</source>
<translation>Zrušeno - %1</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="281"/>
<location filename="../src/downloads/downloaditem.cpp" line="268"/>
<source>Delete file</source>
<translation>Smazat soubor</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="281"/>
<location filename="../src/downloads/downloaditem.cpp" line="268"/>
<source>Do you want to also delete dowloaded file?</source>
<translation>Chcete také smazat stahovaný soubor?</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="297"/>
<location filename="../src/downloads/downloaditem.cpp" line="284"/>
<source>Open File</source>
<translation>Otevřít soubor</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="299"/>
<location filename="../src/downloads/downloaditem.cpp" line="286"/>
<source>Open Folder</source>
<translation>Otevřít složku</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="301"/>
<location filename="../src/downloads/downloaditem.cpp" line="288"/>
<source>Go to Download Page</source>
<translation>Přejít na stránku stahování</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="302"/>
<location filename="../src/downloads/downloaditem.cpp" line="289"/>
<source>Copy Download Link</source>
<translation>Kopírovat stahovaný odkaz</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="310"/>
<location filename="../src/downloads/downloaditem.cpp" line="297"/>
<source>Cancel downloading</source>
<translation>Zrušit stahování</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="311"/>
<location filename="../src/downloads/downloaditem.cpp" line="298"/>
<source>Clear</source>
<translation>Vyčistit</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="313"/>
<location filename="../src/downloads/downloaditem.cpp" line="300"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="320"/>
<location filename="../src/downloads/downloaditem.cpp" line="307"/>
<source>New tab</source>
<translation>Nový panel</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="341"/>
<location filename="../src/downloads/downloaditem.cpp" line="328"/>
<source>Not found</source>
<translation>Soubor neexistuje</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="341"/>
<location filename="../src/downloads/downloaditem.cpp" line="328"/>
<source>Sorry, the file
%1
was not found!</source>
@ -974,12 +988,12 @@ p, li { white-space: pre-wrap; }
nebyl nalezen!</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="356"/>
<location filename="../src/downloads/downloaditem.cpp" line="343"/>
<source>Error: Cannot write to file!</source>
<translation>Chyba: Nelze zapisovat do souboru!</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="368"/>
<location filename="../src/downloads/downloaditem.cpp" line="355"/>
<source>Error: </source>
<translation>Chyba:</translation>
</message>
@ -997,40 +1011,37 @@ nebyl nalezen!</translation>
<translation>% - Správce stahování</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="211"/>
<location filename="../src/downloads/downloadmanager.cpp" line="215"/>
<source>Save file as...</source>
<translation>Uložit soubor jako...</translation>
<translation type="obsolete">Uložit soubor jako...</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="304"/>
<location filename="../src/downloads/downloadmanager.cpp" line="191"/>
<source>Download Finished</source>
<translation>Stahování dokončeno</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="304"/>
<location filename="../src/downloads/downloadmanager.cpp" line="191"/>
<source>All files have been successfuly downloaded.</source>
<translation>Všechna stahování byla úspěšně dokončena.</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="384"/>
<location filename="../src/downloads/downloadmanager.cpp" line="235"/>
<source>Warning</source>
<translation>Varování</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="385"/>
<location filename="../src/downloads/downloadmanager.cpp" line="236"/>
<source>Are you sure to quit? All uncompleted downloads will be cancelled!</source>
<translation>Jste si jistý že chcete skončit? Všechna nedokončená stahování budou zrušena!</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="346"/>
<source>NoNameDownload</source>
<translation>BezNazvu</translation>
<translation type="obsolete">BezNazvu</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.ui" line="20"/>
<location filename="../src/downloads/downloadmanager.cpp" line="95"/>
<location filename="../src/downloads/downloadmanager.cpp" line="309"/>
<location filename="../src/downloads/downloadmanager.cpp" line="196"/>
<source>Download Manager</source>
<translation>Správce stahování</translation>
</message>

85
translations/sk_SK.ts
View File

@ -838,6 +838,20 @@ p, li { white-space: pre-wrap; }
<translation>Konca relácie</translation>
</message>
</context>
<context>
<name>DownloadFileHelper</name>
<message>
<location filename="../src/downloads/downloadfilehelper.cpp" line="82"/>
<location filename="../src/downloads/downloadfilehelper.cpp" line="86"/>
<source>Save file as...</source>
<translation>Uložiť súbor ako...</translation>
</message>
<message>
<location filename="../src/downloads/downloadfilehelper.cpp" line="172"/>
<source>NoNameDownload</source>
<translation>BezNazvu</translation>
</message>
</context>
<context>
<name>DownloadItem</name>
<message>
@ -856,119 +870,119 @@ p, li { white-space: pre-wrap; }
<translation>Neznámy zostávajúci čas</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="128"/>
<location filename="../src/downloads/downloaditem.cpp" line="115"/>
<source>Done - %1</source>
<translation>Dokončené - %1</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="180"/>
<location filename="../src/downloads/downloaditem.cpp" line="313"/>
<location filename="../src/downloads/downloaditem.cpp" line="167"/>
<location filename="../src/downloads/downloaditem.cpp" line="300"/>
<source>Cancelled</source>
<translation>Zrušené</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="186"/>
<location filename="../src/downloads/downloaditem.cpp" line="173"/>
<source>few seconds</source>
<translation>pár sekúnd</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="188"/>
<location filename="../src/downloads/downloaditem.cpp" line="175"/>
<source>seconds</source>
<translation>sekúnd</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="190"/>
<location filename="../src/downloads/downloaditem.cpp" line="177"/>
<source>minutes</source>
<translation>minút</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="192"/>
<location filename="../src/downloads/downloaditem.cpp" line="179"/>
<source>hours</source>
<translation>hodín</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="198"/>
<location filename="../src/downloads/downloaditem.cpp" line="185"/>
<source>Unknown speed</source>
<translation>Neznáma rýchslosť</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="215"/>
<location filename="../src/downloads/downloaditem.cpp" line="251"/>
<location filename="../src/downloads/downloaditem.cpp" line="202"/>
<location filename="../src/downloads/downloaditem.cpp" line="238"/>
<source>Unknown size</source>
<translation>Neznáma veľkosť</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="252"/>
<location filename="../src/downloads/downloaditem.cpp" line="239"/>
<source>%2 of %3 (%4)</source>
<translation>%2 z %3 (%4)</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="254"/>
<location filename="../src/downloads/downloaditem.cpp" line="241"/>
<source>Remaining %1 - %2 of %3 (%4)</source>
<translation>Zostáva %1 - %2 z %3 (%4)</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="267"/>
<location filename="../src/downloads/downloaditem.cpp" line="254"/>
<source>Cancelled - %1</source>
<translation>Zrušene - %1</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="281"/>
<location filename="../src/downloads/downloaditem.cpp" line="268"/>
<source>Delete file</source>
<translation>Vymazať súbor</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="281"/>
<location filename="../src/downloads/downloaditem.cpp" line="268"/>
<source>Do you want to also delete dowloaded file?</source>
<translation>Chcete zmazať sťahovaný súbor?</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="297"/>
<location filename="../src/downloads/downloaditem.cpp" line="284"/>
<source>Open File</source>
<translation>Otvoriť súbor</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="299"/>
<location filename="../src/downloads/downloaditem.cpp" line="286"/>
<source>Open Folder</source>
<translation>Otvoriť priečinok</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="301"/>
<location filename="../src/downloads/downloaditem.cpp" line="288"/>
<source>Go to Download Page</source>
<translation>Prejsť k sťahovanie stránke</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="302"/>
<location filename="../src/downloads/downloaditem.cpp" line="289"/>
<source>Copy Download Link</source>
<translation>Kopírovať sťahovaný odkaz</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="310"/>
<location filename="../src/downloads/downloaditem.cpp" line="297"/>
<source>Cancel downloading</source>
<translation>Zrušiť sťahovanie</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="311"/>
<location filename="../src/downloads/downloaditem.cpp" line="298"/>
<source>Clear</source>
<translation>Vyčistiť</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="313"/>
<location filename="../src/downloads/downloaditem.cpp" line="300"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="320"/>
<location filename="../src/downloads/downloaditem.cpp" line="307"/>
<source>New tab</source>
<translation>Nový panel</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="341"/>
<location filename="../src/downloads/downloaditem.cpp" line="328"/>
<source>Not found</source>
<translation>Súbor neexistuje</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="341"/>
<location filename="../src/downloads/downloaditem.cpp" line="328"/>
<source>Sorry, the file
%1
was not found!</source>
@ -977,12 +991,12 @@ p, li { white-space: pre-wrap; }
nebol nájdený!</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="356"/>
<location filename="../src/downloads/downloaditem.cpp" line="343"/>
<source>Error: Cannot write to file!</source>
<translation>Chyba: Nejde zapisovať do súboru!</translation>
</message>
<message>
<location filename="../src/downloads/downloaditem.cpp" line="368"/>
<location filename="../src/downloads/downloaditem.cpp" line="355"/>
<source>Error: </source>
<translation>Chyba: </translation>
</message>
@ -1000,40 +1014,37 @@ p, li { white-space: pre-wrap; }
<translation>% - Správca sťahovania</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="211"/>
<location filename="../src/downloads/downloadmanager.cpp" line="215"/>
<source>Save file as...</source>
<translation>Uložiť súbor ako...</translation>
<translation type="obsolete">Uložiť súbor ako...</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="304"/>
<location filename="../src/downloads/downloadmanager.cpp" line="191"/>
<source>Download Finished</source>
<translation>Sťahovanie dokončené</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="304"/>
<location filename="../src/downloads/downloadmanager.cpp" line="191"/>
<source>All files have been successfuly downloaded.</source>
<translation>Všetky súbory boli úspešne stiahnuté.</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="384"/>
<location filename="../src/downloads/downloadmanager.cpp" line="235"/>
<source>Warning</source>
<translation>Upozornenie</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="385"/>
<location filename="../src/downloads/downloadmanager.cpp" line="236"/>
<source>Are you sure to quit? All uncompleted downloads will be cancelled!</source>
<translation>Ste si istý, že chcete skončiť? Všetky nedokončené sťahovania budú zrušene!</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.cpp" line="346"/>
<source>NoNameDownload</source>
<translation>BezNázvu</translation>
<translation type="obsolete">BezNázvu</translation>
</message>
<message>
<location filename="../src/downloads/downloadmanager.ui" line="20"/>
<location filename="../src/downloads/downloadmanager.cpp" line="95"/>
<location filename="../src/downloads/downloadmanager.cpp" line="309"/>
<location filename="../src/downloads/downloadmanager.cpp" line="196"/>
<source>Download Manager</source>
<translation>Správca sťahovania</translation>
</message>