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

Rename KIcon to enhance compatibility with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 41ef6ae3bd
commit 64ced13f94
18 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File

4
atlantik/ChangeLog
Unescape View File

@ -2,7 +2,7 @@
-----
- Show mortgage and house prices/values on estate views.
- Make token image a saved configuration setting, use KIconDialog.
- Make token image a saved configuration setting, use TDEIconDialog.
- Avoid scrollbar by using KWrappedListViewItem.
0.7.2 (KDE 3.3.2)
@ -188,7 +188,7 @@
2002-02-13 (kaper)
----------
- Nicer button layouts (QSpacerItems, KIcon::SizeSmall, margin/spacingHints)
- Nicer button layouts (QSpacerItems, TDEIcon::SizeSmall, margin/spacingHints)
2002-02-11 (kaper)
----------

14
atlantik/client/configdlg.cpp
Unescape View File

@ -43,10 +43,10 @@
ConfigDialog::ConfigDialog(Atlantik* parent, const char *name) : KDialogBase(IconList, i18n("Configure Atlantik"), Ok|Cancel, Ok, parent, "config_atlantik", false, name)
{
m_parent = parent;
p_general = addPage(i18n("General"), i18n("General"), BarIcon("configure", KIcon::SizeMedium));
p_p13n = addPage(i18n("Personalization"), i18n("Personalization"), BarIcon("personal", KIcon::SizeMedium));
p_board = addPage(i18n("Board"), i18n("Board"), BarIcon("monop_board", KIcon::SizeMedium));
p_monopigator = addPage(i18n("Meta Server"), i18n("Meta Server"), BarIcon("network", KIcon::SizeMedium));
p_general = addPage(i18n("General"), i18n("General"), BarIcon("configure", TDEIcon::SizeMedium));
p_p13n = addPage(i18n("Personalization"), i18n("Personalization"), BarIcon("personal", TDEIcon::SizeMedium));
p_board = addPage(i18n("Board"), i18n("Board"), BarIcon("monop_board", TDEIcon::SizeMedium));
p_monopigator = addPage(i18n("Meta Server"), i18n("Meta Server"), BarIcon("network", TDEIcon::SizeMedium));
configGeneral = new ConfigGeneral(this, p_general, "configGeneral");
configPlayer = new ConfigPlayer(this, p_p13n, "configPlayer");
@ -146,15 +146,15 @@ TQString ConfigPlayer::playerImage()
}
void ConfigPlayer::chooseImage()
{
KIconDialog iconDialog( this, "iconDialog" );
TDEIconDialog iconDialog( this, "iconDialog" );
#ifdef KDE_3_1_FEATURES
iconDialog.setCustomLocation( locate("appdata", "themes/default/tokens/") );
#endif
#ifdef KDE_3_3_FEATURES
iconDialog.setup( KIcon::Desktop, KIcon::Application, false, 0, true, true, true ); // begin with user icons, lock editing
iconDialog.setup( TDEIcon::Desktop, TDEIcon::Application, false, 0, true, true, true ); // begin with user icons, lock editing
#else
iconDialog.setup( KIcon::Desktop, KIcon::Application, false, 0, true ); // begin with user icons
iconDialog.setup( TDEIcon::Desktop, TDEIcon::Application, false, 0, true ); // begin with user icons
#endif
TQString image = iconDialog.openDialog();

2
atlantik/client/eventlogwidget.cpp
Unescape View File

@ -72,7 +72,7 @@ EventLogWidget::EventLogWidget(EventLog *eventLog, TQWidget *parent, const char
actionBox->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
m_saveButton = new KPushButton(BarIcon("filesave", KIcon::SizeSmall), i18n("&Save As..."), this);
m_saveButton = new KPushButton(BarIcon("filesave", TDEIcon::SizeSmall), i18n("&Save As..."), this);
actionBox->addWidget(m_saveButton);
connect(m_saveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(save()));

4
atlantik/client/selectserver_widget.cpp
Unescape View File

@ -82,7 +82,7 @@ SelectServer::SelectServer(bool useMonopigatorOnStart, bool hideDevelopmentServe
connect(m_refreshButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotRefresh()));
// Connect
m_connectButton = new KPushButton(BarIconSet("forward", KIcon::SizeSmall), i18n("Connect"), this);
m_connectButton = new KPushButton(BarIconSet("forward", TDEIcon::SizeSmall), i18n("Connect"), this);
m_connectButton->setEnabled(false);
buttonBox->addWidget(m_connectButton);
@ -122,7 +122,7 @@ void SelectServer::initMonopigator()
void SelectServer::slotMonopigatorAdd(TQString ip, TQString host, TQString port, TQString version, int users)
{
MonopigatorEntry *item = new MonopigatorEntry(m_serverList, host, TQString::number(9999), version, (users == -1) ? i18n("unknown") : TQString::number(users), port, ip);
item->setPixmap(0, BarIcon("atlantik", KIcon::SizeSmall));
item->setPixmap(0, BarIcon("atlantik", TDEIcon::SizeSmall));
if ( item->isDev() )
{

4
atlantik/libatlantikui/trade_widget.cpp
Unescape View File

@ -130,12 +130,12 @@ TradeDisplay::TradeDisplay(Trade *trade, AtlanticCore *atlanticCore, TQWidget *p
actionBox->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
m_rejectButton = new KPushButton(BarIcon("cancel", KIcon::SizeSmall), i18n("Reject"), this);
m_rejectButton = new KPushButton(BarIcon("cancel", TDEIcon::SizeSmall), i18n("Reject"), this);
actionBox->addWidget(m_rejectButton);
connect(m_rejectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()));
m_acceptButton = new KPushButton(BarIcon("ok", KIcon::SizeSmall), i18n("Accept"), this);
m_acceptButton = new KPushButton(BarIcon("ok", TDEIcon::SizeSmall), i18n("Accept"), this);
// m_acceptButton->setEnabled(false);
actionBox->addWidget(m_acceptButton);

2
kbackgammon/engines/fibs/kbgfibs.cpp
Unescape View File

@ -208,7 +208,7 @@ void KBgEngineFIBS::getSetupPages(KDialogBase *nb)
* Main Widget
*/
TQVBox *vbp = nb->addVBoxPage(i18n("FIBS Engine"), i18n("Here you can configure the FIBS backgammon engine"),
kapp->iconLoader()->loadIcon(PROG_NAME "_engine", KIcon::Desktop));
kapp->iconLoader()->loadIcon(PROG_NAME "_engine", TDEIcon::Desktop));
/*
* Get a multi page work space

4
kbackgammon/engines/fibs/kbgfibschat.cpp
Unescape View File

@ -232,11 +232,11 @@ KBgChat::KBgChat(TQWidget *parent, const char *name)
*/
d->mAct[KBgChatPrivate::Inquire] = new TDEAction(i18n("Info On"),
TQIconSet(kapp->iconLoader()->loadIcon(
"help.xpm", KIcon::Small)),
"help.xpm", TDEIcon::Small)),
0, TQT_TQOBJECT(this), TQT_SLOT(slotInquire()), actions);
d->mAct[KBgChatPrivate::Talk] = new TDEAction(i18n("Talk To"),
TQIconSet(kapp->iconLoader()->loadIcon(
PROG_NAME "-chat.png", KIcon::Small)),
PROG_NAME "-chat.png", TDEIcon::Small)),
0, TQT_TQOBJECT(this), TQT_SLOT(slotTalk()), actions);
d->mAct[KBgChatPrivate::InviteD] = new TDEAction(i18n("Use Dialog"), 0, TQT_TQOBJECT(this),

4
kbackgammon/engines/fibs/kplayerlist.cpp
Unescape View File

@ -288,11 +288,11 @@ KFibsPlayerList::KFibsPlayerList(TQWidget *parent, const char *name)
*/
d->mAct[KFibsPlayerListPrivate::Info] = new TDEAction(i18n("Info"),
TQIconSet(kapp->iconLoader()->loadIcon
("help.xpm", KIcon::Small)),
("help.xpm", TDEIcon::Small)),
0, TQT_TQOBJECT(this), TQT_SLOT(slotInfo()), actions);
d->mAct[KFibsPlayerListPrivate::Talk] = new TDEAction(i18n("Talk"),
TQIconSet(kapp->iconLoader()->loadIcon
(PROG_NAME "-chat.png", KIcon::Small)),
(PROG_NAME "-chat.png", TDEIcon::Small)),
0, TQT_TQOBJECT(this), TQT_SLOT(slotTalk()), actions);
d->mAct[KFibsPlayerListPrivate::Look] = new TDEAction(i18n("Look"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotLook()), actions);

