Attachment #58413 for bug #90538

View | Details | Raw Unified | Return to bug 90538
Collapse All | Expand All




		QPtrListIterator<ContactViewItem> cvi_it(e->cvi);
		for(ContactViewItem *i; (i = cvi_it.current()); ++cvi_it) {
			i->setup();
			i->resetName();
		}
	}
}


	if((i->type() == ContactViewItem::Contact && i->u()->inList()) ||
		(i->type() == ContactViewItem::Group && i->groupType() == ContactViewItem::gUser && i->groupName() != ContactView::tr("Hidden"))) {
		i->setup();
		i->setRenameEnabled(0, true);
		i->startRename(0);
		i->setRenameEnabled(0, false);

		//e->u.setName(text);
		//i->setContact(&e->u);
		actionRename(e->u.jid(), text);
		i->setup();
	}
	else {
		// no change?

		repl.setPattern("<!subscription>"); txt.replace(repl, QString("<br>") + ins);
	}
	// show status?
//	if (!static_cast<ContactView*>(QListViewItem::listView())->isShowStatusMsg())
//		return txt;
	// resource dependent
	UserResourceList srl = d->u->userResourceList();
	if(!srl.isEmpty()){




	QListViewItem::setup();
	int h = height();
	
	if (v_rt)
		delete v_rt;
	v_rt = 0;

	const QListView* lv = listView();
	if (! (((ContactView*)lv)->isShowStatusMsg ()))
		return;
	}

	QString txt = expandTemplate(0); // single column !!!
	if (txt.isEmpty())
		if(v_rt)
			delete v_rt;
		v_rt = 0;
		return;
	}
    
	const QListView* lv = listView();
	const QPixmap* px = pixmap(0);
	int left =  lv->itemMargin() + ((px)?(px->width() + lv->itemMargin()):0);


		txt = QString("<font color=\"%1\">").arg(listView()->colorGroup().color( QColorGroup::HighlightedText ).name()) + txt + "</font>";
	}
	
	if(v_rt)
		delete v_rt;
	v_rt = new QSimpleRichText(txt, lv->font());
	
	v_rt->setWidth(lv->columnWidth(0) - left - depth() * lv->treeStepSize());

Return to bug 90538

Lines 562-568 Link Here

(-)psi-0.9.3-orig/src/contactview.cpp (-5 / +4 lines)
562	QPtrListIterator<ContactViewItem> cvi_it(e->cvi);	562	QPtrListIterator<ContactViewItem> cvi_it(e->cvi);
563	for(ContactViewItem *i; (i = cvi_it.current()); ++cvi_it) {	563	for(ContactViewItem *i; (i = cvi_it.current()); ++cvi_it) {
564	i->setup();	564	i->setup();
565	i->resetName();
566	}	565	}
567	}	566	}
568	}	567	}
Lines 1683-1689 Link Here
1683		1682
1684	if((i->type() == ContactViewItem::Contact && i->u()->inList()) \|\|	1683	if((i->type() == ContactViewItem::Contact && i->u()->inList()) \|\|
1685	(i->type() == ContactViewItem::Group && i->groupType() == ContactViewItem::gUser && i->groupName() != ContactView::tr("Hidden"))) {	1684	(i->type() == ContactViewItem::Group && i->groupType() == ContactViewItem::gUser && i->groupName() != ContactView::tr("Hidden"))) {
1686	i->resetName();	1685	i->setup();
1687	i->setRenameEnabled(0, true);	1686	i->setRenameEnabled(0, true);
1688	i->startRename(0);	1687	i->startRename(0);
1689	i->setRenameEnabled(0, false);	1688	i->setRenameEnabled(0, false);
Lines 1773-1779 Link Here
1773	//e->u.setName(text);	1772	//e->u.setName(text);
1774	//i->setContact(&e->u);	1773	//i->setContact(&e->u);
1775	actionRename(e->u.jid(), text);	1774	actionRename(e->u.jid(), text);
1776	i->resetName(); // to put the status message in if needed	1775	i->setup();
1777	}	1776	}
1778	else {	1777	else {
1779	// no change?	1778	// no change?
Lines 2868-2875 Link Here
2868	repl.setPattern("<!subscription>"); txt.replace(repl, QString("<br>") + ins);	2867	repl.setPattern("<!subscription>"); txt.replace(repl, QString("<br>") + ins);
2869	}	2868	}
2870	// show status?	2869	// show status?
2871	if (!static_cast<ContactView*>(QListViewItem::listView())->isShowStatusMsg())	2870	// if (!static_cast<ContactView*>(QListViewItem::listView())->isShowStatusMsg())
2872	return txt;	2871	// return txt;
2873	// resource dependent	2872	// resource dependent
2874	UserResourceList srl = d->u->userResourceList();	2873	UserResourceList srl = d->u->userResourceList();
2875	if(!srl.isEmpty()){	2874	if(!srl.isEmpty()){

Lines 31-52 Link Here

(-)psi-0.9.3-orig/src/richlistview.cpp (-13 / +7 lines)
31	QListViewItem::setup();	31	QListViewItem::setup();
32	int h = height();	32	int h = height();
33		33
34	if (!static_cast<ContactView*>(QListViewItem::listView())->isShowStatusMsg()) {	34	if (v_rt)
35	if(v_rt)	35	delete v_rt;
36	delete v_rt;	36	v_rt = 0;
37	v_rt = 0;	37
		38	const QListView* lv = listView();
		39	if (! (((ContactView*)lv)->isShowStatusMsg ()))
38	return;	40	return;
39	}
40		41
41	QString txt = expandTemplate(0); // single column !!!	42	QString txt = expandTemplate(0); // single column !!!
42	if( txt.isEmpty() ){	43	if (txt.isEmpty())
43	if(v_rt)
44	delete v_rt;
45	v_rt = 0;
46	return;	44	return;
47	}
48		45
49	const QListView* lv = listView();
50	const QPixmap* px = pixmap(0);	46	const QPixmap* px = pixmap(0);
51	int left = lv->itemMargin() + ((px)?(px->width() + lv->itemMargin()):0);	47	int left = lv->itemMargin() + ((px)?(px->width() + lv->itemMargin()):0);
52		48
Lines 57-64 Link Here
57	txt = QString("<font color=\"%1\">").arg(listView()->colorGroup().color( QColorGroup::HighlightedText ).name()) + txt + "</font>";	53	txt = QString("<font color=\"%1\">").arg(listView()->colorGroup().color( QColorGroup::HighlightedText ).name()) + txt + "</font>";
58	}	54	}
59		55
60	if(v_rt)
61	delete v_rt;
62	v_rt = new QSimpleRichText(txt, lv->font());	56	v_rt = new QSimpleRichText(txt, lv->font());
63		57
64	v_rt->setWidth(lv->columnWidth(0) - left - depth() * lv->treeStepSize());	58	v_rt->setWidth(lv->columnWidth(0) - left - depth() * lv->treeStepSize());