remove test cruft, add possibility for a seperator

4 files changed, 90 insertions, 282 deletions

diff --git a/lib/gui/elistbox.cpp b/lib/gui/elistbox.cpp
index d9f95c4b..747733d3 100644
--- a/lib/gui/elistbox.cpp
+++ b/lib/gui/elistbox.cpp
@@ -157,6 +157,53 @@ void eListbox::moveSelection(int dir)
 		break;
 	}
 	
+	if (m_content->cursorValid() && !m_content->currentCursorSelectable())
+	{
+		eDebug("position not selectable");
+			/* ok, our cursor position is valid (i.e. in list), but not selectable. */
+			
+			/* when moving up, continue until we found a valid position. */
+		if ((dir == moveUp) || (dir == pageDown))
+		{
+			eDebug("moving up");
+			while (m_content->cursorGet())
+			{
+				eDebug("tick");
+				m_content->cursorMove(-1);
+				if (m_content->currentCursorSelectable())
+				{
+					eDebug("now ok");
+					break;
+				}
+			}
+		} else
+		{
+			eDebug("moving down");
+			while (m_content->cursorValid())
+			{
+				eDebug("TICK");
+				m_content->cursorMove(+1);
+				if (m_content->currentCursorSelectable())
+				{
+					eDebug("NOW ok");
+					break;
+				}
+			}
+			
+			if (!m_content->cursorValid())
+			{
+				eDebug("not valid (i.e.: end)");
+				m_content->cursorMove(-1);
+			}
+		}
+		
+		if (!m_content->currentCursorSelectable())
+		{
+			eDebug("can't move!");
+			m_content->cursorSet(oldsel);
+		}
+	}
+	
 		/* note that we could be on an invalid cursor position, but we don't
 		   care. this only happens on empty lists, and should have almost no
 		   side effects. */
diff --git a/lib/gui/elistbox.h b/lib/gui/elistbox.h
index 76ad8208..2eb54dd9 100644
--- a/lib/gui/elistbox.h
+++ b/lib/gui/elistbox.h
@@ -38,6 +38,8 @@ protected:
 	
 	virtual int size()=0;
 	
+	virtual int currentCursorSelectable();
+	
 	void setListbox(eListbox *lb);
 	
 	// void setOutputDevice ? (for allocating colors, ...) .. requires some work, though
diff --git a/lib/gui/elistboxcontent.cpp b/lib/gui/elistboxcontent.cpp
index f5ae2b38..fdb270f8 100644
--- a/lib/gui/elistboxcontent.cpp
+++ b/lib/gui/elistboxcontent.cpp
@@ -39,214 +39,9 @@ void iListboxContent::setListbox(eListbox *lb)
 	m_listbox = lb;
 }
 
-DEFINE_REF(eListboxTestContent);
-
-void eListboxTestContent::cursorHome()
-{
-	m_cursor = 0;
-}
-
-void eListboxTestContent::cursorEnd()
+int iListboxContent::currentCursorSelectable()
 {
-	m_cursor = size();
-}
-
-int eListboxTestContent::cursorMove(int count)
-{
-	m_cursor += count;
-	
-	if (m_cursor < 0)
-		cursorHome();
-	else if (m_cursor > size())
-		cursorEnd();
-	return 0;
-}
-
-int eListboxTestContent::cursorValid()
-{
-	return m_cursor < size();
-}
-
-int eListboxTestContent::cursorSet(int n)
-{
-	m_cursor = n;
-	
-	if (m_cursor < 0)
-		cursorHome();
-	else if (m_cursor > size())
-		cursorEnd();
-	return 0;
-}
-
-int eListboxTestContent::cursorGet()
-{
-	return m_cursor;
-}
-
-void eListboxTestContent::cursorSave()
-{
-	m_saved_cursor = m_cursor;
-}
-
-void eListboxTestContent::cursorRestore()
-{
-	m_cursor = m_saved_cursor;
-}
-
-int eListboxTestContent::size()
-{
-	return 10;
-}
-	
-RESULT eListboxTestContent::connectItemChanged(const Slot0<void> &itemChanged, ePtr<eConnection> &connection)
-{
-	return 0;
-}
-
-void eListboxTestContent::setSize(const eSize &size)
-{
-	m_size = size;
-}
-
-void eListboxTestContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
-{
-	ePtr<gFont> fnt = new gFont("Regular", 20);
-	painter.clip(eRect(offset, m_size));
-	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
-	painter.clear();
-
-	if (cursorValid())
-	{
-		painter.setFont(fnt);
-		char string[10];
-		sprintf(string, "%d.)", m_cursor);
-		
-		ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1));
-		
-		painter.renderText(eRect(text_offset, m_size), string);
-		
-		if (selected)
-			style.drawFrame(painter, eRect(offset, m_size), eWindowStyle::frameListboxEntry);
-	}
-	
-	painter.clippop();
-}
-
-//////////////////////////////////////
-
-DEFINE_REF(eListboxStringContent);
-
-eListboxStringContent::eListboxStringContent()
-{
-	m_size = 0;
-	cursorHome();
-}
-
-void eListboxStringContent::cursorHome()
-{
-	m_cursor = m_list.begin();
-	m_cursor_number = 0;
-}
-
-void eListboxStringContent::cursorEnd()
-{
-	m_cursor = m_list.end();
-	m_cursor_number = m_size;
-}
-
-int eListboxStringContent::cursorMove(int count)
-{
-	if (count > 0)
-	{
-		while (count && (m_cursor != m_list.end()))
-		{
-			++m_cursor;
-			++m_cursor_number;
-			--count;
-		}
-	} else if (count < 0)
-	{
-		while (count && (m_cursor != m_list.begin()))
-		{
-			--m_cursor;
-			--m_cursor_number;
-			++count;
-		}
-	}
-	
-	return 0;
-}
-
-int eListboxStringContent::cursorValid()
-{
-	return m_cursor != m_list.end();
-}
-
-int eListboxStringContent::cursorSet(int n)
-{
-	cursorHome();
-	cursorMove(n);
-	
-	return 0;
-}
-
-int eListboxStringContent::cursorGet()
-{
-	return m_cursor_number;
-}
-
-void eListboxStringContent::cursorSave()
-{
-	m_saved_cursor = m_cursor;
-	m_saved_cursor_number = m_cursor_number;
-}
-
-void eListboxStringContent::cursorRestore()
-{
-	m_cursor = m_saved_cursor;
-	m_cursor_number = m_saved_cursor_number;
-}
-
-int eListboxStringContent::size()
-{
-	return m_size;
-}
-	
-void eListboxStringContent::setSize(const eSize &size)
-{
-	m_itemsize = size;
-}
-
-void eListboxStringContent::paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected)
-{
-	ePtr<gFont> fnt = new gFont("Regular", 20);
-	painter.clip(eRect(offset, m_itemsize));
-	style.setStyle(painter, selected ? eWindowStyle::styleListboxSelected : eWindowStyle::styleListboxNormal);
-	painter.clear();
-	
-	eDebug("item %d", m_cursor_number);
-	if (cursorValid())
-	{
-		eDebug("is valid..");
-		painter.setFont(fnt);
-		
-		ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1));
-		
-		painter.renderText(eRect(text_offset, m_itemsize), *m_cursor);
-		
-		if (selected)
-			style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
-	}
-	
-	painter.clippop();
-}
-
-void eListboxStringContent::setList(std::list<std::string> &list)
-{
-	m_list = list;
-	m_size = list.size();
-	cursorHome();
-	m_listbox->entryReset(false);
+	return 1;
 }
 
 //////////////////////////////////////
@@ -305,6 +100,20 @@ int eListboxPythonStringContent::cursorGet()
 	return m_cursor;
 }
 
+int eListboxPythonStringContent::currentCursorSelectable()
+{
+	if (m_list && cursorValid())
+	{
+		PyObject *item = PyList_GET_ITEM(m_list, m_cursor);
+		if (PyTuple_Check(item))
+			item = PyTuple_GET_ITEM(item, 0);
+		
+		if (item != Py_None)
+			return 1;
+	}
+	return 0;
+}
+
 void eListboxPythonStringContent::cursorSave()
 {
 	m_saved_cursor = m_cursor;
@@ -343,11 +152,17 @@ void eListboxPythonStringContent::paint(gPainter &painter, eWindowStyle &style,
 		if (PyTuple_Check(item))
 			item = PyTuple_GET_ITEM(item, 0);
 		
-		const char *string = PyString_Check(item) ? PyString_AsString(item) : "<not-a-string>";
-		
-		ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1));
-		
-		painter.renderText(eRect(text_offset, m_itemsize), string);
+		if (item == Py_None)
+		{
+			int half_height = m_itemsize.height() / 2;
+			
+			painter.fill(eRect(offset.x() + half_height, offset.y() + half_height - 2, m_itemsize.width() - m_itemsize.height(), 4));
+		} else
+		{
+			const char *string = PyString_Check(item) ? PyString_AsString(item) : "<not-a-string>";
+			ePoint text_offset = offset + (selected ? ePoint(2, 2) : ePoint(1, 1));
+			painter.renderText(eRect(text_offset, m_itemsize), string);
+		}
 		
 		if (selected)
 			style.drawFrame(painter, eRect(offset, m_itemsize), eWindowStyle::frameListboxEntry);
@@ -550,6 +365,11 @@ void eListboxPythonConfigContent::paint(gPainter &painter, eWindowStyle &style,
 	painter.clippop();
 }
 
+int eListboxPythonConfigContent::currentCursorSelectable()
+{
+	return eListboxPythonStringContent::currentCursorSelectable();
+}
+
 //////////////////////////////////////
 
 	/* todo: make a real infrastructure here! */
@@ -759,6 +579,11 @@ error_out:
 	painter.clippop();
 }
 
+int eListboxPythonMultiContent::currentCursorSelectable()
+{
+	return eListboxPythonStringContent::currentCursorSelectable();
+}
+
 void eListboxPythonMultiContent::setFont(int fnt, gFont *font)
 {
 	if (font)
diff --git a/lib/gui/elistboxcontent.h b/lib/gui/elistboxcontent.h
index d3648373..acf6525b 100644
--- a/lib/gui/elistboxcontent.h
+++ b/lib/gui/elistboxcontent.h
@@ -4,75 +4,6 @@
 #include <lib/python/python.h>
 #include <lib/gui/elistbox.h>
 
-class eListboxTestContent: public virtual iListboxContent
-{
-	DECLARE_REF(eListboxTestContent);
-public:
-
-#ifndef SWIG
-protected:
-	void cursorHome();
-	void cursorEnd();
-	int cursorMove(int count=1);
-	int cursorValid();
-	int cursorSet(int n);
-	int cursorGet();
-	
-	void cursorSave();
-	void cursorRestore();
-	int size();
-	
-	RESULT connectItemChanged(const Slot0<void> &itemChanged, ePtr<eConnection> &connection);
-	
-	// void setOutputDevice ? (for allocating colors, ...) .. requires some work, though
-	void setSize(const eSize &size);
-	
-		/* the following functions always refer to the selected item */
-	void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
-private:
-	int m_cursor, m_saved_cursor;
-	eSize m_size;
-#endif
-};
-
-class eListboxStringContent: public virtual iListboxContent
-{
-	DECLARE_REF(eListboxStringContent);
-public:
-	eListboxStringContent();
-	void setList(std::list<std::string> &list);
-#ifndef SWI
-protected:
-	
-	void cursorHome();
-	void cursorEnd();
-	int cursorMove(int count=1);
-	int cursorValid();
-	int cursorSet(int n);
-	int cursorGet();
-	
-	void cursorSave();
-	void cursorRestore();
-	int size();
-	
-	// void setOutputDevice ? (for allocating colors, ...) .. requires some work, though
-	void setSize(const eSize &size);
-	
-		/* the following functions always refer to the selected item */
-	void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
-private:
-	typedef std::list<std::string> list;
-	
-	list m_list;
-	list::iterator m_cursor, m_saved_cursor;
-	
-	int m_cursor_number, m_saved_cursor_number;
-	int m_size;
-	
-	eSize m_itemsize;
-#endif
-};
-
 class eListboxPythonStringContent: public virtual iListboxContent
 {
 	DECLARE_REF(eListboxPythonStringContent);
@@ -94,7 +25,8 @@ protected:
 	int cursorValid();
 	int cursorSet(int n);
 	int cursorGet();
-	
+	virtual int currentCursorSelectable();
+		
 	void cursorSave();
 	void cursorRestore();
 	int size();
@@ -119,6 +51,7 @@ class eListboxPythonConfigContent: public eListboxPythonStringContent
 public:
 	void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
 	void setSeperation(int sep) { m_seperation = sep; }
+	int currentCursorSelectable();
 private:
 	int m_seperation;
 };
@@ -128,6 +61,7 @@ class eListboxPythonMultiContent: public eListboxPythonStringContent
 public:
 	enum { TYPE_TEXT, TYPE_PROGRESS, TYPE_PIXMAP, TYPE_PIXMAP_ALPHATEST };
 	void paint(gPainter &painter, eWindowStyle &style, const ePoint &offset, int selected);
+	int currentCursorSelectable();
 	
 	void setFont(int fnt, gFont *fnt);
 private: