Commit 3ea7ac55 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

kdelibs4support--

parent b006b55b
......@@ -22,7 +22,7 @@
#include <QSlider>
#include <kcombobox.h>
#include <klocale.h>
#include <KLocalizedString>
#include <ktabwidget.h>
#include "options.h"
......
......@@ -19,7 +19,7 @@
#include <kapplication.h>
#include <kcmdlineargs.h>
#include <K4AboutData>
#include <klocale.h>
#include <KLocalizedString>
#include "version.h"
#include "topwidget.h"
......
......@@ -31,7 +31,7 @@
#include <QAction>
#include <kactioncollection.h>
#include <kglobalsettings.h>
#include <klocale.h>
#include <KLocalizedString>
#include <kstandarddirs.h>
#include <ktoggleaction.h>
#include <kconfiggroup.h>
......
......@@ -17,20 +17,20 @@
#include "playerinfo.h"
#include <kicon.h>
#include <klocale.h>
#include <QIcon>
#include <KLocalizedString>
#include <kstandarddirs.h>
QPixmap* PlayerInfo::pplayer[6];
void PlayerInfo::loadPixmaps()
{
pplayer[0] = new QPixmap(KIcon( QLatin1String( "battery-discharging-100" )).pixmap(32,32));
pplayer[1] = new QPixmap(KIcon( QLatin1String( "battery-discharging-080" )).pixmap(32,32));
pplayer[2] = new QPixmap(KIcon( QLatin1String( "battery-discharging-060" )).pixmap(32,32));
pplayer[3] = new QPixmap(KIcon( QLatin1String( "battery-discharging-040" )).pixmap(32,32));
pplayer[4] = new QPixmap(KIcon( QLatin1String( "battery-discharging-020" )).pixmap(32,32));
pplayer[5] = new QPixmap(KIcon( QLatin1String( "battery-discharging-000" )).pixmap(32,32));
pplayer[0] = new QPixmap(QIcon::fromTheme( QLatin1String( "battery-discharging-100" )).pixmap(32,32));
pplayer[1] = new QPixmap(QIcon::fromTheme( QLatin1String( "battery-discharging-080" )).pixmap(32,32));
pplayer[2] = new QPixmap(QIcon::fromTheme( QLatin1String( "battery-discharging-060" )).pixmap(32,32));
pplayer[3] = new QPixmap(QIcon::fromTheme( QLatin1String( "battery-discharging-040" )).pixmap(32,32));
pplayer[4] = new QPixmap(QIcon::fromTheme( QLatin1String( "battery-discharging-020" )).pixmap(32,32));
pplayer[5] = new QPixmap(QIcon::fromTheme( QLatin1String( "battery-discharging-000" )).pixmap(32,32));
}
PlayerInfo::PlayerInfo(int pnr,QWidget *parent)
......@@ -72,7 +72,7 @@ PlayerInfo::PlayerInfo(int pnr,QWidget *parent)
lplayer.setPixmap(*(pplayer[0]));
currentPixmap=0;
//lenergy.setPixmap(QPixmap(KStandardDirs::locate("appdata", "sprites/playerinfo/energy.png")));
lenergy.setPixmap(KIcon( QLatin1String( "battery" )).pixmap(32,32));;
lenergy.setPixmap(QIcon::fromTheme( QLatin1String( "battery" )).pixmap(32,32));;
lwins.setPixmap(QPixmap(KStandardDirs::locate("appdata", QLatin1String( "sprites/playerinfo/win.png" ))));
hitpoints.setGeometry(9,45,26,26);
......
......@@ -19,9 +19,9 @@
#include "topwidget.h"
#include <kicon.h>
#include <QIcon>
#include <kshortcutsdialog.h>
#include <klocale.h>
#include <KLocalizedString>
#include <kstandardaction.h>
#include <kstandardgameaction.h>
#include <kstatusbar.h>
......@@ -94,7 +94,7 @@ void MyTopLevelWidget::setupActions()
KStandardGameAction::quit(this, SLOT(close()), actionCollection());
QAction * newRoundAct = actionCollection()->addAction( QLatin1String( "new_round" ) );
newRoundAct->setIcon( KIcon( QLatin1String( "preferences-desktop-notification-bell" )) );
newRoundAct->setIcon( QIcon::fromTheme( QLatin1String( "preferences-desktop-notification-bell" )) );
newRoundAct->setText( i18n( "&New Round" ) );
newRoundAct->setShortcut( Qt::CTRL + Qt::Key_R );
connect( newRoundAct, SIGNAL(triggered(bool)), playfield, SLOT(newRound()) );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment