Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 24727 → Rev 24728

/trunk/Scribus/scribus/actionmanager.cpp
318,11 → 318,11
name = "alignForced";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), mainWindow, 4));
 
(*scrActions)["alignLeft"]->setToggleAction(true);
(*scrActions)["alignCenter"]->setToggleAction(true);
(*scrActions)["alignRight"]->setToggleAction(true);
(*scrActions)["alignBlock"]->setToggleAction(true);
(*scrActions)["alignForced"]->setToggleAction(true);
// (*scrActions)["alignLeft"]->setToggleAction(true);
// (*scrActions)["alignCenter"]->setToggleAction(true);
// (*scrActions)["alignRight"]->setToggleAction(true);
// (*scrActions)["alignBlock"]->setToggleAction(true);
// (*scrActions)["alignForced"]->setToggleAction(true);
 
connect( (*scrActions)["alignLeft"], SIGNAL(triggeredData(int)), mainWindow, SLOT(setNewAlignment(int)));
connect( (*scrActions)["alignCenter"], SIGNAL(triggeredData(int)), mainWindow, SLOT(setNewAlignment(int)));
/trunk/Scribus/scribus/appmodehelper.cpp
531,6 → 531,7
(*a_scrActions)["toolsEditWithStoryEditor"]->setEnabled(false);
(*a_scrActions)["toolsRotate"]->setEnabled(false);
(*a_scrActions)["toolsCopyProperties"]->setEnabled(false);
enableTextStyleActions(false);
break;
case PageItem::ImageFrame: //Image Frame
(*a_scrActions)["fileImportAppendText"]->setEnabled(false);
621,6 → 622,7
(*a_scrActions)["toolsEditWithStoryEditor"]->setEnabled(true);
(*a_scrActions)["insertSampleText"]->setEnabled(true);
//scrMenuMgr->setMenuEnabled("InsertMark",true);
enableTextStyleActions(true);
 
if ((currItem->nextInChain() != nullptr) || (currItem->prevInChain() != nullptr))
{
1790,6 → 1792,7
void AppModeHelper::enableTextActions(bool enabled, const QString& fontName)
{
(*a_scrActions)["insertGlyph"]->setEnabled(enabled);
 
a_actMgr->enableUnicodeActions(a_scrActions, enabled, fontName);
if (!enabled)
{
1802,6 → 1805,25
}
}
 
void AppModeHelper::enableTextStyleActions(bool enabled)
{
(*a_scrActions)["alignLeft"]->setEnabled(enabled);
(*a_scrActions)["alignCenter"]->setEnabled(enabled);
(*a_scrActions)["alignRight"]->setEnabled(enabled);
(*a_scrActions)["alignBlock"]->setEnabled(enabled);
(*a_scrActions)["alignForced"]->setEnabled(enabled);
(*a_scrActions)["typeEffectNormal"]->setEnabled(enabled);
(*a_scrActions)["typeEffectUnderline"]->setEnabled(enabled);
(*a_scrActions)["typeEffectUnderlineWords"]->setEnabled(enabled);
(*a_scrActions)["typeEffectStrikeThrough"]->setEnabled(enabled);
(*a_scrActions)["typeEffectAllCaps"]->setEnabled(enabled);
(*a_scrActions)["typeEffectSmallCaps"]->setEnabled(enabled);
(*a_scrActions)["typeEffectSuperscript"]->setEnabled(enabled);
(*a_scrActions)["typeEffectSubscript"]->setEnabled(enabled);
(*a_scrActions)["typeEffectOutline"]->setEnabled(enabled);
(*a_scrActions)["typeEffectShadow"]->setEnabled(enabled);
}
 
void AppModeHelper::setStartupActionsEnabled(bool enabled)
{
Q_UNUSED(enabled);
/trunk/Scribus/scribus/appmodehelper.h
57,6 → 57,7
void setPreviewMode(bool b);
//! \brief enable or disable the unicode actions and their menus
void enableTextActions(bool enabled, const QString& fontName=QString());
void enableTextStyleActions(bool enabled);
void setStartupActionsEnabled(bool enabled);
 
 
/trunk/Scribus/scribus/scribus.cpp
1039,8 → 1039,30
scrMenuMgr->addMenuItemString("itemWeld", "Weld");
scrMenuMgr->addMenuItemString("itemsUnWeld", "Weld");
scrMenuMgr->addMenuItemString("itemEditWeld", "Weld");
scrMenuMgr->addMenuItemString("editMark", "Item");
 
scrMenuMgr->createMenu("Marks", tr("Marks"), "Item");
scrMenuMgr->addMenuItemString("Marks", "Item");
scrMenuMgr->addMenuItemString("editMark", "Marks");
 
scrMenuMgr->createMenu("TextFeatures", tr("Text Features", "Item"));
scrMenuMgr->addMenuItemString("TextFeatures", "Item");
scrMenuMgr->addMenuItemString("alignLeft", "TextFeatures");
scrMenuMgr->addMenuItemString("alignCenter", "TextFeatures");
scrMenuMgr->addMenuItemString("alignRight", "TextFeatures");
scrMenuMgr->addMenuItemString("alignBlock", "TextFeatures");
scrMenuMgr->addMenuItemString("alignForced", "TextFeatures");
scrMenuMgr->addMenuItemString("SEPARATOR", "TextFeatures");
scrMenuMgr->addMenuItemString("typeEffectNormal", "TextFeatures");
scrMenuMgr->addMenuItemString("typeEffectUnderline", "TextFeatures");
scrMenuMgr->addMenuItemString("typeEffectUnderlineWords", "TextFeatures");
scrMenuMgr->addMenuItemString("typeEffectStrikeThrough", "TextFeatures");
scrMenuMgr->addMenuItemString("typeEffectAllCaps", "TextFeatures");
scrMenuMgr->addMenuItemString("typeEffectSmallCaps", "TextFeatures");
scrMenuMgr->addMenuItemString("typeEffectSuperscript", "TextFeatures");
scrMenuMgr->addMenuItemString("typeEffectSubscript", "TextFeatures");
scrMenuMgr->addMenuItemString("typeEffectOutline", "TextFeatures");
scrMenuMgr->addMenuItemString("typeEffectShadow", "TextFeatures");
 
//Insert menu
scrMenuMgr->createMenu("Insert", ActionManager::defaultMenuNameEntryTranslated("Insert"));
scrMenuMgr->addMenuItemString("insertFrame", "Insert");