Avatar module QT4 port

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

2 files changed, 24 insertions, 16 deletions

diff --git a/src/modules/avatar/avatar_QT4_vc05.vcproj b/src/modules/avatar/avatar_QT4_vc05.vcproj
index 349fd1ac2..78eaae804 100644
--- a/src/modules/avatar/avatar_QT4_vc05.vcproj
+++ b/src/modules/avatar/avatar_QT4_vc05.vcproj
@@ -217,6 +217,12 @@
 				RelativePath=".\moc_libkviavatar.cpp"

 				>

 			</File>

+			<Filter

+				Name="Resource Files"

+				Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

+				UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

+				>

+			</Filter>

 		</Filter>

 		<Filter

 			Name="Header Files"

@@ -246,12 +252,6 @@
 				</FileConfiguration>

 			</File>

 		</Filter>

-		<Filter

-			Name="Resource Files"

-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"

-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"

-			>

-		</Filter>

 	</Files>

 	<Globals>

 	</Globals>

diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index 5c5816a4b..814b230fc 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -76,20 +76,28 @@ KviAsyncAvatarSelectionDialog::KviAsyncAvatarSelectionDialog(QWidget * par,const
 	msg += "</center><br>";
 
 	QLabel * l = new QLabel(msg,this);
+	l->setWordWrap(true);
 	l->setMinimumWidth(250);
 
-	g->addMultiCellWidget(l,0,0,0,2);
-
-	m_pLineEdit = new QLineEdit(this);
+	//g->addMultiCellWidget(l,0,0,0,2);
+	g->addWidget(l,0,0);
+	
+	KviTalHBox * h1 = new KviTalHBox(this);
+	m_pLineEdit = new QLineEdit(h1);
 	m_pLineEdit->setText(szInitialPath);
 	m_pLineEdit->setMinimumWidth(180);
 
-	g->addMultiCellWidget(m_pLineEdit,1,1,0,1);
-
-	QPushButton * b = new QPushButton(__tr2qs("&Browse..."),this);
+	//g->addMultiCellWidget(m_pLineEdit,1,1,0,1);
+	QPushButton * b = new QPushButton(__tr2qs("&Browse..."),h1);
+	g->addWidget(h1,1,0);
 	connect(b,SIGNAL(clicked()),this,SLOT(chooseFileClicked()));
-	g->addWidget(b,1,2);
-	KviTalHBox * h = new KviTalHBox(this);h->setSpacing(8);g->addMultiCellWidget(h,2,2,1,2);
+	//g->addWidget(b,1,2);
+	
+
+	KviTalHBox * h = new KviTalHBox(this);
+	h->setSpacing(8);
+	g->addWidget(h,2,0);
+//	g->addMultiCellWidget(h,2,2,1,2);
 	b = new QPushButton(__tr2qs("&OK"),h);
 	b->setMinimumWidth(80);
 	b->setDefault(true);
@@ -117,7 +125,7 @@ void KviAsyncAvatarSelectionDialog::okClicked()
 	if(!m_szAvatarName.isEmpty())
 	{
 		QString tmp = m_szAvatarName;
-		tmp.replace("\\","\\\\");
+		tmp.replace("\\","\\\\",Qt::CaseInsensitive);
 		QString szBuffer=QString("avatar.set \"%1\"").arg(tmp);
 		KviKvsScript::run(szBuffer,m_pConnection->console());
 	}
@@ -226,7 +234,7 @@ static bool avatar_kvs_cmd_set(KviKvsModuleCommandCall * c)
 			g_pIconManager->urlToCachedFileName(szLocalFile);
 			g_pApp->getLocalKvircDirectory(szLocalFilePath,KviApp::Avatars,szLocalFile);
 
-			szLocalFilePath.replace("\\","\\\\");
+			szLocalFilePath.replace("\\","\\\\",Qt::CaseInsensitive);
 
 			QString szCommand = "http.get -w=nm ";
 				szCommand += szAvatar;