Commit 117197cd authored by Michael Pyne's avatar Michael Pyne

Remove or port FIXMEs in playlist shared settings and track iterator.

parent b3954935
Pipeline #15557 passed with stage
in 6 minutes and 32 seconds
......@@ -2041,11 +2041,6 @@ void Playlist::columnResized(int column, int, int newSize)
m_columnFixedWidths[column] = newSize;
}
void Playlist::slotInlineCompletionModeChanged(KCompletion::CompletionMode mode)
{
SharedSettings::instance()->setInlineCompletionMode(mode);
}
void Playlist::slotPlayCurrent()
{
QTreeWidgetItemIterator it(this, QTreeWidgetItemIterator::Selected);
......
......@@ -18,8 +18,6 @@
#ifndef JUK_PLAYLIST_H
#define JUK_PLAYLIST_H
#include <KCompletion>
#include <QVector>
#include <QEvent>
#include <QList>
......@@ -645,14 +643,6 @@ private slots:
*/
void columnResized(int column, int oldSize, int newSize);
/**
* The slot is called when the completion mode for the line edit in the
* inline tag editor is changed. It saves the settings and through the
* magic of the SharedSettings class will apply it to the other playlists as
* well.
*/
void slotInlineCompletionModeChanged(KCompletion::CompletionMode mode);
void slotPlayCurrent();
void slotUpdateTime();
......
......@@ -71,13 +71,6 @@ bool Playlist::SharedSettings::isColumnVisible(int column) const
return m_columnsVisible[column];
}
void Playlist::SharedSettings::setInlineCompletionMode(KCompletion::CompletionMode mode)
{
m_inlineCompletion = mode;
writeConfig();
}
void Playlist::SharedSettings::apply(Playlist *l) const
{
if(!l)
......@@ -100,8 +93,6 @@ void Playlist::SharedSettings::apply(Playlist *l) const
}
l->updateLeftColumn();
// FIXME rename -- needs a delegate which requires porting to QTreeView
//l->renameLineEdit()->setCompletionMode(m_inlineCompletion);
l->slotColumnResizeModeChanged();
}
......@@ -143,9 +134,6 @@ Playlist::SharedSettings::SharedSettings()
m_columnsVisible[i] = true;
}
}
m_inlineCompletion = KCompletion::CompletionMode(
config.readEntry("InlineCompletionMode", int(KCompletion::CompletionAuto)));
}
////////////////////////////////////////////////////////////////////////////////
......@@ -163,7 +151,6 @@ void Playlist::SharedSettings::writeConfig()
l << i;
config.writeEntry("VisibleColumns", l);
config.writeEntry("InlineCompletionMode", int(m_inlineCompletion));
config.writeEntry("ResizeColumnsManually",
ActionCollection::action<KToggleAction>("resizeColumnsManually")->isChecked());
......
......@@ -18,8 +18,6 @@
#ifndef JUK_PLAYLISTSHAREDSETTINGS_H
#define JUK_PLAYLISTSHAREDSETTINGS_H
#include <KCompletion>
#include <QVector>
#include "playlist.h"
......@@ -39,8 +37,6 @@ public:
void setColumnOrder(const Playlist *l);
void toggleColumnVisible(int column);
bool isColumnVisible(int column) const;
void setInlineCompletionMode(KCompletion::CompletionMode mode);
/**
* Apply the settings.
......@@ -57,7 +53,6 @@ private:
QVector<int> m_columnOrder;
QVector<bool> m_columnsVisible;
KCompletion::CompletionMode m_inlineCompletion;
};
......
......@@ -165,11 +165,11 @@ void DefaultSequenceIterator::advance()
else {
PlaylistItem *next = current()->itemBelow();
if(!next && loop) {
Playlist *p = current()->playlist();
next = p->firstChild();
// FIXME playlist iterator (nextSibling)
/*while(next && !next->isVisible())
next = static_cast<PlaylistItem *>(next->nextSibling());*/
// Find first visible item and restart playback from there
QTreeWidgetItemIterator visible(
current()->playlist(),
QTreeWidgetItemIterator::NotHidden);
next = static_cast<PlaylistItem *>(*visible);
}
setCurrent(next);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment