Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 1800 → Rev 1801

/branches/Version13x/Scribus/scribus/werktoolb.cpp
17,6 → 17,7
 
#include <qtooltip.h>
#include <qpopupmenu.h>
#include <qpixmap.h>
#include "werktoolb.h"
#include "werktoolb.moc"
#include "polyprops.h"
51,7 → 52,9
insertShapeButton->setPopupDelay(0);
Rechteck = new AutoformButtonGroup( NULL );
insertShapeButtonMenu->insertItem( Rechteck );
ScApp->scrActions["toolsInsertShape"]->setIconSet(QIconSet(Rechteck->getIconPixmap(0), Rechteck->getIconPixmap(0)));
QImage newShapeIcon = Rechteck->getIconPixmap(0).convertToImage();
newShapeIcon.smoothScale(16,16);
ScApp->scrActions["toolsInsertShape"]->setIconSet(QIconSet(newShapeIcon,Rechteck->getIconPixmap(0)));
 
ScApp->scrActions["toolsInsertPolygon"]->addTo(this);
ScApp->scrMenuMgr->createMenu("insertPolygonButtonMenu", "insertPolygonButtonMenu");
102,7 → 105,9
void WerkToolB::SelShape(int s, int c, double *vals)
{
const QPixmap* newIcon = Rechteck->find(s)->pixmap();
ScApp->scrActions["toolsInsertShape"]->setIconSet(QIconSet(*newIcon, *newIcon));
QImage newShapeIcon = Rechteck->find(s)->pixmap()->convertToImage();
newShapeIcon.smoothScale(16,16);
ScApp->scrActions["toolsInsertShape"]->setIconSet(QIconSet(newShapeIcon, *newIcon));
insertShapeButtonMenu->hide();
SubMode = s;
ValCount = c;
/branches/Version13x/Scribus/scribus/tabpdfoptions.cpp
105,9 → 105,9
TextLabel1->setAlignment( static_cast<int>( QLabel::AlignVCenter | QLabel::AlignLeft ) );
GroupBox1Layout->addWidget( TextLabel1, 0, 0 );
ComboBox1 = new QComboBox( true, GroupBox1, "ComboBox1" );
ComboBox1->insertItem("Acrobat 4.0");
ComboBox1->insertItem("Acrobat 5.0");
ComboBox1->insertItem("Acrobat 6.0");
ComboBox1->insertItem("PDF 1.3");
ComboBox1->insertItem("PDF 1.4");
ComboBox1->insertItem("PDF 1.5");
#ifdef HAVE_CMS
if ((CMSuse) && (CMSavail) && (!PDFXProfiles->isEmpty()))
ComboBox1->insertItem("PDF/X-3");
817,7 → 817,7
connect(CheckBox10, SIGNAL(clicked()), this, SLOT(DoEffects()));
connect(EonAllPg, SIGNAL(clicked()), this, SLOT(EffectOnAll()));
QToolTip::add( EmbedFonts, tr( "Embed fonts into the PDF. Embedding the fonts\nwill preserve the layout and appearance of your document." ) );
QToolTip::add( CheckBox10, tr( "Enables presentation effects when using Acrobat Reader in full screen mode." ) );
QToolTip::add( CheckBox10, tr( "Enables presentation effects when using Adobe&#0ae; Reader&#0ae; in full screen mode." ) );
QToolTip::add( PagePrev, tr( "Show page previews of each page listed above." ) );
QToolTip::add( PageTime, tr( "Length of time the page is shown before the presentation starts on the selected page." ) );
QToolTip::add( EffectTime, tr( "Length of time the effect runs.\nA shorter time will speed up the effect, a longer one will slow it down." ) );
851,11 → 851,11
"a token can be * for all the pages, 1-5 for\n"
"a range of pages or a single page number.") );
 
