some fixes in options, mainly items order

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2511 17fca916-40b9-46aa-a4ea-0a15b648b75c

2 files changed, 8 insertions, 10 deletions

diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 5b91113b7..308ffe1a2 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -75,19 +75,23 @@ KviGeneralOptionsFrontWidget::~KviGeneralOptionsFrontWidget()
 
 
 KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(KviTalTreeWidget *parent,KviOptionsWidgetInstanceEntry * e)
-:KviTalTreeWidgetItem(parent,e->szName)
+:KviTalTreeWidgetItem()
 {
 	m_pInstanceEntry = e;
 	m_pOptionsWidget = 0;
+	setText(0,e->szName);
 	setIcon(0,*(g_pIconManager->getSmallIcon(e->iIcon)));
+	parent->insertTopLevelItem(0, this);
 }
 
 KviOptionsTreeWidgetItem::KviOptionsTreeWidgetItem(KviTalTreeWidgetItem *parent,KviOptionsWidgetInstanceEntry * e)
-:KviTalTreeWidgetItem(parent,e->szName)
+:KviTalTreeWidgetItem()
 {
 	m_pInstanceEntry = e;
 	m_pOptionsWidget = 0;
+	setText(0,e->szName);
 	setIcon(0,*(g_pIconManager->getSmallIcon(e->iIcon)));
+	parent->insertChild(0, this);
 }
 
 KviOptionsTreeWidgetItem::~KviOptionsTreeWidgetItem()
@@ -179,8 +183,8 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	connect(m_pTreeWidget,SIGNAL(currentItemChanged(KviTalTreeWidgetItem*, KviTalTreeWidgetItem *)),this,SLOT(treeWidgetItemSelectionChanged(KviTalTreeWidgetItem *, KviTalTreeWidgetItem *)));
 
 	KviTalHBox * hbox = new KviTalHBox(vbox);
-	vbox->setSpacing(0);
-	vbox->setMargin(0);
+	hbox->setSpacing(2);
+	hbox->setMargin(0);
 
 	m_pSearchLineEdit = new QLineEdit(hbox);
 	connect(m_pSearchLineEdit,SIGNAL(returnPressed()),this,SLOT(searchClicked()));
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index ec159ce79..ae08bcba1 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -103,17 +103,12 @@ static bool options_kvs_cmd_dialog(KviKvsModuleCommandCall * c)
 		{
 			if(d->parent())
 			{
-			//	d->reparent(0,QPoint(0,0),true);
 				d->setParent(0);
 				d->setGeometry(0,0,d->width(),d->height());
-	//			inline QT3_SUPPORT void reparent(QWidget *parent, const QPoint &p, bool showIt=false)
-    //{ setParent(parent, windowFlags() & ~Qt::WindowType_Mask); setGeometry(p.x(),p.y(),width(),height()); if (showIt) show(); }
-    
 			}
 		} else {
 			if(d->parent() != c->window()->frame()->splitter())
 			{
-			//	d->reparent(c->window()->frame()->splitter(),QPoint(0,0),true);
 				d->setParent(c->window()->frame()->splitter());
 				d->setGeometry(0,0,d->width(),d->height());
 				d->show();
@@ -209,7 +204,6 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 
 	if(e->pWidget)
 	{
-		//c->warning(__tr("The editor page is already open","options"));
 		e->pWidget->raise();
 		e->pWidget->activateWindow();
 		e->pWidget->setFocus();