Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 25278 → Rev 25279

/branches/Version15x/Scribus/scribus/appmodehelper.cpp
1008,17 → 1008,17
#endif
}
 
void AppModeHelper::setActionGroupEnabled(QMap<QString, QPointer<ScrAction> >*ag, bool enabled)
void AppModeHelper::setActionGroupEnabled(const QMap<QString, QPointer<ScrAction> >* ag, bool enabled)
{
if (ag==nullptr)
if (ag == nullptr)
return;
for( QMap<QString, QPointer<ScrAction> >::Iterator it = ag->begin(); it!=ag->end(); ++it )
(*it)->setEnabled(enabled);
for (auto it = ag->begin(); it != ag->end(); ++it)
(*it)->setEnabled(enabled);
}
 
void AppModeHelper::setTextEditMode(bool b)
{
bool b2=!b;
bool b2 = !b;
 
(*a_scrActions)["itemDuplicate"]->setEnabled(b2);
(*a_scrActions)["itemMulDuplicate"]->setEnabled(b2);
1150,9 → 1150,9
setActionGroupEnabled(a_scrLayersActions, b2);
}
 
void AppModeHelper::setSymbolEditMode(bool b, ScribusDoc* doc)
void AppModeHelper::setSymbolEditMode(bool b, const ScribusDoc* doc)
{
bool b2=!b;
bool b2 = !b;
(*a_scrActions)["pageInsert"]->setEnabled(b2);
(*a_scrActions)["pageImport"]->setEnabled(b2);
(*a_scrActions)["pageCopy"]->setEnabled(b2);
1199,7 → 1199,7
#endif
}
 
void AppModeHelper::setInlineEditMode(bool b, ScribusDoc *doc)
void AppModeHelper::setInlineEditMode(bool b, const ScribusDoc *doc)
{
bool b2 = !b;
(*a_scrActions)["pageInsert"]->setEnabled(b2);
1254,9 → 1254,9
#endif
}
 
void AppModeHelper::setMasterPageEditMode(bool b, ScribusDoc* doc)
void AppModeHelper::setMasterPageEditMode(bool b, const ScribusDoc* doc)
{
bool b2=!b;
bool b2 = !b;
(*a_scrActions)["pageInsert"]->setEnabled(b2);
(*a_scrActions)["pageImport"]->setEnabled(b2);
(*a_scrActions)["pageDelete"]->setEnabled(b2);
1349,11 → 1349,11
}
}
 
