--------------Boundary-00=_0EX15GM3LKH9TQ9939A9 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: quoted-printable Hi everybody! In HEAD and the KOFFICE_1_1_BRANCH_KDE3 branch KSpread's calculator plugi= n is=20 horribly broken! All fonts appear as little boxes, the attached patch fix= es=20 that! In my opinion there is also much unneeded stuff in it which is ok for a=20 standalone application but useless for this plugin, like the font=20 configuration! Who really changes the font in the plugin? So I removed fontdlg.* and made the necessary changes, also included in t= he=20 patch! Comments?=20 Regards, --=20 Sven L=FCppken, sven@kde.org, KDE / KOffice Developer DrBranson@web.de, IRC: slueppken Konquer your Desktop with KDE 3.0! --------------Boundary-00=_0EX15GM3LKH9TQ9939A9 Content-Type: text/x-diff; charset="iso-8859-15"; name="calc.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="calc.patch" Index: Makefile.am =================================================================== RCS file: /home/kde/koffice/kspread/plugins/calculator/Makefile.am,v retrieving revision 1.12 diff -u -3 -p -r1.12 Makefile.am --- Makefile.am 2001/03/22 14:02:17 1.12 +++ Makefile.am 2002/02/24 18:05:53 @@ -5,7 +5,6 @@ kde_module_LTLIBRARIES = libkspreadcalc. libkspreadcalc_la_SOURCES = configdlg.cpp \ dlabel.cpp \ - fontdlg.cpp \ kcalc.cpp \ kcalc_core.cpp \ main.cpp \ Index: kcalc.cpp =================================================================== RCS file: /home/kde/koffice/kspread/plugins/calculator/kcalc.cpp,v retrieving revision 1.8 diff -u -3 -p -r1.8 kcalc.cpp --- kcalc.cpp 2001/07/10 23:16:01 1.8 +++ kcalc.cpp 2002/02/24 18:05:55 @@ -23,7 +23,6 @@ #include "kcalc.h" #include "configdlg.h" -#include "fontdlg.h" #include "version.h" #include #include @@ -80,8 +79,8 @@ QtCalculator :: QtCalculator( Calculator readSettings(); - QFont buttonfont( "-misc-fixed-medium-*-semicondensed-*-13-*-*-*-*-*-*-*" ); - buttonfont.setRawMode( true ); + QFont buttonfont( "Helvetica", 12, QFont::Normal ); + buttonfont.setStyleStrategy( QFont::PreferAntialias ); // Set the window caption/title @@ -109,8 +108,8 @@ QtCalculator :: QtCalculator( Calculator myymargin , displaywidth ,displayheight ); calc_display->setFocus(); calc_display->setFocusPolicy( QWidget::StrongFocus ); + calc_display->setFont( QFont( "Helvetica", 16, QFont::Bold ) ); - connect(calc_display,SIGNAL(clicked()),this,SLOT(display_selected())); statusINVLabel = new QLabel( this, "INV" ); @@ -680,7 +679,6 @@ QtCalculator :: QtCalculator( Calculator set_colors(); - set_display_font(); set_precision(); set_style(); @@ -1579,7 +1577,6 @@ void QtCalculator::configclicked(){ DefStruct newdefstruct; newdefstruct.forecolor = kcalcdefaults.forecolor; newdefstruct.backcolor = kcalcdefaults.backcolor; - newdefstruct.font = kcalcdefaults.font; newdefstruct.precision = kcalcdefaults.precision; newdefstruct.fixedprecision = kcalcdefaults.fixedprecision; newdefstruct.fixed = kcalcdefaults.fixed; @@ -1589,11 +1586,7 @@ void QtCalculator::configclicked(){ ConfigDlg *configdlg; configdlg = new ConfigDlg(tabdialog,"configdlg",&newdefstruct); - FontDlg* fontdlg; - fontdlg = new FontDlg(tabdialog,"fontdlg",&newdefstruct); - tabdialog->addTab(configdlg,i18n("Defaults")); - tabdialog->addTab(fontdlg,i18n("Display Font")); tabdialog->addTab(about,i18n("About")); @@ -1602,7 +1595,6 @@ void QtCalculator::configclicked(){ kcalcdefaults.forecolor = newdefstruct.forecolor; kcalcdefaults.backcolor = newdefstruct.backcolor; - kcalcdefaults.font = newdefstruct.font; kcalcdefaults.precision = newdefstruct.precision; kcalcdefaults.fixedprecision = newdefstruct.fixedprecision; kcalcdefaults.fixed = newdefstruct.fixed; @@ -1611,7 +1603,6 @@ void QtCalculator::configclicked(){ set_colors(); set_precision(); - set_display_font(); set_style(); } @@ -1656,7 +1647,6 @@ void QtCalculator::set_style(){ void QtCalculator::readSettings() { - kcalcdefaults.font = QFont("helvetica",16,QFont::Bold); QColor tmpC(189, 255, 222); QColor blackC(0,0,0); kcalcdefaults.forecolor = blackC; @@ -1673,63 +1663,8 @@ void QtCalculator::readSettings() kcalcdefaults.style = 2; kcalcdefaults.beep = 1; - /* - QString str; - - KConfig *config = kapp->config(); - config->setGroup( "Font" ); - - kcalcdefaults.font = config->readFontEntry("Font", - new QFont("helvetica",16,QFont::Bold)); - - config->setGroup("Colors"); - QColor tmpC(189, 255, 222); - QColor blackC(0,0,0); - - kcalcdefaults.forecolor = config->readColorEntry("ForeColor",&blackC); - kcalcdefaults.backcolor = config->readColorEntry("BackColor",&tmpC); - - config->setGroup("Precision"); - -#ifdef HAVE_LONG_DOUBLE - kcalcdefaults.precision = config->readNumEntry("precision",(int)14); -#else - kcalcdefaults.precision = config->readNumEntry("precision",(int)10); -#endif - - kcalcdefaults.fixedprecision = config->readNumEntry("fixedprecision",(int)2); - kcalcdefaults.fixed = (bool) config->readNumEntry("fixed",(int)0); - - config->setGroup("General"); - kcalcdefaults.style = config->readNumEntry("style",(int)2); - kcalcdefaults.beep = config->readNumEntry("beep",(int)1); - */ } -void QtCalculator::writeSettings() -{ - /* - KConfig *config = kapp->config(); - - config->setGroup( "Font" ); - config->writeEntry("Font",kcalcdefaults.font); - - config->setGroup("Colors"); - config->writeEntry("ForeColor",kcalcdefaults.forecolor); - config->writeEntry("BackColor",kcalcdefaults.backcolor); - - config->setGroup("Precision"); - config->writeEntry("precision", kcalcdefaults.precision); - config->writeEntry("fixedprecision", kcalcdefaults.fixedprecision); - config->writeEntry("fixed", (int)kcalcdefaults.fixed); - - config->setGroup("General"); - config->writeEntry("style",(int)kcalcdefaults.style); - config->writeEntry("beep",(int)kcalcdefaults.beep); - config->sync(); */ - -} - void QtCalculator::display_selected(){ if(calc_display->Button() == LeftButton){ @@ -1813,13 +1748,6 @@ void QtCalculator::closeEvent( QCloseEve e->accept(); } -void QtCalculator::quitCalc(){ - - writeSettings(); - /* qApp->quit(); */ - -} - void QtCalculator::set_colors(){ @@ -1846,12 +1774,6 @@ void QtCalculator::set_colors(){ void QtCalculator::set_precision(){ UpdateDisplay(); -} - -void QtCalculator::set_display_font(){ - - calc_display->setFont(kcalcdefaults.font); - } void QtCalculator::temp_stack_next(){ Index: kcalc.h =================================================================== RCS file: /home/kde/koffice/kspread/plugins/calculator/kcalc.h,v retrieving revision 1.3 diff -u -3 -p -r1.3 kcalc.h --- kcalc.h 2000/09/19 21:57:07 1.3 +++ kcalc.h 2002/02/24 18:05:55 @@ -187,7 +187,6 @@ typedef struct _DefStruct{ int style; bool fixed; bool beep; - QFont font; }DefStruct; class Calculator; @@ -203,11 +202,9 @@ public: void keyPressEvent( QKeyEvent *e ); void keyReleaseEvent( QKeyEvent *e ); - void closeEvent( QCloseEvent *e ); - void writeSettings(); + void closeEvent( QCloseEvent *e ); void readSettings(); void set_precision(); - void set_display_font(); void set_style(); void temp_stack_next(); void temp_stack_prev(); @@ -233,7 +230,6 @@ public slots: void set_colors(); void display_selected(); void invertColors(); - void quitCalc(); void selection_timed_out(); void clear_buttons(); void clear_status_label(); --------------Boundary-00=_0EX15GM3LKH9TQ9939A9-- _______________________________________________ koffice-devel mailing list koffice-devel@mail.kde.org http://mail.kde.org/mailman/listinfo/koffice-devel