Updates from the weekend. Lots of cleanups. Now also, all items in the

playlists are "children" of the CollectionListItems, and as such always
share their PlaylistItem::Data sections.  I also fixed things so that
an update in one item will automatically trigger updates in the others.

svn path=/trunk/kdemultimedia/juk/; revision=178225

Makefile.am

@@ -3,12 +3,12 @@ bin_PROGRAMS = juk
 
 ## INCLUDES were found outside kdevelop specific part
 
-juk_SOURCES = collectionlist.cpp playlistitem.cpp playlist.cpp playlistsplitter.cpp listboxpixmap.cpp playlistbox.cpp tageditor.cpp cache.cpp audiodata.cpp genrelistreader.cpp genrelistlist.cpp genrelist.cpp genre.cpp player.cpp tag.cpp customaction.cpp playlistwidget.cpp slideraction.cpp taggerwidget.cpp juk.cpp main.cpp 
+juk_SOURCES = collectionlist.cpp playlistitem.cpp playlist.cpp playlistsplitter.cpp listboxpixmap.cpp playlistbox.cpp tageditor.cpp cache.cpp audiodata.cpp genrelistreader.cpp genrelistlist.cpp genrelist.cpp genre.cpp player.cpp tag.cpp customaction.cpp slideraction.cpp juk.cpp main.cpp 
 juk_LDADD   = -lid3 -lsoundserver_idl $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
 
 SUBDIRS = pics data 
 
-EXTRA_DIST = main.cpp juk.cpp juk.h juk.desktop jukui.rc taggerwidget.cpp taggerwidget.h slideraction.cpp slideraction.h playlistwidget.cpp playlistwidget.h customaction.h customaction.cpp tag.cpp tag.h player.cpp player.h genre.h genre.cpp hi16-app-juk.png hi32-app-juk.png hi48-app-juk.png genrelist.cpp genrelist.h genrelistlist.cpp genrelistlist.h genrelistreader.cpp genrelistreader.h audiodata.cpp audiodata.h cache.cpp cache.h tageditor.cpp tageditor.h playlistbox.cpp playlistbox.h listboxpixmap.cpp listboxpixmap.h playlistsplitter.cpp playlistsplitter.h playlist.cpp playlist.h playlistitem.cpp playlistitem.h collectionlist.cpp collectionlist.h 
+EXTRA_DIST = main.cpp juk.cpp juk.h juk.desktop jukui.rc slideraction.cpp slideraction.h customaction.h customaction.cpp tag.cpp tag.h player.cpp player.h genre.h genre.cpp hi16-app-juk.png hi32-app-juk.png hi48-app-juk.png genrelist.cpp genrelist.h genrelistlist.cpp genrelistlist.h genrelistreader.cpp genrelistreader.h audiodata.cpp audiodata.h cache.cpp cache.h tageditor.cpp tageditor.h playlistbox.cpp playlistbox.h listboxpixmap.cpp listboxpixmap.h playlistsplitter.cpp playlistsplitter.h playlist.cpp playlist.h playlistitem.cpp playlistitem.h collectionlist.cpp collectionlist.h 
 
 install-data-local:
 	$(mkinstalldirs) $(kde_appsdir)/Multimedia/

Makefile.in

@@ -230,12 +230,12 @@ x_libraries = @x_libraries@
 
 bin_PROGRAMS = juk
 
-juk_SOURCES = collectionlist.cpp playlistitem.cpp playlist.cpp playlistsplitter.cpp listboxpixmap.cpp playlistbox.cpp tageditor.cpp cache.cpp audiodata.cpp genrelistreader.cpp genrelistlist.cpp genrelist.cpp genre.cpp player.cpp tag.cpp customaction.cpp playlistwidget.cpp slideraction.cpp taggerwidget.cpp juk.cpp main.cpp 
+juk_SOURCES = collectionlist.cpp playlistitem.cpp playlist.cpp playlistsplitter.cpp listboxpixmap.cpp playlistbox.cpp tageditor.cpp cache.cpp audiodata.cpp genrelistreader.cpp genrelistlist.cpp genrelist.cpp genre.cpp player.cpp tag.cpp customaction.cpp slideraction.cpp juk.cpp main.cpp 
 juk_LDADD = -lid3 -lsoundserver_idl $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
 
 SUBDIRS = pics data 
 
-EXTRA_DIST = main.cpp juk.cpp juk.h juk.desktop jukui.rc taggerwidget.cpp taggerwidget.h slideraction.cpp slideraction.h playlistwidget.cpp playlistwidget.h customaction.h customaction.cpp tag.cpp tag.h player.cpp player.h genre.h genre.cpp hi16-app-juk.png hi32-app-juk.png hi48-app-juk.png genrelist.cpp genrelist.h genrelistlist.cpp genrelistlist.h genrelistreader.cpp genrelistreader.h audiodata.cpp audiodata.h cache.cpp cache.h tageditor.cpp tageditor.h playlistbox.cpp playlistbox.h listboxpixmap.cpp listboxpixmap.h playlistsplitter.cpp playlistsplitter.h playlist.cpp playlist.h playlistitem.cpp playlistitem.h collectionlist.cpp collectionlist.h 
+EXTRA_DIST = main.cpp juk.cpp juk.h juk.desktop jukui.rc slideraction.cpp slideraction.h customaction.h customaction.cpp tag.cpp tag.h player.cpp player.h genre.h genre.cpp hi16-app-juk.png hi32-app-juk.png hi48-app-juk.png genrelist.cpp genrelist.h genrelistlist.cpp genrelistlist.h genrelistreader.cpp genrelistreader.h audiodata.cpp audiodata.h cache.cpp cache.h tageditor.cpp tageditor.h playlistbox.cpp playlistbox.h listboxpixmap.cpp listboxpixmap.h playlistsplitter.cpp playlistsplitter.h playlist.cpp playlist.h playlistitem.cpp playlistitem.h collectionlist.cpp collectionlist.h 
 
 ####### kdevelop will overwrite this part!!! (end)############
 
@@ -263,11 +263,10 @@ am_juk_OBJECTS = collectionlist.$(OBJEXT) playlistitem.$(OBJEXT) \
 	tageditor.$(OBJEXT) cache.$(OBJEXT) audiodata.$(OBJEXT) \
 	genrelistreader.$(OBJEXT) genrelistlist.$(OBJEXT) \
 	genrelist.$(OBJEXT) genre.$(OBJEXT) player.$(OBJEXT) \
-	tag.$(OBJEXT) customaction.$(OBJEXT) playlistwidget.$(OBJEXT) \
-	slideraction.$(OBJEXT) taggerwidget.$(OBJEXT) juk.$(OBJEXT) \
-	main.$(OBJEXT)
+	tag.$(OBJEXT) customaction.$(OBJEXT) slideraction.$(OBJEXT) \
+	juk.$(OBJEXT) main.$(OBJEXT)
 #>- juk_OBJECTS = $(am_juk_OBJECTS)
-#>+ 14
+#>+ 12
 juk_final_OBJECTS = juk.all_cpp.o 
 juk_nofinal_OBJECTS = collectionlist.$(OBJEXT) playlistitem.$(OBJEXT) \
 	playlist.$(OBJEXT) playlistsplitter.$(OBJEXT) \
@@ -275,10 +274,8 @@ juk_nofinal_OBJECTS = collectionlist.$(OBJEXT) playlistitem.$(OBJEXT) \
 	tageditor.$(OBJEXT) cache.$(OBJEXT) audiodata.$(OBJEXT) \
 	genrelistreader.$(OBJEXT) genrelistlist.$(OBJEXT) \
 	genrelist.$(OBJEXT) genre.$(OBJEXT) player.$(OBJEXT) \
-	tag.$(OBJEXT) customaction.$(OBJEXT) playlistwidget.$(OBJEXT) \
-	slideraction.$(OBJEXT) taggerwidget.$(OBJEXT) juk.$(OBJEXT) \
-	main.$(OBJEXT)\
-	collectionlist.moc.o  \
+	tag.$(OBJEXT) customaction.$(OBJEXT) slideraction.$(OBJEXT) \
+	juk.$(OBJEXT) main.$(OBJEXT) \
 	juk_meta_unload.o 
 @KDE_USE_FINAL_FALSE@juk_OBJECTS = $(juk_nofinal_OBJECTS)
 @KDE_USE_FINAL_TRUE@juk_OBJECTS = $(juk_final_OBJECTS)