void AppModeHelper::updateTableMenuActions(ScribusDoc* doc)
void AppModeHelper::updateTableMenuActions(const ScribusDoc* doc)
{
// Determine state.
PageItem* item = doc ? doc->m_Selection->itemAt(0) : nullptr;
PageItem_Table* table = (item && item->isTable()) ? item->asTable() : nullptr;
const PageItem_Table* table = (item && item->isTable()) ? item->asTable() : nullptr;
 
if (!doc || !table)
{
1427,7 → 1427,7
(*a_scrActions)["toolsInsertArc"]->setEnabled(setter);
(*a_scrActions)["toolsInsertSpiral"]->setEnabled(setter);
(*a_scrActions)["toolsInsertRenderFrame"]->setEnabled(setter);
bool setter2=doc->masterPageMode() ? false : setter;
bool setter2 = doc->masterPageMode() ? false : setter;
(*a_scrActions)["toolsPDFPushButton"]->setEnabled(setter2);
(*a_scrActions)["toolsPDFRadioButton"]->setEnabled(setter2);
(*a_scrActions)["toolsPDFTextField"]->setEnabled(setter2);
1440,7 → 1440,7
updateActionPluginsActions(doc);
}
 
void AppModeHelper::mainWindowHasNewDoc(ScribusDoc *doc, bool clipScrapHaveData)
void AppModeHelper::mainWindowHasNewDoc(const ScribusDoc *doc, bool clipScrapHaveData)
{
bool layerUnlocked = !doc->layerLocked(doc->activeLayer());
 
1538,7 → 1538,7
(*a_scrActions)["pageManageProperties"]->setEnabled(true);
}
 
void AppModeHelper::mainWindowSwitchWin(ScribusDoc *doc)
void AppModeHelper::mainWindowSwitchWin(const ScribusDoc *doc)
{
(*a_scrActions)["fileClose"]->setEnabled(true);
if (doc->masterPageMode() || doc->symbolEditMode() || doc->inlineEditMode())
/branches/Version15x/Scribus/scribus/appmodehelper.h
41,22 → 41,22
void setApplicationMode(ScribusMainWindow* scmw, ScribusDoc* doc, int newMode);
void enableActionsForSelection(ScribusMainWindow* scmw, ScribusDoc *doc);
void setModeActionsPerMode(int newMode);
void setActionGroupEnabled(QMap<QString, QPointer<ScrAction> > *, bool enabled);
void setActionGroupEnabled(const QMap<QString, QPointer<ScrAction> > *, bool enabled);
void setTextEditMode(bool b);
void setSpecialEditMode(bool b);
void setFrameEditMode(bool b);
void setSymbolEditMode(bool b, ScribusDoc* doc);
void setInlineEditMode(bool b, ScribusDoc* doc);
void setMasterPageEditMode(bool b, ScribusDoc *doc);
void setSymbolEditMode(bool b, const ScribusDoc* doc);
void setInlineEditMode(bool b, const ScribusDoc* doc);
void setMasterPageEditMode(bool b, const ScribusDoc *doc);
void updateActionPluginsActions(ScribusDoc* doc);
void updateTableMenuActions(ScribusDoc* doc);
void updateTableMenuActions(const ScribusDoc* doc);
void changeLayer(ScribusDoc *doc, bool clipScrapHaveData);
void mainWindowHasNewDoc(ScribusDoc *doc, bool clipScrapHaveData);
void mainWindowSwitchWin(ScribusDoc *doc);
void mainWindowHasNewDoc(const ScribusDoc *doc, bool clipScrapHaveData);
void mainWindowSwitchWin(const ScribusDoc *doc);
void mainWindowCloseLastDoc();
void setPreviewMode(bool b);
//! \brief enable or disable the unicode actions and their menus
void enableTextActions(bool enabled, const QString& fontName=QString());
void enableTextActions(bool enabled, const QString& fontName = QString());
void enableTextStyleActions(bool enabled);
void setStartupActionsEnabled(bool enabled);
 
/branches/Version15x/Scribus/scribus/scribusdoc.cpp
2881,13 → 2881,13
}
 
 
int ScribusDoc::activeLayer()
int ScribusDoc::activeLayer() const
{
return m_ActiveLayer;
}
 
 
const QString& ScribusDoc::activeLayerName()
const QString& ScribusDoc::activeLayerName() const
{
const ScLayer* ll = Layers.layerByID(m_ActiveLayer);
Q_ASSERT(ll);
/branches/Version15x/Scribus/scribus/scribusdoc.h
309,13 → 309,13
* @brief Return the number of the current layer
* @return Active layer number
*/
int activeLayer();
int activeLayer() const;
 
/**
* @brief Return the name of the current layer
* @return Name of the layer
*/
const QString& activeLayerName();
const QString& activeLayerName() const;
/**
* @brief Set the active layer via the layer number
* @param layerToActivate Number of the layer
/branches/Version15x/Scribus/scribus/ui/scdockpalette.cpp
88,23 → 88,7
{
setFontSize();
if (m_visibleOnStartup)
{
#if QT_VERSION < 0x050600
QMainWindow* mainWindow = dynamic_cast<QMainWindow*>(parent());
if (palettePrefs && mainWindow)
{
Qt::DockWidgetArea area = Qt::NoDockWidgetArea;
area = (Qt::DockWidgetArea) palettePrefs->getInt("area", (int) Qt::NoDockWidgetArea);
Qt::DockWidgetAreas areas = this->allowedAreas();
if (areas.testFlag(area))
{
mainWindow->addDockWidget(area, this);
setFloating (palettePrefs->getBool("floating"));
}
}
#endif
show();
}
else
hide();
emit paletteShown(m_visibleOnStartup);