aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/desktop-utils
diff options
context:
space:
mode:
authorq5sys <jt@xsystems.com>2018-03-28 22:05:27 -0400
committerq5sys <jt@xsystems.com>2018-03-28 22:05:27 -0400
commit5610d8f490a98f2a84e1cb5e02a9cafb4a26964a (patch)
tree380c3cab5688c5a7a327426f420f994e1260d45e /src-qt5/desktop-utils
parentadd option to disbale startup quotes (diff)
parentMinor changes. Removed debug statements. (diff)
downloadlumina-5610d8f490a98f2a84e1cb5e02a9cafb4a26964a.tar.gz
lumina-5610d8f490a98f2a84e1cb5e02a9cafb4a26964a.tar.bz2
lumina-5610d8f490a98f2a84e1cb5e02a9cafb4a26964a.zip
Merge branch 'master' of http://github.com/trueos/lumina
Diffstat (limited to 'src-qt5/desktop-utils')
-rw-r--r--src-qt5/desktop-utils/lumina-pdf/PrintWidget.cpp15
-rw-r--r--src-qt5/desktop-utils/lumina-pdf/mainUI.cpp3
2 files changed, 8 insertions, 10 deletions
diff --git a/src-qt5/desktop-utils/lumina-pdf/PrintWidget.cpp b/src-qt5/desktop-utils/lumina-pdf/PrintWidget.cpp
index 954baf28..013708ac 100644
--- a/src-qt5/desktop-utils/lumina-pdf/PrintWidget.cpp
+++ b/src-qt5/desktop-utils/lumina-pdf/PrintWidget.cpp
@@ -29,8 +29,12 @@ PrintWidget::PrintWidget(Renderer *backend, QWidget *parent) :
}
PrintWidget::~PrintWidget() {
- //delete scene;
- //delete items in pages(?)
+ for (int i = 0; i < pages.size(); i++){
+ scene->removeItem(pages.at(i));
+ }
+ qDeleteAll(pages);
+ pages.clear();
+ scene->deleteLater();
}
//Public Slots
@@ -198,16 +202,13 @@ void PrintWidget::layoutPages() {
for (int j = 0; j < cols && pageNum < numPages; j++) {
double itemWidth = 0, itemHeight = 0;
double pageHeight = pages.at(pageNum)->boundingRect().height();
- //qDebug() << "Row:" << i << "Page Num:" << pageNum << "Columns:" << cols << "Floor Value: " << pageNum / cols << "f(x):" << i + (pageNum / cols);
- for(int k = cols * (pageNum / cols); k < pageNum; k++) {
+ for(int k = cols * (pageNum / cols); k < pageNum; k++)
itemWidth += pages.at(k)->boundingRect().width();
- }
foreach(double size, rowMaxList)
itemHeight += size;
- //qDebug() << pageNum << QPointF(itemWidth, itemHeight);
pages.at(pageNum)->setPos(QPointF(itemWidth, itemHeight));
pageNum++;
rowMax = qMax(rowMax, pageHeight);
@@ -314,7 +315,6 @@ void PrintWidget::fit(bool doFitting) {
this->setTransform(t);
if (doFitting && fitting) {
QRectF viewSceneRect = this->viewportTransform().mapRect(this->viewport()->rect());
- qDebug() << viewSceneRect;
viewSceneRect.moveTop(target.top());
this->ensureVisible(viewSceneRect); // Nah...
}
@@ -344,7 +344,6 @@ void PrintWidget::goToPosition(int pagenum, float x, float y) {
int yConv = int(pt.y() + y*(virtualHeight/realHeight)) - 30;
int xConv = int(pt.x() + x*(virtualHeight/realHeight)) - 30;
- //qDebug() << "Y:" << y << "RATIO:" << virtualHeight/realHeight << "YCONV:" << yConv << "PTY" << pt.y() << "MAX" << vsc->maximum();
if(yConv > vsc->maximum())
vsc->triggerAction(QAbstractSlider::SliderToMaximum);
else if(y != 0)
diff --git a/src-qt5/desktop-utils/lumina-pdf/mainUI.cpp b/src-qt5/desktop-utils/lumina-pdf/mainUI.cpp
index 1c529fbe..aa80489d 100644
--- a/src-qt5/desktop-utils/lumina-pdf/mainUI.cpp
+++ b/src-qt5/desktop-utils/lumina-pdf/mainUI.cpp
@@ -34,6 +34,7 @@ MainUI::MainUI() : QMainWindow(), ui(new Ui::MainUI()){
PROPDIALOG = new PropDialog(BACKEND);
BOOKMARKS = new BookmarkMenu(BACKEND, ui->splitter);
BOOKMARKS->setContextMenuPolicy(Qt::CustomContextMenu);
+ BOOKMARKS->setVisible(false);
WIDGET = new PrintWidget(BACKEND, ui->splitter);
WIDGET->setContextMenuPolicy(Qt::CustomContextMenu);
ui->splitter->setCollapsible(0, true);
@@ -360,7 +361,6 @@ void MainUI::startLoadingPages(int degrees){
BACKEND->clearHash();
WIDGET->setVisible(false);
BOOKMARKS->setVisible(false);
- //qDebug() << "Update Progress Bar";
progress->setRange(0, BACKEND->numPages());
progress->setValue(0);
progAct->setVisible(true);
@@ -516,7 +516,6 @@ void MainUI::updatePageNumber(){
}*/
void MainUI::updateContextMenu(){
- //qDebug() << "UpdateContextMenu";
contextMenu->clear();
contextMenu->addSection( QString(tr("Page %1 of %2")).arg(QString::number(WIDGET->currentPage()),
QString::number(BACKEND->numPages()) ) );
bgstack15