Clean up Configurationdialog

Remove all remnants of PictureViewer size.

2 files changed, 0 insertions, 40 deletions

diff --git a/configurationdialog.cpp b/configurationdialog.cpp
index 8a10d4a..fc0102a 100644
--- a/configurationdialog.cpp
+++ b/configurationdialog.cpp
@@ -247,32 +247,14 @@ ConfigurationDialog::ConfigurationDialog(QWidget *parent, Qt::WindowFlags f) : S
     picInfoBox->setLayout(pvInfoL);
 
     //picture viewer - size
-    QDesktopWidget *dw = QApplication::desktop();
-    QSize dSize = dw->availableGeometry().size();
     QFormLayout *pvSizeWHL = new QFormLayout;
-    QGroupBox *pvSizeBox = new QGroupBox(tr("Size"));
-    mPVWidth = new QSpinBox;
-    mPVWidth->setRange(mPVMinSize.width(), dSize.width());
-    mPVHeight = new QSpinBox;
-    mPVHeight->setRange(mPVMinSize.height(), dSize.height());
-    pvSizeWHL->addRow(tr("Width"), mPVWidth);
-    pvSizeWHL->addRow(tr("Height"), mPVHeight);
-    QHBoxLayout *pvSizeButtonLayout = new QHBoxLayout;
-    pvSizeButtonLayout->addStretch();
-    mPVSizeReset = new QPushButton(tr("Reset"));
-    connect(mPVSizeReset, SIGNAL(clicked()), this, SLOT(resetPvSize()));
-    pvSizeButtonLayout->addWidget(mPVSizeReset);
-    pvSizeButtonLayout->addStretch();
     QVBoxLayout *pvSizeL = new QVBoxLayout;
     pvSizeL->addLayout(pvSizeWHL);
-    pvSizeL->addLayout(pvSizeButtonLayout);
-    pvSizeBox->setLayout(pvSizeL);
 
     //picture viewer - layout
     QWidget *picWidget = new QWidget;
     QVBoxLayout *picLayout = new QVBoxLayout;
     picLayout->addWidget(picInfoBox);
-    picLayout->addWidget(pvSizeBox);
     picLayout->addStretch();
     picWidget->setLayout(picLayout);
 
@@ -480,8 +462,6 @@ void ConfigurationDialog::readSettings(){
     //read pictures
     mInfoBox->setCurrentIndex(mInfoBox->findData(s.value("ui/infoposition", TopLeft).toInt()));
     mMapBox->setCurrentIndex(mMapBox->findData(s.value("ui/mappingposition", TopRight).toInt()));
-    mPVWidth->setValue(s.value("ui/pvwidth", mPVMinSize.width()).toInt());
-    mPVHeight->setValue(s.value("ui/pvheight", mPVMinSize.height()).toInt());
 
 	//read database
 	mDatabaseHost->setText(s.value("database/hostname").toString());
@@ -564,8 +544,6 @@ void ConfigurationDialog::writeSettings(){
     s.setValue("ui/infoposition", mPositionMap.value(curPos));
     curPos = mMapBox->currentText();
     s.setValue("ui/mappingposition", mPositionMap.value(curPos));
-    s.setValue("ui/pvwidth", mPVWidth->value());
-    s.setValue("ui/pvheight", mPVHeight->value());
 
 	//write database
 	s.setValue("database/hostname", mDatabaseHost->text());
@@ -660,20 +638,6 @@ void ConfigurationDialog::randomGradientChanged(int state){
     mPVBgColor->setEnabled(state == Qt::Unchecked);
 }
 
-void ConfigurationDialog::resetPvSize(){
-    QDesktopWidget *dw = QApplication::desktop();
-    int width = dw->availableGeometry().width() - 100;
-    if(width < mPVMinSize.width()){
-        width = mPVMinSize.width();
-    }
-    int height = dw->availableGeometry().height() - 100;
-    if(height < mPVMinSize.height()){
-        height = mPVMinSize.height();
-    }
-    mPVWidth->setValue(width);
-    mPVHeight->setValue(height);
-}
-
 void ConfigurationDialog::setColor(QWidget *label){
 	QLabel *curLabel = qobject_cast<QLabel*>(label);
 	if(!curLabel){
diff --git a/configurationdialog.h b/configurationdialog.h
index edd4108..8f2e87b 100644
--- a/configurationdialog.h
+++ b/configurationdialog.h
@@ -10,7 +10,6 @@
 
 #include <QHash>
 #include <QMap>
-#include <QSize>
 
 #include "smdialog.h"
 
@@ -39,7 +38,6 @@ class ConfigurationDialog : public SmDialog {
 		void chooseColor(QWidget *label);
 		void alternateColorsChanged(int);
         void randomGradientChanged(int);
-        void resetPvSize();
 	
 	private:
 		void readSettings();
@@ -81,8 +79,6 @@ class ConfigurationDialog : public SmDialog {
         QCheckBox *mExpensive;
 		QSpinBox *mHoverOpacity;
 		QSpinBox *mCursorOffset;
-        QSpinBox *mPVWidth;
-        QSpinBox *mPVHeight;
         QSpinBox *mAutoRefreshValue;
 		QLabel *mClipboardColor;
 		QLabel *mBaseColor;