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

List:       koffice-devel
Subject:    Patch for KSpread, KWord (change TK icon color)
From:       Toshitaka Fujioka <toshitaka () kde ! gr ! jp>
Date:       2001-07-23 12:11:44
[Download RAW message or body]

Hello,

These patches let "TK... icon" reflect current "Text Color", "Background
Color". 

There isn't "Border Color". Because cell or paragraph may include four
different color.

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-kspread-bugfix-reflectColorInToolBar-20010723.diff" (text/x-diff)]

? koffice-kspread-bugfix-reflectColorInToolBar-20010723.diff
Index: kspread_view.cc
===================================================================
RCS file: /home/kde/koffice/kspread/kspread_view.cc,v
retrieving revision 1.432
diff -u -3 -d -p -r1.432 kspread_view.cc
--- kspread_view.cc	2001/07/14 11:11:20	1.432
+++ kspread_view.cc	2001/07/23 10:39:47
@@ -639,6 +639,9 @@ void KSpreadView::updateEditWidget()
     else
         editWidget()->setText( cell->text() );
 
+    m_textColor->setCurrentColor( cell->textColor( m_pCanvas->markerColumn(), \
m_pCanvas->markerRow() ) ); +    m_bgColor->setCurrentColor( cell->bgColor( \
m_pCanvas->markerColumn(), m_pCanvas->markerRow() ) ); +
     m_selectFontSize->setFontSize( cell->textFontSize( m_pCanvas->markerColumn(), \
                m_pCanvas->markerRow() ) );
     m_selectFont->setFont( cell->textFontFamily( m_pCanvas->markerColumn(), \
                m_pCanvas->markerRow() ) );
     m_bold->setChecked( cell->textFontBold( m_pCanvas->markerColumn(), \
m_pCanvas->markerRow() ) );


["koffice-kword-bugfix-reflectColorInToolBar-20010723.diff" (text/x-diff)]

? koffice-kword-bugfix-reflectColorInToolBar-20010723.diff
Index: kwcanvas.cc
===================================================================
RCS file: /home/kde/koffice/kword/kwcanvas.cc,v
retrieving revision 1.269
diff -u -3 -d -p -r1.269 kwcanvas.cc
--- kwcanvas.cc	2001/07/19 09:38:15	1.269
+++ kwcanvas.cc	2001/07/23 10:39:56
@@ -1574,6 +1574,18 @@ void KWCanvas::setFrameBackgroundColor( 
     }
 }
 
+QColor KWCanvas::getFrameBackgroundColor()
+{
+    QList <KWFrame> selectedFrames = m_doc->getSelectedFrames();
+    if (selectedFrames.count() == 0)
+        return;
+    KWFrame *frame=0L;
+    for(frame=selectedFrames.first(); frame != 0; frame=selectedFrames.next() )
+    {
+        frame=KWFrameSet::settingsFrame(frame);
+        return frame->getBackgroundColor().color();
+    }
+}
 
 void KWCanvas::editFrameProperties()
 {
Index: kwcanvas.h
===================================================================
RCS file: /home/kde/koffice/kword/kwcanvas.h,v
retrieving revision 1.79
diff -u -3 -d -p -r1.79 kwcanvas.h
--- kwcanvas.h	2001/07/13 12:01:20	1.79
+++ kwcanvas.h	2001/07/23 10:39:59
@@ -90,6 +90,7 @@ public:
     void setOutlineFrameBorder( Border _frmBrd, bool _b );
 
     void setFrameBackgroundColor( const QBrush &backColor );
+    QColor getFrameBackgroundColor();
 
     void editFrameProperties();
     void copySelectedFrames();
Index: kwview.cc
===================================================================
RCS file: /home/kde/koffice/kword/kwview.cc,v
retrieving revision 1.351
diff -u -3 -d -p -r1.351 kwview.cc
--- kwview.cc	2001/07/21 08:22:36	1.351
+++ kwview.cc	2001/07/23 10:41:29
@@ -3286,6 +3286,8 @@ void KWView::frameSelectedChanged()
         }
     }
     actionBackgroundColor->setEnabled( frameDifferentOfPart );
+    if ( frameDifferentOfPart )
+        actionBackgroundColor->setCurrentColor( m_gui->canvasWidget()->getFrameBackgroundColor() );
 
     actionEditCopy->setEnabled( nbFrame >= 1 );
 

_______________________________________________
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]