1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00

Status of sidebars is now restored at startup + updated default database

+ fixed proper icon clearing + added some missing html tags
This commit is contained in:
nowrep 2011-04-28 18:31:48 +02:00
parent 8ef4ac4a41
commit d77499aa28
14 changed files with 271 additions and 150 deletions

Binary file not shown.

Binary file not shown.

View File

@ -252,9 +252,9 @@ void QupZilla::setupMenu()
m_actionShowHistorySideBar = new QAction(tr("History"), this);
m_actionShowHistorySideBar->setCheckable(true);
connect(m_actionShowHistorySideBar, SIGNAL(triggered()), this, SLOT(showHistorySideBar()));
m_actionShowRssSideBar = new QAction(tr("RSS Reader"), this);
m_actionShowRssSideBar->setCheckable(true);
connect(m_actionShowRssSideBar, SIGNAL(triggered()), this, SLOT(showRssSideBar()));
// m_actionShowRssSideBar = new QAction(tr("RSS Reader"), this);
// m_actionShowRssSideBar->setCheckable(true);
// connect(m_actionShowRssSideBar, SIGNAL(triggered()), this, SLOT(showRssSideBar()));
QMenu* toolbarsMenu = new QMenu(tr("Toolbars"));
toolbarsMenu->addAction(m_actionShowMenubar);
@ -265,7 +265,7 @@ void QupZilla::setupMenu()
QMenu* sidebarsMenu = new QMenu(tr("Sidebars"));
sidebarsMenu->addAction(m_actionShowBookmarksSideBar);
sidebarsMenu->addAction(m_actionShowHistorySideBar);
sidebarsMenu->addAction(m_actionShowRssSideBar);
// sidebarsMenu->addAction(m_actionShowRssSideBar);
connect(sidebarsMenu, SIGNAL(aboutToShow()), this, SLOT(aboutToShowSidebarsMenu()));
m_menuView->addMenu(toolbarsMenu);

View File

@ -111,6 +111,7 @@ void QupZilla::loadSettings()
bool showNavigationToolbar = settings.value("showNavigationToolbar",true).toBool();
bool showMenuBar = settings.value("showMenubar",true).toBool();
bool makeTransparent = settings.value("useTransparentBackground",false).toBool();
QString activeSideBar = settings.value("SideBar", "None").toString();
settings.endGroup();
bool adBlockEnabled = settings.value("AdBlock/enabled", true).toBool();
@ -126,6 +127,13 @@ void QupZilla::loadSettings()
m_buttonBack->setVisible(showBackForwardIcons);
m_buttonNext->setVisible(showBackForwardIcons);
if (activeSideBar != "None") {
if (activeSideBar == "Bookmarks")
m_actionShowBookmarksSideBar->trigger();
else if (activeSideBar == "History")
m_actionShowHistorySideBar->trigger();
}
//Private browsing
m_actionPrivateBrowsing->setChecked( mApp->webSettings()->testAttribute(QWebSettings::PrivateBrowsingEnabled) );
m_privateBrowsing->setVisible( mApp->webSettings()->testAttribute(QWebSettings::PrivateBrowsingEnabled) );
@ -453,12 +461,12 @@ void QupZilla::aboutToShowSidebarsMenu()
if (!m_sideBar) {
m_actionShowBookmarksSideBar->setChecked(false);
m_actionShowHistorySideBar->setChecked(false);
m_actionShowRssSideBar->setChecked(false);
// m_actionShowRssSideBar->setChecked(false);
} else {
SideBar::SideWidget actWidget = m_sideBar->activeWidget();
m_actionShowBookmarksSideBar->setChecked(actWidget == SideBar::Bookmarks);
m_actionShowHistorySideBar->setChecked(actWidget == SideBar::History);
m_actionShowRssSideBar->setChecked(actWidget == SideBar::RSS);
// m_actionShowRssSideBar->setChecked(actWidget == SideBar::RSS);
}
}
@ -580,14 +588,17 @@ void QupZilla::showBookmarksToolbar()
void QupZilla::showBookmarksSideBar()
{
bool saveToSettings = false;
if (!m_sideBar) {
m_sideBar = new SideBar(this);
addDockWidget(Qt::LeftDockWidgetArea, m_sideBar);
m_sideBar->showBookmarks();
saveToSettings = true;
} else if (m_actionShowBookmarksSideBar->isChecked()){
m_sideBar->showBookmarks();
saveToSettings = true;
} else {
delete m_sideBar;
m_sideBar->close();
}
}
@ -600,7 +611,7 @@ void QupZilla::showHistorySideBar()
} else if (m_actionShowHistorySideBar->isChecked()) {
m_sideBar->showHistory();
} else {
delete m_sideBar;
m_sideBar->close();
}
}

View File

@ -22,6 +22,7 @@
#include "networkmanager.h"
#include "clickablelabel.h"
#include "ui_clearprivatedata.h"
#include "iconprovider.h"
ClearPrivateData::ClearPrivateData(QupZilla* mainClass, QWidget* parent) :
QDialog(parent)
@ -83,6 +84,7 @@ void ClearPrivateData::dialogAccepted()
}
if (ui->icons->isChecked()) {
mApp->webSettings()->clearIconDatabase();
mApp->iconProvider()->clearIconDatabase();
}
close();
}

View File

@ -503,7 +503,7 @@ void Preferences::buttonClicked(QAbstractButton* button)
void Preferences::createProfile()
{
QString name = QInputDialog::getText(this, tr("New Profile"), tr("Enter the new profile's name:"));
if (name.contains("/") || name.contains("\\"))
if (name.isEmpty() || name.contains("/") || name.contains("\\"))
return;
QDir dir(QDir::homePath()+"/.qupzilla/profiles/");
if (QDir(dir.absolutePath() + "/" + name).exists()) {

View File

@ -39,6 +39,9 @@ void SideBar::showBookmarks()
BookmarksSideBar* bar = new BookmarksSideBar((QupZilla*)parentWidget(), this);
setWidget(bar);
m_activeWidget = Bookmarks;
QSettings settings(mApp->getActiveProfil() + "settings.ini", QSettings::IniFormat);
settings.setValue("Browser-View-Settings/SideBar", "Bookmarks");
}
void SideBar::showHistory()
@ -47,9 +50,20 @@ void SideBar::showHistory()
HistorySideBar* bar = new HistorySideBar((QupZilla*)parentWidget(), this);
setWidget(bar);
m_activeWidget = History;
QSettings settings(mApp->getActiveProfil() + "settings.ini", QSettings::IniFormat);
settings.setValue("Browser-View-Settings/SideBar", "History");
}
void SideBar::showRSS()
{
}
void SideBar::close()
{
QSettings settings(mApp->getActiveProfil() + "settings.ini", QSettings::IniFormat);
settings.setValue("Browser-View-Settings/SideBar", "None");
QDockWidget::close();
}

View File

@ -35,6 +35,7 @@ public:
signals:
public slots:
void close();
private:
DockTitleBarWidget* m_titleBar;

View File

@ -78,7 +78,7 @@
<< "(<label|</label)" << "(<input|</input)" << "(<img|</img)"
<< "(<center|</center)" << "(<option|</option)" << "(<select|</select)"
<< "(<hr|</hr)" << "(<object|</object)" << "(<param|</param)"
<< "(<tbody|</tbody)" << "(<thead|</thead)" << "(<tfooter|</tfooter)"
<< "(<tbody|</tbody)" << "(<thead|</thead)" << "(<tfoot|</tfoot)"
<< "(<h6|</h6)" << "(<font|</font)" << "(<noscript|</noscript)"
<< "(<embed|</embed)" << "(<base|</base)" << "(<canvas|</canvas)"
<< "(<cufon|</cufon)" << "(<cufontext|</cufontext)" << "(<button|</button)"
@ -114,6 +114,7 @@
<< "frameborder=\"" << "marginwidth=\"" << "marginheight=\""
<< "scrolling=\"" << "quality=\"" << "bgcolor=\""
<< "allowscriptaccess=\"" << "cols=\"" << "rows=\""
<< "profile=\"" << "colspan=\"" << "scope=\""
<< "href=\"" << "title=\"" << "xmlns=\"";
foreach (const QString &pattern, optionsPatterns) {
rule.pattern = QRegExp(pattern);

View File

@ -18,7 +18,7 @@
#include "iconprovider.h"
#include "webview.h"
IconProvider::IconProvider(QObject *parent) :
IconProvider::IconProvider(QObject* parent) :
QObject(parent)
{
m_timer = new QTimer(this);
@ -27,7 +27,7 @@ IconProvider::IconProvider(QObject *parent) :
connect(m_timer, SIGNAL(timeout()), this, SLOT(saveIconsToDatabase()));
}
void IconProvider::saveIcon(WebView *view)
void IconProvider::saveIcon(WebView* view)
{
Icon item;
item.icon = view->icon();
@ -36,11 +36,13 @@ void IconProvider::saveIcon(WebView *view)
if (item.icon.isNull())
return;
QPixmap iconPixmap = item.icon.pixmap(16,16);
foreach (Icon ic, m_iconBuffer) {
if (ic.url == item.url && ic.icon.pixmap(16,16).toImage() == item.icon.pixmap(16,16).toImage())
if (ic.url == item.url && ic.icon.pixmap(16,16).toImage() == iconPixmap.toImage())
return;
}
item.icon = QIcon(iconPixmap);
m_iconBuffer.append(item);
}
@ -103,3 +105,11 @@ void IconProvider::saveIconsToDatabase()
m_iconBuffer.clear();
}
void IconProvider::clearIconDatabase()
{
QSqlQuery query;
query.exec("DELETE FROM icons");
query.exec("VACUUM");
m_iconBuffer.clear();
}

View File

@ -36,6 +36,8 @@ public:
void saveIcon(WebView* view);
QIcon iconForUrl(const QUrl &url);
void clearIconDatabase();
signals:
public slots:

View File

@ -1127,22 +1127,22 @@ nebyl nalezen!</translation>
<translation>Titulek</translation>
</message>
<message>
<location filename="../src/sidebar/historysidebar.cpp" line="43"/>
<location filename="../src/sidebar/historysidebar.cpp" line="60"/>
<source>New Tab</source>
<translation>Nový panel</translation>
</message>
<message>
<location filename="../src/sidebar/historysidebar.cpp" line="55"/>
<location filename="../src/sidebar/historysidebar.cpp" line="72"/>
<source>Open link in actual tab</source>
<translation>Otevřít odkaz v aktuálním panelu</translation>
</message>
<message>
<location filename="../src/sidebar/historysidebar.cpp" line="56"/>
<location filename="../src/sidebar/historysidebar.cpp" line="73"/>
<source>Open link in new tab</source>
<translation>Otevřít odkaz v novém panelu</translation>
</message>
<message>
<location filename="../src/sidebar/historysidebar.cpp" line="58"/>
<location filename="../src/sidebar/historysidebar.cpp" line="75"/>
<source>Remove Entry</source>
<translation>Odstranit položku</translation>
</message>
@ -1503,7 +1503,7 @@ nebyl nalezen!</translation>
<translation>&lt;b&gt;Chování adresního řádku&lt;/b&gt;</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1614"/>
<location filename="../src/preferences/preferences.ui" line="1740"/>
<source>&lt;b&gt;Language&lt;/b&gt;</source>
<translation>&lt;b&gt;Jazyk&lt;/b&gt;</translation>
</message>
@ -1748,52 +1748,87 @@ nebyl nalezen!</translation>
<translation>...</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1667"/>
<location filename="../src/preferences/preferences.ui" line="1594"/>
<source>&lt;b&gt;Notifications&lt;/b&gt;</source>
<translation>&lt;b&gt;Oznámení&lt;/b&gt;</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1601"/>
<source>Use OSD Notifications</source>
<translation>Používat OSD oznámení</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1611"/>
<source>Use Native System Notifications (Linux only)</source>
<translation>Používat nativní systémové oznámení (pouze Linux)</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1618"/>
<source>Do not use Notifications</source>
<translation>Nepoužívat oznámení</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1669"/>
<source>Expiration timeout:</source>
<translation>Doba:</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1682"/>
<source> seconds</source>
<translation> sekund</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1691"/>
<source>&lt;b&gt;Note: &lt;/b&gt;You can change position of OSD Notification by dragging it on the screen.</source>
<translation>&lt;b&gt;Poznámka: &lt;/b&gt; Můžete změnit pozici OSD oznámení na obrazovce jejím přetažením.</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1793"/>
<source>&lt;b&gt;Proxy Configuration&lt;/b&gt;</source>
<translation>&lt;b&gt;Nastavení Proxy&lt;/b&gt;</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1674"/>
<location filename="../src/preferences/preferences.ui" line="1800"/>
<source>System proxy configuration</source>
<translation>Systémové nastavení proxy</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1681"/>
<location filename="../src/preferences/preferences.ui" line="1807"/>
<source>Do not use proxy</source>
<translation>Nepoužívat proxy</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1688"/>
<location filename="../src/preferences/preferences.ui" line="1814"/>
<source>Manual configuration</source>
<translation>Manuální nastavení</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1711"/>
<location filename="../src/preferences/preferences.ui" line="1837"/>
<source>HTTP</source>
<translation>HTTP</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1716"/>
<location filename="../src/preferences/preferences.ui" line="1842"/>
<source>SOCKS5</source>
<translation>SOCKS5</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1729"/>
<location filename="../src/preferences/preferences.ui" line="1855"/>
<source>Port:</source>
<translation>Port:</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1748"/>
<location filename="../src/preferences/preferences.ui" line="1874"/>
<source>Username:</source>
<translation>Jméno:</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1758"/>
<location filename="../src/preferences/preferences.ui" line="1884"/>
<source>Password:</source>
<translation>Heslo:</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1768"/>
<location filename="../src/preferences/preferences.ui" line="1894"/>
<source>Don&apos;t use on:</source>
<translation>Nepužívat na:</translation>
</message>
@ -1919,58 +1954,68 @@ nebyl nalezen!</translation>
<translation>Správce certifikátů</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1621"/>
<location filename="../src/preferences/preferences.ui" line="1747"/>
<source>Available translations: </source>
<translation>Dostupné překlady:</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1660"/>
<location filename="../src/preferences/preferences.ui" line="1786"/>
<source>In order to change language, you must restart browser.</source>
<translation>Ke změně jazyka je nutný restart prohlížeče.</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="346"/>
<location filename="../src/preferences/preferences.cpp" line="332"/>
<source>OSD Notification</source>
<translation>OSD Oznámení</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="333"/>
<source>Drag it on the screen to place it where You want.</source>
<translation>Přetáhněte ho na obrazovce na místo, na kterém jej chcete mít.</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="382"/>
<source>Choose download location...</source>
<translation>Vyberte složku pro stahování...</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="354"/>
<location filename="../src/preferences/preferences.cpp" line="390"/>
<source>Choose background location...</source>
<translation></translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="469"/>
<location filename="../src/preferences/preferences.cpp" line="505"/>
<source>New Profile</source>
<translation>Nový profil</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="469"/>
<location filename="../src/preferences/preferences.cpp" line="505"/>
<source>Enter the new profile&apos;s name:</source>
<translation>Zvolte jméno nového profilu:</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="474"/>
<location filename="../src/preferences/preferences.cpp" line="478"/>
<location filename="../src/preferences/preferences.cpp" line="510"/>
<location filename="../src/preferences/preferences.cpp" line="514"/>
<source>Error!</source>
<translation>Chyba!</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="474"/>
<location filename="../src/preferences/preferences.cpp" line="510"/>
<source>This profile already exists!</source>
<translation>Tento profil již existuje!</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="478"/>
<location filename="../src/preferences/preferences.cpp" line="514"/>
<source>Cannot create profile directory!</source>
<translation>Nemohu vytvořit složku profilu!</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="492"/>
<location filename="../src/preferences/preferences.cpp" line="528"/>
<source>Confirmation</source>
<translation>Potvrzení</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="493"/>
<location filename="../src/preferences/preferences.cpp" line="529"/>
<source>Are you sure to permanently delete &quot;%1&quot; profile? This action cannot be undone!</source>
<translation>Jste si jisti že chcete permanentně smazat profil &quot;%1&quot;? Tato akce nelze vrátit zpět!</translation>
</message>
@ -2205,22 +2250,17 @@ nebyl nalezen!</translation>
<translation>Poslat odkaz...</translation>
</message>
<message>
<location filename="../src/app/appui.cpp" line="255"/>
<source>RSS Reader</source>
<translation>RSS čtečka</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="408"/>
<location filename="../src/app/qupzilla.cpp" line="416"/>
<source>Other</source>
<translation>Ostatní</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="417"/>
<location filename="../src/app/qupzilla.cpp" line="425"/>
<source>Default</source>
<translation>Defaultní</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="768"/>
<location filename="../src/app/qupzilla.cpp" line="779"/>
<source>Start Private Browsing</source>
<translation>Spustit anonymní prohlížení</translation>
</message>
@ -2245,14 +2285,14 @@ nebyl nalezen!</translation>
<translation>Soukromé prohlížení zapnuto</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="271"/>
<location filename="../src/app/qupzilla.cpp" line="279"/>
<source>Bookmarks In ToolBar</source>
<oldsource>Bookmarks In Toolbar</oldsource>
<translation>Panel záložek</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="285"/>
<location filename="../src/app/qupzilla.cpp" line="305"/>
<location filename="../src/app/qupzilla.cpp" line="293"/>
<location filename="../src/app/qupzilla.cpp" line="313"/>
<source>Empty</source>
<translation>Prázdný</translation>
</message>
@ -2262,143 +2302,143 @@ nebyl nalezen!</translation>
<translation>Nový panel</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="253"/>
<location filename="../src/app/qupzilla.cpp" line="261"/>
<source>Bookmark &amp;This Page</source>
<translation>Přidat &amp;stránku do záložek</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="254"/>
<location filename="../src/app/qupzilla.cpp" line="262"/>
<source>Bookmark &amp;All Tabs</source>
<translation>Přidat &amp;všechny panely do záložek</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="255"/>
<location filename="../src/app/qupzilla.cpp" line="263"/>
<source>Organize &amp;Bookmarks</source>
<translation>Organizovat &amp;záložky</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="322"/>
<location filename="../src/app/qupzilla.cpp" line="330"/>
<source>&amp;Back</source>
<translation>&amp;Zpět</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="329"/>
<location filename="../src/app/qupzilla.cpp" line="337"/>
<source>&amp;Forward</source>
<translation>&amp;Vpřed</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="336"/>
<location filename="../src/app/qupzilla.cpp" line="344"/>
<source>&amp;Home</source>
<translation>&amp;Domů</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="343"/>
<location filename="../src/app/qupzilla.cpp" line="351"/>
<source>Show &amp;All History</source>
<translation>Zobrazit celou &amp;historii</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="362"/>
<location filename="../src/app/qupzilla.cpp" line="370"/>
<source>Report &amp;Bug</source>
<translation>Nahlásit &amp;bug</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="365"/>
<location filename="../src/app/qupzilla.cpp" line="373"/>
<source>About &amp;Qt</source>
<translation>O &amp;Qt</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="366"/>
<location filename="../src/app/qupzilla.cpp" line="374"/>
<source>&amp;About QupZilla</source>
<translation>&amp;O QupZille</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="372"/>
<location filename="../src/app/qupzilla.cpp" line="380"/>
<source>&amp;Web Search</source>
<translation>Hledání na &amp;webu</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="373"/>
<location filename="../src/app/qupzilla.cpp" line="381"/>
<source>Page &amp;Info</source>
<translation>Informace o &amp;stránce</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="375"/>
<location filename="../src/app/qupzilla.cpp" line="383"/>
<source>&amp;Download Manager</source>
<translation>Správce s&amp;tahování</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="376"/>
<location filename="../src/app/qupzilla.cpp" line="384"/>
<source>&amp;Cookies Manager</source>
<translation>Správce coo&amp;kies</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="377"/>
<location filename="../src/app/qupzilla.cpp" line="385"/>
<source>&amp;AdBlock</source>
<translation>&amp;AdBlock</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="378"/>
<location filename="../src/app/qupzilla.cpp" line="386"/>
<source>RSS &amp;Reader</source>
<translation>&amp;RSS čtečka</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="379"/>
<location filename="../src/app/qupzilla.cpp" line="387"/>
<source>Clear Recent &amp;History</source>
<translation>Vymazat nedá&amp;vnou historii</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="380"/>
<location filename="../src/app/qupzilla.cpp" line="388"/>
<source>&amp;Private Browsing</source>
<translation>Soukromé prohlíž&amp;ení</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="387"/>
<location filename="../src/app/qupzilla.cpp" line="395"/>
<source>Pr&amp;eferences</source>
<translation>Předvo&amp;lby</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="649"/>
<location filename="../src/app/qupzilla.cpp" line="650"/>
<location filename="../src/app/qupzilla.cpp" line="660"/>
<location filename="../src/app/qupzilla.cpp" line="661"/>
<source>Web Inspector</source>
<translation>Web Inspektor</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="692"/>
<location filename="../src/app/qupzilla.cpp" line="703"/>
<source>Open file...</source>
<translation>Otevřít soubor...</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="755"/>
<location filename="../src/app/qupzilla.cpp" line="766"/>
<source>Are you sure you want to turn on private browsing?</source>
<translation>Jste si jistý že chcete zapnout soukromé prohlížení?</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="756"/>
<location filename="../src/app/qupzilla.cpp" line="767"/>
<source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
<translation>Se zapnutým soukromým prohlížením jsou některé akce týkající se soukromí vypnuty:</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="759"/>
<location filename="../src/app/qupzilla.cpp" line="770"/>
<source>Webpages are not added to the history.</source>
<translation>Stránky nejsou přidávány do historie.</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="760"/>
<location filename="../src/app/qupzilla.cpp" line="771"/>
<source>New cookies are not stored, but current cookies can be accessed.</source>
<translation>Nové cookies nejsou přijímány, ale současné cookies jsou zasílány.</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="761"/>
<location filename="../src/app/qupzilla.cpp" line="772"/>
<source>Your session won&apos;t be stored.</source>
<translation>Vaše relace nebude uložena.</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="763"/>
<location filename="../src/app/qupzilla.cpp" line="774"/>
<source>Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
<translation>Než zavřete prohlížeč, stále můžete použít tlačítka Zpět a Vpřed k vrácení se na stránky které jste otevřeli.</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="807"/>
<location filename="../src/app/qupzilla.cpp" line="818"/>
<source>There are still %1 open tabs and your session won&apos;t be stored. Are you sure to quit?</source>
<translation>Ještě je otevřeno %1 panelů a Vaše relace nebude uložena. Opravdu chcete skončit?</translation>
</message>
@ -2641,7 +2681,7 @@ Prosím přidejte si nějaký kliknutím na RSS ikonku v navigačním řádku.</
<translation>Záložky</translation>
</message>
<message>
<location filename="../src/sidebar/sidebar.cpp" line="46"/>
<location filename="../src/sidebar/sidebar.cpp" line="49"/>
<source>History</source>
<translation>Historie</translation>
</message>

