Commit b04b351e authored by Tomas Mecir's avatar Tomas Mecir

KF5 port now compiles, doesn't run yet

parent 0fa5fe91
......@@ -13,7 +13,7 @@ include(KDEFrameworkCompilerSettings)
include(ECMInstallIcons)
find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets Script Multimedia)
find_package(KF5 REQUIRED COMPONENTS Config CoreAddons WidgetsAddons I18n KIO KDELibs4Support KCMUtils XmlGui Parts Service IconThemes)
find_package(KF5 REQUIRED COMPONENTS Config CoreAddons WidgetsAddons I18n KIO KDELibs4Support KCMUtils XmlGui Parts Service IconThemes Archive)
find_package(MXP)
if (MXP_FOUND)
......
......@@ -93,4 +93,3 @@ bool cConverterDialog::display (std::list<ConversionDialogItem *> items)
}
#include "converterdialog.moc"
......@@ -70,7 +70,7 @@ ki18n_wrap_ui (kmuddymapper_PART_SRCS
add_library(kmuddymapper MODULE ${kmuddymapper_PART_SRCS})
target_link_libraries(kmuddymapper KF5::KDELibs4Support KF5::Parts kmuddycore )
target_link_libraries(kmuddymapper KF5::KDELibs4Support KF5::Parts KF5::WidgetsAddons KF5::Service KF5::Archive kmuddycore )
install(TARGETS kmuddymapper DESTINATION ${PLUGIN_INSTALL_DIR} )
......
......@@ -17,11 +17,12 @@
#include "cmapclipboard.h"
#include <kaction.h>
#include <kactioncollection.h>
#include <kdebug.h>
#include <klocale.h>
#include <QAction>
#include "cmapmanager.h"
#include "cmappath.h"
#include "cmapzone.h"
......@@ -59,31 +60,31 @@ void CMapClipboard::initActions(void)
// Edit menu
KActionCollection *acol = m_view->actionCollection();
m_editSelectAll = new KAction (m_parent);
m_editSelectAll = new QAction (m_parent);
m_editSelectAll->setText (i18n ("Select All"));
connect (m_editSelectAll, SIGNAL (triggered ()), this, SLOT (slotSelectAll ()));
acol->addAction ("editSelectAll", m_editSelectAll);
m_editUnselectAll = new KAction (m_parent);
m_editUnselectAll = new QAction (m_parent);
m_editUnselectAll->setText (i18n ("Unselect All"));
connect (m_editUnselectAll, SIGNAL (triggered ()), this, SLOT (slotUnselectAll ()));
acol->addAction ("editUnselectAll", m_editUnselectAll);
m_editSelectInvert = new KAction (m_parent);
m_editSelectInvert = new QAction (m_parent);
m_editSelectInvert->setText (i18n ("Invert Selection"));
connect (m_editSelectInvert, SIGNAL (triggered ()), this, SLOT (slotInvertSelection ()));
acol->addAction ("editSelectInvert", m_editSelectInvert);
m_editDelete = new KAction (m_parent);
m_editDelete = new QAction (m_parent);
m_editDelete->setText (i18n ("Delete"));
connect (m_editDelete, SIGNAL (triggered ()), this, SLOT (slotDelete ()));
acol->addAction ("editDelete", m_editDelete);
m_editCopy = new KAction (m_parent);
m_editCopy = new QAction (m_parent);
m_editCopy->setText (i18n ("Copy"));
connect (m_editCopy, SIGNAL (triggered ()), this, SLOT (slotCopy ()));
acol->addAction ("editCopy", m_editCopy);
m_editCut = new KAction (m_parent);
m_editCut = new QAction (m_parent);
m_editCut->setText (i18n ("Cut"));
connect (m_editCut, SIGNAL (triggered ()), this, SLOT (slotCut ()));
acol->addAction ("editCut", m_editCut);
m_editPaste = new KAction (m_parent);
m_editPaste = new QAction (m_parent);
m_editPaste->setText (i18n ("Paste"));
connect (m_editPaste, SIGNAL (triggered ()), this, SLOT (slotPaste ()));
acol->addAction ("editPaste", m_editPaste);
......
......@@ -21,7 +21,7 @@
#include <qobject.h>
#include <kconfiggroup.h>
class KAction;
class QAction;
class CMapManager;
class KMemConfig;
class CMapZone;
......@@ -78,13 +78,13 @@ private:
CMapView *m_view;
QObject *m_parent;
KAction *m_editSelectAll;
KAction *m_editUnselectAll;
KAction *m_editSelectInvert;
KAction *m_editDelete;
KAction *m_editCopy;
KAction *m_editCut;
KAction *m_editPaste;
QAction *m_editSelectAll;
QAction *m_editUnselectAll;
QAction *m_editSelectInvert;
QAction *m_editDelete;
QAction *m_editCopy;
QAction *m_editCut;
QAction *m_editPaste;
};
......
......@@ -42,8 +42,8 @@ class CMapCmdElementCreate : public CMapCommand,CMapElementUtil
public:
CMapCmdElementCreate(CMapManager *mapManager,QString name);
~CMapCmdElementCreate();
virtual void redo();
virtual void undo();
virtual void redo() override;
virtual void undo() override;
void addElement(KMemConfig *newElementProperties,QString grp = "Properties");
......
......@@ -38,8 +38,8 @@ class CMapCmdElementDelete : public CMapCommand,CMapElementUtil
public:
CMapCmdElementDelete(CMapManager *mapManager,QString name,bool delOpsite = true);
~CMapCmdElementDelete();
virtual void redo();
virtual void undo();
virtual void redo() override;
virtual void undo() override;
void addElement(KMemConfig *newElementProperties);
......
......@@ -42,8 +42,8 @@ class CMapCmdElementProperties : public CMapCommand
public:
CMapCmdElementProperties(CMapManager *mapManager,QString name,CMapElement *element);
~CMapCmdElementProperties();
virtual void redo();
virtual void undo();
virtual void redo() override;
virtual void undo() override;
KConfigGroup getOrgProperties(void);
KConfigGroup getNewProperties(void);
......
......@@ -29,8 +29,8 @@ class CMapCmdGroup : public CMapCommand
public:
CMapCmdGroup(CMapManager *mapManager,QString name);
~CMapCmdGroup();
virtual void redo();
virtual void undo();
virtual void redo() override;
virtual void undo() override;
void addCommand(CMapCommand *command);
CMapCmdGroup *getPreviousGroup(void);
void setPreviousGroup(CMapCmdGroup *group);
......
......@@ -34,8 +34,8 @@ public:
CMapCmdLevelCreate(CMapManager *manager,QString name,int index);
~CMapCmdLevelCreate();
virtual void redo();
virtual void undo();
virtual void redo() override;
virtual void undo() override;
CMapLevel *getLevel(void);
......
......@@ -35,8 +35,8 @@ public:
CMapCmdLevelDelete(CMapManager *manager,QString name, CMapLevel *level);
~CMapCmdLevelDelete();
virtual void redo();
virtual void undo();
virtual void redo() override;
virtual void undo() override;
private:
int m_index;
......
......@@ -33,8 +33,8 @@ public:
CMapCmdMoveMap(CMapManager *manager,QPoint offset,QString name);
~CMapCmdMoveMap();
virtual void redo();
virtual void undo();
virtual void redo() override;
virtual void undo() override;
private:
/** This method is used to move the elements in a zone by the given vector */
......
......@@ -31,8 +31,8 @@ class CMapCmdMovePlayer : public CMapCommand
public:
CMapCmdMovePlayer(CMapManager *mapManager, directionTyp direction, QString specialCmd, bool create);
~CMapCmdMovePlayer();
virtual void redo();
virtual void undo();
virtual void redo() override;
virtual void undo() override;
private:
CMapManager *m_manager;
......
......@@ -38,8 +38,8 @@ public:
CMapCmdTogglePathTwoWay(CMapManager *mapManager,QString name,CMapPath *path);
~CMapCmdTogglePathTwoWay();
virtual void redo();
virtual void undo();
virtual void redo() override;
virtual void undo() override;
private:
void togglePath(CMapPath *path);
......
......@@ -26,11 +26,11 @@
#include <kstandardaction.h>
#include <kfiledialog.h>
#include <kpagedialog.h>
#include <kcomponentdata.h>
#include <kundostack.h>
#include <QIcon>
#include <QQueue>
#include <qtimer.h>
#include <QTimer>
#include <QUndoStack>
#include "cmapzone.h"
#include "cmappath.h"
......@@ -91,7 +91,7 @@ CMapManager::CMapManager (QWidget *parent, KMuddyMapper *mapper, int sessId) :
elementEdit = NULL;
/** Create undo/redo history */
commandHistory = new KUndoStack();
commandHistory = new QUndoStack();
//FIXME_jp: Needs to be configurable
commandHistory->setUndoLimit(30);
commandHistory->clear();
......@@ -155,11 +155,6 @@ CMapManager::~CMapManager()
kDebug() << "CMapManager::~CMapManager() end";
}
KComponentData CMapManager::instance ()
{
return mapperPlugin->componentData();
}
void CMapManager::eventStringHandler (QString event, int, QString &par1, const QString &)
{
if (event == "dialog-create") {
......@@ -197,16 +192,16 @@ void CMapManager::createGlobalConfigPanes ()
KPageWidgetItem *item;
QFrame *frmdir = new QFrame (dlg);
item = dlg->addPage (frmdir, i18n ("Mapper: Directions"));
item->setIcon (KIcon ("gear"));
item->setIcon (QIcon::fromTheme ("gear"));
QFrame *frmmovement = new QFrame (dlg);
item = dlg->addPage (frmmovement, i18n ("Mapper: Movement"));
item->setIcon (KIcon ("run"));
item->setIcon (QIcon::fromTheme ("run"));
QFrame *frmcolor = new QFrame (dlg);
item = dlg->addPage (frmcolor, i18n ("Mapper: Colors"));
item->setIcon (KIcon ("colorize"));
item->setIcon (QIcon::fromTheme ("colorize"));
QFrame *frmspeedwalk = new QFrame (dlg);
item = dlg->addPage (frmspeedwalk, i18n ("Mapper: Speedwalk"));
item->setIcon (KIcon ("launch"));
item->setIcon (QIcon::fromTheme ("launch"));
QVBoxLayout *dirlayout = new QVBoxLayout (frmdir);
QVBoxLayout *movementlayout = new QVBoxLayout (frmmovement);
......
......@@ -25,7 +25,6 @@
#include <qpoint.h>
#include <qobject.h>
#include <QLinkedList>
#include <qworkspace.h>
#include <QStringList>
#include <qcursor.h>
......@@ -35,7 +34,6 @@
#include <kaction.h>
#include <kselectaction.h>
#include <ktoggleaction.h>
#include <ksimpleconfig.h>
#include <kstatusbar.h>
#include <kconfiggroup.h>
......@@ -72,9 +70,8 @@ class DlgMapSpeedwalk;
class KMuddyMapper;
class KComponentData;
class QActionGroup;
class KUndoStack;
class QUndoStack;
/**This is used to make the mapper perform different tasks
*@author KMud Development Team
......@@ -88,7 +85,7 @@ public:
CMapManager (QWidget *parent, KMuddyMapper *mapper, int sess);
~CMapManager();
void eventStringHandler (QString event, int, QString &par1, const QString &);
void eventStringHandler (QString event, int, QString &par1, const QString &) override;
/** Used to get a list of the plugins */
QLinkedList<CMapPluginBase *> getPluginList();
......@@ -232,7 +229,7 @@ public:
CMapLevel *findLevel(unsigned int id);
/** Obtain the command history */
KUndoStack *getCommandHistory() { return commandHistory; };
QUndoStack *getCommandHistory() { return commandHistory; };
/** Used to create a new command group */
void openCommandGroup(QString name);
/** Used to close a command group */
......@@ -270,8 +267,6 @@ public:
QString defaultSavePath () const;
KComponentData instance ();
public:
/** A count of the number of levels created */
unsigned int m_levelCount;
......@@ -314,7 +309,7 @@ private:
/** A list of all loaded tools */
QLinkedList<CMapToolBase *> toolList;
/** The undo/redo history */
KUndoStack *commandHistory;
QUndoStack *commandHistory;
/** Points the command history currently being used */
CMapCmdGroup *historyGroup;
/** Used to store the amount of steps taken in the speedwalk */
......
......@@ -38,26 +38,26 @@ public:
CMapPath(CMapManager *manager,CMapRoom *srcRoom,CMapRoom *destRoom);
~CMapPath();
elementTyp getElementType(void) { return PATH ; }
elementTyp getElementType(void) override { return PATH ; }
/** This method is used to set the cords of the path */
void setCords(void);
bool getDone(void) { return done; }
void setDone(bool set) { done = set; }
void paint(QPainter *p,CMapZone *zone);
void paint(QPainter *p,CMapZone *zone) override;
/** Used to paint the element while it is bined resized */
void resizePaint(QPoint offset,QPainter *p,CMapZone *currentZone,int resizeId);
void dragPaint(QPoint offset,QPainter *p,CMapZone *zone);
void lowerPaint(QPainter *p,CMapZone *zone);
void higherPaint(QPainter *p,CMapZone *zone);
void resizePaint(QPoint offset,QPainter *p,CMapZone *currentZone,int resizeId) override;
void dragPaint(QPoint offset,QPainter *p,CMapZone *zone) override;
void lowerPaint(QPainter *p,CMapZone *zone) override;
void higherPaint(QPainter *p,CMapZone *zone) override;
void editPaint(QPoint pos,QPainter *p,CMapZone *,int editBox);
/** Used to find out if the mouse is in the element */
bool mouseInElement(QPoint mousePos);
bool mouseInElement(QPoint mousePos) override;
/** Used to create a deep copy of the path */
CMapElement *copy(void);
CMapElement *copy(void) override;
/** Get the directions of the start and finish directions of the path */
directionTyp getSrcDir(void) { return srcDir; }
......@@ -105,27 +105,27 @@ public:
QString getAfterCommand(void) { return afterCommand; }
/** Used to load the properties of the element from a list of properties */
virtual void loadProperties(KConfigGroup grp);
virtual void loadProperties(KConfigGroup grp) override;
/** Used to save the properties of the element to a list of properties */
virtual void saveProperties(KConfigGroup grp);
virtual void saveProperties(KConfigGroup grp) override;
/** Used to save the element as an XML object
* @param properties The XML object to save the properties too
* @param doc The XML Document */
virtual void saveQDomElement(QDomDocument *doc,QDomElement *properties);
virtual void saveQDomElement(QDomDocument *doc,QDomElement *properties) override;
/** Used to load the properties from a XML object
* @param properties The XML object to load the properties from */
virtual void loadQDomElement(QDomElement *properties);
virtual void loadQDomElement(QDomElement *properties) override;
/** Used to move the element relative to it's current position */
virtual void moveBy(QPoint offset);
virtual void moveBy(QPoint offset) override;
/** This is overriddent to stop a path be resized */
virtual void resize(QPoint,int) { }
/** This is overridden to stop a path be resized */
virtual void resize(QPoint,int) override { }
/** Used to find out if the mouse is in the resize box
* @param mousePos The position of the mouse pointer
* @param currentZone A pointer to the current zone
* @return the ID of the resize box, or 0 if not in any */
virtual int mouseInResize(QPoint mousePos,CMapZone *currentZone);
virtual int mouseInResize(QPoint mousePos,CMapZone *currentZone) override;
/**
* This method is used to find out if the mouse pointer is in a path segment.
* @param mousePos The position of the mouse
......@@ -161,13 +161,13 @@ protected:
QPoint deletePathSeg(int seg);
/** This method is used to calculate the positions of the resize handles */
void generateResizePositions(void);
void generateResizePositions(void) override;
/** Used to paint the element at a given location and size
* @param p The painer to paint the element to
* @param pos The position to paint the elmenet
* @param size The size the element should be draw
* @param zone The current zone being viewed */
virtual void paintElementResize(QPainter *p,QPoint pos,QSize size,CMapZone *zone);
virtual void paintElementResize(QPainter *p,QPoint pos,QSize size,CMapZone *zone) override;
private:
/** This method is used to calcualte the distance from a path segment */
......
......@@ -41,9 +41,9 @@ public:
CMapRoom(CMapManager *manager,QRect rect,CMapLevel *level);
~CMapRoom();
elementTyp getElementType(void) { return ROOM ; }
elementTyp getElementType(void) override { return ROOM ; }
virtual void setLevel(CMapLevel *level);
virtual void setLevel(CMapLevel *level) override;
void setLabel(QString str);
QString getLabel(void) { return label; }
......@@ -80,12 +80,12 @@ public:
void setMoveTime(int moveTime) { time = moveTime; }
int getMoveTime(void) { return time; }
void paint(QPainter *p,CMapZone *);
void dragPaint(QPoint offset,QPainter *p,CMapZone *);
void lowerPaint(QPainter *p,CMapZone *);
void higherPaint(QPainter *p,CMapZone *);
void paint(QPainter *p,CMapZone *) override;
void dragPaint(QPoint offset,QPainter *p,CMapZone *) override;
void lowerPaint(QPainter *p,CMapZone *) override;
void higherPaint(QPainter *p,CMapZone *) override;
CMapElement *copy(void);
CMapElement *copy(void) override;
labelPosTyp getLabelPosition(void);
void setLabelPosition(labelPosTyp pos);
......@@ -93,21 +93,21 @@ public:
void textRemove(void);
/** Used to load the properties of the element from a list of properties */
virtual void loadProperties(KConfigGroup properties);
virtual void loadProperties(KConfigGroup properties) override;
/** Used to save the properties of the element to a list of properties */
virtual void saveProperties(KConfigGroup properties);
virtual void saveProperties(KConfigGroup properties) override;
/** Used to save the element as an XML object
* @param properties The XML object to save the properties too
* @param doc The XML Document */
virtual void saveQDomElement(QDomDocument *doc,QDomElement *properties);
virtual void saveQDomElement(QDomDocument *doc,QDomElement *properties) override;
/** Used to load the properties from a XML object
* @param properties The XML object to load the properties too */
virtual void loadQDomElement(QDomElement *properties);
virtual void loadQDomElement(QDomElement *properties) override;
/** Used to move the element relative to it's current position */
virtual void moveBy(QPoint offset);
virtual void moveBy(QPoint offset) override;
/** This is used to resize the element */
void resize(QPoint offset,int resizeId);
void resize(QPoint offset,int resizeId) override;
/** This is used to get a unique ID for the room */
unsigned int getRoomID(void);
/** This is used to set the ID of the room */
......@@ -121,7 +121,7 @@ protected:
* @param pos The position to paint the elmenet
* @param size The size the element should be draw
* @param zone The current zone being viewed */
void paintElementResize(QPainter *p,QPoint pos,QSize size,CMapZone *zone);
void paintElementResize(QPainter *p,QPoint pos,QSize size,CMapZone *zone) override;
void geometryChanged(void);
unsigned int m_ID;
......
......@@ -39,8 +39,8 @@ public:
CMapText(QString str,CMapManager *manager,QPoint pos,CMapLevel *level);
~CMapText();
elementTyp getElementType(void) { return TEXT ; }
virtual void setLevel(CMapLevel *level);
elementTyp getElementType(void) override { return TEXT ; }
virtual void setLevel(CMapLevel *level) override;
/** Sets the text of the text element
* @param str The new string that the text element should be set to
......@@ -71,16 +71,16 @@ public:
* @param p The painter used to paint the text
* @param zone The zone the text is being painted in
*/
void paint(QPainter *p,CMapZone *zone);
void dragPaint(QPoint offset,QPainter *p,CMapZone *zone);
void lowerPaint(QPainter *p,CMapZone *zone);
void higherPaint(QPainter *p,CMapZone *zone);
void paint(QPainter *p,CMapZone *zone) override;
void dragPaint(QPoint offset,QPainter *p,CMapZone *zone) override;
void lowerPaint(QPainter *p,CMapZone *zone) override;
void higherPaint(QPainter *p,CMapZone *zone) override;
/** This is used to create a new copy of the text element and return
* a pointer to the new text element
* @return A pointer to the copy of the text element.
*/
CMapElement *copy(void);
CMapElement *copy(void) override;
void setLinkElement (CMapElement *element) { m_linkElement = element; }
CMapElement *getLinkElement(void) { return m_linkElement; }
......@@ -116,17 +116,17 @@ public:
/** Used to load the properties of the element from a list of properties
* @param properties The properties to load into the element */
virtual void loadProperties(KConfigGroup properties);
virtual void loadProperties(KConfigGroup properties) override;
/** Used to save the properties of the element to a list of properties
* @param properties The properties to load into the element */
virtual void saveProperties(KConfigGroup properties);
virtual void saveProperties(KConfigGroup properties) override;
/** Used to save the element as an XML object
* @param properties The XML object to save the properties too
* @param doc The XML Document */
virtual void saveQDomElement(QDomDocument *doc,QDomElement *properties);
virtual void saveQDomElement(QDomDocument *doc,QDomElement *properties) override;
/** Used to load the properties from a XML object
* @param properties The XML object to load the properties from */
virtual void loadQDomElement(QDomElement *properties);
virtual void loadQDomElement(QDomElement *properties) override;
/** This is used to convert mouse cordinates into a cursor position
* @param mousePos The position of the mose */
......@@ -170,15 +170,15 @@ public:
protected:
/** This method is called when the element looses it's edit mode */
virtual void editModeUnsetEvent(void);
virtual void editModeUnsetEvent(void) override;
/** This method is called when the element gains it's edit mode */
virtual void editModeSetEvent(void);
virtual void editModeSetEvent(void) override;
/** Used to paint the element at a given location and size
* @param p The painer to paint the element to
* @param pos The position to paint the elmenet
* @param size The size the element should be draw
* @param zone The current zone being viewed */
virtual void paintElementResize(QPainter *p,QPoint pos,QSize size,CMapZone *zone);
virtual void paintElementResize(QPainter *p,QPoint pos,QSize size,CMapZone *zone) override;
private:
/** This used internaly to calculate the offset of the cursor */
......
......@@ -18,6 +18,7 @@
#include "cmapview.h"
#include <QAction>
#include <QPushButton>
#include <QScrollArea>
#include <QActionGroup>
......@@ -35,7 +36,6 @@
#include "cmapclipboard.h"
#include "cmapcmdelementproperties.h"
#include <kaction.h>
#include <kselectaction.h>
#include <ktoggleaction.h>
#include <kactioncollection.h>
......@@ -124,27 +124,27 @@ void CMapView::initMenus()
m_toolsGrid->setIcon (BarIcon("kmud_grid.png"));
connect (m_toolsGrid, SIGNAL (triggered()), this, SLOT(slotToolsGrid()));
actionCollection()->addAction ("toolsGrid", m_toolsGrid);
m_toolsUpLevel = new KAction (this);
m_toolsUpLevel = new QAction (this);
m_toolsUpLevel->setText ( i18n("Display Upper Level"));
m_toolsUpLevel->setIcon (BarIcon("arrow-up"));
connect (m_toolsUpLevel, SIGNAL (triggered()), this, SLOT(slotToolsLevelUp()));
actionCollection()->addAction ("toolsLevelUp", m_toolsUpLevel);
m_toolsDownLevel = new KAction (this);
m_toolsDownLevel = new QAction (this);
m_toolsDownLevel->setText ( i18n("Display Lower Level"));
m_toolsDownLevel->setIcon (BarIcon("arrow-down"));
connect (m_toolsDownLevel, SIGNAL (triggered()), this, SLOT(slotToolsLevelDown()));
actionCollection()->addAction ("toolsLevelDown", m_toolsDownLevel);
m_toolsDeleteLevel = new KAction (this);
m_toolsDeleteLevel = new QAction (this);
m_toolsDeleteLevel->setText ( i18n("Delete Current Level"));
m_toolsDeleteLevel->setIcon (BarIcon("edit-delete"));
connect (m_toolsDeleteLevel, SIGNAL (triggered()), this, SLOT(slotToolsLevelDelete()));
actionCollection()->addAction ("toolsLevelDelete", m_toolsDeleteLevel);
m_toolsCreateZone = new KAction (this);
m_toolsCreateZone = new QAction (this);
m_toolsCreateZone->setText ( i18n("Create New Zone"));
m_toolsCreateZone->setIcon (BarIcon("task-new"));
connect (m_toolsCreateZone, SIGNAL (triggered()), this, SLOT(slotToolsZoneCreate()));
actionCollection()->addAction ("toolsZoneCreate", m_toolsCreateZone);
m_toolsDeleteZone = new KAction (this);
m_toolsDeleteZone = new QAction (this);
m_toolsDeleteZone->setText ( i18n("Delete Current Zone"));
m_toolsDeleteZone->setIcon (BarIcon("edit-delete"));
connect (m_toolsDeleteZone, SIGNAL (triggered()), this, SLOT(slotToolsZoneDelete()));
......@@ -161,37 +161,37 @@ void CMapView::initMenus()
actionCollection()->addAction ("viewLowerLevel", m_viewLowerLevel);
// Room Popup Actions
KAction *action;
action = new KAction (this);
QAction *action;
action = new QAction (this);
action->setText (i18n("Set &Current Position"));
connect (action, SIGNAL (triggered()), this, SLOT(slotRoomSetCurrentPos()));
actionCollection()->addAction ("roomCurrentPos", action);
action = new KAction (this);
action = new QAction (this);
action->setText (i18n("Set Room to &Login Point"));
connect (action, SIGNAL (triggered()), this, SLOT(slotRoomSetLogin()));
actionCollection()->addAction ("roomLoginPoint", action);
action = new KAction (this);
action = new QAction (this);
action->setText (i18n("&Speed walk to room"));
connect (action, SIGNAL (triggered()), this, SLOT(slotRoomSpeedwalkTo()));
actionCollection()->addAction ("roomWalkTo", action);
action = new KAction (this);
action = new QAction (this);
action->setText (i18n("&Delete room"));
action->setIcon (SmallIcon("edit-delete"));
connect (action, SIGNAL (triggered()), this, SLOT(slotRoomDelete()));
actionCollection()->addAction ("roomDelete", action);
action = new KAction (this);
action = new QAction (this);
action->setText (i18n("&Properties"));
action->setIcon (SmallIcon("document-properties"));
connect (action, SIGNAL (triggered()), this, SLOT(slotRoomProperties()));
actionCollection()->addAction ("roomProperties", action);
// Text Popup Actions
action = new KAction (this);
action = new QAction (this);
action->setText (i18n("&Delete Text"));
action->setIcon (SmallIcon("edit-delete"));
connect (action, SIGNAL (triggered()), this, SLOT(slotTextDelete()));
actionCollection()->addAction ("textDelete", action);
action = new KAction (this);
action = new QAction (this);
action->setText (i18n("&Properties"));
action->setIcon (SmallIcon("document-properties"));
connect (action, SIGNAL (triggered()), this, SLOT(slotTextProperties()));
......@@ -206,24 +206,24 @@ void CMapView::initMenus()
action->setText (i18n("&Two way"));
connect (action, SIGNAL (triggered()), this, SLOT(slotPathTwoWay()));
actionCollection()->addAction ("pathTwoWay", action);
action = new KAction (this);
action = new QAction (this);
action->setText (i18n("&Add Bend"));
connect (action, SIGNAL (triggered()), this, SLOT(slotPathAddBend()));
actionCollection()->addAction ("pathAddBend", action);
action = new KAction (this);
action = new QAction (this);
action->setText (i18n("&Remove Segment"));