r21468 by jghali - #14327: remove "unlink text frame with text copy" and rename "unlink text frame with text cut"
scribus-commit
scribus-commit at lists.scribus.net
Wed Oct 26 20:20:26 UTC 2016
Author: jghali
Date: Wed Oct 26 20:20:26 2016
New Revision: 21468
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21468
Log:
#14327: remove "unlink text frame with text copy" and rename "unlink text frame with text cut"
Modified:
trunk/Scribus/scribus/actionmanager.cpp
trunk/Scribus/scribus/appmodehelper.cpp
trunk/Scribus/scribus/scribus.cpp
trunk/Scribus/scribus/scribusdoc.cpp
trunk/Scribus/scribus/scribusdoc.h
Modified: trunk/Scribus/scribus/actionmanager.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21468&path=/trunk/Scribus/scribus/actionmanager.cpp
==============================================================================
--- trunk/Scribus/scribus/actionmanager.cpp (original)
+++ trunk/Scribus/scribus/actionmanager.cpp Wed Oct 26 20:20:26 2016
@@ -869,9 +869,7 @@
scrActions->insert(name, new ScrAction(ScrAction::DataInt, im->loadPixmap("16/color-picker.png"), im->loadPixmap("22/color-picker.png"), "", defaultKey(name), mainWindow, modeEyeDropper));
name="toolsCopyProperties";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, im->loadPixmap("wizard16.png"), im->loadPixmap("wizard.png"), "", defaultKey(name), mainWindow, modeCopyProperties));
- name="toolsUnlinkTextFrameWithTextCopy";
- scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, modeUnlinkFrames));
- name="toolsUnlinkTextFrameWithTextCut";
+ name="toolsUnlinkTextFrameAndCutText";
scrActions->insert(name, new ScrAction(ScrAction::DataInt, QPixmap(), QPixmap(), "", defaultKey(name), mainWindow, modeUnlinkFrames));
//PDF toolbar
@@ -929,7 +927,7 @@
*modeActionNames << "toolsSelect" << "toolsInsertTextFrame" << "toolsInsertImageFrame" << "toolsInsertTable";
*modeActionNames << "toolsInsertShape" << "toolsInsertPolygon" << "toolsInsertArc" << "toolsInsertSpiral" << "toolsInsertLine" << "toolsInsertBezier";
*modeActionNames << "toolsInsertFreehandLine" << "toolsInsertCalligraphicLine" << "toolsInsertRenderFrame" << "toolsRotate" << "toolsZoom" << "toolsEditContents";
- *modeActionNames << "toolsEditWithStoryEditor" << "toolsLinkTextFrame" << "toolsUnlinkTextFrame"; //<< "toolsUnlinkTextFrameWithTextCopy" << "toolsUnlinkTextFrameWithTextCut";
+ *modeActionNames << "toolsEditWithStoryEditor" << "toolsLinkTextFrame" << "toolsUnlinkTextFrame"; //<< "toolsUnlinkTextFrameAndCutText";
*modeActionNames << "toolsEyeDropper" << "toolsCopyProperties";
*modeActionNames << "toolsPDFPushButton" << "toolsPDFRadioButton" << "toolsPDFTextField" << "toolsPDFCheckBox" << "toolsPDFComboBox" << "toolsPDFListBox" << "toolsPDFAnnotText" << "toolsPDFAnnotLink";
#ifdef HAVE_OSG
@@ -1242,8 +1240,7 @@
disconnect( (*scrActions)["itemRaiseToTop"], 0, 0, 0);
disconnect( (*scrActions)["itemLower"], 0, 0, 0);
disconnect( (*scrActions)["itemRaise"], 0, 0, 0);
- disconnect( (*scrActions)["toolsUnlinkTextFrameWithTextCopy"], 0, 0, 0 );
- disconnect( (*scrActions)["toolsUnlinkTextFrameWithTextCut"], 0, 0, 0 );
+ disconnect( (*scrActions)["toolsUnlinkTextFrameAndCutText"], 0, 0, 0 );
}
void ActionManager::connectNewDocActions(ScribusDoc *currDoc)
@@ -1283,8 +1280,7 @@
connect( (*scrActions)["itemRaiseToTop"], SIGNAL(triggered()), currDoc, SLOT(bringItemSelectionToFront()) );
connect( (*scrActions)["itemLower"], SIGNAL(triggered()), currDoc, SLOT(itemSelection_LowerItem()) );
connect( (*scrActions)["itemRaise"], SIGNAL(triggered()), currDoc, SLOT(itemSelection_RaiseItem()) );
- connect( (*scrActions)["toolsUnlinkTextFrameWithTextCopy"], SIGNAL(triggered()), currDoc, SLOT(itemSelection_UnlinkTextFrameWithText()) );
- connect( (*scrActions)["toolsUnlinkTextFrameWithTextCut"], SIGNAL(triggered()), currDoc, SLOT(itemSelection_UnlinkTextFrameWithTextCut()) );
+ connect( (*scrActions)["toolsUnlinkTextFrameAndCutText"], SIGNAL(triggered()), currDoc, SLOT(itemSelection_UnlinkTextFrameAndCutText()) );
}
void ActionManager::disconnectNewViewActions()
@@ -1701,8 +1697,7 @@
(*scrActions)["toolsEditWithStoryEditor"]->setText( tr("Edit Text..."));
(*scrActions)["toolsLinkTextFrame"]->setTexts( tr("Link Text Frames"));
(*scrActions)["toolsUnlinkTextFrame"]->setTexts( tr("Unlink Text Frames"));
- (*scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setTexts( tr("Unlink Text Frame with Text Copy"));
- (*scrActions)["toolsUnlinkTextFrameWithTextCut"]->setTexts( tr("Unlink Text Frame with Text Cut"));
+ (*scrActions)["toolsUnlinkTextFrameAndCutText"]->setTexts( tr("Unlink Text Frames and Cut Text"));
(*scrActions)["toolsEyeDropper"]->setTexts( tr("&Eye Dropper"));
(*scrActions)["toolsCopyProperties"]->setTexts( tr("Copy Item Properties"));
@@ -2173,8 +2168,7 @@
<< "itemsUnWeld"
<< "itemWeld"
<< "itemEditWeld"
- << "toolsUnlinkTextFrameWithTextCopy"
- << "toolsUnlinkTextFrameWithTextCut";
+ << "toolsUnlinkTextFrameAndCutText";
//Insert
++itmenu;
@@ -2429,8 +2423,7 @@
itnmenua->second << "toolsEditContents";
itnmenua->second << "toolsLinkTextFrame";
itnmenua->second << "toolsUnlinkTextFrame";
-// itnmenua->second << "toolsUnlinkTextFrameWithTextCopy";
-// itnmenua->second << "toolsUnlinkTextFrameWithTextCut";
+// itnmenua->second << "toolsUnlinkTextFrameAndCutText";
itnmenua->second << "toolsEyeDropper";
itnmenua->second << "toolsCopyProperties";
itnmenua->second << "toolsPDFPushButton";
Modified: trunk/Scribus/scribus/appmodehelper.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21468&path=/trunk/Scribus/scribus/appmodehelper.cpp
==============================================================================
--- trunk/Scribus/scribus/appmodehelper.cpp (original)
+++ trunk/Scribus/scribus/appmodehelper.cpp Wed Oct 26 20:20:26 2016
@@ -534,8 +534,7 @@
(*a_scrActions)["itemEditWeld"]->setEnabled(false);
(*a_scrActions)["toolsUnlinkTextFrame"]->setEnabled(false);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(false);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCut"]->setEnabled(false);
+ (*a_scrActions)["toolsUnlinkTextFrameAndCutText"]->setEnabled(false);
(*a_scrActions)["toolsLinkTextFrame"]->setEnabled(false);
(*a_scrActions)["toolsEditContents"]->setEnabled(false);
(*a_scrActions)["toolsEditWithStoryEditor"]->setEnabled(false);
@@ -575,8 +574,7 @@
(*a_scrActions)["itemConvertToTextFrame"]->setEnabled(!inAnEditMode);
(*a_scrActions)["itemConvertToSymbolFrame"]->setEnabled(!inAnEditMode);
(*a_scrActions)["toolsUnlinkTextFrame"]->setEnabled(false);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(false);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCut"]->setEnabled(false);
+ (*a_scrActions)["toolsUnlinkTextFrameAndCutText"]->setEnabled(false);
(*a_scrActions)["toolsLinkTextFrame"]->setEnabled(false);
(*a_scrActions)["toolsEditContents"]->setEnabled(currItem->ScaleType);
(*a_scrActions)["toolsEditWithStoryEditor"]->setEnabled(false);
@@ -641,8 +639,7 @@
(*a_scrActions)["itemConvertToTextFrame"]->setEnabled(false);
(*a_scrActions)["itemConvertToSymbolFrame"]->setEnabled(false);
(*a_scrActions)["toolsUnlinkTextFrame"]->setEnabled(true);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(true);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCut"]->setEnabled(true);
+ (*a_scrActions)["toolsUnlinkTextFrameAndCutText"]->setEnabled(true);
// FIXME: once there's one itemtext per story, always enable editcontents
if ((currItem->prevInChain() != 0) && (currItem->itemText.length() == 0))
(*a_scrActions)["toolsEditContents"]->setEnabled(false);
@@ -653,8 +650,7 @@
{
(*a_scrActions)["toolsEditContents"]->setEnabled(true);
(*a_scrActions)["toolsUnlinkTextFrame"]->setEnabled(false);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(false);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCut"]->setEnabled(false);
+ (*a_scrActions)["toolsUnlinkTextFrameAndCutText"]->setEnabled(false);
}
(*a_scrActions)["toolsLinkTextFrame"]->setEnabled(!currItem->nextInChain());
// if (doc->masterPageMode())
@@ -735,8 +731,7 @@
(*a_scrActions)["toolsEditWithStoryEditor"]->setEnabled(true);
(*a_scrActions)["toolsLinkTextFrame"]->setEnabled(false);
(*a_scrActions)["toolsUnlinkTextFrame"]->setEnabled(false);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(false);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCut"]->setEnabled(false);
+ (*a_scrActions)["toolsUnlinkTextFrameAndCutText"]->setEnabled(false);
break;
default:
(*a_scrActions)["fileImportText"]->setEnabled(false);
@@ -818,8 +813,7 @@
(*a_scrActions)["toolsEditContents"]->setEnabled(false);
(*a_scrActions)["toolsEditWithStoryEditor"]->setEnabled(false);
(*a_scrActions)["toolsUnlinkTextFrame"]->setEnabled(false);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(false);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCut"]->setEnabled(false);
+ (*a_scrActions)["toolsUnlinkTextFrameAndCutText"]->setEnabled(false);
(*a_scrActions)["toolsLinkTextFrame"]->setEnabled(false);
(*a_scrActions)["toolsRotate"]->setEnabled(!inAnEditMode);
(*a_scrActions)["toolsCopyProperties"]->setEnabled(!inAnEditMode);
@@ -993,8 +987,7 @@
(*a_scrActions)["toolsEditWithStoryEditor"]->setChecked(newMode==modeStoryEditor);
(*a_scrActions)["toolsLinkTextFrame"]->setChecked(newMode==modeLinkFrames);
(*a_scrActions)["toolsUnlinkTextFrame"]->setChecked(newMode==modeUnlinkFrames);
-// (*a_scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setChecked(newMode==modeUnlinkFrames);
-// (*a_scrActions)["toolsUnlinkTextFrameWithTextCut"]->setChecked(newMode==modeUnlinkFrames);
+// (*a_scrActions)["toolsUnlinkTextFrameAndCutText"]->setChecked(newMode==modeUnlinkFrames);
(*a_scrActions)["toolsEyeDropper"]->setChecked(newMode==modeEyeDropper);
(*a_scrActions)["toolsMeasurements"]->setChecked(newMode==modeMeasurementTool);
(*a_scrActions)["toolsCopyProperties"]->setChecked(newMode==modeCopyProperties);
@@ -1116,8 +1109,7 @@
(*a_scrActions)["toolsInsertRenderFrame"]->setEnabled(b2);
(*a_scrActions)["toolsLinkTextFrame"]->setEnabled(b2);
(*a_scrActions)["toolsUnlinkTextFrame"]->setEnabled(b2);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(b2);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCut"]->setEnabled(b2);
+ (*a_scrActions)["toolsUnlinkTextFrameAndCutText"]->setEnabled(b2);
(*a_scrActions)["toolsMeasurements"]->setEnabled(b2);
(*a_scrActions)["toolsCopyProperties"]->setEnabled(b2);
(*a_scrActions)["toolsEyeDropper"]->setEnabled(b2);
@@ -1638,8 +1630,7 @@
(*a_scrActions)["toolsRotate"]->setEnabled(false);
(*a_scrActions)["toolsSelect"]->setEnabled(false);
(*a_scrActions)["toolsUnlinkTextFrame"]->setEnabled(false);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(false);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCut"]->setEnabled(false);
+ (*a_scrActions)["toolsUnlinkTextFrameAndCutText"]->setEnabled(false);
(*a_scrActions)["toolsZoom"]->setEnabled(false);
(*a_scrActions)["viewFit100"]->setEnabled(false);
(*a_scrActions)["viewFit200"]->setEnabled(false);
@@ -1823,8 +1814,7 @@
(*a_scrActions)["toolsInsertTable"]->setEnabled(false);
(*a_scrActions)["toolsLinkTextFrame"]->setEnabled(false);
(*a_scrActions)["toolsUnlinkTextFrame"]->setEnabled(false);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCopy"]->setEnabled(false);
- (*a_scrActions)["toolsUnlinkTextFrameWithTextCut"]->setEnabled(false);
+ (*a_scrActions)["toolsUnlinkTextFrameAndCutText"]->setEnabled(false);
(*a_scrActions)["toolsMeasurements"]->setEnabled(false);
(*a_scrActions)["toolsCopyProperties"]->setEnabled(false);
(*a_scrActions)["toolsEyeDropper"]->setEnabled(false);
Modified: trunk/Scribus/scribus/scribus.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21468&path=/trunk/Scribus/scribus/scribus.cpp
==============================================================================
--- trunk/Scribus/scribus/scribus.cpp (original)
+++ trunk/Scribus/scribus/scribus.cpp Wed Oct 26 20:20:26 2016
@@ -912,8 +912,7 @@
scrMenuMgr->addMenuItemString("TextLinking", "Item");
scrMenuMgr->addMenuItemString("toolsLinkTextFrame", "TextLinking");
scrMenuMgr->addMenuItemString("toolsUnlinkTextFrame", "TextLinking");
- scrMenuMgr->addMenuItemString("toolsUnlinkTextFrameWithTextCopy", "TextLinking");
- scrMenuMgr->addMenuItemString("toolsUnlinkTextFrameWithTextCut", "TextLinking");
+ scrMenuMgr->addMenuItemString("toolsUnlinkTextFrameAndCutText", "TextLinking");
scrMenuMgr->createMenu("ItemPathOps", tr("Path Tools"), "Item");
scrMenuMgr->addMenuItemString("ItemPathOps", "Item");
scrMenuMgr->addMenuItemString("itemCombinePolygons", "ItemPathOps");
Modified: trunk/Scribus/scribus/scribusdoc.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21468&path=/trunk/Scribus/scribus/scribusdoc.cpp
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.cpp (original)
+++ trunk/Scribus/scribus/scribusdoc.cpp Wed Oct 26 20:20:26 2016
@@ -16198,7 +16198,7 @@
}
}
-void ScribusDoc::itemSelection_UnlinkTextFrameWithText( Selection *customSelection, bool cutText)
+void ScribusDoc::itemSelection_UnlinkTextFrameAndKeepText( Selection *customSelection, bool cutText)
{
Selection* itemSelection = (customSelection!=0) ? customSelection : m_Selection;
assert(itemSelection!=0);
@@ -16217,9 +16217,9 @@
itemSelection->itemAt(0)->emitAllToGUI();
}
-void ScribusDoc::itemSelection_UnlinkTextFrameWithTextCut( Selection *customSelection)
-{
- itemSelection_UnlinkTextFrameWithText(customSelection, true);
+void ScribusDoc::itemSelection_UnlinkTextFrameAndCutText( Selection *customSelection)
+{
+ itemSelection_UnlinkTextFrameAndKeepText(customSelection, true);
}
void ScribusDoc::itemSelection_UnWeld()
Modified: trunk/Scribus/scribus/scribusdoc.h
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21468&path=/trunk/Scribus/scribus/scribusdoc.h
==============================================================================
--- trunk/Scribus/scribus/scribusdoc.h (original)
+++ trunk/Scribus/scribus/scribusdoc.h Wed Oct 26 20:20:26 2016
@@ -1458,8 +1458,8 @@
void itemSelection_Rotate(double angle, Selection* customSelection = 0);
void itemSelection_DoHyphenate();
void itemSelection_DoDeHyphenate();
- void itemSelection_UnlinkTextFrameWithText(Selection *customSelection=0, bool cutText=false);
- void itemSelection_UnlinkTextFrameWithTextCut(Selection *customSelection=0);
+ void itemSelection_UnlinkTextFrameAndKeepText(Selection *customSelection=0, bool cutText=false);
+ void itemSelection_UnlinkTextFrameAndCutText(Selection *customSelection=0);
void itemSelection_SendToLayer(int layerID);
void itemSelection_SetImageOffset(double x, double y, Selection* customSelection=0);
void itemSelection_SetImageScale(double x, double y, Selection* customSelection=0);
More information about the scribus-commit
mailing list