Added option to load user stylesheet on every pages, some small fixes in

download manager, crash fix on clicktoflash and updated translations
2024-11-11 01:22:10 +01:00 · 2011-05-10 21:25:31 +02:00 · 2011-05-10 21:25:31 +02:00 · bac1f5d78d
commit bac1f5d78d
parent 85daf062d4
15 changed files with 1101 additions and 1037 deletions
--- a/bin/locale/cs_CZ.qm
+++ b/bin/locale/cs_CZ.qm
--- a/src/app/commandlineoptions.cpp
+++ b/src/app/commandlineoptions.cpp
@ -53,7 +53,7 @@ void CommandLineOptions::parseActions()
    using namespace std;

    bool found = false;
-    // Skip first argument (program itself)
+    // Skip first argument (it should be program itself)
    for (int i = 1; i < m_argc; i++) {
        QString arg(m_argv[i]);
        if (arg == "-h" || arg == "-help") {
--- a/src/app/mainapplication.cpp
+++ b/src/app/mainapplication.cpp
@ -71,6 +71,7 @@ MainApplication::MainApplication(int &argc, char **argv)
    QUrl startUrl("");
    QString message;
    QString startProfile;
+
    if (argc > 1) {
        CommandLineOptions cmd(argc, argv);
        QList<QPair<int, QString> > cmdActions = cmd.getActions();
@ -179,6 +180,7 @@ void MainApplication::loadSettings()
    bool printElBg = settings.value("PrintElementBackground", true).toBool();
    int maxCachedPages = settings.value("maximumCachedPages",3).toInt();
    int scrollingLines = settings.value("wheelScrollLines", wheelScrollLines()).toInt();
+    QUrl userStyleSheet = settings.value("userStyleSheet", QUrl()).toUrl();
    settings.endGroup();

    m_websettings->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
@ -202,6 +204,7 @@ void MainApplication::loadSettings()
    m_websettings->setFontSize(QWebSettings::DefaultFontSize, settings.value("DefaultFontSize", m_websettings->fontSize(QWebSettings::DefaultFontSize)).toInt() );
    m_websettings->setFontSize(QWebSettings::DefaultFixedFontSize, settings.value("FixedFontSize", m_websettings->fontSize(QWebSettings::DefaultFixedFontSize)).toInt() );

+    m_websettings->setUserStyleSheetUrl(userStyleSheet);
    m_websettings->setDefaultTextEncoding("System");
 #ifdef Q_WS_X11
    m_websettings->setWebGraphic(QWebSettings::DefaultFrameIconGraphic, QIcon::fromTheme("text-plain").pixmap(16,16));
--- a/src/app/mainapplication.h
+++ b/src/app/mainapplication.h
@ -69,9 +69,10 @@ public:
    inline QString getActiveLanguage() { return m_activeLanguage; }
    inline bool isClosing() { return m_isClosing; }
    inline bool isExited() { return m_isExited; }
+    inline int windowCount() { return m_mainWindows.count(); }
+
    bool checkSettingsDir();
    void checkProfile(QString path);
-    inline int windowCount() { return m_mainWindows.count(); }

    QupZilla* getWindow();
    BookmarksManager* bookmarksManager();
--- a/src/app/qupzilla.cpp
+++ b/src/app/qupzilla.cpp
@ -204,9 +204,11 @@ void QupZilla::setupUi()

    m_actionExitFullscreen = new QAction(tr("Exit Fullscreen"),this);
    m_actionExitFullscreen->setVisible(false);
+    QWidget* _spacer = new QWidget();
+    _spacer->setMinimumWidth(4);
+    m_navigation->addWidget(_spacer); //Elegant spacer -,-
    m_navigation->addAction(m_actionExitFullscreen);
    m_navigation->addWidget(m_supMenu);
-    m_navigation->addWidget(new QLabel()); //Elegant spacer -,-
    m_navigation->setContextMenuPolicy(Qt::CustomContextMenu);

    m_progressBar = new ProgressBar(statusBar());
@ -446,7 +448,7 @@ void QupZilla::loadSettings()
    m_bookmarksToolbar->setVisible(showBookmarksToolbar);
    m_navigation->setVisible(showNavigationToolbar);
    menuBar()->setVisible(showMenuBar);
-    m_navigation->actions().at(m_navigation->actions().count()-2)->setVisible(!showMenuBar);
+    m_navigation->actions().at(m_navigation->actions().count() - 1)->setVisible(!showMenuBar);

    m_buttonHome->setVisible(showHomeIcon);
    m_buttonBack->setVisible(showBackForwardIcons);
@ -974,7 +976,7 @@ void QupZilla::showMenubar()
        showNavigationToolbar();

    menuBar()->setVisible(!menuBar()->isVisible());
-    m_navigation->actions().at(m_navigation->actions().count()-2)->setVisible(!menuBar()->isVisible());
+    m_navigation->actions().at(m_navigation->actions().count() - 1)->setVisible(!menuBar()->isVisible());

    QSettings settings(activeProfil()+"settings.ini", QSettings::IniFormat);
    settings.setValue("Browser-View-Settings/showMenubar", menuBar()->isVisible());
--- a/src/downloads/downloaditem.cpp
+++ b/src/downloads/downloaditem.cpp
@ -24,13 +24,14 @@

 //#define DOWNMANAGER_DEBUG

-DownloadItem::DownloadItem(QListWidgetItem* item, QNetworkReply* reply, QString path, QString fileName, QPixmap fileIcon, bool openAfterFinishedDownload, QWidget* parent)
+DownloadItem::DownloadItem(QListWidgetItem* item, QNetworkReply* reply, QString path, QString fileName, QPixmap fileIcon, QTime* timer, bool openAfterFinishedDownload, QWidget* parent)
    : QWidget(parent)
   ,ui(new Ui::DownloadItem)
   ,m_item(item)
   ,m_reply(reply)
   ,m_path(path)
   ,m_fileName(fileName)
+   ,m_downTimer(timer)
   ,m_downUrl(reply->url())
   ,m_downloadPage(QUrl())
   ,m_downloading(false)
@ -72,7 +73,6 @@ DownloadItem::DownloadItem(QListWidgetItem* item, QNetworkReply* reply, QString
    connect(ui->button, SIGNAL(clicked(QPoint)), this, SLOT(stop()));

    m_downloading = true;
-    m_downTimer.start();
    m_timer.start(1000*1, this);
    readyRead();
    QTimer::singleShot(500, this, SLOT(updateDownload()));
@ -147,7 +147,7 @@ void DownloadItem::downloadProgress(qint64 received, qint64 total)
    }
    ui->progressBar->setValue(currentValue);
    ui->progressBar->setMaximum(totalValue);
-    m_currSpeed = received * 1000.0 / m_downTimer.elapsed();
+    m_currSpeed = received * 1000.0 / m_downTimer->elapsed();
    m_received = received;
    m_total = total;
 }
@ -370,4 +370,5 @@ DownloadItem::~DownloadItem()
 {
    delete ui;
    delete m_item;
+    delete m_downTimer;
 }
--- a/src/downloads/downloaditem.h
+++ b/src/downloads/downloaditem.h
@ -42,7 +42,7 @@ class DownloadItem : public QWidget
    Q_OBJECT

 public:
-    explicit DownloadItem(QListWidgetItem* item, QNetworkReply* reply ,QString path, QString fileName, QPixmap fileIcon, bool openAfterFinishedDownload, QWidget* parent = 0);
+    explicit DownloadItem(QListWidgetItem* item, QNetworkReply* reply, QString path, QString fileName, QPixmap fileIcon, QTime* timer, bool openAfterFinishedDownload, QWidget* parent = 0);
    bool isDownloading() { return m_downloading; }
    bool isCancelled();
    QTime remainingTime() { return m_remTime; }
@ -84,7 +84,7 @@ private:
    QNetworkReply* m_reply;
    QString m_path;
    QString m_fileName;
-    QTime m_downTimer;
+    QTime* m_downTimer;
    QTime m_remTime;
    QBasicTimer m_timer;
    QFile m_outputFile;
--- a/src/downloads/downloadmanager.cpp
+++ b/src/downloads/downloadmanager.cpp
@ -144,6 +144,8 @@ void DownloadManager::download(const QNetworkRequest &request, bool askWhatToDo)
 //////////////////////////////////////////////////////
 void DownloadManager::handleUnsupportedContent(QNetworkReply* reply, bool askWhatToDo)
 {
+    m_htimer = new QTime();
+    m_htimer->start();
    m_h_fileName = getFileName(reply);
    m_hreply = reply;

@ -167,6 +169,8 @@ void DownloadManager::optionsDialogAccepted(int finish)
    m_hOpenFileChoosed = false;
    switch (finish) {
    case 0:  //Cancelled
+        if (m_htimer)
+            delete m_htimer;
        return;
        break;
    case 1: //Open
@ -201,6 +205,8 @@ void DownloadManager::fileNameChoosed(const QString &name)
    m_huserFileName = name;
    if (m_huserFileName.isEmpty()) {
        m_hreply->abort();
+        if (m_htimer)
+            delete m_htimer;
        return;
    }

@ -220,7 +226,7 @@ void DownloadManager::fileNameChoosed(const QString &name)
    settings.endGroup();

    QListWidgetItem* item = new QListWidgetItem(ui->list);
-    DownloadItem* downItem = new DownloadItem(item, m_hreply, m_hpath, m_hfileName, m_hfileIcon, m_hOpenFileChoosed, this);
+    DownloadItem* downItem = new DownloadItem(item, m_hreply, m_hpath, m_hfileName, m_hfileIcon, m_htimer, m_hOpenFileChoosed, this);
    connect(downItem, SIGNAL(deleteItem(DownloadItem*)), this, SLOT(deleteItem(DownloadItem*)));
    connect(downItem, SIGNAL(downloadFinished(bool)), this, SLOT(downloadFinished(bool)));
    ui->list->setItemWidget(item, downItem);
@ -253,7 +259,7 @@ void DownloadManager::downloadFinished(bool success)

    if (downloadingAllFilesFinished) {
        if (success && qApp->activeWindow() != this) {
-            mApp->desktopNotifications()->notify(QPixmap(":icons/notifications/download.png"), tr("Download Finished"), tr("All files has been successfuly downloaded."));
+            mApp->desktopNotifications()->notify(QPixmap(":icons/notifications/download.png"), tr("Download Finished"), tr("All files have been successfuly downloaded."));
            raise();
            activateWindow();
        }
--- a/src/downloads/downloadmanager.h
+++ b/src/downloads/downloadmanager.h
@ -92,6 +92,7 @@ private:
    bool m_isClosing;

    // Variables used by HandleUnsupportContent:
+    QTime* m_htimer;
    QString m_hpath;
    QString m_hfileName;
    QString m_huserFileName;
--- a/src/plugins/clicktoflash.cpp
+++ b/src/plugins/clicktoflash.cpp
@ -51,16 +51,6 @@ ClickToFlash::ClickToFlash(const QUrl &pluginUrl, const QStringList &argumentNam
        , m_argumentValues(argumentValues)
        , m_url(pluginUrl)
 {
-    //AdBlock
-    AdBlockManager* manager = AdBlockManager::instance();
-    if (manager->isEnabled()) {
-        QString urlString = pluginUrl.toEncoded();
-        AdBlockSubscription* subscription = manager->subscription();
-        if (!subscription->allow(urlString) && subscription->block(urlString)) {
-            QTimer::singleShot(200, this, SLOT(hideAdBlocked()));
-            return;
-        }
-    }
    QHBoxLayout* horizontalLayout;
    QFrame* frame;
    QHBoxLayout* horizontalLayout_2;
@ -71,6 +61,18 @@ ClickToFlash::ClickToFlash(const QUrl &pluginUrl, const QStringList &argumentNam
    frame->setContentsMargins(0,0,0,0);
    horizontalLayout_2 = new QHBoxLayout(frame);
    toolButton = new QToolButton(frame);
+
+    //AdBlock
+    AdBlockManager* manager = AdBlockManager::instance();
+    if (manager->isEnabled()) {
+        QString urlString = pluginUrl.toEncoded();
+        AdBlockSubscription* subscription = manager->subscription();
+        if (!subscription->allow(urlString) && subscription->block(urlString)) {
+            QTimer::singleShot(200, this, SLOT(hideAdBlocked()));
+            return;
+        }
+    }
+
    toolButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
    toolButton->setStyleSheet("QToolButton { background: url(:/icons/other/flash.png) no-repeat;\n"
        "background-position: center; border: none;}\n"
--- a/src/preferences/preferences.cpp
+++ b/src/preferences/preferences.cpp
@ -207,6 +207,10 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent) :
    ui->deleteCookiesOnClose->setChecked( settings.value("deleteCookiesOnClose", false).toBool() );
    ui->matchExactly->setChecked( settings.value("allowCookiesFromVisitedDomainOnly",false).toBool() );
    ui->filterTracking->setChecked( settings.value("filterTrackingCookie",false).toBool() );
+
+    //CSS Style
+    ui->userStyleSheet->setText( settings.value("userStyleSheet", "").toString() );
+    connect(ui->chooseUserStylesheet, SIGNAL(clicked()), this, SLOT(chooseUserStyleClicked()));
    settings.endGroup();

    //DOWNLOADS
@ -396,6 +400,14 @@ void Preferences::chooseBackgroundPath()
    updateBgLabel();
 }

+void Preferences::chooseUserStyleClicked()
+{
+    QString file = QFileDialog::getOpenFileName(p_QupZilla, tr("Choose stylesheet location..."), QDir::homePath(), "*.css");
+    if (file.isEmpty())
+        return;
+    ui->userStyleSheet->setText(file);
+}
+
 void Preferences::newTabChanged()
 {
    if (ui->newTab->currentIndex() == 2)
@ -633,6 +645,8 @@ void Preferences::saveSettings()
    //Cache
    settings.setValue("AllowLocalCache", ui->allowCache->isChecked());
    settings.setValue("LocalCacheSize", ui->cacheMB->value());
+    //CSS Style
+    settings.setValue("userStyleSheet", ui->userStyleSheet->text());

    //PRIVACY
    //Web storage
--- a/src/preferences/preferences.h
+++ b/src/preferences/preferences.h
@ -56,6 +56,7 @@ private slots:
    void resetBackground();
    void chooseColor();
    void openSslManager();
+    void chooseUserStyleClicked();

    void allowJavaScriptChanged(bool stat);
    void saveHistoryChanged(bool stat);
--- a/src/preferences/preferences.ui
+++ b/src/preferences/preferences.ui
@ -784,288 +784,485 @@
     </widget>
     <widget class="QWidget" name="stackedWidgetPage4">
      <layout class="QGridLayout" name="gridLayout_9">
-       <item row="0" column="0" colspan="2">
-        <layout class="QGridLayout" name="gridLayout">
-         <item row="6" column="1" colspan="2">
-          <widget class="QCheckBox" name="loadImages">
-           <property name="text">
-            <string>Load images</string>
-           </property>
-          </widget>
-         </item>
-         <item row="5" column="1" colspan="2">
-          <widget class="QCheckBox" name="allowJava">
-           <property name="text">
-            <string>Allow JAVA</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1" colspan="2">
-          <widget class="QCheckBox" name="allowJavaScript">
-           <property name="text">
-            <string>Allow  JavaScript</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="0" colspan="4">
-          <widget class="QLabel" name="label_9">
-           <property name="text">
-            <string>&lt;b&gt;WebKit&lt;/b&gt;</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1" colspan="2">
-          <widget class="QCheckBox" name="allowPlugins">
-           <property name="text">
-            <string>Allow Plugins (Flash plugin)</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="1" colspan="2">
-          <widget class="QCheckBox" name="blockPopup">
-           <property name="text">
-            <string>Block PopUp windows</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="0">
-          <spacer name="horizontalSpacer_10">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Fixed</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item row="2" column="1" colspan="2">
-          <widget class="QCheckBox" name="allowDNSPrefetch">
-           <property name="text">
-            <string>Allow DNS Prefetch</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="3">
-          <widget class="QCheckBox" name="jscanAccessClipboard">
-           <property name="text">
-            <string>JavaScript can access clipboard</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="3">
-          <widget class="QCheckBox" name="linksInFocusChain">
-           <property name="text">
-            <string>Include links in focus chain</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="3">
-          <widget class="QCheckBox" name="zoomTextOnly">
-           <property name="text">
-            <string>Zoom text only</string>
-           </property>
-          </widget>
-         </item>
-         <item row="4" column="3">
-          <widget class="QCheckBox" name="printEBackground">
-           <property name="text">
-            <string>Print element background</string>
-           </property>
-          </widget>
-         </item>
-         <item row="6" column="3">
-          <layout class="QHBoxLayout" name="horizontalLayout_7">
-           <item>
-            <widget class="QLabel" name="label_14">
-             <property name="text">
-              <string>Wheel scrolls</string>
-             </property>
-            </widget>
+       <item row="0" column="0">
+        <widget class="QTabWidget" name="tabWidget">
+         <property name="currentIndex">
+          <number>0</number>
+         </property>
+         <widget class="QWidget" name="tab">
+          <attribute name="title">
+           <string>Web Configuration</string>
+          </attribute>
+          <layout class="QGridLayout" name="gridLayout_18">
+           <item row="0" column="0">
+            <layout class="QGridLayout" name="gridLayout">
+             <item row="5" column="0" colspan="2">
+              <widget class="QCheckBox" name="loadImages">
+               <property name="text">
+                <string>Load images</string>
+               </property>
+              </widget>
+             </item>
+             <item row="4" column="0" colspan="2">
+              <widget class="QCheckBox" name="allowJava">
+               <property name="text">
+                <string>Allow JAVA</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0" colspan="2">
+              <widget class="QCheckBox" name="allowJavaScript">
+               <property name="text">
+                <string>Allow  JavaScript</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0" colspan="2">
+              <widget class="QCheckBox" name="allowPlugins">
+               <property name="text">
+                <string>Allow Plugins (Flash plugin)</string>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="0" colspan="2">
+              <widget class="QCheckBox" name="blockPopup">
+               <property name="text">
+                <string>Block PopUp windows</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0" colspan="2">
+              <widget class="QCheckBox" name="allowDNSPrefetch">
+               <property name="text">
+                <string>Allow DNS Prefetch</string>
+               </property>
+              </widget>
+             </item>
+             <item row="5" column="2">
+              <layout class="QHBoxLayout" name="horizontalLayout_7">
+               <item>
+                <spacer name="horizontalSpacer_28">
+                 <property name="orientation">
+                  <enum>Qt::Horizontal</enum>
+                 </property>
+                 <property name="sizeHint" stdset="0">
+                  <size>
+                   <width>40</width>
+                   <height>20</height>
+                  </size>
+                 </property>
+                </spacer>
+               </item>
+              </layout>
+             </item>
+             <item row="6" column="0" colspan="2">
+              <widget class="QCheckBox" name="jscanAccessClipboard">
+               <property name="text">
+                <string>JavaScript can access clipboard</string>
+               </property>
+              </widget>
+             </item>
+             <item row="7" column="0" colspan="2">
+              <widget class="QCheckBox" name="doNotTrack">
+               <property name="text">
+                <string>Send Do Not Track header to servers</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="2">
+              <widget class="QCheckBox" name="zoomTextOnly">
+               <property name="text">
+                <string>Zoom text only</string>
+               </property>
+              </widget>
+             </item>
+             <item row="8" column="0">
+              <widget class="QCheckBox" name="linksInFocusChain">
+               <property name="text">
+                <string>Include links in focus chain</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="2">
+              <widget class="QCheckBox" name="printEBackground">
+               <property name="text">
+                <string>Print element background</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
           </item>
-           <item>
-            <widget class="QSpinBox" name="wheelScroll">
-             <property name="minimum">
-              <number>1</number>
-             </property>
-            </widget>
+           <item row="1" column="0">
+            <layout class="QHBoxLayout" name="horizontalLayout_11">
+             <item>
+              <widget class="QLabel" name="label_14">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>Mouse wheel scrolls</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QSpinBox" name="wheelScroll">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="minimum">
+                <number>1</number>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QLabel" name="label_26">
+               <property name="text">
+                <string>lines on page</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
           </item>
-           <item>
-            <widget class="QLabel" name="label_26">
-             <property name="text">
-              <string>lines</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <spacer name="horizontalSpacer_28">
+           <item row="2" column="0">
+            <spacer name="verticalSpacer_9">
             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
+              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
-               <width>40</width>
-               <height>20</height>
+               <width>20</width>
+               <height>40</height>
              </size>
             </property>
            </spacer>
           </item>
          </layout>
-         </item>
-         <item row="5" column="3">
-          <widget class="QCheckBox" name="doNotTrack">
-           <property name="text">
-            <string>Send Do Not Track header to servers</string>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_22">
-         <property name="text">
-          <string>&lt;b&gt;Network Cache&lt;/b&gt;</string>
-         </property>
+         </widget>
+         <widget class="QWidget" name="tab_2">
+          <attribute name="title">
+           <string>Local Storage</string>
+          </attribute>
+          <layout class="QGridLayout" name="gridLayout_19">
+           <item row="0" column="0" colspan="2">
+            <layout class="QGridLayout" name="gridLayout_4">
+             <item row="0" column="0" colspan="2">
+              <widget class="QLabel" name="label_10">
+               <property name="text">
+                <string>Maximum pages in cache: </string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="2">
+              <widget class="QLabel" name="pageCacheLabel">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="minimumSize">
+                <size>
+                 <width>20</width>
+                 <height>0</height>
+                </size>
+               </property>
+               <property name="text">
+                <string>1</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="3">
+              <widget class="QFrame" name="frame_2">
+               <property name="frameShape">
+                <enum>QFrame::NoFrame</enum>
+               </property>
+               <property name="frameShadow">
+                <enum>QFrame::Raised</enum>
+               </property>
+               <layout class="QHBoxLayout" name="horizontalLayout_6">
+                <property name="leftMargin">
+                 <number>0</number>
+                </property>
+                <property name="topMargin">
+                 <number>6</number>
+                </property>
+                <property name="rightMargin">
+                 <number>0</number>
+                </property>
+                <property name="bottomMargin">
+                 <number>6</number>
+                </property>
+                <item>
+                 <widget class="QSlider" name="pagesInCache">
+                  <property name="maximum">
+                   <number>20</number>
+                  </property>
+                  <property name="orientation">
+                   <enum>Qt::Horizontal</enum>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item row="1" column="0" colspan="4">
+              <widget class="QCheckBox" name="allowCache">
+               <property name="text">
+                <string>Allow storing network cache on disk</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QFrame" name="cacheFrame">
+               <layout class="QHBoxLayout" name="horizontalLayout_5">
+                <item>
+                 <widget class="QLabel" name="label_21">
+                  <property name="text">
+                   <string>Maximum </string>
+                  </property>
+                 </widget>
+                </item>
+                <item>
+                 <widget class="QLabel" name="MBlabel">
+                  <property name="text">
+                   <string>50 MB</string>
+                  </property>
+                 </widget>
+                </item>
+               </layout>
+              </widget>
+             </item>
+             <item row="2" column="3">
+              <widget class="QSlider" name="cacheMB">
+               <property name="minimum">
+                <number>10</number>
+               </property>
+               <property name="sliderPosition">
+                <number>50</number>
+               </property>
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </item>
+           <item row="1" column="0" colspan="2">
+            <layout class="QGridLayout" name="gridLayout_3">
+             <item row="0" column="0" colspan="3">
+              <widget class="QCheckBox" name="storeIcons">
+               <property name="text">
+                <string>Allow storing web icons</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0" colspan="3">
+              <widget class="QCheckBox" name="saveHistory">
+               <property name="text">
+                <string>Allow saving history</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QCheckBox" name="deleteHistoryOnClose">
+               <property name="text">
+                <string>Delete history on close</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <spacer name="horizontalSpacer_4">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item row="2" column="2">
+              <spacer name="horizontalSpacer_23">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </item>
+           <item row="2" column="0">
+            <spacer name="verticalSpacer_11">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="tab_3">
+          <attribute name="title">
+           <string>Proxy Configuration</string>
+          </attribute>
+          <layout class="QGridLayout" name="gridLayout_20">
+           <item row="0" column="0" rowspan="2" colspan="2">
+            <layout class="QGridLayout" name="manualProxyLayout">
+             <item row="3" column="1">
+              <widget class="QComboBox" name="proxyType">
+               <item>
+                <property name="text">
+                 <string>HTTP</string>
+                </property>
+               </item>
+               <item>
+                <property name="text">
+                 <string>SOCKS5</string>
+                </property>
+               </item>
+              </widget>
+             </item>
+             <item row="3" column="2" colspan="2">
+              <layout class="QHBoxLayout" name="horizontalLayout_9">
+               <item>
+                <widget class="QLineEdit" name="proxyServer"/>
+               </item>
+               <item>
+                <widget class="QLabel" name="label_37">
+                 <property name="text">
+                  <string>Port:</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QLineEdit" name="proxyPort">
+                 <property name="maximumSize">
+                  <size>
+                   <width>50</width>
+                   <height>16777215</height>
+                  </size>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+             <item row="4" column="1">
+              <widget class="QLabel" name="label_38">
+               <property name="text">
+                <string>Username:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="4" column="2">
+              <widget class="QLineEdit" name="proxyUsername"/>
+             </item>
+             <item row="5" column="1">
+              <widget class="QLabel" name="label_39">
+               <property name="text">
+                <string>Password:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="5" column="2">
+              <widget class="QLineEdit" name="proxyPassword"/>
+             </item>
+             <item row="6" column="2" colspan="2">
+              <widget class="QLineEdit" name="proxyExceptions"/>
+             </item>
+             <item row="4" column="3">
+              <spacer name="horizontalSpacer_3">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>40</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+             <item row="6" column="1">
+              <widget class="QLabel" name="label_40">
+               <property name="text">
+                <string>Don't use on:</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0" colspan="3">
+              <widget class="QRadioButton" name="manualProxy">
+               <property name="text">
+                <string>Manual configuration</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0" colspan="3">
+              <widget class="QRadioButton" name="systemProxy">
+               <property name="text">
+                <string>System proxy configuration</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="0" colspan="3">
+              <widget class="QRadioButton" name="noProxy">
+               <property name="text">
+                <string>Do not use proxy</string>
+               </property>
+              </widget>
+             </item>
+             <item row="5" column="0">
+              <spacer name="horizontalSpacer_29">
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Fixed</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>20</width>
+                 <height>20</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </item>
+           <item row="2" column="0">
+            <spacer name="verticalSpacer_14">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
        </widget>
       </item>
-       <item row="2" column="0">
-        <layout class="QGridLayout" name="gridLayout_4">
-         <item row="0" column="0">
-          <spacer name="horizontalSpacer_12">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Fixed</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item row="0" column="1" colspan="2">
-          <widget class="QLabel" name="label_10">
-           <property name="text">
-            <string>Maximum pages in cache: </string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="3">
-          <widget class="QLabel" name="pageCacheLabel">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>20</width>
-             <height>0</height>
-            </size>
-           </property>
-           <property name="text">
-            <string>1</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="4">
-          <widget class="QFrame" name="frame_2">
-           <property name="frameShape">
-            <enum>QFrame::NoFrame</enum>
-           </property>
-           <property name="frameShadow">
-            <enum>QFrame::Raised</enum>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout_6">
-            <property name="leftMargin">
-             <number>0</number>
-            </property>
-            <property name="topMargin">
-             <number>6</number>
-            </property>
-            <property name="rightMargin">
-             <number>0</number>
-            </property>
-            <property name="bottomMargin">
-             <number>6</number>
-            </property>
-            <item>
-             <widget class="QSlider" name="pagesInCache">
-              <property name="maximum">
-               <number>20</number>
-              </property>
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item row="1" column="1" colspan="4">
-          <widget class="QCheckBox" name="allowCache">
-           <property name="text">
-            <string>Allow storing network cache on disk</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="2">
-          <widget class="QFrame" name="cacheFrame">
-           <layout class="QHBoxLayout" name="horizontalLayout_5">
-            <item>
-             <widget class="QLabel" name="label_21">
-              <property name="text">
-               <string>Maximum </string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLabel" name="MBlabel">
-              <property name="text">
-               <string>50 MB</string>
-              </property>
-             </widget>
-            </item>
-           </layout>
-          </widget>
-         </item>
-         <item row="2" column="4">
-          <widget class="QSlider" name="cacheMB">
-           <property name="minimum">
-            <number>10</number>
-           </property>
-           <property name="sliderPosition">
-            <number>50</number>
-           </property>
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </item>
-       <item row="3" column="0" colspan="2">
-        <spacer name="verticalSpacer_9">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
      </layout>
     </widget>
     <widget class="QWidget" name="page_2">
@ -1380,93 +1577,6 @@
         </property>
        </spacer>
       </item>
-       <item row="2" column="0">
-        <layout class="QGridLayout" name="gridLayout_3">
-         <item row="0" column="0" colspan="4">
-          <widget class="QLabel" name="label_15">
-           <property name="text">
-            <string>&lt;b&gt;Web storage&lt;/b&gt;</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1" colspan="3">
-          <widget class="QCheckBox" name="storeIcons">
-           <property name="text">
-            <string>Allow storing web icons</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1" colspan="3">
-          <widget class="QCheckBox" name="saveHistory">
-           <property name="text">
-            <string>Allow saving history</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="2">
-          <widget class="QCheckBox" name="deleteHistoryOnClose">
-           <property name="text">
-            <string>Delete history on close</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1">
-          <spacer name="horizontalSpacer_4">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item row="1" column="0">
-          <spacer name="horizontalSpacer_22">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Fixed</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item row="3" column="3">
-          <spacer name="horizontalSpacer_23">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item row="3" column="0">
-        <spacer name="verticalSpacer_12">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
       <item row="0" column="0">
        <layout class="QGridLayout" name="gridLayout_2">
         <item row="0" column="0" colspan="4">
@ -1787,35 +1897,7 @@
         </property>
        </widget>
       </item>
-       <item row="4" column="0" colspan="3">
-        <widget class="QLabel" name="label_36">
-         <property name="text">
-          <string>&lt;b&gt;Proxy Configuration&lt;/b&gt;</string>
-         </property>
-        </widget>
-       </item>
-       <item row="5" column="1" colspan="2">
-        <widget class="QRadioButton" name="systemProxy">
-         <property name="text">
-          <string>System proxy configuration</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="1" colspan="2">
-        <widget class="QRadioButton" name="noProxy">
-         <property name="text">
-          <string>Do not use proxy</string>
-         </property>
-        </widget>
-       </item>
       <item row="7" column="1" colspan="2">
-        <widget class="QRadioButton" name="manualProxy">
-         <property name="text">
-          <string>Manual configuration</string>
-         </property>
-        </widget>
-       </item>
-       <item row="9" column="1" colspan="2">
        <spacer name="verticalSpacer_13">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
@ -1828,90 +1910,29 @@
         </property>
        </spacer>
       </item>
-       <item row="8" column="1" colspan="3">
-        <layout class="QGridLayout" name="manualProxyLayout">
-         <item row="0" column="0">
-          <widget class="QComboBox" name="proxyType">
-           <item>
-            <property name="text">
-             <string>HTTP</string>
-            </property>
-           </item>
-           <item>
-            <property name="text">
-             <string>SOCKS5</string>
-            </property>
-           </item>
-          </widget>
-         </item>
-         <item row="0" column="1" colspan="2">
-          <layout class="QHBoxLayout" name="horizontalLayout_9">
-           <item>
-            <widget class="QLineEdit" name="proxyServer"/>
-           </item>
-           <item>
-            <widget class="QLabel" name="label_37">
-             <property name="text">
-              <string>Port:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLineEdit" name="proxyPort">
-             <property name="maximumSize">
-              <size>
-               <width>50</width>
-               <height>16777215</height>
-              </size>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_38">
-           <property name="text">
-            <string>Username:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="1">
-          <widget class="QLineEdit" name="proxyUsername"/>
-         </item>
-         <item row="2" column="0">
-          <widget class="QLabel" name="label_39">
-           <property name="text">
-            <string>Password:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="2" column="1">
-          <widget class="QLineEdit" name="proxyPassword"/>
-         </item>
-         <item row="3" column="0">
-          <widget class="QLabel" name="label_40">
-           <property name="text">
-            <string>Don't use on:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="3" column="1" colspan="2">
-          <widget class="QLineEdit" name="proxyExceptions"/>
-         </item>
-         <item row="1" column="2">
-          <spacer name="horizontalSpacer_3">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
+       <item row="4" column="0" colspan="2">
+        <widget class="QLabel" name="label_9">
+         <property name="text">
+          <string>&lt;b&gt;User CSS StyleSheet&lt;/b&gt;</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1" colspan="3">
+        <widget class="QLabel" name="label_15">
+         <property name="text">
+          <string>StyleSheet automatically loaded with all websites: </string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <widget class="QLineEdit" name="userStyleSheet"/>
+       </item>
+       <item row="6" column="2">
+        <widget class="QToolButton" name="chooseUserStylesheet">
+         <property name="text">
+          <string>...</string>
+         </property>
+        </widget>
       </item>
      </layout>
     </widget>
--- a/translations/cs_CZ.ts
+++ b/translations/cs_CZ.ts
--- a/translations/sk_SK.ts
+++ b/translations/sk_SK.ts