diff options
| -rw-r--r-- | src/qmmpui/forms/winfileassocpage.ui | 11 | ||||
| -rw-r--r-- | src/qmmpui/winfileassocpage.cpp | 12 |
2 files changed, 3 insertions, 20 deletions
diff --git a/src/qmmpui/forms/winfileassocpage.ui b/src/qmmpui/forms/winfileassocpage.ui index 1629baccc..a6638cb78 100644 --- a/src/qmmpui/forms/winfileassocpage.ui +++ b/src/qmmpui/forms/winfileassocpage.ui @@ -11,7 +11,7 @@ </rect> </property> <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0" colspan="3"> + <item row="0" column="0" colspan="2"> <widget class="QLabel" name="textLabel"> <property name="text"> <string>Media files handled by Qmmp:</string> @@ -24,7 +24,7 @@ </property> </widget> </item> - <item row="1" column="0" colspan="3"> + <item row="1" column="0" colspan="2"> <widget class="QListWidget" name="listWidget"> <property name="editTriggers"> <set>QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed</set> @@ -51,13 +51,6 @@ </widget> </item> <item row="2" column="1"> - <widget class="QPushButton" name="selectNone"> - <property name="text"> - <string>Select None</string> - </property> - </widget> - </item> - <item row="2" column="2"> <spacer> <property name="orientation"> <enum>Qt::Horizontal</enum> diff --git a/src/qmmpui/winfileassocpage.cpp b/src/qmmpui/winfileassocpage.cpp index 4f0484b0e..58c2b038f 100644 --- a/src/qmmpui/winfileassocpage.cpp +++ b/src/qmmpui/winfileassocpage.cpp @@ -33,12 +33,6 @@ WinFileAssocPage::WinFileAssocPage(QWidget *parent): QWidget(parent) m_ui = new Ui::WinFileAssocPage; m_ui->setupUi(this); - if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA) - { - //Hide Select None - One cannot restore an association in Vista. Go figure. - m_ui->selectNone->hide(); - } - for(QString ext : MetaDataManager::instance()->nameFilters()) { ext.remove("*."); @@ -85,10 +79,7 @@ void WinFileAssocPage::loadAssociations() pItem->setCheckState(Qt::Checked); //Don't allow de-selection in windows VISTA if extension is registered. //VISTA doesn't seem to support extension 'restoration' in the API. - if (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA) - { - pItem->setFlags(Qt::NoItemFlags); - } + pItem->setFlags(Qt::NoItemFlags); } else { @@ -131,7 +122,6 @@ void WinFileAssocPage::saveAssociations() void WinFileAssocPage::createHelp() { m_ui->selectAll->setToolTip(tr("Check all file types in the list")); - m_ui->selectNone->setToolTip(tr("Uncheck all file types in the list")); m_ui->listWidget->setToolTip(tr("Check the media file extensions you would like Qmmp to handle. " "When you click Apply, the checked files will be associated with " "Qmmp. If you uncheck a media type, the file association will " |