2
kbackgammon/engines/gnubg/kbggnubg.cpp
Unescape View File

@ -380,7 +380,7 @@ void KBgEngineGNU::getSetupPages(KDialogBase *nb)
* Main Widget
*/
TQVBox *w = nb->addVBoxPage(i18n("GNU Engine"), i18n("Here you can configure the GNU backgammon engine"),
kapp->iconLoader()->loadIcon(PROG_NAME "_engine", KIcon::Desktop));
kapp->iconLoader()->loadIcon(PROG_NAME "_engine", TDEIcon::Desktop));
}
/*

2
kbackgammon/engines/offline/kbgoffline.cpp
Unescape View File

@ -180,7 +180,7 @@ void KBgEngineOffline::getSetupPages(KDialogBase *nb)
* Main Widget
*/
TQVBox *vbp = nb->addVBoxPage(i18n("Offline Engine"), i18n("Use this to configure the Offline engine"),
kapp->iconLoader()->loadIcon(PROG_NAME "_engine", KIcon::Desktop));
kapp->iconLoader()->loadIcon(PROG_NAME "_engine", TDEIcon::Desktop));
/*
* Get a multi page work space

4
kbackgammon/kbg.cpp
Unescape View File

@ -122,7 +122,7 @@ KBg::KBg()
endAction = KStdGameAction::endTurn(TQT_TQOBJECT(this), TQT_SLOT(done()), actionCollection());
endAction->setEnabled(false);
cubeAction = new TDEAction(i18n("Double Cube"), TQIconSet(kapp->iconLoader()->loadIcon
(PROG_NAME "-double.xpm", KIcon::Toolbar)),
(PROG_NAME "-double.xpm", TDEIcon::Toolbar)),
0, TQT_TQOBJECT(this), TQT_SLOT(cube()), actionCollection(), "move_cube");
cubeAction->setEnabled(false);
@ -508,7 +508,7 @@ void KBg::setupDlg()
*/
TQVBox *w = nb->addVBoxPage(i18n("General"), i18n("Here you can configure general settings of %1").
arg(kapp->aboutData()->programName()),
kapp->iconLoader()->loadIcon("go", KIcon::Desktop));
kapp->iconLoader()->loadIcon("go", TDEIcon::Desktop));
/*
* Group boxes

2
kbackgammon/kbgboard.cpp
Unescape View File

@ -129,7 +129,7 @@ void KBgBoardSetup::getSetupPages(KDialogBase *nb)
* ===========
*/
TQVBox *vbp = nb->addVBoxPage(i18n("Board"), i18n("Here you can configure the backgammon board"),
kapp->iconLoader()->loadIcon(PROG_NAME, KIcon::Desktop));
kapp->iconLoader()->loadIcon(PROG_NAME, TDEIcon::Desktop));
/*
* Need more than one page

34
kmahjongg/Editor.cpp
Unescape View File

@ -105,40 +105,40 @@ Editor::~Editor()
void Editor::setupToolbar()
{
KIconLoader *loader = TDEGlobal::iconLoader();
TDEIconLoader *loader = TDEGlobal::iconLoader();
topToolbar = new TDEToolBar( this, "editToolBar" );
TDEToolBarRadioGroup *radio = new TDEToolBarRadioGroup(topToolbar);
// new game
topToolbar->insertButton(loader->loadIcon("filenew", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("filenew", TDEIcon::Toolbar),
ID_TOOL_NEW, true, i18n("New board"));
// open game
topToolbar->insertButton(loader->loadIcon("fileopen", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("fileopen", TDEIcon::Toolbar),
ID_TOOL_LOAD, true, i18n("Open board"));
// save game
topToolbar->insertButton(loader->loadIcon("filesave", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("filesave", TDEIcon::Toolbar),
ID_TOOL_SAVE, true, i18n("Save board"));
topToolbar->setButtonIconSet(ID_TOOL_SAVE,loader->loadIconSet("filesave", KIcon::Toolbar));
topToolbar->setButtonIconSet(ID_TOOL_SAVE,loader->loadIconSet("filesave", TDEIcon::Toolbar));
#ifdef FUTURE_OPTIONS
// Select
topToolbar->insertSeparator();
topToolbar->insertButton(loader->loadIcon("rectangle_select", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("rectangle_select", TDEIcon::Toolbar),
ID_TOOL_SELECT, true, i18n("Select"));
topToolbar->insertButton(loader->loadIcon("editcut", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("editcut", TDEIcon::Toolbar),
ID_TOOL_CUT, true, i18n("Cut"));
topToolbar->insertButton(loader->loadIcon("editcopy", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("editcopy", TDEIcon::Toolbar),
ID_TOOL_COPY, true, i18n("Copy"));
topToolbar->insertButton(loader->loadIcon("editpaste", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("editpaste", TDEIcon::Toolbar),
ID_TOOL_PASTE, true, i18n("Paste"));
topToolbar->insertSeparator();
topToolbar->insertButton(loader->loadIcon("move", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("move", TDEIcon::Toolbar),
ID_TOOL_MOVE, true, i18n("Move tiles"));
#endif
topToolbar->insertButton(loader->loadIcon("pencil", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("pencil", TDEIcon::Toolbar),
ID_TOOL_ADD, true, i18n("Add tiles"));
topToolbar->insertButton(loader->loadIcon("editdelete", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("editdelete", TDEIcon::Toolbar),
ID_TOOL_DEL, true, i18n("Remove tiles"));
topToolbar->setToggle(ID_TOOL_ADD);
@ -154,17 +154,17 @@ void Editor::setupToolbar()
// board shift
topToolbar->insertSeparator();
topToolbar->insertButton(loader->loadIcon("back", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("back", TDEIcon::Toolbar),
ID_TOOL_LEFT, true, i18n("Shift left"));
topToolbar->insertButton(loader->loadIcon("up", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("up", TDEIcon::Toolbar),
ID_TOOL_UP, true, i18n("Shift up"));
topToolbar->insertButton(loader->loadIcon("down", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("down", TDEIcon::Toolbar),
ID_TOOL_DOWN, true, i18n("Shift down"));
topToolbar->insertButton(loader->loadIcon("forward", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("forward", TDEIcon::Toolbar),
ID_TOOL_RIGHT, true, i18n("Shift right"));
topToolbar->insertSeparator();
topToolbar->insertButton(loader->loadIcon("exit", KIcon::Toolbar),
topToolbar->insertButton(loader->loadIcon("exit", TDEIcon::Toolbar),
ID_META_EXIT, true, i18n("Exit"));
// status in the toolbar for now (ick)

4
kmahjongg/HighScore.cpp
Unescape View File

@ -127,8 +127,8 @@ HighScore::HighScore
resetBtn->setAutoRepeat( false );
resetBtn->setAutoResize( false );
KIconLoader *loader = TDEGlobal::iconLoader();
resetBtn->setPixmap(loader->loadIcon("editdelete", KIcon::Toolbar));
TDEIconLoader *loader = TDEGlobal::iconLoader();
resetBtn->setPixmap(loader->loadIcon("editdelete", TDEIcon::Toolbar));

12
knetwalk/src/cell.cpp
Unescape View File

@ -47,7 +47,7 @@ void Cell::initPixmaps()
for(it = names.constBegin(); it != names.constEnd(); ++it)
{
connectedpixmap[it.key()]=new TQPixmap(TDEGlobal::iconLoader()->loadIcon(
locate("data","knetwalk/cable"+it.data()+".png"), KIcon::NoGroup, 32) );
locate("data","knetwalk/cable"+it.data()+".png"), TDEIcon::NoGroup, 32) );
TQImage image = connectedpixmap[it.key()]->convertToImage();
for(int y = 0; y < image.height(); y++)
@ -152,9 +152,9 @@ void Cell::paintEvent(TQPaintEvent*)
{
changed = false;
if ( locked ) {
pixmap = TDEGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/background_locked.png"), KIcon::NoGroup, 32);
pixmap = TDEGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/background_locked.png"), TDEIcon::NoGroup, 32);
} else {
pixmap = TDEGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/background.png"), KIcon::NoGroup, 32);
pixmap = TDEGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/background.png"), TDEIcon::NoGroup, 32);
}
TQPainter paint;
@ -185,14 +185,14 @@ void Cell::paintEvent(TQPaintEvent*)
if(root)
{
pix=TDEGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/server.png"), KIcon::NoGroup, 32);
pix=TDEGlobal::iconLoader()->loadIcon(locate("data", "knetwalk/server.png"), TDEIcon::NoGroup, 32);
}
else if(ddirs == U || ddirs == L || ddirs == D || ddirs == R)
{
if(connected)
pix=TDEGlobal::iconLoader()->loadIcon(locate("data","knetwalk/computer2.png"),KIcon::NoGroup,32);
pix=TDEGlobal::iconLoader()->loadIcon(locate("data","knetwalk/computer2.png"),TDEIcon::NoGroup,32);
else
pix=TDEGlobal::iconLoader()->loadIcon(locate("data","knetwalk/computer1.png"),KIcon::NoGroup,32);
pix=TDEGlobal::iconLoader()->loadIcon(locate("data","knetwalk/computer1.png"),TDEIcon::NoGroup,32);
}
paint.drawPixmap(0, 0, pix);
}

2
knetwalk/src/mainwindow.cpp
Unescape View File

@ -94,7 +94,7 @@ MainWindow::MainWindow(TQWidget *parent, const char* name, WFlags /*fl*/) :
" to turn it in a counter-clockwise direction."
"<p>Start the LAN with as few turns as possible!"));
//const int cellsize = TDEGlobal::iconLoader()->loadIcon("knetwalk/background.png", KIcon::User, 32).width();
//const int cellsize = TDEGlobal::iconLoader()->loadIcon("knetwalk/background.png", TDEIcon::User, 32).width();
const int cellsize = 32;
const int gridsize = cellsize * MasterBoardSize + 2;

