<br><br><div class="gmail_quote">On Wed, Dec 3, 2008 at 12:08 PM, Teo Mrnjavac <span dir="ltr"><<a href="mailto:teo.mrnjavac@gmail.com">teo.mrnjavac@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">
SVN commit 892146 by mrnjavac:<br>
<br>
Added back the fixed Collection Root token. This was done with our usability guy leinir's suggestion, approval and blessing and should not have been removed.</blockquote><div>I have to disagree with this.<br><br>1) There was a thread about this on amarok-devel. The agreement there was to remove this (along with the other changes). If there are objections they should be raised there first. The thread was not there for all that long before Seb commited, but objections should still be raised there even after committing.<br>
<br>2) The token itself-- Seb's objection was extremely valid. It takes up a _lot_ of horizontal space, and it does not add any new information. The preview widget below shows how it will go. I'm really curious about why you (and leinir) deem it necessary? <br>
</div><blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;"><br>
Added back the hint picture. This is open for discussion but I would like if it stayed in.<br>
<br>
<br>
<br>
M +56 -7 FilenameLayoutDialog.cpp<br>
M +86 -17 FilenameLayoutDialog.ui<br>
<br>
<br>
--- trunk/extragear/multimedia/amarok/src/dialogs/FilenameLayoutDialog.cpp #892145:892146<br>
@@ -40,14 +40,23 @@<br>
filenameLayoutEdit->hide();<br>
syntaxLabel->hide();<br>
syntaxLabel->setWordWrap( true );<br>
+ QString hintImagePath = QString( KStandardDirs::locate( "data", "amarok/images/FilenameLayoutDialogHint.png" ) );<br>
+ QPixmap *hintImage = new QPixmap( hintImagePath );<br>
+ hintPicture->setPixmap( *hintImage );<br>
+<br>
+ connect( cbCase, SIGNAL( toggled( bool ) ),<br>
+ this, SLOT( editStateEnable( bool ) ) );<br>
+ connect( parent, SIGNAL( accepted() ),<br>
+ this, SLOT( onAccept() ) );<br>
+ connect( tokenPool, SIGNAL( onDoubleClick( QString ) ),<br>
+ filenameLayout, SLOT( addToken( QString ) ) );<br>
+ connect( kpbAdvanced, SIGNAL( clicked() ),<br>
+ this, SLOT( toggleAdvancedMode() ) );<br>
+ connect( filenameLayout, SIGNAL( schemeChanged() ),<br>
+ this, SIGNAL( schemeChanged() ) );<br>
+ connect( filenameLayoutEdit, SIGNAL( textChanged( const QString & ) ),<br>
+ this, SIGNAL( schemeChanged() ) );<br>
<br>
- connect( cbCase, SIGNAL( toggled( bool ) ), this, SLOT( editStateEnable( bool ) ) );<br>
- connect( parent, SIGNAL( accepted() ), this, SLOT( onAccept() ) );<br>
- connect( tokenPool, SIGNAL( onDoubleClick( QString ) ), filenameLayout, SLOT( addToken( QString ) ) );<br>
- connect( kpbAdvanced, SIGNAL( clicked() ), this, SLOT( toggleAdvancedMode() ) );<br>
- connect( filenameLayout, SIGNAL( schemeChanged() ), this, SIGNAL( schemeChanged() ) );<br>
- connect( filenameLayoutEdit, SIGNAL( textChanged( const QString & ) ), this, SIGNAL( schemeChanged() ) );<br>
-<br>
//KConfig stuff:<br>
int caseOptions = Amarok::config( "TagGuesser" ).readEntry( "Case options" ).toInt();<br>
if( !caseOptions )<br>
@@ -73,6 +82,42 @@<br>
if( !m_isOrganizeCollection )<br>
optionsFrame->show();<br>
<br>
+ //INIT for collection root<br>
+ unsigned int borderColor = static_cast<unsigned int>( KColorScheme( QPalette::Active ).decoration( KColorScheme::HoverColor ).color().rgb() );<br>
+ collectionRootFrame->setStyleSheet( "\<br>
+ color: palette( Base );\<br>
+ border: 2px solid #" + QString::number( borderColor, 16 ).remove( 0, 2 ) + ";\<br>
+ border-radius: 4px;\<br>
+ padding: 2px;\<br>
+ " );<br>
+ QHBoxLayout *collectionRootLayout = new QHBoxLayout( collectionRootFrame );<br>
+ QLabel *collectionRootIconLabel = new QLabel( "", this );<br>
+ QLabel *collectionRootLabel = new QLabel( i18n( "Collection root" ), this );<br>
+ collectionRootLayout->addWidget( collectionRootIconLabel );<br>
+ collectionRootLayout->addWidget( collectionRootLabel );<br>
+ collectionRootLabel->setStyleSheet( "border:0px solid #000000; border-radius: 0px; padding: 0px;" );<br>
+ collectionRootIconLabel->setStyleSheet( "border:0px solid #000000; border-radius: 0px; padding: 0px;" );<br>
+ collectionRootLayout->setContentsMargins( 0, 0, 0, 0 );<br>
+ collectionRootIconLabel->setContentsMargins( 0, 0, 0, 0 );<br>
+ collectionRootLabel->setContentsMargins( 0, 0, 0, 0 );<br>
+ collectionRootIconLabel->setSizePolicy( QSizePolicy::Fixed, QSizePolicy::Fixed );<br>
+ collectionRootIconLabel->setFixedSize( 16, 16 );<br>
+ QPixmap collectionIcon = QPixmap( KIcon( "collection-amarok" ).pixmap(16, 16) );<br>
+ collectionRootIconLabel->setPixmap( collectionIcon );<br>
+<br>
+ collectionSlashFrame->setStyleSheet( "\<br>
+ color: palette( Base );\<br>
+ border: 2px solid #" + QString::number( borderColor, 16 ).remove( 0, 2 ) + ";\<br>
+ border-radius: 4px;\<br>
+ padding: 2px;\<br>
+ " );<br>
+ QHBoxLayout *collectionSlashLayout = new QHBoxLayout( collectionSlashFrame );<br>
+ QLabel *collectionSlashLabel = new QLabel( "/", this );<br>
+ collectionSlashLayout->addWidget(collectionSlashLabel);<br>
+ collectionSlashLabel->setStyleSheet( "border:0px solid #000000; border-radius: 0px; padding: 0px;" );<br>
+ collectionSlashLayout->setContentsMargins( 0, 0, 0, 0 );<br>
+ collectionSlashLabel->setContentsMargins( 0, 0, 0, 0 );<br>
+<br>
//INIT for tokenPool<br>
tokenPool->addItem( new QListWidgetItem( KIcon( "filename-track-amarok" ).pixmap( 48, 48 ), i18n( "Track" ) ) );<br>
tokenPool->addItem( new QListWidgetItem( KIcon( "filename-title-amarok" ).pixmap( 48, 48 ), i18n( "Title" ) ) );<br>
@@ -92,6 +137,8 @@<br>
syntaxLabel->setText( i18nc("Please do not translate the %foo words as they define a syntax used internally by a parser to describe a filename.",<br>
"The following tokens can be used to define a filename scheme: \<br>
<br>%track, %title, %artist, %composer, %year, %album, %comment, %genre, %ignore." ) );<br>
+ collectionRootFrame->hide();<br>
+ collectionSlashFrame->hide();<br>
}<br>
else<br>
{<br>
@@ -102,6 +149,8 @@<br>
syntaxLabel->setText( i18nc("Please do not translate the %foo words as they define a syntax used internally by a parser to describe a filename.",<br>
"The following tokens can be used to define a filename scheme: \<br>
<br>%track, %title, %artist, %composer, %year, %album, %comment, %genre, %initial, %folder, %filetype, %discnumber." ) );<br>
+ collectionRootFrame->show();<br>
+ collectionSlashFrame->show();<br>
}<br>
if( m_isOrganizeCollection )<br>
{<br>
--- trunk/extragear/multimedia/amarok/src/dialogs/FilenameLayoutDialog.ui #892145:892146<br>
@@ -5,7 +5,7 @@<br>
<rect><br>
<x>0</x><br>
<y>0</y><br>
- <width>554</width><br>
+ <width>690</width><br>
<height>568</height><br>
</rect><br>
</property><br>
@@ -87,34 +87,34 @@<br>
</widget><br>
</item><br>
<item><br>
- <widget class="QLabel" name="syntaxLabel" ><br>
+ <widget class="QLabel" name="hintPicture" ><br>
<property name="sizePolicy" ><br>
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" ><br>
+ <sizepolicy vsizetype="Fixed" hsizetype="Expanding" ><br>
<horstretch>0</horstretch><br>
<verstretch>0</verstretch><br>
</sizepolicy><br>
</property><br>
<property name="minimumSize" ><br>
<size><br>
- <width>0</width><br>
- <height>0</height><br>
+ <width>682</width><br>
+ <height>44</height><br>
</size><br>
</property><br>
<property name="maximumSize" ><br>
<size><br>
<width>16777215</width><br>
- <height>144</height><br>
+ <height>44</height><br>
</size><br>
</property><br>
<property name="text" ><br>
- <string>The following tokens can be used to define a filename scheme: &lt;br>%track, %title, %artist, %composer, %year, %album, %comment, %genre&lt;br></string><br>
+ <string/><br>
</property><br>
</widget><br>
</item><br>
<item><br>
- <widget class="FilenameLayoutWidget" name="filenameLayout" ><br>
+ <widget class="QLabel" name="syntaxLabel" ><br>
<property name="sizePolicy" ><br>
- <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" ><br>
+ <sizepolicy vsizetype="Preferred" hsizetype="Preferred" ><br>
<horstretch>0</horstretch><br>
<verstretch>0</verstretch><br>
</sizepolicy><br>
@@ -122,26 +122,95 @@<br>
<property name="minimumSize" ><br>
<size><br>
<width>0</width><br>
- <height>30</height><br>
+ <height>0</height><br>
</size><br>
</property><br>
<property name="maximumSize" ><br>
<size><br>
- <width>30000</width><br>
- <height>36</height><br>
+ <width>16777215</width><br>
+ <height>144</height><br>
</size><br>
</property><br>
- <property name="frameShape" ><br>
- <enum>QFrame::StyledPanel</enum><br>
+ <property name="text" ><br>
+ <string>The following tokens can be used to define a filename scheme: &lt;br>%track, %title, %artist, %composer, %year, %album, %comment, %genre&lt;br></string><br>
</property><br>
- <property name="frameShadow" ><br>
- <enum>QFrame::Sunken</enum><br>
- </property><br>
</widget><br>
</item><br>
<item><br>
<layout class="QHBoxLayout" name="horizontalLayout_2" ><br>
<item><br>
+ <widget class="QFrame" name="collectionRootFrame" ><br>
+ <property name="sizePolicy" ><br>
+ <sizepolicy vsizetype="Preferred" hsizetype="Minimum" ><br>
+ <horstretch>0</horstretch><br>
+ <verstretch>0</verstretch><br>
+ </sizepolicy><br>
+ </property><br>
+ <property name="maximumSize" ><br>
+ <size><br>
+ <width>16777215</width><br>
+ <height>24</height><br>
+ </size><br>
+ </property><br>
+ <property name="frameShape" ><br>
+ <enum>QFrame::StyledPanel</enum><br>
+ </property><br>
+ <property name="frameShadow" ><br>
+ <enum>QFrame::Raised</enum><br>
+ </property><br>
+ </widget><br>
+ </item><br>
+ <item><br>
+ <widget class="QFrame" name="collectionSlashFrame" ><br>
+ <property name="sizePolicy" ><br>
+ <sizepolicy vsizetype="Preferred" hsizetype="Minimum" ><br>
+ <horstretch>0</horstretch><br>
+ <verstretch>0</verstretch><br>
+ </sizepolicy><br>
+ </property><br>
+ <property name="maximumSize" ><br>
+ <size><br>
+ <width>16777215</width><br>
+ <height>24</height><br>
+ </size><br>
+ </property><br>
+ <property name="frameShape" ><br>
+ <enum>QFrame::StyledPanel</enum><br>
+ </property><br>
+ <property name="frameShadow" ><br>
+ <enum>QFrame::Raised</enum><br>
+ </property><br>
+ </widget><br>
+ </item><br>
+ <item><br>
+ <widget class="FilenameLayoutWidget" name="filenameLayout" ><br>
+ <property name="sizePolicy" ><br>
+ <sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" ><br>
+ <horstretch>0</horstretch><br>
+ <verstretch>0</verstretch><br>
+ </sizepolicy><br>
+ </property><br>
+ <property name="minimumSize" ><br>
+ <size><br>
+ <width>0</width><br>
+ <height>30</height><br>
+ </size><br>
+ </property><br>
+ <property name="maximumSize" ><br>
+ <size><br>
+ <width>30000</width><br>
+ <height>36</height><br>
+ </size><br>
+ </property><br>
+ <property name="frameShape" ><br>
+ <enum>QFrame::StyledPanel</enum><br>
+ </property><br>
+ <property name="frameShadow" ><br>
+ <enum>QFrame::Sunken</enum><br>
+ </property><br>
+ </widget><br>
+ </item><br>
+ <item><br>
<widget class="KLineEdit" name="filenameLayoutEdit" ><br>
<property name="sizePolicy" ><br>
<sizepolicy vsizetype="Preferred" hsizetype="MinimumExpanding" ><br>
</blockquote></div><br>