12 files changed, 132 insertions, 65 deletions

diff --git a/pwmanager/pwmanager/addentrywnd_emb.cpp b/pwmanager/pwmanager/addentrywnd_emb.cpp
index ed02e6d..dd09d13 100644
--- a/pwmanager/pwmanager/addentrywnd_emb.cpp
+++ b/pwmanager/pwmanager/addentrywnd_emb.cpp
@@ -4,64 +4,65 @@
                                                                         
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or   
     (at your option) any later version.                                 
                                                                         
     This program is distributed in the hope that it will be useful,     
     but WITHOUT ANY WARRANTY; without even the implied warranty of      
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
     GNU General Public License for more details.                        
                                                                         
     You should have received a copy of the GNU General Public License   
     along with this program; if not, write to the Free Software         
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                         
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 
 $Id$
 */                                                                      
 
 #include "addentrywnd_emb.h"
 
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qtabwidget.h>
 #include <qgroupbox.h>
 #include <klocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <qpushbutton.h>
+#include <qmultilineedit.h>
 
 /*
  *  Constructs a addEntryWnd as a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'.
  *
  *  The dialog will by default be modeless, unless you set 'modal' to
  *  TRUE to construct a modal dialog.
  */
 addEntryWnd::addEntryWnd( QWidget* parent, const char* name)
   : KDialogBase( KDialogBase::Plain, i18n( "edit/add a password entry" ), 
                  KDialogBase::Ok | KDialogBase::Cancel,
                  KDialogBase::Ok, parent, name, true )
 {
     QWidget *page = plainPage();
     QVBoxLayout *pageLayout = new QVBoxLayout( page );
 
     QTabWidget* mTabWidget = new QTabWidget( page );
     pageLayout->addWidget( mTabWidget );
 
     ////////////////////////////////////////////////////////////////////
     // This is the Password tab
     QWidget *tab1 = new QWidget( mTabWidget );
 
     QGridLayout *layout = new QGridLayout( tab1, 3, 1 );
     layout->setMargin( KDialogBase::marginHint() );
     layout->setSpacing( KDialogBase::spacingHint() );
 
 
 
     int i = 0;
     descLineEdit = new KLineEdit( tab1, "descLineEdit" );
     QLabel* label = new QLabel( descLineEdit, i18n("Description:"), tab1 );
@@ -89,125 +90,110 @@ addEntryWnd::addEntryWnd( QWidget* parent, const char* name)
     pwLineEdit->setEchoMode( QLineEdit::Password );
     label = new QLabel( pwLineEdit, i18n("Password:"), tab1 );
     layout->addWidget( label, i, 0 );
     layout->addWidget( pwLineEdit, i, 1 );
     i++;
 
     revealButton = new QPushButton( i18n("&Reveal"), tab1, "revealButton" );
     revealButton->setToggleButton( TRUE );
     layout->addWidget( revealButton, i, 0 );
 
     generateButton = new QPushButton( i18n("&Generate"), tab1, "generateButton" );
     layout->addWidget( generateButton, i, 1 );
     i++;
 
     urlLineEdit = new KLineEdit( tab1, "urlLineEdit" );
     label = new QLabel( urlLineEdit, i18n("URL:"), tab1 );
     layout->addWidget( label, i, 0 );
     layout->addWidget( urlLineEdit, i, 1 );
     i++;
 
     mTabWidget->addTab( tab1, i18n( "&Password" ) );
 
 
     ////////////////////////////////////////////////////////////////////
     // This is the Comment tab
     QWidget *tab2 = new QWidget( mTabWidget );
 
     layout = new QGridLayout( tab2, 3, 1 );
     layout->setMargin( KDialogBase::marginHintSmall() );
     layout->setSpacing( KDialogBase::spacingHintSmall() );
     i = 0;
 
-
-
-    groupBox1 = new QGroupBox( tab2, "groupBox1" );
-    commentDummy = new QLabel( groupBox1, "commentDummy" );
-    commentDummy->setText( QString::null );
-
-    groupBox1->setTitle( i18n( "Comment:" ) );
-
-    layout->addMultiCellWidget( groupBox1, i, i, 0, 1 );
-    i++;
-
-
-    advancedCommentButton = new QPushButton( i18n("advanced comment"), groupBox1, "advancedCommentButton" );
-    advancedCommentButton->setToggleButton( FALSE );
-    layout->addMultiCellWidget( advancedCommentButton, i, i, 0, 1 );
+    commentTextEdit = new QMultiLineEdit(tab2);
+    layout->addMultiCellWidget( commentTextEdit, i, i, 0, 0 );
     i++;
 
 
     mTabWidget->addTab( tab2, i18n( "&Comments" ) );
 
 
     ////////////////////////////////////////////////////////////////////
     // This is the Launcher tab
     QWidget *tab3 = new QWidget( mTabWidget );
 
     layout = new QGridLayout( tab3, 3, 1 );
     layout->setMargin( KDialogBase::marginHintSmall() );
     layout->setSpacing( KDialogBase::spacingHintSmall() );
     i = 0;
 
     launcherLineEdit = new KLineEdit( tab3, "launcherLineEdit" );
     label = new QLabel( launcherLineEdit, i18n("Launcher:"), tab3 );
 
     QLabel* label1 = new QLabel( launcherLineEdit, i18n("$d = Description"), tab3 );
     QLabel* label2 = new QLabel( launcherLineEdit, i18n("$n = Username"), tab3 );
     QLabel* label3 = new QLabel( launcherLineEdit, i18n("$c = Comment"), tab3 );
     QLabel* label4 = new QLabel( launcherLineEdit, i18n("$u = URL"), tab3 );
     QLabel* label5 = new QLabel( launcherLineEdit, i18n("$p = Password"), tab3 );
 
     label = new QLabel( launcherLineEdit, i18n("Launcher:"), tab3 );
 
     layout->addWidget( label1, i, 0 );
     layout->addWidget( label2, i, 1 );
     i++;
     layout->addWidget( label3, i, 0 );
     layout->addWidget( label4, i, 1 );
     i++;
     layout->addWidget( label5, i, 0 );
     i++;
 
     layout->addWidget( label, i, 0 );
     layout->addWidget( launcherLineEdit, i, 1 );
     i++;
 
 
     mTabWidget->addTab( tab3, i18n( "&Launcher" ) );
 
     // signals and slots connections
     connect( generateButton, SIGNAL( clicked() ), this, SLOT( generateButton_slot() ) );
     connect( revealButton, SIGNAL( toggled(bool) ), this, SLOT( revealButton_slot() ) );
-    connect( advancedCommentButton, SIGNAL( toggled(bool) ), this, SLOT( advancedCommentButton_slot(bool) ) );
-
 }
 
 /*
  *  Destroys the object and frees any allocated resources
  */
 addEntryWnd::~addEntryWnd()
 {
     // no need to delete child widgets, Qt does it all for us
 }
 
 void addEntryWnd::slotOk()
 {
     qWarning( "addEntryWnd::slotOk(): Not implemented yet" );
 }
 
 void addEntryWnd::revealButton_slot()
 {
     qWarning( "addEntryWnd::revealButton_slot(): Not implemented yet" );
 }
 
 void addEntryWnd::generateButton_slot()
 {
     qWarning( "addEntryWnd::generateButton_slot(): Not implemented yet" );
 }
 
 void addEntryWnd::advancedCommentButton_slot(bool)
 {
     qWarning( "addEntryWnd::advancedCommentButton_slot(bool): Not implemented yet" );
 }
 
 
diff --git a/pwmanager/pwmanager/addentrywnd_emb.h b/pwmanager/pwmanager/addentrywnd_emb.h
index e368721..83761dc 100644
--- a/pwmanager/pwmanager/addentrywnd_emb.h
+++ b/pwmanager/pwmanager/addentrywnd_emb.h
@@ -9,65 +9,64 @@
                                                                         
     This program is distributed in the hope that it will be useful,     
     but WITHOUT ANY WARRANTY; without even the implied warranty of      
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the        
     GNU General Public License for more details.                        
                                                                         
     You should have received a copy of the GNU General Public License   
     along with this program; if not, write to the Free Software         
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.           
                                                                         
     As a special exception, permission is given to link this program    
     with any edition of Qt, and distribute the resulting executable,    
     without including the source code for Qt in the source distribution.
 
 $Id$
 */                                                                      
 
 #ifndef ADDENTRYWND_EMB_H
 #define ADDENTRYWND_EMB_H
 
 #include <qvariant.h>
 #include <kdialogbase.h>
 
 class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QSpacerItem;
 class KLineEdit;
 class QPushButton;
 class KComboBox;
 class QLabel;
 class QGroupBox;
+class QMultiLineEdit;
 
 class addEntryWnd : public KDialogBase
 {
     Q_OBJECT
 
 public:
     addEntryWnd( QWidget* parent = 0, const char* name = 0);
     ~addEntryWnd();
 
     KLineEdit* launcherLineEdit;
     QPushButton* generateButton;
     KLineEdit* descLineEdit;
     KComboBox* categoryComboBox;
     KLineEdit* usernameLineEdit;
     KLineEdit* pwLineEdit;
     KLineEdit* urlLineEdit;
 
     QPushButton* revealButton;
-    QGroupBox* groupBox1;
-    QLabel* commentDummy;
-    QPushButton* advancedCommentButton;
+    QMultiLineEdit* commentTextEdit;
 
 public slots:
     virtual void revealButton_slot();
     virtual void generateButton_slot();
     virtual void advancedCommentButton_slot(bool on);
 
   protected slots:
     virtual void slotOk();
 
 };
 
 #endif // ADDENTRYWND_H
diff --git a/pwmanager/pwmanager/addentrywndimpl.cpp b/pwmanager/pwmanager/addentrywndimpl.cpp
index ffd301f..d47f32c 100644
--- a/pwmanager/pwmanager/addentrywndimpl.cpp
+++ b/pwmanager/pwmanager/addentrywndimpl.cpp
@@ -4,83 +4,89 @@
  *   email: mbuesch@freenet.de                                             *
  *                                                                         *
  *   Many very good improvements and the original implementations of       *
  *   them came from Matt Scifo <mscifo@o1.com>                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License version 2        *
  *   as published by the Free Software Foundation.                         *
  *                                                                         *
  ***************************************************************************/
 
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.0.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #include "addentrywndimpl.h"
 #include "pwmexception.h"
 #include "pwgenwndimpl.h"
 #ifndef PWM_EMBEDDED
 #include "advcommeditimpl.h"
 #endif
 #include "htmlgen.h"
 
 #include <kmessagebox.h>
 #include <klocale.h>
 
 #include <qpushbutton.h>
 #include <qlabel.h>