View File

@ -1130,22 +1130,22 @@ p, li { white-space: pre-wrap; }
<translation>Názov</translation>
</message>
<message>
<location filename="../src/sidebar/historysidebar.cpp" line="43"/>
<location filename="../src/sidebar/historysidebar.cpp" line="60"/>
<source>New Tab</source>
<translation>Nový panel</translation>
</message>
<message>
<location filename="../src/sidebar/historysidebar.cpp" line="55"/>
<location filename="../src/sidebar/historysidebar.cpp" line="72"/>
<source>Open link in actual tab</source>
<translation>Otvoriť odkaz v aktuálnom panely</translation>
</message>
<message>
<location filename="../src/sidebar/historysidebar.cpp" line="56"/>
<location filename="../src/sidebar/historysidebar.cpp" line="73"/>
<source>Open link in new tab</source>
<translation>Otvoriť odkaz na novom panely</translation>
</message>
<message>
<location filename="../src/sidebar/historysidebar.cpp" line="58"/>
<location filename="../src/sidebar/historysidebar.cpp" line="75"/>
<source>Remove Entry</source>
<translation>Odstrániť položku</translation>
</message>
@ -1514,7 +1514,7 @@ p, li { white-space: pre-wrap; }
<translation>&lt;b&gt;Chovanie adresového riadku&lt;/b&gt;</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1614"/>
<location filename="../src/preferences/preferences.ui" line="1740"/>
<source>&lt;b&gt;Language&lt;/b&gt;</source>
<translation>&lt;b&gt;Jazyk&lt;/b&gt;</translation>
</message>
@ -1830,52 +1830,87 @@ p, li { white-space: pre-wrap; }
<translation>Správca cookies</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1667"/>
<location filename="../src/preferences/preferences.ui" line="1594"/>
<source>&lt;b&gt;Notifications&lt;/b&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1601"/>
<source>Use OSD Notifications</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1611"/>
<source>Use Native System Notifications (Linux only)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1618"/>
<source>Do not use Notifications</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1669"/>
<source>Expiration timeout:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1682"/>
<source> seconds</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1691"/>
<source>&lt;b&gt;Note: &lt;/b&gt;You can change position of OSD Notification by dragging it on the screen.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1793"/>
<source>&lt;b&gt;Proxy Configuration&lt;/b&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1674"/>
<location filename="../src/preferences/preferences.ui" line="1800"/>
<source>System proxy configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1681"/>
<location filename="../src/preferences/preferences.ui" line="1807"/>
<source>Do not use proxy</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1688"/>
<location filename="../src/preferences/preferences.ui" line="1814"/>
<source>Manual configuration</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1711"/>
<location filename="../src/preferences/preferences.ui" line="1837"/>
<source>HTTP</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1716"/>
<location filename="../src/preferences/preferences.ui" line="1842"/>
<source>SOCKS5</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1729"/>
<location filename="../src/preferences/preferences.ui" line="1855"/>
<source>Port:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1748"/>
<location filename="../src/preferences/preferences.ui" line="1874"/>
<source>Username:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1758"/>
<location filename="../src/preferences/preferences.ui" line="1884"/>
<source>Password:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1768"/>
<location filename="../src/preferences/preferences.ui" line="1894"/>
<source>Don&apos;t use on:</source>
<translation type="unfinished"></translation>
</message>
@ -1921,58 +1956,68 @@ p, li { white-space: pre-wrap; }
<translation>Správca SSL</translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1621"/>
<location filename="../src/preferences/preferences.ui" line="1747"/>
<source>Available translations: </source>
<translation>Dostupné preklady: </translation>
</message>
<message>
<location filename="../src/preferences/preferences.ui" line="1660"/>
<location filename="../src/preferences/preferences.ui" line="1786"/>
<source>In order to change language, you must restart browser.</source>
<translation>K zmene jazyku je potrebný reštart prehliadača.</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="346"/>
<location filename="../src/preferences/preferences.cpp" line="332"/>
<source>OSD Notification</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="333"/>
<source>Drag it on the screen to place it where You want.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="382"/>
<source>Choose download location...</source>
<translation>Vyberte zložku pre sťahovanie...</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="354"/>
<location filename="../src/preferences/preferences.cpp" line="390"/>
<source>Choose background location...</source>
<translation>Zvoľte lokáciu pozadia...</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="469"/>
<location filename="../src/preferences/preferences.cpp" line="505"/>
<source>New Profile</source>
<translation>Nový profil</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="469"/>
<location filename="../src/preferences/preferences.cpp" line="505"/>
<source>Enter the new profile&apos;s name:</source>
<translation>Zadajte nové meno profilu:</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="474"/>
<location filename="../src/preferences/preferences.cpp" line="478"/>
<location filename="../src/preferences/preferences.cpp" line="510"/>
<location filename="../src/preferences/preferences.cpp" line="514"/>
<source>Error!</source>
<translation>Chyba!</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="474"/>
<location filename="../src/preferences/preferences.cpp" line="510"/>
<source>This profile already exists!</source>
<translation>Tento profil existuje!</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="478"/>
<location filename="../src/preferences/preferences.cpp" line="514"/>
<source>Cannot create profile directory!</source>
<translation>Nemožno vytvoriť zložku profilu!</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="492"/>
<location filename="../src/preferences/preferences.cpp" line="528"/>
<source>Confirmation</source>
<translation>Potvrdenie</translation>
</message>
<message>
<location filename="../src/preferences/preferences.cpp" line="493"/>
<location filename="../src/preferences/preferences.cpp" line="529"/>
<source>Are you sure to permanently delete &quot;%1&quot; profile? This action cannot be undone!</source>
<translation>Ste si istý, že chcete permanentne zmazať profil &quot;%1&quot;? Táto akcia sa nebude dať vrátiť späť!</translation>
</message>
@ -2124,7 +2169,7 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="../src/app/appui.cpp" line="259"/>
<source>Toolbars</source>
<translation>Nástroje</translation>
<translation>Nástrojové lišty</translation>
</message>
<message>
<location filename="../src/app/appui.cpp" line="265"/>
@ -2207,22 +2252,17 @@ p, li { white-space: pre-wrap; }
<translation>Poslať odkaz...</translation>
</message>
<message>
<location filename="../src/app/appui.cpp" line="255"/>
<source>RSS Reader</source>
<translation>RSS čítač</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="408"/>
<location filename="../src/app/qupzilla.cpp" line="416"/>
<source>Other</source>
<translation>Ostatné</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="417"/>
<location filename="../src/app/qupzilla.cpp" line="425"/>
<source>Default</source>
<translation>Základné</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="768"/>
<location filename="../src/app/qupzilla.cpp" line="779"/>
<source>Start Private Browsing</source>
<translation>Spustiť anonymné prehliadanie</translation>
</message>
@ -2247,13 +2287,13 @@ p, li { white-space: pre-wrap; }
<translation>Súkromné prehliadanie je zapnuté</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="271"/>
<location filename="../src/app/qupzilla.cpp" line="279"/>
<source>Bookmarks In ToolBar</source>
<translation>Panel záložiek</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="285"/>
<location filename="../src/app/qupzilla.cpp" line="305"/>
<location filename="../src/app/qupzilla.cpp" line="293"/>
<location filename="../src/app/qupzilla.cpp" line="313"/>
<source>Empty</source>
<translation>Prázdny</translation>
</message>
@ -2263,143 +2303,143 @@ p, li { white-space: pre-wrap; }
<translation>Nový panel</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="253"/>
<location filename="../src/app/qupzilla.cpp" line="261"/>
<source>Bookmark &amp;This Page</source>
<translation>Pridať &amp;stránku do záložiek</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="254"/>
<location filename="../src/app/qupzilla.cpp" line="262"/>
<source>Bookmark &amp;All Tabs</source>
<translation>Pridať &amp;všetky panely do záložiek</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="255"/>
<location filename="../src/app/qupzilla.cpp" line="263"/>
<source>Organize &amp;Bookmarks</source>
<translation>&amp;Organizovať záložky</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="322"/>
<location filename="../src/app/qupzilla.cpp" line="330"/>
<source>&amp;Back</source>
<translation>&amp;Späť</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="329"/>
<location filename="../src/app/qupzilla.cpp" line="337"/>
<source>&amp;Forward</source>
<translation>&amp;Dopredu</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="336"/>
<location filename="../src/app/qupzilla.cpp" line="344"/>
<source>&amp;Home</source>
<translation>Do&amp;mov</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="343"/>
<location filename="../src/app/qupzilla.cpp" line="351"/>
<source>Show &amp;All History</source>
<translation>Zobraziť celú &amp;históriu</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="362"/>
<location filename="../src/app/qupzilla.cpp" line="370"/>
<source>Report &amp;Bug</source>
<translation>Nahlásiť &amp;chybu</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="365"/>
<location filename="../src/app/qupzilla.cpp" line="373"/>
<source>About &amp;Qt</source>
<translation>O &amp;Qt</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="366"/>
<location filename="../src/app/qupzilla.cpp" line="374"/>
<source>&amp;About QupZilla</source>
<translation>&amp;O QupZille</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="372"/>
<location filename="../src/app/qupzilla.cpp" line="380"/>
<source>&amp;Web Search</source>
<translation>Hladať na &amp;webu</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="373"/>
<location filename="../src/app/qupzilla.cpp" line="381"/>
<source>Page &amp;Info</source>
<translation>&amp;Informácie o stránke</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="375"/>
<location filename="../src/app/qupzilla.cpp" line="383"/>
<source>&amp;Download Manager</source>
<translation>Správca &amp;sťahovania</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="376"/>
<location filename="../src/app/qupzilla.cpp" line="384"/>
<source>&amp;Cookies Manager</source>
<translation>Správca &amp;cookies</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="377"/>
<location filename="../src/app/qupzilla.cpp" line="385"/>
<source>&amp;AdBlock</source>
<translation>&amp;AdBlock</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="378"/>
<location filename="../src/app/qupzilla.cpp" line="386"/>
<source>RSS &amp;Reader</source>
<translation>&amp;RSS čítač</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="379"/>
<location filename="../src/app/qupzilla.cpp" line="387"/>
<source>Clear Recent &amp;History</source>
<translation>Vymazať nedávnu &amp;históriu</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="380"/>
<location filename="../src/app/qupzilla.cpp" line="388"/>
<source>&amp;Private Browsing</source>
<translation>Súkromné prehlia&amp;danie</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="387"/>
<location filename="../src/app/qupzilla.cpp" line="395"/>
<source>Pr&amp;eferences</source>
<translation>Pr&amp;edvoľby</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="649"/>
<location filename="../src/app/qupzilla.cpp" line="650"/>
<location filename="../src/app/qupzilla.cpp" line="660"/>
<location filename="../src/app/qupzilla.cpp" line="661"/>
<source>Web Inspector</source>
<translation>Web inšpektor</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="692"/>
<location filename="../src/app/qupzilla.cpp" line="703"/>
<source>Open file...</source>
<translation>Otvoriť súbor...</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="755"/>
<location filename="../src/app/qupzilla.cpp" line="766"/>
<source>Are you sure you want to turn on private browsing?</source>
<translation>Ste si istý, že chcete zapnúť súkromné prehliadanie?</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="756"/>
<location filename="../src/app/qupzilla.cpp" line="767"/>
<source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
<translation>So zapnutým súkromným prehliadaním niektoré akcie týkajúce sa súkromia vypnuté:</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="759"/>
<location filename="../src/app/qupzilla.cpp" line="770"/>
<source>Webpages are not added to the history.</source>
<translation>Stránky nie pridávané do histórie.</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="760"/>
<location filename="../src/app/qupzilla.cpp" line="771"/>
<source>New cookies are not stored, but current cookies can be accessed.</source>
<translation>Nové cookies nie prijímané, ale súčasné cookies zasielané.</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="761"/>
<location filename="../src/app/qupzilla.cpp" line="772"/>
<source>Your session won&apos;t be stored.</source>
<translation>Vaša relácia nebude uložená.</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="763"/>
<location filename="../src/app/qupzilla.cpp" line="774"/>
<source>Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
<translation>Dokiaľ nezavriete prehliadač, tak stále môžete používať tlačidla Späť a Dopredu k vráteniu sa na stránky, ktoré ste mali otvorené.</translation>
</message>
<message>
<location filename="../src/app/qupzilla.cpp" line="807"/>
<location filename="../src/app/qupzilla.cpp" line="818"/>
<source>There are still %1 open tabs and your session won&apos;t be stored. Are you sure to quit?</source>
<translation>Stále otvorené %1 panely a Vaša relácia nebude uložená. Skutočne chcete skončiť?</translation>
</message>
@ -2642,7 +2682,7 @@ Prosím pridajte si nejaký kliknutím na RSS ikonku v navigačnom riadku.</tran
<translation>Záložky</translation>
</message>
<message>
<location filename="../src/sidebar/sidebar.cpp" line="46"/>
<location filename="../src/sidebar/sidebar.cpp" line="49"/>
<source>History</source>
<translation>História</translation>
</message>