2
libtdegames/highscore/kexthighscore_gui.cpp
Unescape View File

@ -211,7 +211,7 @@ HighscoresDialog::HighscoresDialog(int rank, TQWidget *parent)
TQString title = internal->manager.gameTypeLabel(i, Manager::I18N);
TQString icon = internal->manager.gameTypeLabel(i, Manager::Icon);
TQWidget *w = addVBoxPage(title, TQString(),
BarIcon(icon, KIcon::SizeLarge));
BarIcon(icon, TDEIcon::SizeLarge));
if ( i==internal->gameType() ) createPage(w);
}

10
libtdegames/kcarddialog.cpp
Unescape View File

@ -87,8 +87,8 @@ public:
TQLabel* deckLabel;
TQLabel* cardLabel;
KIconView* deckIconView;
KIconView* cardIconView;
TDEIconView* deckIconView;
TDEIconView* cardIconView;
TQCheckBox* randomDeck;
TQCheckBox* randomCardDir;
TQCheckBox* globalDeck;
@ -277,7 +277,7 @@ void KCardDialog::setupDialog(bool showResizeBox)
TQGroupBox* grp1 = new TQGroupBox(1,Qt::Horizontal, i18n("Choose Backside"), plainPage());
layout->addWidget(grp1);
d->deckIconView = new KIconView(grp1,"decks");
d->deckIconView = new TDEIconView(grp1,"decks");
d->deckIconView->setSpacing(8);
/*
deckIconView->setGridX(-1);
@ -329,7 +329,7 @@ void KCardDialog::setupDialog(bool showResizeBox)
TQGroupBox* grp2 = new TQGroupBox(1,Qt::Horizontal, i18n("Choose Frontside"), plainPage());
layout->addWidget(grp2);
d->cardIconView =new KIconView(grp2,"cards");
d->cardIconView =new TDEIconView(grp2,"cards");
/*
cardIconView->setGridX(36);
cardIconView->setGridY(50);
@ -416,7 +416,7 @@ void KCardDialog::setupDialog(bool showResizeBox)
// leads to an always resizing dialog which is *very* ugly. i worked around
// this by using a TQWidget which is the only child widget of the group box.
// The other widget are managed inside this TQWidget - a stretch area on the
// right ensures that the KIconViews are not resized...
// right ensures that the TDEIconViews are not resized...
// note that the dialog is still resized if you you scale the pixmap very
// large. This is desired behaviour as i don't want to make the box even

Write Preview
Loading…
Cancel
Save