fixed problems in options conditional selectors

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

5 files changed, 17 insertions, 18 deletions

diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp
index 729f5d4a9..fe9b43413 100644
--- a/src/kvirc/ui/kvi_optionswidget.cpp
+++ b/src/kvirc/ui/kvi_optionswidget.cpp
@@ -69,7 +69,7 @@ KviOptionsWidget::~KviOptionsWidget()
 
 void KviOptionsWidget::mergeTip(QWidget * w,const QString &tip)
 {
-	static QString begin = "<table width=\"100%\" align=\"center\"><tr><td bgcolor=\"#fefef0\"><font color=\"000000\">";
+	static QString begin = "<table width=\"100%\" align=\"center\"><tr><td bgcolor=\"#fefef0\"><font color=\"#000000\">";
 	static QString mid = "</font></td></tr><tr><td>";
 	static QString end = "</td></tr></table>";
 
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index f93bfb823..c903a9401 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -49,6 +49,11 @@ KviBoolSelector::KviBoolSelector(QWidget * par,const QString & txt,bool *pOption
 	m_pOption = pOption;
 }
 
+void KviBoolSelector::setEnabled(bool bEnabled)
+{
+	QCheckBox::setEnabled(bEnabled);
+}
+
 void KviBoolSelector::setNotEnabled(bool bNotEnabled)
 {
 	setEnabled(!bNotEnabled);
diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h
index 0dbc53d28..0d618ddba 100644
--- a/src/kvirc/ui/kvi_selectors.h
+++ b/src/kvirc/ui/kvi_selectors.h
@@ -87,6 +87,7 @@ public:
 	virtual void commit();
 public slots:
 	void setNotEnabled(bool bNotEnabled);
+	void setEnabled(bool bEnabled);
 };
 
 class KVIRC_API KviStringSelector : public KviTalHBox, public KviSelectorInterface
@@ -103,8 +104,9 @@ public:
 	void setValidator(QValidator * v){ m_pLineEdit->setValidator(v); };
 	void setMinimumLabelWidth(unsigned int uWidth){ m_pLabel->setMinimumWidth(uWidth); };
 	virtual void commit();
-	virtual void setEnabled(bool bEnabled);
 	void setText(const QString& text);
+public slots:
+	virtual void setEnabled(bool bEnabled);
 };
 
 
@@ -169,6 +171,7 @@ public:
 	virtual void setPrefix(const QString & txt);
 	virtual void setSuffix(const QString & txt);
 	virtual void commit();
+public slots:
 	virtual void setEnabled(bool bEnabled);
 };
 
@@ -193,10 +196,11 @@ protected:
 	QString       m_szFilter;
 public:
 	virtual void commit();
-	virtual void setEnabled(bool bEnabled);
 	void setSelection(const QString &szSelection);
 signals:
 	void selectionChanged(const QString &szNewValue);
+public slots:
+	virtual void setEnabled(bool bEnabled);
 private slots:
 	void browseClicked();
 protected:
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index aef2bb8a5..89fc38f77 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -221,6 +221,7 @@ KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
 
 	KviStringSelector * s = addStringSelector(gbox,__tr2qs_ctx("Ident username:","options"),
 		KviOption_stringIdentdUser,KVI_OPTION_BOOL(KviOption_boolUseIdentService));
+	connect(m_pEnableIdent,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
 	
 	KviUIntSelector * u = addUIntSelector(gbox,__tr2qs_ctx("Service port:","options"),
 		KviOption_uintIdentdPort,0,65535,113,KVI_OPTION_BOOL(KviOption_boolUseIdentService));
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index c973958b2..401ab18c1 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -60,15 +60,15 @@ KviNickAlternativesDialog::KviNickAlternativesDialog(QWidget * par,const QString
 		"alternative to the primary one. KVIrc will use the alternatives " \
 		"if the primary nick is already used by someone else on a particular " \
 		"IRC network.</center>","options"));
+	l->setWordWrap(true);
+
 	g->addWidget(l,0,0,1,3);
-//	g->addMultiCellWidget(l,0,0,0,2);
 
 	l = new QLabel(this);
 	l->setText(__tr2qs_ctx("Alt. Nickname 1:","options"));
 	g->addWidget(l,1,0);
 	m_pNickEdit1 = new QLineEdit(this);
 	g->addWidget(m_pNickEdit1,1,1,1,2);
-//	g->addMultiCellWidget(m_pNickEdit1,1,1,1,2);
 	m_pNickEdit1->setText(n1);
 
 	l = new QLabel(this);
@@ -76,7 +76,6 @@ KviNickAlternativesDialog::KviNickAlternativesDialog(QWidget * par,const QString
 	g->addWidget(l,2,0);
 	m_pNickEdit2 = new QLineEdit(this);
 	g->addWidget(m_pNickEdit2,2,1,1,2);
-//	g->addMultiCellWidget(m_pNickEdit2,2,2,1,2);
 	m_pNickEdit2->setText(n2);
 
 	l = new QLabel(this);
@@ -84,14 +83,12 @@ KviNickAlternativesDialog::KviNickAlternativesDialog(QWidget * par,const QString
 	g->addWidget(l,3,0);
 	m_pNickEdit3 = new QLineEdit(this);
 	g->addWidget(m_pNickEdit3,3,1,1,2);
-//	g->addMultiCellWidget(m_pNickEdit3,3,3,1,2);
 	m_pNickEdit3->setText(n3);
 	KviTalHBox * h = new KviTalHBox(this);
 	h->setSpacing(8);
 	g->addWidget(h,4,2);
 
 	QPushButton * pb = new QPushButton(__tr2qs_ctx("Cancel","options"),h);
-	//g->addWidget(pb,4,2);
 	connect(pb,SIGNAL(clicked()),this,SLOT(reject()));
 
 	pb = new QPushButton(__tr2qs_ctx("Ok","options"),h);
@@ -99,8 +96,6 @@ KviNickAlternativesDialog::KviNickAlternativesDialog(QWidget * par,const QString
 	connect(pb,SIGNAL(clicked()),this,SLOT(accept()));
 
 	g->setColumnStretch(0,1);
-
-	//setMinimumSize(250,120);
 }
 
 KviNickAlternativesDialog::~KviNickAlternativesDialog()
@@ -126,7 +121,6 @@ KviAvatarDownloadDialog::KviAvatarDownloadDialog(QWidget * par,const QString &sz
 
 	m_pOutput = new QLabel(__tr2qs_ctx("<center>Please wait while the avatar is being downloaded</center>","options"),this);
 	g->addWidget(m_pOutput,0,0,1,2);
-//	g->addMultiCellWidget(m_pOutput,0,0,0,1);
 
 	QPushButton * b = new QPushButton(__tr2qs_ctx("Abort","options"),this);
 	g->addWidget(b,1,1);
@@ -219,35 +213,29 @@ KviAvatarSelectionDialog::KviAvatarSelectionDialog(QWidget * par,const QString &
 	l->setMinimumWidth(250);
 
 	g->addWidget(l,0,0,1,3);
-//	g->addMultiCellWidget(l,0,0,0,2);
 
 	m_pLineEdit = new QLineEdit(this);
 	m_pLineEdit->setText(szInitialPath);
 	m_pLineEdit->setMinimumWidth(180);
 
 	g->addWidget(m_pLineEdit,1,0,1,2);
-//	g->addMultiCellWidget(m_pLineEdit,1,1,0,1);
 
 	QPushButton * b = new QPushButton(__tr2qs_ctx("&Browse...","options"),this);
 	connect(b,SIGNAL(clicked()),this,SLOT(chooseFileClicked()));
 	g->addWidget(b,1,2);
 	KviTalHBox * h = new KviTalHBox(this);h->setSpacing(8);
 	g->addWidget(h,2,1,1,2);
-//	g->addMultiCellWidget(h,2,2,1,2);
 	b = new QPushButton(__tr2qs_ctx("&OK","options"),h);
 	b->setMinimumWidth(80);
 	b->setDefault(true);
 	connect(b,SIGNAL(clicked()),this,SLOT(okClicked()));
-	//g->addWidget(b,2,1);
 
 	b = new QPushButton(__tr2qs_ctx("Cancel","options"),h);
 	b->setMinimumWidth(80);
 	connect(b,SIGNAL(clicked()),this,SLOT(cancelClicked()));
-	//g->addWidget(b,2,2);
 
 	g->setRowStretch(0,1);
 	g->setColumnStretch(0,1);
-	//setMinimumSize(250,120);
 }
 
 KviAvatarSelectionDialog::~KviAvatarSelectionDialog()
@@ -305,7 +293,8 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 
 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,Qt::Horizontal,__tr2qs_ctx("Basic Properties","options"));
 	KviTalHBox * hb = new KviTalHBox(gbox);
-	hb->setSpacing(3);
+	hb->setSpacing(0);
+	hb->setMargin(0);
 
 	KviStringSelector * sel = addStringSelector(hb,__tr2qs_ctx("Nickname:","options"),KviOption_stringNickname1);
 	sel->setMinimumLabelWidth(120);