From 436aad0ab7cd4850f6c60228d6cd9298a9cd00de Mon Sep 17 00:00:00 2001
From: trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>
Date: Thu, 30 Apr 2015 18:11:02 +0000
Subject: fixed build

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@4880 90c681e8-e032-0410-971d-27865f9a5e38
---
 src/plugins/Ui/skinned/forms/skinnedsettings.ui | 119 +++++++++++++-----------
 src/qmmpui/configdialog.cpp                     |  29 ------
 src/qmmpui/configdialog.h                       |   3 +-
 3 files changed, 64 insertions(+), 87 deletions(-)

(limited to 'src')

diff --git a/src/plugins/Ui/skinned/forms/skinnedsettings.ui b/src/plugins/Ui/skinned/forms/skinnedsettings.ui
index a896a5428..04192048c 100644
--- a/src/plugins/Ui/skinned/forms/skinnedsettings.ui
+++ b/src/plugins/Ui/skinned/forms/skinnedsettings.ui
@@ -377,21 +377,61 @@
           <string>Song Display</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_3">
-          <item row="0" column="0">
-           <widget class="QCheckBox" name="protocolCheckBox">
+          <item row="6" column="0">
+           <widget class="QCheckBox" name="showNewPLCheckBox">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
             <property name="text">
-             <string>Show protocol</string>
+             <string>Show 'New Playlist' button</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QCheckBox" name="numbersCheckBox">
+          <item row="9" column="0">
+           <widget class="QCheckBox" name="popupCheckBox">
             <property name="text">
-             <string>Show song numbers</string>
+             <string>Show popup information</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
+          <item row="7" column="0">
+           <layout class="QHBoxLayout" name="horizontalLayout_2">
+            <item>
+             <widget class="QLabel" name="label_4">
+              <property name="text">
+               <string>Playlist separator:</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QLineEdit" name="plSeplineEdit">
+              <property name="enabled">
+               <bool>false</bool>
+              </property>
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_3">
+              <property name="orientation">
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item row="3" column="0">
            <widget class="QCheckBox" name="alignCheckBox">
             <property name="enabled">
              <bool>false</bool>
@@ -401,28 +441,28 @@
             </property>
            </widget>
           </item>
-          <item row="3" column="0">
+          <item row="4" column="0">
            <widget class="QCheckBox" name="anchorCheckBox">
             <property name="text">
              <string>Show anchor</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
-           <widget class="QCheckBox" name="playlistsCheckBox">
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="numbersCheckBox">
             <property name="text">
-             <string>Show playlists</string>
+             <string>Show song numbers</string>
             </property>
            </widget>
           </item>
-          <item row="8" column="0">
-           <widget class="QCheckBox" name="popupCheckBox">
+          <item row="0" column="0">
+           <widget class="QCheckBox" name="protocolCheckBox">
             <property name="text">
-             <string>Show popup information</string>
+             <string>Show protocol</string>
             </property>
            </widget>
           </item>
-          <item row="9" column="0">
+          <item row="10" column="0">
            <layout class="QHBoxLayout" name="horizontalLayout_3">
             <item>
              <widget class="QPushButton" name="popupTemplateButton">
@@ -449,50 +489,17 @@
             </item>
            </layout>
           </item>
-          <item row="6" column="0">
-           <layout class="QHBoxLayout" name="horizontalLayout_2">
-            <item>
-             <widget class="QLabel" name="label_4">
-              <property name="text">
-               <string>Playlist separator:</string>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <widget class="QLineEdit" name="plSeplineEdit">
-              <property name="enabled">
-               <bool>false</bool>
-              </property>
-              <property name="sizePolicy">
-               <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                <horstretch>0</horstretch>
-                <verstretch>0</verstretch>
-               </sizepolicy>
-              </property>
-             </widget>
-            </item>
-            <item>
-             <spacer name="horizontalSpacer_3">
-              <property name="orientation">
-               <enum>Qt::Horizontal</enum>
-              </property>
-              <property name="sizeHint" stdset="0">
-               <size>
-                <width>40</width>
-                <height>20</height>
-               </size>
-              </property>
-             </spacer>
-            </item>
-           </layout>
-          </item>
           <item row="5" column="0">
