Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 7713 → Rev 7714

/branches/Version13x/Scribus/scribus/scribus.cpp
7883,9 → 7883,9
propertiesPalette->updateColorList();
propertiesPalette->Spal->updateFormatList();
propertiesPalette->SetLineFormats(docc);
outlinePalette->BuildTree();
// outlinePalette->BuildTree();
slotDocCh();
outlinePalette->reopenTree(doc->OpenNodes);
slotDocCh();
}
}
delete ss;
8198,7 → 8198,7
}
doc->GroupCounter++;
view->updateContents(QRect(static_cast<int>(x-5), static_cast<int>(y-5), static_cast<int>(w+10), static_cast<int>(h+10)));
outlinePalette->BuildTree();
// outlinePalette->BuildTree();
slotDocCh();
scrActions["itemAttachTextToPath"]->setEnabled(false);
scrActions["itemGroup"]->setEnabled(false);
8234,6 → 8234,9
ss->set("UNGROUP", "ungroup");
ss->set("itemcount", docSelectionCount);
QString tooltip = Um::ItemsInvolved + "\n";
slotDocCh();
HaveNewSel(doc->m_Selection->itemAt(0)->itemType());
doc->m_Selection->itemAt(0)->emitAllToGUI();
for (uint a=0; a<docSelectionCount; ++a)
{
currItem = doc->m_Selection->itemAt(a);
8241,13 → 8244,9
ss->set(QString("tableitem%1").arg(a), currItem->isTableItem);
tooltip += "\t" + currItem->getUName() + "\n";
currItem->isTableItem = false;
currItem->setSelected(true);
currItem->paintObj();
}
// view->Deselect(true);
view->DrawNew();
HaveNewSel(doc->m_Selection->itemAt(0)->itemType());
doc->m_Selection->itemAt(0)->emitAllToGUI();
outlinePalette->BuildTree();
slotDocCh();
undoManager->action(this, ss, Um::SelectionGroup, Um::IGroup);
}
}
/branches/Version13x/Scribus/scribus/colorm.cpp
507,7 → 507,7
return;
if (!fileName.isEmpty())
{
int oldCount = EditColors.count();
uint oldCount = EditColors.count();
dirs->set("colors", fileName.left(fileName.findRev("/")));
QFileInfo fi = QFileInfo(fileName);
QString ext = fi.extension(false).lower();
/branches/Version13x/Scribus/scribus/colorm.h
27,6 → 27,7
 
class DynamicTip;
class ScribusDoc;
class ColorListBox;
 
class SCRIBUS_API ColorSmallPixmapItem : public ScListBoxPixmap<15,15>
{