[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: extragear/multimedia/amarok
From: Martin Aumüller <aumuell () reserv ! at>
Date: 2007-01-06 17:04:38
Message-ID: 1168103078.849057.24498.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 620583 by aumuell:
a little bit more consistency with other parts of amarok
M +2 -2 ChangeLog
M +3 -3 src/collectionbrowser.cpp
M +35 -36 src/editcollectionfilterdialog.cpp
--- trunk/extragear/multimedia/amarok/ChangeLog #620582:620583
@@ -5,8 +5,8 @@
VERSION 1.4.5
FEATURES:
- * Added a dialog to filter titles collection. Patch by Giovanni
- Venturi <giovanni@kde-it.org> (BR 139292)
+ * Gueded editing of the collection filter. Patch by Giovanni Venturi
+ <giovanni@kde-it.org> (BR 139292)
* Added GUI options for fadeout and fadeout on exit. Both are now enabled
by default.
* Support for Speex (.spx), WavPack (.wv) and TrueAudio (.tta) files in
--- trunk/extragear/multimedia/amarok/src/collectionbrowser.cpp #620582:620583
@@ -18,6 +18,7 @@
#include "debug.h"
#include "deletedialog.h"
#include "directorylist.h"
+#include "editcollectionfilterdialog.h"
#include "k3bexporter.h"
#include "mediabrowser.h"
#include "metabundle.h"
@@ -29,7 +30,6 @@
#include "tagdialog.h"
#include "threadweaver.h"
#include "qstringx.h"
-#include "editcollectionfilterdialog.h"
#include <taglib/tfile.h> //TagLib::File::isWritable
@@ -112,7 +112,7 @@
QToolTip::add( button, i18n( "Clear search field" ) );
QToolTip::add( m_searchEdit, i18n( "Enter space-separated terms to search in \
the collection" ) );
- QToolTip::add( filterButton, i18n( "Click here to setup the collection \
filter" ) ); + QToolTip::add( filterButton, i18n( "Click to edit collection \
filter" ) ); } //</Search LineEdit>
@@ -286,7 +286,7 @@
{
EditCollectionFilterDialog *cod = new EditCollectionFilterDialog( this, \
m_searchEdit->text() ); if (cod->exec())
- m_searchEdit->setText(cod->filter());
+ m_searchEdit->setText(cod->filter());
}
void
--- trunk/extragear/multimedia/amarok/src/editcollectionfilterdialog.cpp \
#620582:620583 @@ -28,7 +28,7 @@
m_filterText(text)
{
// Redefine "Default" button
- KGuiItem defaultButton( i18n("&Append this filter"), "add" );
+ KGuiItem defaultButton( i18n("&Append Filter"), "add" );
setButtonWhatsThis( Default, i18n( "<qt><p>Clicking here you can add the defined \
condition. The \"OK\" button is intended to "
"close the dialog and apply the defined \
filter. With this button you can add more than "
"one condition, so to create a more complex \
filtering condition.</p></qt>" ) ); @@ -36,14 +36,14 @@
setButtonGuiItem( Default, defaultButton );
// define "User1" button
- KGuiItem user1Button( i18n("&Clear filter"), "remove" );
+ KGuiItem user1Button( i18n("&Clear Filter"), "remove" );
setButtonWhatsThis( User1, i18n( "<p>Clicking here you will clear the collection \
filter. If you intend just "
"undo last appending just click on \"Append \
this filter\" button.</p>" ) ); setButtonTip(User1, i18n( "Clear the collection \
filter" ) ); setButtonGuiItem( User1, user1Button );
// define "User2" button
- KGuiItem user2Button( i18n("&Unappend last filter"), "undo" );
+ KGuiItem user2Button( i18n("&Remove Last Filter"), "undo" );
setButtonWhatsThis( User2, i18n( "<p>Clicking here you will remove the last \
appended collection filter, so to undo last "
"appending filter. You cannot undo more than \
one action.</p>" ) );
setButtonTip(User2, i18n( "Remove last appendend collection filter" ) );
@@ -57,9 +57,8 @@
// text explanation of this dialog
QLabel *label1 = new QLabel( plainPage(), "label1" );
- label1->setText( i18n("<p>In this dialog you can configure the collection filter \
"
- "that let you find title with specific attributes, for \
example "
- "you can look for a title that has a length of 3 \
minutes.</p>") ); + label1->setText( i18n("<p>Edit the collection filter for \
finding tracks with specific attributes" + ", e.g. you \
can look for a track that has a length of 3 minutes.</p>") ); m_mainLay->addWidget( \
label1 );
m_mainLay->addItem( new QSpacerItem( 10, 10, QSizePolicy::Expanding, \
QSizePolicy::Minimum ) );
@@ -83,8 +82,8 @@
"<p>Here you can choose to <i>type text</i> directly or to use "
"some keywords to specify some attributes as the artist name "
"and so on. The keyword selectable are divided by their specific value. "
- "Some keywords are numeric and others are alphanumeric. You don't need "
- "to know it diectly. When a keyword is numeric than will be enabled "
+ "Some keywords are numeric and others are alphanumeric. You do not need "
+ "to know it directly. When a keyword is numeric than will be enabled "
"the part related to the numeric specifics.</p><p>The alphanumeric "
"keywords are the following: <b>album</b>, <b>artist</b>, <b>filename</b> \
"
" (including path), <b>mountpoint</b> (i.e. /home/user1), <b>filetype</b> \
" @@ -100,29 +99,29 @@
keywordLayout->addItem( new QSpacerItem( 5, 10, QSizePolicy::Minimum, \
QSizePolicy::Minimum ) ); m_comboKeyword = new QComboBox( plainPage(), \
"keywordComboBox"); label3->setBuddy( m_comboKeyword );
- m_comboKeyword->insertItem( i18n("type text") );
- m_comboKeyword->insertItem( i18n("album") );
- m_comboKeyword->insertItem( i18n("artist") );
- m_comboKeyword->insertItem( i18n("bitrate") );
- m_comboKeyword->insertItem( i18n("comment") );
- m_comboKeyword->insertItem( i18n("composer") );
- m_comboKeyword->insertItem( i18n("directory") );
- m_comboKeyword->insertItem( i18n("disc/discnumber") );
- m_comboKeyword->insertItem( i18n("filename") );
- m_comboKeyword->insertItem( i18n("mountpoint") );
- m_comboKeyword->insertItem( i18n("filetype") );
- m_comboKeyword->insertItem( i18n("genre") );
- m_comboKeyword->insertItem( i18n("length") );
- m_comboKeyword->insertItem( i18n("lyrics") );
- m_comboKeyword->insertItem( i18n("playcount") );
- m_comboKeyword->insertItem( i18n("rating") );
- m_comboKeyword->insertItem( i18n("samplerate") );
- m_comboKeyword->insertItem( i18n("score") );
- m_comboKeyword->insertItem( i18n("size/filesize") );
- m_comboKeyword->insertItem( i18n("title") );
- m_comboKeyword->insertItem( i18n("track") );
- m_comboKeyword->insertItem( i18n("year") );
- m_comboKeyword->insertItem( i18n("label") );
+ m_comboKeyword->insertItem( i18n("Type Text") );
+ m_comboKeyword->insertItem( i18n("Album") );
+ m_comboKeyword->insertItem( i18n("Artist") );
+ m_comboKeyword->insertItem( i18n("Bitrate") );
+ m_comboKeyword->insertItem( i18n("Comment") );
+ m_comboKeyword->insertItem( i18n("Composer") );
+ m_comboKeyword->insertItem( i18n("Directory") );
+ m_comboKeyword->insertItem( i18n("Disc Number") );
+ m_comboKeyword->insertItem( i18n("Filename") );
+ m_comboKeyword->insertItem( i18n("Mount Point") );
+ m_comboKeyword->insertItem( i18n("Filetype") );
+ m_comboKeyword->insertItem( i18n("Genre") );
+ m_comboKeyword->insertItem( i18n("Length") );
+ m_comboKeyword->insertItem( i18n("Lyrics") );
+ m_comboKeyword->insertItem( i18n("Play Count") );
+ m_comboKeyword->insertItem( i18n("Rating") );
+ m_comboKeyword->insertItem( i18n("Sample Rate") );
+ m_comboKeyword->insertItem( i18n("Score") );
+ m_comboKeyword->insertItem( i18n("File Size") );
+ m_comboKeyword->insertItem( i18n("Title") );
+ m_comboKeyword->insertItem( i18n("Track") );
+ m_comboKeyword->insertItem( i18n("Year") );
+ m_comboKeyword->insertItem( i18n("Label") );
QToolTip::add( m_comboKeyword, i18n("Select a keyword for the filter") );
vector[0] = "type text";
vector[1] = "album";
@@ -154,7 +153,7 @@
keywordLayout->addWidget( m_comboKeyword );
keywordLayout->addItem( new QSpacerItem( 5, 10, QSizePolicy::Minimum, \
QSizePolicy::Minimum ) ); m_editKeyword = new QLineEdit( plainPage(), \
"editKeywordBox" );
- QWhatsThis::add( m_editKeyword, i18n("<p>Type here the keyword attribut or type \
text to look for into the collection.</p>") ); + QWhatsThis::add( m_editKeyword, \
i18n("<p>Type here the keyword attribute or type text to look for into the \
collection.</p>") ); keywordLayout->addWidget( m_editKeyword );
m_mainLay->addLayout( keywordLayout );
m_mainLay->addItem( new QSpacerItem( 10, 10, QSizePolicy::Expanding, \
QSizePolicy::Minimum ) ); @@ -218,14 +217,14 @@
connect(m_spinMax1, SIGNAL(valueChanged(int)), this, SLOT(maxSpinChanged(int)));
QHBoxLayout *filesizeLayout = new QHBoxLayout( vertLayout );
- QLabel *filesizeLabel = new QLabel( i18n("Choose the related unit for the \
\"filesize\" keyword:"), m_groupBox, "filesizeLabel"); + QLabel *filesizeLabel = \
new QLabel( i18n("Unit for file size:"), m_groupBox, "filesizeLabel"); \
filesizeLayout->addWidget( filesizeLabel );
filesizeLayout->addItem( new QSpacerItem( 5, 10, QSizePolicy::Minimum, \
QSizePolicy::Minimum ) ); m_comboUnitSize = new QComboBox( m_groupBox, \
"comboKiloMega" ); filesizeLabel->setBuddy( m_comboUnitSize );
- m_comboUnitSize->insertItem( i18n("bytes") );
- m_comboUnitSize->insertItem( i18n("kbytes") );
- m_comboUnitSize->insertItem( i18n("mbytes") );
+ m_comboUnitSize->insertItem( i18n("B (1 Byte)") );
+ m_comboUnitSize->insertItem( i18n("KB (1024 Bytes)") );
+ m_comboUnitSize->insertItem( i18n("MB (1024 KB)") );
filesizeLayout->addWidget( m_comboUnitSize );
// type text selected
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic