diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/kjtagdialog.cpp | 2 | ||||
| -rwxr-xr-x | src/kpicosim.cpp | 36 |
2 files changed, 19 insertions, 19 deletions
diff --git a/src/kjtagdialog.cpp b/src/kjtagdialog.cpp index 26c7d26..86ba2dd 100644 --- a/src/kjtagdialog.cpp +++ b/src/kjtagdialog.cpp @@ -34,7 +34,7 @@ KJTAGDialog::KJTAGDialog( TQWidget *parent ) m_selectFileBtn = new TQPushButton( m_groupConfigure ) ; m_selectFileBtn->setFixedSize( 30, 25 ) ; m_selectFileBtn->move( 205, 15 ) ; - m_selectFileBtn->setPixmap( TDEGlobal::iconLoader()->loadIcon( "fileopen", KIcon::Small ) ) ; + m_selectFileBtn->setPixmap( TDEGlobal::iconLoader()->loadIcon( "fileopen", TDEIcon::Small ) ) ; connect( m_selectFileBtn, TQT_SIGNAL( clicked() ), this, TQT_SLOT( selectFileName() ) ) ; m_configureBtn = new TQPushButton( "Configure", m_groupConfigure ) ; diff --git a/src/kpicosim.cpp b/src/kpicosim.cpp index 236b204..d0182f0 100755 --- a/src/kpicosim.cpp +++ b/src/kpicosim.cpp @@ -172,7 +172,7 @@ KPicoSim::KPicoSim() : TDEMainWindow( 0, "KPicoSim" ) void KPicoSim::buildMenu() { - KIconLoader * ldr = TDEGlobal::iconLoader() ; + TDEIconLoader * ldr = TDEGlobal::iconLoader() ; TDEPopupMenu * exportMenu = new TDEPopupMenu( this ) ; @@ -182,36 +182,36 @@ void KPicoSim::buildMenu() exportMenu->insertItem( "HEX", TQT_TQOBJECT(this), TQT_SLOT( fileExportHEX() ) ) ; m_fileMenu = new TDEPopupMenu( this ) ; - m_fileMenu->insertItem( ldr->loadIcon( "filenew", KIcon::Small ), "New", TQT_TQOBJECT(this), TQT_SLOT( slotFileNew() ) ) ; - m_fileMenu->insertItem( ldr->loadIcon( "fileopen", KIcon::Small ), "Open", TQT_TQOBJECT(m_editor), TQT_SLOT( slotOpen() ) ) ; + m_fileMenu->insertItem( ldr->loadIcon( "filenew", TDEIcon::Small ), "New", TQT_TQOBJECT(this), TQT_SLOT( slotFileNew() ) ) ; + m_fileMenu->insertItem( ldr->loadIcon( "fileopen", TDEIcon::Small ), "Open", TQT_TQOBJECT(m_editor), TQT_SLOT( slotOpen() ) ) ; m_fileMenu->insertSeparator() ; - m_fileMenu->insertItem( ldr->loadIcon( "filesave", KIcon::Small ), "Save", TQT_TQOBJECT(m_editor), TQT_SLOT( slotSave() ), TQKeySequence( "CTRL+S" ) ) ; - m_fileMenu->insertItem( ldr->loadIcon( "filesaveas", KIcon::Small ), "Save As...", TQT_TQOBJECT(m_editor), TQT_SLOT( slotSaveAs() ) ) ; + m_fileMenu->insertItem( ldr->loadIcon( "filesave", TDEIcon::Small ), "Save", TQT_TQOBJECT(m_editor), TQT_SLOT( slotSave() ), TQKeySequence( "CTRL+S" ) ) ; + m_fileMenu->insertItem( ldr->loadIcon( "filesaveas", TDEIcon::Small ), "Save As...", TQT_TQOBJECT(m_editor), TQT_SLOT( slotSaveAs() ) ) ; m_fileMenu->insertSeparator() ; - m_fileMenu->insertItem( ldr->loadIcon( "fileprint", KIcon::Small ), "Print...", TQT_TQOBJECT(m_editor), TQT_SLOT( slotPrint() ), TQKeySequence( "CTRL+P" ) ) ; + m_fileMenu->insertItem( ldr->loadIcon( "fileprint", TDEIcon::Small ), "Print...", TQT_TQOBJECT(m_editor), TQT_SLOT( slotPrint() ), TQKeySequence( "CTRL+P" ) ) ; m_fileMenu->insertSeparator() ; m_fileMenu->insertItem( "Export", exportMenu ) ; m_fileMenu->insertSeparator() ; - m_fileMenu->insertItem( ldr->loadIcon( "fileclose", KIcon::Small ), "Quit", TQT_TQOBJECT(this), TQT_SLOT( slotClose() ) ) ; + m_fileMenu->insertItem( ldr->loadIcon( "fileclose", TDEIcon::Small ), "Quit", TQT_TQOBJECT(this), TQT_SLOT( slotClose() ) ) ; m_editMenu = new TDEPopupMenu( this ) ; - m_editMenu->insertItem( ldr->loadIcon( "undo", KIcon::Small ), "Undo", TQT_TQOBJECT(m_editor), TQT_SLOT( slotUndo() ),TQKeySequence( "CTRL+Z" ) ) ; - m_editMenu->insertItem( ldr->loadIcon( "redo", KIcon::Small ), "Redo", TQT_TQOBJECT(m_editor), TQT_SLOT( slotRedo() ),TQKeySequence( "CTRL+SHIFT+Z" ) ) ; + m_editMenu->insertItem( ldr->loadIcon( "undo", TDEIcon::Small ), "Undo", TQT_TQOBJECT(m_editor), TQT_SLOT( slotUndo() ),TQKeySequence( "CTRL+Z" ) ) ; + m_editMenu->insertItem( ldr->loadIcon( "redo", TDEIcon::Small ), "Redo", TQT_TQOBJECT(m_editor), TQT_SLOT( slotRedo() ),TQKeySequence( "CTRL+SHIFT+Z" ) ) ; m_editMenu->insertSeparator() ; m_editMenu->insertItem( "Select All", TQT_TQOBJECT(m_editor), TQT_SLOT( slotSelectAll() ),TQKeySequence( "CTRL+A" ) ) ; m_editMenu->insertSeparator() ; - m_editMenu->insertItem( ldr->loadIcon( "editcut", KIcon::Small ), "Cut", TQT_TQOBJECT(m_editor), TQT_SLOT( slotCut() ),TQKeySequence( "CTRL+X" ) ) ; - m_editMenu->insertItem( ldr->loadIcon( "editcopy", KIcon::Small ), "Copy", TQT_TQOBJECT(m_editor), TQT_SLOT( slotCopy() ),TQKeySequence( "CTRL+C" ) ) ; - m_editMenu->insertItem( ldr->loadIcon( "editpaste", KIcon::Small ), "Paste", TQT_TQOBJECT(m_editor), TQT_SLOT( slotPaste() ),TQKeySequence( "CTRL+V" ) ) ; + m_editMenu->insertItem( ldr->loadIcon( "editcut", TDEIcon::Small ), "Cut", TQT_TQOBJECT(m_editor), TQT_SLOT( slotCut() ),TQKeySequence( "CTRL+X" ) ) ; + m_editMenu->insertItem( ldr->loadIcon( "editcopy", TDEIcon::Small ), "Copy", TQT_TQOBJECT(m_editor), TQT_SLOT( slotCopy() ),TQKeySequence( "CTRL+C" ) ) ; + m_editMenu->insertItem( ldr->loadIcon( "editpaste", TDEIcon::Small ), "Paste", TQT_TQOBJECT(m_editor), TQT_SLOT( slotPaste() ),TQKeySequence( "CTRL+V" ) ) ; m_editMenu->insertSeparator() ; - m_editMenu->insertItem( ldr->loadIcon( "find", KIcon::Small ), "Find...", TQT_TQOBJECT(m_editor), TQT_SLOT( slotFind() ), TQKeySequence( "CTRL+F" ) ) ; + m_editMenu->insertItem( ldr->loadIcon( "find", TDEIcon::Small ), "Find...", TQT_TQOBJECT(m_editor), TQT_SLOT( slotFind() ), TQKeySequence( "CTRL+F" ) ) ; m_editMenu->insertItem( "Find Next", TQT_TQOBJECT(m_editor), TQT_SLOT( slotFindNext() ), TQKeySequence( "F3" ) ) ; m_debugMenu = new TDEPopupMenu( this ) ; m_debugMenu->insertSeparator() ; - m_debugMenu->insertItem( ldr->loadIcon( "rebuild", KIcon::Small ), "Compile", TQT_TQOBJECT(this), TQT_SLOT( compile() ), TQKeySequence( "SHIFT+F9" ) ) ; - m_debugMenu->insertItem( ldr->loadIcon( "run", KIcon::Small ), "Start Debug", TQT_TQOBJECT(this), TQT_SLOT( startSim() ), TQKeySequence( "F9" ) , START_SIM_ID ) ; + m_debugMenu->insertItem( ldr->loadIcon( "rebuild", TDEIcon::Small ), "Compile", TQT_TQOBJECT(this), TQT_SLOT( compile() ), TQKeySequence( "SHIFT+F9" ) ) ; + m_debugMenu->insertItem( ldr->loadIcon( "run", TDEIcon::Small ), "Start Debug", TQT_TQOBJECT(this), TQT_SLOT( startSim() ), TQKeySequence( "F9" ) , START_SIM_ID ) ; m_debugMenu->insertSeparator() ; m_debugMenu->insertItem( "Continue", TQT_TQOBJECT(this), TQT_SLOT( startStop() ), TQKeySequence( "F10" ) , RUN_ID ) ; @@ -533,12 +533,12 @@ bool KPicoSim::compile() void KPicoSim::startSim() { - KIconLoader * ldr = TDEGlobal::iconLoader() ; + TDEIconLoader * ldr = TDEGlobal::iconLoader() ; if ( !m_simulationMode ) { if ( compile() ) { setCaption( m_editor->getFilename() + " [Debugging]" ) ; - m_debugMenu->changeItem( START_SIM_ID, ldr->loadIcon( "stop", KIcon::Small ), "Stop Debug" ) ; + m_debugMenu->changeItem( START_SIM_ID, ldr->loadIcon( "stop", TDEIcon::Small ), "Stop Debug" ) ; m_debugBar->setButton( START_SIM_ID, true ) ; m_simulator->reset() ; @@ -550,7 +550,7 @@ void KPicoSim::startSim() startStop() ; setCaption( m_editor->getFilename() ) ; - m_debugMenu->changeItem( START_SIM_ID, ldr->loadIcon( "run", KIcon::Small ), "Start Debug" ) ; + m_debugMenu->changeItem( START_SIM_ID, ldr->loadIcon( "run", TDEIcon::Small ), "Start Debug" ) ; m_debugBar->setButton( START_SIM_ID, false ) ; m_editor->clearExecutionMarker() ; m_simulationMode = FALSE ; |