From 2132bc9e3478ba2343299a2ab6441d1345fdeb1b Mon Sep 17 00:00:00 2001 From: Arin Alexander Date: Tue, 24 May 2016 01:39:56 +0400 Subject: [PATCH] actionOneToOne fixed --- demo_r2/mainwindow.cpp | 11 ++++++----- demo_r2/mainwindow.h | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/demo_r2/mainwindow.cpp b/demo_r2/mainwindow.cpp index 0df5e6e..23c4d35 100644 --- a/demo_r2/mainwindow.cpp +++ b/demo_r2/mainwindow.cpp @@ -37,6 +37,7 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->actionExport_to_PDF, SIGNAL(triggered()), m_preview, SLOT(printToPDF())); connect(ui->actionPrint_Report, SIGNAL(triggered()), m_preview, SLOT(print())); connect(ui->actionDesign_Report, SIGNAL(triggered()), this, SLOT(slotDesignReport())); + connect(ui->actionOne_to_One, SIGNAL(triggered()), this, SLOT(slotOneToOne())); initPercentCombobox(); enableUI(false); QDesktopWidget *desktop = QApplication::desktop(); @@ -131,10 +132,10 @@ void MainWindow::initPercentCombobox() m_scalePercent->setCurrentIndex(4); } -void MainWindow::on_sbPageNavigator_valueChanged(int arg1) -{ - m_preview->pageNavigatorChanged(arg1); -} +//void MainWindow::on_sbPageNavigator_valueChanged(int arg1) +//{ +// m_preview->pageNavigatorChanged(arg1); +//} void MainWindow::slotDesignReport() { @@ -142,7 +143,7 @@ void MainWindow::slotDesignReport() m_preview->refreshPages(); } -void MainWindow::on_tbOneToOne_clicked() +void MainWindow::slotOneToOne() { m_preview->setScalePercent(100); } diff --git a/demo_r2/mainwindow.h b/demo_r2/mainwindow.h index aa416ab..ceab608 100644 --- a/demo_r2/mainwindow.h +++ b/demo_r2/mainwindow.h @@ -29,9 +29,9 @@ private slots: void slotPageChanged(int page); void slotPageNavigatorChanged(int page); void on_treeWidget_itemClicked(QTreeWidgetItem *item, int); - void on_sbPageNavigator_valueChanged(int arg1); + //void on_sbPageNavigator_valueChanged(int arg1); void slotDesignReport(); - void on_tbOneToOne_clicked(); + void slotOneToOne(); private: template< typename T > void buildReportsTree(const QString &path, T* parentItem)