Added option to compile with WebGL enabled. Closes #7

QupZilla · Oct 13, 2011 · 1859bc0 · 1859bc0
1 parent 6a7811a
commit 1859bc0
Show file tree

Hide file tree

Showing 10 changed files with 983 additions and 983 deletions.
diff --git a/BUILDING b/BUILDING
@@ -50,9 +50,14 @@
      UNRELEASED_BUILD     QupZilla won't check profile version,
                           thus, it won't reset your profile is lower version
                           (disabled by default)
+
+     USE_WEBGL            Enable WebGL. You need to build QupZilla with WebKit built
+                          with WebGL support, otherwise you won't be able to compile
+                          without errors.
+                          (disabled by default)
 
  Windows specific defines
-     W7API                Build QupZilla with Windows 7 API support
+     W7API                Enable Windows 7 API support
                           Requires Microsoft Visual C++ Compiler 2010
                           (disabled by default)
 

diff --git a/bin/locale/cs_CZ.qm b/bin/locale/cs_CZ.qm
diff --git a/bin/locale/sk_SK.qm b/bin/locale/sk_SK.qm
diff --git a/src/QupZilla.pro b/src/QupZilla.pro
@@ -16,8 +16,9 @@ RCC_DIR = ../build
 UI_DIR = ../build
 
 # Please read BUILD informations #
-#win32:DEFINES += UNRELEASED_BUILD
-#win32:DEFINES += NO_SYSTEM_DATAPATH
+#DEFINES += UNRELEASED_BUILD
+#DEFINES += NO_SYSTEM_DATAPATH
+#DEFINES += USE_WEBGL
 #win32:DEFINES += W7API
 
 unix:QT += dbus

diff --git a/src/app/mainapplication.cpp b/src/app/mainapplication.cpp
@@ -242,6 +242,10 @@ void MainApplication::loadSettings()
     m_websettings->setAttribute(QWebSettings::LinksIncludedInFocusChain, linkInFocuschain);
     m_websettings->setAttribute(QWebSettings::ZoomTextOnly, zoomTextOnly);
     m_websettings->setAttribute(QWebSettings::PrintElementBackgrounds, printElBg);
+#ifdef USE_WEBGL
+    m_websettings->setAttribute(QWebSettings::WebGLEnabled , true);
+    m_websettings->setAttribute(QWebSettings::AcceleratedCompositingEnabled, true);
+#endif
 
     m_websettings->setFontFamily(QWebSettings::StandardFont, settings.value("StandardFont", m_websettings->fontFamily(QWebSettings::StandardFont)).toString());
     m_websettings->setFontFamily(QWebSettings::CursiveFont, settings.value("CursiveFont", m_websettings->fontFamily(QWebSettings::CursiveFont)).toString());

diff --git a/src/preferences/sslmanager.ui b/src/preferences/sslmanager.ui
@@ -96,7 +96,7 @@
          <item>
           <widget class="QPushButton" name="deleteButton">
            <property name="text">
-            <string>Delete</string>
+            <string>Remove</string>
            </property>
           </widget>
          </item>
@@ -147,7 +147,7 @@
          <item>
           <widget class="QPushButton" name="deletePath">
            <property name="text">
-            <string>Delete</string>
+            <string>Remove</string>
            </property>
           </widget>
          </item>
@@ -163,12 +163,12 @@
          </property>
         </widget>
        </item>
-       <item row="6" column="0" colspan="2">
+       <item row="7" column="0" colspan="2">
         <layout class="QGridLayout" name="gridLayout_4">
          <item row="1" column="1">
           <widget class="QLabel" name="label_4">
            <property name="text">
-            <string>&lt;b&gt;NOTE:&lt;/b&gt; Setting this option is big security vulnerability!</string>
+            <string>&lt;b&gt;NOTE:&lt;/b&gt; Setting this option is big security risk!</string>
            </property>
            <property name="wordWrap">
             <bool>false</bool>
@@ -213,7 +213,7 @@
          </item>
         </layout>
        </item>
-       <item row="5" column="0" colspan="2">
+       <item row="6" column="0" colspan="2">
         <spacer name="verticalSpacer_4">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -226,10 +226,27 @@
          </property>
         </spacer>
        </item>
+       <item row="5" column="0" colspan="2">
+        <widget class="QLabel" name="label_5">
+         <property name="text">
+          <string>After adding or removing certificate paths, it is neccessary to restart browser in order to changes take effect.</string>
+         </property>
+         <property name="wordWrap">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>
    </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>

diff --git a/translations/cs_CZ.ts b/translations/cs_CZ.ts
@@ -65,7 +65,7 @@ p, li { white-space: pre-wrap; }
         <translation>&lt;p&gt;&lt;b&gt;Ostatní spolupracovníci:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</translation>
     </message>
     <message>
-        <location filename="../src/other/aboutdialog.cpp" line="74"/>
+        <location filename="../src/other/aboutdialog.cpp" line="75"/>
         <source>&lt;p&gt;&lt;b&gt;Thanks to:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</source>
         <translation>&lt;p&gt;&lt;b&gt;Poděkování:&lt;/b&gt;&lt;br/&gt;%1&lt;/p&gt;</translation>
     </message>
@@ -651,7 +651,7 @@ p, li { white-space: pre-wrap; }
         <translation>Platný do:</translation>
     </message>
     <message>
-        <location filename="../src/tools/certificateinfowidget.cpp" line="111"/>
+        <location filename="../src/tools/certificateinfowidget.cpp" line="122"/>
         <source>&lt;not set in certificate&gt;</source>
         <translation>&lt;není součástí certifikátu&gt;</translation>
     </message>
@@ -934,7 +934,7 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../src/downloads/downloaditem.cpp" line="160"/>
-        <location filename="../src/downloads/downloaditem.cpp" line="293"/>
+        <location filename="../src/downloads/downloaditem.cpp" line="287"/>
         <source>Cancelled</source>
         <translation>Zrušeno</translation>
     </message>
@@ -1015,32 +1015,32 @@ p, li { white-space: pre-wrap; }
         <translation>Kopírovat stahovaný odkaz</translation>
     </message>
     <message>
-        <location filename="../src/downloads/downloaditem.cpp" line="290"/>
+        <location filename="../src/downloads/downloaditem.cpp" line="284"/>
         <source>Cancel downloading</source>
         <translation>Zrušit stahování</translation>
     </message>
     <message>
-        <location filename="../src/downloads/downloaditem.cpp" line="291"/>
+        <location filename="../src/downloads/downloaditem.cpp" line="285"/>
         <source>Clear</source>
         <translation>Vyčistit</translation>
     </message>
     <message>
-        <location filename="../src/downloads/downloaditem.cpp" line="293"/>
+        <location filename="../src/downloads/downloaditem.cpp" line="287"/>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
     <message>
-        <location filename="../src/downloads/downloaditem.cpp" line="300"/>
+        <location filename="../src/downloads/downloaditem.cpp" line="294"/>
         <source>New tab</source>
         <translation>Nový panel</translation>
     </message>
     <message>
-        <location filename="../src/downloads/downloaditem.cpp" line="321"/>
+        <location filename="../src/downloads/downloaditem.cpp" line="315"/>
         <source>Not found</source>
         <translation>Soubor neexistuje</translation>
     </message>
     <message>
-        <location filename="../src/downloads/downloaditem.cpp" line="321"/>
+        <location filename="../src/downloads/downloaditem.cpp" line="315"/>
         <source>Sorry, the file 
  %1 
  was not found!</source>
@@ -1049,12 +1049,12 @@ p, li { white-space: pre-wrap; }
 nebyl nalezen!</translation>
     </message>
     <message>
-        <location filename="../src/downloads/downloaditem.cpp" line="336"/>
+        <location filename="../src/downloads/downloaditem.cpp" line="330"/>
         <source>Error: Cannot write to file!</source>
         <translation>Chyba: Nelze zapisovat do souboru!</translation>
     </message>
     <message>
-        <location filename="../src/downloads/downloaditem.cpp" line="348"/>
+        <location filename="../src/downloads/downloaditem.cpp" line="342"/>
         <source>Error: </source>
         <translation>Chyba:</translation>
     </message>
@@ -2274,32 +2274,32 @@ nebyl nalezen!</translation>
 <context>
     <name>QtWin</name>
     <message>
-        <location filename="../src/3rdparty/qtwin.cpp" line="336"/>
+        <location filename="../src/3rdparty/qtwin.cpp" line="337"/>
         <source>Open new tab</source>
         <translation>Otevřít nový panel</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/qtwin.cpp" line="336"/>
