1 files changed, 12 insertions, 23 deletions

diff --git a/noncore/apps/opie-reader/CAnnoEdit.h b/noncore/apps/opie-reader/CAnnoEdit.h
index f320061..78d3eeb 100644
--- a/noncore/apps/opie-reader/CAnnoEdit.h
+++ b/noncore/apps/opie-reader/CAnnoEdit.h
@@ -7,2 +7,3 @@
 #include <qmultilineedit.h>
+#include <qcombobox.h>
 
@@ -14,6 +15,11 @@ class CAnnoEdit : public QWidget
     QMultiLineEdit* m_anno;
-    size_t m_posn;
+    size_t m_posn, m_posn2;
+    QComboBox* colorbox;
  public:
     void setPosn(size_t p) { m_posn = p; }
+    void setPosn2(size_t p) { m_posn2 = p; }
     size_t getPosn() { return m_posn; }
+    size_t getPosn2() { return m_posn2; }
+    QColor getColor();
+    void setColor(QColor);
     void setName(const QString& name)
@@ -28,25 +34,8 @@ class CAnnoEdit : public QWidget
     bool edited() { return m_anno->edited(); }
-    CAnnoEdit(QWidget *parent=0, const char *name=0, WFlags f = 0) :
-	QWidget(parent, name, f)
-	{
-	    QVBoxLayout* grid = new QVBoxLayout(this);
-	    m_name = new QLineEdit(this, "Name");
-	    m_anno = new QMultiLineEdit(this, "Annotation");
-	    m_anno->setWordWrap(QMultiLineEdit::WidgetWidth);
-	    QPushButton* exitButton = new QPushButton("Okay", this);
-	    connect(exitButton, SIGNAL( released() ), this, SLOT( slotOkay() ) );
-	    QPushButton* cancelButton = new QPushButton("Cancel", this);
-	    connect(cancelButton, SIGNAL( released() ), this, SLOT( slotCancel() ) );
-	    QLabel *l = new QLabel("Text",this);
-	    grid->addWidget(l);
-	    grid->addWidget(m_name);
-	    l = new QLabel("Annotation",this);
-	    grid->addWidget(l);
-	    grid->addWidget(m_anno,1);
-	    QHBoxLayout* hgrid = new QHBoxLayout(grid);
-	    hgrid->addWidget(cancelButton);
-	    hgrid->addWidget(exitButton);
-	}
+    CAnnoEdit(QWidget *parent=0, const char *name=0, WFlags f = 0);
     private slots:
-	void slotOkay() { emit finished(m_name->text(), m_anno->text()); }
+	void slotOkay()
+      {
+	emit finished(m_name->text(), m_anno->text());
+      }
 	void slotCancel() { emit cancelled(); }