+#include <qlayout.h>
+
 
 #ifndef PWM_EMBEDDED
 AddEntryWndImpl::AddEntryWndImpl()
   : addEntryWnd( 0, "AddEntryWndImpl", TRUE)
 #else
 AddEntryWndImpl::AddEntryWndImpl( QWidget* parent, const char* name)
   : addEntryWnd( parent, name)
 #endif
 {
+#ifndef PWM_EMBEDDED
 	editAdvCommentButton = 0;
 	commentTextEdit = 0;
+#endif
 	switchComment(false);
 	pwGen = new PwGenWndImpl(this);
 }
 
 AddEntryWndImpl::~AddEntryWndImpl()
 {
+#ifndef PWM_EMBEDDED
 	delete_ifnot_null(editAdvCommentButton);
 	delete_ifnot_null(commentTextEdit);
+#endif
 	delete pwGen;
 }
 
 #ifdef PWM_EMBEDDED
 void AddEntryWndImpl::slotOk()
 {
   slotApply();
 
   if (pwLineEdit->text().isEmpty()) {
     KMessageBox::error(this,
 	i18n("Sorry, you haven't set a password."),
 	i18n("no password"));
     return;
   }
   
   if (descLineEdit->text().isEmpty()) {
     KMessageBox::error(this,
 	i18n("You haven't set a \"Description\"."),
 	i18n("Description not set"));
     return;
   }
  
   KDialogBase::slotOk();
 }
 #else
 
 void AddEntryWndImpl::okButton_slot()
 {
 	if (pwLineEdit->text().isEmpty()) {
 		KMessageBox::error(this,
 				   i18n("Sorry, you haven't set a password."),
 				   i18n("no password"));
@@ -104,100 +110,108 @@ void AddEntryWndImpl::cancelButton_slot()
 
 void AddEntryWndImpl::setCurrCategory(const QString &cat)
 {
 	int i, count = categoryComboBox->count();
 
 	for (i = 0; i < count; ++i) {
 		if (categoryComboBox->text(i) == cat) {
 			categoryComboBox->setCurrentItem(i);
 			return;
 		}
 	}
 	BUG();
 }
 
 void AddEntryWndImpl::revealButton_slot()
 {
 	if (revealButton->isOn()) {
 		pwLineEdit->setEchoMode(QLineEdit::Normal);
 	} else {
 		pwLineEdit->setEchoMode(QLineEdit::Password);
 	}
 }
 
 void AddEntryWndImpl::generateButton_slot()
 {
 	if (!pwGen->exec())
 		return;
 	setPassword(pwGen->getPassword());
 }
 
 QString AddEntryWndImpl::getComment()
 {
+#ifndef PWM_EMBEDDED
 	if (isAdvancedComment()) {
 		return advCommentDta;
 	}
+#endif
 	return commentTextEdit->text();
 }
 
 void AddEntryWndImpl::setComment(const QString &comm)
 {
+#ifndef PWM_EMBEDDED
 	if (HtmlGen::isHtml(comm)) {
 		advancedCommentButton->setOn(true);
 		advCommentDta = comm;
 	} else {
 		advancedCommentButton->setOn(false);
 		commentTextEdit->setText(comm);
 	}
+#else
+	commentTextEdit->setText(comm);
+#endif
 }
 
 void AddEntryWndImpl::advancedCommentButton_slot(bool on)
 {
+#ifndef PWM_EMBEDDED
 	switchComment(on);
+#endif
 }
 
 void AddEntryWndImpl::switchComment(bool toAdvanced)
 {
+#ifndef PWM_EMBEDDED
+
 	useAdvComment = toAdvanced;
 	if (toAdvanced) {
 		if (commentTextEdit) {
 			savedCommentText = commentTextEdit->text();
 			delete_and_null(commentTextEdit);
 		}
 		if (editAdvCommentButton)
 			return;
 		editAdvCommentButton = new QPushButton(i18n("Edit advanced comment..."),
 						       commentDummy);
 		editAdvCommentButton->resize(commentDummy->size().width(), 50);
 		connect(editAdvCommentButton, SIGNAL(clicked()),
 			this, SLOT(editAdvCommentButton_slot()));
 		editAdvCommentButton->show();
 	} else {
 		delete_ifnot_null(editAdvCommentButton);
 		if (commentTextEdit)
 			return;
-#ifndef PWM_EMBEDDED
+
 		commentTextEdit = new QTextEdit(commentDummy);
 		commentTextEdit->setTextFormat(Qt::PlainText);
-#else
-		commentTextEdit = new QMultiLineEdit(commentDummy);
-#endif
 		commentTextEdit->resize(commentDummy->size());
 		commentTextEdit->setText(savedCommentText);
 		commentTextEdit->show();
 	}
+#endif
 }
 
 void AddEntryWndImpl::editAdvCommentButton_slot()
 {
 #ifndef PWM_EMBEDDED
 	AdvCommEditImpl editor(this);
 	editor.setHtmlDta(advCommentDta);
 	if (editor.exec())
 		return;
 	advCommentDta = editor.getHtmlDta();
 #endif
 }
 
 #ifndef PWM_EMBEDDED
 #include "addentrywndimpl.moc"
 #endif
diff --git a/pwmanager/pwmanager/addentrywndimpl.h b/pwmanager/pwmanager/addentrywndimpl.h
index 622e9d2..ce9a594 100644
--- a/pwmanager/pwmanager/addentrywndimpl.h
+++ b/pwmanager/pwmanager/addentrywndimpl.h
@@ -83,45 +83,45 @@ public:
 	/** are we using an advanced comment */
 	bool isAdvancedComment()
 			{ return useAdvComment; }
 
 public slots:
 #ifndef PWM_EMBEDDED 
 //MOC_SKIP_BEGIN
 	/** OK button pressed */
 	void okButton_slot();
 	/** cancel button pressed */
 	void cancelButton_slot();
 //MOC_SKIP_END
 #else
 	virtual void slotOk();
 #endif
 	/** Reveal button pressed */
 	void revealButton_slot();
 	/** Generate button pressed */
 	void generateButton_slot();
 	/** advanced comment button pressed */
 	void advancedCommentButton_slot(bool on);
 	/** edit advanced comment button pressed */
 	void editAdvCommentButton_slot();
 
 protected:
 	void switchComment(bool toAdvanced);
 
 protected:
 	QPushButton *editAdvCommentButton;
 #ifndef PWM_EMBEDDED
 	QTextEdit *commentTextEdit;
 #else
-	QMultiLineEdit * commentTextEdit;
+	//nothing here 
 #endif
 	/** saved data from normal comment text edit box */
 	QString savedCommentText;
 	/** use an advanced comment? */
 	bool useAdvComment;
 	/** data of advanced comment (if available) */
 	QString advCommentDta;
 	/** password generation object */
 	PwGenWndImpl *pwGen;
 };
 
 #endif
diff --git a/pwmanager/pwmanager/commentbox.cpp b/pwmanager/pwmanager/commentbox.cpp
index 280b139..4a76f36 100644
--- a/pwmanager/pwmanager/commentbox.cpp
+++ b/pwmanager/pwmanager/commentbox.cpp
@@ -2,237 +2,280 @@
  *                                                                         *
  *   copyright (C) 2004 by Michael Buesch                                  *
  *   email: mbuesch@freenet.de                                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License version 2        *
  *   as published by the Free Software Foundation.                         *
  *                                                                         *
  ***************************************************************************/
 
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.0.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #include "commentbox.h"
 #include "pwmexception.h"
 #include "htmlgen.h"
 
 #include <klocale.h>
 
 #ifndef PWM_EMBEDDED
 #include <khtml_part.h>
 #include <khtmlview.h>
 #include <qtextedit.h>
 #else
 #include <qmultilineedit.h>
 #endif
 
+
+
+#ifndef PWM_EMBEDDED
 CommentBox::CommentBox(QWidget *_parentWidget)
 {
 	PWM_ASSERT(_parentWidget);
 	parentWidget = _parentWidget;
 	textDta = 0;
-#ifndef PWM_EMBEDDED
 	htmlDta = 0;
-#endif
 	mode = mode_notSet;
 }
 
 CommentBox::~CommentBox()
 {
 	clearText();
 	clearHtml();
 }
 
 void CommentBox::clear()
 {
 	clearText();
 	clearHtml();
 	mode = mode_notSet;
+	this->hide();
 }
 
 void CommentBox::clearText()
 {
 	delete_ifnot_null(textDta);
 }
 
 void CommentBox::clearHtml()
 {
-#ifndef PWM_EMBEDDED
   delete_ifnot_null(htmlDta);
-#endif
 }
 
 void CommentBox::setText(const QString &text)
 {
 	switchTo(mode_text);
 	PWM_ASSERT(textDta);
 	textDta->setText(i18n("Comment") + ":  " + text);
 	if (!textDta->isVisible())
 		textDta->show();
 }
 
 bool CommentBox::getText(QString *text)
 {
 	if (mode != mode_text)
 		return false;
 	PWM_ASSERT(text);
 	if (!textDta) {
 		*text = "";
 		return true;
 	}
 	*text = textDta->text();
 	return true;
 }
 
 void CommentBox::setHtml(QString code)
 {
-#ifndef PWM_EMBEDDED
 	switchTo(mode_html);
 	PWM_ASSERT(htmlDta);
 	if (!HtmlGen::replaceSSDummy(&code))
 		printWarn("CommentBox::setHtml(): replaceSSDummy() failed!");
 	htmlDta->begin();
 	htmlDta->write(code);
 	htmlDta->end();
 	htmlDta->show();
-#endif
 }
 
 void CommentBox::setContent(const QString &dta)
 {
 	// if there's no data, hide the comment-box
 	if (dta.isEmpty()) {
 		clear();
 		return;
 	}
-#ifndef PWM_EMBEDDED
 	if (HtmlGen::isHtml(dta)) {
 		setHtml(dta);
 		return;
 	}
-#endif
 	// we assume it's plain text
 	setText(dta);
 }
 
 void CommentBox::switchTo(commentBoxMode newMode)
 {
 	if (newMode == mode)
 		return;
 
 	// cleanup old mode
 	switch (mode) {
 	case mode_text:
 		clearText();
 		break;
 	case mode_html:
 		clearHtml();
 		break;
 	default:
 		break;
 	}
 
 	// setup new mode
 	switch (newMode) {
 	case mode_text:
-#ifndef PWM_EMBEDDED
 		textDta = new QTextEdit(parentWidget);
 		textDta->setTextFormat(Qt::PlainText);
-#else
-		textDta = new QMultiLineEdit(parentWidget);
-#endif
 		textDta->setReadOnly(true);
 		textDta->show();
 		break;
 	case mode_html:
-#ifndef PWM_EMBEDDED
 		htmlDta = new KHTMLPart(parentWidget, 0,
 					parentWidget);
 		htmlDta->show();
-#endif
 		break;
 	default:
 		BUG();
 		break;
 	}
 
 	mode = newMode;
 }
 
 void CommentBox::show()
 {
 	switch (mode) {
 	case mode_text:
 		PWM_ASSERT(textDta);
 		textDta->show();
 		break;
 	case mode_html:
-#ifndef PWM_EMBEDDED
 		PWM_ASSERT(htmlDta);
 		htmlDta->show();
-#endif
 		break;
 	default:
 		break;
 	}
+
 }
 
 void CommentBox::hide()
 {
 	switch (mode) {
 	case mode_text:
 		PWM_ASSERT(textDta);
 		textDta->hide();
 		break;
 	case mode_html:
-#ifndef PWM_EMBEDDED
 		PWM_ASSERT(htmlDta);
 		htmlDta->hide();
-#endif
 		break;
 	default:
 		break;
 	}
 }
 
 void CommentBox::resize(const QSize &size)
 {
 	switch (mode) {
 	case mode_text:
 		PWM_ASSERT(textDta);
 		textDta->resize(size);
 		break;
 	case mode_html:
-#ifndef PWM_EMBEDDED
  		PWM_ASSERT(htmlDta);
 		htmlDta->view()->resize(size);
-#endif
 		break;
 	default:
 		break;
 	}
+
 }
 
 QSize CommentBox::size()
 {
 	switch (mode) {
 	case mode_text:
 		PWM_ASSERT(textDta);
 		return textDta->size();
 		break;
 	case mode_html:
-#ifndef PWM_EMBEDDED
 		PWM_ASSERT(htmlDta);
 		return htmlDta->view()->size();
-#endif
 		break;
 	default:
 		break;
 	}
+
 	return QSize();
 }
+
+
+////////////////////////////////////////////////////////////////////////
+
+#else
+
+CommentBox::CommentBox(QWidget *_parentWidget)
+  : QMultiLineEdit(_parentWidget) 
+
+{
+  this->setReadOnly(true);
+}
+
+CommentBox::~CommentBox()
+{
+}
+
+void CommentBox::clear()
+{
+	this->hide();
+}
+
+
+void CommentBox::setText(const QString &text)
+{
+	QMultiLineEdit::setText(i18n("Comment") + ":  " + text);
+	if (!this->isVisible())
+		this->show();
+}
+
+bool CommentBox::getText(QString *text)
+{
+	*text = this->text();
+	return true;
+}
+
+void CommentBox::setContent(const QString &dta)
+{
+	// if there's no data, hide the comment-box
+	if (dta.isEmpty()) {
+		clear();
+		return;
+	}
+
+	// we assume it's plain text
+	setText(dta);
+}
+
+#endif
+
+
+
+
+
+
+
+
+
diff --git a/pwmanager/pwmanager/commentbox.h b/pwmanager/pwmanager/commentbox.h
index a220acd..352867c 100644
--- a/pwmanager/pwmanager/commentbox.h
+++ b/pwmanager/pwmanager/commentbox.h
@@ -1,100 +1,124 @@
 /***************************************************************************
  *                                                                         *
  *   copyright (C) 2004 by Michael Buesch                                  *
  *   email: mbuesch@freenet.de                                             *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License version 2        *
  *   as published by the Free Software Foundation.                         *
  *                                                                         *
  ***************************************************************************/
 
 /***************************************************************************
  * copyright (C) 2004 by Ulf Schenk
  * This file is originaly based on version 1.0.1 of pwmanager
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #ifndef COMMENTBOX_H
 #define COMMENTBOX_H
 
 #include <qstring.h>
 #include <qsize.h>
-
 class QWidget;
 class QTextEdit;
-class QMultiLineEdit;
 class KHTMLPart;
 
-/** Implementation of the advanced HTML comment box */
-class CommentBox
+#ifndef PWM_EMBEDDED
+
+class CommentBox 
 {
 protected:
 	enum commentBoxMode
 	{
 		mode_notSet = 0,
 		mode_text,
 		mode_html
 	};
 
 public:
 	CommentBox(QWidget *_parentWidget);
 	~CommentBox();
 
 	/** clear all data in the comment box */
 	void clear();
 	/** show the comment box */
 	void show();
 	/** hide the comment box */
 	void hide();
 	/** resize the comment box */
 	void resize(const QSize &size);
 	void resize(int w, int h)
 			{ resize(QSize(w, h)); }
 	/** get the size of the comment box */
 	QSize size();
 	/** if neccessary switch to text-mode and
 	  * insert this text into the comment box
 	  */
 	void setText(const QString &text);
 	/** get the text of the comment box.
 	  * If it's not in text-mode it returns false
 	  */
 	bool getText(QString *text);
 	/** if neccessary switch to HTML-mode and
 	  * insert this html code into the comment box
 	  */
 	void setHtml(QString code);
 	/** checks "dta" for its type, sets the correct
 	  * mode and writes "dta" to the comment box
 	  */
 	void setContent(const QString &dta);
 
 protected:
 	/** switch the current mode */
 	void switchTo(commentBoxMode newMode);
 	/** clear all text data */
 	void clearText();
 	/** clear all HTML data */
 	void clearHtml();
 
 protected:
 	/** parent widget for this comment box */
 	QWidget *parentWidget;
 	/** current comment box usage type */
 	commentBoxMode mode;
-#ifndef PWM_EMBEDDED
 	/** if the comment box is a normal textbox, data is stored here */
 	QTextEdit *textDta;
 	/** if the comment box is a HTML box, data is stored here */
 	KHTMLPart *htmlDta;
+};
+
 #else
-	/** if the comment box is a normal textbox, data is stored here */
-	QMultiLineEdit *textDta;
-#endif
+#include <qmultilineedit.h>
+/** Implementation of the advanced HTML comment box */
+//US ENH: CommentBox must be derived from QWidget, to allow the splitter to set a initial size
+// without conflicting with the two display modes 
+
+class CommentBox : public QMultiLineEdit 
+{
+public:
+	CommentBox(QWidget *_parentWidget);
+	~CommentBox();
+
+	/** clear all data in the comment box */
+	void clear();
+	/** if neccessary switch to text-mode and
+	  * insert this text into the comment box
+	  */
+	void setText(const QString &text);
+	/** get the text of the comment box.
+	  * If it's not in text-mode it returns false
+	  */
+	bool getText(QString *text);
+	/** if neccessary switch to HTML-mode and
+	  * insert this html code into the comment box
+	  */
+	void setContent(const QString &dta);
 
 };
+#endif
+
 
 #endif
diff --git a/pwmanager/pwmanager/pwmanagerE.pro b/pwmanager/pwmanager/pwmanagerE.pro
index 3bcf679..4e482ca 100644
--- a/pwmanager/pwmanager/pwmanagerE.pro
+++ b/pwmanager/pwmanager/pwmanagerE.pro
@@ -1,43 +1,44 @@
 TEMPLATE	= app
 CONFIG		+= qt warn_on
 
 
 TARGET		= pwmpi
 OBJECTS_DIR = obj/$(PLATFORM)
 MOC_DIR = moc/$(PLATFORM)
 DESTDIR=$(QPEDIR)/bin
 
 INCLUDEPATH += . ../../qtcompat ../../qtcompat/xml ../../libkdepim ../../microkde ../../microkde/kdecore ../../microkde/kdeui ../../microkde/kutils $(QPEDIR)/include
-DEFINES += PWM_EMBEDDED PWM_DEBUG
+DEFINES += PWM_EMBEDDED CONFIG_DEBUG
+
 LIBS += -lmicrokde
 LIBS += -lmicroqtcompat
 LIBS += -lmicrokdepim
 LIBS += -L$(QPEDIR)/lib
 LIBS += -lqpe
 LIBS += -lbz2
 LIBS += $(QTOPIALIB)
 
 #INTERFACES = \
 #addentrywnd.ui \
 #configwnd.ui \
 #findwnd.ui \
 #getmasterpwwnd.ui \
 #pwgenwnd.ui \
 #setmasterpwwnd.ui \
 #subtbledit.ui
 
 #INTERFACES = \
 #subtbledit.ui \
 
 
 
 #HEADERS = \
 #configuration_31compat.h \
 #configuration.h \
 #configwnd.h \
 #configwndimpl.h \
 #selftest.h
 #subtbledit.h \
 #subtbleditimpl.h \
 
 HEADERS = \
diff --git a/pwmanager/pwmanager/pwmdoc.cpp b/pwmanager/pwmanager/pwmdoc.cpp
index c167c2c..1b6d36f 100644
--- a/pwmanager/pwmanager/pwmdoc.cpp
+++ b/pwmanager/pwmanager/pwmdoc.cpp
@@ -15,66 +15,64 @@
  * and was modified to run on embedded devices that run microkde
  *
  * $Id$
  **************************************************************************/  
 
 #include "pwmdoc.h"
 #include "pwmview.h"
 #include "blowfish.h"
 #include "sha1.h"
 #include "globalstuff.h"
 #include "gpasmanfile.h"
 #include "serializer.h"
 #include "compressgzip.h"
 #include "compressbzip2.h"
 #include "randomizer.h"
 #include "pwminit.h"
 #ifndef PWM_EMBEDDED
 //US #include "libgryptif.h"
 #else
 #include "pwmprefs.h"
 #include "kglobal.h"
 #endif
 
 #ifdef CONFIG_KWALLETIF
 # include "kwalletemu.h"
 #endif // CONFIG_KWALLETIF
 
 #include <qdatetime.h>
 #include <qsize.h>
 #include <qfileinfo.h>
 #include <qfile.h>
 
-#define __USE_GNU
-#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
 //US#include <iostream>
 #include <algorithm>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <stdint.h>
 
 //TODO: reset to its normal value.
 #define META_CHECK_TIMER_INTERVAL	10/*300*/ /* sek */
 
 using namespace std;
 
 
 void PwMDocList::add(PwMDoc *doc, const string &id)
 {
 #ifdef PWM_DEBUG
 	// check for existance of object in debug mode only.
 	vector<listItem>::iterator begin = docList.begin(),
 				   end = docList.end(),
 				   i = begin;
 	while (i != end) {
 		if (i->doc == doc) {
 			BUG();
 			return;
 		}
 		++i;
 	}
 #endif
@@ -1142,66 +1140,64 @@ unsigned int PwMDoc::numEntries(const QString &category)
 }
 
 bool PwMDoc::serializeDta(string *d)
 {
 	PWM_ASSERT(d);
 	Serializer ser;
 	if (!ser.serialize(dta))
 		return false;
 	d->assign(ser.getXml());
 	if (!d->size())
 		return false;
 	return true;
 }
 
 bool PwMDoc::deSerializeDta(const string *d, bool entriesLocked)
 {
 	PWM_ASSERT(d);
 #ifndef PWM_EMBEDDED
 	try {
 
 		Serializer ser(d->c_str());
 		ser.setDefaultLockStat(entriesLocked);
 		if (!ser.deSerialize(&dta))
 			return false;
 	} catch (PwMException) {
 		return false;
 	}
 #else
 	Serializer ser(d->c_str());
 	ser.setDefaultLockStat(entriesLocked);
 	if (!ser.deSerialize(&dta))
 	  return false;
-	else
-	  return false;
 #endif
 
 	emitDataChanged(this);
 	return true;
 }
 
 bool PwMDoc::getEntry(const QString &category, unsigned int index,
 		      PwMDataItem * d, bool unlockIfLocked)
 {
 	PWM_ASSERT(d);
 	unsigned int cat = 0;
 
 	if (!findCategory(category, &cat)) {
 		BUG();
 		return false;
 	}
 
 	return getEntry(cat, index, d, unlockIfLocked);
 }
 
 bool PwMDoc::getEntry(unsigned int category, unsigned int index,
 		      PwMDataItem *d, bool unlockIfLocked)
 {
 	if (index > dta[category].d.size() - 1)
 		return false;
 
 	bool locked = isLocked(category, index);
 	if (locked) {
 		/* this entry is locked. We don't return a password,
 		 * until it's unlocked by the user by inserting
 		 * chipcard or entering the mpw
 		 */
diff --git a/pwmanager/pwmanager/pwmprefs.cpp b/pwmanager/pwmanager/pwmprefs.cpp
index d3847f6..7fd347f 100644
--- a/pwmanager/pwmanager/pwmprefs.cpp
+++ b/pwmanager/pwmanager/pwmprefs.cpp
@@ -32,65 +32,66 @@
 
 PWMPrefs *PWMPrefs::sInstance = 0;
 static KStaticDeleter<PWMPrefs> staticDeleter;
 
 PWMPrefs::PWMPrefs()
   : KPimPrefs("pwmanagerrc")
 {
   KPrefs::setCurrentGroup( "Global" );
 
   addItemString( "autoStart", &mAutoStart, "" );
   addItemString( "browserCommand", &mBrowserCommand, "" );
   addItemString( "xtermCommand", &mXTermCommand, CONF_DEFAULT_XTERMCOMMAND);
   addItemFont( "entryFont", &mEntryFont);
   addItemInt( "pwTimeout", &mPwTimeout, CONF_DEFAULT_PWTIMEOUT );
   addItemInt( "lockTimeout", &mLockTimeout, CONF_DEFAULT_LOCKTIMEOUT );
   addItemInt( "compression", &mCompression, CONF_DEFAULT_COMPRESSION );
   addItemInt( "filePermissions", &mFilePermissions, CONF_DEFAULT_FILEPERMISSIONS );
   addItemInt( "minimizeLock", &mMinimizeLock, CONF_DEFAULT_MINIMIZELOCK );
   addItemBool( "unlockOnOpen", &mUnlockOnOpen, CONF_DEFAULT_UNLOCKONOPEN );
   addItemBool( "tray", &mTray, CONF_DEFAULT_TRAY );
   addItemBool( "makeFileBackup", &mMakeFileBackup, CONF_DEFAULT_MAKEFILEBACKUP );
   addItemBool( "autostartDeepLocked", &mAutostartDeeplocked, CONF_DEFAULT_AUTOSTART_DEEPL );
   addItemBool( "autoDeepLock", &mAutoDeeplock, CONF_DEFAULT_AUTODEEPLOCK );
   addItemBool( "kwalletEmu", &mKWalletEmu, CONF_DEFAULT_KWALLETEMU );
   addItemBool( "newEntrLockStat", &mNewEntrLockStat, CONF_DEFAULT_NEWENTRLOCKSTAT );
 
   KPrefs::setCurrentGroup( "Wnd" );
 
   addItemSize( "MainWndSize", &mMainWndSize);
   addItemInt( "MainViewStyle", &mMainViewStyle, CONF_DEFAULT_MAINVIEWSTYLE );
   addItemBool( "autoMinimizeOnStart", &mAutoMinimizeOnStart, CONF_DEFAULT_AUTOMINIMIZE );
   addItemBool( "close", &mClose, CONF_DEFAULT_WNDCLOSE );
-  addItemIntList( "CommentSplitter", &mCommentSplitter );
+  addItemIntList( "commentSplitter", &mCommentSplitter );
+  addItemIntList( "categorySplitter", &mCategorySplitter );
 }
 
 PWMPrefs::~PWMPrefs()
 {
 }
 
 PWMPrefs *PWMPrefs::instance()
 {
   if ( !sInstance ) {
 #ifdef PWM_EMBEDDED
     sInstance = staticDeleter.setObject( new PWMPrefs() );
 #else  //PWM_EMBEDDED
     //US the following line has changed ???. Why
     staticDeleter.setObject( sInstance, new PWMPrefs() );
 #endif //KAB_EMBEDDED
     sInstance->readConfig();
   }
 
   return sInstance;
 }
 
     // US introduce a nonconst way to return the config object.
 KConfig* PWMPrefs::getConfig()
 {
     return config();
 }
 
 /*******************************************************************
  *  functions for reading the configuration settings
  *******************************************************************/
 
 QString PWMPrefs::confGlobAutoStart()
diff --git a/pwmanager/pwmanager/pwmprefs.h b/pwmanager/pwmanager/pwmprefs.h
index 6a89d10..9fed7d2 100644
--- a/pwmanager/pwmanager/pwmprefs.h
+++ b/pwmanager/pwmanager/pwmprefs.h
@@ -107,44 +107,45 @@ public:
 	void confGlobNewEntrLockStat(bool e);
 	/* WND */
 	void confWndMainWndSize(const QSize &e);
 	void confWndMainViewStyle(int e);
 	void confWndAutoMinimizeOnStart(bool e);
 	void confWndClose(bool e);
 
 
 
   QString mAutoStart;
   QString mBrowserCommand;
   QString mXTermCommand;
   QFont mEntryFont;
   int mPwTimeout;
   int mLockTimeout;
   int mCompression;
   int mFilePermissions;
   int mMinimizeLock;
   bool mUnlockOnOpen;
   bool mTray;
   bool mMakeFileBackup;
   bool mAutostartDeeplocked;
   bool mAutoDeeplock;
   bool mKWalletEmu;
   bool mNewEntrLockStat;
   QSize mMainWndSize;
   int mMainViewStyle;
   bool mAutoMinimizeOnStart;
   bool mClose;
 
   //US ENH
   QValueList<int> mCommentSplitter;
+  QValueList<int> mCategorySplitter;
 
 
     // US introduce a nonconst way to return the config object.
     KConfig* getConfig();
 
   private:
     PWMPrefs();
 
     static PWMPrefs *sInstance;
 };
 
 #endif
diff --git a/pwmanager/pwmanager/pwmviewstyle.cpp b/pwmanager/pwmanager/pwmviewstyle.cpp
index 9704615..0af1473 100644
--- a/pwmanager/pwmanager/pwmviewstyle.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle.cpp
@@ -26,111 +26,111 @@
 #include "pwmview.h"
 #include "commentbox.h"
 #ifndef PWM_EMBEDDED
 #include "configuration.h"
 #else
 #include "pwmprefs.h"
 #endif
 
 PwMViewStyle::PwMViewStyle(QWidget *parent, const char *name)
  : QWidget(parent, name)
 {
 	curStyle = style_notset;
 	s0 = 0;
 	s1 = 0;
 }
 
 PwMViewStyle::~PwMViewStyle()
 {
 	//US ENH : store the size of the listviewcolumns
         switch (curStyle)
 	  {
 	  case style_0:
 	    s0->saveSettings(PWMPrefs::instance());
 	    break;
 	  case style_1:
 	    s1->saveSettings(PWMPrefs::instance());
 	    break;
 	  default:
 		BUG();
 	  }
 
 
-	PWMPrefs::instance()->getConfig()->sync();
+	PWMPrefs::instance()->writeConfig();
 
 	delete_ifnot_null(s0);
 	delete_ifnot_null(s1);
 }
 
 void PwMViewStyle::initStyle(style_t style)
 {
 	printDebug(string("initializing style ") + tostr(style));
 	bool wasMaximized = v->isMaximized();
 	if (v->isVisible())
 		v->hide();
 	switch (style) {
 	case style_0:
 		delete_ifnot_null(s0);
 		delete_ifnot_null(s1);
 		s0 = new PwMViewStyle_0(v);
 		lv = s0->getLv();
 		commentBox = s0->getCommentBox();
 		break;
 	case style_1:
 		delete_ifnot_null(s0);
 		delete_ifnot_null(s1);
 		s1 = new PwMViewStyle_1(v);
 		lv = s1->getLv();
 		commentBox = s1->getCommentBox();
 		break;
 	default:
 		BUG();
 		return;
 	}
 	curStyle = style;
 	connect(lv, SIGNAL(pressed(QListViewItem *)),
 		v, SLOT(handleToggle(QListViewItem *)));
 	connect(lv, SIGNAL(rightButtonClicked(QListViewItem *, const QPoint &, int)),
 		v, SLOT(handleRightClick(QListViewItem *, const QPoint &, int)));
 	connect(lv, SIGNAL(clicked(QListViewItem *)),
 		v, SLOT(refreshCommentTextEdit(QListViewItem *)));
 	lv->addColumn(i18n("Description"), 180);
 	lv->addColumn(i18n("Username"), 150);
 	lv->addColumn(i18n("Password"), 150);
 	lv->addColumn(i18n("URL"), 180);
 	lv->addColumn(i18n("Launcher"), 120);
 	v->tmpReEnableSort();
 
 	//US ENH : load the size of the listviewcolumns
-	switch (style)
+	switch (curStyle)
 	  {
 	  case style_0:
 	    s0->restoreSettings(PWMPrefs::instance());
 	    break;
 	  case style_1:
 	    s1->restoreSettings(PWMPrefs::instance());
 	    break;
 	  default:
 		BUG();
 	  }
 
 	resizeView(v->size());
 	v->updateView();
 	if (wasMaximized) {
 		v->showMaximized();
 	} else {
 		v->show();
 	}
 	connect(lv, SIGNAL(layoutChanged()),
 		v, SLOT(reorgLp()));
 }
 
 void PwMViewStyle::resizeView(const QSize &size)
 {
 	switch (curStyle) {
 	case style_0:
 		PWM_ASSERT(s0);
 		s0->resize(size);
 		return;
 	case style_1:
 		PWM_ASSERT(s1);
 		s1->resize(size);
diff --git a/pwmanager/pwmanager/pwmviewstyle_1.cpp b/pwmanager/pwmanager/pwmviewstyle_1.cpp
index 8b2d6d3..374c698 100644
--- a/pwmanager/pwmanager/pwmviewstyle_1.cpp
+++ b/pwmanager/pwmanager/pwmviewstyle_1.cpp
@@ -25,74 +25,74 @@
 #include <klocale.h>
 #include "pwmprefs.h"
 
 #define INITIAL_CATEGORIES_WIDTH	100
 
 PwMViewStyle_1::PwMViewStyle_1(PwMView *view)
  : QObject()
 {
 #ifndef PWM_EMBEDDED
 	splitter = new QSplitter(view);
 #else
 	splitter = new KDGanttMinimizeSplitter( Qt::Horizontal, view);
 	splitter->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
 
 	//US  topLayout->addWidget(mMiniSplitter );
 #endif
 
 	vbox1 = new QVBox(splitter);
 	categoriesTitle = new QLabel(vbox1);
 	categoriesList = new QListBox(vbox1);
 #ifndef PWM_EMBEDDED
 	splitter2 = new QSplitter(splitter);
 	splitter2->setOrientation(Qt::Vertical);
 #else
 	splitter2 = new KDGanttMinimizeSplitter( Qt::Vertical, splitter);
 	splitter2->setMinimizeDirection ( KDGanttMinimizeSplitter::Right );
 
 	//US  topLayout->addWidget(mMiniSplitter );
 #endif
 	lv = new ListViewPwM(splitter2);
 	commentBox = new CommentBox(splitter2);
 	// set sizes and styles
-	commentBox->resize(commentBox->size().width(), 60);
+	//US	commentBox->resize(commentBox->size().width(), 60);
 	QValueList<int> sizes;
 #ifndef PWM_EMBEDDED
 	sizes.push_back(INITIAL_CATEGORIES_WIDTH);
 	sizes.push_back(view->height() - INITIAL_CATEGORIES_WIDTH);
 #else
 	sizes.append(INITIAL_CATEGORIES_WIDTH);
 	sizes.append(view->height() - INITIAL_CATEGORIES_WIDTH);
 #endif
-	splitter->setSizes(sizes);
+	//US	splitter->setSizes(sizes);
 	categoriesTitle->setAlignment(Qt::AlignHCenter);
 #ifndef PWM_EMBEDDED
 	categoriesTitle->setFrameShape(QFrame::MenuBarPanel);
 #else
 	categoriesTitle->setFrameShape(QFrame::StyledPanel);
 #endif
 	categoriesTitle->setText(i18n("Categories:"));
 	catCtxMenu = new QPopupMenu(view);
 	catCtxMenu->insertItem(i18n("&Rename"),
 			       view, SLOT(renCatButton_slot()));
 	catCtxMenu->insertItem(i18n("&Delete"),
 			       view, SLOT(delCatButton_slot()));
 	// connections
 	connect(categoriesList, SIGNAL(highlighted(int)),
 		view, SLOT(shiftToView()));
 	connect(categoriesList,
 		SIGNAL(rightButtonClicked(QListBoxItem *, const QPoint &)),
 		this,
 		SLOT(catRightClick(QListBoxItem *, const QPoint &)));
 }
 
 PwMViewStyle_1::~PwMViewStyle_1()
 {
 	delete catCtxMenu;
 	delete splitter;
 }
 
 void PwMViewStyle_1::catRightClick(QListBoxItem *item, const QPoint &point)
 {
 	if (!item)
 		return;
 	catCtxMenu->move(point);
@@ -102,49 +102,51 @@ void PwMViewStyle_1::catRightClick(QListBoxItem *item, const QPoint &point)
 void PwMViewStyle_1::delCategory(const QString &cat)
 {
 	PWM_ASSERT(categoriesList);
 	int i, count = categoriesList->count();
 	for (i = 0; i < count; ++i) {
 		if (categoriesList->text(i) == cat) {
 			categoriesList->removeItem(i);
 			return;
 		}
 	}
 	BUG();
 }
 
 void PwMViewStyle_1::selectCategory(const QString &cat)
 {
 	PWM_ASSERT(categoriesList);
 	int i, count = categoriesList->count();
 	for (i = 0; i < count; ++i) {
 		if (categoriesList->text(i) == cat) {
 			categoriesList->setCurrentItem(i);
 			return;
 		}
 	}
 	// fall back to 0
 	categoriesList->setCurrentItem(0);
 }
 
 //US ENH: I need a place to load the view dependend settings. Eg. splittersize
 void PwMViewStyle_1::restoreSettings(PWMPrefs* prefs)
 {
   //load and store the size of the listviewcolumns
   lv->restoreLayout(prefs->getConfig(), "listview");
+  splitter->setSizes( prefs->mCategorySplitter );
   splitter2->setSizes( prefs->mCommentSplitter );
 
 }
 
 //US ENH: I need a place to load the view dependend settings. Eg. splittersize
 void PwMViewStyle_1::saveSettings(PWMPrefs* prefs)
 {
   //store the size of the listviewcolumns
   lv->saveLayout(prefs->getConfig(), "listview");
+  prefs->mCategorySplitter = splitter->sizes();
   prefs->mCommentSplitter = splitter2->sizes();
 
 }
 
 
 #ifndef PWM_EMBEDDED
 #include "pwmviewstyle_1.moc"
 #endif