diff --git a/code/ryzom/client/client_default.cfg b/code/ryzom/client/client_default.cfg
index a27e69ee0..e4b9b3ee9 100644
--- a/code/ryzom/client/client_default.cfg
+++ b/code/ryzom/client/client_default.cfg
@@ -15,7 +15,7 @@ SaveConfig = 1;
Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1" & "Direct3D" or "2"
// "Auto" will choose the best suited driver depending on hardware
-FullScreen = 1;
+FullScreen = 0;
Width = 1024;
Height = 768;
PositionX = 0;
@@ -39,20 +39,15 @@ Gamma_max = 1.0;
// NETWORK //
/////////////
-Application = { "ryzom_open", "./client_ryzom_r.exe", "./" };
+Application = { "ryzom_live", "./client_ryzom_r.exe", "./" };
BackgroundDownloader = 0;
-PatchServer = "";
-PatchWanted = 0;
-SignUpURL = "";
-StartupHost = "shard.ryzomcore.org:40916";
+PatchServer = "http://dl.ryzom.com/patch_live";
+SignUpURL = "http://www.ryzom.com/subscribe";
+StartupHost = "shard.ryzom.com:40916";
StartupPage = "/login/r2_login.php";
-InstallStatsUrl = "http://open.ryzom.com:50000/stats/stats.php";
-CreateAccountURL = "http://shard.ryzomcore.org/ams/?page=register";
-EditAccountURL = "http://shard.ryzomcore.org/ams/?page=settings";
-ConditionsTermsURL = "http://www.gnu.org/licenses/agpl-3.0.html";
-ForgetPwdURL = "http://shard.ryzomcore.org/ams/?page=forgot_password";
-LoginSupportURL = "https://plus.google.com/u/0/communities/103798956862568269036";
-InstallWebPage = "";
+InstallStatsUrl = "http://shard.ryzom.com:50000/stats/stats.php";
+CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
+InstallWebPage = "http://dl.ryzom.com/installer/";
////////////////
@@ -84,10 +79,6 @@ XMLOutGameInterfaceFiles = {
"out_v2_keys.xml",
};
-TexturesInterface = "texture_interfaces_v3";
-TexturesInterfaceDXTC = "texture_interfaces_dxtc";
-
-
// The ligo primitive class file
LigoPrimitiveClass = "world_editor_classes.xml";
@@ -333,7 +324,8 @@ SoundGameMusicVolume_max = 1.0;
SoundGameMusicVolume_step = 0.001;
// MISC
-PreDataPath = { "user", "patch", "data", "examples" };
+PreDataPath = { "user", "patch", "examples", "data/fonts", "data/gamedev.bnp" };
+DataPath = { "data" };
NeedComputeVS = 0;
NegFiltersDebug = {"Update DB", "Reading:", "Read Value :", "impulseCallBack", "CLIMPD:", "LNET" };
diff --git a/code/ryzom/client/client_default.cfg.in b/code/ryzom/client/client_default.cfg.in
index 030a4a2b2..b7c4f2552 100644
--- a/code/ryzom/client/client_default.cfg.in
+++ b/code/ryzom/client/client_default.cfg.in
@@ -15,7 +15,7 @@ SaveConfig = 1;
Driver3D="Auto"; // Valid values are "Auto" or "0", "OpengGL" or "1" & "Direct3D" or "2"
// "Auto" will choose the best suited driver depending on hardware
-FullScreen = 1;
+FullScreen = 0;
Width = 1024;
Height = 768;
PositionX = 0;
@@ -39,16 +39,15 @@ Gamma_max = 1.0;
// NETWORK //
/////////////
-Application = { "ryzom_open", "./client_ryzom_r.exe", "./" };
+Application = { "ryzom_live", "./client_ryzom_r.exe", "./" };
BackgroundDownloader = 0;
-PatchServer = "";
-PatchWanted = 0;
-SignUpURL = "";
-StartupHost = "open.ryzom.com:40916";
+PatchServer = "http://dl.ryzom.com/patch_live";
+SignUpURL = "http://www.ryzom.com/subscribe";
+StartupHost = "shard.ryzom.com:40916";
StartupPage = "/login/r2_login.php";
-InstallStatsUrl = "http://open.ryzom.com:50000/stats/stats.php";
-CreateAccountURL = "";
-InstallWebPage = "";
+InstallStatsUrl = "http://shard.ryzom.com:50000/stats/stats.php";
+CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
+InstallWebPage = "http://dl.ryzom.com/installer/";
////////////////
@@ -80,10 +79,6 @@ XMLOutGameInterfaceFiles = {
"out_v2_keys.xml",
};
-TexturesInterface = "texture_interfaces_v3";
-TexturesInterfaceDXTC = "texture_interfaces_dxtc";
-
-
// The ligo primitive class file
LigoPrimitiveClass = "world_editor_classes.xml";
@@ -477,7 +472,7 @@ XMLR2EDInterfaceFiles =
{
"r2ed.xml",
"r2_triggers.xml",
- "r2_logic_entities.xml",
+ "r2_logic_entities.xml",
"r2ed_acts.xml",
"r2ed_scenario.xml",
"r2ed_connect.xml"
@@ -561,14 +556,11 @@ HelpPages =
"de=http://forums.ryzom.com/forum/showthread.php?t=29131"
};
-WebIgMainDomain = "atys.ryzom.com";
-
-WebIgTrustedDomains =
-{
- "atys.ryzom.com"
+WebIgMainDomain = "app.ryzom.com";
+WebIgTrustedDomains = {
+ "api.ryzom.com", "app.ryzom.com"
};
-
-PatchletUrl = "http://atys.ryzom.com/start/app_patchlet.php?patch=preload";
+PatchletUrl = "http://app.ryzom.com/app_patchlet/index.php?patch=preload";
SelectedSlot = 0;
diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt
index 637003321..df91d5c7b 100644
--- a/code/ryzom/client/src/CMakeLists.txt
+++ b/code/ryzom/client/src/CMakeLists.txt
@@ -48,12 +48,19 @@ SOURCE_GROUP("r2" FILES ${SRC_R2})
# on Mac, create a .App Bundle
if(APPLE)
- SET(MACOSX_BUNDLE_INFO_STRING "Ryzom Core Client")
+ SET(RYZOM_VERSION_SHORT "2.1.0")
+ SET(RYZOM_VERSION_LONG "2.1.0")
+
+ IF(REVISION)
+ SET(RYZOM_VERSION_LONG "${RYZOM_VERSION_LONG}.${REVISION}")
+ ENDIF()
+
+ SET(MACOSX_BUNDLE_INFO_STRING "Ryzom")
SET(MACOSX_BUNDLE_ICON_FILE "ryzom.icns")
- SET(MACOSX_BUNDLE_GUI_IDENTIFIER "")
- SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${NL_VERSION})
- SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom Core Client")
- SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "0.8")
+ SET(MACOSX_BUNDLE_GUI_IDENTIFIER "com.winchgate.Ryzom")
+ SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${RYZOM_VERSION_LONG})
+ SET(MACOSX_BUNDLE_BUNDLE_NAME "Ryzom")
+ SET(MACOSX_BUNDLE_SHORT_VERSION_STRING ${RYZOM_VERSION_SHORT})
SET(MACOSX_BUNDLE_BUNDLE_VERSION "1.0")
SET(MACOSX_BUNDLE_COPYRIGHT "Winchgate and The Ryzom Core Community")
SET(RYZOM_OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${MACOSX_BUNDLE_BUNDLE_NAME}.app)
@@ -116,7 +123,7 @@ ENDIF(APPLE)
ADD_DEFINITIONS(${LIBXML2_DEFINITIONS} ${CURL_DEFINITIONS} ${LUABIND_DEFINITIONS})
-NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Core Client")
+NL_DEFAULT_PROPS(ryzom_client "Ryzom, Client: Ryzom Client")
NL_ADD_RUNTIME_FLAGS(ryzom_client)
NL_ADD_LIB_SUFFIX(ryzom_client)
diff --git a/code/ryzom/client/src/client_cfg.cpp b/code/ryzom/client/src/client_cfg.cpp
index a42c7988b..bb837b03b 100644
--- a/code/ryzom/client/src/client_cfg.cpp
+++ b/code/ryzom/client/src/client_cfg.cpp
@@ -327,13 +327,13 @@ CClientConfig::CClientConfig()
TexturesLoginInterface.push_back("texture_interfaces_v3_login");
DisplayAccountButtons = true;
- CreateAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=register";
+ CreateAccountURL = "https://secure.ryzom.com/signup/from_client.php";
ConditionsTermsURL = "https://secure.ryzom.com/signup/terms_of_use.php";
- EditAccountURL = "http://shard.ryzomcore.org/ams/index.php?page=settings";
+ EditAccountURL = "https://secure.ryzom.com/payment_profile/index.php";
BetaAccountURL = "http://www.ryzom.com/profile";
- ForgetPwdURL = "http://shard.ryzomcore.org/ams/index.php?page=forgot_password";
+ ForgetPwdURL = "https://secure.ryzom.com/payment_profile/lost_secure_password.php";
FreeTrialURL = "http://www.ryzom.com/join/?freetrial=1";
- LoginSupportURL = "http://shard.ryzomcore.org/ams/index.php";
+ LoginSupportURL = "http://www.ryzom.com/en/support.html";
Position = CVector(0.f, 0.f, 0.f); // Default Position.
Heading = CVector(0.f, 1.f, 0.f); // Default Heading.
EyesHeight = 1.5f; // Default User Eyes Height.
@@ -889,14 +889,6 @@ void CClientConfig::setValues()
READ_STRING_DEV(FreeTrialURL)
READ_STRING_DEV(LoginSupportURL)
- READ_STRING_FV(CreateAccountURL)
- READ_STRING_FV(EditAccountURL)
- READ_STRING_FV(ConditionsTermsURL)
- READ_STRING_FV(BetaAccountURL)
- READ_STRING_FV(ForgetPwdURL)
- READ_STRING_FV(FreeTrialURL)
- READ_STRING_FV(LoginSupportURL)
-
#ifndef RZ_NO_CLIENT
// if cookie is not empty, it means that the client was launch
// by the nel_launcher, so it can't be local
@@ -1059,18 +1051,11 @@ void CClientConfig::setValues()
/////////////////////////
// NEW PATCHING SYSTEM //
READ_BOOL_FV(PatchWanted)
- READ_STRING_FV(PatchServer)
- READ_STRING_FV(PatchUrl)
- READ_STRING_FV(PatchVersion)
- READ_STRING_FV(RingReleaseNotePath)
- READ_STRING_FV(ReleaseNotePath)
- READ_BOOL_DEV(PatchWanted)
- READ_STRING_DEV(PatchServer)
READ_STRING_DEV(PatchUrl)
READ_STRING_DEV(PatchVersion)
READ_STRING_DEV(RingReleaseNotePath)
READ_STRING_DEV(ReleaseNotePath)
-
+ READ_STRING_FV(PatchServer)
/////////////////////////
// NEW PATCHLET SYSTEM //
diff --git a/code/ryzom/common/src/game_share/ryzom_version.h b/code/ryzom/common/src/game_share/ryzom_version.h
index 2dfdca48e..7bc654d3a 100644
--- a/code/ryzom/common/src/game_share/ryzom_version.h
+++ b/code/ryzom/common/src/game_share/ryzom_version.h
@@ -17,7 +17,7 @@
#ifndef RYZOM_VERSION_H
#define RYZOM_VERSION_H
-#define RYZOM_VERSION "RYZOM CORE"
+#define RYZOM_VERSION "2.1.0"
#endif // RYZOM_VERSION_H
diff --git a/code/studio/src/plugins/georges_editor/actions.h b/code/studio/src/plugins/georges_editor/actions.h
index 0c57b0577..861eaef8e 100644
--- a/code/studio/src/plugins/georges_editor/actions.h
+++ b/code/studio/src/plugins/georges_editor/actions.h
@@ -1,48 +1,48 @@
-// Object Viewer Qt - Georges Editor Plugin - MMORPG Framework
-// Copyright (C) 2011 Adrian Jaekel
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program. If not, see .
-
-#ifndef ACTIONS_H
-#define ACTIONS_H
-
-#include
-#include
-
-namespace GeorgesQt
-{
- class CFormItem;
- class CGeorgesFormModel;
-
- class CUndoFormArrayRenameCommand : public QUndoCommand
- {
- public:
- CUndoFormArrayRenameCommand(CGeorgesFormModel *model, CFormItem *item, const QVariant &value, QUndoCommand *parent = 0);
- ~CUndoFormArrayRenameCommand() {}
-
- void redo();
- void undo();
-
- void update(bool redo);
-
- protected:
- CFormItem *m_item;
- CGeorgesFormModel *m_model;
-
- QString m_newValue;
- QString m_oldValue;
- };
-}
-
+// Object Viewer Qt - Georges Editor Plugin - MMORPG Framework
+// Copyright (C) 2011 Adrian Jaekel
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
+#ifndef ACTIONS_H
+#define ACTIONS_H
+
+#include
+#include
+
+namespace GeorgesQt
+{
+ class CFormItem;
+ class CGeorgesFormModel;
+
+ class CUndoFormArrayRenameCommand : public QUndoCommand
+ {
+ public:
+ CUndoFormArrayRenameCommand(CGeorgesFormModel *model, CFormItem *item, const QVariant &value, QUndoCommand *parent = 0);
+ ~CUndoFormArrayRenameCommand() {}
+
+ void redo();
+ void undo();
+
+ void update(bool redo);
+
+ protected:
+ CFormItem *m_item;
+ CGeorgesFormModel *m_model;
+
+ QString m_newValue;
+ QString m_oldValue;
+ };
+}
+
#endif // ACTIONS_H
\ No newline at end of file
diff --git a/code/studio/src/plugins/georges_editor/browser_ctrl.h b/code/studio/src/plugins/georges_editor/browser_ctrl.h
index 9c70f51bb..d61d3b9e9 100644
--- a/code/studio/src/plugins/georges_editor/browser_ctrl.h
+++ b/code/studio/src/plugins/georges_editor/browser_ctrl.h
@@ -1,47 +1,47 @@
-#ifndef BROWSER_CTRL_H
-#define BROWSER_CTRL_H
-
-#include
-
-namespace NLGEORGES
-{
- class UForm;
-}
-
-class QtTreePropertyBrowser;
-class QModelIndex;
-class QVariant;
-class QtProperty;
-
-class BrowserCtrlPvt;
-
-class BrowserCtrl : public QObject
-{
- Q_OBJECT
-public:
- BrowserCtrl( QtTreePropertyBrowser *browser );
- ~BrowserCtrl();
- void setForm( NLGEORGES::UForm *form ){ m_form = form; }
-
-public Q_SLOTS:
- void clicked( const QModelIndex &idx );
-
-Q_SIGNALS:
- void arrayResized( const QString &name, int size );
- void modified();
-
-private Q_SLOTS:
- void onValueChanged( QtProperty *p, const QVariant &value );
- void onArrayResized( const QString &name, int size );
- void onModified();
-
-private:
- void enableMgrConnections();
- void disableMgrConnections();
-
-
- BrowserCtrlPvt *m_pvt;
- NLGEORGES::UForm *m_form;
-};
-
-#endif
+#ifndef BROWSER_CTRL_H
+#define BROWSER_CTRL_H
+
+#include
+
+namespace NLGEORGES
+{
+ class UForm;
+}
+
+class QtTreePropertyBrowser;
+class QModelIndex;
+class QVariant;
+class QtProperty;
+
+class BrowserCtrlPvt;
+
+class BrowserCtrl : public QObject
+{
+ Q_OBJECT
+public:
+ BrowserCtrl( QtTreePropertyBrowser *browser );
+ ~BrowserCtrl();
+ void setForm( NLGEORGES::UForm *form ){ m_form = form; }
+
+public Q_SLOTS:
+ void clicked( const QModelIndex &idx );
+
+Q_SIGNALS:
+ void arrayResized( const QString &name, int size );
+ void modified();
+
+private Q_SLOTS:
+ void onValueChanged( QtProperty *p, const QVariant &value );
+ void onArrayResized( const QString &name, int size );
+ void onModified();
+
+private:
+ void enableMgrConnections();
+ void disableMgrConnections();
+
+
+ BrowserCtrlPvt *m_pvt;
+ NLGEORGES::UForm *m_form;
+};
+
+#endif
diff --git a/code/studio/src/plugins/georges_editor/browser_ctrl_pvt.h b/code/studio/src/plugins/georges_editor/browser_ctrl_pvt.h
index 0d0363c1f..c34d5ce0c 100644
--- a/code/studio/src/plugins/georges_editor/browser_ctrl_pvt.h
+++ b/code/studio/src/plugins/georges_editor/browser_ctrl_pvt.h
@@ -1,54 +1,54 @@
-#ifndef BROWSER_CTRL_PVT_H
-#define BROWSER_CTRL_PVT_H
-
-#include
-
-namespace NLGEORGES
-{
- class CFormElm;
- class UFormElm;
- class CFormElmStruct;
-}
-
-class QtVariantPropertyManager;
-class QtVariantEditorFactory;
-class QtTreePropertyBrowser;
-class QVariant;
-class QtProperty;
-
-class BrowserCtrlPvt : public QObject
-{
- Q_OBJECT
-public:
- BrowserCtrlPvt( QObject *parent = NULL );
- ~BrowserCtrlPvt();
-
- void clear();
- void setupNode( NLGEORGES::UFormElm *node );
- void onValueChanged( QtProperty *p, const QVariant &value );
-
- QtVariantPropertyManager* manager() const{ return mgr; }
- void setRootNode( NLGEORGES::CFormElm *root ){ m_rootNode = root; }
- void setBrowser( QtTreePropertyBrowser *browser ){ m_browser = browser; }
-
-Q_SIGNALS:
- void arrayResized( const QString &name, int size );
- void modified();
-
-private:
- void setupStruct( NLGEORGES::UFormElm *node );
- void setupArray( NLGEORGES::UFormElm *node );
- void setupAtom( NLGEORGES::CFormElmStruct::CFormElmStructElm &elm );
-
- void onStructValueChanged( QtProperty *p, const QVariant &value );
- void onArrayValueChanged( QtProperty *p, const QVariant &value );
-
- QtVariantPropertyManager *mgr;
- QtVariantEditorFactory *factory;
- QtTreePropertyBrowser *m_browser;
-
- NLGEORGES::UFormElm *m_currentNode;
- NLGEORGES::CFormElm *m_rootNode;
-};
-
-#endif
+#ifndef BROWSER_CTRL_PVT_H
+#define BROWSER_CTRL_PVT_H
+
+#include
+
+namespace NLGEORGES
+{
+ class CFormElm;
+ class UFormElm;
+ class CFormElmStruct;
+}
+
+class QtVariantPropertyManager;
+class QtVariantEditorFactory;
+class QtTreePropertyBrowser;
+class QVariant;
+class QtProperty;
+
+class BrowserCtrlPvt : public QObject
+{
+ Q_OBJECT
+public:
+ BrowserCtrlPvt( QObject *parent = NULL );
+ ~BrowserCtrlPvt();
+
+ void clear();
+ void setupNode( NLGEORGES::UFormElm *node );
+ void onValueChanged( QtProperty *p, const QVariant &value );
+
+ QtVariantPropertyManager* manager() const{ return mgr; }
+ void setRootNode( NLGEORGES::CFormElm *root ){ m_rootNode = root; }
+ void setBrowser( QtTreePropertyBrowser *browser ){ m_browser = browser; }
+
+Q_SIGNALS:
+ void arrayResized( const QString &name, int size );
+ void modified();
+
+private:
+ void setupStruct( NLGEORGES::UFormElm *node );
+ void setupArray( NLGEORGES::UFormElm *node );
+ void setupAtom( NLGEORGES::CFormElmStruct::CFormElmStructElm &elm );
+
+ void onStructValueChanged( QtProperty *p, const QVariant &value );
+ void onArrayValueChanged( QtProperty *p, const QVariant &value );
+
+ QtVariantPropertyManager *mgr;
+ QtVariantEditorFactory *factory;
+ QtTreePropertyBrowser *m_browser;
+
+ NLGEORGES::UFormElm *m_currentNode;
+ NLGEORGES::CFormElm *m_rootNode;
+};
+
+#endif
diff --git a/code/studio/src/plugins/gui_editor/action_list.cpp b/code/studio/src/plugins/gui_editor/action_list.cpp
index 8925e6d04..4cc30aecb 100644
--- a/code/studio/src/plugins/gui_editor/action_list.cpp
+++ b/code/studio/src/plugins/gui_editor/action_list.cpp
@@ -1,49 +1,49 @@
-#include "action_list.h"
-#include "nel/gui/action_handler.h"
-#include
-#include
-
-ActionList::ActionList( QDialog *parent ) :
-QDialog( parent )
-{
- setupUi( this );
-}
-
-ActionList::~ActionList()
-{
-}
-
-void ActionList::load()
-{
- actionList->clear();
-
- NLGUI::CAHManager *am = NLGUI::CAHManager::getInstance();
- std::vector< std::string > handlers;
- am->getActionHandlers( handlers );
-
- std::vector< std::string >::const_iterator itr = handlers.begin();
- while( itr != handlers.end() )
- {
- actionList->addItem( itr->c_str() );
- ++itr;
- }
-}
-
-void ActionList::accept()
-{
- QListWidgetItem *item = actionList->currentItem();
- if( item == NULL )
- return;
-
- selectedAction = item->text();
-
- QDialog::accept();
-}
-
-void ActionList::reject()
-{
- selectedAction = "";
-
- QDialog::reject();
-}
-
+#include "action_list.h"
+#include "nel/gui/action_handler.h"
+#include
+#include
+
+ActionList::ActionList( QDialog *parent ) :
+QDialog( parent )
+{
+ setupUi( this );
+}
+
+ActionList::~ActionList()
+{
+}
+
+void ActionList::load()
+{
+ actionList->clear();
+
+ NLGUI::CAHManager *am = NLGUI::CAHManager::getInstance();
+ std::vector< std::string > handlers;
+ am->getActionHandlers( handlers );
+
+ std::vector< std::string >::const_iterator itr = handlers.begin();
+ while( itr != handlers.end() )
+ {
+ actionList->addItem( itr->c_str() );
+ ++itr;
+ }
+}
+
+void ActionList::accept()
+{
+ QListWidgetItem *item = actionList->currentItem();
+ if( item == NULL )
+ return;
+
+ selectedAction = item->text();
+
+ QDialog::accept();
+}
+
+void ActionList::reject()
+{
+ selectedAction = "";
+
+ QDialog::reject();
+}
+
diff --git a/code/studio/src/plugins/gui_editor/action_list.h b/code/studio/src/plugins/gui_editor/action_list.h
index 752d66467..f61e0d239 100644
--- a/code/studio/src/plugins/gui_editor/action_list.h
+++ b/code/studio/src/plugins/gui_editor/action_list.h
@@ -1,29 +1,29 @@
-#ifndef ACTION_LIST_H
-#define ACTION_LIST_H
-
-
-#include "ui_action_list.h"
-#include
-
-
-class ActionList : public QDialog, public Ui::ActionListDialog
-{
- Q_OBJECT
-
-public:
- ActionList( QDialog *parent = NULL );
- ~ActionList();
- void load();
-
- QString getSelectedAction(){ return selectedAction; }
-
-
-public Q_SLOTS:
- void accept();
- void reject();
-
-private:
- QString selectedAction;
-};
-
-#endif
+#ifndef ACTION_LIST_H
+#define ACTION_LIST_H
+
+
+#include "ui_action_list.h"
+#include
+
+
+class ActionList : public QDialog, public Ui::ActionListDialog
+{
+ Q_OBJECT
+
+public:
+ ActionList( QDialog *parent = NULL );
+ ~ActionList();
+ void load();
+
+ QString getSelectedAction(){ return selectedAction; }
+
+
+public Q_SLOTS:
+ void accept();
+ void reject();
+
+private:
+ QString selectedAction;
+};
+
+#endif