[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kmail-devel
Subject:    Re: [PATCH] button for resetting fontsettings in html-composing
From:       Edwin Schepers <yez () home ! nl>
Date:       2004-04-19 21:54:09
Message-ID: 200404192354.09965.yez () home ! nl
[Download RAW message or body]

On Monday 19 April 2004 00:04 am, Ingo Klöcker wrote:
> Please add diff -u3 -p
> to your ~/.cvsrc file and then recreate and resend the diff.
Of course, hereby...
It also solves an issue that font-dropdownbox and buttons are not set when 
selecting the html-toolbar.

Regards,
Edwin

["kmail.diff" (text/x-diff)]

? kmail/subscriptiondialog.loT
Index: kmail/kmcomposerui.rc
===================================================================
RCS file: /home/kde/kdepim/kmail/kmcomposerui.rc,v
retrieving revision 1.31
diff -u -3 -p -r1.31 kmcomposerui.rc
--- kmail/kmcomposerui.rc	28 Mar 2004 20:54:59 -0000	1.31
+++ kmail/kmcomposerui.rc	19 Apr 2004 21:48:44 -0000
@@ -1,4 +1,4 @@
-<!DOCTYPE kpartgui ><kpartgui version="19" name="kmcomposer" >
+<!DOCTYPE kpartgui ><kpartgui version="20" name="kmcomposer" >
  <MenuBar>
   <Menu noMerge="1" name="file" >
    <text>&amp;Message</text>
@@ -93,6 +93,7 @@
   <Action name="text_list" />
   <Action name="text_font" />
   <Action name="text_size" />
+  <Action name="format_reset" />
   <Action name="text_bold" />
   <Action name="text_italic" />
   <Action name="text_under" />
Index: kmail/kmcomposewin.cpp
===================================================================
RCS file: /home/kde/kdepim/kmail/kmcomposewin.cpp,v
retrieving revision 1.812
diff -u -3 -p -r1.812 kmcomposewin.cpp
--- kmail/kmcomposewin.cpp	19 Apr 2004 12:10:54 -0000	1.812
+++ kmail/kmcomposewin.cpp	19 Apr 2004 21:48:51 -0000
@@ -1166,8 +1166,11 @@ void KMComposeWin::setupActions(void)
                                        this, SLOT(slotTextItalic()),
                                        actionCollection(), "text_italic");
   textUnderAction = new KToggleAction (i18n("&Under"), "text_under", 0,
-                                      this, SLOT(slotTextUnder()),
-                                      actionCollection(), "text_under");
+                                     this, SLOT(slotTextUnder()),
+                                     actionCollection(), "text_under");
+  actionFormatReset = new KAction( i18n( "Reset current fontsettings" ), "eraser", 0,
+                                     this, SLOT( slotFormatReset() ),
+                                     actionCollection(), "format_reset");
   actionFormatColor = new KAction( i18n( "Text Color..." ), "colorize", 0,
                                      this, SLOT( slotTextColor() ),
                                      actionCollection(), "format_color");
@@ -3109,6 +3112,9 @@ void KMComposeWin::slotToggleMarkup()
  if ( markupAction->isChecked() ) {
    toolBar("htmlToolBar")->show();
    // markup will be toggled as soon as markup is actually used
+   fontAction->setFont( mEditor->currentFont().family() );
+   fontChanged( mEditor->currentFont().family() ); // set buttons in correct position
+   mSaveFont = mEditor->currentFont();
  }
  else
    toggleMarkup(false);
@@ -3503,9 +3509,15 @@ void KMComposeWin::slotTextUnder()
     mEditor->QTextEdit::setUnderline( textUnderAction->isChecked() );
 }
 
+void KMComposeWin::slotFormatReset()
+{
+  mEditor->setColor(QColor(0,0,0));
+  mEditor->setCurrentFont( mSaveFont ); // fontChanged is called now
+}
 void KMComposeWin::slotTextColor()
 {
   QColor color = mEditor->color();
+
   if ( KColorDialog::getColor( color ) ) {
     toggleMarkup(true);
     mEditor->setColor( color );
@@ -3516,6 +3528,11 @@ void KMComposeWin::fontChanged( const QF
 {
   QFontDatabase *fontdb = new QFontDatabase();
 
+   //QStringList styles = QStringList(fontdb->styles(f.family()));
+   //for ( QStringList::Iterator it = styles.begin(); it != styles.end(); ++it ) {
+   //  kdDebug(5006) << "style : '" << *it << "'" << endl;
+   //}
+
   if ( fontdb->bold(f.family(), "Bold") ) {
     textBoldAction->setChecked( f.bold() );
     textBoldAction->setEnabled(true);
Index: kmail/kmcomposewin.h
===================================================================
RCS file: /home/kde/kdepim/kmail/kmcomposewin.h,v
retrieving revision 1.240
diff -u -3 -p -r1.240 kmcomposewin.h
--- kmail/kmcomposewin.h	8 Apr 2004 17:15:24 -0000	1.240
+++ kmail/kmcomposewin.h	19 Apr 2004 21:48:51 -0000
@@ -547,6 +547,7 @@ public slots:
   void slotTextBold();
   void slotTextItalic();
   void slotTextUnder();
+  void slotFormatReset();
   void slotTextColor();
   void fontChanged( const QFont & );
   void alignmentChanged( int );
@@ -773,7 +774,7 @@ protected:
   KToggleAction *alignLeftAction, *alignCenterAction, *alignRightAction;
   KToggleAction *textBoldAction, *textItalicAction, *textUnderAction;
   KToggleAction *plainTextAction, *markupAction;
-  KAction *actionFormatColor;
+  KAction *actionFormatColor, *actionFormatReset;
   KAction *mHtmlToolbar;
 
   KSelectAction *mEncodingAction;
@@ -807,6 +808,7 @@ private slots:
 
 private:
   QColor mForeColor,mBackColor;
+  QFont mSaveFont;
   struct atmLoadData
   {
     KURL url;


_______________________________________________
KMail developers mailing list
KMail-devel@kde.org
https://mail.kde.org/mailman/listinfo/kmail-devel


[prev in list] [next in list] [prev in thread] [next in thread]