QToolTip::add( ComboBox1, tr( "Determines the PDF compatibility. The default is Acrobat 4.0 which gives the widest compatibility.\nChoose Acrobat 5.0 if your file has PDF 1.4 features such as transparency or you require 128 bit encryption.\nPDF/X-3 is for exporting the PDF for commercial printing and is selectable when you have activated color management." ) );
QToolTip::add( ComboBox1, tr( "Determines the PDF compatibility. The default is PDF 1.3 which gives the widest compatibility.\nChoose PDF 1.4 if your file uses features such as transparency or you require 128 bit encryption.\nPDF/X-3 is for exporting the PDF for commercial printing and is selectable when you have activated color management." ) );
QToolTip::add( ComboBind, tr( "Determines the binding of pages in the PDF. Unless you know\nyou need to change it leave the default choice - Left." ) );
QToolTip::add( CheckBox1, tr( "Generates thumbnails of each page in the PDF.\nSome viewers can use the thumbnails for navigation." ) );
QToolTip::add( Article, tr( "Generate PDF Articles, which is useful for navigating linked articles in a PDF." ) );
QToolTip::add( useLayers, tr( "Layers in your document are exported to the PDF\nOnly available if Acrobat 6.0 is choosen." ) );
QToolTip::add( useLayers, tr( "Layers in your document are exported to the PDF\nOnly available if PDF 1.5 is choosen." ) );
QToolTip::add( CheckBM, tr( "Embed the bookmarks you created in your document.\nThese are useful for navigating long PDF documents." ) );
QToolTip::add( Resolution, tr( "Export resolution of text and vector graphics.\nThis does not affect the resolution of bitmap images like photos." ) );
QToolTip::add( Compression, tr( "Compression of text and graphics.\nUnless you have a reason, leave this checked. This reduces PDF size." ) );
863,7 → 863,7
QToolTip::add( CQuality, tr( "Compression levels: Minimum (25%), Low (50%), Medium (75%), High (85%), Maximum (95%)" ) );
QToolTip::add( DSColor, tr( "Downsample your bitmap images to the selected DPI.\nLeaving this unchecked will render them at their native resolution." ) );
QToolTip::add( ValC, tr( "DPI (Dots Per Inch) for image export.") );
QToolTip::add( Encry, tr( "Enable the security features in your exported PDF.\nIf you selected Acrobat 4.0, the PDF will be protected by 40 bit encryption.\nIf you selected Acrobat 5.0, the PDF will be protected by 128 bit encryption.\nDisclaimer: PDF encryption is not as reliable as GPG or PGP encryption and does have some limitations." ) );
QToolTip::add( Encry, tr( "Enable the security features in your exported PDF.\nIf you selected PDF 1.3, the PDF will be protected by 40 bit encryption.\nIf you selected PDF 1.4, the PDF will be protected by 128 bit encryption.\nDisclaimer: PDF encryption is not as reliable as GPG or PGP encryption and does have some limitations." ) );
QToolTip::add( PassOwner, tr( "Choose a master password which enables or disables all the\nsecurity features in your exported PDF" ) );
QToolTip::add( PassUser, tr( "Choose a password for users to be able to read your PDF." ) );
QToolTip::add( PrintSec, tr( "Allow printing of the PDF. If un-checked, printing is prevented. " ) );
924,9 → 924,9
disconnect(ComboBox1, SIGNAL(activated(int)), this, SLOT(EnablePDFX(int)));
int a = ComboBox1->currentItem();
ComboBox1->clear();
ComboBox1->insertItem("Acrobat 4.0");
ComboBox1->insertItem("Acrobat 5.0");
ComboBox1->insertItem("Acrobat 6.0");
ComboBox1->insertItem("PDF 1.3");
ComboBox1->insertItem("PDF 1.4");
ComboBox1->insertItem("PDF 1.5");
if (enable)
{
cms = true;
/branches/Version13x/Scribus/scribus/icons/Bild16.xpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Version13x/Scribus/scribus/icons/frame_table16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Version13x/Scribus/scribus/icons/frame_table16.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Version13x/Scribus/scribus/icons/Stift16.xpm
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Version13x/Scribus/scribus/icons/Stift16.xpm
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Version13x/Scribus/scribus/icons/Makefile.am
===================================================================
--- Version13x/Scribus/scribus/icons/Makefile.am (revision 1800)
+++ Version13x/Scribus/scribus/icons/Makefile.am (revision 1801)
@@ -1,4 +1,4 @@
-EXTRA_DIST = DrawFrame.xpm DrawImageFrame.xpm DrawPolylineFrame.xpm DrawTable.xpm DrawTextFrame.xpm plugins.png filenew.png fileopen.png editcopy22.png edittrash.png font_otf16.png font_truetype16.png font_type1_16.png font_otf.png font_truetype.png font_type1.png acroread.png checkdoc.png vectorgfx.png ooo_draw.png ooo_writer.png key_bindings.png blend.png hyphenate.png scrap.png misc.png tools.png page.png guides.png font.png screen.png nftabout.xpm nftinfo.xpm dist.png tab.png view.png Kreuz.xpm Bild.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift.xpm Text.xpm Unlock.xpm DateiClose.png DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave2.png AppIcon2.png AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.png editpaste.png exit.png doc.png image.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm FlipH.xpm FlipV.xpm Winkel.xpm acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline.png triangle.png Stiftalt.xpm beziertool.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png text_force.png ok.png ok22.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png signature.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png frame_table.png scribusdoc.png documentinfo.png filesaveas.png revert.png reload.png compfile.png reload16.png compfile16.png find.png find16.png addf.png removef.png launch.png launch16.png u_undo.png u_redo.png u_undo16.png u_redo16.png u_margins.png u_margins_locked.png u_align.png u_move.png u_resize.png u_rotate.png u_group.png u_fill.png u_shade.png u_lock.png u_unlock.png u_create.png u_delete.png u_fliph.png u_flipv.png u_cut.png u_transp.png u_line.png u_arrow.png u_font.png u_svg.png u_eps.png u_scale_image.png u_shape.png docattributes.png tabtocindex.png
+EXTRA_DIST = DrawFrame.xpm DrawImageFrame.xpm DrawPolylineFrame.xpm DrawTable.xpm DrawTextFrame.xpm plugins.png filenew.png fileopen.png editcopy22.png edittrash.png font_otf16.png font_truetype16.png font_type1_16.png font_otf.png font_truetype.png font_type1.png acroread.png checkdoc.png vectorgfx.png ooo_draw.png ooo_writer.png key_bindings.png blend.png hyphenate.png scrap.png misc.png tools.png page.png guides.png font.png screen.png nftabout.xpm nftinfo.xpm dist.png tab.png view.png Kreuz.xpm Bild.xpm Bild16.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift16.xpm Stift.xpm Text.xpm Text16.xpm Unlock.xpm DateiClose.png DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave2.png AppIcon2.png AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.png editpaste.png exit.png doc.png image.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm FlipH.xpm FlipV.xpm Winkel.xpm acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline16.png spline.png triangle.png Stiftalt.xpm Stiftalt16.xpm beziertool.png beziertool16.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png text_force.png ok.png ok22.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png signature.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png frame_table16.png frame_table.png scribusdoc.png documentinfo.png filesaveas.png revert.png reload.png compfile.png reload16.png compfile16.png find.png find16.png addf.png removef.png launch.png launch16.png u_undo.png u_redo.png u_undo16.png u_redo16.png u_margins.png u_margins_locked.png u_align.png u_move.png u_resize.png u_rotate.png u_group.png u_fill.png u_shade.png u_lock.png u_unlock.png u_create.png u_delete.png u_fliph.png u_flipv.png u_cut.png u_transp.png u_line.png u_arrow.png u_font.png u_svg.png u_eps.png u_scale_image.png u_shape.png docattributes.png tabtocindex.png
install-data-local:
$(mkinstalldirs) $(prefix)/share/scribus/icons/
@@ -46,6 +46,7 @@
$(INSTALL_DATA) $(srcdir)/tab.png $(prefix)/share/scribus/icons/tab.png
$(INSTALL_DATA) $(srcdir)/view.png $(prefix)/share/scribus/icons/view.png
$(INSTALL_DATA) $(srcdir)/frame_table.png $(prefix)/share/scribus/icons/frame_table.png
+ $(INSTALL_DATA) $(srcdir)/frame_table16.png $(prefix)/share/scribus/icons/frame_table16.png
$(INSTALL_DATA) $(srcdir)/testfill.png $(prefix)/share/scribus/icons/testfill.png
$(INSTALL_DATA) $(srcdir)/frameresize.png $(prefix)/share/scribus/icons/frameresize.png
$(INSTALL_DATA) $(srcdir)/framenoresize.png $(prefix)/share/scribus/icons/framenoresize.png
@@ -55,6 +56,7 @@
$(INSTALL_DATA) $(srcdir)/rotate_ccw.png $(prefix)/share/scribus/icons/rotate_ccw.png
$(INSTALL_DATA) $(srcdir)/Kreuz.xpm $(prefix)/share/scribus/icons/Kreuz.xpm
$(INSTALL_DATA) $(srcdir)/Bild.xpm $(prefix)/share/scribus/icons/Bild.xpm
+ $(INSTALL_DATA) $(srcdir)/Bild16.xpm $(prefix)/share/scribus/icons/Bild16.xpm
$(INSTALL_DATA) $(srcdir)/Editm.xpm $(prefix)/share/scribus/icons/Editm.xpm
$(INSTALL_DATA) $(srcdir)/Kreise.xpm $(prefix)/share/scribus/icons/Kreise.xpm
$(INSTALL_DATA) $(srcdir)/Lock.xpm $(prefix)/share/scribus/icons/Lock.xpm
@@ -61,7 +63,9 @@
$(INSTALL_DATA) $(srcdir)/Lupe.xpm $(prefix)/share/scribus/icons/Lupe.xpm
$(INSTALL_DATA) $(srcdir)/Rechtecke.xpm $(prefix)/share/scribus/icons/Rechtecke.xpm
$(INSTALL_DATA) $(srcdir)/Rotieren.xpm $(prefix)/share/scribus/icons/Rotieren.xpm
+ $(INSTALL_DATA) $(srcdir)/Stift16.xpm $(prefix)/share/scribus/icons/Stift16.xpm
$(INSTALL_DATA) $(srcdir)/Stift.xpm $(prefix)/share/scribus/icons/Stift.xpm
+ $(INSTALL_DATA) $(srcdir)/Text16.xpm $(prefix)/share/scribus/icons/Text16.xpm
$(INSTALL_DATA) $(srcdir)/Text.xpm $(prefix)/share/scribus/icons/Text.xpm
$(INSTALL_DATA) $(srcdir)/Unlock.xpm $(prefix)/share/scribus/icons/Unlock.xpm
$(INSTALL_DATA) $(srcdir)/DateiClose.png $(prefix)/share/scribus/icons/DateiClose.png
@@ -113,9 +117,12 @@
$(INSTALL_DATA) $(srcdir)/text_left.png $(prefix)/share/scribus/icons/text_left.png
$(INSTALL_DATA) $(srcdir)/text_right.png $(prefix)/share/scribus/icons/text_right.png
$(INSTALL_DATA) $(srcdir)/Text2.xpm $(prefix)/share/scribus/icons/Text2.xpm
+ $(INSTALL_DATA) $(srcdir)/spline16.png $(prefix)/share/scribus/icons/spline16.png
$(INSTALL_DATA) $(srcdir)/spline.png $(prefix)/share/scribus/icons/spline.png
$(INSTALL_DATA) $(srcdir)/triangle.png $(prefix)/share/scribus/icons/triangle.png
+ $(INSTALL_DATA) $(srcdir)/Stiftalt16.xpm $(prefix)/share/scribus/icons/Stiftalt16.xpm
$(INSTALL_DATA) $(srcdir)/Stiftalt.xpm $(prefix)/share/scribus/icons/Stiftalt.xpm
+ $(INSTALL_DATA) $(srcdir)/beziertool16.png $(prefix)/share/scribus/icons/beziertool16.png
$(INSTALL_DATA) $(srcdir)/beziertool.png $(prefix)/share/scribus/icons/beziertool.png
$(INSTALL_DATA) $(srcdir)/AddNode.png $(prefix)/share/scribus/icons/AddNode.png
$(INSTALL_DATA) $(srcdir)/DeleteNode.png $(prefix)/share/scribus/icons/DeleteNode.png
/branches/Version13x/Scribus/scribus/icons/spline16.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Version13x/Scribus/scribus/icons/Stiftalt16.xpm
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Version13x/Scribus/scribus/icons/Stiftalt16.xpm
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Version13x/Scribus/scribus/icons/Text16.xpm
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Version13x/Scribus/scribus/icons/Text16.xpm
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Version13x/Scribus/scribus/icons/beziertool16.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Version13x/Scribus/scribus/icons/beziertool16.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Version13x/Scribus/scribus/scribus.cpp
===================================================================
--- Version13x/Scribus/scribus/scribus.cpp (revision 1800)
+++ Version13x/Scribus/scribus/scribus.cpp (revision 1801)
@@ -205,6 +205,7 @@
initEditMenuActions();
initStyleMenuActions();
initItemMenuActions();
+ initInsertMenuActions();
initPageMenuActions();
initViewMenuActions();
initToolsMenuActions();
@@ -358,8 +359,8 @@
{
if (splashScreen!=NULL)
splashScreen->close(); // 10/10/2004 pv fix #1200
- QString mess = tr("There are no Postscript fonts on your system");
- mess += "\n" + tr("Exiting now");
+ QString mess = tr("There are no fonts found on your system.");
+ mess += "\n" + tr("Exiting now.");
QMessageBox::critical(this, tr("Fatal Error"), mess, 1, 0, 0);
}
else
@@ -1193,6 +1194,14 @@
connect( scrActions["itemConvertToOutlines"], SIGNAL(activated()) , this, SLOT(TraceText()) );
}
+void ScribusApp::initInsertMenuActions()
+{
+ //Insert Menu
+ scrActions.insert("extrasInsertSpecial", new ScrAction(tr("Special Character..."), QKeySequence(), this, "extrasInsertSpecial"));
+ scrActions["extrasInsertSpecial"]->setText(tr("Insert Special Character"));
+ connect( scrActions["extrasInsertSpecial"], SIGNAL(activated()) , this, SLOT(slotCharSelect()) );
+}
+
void ScribusApp::initPageMenuActions()
{
//Page menu
@@ -1281,14 +1290,25 @@
//toolbar only items
scrActions.insert("toolsSelect", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("Kreuz.xpm"), loadIcon("Kreuz.xpm")), tr("Select Item"), QKeySequence(Key_C), this, "toolsSelect", NormalMode));
- scrActions.insert("toolsInsertTextFrame", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("Text.xpm"), loadIcon("Text.xpm")), tr("Insert Text Frame"), QKeySequence(Key_T), this, "toolsInsertTextFrame", DrawText));
- scrActions.insert("toolsInsertImageFrame", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("Bild.xpm"), loadIcon("Bild.xpm")), tr("Insert Image Frame"), QKeySequence(Key_I), this, "toolsInsertImageFrame", DrawPicture));
- scrActions.insert("toolsInsertTableFrame", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("frame_table.png"), loadIcon("frame_table.png")), tr("Insert Table"), QKeySequence(Key_A), this, "toolsInsertTableFrame", DrawTable));
- scrActions.insert("toolsInsertShape", new ScrAction(ScrAction::DataInt,QIconSet(), tr("Insert Shape"), QKeySequence(Key_S), this, "toolsInsertShape", DrawShapes));
- scrActions.insert("toolsInsertPolygon", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("spline.png"), loadIcon("spline.png")), tr("Insert Polygon"), QKeySequence(Key_P), this, "toolsInsertPolygon", DrawRegularPolygon));
- scrActions.insert("toolsInsertLine", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("Stift.xpm"), loadIcon("Stift.xpm")), tr("Insert Line"), QKeySequence(Key_L), this, "toolsInsertLine", DrawLine));
- scrActions.insert("toolsInsertBezier", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("beziertool.png"), loadIcon("beziertool.png")), tr("Insert Bezier Curve"), QKeySequence(Key_B), this, "toolsInsertBezier", DrawBezierLine));
- scrActions.insert("toolsInsertFreehandLine", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("Stiftalt.xpm"), loadIcon("Stiftalt.xpm")), tr("Insert Freehand Line"), QKeySequence(Key_F), this, "toolsInsertFreehandLine", DrawFreehandLine));
+
+ scrActions.insert("toolsInsertTextFrame", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("Text16.xpm"), loadIcon("Text.xpm")), tr("&Text Frame"), QKeySequence(Key_T), this, "toolsInsertTextFrame", DrawText));
+ scrActions.insert("toolsInsertImageFrame", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("Bild16.xpm"), loadIcon("Bild.xpm")), tr("&Image Frame"), QKeySequence(Key_I), this, "toolsInsertImageFrame", DrawPicture));
+ scrActions.insert("toolsInsertTableFrame", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("frame_table16.png"), loadIcon("frame_table.png")), tr("T&able"), QKeySequence(Key_A), this, "toolsInsertTableFrame", DrawTable));
+ scrActions.insert("toolsInsertShape", new ScrAction(ScrAction::DataInt,QIconSet(), tr("&Shape"), QKeySequence(Key_S), this, "toolsInsertShape", DrawShapes));
+ scrActions.insert("toolsInsertPolygon", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("spline16.png"), loadIcon("spline.png")), tr("&Polygon"), QKeySequence(Key_P), this, "toolsInsertPolygon", DrawRegularPolygon));
+ scrActions.insert("toolsInsertLine", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("Stift16.xpm"), loadIcon("Stift.xpm")), tr("&Line"), QKeySequence(Key_L), this, "toolsInsertLine", DrawLine));
+ scrActions.insert("toolsInsertBezier", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("beziertool16.png"), loadIcon("beziertool.png")), tr("&Bezier Curve"), QKeySequence(Key_B), this, "toolsInsertBezier", DrawBezierLine));
+ scrActions.insert("toolsInsertFreehandLine", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("Stiftalt16.xpm"), loadIcon("Stiftalt.xpm")), tr("&Freehand Line"), QKeySequence(Key_F), this, "toolsInsertFreehandLine", DrawFreehandLine));
+
+ scrActions["toolsInsertTextFrame"]->setText(tr("Insert Text Frame"));
+ scrActions["toolsInsertImageFrame"]->setText(tr("Insert Image Frame"));
+ scrActions["toolsInsertTableFrame"]->setText(tr("Insert Table"));
+ scrActions["toolsInsertShape"]->setText(tr("Insert Shape"));
+ scrActions["toolsInsertPolygon"]->setText(tr("Insert Polygon"));
+ scrActions["toolsInsertLine"]->setText(tr("Insert Line"));
+ scrActions["toolsInsertBezier"]->setText(tr("Insert Bezier Curve"));
+ scrActions["toolsInsertFreehandLine"]->setText(tr("Insert Freehand Line"));
+
scrActions.insert("toolsRotate", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("Rotieren.xpm"), loadIcon("Rotieren.xpm")), tr("Rotate Item"), QKeySequence(Key_R), this, "toolsRotate", Rotation));
scrActions.insert("toolsZoom", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("Lupe.xpm"), loadIcon("Lupe.xpm")), tr("Zoom in or out"), QKeySequence(Key_Z), this, "toolsZoom", Magnifier));
scrActions.insert("toolsEditContents", new ScrAction(ScrAction::DataInt,QIconSet(loadIcon("Editm.xpm"), loadIcon("Editm.xpm")), tr("Edit Contents of Frame"), QKeySequence(Key_E), this, "toolsEditContents", EditMode));
@@ -1341,12 +1361,10 @@
{
scrActions.insert("extrasManagePictures", new ScrAction(tr("&Manage Pictures"), QKeySequence(), this, "extrasManagePictures"));
scrActions.insert("extrasHyphenateText", new ScrAction(tr("&Hyphenate Text"), QKeySequence(), this, "extrasHyphenateText"));
- scrActions.insert("extrasInsertSpecial", new ScrAction(tr("&Insert Special"), QKeySequence(), this, "extrasInsertSpecial"));
scrActions.insert("extrasGenerateTableOfContents", new ScrAction(tr("&Generate Table Of Contents"), QKeySequence(), this, "extrasGenerateTableOfContents"));
connect( scrActions["extrasManagePictures"], SIGNAL(activated()) , this, SLOT(StatusPic()) );
connect( scrActions["extrasHyphenateText"], SIGNAL(activated()) , this, SLOT(doHyphenate()) );
- connect( scrActions["extrasInsertSpecial"], SIGNAL(activated()) , this, SLOT(slotCharSelect()) );
connect( scrActions["extrasGenerateTableOfContents"], SIGNAL(activated()) , this, SLOT(generateTableOfContents()) );
}
@@ -1378,9 +1396,13 @@
void ScribusApp::initSpecialActions()
{
//typography
- scrActions.insert("specialSmartHyphen", new ScrAction(ScrAction::DataQString, QIconSet(), tr("Insert Smart Hyphen"), CTRL+Key_Minus, this, "specialSmartHyphen",0,0.0,"specialSmartHyphen"));
- scrActions.insert("specialNonBreakingSpace", new ScrAction(ScrAction::DataQString, QIconSet(), tr("Insert Non Breaking Space"), CTRL+Key_Space, this, "specialNonBreakingSpace",0,0.0,"specialNonBreakingSpace"));
- scrActions.insert("specialPageNumber", new ScrAction(ScrAction::DataQString, QIconSet(), tr("Insert Page Number"), CTRL+SHIFT+ALT+Key_P, this, "specialPageNumber",0,0.0,"specialPageNumber"));
+ scrActions.insert("specialSmartHyphen", new ScrAction(ScrAction::DataQString, QIconSet(), tr("Smart &Hyphen"), CTRL+Key_Minus, this, "specialSmartHyphen",0,0.0,"specialSmartHyphen"));
+ scrActions.insert("specialNonBreakingSpace", new ScrAction(ScrAction::DataQString, QIconSet(), tr("Non Breaking &Space"), CTRL+Key_Space, this, "specialNonBreakingSpace",0,0.0,"specialNonBreakingSpace"));
+ scrActions.insert("specialPageNumber", new ScrAction(ScrAction::DataQString, QIconSet(), tr("Page &Number"), CTRL+SHIFT+ALT+Key_P, this, "specialPageNumber",0,0.0,"specialPageNumber"));
+
+ scrActions["specialSmartHyphen"]->setText("Insert Smart Hyphen");
+ scrActions["specialNonBreakingSpace"]->setText("Insert Non Breaking Space");
+ scrActions["specialPageNumber"]->setText("Insert Page Number");
connect( scrActions["specialSmartHyphen"], SIGNAL(activatedData(QString)) , this, SLOT(specialActionKeyEvent(QString)) );
connect( scrActions["specialNonBreakingSpace"], SIGNAL(activatedData(QString)) , this, SLOT(specialActionKeyEvent(QString)) );
@@ -1547,6 +1569,23 @@
scrActions["itemLock"]->setEnabled(false);
scrActions["itemConvertToOutlines"]->setEnabled(false);
+ //Insert menu
+ scrMenuMgr->createMenu("Insert", tr("I&nsert"));
+ scrMenuMgr->addMenuItem(scrActions["toolsInsertTextFrame"], "Insert");
+ scrMenuMgr->addMenuItem(scrActions["toolsInsertImageFrame"], "Insert");
+ scrMenuMgr->addMenuItem(scrActions["toolsInsertTableFrame"], "Insert");
+ scrMenuMgr->addMenuItem(scrActions["toolsInsertShape"], "Insert");
+ scrMenuMgr->addMenuItem(scrActions["toolsInsertPolygon"], "Insert");
+ scrMenuMgr->addMenuItem(scrActions["toolsInsertLine"], "Insert");
+ scrMenuMgr->addMenuItem(scrActions["toolsInsertBezier"], "Insert");
+ scrMenuMgr->addMenuItem(scrActions["toolsInsertFreehandLine"], "Insert");
+ scrMenuMgr->addMenuSeparator("Insert");
+ scrMenuMgr->addMenuItem(scrActions["extrasInsertSpecial"], "Insert");
+ scrMenuMgr->addMenuItem(scrActions["specialNonBreakingSpace"], "Insert");
+ scrMenuMgr->addMenuItem(scrActions["specialPageNumber"], "Insert");
+ scrMenuMgr->addMenuItem(scrActions["specialSmartHyphen"], "Insert");
+ scrActions["extrasInsertSpecial"]->setEnabled(false);
+
//Page menu
scrMenuMgr->createMenu("Page", tr("&Page"));
scrMenuMgr->addMenuItem(scrActions["pageInsert"], "Page");
@@ -1599,12 +1638,10 @@
scrMenuMgr->createMenu("Extras", tr("E&xtras"));
scrMenuMgr->addMenuItem(scrActions["extrasManagePictures"], "Extras");
scrMenuMgr->addMenuItem(scrActions["extrasHyphenateText"], "Extras");
- scrMenuMgr->addMenuItem(scrActions["extrasInsertSpecial"], "Extras");
scrMenuMgr->addMenuItem(scrActions["extrasGenerateTableOfContents"], "Extras");
scrMenuMgr->setMenuEnabled("Extras", false);
scrActions["extrasHyphenateText"]->setEnabled(false);
- scrActions["extrasInsertSpecial"]->setEnabled(false);
//Window menu
scrMenuMgr->createMenu("Windows", tr("&Windows"));
@@ -1623,8 +1660,10 @@
scrMenuMgr->addMenuToMenuBar("Style");
scrMenuMgr->setMenuEnabled("Style", false);
scrMenuMgr->addMenuToMenuBar("Item");
+ scrMenuMgr->setMenuEnabled("Item", false);
+ scrMenuMgr->addMenuToMenuBar("Insert");
+ scrMenuMgr->setMenuEnabled("Insert", false);
scrMenuMgr->addMenuToMenuBar("Page");
- scrMenuMgr->setMenuEnabled("Item", false);
scrMenuMgr->setMenuEnabled("Page", false);
scrMenuMgr->addMenuToMenuBar("View");
scrMenuMgr->setMenuEnabled("View", false);
@@ -3692,6 +3731,7 @@
scrActions["viewSnapToGrid"]->setOn(doc->useRaster);
scrActions["viewSnapToGuides"]->setOn(doc->SnapGuides);
+ scrMenuMgr->setMenuEnabled("Insert", true);
scrMenuMgr->setMenuEnabled("Windows", true);
scrMenuMgr->setMenuEnabled("Page", true);
scrMenuMgr->setMenuEnabled("Extras", true);
@@ -3823,9 +3863,11 @@
else
Nr = -1;
}
-
scrActions["itemDetachTextFromPath"]->setEnabled(false);
scrActions["extrasInsertSpecial"]->setEnabled(false);
+ scrActions["specialSmartHyphen"]->setEnabled(false);
+ scrActions["specialNonBreakingSpace"]->setEnabled(false);
+ scrActions["specialPageNumber"]->setEnabled(false);
view->horizRuler->ItemPosValid = false;
view->horizRuler->repX = false;
view->horizRuler->repaint();
@@ -3923,6 +3965,9 @@
setTBvals(b);
scrActions["editSelectAll"]->setEnabled(true);
scrActions["extrasInsertSpecial"]->setEnabled(true);
+ scrActions["specialSmartHyphen"]->setEnabled(true);
+ scrActions["specialNonBreakingSpace"]->setEnabled(true);
+ scrActions["specialPageNumber"]->setEnabled(true);
view->horizRuler->ItemPos = b->Xpos - doc->ScratchLeft;
view->horizRuler->ItemEndPos = b->Xpos+b->Width - doc->ScratchLeft;
if (b->lineColor() != "None")
@@ -5173,6 +5218,7 @@
scrActions["viewSnapToGuides"]->setOn(false);
scrActions["viewSnapToGrid"]->setOn(false);
+ scrMenuMgr->setMenuEnabled("Insert", false);
scrMenuMgr->setMenuEnabled("Page", false);
scrMenuMgr->setMenuEnabled("Extras", false);
scrMenuMgr->setMenuEnabled("Style", false);
@@ -6433,6 +6479,9 @@
}
scrActions["editPaste"]->setEnabled(false);
scrActions["extrasInsertSpecial"]->setEnabled(true);
+ scrActions["specialSmartHyphen"]->setEnabled(true);
+ scrActions["specialNonBreakingSpace"]->setEnabled(true);
+ scrActions["specialPageNumber"]->setEnabled(true);
if (!Buffer2.isNull())
{
if (!Buffer2.startsWith("<SCRIBUSELEM"))
/branches/Version13x/Scribus/scribus/scribus.h
499,6 → 499,7
void initEditMenuActions();
void initStyleMenuActions();
void initItemMenuActions();
void initInsertMenuActions();
void initPageMenuActions();
void initViewMenuActions();
void initToolsMenuActions();