[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/workspace/kcontrol/kfontinst/kcmfontinst
From: Alex Merry <kde () randomguy3 ! me ! uk>
Date: 2010-09-10 11:22:06
Message-ID: 20100910112206.0FA4FAC884 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1173754 by alexmerry:
warnings--
Also, rename a variable (it was a clear typo)
M +7 -5 DuplicatesDialog.cpp
M +27 -2 FontList.cpp
M +2 -0 GroupList.cpp
M +2 -2 PreviewList.h
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kcmfontinst/DuplicatesDialog.cpp \
#1173753:1173754 @@ -175,7 +175,7 @@
}
QTreeWidgetItem *item=0L;
- for(int i=0; item=itsView->topLevelItem(i); ++i)
+ for(int i=0; (item=itsView->topLevelItem(i)); ++i)
item->setExpanded(true);
itsView->setSortingEnabled(true);
@@ -617,7 +617,7 @@
item->setSelected(true);
bool haveUnmarked(false),
- haveMaked(false);
+ haveMarked(false);
QList<QTreeWidgetItem *> items(selectedItems());
QTreeWidgetItem *item;
@@ -625,18 +625,20 @@
foreach(item, items)
{
if(item->parent() && item->isSelected())
+ {
if(isMarked(item))
- haveMaked=true;
+ haveMarked=true;
else
haveUnmarked=true;
+ }
- if(haveUnmarked && haveMaked)
+ if(haveUnmarked && haveMarked)
break;
}
itsMarkAct->setEnabled(haveUnmarked);
- itsUnMarkAct->setEnabled(haveMaked);
+ itsUnMarkAct->setEnabled(haveMarked);
itsMenu->popup(ev->globalPos());
}
}
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kcmfontinst/FontList.cpp \
#1173753:1173754 @@ -561,6 +561,7 @@
for(; it!=end; ++it)
if((*it).isValid())
+ {
if((static_cast<CFontModelItem *>((*it).internalPointer()))->isFont())
{
CFontItem *font=static_cast<CFontItem *>((*it).internalPointer());
@@ -573,6 +574,7 @@
families.insert(fam->name());
}
+ }
ds << families;
mimeData->setData(KFI_FONT_DRAG_MIME, encodedData);
@@ -998,6 +1000,7 @@
case Qt::ToolTipRole:
if(CFontFilter::CRIT_FILENAME==itsFilterCriteria || \
CFontFilter::CRIT_LOCATION==itsFilterCriteria || \
CFontFilter::CRIT_FONTCONFIG==itsFilterCriteria) + {
if(mi->isFamily())
{
CFamilyItem *fam=static_cast<CFamilyItem \
*>(index.internalPointer()); @@ -1050,6 +1053,7 @@
tip+="</table></p>";
return tip;
}
+ }
break;
case Qt::FontRole:
if(COL_FONT==index.column() && mi->isSystem())
@@ -1067,6 +1071,7 @@
break;
case Qt::DisplayRole:
if(COL_FONT==index.column())
+ {
if(mi->isFamily())
{
CFamilyItem *fam=static_cast<CFamilyItem \
*>(index.internalPointer()); @@ -1075,6 +1080,7 @@
}
else
return (static_cast<CFontItem \
*>(index.internalPointer()))->style(); + }
break;
case Qt::DecorationRole:
if(mi->isFamily())
@@ -1098,8 +1104,7 @@
break;
}
}
- else
- if(COL_STATUS==index.column())
+ else if(COL_STATUS==index.column())
return SmallIcon( (static_cast<CFontItem \
*>(index.internalPointer()))->isEnabled()
? "dialog-ok" : "dialog-cancel", 10);
break;
@@ -1413,6 +1418,7 @@
QModelIndex realIndex(itsProxy->mapToSource(index));
if(realIndex.isValid())
+ {
if((static_cast<CFontModelItem \
*>(realIndex.internalPointer()))->isFont()) {
CFontItem *font=static_cast<CFontItem \
*>(realIndex.internalPointer()); @@ -1439,6 +1445,7 @@
}
}
}
+ }
fontNames=CFontList::compact(fontNames);
}
@@ -1495,6 +1502,7 @@
QModelIndex realIndex(itsProxy->mapToSource(index));
if(realIndex.isValid())
+ {
if((static_cast<CFontModelItem \
*>(realIndex.internalPointer()))->isFont())
font=static_cast<CFontItem *>(realIndex.internalPointer());
else
@@ -1503,6 +1511,7 @@
font=fam->regularFont();
}
}
+ }
if(font && !font->isBitmap() && font->isEnabled())
items.insert(Misc::TFont(font->family(), font->styleInfo()));
@@ -1612,7 +1621,9 @@
QModelIndex realIndex(itsProxy->mapToSource(index));
if(realIndex.isValid())
+ {
if((static_cast<CFontModelItem \
*>(realIndex.internalPointer()))->isFamily()) + {
switch((static_cast<CFamilyItem \
*>(realIndex.internalPointer()))->status()) {
case CFamilyItem::ENABLED:
@@ -1626,11 +1637,15 @@
disabled=true;
break;
}
+ }
else
+ {
if((static_cast<CFontItem \
*>(realIndex.internalPointer()))->isEnabled()) enabled=true;
else
disabled=true;
+ }
+ }
if(enabled && disabled)
break;
}
@@ -1700,6 +1715,7 @@
QModelIndex realIndex(itsProxy->mapToSource(index));
if(realIndex.isValid())
+ {
if((static_cast<CFontModelItem \
*>(realIndex.internalPointer()))->isFont()) {
CFontItem *font=static_cast<CFontItem \
*>(realIndex.internalPointer()); @@ -1719,6 +1735,7 @@
}
}
else
+ {
switch((static_cast<CFamilyItem \
*>(realIndex.internalPointer()))->status()) {
case CFamilyItem::ENABLED:
@@ -1732,6 +1749,8 @@
break;
}
}
+ }
+ }
if(deselectList.count())
foreach(index, deselectList)
@@ -1797,6 +1816,7 @@
QModelIndex realIndex(itsProxy->mapToSource(index));
if(realIndex.isValid())
+ {
if((static_cast<CFontModelItem \
*>(realIndex.internalPointer()))->isFont()) {
CFontItem *font(static_cast<CFontItem \
*>(realIndex.internalPointer())); @@ -1811,6 +1831,7 @@
fonts.insert(font);
}
}
+ }
if(fonts.count() &&
(fonts.count()<constMaxBeforePrompt ||
@@ -1966,6 +1987,7 @@
QModelIndex realIndex(itsProxy->mapToSource(index));
if(realIndex.isValid())
+ {
if((static_cast<CFontModelItem \
*>(realIndex.internalPointer()))->isFont()) {
if((static_cast<CFontItem \
*>(realIndex.internalPointer())->isEnabled())) @@ -1974,6 +1996,7 @@
dis=true;
}
else
+ {
switch((static_cast<CFamilyItem \
*>(realIndex.internalPointer()))->status()) {
case CFamilyItem::ENABLED:
@@ -1986,6 +2009,8 @@
en=dis=true;
break;
}
+ }
+ }
if(en && dis)
break;
}
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kcmfontinst/GroupList.cpp \
#1173753:1173754 @@ -972,6 +972,7 @@
ds >> families;
// Are we mvoeing/copying, removing a font from the current group?
if(to.isValid() && from.isValid())
+ {
if( ((static_cast<CGroupListItem *>(from.internalPointer()))->isSystem() \
&&
(static_cast<CGroupListItem \
*>(to.internalPointer()))->isPersonal()) ||
((static_cast<CGroupListItem \
*>(from.internalPointer()))->isPersonal() && @@ -982,6 +983,7 @@
emit removeFamilies(from, families);
else
emit addFamilies(to, families);
+ }
if(isUnclassified())
emit unclassifiedChanged();
--- trunk/KDE/kdebase/workspace/kcontrol/kfontinst/kcmfontinst/PreviewList.h \
#1173753:1173754 @@ -68,8 +68,8 @@
QModelIndex index(int row, int column,
const QModelIndex &parent = QModelIndex()) const;
QModelIndex parent(const QModelIndex &index) const;
- int rowCount(const QModelIndex &parent = QModelIndex()) const { \
return itsItems.count(); }
- int columnCount(const QModelIndex &parent = QModelIndex()) const { \
return 1; } + int rowCount(const QModelIndex &parent = QModelIndex()) \
const { Q_UNUSED(parent) return itsItems.count(); } + int \
columnCount(const QModelIndex &parent = QModelIndex()) const { Q_UNUSED(parent) \
return 1; } void clear();
void showFonts(const QModelIndexList &font);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic