TDE
/
ktechlab
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/ktechlab
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KIcon to enhance compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent abef44c4d6
commit efa4f71896
18 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File

4
src/drawparts/dpline.cpp
Unescape View File

@ -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 );
}

2
src/drawparts/dptext.cpp
Unescape View File

@ -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 );
}

4
src/drawparts/solidshape.cpp
Unescape View File

@ -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 );
}

8
src/electronics/components/piccomponent.cpp
Unescape View File

@ -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()) );

2
src/electronics/subcircuits.cpp
Unescape View File

@ -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 );
}

8
src/flowcodeview.cpp
Unescape View File

@ -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

2
src/flowcontainer.cpp
Unescape View File

@ -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 );

16
src/gui/newfiledlg.cpp
Unescape View File

@ -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<TQIconViewItem*> 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;

2
src/gui/newfilewidget.ui
Unescape View File

@ -63,7 +63,7 @@ Creates a new circuit, with drag and drop editor. Real time simulation of the ci
<set>AlignVCenter</set>
</property>
</widget>
<widget class="KIconView" row="1" column="1">
<widget class="TDEIconView" row="1" column="1">
<property name="name">
<cstring>typeIconView</cstring>
</property>

2
src/gui/oscilloscope.cpp
Unescape View File

@ -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);

4
src/icnview.cpp
Unescape View File

@ -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 );

10
src/itemview.cpp
Unescape View File

@ -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

20
src/ktechlab.cpp
Unescape View File

@ -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
}

4
src/libraryitem.cpp
Unescape View File

@ -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;

2
src/picitem.cpp
Unescape View File

@ -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 );

2
src/projectmanager.cpp
Unescape View File

@ -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;
}
}

8
src/textview.cpp
Unescape View File

@ -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 );

4
src/view.cpp
Unescape View File

@ -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& )) );

Write Preview
Loading…
Cancel
Save