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

Rename KIcon to enhance compatibility with KDE4

Browse Source
pull/2/head
Timothy Pearson 11 years ago
parent 4f841fbbbc
commit de9b6c9ad1
131 changed files with 640 additions and 640 deletions
Show Stats Download Patch File Download Diff File

4
kappfinder/toplevel.cpp
Unescape 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" ) )

20
kate/app/kateconfigdialog.cpp
Unescape 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;

6
kate/app/kateexternaltools.cpp
Unescape 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;

2
kate/app/kateexternaltools.h
Unescape 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:

6
kate/app/katesavemodifieddialog.cpp
Unescape 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;
}
}

2
kate/interfaces/pluginconfiginterfaceextension.h
Unescape 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;

2
kcontrol/access/kaccess.cpp
Unescape 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);

4
kcontrol/filetypes/filetypedetails.cpp
Unescape 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);

4
kcontrol/filetypes/filetypedetails.h
Unescape 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;

2
kcontrol/filetypes/filetypesview.h
Unescape View File

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

2
kcontrol/filetypes/typeslistitem.cpp
Unescape 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();
}

4
kcontrol/hwmanager/deviceiconview.cpp
Unescape 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;
}

2
kcontrol/hwmanager/deviceiconview.h
Unescape 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*);

2
kcontrol/hwmanager/devicepropsdlg.cpp
Unescape 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());

174
kcontrol/icons/icons.cpp
Unescape 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();

26
kcontrol/icons/icons.h
Unescape 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;

48
kcontrol/icons/iconthemes.cpp
Unescape 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);
}

2
kcontrol/icons/main.cpp
Unescape 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)));

2
kcontrol/icons/testicons.cpp
Unescape 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();

4
kcontrol/joystick/joywidget.cpp
Unescape 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();

6
kcontrol/kcontrol/aboutwidget.cpp
Unescape 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)) );

4
kcontrol/kcontrol/dockcontainer.cpp
Unescape 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() );

2
kcontrol/kcontrol/global.cpp
Unescape 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()

6
kcontrol/kcontrol/global.h
Unescape 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;