diff options
Diffstat (limited to 'karbon/dockers/vdocumentdocker.cc')
-rw-r--r-- | karbon/dockers/vdocumentdocker.cc | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc index 98b0b883..bdb7ad44 100644 --- a/karbon/dockers/vdocumentdocker.cc +++ b/karbon/dockers/vdocumentdocker.cc @@ -19,7 +19,7 @@ #include <tqhbuttongroup.h> #include <tqinputdialog.h> -#include <tqlayout.h> +#include <layout.h> #include <tqcheckbox.h> #include <tqlistview.h> #include <tqptrvector.h> @@ -206,12 +206,12 @@ VDocumentPreview::paintEvent( TQPaintEvent* ) } TQPainter pw( &pixmap ); - pw.setPen( tqcolorGroup().light() ); + pw.setPen( colorGroup().light() ); pw.drawLine( 1, 1, 1, height() - 2 ); pw.drawLine( 1, 1, width() - 2, 1 ); pw.drawLine( width() - 1, height() - 1, 0, height() - 1 ); pw.drawLine( width() - 1, height() - 1, width() - 1, 0 ); - pw.setPen( tqcolorGroup().dark() ); + pw.setPen( colorGroup().dark() ); pw.drawLine( 0, 0, width() - 1, 0 ); pw.drawLine( 0, 0, 0, height() - 1 ); pw.drawLine( width() - 2, height() - 2, width() - 2, 1 ); @@ -224,33 +224,33 @@ VDocumentTab::VDocumentTab( KarbonView* view, TQWidget* parent ) : TQWidget( parent, "DocumentTab" ), m_view( view ) { TQFrame* frame; - TQGridLayout* tqlayout = new TQGridLayout( this ); - tqlayout->setMargin( 3 ); - tqlayout->setSpacing( 2 ); - tqlayout->addMultiCellWidget( m_documentPreview = new VDocumentPreview( m_view, this ), 0, 7, 2, 2 ); - tqlayout->addWidget( new TQLabel( i18n( "document width", "Width:" ), this ), 0, 0 ); - tqlayout->addWidget( new TQLabel( i18n( "Height:" ), this ), 1, 0 ); - tqlayout->addMultiCellWidget( frame = new TQFrame( this ), 2, 2, 0, 1 ); + TQGridLayout* layout = new TQGridLayout( this ); + layout->setMargin( 3 ); + layout->setSpacing( 2 ); + layout->addMultiCellWidget( m_documentPreview = new VDocumentPreview( m_view, this ), 0, 7, 2, 2 ); + layout->addWidget( new TQLabel( i18n( "document width", "Width:" ), this ), 0, 0 ); + layout->addWidget( new TQLabel( i18n( "Height:" ), this ), 1, 0 ); + layout->addMultiCellWidget( frame = new TQFrame( this ), 2, 2, 0, 1 ); frame->setFrameShape( TQFrame::HLine ); - tqlayout->addWidget( new TQLabel( i18n( "Layers:" ), this ), 3, 0 ); - tqlayout->addWidget( new TQLabel( i18n( "Format:" ), this ), 4, 0 ); - tqlayout->addMultiCellWidget( frame = new TQFrame( this ), 5, 5, 0, 1 ); + layout->addWidget( new TQLabel( i18n( "Layers:" ), this ), 3, 0 ); + layout->addWidget( new TQLabel( i18n( "Format:" ), this ), 4, 0 ); + layout->addMultiCellWidget( frame = new TQFrame( this ), 5, 5, 0, 1 ); frame->setFrameShape( TQFrame::HLine ); - //tqlayout->addMultiCellWidget( new TQLabel( i18n( "Zoom factor:" ), this ), 6, 6, 0, 1 ); - tqlayout->addWidget( m_width = new TQLabel( this ), 0, 1 ); - tqlayout->addWidget( m_height = new TQLabel( this ), 1, 1 ); - tqlayout->addWidget( m_layers = new TQLabel( this ), 3, 1 ); - tqlayout->addWidget( m_format = new TQLabel( this ), 4, 1 ); - tqlayout->setRowStretch( 7, 1 ); - tqlayout->setColStretch( 0, 0 ); - tqlayout->setColStretch( 1, 0 ); - tqlayout->setColStretch( 2, 2 ); - //tqlayout->addWidget( - - m_width->tqsetAlignment( AlignRight ); - m_height->tqsetAlignment( AlignRight ); - m_layers->tqsetAlignment( AlignRight ); - m_format->tqsetAlignment( AlignRight ); + //layout->addMultiCellWidget( new TQLabel( i18n( "Zoom factor:" ), this ), 6, 6, 0, 1 ); + layout->addWidget( m_width = new TQLabel( this ), 0, 1 ); + layout->addWidget( m_height = new TQLabel( this ), 1, 1 ); + layout->addWidget( m_layers = new TQLabel( this ), 3, 1 ); + layout->addWidget( m_format = new TQLabel( this ), 4, 1 ); + layout->setRowStretch( 7, 1 ); + layout->setColStretch( 0, 0 ); + layout->setColStretch( 1, 0 ); + layout->setColStretch( 2, 2 ); + //layout->addWidget( + + m_width->setAlignment( AlignRight ); + m_height->setAlignment( AlignRight ); + m_layers->setAlignment( AlignRight ); + m_format->setAlignment( AlignRight ); connect( view->part()->commandHistory(), TQT_SIGNAL( commandAdded( VCommand* ) ), this, TQT_SLOT( slotCommandAdded( VCommand* ) ) ); connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted() ), this, TQT_SLOT( slotCommandExecuted() ) ); @@ -320,7 +320,7 @@ VObjectListViewItem::~VObjectListViewItem() TQString VObjectListViewItem::key( int, bool ) const { - return TQString( "%1" ).tqarg( m_key ); + return TQString( "%1" ).arg( m_key ); } void @@ -329,7 +329,7 @@ VObjectListViewItem::update() // text description VSelectionDescription selectionDesc; selectionDesc.visit( *m_object ); - setText( 0, TQString( "%1" ).tqarg( selectionDesc.shortDescription() ) ); + setText( 0, TQString( "%1" ).arg( selectionDesc.shortDescription() ) ); // draw thumb preview (16x16) TQPixmap preview; @@ -438,7 +438,7 @@ VLayerListViewItem::pos() TQString VLayerListViewItem::key( int, bool ) const { - return TQString( "%1" ).tqarg( m_key ); + return TQString( "%1" ).arg( m_key ); } int @@ -454,8 +454,8 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent ) { TQToolButton* button; - TQVBoxLayout* tqlayout = new TQVBoxLayout( this, 1 ); - tqlayout->addWidget( m_layersListView = new TQListView( this ), 1 ); + TQVBoxLayout* layout = new TQVBoxLayout( this, 1 ); + layout->addWidget( m_layersListView = new TQListView( this ), 1 ); m_buttonGroup = new TQHButtonGroup( this ); m_buttonGroup->setInsideMargin( 3 ); button = new TQToolButton( m_buttonGroup ); @@ -474,9 +474,9 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent ) button->setIconSet( SmallIcon( "14_layer_deletelayer" ) ); button->setTextLabel( i18n( "Delete" ) ); m_buttonGroup->insert( button ); - tqlayout->addWidget( m_buttonGroup, 0); - tqlayout->setSpacing( 0 ); - tqlayout->setMargin( 3 ); + layout->addWidget( m_buttonGroup, 0); + layout->setSpacing( 0 ); + layout->setMargin( 3 ); m_layersListView->setAllColumnsShowFocus( true ); m_layersListView->addColumn( i18n( "Item" ), 120 ); @@ -497,7 +497,7 @@ VLayersTab::VLayersTab( KarbonView* view, TQWidget* parent ) connect( m_buttonGroup, TQT_SIGNAL( clicked( int ) ), this, TQT_SLOT( slotButtonClicked( int ) ) ); connect( view->part()->commandHistory(), TQT_SIGNAL( commandExecuted( VCommand*) ), this, TQT_SLOT( slotCommandExecuted( VCommand* ) ) ); - tqlayout->activate(); + layout->activate(); updateLayers(); } // VLayersTab::VLayersTab @@ -531,7 +531,7 @@ VLayersTab::resetSelection() for(; it.current(); ++it ) { it.current()->setSelected( false ); - it.current()->tqrepaint(); + it.current()->repaint(); } } @@ -556,14 +556,14 @@ VLayersTab::selectActiveLayer() for(; it.current(); ++it ) { it.current()->setSelected( false ); - it.current()->tqrepaint(); + it.current()->repaint(); } VLayerListViewItem *layerItem = m_layers[ m_document->activeLayer() ]; if( layerItem ) { layerItem->setSelected( true ); - layerItem->tqrepaint(); + layerItem->repaint(); kdDebug(38000) << "selecting active layer: " << layerItem->text() << endl; } } @@ -620,7 +620,7 @@ VLayersTab::updateChildItems( TQListViewItem *item ) updateChildItems( objectItem ); objectItem->update(); - objectItem->tqrepaint(); + objectItem->repaint(); } } @@ -676,7 +676,7 @@ VLayersTab::itemClicked( TQListViewItem* item, const TQPoint &, int col ) toggleState( layerItem->layer(), col ); layerItem->update(); - layerItem->tqrepaint(); + layerItem->repaint(); updateChildItems( layerItem ); @@ -703,7 +703,7 @@ VLayersTab::itemClicked( TQListViewItem* item, const TQPoint &, int col ) objectItem->setSelected( false ); objectItem->update(); - objectItem->tqrepaint(); + objectItem->repaint(); if( dynamic_cast<VGroup*>( objectItem->object() ) ) updateChildItems( objectItem ); @@ -740,7 +740,7 @@ VLayersTab::selectionChangedFromList() && (state != VObject::hidden_locked) ) { m_document->selection()->append( objectItem->object() ); - objectItem->tqrepaint(); + objectItem->repaint(); } } @@ -1203,16 +1203,16 @@ VHistoryItem::paintFocus( TQPainter*, const TQColorGroup&, const TQRect& ) VHistoryTab::VHistoryTab( KarbonPart* part, TQWidget* parent ) : TQWidget( parent ), m_part( part ) { - TQVBoxLayout* tqlayout = new TQVBoxLayout( this ); - tqlayout->setMargin( 3 ); - tqlayout->setSpacing( 2 ); - tqlayout->add( m_history = new TQListView( this ) ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); + layout->setMargin( 3 ); + layout->setSpacing( 2 ); + layout->add( m_history = new TQListView( this ) ); m_history->setVScrollBarMode( TQListView::AlwaysOn ); m_history->setSelectionMode( TQListView::NoSelection ); m_history->addColumn( i18n( "Commands" ) ); m_history->setResizeMode( TQListView::AllColumns ); m_history->setRootIsDecorated( true ); - tqlayout->add( m_groupCommands = new TQCheckBox( i18n( "Group commands" ), this ) ); + layout->add( m_groupCommands = new TQCheckBox( i18n( "Group commands" ), this ) ); m_history->setSorting( 0, true ); VHistoryGroupItem* group = 0; |