Rename KIcon to enhance compatibility with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent a8c829b452
commit a581368f20

@ -179,7 +179,7 @@ void AcquireImageDialog::setupImageOptions(void)
page_setupImageOptions = addPage( i18n("Target Image"), page_setupImageOptions = addPage( i18n("Target Image"),
i18n("Target Image Options"), i18n("Target Image Options"),
BarIcon("image", KIcon::SizeMedium ) ); BarIcon("image", TDEIcon::SizeMedium ) );
TQVBoxLayout *vlay = new TQVBoxLayout( page_setupImageOptions, 0, spacingHint() ); TQVBoxLayout *vlay = new TQVBoxLayout( page_setupImageOptions, 0, spacingHint() );
@ -302,7 +302,7 @@ void AcquireImageDialog::setupAlbumsList(void)
page_setupAlbumsList = addPage( i18n("Selection"), page_setupAlbumsList = addPage( i18n("Selection"),
i18n("Album selection"), i18n("Album selection"),
BarIcon("folder_image", KIcon::SizeMedium ) ); BarIcon("folder_image", TDEIcon::SizeMedium ) );
TQVBoxLayout *vlay = new TQVBoxLayout( page_setupAlbumsList, 0, spacingHint() ); TQVBoxLayout *vlay = new TQVBoxLayout( page_setupAlbumsList, 0, spacingHint() );

@ -35,9 +35,9 @@ namespace KIPICalendarPlugin {
CalEvents::CalEvents(TQWidget *parent, const char *name) CalEvents::CalEvents(TQWidget *parent, const char *name)
: CalEventsBase(parent, name) : CalEventsBase(parent, name)
{ {
KIconLoader * icons = new KIconLoader( TQString( "MenuDlg" ) ); TDEIconLoader * icons = new TDEIconLoader( TQString( "MenuDlg" ) );
ohBtn->setPixmap( icons->loadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); ohBtn->setPixmap( icons->loadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) );
fhBtn->setPixmap( icons->loadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); fhBtn->setPixmap( icons->loadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) );
} }

@ -66,8 +66,8 @@ MonthWidget::MonthWidget( KIPI::Interface* interface, TQWidget *parent, int mont
month_ = month; month_ = month;
imagePath_ = TQString(""); imagePath_ = TQString("");
pixmap_ = new TQPixmap(SmallIcon("file_broken", pixmap_ = new TQPixmap(SmallIcon("file_broken",
KIcon::SizeMedium, TDEIcon::SizeMedium,
KIcon::DisabledState)); TDEIcon::DisabledState));
setFixedSize(TQSize(70,90)); setFixedSize(TQSize(70,90));
setFrameStyle(TQFrame::Panel|TQFrame::Raised); setFrameStyle(TQFrame::Panel|TQFrame::Raised);
} }
@ -125,8 +125,8 @@ void MonthWidget::setImage( const KURL &url )
imagePath_ = url; imagePath_ = url;
CalSettings::instance()->setImage(month_, imagePath_); CalSettings::instance()->setImage(month_, imagePath_);
KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
TQPixmap pix = iconLoader->loadIcon("image", KIcon::NoGroup, 64 ); TQPixmap pix = iconLoader->loadIcon("image", TDEIcon::NoGroup, 64 );
if ( pixmap_ ) if ( pixmap_ )
delete pixmap_; delete pixmap_;
pixmap_ = new TQPixmap( pix ); pixmap_ = new TQPixmap( pix );
@ -184,8 +184,8 @@ void MonthWidget::mouseReleaseEvent(TQMouseEvent* e)
CalSettings::instance()->setImage(month_,imagePath_); CalSettings::instance()->setImage(month_,imagePath_);
delete pixmap_; delete pixmap_;
pixmap_ = new TQPixmap(SmallIcon("file_broken", pixmap_ = new TQPixmap(SmallIcon("file_broken",
KIcon::SizeMedium, TDEIcon::SizeMedium,
KIcon::DisabledState)); TDEIcon::DisabledState));
update(); update();
} }
} }

@ -138,7 +138,7 @@ void CDArchivingDialog::slotHelp()
void CDArchivingDialog::setupSelection(void) void CDArchivingDialog::setupSelection(void)
{ {
page_setupSelection = addPage(i18n("Selection"), i18n("Album Selection"), page_setupSelection = addPage(i18n("Selection"), i18n("Album Selection"),
BarIcon("folder_image", KIcon::SizeMedium)); BarIcon("folder_image", TDEIcon::SizeMedium));
TQVBoxLayout *layout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() ); TQVBoxLayout *layout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() );
m_imageCollectionSelector = new KIPI::ImageCollectionSelector(page_setupSelection, m_interface); m_imageCollectionSelector = new KIPI::ImageCollectionSelector(page_setupSelection, m_interface);
@ -180,7 +180,7 @@ void CDArchivingDialog::setupLookPage(void)
{ {
TQString whatsThis; TQString whatsThis;
page_setupLook = addPage( i18n("HTML Interface"), i18n("HTML Interface Look"), page_setupLook = addPage( i18n("HTML Interface"), i18n("HTML Interface Look"),
BarIcon("html", KIcon::SizeMedium ) ); BarIcon("html", TDEIcon::SizeMedium ) );
TQVBoxLayout *vlay = new TQVBoxLayout( page_setupLook, 0, spacingHint() ); TQVBoxLayout *vlay = new TQVBoxLayout( page_setupLook, 0, spacingHint() );
@ -416,7 +416,7 @@ void CDArchivingDialog::setupLookPage(void)
void CDArchivingDialog::setupCDInfos(void) void CDArchivingDialog::setupCDInfos(void)
{ {
page_CDInfos = addPage( i18n("Volume Descriptor"), i18n("Media Volume Descriptor"), page_CDInfos = addPage( i18n("Volume Descriptor"), i18n("Media Volume Descriptor"),
BarIcon("cd", KIcon::SizeMedium ) ); BarIcon("cd", TDEIcon::SizeMedium ) );
TQVBoxLayout *vlay = new TQVBoxLayout( page_CDInfos, 0, spacingHint() ); TQVBoxLayout *vlay = new TQVBoxLayout( page_CDInfos, 0, spacingHint() );
@ -500,7 +500,7 @@ void CDArchivingDialog::setupBurning(void)
{ {
page_burning = addPage( i18n("Media Burning"), page_burning = addPage( i18n("Media Burning"),
i18n("CD/DVD Burning Setup"), i18n("CD/DVD Burning Setup"),
BarIcon("cdwriter_unmount", KIcon::SizeMedium ) ); BarIcon("cdwriter_unmount", TDEIcon::SizeMedium ) );
TQVBoxLayout *vlay = new TQVBoxLayout( page_burning, 0, spacingHint() ); TQVBoxLayout *vlay = new TQVBoxLayout( page_burning, 0, spacingHint() );

@ -124,7 +124,7 @@ void FindDuplicateDialog::setupSelection(void)
{ {
page_setupSelection = addPage(i18n("Selection"), page_setupSelection = addPage(i18n("Selection"),
i18n("Album's Selection"), i18n("Album's Selection"),
BarIcon("folder_image", KIcon::SizeMedium)); BarIcon("folder_image", TDEIcon::SizeMedium));
TQVBoxLayout *layout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() ); TQVBoxLayout *layout = new TQVBoxLayout(page_setupSelection, 0, spacingHint() );
m_imageCollectionSelector = new KIPI::ImageCollectionSelector(page_setupSelection, m_interface); m_imageCollectionSelector = new KIPI::ImageCollectionSelector(page_setupSelection, m_interface);
@ -138,7 +138,7 @@ void FindDuplicateDialog::setupPageMethod(void)
{ {
TQString whatsThis; TQString whatsThis;
page_setupMethod = addPage( i18n("Method & Cache"), i18n("Find-Duplicates Method & Cache Configuration"), page_setupMethod = addPage( i18n("Method & Cache"), i18n("Find-Duplicates Method & Cache Configuration"),
BarIcon("run", KIcon::SizeMedium ) ); BarIcon("run", TDEIcon::SizeMedium ) );
TQVBoxLayout *vlay = new TQVBoxLayout( page_setupMethod, 0, spacingHint() ); TQVBoxLayout *vlay = new TQVBoxLayout( page_setupMethod, 0, spacingHint() );

@ -334,8 +334,8 @@ void FlickrWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
//m_photoView->write( "<html></html>" ); //m_photoView->write( "<html></html>" );
//m_photoView->end(); //m_photoView->end();
KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 ); TQPixmap pix = iconLoader->loadIcon( "folder", TDEIcon::NoGroup, 32 );
typedef TQValueList<GAlbum> GAlbumList; typedef TQValueList<GAlbum> GAlbumList;
GAlbumList::const_iterator iter; GAlbumList::const_iterator iter;

@ -58,7 +58,7 @@ namespace KIPIFlickrExportPlugin
ImagesListViewItem::ImagesListViewItem(TQListView *view, const KURL& url) ImagesListViewItem::ImagesListViewItem(TQListView *view, const KURL& url)
: TQListViewItem(view) : TQListViewItem(view)
{ {
setThumb(SmallIcon("file_broken", ICONSIZE, KIcon::DisabledState)); setThumb(SmallIcon("file_broken", ICONSIZE, TDEIcon::DisabledState));
setUrl(url); setUrl(url);
} }

@ -282,8 +282,8 @@ void GalleryWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
m_photoView->write( "<html></html>" ); m_photoView->write( "<html></html>" );
m_photoView->end(); m_photoView->end();
KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 ); TQPixmap pix = iconLoader->loadIcon( "folder", TDEIcon::NoGroup, 32 );
typedef TQValueList<GAlbum> GAlbumList; typedef TQValueList<GAlbum> GAlbumList;
GAlbumList::const_iterator iter; GAlbumList::const_iterator iter;

@ -72,7 +72,7 @@ GPSListViewItem::GPSListViewItem(TDEListView *view, TQListViewItem *after, const
d->url = url; d->url = url;
setEnabled(false); setEnabled(false);
setPixmap(0, SmallIcon( "file_broken", KIcon::SizeLarge, KIcon::DisabledState )); setPixmap(0, SmallIcon( "file_broken", TDEIcon::SizeLarge, TDEIcon::DisabledState ));
setText(1, d->url.fileName()); setText(1, d->url.fileName());
KExiv2Iface::KExiv2 exiv2Iface; KExiv2Iface::KExiv2 exiv2Iface;

@ -103,7 +103,7 @@ UploadDialog::UploadDialog(
TQWhatsThis::add( m_renameAlbumButton, i18n("Rename the selected photo album on the iPod.")); TQWhatsThis::add( m_renameAlbumButton, i18n("Rename the selected photo album on the iPod."));
TQLabel *ipod_icon = new TQLabel( buttons ); TQLabel *ipod_icon = new TQLabel( buttons );
ipod_icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( "ipod", KIcon::Desktop, KIcon::SizeHuge ) ); ipod_icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( "ipod", TDEIcon::Desktop, TDEIcon::SizeHuge ) );
m_ipodPreview = new TQLabel( buttons ); m_ipodPreview = new TQLabel( buttons );
m_ipodPreview->setFixedHeight( 80 ); m_ipodPreview->setFixedHeight( 80 );
@ -148,7 +148,7 @@ UploadDialog::UploadDialog(
TQWhatsThis::add( m_imagePreview, i18n( "The preview of the selected image in the list." ) ); TQWhatsThis::add( m_imagePreview, i18n( "The preview of the selected image in the list." ) );
TQLabel *hdd_icon = new TQLabel( urlBox ); TQLabel *hdd_icon = new TQLabel( urlBox );
hdd_icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( "system", KIcon::Desktop, KIcon::SizeHuge ) ); hdd_icon->setPixmap( TDEGlobal::iconLoader()->loadIcon( "system", TDEIcon::Desktop, TDEIcon::SizeHuge ) );
uploadPaneLayout->addWidget( m_imagePreview ); uploadPaneLayout->addWidget( m_imagePreview );
uploadPaneLayout->addStretch( 1 ); uploadPaneLayout->addStretch( 1 );
@ -207,7 +207,7 @@ UploadDialog::getIpodAlbums()
Itdb_PhotoAlbum *ipodAlbum = (Itdb_PhotoAlbum *)it->data; Itdb_PhotoAlbum *ipodAlbum = (Itdb_PhotoAlbum *)it->data;
debug() << " found album: " << ipodAlbum->name << endl; debug() << " found album: " << ipodAlbum->name << endl;
last = new IpodAlbumItem( m_ipodAlbumList, last, ipodAlbum ); last = new IpodAlbumItem( m_ipodAlbumList, last, ipodAlbum );
last->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "folder", KIcon::Toolbar, KIcon::SizeSmall ) ); last->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "folder", TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
getIpodAlbumPhotos( last, ipodAlbum ); getIpodAlbumPhotos( last, ipodAlbum );
} }
} }
@ -225,7 +225,7 @@ UploadDialog::getIpodAlbumPhotos( IpodAlbumItem *item, Itdb_PhotoAlbum *album )
gint photo_id = photo->id; gint photo_id = photo->id;
last = new IpodPhotoItem( item, last, photo ); last = new IpodPhotoItem( item, last, photo );
last->setText( 0, TQString::number( photo_id ) ); last->setText( 0, TQString::number( photo_id ) );
last->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "image", KIcon::Toolbar, KIcon::SizeSmall ) ); last->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "image", TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
} }
} }
@ -469,7 +469,7 @@ UploadDialog::createIpodAlbum()
Itdb_PhotoAlbum *photoAlbum = itdb_photodb_photoalbum_create( m_itdb, TQFile::encodeName( newAlbum ), -1/*end*/ ); Itdb_PhotoAlbum *photoAlbum = itdb_photodb_photoalbum_create( m_itdb, TQFile::encodeName( newAlbum ), -1/*end*/ );
// add the new album to the list view // add the new album to the list view
IpodAlbumItem *i = new IpodAlbumItem( m_ipodAlbumList, last, photoAlbum ); IpodAlbumItem *i = new IpodAlbumItem( m_ipodAlbumList, last, photoAlbum );
i->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "folder", KIcon::Toolbar, KIcon::SizeSmall ) ); i->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "folder", TDEIcon::Toolbar, TDEIcon::SizeSmall ) );
m_ipodAlbumList->clearSelection(); m_ipodAlbumList->clearSelection();
m_ipodAlbumList->setSelected( i, true ); m_ipodAlbumList->setSelected( i, true );

@ -52,9 +52,9 @@ DMessageBox::DMessageBox() : TQWidget(0, 0, WShowModal | WStyle_DialogBorder| WD
TQHBox *hbox = new TQHBox(this); TQHBox *hbox = new TQHBox(this);
hbox->setSpacing(5); hbox->setSpacing(5);
TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon("error", TQPixmap pix = TDEApplication::kApplication()->iconLoader()->loadIcon("error",
KIcon::NoGroup, TDEIcon::NoGroup,
KIcon::SizeMedium, TDEIcon::SizeMedium,
KIcon::DefaultState, TDEIcon::DefaultState,
0, true); 0, true);
TQLabel *pixLabel = new TQLabel(hbox); TQLabel *pixLabel = new TQLabel(hbox);
pixLabel->setPixmap(pix); pixLabel->setPixmap(pix);

@ -136,27 +136,27 @@ EXIFEditDialog::EXIFEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interfac
// --------------------------------------------------------------- // ---------------------------------------------------------------
d->page_caption = addPage(i18n("Caption"), i18n("Caption Information"), d->page_caption = addPage(i18n("Caption"), i18n("Caption Information"),
BarIcon("editclear", KIcon::SizeMedium)); BarIcon("editclear", TDEIcon::SizeMedium));
d->captionPage = new EXIFCaption(d->page_caption); d->captionPage = new EXIFCaption(d->page_caption);
d->page_datetime = addPage(i18n("Date & Time"), i18n("Date and Time"), d->page_datetime = addPage(i18n("Date & Time"), i18n("Date and Time"),
BarIcon("today", KIcon::SizeMedium)); BarIcon("today", TDEIcon::SizeMedium));
d->datetimePage = new EXIFDateTime(d->page_datetime); d->datetimePage = new EXIFDateTime(d->page_datetime);
d->page_lens = addPage(i18n("Lens"), i18n("Lens Settings"), d->page_lens = addPage(i18n("Lens"), i18n("Lens Settings"),
BarIcon("camera", KIcon::SizeMedium)); BarIcon("camera", TDEIcon::SizeMedium));
d->lensPage = new EXIFLens(d->page_lens); d->lensPage = new EXIFLens(d->page_lens);
d->page_device = addPage(i18n("Device"), i18n("Capture Device Settings"), d->page_device = addPage(i18n("Device"), i18n("Capture Device Settings"),
BarIcon("scanner", KIcon::SizeMedium)); BarIcon("scanner", TDEIcon::SizeMedium));
d->devicePage = new EXIFDevice(d->page_device); d->devicePage = new EXIFDevice(d->page_device);
d->page_light = addPage(i18n("Light"), i18n("Light Source Information"), d->page_light = addPage(i18n("Light"), i18n("Light Source Information"),
BarIcon("idea", KIcon::SizeMedium)); BarIcon("idea", TDEIcon::SizeMedium));
d->lightPage = new EXIFLight(d->page_light); d->lightPage = new EXIFLight(d->page_light);
d->page_adjust = addPage(i18n("Adjustments"), i18n("Pictures Adjustments"), d->page_adjust = addPage(i18n("Adjustments"), i18n("Pictures Adjustments"),
BarIcon("blend", KIcon::SizeMedium)); BarIcon("blend", TDEIcon::SizeMedium));
d->adjustPage = new EXIFAdjust(d->page_adjust); d->adjustPage = new EXIFAdjust(d->page_adjust);
// --------------------------------------------------------------- // ---------------------------------------------------------------

@ -144,35 +144,35 @@ IPTCEditDialog::IPTCEditDialog(TQWidget* parent, KURL::List urls, KIPI::Interfac
// --------------------------------------------------------------- // ---------------------------------------------------------------
d->page_caption = addPage(i18n("Caption"), i18n("Caption Information"), d->page_caption = addPage(i18n("Caption"), i18n("Caption Information"),
BarIcon("editclear", KIcon::SizeMedium)); BarIcon("editclear", TDEIcon::SizeMedium));
d->captionPage = new IPTCCaption(d->page_caption); d->captionPage = new IPTCCaption(d->page_caption);
d->page_datetime = addPage(i18n("Date & Time"), i18n("Date and Time Information"), d->page_datetime = addPage(i18n("Date & Time"), i18n("Date and Time Information"),
BarIcon("today", KIcon::SizeMedium)); BarIcon("today", TDEIcon::SizeMedium));
d->datetimePage = new IPTCDateTime(d->page_datetime); d->datetimePage = new IPTCDateTime(d->page_datetime);
d->page_subjects = addPage(i18n("Subjects"), i18n("Subjects Information"), d->page_subjects = addPage(i18n("Subjects"), i18n("Subjects Information"),
BarIcon("cookie", KIcon::SizeMedium)); BarIcon("cookie", TDEIcon::SizeMedium));
d->subjectsPage = new IPTCSubjects(d->page_subjects); d->subjectsPage = new IPTCSubjects(d->page_subjects);
d->page_keywords = addPage(i18n("Keywords"), i18n("Keywords Information"), d->page_keywords = addPage(i18n("Keywords"), i18n("Keywords Information"),
BarIcon("bookmark", KIcon::SizeMedium)); BarIcon("bookmark", TDEIcon::SizeMedium));
d->keywordsPage = new IPTCKeywords(d->page_keywords); d->keywordsPage = new IPTCKeywords(d->page_keywords);
d->page_categories = addPage(i18n("Categories"), i18n("Categories Information"), d->page_categories = addPage(i18n("Categories"), i18n("Categories Information"),
BarIcon("bookmark_folder", KIcon::SizeMedium)); BarIcon("bookmark_folder", TDEIcon::SizeMedium));
d->categoriesPage = new IPTCCategories(d->page_categories); d->categoriesPage = new IPTCCategories(d->page_categories);
d->page_credits = addPage(i18n("Credits"), i18n("Credits Information"), d->page_credits = addPage(i18n("Credits"), i18n("Credits Information"),
BarIcon("identity", KIcon::SizeMedium)); BarIcon("identity", TDEIcon::SizeMedium));
d->creditsPage = new IPTCCredits(d->page_credits); d->creditsPage = new IPTCCredits(d->page_credits);
d->page_status = addPage(i18n("Status"), i18n("Status Information"), d->page_status = addPage(i18n("Status"), i18n("Status Information"),
BarIcon("messagebox_info", KIcon::SizeMedium)); BarIcon("messagebox_info", TDEIcon::SizeMedium));
d->statusPage = new IPTCStatus(d->page_status); d->statusPage = new IPTCStatus(d->page_status);
d->page_origin = addPage(i18n("Origin"), i18n("Origin Information"), d->page_origin = addPage(i18n("Origin"), i18n("Origin Information"),
BarIcon("www", KIcon::SizeMedium)); BarIcon("www", TDEIcon::SizeMedium));
d->originPage = new IPTCOrigin(d->page_origin); d->originPage = new IPTCOrigin(d->page_origin);
// --------------------------------------------------------------- // ---------------------------------------------------------------

@ -188,7 +188,7 @@ KImg2mpgData::KImg2mpgData(KIPI::Interface* interface, TQWidget *parent, const c
m_Encoding = false; m_Encoding = false;
m_Abort = false; m_Abort = false;
m_Icons = new KIconLoader( TQString( "kipi" ) ); m_Icons = new TDEIconLoader( TQString( "kipi" ) );
m_NoneLabel = i18n ("none"); m_NoneLabel = i18n ("none");
// Set buttons icon // Set buttons icon
@ -951,7 +951,7 @@ void KImg2mpgData::EncodeDone(TDEProcess*)
TQPixmap KImg2mpgData::LoadIcon( TQString Name, int Group ) TQPixmap KImg2mpgData::LoadIcon( TQString Name, int Group )
{ {
return m_Icons->loadIcon( Name, (KIcon::Group)Group ); return m_Icons->loadIcon( Name, (TDEIcon::Group)Group );
} }

@ -61,7 +61,7 @@ class TQPixmap;
class TDEConfig; class TDEConfig;
class TDEProcess; class TDEProcess;
class KLineEdit; class KLineEdit;
class KIconLoader; class TDEIconLoader;
class KColorButton; class KColorButton;
class TDEListBox; class TDEListBox;
class KButtonBox; class KButtonBox;
@ -167,7 +167,7 @@ private:
TDEProcess* m_Proc; TDEProcess* m_Proc;
KIconLoader* m_Icons; TDEIconLoader* m_Icons;
KIPI::Interface* m_interface; KIPI::Interface* m_interface;

@ -51,7 +51,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent)
: KDialogBase( parent, "MPEGEncoderOptionsDialog", true, : KDialogBase( parent, "MPEGEncoderOptionsDialog", true,
i18n("MPEG Encoder Plugin Settings"), Ok|Cancel, Ok, false) i18n("MPEG Encoder Plugin Settings"), Ok|Cancel, Ok, false)
{ {
Icons = new KIconLoader( TQString( "MenuDlg" ) ); Icons = new TDEIconLoader( TQString( "MenuDlg" ) );
TQWidget* box = new TQWidget( this ); TQWidget* box = new TQWidget( this );
setMainWidget(box); setMainWidget(box);
@ -68,7 +68,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent)
IMBinFolderEditFilename = new KLineEdit( IMBinFolderGroup ); IMBinFolderEditFilename = new KLineEdit( IMBinFolderGroup );
IMBinFolderEditFilename->setMinimumWidth( 300 ); IMBinFolderEditFilename->setMinimumWidth( 300 );
TQPushButton* IMBinFolderButtonFilename = new TQPushButton( IMBinFolderGroup ); TQPushButton* IMBinFolderButtonFilename = new TQPushButton( IMBinFolderGroup );
IMBinFolderButtonFilename->setPixmap( LoadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); IMBinFolderButtonFilename->setPixmap( LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) );
connect( IMBinFolderButtonFilename, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotIMBinFolderFilenameDialog())); connect( IMBinFolderButtonFilename, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotIMBinFolderFilenameDialog()));
// MjpegTools binary programs folder // MjpegTools binary programs folder
@ -78,7 +78,7 @@ OptionsDialog::OptionsDialog(TQWidget *parent)
MJBinFolderEditFilename = new KLineEdit( MJBinFolderGroup ); MJBinFolderEditFilename = new KLineEdit( MJBinFolderGroup );
MJBinFolderEditFilename->setMinimumWidth( 300 ); MJBinFolderEditFilename->setMinimumWidth( 300 );
TQPushButton* MJBinFolderButtonFilename = new TQPushButton( MJBinFolderGroup ); TQPushButton* MJBinFolderButtonFilename = new TQPushButton( MJBinFolderGroup );
MJBinFolderButtonFilename->setPixmap( LoadIcon( TQString( "fileopen" ), KIcon::Toolbar ) ); MJBinFolderButtonFilename->setPixmap( LoadIcon( TQString( "fileopen" ), TDEIcon::Toolbar ) );
connect( MJBinFolderButtonFilename, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMJBinFolderFilenameDialog())); connect( MJBinFolderButtonFilename, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotMJBinFolderFilenameDialog()));
} }
@ -94,7 +94,7 @@ OptionsDialog::~OptionsDialog()
TQPixmap OptionsDialog::LoadIcon( TQString Name, int Group ) TQPixmap OptionsDialog::LoadIcon( TQString Name, int Group )
{ {
return Icons->loadIcon( Name, (KIcon::Group)Group ); return Icons->loadIcon( Name, (TDEIcon::Group)Group );
} }
////////////////////////////////// SLOTS //////////////////////////////////////////////////// ////////////////////////////////// SLOTS ////////////////////////////////////////////////////

