[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bamarok=5D_/=3A_New_=22Preview=22_feature_for_the_Or?=
From:       Mark Kretschmann <kretschmann () kde ! org>
Date:       2011-01-26 10:11:59
Message-ID: 20110126101159.99EA0A6094 () git ! kde ! org
[Download RAW message or body]

Git commit 5d3b22da211b6897d7dde5b90ac897d2f397bf18 by Mark Kretschmann.
Pushed by markey into branch 'master'.

New "Preview" feature for the Organize Collection dialog.

Patch bye Maximilian Güntner <maximilian.guentner@gmail.com>.

REVIEW: 100270

M  +2    -0    ChangeLog     
M  +4    -3    src/dialogs/OrganizeCollectionDialog.cpp     
M  +15   -1    src/dialogs/OrganizeCollectionDialogBase.ui     

http://commits.kde.org/amarok/5d3b22da211b6897d7dde5b90ac897d2f397bf18

diff --git a/ChangeLog b/ChangeLog
index 658b531..f4a3f49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@ Amarok ChangeLog
 
 VERSION 2.4.1
   FEATURES:
+    * New "Preview" feature for the Organize Collection dialog. Patch bye
+      Maximilian Güntner <maximilian.guentner@gmail.com>.
 
   CHANGES:
     * Renewed FilterEditor dialog.
diff --git a/src/dialogs/OrganizeCollectionDialog.cpp \
b/src/dialogs/OrganizeCollectionDialog.cpp index a104c8e..c81f435 100644
--- a/src/dialogs/OrganizeCollectionDialog.cpp
+++ b/src/dialogs/OrganizeCollectionDialog.cpp
@@ -93,9 +93,10 @@ OrganizeCollectionDialog::OrganizeCollectionDialog( const \
                Meta::TrackList &track
     KColorScheme::adjustForeground( p, KColorScheme::NegativeText ); // TODO this \
isn't working, the color is still normal  ui->conflictLabel->setPalette( p );
 
+    connect( ui->previewButton , SIGNAL(clicked(bool)), SLOT(slotUpdatePreview()) );
+    connect( ui->autoPreviewCheck, SIGNAL(toggled(bool)), SLOT(slotUpdatePreview()) \
);  // to show the conflict error
     connect( ui->overwriteCheck, SIGNAL( stateChanged( int ) ), SLOT( \
                slotUpdatePreview() ) );
-
     connect( ui->ignoreTheCheck, SIGNAL(toggled(bool)), SLOT(slotUpdatePreview()) );
     connect( ui->spaceCheck    , SIGNAL(toggled(bool)), SLOT(slotUpdatePreview()) );
     connect( ui->asciiCheck    , SIGNAL(toggled(bool)), SLOT(slotUpdatePreview()) );
@@ -283,7 +284,6 @@ void
 OrganizeCollectionDialog::init()
 {
     populateFormatList();
-    slotUpdatePreview();
 }
 
 void OrganizeCollectionDialog::populateFormatList()
@@ -343,7 +343,8 @@ OrganizeCollectionDialog::slotUpdatePreview()
     mTrackOrganizer->setReplaceSpaces( ui->spaceCheck->isChecked() );
     mTrackOrganizer->setReplace( ui->regexpEdit->text(), ui->replaceEdit->text() );
     mTrackOrganizer->setVfatSafe( ui->vfatCheck->isChecked() );
-    preview( buildFormatString() );
+    if(ui->autoPreviewCheck->isChecked() == true || QObject::sender() == \
ui->previewButton) +        preview( buildFormatString() );
 }
 
 void
diff --git a/src/dialogs/OrganizeCollectionDialogBase.ui \
b/src/dialogs/OrganizeCollectionDialogBase.ui index 2f28102..66420cd 100644
--- a/src/dialogs/OrganizeCollectionDialogBase.ui
+++ b/src/dialogs/OrganizeCollectionDialogBase.ui
@@ -332,6 +332,20 @@ Most people can leave this option enabled as it ensures copying \
to media devices  <item>
        <layout class="QHBoxLayout">
         <item>
+	  <widget class="QPushButton" name="previewButton">
+          <property name="text">
+           <string>Preview</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QCheckBox" name="autoPreviewCheck">
+          <property name="text">
+           <string>Automatic Preview</string>
+          </property>
+         </widget>
+        </item>
+        <item>
          <spacer name="spacer2_2">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
@@ -341,7 +355,7 @@ Most people can leave this option enabled as it ensures copying \
to media devices  </property>
           <property name="sizeHint" stdset="0">
            <size>
-            <width>347</width>
+            <width>150</width>
             <height>20</height>
            </size>
           </property>


[prev in list] [next in list] [prev in thread] [next in thread]