r17309 by jghali - #10587 : text editing mode actions are enabled in normal mode
scribus-commit
scribus-commit at lists.scribus.net
Thu Feb 16 21:14:59 UTC 2012
Author: jghali
Date: Thu Feb 16 21:14:59 2012
New Revision: 17309
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17309
Log:
#10587 : text editing mode actions are enabled in normal mode
Modified:
trunk/Scribus/scribus/scribus.cpp
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17309&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Thu Feb 16 21:14:59 2012
@@ -6389,6 +6389,8 @@
if (currItem != 0)
{
currItem->update();
+ if (currItem->asTextFrame())
+ enableTextActions(&scrActions, false);
// scrMenuMgr->setMenuEnabled("Item", true);
scrActions["itemDuplicate"]->setEnabled(true);
scrActions["itemMulDuplicate"]->setEnabled(true);
@@ -6610,33 +6612,6 @@
pluginManager.enablePluginActionsForSelection(this);
emit AppModeChanged(oldMode, mode);
-/*
- QStringList pluginNames(pluginManager.pluginNames(false));
- ScPlugin* plugin;
- ScActionPlugin* ixplug;
- ScrAction* pluginAction = 0;
- QString pName;
- for (int i = 0; i < pluginNames.count(); ++i)
- {
- pName = pluginNames.at(i);
- plugin = pluginManager.getPlugin(pName, true);
- Q_ASSERT(plugin); // all the returned names should represent loaded plugins
- if (plugin->inherits("ScActionPlugin"))
- {
- ixplug = dynamic_cast<ScActionPlugin*>(plugin);
- Q_ASSERT(ixplug);
- ScActionPlugin::ActionInfo ai(ixplug->actionInfo());
- pluginAction = ScCore->primaryMainWindow()->scrActions[ai.name];
- if (pluginAction != 0)
- {
- if (doc->m_Selection->count() != 0)
- pluginAction->setEnabled(ixplug->handleSelection(doc, doc->m_Selection->itemAt(0)->itemType()));
- else
- pluginAction->setEnabled(ixplug->handleSelection(doc));
- }
- }
- }
-*/
}
actionManager->connectModeActions();
}
More information about the scribus-commit
mailing list