@@ -299,9 +296,8 @@ depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
 	@AMDEP_TRUE@	$(DEPDIR)/player.Po $(DEPDIR)/playlist.Po \
 	@AMDEP_TRUE@	$(DEPDIR)/playlistbox.Po $(DEPDIR)/playlistitem.Po \
 	@AMDEP_TRUE@	$(DEPDIR)/playlistsplitter.Po \
-	@AMDEP_TRUE@	$(DEPDIR)/playlistwidget.Po \
 	@AMDEP_TRUE@	$(DEPDIR)/slideraction.Po $(DEPDIR)/tag.Po \
-	@AMDEP_TRUE@	$(DEPDIR)/tageditor.Po $(DEPDIR)/taggerwidget.Po
+	@AMDEP_TRUE@	$(DEPDIR)/tageditor.Po
 #>- CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 #>- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 #>+ 2
@@ -409,11 +405,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/playlistbox.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/playlistitem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/playlistsplitter.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/playlistwidget.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/slideraction.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tag.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/tageditor.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/taggerwidget.Po@am__quote@
 
 distclean-depend:
 	-rm -rf $(DEPDIR)
@@ -549,7 +543,7 @@ distclean-tags:
 
 #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 #>+ 4
-KDE_DIST=juk 
+KDE_DIST=playlistwidget.h playlistwidget.cpp taggerwidget.h taggerwidget.cpp 
 
 DISTFILES= $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
 
@@ -709,8 +703,8 @@ slideraction.moc: $(srcdir)/slideraction.h
 	$(MOC) $(srcdir)/slideraction.h -o slideraction.moc
 
 #>+ 3
-collectionlist.moc.cpp: $(srcdir)/collectionlist.h
-	$(MOC) $(srcdir)/collectionlist.h -o collectionlist.moc.cpp
+collectionlist.moc: $(srcdir)/collectionlist.h
+	$(MOC) $(srcdir)/collectionlist.h -o collectionlist.moc
 
 #>+ 3
 playlistbox.moc: $(srcdir)/playlistbox.h
@@ -746,7 +740,7 @@ tageditor.moc: $(srcdir)/tageditor.h
 
 #>+ 3
 clean-metasources:
-	-rm -f  slideraction.moc collectionlist.moc.cpp playlistbox.moc customaction.moc playlistitem.moc taggerwidget.moc playlist.moc playlistsplitter.moc juk.moc tageditor.moc
+	-rm -f  slideraction.moc collectionlist.moc playlistbox.moc customaction.moc playlistitem.moc taggerwidget.moc playlist.moc playlistsplitter.moc juk.moc tageditor.moc
 
 #>+ 2
 docs-am:
@@ -773,12 +767,12 @@ force-reedit:
 
 
 #>+ 12
-juk_meta_unload.cpp:  slideraction.moc collectionlist.moc.cpp playlistbox.moc playlistitem.moc customaction.moc playlist.moc taggerwidget.moc playlistsplitter.moc tageditor.moc juk.moc
+juk_meta_unload.cpp:  slideraction.moc collectionlist.moc playlistbox.moc playlistitem.moc customaction.moc playlist.moc playlistsplitter.moc tageditor.moc juk.moc
 	@echo 'creating juk_meta_unload.cpp'
 	@-rm -f juk_meta_unload.cpp
 	@if test ${kde_qtver} = 2; then \
 		echo 'static const char * _metalist_juk[] = {' > juk_meta_unload.cpp ;\
-		cat  slideraction.moc collectionlist.moc.cpp playlistbox.moc playlistitem.moc customaction.moc playlist.moc taggerwidget.moc playlistsplitter.moc tageditor.moc juk.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> juk_meta_unload.cpp ;\
+		cat  slideraction.moc collectionlist.moc playlistbox.moc playlistitem.moc customaction.moc playlist.moc playlistsplitter.moc tageditor.moc juk.moc | grep 'char.*className' | sed -e 's/.*[^A-Za-z0-9_:]\([A-Za-z0-9_:]*\)::className.*$$/\"\1\",/' | sort | uniq >> juk_meta_unload.cpp ;\
 		echo '0};' >> juk_meta_unload.cpp ;\
 		echo '#include <kunload.h>' >> juk_meta_unload.cpp ;\
 		echo '_UNLOAD(juk)' >> juk_meta_unload.cpp ;\
