[prev in list] [next in list] [prev in thread] [next in thread]
List: koffice-devel
Subject: Patch: New actions for kpresenter
From: Peter Simonsson <peter.simonsson () gmail ! com>
Date: 2005-08-04 17:41:06
Message-ID: 9966b304050804104161613787 () mail ! gmail ! com
[Download RAW message or body]
Hi!
This patch will make kpresenter use the same actions as kivio for pen
width and style. If none have any objections I'll commit the patch on
saturday (or earlier if told so).
--=20
LLaP
Peter Simonsson
["kpresenter.diff" (text/plain)]
Index: kpresenter_doc.h
===================================================================
--- kpresenter_doc.h (revision 442900)
+++ kpresenter_doc.h (arbetskopia)
@@ -536,6 +536,7 @@
void sig_updateRuler();
void sig_terminateEditing( KPTextObject * );
void sig_updateMenuBar();
+ void unitChanged(KoUnit::Unit);
protected slots:
void slotDocumentRestored();
Index: KPresenterViewIface.cc
===================================================================
--- KPresenterViewIface.cc (revision 442900)
+++ KPresenterViewIface.cc (arbetskopia)
@@ -286,12 +286,14 @@
void KPresenterViewIface::extraPenStyle()
{
- view->extraPenStyle();
+// FIXME
+// view->extraPenStyle();
}
void KPresenterViewIface::extraPenWidth()
{
- view->extraPenWidth();
+// FIXME
+// view->extraPenWidth();
}
void KPresenterViewIface::screenTransEffect()
Index: kpresenter_view.h
===================================================================
--- kpresenter_view.h (revision 442900)
+++ kpresenter_view.h (arbetskopia)
@@ -64,6 +64,8 @@
class KoPartSelectAction;
class KoPicture;
class KoParagStyle;
+class KoLineStyleAction;
+class KoLineWidthAction;
class KoCharSelectDia;
class KoTextFormat;
@@ -260,8 +262,8 @@
void extraDefaultTemplate();
void extraGroup();
void extraUnGroup();
- void extraPenStyle();
- void extraPenWidth();
+ void extraPenStyle( int newStyle );
+ void extraPenWidth( double newWidth );
void configureCompletion();
@@ -693,24 +695,7 @@
void extraLineEndDoubleLineArrow();
void setExtraLineEnd(LineEnd le);
- void extraPenStyleSolid();
- void extraPenStyleDash();
- void extraPenStyleDot();
- void extraPenStyleDashDot();
- void extraPenStyleDashDotDot();
- void extraPenStyleNoPen();
void setExtraPenStyle( Qt::PenStyle style );
-
- void extraPenWidth1();
- void extraPenWidth2();
- void extraPenWidth3();
- void extraPenWidth4();
- void extraPenWidth5();
- void extraPenWidth6();
- void extraPenWidth7();
- void extraPenWidth8();
- void extraPenWidth9();
- void extraPenWidth10();
void setExtraPenWidth( unsigned int width );
/**
@@ -829,7 +814,7 @@
bool m_screenSaverWasEnabled;
// right button popup menus
- QPopupMenu *rb_oalign, *rb_lbegin, *rb_lend, *rb_pstyle, *rb_pwidth;
+ QPopupMenu *rb_oalign, *rb_lbegin, *rb_lend;
QPopupMenu *m_arrangeObjectsPopup;
QPtrList<KAction> m_actionList; // for the kodatatools
QPtrList<KAction> m_variableActionList;
@@ -1007,8 +992,8 @@
KAction *actionExtraLineEnd;
KAction *actionExtraGroup;
KAction *actionExtraUnGroup;
- KAction *actionExtraPenStyle;
- KAction *actionExtraPenWidth;
+ KoLineStyleAction *actionExtraPenStyle;
+ KoLineWidthAction *actionExtraPenWidth;
KAction *actionScreenConfigPages;
KAction *actionScreenAssignEffect;
Index: kpresenter_view.cc
===================================================================
--- kpresenter_view.cc (revision 442900)
+++ kpresenter_view.cc (arbetskopia)
@@ -98,6 +98,8 @@
#include <qcombobox.h>
#include <koPartSelectAction.h>
#include <kozoomhandler.h>
+#include <kolinestyleaction.h>
+#include <kolinewidthaction.h>
#include <stdlib.h>
#include <signal.h>
@@ -396,8 +398,6 @@
delete pgConfDia;
delete rotateDia;
delete shadowDia;
- delete rb_pstyle;
- delete rb_pwidth;
delete afChoose;
delete m_fontDlg;
delete m_paragDlg;
@@ -1359,18 +1359,16 @@
objectSelectedChanged();
}
-void KPresenterView::extraPenStyle()
+void KPresenterView::extraPenStyle( int newStyle )
{
m_canvas->setToolEditMode( TEM_MOUSE );
- QPoint pnt( QCursor::pos() );
- rb_pstyle->popup( pnt );
+ setExtraPenStyle(static_cast<Qt::PenStyle>(newStyle));
}
-void KPresenterView::extraPenWidth()
+void KPresenterView::extraPenWidth( double newWidth )
{
m_canvas->setToolEditMode( TEM_MOUSE );
- QPoint pnt( QCursor::pos() );
- rb_pwidth->popup( pnt );
+ setExtraPenWidth( qRound( newWidth ) );
}
void KPresenterView::screenConfigPages()
@@ -2010,36 +2008,6 @@
lineEnd = le;
}
-void KPresenterView::extraPenStyleSolid()
-{
- setExtraPenStyle( Qt::SolidLine );
-}
-
-void KPresenterView::extraPenStyleDash()
-{
- setExtraPenStyle( Qt::DashLine );
-}
-
-void KPresenterView::extraPenStyleDot()
-{
- setExtraPenStyle( Qt::DotLine );
-}
-
-void KPresenterView::extraPenStyleDashDot()
-{
- setExtraPenStyle( Qt::DashDotLine );
-}
-
-void KPresenterView::extraPenStyleDashDotDot()
-{
- setExtraPenStyle( Qt::DashDotDotLine );
-}
-
-void KPresenterView::extraPenStyleNoPen()
-{
- setExtraPenStyle( Qt::NoPen );
-}
-
void KPresenterView::setExtraPenStyle( Qt::PenStyle style )
{
KCommand * cmd( getPenCmd( i18n("Change Outline Style"), QPen(style),
@@ -2051,56 +2019,6 @@
pen.setStyle( style );
}
-void KPresenterView::extraPenWidth1()
-{
- setExtraPenWidth( 1 );
-}
-
-void KPresenterView::extraPenWidth2()
-{
- setExtraPenWidth( 2 );
-}
-
-void KPresenterView::extraPenWidth3()
-{
- setExtraPenWidth( 3 );
-}
-
-void KPresenterView::extraPenWidth4()
-{
- setExtraPenWidth( 4 );
-}
-
-void KPresenterView::extraPenWidth5()
-{
- setExtraPenWidth( 5 );
-}
-
-void KPresenterView::extraPenWidth6()
-{
- setExtraPenWidth( 6 );
-}
-
-void KPresenterView::extraPenWidth7()
-{
- setExtraPenWidth( 7 );
-}
-
-void KPresenterView::extraPenWidth8()
-{
- setExtraPenWidth( 8 );
-}
-
-void KPresenterView::extraPenWidth9()
-{
- setExtraPenWidth( 9 );
-}
-
-void KPresenterView::extraPenWidth10()
-{
- setExtraPenWidth( 10 );
-}
-
void KPresenterView::setExtraPenWidth( unsigned int width )
{
QPen tmpPen;
@@ -2707,13 +2625,18 @@
this, SLOT( extraLineEnd() ),
actionCollection(), "extra_lineend" );
- actionExtraPenStyle = new KAction( i18n("Outline Style"), "pen_style", 0,
- this, SLOT( extraPenStyle() ),
+ actionExtraPenStyle = new KoLineStyleAction( i18n("Outline Style"), "pen_style",
+ this, SLOT( extraPenStyle(int) ),
actionCollection(), "extra_penstyle" );
+ actionExtraPenStyle->setShowCurrentSelection(false);
- actionExtraPenWidth = new KAction( i18n("Outline Width"), "pen_width", 0,
- this, SLOT( extraPenWidth() ),
+ actionExtraPenWidth = new KoLineWidthAction( i18n("Outline Width"), "pen_width",
+ this, SLOT( extraPenWidth(double) ),
actionCollection(), "extra_penwidth" );
+ actionExtraPenWidth->setUnit( kPresenterDoc()->getUnit() );
+ actionExtraPenWidth->setShowCurrentSelection(false);
+ connect( kPresenterDoc(), SIGNAL( unitChanged( KoUnit::Unit ) ),
+ actionExtraPenWidth, SLOT( setUnit( KoUnit::Unit ) ) );
actionExtraGroup = new KAction( i18n( "&Group Objects" ), "group", 0,
this, SLOT( extraGroup() ),
@@ -3676,48 +3599,6 @@
rb_lend->setMouseTracking( true );
rb_lend->setCheckable( false );
- // create right button pen style
- rb_pstyle = new QPopupMenu();
- Q_CHECK_PTR( rb_pstyle );
- rb_pstyle->insertItem( KPBarIcon( "pen_style_solid" ), this, SLOT( \
extraPenStyleSolid() ) );
- rb_pstyle->insertSeparator();
- rb_pstyle->insertItem( KPBarIcon( "pen_style_dash" ), this, SLOT( \
extraPenStyleDash() ) );
- rb_pstyle->insertSeparator();
- rb_pstyle->insertItem( KPBarIcon( "pen_style_dot" ), this, SLOT( \
extraPenStyleDot() ) );
- rb_pstyle->insertSeparator();
- rb_pstyle->insertItem( KPBarIcon( "pen_style_dashdot" ), this, SLOT( \
extraPenStyleDashDot() ) );
- rb_pstyle->insertSeparator();
- rb_pstyle->insertItem( KPBarIcon( "pen_style_dashdotdot" ), this, SLOT( \
extraPenStyleDashDotDot() ) );
- rb_pstyle->insertSeparator();
- rb_pstyle->insertItem( KPBarIcon( "pen_style_nopen" ), this, SLOT( \
extraPenStyleNoPen() ) );
- rb_pstyle->setMouseTracking( true );
- rb_pstyle->setCheckable( false );
-
- // create right button pen width
- rb_pwidth = new QPopupMenu();
- Q_CHECK_PTR( rb_pwidth );
- rb_pwidth->insertItem( KPBarIcon( "pen_width1" ), this, SLOT( extraPenWidth1() ) \
);
- rb_pwidth->insertSeparator();
- rb_pwidth->insertItem( KPBarIcon( "pen_width2" ), this, SLOT( extraPenWidth2() ) \
);
- rb_pwidth->insertSeparator();
- rb_pwidth->insertItem( KPBarIcon( "pen_width3" ), this, SLOT( extraPenWidth3() ) \
);
- rb_pwidth->insertSeparator();
- rb_pwidth->insertItem( KPBarIcon( "pen_width4" ), this, SLOT( extraPenWidth4() ) \
);
- rb_pwidth->insertSeparator();
- rb_pwidth->insertItem( KPBarIcon( "pen_width5" ), this, SLOT( extraPenWidth5() ) \
);
- rb_pwidth->insertSeparator();
- rb_pwidth->insertItem( KPBarIcon( "pen_width6" ), this, SLOT( extraPenWidth6() ) \
);
- rb_pwidth->insertSeparator();
- rb_pwidth->insertItem( KPBarIcon( "pen_width7" ), this, SLOT( extraPenWidth7() ) \
);
- rb_pwidth->insertSeparator();
- rb_pwidth->insertItem( KPBarIcon( "pen_width8" ), this, SLOT( extraPenWidth8() ) \
);
- rb_pwidth->insertSeparator();
- rb_pwidth->insertItem( KPBarIcon( "pen_width9" ), this, SLOT( extraPenWidth9() ) \
);
- rb_pwidth->insertSeparator();
- rb_pwidth->insertItem( KPBarIcon( "pen_width10" ), this, SLOT( extraPenWidth10() \
) );
- rb_pwidth->setMouseTracking( true );
- rb_pwidth->setCheckable( false );
-
// create arrange-objects popup
m_arrangeObjectsPopup = new QPopupMenu();
Q_CHECK_PTR(m_arrangeObjectsPopup);
Index: kpresenter_doc.cc
===================================================================
--- kpresenter_doc.cc (revision 442900)
+++ kpresenter_doc.cc (arbetskopia)
@@ -309,6 +309,11 @@
void KPresenterDoc::setUnit( KoUnit::Unit _unit )
{
+ if( m_unit == _unit )
+ {
+ return;
+ }
+
m_unit = _unit;
QPtrListIterator<KoView> it( views() );
@@ -316,6 +321,8 @@
((KPresenterView*)it.current())->getHRuler()->setUnit( m_unit );
((KPresenterView*)it.current())->getVRuler()->setUnit( m_unit );
}
+
+ emit unitChanged( m_unit );
}
void KPresenterDoc::saveConfig()
_______________________________________________
koffice-devel mailing list
koffice-devel@kde.org
https://mail.kde.org/mailman/listinfo/koffice-devel
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic