v1.0.0-b4

src/app/mainapplication.cpp

@@ -40,24 +40,25 @@
 
 MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cmdActions, int &argc, char **argv)
     : QtSingleApplication("QupZillaWebBrowser", argc, argv)
-    ,m_cookiemanager(0)
+    , m_cookiemanager(0)
-    ,m_browsingLibrary(0)
+    , m_browsingLibrary(0)
-    ,m_historymodel(0)
+    , m_historymodel(0)
-    ,m_websettings(0)
+    , m_websettings(0)
-    ,m_networkmanager(0)
+    , m_networkmanager(0)
-    ,m_cookiejar(0)
+    , m_cookiejar(0)
-    ,m_rssmanager(0)
+    , m_rssmanager(0)
-    ,m_plugins(0)
+    , m_updater(0)
-    ,m_bookmarksModel(0)
+    , m_plugins(0)
-    ,m_downloadManager(0)
+    , m_bookmarksModel(0)
-    ,m_autofill(0)
+    , m_downloadManager(0)
-    ,m_networkCache(new QNetworkDiskCache)
+    , m_autofill(0)
-    ,m_desktopNotifications(0)
+    , m_networkCache(new QNetworkDiskCache)
-    ,m_iconProvider(new IconProvider)
+    , m_desktopNotifications(0)
-    ,m_isClosing(false)
+    , m_iconProvider(new IconProvider)
-    ,m_isStateChanged(false)
+    , m_isClosing(false)
-    ,m_isExited(false)
+    , m_isStateChanged(false)
-    ,m_isRestoring(false)
+    , m_isExited(false)
+    , m_isRestoring(false)
 {
     setOverrideCursor(Qt::WaitCursor);
 #if defined(Q_WS_X11) & !defined(DEVELOPING)
@@ -154,7 +155,9 @@ MainApplication::MainApplication(const QList<CommandLineOptions::ActionPair> &cm
 
     AutoSaver* saver = new AutoSaver();
     connect(saver, SIGNAL(saveApp()), this, SLOT(saveStateSlot()));
-    m_updater = new Updater(qupzilla);
+
+    if (settings2.value("Web-Browser-Settings/CheckUpdates", true).toBool())
+        m_updater = new Updater(qupzilla);
 
     if (noAddons) {
         settings2.setValue("Plugin-Settings/AllowedPlugins", QStringList());

src/app/qupzilla.cpp

@@ -63,6 +63,7 @@ const QString QupZilla::BUILDTIME =  __DATE__" "__TIME__;
 const QString QupZilla::AUTHOR = "nowrep";
 const QString QupZilla::COPYRIGHT = "2010-2011";
 const QString QupZilla::WWWADDRESS = "http://qupzilla.ic.cz";
+const QString QupZilla::WIKIADDRESS = "https://github.com/nowrep/QupZilla/wiki";
 const QString QupZilla::WEBKITVERSION = qWebKitVersion();
 
 QIcon QupZilla::qupzillaIcon()

src/app/qupzilla.h

@@ -82,6 +82,7 @@ public:
     static const QString AUTHOR;
     static const QString COPYRIGHT;
     static const QString WWWADDRESS;
+    static const QString WIKIADDRESS;
     static const QString WEBKITVERSION;
     static QIcon qupzillaIcon();
 

src/downloads/downloaditem.cpp

@@ -229,7 +229,7 @@ void DownloadItem::updateDownloadInfo(double currSpeed, qint64 received, qint64
     QString fileSize = fileSizeToString(total);
 
     if (fileSize == tr("Unknown size"))
-        ui->downloadInfo->setText(tr("%2 of %3 (%4)").arg(currSize, fileSize, speed));
+        ui->downloadInfo->setText(tr("%2 - unknown size (%3)").arg(currSize, speed));
     else
         ui->downloadInfo->setText(tr("Remaining %1 - %2 of %3 (%4)").arg(remTime, currSize, fileSize, speed));
 }

src/network/qupzillaschemehandler.cpp

@@ -132,7 +132,7 @@ QString QupZillaSchemeReply::startPage()
     page.replace("%TITLE%", tr("Start Page"));
     page.replace("%BUTTON-LABEL%", tr("Google Search"));
     page.replace("%SEARCH-BY-GOOGLE%", tr("Search results provided by Google"));
-    page.replace("%WWW%", QupZilla::WWWADDRESS);
+    page.replace("%WWW%", QupZilla::WIKIADDRESS);
     page.replace("%ABOUT-QUPZILLA%", tr("About QupZilla"));
 
     return page;

src/other/updater.cpp

@@ -49,9 +49,9 @@ void Updater::downCompleted(QNetworkReply* reply)
         html.remove("Version:");
         if (html != QupZilla::VERSION) {
             mApp->desktopNotifications()->notify(QPixmap(":icons/qupzillaupdate.png"), tr("Update available"), tr("New version of QupZilla is ready to download."));
-            QAction* action = new QAction(QIcon(":icons/qupzillaupdate.png"), "Update", this);
+//            QAction* action = new QAction(QIcon(":icons/qupzillaupdate.png"), "Update", this);
-            connect(action, SIGNAL(triggered()), this, SLOT(downloadNewVersion()));
+//            connect(action, SIGNAL(triggered()), this, SLOT(downloadNewVersion()));
-            p_QupZilla->menuBar()->addAction(action);
+//            p_QupZilla->menuBar()->addAction(action);
         }
     }
     reply->manager()->deleteLater();

src/preferences/preferences.cpp

@@ -85,6 +85,7 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent) :
     int afterLaunch = settings.value("afterLaunch",1).toInt();
     settings.endGroup();
     ui->afterLaunch->setCurrentIndex(afterLaunch);
+    ui->checkUpdates->setChecked( settings.value("Web-Browser-Settings/CheckUpdates", true).toBool() );
 
     ui->newTabFrame->setVisible(false);
     if (m_newTabUrl.isEmpty())
@@ -509,7 +510,11 @@ void Preferences::deleteProfile()
 void Preferences::startProfileIndexChanged(QString index)
 {
     ui->deleteProfile->setEnabled(m_actProfileName != index);
-    ui->cannotDeleteActiveProfileLabel->setVisible(m_actProfileName == index);
+
+    if (m_actProfileName == index)
+        ui->cannotDeleteActiveProfileLabel->setText(tr("Note: You cannot delete active profile."));
+    else
+        ui->cannotDeleteActiveProfileLabel->setText(" ");
 }
 
 void Preferences::saveSettings()
@@ -604,6 +609,7 @@ void Preferences::saveSettings()
     settings.setValue("PrintElementBackground", ui->printEBackground->isChecked());
     settings.setValue("wheelScrollLines", ui->wheelScroll->value());
     settings.setValue("DoNotTrack", ui->doNotTrack->isChecked());
+    settings.setValue("CheckUpdates", ui->checkUpdates->isChecked());
     //Cache
     settings.setValue("AllowLocalCache", ui->allowCache->isChecked());
     settings.setValue("LocalCacheSize", ui->cacheMB->value());

src/preferences/preferences.ui

@@ -324,24 +324,24 @@
          </item>
         </widget>
        </item>
-       <item row="6" column="0" colspan="2">
+       <item row="7" column="0" colspan="2">
         <widget class="QLabel" name="label_4">
          <property name="text">
           <string>&lt;b&gt;Profiles&lt;/b&gt;</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="1">
+       <item row="8" column="1">
         <widget class="QLabel" name="label_5">
          <property name="text">
           <string>Startup profile:</string>
          </property>
         </widget>
        </item>
-       <item row="7" column="2">
+       <item row="8" column="2">
         <widget class="QComboBox" name="startProfile"/>
        </item>
-       <item row="8" column="2" colspan="2">
+       <item row="9" column="2" colspan="2">
         <widget class="QFrame" name="frame">
          <property name="frameShape">
           <enum>QFrame::NoFrame</enum>
@@ -407,7 +407,7 @@
          </layout>
         </widget>
        </item>
-       <item row="10" column="1">
+       <item row="11" column="1">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -442,7 +442,7 @@
          </layout>
         </widget>
        </item>
-       <item row="5" column="0">
+       <item row="6" column="0">
         <spacer name="verticalSpacer_6">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -455,7 +455,7 @@
          </property>
         </spacer>
        </item>
-       <item row="9" column="1" colspan="2">
+       <item row="10" column="1" colspan="2">
         <widget class="QLabel" name="cannotDeleteActiveProfileLabel">
          <property name="text">
           <string>Note: You cannot delete active profile.</string>
@@ -465,6 +465,13 @@
          </property>
         </widget>
        </item>
+       <item row="5" column="1" colspan="2">
+        <widget class="QCheckBox" name="checkUpdates">
+         <property name="text">
+          <string>Check for updates on start</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="stackedWidgetPage2">