@@ -790,11 +784,11 @@ clean-moc-classes:
 	-rm -f  juk_meta_unload.cpp
 
 #>+ 11
-juk.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/collectionlist.cpp $(srcdir)/playlistitem.cpp $(srcdir)/playlist.cpp $(srcdir)/playlistsplitter.cpp $(srcdir)/listboxpixmap.cpp $(srcdir)/playlistbox.cpp $(srcdir)/tageditor.cpp $(srcdir)/cache.cpp $(srcdir)/audiodata.cpp $(srcdir)/genrelistreader.cpp $(srcdir)/genrelistlist.cpp $(srcdir)/genrelist.cpp $(srcdir)/genre.cpp $(srcdir)/player.cpp $(srcdir)/tag.cpp $(srcdir)/customaction.cpp $(srcdir)/playlistwidget.cpp $(srcdir)/slideraction.cpp $(srcdir)/taggerwidget.cpp $(srcdir)/juk.cpp $(srcdir)/main.cpp $(srcdir)/juk_meta_unload.cpp  collectionlist.moc.cpp slideraction.moc playlistbox.moc customaction.moc playlistitem.moc taggerwidget.moc playlist.moc playlistsplitter.moc juk.moc tageditor.moc 
+juk.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/collectionlist.cpp $(srcdir)/playlistitem.cpp $(srcdir)/playlist.cpp $(srcdir)/playlistsplitter.cpp $(srcdir)/listboxpixmap.cpp $(srcdir)/playlistbox.cpp $(srcdir)/tageditor.cpp $(srcdir)/cache.cpp $(srcdir)/audiodata.cpp $(srcdir)/genrelistreader.cpp $(srcdir)/genrelistlist.cpp $(srcdir)/genrelist.cpp $(srcdir)/genre.cpp $(srcdir)/player.cpp $(srcdir)/tag.cpp $(srcdir)/customaction.cpp $(srcdir)/slideraction.cpp $(srcdir)/juk.cpp $(srcdir)/main.cpp juk_meta_unload.cpp   slideraction.moc collectionlist.moc playlistbox.moc customaction.moc playlistitem.moc taggerwidget.moc playlist.moc playlistsplitter.moc juk.moc tageditor.moc 
 	@echo 'creating juk.all_cpp.cpp ...'; \
 	rm -f juk.all_cpp.files juk.all_cpp.final; \
 	echo "#define KDE_USE_FINAL 1" >> juk.all_cpp.final; \
-	for file in collectionlist.cpp playlistitem.cpp playlist.cpp playlistsplitter.cpp listboxpixmap.cpp playlistbox.cpp tageditor.cpp cache.cpp audiodata.cpp genrelistreader.cpp genrelistlist.cpp genrelist.cpp genre.cpp player.cpp tag.cpp customaction.cpp playlistwidget.cpp slideraction.cpp taggerwidget.cpp juk.cpp main.cpp juk_meta_unload.cpp  collectionlist.moc.cpp; do \
+	for file in collectionlist.cpp playlistitem.cpp playlist.cpp playlistsplitter.cpp listboxpixmap.cpp playlistbox.cpp tageditor.cpp cache.cpp audiodata.cpp genrelistreader.cpp genrelistlist.cpp genrelist.cpp genre.cpp player.cpp tag.cpp customaction.cpp slideraction.cpp juk.cpp main.cpp juk_meta_unload.cpp ; do \
 	  echo "#include \"$$file\"" >> juk.all_cpp.files; \
 	  test ! -f $(srcdir)/$$file || egrep '^#pragma +implementation' $(srcdir)/$$file >> juk.all_cpp.final; \
 	done; \
@@ -825,12 +819,13 @@ cvs-clean:
 kde-rpo-clean:
 	-rm -f *.rpo
 