@ -33,7 +33,7 @@
#include <kdialogbase.h> #include <kdialogbase.h>
class KLineEdit; class KLineEdit;
class KIconLoader; class TDEIconLoader;
namespace KIPIMPEGEncoderPlugin namespace KIPIMPEGEncoderPlugin
{ {
@ -55,7 +55,7 @@ Q_OBJECT
void slotMJBinFolderFilenameDialog(void); void slotMJBinFolderFilenameDialog(void);
private: private:
KIconLoader* Icons; TDEIconLoader* Icons;
TQPixmap LoadIcon( TQString Name, int Group ); TQPixmap LoadIcon( TQString Name, int Group );
}; };

@ -386,7 +386,7 @@ void BatchDialog::addItems(const TQStringList& itemList)
KURL::List urlList; KURL::List urlList;
TQPixmap pix(SmallIcon( "file_broken", KIcon::SizeLarge, KIcon::DisabledState )); TQPixmap pix(SmallIcon( "file_broken", TDEIcon::SizeLarge, TDEIcon::DisabledState ));
for (TQStringList::const_iterator it = itemList.begin(); for (TQStringList::const_iterator it = itemList.begin();
it != itemList.end(); ++it) it != itemList.end(); ++it)

@ -250,7 +250,7 @@ void SendImagesDialog::setupImagesList(void)
page_setupImagesList = addPage(i18n("Images"), page_setupImagesList = addPage(i18n("Images"),
i18n("Images to EMail"), i18n("Images to EMail"),
BarIcon("image", KIcon::SizeMedium)); BarIcon("image", TDEIcon::SizeMedium));
TQVBoxLayout *vlay = new TQVBoxLayout( page_setupImagesList, 0, spacingHint() ); TQVBoxLayout *vlay = new TQVBoxLayout( page_setupImagesList, 0, spacingHint() );
@ -363,7 +363,7 @@ void SendImagesDialog::setupEmailOptions(void)
page_setupEmailOptions = addPage(i18n("Mail"), page_setupEmailOptions = addPage(i18n("Mail"),
i18n("Mail Options"), i18n("Mail Options"),
BarIcon("mail_generic", KIcon::SizeMedium)); BarIcon("mail_generic", TDEIcon::SizeMedium));
TQVBoxLayout *vlay = new TQVBoxLayout( page_setupEmailOptions, 0, spacingHint() ); TQVBoxLayout *vlay = new TQVBoxLayout( page_setupEmailOptions, 0, spacingHint() );

