[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdemultimedia/noatun/modules
From: Stefan Gehn <mETz81 () web ! de>
Date: 2007-01-21 18:21:01
Message-ID: 1169403661.654899.32131.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 625955 by metz:
- deprecated--
- remove unneeded files, probably a leftover from merging branches
M +3 -3 akode-engine/noatun_akode.cpp
D noatunui/noatunui.cpp
M +1 -1 noatunui/pics/Makefile.am
D splitplaylist/splitplaylist.cpp
M +83 -46 splitplaylist/view.cpp
--- trunk/KDE/kdemultimedia/noatun/modules/akode-engine/noatun_akode.cpp \
#625954:625955 @@ -62,7 +62,7 @@
}
else
{
- kdError(66666) << "Could not initialize aKode!" << endl;
+ kError(66666) << "Could not initialize aKode!" << endl;
delete mPlayer;
mPlayer = 0;
}
@@ -200,12 +200,12 @@
PurposeEOF,
PurposeError
};
-
+
AkodePluginEvent(Purpose p)
: QEvent(QEvent::User), mPurpose(p)
{
}
-
+
Purpose purpose() const { return mPurpose; }
private:
Purpose mPurpose;
--- trunk/KDE/kdemultimedia/noatun/modules/noatunui/pics/Makefile.am #625954:625955
@@ -1,2 +1,2 @@
-noatunuiiconsdir = $(kde_datadir)/noatun_noatuni/icons
+noatunuiiconsdir = $(kde_datadir)/noatun_noatunui/icons
noatunuiicons_ICON = AUTO
--- trunk/KDE/kdemultimedia/noatun/modules/splitplaylist/view.cpp #625954:625955
@@ -19,9 +19,11 @@
#include <qpainter.h>
#include <kaction.h>
+#include <kactioncollection.h>
#include <kdebug.h>
#include <kfiledialog.h>
#include <kfileitem.h>
+#include <kjobuidelegate.h>
#include <kio/job.h>
#include <kio/netaccess.h>
#include <klocale.h>
@@ -62,7 +64,7 @@
// if (!isDownloaded()) setText(1, "0%");
// mProperties.setAutoDelete(true);
-
+
PlaylistItem pli(SPL->item(new ItemData(SPL, this)));
pli.added(Noatun::Global::self());
@@ -86,16 +88,16 @@
// Ugly, but this function is a very hot path on playlist loading
for (QMap<QString,QString>::ConstIterator i=props.begin(); i!=props.end(); ++i )
{
- QString n = i.key();
- QString val = i.data();
+ const QString &key = i.key();
+ const QString &val = i.value();
- if (n=="enabled")
+ if (key == "enabled")
{
- setOn(val!="false" && val!="0");
+ setOn(val != "false" && val != "0");
}
else
{
- Property p={n,val};
+ Property p = {key, val};
mProperties += p;
}
}
@@ -210,11 +212,13 @@
}
else
{
- for (QList<Property>::Iterator i=mProperties.begin(); i != mProperties.end(); ++i)
+ QList<Property>::Iterator i(mProperties.begin());
+ QList<Property>::ConstIterator end(mProperties.end());
+ for ( ; i != end; ++i)
{
if ((*i).key == n)
{
- mProperties.remove(i);
+ mProperties.erase(i);
modified();
break;
}
@@ -475,7 +479,7 @@
{
after = after->nextSibling();
}
-
+
if (after)
return SPL->item(new ItemData(SPL, after));
else
@@ -558,9 +562,9 @@
if (
- url.path().right(4).lower()==".m3u"
- || url.path().right(4).lower()==".pls"
- || url.protocol().lower()=="http"
+ url.path().right(4).toLower()==".m3u"
+ || url.path().right(4).toLower()==".pls"
+ || url.protocol().toLower()=="http"
)
{
// a playlist is requested
@@ -591,10 +595,12 @@
// starts a new listJob if there is no active but work to do
void List::addNextPendingDirectory()
{
- KUrl::List::Iterator pendingIt= pendingAddDirectories.begin();
- if (!listJob && (pendingIt!= pendingAddDirectories.end()))
+ KUrl::List::Iterator pendingIt = pendingAddDirectories.begin();
+ KUrl::List::ConstIterator pendingEnd = pendingAddDirectories.end();
+
+ if (!listJob && (pendingIt != pendingEnd))
{
- currentJobURL= *pendingIt;
+ currentJobURL = *pendingIt;
listJob = KIO::listDir(currentJobURL, false, false);
connect(
listJob, SIGNAL(entries(KIO::Job*, const KIO::UDSEntryList&)),
@@ -608,7 +614,7 @@
listJob, SIGNAL(redirection(KIO::Job *, const KUrl &)),
SLOT(slotRedirection(KIO::Job *, const KUrl &))
);
- pendingAddDirectories.remove(pendingIt);
+ pendingAddDirectories.erase(pendingIt);
lastAddedSubDirectory = pendingAddDirectories.begin();
}
}
@@ -636,9 +642,9 @@
void List::slotResult(KJob *job)
{
- listJob= 0;
- if (job && job->error())
- job->showErrorDialog();
+ listJob = 0;
+ if (job && job->error() && job->uiDelegate())
+ job->uiDelegate()->showErrorMessage();
addNextPendingDirectory();
}
@@ -682,35 +688,66 @@
: Noatun::NMainWindow(pl, false, false, 0, Qt::WType_TopLevel)
{
//kDebug(66666) << k_funcinfo << "BEGIN" << endl;
+ setStandardToolBarMenuEnabled(true);
+
list = new List(this);
setCentralWidget(list);
+
connect(list, SIGNAL(modified(void)), this, SLOT(setModified(void)) );
// connect the click on the header with sorting
connect(list->header(),SIGNAL(clicked(int)),this,SLOT(headerClicked(int)) );
- setStandardToolBarMenuEnabled(true);
- mOpen=new KAction(i18n("Add &Files..."), "queue", 0, this, SLOT(addFiles()), \
actionCollection(), "add_files");
- (void) new KAction(i18n("Add Fol&ders..."), "folder", 0, this, \
SLOT(addDirectory()), actionCollection(), "add_dir");
- mDelete=new KAction(i18n("Delete"), "editdelete", Qt::Key_Delete, this, \
SLOT(deleteSelected()), actionCollection(), "delete");
- mClose=KStandardAction::close(this, SLOT(close()), actionCollection());
- mFind=KStandardAction::find(this, SLOT(find()), actionCollection());
+ mOpen = new KAction(actionCollection());
+ actionCollection()->addAction("add_files", mOpen);
+ mOpen->setText(i18n("Add &Files..."));
+ mOpen->setIcon(KIcon("queue"));
+ connect(mOpen, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)),
+ this, SLOT(addFiles()));
- mOpenNew=KStandardAction::openNew(this, SLOT(openNew()), actionCollection());
- mOpenpl=KStandardAction::open(this, SLOT(open()), actionCollection());
- mSave=KStandardAction::save(this, SLOT(save()), actionCollection());
- mSaveAs=KStandardAction::saveAs(this, SLOT(saveAs()), actionCollection());
+ KAction *addFld = new KAction(actionCollection());
+ actionCollection()->addAction("add_dir", addFld);
+ addFld->setText(i18n("Add Fol&ders..."));
+ addFld->setIcon(KIcon("folder"));
+ connect(addFld, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)),
+ this, SLOT(addDirectory()));
- (void) new KAction(i18n("Shuffle"), "misc", 0, SPL, SLOT( randomize() ), \
actionCollection(), "shuffle");
- (void) new KAction(i18n("Clear"), "editclear", 0, list, SLOT( clear() ), \
actionCollection(), "clear"); + mDelete = new KAction(actionCollection());
+ actionCollection()->addAction("delete", mDelete);
+ mDelete->setText(i18n("Delete"));
+ mDelete->setIcon(KIcon("editdelete"));
+ connect(mDelete, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)),
+ this, SLOT(deleteSelected()));
- setupGUI(ToolBar|Save|Create, "noatun/splui.rc");
+ mClose = KStandardAction::close(this, SLOT(close()), actionCollection());
+ mFind = KStandardAction::find(this, SLOT(find()), actionCollection());
+ mOpenNew = KStandardAction::openNew(this, SLOT(openNew()), actionCollection());
+ mOpenpl = KStandardAction::open(this, SLOT(open()), actionCollection());
+ mSave = KStandardAction::save(this, SLOT(save()), actionCollection());
+ mSaveAs = KStandardAction::saveAs(this, SLOT(saveAs()), actionCollection());
+ KAction *shuf = new KAction(actionCollection());
+ actionCollection()->addAction("shuffle", shuf);
+ shuf->setText(i18n("Shuffle"));
+ shuf->setIcon(KIcon("misc"));
+ connect(shuf, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)),
+ this, SLOT(randomize()));
+
+ KAction *clr = new KAction(actionCollection());
+ actionCollection()->addAction("clear", clr);
+ clr->setText(i18n("Clear"));
+ clr->setIcon(KIcon("editclear"));
+ connect(clr, SIGNAL(triggered(Qt::MouseButtons,Qt::KeyboardModifiers)),
+ this, SLOT(clear()));
+
+ setupGUI(ToolBar | Save | Create, "noatun/splui.rc");
+
mFinder = new Finder(this);
applyMainWindowSettings(KGlobal::config(), "SPL Window");
list->setFocus();
//kDebug(66666) << k_funcinfo << "END" << endl;
-
+
+ // FIXME: kde4 workaround to automatically open file chooser
QTimer::singleShot(1000, this, SLOT(addFiles()));
}
@@ -749,14 +786,14 @@
config.setGroup("splitplaylist");
// this has to come after openGlobal, since openGlobal emits modified()
- setModified(config.readBoolEntry("modified", false));
+ setModified(config.readEntry<bool>("modified", false));
QString path = config.readPathEntry("file");
// don't call setPath with an empty path, that would make the url "valid"
if (!path.isEmpty())
mPlaylistFile.setPath(path);
SPL->reset();
- int saved = config.readNumEntry("current", 0);
+ int saved = config.readEntry<int>("current", 0);
PlaylistItem item = SPL->getFirst();
for(int i = 0 ; i < saved ; i++)
@@ -779,15 +816,15 @@
static bool testWord(PlaylistItem &item, const QString &finder)
{
- if (item.property("author").find(finder, false))
+ if (item.property("author").contains(finder, Qt::CaseInsensitive))
return true;
- if (item.property("title").find(finder, false))
+ if (item.property("title").contains(finder, Qt::CaseInsensitive))
return true;
- if (item.property("album").find(finder, false))
+ if (item.property("album").contains(finder, Qt::CaseInsensitive))
return true;
- if (item.property("comment").find(finder, false))
+ if (item.property("comment").contains(finder, Qt::CaseInsensitive))
return true;
- if (item.url().path().find(finder, false))
+ if (item.url().path().contains(finder, Qt::CaseInsensitive))
return true;
return false;
@@ -796,15 +833,15 @@
static bool testWord(PlaylistItem &item, const QRegExp &finder)
{
- if (item.property("author").find(finder, false))
+ if (item.property("author").contains(finder))
return true;
- if (item.property("title").find(finder, false))
+ if (item.property("title").contains(finder))
return true;
- if (item.property("album").find(finder, false))
+ if (item.property("album").contains(finder))
return true;
- if (item.property("comment").find(finder, false))
+ if (item.property("comment").contains(finder))
return true;
- if (item.url().path().find(finder, false))
+ if (item.url().path().contains(finder))
return true;
return false;
@@ -836,7 +873,7 @@
PlaylistItem item = SPL->item(new ItemData(SPL, search));
if (f->regexp())
{
- if (testWord(item, QRegExp(f->string(), false)))
+ if (testWord(item, QRegExp(f->string(), Qt::CaseInsensitive)))
break;
}
else
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic