r15108 by cbradney - #3233: Add in link/unlink text frames to menu
scribus-commit
scribus-commit at lists.scribus.net
Tue May 25 21:00:34 CEST 2010
Revision: 15108
Author: cbradney
Date: 2010-05-25T18:51:20.356254Z
Commit message: #3233: Add in link/unlink text frames to menu
Changeset:
M /trunk/Scribus/scribus/scribus.cpp
M /trunk/Scribus/scribus/ui/prefs_documentsetup.cpp
M /trunk/Scribus/scribus/ui/preferencesdialog.cpp
M /trunk/Scribus/scribus/ui/prefs_documentsetupbase.ui
M /trunk/Scribus/scribus/ui/inspage.cpp
Diffs:
Index: scribus/ui/prefs_documentsetup.cpp
===================================================================
--- scribus/ui/prefs_documentsetup.cpp (revision 15107)
+++ scribus/ui/prefs_documentsetup.cpp (revision 15108)
@@ -101,7 +101,7 @@
pageWidthSpinBox->setToolTip( "<qt>" + tr( "Width of document pages, editable if you have chosen a custom page size" ) + "</qt>" );
pageHeightSpinBox->setToolTip( "<qt>" + tr( "Height of document pages, editable if you have chosen a custom page size" ) + "</qt>" );
- pageSizeComboBox->setToolTip( "<qt>" + tr( "Default page size, either a standard size or a custom size" ) + "</qt>" );
+ pageSizeComboBox->setToolTip( "<qt>" + tr( "Default page size, either a standard size or a custom size. More page sizes can be made visible by activating them in Preferences." ) + "</qt>" );
pageSizeLinkToolButton->setToolTip( "<qt>" + tr( "Enable or disable more page sizes by jumping to Page Size preferences" ) + "</qt>" );
pageOrientationComboBox->setToolTip( "<qt>" + tr( "Default orientation of document pages" ) + "</qt>" );
pageUnitsComboBox->setToolTip( "<qt>" + tr( "Default unit of measurement for document editing" ) + "</qt>" );
Index: scribus/ui/preferencesdialog.cpp
===================================================================
--- scribus/ui/preferencesdialog.cpp (revision 15107)
+++ scribus/ui/preferencesdialog.cpp (revision 15108)
@@ -128,6 +128,7 @@
prefs_ImageCache = new Prefs_ImageCache(prefsStackWidget, m_Doc);
addItem( tr("Image Cache"), loadIcon("22/image-x-generic.png"), prefs_ImageCache);
}
+
arrangeIcons();
//**********
@@ -171,84 +172,65 @@
void PreferencesDialog::setupGui()
{
- if (prefs_UserInterface)
- prefs_UserInterface->restoreDefaults(&localPrefs);
- if (prefs_Paths)
- prefs_Paths->restoreDefaults(&localPrefs);
- prefs_DocumentSetup->restoreDefaults(&localPrefs);
- if (prefs_DocumentInformation)
- prefs_DocumentInformation->restoreDefaults(&localPrefs);
- prefs_Guides->restoreDefaults(&localPrefs);
- prefs_Typography->restoreDefaults(&localPrefs);
- prefs_ItemTools->restoreDefaults(&localPrefs);
- prefs_OperatorTools->restoreDefaults(&localPrefs);
- prefs_Hyphenator->restoreDefaults(&localPrefs);
- prefs_Fonts->restoreDefaults(&localPrefs);
- prefs_Printer->restoreDefaults(&localPrefs);
- prefs_PDFExport->restoreDefaults(&localPrefs, ScCore->PDFXProfiles);
- prefs_PreflightVerifier->restoreDefaults(&localPrefs);
- prefs_DocumentItemAttributes->restoreDefaults(&localPrefs);
- prefs_TableOfContents->restoreDefaults(&localPrefs);
- if (prefs_DocumentSections)
- prefs_DocumentSections->restoreDefaults(&localPrefs);
- if (prefs_KeyboardShortcuts)
- prefs_KeyboardShortcuts->restoreDefaults(&localPrefs);
- prefs_ColorManagement->restoreDefaults(&localPrefs);
- prefs_ColorManagement->setProfiles(&localPrefs, &ScCore->InputProfiles, &ScCore->InputProfilesCMYK, &ScCore->PrinterProfiles, &ScCore->MonitorProfiles);
- if (prefs_Scrapbook)
- prefs_Scrapbook->restoreDefaults(&localPrefs);
- prefs_Display->restoreDefaults(&localPrefs);
- if (prefs_ExternalTools)
- prefs_ExternalTools->restoreDefaults(&localPrefs);
- if (prefs_Plugins)
- prefs_Plugins->restoreDefaults(&localPrefs);
- if (prefs_Miscellaneous)
- prefs_Miscellaneous->restoreDefaults(&localPrefs);
- if (prefs_PageSizes)
- prefs_PageSizes->restoreDefaults(&localPrefs);
- if (prefs_ImageCache)
- prefs_ImageCache->restoreDefaults(&localPrefs);
+ if (prefs_UserInterface) prefs_UserInterface->restoreDefaults(&localPrefs);
+ if (prefs_Paths) prefs_Paths->restoreDefaults(&localPrefs);
+ if (prefs_DocumentSetup) prefs_DocumentSetup->restoreDefaults(&localPrefs);
+ if (prefs_DocumentInformation) prefs_DocumentInformation->restoreDefaults(&localPrefs);
+ if (prefs_Guides) prefs_Guides->restoreDefaults(&localPrefs);
+ if (prefs_Typography) prefs_Typography->restoreDefaults(&localPrefs);
+ if (prefs_ItemTools) prefs_ItemTools->restoreDefaults(&localPrefs);
+ if (prefs_OperatorTools) prefs_OperatorTools->restoreDefaults(&localPrefs);
+ if (prefs_Hyphenator) prefs_Hyphenator->restoreDefaults(&localPrefs);
+ if (prefs_Fonts) prefs_Fonts->restoreDefaults(&localPrefs);
+ if (prefs_Printer) prefs_Printer->restoreDefaults(&localPrefs);
+ if (prefs_PDFExport) prefs_PDFExport->restoreDefaults(&localPrefs, ScCore->PDFXProfiles);
+ if (prefs_PreflightVerifier) prefs_PreflightVerifier->restoreDefaults(&localPrefs);
+ if (prefs_DocumentItemAttributes) prefs_DocumentItemAttributes->restoreDefaults(&localPrefs);
+ if (prefs_TableOfContents) prefs_TableOfContents->restoreDefaults(&localPrefs);
+ if (prefs_DocumentSections) prefs_DocumentSections->restoreDefaults(&localPrefs);
+ if (prefs_KeyboardShortcuts) prefs_KeyboardShortcuts->restoreDefaults(&localPrefs);
+ if (prefs_ColorManagement)
+ {
+ prefs_ColorManagement->restoreDefaults(&localPrefs);
+ prefs_ColorManagement->setProfiles(&localPrefs, &ScCore->InputProfiles, &ScCore->InputProfilesCMYK, &ScCore->PrinterProfiles, &ScCore->MonitorProfiles);
+ }
+ if (prefs_Scrapbook) prefs_Scrapbook->restoreDefaults(&localPrefs);
+ if (prefs_Display) prefs_Display->restoreDefaults(&localPrefs);
+ if (prefs_ExternalTools) prefs_ExternalTools->restoreDefaults(&localPrefs);
+ if (prefs_Plugins) prefs_Plugins->restoreDefaults(&localPrefs);
+ if (prefs_Miscellaneous) prefs_Miscellaneous->restoreDefaults(&localPrefs);
+ if (prefs_PageSizes) prefs_PageSizes->restoreDefaults(&localPrefs);
+ if (prefs_ImageCache) prefs_ImageCache->restoreDefaults(&localPrefs);
}
void PreferencesDialog::saveGuiToPrefs()
{
- if (prefs_UserInterface)
- prefs_UserInterface->saveGuiToPrefs(&localPrefs);
- if (prefs_Paths)
- prefs_Paths->saveGuiToPrefs(&localPrefs);
- prefs_DocumentSetup->saveGuiToPrefs(&localPrefs);
- if (prefs_DocumentInformation)
- prefs_DocumentInformation->saveGuiToPrefs(&localPrefs);
- prefs_Guides->saveGuiToPrefs(&localPrefs);
- prefs_Typography->saveGuiToPrefs(&localPrefs);
- prefs_ItemTools->saveGuiToPrefs(&localPrefs);
- prefs_OperatorTools->saveGuiToPrefs(&localPrefs);
- prefs_Hyphenator->saveGuiToPrefs(&localPrefs);
- prefs_Fonts->saveGuiToPrefs(&localPrefs);
- prefs_Printer->saveGuiToPrefs(&localPrefs);
- prefs_PDFExport->saveGuiToPrefs(&localPrefs);
- prefs_PreflightVerifier->saveGuiToPrefs(&localPrefs);
- prefs_DocumentItemAttributes->saveGuiToPrefs(&localPrefs);
- prefs_TableOfContents->saveGuiToPrefs(&localPrefs);
- if (prefs_DocumentSections)
- prefs_DocumentSections->saveGuiToPrefs(&localPrefs);
- if (prefs_KeyboardShortcuts)
- prefs_KeyboardShortcuts->saveGuiToPrefs(&localPrefs);
- prefs_ColorManagement->saveGuiToPrefs(&localPrefs);
- if (prefs_Scrapbook)
- prefs_Scrapbook->saveGuiToPrefs(&localPrefs);
- prefs_Display->saveGuiToPrefs(&localPrefs);
- if (prefs_ExternalTools)
- prefs_ExternalTools->saveGuiToPrefs(&localPrefs);
- if (prefs_Plugins)
- prefs_Plugins->saveGuiToPrefs(&localPrefs);
- if (prefs_Miscellaneous)
- prefs_Miscellaneous->saveGuiToPrefs(&localPrefs);
- if (prefs_PageSizes)
- prefs_PageSizes->saveGuiToPrefs(&localPrefs);
- if (prefs_ImageCache)
- prefs_ImageCache->saveGuiToPrefs(&localPrefs);
+ if (prefs_UserInterface) prefs_UserInterface->saveGuiToPrefs(&localPrefs);
+ if (prefs_Paths) prefs_Paths->saveGuiToPrefs(&localPrefs);
+ if (prefs_DocumentSetup) prefs_DocumentSetup->saveGuiToPrefs(&localPrefs);
+ if (prefs_DocumentInformation) prefs_DocumentInformation->saveGuiToPrefs(&localPrefs);
+ if (prefs_Guides) prefs_Guides->saveGuiToPrefs(&localPrefs);
+ if (prefs_Typography) prefs_Typography->saveGuiToPrefs(&localPrefs);
+ if (prefs_ItemTools) prefs_ItemTools->saveGuiToPrefs(&localPrefs);
+ if (prefs_OperatorTools) prefs_OperatorTools->saveGuiToPrefs(&localPrefs);
+ if (prefs_Hyphenator) prefs_Hyphenator->saveGuiToPrefs(&localPrefs);
+ if (prefs_Fonts) prefs_Fonts->saveGuiToPrefs(&localPrefs);
+ if (prefs_Printer) prefs_Printer->saveGuiToPrefs(&localPrefs);
+ if (prefs_PDFExport) prefs_PDFExport->saveGuiToPrefs(&localPrefs);
+ if (prefs_PreflightVerifier) prefs_PreflightVerifier->saveGuiToPrefs(&localPrefs);
+ if (prefs_DocumentItemAttributes) prefs_DocumentItemAttributes->saveGuiToPrefs(&localPrefs);
+ if (prefs_TableOfContents) prefs_TableOfContents->saveGuiToPrefs(&localPrefs);
+ if (prefs_DocumentSections) prefs_DocumentSections->saveGuiToPrefs(&localPrefs);
+ if (prefs_ColorManagement) prefs_KeyboardShortcuts->saveGuiToPrefs(&localPrefs);
+ if (prefs_KeyboardShortcuts) prefs_ColorManagement->saveGuiToPrefs(&localPrefs);
+ if (prefs_Scrapbook) prefs_Scrapbook->saveGuiToPrefs(&localPrefs);
+ if (prefs_Display) prefs_Display->saveGuiToPrefs(&localPrefs);
+ if (prefs_ExternalTools) prefs_ExternalTools->saveGuiToPrefs(&localPrefs);
+ if (prefs_Plugins) prefs_Plugins->saveGuiToPrefs(&localPrefs);
+ if (prefs_Miscellaneous) prefs_Miscellaneous->saveGuiToPrefs(&localPrefs);
+ if (prefs_PageSizes) prefs_PageSizes->saveGuiToPrefs(&localPrefs);
+ if (prefs_ImageCache) prefs_ImageCache->saveGuiToPrefs(&localPrefs);
}
void PreferencesDialog::applyButtonClicked()
Index: scribus/ui/prefs_documentsetupbase.ui
===================================================================
--- scribus/ui/prefs_documentsetupbase.ui (revision 15107)
+++ scribus/ui/prefs_documentsetupbase.ui (revision 15108)
@@ -38,7 +38,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>0</number>
+ <number>1</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@@ -284,130 +284,167 @@
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
- <widget class="QLabel" name="label_8">
- <property name="font">
- <font>
- <pointsize>13</pointsize>
- <weight>75</weight>
- <bold>true</bold>
- </font>
+ <widget class="QScrollArea" name="scrollArea">
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
</property>
- <property name="text">
- <string>Margins</string>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
</property>
- </widget>
- </item>
- <item>
- <widget class="Line" name="line_5">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <property name="lineWidth">
+ <number>0</number>
</property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_6">
- <item>
- <widget class="NewMarginWidget" name="marginsWidget" native="true"/>
- </item>
- <item>
- <spacer name="horizontalSpacer_6">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <property name="widgetResizable">
+ <bool>true</bool>
+ </property>
+ <widget class="QWidget" name="scrollAreaWidgetContents">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>415</width>
+ <height>476</height>
+ </rect>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <property name="margin">
+ <number>0</number>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QCheckBox" name="applyMarginsToAllPagesCheckBox">
- <property name="text">
- <string>Apply changes to all pages</string>
- </property>
+ <item>
+ <widget class="QLabel" name="label_8">
+ <property name="font">
+ <font>
+ <pointsize>13</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Margins</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_5">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <property name="margin">
+ <number>5</number>
+ </property>
+ <item>
+ <widget class="NewMarginWidget" name="marginsWidget" native="true"/>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="applyMarginsToAllPagesCheckBox">
+ <property name="text">
+ <string>Apply changes to all pages</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="applyMarginsToAllMasterPagesCheckBox">
+ <property name="text">
+ <string>Apply changes to all master pages</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_10">
+ <property name="font">
+ <font>
+ <pointsize>13</pointsize>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Bleeds</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="Line" name="line_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <property name="margin">
+ <number>5</number>
+ </property>
+ <item>
+ <widget class="NewMarginWidget" name="bleedsWidget" native="true"/>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_7">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <spacer name="verticalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>0</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
</widget>
</item>
- <item>
- <widget class="QCheckBox" name="applyMarginsToAllMasterPagesCheckBox">
- <property name="text">
- <string>Apply changes to all master pages</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer_3">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="label_10">
- <property name="font">
- <font>
- <pointsize>13</pointsize>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Bleeds</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="Line" name="line_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_7">
- <item>
- <widget class="NewMarginWidget" name="bleedsWidget" native="true"/>
- </item>
- <item>
- <spacer name="horizontalSpacer_7">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="verticalSpacer_4">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
<widget class="QWidget" name="tab_3">
Index: scribus/ui/inspage.cpp
===================================================================
--- scribus/ui/inspage.cpp (revision 15107)
+++ scribus/ui/inspage.cpp (revision 15108)
@@ -211,6 +211,7 @@
dsGroupBox7Layout->setMargin( 5 );
TextLabel1 = new QLabel( tr( "&Size:" ), dsGroupBox7);
dsGroupBox7Layout->addWidget( TextLabel1, 0, 0);
+
PageSize *ps=new PageSize(currentDoc->pageSize());
prefsPageSizeName=ps->name();
sizeQComboBox = new QComboBox(dsGroupBox7);
@@ -220,15 +221,12 @@
insertList.sort();
insertList<<CommonStrings::trCustomPageSize;
sizeQComboBox->addItems(insertList);
-
int sizeIndex = insertList.indexOf(ps->nameTR());
if (sizeIndex != -1)
sizeQComboBox->setCurrentIndex(sizeIndex);
else
sizeQComboBox->setCurrentIndex(sizeQComboBox->count()-1);
-
-
TextLabel1->setBuddy(sizeQComboBox);
dsGroupBox7Layout->addWidget(sizeQComboBox, 0, 1, 1, 3);
TextLabel2 = new QLabel( tr( "Orie&ntation:" ), dsGroupBox7);
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp (revision 15107)
+++ scribus/scribus.cpp (revision 15108)
@@ -655,24 +655,8 @@
scrMenuMgr->addMenuSeparator("File");
scrMenuMgr->addMenuItem(scrActions["fileQuit"], "File", true);
-// scrActions["fileClose"]->setEnabled(false);
-// scrActions["fileSave"]->setEnabled(false);
-// scrActions["fileSaveAs"]->setEnabled(false);
-// scrActions["fileRevert"]->setEnabled(false);
-// scrActions["fileCollect"]->setEnabled(false);
-// scrActions["fileImportText"]->setEnabled(false);
-// scrActions["fileImportText2"]->setEnabled(false);
-// scrActions["fileImportImage"]->setEnabled(false);
-// scrActions["fileImportAppendText"]->setEnabled(false);
-// scrActions["pageImport"]->setEnabled(false);
-// scrActions["fileExportText"]->setEnabled(false);
-// scrActions["fileExportAsEPS"]->setEnabled(false);
-// scrActions["fileExportAsPDF"]->setEnabled(false);
scrMenuMgr->setMenuEnabled("FileImport", false);
scrMenuMgr->setMenuEnabled("FileExport", false);
-// scrActions["fileDocSetup"]->setEnabled(false);
-// scrActions["filePrint"]->setEnabled(false);
-// scrActions["PrintPreview"]->setEnabled(false);
scrMenuMgr->createMenu("Edit", ActionManager::defaultMenuNameEntryTranslated("Edit"));
scrMenuMgr->addMenuItem(scrActions["editUndoAction"], "Edit", false);
@@ -705,33 +689,11 @@
scrMenuMgr->addMenuItem(scrActions["editStyles"], "Edit", false);
scrMenuMgr->addMenuItem(scrActions["editMasterPages"], "Edit", false);
scrMenuMgr->addMenuItem(scrActions["editJavascripts"], "Edit", false);
-// scrActions["editUndoAction"]->setEnabled(false);
-// scrActions["editRedoAction"]->setEnabled(false);
-// scrActions["editActionMode"]->setEnabled(true);
-// scrActions["editCut"]->setEnabled(false);
-// scrActions["editCopy"]->setEnabled(false);
-// scrActions["editPaste"]->setEnabled(false);
scrMenuMgr->setMenuEnabled("EditPasteRecent", false);
scrMenuMgr->setMenuEnabled("EditContents", false);
-// scrActions["editCopyContents"]->setEnabled(false);
-// scrActions["editPasteContents"]->setEnabled(false);
-// scrActions["editPasteContentsAbs"]->setEnabled(false);
-// scrActions["editClearContents"]->setEnabled(false);
-// scrActions["editSelectAll"]->setEnabled(false);
-// scrActions["editSelectAllOnLayer"]->setEnabled(false);
-// scrActions["editDeselectAll"]->setEnabled(false);
-// scrActions["editSearchReplace"]->setEnabled(false);
-// scrActions["editReplaceColors"]->setEnabled(false);
-// scrActions["editPatterns"]->setEnabled(false);
- scrActions["editGradients"]->setEnabled(true);
-// scrActions["editStyles"]->setEnabled(false);
-// scrActions["editMasterPages"]->setEnabled(false);
-// scrActions["editJavascripts"]->setEnabled(false);
-// scrActions["toolsEditWithStoryEditor"]->setEnabled(false);
-// scrActions["editEditWithImageEditor"]->setEnabled(false);
-// scrActions["editEditRenderSource"]->setEnabled(false);
+
scrActions["itemDuplicate"]->setEnabled(false);
scrActions["itemMulDuplicate"]->setEnabled(false);
scrActions["itemDelete"]->setEnabled(false);
@@ -794,37 +756,26 @@
scrMenuMgr->addMenuItem(scrActions["itemPDFIsBookmark"], "ItemPDFOptions", false);
scrMenuMgr->addMenuItem(scrActions["itemPDFAnnotationProps"], "ItemPDFOptions", false);
scrMenuMgr->addMenuItem(scrActions["itemPDFFieldProps"], "ItemPDFOptions", false);
- //scrMenuMgr->createMenu("ItemShapes", tr("&Shape"), "Item");
scrMenuMgr->createMenu("ItemConvertTo", tr("C&onvert To"), "Item");
scrMenuMgr->addMenuItem(scrActions["itemConvertToBezierCurve"], "ItemConvertTo", false);
scrMenuMgr->addMenuItem(scrActions["itemConvertToImageFrame"], "ItemConvertTo", false);
scrMenuMgr->addMenuItem(scrActions["itemConvertToOutlines"], "ItemConvertTo", false);
scrMenuMgr->addMenuItem(scrActions["itemConvertToPolygon"], "ItemConvertTo", false);
scrMenuMgr->addMenuItem(scrActions["itemConvertToTextFrame"], "ItemConvertTo", false);
-
+ scrMenuMgr->addMenuSeparator("Item");
+ scrMenuMgr->addMenuItem(scrActions["toolsLinkTextFrame"], "Item", false);
+ scrMenuMgr->addMenuItem(scrActions["toolsUnlinkTextFrame"], "Item", false);
+ scrMenuMgr->addMenuSeparator("Item");
scrMenuMgr->addMenuItem(scrActions["itemAttachTextToPath"], "Item", false);
scrMenuMgr->addMenuItem(scrActions["itemDetachTextFromPath"], "Item", false);
// scrMenuMgr->createMenu("ItemPathOps", tr("Path Tools"), "Item");
scrMenuMgr->addMenuItem(scrActions["itemCombinePolygons"], "Item", false);
scrMenuMgr->addMenuItem(scrActions["itemSplitPolygons"], "Item", false);
- //scrMenuMgr->setMenuEnabled("ItemShapes", false);
-// scrActions["itemGroup"]->setEnabled(false);
-// scrActions["itemUngroup"]->setEnabled(false);
-// scrActions["itemAttachTextToPath"]->setEnabled(false);
-// scrActions["itemDetachTextFromPath"]->setEnabled(false);
-// scrActions["itemCombinePolygons"]->setEnabled(false);
-// scrActions["itemSplitPolygons"]->setEnabled(false);
-// scrActions["itemLock"]->setEnabled(false);
-// scrActions["itemLockSize"]->setEnabled(false);
+
scrActions["itemPrintingEnabled"]->setEnabled(false);
-// scrActions["itemImageIsVisible"]->setEnabled(false);
scrMenuMgr->setMenuEnabled("ItemConvertTo", false);
-// scrActions["itemConvertToBezierCurve"]->setEnabled(false);
-// scrActions["itemConvertToImageFrame"]->setEnabled(false);
-// scrActions["itemConvertToOutlines"]->setEnabled(false);
-// scrActions["itemConvertToPolygon"]->setEnabled(false);
-// scrActions["itemConvertToTextFrame"]->setEnabled(false);
+
//Insert menu
scrMenuMgr->createMenu("Insert", ActionManager::defaultMenuNameEntryTranslated("Insert"));
scrMenuMgr->addMenuItem(scrActions["insertFrame"], "Insert", false);
More information about the scribus-commit
mailing list