Commit c4506771 authored by Mathieu Faverge's avatar Mathieu Faverge

Remove multiple Settings creation

parent a6eb2e10
This diff is collapsed.
......@@ -6,13 +6,13 @@
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
......@@ -23,7 +23,7 @@
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
......@@ -37,7 +37,7 @@
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
** - VUCHENER Clément
**
*/
/*!
......@@ -53,22 +53,8 @@ class QByteArray;
class QColor;
class QString;
class QStringList;
#include <QSettings>
#include <list>
/*!
* \def ORG_NAME
* \brief The "organization" name
*/
#define ORG_NAME "ViTE"
/*!
* \def ORG_DOMAIN
* \brief The "organization" domain
*/
#define ORG_DOMAIN "vite.gforge.inria.com"
/*!
* \def APP_NAME
* \brief The application name
*/
#define APP_NAME "ViTE"
/*!
* \def RECENT_FILES
......@@ -121,7 +107,7 @@ class QStringList;
* \brief Class used to store information between two software launch.
*
*/
class Session{
class Session {
private:
......@@ -131,11 +117,13 @@ private:
Session();
public:
static QSettings *settings;
static Palette *_palette;
static Palette * _link_types;
static Palette * _event_types;
//boolean used to know if palettes are used (only one boolean for all types of palettes)
static bool _use_palettes;
//boolean used to know if the previous one is set (ugly but avoids rereading from settings file each time)
......@@ -144,7 +132,7 @@ public:
* \brief The class destructor.
*/
virtual ~Session();
/*!
* \brief Sub structure to store export information.
*/
......@@ -165,7 +153,7 @@ public:
* \brief Sub structure to store render information.
*/
struct Render{
};
/*!
......@@ -178,54 +166,54 @@ public:
static QColor pen_color, brush_color;
static bool is_closed;
};
static void save_minimap(int x, int y, int w, int h, bool hide_on_start);
/*!
* \brief maximum number of file shown in the recent files menu.
*/
*/
static const int _MAX_NB_RECENT_FILES = 10;
static void save_config_file();
static void load_config_file();
/*!
* \fn update_vertical_line_setting(bool b)
* \brief set if we want to display the vertical line or not
*/
*/
static void update_vertical_line_setting(bool b);
/*!
* \fn get_vertical_line_setting()
* \brief check if we want to display the vertical line or not
*/
*/
static bool get_vertical_line_setting();
/*!
* \fn update_reload_type_setting(bool b)
* \brief set the type of reload we want (true : reload with parsing, false: reload without parsing)
*/
*/
static void update_reload_type_setting(bool b);
/*!
* \fn get_reload_type_setting()
* \brief check the type of reload we want (true : reload with parsing, false: reload without parsing)
*/
*/
static bool get_reload_type_setting();
/*!
* \fn get_shaded_states_setting()
* \brief set if we want to display shaded states in the trace or not
*/
*/
static void update_shaded_states_setting(bool b);
/*!
* \fn get_shaded_states_setting()
* \brief check if we want to display shaded states in the trace or not
*/
*/
static bool get_shaded_states_setting();
/*!
......@@ -342,7 +330,7 @@ public:
* \param state_name : the state name
*/
static void remove_state_to_palette(const std::string type, const std::string &palette_name, const std::string &state_name);
};
#endif
......@@ -51,10 +51,22 @@
#include "ViteConfig.hpp"
/*!
* \def VITE_NAME
* \def VITE_ORGANISATION_NAME
* \brief the ViTE string
*/
#define VITE_NAME "ViTE"
#define VITE_ORGANISATION_NAME "ViTE"
/*!
* \def VITE_ORGANISATION_DOMAIN
* \brief the ViTE string
*/
#define VITE_ORGANISATION_DOMAIN "vite.gforge.inria.fr"
/*!
* \def VITE_APPLICATION_NAME
* \brief the ViTE string
*/
#define VITE_APPLICATION_NAME "vite"
/*!
* \def VITE_VERSION
......
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