+        <location filename="../src/3rdparty/qtwin.cpp" line="337"/>
         <source>Opens a new tab if browser is running</source>
         <translation>Otevře nový panel pokud je prohlížeč spuštěný</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/qtwin.cpp" line="340"/>
+        <location filename="../src/3rdparty/qtwin.cpp" line="341"/>
         <source>Open new window</source>
         <translation>Otevřít nové okno</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/qtwin.cpp" line="340"/>
+        <location filename="../src/3rdparty/qtwin.cpp" line="341"/>
         <source>Opens a new window if browser is running</source>
         <translation>Otevře nové okno pokud je prohlížeč spuštěný</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/qtwin.cpp" line="344"/>
+        <location filename="../src/3rdparty/qtwin.cpp" line="345"/>
         <source>Open download manager</source>
         <translation>Otevřít správce stahování</translation>
     </message>
     <message>
-        <location filename="../src/3rdparty/qtwin.cpp" line="344"/>
+        <location filename="../src/3rdparty/qtwin.cpp" line="345"/>
         <source>Opens a download manager if browser is running</source>
         <translation>Otevře správce stahování pokud je prohlížeč spuštěný</translation>
     </message>
@@ -3063,9 +3063,14 @@ Prosím přidejte si nějaký kliknutím na RSS ikonku v navigačním řádku.</
     <message>
         <location filename="../src/preferences/sslmanager.ui" line="99"/>
         <location filename="../src/preferences/sslmanager.ui" line="150"/>
-        <source>Delete</source>
+        <source>Remove</source>
         <translation>Odstranit</translation>
     </message>
+    <message>
+        <location filename="../src/preferences/sslmanager.ui" line="232"/>
+        <source>After adding or removing certificate paths, it is neccessary to restart browser in order to changes take effect.</source>
+        <translation>Po přidání či odstranění cest k certifikátům je nutné k projevení změn restart prohlížeče.</translation>
+    </message>
     <message>
         <location filename="../src/preferences/sslmanager.ui" line="108"/>
         <source>This is list of Local Certificates stored in user profile. This list also contains all certificates, that have received an exception.</source>
@@ -3088,53 +3093,21 @@ Prosím přidejte si nějaký kliknutím na RSS ikonku v navigačním řádku.</
     </message>
     <message>
         <location filename="../src/preferences/sslmanager.ui" line="171"/>
-        <source>&lt;b&gt;NOTE:&lt;/b&gt; Setting this option is big security vulnerability!</source>
-        <translation>&lt;b&gt;Poznámka&lt;/b&gt; Tato možnost představuje velké bezpečnostní ohrožení!</translation>
+        <source>&lt;b&gt;NOTE:&lt;/b&gt; Setting this option is big security risk!</source>
+        <translation>&lt;b&gt;Poznámka.&lt;/b&gt; Zaškrtnutím této možnosti se vystavujete velikému bezpečnostnímu riziku!</translation>
     </message>
     <message>
         <location filename="../src/preferences/sslmanager.ui" line="210"/>
         <source>Ignore all SSL Warnings</source>
         <translation>Ignorovat všechna SSL varování</translation>
     </message>
     <message>
-        <source>Ignore all warnings</source>
-        <translation type="obsolete">Ignorovat všechna varování</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Organization: &lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Organizace: &lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Domain Name: &lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Doména: &lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Locality Name: &lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Lokalita: &lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Country Name: &lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Země: &lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Verified by: &lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Ověřeno: &lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Expiration Date: &lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;Vyprší: &lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Certificate Informations</source>
-        <translation type="obsolete">Informace o certifikátě</translation>
-    </message>
-    <message>
-        <location filename="../src/preferences/sslmanager.cpp" line="63"/>
+        <location filename="../src/preferences/sslmanager.cpp" line="53"/>
         <source>Choose path...</source>
         <translation>Vyberte cestu...</translation>
     </message>
     <message>
-        <location filename="../src/preferences/sslmanager.cpp" line="133"/>
+        <location filename="../src/preferences/sslmanager.cpp" line="129"/>
         <source>Certificate Informations</source>
         <translation>Informace o certifikátě</translation>
     </message>