-#>+ 10
+#>+ 11
 $(srcdir)/playlist.cpp: playlist.moc 
 $(srcdir)/slideraction.cpp: slideraction.moc 
 $(srcdir)/playlistbox.cpp: playlistbox.moc 
 $(srcdir)/tageditor.cpp: tageditor.moc 
 $(srcdir)/playlistitem.cpp: playlistitem.moc 
+$(srcdir)/collectionlist.cpp: collectionlist.moc 
 $(srcdir)/playlistsplitter.cpp: playlistsplitter.moc 
 $(srcdir)/customaction.cpp: customaction.moc 
 $(srcdir)/taggerwidget.cpp: taggerwidget.moc 

collectionlist.cpp

@@ -15,9 +15,69 @@
  *                                                                         *
  ***************************************************************************/
 
+#include <kdebug.h>
+
 #include "collectionlist.h"
 
-CollectionList::CollectionList(QWidget *parent, const char *name) : Playlist(parent, name)
+////////////////////////////////////////////////////////////////////////////////
+// static methods
+////////////////////////////////////////////////////////////////////////////////
+
+CollectionList *CollectionList::list = 0;
+
+CollectionList *CollectionList::instance()
+{
+    return(list);
+}
+
+void CollectionList::initialize(QWidget *parent)
+{
+    list = new CollectionList(parent);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// public methods
+////////////////////////////////////////////////////////////////////////////////
+
+void CollectionList::append(const QString &item)
+{
+    Playlist::append(item);
+    emit(collectionChanged());
+}
+
+void CollectionList::append(const QStringList &items)
+{
+    Playlist::append(items);
+    emit(collectionChanged());
+}
+
+CollectionListItem *CollectionList::lookup(const QString &file)
+{
+    return(itemsDict.find(file));
+}
+
+PlaylistItem *CollectionList::createItem(const QFileInfo &file)
+{
+    PlaylistItem *item = new CollectionListItem(file);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// public slots
+////////////////////////////////////////////////////////////////////////////////
+
+void CollectionListItem::refresh()
+{
+    refreshImpl();
+    
+    // This is connected to refreshImpl() for all of the items children.
+    emit(refreshed());
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// protected methods
+////////////////////////////////////////////////////////////////////////////////
+
+CollectionList::CollectionList(QWidget *parent) : Playlist(parent, "collectionList")
 {
 
 }
@@ -26,3 +86,52 @@ CollectionList::~CollectionList()
 {
 
 }
+
+void CollectionList::appendImpl(const QString &item)
+{
+    if(!lookup(item))
+	Playlist::appendImpl(item);
+}
+
+void CollectionList::addToDict(const QString &file, CollectionListItem *item)
+{
+    itemsDict.replace(file, item);
+}
+
+void CollectionList::removeFromDict(const QString &file)
+{
+    itemsDict.remove(file);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// CollectionListItem public methods
+////////////////////////////////////////////////////////////////////////////////
+
+CollectionListItem::CollectionListItem(const QFileInfo &file) : PlaylistItem(CollectionList::instance())
+{
+    CollectionList *l = CollectionList::instance();
+    if(l) {
+	l->addToDict(file.absFilePath(), this);
+	setData(Data::newUser(file));
+	refresh();
+	connect(this, SIGNAL(refreshed()), l, SIGNAL(dataChanged()));
+    }
+    else
+	kdError() << "CollectionListItems should not be created before"
+		  << "CollectionList::initialize() has been called." << endl;
+}
+
+CollectionListItem::~CollectionListItem()
+{
+    CollectionList *l = CollectionList::instance();
+    if(l)
+	l->removeFromDict(getData()->absFilePath());
+}
+
+void CollectionListItem::addChildItem(PlaylistItem *child)
+{
+    connect(child, SIGNAL(refreshed()), this, SLOT(refresh()));
+    connect(this, SIGNAL(refreshed()), child, SLOT(refreshImpl()));   
+}
+
+#include "collectionlist.moc"

collectionlist.h

@@ -18,14 +18,63 @@
 #ifndef COLLECTIONLIST_H
 #define COLLECTIONLIST_H
 
+#include <qdict.h>
+
 #include "playlist.h"
+#include "playlistitem.h"
+
+/** This is the "collection", or all of the music files that have been opened
+    in any playlist and not explicitly removed from the collection.
+
+    It is being implemented as a "semi-singleton" because I need universal access
+    to just one instance.  However, because the collection needs initialization 
+    parameters (that will not always be available when an instance is needed).  
+    Hence there will be the familiar singleton "instance()" method allong with an
+    "initialize()" method.
+*/
+
+class CollectionListItem;
 
 class CollectionList : public Playlist
 {
+    friend class CollectionListItem;
+
     Q_OBJECT
 public: 
-    CollectionList(QWidget *parent = 0, const char *name = 0);
+    static CollectionList *instance();
+    static void initialize(QWidget *parent);
+
+    virtual void append(const QString &item);
+    virtual void append(const QStringList &items);
+
+    CollectionListItem *lookup(const QString &file);
+    virtual PlaylistItem *createItem(const QFileInfo &file);
+    
+protected:
+    CollectionList(QWidget *parent = 0);
     virtual ~CollectionList();
+
+    virtual void appendImpl(const QString &item);
+
+    void addToDict(const QString &file, CollectionListItem *item);
+    void removeFromDict(const QString &file);
+
+private:
+    static CollectionList *list;
+    QDict<CollectionListItem> itemsDict;
+};
+
+class CollectionListItem : public PlaylistItem
+{
+    Q_OBJECT
+public:
+    CollectionListItem(const QFileInfo &file);
+    virtual ~CollectionListItem();
+
+    void addChildItem(PlaylistItem *child);
+
+public slots:
+    virtual void refresh();
 };
 
 #endif

juk.cpp

@@ -16,14 +16,11 @@
  ***************************************************************************/
 
 #include <klocale.h>
-#include <keditcl.h>
 #include <kfiledialog.h>
 #include <kiconloader.h>
 #include <kcmdlineargs.h>
 #include <kdebug.h>
 
-#include <qsplitter.h>
-
 #include "juk.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -32,6 +29,8 @@
 
 JuK::JuK(QWidget *parent, const char *name) : KMainWindow(parent, name)
 {
+    // Expect segfaults if you change this order.
+
     setupActions();
     setupLayout();
     setupPlayer();
@@ -64,6 +63,9 @@ void JuK::setupActions()
     KStdAction::paste(this, SLOT(paste()), actionCollection());
     KStdAction::selectAll(this, SLOT(selectAll()), actionCollection());
 
+    // view menu
+    showEditorAction = new KToggleAction(i18n("Show Tag Editor"), 0, actionCollection(), "showEditor");
+
     // play menu
     playAction = new KAction(i18n("&Play"), "1rightarrow", 0, this, SLOT(playFile()), actionCollection(), "playFile");
     pauseAction = new KAction(i18n("P&ause"), "player_pause", 0, this, SLOT(pauseFile()), actionCollection(), "pauseFile");
@@ -82,6 +84,7 @@ void JuK::setupLayout()
 
     splitter = new PlaylistSplitter(this, "playlistSplitter");
     setCentralWidget(splitter);
+    connect(showEditorAction, SIGNAL(toggled(bool)), splitter, SLOT(setEditorVisible(bool)));
 
     // set the slider to the proper orientation and make it stay that way
     sliderAction->updateOrientation();
@@ -89,6 +92,8 @@ void JuK::setupLayout()
 
     // playlist item activation connection
     connect(splitter, SIGNAL(playlistDoubleClicked(QListViewItem *)), this, SLOT(playItem(QListViewItem *)));
+
+    splitter->setFocus();
 }
 
 void JuK::setupPlayer()
@@ -132,6 +137,12 @@ void JuK::readConfig()
             sliderAction->getVolumeSlider()->setValue(volume);
         }
     }
+    { // view Settings
+        KConfigGroupSaver saver(config, "View");
+	bool showEditor = config->readBoolEntry("ShowEditor", true);
+	showEditorAction->setChecked(showEditor);
+	splitter->setEditorVisible(showEditor);
+    }
 }
 
 void JuK::saveConfig()
@@ -142,6 +153,10 @@ void JuK::saveConfig()
         if(sliderAction && sliderAction->getVolumeSlider())
             config->writeEntry("Volume", sliderAction->getVolumeSlider()->value());
     }
