Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 6720 → Rev 6722

/branches/Version13x/Scribus/scribus/mpalette.h
185,7 → 185,6
void setFlippedV(bool);
 
private slots:
 
void SelTab(int t);
void NewX();
void NewY();
250,6 → 249,7
void setEndArrow(int id);
void setGroupTransparency(int trans);
void setGroupBlending(int blend);
void doGrouping();
 
protected slots:
//virtual void reject();
498,6 → 498,8
QPopupMenu* lineSpacingPop;
 
QToolButton* linespacingButton;
QToolButton* DoGroup;
QToolButton* DoUnGroup;
QToolButton* FlipH;
QToolButton* FlipV;
QToolButton* Locked;
/branches/Version13x/Scribus/scribus/icons/Makefile.am
1,4 → 1,4
EXTRA_DIST = configure.png previewOn.png previewOff.png curvelinear.png curvebezier.png curve.png invert.png page16.png pagedouble16.png pagequadro16.png pagesingle16.png pagetriple16.png viewmag1.png viewmagout.png viewmagin.png register.png cmyk.png rgb.png spot.png alert.png pagedouble.png pagequadro.png pagesingle.png pagetriple.png mover.png above.png below.png firstline.png leftindent.png rightindent.png shade.png linespacing.png linespacing2.png textbase.png textscaleh.png textkern.png textscalev.png wordsOnly.png shadow.png AllCaps.png DrawFrame.xpm DrawImageFrame.xpm DrawPolylineFrame.xpm DrawTable.xpm DrawTextFrame.xpm plugins.png shortwords.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 externaltools.png tools.png page.png guides.png font.png typography.png screen.png nftabout.xpm nftinfo.xpm dist.png dist22.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 DragPix.xpm Rotieren2.png HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editcut22.png editdelete.png editdelete22.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 signature2.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 scribusdoc16.png documentinfo.png documentinfo32.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 \
EXTRA_DIST = group.png ungroup.png configure.png previewOn.png previewOff.png curvelinear.png curvebezier.png curve.png invert.png page16.png pagedouble16.png pagequadro16.png pagesingle16.png pagetriple16.png viewmag1.png viewmagout.png viewmagin.png register.png cmyk.png rgb.png spot.png alert.png pagedouble.png pagequadro.png pagesingle.png pagetriple.png mover.png above.png below.png firstline.png leftindent.png rightindent.png shade.png linespacing.png linespacing2.png textbase.png textscaleh.png textkern.png textscalev.png wordsOnly.png shadow.png AllCaps.png DrawFrame.xpm DrawImageFrame.xpm DrawPolylineFrame.xpm DrawTable.xpm DrawTextFrame.xpm plugins.png shortwords.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 externaltools.png tools.png page.png guides.png font.png typography.png screen.png nftabout.xpm nftinfo.xpm dist.png dist22.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 DragPix.xpm Rotieren2.png HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editcut22.png editdelete.png editdelete22.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 signature2.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 scribusdoc16.png documentinfo.png documentinfo32.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 u_enableprint.png u_disableprint.png \
docattributes.png tabtocindex.png colorpicker.png wizard.png flow-bounding.png flow-contour.png flow-frame.png flow-none.png\
al_bottom_in.png al_bottom_out.png al_center_hor.png al_center_ver.png al_left_in.png al_left_out.png al_right_in.png al_right_out.png al_top_in.png al_top_out.png distribute_acrosspage.png distribute_acrossmargins.png distribute_bottom.png distribute_downpage.png distribute_downmargins.png distribute_hcentre.png \
135,6 → 135,8
$(mkinstalldirs) $(prefix)/share/scribus/icons/16/
$(mkinstalldirs) $(prefix)/share/scribus/icons/22/
$(mkinstalldirs) $(prefix)/share/pixmaps/
$(INSTALL_DATA) $(srcdir)/group.png $(prefix)/share/scribus/icons/group.png
$(INSTALL_DATA) $(srcdir)/ungroup.png $(prefix)/share/scribus/icons/ungroup.png
$(INSTALL_DATA) $(srcdir)/ellipsis.png $(prefix)/share/scribus/icons/ellipsis.png
$(INSTALL_DATA) $(srcdir)/configure.png $(prefix)/share/scribus/icons/configure.png
$(INSTALL_DATA) $(srcdir)/previewOn.png $(prefix)/share/scribus/icons/previewOn.png
999,3 → 1001,5
-rm -f $(prefix)/share/scribus/icons/previewOn.png
-rm -f $(prefix)/share/scribus/icons/previewOff.png
-rm -f $(prefix)/share/scribus/icons/configure.png
-rm -f $(prefix)/share/scribus/icons/group.png
-rm -f $(prefix)/share/scribus/icons/ungroup.png
/branches/Version13x/Scribus/scribus/icons/ungroup.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: Scribus/scribus/icons/group.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/Scribus/scribus/icons/group.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: Scribus/scribus/icons/CMakeLists.txt
===================================================================
--- Scribus/scribus/icons/CMakeLists.txt (revision 6720)
+++ Scribus/scribus/icons/CMakeLists.txt (revision 6722)
@@ -130,6 +130,7 @@
frame_table.png
gohome.png
goto.png
+group.png
guides.png
HandC.xpm
hmirror.png
@@ -285,6 +286,7 @@
u_margins.png
u_move.png
u_multiple.png
+ungroup.png
unlock.png
Unlock.xpm
Unter.xpm
Index: Scribus/scribus/mpalette.cpp
===================================================================
--- Scribus/scribus/mpalette.cpp (revision 6720)
+++ Scribus/scribus/mpalette.cpp (revision 6722)
@@ -279,14 +279,22 @@
layout60->addItem( spacer2 );
Layout44 = new QGridLayout( 0, 1, 1, 8, 4, "Layout44");
+
+ DoGroup = new QToolButton( page, "DoGroup" );
+ DoGroup->setPixmap(loadIcon("group.png"));
+ Layout44->addWidget( DoGroup, 0, 0 );
+ DoUnGroup = new QToolButton( page, "DoUnGroup" );
+ DoUnGroup->setPixmap(loadIcon("ungroup.png"));
+ Layout44->addWidget( DoUnGroup, 1, 0 );
+
FlipH = new QToolButton( page, "MirrorH" );
FlipH->setPixmap(loadIcon("16/flip-object-horizontal.png"));
FlipH->setToggleButton( true );
- Layout44->addWidget( FlipH, 0, 0 );
+ Layout44->addWidget( FlipH, 0, 1 );
FlipV = new QToolButton( page, "MirrorV" );
FlipV->setPixmap(loadIcon("16/flip-object-vertical.png"));
FlipV->setToggleButton( true );
- Layout44->addWidget( FlipV, 1, 0 );
+ Layout44->addWidget( FlipV, 1, 1 );
Locked = new QToolButton( page, "Lock" );
Locked->setToggleButton( true );
QIconSet a = QIconSet();
@@ -293,7 +301,7 @@
a.setPixmap(loadIcon("16/lock.png"), QIconSet::Automatic, QIconSet::Normal, QIconSet::On);
a.setPixmap(loadIcon("16/lock-unlocked.png"), QIconSet::Automatic, QIconSet::Normal, QIconSet::Off);
Locked->setIconSet(a);
- Layout44->addWidget( Locked, 0, 1 );
+ Layout44->addWidget( Locked, 0, 2 );
NoPrint = new QToolButton( page, "NoPrint" );
NoPrint->setToggleButton( true );
QIconSet a2 = QIconSet();
@@ -300,7 +308,7 @@
a2.setPixmap(loadIcon("NoPrint.png"), QIconSet::Automatic, QIconSet::Normal, QIconSet::On);
a2.setPixmap(loadIcon("DateiPrint16.png"), QIconSet::Automatic, QIconSet::Normal, QIconSet::Off);
NoPrint->setIconSet(a2);
- Layout44->addWidget( NoPrint, 1, 1 );
+ Layout44->addWidget( NoPrint, 1, 2 );
NoResize = new QToolButton( page, "NoResize" );
NoResize->setToggleButton( true );
QIconSet a3 = QIconSet();
@@ -307,7 +315,7 @@
a3.setPixmap(loadIcon("framenoresize.png"), QIconSet::Automatic, QIconSet::Normal, QIconSet::On);
a3.setPixmap(loadIcon("frameresize.png"), QIconSet::Automatic, QIconSet::Normal, QIconSet::Off);
NoResize->setIconSet(a3);
- Layout44->addWidget( NoResize, 0, 2 );
+ Layout44->addWidget( NoResize, 0, 3 );
layout60->addLayout( Layout44 );
pageLayout->addLayout( layout60 );
@@ -952,6 +960,7 @@
connect( Overprint, SIGNAL( clicked() ), this, SLOT( handleOverprint() ) );
connect(TransSpin, SIGNAL(valueChanged(int)), this, SLOT(setGroupTransparency(int)));
connect(blendMode, SIGNAL(activated(int)), this, SLOT(setGroupBlending(int)));
+ connect(DoGroup, SIGNAL(clicked()), this, SLOT(doGrouping()) );
HaveItem = false;
Xpos->setValue(0);
@@ -989,6 +998,7 @@
connect(this->Cpal, SIGNAL(QueryItem()), m_ScMW, SLOT(GetBrushPen()));
connect(this->Cpal->gradEdit->Preview, SIGNAL(gradientChanged()), m_ScMW, SLOT(updtGradFill()));
connect(this->Cpal, SIGNAL(gradientChanged()), m_ScMW, SLOT(updtGradFill()));
+ connect(DoUnGroup, SIGNAL(clicked()), m_ScMW, SLOT(UnGroupObj()) );
}
@@ -1548,6 +1558,29 @@
}
setXY(CurItem->xPos(), CurItem->yPos());
+ DoGroup->setEnabled(false);
+ DoUnGroup->setEnabled(false);
+ if (doc->m_Selection->count() > 1)
+ {
+ bool isGroup = true;
+ int firstElem = -1;
+ if (CurItem->Groups.count() != 0)
+ firstElem = CurItem->Groups.top();
+ for (uint bx = 0; bx < doc->m_Selection->count(); ++bx)
+ {
+ if (doc->m_Selection->itemAt(bx)->Groups.count() != 0)
+ {
+ if (doc->m_Selection->itemAt(bx)->Groups.top() != firstElem)
+ isGroup = false;
+ }
+ else
+ isGroup = false;
+ }
+ if (!isGroup)
+ DoGroup->setEnabled(true);
+ if (CurItem->Groups.count() != 0)
+ DoUnGroup->setEnabled(true);
+ }
updateSpinBoxConstants();
}
@@ -1612,6 +1645,8 @@
}
else
{
+ DoGroup->setEnabled(false);
+ DoUnGroup->setEnabled(false);
EditShape->setEnabled(false);
ShapeGroup->setEnabled(false);
}
@@ -4226,6 +4261,8 @@
QToolTip::add(BottomLeft, tr("Select bottom left for basepoint"));
QToolTip::add(BottomRight, tr("Select bottom right for basepoint"));
QToolTip::add(Center, tr("Select center for basepoint"));
+ QToolTip::add(DoGroup, tr("Group the selected objects"));
+ QToolTip::add(DoUnGroup, tr("Destroys the selected group"));
QToolTip::add(FlipH, tr("Flip Horizontal"));
QToolTip::add(FlipV, tr("Flip Vertical"));
QToolTip::add(Zup, tr("Move one level up"));
@@ -4414,6 +4451,14 @@
emit DocChanged();
}
+void Mpalette::doGrouping()
+{
+ m_ScMW->GroupObj();
+ DoGroup->setEnabled(false);
+ DoUnGroup->setEnabled(true);
+ setMultipleSelection(true);
+}
+
void Mpalette::EditSh2()
{
if (!m_ScMW || m_ScMW->ScriptRunning)