@ -169,7 +169,7 @@ void SVEDialog::writeConfig()
void SVEDialog::selectionPage() void SVEDialog::selectionPage()
{ {
m_selectionPage = addPage(i18n("Selection"), i18n("Album Selection"), m_selectionPage = addPage(i18n("Selection"), i18n("Album Selection"),
BarIcon("folder_image", KIcon::SizeMedium)); BarIcon("folder_image", TDEIcon::SizeMedium));
TQVBoxLayout *layout = new TQVBoxLayout( m_selectionPage, 0, spacingHint() ); TQVBoxLayout *layout = new TQVBoxLayout( m_selectionPage, 0, spacingHint() );
m_imageCollectionSelector = new KIPI::ImageCollectionSelector( m_selectionPage, m_interface ); m_imageCollectionSelector = new KIPI::ImageCollectionSelector( m_selectionPage, m_interface );
@ -179,7 +179,7 @@ void SVEDialog::selectionPage()
void SVEDialog::lookPage() void SVEDialog::lookPage()
{ {
m_lookPage = addPage(i18n("Look"), i18n("Page Look"), m_lookPage = addPage(i18n("Look"), i18n("Page Look"),
BarIcon("colors", KIcon::SizeMedium)); BarIcon("colors", TDEIcon::SizeMedium));
TQVBoxLayout *mainLayout = new TQVBoxLayout(m_lookPage, 0, spacingHint()); TQVBoxLayout *mainLayout = new TQVBoxLayout(m_lookPage, 0, spacingHint());
TQVGroupBox *vgroupbox; TQVGroupBox *vgroupbox;
@ -272,7 +272,7 @@ void SVEDialog::lookPage()
void SVEDialog::generalPage() void SVEDialog::generalPage()
{ {
m_generalPage = addPage(i18n("General"), i18n("General Setup"), m_generalPage = addPage(i18n("General"), i18n("General Setup"),
BarIcon("html", KIcon::SizeMedium)); BarIcon("html", TDEIcon::SizeMedium));
TQVBoxLayout *mainLayout = new TQVBoxLayout(m_generalPage, 0, spacingHint()); TQVBoxLayout *mainLayout = new TQVBoxLayout(m_generalPage, 0, spacingHint());

@ -51,11 +51,11 @@ ToolBar::ToolBar(TQWidget* parent)
m_stopBtn = new TQToolButton(this); m_stopBtn = new TQToolButton(this);
m_playBtn->setToggleButton(true); m_playBtn->setToggleButton(true);
KIconLoader* loader = kapp->iconLoader(); TDEIconLoader* loader = kapp->iconLoader();
m_playBtn->setIconSet(loader->loadIcon("player_pause", KIcon::NoGroup, 22)); m_playBtn->setIconSet(loader->loadIcon("player_pause", TDEIcon::NoGroup, 22));
m_prevBtn->setIconSet(loader->loadIcon("back", KIcon::NoGroup, 22)); m_prevBtn->setIconSet(loader->loadIcon("back", TDEIcon::NoGroup, 22));
m_nextBtn->setIconSet(loader->loadIcon("forward", KIcon::NoGroup, 22)); m_nextBtn->setIconSet(loader->loadIcon("forward", TDEIcon::NoGroup, 22));
m_stopBtn->setIconSet(loader->loadIcon("stop", KIcon::NoGroup, 22)); m_stopBtn->setIconSet(loader->loadIcon("stop", TDEIcon::NoGroup, 22));
lay->addWidget(m_playBtn); lay->addWidget(m_playBtn);
lay->addWidget(m_prevBtn); lay->addWidget(m_prevBtn);
@ -129,15 +129,15 @@ void ToolBar::slotPlayBtnToggled()
if (m_playBtn->isOn()) if (m_playBtn->isOn())
{ {
m_canHide = false; m_canHide = false;
KIconLoader* loader = kapp->iconLoader(); TDEIconLoader* loader = kapp->iconLoader();
m_playBtn->setIconSet(loader->loadIcon("player_play", KIcon::NoGroup, 22)); m_playBtn->setIconSet(loader->loadIcon("player_play", TDEIcon::NoGroup, 22));
emit signalPause(); emit signalPause();
} }
else else
{ {
m_canHide = true; m_canHide = true;
KIconLoader* loader = kapp->iconLoader(); TDEIconLoader* loader = kapp->iconLoader();
m_playBtn->setIconSet(loader->loadIcon("player_pause", KIcon::NoGroup, 22)); m_playBtn->setIconSet(loader->loadIcon("player_pause", TDEIcon::NoGroup, 22));
emit signalPlay(); emit signalPlay();
} }
} }
@ -148,8 +148,8 @@ void ToolBar::slotNexPrevClicked()
{ {
m_playBtn->setOn(true); m_playBtn->setOn(true);
m_canHide = false; m_canHide = false;
KIconLoader* loader = kapp->iconLoader(); TDEIconLoader* loader = kapp->iconLoader();
m_playBtn->setIconSet(loader->loadIcon("player_play", KIcon::NoGroup, 22)); m_playBtn->setIconSet(loader->loadIcon("player_play", TDEIcon::NoGroup, 22));
emit signalPause(); emit signalPause();
} }
} }

@ -267,8 +267,8 @@ void GalleryWindow::slotAlbums( const TQValueList<GAlbum>& albumList )
m_photoView->write( "<html></html>" ); m_photoView->write( "<html></html>" );
m_photoView->end(); m_photoView->end();
KIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader(); TDEIconLoader* iconLoader = TDEApplication::kApplication()->iconLoader();
TQPixmap pix = iconLoader->loadIcon( "folder", KIcon::NoGroup, 32 ); TQPixmap pix = iconLoader->loadIcon( "folder", TDEIcon::NoGroup, 32 );
typedef TQValueList<GAlbum> GAlbumList; typedef TQValueList<GAlbum> GAlbumList;
GAlbumList::const_iterator iter; GAlbumList::const_iterator iter;

Loading…
Cancel
Save