diff --git a/YACReader/goto_flow.cpp b/YACReader/goto_flow.cpp index f6325b0f..3463e91c 100644 --- a/YACReader/goto_flow.cpp +++ b/YACReader/goto_flow.cpp @@ -47,7 +47,7 @@ GoToFlow::GoToFlow(QWidget *parent,FlowType flowType) connect(toolBar,SIGNAL(goTo(unsigned int)),this,SIGNAL(goToPage(unsigned int))); connect(toolBar,SIGNAL(setCenter(unsigned int)),flow,SLOT(showSlide(unsigned int))); - mainLayout->insertWidget(1,flow); + mainLayout->insertWidget(0,flow); mainLayout->setStretchFactor(flow,1); resize(static_cast(5*imageSize.width()),static_cast(imageSize.height()*1.7)); diff --git a/YACReader/goto_flow_decorationbar.cpp b/YACReader/goto_flow_decorationbar.cpp deleted file mode 100644 index c9ef2fbb..00000000 --- a/YACReader/goto_flow_decorationbar.cpp +++ /dev/null @@ -1,33 +0,0 @@ -#include "goto_flow_decorationbar.h" - -#include -#include - -GoToFlowDecorationBar::GoToFlowDecorationBar(QWidget * parent) -:QWidget(parent) -{ - QHBoxLayout * topBar = new QHBoxLayout(); - - QLabel * imgTopLeft = new QLabel(); - QLabel * imgTopRight = new QLabel(); - QLabel * imgTopMiddle = new QLabel(); - QPixmap pL(":/images/imgTopLeft.png"); - QPixmap pM(":/images/imgTopMiddle.png"); - QPixmap pR(":/images/imgTopRight.png"); - imgTopLeft->setPixmap(pL); - imgTopRight->setPixmap(pR); - imgTopMiddle->setPixmap(pM); - imgTopMiddle->setScaledContents(true); - - topBar->addWidget(imgTopLeft); - topBar->addWidget(imgTopMiddle); - topBar->addWidget(imgTopRight); - topBar->setStretchFactor(imgTopLeft,0); - topBar->setStretchFactor(imgTopMiddle,1); - topBar->setStretchFactor(imgTopRight,0); - - topBar->setMargin(0); - topBar->setSpacing(0); - - setLayout(topBar); -} \ No newline at end of file diff --git a/YACReader/goto_flow_decorationbar.h b/YACReader/goto_flow_decorationbar.h deleted file mode 100644 index 10397124..00000000 --- a/YACReader/goto_flow_decorationbar.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef GOTO_FLOW_DECORATIONBAR_H -#define GOTO_FLOW_DECORATIONBAR_H - -#include - -class GoToFlowDecorationBar : public QWidget -{ - Q_OBJECT - public: - GoToFlowDecorationBar(QWidget * parent = 0); -}; - -#endif \ No newline at end of file diff --git a/YACReader/goto_flow_gl.cpp b/YACReader/goto_flow_gl.cpp index 8f315c7d..746da88b 100644 --- a/YACReader/goto_flow_gl.cpp +++ b/YACReader/goto_flow_gl.cpp @@ -28,7 +28,7 @@ GoToFlowGL::GoToFlowGL(QWidget* parent, FlowType flowType) connect(toolBar,SIGNAL(goTo(unsigned int)),this,SIGNAL(goToPage(unsigned int))); connect(toolBar,SIGNAL(setCenter(unsigned int)),flow,SLOT(setCenterIndex(unsigned int))); - mainLayout->insertWidget(1,flow); + mainLayout->insertWidget(0,flow); mainLayout->setStretchFactor(flow,1); resize(static_cast(5*imageSize.width()),static_cast(imageSize.height()*1.7)); diff --git a/YACReader/goto_flow_widget.cpp b/YACReader/goto_flow_widget.cpp index 1f0c98c8..b9d8ad5c 100644 --- a/YACReader/goto_flow_widget.cpp +++ b/YACReader/goto_flow_widget.cpp @@ -16,10 +16,8 @@ GoToFlowWidget::GoToFlowWidget(QWidget * parent) mainLayout->setMargin(0); mainLayout->setSpacing(0); - topBar = new GoToFlowDecorationBar(this); toolBar = new GoToFlowToolBar(this); - mainLayout->addWidget(topBar); mainLayout->addWidget(toolBar); mainLayout->setMargin(0);