diff --git a/demo_r2/mainwindow.cpp b/demo_r2/mainwindow.cpp index b7bde34..6f2aa7b 100644 --- a/demo_r2/mainwindow.cpp +++ b/demo_r2/mainwindow.cpp @@ -16,7 +16,7 @@ MainWindow::MainWindow(QWidget *parent) : m_pageNavigator = new QSpinBox(this); m_pageNavigator->setPrefix(tr("Page :")); - ui->toolBar->insertWidget(ui->actionZoomIn,m_scalePercent); + ui->toolBar->insertWidget(ui->actionZoom_Out,m_scalePercent); ui->toolBar->insertWidget(ui->actionNext_Page,m_pageNavigator); connect(m_scalePercent, SIGNAL(currentIndexChanged(QString)), this, SLOT(scaleComboboxChanged(QString))); connect(m_pageNavigator, SIGNAL(valueChanged(int)), this, SLOT(slotPageNavigatorChanged(int))); diff --git a/demo_r2/mainwindow.ui b/demo_r2/mainwindow.ui index 436974c..8475814 100644 --- a/demo_r2/mainwindow.ui +++ b/demo_r2/mainwindow.ui @@ -17,14 +17,17 @@ :/report/images/logo32:/report/images/logo32 + + false + - + Qt::Horizontal - + @@ -107,7 +110,7 @@ 5 - + 0 @@ -240,6 +243,27 @@ + + + + RadioButton + + + + + + + + Tab 1 + + + + + Tab 2 + + + + @@ -247,6 +271,9 @@ toolBar + + Qt::ToolButtonTextBesideIcon + TopToolBarArea @@ -302,7 +329,13 @@ :/images/images/ZoomIn.png:/images/images/ZoomIn.png - Zoom In + + + + + + + Zoom in @@ -311,7 +344,10 @@ :/images/images/ZoomOut.png:/images/images/ZoomOut.png - Zoom Out + + + + Zoom out @@ -347,6 +383,9 @@ :/images/images/First.png:/images/images/First.png + + + First Page @@ -356,6 +395,9 @@ :/images/images/Prev.png:/images/images/Prev.png + + + Prior Page @@ -365,6 +407,9 @@ :/images/images/Next.png:/images/images/Next.png + + + Next Page @@ -374,14 +419,17 @@ :/images/images/Last.png:/images/images/Last.png + + + Last Page - +