Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 15325 → Rev 15326

/trunk/Scribus/scribus/scribus.cpp
3388,6 → 3388,16
}
}
 
void ScribusMainWindow::updateColorLists()
{
if (HaveDoc)
{
propertiesPalette->updateColorList();
propertiesPalette->SetLineFormats(doc);
styleManager->updateColorList();
}
}
 
bool ScribusMainWindow::slotDocOpen()
{
PrefsContext* docContext = prefsManager->prefsFile->getContext("docdirs", false);
9955,10 → 9965,13
}
doc->recalculateColors();
doc->recalcPicturesRes();
updateColorLists();
/*
propertiesPalette->updateColorList();
//3102: update the line styles in PP too
propertiesPalette->SetLineFormats(doc);
styleManager->updateColorList();
*/
if (doc->m_Selection->count() != 0)
doc->m_Selection->itemAt(0)->emitAllToGUI();
view->DrawNew();
/trunk/Scribus/scribus/canvasmode_eyedropper.cpp
179,7 → 179,8
{
ScColor newColor(selectedColor.red(), selectedColor.green(), selectedColor.blue());
m_doc->PageColors[colorName]=newColor;
m_ScMW->propertiesPalette->updateColorList();
m_ScMW->updateColorLists();
// m_ScMW->propertiesPalette->updateColorList();
}
else
colorName=QString::null;
/trunk/Scribus/scribus/scribus.h
528,6 → 528,7
void insertSampleText();
//void sendToLayer(int layerNumber);
void updateItemLayerList();
void updateColorLists();
/*! \brief Apply changes from ReformDoc dialog.
It's called from this->slotDocSetup() or from ReformDoc directly.
\param dia a reference to the ReformDoc dialog */