summaryrefslogtreecommitdiffstats
path: root/kooka
diff options
context:
space:
mode:
Diffstat (limited to 'kooka')
-rw-r--r--kooka/kookapref.cpp8
-rw-r--r--kooka/kookaview.cpp16
-rw-r--r--kooka/main.cpp6
-rw-r--r--kooka/scanpackager.cpp20
-rw-r--r--kooka/thumbview.cpp2
-rw-r--r--kooka/thumbview.h4
6 files changed, 28 insertions, 28 deletions
diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp
index 5513455f..32477e67 100644
--- a/kooka/kookapref.cpp
+++ b/kooka/kookapref.cpp
@@ -75,7 +75,7 @@ void KookaPreferences::setupOCRPage()
konf->setGroup( CFG_GROUP_OCR_DIA );
TQFrame *page = addPage( i18n("OCR"), i18n("Optical Character Recognition" ),
- BarIcon("ocrImage", KIcon::SizeMedium ) );
+ BarIcon("ocrImage", TDEIcon::SizeMedium ) );
TQVBoxLayout *top = new TQVBoxLayout( page, 0, spacingHint() );
@@ -309,7 +309,7 @@ void KookaPreferences::setupStartupPage()
konf->setGroup( GROUP_STARTUP );
TQFrame *page = addPage( i18n("Startup"), i18n("Kooka Startup Preferences" ),
- BarIcon("gear", KIcon::SizeMedium ) );
+ BarIcon("gear", TDEIcon::SizeMedium ) );
TQVBoxLayout *top = new TQVBoxLayout( page, 0, spacingHint() );
/* Description-Label */
top->addWidget( new TQLabel( i18n("Note that changing these options will affect Kooka's next start!"), page ));
@@ -351,7 +351,7 @@ void KookaPreferences::setupSaveFormatPage( )
{
konf->setGroup( OP_FILE_GROUP );
TQFrame *page = addPage( i18n("Image Saving"), i18n("Configure Image Save Assistant" ),
- BarIcon("filesave", KIcon::SizeMedium ) );
+ BarIcon("filesave", TDEIcon::SizeMedium ) );
TQVBoxLayout *top = new TQVBoxLayout( page, 0, spacingHint() );
/* Skip the format asking if a format entry exists */
@@ -377,7 +377,7 @@ void KookaPreferences::setupThumbnailPage()
konf->setGroup( THUMB_GROUP );
TQFrame *page = addPage( i18n("Thumbnail View"), i18n("Thumbnail Gallery View" ),
- BarIcon("thumbnail", KIcon::SizeMedium ) );
+ BarIcon("thumbnail", TDEIcon::SizeMedium ) );
TQVBoxLayout *top = new TQVBoxLayout( page, 0, spacingHint() );
top->addWidget( new TQLabel( i18n("Here you can configure the appearance of the thumbnail view of your scan picture gallery."),page ));
diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp
index d7a32f80..23ebdb2d 100644
--- a/kooka/kookaview.cpp
+++ b/kooka/kookaview.cpp
@@ -96,12 +96,12 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
m_mainWindow(parent),
m_ocrResEdit(0)
{
- KIconLoader *loader = TDEGlobal::iconLoader();
+ TDEIconLoader *loader = TDEGlobal::iconLoader();
scan_params = 0L;
preview_canvas = 0L;
m_mainDock = parent->createDockWidget( "Kookas MainDock",
- loader->loadIcon( "folder_image", KIcon::Small ),
+ loader->loadIcon( "folder_image", TDEIcon::Small ),
0L, i18n("Image Viewer"));
m_mainDock->setEnableDocking(KDockWidget::DockNone );
m_mainDock->setDockSite( KDockWidget::DockFullSite );
@@ -122,7 +122,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
/** Thumbview **/
m_dockThumbs = parent->createDockWidget( "Thumbs",
- loader->loadIcon( "thumbnail", KIcon::Small ),
+ loader->loadIcon( "thumbnail", TDEIcon::Small ),
0L, i18n("Thumbnails"));
m_dockThumbs->setDockSite(KDockWidget::DockFullSite );
@@ -137,7 +137,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
/** Packager Dock **/
/* A new packager to contain the already scanned images */
m_dockPackager = parent->createDockWidget( "Scanpackager",
- loader->loadIcon( "palette_color", KIcon::Small ),
+ loader->loadIcon( "palette_color", TDEIcon::Small ),
0L, i18n("Gallery"));
m_dockPackager->setDockSite(KDockWidget::DockFullSite);
packager = new ScanPackager( m_dockPackager );
@@ -156,7 +156,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
* Create a Kombobox that holds the last folders visible even on the preview page
*/
m_dockRecent = parent->createDockWidget( "Recent",
- loader->loadIcon( "image", KIcon::Small ),
+ loader->loadIcon( "image", TDEIcon::Small ),
0L, i18n("Gallery Folders"));
m_dockRecent->setDockSite(KDockWidget::DockFullSite);
@@ -185,7 +185,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
/* the object from the kscan lib to handle low level scanning */
m_dockScanParam = parent->createDockWidget( "Scan Parameter",
- loader->loadIcon( "folder", KIcon::Small ),
+ loader->loadIcon( "folder", TDEIcon::Small ),
0L, i18n("Scan Parameter"));
//
m_dockScanParam->setDockSite(KDockWidget::DockFullSite);
@@ -204,7 +204,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
* scan_params must be zero for that */
m_dockPreview = parent->createDockWidget( "Preview ",
- loader->loadIcon( "viewmag", KIcon::Small ),
+ loader->loadIcon( "viewmag", TDEIcon::Small ),
0L, i18n("Scan Preview"));
preview_canvas = new Previewer( m_dockPreview );
@@ -223,7 +223,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
/* Create a text editor part for ocr results */
m_dockOCRText = parent->createDockWidget( "OCRResults",
- loader->loadIcon("edit", KIcon::Small ),
+ loader->loadIcon("edit", TDEIcon::Small ),
0L, i18n("OCR Result Text"));
// m_textEdit
m_ocrResEdit = new ocrResEdit( m_dockOCRText );
diff --git a/kooka/main.cpp b/kooka/main.cpp
index 95788ebe..df42cc9f 100644
--- a/kooka/main.cpp
+++ b/kooka/main.cpp
@@ -87,7 +87,7 @@ int main( int argc, char *argv[] )
TDEApplication app;
TDEGlobal::locale()->insertCatalogue("libkscan");
KImageIO::registerFormats();
- KIconLoader *loader = TDEGlobal::iconLoader();
+ TDEIconLoader *loader = TDEGlobal::iconLoader();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
TQCString devToUse = args->getOption( "d" );
@@ -107,8 +107,8 @@ int main( int argc, char *argv[] )
Kooka *kooka = new Kooka(devToUse);
app.setMainWidget( kooka );
- KWin::setIcons(kooka->winId(), loader->loadIcon( "scanner", KIcon::Desktop ),
- loader->loadIcon("scanner", KIcon::Small) );
+ KWin::setIcons(kooka->winId(), loader->loadIcon( "scanner", TDEIcon::Desktop ),
+ loader->loadIcon("scanner", TDEIcon::Small) );
kooka->show();
app.processEvents();
diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp
index 50fd6ed9..22339e78 100644
--- a/kooka/scanpackager.cpp
+++ b/kooka/scanpackager.cpp
@@ -117,11 +117,11 @@ ScanPackager::ScanPackager( TQWidget *parent ) : KFileTreeView( parent )
m_currImportDir = m_currCopyDir;
/* Preload frequently used icons */
- KIconLoader *loader = TDEGlobal::iconLoader();
- m_floppyPixmap = loader->loadIcon( "3floppy_unmount", KIcon::Small );
- m_grayPixmap = loader->loadIcon( "palette_gray", KIcon::Small );
- m_bwPixmap = loader->loadIcon( "palette_lineart", KIcon::Small );
- m_colorPixmap = loader->loadIcon( "palette_color", KIcon::Small );
+ TDEIconLoader *loader = TDEGlobal::iconLoader();
+ m_floppyPixmap = loader->loadIcon( "3floppy_unmount", TDEIcon::Small );
+ m_grayPixmap = loader->loadIcon( "palette_gray", TDEIcon::Small );
+ m_bwPixmap = loader->loadIcon( "palette_lineart", TDEIcon::Small );
+ m_colorPixmap = loader->loadIcon( "palette_color", TDEIcon::Small );
m_startup = true;
@@ -145,15 +145,15 @@ void ScanPackager::openRoots()
KFileTreeBranch* ScanPackager::openRoot( const KURL& root, bool )
{
- KIconLoader *loader = TDEGlobal::iconLoader();
+ TDEIconLoader *loader = TDEGlobal::iconLoader();
/* working on the global branch. FIXME */
m_defaultBranch = addBranch( root, i18n("Kooka Gallery"),
- loader->loadIcon( "folder_image", KIcon::Small ),
+ loader->loadIcon( "folder_image", TDEIcon::Small ),
false /* do not showHidden */ );
// TQ_CHECK_PTR( m_defaultBranch );
- m_defaultBranch->setOpenPixmap( loader->loadIcon( "folder_blue_open", KIcon::Small ));
+ m_defaultBranch->setOpenPixmap( loader->loadIcon( "folder_blue_open", TDEIcon::Small ));
setDirOnlyMode( m_defaultBranch, false );
m_defaultBranch->setShowExtensions( true ); // false );
@@ -581,7 +581,7 @@ void ScanPackager::loadImageForItem( KFileTreeViewItem *item )
kdDebug(28000) << "subImage-count: " << img->subImagesCount() << endl;
if( img->subImagesCount() > 1 )
{
- KIconLoader *loader = TDEGlobal::iconLoader();
+ TDEIconLoader *loader = TDEGlobal::iconLoader();
kdDebug(28000) << "SubImages existing!" << endl;
/* Start at the image with index 1, that makes one less than are actually in the
@@ -599,7 +599,7 @@ void ScanPackager::loadImageForItem( KFileTreeViewItem *item )
}
prevItem = subImgItem;
- subImgItem->setPixmap( 0, loader->loadIcon( "editcopy", KIcon::Small ));
+ subImgItem->setPixmap( 0, loader->loadIcon( "editcopy", TDEIcon::Small ));
subImgItem->setText( 0, i18n("Sub-image %1").arg( i ) );
KookaImage *subImgImg = new KookaImage( i, img );
subImgImg->setFileItem( newKfi );
diff --git a/kooka/thumbview.cpp b/kooka/thumbview.cpp
index 51134661..f202778f 100644
--- a/kooka/thumbview.cpp
+++ b/kooka/thumbview.cpp
@@ -56,7 +56,7 @@ ThumbView::ThumbView( TQWidget *parent, const char *name )
m_pixWidth = 0;
m_pixHeight = 0;
m_thumbMargin = 5;
- m_iconView = new KIconView( this, name );
+ m_iconView = new TDEIconView( this, name );
m_progress = new KProgress( this );
m_progress->hide();
diff --git a/kooka/thumbview.h b/kooka/thumbview.h
index 4dff2559..81eebccb 100644
--- a/kooka/thumbview.h
+++ b/kooka/thumbview.h
@@ -56,7 +56,7 @@ class TQListViewItem;
class KProgress;
class TDEIO::PreviewJob;
-class ThumbView: public TQVBox /* KIconView */
+class ThumbView: public TQVBox /* TDEIconView */
{
Q_OBJECT
@@ -134,7 +134,7 @@ private:
TQPixmap createPixmap( const TQPixmap& ) const;
bool deleteImage( KFileItem* );
- KIconView *m_iconView;
+ TDEIconView *m_iconView;
KProgress *m_progress;
KURL m_currentDir;
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-16 14:43:36 +0000