-           <widget class="QCheckBox" name="showNewPLCheckBox">
-            <property name="enabled">
-             <bool>false</bool>
+           <widget class="QCheckBox" name="playlistsCheckBox">
+            <property name="text">
+             <string>Show playlists</string>
             </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="lengthsCheckBox">
             <property name="text">
-             <string>Show 'New Playlist' button</string>
+             <string>Show song lengths</string>
             </property>
            </widget>
           </item>
diff --git a/src/qmmpui/configdialog.cpp b/src/qmmpui/configdialog.cpp
index d0dff6626..ff49f87bb 100644
--- a/src/qmmpui/configdialog.cpp
+++ b/src/qmmpui/configdialog.cpp
@@ -290,27 +290,6 @@ void ConfigDialog::on_informationButton_clicked()
 
 void ConfigDialog::createMenus()
 {
-    QMenu *titleMenu = new QMenu(this);
-
-    titleMenu->addAction(tr("Artist"))->setData("%p");
-    titleMenu->addAction(tr("Album"))->setData("%a");
-    titleMenu->addAction(tr("Album artist"))->setData("%aa");
-    titleMenu->addAction(tr("Title"))->setData("%t");
-    titleMenu->addAction(tr("Track number"))->setData("%n");
-    titleMenu->addAction(tr("Two-digit track number"))->setData("%NN");
-    titleMenu->addAction(tr("Genre"))->setData("%g");
-    titleMenu->addAction(tr("Comment"))->setData("%c");
-    titleMenu->addAction(tr("Composer"))->setData("%C");
-    titleMenu->addAction(tr("Disc number"))->setData("%D");
-    titleMenu->addAction(tr("File name"))->setData("%f");
-    titleMenu->addAction(tr("File path"))->setData("%F");
-    titleMenu->addAction(tr("Year"))->setData("%y");
-    titleMenu->addAction(tr("Condition"))->setData("%if(%p&%t,%p - %t,%f)");
-
-    m_ui->titleButton->setMenu(titleMenu);
-    m_ui->titleButton->setPopupMode(QToolButton::InstantPopup);
-    connect(titleMenu, SIGNAL(triggered (QAction *)), SLOT(addTitleString(QAction *)));
-
     QMenu *groupMenu = new QMenu(this);
 
     groupMenu->addAction(tr("Artist"))->setData("%p");
@@ -381,14 +360,6 @@ void ConfigDialog::loadLanguages()
     m_ui->langComboBox->setCurrentIndex(index);
 }
 
-void ConfigDialog::addTitleString(QAction * a)
-{
-    if (m_ui->formatLineEdit->cursorPosition () < 1)
-        m_ui->formatLineEdit->insert(a->data().toString());
-    else
-        m_ui->formatLineEdit->insert(" - "+a->data().toString());
-}
-
 void ConfigDialog::addGroupString(QAction *a)
 {
     if (m_ui->groupLineEdit->cursorPosition () < 1)
diff --git a/src/qmmpui/configdialog.h b/src/qmmpui/configdialog.h
index 150c3f216..ccbaa43f4 100644
--- a/src/qmmpui/configdialog.h
+++ b/src/qmmpui/configdialog.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2007-2014 by Ilya Kotov                                 *
+ *   Copyright (C) 2007-2015 by Ilya Kotov                                 *
  *   forkotov02@hotmail.ru                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -62,7 +62,6 @@ private slots:
     void on_contentsWidget_currentItemChanged (QListWidgetItem *current, QListWidgetItem *previous);
     void on_preferencesButton_clicked();
     void on_informationButton_clicked();
-    void addTitleString(QAction *a);
     void addGroupString(QAction *a);
     void saveSettings();
     void on_treeWidget_itemChanged (QTreeWidgetItem *item, int column);
-- 
cgit v1.2.3-13-gbd6f