[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [Amarok] Use a QPlainTextEdit for the comment field in the
From: Nikolaj Hald Nielsen <nhnFreespirit () gmail ! com>
Date: 2009-08-10 19:31:06
Message-ID: 200908102330.n7ANUKFa023232 () Wurst ! kollide ! net
[Download RAW message or body]
commit 80af45cd491e5e30b6638147b2caab3cbb98ed1e
Author: Nikolaj Hald Nielsen <nhnFreespirit@gmail.com>
AuthorDate: Mon Aug 10 21:27:08 2009 +0200
Commit: Nikolaj Hald Nielsen <nhnFreespirit@gmail.com>
CommitDate: Mon Aug 10 21:29:37 2009 +0200
Use a QPlainTextEdit for the comment field in the tag edit dialog.
This insures that any special formatting is immediately stripped from text pasted \
or dragged to the edit. BUG: 188270
diff --git a/src/dialogs/TagDialog.cpp b/src/dialogs/TagDialog.cpp
index 11d37be..e15622e 100644
--- a/src/dialogs/TagDialog.cpp
+++ b/src/dialogs/TagDialog.cpp
@@ -546,7 +546,7 @@ TagDialog::guessFromFilename() //SLOT
if( !guesser.track().isNull() )
ui->qSpinBox_track->setValue( guesser.track().toInt() );
if( !guesser.comment().isNull() )
- ui->kTextEdit_comment->setText( guesser.comment() );
+ ui->qPlainTextEdit_comment->setPlainText( guesser.comment() );
if( !guesser.year().isNull() )
ui->qSpinBox_year->setValue( guesser.year().toInt() );
@@ -664,7 +664,7 @@ void TagDialog::init()
connect( ui->qSpinBox_track, SIGNAL( valueChanged( int ) ), \
SLOT(checkModified()) );
connect( ui->qSpinBox_year, SIGNAL( valueChanged( int ) ), \
SLOT(yearModified()) );
connect( ui->qSpinBox_score, SIGNAL( valueChanged( int ) ), \
SLOT(scoreModified()) );
- connect( ui->kTextEdit_comment, SIGNAL( textChanged() ), \
SLOT(commentModified()) ); + connect( ui->qPlainTextEdit_comment, SIGNAL( \
textChanged() ), SLOT(commentModified()) );
connect( ui->kTextEdit_lyrics, SIGNAL( textChanged() ), \
SLOT(checkModified()) );
connect( ui->kTextEdit_selectedLabels, SIGNAL( textChanged() ), \
SLOT(checkModified()) );
connect( ui->qSpinBox_discNumber, SIGNAL( valueChanged( int ) ), \
SLOT(discNumberModified()) ); @@ -887,7 +887,7 @@ void TagDialog::readTags()
ui->qSpinBox_year->setValue( m_currentTrack->year()->name().toInt() );
ui->qSpinBox_score->setValue( static_cast<int>(m_currentTrack->score()) );
ui->qSpinBox_discNumber->setValue( m_currentTrack->discNumber() );
- ui->kTextEdit_comment->setText( Qt::escape( m_currentTrack->comment() ) );
+ ui->qPlainTextEdit_comment->setPlainText( Qt::escape( m_currentTrack->comment() \
) );
QString summaryText, statisticsText;
const QString body2cols = "<tr><td><nobr>%1</nobr></td><td><b>%2</b></td></tr>";
@@ -958,7 +958,7 @@ void TagDialog::readTags()
ui->qSpinBox_track->setEnabled( editable );
ui->qSpinBox_discNumber->setEnabled( editable );
ui->qSpinBox_year->setEnabled( editable );
- ui->kTextEdit_comment->setEnabled( editable );
+ ui->qPlainTextEdit_comment->setEnabled( editable );
ui->kTextEdit_selectedLabels->setEnabled( editable );
m_labelCloud->view()->setEnabled( editable );
ui->ratingWidget->setEnabled( true );
@@ -999,7 +999,7 @@ TagDialog::setMultipleTracksMode()
ui->kComboBox_genre->setItemText( ui->kComboBox_genre->currentIndex(), "" );
ui->kComboBox_composer->setItemText( ui->kComboBox_composer->currentIndex(), "" \
); ui->kLineEdit_title->setText( "" );
- ui->kTextEdit_comment->setText( "" );
+ ui->qPlainTextEdit_comment->setPlainText( "" );
ui->qSpinBox_track->setValue( ui->qSpinBox_track->minimum() );
ui->qSpinBox_discNumber->setValue( ui->qSpinBox_discNumber->minimum() );
ui->qSpinBox_year->setValue( ui->qSpinBox_year->minimum() );
@@ -1120,7 +1120,7 @@ TagDialog::readMultipleTracks()
if( comment )
{
m_currentData.insert( Meta::Field::COMMENT, first.value( \
Meta::Field::COMMENT ) );
- ui->kTextEdit_comment->setText( first.value( Meta::Field::COMMENT \
).toString() ); + ui->qPlainTextEdit_comment->setPlainText( first.value( \
Meta::Field::COMMENT ).toString() ); }
if( composer )
{
@@ -1218,7 +1218,7 @@ TagDialog::changes()
modified |= ui->qSpinBox_discNumber->value() != m_currentData.value( \
Meta::Field::DISCNUMBER ).toInt();
modified |= !equalString( ui->kComboBox_composer->lineEdit()->text(), \
m_currentData.value( Meta::Field::COMPOSER ).toString() );
- modified |= !equalString( ui->kTextEdit_comment->toPlainText(), \
m_currentData.value( Meta::Field::COMMENT ).toString() ); + modified |= \
!equalString( ui->qPlainTextEdit_comment->toPlainText(), m_currentData.value( \
Meta::Field::COMMENT ).toString() );
if( !m_tracks.count() || m_perTrack )
{ //ignore these on MultipleTracksMode
@@ -1276,8 +1276,8 @@ TagDialog::storeTags( const Meta::TrackPtr &track )
map.insert( Meta::Field::ARTIST, ui->kComboBox_artist->currentText() );
if ( !track->album() || ui->kComboBox_album->currentText() != \
track->album()->name() )
map.insert( Meta::Field::ALBUM, ui->kComboBox_album->currentText() );
- if ( ui->kTextEdit_comment->toPlainText() != track->comment() )
- map.insert( Meta::Field::COMMENT, ui->kTextEdit_comment->toPlainText() \
); + if ( ui->qPlainTextEdit_comment->toPlainText() != track->comment() )
+ map.insert( Meta::Field::COMMENT, \
ui->qPlainTextEdit_comment->toPlainText() );
if ( !track->genre() || ui->kComboBox_genre->currentText() != \
track->genre()->name() )
map.insert( Meta::Field::GENRE, ui->kComboBox_genre->currentText() );
if ( ui->qSpinBox_track->value() != track->trackNumber() )
@@ -1568,7 +1568,7 @@ TagDialog::applyToAllTracks()
if( m_fieldEdited.contains( "comment" ) && m_fieldEdited[ "comment" ] )
{
- data.insert( Meta::Field::COMMENT, ui->kTextEdit_comment->toPlainText() \
); + data.insert( Meta::Field::COMMENT, \
ui->qPlainTextEdit_comment->toPlainText() ); changed |= TagDialog::TAGSCHANGED;
}
diff --git a/src/dialogs/TagDialogBase.ui b/src/dialogs/TagDialogBase.ui
index 84fea1a..a2aff5f 100644
--- a/src/dialogs/TagDialogBase.ui
+++ b/src/dialogs/TagDialogBase.ui
@@ -28,7 +28,7 @@
<item>
<widget class="KTabWidget" name="kTabWidget">
<property name="currentIndex">
- <number>0</number>
+ <number>1</number>
</property>
<property name="currentPage" stdset="0">
<number>4</number>
@@ -170,7 +170,7 @@
</property>
</widget>
</item>
- <item row="0" column="1">
+ <item row="0" column="2">
<widget class="KLineEdit" name="kLineEdit_title"/>
</item>
<item row="1" column="0">
@@ -186,7 +186,7 @@
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="1" column="2">
<widget class="KComboBox" name="kComboBox_artist">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -215,7 +215,7 @@
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="2" column="2">
<widget class="KComboBox" name="kComboBox_composer">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -241,7 +241,7 @@
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="3" column="2">
<layout class="QHBoxLayout">
<item>
<widget class="KComboBox" name="kComboBox_album">
@@ -318,7 +318,7 @@
</property>
</widget>
</item>
- <item row="4" column="1">
+ <item row="4" column="2">
<widget class="KComboBox" name="kComboBox_genre">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -350,7 +350,7 @@
</property>
</widget>
</item>
- <item row="5" column="1">
+ <item row="5" column="2">
<layout class="QHBoxLayout">
<item>
<widget class="QSpinBox" name="qSpinBox_track">
@@ -416,22 +416,15 @@
<property name="wordWrap">
<bool>false</bool>
</property>
- <property name="buddy">
- <cstring>kTextEdit_comment</cstring>
- </property>
- </widget>
- </item>
- <item row="6" column="1">
- <widget class="KTextEdit" name="kTextEdit_comment">
- <property name="tabChangesFocus">
- <bool>true</bool>
+ <property name="textInteractionFlags">
+ <set>Qt::TextSelectableByKeyboard</set>
</property>
- <property name="text" stdset="0">
- <string/>
+ <property name="buddy">
+ <cstring>qPlainTextEdit_comment</cstring>
</property>
</widget>
</item>
- <item row="8" column="1">
+ <item row="8" column="2">
<layout class="QHBoxLayout">
<item>
<widget class="QPushButton" name="pushButton_guessTags">
@@ -442,6 +435,9 @@
</item>
</layout>
</item>
+ <item row="6" column="1" colspan="2">
+ <widget class="QPlainTextEdit" name="qPlainTextEdit_comment"/>
+ </item>
</layout>
</item>
</layout>
@@ -825,7 +821,6 @@
<tabstop>kComboBox_genre</tabstop>
<tabstop>qSpinBox_track</tabstop>
<tabstop>qSpinBox_year</tabstop>
- <tabstop>kTextEdit_comment</tabstop>
<tabstop>pushButton_guessTags</tabstop>
<tabstop>kTextEdit_lyrics</tabstop>
<tabstop>qSpinBox_score</tabstop>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic