Browse Source

Rename KIcon to enhance compatibility with KDE4

tags/r14.0.0
Timothy Pearson 6 years ago
parent
commit
de9b6c9ad1
100 changed files with 469 additions and 469 deletions
  1. 2
    2
      kappfinder/toplevel.cpp
  2. 10
    10
      kate/app/kateconfigdialog.cpp
  3. 3
    3
      kate/app/kateexternaltools.cpp
  4. 1
    1
      kate/app/kateexternaltools.h
  5. 3
    3
      kate/app/katesavemodifieddialog.cpp
  6. 1
    1
      kate/interfaces/pluginconfiginterfaceextension.h
  7. 1
    1
      kcontrol/access/kaccess.cpp
  8. 2
    2
      kcontrol/filetypes/filetypedetails.cpp
  9. 2
    2
      kcontrol/filetypes/filetypedetails.h
  10. 1
    1
      kcontrol/filetypes/filetypesview.h
  11. 1
    1
      kcontrol/filetypes/typeslistitem.cpp
  12. 2
    2
      kcontrol/hwmanager/deviceiconview.cpp
  13. 1
    1
      kcontrol/hwmanager/deviceiconview.h
  14. 1
    1
      kcontrol/hwmanager/devicepropsdlg.cpp
  15. 87
    87
      kcontrol/icons/icons.cpp
  16. 13
    13
      kcontrol/icons/icons.h
  17. 24
    24
      kcontrol/icons/iconthemes.cpp
  18. 1
    1
      kcontrol/icons/main.cpp
  19. 1
    1
      kcontrol/icons/testicons.cpp
  20. 2
    2
      kcontrol/joystick/joywidget.cpp
  21. 3
    3
      kcontrol/kcontrol/aboutwidget.cpp
  22. 2
    2
      kcontrol/kcontrol/dockcontainer.cpp
  23. 1
    1
      kcontrol/kcontrol/global.cpp
  24. 3
    3
      kcontrol/kcontrol/global.h
  25. 2
    2
      kcontrol/kcontrol/modulemenu.cpp
  26. 4
    4
      kcontrol/kcontrol/moduletreeview.cpp
  27. 1
    1
      kcontrol/kcontrol/searchwidget.cpp
  28. 16
    16
      kcontrol/kcontrol/toplevel.cpp
  29. 6
    6
      kcontrol/kicker/menutab_impl.cpp
  30. 1
    1
      kcontrol/konsole/sessiondialog.ui
  31. 2
    2
      kcontrol/kthememanager/ktheme.cpp
  32. 8
    8
      kcontrol/kthememanager/kthememanager.cpp
  33. 4
    4
      kcontrol/kthememanager/kthememanager.h
  34. 2
    2
      kcontrol/locale/kcmlocale.cpp
  35. 2
    2
      kcontrol/style/menupreview.cpp
  36. 4
    4
      kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp
  37. 1
    1
      kcontrol/tdeio/kmanualproxydlg.cpp
  38. 1
    1
      kcontrol/tdm/tdm-appear.cpp
  39. 1
    1
      kdcop/kdcopwindow.cpp
  40. 1
    1
      kdepasswd/kcm/chfacedlg.cpp
  41. 1
    1
      kdepasswd/kcm/chfacedlg.h
  42. 1
    1
      kdepasswd/kcm/kcm_useraccount.kcfg
  43. 1
    1
      kdesktop/desktop.cc
  44. 4
    4
      kdesktop/kcustommenu.cc
  45. 4
    4
      kdesktop/kdiconview.cc
  46. 1
    1
      kdesktop/minicli.cpp
  47. 2
    2
      kdesktop/startupid.cpp
  48. 3
    3
      kdesktop/tdefileividesktop.cpp
  49. 1
    1
      kdesktop/tdefileividesktop.h
  50. 21
    21
      kdialog/kdialog.cpp
  51. 1
    1
      kfind/kftabdlg.cpp
  52. 4
    4
      kicker/applets/clock/clock.cpp
  53. 6
    6
      kicker/applets/launcher/quickbutton.cpp
  54. 1
    1
      kicker/applets/launcher/quickbutton.h
  55. 1
    1
      kicker/applets/minipager/pagerbutton.cpp
  56. 1
    1
      kicker/extensions/kasbar/ChangeLog
  57. 2
    2
      kicker/extensions/kasbar/kasaboutdlg.cpp
  58. 1
    1
      kicker/extensions/kasbar/kasbar.cpp
  59. 8
    8
      kicker/extensions/kasbar/kasgroupitem.cpp
  60. 2
    2
      kicker/extensions/kasbar/kasprefsdlg.cpp
  61. 12
    12
      kicker/extensions/kasbar/kasstartupitem.cpp
  62. 7
    7
      kicker/extensions/kasbar/kastaskitem.cpp
  63. 4
    4
      kicker/kicker/core/containerarea.cpp
  64. 2
    2
      kicker/kicker/ui/addapplet.cpp
  65. 2
    2
      kicker/kicker/ui/appletop_mnu.cpp
  66. 2
    2
      kicker/kicker/ui/browser_dlg.cpp
  67. 2
    2
      kicker/kicker/ui/browser_dlg.h
  68. 4
    4
      kicker/kicker/ui/browser_mnu.cpp
  69. 3
    3
      kicker/kicker/ui/exe_dlg.cpp
  70. 4
    4
      kicker/kicker/ui/hidebutton.cpp
  71. 3
    3
      kicker/kicker/ui/itemview.cpp
  72. 1
    1
      kicker/kicker/ui/nonKDEButtonSettings.ui
  73. 2
    2
      kicker/kicker/ui/service_mnu.cpp
  74. 8
    8
      kicker/libkicker/global.cpp
  75. 14
    14
      kicker/libkicker/panelbutton.cpp
  76. 5
    5
      kicker/libkicker/simplebutton.cpp
  77. 2
    2
      kicker/menuext/prefmenu/prefmenu.cpp
  78. 16
    16
      kicker/menuext/tom/tom.cc
  79. 2
    2
      kicker/taskbar/taskbarcontainer.cpp
  80. 7
    7
      kicker/taskbar/taskcontainer.cpp
  81. 16
    16
      kicker/taskmanager/taskmanager.cpp
  82. 7
    7
      kicker/taskmanager/taskmanager.h
  83. 1
    1
      kmenuedit/basictab.cpp
  84. 2
    2
      kmenuedit/basictab.h
  85. 1
    1
      kmenuedit/treeview.cpp
  86. 1
    1
      konqueror/ChangeLog
  87. 1
    1
      konqueror/TODO
  88. 26
    26
      konqueror/about/konq_aboutpage.cc
  89. 2
    2
      konqueror/iconview/konq_iconview.cc
  90. 2
    2
      konqueror/keditbookmarks/actionsimpl.cpp
  91. 7
    7
      konqueror/konq_combo.cc
  92. 1
    1
      konqueror/konq_guiclients.cc
  93. 1
    1
      konqueror/konq_mainwindow.cc
  94. 1
    1
      konqueror/konq_misc.cc
  95. 1
    1
      konqueror/konq_tabs.cc
  96. 1
    1
      konqueror/listview/konq_infolistviewitem.cc
  97. 1
    1
      konqueror/listview/konq_listview.cc
  98. 2
    2
      konqueror/listview/konq_listviewitems.cc
  99. 3
    3
      konqueror/listview/konq_listviewitems.h
  100. 0
    0
      konqueror/listview/konq_listviewwidget.cc

+ 2
- 2
kappfinder/toplevel.cpp View File

@@ -161,7 +161,7 @@ TQListViewItem* TopLevel::addGroupItem( TQListViewItem *parent, const TQString &

void TopLevel::slotScan()
{
KIconLoader* loader = TDEGlobal::iconLoader();
TDEIconLoader* loader = TDEGlobal::iconLoader();

mTemplates = TDEGlobal::dirs()->findAllResources( "data", "kappfinder/apps/*.desktop", true );

@@ -229,7 +229,7 @@ void TopLevel::slotScan()
else
item = new TQCheckListItem( mListView, desktop.readName(), TQCheckListItem::CheckBox );

item->setPixmap( 0, loader->loadIcon( desktop.readIcon(), KIcon::Small ) );
item->setPixmap( 0, loader->loadIcon( desktop.readIcon(), TDEIcon::Small ) );
item->setText( 1, desktop.readGenericName() );
item->setText( 2, desktop.readPathEntry( "Exec" ) );
if ( desktop.readBoolEntry( "X-StandardInstall" ) )

+ 10
- 10
kate/app/kateconfigdialog.cpp View File

@@ -89,13 +89,13 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )

path.clear();
path << i18n("Application");
setFolderIcon (path, SmallIcon("kate", KIcon::SizeSmall));
setFolderIcon (path, SmallIcon("kate", TDEIcon::SizeSmall));

path.clear();

//BEGIN General page
path << i18n("Application") << i18n("General");
TQFrame* frGeneral = addPage(path, i18n("General Options"), BarIcon("gohome", KIcon::SizeSmall));
TQFrame* frGeneral = addPage(path, i18n("General Options"), BarIcon("gohome", TDEIcon::SizeSmall));

TQVBoxLayout *lo = new TQVBoxLayout( frGeneral );
lo->setSpacing(KDialog::spacingHint());
@@ -193,7 +193,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )

//BEGIN Session page
path << i18n("Application") << i18n("Sessions");
TQFrame* frSessions = addPage(path, i18n("Session Management"), BarIcon("history", KIcon::SizeSmall));
TQFrame* frSessions = addPage(path, i18n("Session Management"), BarIcon("history", TDEIcon::SizeSmall));

lo = new TQVBoxLayout( frSessions );
lo->setSpacing(KDialog::spacingHint());
@@ -264,7 +264,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
path << i18n("Application") << i18n("File Selector");

TQVBox *page = addVBoxPage( path, i18n("File Selector Settings"),
BarIcon("fileopen", KIcon::SizeSmall) );
BarIcon("fileopen", TDEIcon::SizeSmall) );
fileSelConfigPage = new KFSConfigPage( page, "file selector config page",
mainWindow->fileselector );
connect( fileSelConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
@@ -272,7 +272,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )

path << i18n("Application") << i18n("Document List");
page = addVBoxPage( path, i18n("Document List Settings"),
BarIcon("view_text", KIcon::SizeSmall) );
BarIcon("view_text", TDEIcon::SizeSmall) );
filelistConfigPage = new KFLConfigPage( page, "file list config page",
mainWindow->filelist );
connect( filelistConfigPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
@@ -280,7 +280,7 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )

path << i18n("Application") << i18n("Plugins");
/*TQVBox **/page=addVBoxPage(path,i18n("Plugin Manager"),
BarIcon("connect_established",KIcon::SizeSmall));
BarIcon("connect_established",TDEIcon::SizeSmall));
KateConfigPluginPage *configPluginPage = new KateConfigPluginPage(page, this);
connect( configPluginPage, TQT_SIGNAL( changed() ), TQT_TQOBJECT(this), TQT_SLOT( slotChanged() ) );

@@ -288,21 +288,21 @@ KateConfigDialog::KateConfigDialog ( KateMainWindow *parent, Kate::View *view )
path.clear();
path << i18n("Application") << i18n("External Tools");
page = addVBoxPage( path, i18n("External Tools"),
BarIcon("configure", KIcon::SizeSmall) );
BarIcon("configure", TDEIcon::SizeSmall) );
configExternalToolsPage = new KateExternalToolsConfigWidget(page, "external tools config page");
connect( configExternalToolsPage, TQT_SIGNAL(changed()), TQT_TQOBJECT(this), TQT_SLOT(slotChanged()) );