+    { // view settings
+        KConfigGroupSaver saver(config, "View");
+	config->writeEntry("ShowEditor", showEditorAction->isChecked());
+    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////

juk.h

@@ -28,13 +28,9 @@
 #include <kmainwindow.h>
 
 #include <qtimer.h>
-#include <qwidgetstack.h>
 
-#include "taggerwidget.h"
-#include "playlistwidget.h"
 #include "slideraction.h"
 #include "player.h"
-#include "playlistbox.h"
 #include "playlistsplitter.h"
 
 class JuK : public KMainWindow
@@ -57,6 +53,7 @@ private:
     PlaylistSplitter *splitter;
 
     // actions
+    KToggleAction *showEditorAction;
     SliderAction *sliderAction;
     KAction *playAction;
     KAction *pauseAction;

jukui.rc

@@ -11,7 +11,10 @@
 		<Separator/>
 		<Action name="file_quit"/>
 	</Menu>
-		<Menu name="player"><text>&amp;Player</text>
+	<Menu name="view"><text>&amp;View</text>
+		<Action name="showEditor"/>
+	</Menu>
+	<Menu name="player"><text>&amp;Player</text>
 		<Action name="playFile"/>
 		<Action name="pauseFile"/>
 		<Action name="stopFile"/>
@@ -27,7 +30,6 @@
 	<Action name="edit_cut"/>
 	<Action name="edit_copy"/>
 	<Action name="edit_paste"/>
-	<Separator lineSeparator="true"/>
 </ToolBar>
 
 <ToolBar name="playToolBar" noMerge="1"><text>Play Toolbar</text>

playlist.cpp

@@ -26,6 +26,7 @@
 #include <qptrlist.h>
 
 #include "playlist.h"
+#include "collectionlist.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // public members
@@ -34,6 +35,7 @@
 Playlist::Playlist(QWidget *parent, const char *name) : KListView(parent, name)
 {
     setup();
+    allowDuplicates = false;
 }
 
 Playlist::~Playlist()
@@ -43,38 +45,27 @@ Playlist::~Playlist()
 
 void Playlist::append(const QString &item)
 {
+    collectionListChanged = false;
+
     QApplication::setOverrideCursor(Qt::waitCursor);
     appendImpl(item);
     QApplication::restoreOverrideCursor();
-    emit(collectionChanged(this));
+    
+    if(collectionListChanged)
+	emit(collectionChanged());
 }
 
 void Playlist::append(const QStringList &items)
 {
+    collectionListChanged = false;
+
     QApplication::setOverrideCursor(Qt::waitCursor);
     for(QStringList::ConstIterator it = items.begin(); it != items.end(); ++it)
         appendImpl(*it);
     QApplication::restoreOverrideCursor();
-    emit(collectionChanged(this));
-}
 
-void Playlist::append(PlaylistItem *item)
-{
-    if(item && members.contains(item->absFilePath()) == 0) {
-        members.append(item->absFilePath());
-        (void) new PlaylistItem(*item, this);
-    }
-    emit(collectionChanged(this));
-}
-
-void Playlist::append(QPtrList<PlaylistItem> &items)
-{
-    QPtrListIterator<PlaylistItem> it(items);
-    while(it.current()) {
-        append(it.current());
-        ++it;
-    }
-    // the emit(collectionChanged()) is handled in the above function
+    if(collectionListChanged)
+	emit(collectionChanged());
 }
 
 void Playlist::clearItems(const QPtrList<PlaylistItem> &items)
@@ -132,6 +123,47 @@ QStringList &Playlist::getAlbumList()
     return(albumList);
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// protected members
+////////////////////////////////////////////////////////////////////////////////
+
+PlaylistItem *Playlist::createItem(const QFileInfo &file)
+{
+    CollectionListItem *item = CollectionList::instance()->lookup(file.absFilePath());
+
+    if(item)
+	return(new PlaylistItem(item, this));
+    else if(CollectionList::instance()) {
+	item = new CollectionListItem(file);
+	collectionListChanged = true;
+	return(new PlaylistItem(item, this));
+    }
+    else
+	return(0);
+}
+
+void Playlist::appendImpl(const QString &item)
+{
+    processEvents();
+    QFileInfo file(QDir::cleanDirPath(item));
+    if(file.exists()) {
+        if(file.isDir()) {
+            QDir dir(file.filePath());
+            QStringList dirContents=dir.entryList();
+            for(QStringList::Iterator it = dirContents.begin(); it != dirContents.end(); ++it)
+                if(*it != "." && *it != "..")
+                    appendImpl(file.filePath() + QDir::separator() + *it);
+        }
+        else {
+            QString extension = file.extension(false);
+            if(extensions.contains(extension) > 0 && (members.contains(file.absFilePath()) == 0 || allowDuplicates)) {
+                members.append(file.absFilePath());
+                (void) createItem(file);
+            }
+        }
+    }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // private members
 ////////////////////////////////////////////////////////////////////////////////
@@ -161,31 +193,6 @@ void Playlist::setup()
     connect(this, SIGNAL(selectionChanged()), this, SLOT(emitSelected()));
 }
 
-void Playlist::appendImpl(const QString &item)
-{
-    processEvents();
-    QFileInfo file(QDir::cleanDirPath(item));
-    if(file.exists()) {
-        if(file.isDir()) {
-            QDir dir(file.filePath());
-            QStringList dirContents=dir.entryList();
-            for(QStringList::Iterator it = dirContents.begin(); it != dirContents.end(); ++it) {
-                if(*it != "." && *it != "..") {
-                    appendImpl(file.filePath() + QDir::separator() + *it);
-                }
-            }
-        }
-        else {
-            QString extension = file.extension(false);
-            if(extensions.contains(extension) > 0 && members.contains(file.absFilePath()) == 0) {
-                members.append(file.absFilePath());
-                (void) new PlaylistItem(file, this);
-            }
-        }
-    }
-}
-
-
 void Playlist::processEvents()
 {
     if(processed == 0)

playlist.h

@@ -33,8 +33,6 @@ public:
 
     virtual void append(const QString &item);
     virtual void append(const QStringList &items);
-    virtual void append(PlaylistItem *item);
-    virtual void append(QPtrList<PlaylistItem> &items);
 
     virtual void clearItems(const QPtrList<PlaylistItem> &items);
 
@@ -43,6 +41,9 @@ public:
     void remove();
     void remove(const QPtrList<PlaylistItem> &items);
 
+    /** Allow duplicate files in the playlist. */
+    void setAllowDuplicates(bool allow);
+
     // These are used in a hard-core, encapsulation breaking way and should be
     // replaced soon (see PlaylistItem).  Unfortunately they're more efficient
     // than elegant solutions.  These also should be removed by doing the
@@ -52,27 +53,39 @@ public:
     QStringList &getArtistList();
     QStringList &getAlbumList();
 
+protected:
+    /** This is being used as a mini-factory of sorts to make the construction
+	of PlaylistItems virtual. */
+    virtual PlaylistItem *createItem(const QFileInfo &file);
+    virtual void appendImpl(const QString &item);
+
 private:
     void setup();
-    void appendImpl(const QString &item);
+    void processEvents();
 
     QStringList extensions;
     QStringList members;
     QStringList artistList;
     QStringList albumList;
-    void processEvents();
     int processed;
+    bool collectionListChanged;
+    bool allowDuplicates;
 
 private slots:
     void emitSelected();
 
 signals:
+    /** This signal is connected to PlaylistItem::refreshed() in the 
+	PlaylistItem class. */
     void dataChanged();
 
-    // This signal should later be moved to the "CollectionList" subclass of
-    // Playlist.
+    /** This signal is emitted when items are added to the collection list.  
+	This happens in the createItem() method when items are added to the 
+	collection. */
+    void collectionChanged();
 
-    void collectionChanged(Playlist *list);
+    /** This is emitted when the playlist selection is changed.  This is used
+	primarily to notify the TagEditor of the new data. */
     void selectionChanged(const QPtrList<PlaylistItem> &selection);
 };