Final modifications for 1.0.0-b1 version release

src/app/appui.cpp

@@ -248,9 +248,11 @@ void QupZilla::setupMenu()
 
     m_actionShowBookmarksSideBar = new QAction(tr("Bookmarks"), this);
     m_actionShowBookmarksSideBar->setCheckable(true);
+    m_actionShowBookmarksSideBar->setShortcut(QKeySequence("Ctrl+B"));
     connect(m_actionShowBookmarksSideBar, SIGNAL(triggered()), this, SLOT(showBookmarksSideBar()));
     m_actionShowHistorySideBar = new QAction(tr("History"), this);
     m_actionShowHistorySideBar->setCheckable(true);
+    m_actionShowHistorySideBar->setShortcut(QKeySequence("Ctrl+H"));
     connect(m_actionShowHistorySideBar, SIGNAL(triggered()), this, SLOT(showHistorySideBar()));
 //    m_actionShowRssSideBar = new QAction(tr("RSS Reader"), this);
 //    m_actionShowRssSideBar->setCheckable(true);

src/app/mainapplication.cpp

@@ -203,6 +203,8 @@ void MainApplication::loadSettings()
     m_websettings->setDefaultTextEncoding("System");
 #ifdef Q_WS_X11
     m_websettings->setWebGraphic(QWebSettings::DefaultFrameIconGraphic, QIcon::fromTheme("text-plain").pixmap(16,16));
+#else
+    m_websettings->setWebGraphic(QWebSettings::DefaultFrameIconGraphic, QPixmap(":icons/locationbar/unknownpage.png");
 #endif
 
     if (allowPersistentStorage) m_websettings->enablePersistentStorage(m_activeProfil);
@@ -613,8 +615,8 @@ bool MainApplication::checkSettingsDir()
     versionFile.write(QupZilla::VERSION.toAscii());
     versionFile.close();
 
-    if (rData.contains("0.9.") || rData.contains("0.9.7") || rData.contains("0.9.8")) // Data not changed from this version
+//    if (rData.contains("0.9.9") || rData.contains("0.9.7") || rData.contains("0.9.8")) // Data not changed from this version
-        return true;
+//        return true;
 
     dir.mkdir("profiles");
     dir.cd("profiles");

src/app/qupzilla.cpp

@@ -348,7 +348,7 @@ void QupZilla::aboutToShowHistoryMenu()
     if (!weView()->history()->canGoForward())
         m_menuHistory->actions().at(1)->setEnabled(false);
 
-    m_menuHistory->addAction(QIcon(":/icons/menu/history.png"), tr("Show &All History"), this, SLOT(showHistoryManager()))->setShortcut(QKeySequence("Ctrl+H"));
+    m_menuHistory->addAction(QIcon(":/icons/menu/history.png"), tr("Show &All History"), this, SLOT(showHistoryManager()));
     m_menuHistory->addSeparator();
 
     QSqlQuery query;

src/app/qupzilla.h

@@ -19,8 +19,7 @@
 #define QUPZILLA_H
 
 //Comment for release building
-#define DEVELOPING
+//#define DEVELOPING
-//Check if i don't fuck anything
 
 #ifdef QT_NO_DEBUG
 #ifdef DEVELOPING

src/desktopnotifications/desktopnotificationsfactory.cpp

@@ -57,8 +57,8 @@ void DesktopNotificationsFactory::notify(const QPixmap &icon, const QString &hea
         m_desktopNotif->move(m_position);
         m_desktopNotif->show();
         break;
-
     case DesktopNative:
+#ifdef Q_WS_X11
         QFile tmp(QDir::tempPath() + "/qupzilla_notif.png");
         tmp.open(QFile::WriteOnly);
         icon.save(tmp.fileName());
@@ -77,6 +77,7 @@ void DesktopNotificationsFactory::notify(const QPixmap &icon, const QString &hea
         QVariantList list = message.arguments();
         if (list.count() > 0)
             m_uint = list.at(0).toInt();
+#endif
         break;
     }
 }

src/desktopnotifications/desktopnotificationsfactory.h

@@ -19,7 +19,9 @@
 #define DESKTOPNOTIFICATIONSFACTORY_H
 
 #include <QObject>
+#ifdef Q_WS_X11
 #include <QDBusInterface>
+#endif
 #include <QStringList>
 #include <QSettings>
 #include <QPoint>

src/downloads/downloadmanager.cpp

@@ -211,8 +211,11 @@ void DownloadManager::downloadFinished(bool success)
     }
 
     if (downloadingAllFilesFinished) {
-        if (success)
+        if (success && qApp->activeWindow() != this) {
             mApp->desktopNotifications()->notify(QPixmap(":icons/notifications/download.png"), tr("Download Finished"), tr("All files has been successfuly downloaded."));
+            raise();
+            activateWindow();
+        }
         ui->speedLabel->clear();
         setWindowTitle(tr("Download Manager"));
 #ifdef W7API

src/preferences/preferences.cpp

@@ -248,7 +248,7 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent) :
 #ifdef Q_WS_X11
         notifyType = settings.value("UseNativeDesktop", true).toBool() ? DesktopNotificationsFactory::DesktopNative : DesktopNotificationsFactory::PopupWidget;
 #else
-        notifTyype = DesktopNotificationsFactory::PopupWidget;
+        notifyType = DesktopNotificationsFactory::PopupWidget;
 #endif
     if (notifyType == DesktopNotificationsFactory::DesktopNative)
         ui->useNativeSystemNotifications->setChecked(true);

src/tools/iconprovider.cpp

@@ -73,7 +73,7 @@ QIcon IconProvider::iconForUrl(const QUrl &url)
 #ifdef Q_WS_X11
     return QIcon::fromTheme("text-plain");
 #else
-    return QIcon(":icons/other/unknownpage.png");
+    return QIcon(":icons/locationbar/unknownpage.png");
 #endif
 }