Commit b006b55b authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Port++

parent 3b6994a4
......@@ -71,11 +71,11 @@ install(FILES default_theme.svgz DESTINATION ${DATA_INSTALL_DIR}/kspaceduel/spri
########### install files ###############
install( PROGRAMS kspaceduel.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( PROGRAMS org.kde.kspaceduel.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
install( FILES kspaceduel.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
install( FILES kspaceduelui.rc DESTINATION ${DATA_INSTALL_DIR}/kspaceduel )
ecm_install_icons( ${ICON_INSTALL_DIR} )
ecm_install_icons( ICONS hi128-apps-kspaceduel.png hi16-apps-kspaceduel.png hi22-apps-kspaceduel.png hi32-apps-kspaceduel.png hi48-apps-kspaceduel.png hi64-apps-kspaceduel.png DESTINATION ${ICON_INSTALL_DIR} )
......
......@@ -277,7 +277,7 @@ void ConfigSetup::updateSettings()
*customConfig=config;
Options::setLastConfig(selectedConfig);
Options::self()->writeConfig();
Options::self()->save();
}
bool ConfigSetup::hasChanged()
......@@ -461,4 +461,4 @@ bool SettingsDialog::isDefault()
return cs->isDefault();
}
#include "dialogs.moc"
......@@ -40,6 +40,7 @@
#include <KGlobal>
#include <KShortcut>
#include <QFontDatabase>
#include "ai.h"
#include "options.h"
......@@ -178,7 +179,7 @@ bool MyMainView::readSprites()
void MyMainView::readConfig()
{
KConfigGroup game(KGlobal::config(), "Game");
KConfigGroup game(KSharedConfig::openConfig(), "Game");
int i;
customConfig.gamespeed=game.readEntry("gamespeed",
......@@ -252,7 +253,7 @@ void MyMainView::readConfig()
void MyMainView::writeConfig()
{
KConfigGroup game(KGlobal::config(), "Game");
KConfigGroup game(KSharedConfig::openConfig(), "Game");
game.writeEntry("gravity",customConfig.gravity);
game.writeEntry("acceleration",customConfig.acc);
......@@ -567,7 +568,7 @@ void MyMainView::timerEvent(QTimerEvent *event)
// FIXME
// textSprite->setTextFlags(Qt::AlignCenter);
textSprite->setBrush(QBrush(QColor(255,160,0)));
textSprite->setFont(QFont(KGlobalSettings::generalFont().family(),14));
textSprite->setFont(QFont(QFontDatabase::systemFont(QFontDatabase::GeneralFont).family(),14));
textSprite->show( );
if(ship[0]->getHitPoints()==0)
{
......@@ -1089,4 +1090,4 @@ void MyMainView::focusOutEvent (QFocusEvent * /*event*/)
setFocus(Qt::OtherFocusReason);
}
#include "mainview.moc"
......@@ -134,3 +134,4 @@ Terminal=false
X-KDE-StartupNotify=true
X-DBUS-StartupType=Multi
Categories=Qt;KDE;Game;ArcadeGame;
X-DBUS-ServiceName=org.kde.kspaceduel
ecm_install_icons( ${DATA_INSTALL_DIR}/kspaceduel/icons )
ecm_install_icons( ICONS hi16-actions-spnewgame.png hi16-actions-spnewround.png hi16-actions-sppausegame.png hi22-actions-spnewgame.png hi22-actions-spnewround.png hi22-actions-sppausegame.png hi32-actions-spnewgame.png hi32-actions-spnewround.png hi32-actions-sppausegame.png DESTINATION ${DATA_INSTALL_DIR}/kspaceduel/icons )
......@@ -130,4 +130,4 @@ void PlayerInfo::setWins(int w)
wins.display(w);
}
#include "playerinfo.moc"
......@@ -184,4 +184,4 @@ void MyTopLevelWidget::keySetup()
KShortcutsDialog::configure( actionCollection( ), KShortcutsEditor::LetterShortcutsAllowed, this, true );
}
#include "topwidget.moc"
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