From efa4f718964aee9c6612fe61665dec4622cb6785 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 4 Feb 2013 14:07:48 -0600 Subject: Rename KIcon to enhance compatibility with KDE4 --- src/drawparts/dpline.cpp | 4 ++-- src/drawparts/dptext.cpp | 2 +- src/drawparts/solidshape.cpp | 4 ++-- src/electronics/components/piccomponent.cpp | 8 ++++---- src/electronics/subcircuits.cpp | 2 +- src/flowcodeview.cpp | 8 ++++---- src/flowcontainer.cpp | 2 +- src/gui/newfiledlg.cpp | 16 ++++++++-------- src/gui/newfilewidget.ui | 2 +- src/gui/oscilloscope.cpp | 2 +- src/icnview.cpp | 4 ++-- src/itemview.cpp | 10 +++++----- src/ktechlab.cpp | 20 ++++++++++---------- src/libraryitem.cpp | 4 ++-- src/picitem.cpp | 2 +- src/projectmanager.cpp | 2 +- src/textview.cpp | 8 ++++---- src/view.cpp | 4 ++-- 18 files changed, 52 insertions(+), 52 deletions(-) (limited to 'src') diff --git a/src/drawparts/dpline.cpp b/src/drawparts/dpline.cpp index b476cc9..31a4a70 100644 --- a/src/drawparts/dpline.cpp +++ b/src/drawparts/dpline.cpp @@ -31,7 +31,7 @@ LibraryItem* DPLine::libraryItem() TQString("dp/line"), i18n("Line"), i18n("Other"), - TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), + TDEGlobal::iconLoader()->loadIcon( "text", TDEIcon::Small ), LibraryItem::lit_drawpart, DPLine::construct ); } @@ -159,7 +159,7 @@ LibraryItem* DPArrow::libraryItem() TQString("dp/arrow"), i18n("Arrow"), i18n("Other"), - TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), + TDEGlobal::iconLoader()->loadIcon( "text", TDEIcon::Small ), LibraryItem::lit_drawpart, DPArrow::construct ); } diff --git a/src/drawparts/dptext.cpp b/src/drawparts/dptext.cpp index eaa792d..7524b1e 100644 --- a/src/drawparts/dptext.cpp +++ b/src/drawparts/dptext.cpp @@ -31,7 +31,7 @@ LibraryItem* DPText::libraryItem() idList, i18n("Canvas Text"), i18n("Other"), - TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), + TDEGlobal::iconLoader()->loadIcon( "text", TDEIcon::Small ), LibraryItem::lit_drawpart, DPText::construct ); } diff --git a/src/drawparts/solidshape.cpp b/src/drawparts/solidshape.cpp index 7de7a34..05c5f3f 100644 --- a/src/drawparts/solidshape.cpp +++ b/src/drawparts/solidshape.cpp @@ -30,7 +30,7 @@ LibraryItem* DPRectangle::libraryItem() TQString("dp/rectangle"), i18n("Rectangle"), i18n("Other"), - TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), + TDEGlobal::iconLoader()->loadIcon( "text", TDEIcon::Small ), LibraryItem::lit_drawpart, DPRectangle::construct ); } @@ -148,7 +148,7 @@ LibraryItem* DPEllipse::libraryItem() TQString("dp/ellipse"), i18n("Ellipse"), i18n("Other"), - TDEGlobal::iconLoader()->loadIcon( "text", KIcon::Small ), + TDEGlobal::iconLoader()->loadIcon( "text", TDEIcon::Small ), LibraryItem::lit_drawpart, DPEllipse::construct ); } diff --git a/src/electronics/components/piccomponent.cpp b/src/electronics/components/piccomponent.cpp index b747ac6..0712992 100644 --- a/src/electronics/components/piccomponent.cpp +++ b/src/electronics/components/piccomponent.cpp @@ -82,10 +82,10 @@ PICComponent::PICComponent( ICNDocument *icnDocument, bool newItem, const char * m_bLoadingProgram = false; m_pGpsim = 0L; - addButton( "run", TQRect(), TDEGlobal::iconLoader()->loadIcon( "player_play", KIcon::Small ) ); - addButton( "pause", TQRect(), TDEGlobal::iconLoader()->loadIcon( "player_pause", KIcon::Small ) ); - addButton( "reset", TQRect(), TDEGlobal::iconLoader()->loadIcon( "stop", KIcon::Small ) ); - addButton( "reload", TQRect(), TDEGlobal::iconLoader()->loadIcon( "reload", KIcon::Small ) ); + addButton( "run", TQRect(), TDEGlobal::iconLoader()->loadIcon( "player_play", TDEIcon::Small ) ); + addButton( "pause", TQRect(), TDEGlobal::iconLoader()->loadIcon( "player_pause", TDEIcon::Small ) ); + addButton( "reset", TQRect(), TDEGlobal::iconLoader()->loadIcon( "stop", TDEIcon::Small ) ); + addButton( "reload", TQRect(), TDEGlobal::iconLoader()->loadIcon( "reload", TDEIcon::Small ) ); if ( icnDocument->ktechlab() ) connect( icnDocument->ktechlab(), TQT_SIGNAL(recentFileAdded(const KURL &)), this, TQT_SLOT(slotUpdateFileList()) ); diff --git a/src/electronics/subcircuits.cpp b/src/electronics/subcircuits.cpp index 1bdd672..5c2ddcc 100644 --- a/src/electronics/subcircuits.cpp +++ b/src/electronics/subcircuits.cpp @@ -104,7 +104,7 @@ void Subcircuits::updateComponentSelector( int id, const TQString &name ) if ( name.isEmpty() ) return; - ComponentSelector::self()->addItem( name, "sc/"+TQString::number(id), "Subcircuits", TDEGlobal::iconLoader()->loadIcon( "ktechlab_circuit", KIcon::Small ), true ); + ComponentSelector::self()->addItem( name, "sc/"+TQString::number(id), "Subcircuits", TDEGlobal::iconLoader()->loadIcon( "ktechlab_circuit", TDEIcon::Small ), true ); } diff --git a/src/flowcodeview.cpp b/src/flowcodeview.cpp index c04ab6d..ea67606 100644 --- a/src/flowcodeview.cpp +++ b/src/flowcodeview.cpp @@ -30,10 +30,10 @@ FlowCodeView::FlowCodeView( FlowCodeDocument * flowCodeDocument, ViewContainer * TDEPopupMenu * m = pa->popupMenu(); m->insertTitle( i18n("Convert to") ); - m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_microbe", KIcon::Small ), i18n("Microbe"), FlowCodeDocument::MicrobeOutput ); - m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_assembly", KIcon::Small ), i18n("Assembly"), FlowCodeDocument::AssemblyOutput ); - m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_hex", KIcon::Small ), i18n("Hex"), FlowCodeDocument::HexOutput ); - m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_pic", KIcon::Small ), i18n("PIC (upload)"), FlowCodeDocument::PICOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_microbe", TDEIcon::Small ), i18n("Microbe"), FlowCodeDocument::MicrobeOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_assembly", TDEIcon::Small ), i18n("Assembly"), FlowCodeDocument::AssemblyOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_hex", TDEIcon::Small ), i18n("Hex"), FlowCodeDocument::HexOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_pic", TDEIcon::Small ), i18n("PIC (upload)"), FlowCodeDocument::PICOutput ); connect( m, TQT_SIGNAL(activated(int)), flowCodeDocument, TQT_SLOT(slotConvertTo(int)) ); //END Convert To * Actions diff --git a/src/flowcontainer.cpp b/src/flowcontainer.cpp index c5f4b83..5f09f55 100644 --- a/src/flowcontainer.cpp +++ b/src/flowcontainer.cpp @@ -30,7 +30,7 @@ FlowContainer::FlowContainer( ICNDocument *_icnDocument, bool newItem, const TQS m_ext_in = m_int_in = m_int_out = m_ext_out = 0l; b_expanded = true; - addButton( "expandBtn", TQRect( offsetX(), offsetY()+24 - 11, 22, 22 ), TDEGlobal::iconLoader()->loadIcon( "down", KIcon::Small ), true ); + addButton( "expandBtn", TQRect( offsetX(), offsetY()+24 - 11, 22, 22 ), TDEGlobal::iconLoader()->loadIcon( "down", TDEIcon::Small ), true ); m_rectangularOverlay = new RectangularOverlay( this, 8, 8 ); setSize( -160, -120, 320, 240 ); diff --git a/src/gui/newfiledlg.cpp b/src/gui/newfiledlg.cpp index 87159c1..4a32b00 100644 --- a/src/gui/newfiledlg.cpp +++ b/src/gui/newfiledlg.cpp @@ -41,20 +41,20 @@ NewFileDlg::NewFileDlg( TQWidget *parent ) m_pNewFileWidget = new NewFileWidget(this); m_pNewFileWidget->typeIconView->setSelectionMode(TQIconView::Single); - m_pNewFileWidget->typeIconView->setMode(KIconView::Select); + m_pNewFileWidget->typeIconView->setMode(TDEIconView::Select); - KIconLoader *loader = TDEGlobal::iconLoader(); + TDEIconLoader *loader = TDEGlobal::iconLoader(); TQValueList items; - items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"Assembly Code (.asm)", loader->loadIcon( "source", KIcon::NoGroup, KIcon::SizeHuge ) ); - items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"C (.c)", loader->loadIcon( "source_c", KIcon::NoGroup, KIcon::SizeHuge ) ); - items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"Circuit (.circuit)", loader->loadIcon( "ktechlab_circuit", KIcon::NoGroup, KIcon::SizeHuge ) ); - items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"FlowCode (.flowcode)", loader->loadIcon( "ktechlab_flowcode", KIcon::NoGroup, KIcon::SizeHuge ) ); + items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"Assembly Code (.asm)", loader->loadIcon( "source", TDEIcon::NoGroup, TDEIcon::SizeHuge ) ); + items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"C (.c)", loader->loadIcon( "source_c", TDEIcon::NoGroup, TDEIcon::SizeHuge ) ); + items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"Circuit (.circuit)", loader->loadIcon( "ktechlab_circuit", TDEIcon::NoGroup, TDEIcon::SizeHuge ) ); + items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"FlowCode (.flowcode)", loader->loadIcon( "ktechlab_flowcode", TDEIcon::NoGroup, TDEIcon::SizeHuge ) ); #ifdef MECHANICS - items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"Mechanics (.mechanics)", loader->loadIcon( "exec", KIcon::NoGroup, KIcon::SizeHuge ) ); + items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"Mechanics (.mechanics)", loader->loadIcon( "exec", TDEIcon::NoGroup, TDEIcon::SizeHuge ) ); #endif - items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"Microbe (.microbe)", loader->loadIcon( "ktechlab_microbe", KIcon::NoGroup, KIcon::SizeHuge ) ); + items << new TQIconViewItem(m_pNewFileWidget->typeIconView,"Microbe (.microbe)", loader->loadIcon( "ktechlab_microbe", TDEIcon::NoGroup, TDEIcon::SizeHuge ) ); unsigned minWidth = 20 + m_pNewFileWidget->typeIconView->spacing() * items.size(); int minHeight = 0; diff --git a/src/gui/newfilewidget.ui b/src/gui/newfilewidget.ui index 4f0b4dc..5d94858 100644 --- a/src/gui/newfilewidget.ui +++ b/src/gui/newfilewidget.ui @@ -63,7 +63,7 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci AlignVCenter - + typeIconView diff --git a/src/gui/oscilloscope.cpp b/src/gui/oscilloscope.cpp index 7bc0a07..d88924c 100644 --- a/src/gui/oscilloscope.cpp +++ b/src/gui/oscilloscope.cpp @@ -332,7 +332,7 @@ void addOscilloscopeAsToolView( KTechlab *ktechlab ) KateMDI::ToolView * tv; tv = ktechlab->createToolView( Oscilloscope::toolViewIdentifier(), KMultiTabBar::Bottom, - TDEGlobal::iconLoader()->loadIcon( "oscilloscope", KIcon::Small ), + TDEGlobal::iconLoader()->loadIcon( "oscilloscope", TDEIcon::Small ), i18n("Oscilloscope") ); Oscilloscope::self(tv); diff --git a/src/icnview.cpp b/src/icnview.cpp index 43c77aa..ab2789e 100644 --- a/src/icnview.cpp +++ b/src/icnview.cpp @@ -46,8 +46,8 @@ ICNView::ICNView( ICNDocument *icnDocument, ViewContainer *viewContainer, uint v TDEPopupMenu * m = m_pRoutingModeToolbarPopup->popupMenu(); m->insertTitle( i18n("Connection Routing Mode") ); - m->insertItem( /*TDEGlobal::iconLoader()->loadIcon( "routing_mode_auto", KIcon::Small ), */i18n("Automatic"), 0 ); - m->insertItem( /*TDEGlobal::iconLoader()->loadIcon( "routing_mode_manual", KIcon::Small ),*/ i18n("Manual"), 1 ); + m->insertItem( /*TDEGlobal::iconLoader()->loadIcon( "routing_mode_auto", TDEIcon::Small ), */i18n("Automatic"), 0 ); + m->insertItem( /*TDEGlobal::iconLoader()->loadIcon( "routing_mode_manual", TDEIcon::Small ),*/ i18n("Manual"), 1 ); m->setCheckable(true); m->setItemChecked( manualRouting ? 1 : 0, true ); diff --git a/src/itemview.cpp b/src/itemview.cpp index 34db2b6..06f7ff5 100644 --- a/src/itemview.cpp +++ b/src/itemview.cpp @@ -65,11 +65,11 @@ ItemView::ItemView( ItemDocument * itemDocument, ViewContainer *viewContainer, u TDEPopupMenu * m = pa->popupMenu(); m->insertTitle( i18n("Draw") ); - m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_text", KIcon::Small ), i18n("Text"), DrawPart::da_text ); - m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_line", KIcon::Small ), i18n("Line"), DrawPart::da_line ); - m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_arrow", KIcon::Small ), i18n("Arrow"), DrawPart::da_arrow ); - m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_ellipse", KIcon::Small ), i18n("Ellipse"), DrawPart::da_ellipse ); - m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_rectangle", KIcon::Small ), i18n("Rectangle"), DrawPart::da_rectangle ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_text", TDEIcon::Small ), i18n("Text"), DrawPart::da_text ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_line", TDEIcon::Small ), i18n("Line"), DrawPart::da_line ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_arrow", TDEIcon::Small ), i18n("Arrow"), DrawPart::da_arrow ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_ellipse", TDEIcon::Small ), i18n("Ellipse"), DrawPart::da_ellipse ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "tool_rectangle", TDEIcon::Small ), i18n("Rectangle"), DrawPart::da_rectangle ); connect( m, TQT_SIGNAL(activated(int)), itemDocument, TQT_SLOT(slotSetDrawAction(int)) ); //END Draw actions diff --git a/src/ktechlab.cpp b/src/ktechlab.cpp index a76b737..da1a8aa 100644 --- a/src/ktechlab.cpp +++ b/src/ktechlab.cpp @@ -158,12 +158,12 @@ void KTechlab::setupToolDocks() #endif TQPixmap pm; - KIconLoader * loader = TDEGlobal::iconLoader(); + TDEIconLoader * loader = TDEGlobal::iconLoader(); KateMDI::ToolView * tv = 0l; tv = createToolView( ProjectManager::toolViewIdentifier(), KMultiTabBar::Left, - loader->loadIcon( "attach", KIcon::Small ), + loader->loadIcon( "attach", TDEIcon::Small ), i18n("Project") ); ProjectManager::self( this, tv ); @@ -203,20 +203,20 @@ void KTechlab::setupToolDocks() tv = createToolView( ContextHelp::toolViewIdentifier(), KMultiTabBar::Right, - loader->loadIcon( "contents", KIcon::Small ), + loader->loadIcon( "contents", TDEIcon::Small ), i18n("Context Help") ); ContextHelp::self(tv); tv = createToolView( LanguageManager::toolViewIdentifier(), KMultiTabBar::Bottom, - loader->loadIcon( "log", KIcon::Small ), + loader->loadIcon( "log", TDEIcon::Small ), i18n("Messages") ); LanguageManager::self( tv, this ); #ifndef NO_GPSIM tv = createToolView( SymbolViewer::toolViewIdentifier(), KMultiTabBar::Right, - loader->loadIcon( "blockdevice", KIcon::Small ), + loader->loadIcon( "blockdevice", TDEIcon::Small ), i18n("Symbol Viewer") ); SymbolViewer::self(tv); #endif @@ -555,10 +555,10 @@ void KTechlab::slotTabReceivedDropEvent( TQWidget *widget, TQDropEvent *e ) e->accept(true); TDEPopupMenu dropMenu; - dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "goto", KIcon::Small ), i18n("&Insert Into"), 0 ); - dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "editcopy", KIcon::Small ), i18n("&Copy Into"), 1 ); + dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "goto", TDEIcon::Small ), i18n("&Insert Into"), 0 ); + dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "editcopy", TDEIcon::Small ), i18n("&Copy Into"), 1 ); dropMenu.insertSeparator(); - dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "stop", KIcon::Small ), i18n("C&ancel"), 2 ); + dropMenu.insertItem( TDEGlobal::iconLoader()->loadIcon( "stop", TDEIcon::Small ), i18n("C&ancel"), 2 ); connect( &dropMenu, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotDragContextActivated(int)) ); // dropMenu.exec(e->pos() + widget->pos() ); @@ -1007,7 +1007,7 @@ KURL::List KTechlab::getFileURLs() void KTechlab::slotDocModifiedChanged() { //BEGIN Set tab icons - KIconLoader *loader = TDEGlobal::iconLoader(); + TDEIconLoader *loader = TDEGlobal::iconLoader(); const ViewContainerList::iterator vcEnd = m_viewContainerList.end(); for ( ViewContainerList::iterator it = m_viewContainerList.begin(); it != vcEnd; ++it ) { @@ -1046,7 +1046,7 @@ void KTechlab::slotDocModifiedChanged() break; } - tabWidget()->setTabIconSet( vc, loader->loadIcon( iconName, KIcon::Small ) ); + tabWidget()->setTabIconSet( vc, loader->loadIcon( iconName, TDEIcon::Small ) ); } //END Set tab icons } diff --git a/src/libraryitem.cpp b/src/libraryitem.cpp index 26374a6..09a4379 100644 --- a/src/libraryitem.cpp +++ b/src/libraryitem.cpp @@ -58,9 +58,9 @@ LibraryItem::~LibraryItem() void LibraryItem::createIcon16() { if ( m_icon_full.isNull() ) - m_icon_full = TDEGlobal::iconLoader()->loadIcon( "null", KIcon::Small ); + m_icon_full = TDEGlobal::iconLoader()->loadIcon( "null", TDEIcon::Small ); -// const int size = KIcon::SizeSmallMedium; +// const int size = TDEIcon::SizeSmallMedium; // const int size = 22; const int size = 16; diff --git a/src/picitem.cpp b/src/picitem.cpp index 05868b6..dfadedf 100644 --- a/src/picitem.cpp +++ b/src/picitem.cpp @@ -254,7 +254,7 @@ PicItem::PicItem( ICNDocument *icnDocument, bool newItem, const char *id, MicroS updateVisibility(); addButton( "settings", TQRect( SidePadding-8, m_innerHeight+TopPadding+(BottomPadding-24)/2-1, InnerWidth+16, 24 ), i18n("Advanced...") ); - addButton( "expandBtn", TQRect( (TopPadding-22)/2, (TopPadding-22)/2, 22, 22 ), TDEGlobal::iconLoader()->loadIcon( "down", KIcon::Small ), true ); + addButton( "expandBtn", TQRect( (TopPadding-22)/2, (TopPadding-22)/2, 22, 22 ), TDEGlobal::iconLoader()->loadIcon( "down", TDEIcon::Small ), true ); button("expandBtn")->setState(true); move( 12, 12 ); diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index dbefa7d..305b1cc 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -245,7 +245,7 @@ void ProjectItem::updateILVItemPixmap() case FileType: { KMimeType::Ptr m = KMimeType::findByPath( url().path() ); - m_pILVItem->setPixmap( 0, m->pixmap( KIcon::Small ) ); + m_pILVItem->setPixmap( 0, m->pixmap( TDEIcon::Small ) ); break; } } diff --git a/src/textview.cpp b/src/textview.cpp index 622efe5..05c8075 100644 --- a/src/textview.cpp +++ b/src/textview.cpp @@ -56,10 +56,10 @@ TextView::TextView( TextDocument * textDocument, ViewContainer *viewContainer, u TDEPopupMenu * m = pa->popupMenu(); m->insertTitle( i18n("Convert to ...") ); - m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_microbe", KIcon::Small ), i18n("Microbe"), TextDocument::MicrobeOutput ); - m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_assembly", KIcon::Small ), i18n("Assembly"), TextDocument::AssemblyOutput ); - m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_hex", KIcon::Small ), i18n("Hex"), TextDocument::HexOutput ); - m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_pic", KIcon::Small ), i18n("PIC (upload)"), TextDocument::PICOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_microbe", TDEIcon::Small ), i18n("Microbe"), TextDocument::MicrobeOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_assembly", TDEIcon::Small ), i18n("Assembly"), TextDocument::AssemblyOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_hex", TDEIcon::Small ), i18n("Hex"), TextDocument::HexOutput ); + m->insertItem( TDEGlobal::iconLoader()->loadIcon( "convert_to_pic", TDEIcon::Small ), i18n("PIC (upload)"), TextDocument::PICOutput ); connect( m, TQT_SIGNAL(activated(int)), textDocument, TQT_SLOT(slotConvertTo(int)) ); m->setItemEnabled( TextDocument::MicrobeOutput, false ); diff --git a/src/view.cpp b/src/view.cpp index 453d2e1..c5c5205 100644 --- a/src/view.cpp +++ b/src/view.cpp @@ -183,8 +183,8 @@ ViewStatusBar::ViewStatusBar( View *view ) m_fileNameLabel = new KSqueezedTextLabel(this); addWidget( m_fileNameLabel, 1, false ); - m_modifiedPixmap = TDEGlobal::iconLoader()->loadIcon( "filesave", KIcon::Small ); - m_unmodifiedPixmap = TDEGlobal::iconLoader()->loadIcon( "null", KIcon::Small ); + m_modifiedPixmap = TDEGlobal::iconLoader()->loadIcon( "filesave", TDEIcon::Small ); + m_unmodifiedPixmap = TDEGlobal::iconLoader()->loadIcon( "null", TDEIcon::Small ); connect( view->document(), TQT_SIGNAL(modifiedStateChanged()), this, TQT_SLOT(slotModifiedStateChanged()) ); connect( view->document(), TQT_SIGNAL(fileNameChanged(const KURL& )), this, TQT_SLOT(slotFileNameChanged(const KURL& )) ); -- cgit v1.2.1