// editor widgets from kwrite/kwdialog
path.clear();
path << i18n("Editor");
setFolderIcon (path, SmallIcon("edit", KIcon::SizeSmall));
setFolderIcon (path, SmallIcon("edit", TDEIcon::SizeSmall));

for (uint i = 0; i < KTextEditor::configInterfaceExtension (v->document())->configPages (); i++)
{
path.clear();
path << i18n("Editor") << KTextEditor::configInterfaceExtension (v->document())->configPageName (i);
/*TQVBox **/page = addVBoxPage(path, KTextEditor::configInterfaceExtension (v->document())->configPageFullName (i),
KTextEditor::configInterfaceExtension (v->document())->configPagePixmap(i, KIcon::SizeSmall) );
KTextEditor::configInterfaceExtension (v->document())->configPagePixmap(i, TDEIcon::SizeSmall) );

KTextEditor::ConfigPage *cPage = KTextEditor::configInterfaceExtension (v->document())->configPage(i, page);
connect( cPage, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
@@ -336,7 +336,7 @@ void KateConfigDialog::addPluginPage (Kate::Plugin *plugin)
TQStringList path;
path.clear();
path << i18n("Application")<<i18n("Plugins") << Kate::pluginConfigInterfaceExtension(plugin)->configPageName(i);
TQVBox *page=addVBoxPage(path, Kate::pluginConfigInterfaceExtension(plugin)->configPageFullName(i), Kate::pluginConfigInterfaceExtension(plugin)->configPagePixmap(i, KIcon::SizeSmall));
TQVBox *page=addVBoxPage(path, Kate::pluginConfigInterfaceExtension(plugin)->configPageFullName(i), Kate::pluginConfigInterfaceExtension(plugin)->configPagePixmap(i, TDEIcon::SizeSmall));

PluginPageListItem *info=new PluginPageListItem;
info->plugin = plugin;

+ 3
- 3
kate/app/kateexternaltools.cpp View File

@@ -445,8 +445,8 @@ KateExternalToolServiceEditor::KateExternalToolServiceEditor( KateExternalTool *
TQWhatsThis::add( leName, i18n(
"The name will be displayed in the 'Tools->External' menu") );

btnIcon = new KIconButton( w );
btnIcon->setIconSize( KIcon::SizeSmall );
btnIcon = new TDEIconButton( w );
btnIcon->setIconSize( TDEIcon::SizeSmall );
lo->addWidget( btnIcon, 1, 3 );
if ( tool && !tool->icon.isEmpty() )
btnIcon->setIcon( tool->icon );
@@ -649,7 +649,7 @@ void KateExternalToolsConfigWidget::reload()

TQPixmap KateExternalToolsConfigWidget::blankIcon()
{
TQPixmap pm( KIcon::SizeSmall, KIcon::SizeSmall );
TQPixmap pm( TDEIcon::SizeSmall, TDEIcon::SizeSmall );
pm.fill();
pm.setMask( pm.createHeuristicMask() );
return pm;

+ 1
- 1
kate/app/kateexternaltools.h View File

@@ -210,7 +210,7 @@ class KateExternalToolServiceEditor : public KDialogBase

class TQLineEdit *leName, *leExecutable, *leMimetypes,*leCmdLine;
class TQTextEdit *teCommand;
class KIconButton *btnIcon;
class TDEIconButton *btnIcon;
class TQComboBox *cmbSave;

private slots:

+ 3
- 3
kate/app/katesavemodifieddialog.cpp View File

@@ -48,16 +48,16 @@ public:
STATE state() const { return m_state;}
void setState(enum STATE state) {
m_state=state;
KIconLoader *loader = TDEGlobal::instance()->iconLoader();
TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
switch (state) {
case InitialState:
setPixmap(0,TQPixmap());
break;
case SaveOKState:
setPixmap(0,loader->loadIcon("ok",KIcon::NoGroup,height()));
setPixmap(0,loader->loadIcon("ok",TDEIcon::NoGroup,height()));
break;
case SaveFailedState:
setPixmap(0,loader->loadIcon("cancel",KIcon::NoGroup,height()));
setPixmap(0,loader->loadIcon("cancel",TDEIcon::NoGroup,height()));
break;
}
}

+ 1
- 1
kate/interfaces/pluginconfiginterfaceextension.h View File

@@ -88,7 +88,7 @@ class KDE_EXPORT PluginConfigInterfaceExtension
virtual TQString configPageName (uint number = 0) const = 0;
virtual TQString configPageFullName (uint number = 0) const = 0;
virtual TQPixmap configPagePixmap (uint number = 0, int size = KIcon::SizeSmall) const = 0;
virtual TQPixmap configPagePixmap (uint number = 0, int size = TDEIcon::SizeSmall) const = 0;
private:
class PrivatePluginConfigInterfaceExtension *d;

+ 1
- 1
kcontrol/access/kaccess.cpp View File

@@ -574,7 +574,7 @@ void KAccessApp::createDialogContents() {
lay->setSpacing(KDialog::spacingHint());

TQLabel *label1 = new TQLabel( contents);
TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup, KIcon::SizeMedium, KIcon::DefaultState, 0, true);
TQPixmap pixmap = TDEApplication::kApplication()->iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true);
if (pixmap.isNull())
pixmap = TQMessageBox::standardIcon(TQMessageBox::Warning);
label1->setPixmap(pixmap);

+ 2
- 2
kcontrol/filetypes/filetypedetails.cpp View File

@@ -28,8 +28,8 @@ FileTypeDetails::FileTypeDetails( TQWidget * parent, const char * name )
TQHBoxLayout *hBox = new TQHBoxLayout(0L, 0, KDialog::spacingHint());
firstLayout->addLayout(hBox, 1);

iconButton = new KIconButton(firstWidget);
iconButton->setIconType(KIcon::Desktop, KIcon::MimeType);
iconButton = new TDEIconButton(firstWidget);
iconButton->setIconType(TDEIcon::Desktop, TDEIcon::MimeType);
connect(iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(updateIcon(TQString)));

iconButton->setFixedSize(70, 70);

+ 2
- 2
kcontrol/filetypes/filetypedetails.h View File

@@ -3,7 +3,7 @@

#include <tqtabwidget.h>
class TypesListItem;
class KIconButton;
class TDEIconButton;
class TQLineEdit;
class TQListBox;
class TQButtonGroup;
@@ -47,7 +47,7 @@ private:
TypesListItem * m_item;

// First tab - General
KIconButton *iconButton;
TDEIconButton *iconButton;
TQListBox *extensionLB;
TQPushButton *addExtButton, *removeExtButton;
TQLineEdit *description;

+ 1
- 1
kcontrol/filetypes/filetypesview.h View File

@@ -14,7 +14,7 @@ class TDEListView;
class TQListViewItem;
class TQListBox;
class TQPushButton;
class KIconButton;
class TDEIconButton;
class TQLineEdit;
class TQComboBox;
class FileTypeDetails;

+ 1
- 1
kcontrol/filetypes/typeslistitem.cpp View File

@@ -82,7 +82,7 @@ void TypesListItem::setup()
{
if (m_mimetype)
{
setPixmap(0, m_mimetype->pixmap(KIcon::Small, IconSize(KIcon::Small)));
setPixmap(0, m_mimetype->pixmap(TDEIcon::Small, IconSize(TDEIcon::Small)));
}
TQListViewItem::setup();
}

+ 2
- 2
kcontrol/hwmanager/deviceiconview.cpp View File

@@ -103,6 +103,6 @@ TQPixmap DeviceIconView::loadIcon( const TQString &name )
return icon;
}

KIcon::StdSizes DeviceIconView::iconSize() {
return KIcon::SizeSmall;
TDEIcon::StdSizes DeviceIconView::iconSize() {
return TDEIcon::SizeSmall;
}

+ 1
- 1
kcontrol/hwmanager/deviceiconview.h View File

@@ -65,7 +65,7 @@ class DeviceIconView : public TDEListView

public:
DeviceIconView(TQWidget * parent = 0, const char * name = 0);
KIcon::StdSizes iconSize();
TDEIcon::StdSizes iconSize();

signals:
void deviceSelected(TDEGenericDevice*);

+ 1
- 1
kcontrol/hwmanager/devicepropsdlg.cpp View File

@@ -343,7 +343,7 @@ TQString assembleSwitchList(TDESwitchType::TDESwitchType switches) {
void DevicePropertiesDialog::populateDeviceInformation() {
if (m_device) {
base->labelDeviceType->setText(m_device->friendlyDeviceType());
base->iconDeviceType->setPixmap(m_device->icon(KIcon::SizeSmall));
base->iconDeviceType->setPixmap(m_device->icon(TDEIcon::SizeSmall));
base->labelDeviceName->setText(m_device->friendlyName());
base->labelDeviceNode->setText((m_device->deviceNode().isNull())?i18n("<none>"):m_device->deviceNode());
base->labelSystemPath->setText(m_device->systemPath());

+ 87
- 87
kcontrol/icons/icons.cpp View File

@@ -32,9 +32,9 @@

#include "icons.h"

/**** KIconConfig ****/
/**** TDEIconConfig ****/

KIconConfig::KIconConfig(TQWidget *parent, const char *name)
TDEIconConfig::TDEIconConfig(TQWidget *parent, const char *name)
: TDECModule(parent, name)
{

@@ -114,13 +114,13 @@ KIconConfig::KIconConfig(TQWidget *parent, const char *name)
preview();
}

KIconConfig::~KIconConfig()
TDEIconConfig::~TDEIconConfig()
{
delete mpSystrayConfig;
delete mpEffect;
}

TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay)
TQPushButton *TDEIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *parent, TQGridLayout *lay)
{
TQLabel *lab = new TQLabel(str, parent);
lay->addWidget(lab, 1, i, Qt::AlignCenter);
@@ -133,14 +133,14 @@ TQPushButton *KIconConfig::addPreviewIcon(int i, const TQString &str, TQWidget *
return push;
}

void KIconConfig::init()
void TDEIconConfig::init()
{
mpLoader = TDEGlobal::iconLoader();
mpConfig = TDEGlobal::config();
mpEffect = new KIconEffect;
mpEffect = new TDEIconEffect;
mpTheme = mpLoader->theme();
mUsage = 0;
for (int i=0; i<KIcon::LastGroup; i++)
for (int i=0; i<TDEIcon::LastGroup; i++)
mbChanged[i] = false;

// Fill list/checkboxen
@@ -165,11 +165,11 @@ void KIconConfig::init()
mStates += "Disabled";
}

void KIconConfig::initDefaults()
void TDEIconConfig::initDefaults()
{
mDefaultEffect[0].type = KIconEffect::NoEffect;
mDefaultEffect[1].type = KIconEffect::NoEffect;
mDefaultEffect[2].type = KIconEffect::ToGray;
mDefaultEffect[0].type = TDEIconEffect::NoEffect;
mDefaultEffect[1].type = TDEIconEffect::NoEffect;
mDefaultEffect[2].type = TDEIconEffect::ToGray;
mDefaultEffect[0].transparant = false;
mDefaultEffect[1].transparant = false;
mDefaultEffect[2].transparant = true;
@@ -185,9 +185,9 @@ void KIconConfig::initDefaults()

const int defDefSizes[] = { 32, 22, 22, 16, 32 };

KIcon::Group i;
TDEIcon::Group i;
TQStringList::ConstIterator it;
for(it=mGroups.begin(), i=KIcon::FirstGroup; it!=mGroups.end(); ++it, i++)
for(it=mGroups.begin(), i=TDEIcon::FirstGroup; it!=mGroups.end(); ++it, i++)
{
mbDP[i] = false;
mbChanged[i] = true;
@@ -213,24 +213,24 @@ void KIconConfig::initDefaults()
int group = mGroups.findIndex( "Desktop" );
if ( group != -1 )
{
mEffects[ group ][ activeState ].type = KIconEffect::ToGamma;
mEffects[ group ][ activeState ].type = TDEIconEffect::ToGamma;
mEffects[ group ][ activeState ].value = 0.7;
}

group = mGroups.findIndex( "Panel" );
if ( group != -1 )
{
mEffects[ group ][ activeState ].type = KIconEffect::ToGamma;
mEffects[ group ][ activeState ].type = TDEIconEffect::ToGamma;
mEffects[ group ][ activeState ].value = 0.7;
}
}
}

void KIconConfig::read()
void TDEIconConfig::read()
{
if (mpTheme)
{
for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++)
for (TDEIcon::Group i=TDEIcon::FirstGroup; i<TDEIcon::LastGroup; i++)
mAvSizes[i] = mpTheme->querySizes(i);

mTheme = mpTheme->current();
@@ -238,7 +238,7 @@ void KIconConfig::read()
}
else
{
for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++)
for (TDEIcon::Group i=TDEIcon::FirstGroup; i<TDEIcon::LastGroup; i++)
mAvSizes[i] = TQValueList<int>();

mTheme = TQString::null;
@@ -262,17 +262,17 @@ void KIconConfig::read()
{
TQString tmp = mpConfig->readEntry(*it2 + "Effect");
if (tmp == "togray")
effect = KIconEffect::ToGray;
effect = TDEIconEffect::ToGray;
else if (tmp == "colorize")
effect = KIconEffect::Colorize;
effect = TDEIconEffect::Colorize;
else if (tmp == "togamma")
effect = KIconEffect::ToGamma;
effect = TDEIconEffect::ToGamma;
else if (tmp == "desaturate")
effect = KIconEffect::DeSaturate;
effect = TDEIconEffect::DeSaturate;
else if (tmp == "tomonochrome")
effect = KIconEffect::ToMonochrome;
effect = TDEIconEffect::ToMonochrome;
else if (tmp == "none")
effect = KIconEffect::NoEffect;
effect = TDEIconEffect::NoEffect;
else continue;
mEffects[i][j].type = effect;
mEffects[i][j].value = mpConfig->readDoubleNumEntry(*it2 + "Value");
@@ -287,14 +287,14 @@ void KIconConfig::read()
mSysTraySize = mpSystrayConfig->readNumEntry("systrayIconWidth", 22);

mpKickerConfig->setGroup("General");
mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);
mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", TDEIcon::SizeLarge);

TDEConfigGroup g( TDEGlobal::config(), "KDE" );
mpRoundedCheck->setChecked(g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED));
mpActiveEffectCheck->setChecked(g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT));
}

void KIconConfig::apply()
void TDEIconConfig::apply()
{
int i;

@@ -332,7 +332,7 @@ void KIconConfig::apply()
int delta = 1000, dw, index = -1, size = 0, i;
TQValueList<int>::Iterator it;
mpSizeBox->clear();
if (mUsage < KIcon::LastGroup) {
if (mUsage < TDEIcon::LastGroup) {
for (it=mAvSizes[mUsage].begin(), i=0; it!=mAvSizes[mUsage].end(); ++it, i++)
{
mpSizeBox->insertItem(TQString().setNum(*it));
@@ -355,31 +355,31 @@ void KIconConfig::apply()
}
}

void KIconConfig::preview(int i)
void TDEIconConfig::preview(int i)
{
// Apply effects ourselves because we don't want to sync
// the configuration every preview.

int viewedGroup;
if (mpUsageList->text(mUsage) == i18n("Panel Buttons")) {
viewedGroup = KIcon::FirstGroup;
viewedGroup = TDEIcon::FirstGroup;
}
else if (mpUsageList->text(mUsage) == i18n("System Tray Icons")) {
viewedGroup = KIcon::FirstGroup;
viewedGroup = TDEIcon::FirstGroup;
}
else {
viewedGroup = (mUsage == KIcon::LastGroup) ? KIcon::FirstGroup : mUsage;
viewedGroup = (mUsage == TDEIcon::LastGroup) ? TDEIcon::FirstGroup : mUsage;
}

TQPixmap pm;
if (mpUsageList->text(mUsage) == i18n("Panel Buttons")) {
pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mQuickLaunchSize);
pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mQuickLaunchSize);
}
else if (mpUsageList->text(mUsage) == i18n("System Tray Icons")) {
pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSysTraySize);
pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mSysTraySize);
}
else {
pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSizes[viewedGroup]);
pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mSizes[viewedGroup]);
}
TQImage img = pm.convertToImage();
if (mbDP[viewedGroup])
@@ -396,32 +396,32 @@ void KIconConfig::preview(int i)
mpPreview[i]->setPixmap(pm);
}

