removed auto-resize option from column editor

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4827 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 23 insertions, 42 deletions

diff --git a/src/qmmpui/columneditor.cpp b/src/qmmpui/columneditor.cpp
index f41258f09..6afef43b9 100644
--- a/src/qmmpui/columneditor.cpp
+++ b/src/qmmpui/columneditor.cpp
@@ -22,7 +22,7 @@
 #include "columneditor_p.h"
 #include "ui_columneditor.h"
 
-ColumnEditor::ColumnEditor(const QString &name, const QString &patt, bool autoResize, QWidget *parent) :
+ColumnEditor::ColumnEditor(const QString &name, const QString &patt, QWidget *parent) :
     QDialog(parent),
     m_ui(new Ui::ColumnEditor)
 {
@@ -33,7 +33,6 @@ ColumnEditor::ColumnEditor(const QString &name, const QString &patt, bool autoRe
     //load inital values
     m_ui->nameLineEdit->setText(name);
     m_ui->formatLineEdit->setText(patt);
-    m_ui->autoResizeCheckBox->setChecked(autoResize);
 }
 
 ColumnEditor::~ColumnEditor()
@@ -51,11 +50,6 @@ QString ColumnEditor::pattern() const
     return m_ui->formatLineEdit->text();
 }
 
-bool ColumnEditor::autoResize() const
-{
-    return m_ui->autoResizeCheckBox->isChecked();
-}
-
 void ColumnEditor::insertExpression(QAction *a)
 {
     if (m_ui->formatLineEdit->cursorPosition () < 1)
diff --git a/src/qmmpui/columneditor_p.h b/src/qmmpui/columneditor_p.h
index 48e39158e..dc6a2815c 100644
--- a/src/qmmpui/columneditor_p.h
+++ b/src/qmmpui/columneditor_p.h
@@ -34,12 +34,11 @@ class ColumnEditor : public QDialog
 {
     Q_OBJECT
 public:
-    explicit ColumnEditor(const QString &name, const QString &patt, bool autoResize, QWidget *parent = 0);
+    explicit ColumnEditor(const QString &name, const QString &patt, QWidget *parent = 0);
     ~ColumnEditor();
 
     QString name() const;
     QString pattern() const;
-    bool autoResize() const;
 
 private slots:
     void insertExpression(QAction *a);
diff --git a/src/qmmpui/columnmanager.cpp b/src/qmmpui/columnmanager.cpp
index 95c0bb768..f798f48f6 100644
--- a/src/qmmpui/columnmanager.cpp
+++ b/src/qmmpui/columnmanager.cpp
@@ -148,14 +148,12 @@ void ColumnManager::execEditor(int index, QWidget *parent)
     if(!parent)
         parent = qApp->activeWindow();
 
-    ColumnEditor editor(m_columns[index].name, m_columns[index].pattern,
-                        m_columns[index].autoResize, parent);
+    ColumnEditor editor(m_columns[index].name, m_columns[index].pattern, parent);
     if(editor.exec() == QDialog::Accepted)
     {
         m_columns[index].name = editor.name();
         m_columns[index].pattern = editor.pattern();
         m_columns[index].titleFormatter->setPattern(editor.pattern());
-        m_columns[index].autoResize  = editor.autoResize();
         emit changed(index);
     }
 }
diff --git a/src/qmmpui/forms/columneditor.ui b/src/qmmpui/forms/columneditor.ui
index 3506dff5c..9d7ed66ba 100644
--- a/src/qmmpui/forms/columneditor.ui
+++ b/src/qmmpui/forms/columneditor.ui
@@ -6,17 +6,14 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>382</width>
-    <height>192</height>
+    <width>391</width>
+    <height>149</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Edit Column</string>
   </property>
-  <layout class="QFormLayout" name="formLayout">
-   <property name="fieldGrowthPolicy">
-    <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-   </property>
+  <layout class="QGridLayout" name="gridLayout">
    <property name="leftMargin">
     <number>6</number>
    </property>
@@ -33,27 +30,30 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="comboBox"/>
-   </item>
-   <item row="1" column="0">
+   <item row="1" column="0" colspan="2">
     <widget class="QLabel" name="label">
      <property name="text">
       <string>Name:</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="0" column="2">
+    <widget class="QComboBox" name="comboBox"/>
+   </item>
+   <item row="1" column="2">
     <widget class="QLineEdit" name="nameLineEdit"/>
    </item>
-   <item row="3" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Format:</string>
+   <item row="4" column="0" colspan="3">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
-   <item row="3" column="1">
+   <item row="2" column="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLineEdit" name="formatLineEdit"/>
@@ -70,24 +70,14 @@
      </item>
     </layout>
    </item>
-   <item row="7" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="0" colspan="2">
-    <widget class="QCheckBox" name="autoResizeCheckBox">
+   <item row="2" column="0" colspan="2">
+    <widget class="QLabel" name="label_3">
      <property name="text">
-      <string>Auto-scale column with window size</string>
+      <string>Format:</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="0">
+   <item row="3" column="0">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>