Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 20174 → Rev 20175

/branches/Version14x/Scribus/scribus/smcolorcombo.cpp
56,7 → 56,7
hasParent_ = false;
pItem_ = -1;
pText_ = s;
setCurrentComboItem(this, s);
setCurrentComboItem(this, (s == CommonStrings::None) ? CommonStrings::tr_NoneColor : s);
connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
}
 
66,7 → 66,7
hasParent_ = true;
pItem_ = -1;
pText_ = s;
setCurrentComboItem(this, s);
setCurrentComboItem(this, (s == CommonStrings::None) ? CommonStrings::tr_NoneColor : s);
setFont(!isParentValue);
connect(this, SIGNAL(highlighted(int)), this, SLOT(currentChanged()));
}