void KIconConfig::preview()
void TDEIconConfig::preview()
{
preview(0);
preview(1);
preview(2);
}

void KIconConfig::load()
void TDEIconConfig::load()
{
load( false );
}

void KIconConfig::load( bool useDefaults )
void TDEIconConfig::load( bool useDefaults )
{
mpConfig = TDEGlobal::config();
mpConfig->setReadDefaults( useDefaults );
read();
apply();
for (int i=0; i<KIcon::LastGroup; i++)
for (int i=0; i<TDEIcon::LastGroup; i++)
mbChanged[i] = false;
preview();
emit changed( useDefaults );
}


void KIconConfig::save()
void TDEIconConfig::save()
{
int i, j;
TQStringList::ConstIterator it, it2;
@@ -436,19 +436,19 @@ void KIconConfig::save()
TQString tmp;
switch (mEffects[i][j].type)
{
case KIconEffect::ToGray:
case TDEIconEffect::ToGray:
tmp = "togray";
break;
case KIconEffect::ToGamma:
case TDEIconEffect::ToGamma:
tmp = "togamma";
break;
case KIconEffect::Colorize:
case TDEIconEffect::Colorize:
tmp = "colorize";
break;
case KIconEffect::DeSaturate:
case TDEIconEffect::DeSaturate:
tmp = "desaturate";
break;
case KIconEffect::ToMonochrome:
case TDEIconEffect::ToMonochrome:
tmp = "tomonochrome";
break;
default:
@@ -487,7 +487,7 @@ void KIconConfig::save()
emit changed(false);

// Emit KIPC change message.
for (int i=0; i<KIcon::LastGroup; i++)
for (int i=0; i<TDEIcon::LastGroup; i++)
{
if (mbChanged[i])
{
@@ -503,16 +503,16 @@ void KIconConfig::save()
kapp->dcopClient()->send("kicker", "SystemTrayApplet", "iconSizeChanged()", TQByteArray());
}

void KIconConfig::defaults()
void TDEIconConfig::defaults()
{
load( true );
}

void KIconConfig::QLSizeLockedChanged(bool checked) {
void TDEIconConfig::QLSizeLockedChanged(bool checked) {
emit changed();
}

void KIconConfig::slotUsage(int index)
void TDEIconConfig::slotUsage(int index)
{
mUsage = index;
if (mpUsageList->text(index) == i18n("Panel Buttons")) {
@@ -531,11 +531,11 @@ void KIconConfig::slotUsage(int index)
mPreviewButton2->setEnabled(false);
mPreviewButton3->setEnabled(false);
}
else if ( mUsage == KIcon::Panel || mUsage == KIcon::LastGroup )
else if ( mUsage == TDEIcon::Panel || mUsage == TDEIcon::LastGroup )
{
mpSizeBox->setEnabled(false);
mpDPCheck->setEnabled(false);
mpAnimatedCheck->setEnabled( mUsage == KIcon::Panel );
mpAnimatedCheck->setEnabled( mUsage == TDEIcon::Panel );
mPreviewButton1->setEnabled(true);
mPreviewButton2->setEnabled(true);
mPreviewButton3->setEnabled(true);
@@ -544,7 +544,7 @@ void KIconConfig::slotUsage(int index)
{
mpSizeBox->setEnabled(true);
mpDPCheck->setEnabled(true);
mpAnimatedCheck->setEnabled( mUsage == KIcon::Desktop );
mpAnimatedCheck->setEnabled( mUsage == TDEIcon::Desktop );
mPreviewButton1->setEnabled(true);
mPreviewButton2->setEnabled(true);
mPreviewButton3->setEnabled(true);
@@ -554,9 +554,9 @@ void KIconConfig::slotUsage(int index)
preview();
}

void KIconConfig::EffectSetup(int state)
void TDEIconConfig::EffectSetup(int state)
{
int viewedGroup = (mUsage == KIcon::LastGroup) ? KIcon::FirstGroup : mUsage;
int viewedGroup = (mUsage == TDEIcon::LastGroup) ? TDEIcon::FirstGroup : mUsage;

if (mpUsageList->currentText() == i18n("Panel Buttons")) {
return;
@@ -565,7 +565,7 @@ void KIconConfig::EffectSetup(int state)
return;
}

TQPixmap pm = mpLoader->loadIcon(mExample, KIcon::NoGroup, mSizes[viewedGroup]);
TQPixmap pm = mpLoader->loadIcon(mExample, TDEIcon::NoGroup, mSizes[viewedGroup]);
TQImage img = pm.convertToImage();
if (mbDP[viewedGroup])
{
@@ -581,12 +581,12 @@ void KIconConfig::EffectSetup(int state)
case 2 : caption = i18n("Setup Disabled Icon Effect"); break;
}

KIconEffectSetupDialog dlg(mEffects[viewedGroup][state], mDefaultEffect[state], caption, img);
TDEIconEffectSetupDialog dlg(mEffects[viewedGroup][state], mDefaultEffect[state], caption, img);

if (dlg.exec() == TQDialog::Accepted)
{
if (mUsage == KIcon::LastGroup) {
for (int i=0; i<KIcon::LastGroup; i++)
if (mUsage == TDEIcon::LastGroup) {
for (int i=0; i<TDEIcon::LastGroup; i++)
mEffects[i][state] = dlg.effect();
} else {
mEffects[mUsage][state] = dlg.effect();
@@ -597,8 +597,8 @@ void KIconConfig::EffectSetup(int state)

emit changed(true);

if (mUsage == KIcon::LastGroup) {
for (int i=0; i<KIcon::LastGroup; i++)
if (mUsage == TDEIcon::LastGroup) {
for (int i=0; i<TDEIcon::LastGroup; i++)
mbChanged[i] = true;
} else {
mbChanged[mUsage] = true;
@@ -607,7 +607,7 @@ void KIconConfig::EffectSetup(int state)
preview(state);
}

void KIconConfig::slotSize(int index)
void TDEIconConfig::slotSize(int index)
{
if (mpUsageList->currentText() == i18n("Panel Buttons")) {
mQuickLaunchSize = mpSizeBox->currentText().toInt();
@@ -620,7 +620,7 @@ void KIconConfig::slotSize(int index)
emit changed(true);
}
else {
Q_ASSERT(mUsage < KIcon::LastGroup);
Q_ASSERT(mUsage < TDEIcon::LastGroup);
mSizes[mUsage] = mAvSizes[mUsage][index];
preview();
emit changed(true);
@@ -628,9 +628,9 @@ void KIconConfig::slotSize(int index)
}
}

void KIconConfig::slotDPCheck(bool check)
void TDEIconConfig::slotDPCheck(bool check)
{
Q_ASSERT(mUsage < KIcon::LastGroup);
Q_ASSERT(mUsage < TDEIcon::LastGroup);
if (mbDP[mUsage] != check)
{
mbDP[mUsage] = check;
@@ -641,9 +641,9 @@ void KIconConfig::slotDPCheck(bool check)

}

void KIconConfig::slotAnimatedCheck(bool check)
void TDEIconConfig::slotAnimatedCheck(bool check)
{
Q_ASSERT(mUsage < KIcon::LastGroup);
Q_ASSERT(mUsage < TDEIcon::LastGroup);
if (mbAnimated[mUsage] != check)
{
mbAnimated[mUsage] = check;
@@ -652,17 +652,17 @@ void KIconConfig::slotAnimatedCheck(bool check)
}
}

void KIconConfig::slotRoundedCheck(bool check)
void TDEIconConfig::slotRoundedCheck(bool check)
{
emit changed(true);
}

void KIconConfig::slotActiveEffect(bool check)
void TDEIconConfig::slotActiveEffect(bool check)
{
emit changed(true);
}

KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
TDEIconEffectSetupDialog::TDEIconEffectSetupDialog(const Effect &effect,
const Effect &defaultEffect,
const TQString &caption, const TQImage &image,
TQWidget *parent, char *name)
@@ -672,7 +672,7 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
mDefaultEffect(defaultEffect),
mExample(image)
{
mpEffect = new KIconEffect;
mpEffect = new TDEIconEffect;

TQLabel *lbl;
TQGroupBox *frame;
@@ -749,67 +749,67 @@ KIconEffectSetupDialog::KIconEffectSetupDialog(const Effect &effect,
preview();
}

KIconEffectSetupDialog::~KIconEffectSetupDialog()
TDEIconEffectSetupDialog::~TDEIconEffectSetupDialog()
{
delete mpEffect;
}

void KIconEffectSetupDialog::init()
void TDEIconEffectSetupDialog::init()
{
mpEffectBox->setCurrentItem(mEffect.type);
mpEffectSlider->setEnabled(mEffect.type != KIconEffect::NoEffect);
mpEColButton->setEnabled(mEffect.type == KIconEffect::Colorize || mEffect.type == KIconEffect::ToMonochrome);
mpECol2Button->setEnabled(mEffect.type == KIconEffect::ToMonochrome);
mpEffectSlider->setEnabled(mEffect.type != TDEIconEffect::NoEffect);
mpEColButton->setEnabled(mEffect.type == TDEIconEffect::Colorize || mEffect.type == TDEIconEffect::ToMonochrome);
mpECol2Button->setEnabled(mEffect.type == TDEIconEffect::ToMonochrome);
mpEffectSlider->setValue((int) (100.0 * mEffect.value + 0.5));
mpEColButton->setColor(mEffect.color);
mpECol2Button->setColor(mEffect.color2);
mpSTCheck->setChecked(mEffect.transparant);
}

void KIconEffectSetupDialog::slotEffectValue(int value)
void TDEIconEffectSetupDialog::slotEffectValue(int value)
{
mEffect.value = 0.01 * value;
preview();
}

void KIconEffectSetupDialog::slotEffectColor(const TQColor &col)
void TDEIconEffectSetupDialog::slotEffectColor(const TQColor &col)
{
mEffect.color = col;
preview();
}

void KIconEffectSetupDialog::slotEffectColor2(const TQColor &col)
void TDEIconEffectSetupDialog::slotEffectColor2(const TQColor &col)
{
mEffect.color2 = col;
preview();
}

void KIconEffectSetupDialog::slotEffectType(int type)
void TDEIconEffectSetupDialog::slotEffectType(int type)
{
mEffect.type = type;
mpEffectGroup->setEnabled(mEffect.type != KIconEffect::NoEffect);
mpEffectSlider->setEnabled(mEffect.type != KIconEffect::NoEffect);
mpEffectColor->setEnabled(mEffect.type == KIconEffect::Colorize || mEffect.type == KIconEffect::ToMonochrome);
mpEColButton->setEnabled(mEffect.type == KIconEffect::Colorize || mEffect.type == KIconEffect::ToMonochrome);
mpEffectColor2->setEnabled(mEffect.type == KIconEffect::ToMonochrome);
mpECol2Button->setEnabled(mEffect.type == KIconEffect::ToMonochrome);
mpEffectGroup->setEnabled(mEffect.type != TDEIconEffect::NoEffect);
mpEffectSlider->setEnabled(mEffect.type != TDEIconEffect::NoEffect);
mpEffectColor->setEnabled(mEffect.type == TDEIconEffect::Colorize || mEffect.type == TDEIconEffect::ToMonochrome);
mpEColButton->setEnabled(mEffect.type == TDEIconEffect::Colorize || mEffect.type == TDEIconEffect::ToMonochrome);
mpEffectColor2->setEnabled(mEffect.type == TDEIconEffect::ToMonochrome);
mpECol2Button->setEnabled(mEffect.type == TDEIconEffect::ToMonochrome);
preview();
}

void KIconEffectSetupDialog::slotSTCheck(bool b)
void TDEIconEffectSetupDialog::slotSTCheck(bool b)
{
mEffect.transparant = b;
preview();
}

void KIconEffectSetupDialog::slotDefault()
void TDEIconEffectSetupDialog::slotDefault()
{
mEffect = mDefaultEffect;
init();
preview();
}

void KIconEffectSetupDialog::preview()
void TDEIconEffectSetupDialog::preview()
{
TQPixmap pm;
TQImage img = mExample.copy();

+ 13
- 13
kcontrol/icons/icons.h View File

@@ -36,9 +36,9 @@ class TQWidget;

class KColorButton;
class TDEConfig;
class KIconEffect;
class KIconLoader;
class KIconTheme;
class TDEIconEffect;
class TDEIconLoader;
class TDEIconTheme;

struct Effect
{
@@ -53,13 +53,13 @@ struct Effect
/**
* The General Icons tab in kcontrol.
*/
class KIconConfig: public TDECModule
class TDEIconConfig: public TDECModule
{
Q_OBJECT

public:
KIconConfig(TQWidget *parent, const char *name=0);
~KIconConfig();
TDEIconConfig(TQWidget *parent, const char *name=0);
~TDEIconConfig();

virtual void load();
virtual void load( bool useDefaults );
@@ -103,9 +103,9 @@ private:
int mSysTraySize;
int mQuickLaunchSize;

KIconEffect *mpEffect;
KIconTheme *mpTheme;
KIconLoader *mpLoader;
TDEIconEffect *mpEffect;
TDEIconTheme *mpTheme;
TDEIconLoader *mpLoader;
TDEConfig *mpConfig;
KSimpleConfig *mpSystrayConfig;
KSimpleConfig *mpKickerConfig;
@@ -121,15 +121,15 @@ private:
TQPushButton *mPreviewButton1, *mPreviewButton2, *mPreviewButton3;
};

class KIconEffectSetupDialog: public KDialogBase
class TDEIconEffectSetupDialog: public KDialogBase
{
Q_OBJECT
public:
KIconEffectSetupDialog(const Effect &, const Effect &,
TDEIconEffectSetupDialog(const Effect &, const Effect &,
const TQString &, const TQImage &,
TQWidget *parent=0L, char *name=0L);
~KIconEffectSetupDialog();
~TDEIconEffectSetupDialog();
Effect effect() { return mEffect; }

protected:
@@ -145,7 +145,7 @@ protected slots:
void slotDefault();

private:
KIconEffect *mpEffect;
TDEIconEffect *mpEffect;
TQListBox *mpEffectBox;
TQCheckBox *mpSTCheck;
TQSlider *mpEffectSlider;

+ 24
- 24
kcontrol/icons/iconthemes.cpp View File

@@ -124,13 +124,13 @@ void IconThemesConfig::loadThemes()
{
m_iconThemes->clear();
m_themeNames.clear();
TQStringList themelist(KIconTheme::list());
TQStringList themelist(TDEIconTheme::list());
TQString name;
TQString tname;
TQStringList::Iterator it;
for (it=themelist.begin(); it != themelist.end(); ++it)
{
KIconTheme icontheme(*it);
TDEIconTheme icontheme(*it);
if (!icontheme.isValid()) kdDebug() << "notvalid\n";
if (icontheme.isHidden()) continue;

@@ -194,7 +194,7 @@ void IconThemesConfig::installNewTheme()
TDEGlobal::instance()->newIconLoader();
loadThemes();

TQListViewItem *item=iconThemeItem(KIconTheme::current());
TQListViewItem *item=iconThemeItem(TDEIconTheme::current());
m_iconThemes->setSelected(item, true);
updateRemoveButton();
}
@@ -289,12 +289,12 @@ void IconThemesConfig::removeSelectedTheme()
"This will delete the files installed by this theme.</qt>").
arg(selected->text(0));

bool deletingCurrentTheme=(selected==iconThemeItem(KIconTheme::current()));
bool deletingCurrentTheme=(selected==iconThemeItem(TDEIconTheme::current()));

int r=KMessageBox::warningContinueCancel(this,question,i18n("Confirmation"),KStdGuiItem::del());
if (r!=KMessageBox::Continue) return;

KIconTheme icontheme(m_themeNames[selected->text(0)]);
TDEIconTheme icontheme(m_themeNames[selected->text(0)]);

// delete the index file before the async TDEIO::del so loadThemes() will
// ignore that dir.
@@ -309,9 +309,9 @@ void IconThemesConfig::removeSelectedTheme()
TQListViewItem *item=0L;
//Fallback to the default if we've deleted the current theme
if (!deletingCurrentTheme)
item=iconThemeItem(KIconTheme::current());
item=iconThemeItem(TDEIconTheme::current());
if (!item)
item=iconThemeItem(KIconTheme::defaultThemeName());
item=iconThemeItem(TDEIconTheme::defaultThemeName());

m_iconThemes->setSelected(item, true);
updateRemoveButton();
@@ -326,12 +326,12 @@ void IconThemesConfig::updateRemoveButton()
bool enabled = false;
if (selected)
{
KIconTheme icontheme(m_themeNames[selected->text(0)]);
TDEIconTheme icontheme(m_themeNames[selected->text(0)]);
TQFileInfo fi(icontheme.dir());
enabled = fi.isWritable();
// Don't let users remove the current theme.
if(m_themeNames[selected->text(0)] == KIconTheme::current() ||
m_themeNames[selected->text(0)] == KIconTheme::defaultThemeName())
if(m_themeNames[selected->text(0)] == TDEIconTheme::current() ||
m_themeNames[selected->text(0)] == TDEIconTheme::defaultThemeName())
enabled = false;
}
m_removeButton->setEnabled(enabled);
@@ -343,20 +343,20 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
KSVGIconEngine engine;
#endif
TQString dirName(m_themeNames[item->text(0)]);
KIconTheme icontheme(dirName);
TDEIconTheme icontheme(dirName);
if (!icontheme.isValid()) kdDebug() << "notvalid\n";

updateRemoveButton();
const int size = icontheme.defaultSize(KIcon::Desktop);
const int size = icontheme.defaultSize(TDEIcon::Desktop);

KIcon icon=icontheme.iconPath("exec.png", size, KIcon::MatchBest);
TDEIcon icon=icontheme.iconPath("exec.png", size, TDEIcon::MatchBest);
if (!icon.isValid()) {
#ifdef HAVE_LIBART
icon=icontheme.iconPath("exec.svg", size, KIcon::MatchBest);
icon=icontheme.iconPath("exec.svg", size, TDEIcon::MatchBest);
if(engine.load(size, size, icon.path))
m_previewExec->setPixmap(*engine.image());
else {
icon=icontheme.iconPath("exec.svgz", size, KIcon::MatchBest);
icon=icontheme.iconPath("exec.svgz", size, TDEIcon::MatchBest);
if(engine.load(size, size, icon.path))
m_previewExec->setPixmap(*engine.image());
}
@@ -365,14 +365,14 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
else
m_previewExec->setPixmap(TQPixmap(icon.path));

icon=icontheme.iconPath("folder.png",size,KIcon::MatchBest);
icon=icontheme.iconPath("folder.png",size,TDEIcon::MatchBest);
if (!icon.isValid()) {
#ifdef HAVE_LIBART
icon=icontheme.iconPath("folder.svg", size, KIcon::MatchBest);
icon=icontheme.iconPath("folder.svg", size, TDEIcon::MatchBest);
if(engine.load(size, size, icon.path))
m_previewFolder->setPixmap(*engine.image());
else {
icon=icontheme.iconPath("folder.svgz", size, KIcon::MatchBest);
icon=icontheme.iconPath("folder.svgz", size, TDEIcon::MatchBest);
if(engine.load(size, size, icon.path))
m_previewFolder->setPixmap(*engine.image());
}
@@ -381,14 +381,14 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)
else
m_previewFolder->setPixmap(TQPixmap(icon.path));

icon=icontheme.iconPath("txt.png",size,KIcon::MatchBest);
icon=icontheme.iconPath("txt.png",size,TDEIcon::MatchBest);
if (!icon.isValid()) {
#ifdef HAVE_LIBART
icon=icontheme.iconPath("txt.svg", size, KIcon::MatchBest);
icon=icontheme.iconPath("txt.svg", size, TDEIcon::MatchBest);
if(engine.load(size, size, icon.path))
m_previewDocument->setPixmap(*engine.image());
else {
icon=icontheme.iconPath("txt.svgz", size, KIcon::MatchBest);
icon=icontheme.iconPath("txt.svgz", size, TDEIcon::MatchBest);
if(engine.load(size, size, icon.path))
m_previewDocument->setPixmap(*engine.image());
}
@@ -403,7 +403,7 @@ void IconThemesConfig::themeSelected(TQListViewItem *item)

void IconThemesConfig::load()
{
m_defaultTheme=iconThemeItem(KIconTheme::current());
m_defaultTheme=iconThemeItem(TDEIconTheme::current());
m_iconThemes->setSelected(m_defaultTheme, true);
updateRemoveButton();

@@ -424,10 +424,10 @@ void IconThemesConfig::save()
config->writeEntry("Theme", m_themeNames[selected->text(0)]);
delete config;

KIconTheme::reconfigure();
TDEIconTheme::reconfigure();
emit changed(false);

for (int i=0; i<KIcon::LastGroup; i++)
for (int i=0; i<TDEIcon::LastGroup; i++)
{
KIPC::sendMessageAll(KIPC::IconChanged, i);
}

+ 1
- 1
kcontrol/icons/main.cpp View File

@@ -47,7 +47,7 @@ IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
tab->addTab(tab1, i18n("&Theme"));
connect(tab1, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));

tab2 = new KIconConfig(this, "effects");
tab2 = new TDEIconConfig(this, "effects");
tab->addTab(tab2, i18n("Ad&vanced"));
connect(tab2, TQT_SIGNAL(changed(bool)), this, TQT_SLOT(moduleChanged(bool)));


+ 1
- 1
kcontrol/icons/testicons.cpp View File

@@ -6,7 +6,7 @@
int main(int argc, char **argv)
{
TDEApplication app(argc, argv, "testicons");
KIconConfig *w = new KIconConfig(0L, "testicons");
TDEIconConfig *w = new TDEIconConfig(0L, "testicons");
app.setMainWidget(w);
w->show();
return app.exec();

+ 2
- 2
kcontrol/joystick/joywidget.cpp View File

@@ -54,8 +54,8 @@ JoyWidget::JoyWidget(TQWidget *parent, const char *name)
messageBox = new TQHBox(mainVbox);
messageBox->setSpacing(KDialog::spacingHint());
TQLabel *icon = new TQLabel(messageBox);
icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", KIcon::NoGroup,
KIcon::SizeMedium, KIcon::DefaultState, 0, true));
icon->setPixmap(TDEGlobal::iconLoader()->loadIcon("messagebox_warning", TDEIcon::NoGroup,
TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true));
icon->setFixedSize(icon->sizeHint());
message = new TQLabel(messageBox);
messageBox->hide();

+ 3
- 3
kcontrol/kcontrol/aboutwidget.cpp View File

@@ -150,10 +150,10 @@ void AboutWidget::updatePixmap()
}
else
{
KIconLoader *loader = TDEGlobal::instance()->iconLoader();
TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
TQString iconPath;
if (!_icon.isEmpty()) {
iconPath = loader->iconPath( _icon, KIcon::Toolbar );
iconPath = loader->iconPath( _icon, TDEIcon::Toolbar );
content += "<div id=\"tableTitle\"><img src=\"" + iconPath +" \"</a>&nbsp;" + _caption + "</div>";
}

@@ -171,7 +171,7 @@ void AboutWidget::updatePixmap()
{
szName = module->moduleName();
szComment = module->comment();
iconPath = loader->iconPath( module->icon(), KIcon::Small );
iconPath = loader->iconPath( module->icon(), TDEIcon::Small );

content += "<img src=\"" + iconPath +" \"</a>&nbsp;<a href=\"%1\" class=\"kcm_link\">" + szName + "</a></td><td class=\"kc_rightcol\">" + szComment;
KURL moduleURL( TQString("kcm://%1").arg(TQString().sprintf("%p",module)) );

+ 2
- 2
kcontrol/kcontrol/dockcontainer.cpp View File

@@ -83,8 +83,8 @@ void ModuleTitle::showTitleFor( ConfigModule *config )

TQWhatsThis::remove( this );
TQWhatsThis::add( this, config->comment() );
KIconLoader *loader = TDEGlobal::instance()->iconLoader();
TQPixmap icon = loader->loadIcon( config->icon(), KIcon::NoGroup, 22 );
TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
TQPixmap icon = loader->loadIcon( config->icon(), TDEIcon::NoGroup, 22 );
m_icon->setPixmap( icon );
m_name->setText( config->moduleName() );


+ 1
- 1
kcontrol/kcontrol/global.cpp View File

@@ -42,7 +42,7 @@ TQString KCGlobal::_irelease = "";
TQString KCGlobal::_iversion = "";
TQString KCGlobal::_imachine = "";
IndexViewMode KCGlobal::_viewmode = Icon;
KIcon::StdSizes KCGlobal::_iconsize = KIcon::SizeMedium;
TDEIcon::StdSizes KCGlobal::_iconsize = TDEIcon::SizeMedium;
TQString KCGlobal::_baseGroup = "";

void KCGlobal::init()

+ 3
- 3
kcontrol/kcontrol/global.h View File

@@ -45,7 +45,7 @@ public:
static TQString systemVersion() { return _iversion; }
static TQString systemMachine() { return _imachine; }
static IndexViewMode viewMode() { return _viewmode; }
static KIcon::StdSizes iconSize() { return _iconsize; }
static TDEIcon::StdSizes iconSize() { return _iconsize; }
static TQString baseGroup();

static void setIsInfoCenter(bool b) { _infocenter = b; }
@@ -59,7 +59,7 @@ public:
static void setSystemVersion(const TQString& n){ _iversion = n; }
static void setSystemMachine(const TQString& n){ _imachine = n; }
static void setViewMode(IndexViewMode m) { _viewmode = m; }
static void setIconSize(KIcon::StdSizes s) { _iconsize = s; }
static void setIconSize(TDEIcon::StdSizes s) { _iconsize = s; }

static void repairAccels( TQWidget * tw );

@@ -69,7 +69,7 @@ private:
static TQStringList _types;
static TQString _uname, _hname, _isystem, _irelease, _iversion, _imachine, _tdeversion;
static IndexViewMode _viewmode;
static KIcon::StdSizes _iconsize;
static TDEIcon::StdSizes _iconsize;
static TQString _baseGroup;
};


+ 2
- 2
kcontrol/kcontrol/modulemenu.cpp View File

@@ -72,7 +72,7 @@ void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath)
TQString name = group->caption();
name.replace("&", "&&");
parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(group->icon(), KIcon::Desktop, KIcon::SizeSmall)
parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(group->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall)
, name, menu);

fill(menu, path);
@@ -87,7 +87,7 @@ void ModuleMenu::fill(TDEPopupMenu *parentMenu, const TQString &parentPath)
TQString name = module->moduleName();
name.replace("&", "&&");

int realid = parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall)
int realid = parentMenu->insertItem(TDEGlobal::iconLoader()->loadIcon(module->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall)
, name, id);
_moduleDict.insert(realid, module);


+ 4
- 4
kcontrol/kcontrol/moduletreeview.cpp View File

@@ -38,12 +38,12 @@
static TQPixmap appIcon(const TQString &iconName)
{
TQString path;
TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::Small, 0, KIcon::DefaultState, &path, true);
// make sure they are not larger than KIcon::SizeSmall
if (normal.width() > KIcon::SizeSmall || normal.height() > KIcon::SizeSmall)
TQPixmap normal = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::Small, 0, TDEIcon::DefaultState, &path, true);
// make sure they are not larger than TDEIcon::SizeSmall
if (normal.width() > TDEIcon::SizeSmall || normal.height() > TDEIcon::SizeSmall)
{
TQImage tmp = normal.convertToImage();
tmp = tmp.smoothScale(KIcon::SizeSmall, KIcon::SizeSmall);
tmp = tmp.smoothScale(TDEIcon::SizeSmall, TDEIcon::SizeSmall);
normal.convertFromImage(tmp);
}
return normal;

+ 1
- 1
kcontrol/kcontrol/searchwidget.cpp View File

@@ -39,7 +39,7 @@ class ModuleItem : public TQListBoxPixmap
public:
ModuleItem(ConfigModule *module, TQListBox * listbox = 0) :
TQListBoxPixmap(listbox,
TDEGlobal::iconLoader()->loadIcon(module->icon(), KIcon::Desktop, KIcon::SizeSmall),
TDEGlobal::iconLoader()->loadIcon(module->icon(), TDEIcon::Desktop, TDEIcon::SizeSmall),
module->moduleName())
, m_module(module)
{

+ 16
- 16
kcontrol/kcontrol/toplevel.cpp View File

@@ -68,13 +68,13 @@ TopLevel::TopLevel(const char* name)

TQString size = config->readEntry("IconSize", "Medium");
if (size == "Small")
KCGlobal::setIconSize(KIcon::SizeSmall);
KCGlobal::setIconSize(TDEIcon::SizeSmall);
else if (size == "Large")
KCGlobal::setIconSize(KIcon::SizeLarge);
KCGlobal::setIconSize(TDEIcon::SizeLarge);
else if (size == "Huge")
KCGlobal::setIconSize(KIcon::SizeHuge);
KCGlobal::setIconSize(TDEIcon::SizeHuge);
else
KCGlobal::setIconSize(KIcon::SizeMedium);
KCGlobal::setIconSize(TDEIcon::SizeMedium);

// initialize the entries
_modules = new ConfigModuleList();
@@ -182,8 +182,8 @@ TopLevel::TopLevel(const char* name)
TQT_SLOT( activateModule( ConfigModule * ) ) );
_dock->setBaseWidget( aw );
KWin::setIcons( winId(),
TDEGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 32 ),
TDEGlobal::iconLoader()->loadIcon("hwinfo", KIcon::NoGroup, 16 ) );
TDEGlobal::iconLoader()->loadIcon("hwinfo", TDEIcon::NoGroup, 32 ),
TDEGlobal::iconLoader()->loadIcon("hwinfo", TDEIcon::NoGroup, 16 ) );
}
else
{
@@ -205,13 +205,13 @@ TopLevel::~TopLevel()

switch (KCGlobal::iconSize())
{
case KIcon::SizeSmall:
case TDEIcon::SizeSmall:
config->writeEntry("IconSize", "Small");
break;
case KIcon::SizeLarge:
case TDEIcon::SizeLarge:
config->writeEntry("IconSize", "Large");
break;
case KIcon::SizeHuge:
case TDEIcon::SizeHuge:
config->writeEntry("IconSize", "Huge");
break;
default:
@@ -295,13 +295,13 @@ void TopLevel::activateIconView()

switch(KCGlobal::iconSize())
{
case KIcon::SizeSmall:
case TDEIcon::SizeSmall:
icon_small->setChecked(true);
break;
case KIcon::SizeLarge:
case TDEIcon::SizeLarge:
icon_large->setChecked(true);
break;
case KIcon::SizeHuge:
case TDEIcon::SizeHuge:
icon_huge->setChecked(true);
break;
default:
@@ -323,25 +323,25 @@ void TopLevel::activateTreeView()

void TopLevel::activateSmallIcons()
{
KCGlobal::setIconSize(KIcon::SizeSmall);
KCGlobal::setIconSize(TDEIcon::SizeSmall);
_index->reload();
}

void TopLevel::activateMediumIcons()
{
KCGlobal::setIconSize(KIcon::SizeMedium);
KCGlobal::setIconSize(TDEIcon::SizeMedium);
_index->reload();
}

void TopLevel::activateLargeIcons()
{
KCGlobal::setIconSize(KIcon::SizeLarge);
KCGlobal::setIconSize(TDEIcon::SizeLarge);
_index->reload();
}

void TopLevel::activateHugeIcons()
{
KCGlobal::setIconSize(KIcon::SizeHuge);
KCGlobal::setIconSize(TDEIcon::SizeHuge);
_index->reload();
}


+ 6
- 6
kcontrol/kicker/menutab_impl.cpp View File

@@ -84,13 +84,13 @@ MenuTab::MenuTab( TQWidget *parent, const char* name )
//connect(kcfg_ButtonFont, TQT_SIGNAL(fontSelected(const TQFont &)), TQT_SLOT(kmenuChanged()));
connect(maxrecentdocs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(kmenuChanged()));

KIconLoader * ldr = TDEGlobal::iconLoader();
TDEIconLoader * ldr = TDEGlobal::iconLoader();
TQPixmap kmenu_icon;
m_kmenu_icon = KickerSettings::customKMenuIcon();
if (m_kmenu_icon.isNull() == true) {
m_kmenu_icon = TQString("kmenu");
}
kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall);
kmenu_icon = ldr->loadIcon(m_kmenu_icon, TDEIcon::Small, TDEIcon::SizeSmall);
btnCustomKMenuIcon->setPixmap(kmenu_icon);

TDEConfig *config;
@@ -306,15 +306,15 @@ void MenuTab::launchMenuEditor()

void MenuTab::launchIconEditor()
{
KIconDialog dlg(this);
TQString newIcon = dlg.selectIcon(KIcon::Small, KIcon::Application);
TDEIconDialog dlg(this);
TQString newIcon = dlg.selectIcon(TDEIcon::Small, TDEIcon::Application);
if (newIcon.isEmpty())
return;

m_kmenu_icon = newIcon;
KIconLoader * ldr = TDEGlobal::iconLoader();
TDEIconLoader * ldr = TDEGlobal::iconLoader();
TQPixmap kmenu_icon;
kmenu_icon = ldr->loadIcon(m_kmenu_icon, KIcon::Small, KIcon::SizeSmall);
kmenu_icon = ldr->loadIcon(m_kmenu_icon, TDEIcon::Small, TDEIcon::SizeSmall);
btnCustomKMenuIcon->setPixmap(kmenu_icon);
m_kmenu_button_changed = true;


+ 1
- 1
kcontrol/konsole/sessiondialog.ui View File

@@ -180,7 +180,7 @@
</widget>
</grid>
</widget>
<widget class="KIconButton" row="0" column="1">
<widget class="TDEIconButton" row="0" column="1">
<property name="name">
<cstring>previewIcon</cstring>
</property>

+ 2
- 2
kcontrol/kthememanager/ktheme.cpp View File

@@ -187,7 +187,7 @@ TQString KTheme::createYourself( bool pack )
// 3. Icons
globalConf->setGroup( "Icons" );
TQDomElement iconElem = m_dom.createElement( "icons" );
iconElem.setAttribute( "name", globalConf->readEntry( "Theme",KIconTheme::current() ) );
iconElem.setAttribute( "name", globalConf->readEntry( "Theme",TDEIconTheme::current() ) );
createIconElems( "DesktopIcons", "desktop", iconElem, globalConf );
createIconElems( "MainToolbarIcons", "mainToolbar", iconElem, globalConf );
createIconElems( "PanelIcons", "panel", iconElem, globalConf );
@@ -483,7 +483,7 @@ void KTheme::apply()
}
iconConf->sync();

for ( int i = 0; i < KIcon::LastGroup; i++ )
for ( int i = 0; i < TDEIcon::LastGroup; i++ )
KIPC::sendMessageAll( KIPC::IconChanged, i );
KService::rebuildKSycoca( m_parent );
}

+ 8
- 8
kcontrol/kthememanager/kthememanager.cpp View File

@@ -385,20 +385,20 @@ void kthememanager::queryLNFModules()
if ( p->isType( KST_KService ) )
{
KService *s = static_cast<KService *>( p );
( void ) new KThemeDetailsItem( dlg->lvDetails, s->name(), s->pixmap( KIcon::Desktop ), s->exec() );
( void ) new KThemeDetailsItem( dlg->lvDetails, s->name(), s->pixmap( TDEIcon::Desktop ), s->exec() );
}
}

dlg->lvDetails->sort();*/

// For now use a static list
KIconLoader * il = TDEGlobal::iconLoader();
dlg->btnBackground->setIconSet( il->loadIconSet( "background", KIcon::Desktop, 32 ) );
dlg->btnColors->setIconSet( il->loadIconSet( "colorscm", KIcon::Desktop, 32 ) );
dlg->btnStyle->setIconSet( il->loadIconSet( "style", KIcon::Desktop, 32 ) );
dlg->btnIcons->setIconSet( il->loadIconSet( "icons", KIcon::Desktop, 32 ) );
dlg->btnFonts->setIconSet( il->loadIconSet( "fonts", KIcon::Desktop, 32 ) );
dlg->btnSaver->setIconSet( il->loadIconSet( "tdescreensaver", KIcon::Desktop, 32 ) );
TDEIconLoader * il = TDEGlobal::iconLoader();
dlg->btnBackground->setIconSet( il->loadIconSet( "background", TDEIcon::Desktop, 32 ) );
dlg->btnColors->setIconSet( il->loadIconSet( "colorscm", TDEIcon::Desktop, 32 ) );
dlg->btnStyle->setIconSet( il->loadIconSet( "style", TDEIcon::Desktop, 32 ) );
dlg->btnIcons->setIconSet( il->loadIconSet( "icons", TDEIcon::Desktop, 32 ) );
dlg->btnFonts->setIconSet( il->loadIconSet( "fonts", TDEIcon::Desktop, 32 ) );
dlg->btnSaver->setIconSet( il->loadIconSet( "tdescreensaver", TDEIcon::Desktop, 32 ) );
}

void kthememanager::updatePreview( const TQString & pixFile )

+ 4
- 4
kcontrol/kthememanager/kthememanager.h View File

@@ -34,13 +34,13 @@ class TDEAboutData;
#define ORIGINAL_THEME "original" // no i18n() here!!!

/*
class KIconViewItem;
class TDEIconViewItem;

class KThemeDetailsItem: public KIconViewItem
class KThemeDetailsItem: public TDEIconViewItem
{
public:
KThemeDetailsItem( KIconView * parent, const TQString & text, const TQPixmap & icon, const TQString & execString )
: KIconViewItem( parent, text, icon ) { m_exec = execString; }
KThemeDetailsItem( TDEIconView * parent, const TQString & text, const TQPixmap & icon, const TQString & execString )
: TDEIconViewItem( parent, text, icon ) { m_exec = execString; }
virtual ~KThemeDetailsItem() { };

void exec() {

+ 2
- 2
kcontrol/locale/kcmlocale.cpp View File

@@ -356,7 +356,7 @@ void TDELocaleConfig::loadCountryList()
.arg(tag) ) );
TQIconSet icon;
if ( !map.isNull() )
icon = TDEGlobal::iconLoader()->loadIconSet(map, KIcon::Small);
icon = TDEGlobal::iconLoader()->loadIconSet(map, TDEIcon::Small);
m_comboCountry->insertSubmenu( icon, name, tag, sub, -2 );
}

@@ -383,7 +383,7 @@ void TDELocaleConfig::loadCountryList()
TQString flag( locate( "locale",
TQString::fromLatin1( "l10n/%1/flag.png" )
.arg(tag) ) );
TQIconSet icon( TDEGlobal::iconLoader()->loadIconSet(flag, KIcon::Small) );
TQIconSet icon( TDEGlobal::iconLoader()->loadIconSet(flag, TDEIcon::Small) );
m_comboCountry->insertItem( icon, name, tag, submenu, menu_index );
}


+ 2
- 2
kcontrol/style/menupreview.cpp View File

@@ -82,8 +82,8 @@ void MenuPreview::createPixmaps()
(x % 2) ?
((y % 2) ? c2 : c1 ) : // See the grid? ;-)
((y % 2) ? c1 : c2 ) );
KIconLoader* icl = TDEGlobal::iconLoader();
TQPixmap pix = icl->loadIcon("go", KIcon::Desktop, KIcon::SizeLarge, KIcon::ActiveState);
TDEIconLoader* icl = TDEGlobal::iconLoader();
TQPixmap pix = icl->loadIcon("go", TDEIcon::Desktop, TDEIcon::SizeLarge, TDEIcon::ActiveState);
p.drawPixmap( (width()-2-pix.width())/2, (height()-2-pix.height())/2, pix );
}


+ 4
- 4
kcontrol/tdefontinst/kcmfontinst/KFileFontView.cpp View File

@@ -260,7 +260,7 @@ void CKFileFontView::updateView(bool b)
{
CFontListViewItem *item=static_cast<CFontListViewItem *>(it.current());

item->setPixmap(0, item->fileInfo()->pixmap(KIcon::SizeSmall));
item->setPixmap(0, item->fileInfo()->pixmap(TDEIcon::SizeSmall));
}
}
}
@@ -475,9 +475,9 @@ TQDragObject *CKFileFontView::dragObject()
urls.append( (*it)->url() );

if(urls.count()> 1)
pixmap = DesktopIcon("tdemultiple", KIcon::SizeSmall);
pixmap = DesktopIcon("tdemultiple", TDEIcon::SizeSmall);
if(pixmap.isNull())
pixmap = currentFileItem()->pixmap(KIcon::SizeSmall);
pixmap = currentFileItem()->pixmap(TDEIcon::SizeSmall);

hotspot.setX(pixmap.width() / 2);
hotspot.setY(pixmap.height() / 2);
@@ -629,7 +629,7 @@ void CKFileFontView::writeConfig(TDEConfig *kc, const TQString &group)

void CFontListViewItem::init()
{
CFontListViewItem::setPixmap(COL_NAME, itsInf->pixmap(KIcon::SizeSmall));
CFontListViewItem::setPixmap(COL_NAME, itsInf->pixmap(TDEIcon::SizeSmall));

setText(COL_NAME, itsInf->text());
setText(COL_SIZE, itsInf->isDir() ? "" : TDEGlobal::locale()->formatNumber(itsInf->size(), 0));

+ 1
- 1
kcontrol/tdeio/kmanualproxydlg.cpp View File

@@ -49,7 +49,7 @@ KManualProxyDlg::KManualProxyDlg( TQWidget* parent, const char* name )
mDlg = new ManualProxyDlgUI (this);
setMainWidget( mDlg );

mDlg->pbCopyDown->setPixmap( BarIcon("down", KIcon::SizeSmall) );
mDlg->pbCopyDown->setPixmap( BarIcon("down", TDEIcon::SizeSmall) );
TQSizePolicy sizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed,
mDlg->pbCopyDown->sizePolicy().hasHeightForWidth() );
mDlg->pbCopyDown->setSizePolicy( sizePolicy );

+ 1
- 1
kcontrol/tdm/tdm-appear.cpp View File

@@ -462,7 +462,7 @@ void TDMAppearanceWidget::save()
config->writeEntry("LogoArea", noneRadio->isChecked() ? "None" :
logoRadio->isChecked() ? "Logo" : "Clock" );

config->writeEntry("LogoPixmap", TDEGlobal::iconLoader()->iconPath(logopath, KIcon::Desktop, true));
config->writeEntry("LogoPixmap", TDEGlobal::iconLoader()->iconPath(logopath, TDEIcon::Desktop, true));

config->writeEntry("Compositor", compositorcombo->currentId());


+ 1
- 1
kdcop/kdcopwindow.cpp View File

@@ -114,7 +114,7 @@ DCOPBrowserApplicationItem::DCOPBrowserApplicationItem
{
setExpandable(true);
setText(0, TQString::fromUtf8(app_));
setPixmap(0, TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), KIcon::Small ));
setPixmap(0, TDEGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "exec" ), TDEIcon::Small ));


/* Get the icon: we use the icon from a mainwindow in that class.

+ 1
- 1
kdepasswd/kcm/chfacedlg.cpp View File

@@ -63,7 +63,7 @@ ChFaceDlg::ChFaceDlg(const TQString& picsdir, TQWidget *parent, const char *name
TQLabel *header = new TQLabel( i18n("Select a new face:"), page );
top->addWidget( header );

m_FacesWidget = new KIconView( page );
m_FacesWidget = new TDEIconView( page );
m_FacesWidget->setSelectionMode( TQIconView::Single );
m_FacesWidget->setItemsMovable( false );
m_FacesWidget->setMinimumSize( 400, 200 );

+ 1
- 1
kdepasswd/kcm/chfacedlg.h View File

@@ -63,7 +63,7 @@ private slots:
private:
void addCustomPixmap( TQString imPath, bool saveCopy );

KIconView *m_FacesWidget;
TDEIconView *m_FacesWidget;
};

#endif // CHFACEDLG_H

+ 1
- 1
kdepasswd/kcm/kcm_useraccount.kcfg View File

@@ -37,7 +37,7 @@
<default>$HOME/.face.icon</default>
</entry>
<entry name="CustomKey" type="String">
<label>Sort key for KIconViewItems</label>
<label>Sort key for TDEIconViewItems</label>
<default>Zz_custom</default>
</entry>
</group>

+ 1
- 1
kdesktop/desktop.cc View File

@@ -810,7 +810,7 @@ void KDesktop::slotSettingsChanged(int category)

void KDesktop::slotIconChanged(int group)
{
if ( group == KIcon::Desktop )
if ( group == TDEIcon::Desktop )
{
kdDebug(1204) << "KDesktop::slotIconChanged" << endl;
refresh();

+ 4
- 4
kdesktop/kcustommenu.cc View File

@@ -84,10 +84,10 @@ KCustomMenu::insertMenuItem(KService::Ptr & s, int nId, int nIndex/*= -1*/)
// to accelators, replace them with two ampersands.
serviceName.replace("&", "&&");

TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
0, KIcon::DefaultState, 0L, true);
TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), KIcon::Small,
0, KIcon::ActiveState, 0L, true);
TQPixmap normal = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), TDEIcon::Small,
0, TDEIcon::DefaultState, 0L, true);
TQPixmap active = TDEGlobal::instance()->iconLoader()->loadIcon(s->icon(), TDEIcon::Small,
0, TDEIcon::ActiveState, 0L, true);
// make sure they are not larger than 16x16
if (normal.width() > 16 || normal.height() > 16) {
TQImage tmp = normal.convertToImage();

+ 4
- 4
kdesktop/kdiconview.cc View File

@@ -490,7 +490,7 @@ void KDIconView::setAutoAlign( bool b )
// Auto line-up icons
if ( b ) {
// set maxItemWidth to ensure sane initial icon layout before the auto align code is fully activated
int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
setFont( font() ); // Force calcRect()

@@ -505,7 +505,7 @@ void KDIconView::setAutoAlign( bool b )
}
else {
// change maxItemWidth, because when grid-align was active, it changed this for the grid
int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( KIcon::Desktop );
int sz = iconSize() ? iconSize() : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop );
setMaxItemWidth( QMAX( QMAX( sz, previewIconSize( iconSize() ) ), KonqFMSettings::settings()->iconTextWidth() ) );
setFont( font() ); // Force calcRect()

@@ -1528,7 +1528,7 @@ void KDIconView::showEvent( TQShowEvent *e )
if (m_hasExistingPos)
TQScrollView::showEvent( e );
else
KIconView::showEvent( e );
TDEIconView::showEvent( e );
}

void KDIconView::contentsDropEvent( TQDropEvent * e )
@@ -1548,7 +1548,7 @@ void KDIconView::contentsDropEvent( TQDropEvent * e )
bool bSignals = signalsBlocked();
setItemsMovable(false);
blockSignals(true);
KIconView::contentsDropEvent( e );
TDEIconView::contentsDropEvent( e );
blockSignals(bSignals);
setItemsMovable(bMovable);
// End hack

+ 1
- 1
kdesktop/minicli.cpp View File

@@ -864,7 +864,7 @@ void Minicli::setIcon ()

if ( m_iconName == "www" )
{
// Not using KIconEffect::overlay as that requires the same size
// Not using TDEIconEffect::overlay as that requires the same size
// for the icon and the overlay, also the overlay definately doesn't
// have a more that one-bit alpha channel here
TQPixmap overlay( locate ( "icon", KMimeType::favIconForURL( m_filterData->uri() ) + ".png" ) );

+ 2
- 2
kdesktop/startupid.cpp View File

@@ -179,8 +179,8 @@ void StartupId::start_startupid( const TQString& icon_P )
= { Qt::black, Qt::darkGray, Qt::lightGray, Qt::white, Qt::white };


TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, KIcon::Small, 0,
KIcon::DefaultState, 0, true ); // return null pixmap if not found
TQPixmap icon_pixmap = TDEGlobal::iconLoader()->loadIcon( icon_P, TDEIcon::Small, 0,
TDEIcon::DefaultState, 0, true ); // return null pixmap if not found
if( icon_pixmap.isNull())
icon_pixmap = SmallIcon( "exec" );
if( startup_widget == NULL )

+ 3
- 3
kdesktop/tdefileividesktop.cpp View File

@@ -64,7 +64,7 @@ KFileIVIDesktop::~KFileIVIDesktop()

void KFileIVIDesktop::calcRect( const TQString& _text )
{
KIconViewItem::calcRect( _text );
TDEIconViewItem::calcRect( _text );

if ( !iconView() || !m_shadow ||
!wordWrap() || !( static_cast<KDesktopShadowSettings *>
@@ -99,7 +99,7 @@ void KFileIVIDesktop::paintItem( TQPainter *p, const TQColorGroup &cg)

p->save();

// draw the pixmap as in KIconViewItem::paintItem(...)
// draw the pixmap as in TDEIconViewItem::paintItem(...)
paintPixmap(p, colors);

//
@@ -147,7 +147,7 @@ void KFileIVIDesktop::drawShadowedText( TQPainter *p, const TQColorGroup &cg )
else
textX = textRect( FALSE ).x() + 2;
int textY = textRect( FALSE ).y();
int align = ((KIconView *) iconView())->itemTextPos() == TQIconView::Bottom
int align = ((TDEIconView *) iconView())->itemTextPos() == TQIconView::Bottom
? AlignHCenter : AlignAuto;
bool rebuild = shouldUpdateShadow(isSelected());


+ 1
- 1
kdesktop/tdefileividesktop.h View File

@@ -66,7 +66,7 @@ class KFileIVIDesktop : public KFileIVI

protected:
/**
* Reimplements KIconView::calcRect to take the shadow metrics
* Reimplements TDEIconView::calcRect to take the shadow metrics
* into account
*/
virtual void calcRect( const TQString& _text );

+ 21
- 21
kdialog/kdialog.cpp View File

@@ -596,47 +596,47 @@ static int directCommand(TDECmdLineArgs *args)
if (args->count() >= 1) {
contextStr = TQString::fromLocal8Bit(args->arg(0));
}
KIcon::Group group = KIcon::NoGroup;
TDEIcon::Group group = TDEIcon::NoGroup;
if ( groupStr == TQString::fromLatin1( "Desktop" ) )
group = KIcon::Desktop;
group = TDEIcon::Desktop;
else if ( groupStr == TQString::fromLatin1( "Toolbar" ) )
group = KIcon::Toolbar;
group = TDEIcon::Toolbar;
else if ( groupStr == TQString::fromLatin1( "MainToolbar" ) )
group = KIcon::MainToolbar;
group = TDEIcon::MainToolbar;
else if ( groupStr == TQString::fromLatin1( "Small" ) )
group = KIcon::Small;
group = TDEIcon::Small;
else if ( groupStr == TQString::fromLatin1( "Panel" ) )
group = KIcon::Panel;
group = TDEIcon::Panel;
else if ( groupStr == TQString::fromLatin1( "User" ) )
group = KIcon::User;
KIcon::Context context = KIcon::Any;
group = TDEIcon::User;
TDEIcon::Context context = TDEIcon::Any;
// From kicontheme.cpp
if ( contextStr == TQString::fromLatin1( "Devices" ) )
context = KIcon::Device;
context = TDEIcon::Device;
else if ( contextStr == TQString::fromLatin1( "MimeTypes" ) )
context = KIcon::MimeType;
context = TDEIcon::MimeType;
else if ( contextStr == TQString::fromLatin1( "FileSystems" ) )
context = KIcon::FileSystem;
context = TDEIcon::FileSystem;
else if ( contextStr == TQString::fromLatin1( "Applications" ) )
context = KIcon::Application;
context = TDEIcon::Application;
else if ( contextStr == TQString::fromLatin1( "Actions" ) )
context = KIcon::Action;
context = TDEIcon::Action;
else if ( contextStr == TQString::fromLatin1( "Animations" ) )
context = KIcon::Animation;
context = TDEIcon::Animation;
else if ( contextStr == TQString::fromLatin1( "Categories" ) )
context = KIcon::Category;
context = TDEIcon::Category;
else if ( contextStr == TQString::fromLatin1( "Emblems" ) )
context = KIcon::Emblem;
context = TDEIcon::Emblem;
else if ( contextStr == TQString::fromLatin1( "Emotes" ) )
context = KIcon::Emote;
context = TDEIcon::Emote;
else if ( contextStr == TQString::fromLatin1( "International" ) )
context = KIcon::International;
context = TDEIcon::International;
else if ( contextStr == TQString::fromLatin1( "Places" ) )
context = KIcon::Place;
context = TDEIcon::Place;
else if ( contextStr == TQString::fromLatin1( "Status" ) )
context = KIcon::StatusIcon;
context = TDEIcon::StatusIcon;

KIconDialog dlg(0, "icon dialog");
TDEIconDialog dlg(0, "icon dialog");
kapp->setTopWidget( &dlg );
dlg.setup( group, context);
if (!title.isNull())

+ 1
- 1
kfind/kftabdlg.cpp View File

@@ -301,7 +301,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name)
it != m_types.end(); ++it )
{
KMimeType::Ptr typ = *it;
typeBox->insertItem(typ->pixmap( KIcon::Small ), typ->comment());
typeBox->insertItem(typ->pixmap( TDEIcon::Small ), typ->comment());
}

if ( editRegExp ) {

+ 4
- 4
kicker/applets/clock/clock.cpp View File

@@ -370,7 +370,7 @@ void DigitalClock::loadSettings()
setSegmentStyle(TQLCDNumber::Flat);

if (_prefs->digitalLCDStyle())
lcdPattern = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User);
lcdPattern = TDEIconLoader("clockapplet").loadIcon("lcd", TDEIcon::User);

setNumDigits(_prefs->digitalShowSeconds() ? 8:5);

@@ -477,14 +477,14 @@ void AnalogClock::initBackgroundPixmap()
//if no antialiasing, use pixmap as-is
if (_prefs->analogAntialias() == 0)
{
lcdPattern = KIconLoader("clockapplet").loadIcon("lcd",KIcon::User);
lcdPattern = TDEIconLoader("clockapplet").loadIcon("lcd",TDEIcon::User);
_bgScale = 1;
}
else
{
//make a scaled pixmap -- so when image is reduced it'll look "OK".
_bgScale = _prefs->analogAntialias()+1;
TQImage bgImage = KIconLoader("clockapplet").loadIcon("lcd", KIcon::User).convertToImage();
TQImage bgImage = TDEIconLoader("clockapplet").loadIcon("lcd", TDEIcon::User).convertToImage();
lcdPattern = TQPixmap(bgImage.scale(bgImage.width() * _bgScale,
bgImage.height() * _bgScale));

@@ -1780,7 +1780,7 @@ void ClockApplet::updateKickerTip(KickerTip::Data& data)
TZoffset = zone->calc_TZ_offset(activeZone);
}

data.icon = DesktopIcon("date", KIcon::SizeMedium);
data.icon = DesktopIcon("date", TDEIcon::SizeMedium);
data.direction = popupDirection();
data.duration = 4000;
}

+ 6
- 6
kicker/applets/launcher/quickbutton.cpp View File

@@ -126,7 +126,7 @@ void QuickURL::run() const
}

//similar to MimeType::pixmapForURL
TQPixmap QuickURL::pixmap( mode_t _mode, KIcon::Group _group,
TQPixmap QuickURL::pixmap( mode_t _mode, TDEIcon::Group _group,
int _force_size, int _state, TQString *) const
{
TQPixmap pxmap;
@@ -206,8 +206,8 @@ void QuickButton::loadIcon()
// Set Icon Dimension from size
_iconDim=std::min(size().width(),size().height())-2*ICON_MARGIN;
// Load icons
_icon = _qurl->pixmap(0, KIcon::Panel, _iconDim, KIcon::DefaultState);
_iconh = _qurl->pixmap(0, KIcon::Panel, _iconDim, KIcon::ActiveState);
_icon = _qurl->pixmap(0, TDEIcon::Panel, _iconDim, TDEIcon::DefaultState);
_iconh = _qurl->pixmap(0, TDEIcon::Panel, _iconDim, TDEIcon::ActiveState);
setPixmap(_icon);
}

@@ -262,7 +262,7 @@ void QuickButton::launch()
if (!KickerSettings::showDeepButtons()) {
setDown(false);
update();
KIconEffect::visualActivate(this, rect());
TDEIconEffect::visualActivate(this, rect());
}
if (_qurl->kurl().url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
if (isOn()) {
@@ -344,10 +344,10 @@ void QuickButton::updateKickerTip(KickerTip::Data &data)
data.subtext = data.message;
}
if (_qurl->url() == "SPECIAL_BUTTON__SHOW_DESKTOP") {
data.icon = TDEGlobal::iconLoader()->loadIcon("desktop", KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
data.icon = TDEGlobal::iconLoader()->loadIcon("desktop", TDEIcon::Panel, TDEIcon::SizeHuge, TDEIcon::DefaultState);
}
else {
data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, KIcon::Panel, KIcon::SizeHuge, KIcon::DefaultState);
data.icon = KMimeType::pixmapForURL(_qurl->kurl(), 0, TDEIcon::Panel, TDEIcon::SizeHuge, TDEIcon::DefaultState);
}
}


+ 1
- 1
kicker/applets/launcher/quickbutton.h View File

@@ -53,7 +53,7 @@ public:
TQString name() const { return m_name; }
KService::Ptr service() const {return _service;};
void run() const;
TQPixmap pixmap(mode_t _mode = 0, KIcon::Group _group = KIcon::Desktop,
TQPixmap pixmap(mode_t _mode = 0, TDEIcon::Group _group = TDEIcon::Desktop,
int _force_size = 0, int _state = 0, TQString * _path = 0L) const;

private:

+ 1
- 1
kicker/applets/minipager/pagerbutton.cpp View File

@@ -829,7 +829,7 @@ void KMiniPagerButton::updateKickerTip(KickerTip::Data &data)
}

data.duration = 4000;
data.icon = DesktopIcon("window_list", KIcon::SizeMedium);
data.icon = DesktopIcon("window_list", TDEIcon::SizeMedium);
data.message = TQStyleSheet::escape(m_desktopName);
data.direction = m_pager->popupDirection();
}

+ 1
- 1
kicker/extensions/kasbar/ChangeLog View File

@@ -786,7 +786,7 @@

* Moved the icon handling code out of Kasbar and into the Task
class. Task now provides an API for icon loading that allows
access to different icon sizes and uses KIconLoader where needed.
access to different icon sizes and uses TDEIconLoader where needed.

2001-05-15 Tuesday 01:19 rich


+ 2
- 2
kicker/extensions/kasbar/kasaboutdlg.cpp View File

@@ -80,8 +80,8 @@
#include "kasaboutdlg.h"
#include "version.h"

#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeMedium )
#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeLarge )

KasAboutDialog::KasAboutDialog( TQWidget *parent )
: KDialogBase( KDialogBase::IconList, i18n("About Kasbar"),

+ 1
- 1
kicker/extensions/kasbar/kasbar.cpp View File

@@ -717,7 +717,7 @@ void KasBar::addTestItems()
KasItem *i = new KasItem( this );
insert( 0, i );
i->setText( "Animated" );
i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", KIcon::NoGroup, KIcon::SizeMedium ) );
i->setIcon( TDEGlobal::iconLoader()->loadIcon( "icons", TDEIcon::NoGroup, TDEIcon::SizeMedium ) );
i->setAnimation( resources()->startupAnimation() );
TQTimer *aniTimer = new TQTimer( i, "aniTimer" );
connect( aniTimer, TQT_SIGNAL( timeout() ), i, TQT_SLOT( advanceAnimation() ) );

+ 8
- 8
kicker/extensions/kasbar/kasgroupitem.cpp View File

@@ -145,19 +145,19 @@ void KasGroupItem::updateIcon()
Task::Ptr t = items.first();
if (!t)
p = TDEGlobal::iconLoader()->loadIcon( "kicker",
KIcon::NoGroup,
KIcon::SizeSmall );
TDEIcon::NoGroup,
TDEIcon::SizeSmall );

int sizes[] = { KIcon::SizeEnormous,
KIcon::SizeHuge,
KIcon::SizeLarge,
KIcon::SizeMedium,
KIcon::SizeSmall };
int sizes[] = { TDEIcon::SizeEnormous,
TDEIcon::SizeHuge,
TDEIcon::SizeLarge,
TDEIcon::SizeMedium,
TDEIcon::SizeSmall };

p = t->bestIcon( sizes[kasbar()->itemSize()], usedIconLoader );

if ( p.isNull() )
p = TDEGlobal::iconLoader()->loadIcon( "error", KIcon::NoGroup, KIcon::SizeSmall );
p = TDEGlobal::iconLoader()->loadIcon( "error", TDEIcon::NoGroup, TDEIcon::SizeSmall );

setIcon( p );
}

+ 2
- 2
kicker/extensions/kasbar/kasprefsdlg.cpp View File

@@ -75,8 +75,8 @@
#include "kasprefsdlg.h"
#include "kasprefsdlg.moc"

#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeMedium )
#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, KIcon::NoGroup, KIcon::SizeLarge )
#define Icon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeMedium )
#define LargeIcon(x) TDEGlobal::iconLoader()->loadIcon( x, TDEIcon::NoGroup, TDEIcon::SizeLarge )


KasPrefsDialog::KasPrefsDialog( KasTasker *kas, TQWidget *parent )

+ 12
- 12
kicker/extensions/kasbar/kasstartupitem.cpp View File

@@ -99,34 +99,34 @@ TQPixmap KasStartupItem::icon() const
case KasBar::Small:
/* ***** NOP ******
pixmap = TDEGlobal::iconLoader()->loadIcon( startup_->icon(),
KIcon::NoGroup,
KIcon::SizeSmall );
TDEIcon::NoGroup,
TDEIcon::SizeSmall );