diff options
Diffstat (limited to 'kspread/dialogs/kspread_dlg_layout.cc')
-rw-r--r-- | kspread/dialogs/kspread_dlg_layout.cc | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc index 53942457..27e27868 100644 --- a/kspread/dialogs/kspread_dlg_layout.cc +++ b/kspread/dialogs/kspread_dlg_layout.cc @@ -78,7 +78,7 @@ PatternSelect::PatternSelect( TQWidget *parent, const char * ) { penStyle = Qt::NoPen; penWidth = 1; - penColor = tqcolorGroup().text(); + penColor = colorGroup().text(); selected = false; undefined = false; } @@ -160,7 +160,7 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) groupBox->tqlayout()->setMargin( KDialog::marginHint() ); TQGridLayout * groupBoxLayout = new TQGridLayout( groupBox->tqlayout() ); - groupBoxLayout->tqsetAlignment( TQt::AlignTop ); + groupBoxLayout->setAlignment( TQt::AlignTop ); TQLabel * label1 = new TQLabel( groupBox, "label1" ); label1->setText( i18n( "Name:" ) ); @@ -207,7 +207,7 @@ GeneralTab::GeneralTab( TQWidget* parent, CellFormatDialog * dlg ) m_parentBox->setEnabled( false ); } - resize( TQSize( 534, 447 ).expandedTo(tqminimumSizeHint()) ); + resize( TQSize( 534, 447 ).expandedTo(minimumSizeHint()) ); } GeneralTab::~GeneralTab() @@ -886,12 +886,12 @@ void CellFormatDialog::initParameters(Format *obj,int x,int y) void CellFormatDialog::init() { - TQColorGroup tqcolorGroup = TQApplication::tqpalette().active(); + TQColorGroup colorGroup = TQApplication::tqpalette().active(); // Did we initialize the bitmaps ? if ( formatOnlyNegSignedPixmap == 0L ) { - TQColor black = tqcolorGroup.text(); // not necessarily black :) + TQColor black = colorGroup.text(); // not necessarily black :) formatOnlyNegSignedPixmap = paintFormatPixmap( "123.456", black, "-123.456", black ); formatRedOnlyNegSignedPixmap = paintFormatPixmap( "123.456", black, "-123.456", TQt::red ); formatRedNeverSignedPixmap = paintFormatPixmap( "123.456", black, "123.456", TQt::red ); @@ -1465,8 +1465,8 @@ void CellFormatPageFloat::init() TQString tmp; TQString tmp2; TQDate tmpDate( 2000,2,18); - list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), true); - list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::tqcurrentDate(), false); + list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::currentDate(), true); + list+=i18n("System: ")+dlg->locale()->formatDate (TQDate::currentDate(), false); ValueFormatter *fmt = dlg->getDoc()->formatter(); @@ -2164,10 +2164,10 @@ void CellFormatPageFont::setCombos() if ( dlg->bTextColor ) textColor = dlg->textColor; else - textColor = tqcolorGroup().text(); + textColor = colorGroup().text(); if ( !textColor.isValid() ) - textColor =tqcolorGroup().text(); + textColor =colorGroup().text(); textColorButton->setColor( textColor ); @@ -2533,7 +2533,7 @@ BorderButton::BorderButton( TQWidget *parent, const char *_name ) : TQPushButton { penStyle = Qt::NoPen; penWidth = 1; - penColor = tqcolorGroup().text(); + penColor = colorGroup().text(); setToggleButton( true ); setOn( false); setChanged(false); @@ -2549,7 +2549,7 @@ void BorderButton::setUndefined() { setPenStyle(Qt::SolidLine ); setPenWidth(1); - setColor(tqcolorGroup().midlight()); + setColor(colorGroup().midlight()); } @@ -2558,7 +2558,7 @@ void BorderButton::unselect() setOn(false); setPenWidth(1); setPenStyle(Qt::NoPen); - setColor( tqcolorGroup().text() ); + setColor( colorGroup().text() ); setChanged(true); } @@ -2586,7 +2586,7 @@ void Border::paintEvent( TQPaintEvent *_ev ) TQPen pen; TQPainter painter; painter.begin( this ); - pen=TQPen( tqcolorGroup().midlight(),2,SolidLine); + pen=TQPen( colorGroup().midlight(),2,SolidLine); painter.setPen( pen ); painter.drawLine( OFFSETX-5, OFFSETY, OFFSETX , OFFSETY ); @@ -2682,14 +2682,14 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox( this, "GroupBox_1" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Border") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,6,5,KDialog::marginHint(), KDialog::spacingHint()); int fHeight = tmpTQGroupBox->fontMetrics().height(); grid2->addRowSpacing( 0, fHeight/2 ); // groupbox title area=new Border(tmpTQGroupBox,"area",dlg->oneCol,dlg->oneRow); grid2->addMultiCellWidget(area,2,4,1,3); - area->setBackgroundColor( tqcolorGroup().base() ); + area->setBackgroundColor( colorGroup().base() ); /* initailize the buttons that are in this box */ for (int i=BorderType_Top; i < BorderType_END; i++) @@ -2709,7 +2709,7 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox( this, "GroupBox_3" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Preselect") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,1,3,KDialog::marginHint(), KDialog::spacingHint()); @@ -2748,7 +2748,7 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox( this, "GroupBox_10" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Pattern") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,7,2,KDialog::marginHint(), KDialog::spacingHint()); fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -2804,7 +2804,7 @@ void CellFormatPageBorder::InitializeGrids() style->insertItem(paintFormatPixmap(DashDotLine),2 ); style->insertItem(paintFormatPixmap(DashDotDotLine),3 ); style->insertItem(paintFormatPixmap(SolidLine),4); - style->setBackgroundColor( tqcolorGroup().background() ); + style->setBackgroundColor( colorGroup().background() ); grid2->addMultiCell(grid3,6,6,0,1); grid->addMultiCellWidget(tmpTQGroupBox,0,3,1,1); @@ -2813,7 +2813,7 @@ void CellFormatPageBorder::InitializeGrids() tmpTQGroupBox = new TQGroupBox(this, "GroupBox_4" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Preview") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,1,1,KDialog::marginHint(), KDialog::spacingHint()); fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -2970,9 +2970,9 @@ TQPixmap CellFormatPageBorder::paintFormatPixmap(PenStyle _style) TQPixmap pixmap( style->width(), 14 ); TQPainter painter; TQPen pen; - pen=TQPen( tqcolorGroup().text(),1,_style); + pen=TQPen( colorGroup().text(),1,_style); painter.begin( &pixmap ); - painter.fillRect( 0, 0, style->width(), 14, tqcolorGroup().background() ); + painter.fillRect( 0, 0, style->width(), 14, colorGroup().background() ); painter.setPen( pen ); painter.drawLine( 0, 7, style->width(), 7 ); painter.end(); @@ -3240,7 +3240,7 @@ void CellFormatPageBorder::changeState( BorderButton *_p) { _p->setPenWidth(1); _p->setPenStyle(Qt::NoPen); - _p->setColor( tqcolorGroup().text() ); + _p->setColor( colorGroup().text() ); } area->tqrepaint(); @@ -3567,7 +3567,7 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog tmpTQGroupBox = new TQGroupBox( this, "GroupBox_20" ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); tmpTQGroupBox->setTitle( i18n("Pattern") ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); TQGridLayout *grid2 = new TQGridLayout(tmpTQGroupBox,8,3,KDialog::marginHint(), KDialog::spacingHint()); int fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -3656,10 +3656,10 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog if ( dlg->bBgColor ) bgColor = dlg->bgColor; else - bgColor = tqcolorGroup().base(); + bgColor = colorGroup().base(); if (!bgColor.isValid()) - bgColor = tqcolorGroup().base(); + bgColor = colorGroup().base(); bgColorButton->setColor( bgColor ); connect( bgColorButton, TQT_SIGNAL( changed( const TQColor & ) ), @@ -3678,7 +3678,7 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog tmpTQGroupBox = new TQGroupBox( this, "GroupBox1" ); tmpTQGroupBox->setTitle( i18n("Preview") ); tmpTQGroupBox->setFrameStyle( TQFrame::Box | TQFrame::Sunken ); - tmpTQGroupBox->tqsetAlignment( AlignLeft ); + tmpTQGroupBox->setAlignment( AlignLeft ); grid2 = new TQGridLayout(tmpTQGroupBox,2,1,KDialog::marginHint(), KDialog::spacingHint()); fHeight = tmpTQGroupBox->fontMetrics().height(); @@ -3753,8 +3753,8 @@ CellFormatPagePattern::CellFormatPagePattern( TQWidget* parent, CellFormatDialog void CellFormatPagePattern::slotNotAnyColor() { b_notAnyColor = true; - bgColorButton->setColor( tqcolorGroup().base() ); - current->setBackgroundColor( tqcolorGroup().base() ); + bgColorButton->setColor( colorGroup().base() ); + current->setBackgroundColor( colorGroup().base() ); } void CellFormatPagePattern::slotSetBackgroundColor( const TQColor &_color ) |