[prev in list] [next in list] [prev in thread] [next in thread]
List: koffice-devel
Subject: Bug fix Patch for KPresenter
From: Toshitaka Fujioka <toshitaka () kde ! gr ! jp>
Date: 2001-07-19 13:03:16
[Download RAW message or body]
Hello,
The attached patch fixes a bug.
koffice-kpresenter-bugfix-initializationOfVariable-20010719.diff:
Variable ("Infinite Loop", "Manual switch to next step",
"Speed of the presentation") fixes a bug changed in value of default
when I inserted a new page.
koffice-kpresenter-bugfix-reflectColorInToolBar-20010719.diff:
I let "TK... icon" reflect current Text Color, Pen Color and Brush Color.
koffice-kpresenter-bugfix-screenPresentation-20010719.diff:
I fix the bug that the right and left button of mouse does not work
with Screen Presentation (besides first page).
Please review.
--
Toshitaka Fujioka
http://www.kde.org The K Desktop Environment Project
fujioka@kde.org
http://www.kde.gr.jp Japan KDE User's Group
toshitaka@kde.gr.jp
-- We offer the best Desktop Environment to you. (This is my goal. ;-)) --
["koffice-kpresenter-bugfix-initializationOfVariable-20010719.diff" (text/x-diff)]
diff -ur koffice.orig/kpresenter/kpresenter_doc.cc koffice/kpresenter/kpresenter_doc.cc
--- koffice.orig/kpresenter/kpresenter_doc.cc Thu Jul 19 20:03:53 2001
+++ koffice/kpresenter/kpresenter_doc.cc Thu Jul 19 20:48:56 2001
@@ -2997,6 +2997,9 @@
QColor tmp_txtBackCol = _txtBackCol;
unsigned int tmp_RastX = _rastX;
unsigned int tmp_RastY = _rastY;
+ bool tmp_spInfinitLoop = _spInfinitLoop;
+ bool tmp_spManualSwitch = _spManualSwitch;
+ PresSpeed tmp_presSpeed = presSpeed;
loadNativeFormat( fileName );
objStartY = 0;
@@ -3004,6 +3007,9 @@
_txtBackCol = tmp_txtBackCol;
_rastX = tmp_RastX;
_rastY = tmp_RastY;
+ _spInfinitLoop = tmp_spInfinitLoop;
+ _spManualSwitch = tmp_spManualSwitch;
+ presSpeed = tmp_presSpeed;
_clean = true;
setModified(true);
["koffice-kpresenter-bugfix-reflectColorInToolBar-20010719.diff" (text/x-diff)]
diff -ur koffice.orig/kpresenter/kpresenter_view.cc koffice/kpresenter/kpresenter_view.cc
--- koffice.orig/kpresenter/kpresenter_view.cc Thu Jul 19 20:03:54 2001
+++ koffice/kpresenter/kpresenter_view.cc Thu Jul 19 20:52:13 2001
@@ -1803,6 +1803,8 @@
page = new Page( pageBase, "Page", ( KPresenterView* )this );
QObject::connect( page, SIGNAL( fontChanged( const QFont & ) ),
this, SLOT( fontChanged( const QFont & ) ) );
+ QObject::connect( page, SIGNAL( colorChanged( const QColor & ) ),
+ this, SLOT( colorChanged( const QColor & ) ) );
QObject::connect( page, SIGNAL( alignChanged( int ) ),
this, SLOT( alignChanged( int ) ) );
QObject::connect( page, SIGNAL( updateSideBarItem( int ) ),
@@ -2609,6 +2611,14 @@
( (KToggleAction*) actionTextUnderline )->blockSignals( false );
}
+/*====================== color changed ==========================*/
+void KPresenterView::colorChanged( const QColor &color )
+{
+ tbColor.setRgb( color.rgb() );
+ actionTextColor->setEnabled( true );
+ actionTextColor->setCurrentColor( tbColor );
+}
+
/*====================== align changed ==========================*/
void KPresenterView::alignChanged( int align )
{
@@ -3395,6 +3405,18 @@
void KPresenterView::chPic()
{
page->chPic();
+}
+
+void KPresenterView::penColorChanged( const QPen & _pen )
+{
+ actionPenColor->setEnabled( true );
+ actionPenColor->setCurrentColor( _pen.color() );
+}
+
+void KPresenterView::brushColorChanged( const QBrush _brush )
+{
+ actionBrushColor->setEnabled( true );
+ actionBrushColor->setCurrentColor( _brush.color() );
}
#include <kpresenter_view.moc>
diff -ur koffice.orig/kpresenter/kpresenter_view.h koffice/kpresenter/kpresenter_view.h
--- koffice.orig/kpresenter/kpresenter_view.h Thu Jul 19 20:03:54 2001
+++ koffice/kpresenter/kpresenter_view.h Thu Jul 19 20:53:03 2001
@@ -331,6 +331,9 @@
void openPopupMenuSideBar(const QPoint & _point);
void openPopupMenuPicObject(const QPoint & _point);
+ void penColorChanged( const QPen & _pen );
+ void brushColorChanged( const QBrush _brush );
+
protected slots:
// dialog slots
void backOk( bool );
@@ -351,6 +354,7 @@
// textobject
void fontChanged( const QFont & );
+ void colorChanged( const QColor &color );
void alignChanged( int );
void extraLineBeginNormal();
diff -ur koffice.orig/kpresenter/page.cc koffice/kpresenter/page.cc
--- koffice.orig/kpresenter/page.cc Thu Jul 19 20:03:54 2001
+++ koffice/kpresenter/page.cc Thu Jul 19 20:56:14 2001
@@ -903,6 +903,9 @@
p.end();
mouseSelectedObject = true;
+
+ view->penColorChanged( QPen( Qt::black, 1, Qt::SolidLine ) );
+ view->brushColorChanged( QBrush( Qt::black, Qt::SolidPattern ) );
} break;
case INS_ELLIPSE: {
QPainter p( this );
@@ -917,6 +920,9 @@
p.end();
mouseSelectedObject = true;
+
+ view->penColorChanged( QPen( Qt::black, 1, Qt::SolidLine ) );
+ view->brushColorChanged( QBrush( Qt::white, Qt::SolidPattern ) );
} break;
case INS_RECT: {
QPainter p( this );
@@ -931,6 +937,9 @@
p.end();
mouseSelectedObject = true;
+
+ view->penColorChanged( QPen( Qt::black, 1, Qt::SolidLine ) );
+ view->brushColorChanged( QBrush( Qt::white, Qt::SolidPattern ) );
} break;
case INS_LINE: {
QPainter p( this );
@@ -945,6 +954,9 @@
p.end();
mouseSelectedObject = true;
+
+ view->penColorChanged( QPen( Qt::black, 1, Qt::SolidLine ) );
+ view->brushColorChanged( QBrush( Qt::white, Qt::SolidPattern ) );
} break;
case INS_PIE: {
QPainter p( this );
@@ -988,6 +1000,9 @@
p.end();
mouseSelectedObject = true;
+
+ view->penColorChanged( QPen( Qt::black, 1, Qt::SolidLine ) );
+ view->brushColorChanged( QBrush( Qt::white, Qt::SolidPattern ) );
} break;
}
}
@@ -1231,6 +1246,10 @@
toColorChanged( c );
toAlignChanged( kptextobject->getKTextObject()->alignment() );
}
+
+ view->penColorChanged( view->kPresenterDoc()->getPen( QPen( Qt::black, 1, Qt::SolidLine ) ) );
+ view->brushColorChanged( view->kPresenterDoc()->getBrush( QBrush( Qt::white, Qt::SolidPattern ) ) );
+
_repaint( kpobject );
emit objectSelectedChanged();
["koffice-kpresenter-bugfix-screenPresentation-20010719.diff" (text/x-diff)]
diff -ur koffice.orig/kpresenter/page.cc koffice/kpresenter/page.cc
--- koffice.orig/kpresenter/page.cc Thu Jul 19 20:03:54 2001
+++ koffice/kpresenter/page.cc Thu Jul 19 20:47:11 2001
@@ -289,8 +289,10 @@
return;
//disallow selecting objects outside the "page"
- if ( !view->kPresenterDoc()->getPageRect( view->getCurrPgNum()-1, \
view->getDiffX(), view->getDiffY(), _presFakt ).contains(e->pos()))
- return;
+ if ( editMode ) {
+ if ( !view->kPresenterDoc()->getPageRect( view->getCurrPgNum()-1, \
view->getDiffX(), view->getDiffY(), _presFakt ).contains(e->pos())) + \
return; + }
if ( e->state() & ControlButton )
keepRatio = true;
_______________________________________________
Koffice-devel mailing list
Koffice-devel@master.kde.org
http://master.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