diff --git a/frontend_qt4/barcodeitem.cpp b/frontend_qt4/barcodeitem.cpp index 60de9b6c..dba4329f 100644 --- a/frontend_qt4/barcodeitem.cpp +++ b/frontend_qt4/barcodeitem.cpp @@ -20,7 +20,6 @@ BarcodeItem::BarcodeItem() : QGraphicsItem() { - scaleFactor=1; w=400; h=400; } @@ -37,7 +36,7 @@ QRectF BarcodeItem::boundingRect() const void BarcodeItem::paint(QPainter * painter, const QStyleOptionGraphicsItem * /*option*/, QWidget * /*widget*/) { - bc.render(*painter,boundingRect(),Zint::QZint::IgnoreAspectRatio,scaleFactor); + bc.render(*painter,boundingRect(),Zint::QZint::IgnoreAspectRatio); } diff --git a/frontend_qt4/barcodeitem.h b/frontend_qt4/barcodeitem.h index c15c019e..3f23dc4c 100644 --- a/frontend_qt4/barcodeitem.h +++ b/frontend_qt4/barcodeitem.h @@ -34,7 +34,6 @@ public: public: mutable Zint::QZint bc; - int scaleFactor; int w,h; }; diff --git a/frontend_qt4/mainWindow.ui b/frontend_qt4/mainWindow.ui index 0c2b772b..521d9bd5 100644 --- a/frontend_qt4/mainWindow.ui +++ b/frontend_qt4/mainWindow.ui @@ -276,7 +276,7 @@ - + @@ -302,33 +302,6 @@ p, li { white-space: pre-wrap; } - - - - - Scale factor: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - 1 - - - 16 - - - 1 - - - - - - @@ -355,7 +328,7 @@ p, li { white-space: pre-wrap; } - + @@ -388,7 +361,7 @@ p, li { white-space: pre-wrap; } - + @@ -415,7 +388,7 @@ p, li { white-space: pre-wrap; } - + @@ -458,7 +431,7 @@ p, li { white-space: pre-wrap; } - + @@ -486,7 +459,7 @@ p, li { white-space: pre-wrap; } - + @@ -504,7 +477,7 @@ p, li { white-space: pre-wrap; } - + diff --git a/frontend_qt4/mainwindow.cpp b/frontend_qt4/mainwindow.cpp index cbbb6195..e8cf1c3e 100644 --- a/frontend_qt4/mainwindow.cpp +++ b/frontend_qt4/mainwindow.cpp @@ -59,7 +59,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags fl) connect(heightb, SIGNAL(valueChanged( int )), SLOT(on_generate_clicked())); connect(widthb, SIGNAL(valueChanged( int )), SLOT(on_generate_clicked())); connect(security, SIGNAL(valueChanged( int )), SLOT(on_generate_clicked())); - connect(scaleFactor, SIGNAL(valueChanged( int )), SLOT(on_generate_clicked())); connect(bwidth, SIGNAL(valueChanged( int )), SLOT(on_generate_clicked())); connect(codewords, SIGNAL(valueChanged( int )), SLOT(on_generate_clicked())); connect(iwidth, SIGNAL(valueChanged( int )), SLOT(on_generate_clicked())); @@ -89,7 +88,6 @@ void MainWindow::on_bgcolor_clicked() void MainWindow::on_generate_clicked() { QString error; - m_bc.scaleFactor=scaleFactor->value(); m_bc.w=iwidth->value(); m_bc.h=iheight->value(); m_bc.bc.setText(text->toPlainText());