summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/homepage.cpp1
-rw-r--r--src/previewimage.cpp7
2 files changed, 1 insertions, 7 deletions
diff --git a/src/homepage.cpp b/src/homepage.cpp
index 7d1e2671..d7294aba 100644
--- a/src/homepage.cpp
+++ b/src/homepage.cpp
@@ -295,7 +295,6 @@ QString HomePage::fillClosedTabs()
closed += "<object type=\"application/image-preview\" data=\"";
closed += url.prettyUrl() + "\" width=\"200\">";
closed += "<param name=\"title\" value=\"" + text + "\" />";
- closed += "<param name=\"index\" value=\"" + QString::number(i) + "\" />";
closed += "</object>";
closed += "</div>";
}
diff --git a/src/previewimage.cpp b/src/previewimage.cpp
index 42b275b2..b51631af 100644
--- a/src/previewimage.cpp
+++ b/src/previewimage.cpp
@@ -69,7 +69,7 @@ PreviewImage::PreviewImage(const QUrl &url, const QString &title, int index, boo
setLayout(mainLayout);
loadUrlPreview(url);
- setAlignment(Qt::AlignCenter);
+// setAlignment(Qt::AlignCenter);
}
@@ -123,13 +123,8 @@ void PreviewImage::snapFinished()
loadingSnapshot = false;
QMovie *m = m_imageLabel->movie();
delete m;
-<<<<<<< HEAD
- setMovie(0);
-
-=======
m_imageLabel->setMovie(0);
->>>>>>> STEP 1
m_pixmap = ws->previewImage();
m_imageLabel->setPixmap(m_pixmap);
m_textLabel->setText(m_title);