diff options
author | Andrea Diamantini <adjam7@gmail.com> | 2012-10-16 18:03:28 +0200 |
---|---|---|
committer | Andrea Diamantini <adjam7@gmail.com> | 2012-12-10 02:48:05 +0100 |
commit | 44505a48200f16cc3c299d69383b017dba9ce1a9 (patch) | |
tree | d9e3a955b803598bafcd97a3e78b4f111f744a76 /src/webtab | |
parent | clean up urlbar url loading. We really are lighter now :) (diff) | |
download | rekonq-44505a48200f16cc3c299d69383b017dba9ce1a9.tar.xz |
Re-enable the restore on crash message bar :)
Diffstat (limited to 'src/webtab')
-rw-r--r-- | src/webtab/crashmessagebar.cpp (renamed from src/webtab/messagebar.cpp) | 10 | ||||
-rw-r--r-- | src/webtab/crashmessagebar.h (renamed from src/webtab/messagebar.h) | 12 | ||||
-rw-r--r-- | src/webtab/webtab.cpp | 6 | ||||
-rw-r--r-- | src/webtab/webtab.h | 3 |
4 files changed, 16 insertions, 15 deletions
diff --git a/src/webtab/messagebar.cpp b/src/webtab/crashmessagebar.cpp index 0e89ac56..11eefa41 100644 --- a/src/webtab/messagebar.cpp +++ b/src/webtab/crashmessagebar.cpp @@ -3,7 +3,7 @@ * This file is a part of the rekonq project * * Copyright (C) 2010-2011 by Pierre Rossi <pierre dot rossi at gmail dot com> -* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com> +* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com> * * * This program is free software; you can redistribute it and/or @@ -26,8 +26,8 @@ // Self Includes -#include "messagebar.h" -#include "messagebar.moc" +#include "crashmessagebar.h" +#include "crashmessagebar.moc" // KDE Includes #include <KIcon> @@ -38,7 +38,7 @@ #include <QAction> -MessageBar::MessageBar(const QString &message, QWidget *parent) +CrashMessageBar::CrashMessageBar(const QString &message, QWidget *parent) : KMessageWidget(parent) { connect(this, SIGNAL(accepted()), this, SLOT(hideAndDelete())); @@ -64,7 +64,7 @@ MessageBar::MessageBar(const QString &message, QWidget *parent) } -void MessageBar::hideAndDelete() +void CrashMessageBar::hideAndDelete() { animatedHide(); deleteLater(); diff --git a/src/webtab/messagebar.h b/src/webtab/crashmessagebar.h index bbf5d5d4..3bbc12ab 100644 --- a/src/webtab/messagebar.h +++ b/src/webtab/crashmessagebar.h @@ -3,7 +3,7 @@ * This file is a part of the rekonq project * * Copyright (C) 2010-2011 by Pierre Rossi <pierre dot rossi at gmail dot com> -* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com> +* Copyright (C) 2011-2012 by Andrea Diamantini <adjam7 at gmail dot com> * * * This program is free software; you can redistribute it and/or @@ -25,8 +25,8 @@ * ============================================================ */ -#ifndef MESSAGEBAR_H -#define MESSAGEBAR_H +#ifndef CRASH_MESSAGE_BAR_H +#define CRASH_MESSAGE_BAR_H // Rekonq Includes #include "rekonq_defines.h" @@ -35,12 +35,12 @@ #include <KMessageWidget> -class REKONQ_TESTS_EXPORT MessageBar : public KMessageWidget +class REKONQ_TESTS_EXPORT CrashMessageBar : public KMessageWidget { Q_OBJECT public: - explicit MessageBar(const QString & message, QWidget *parent); + explicit CrashMessageBar(const QString & message, QWidget *parent); private Q_SLOTS: void hideAndDelete(); @@ -51,4 +51,4 @@ Q_SIGNALS: }; -#endif // MESSAGEBAR_H +#endif // CRASH_MESSAGE_BAR_H diff --git a/src/webtab/webtab.cpp b/src/webtab/webtab.cpp index 1a4c0fe2..549fa285 100644 --- a/src/webtab/webtab.cpp +++ b/src/webtab/webtab.cpp @@ -37,7 +37,7 @@ #include "sessionmanager.h" #include "syncmanager.h" -#include "messagebar.h" +#include "crashmessagebar.h" #include "previewselectorbar.h" #include "searchenginebar.h" #include "walletbar.h" @@ -279,9 +279,9 @@ void WebTab::setPart(KParts::ReadOnlyPart *p, const KUrl &u) } -void WebTab::showMessageBar() +void WebTab::showCrashMessageBar() { - MessageBar *msgBar = new MessageBar(i18n("It seems rekonq was not closed properly. Do you want " + CrashMessageBar *msgBar = new CrashMessageBar(i18n("It seems rekonq was not closed properly. Do you want " "to restore the last saved session?"), this); qobject_cast<QVBoxLayout *>(layout())->insertWidget(0, msgBar); diff --git a/src/webtab/webtab.h b/src/webtab/webtab.h index a0e6890d..2773dc12 100644 --- a/src/webtab/webtab.h +++ b/src/webtab/webtab.h @@ -75,6 +75,8 @@ public: void createPreviewSelectorBar(int index); void hideSelectorBar(); + void showCrashMessageBar(); + bool isPageLoading(); KParts::ReadOnlyPart *part(); @@ -86,7 +88,6 @@ private Q_SLOTS: void createWalletBar(const QString &, const QUrl &); - void showMessageBar(); void loadFinished(); void showSearchEngineBar(); |