1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 10:46:35 +01:00

Final modifications for 1.0.0-b1 version release

This commit is contained in:
nowrep 2011-04-29 17:47:55 +02:00
parent d77499aa28
commit fb8be5dad0
9 changed files with 18 additions and 9 deletions

View File

@ -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);

View File

@ -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
return true;
// if (rData.contains("0.9.9") || rData.contains("0.9.7") || rData.contains("0.9.8")) // Data not changed from this version
// return true;
dir.mkdir("profiles");
dir.cd("profiles");

View File

@ -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;

View File

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

View File

@ -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;
}
}

View File

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

View File

@ -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

View File

@ -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);

View File

@ -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
}