From 8c59b8183a87106768c37c8d1efa5ff9a79a333d Mon Sep 17 00:00:00 2001 From: xavierqet Date: Sun, 11 May 2008 20:05:18 +0000 Subject: [PATCH] Correction du bug #12 : QET provoquait une erreur de segmentation des son demarrage dans un environnement sans systray git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@322 bfdf4180-ca20-0410-9c96-a3a8aa849046 --- Doxyfile | 24 ++++++++++++---- qetapp.cpp | 80 ++++++++++++++++++++++++++---------------------------- 2 files changed, 58 insertions(+), 46 deletions(-) diff --git a/Doxyfile b/Doxyfile index 6ecaf500f..6d6c8af80 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1,14 +1,14 @@ -# Doxyfile 1.5.1-KDevelop +# Doxyfile 1.5.5 #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- +DOXYFILE_ENCODING = UTF-8 PROJECT_NAME = QElectroTech PROJECT_NUMBER = 0.1 OUTPUT_DIRECTORY = CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = French -USE_WINDOWS_ENCODING = NO BRIEF_MEMBER_DESC = YES REPEAT_BRIEF = YES ABBREVIATE_BRIEF = "The $name class" \ @@ -29,6 +29,7 @@ STRIP_FROM_PATH = /home/data/chaos/projets/qet/qelectrotech/ STRIP_FROM_INC_PATH = SHORT_NAMES = NO JAVADOC_AUTOBRIEF = NO +QT_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = NO DETAILS_AT_TOP = NO INHERIT_DOCS = YES @@ -37,9 +38,14 @@ TAB_SIZE = 4 ALIASES = OPTIMIZE_OUTPUT_FOR_C = NO OPTIMIZE_OUTPUT_JAVA = NO +OPTIMIZE_FOR_FORTRAN = NO +OPTIMIZE_OUTPUT_VHDL = NO BUILTIN_STL_SUPPORT = NO +CPP_CLI_SUPPORT = NO +SIP_SUPPORT = NO DISTRIBUTE_GROUP_DOC = NO SUBGROUPING = YES +TYPEDEF_HIDES_STRUCT = NO #--------------------------------------------------------------------------- # Build related configuration options #--------------------------------------------------------------------------- @@ -48,6 +54,7 @@ EXTRACT_PRIVATE = NO EXTRACT_STATIC = YES EXTRACT_LOCAL_CLASSES = YES EXTRACT_LOCAL_METHODS = NO +EXTRACT_ANON_NSPACES = NO HIDE_UNDOC_MEMBERS = NO HIDE_UNDOC_CLASSES = NO HIDE_FRIEND_COMPOUNDS = NO @@ -59,6 +66,7 @@ SHOW_INCLUDE_FILES = YES INLINE_INFO = YES SORT_MEMBER_DOCS = YES SORT_BRIEF_DOCS = NO +SORT_GROUP_NAMES = NO SORT_BY_SCOPE_NAME = NO GENERATE_TODOLIST = NO GENERATE_TESTLIST = NO @@ -82,7 +90,8 @@ WARN_LOGFILE = #--------------------------------------------------------------------------- # configuration options related to the input files #--------------------------------------------------------------------------- -INPUT = /home/data/chaos/projets/qet/qelectrotech +INPUT = +INPUT_ENCODING = UTF-8 FILE_PATTERNS = *.h \ *.cpp RECURSIVE = YES @@ -92,6 +101,7 @@ EXCLUDE = moc_* \ debug EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = +EXCLUDE_SYMBOLS = EXAMPLE_PATH = EXAMPLE_PATTERNS = * EXAMPLE_RECURSIVE = NO @@ -127,6 +137,10 @@ HTML_FOOTER = HTML_STYLESHEET = HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO +GENERATE_DOCSET = NO +DOCSET_FEEDNAME = "Doxygen generated docs" +DOCSET_BUNDLE_ID = org.doxygen.Project +HTML_DYNAMIC_SECTIONS = NO CHM_FILE = HHC_LOCATION = GENERATE_CHI = NO @@ -210,6 +224,7 @@ PERL_PATH = /usr/bin/perl # Configuration options related to the dot tool #--------------------------------------------------------------------------- CLASS_DIAGRAMS = YES +MSCGEN_PATH = HIDE_UNDOC_RELATIONS = YES HAVE_DOT = YES CLASS_GRAPH = YES @@ -226,8 +241,7 @@ DIRECTORY_GRAPH = YES DOT_IMAGE_FORMAT = png DOT_PATH = DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1024 +DOT_GRAPH_MAX_NODES = 50 MAX_DOT_GRAPH_DEPTH = 1000 DOT_TRANSPARENT = NO DOT_MULTI_TARGETS = NO diff --git a/qetapp.cpp b/qetapp.cpp index 5939eda96..6668fd2a4 100644 --- a/qetapp.cpp +++ b/qetapp.cpp @@ -72,47 +72,45 @@ QETApp::QETApp(int &argc, char **argv) : QApplication(argc, argv) { connect(this, SIGNAL(aboutToQuit()), this, SLOT(cleanup())); // systray de l'application - if (QSystemTrayIcon::isSystemTrayAvailable()) { - // initialisation des menus de l'icone dans le systray - menu_systray = new QMenu(tr("QElectroTech")); - - quitter_qet = new QAction(QIcon(":/ico/exit.png"), tr("&Quitter"), this); - reduce_appli = new QAction(QIcon(":/ico/masquer.png"), tr("&Masquer"), this); - restore_appli = new QAction(QIcon(":/ico/restaurer.png"), tr("&Restaurer"), this); - reduce_diagrams = new QAction(QIcon(":/ico/masquer.png"), tr("&Masquer tous les \351diteurs de sch\351ma"), this); - restore_diagrams = new QAction(QIcon(":/ico/restaurer.png"), tr("&Restaurer tous les \351diteurs de sch\351ma"), this); - reduce_elements = new QAction(QIcon(":/ico/masquer.png"), tr("&Masquer tous les \351diteurs d'\351l\351ment"), this); - restore_elements = new QAction(QIcon(":/ico/restaurer.png"), tr("&Restaurer tous les \351diteurs d'\351l\351ment"), this); - new_diagram = new QAction(QIcon(":/ico/window_new.png"), tr("&Nouvel \351diteur de sch\351ma"), this); - new_element = new QAction(QIcon(":/ico/window_new.png"), tr("&Nouvel \351diteur d'\351l\351ment"), this); - - quitter_qet -> setStatusTip(tr("Ferme l'application QElectroTech")); - reduce_appli -> setToolTip(tr("R\351duire QElectroTech dans le systray")); - restore_appli -> setToolTip(tr("Restaurer QElectroTech")); - - connect(quitter_qet, SIGNAL(triggered()), this, SLOT(quitQET())); - connect(reduce_appli, SIGNAL(triggered()), this, SLOT(reduceEveryEditor())); - connect(restore_appli, SIGNAL(triggered()), this, SLOT(restoreEveryEditor())); - connect(reduce_diagrams, SIGNAL(triggered()), this, SLOT(reduceDiagramEditors())); - connect(restore_diagrams, SIGNAL(triggered()), this, SLOT(restoreDiagramEditors())); - connect(reduce_elements, SIGNAL(triggered()), this, SLOT(reduceElementEditors())); - connect(restore_elements, SIGNAL(triggered()), this, SLOT(restoreElementEditors())); - connect(new_diagram, SIGNAL(triggered()), this, SLOT(newDiagramEditor())); - connect(new_element, SIGNAL(triggered()), this, SLOT(newElementEditor())); - - // connexion pour le signalmapper - connect(&signal_map, SIGNAL(mapped(QWidget *)), this, SLOT(invertMainWindowVisibility(QWidget *))); - - // initialisation de l'icone du systray - qsti = new QSystemTrayIcon(QIcon(":/ico/qet.png"), this); - qsti -> setToolTip(tr("QElectroTech")); - connect(qsti, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(systray(QSystemTrayIcon::ActivationReason))); - qsti -> setContextMenu(menu_systray); - qsti -> show(); - - setQuitOnLastWindowClosed(false); - connect(this, SIGNAL(lastWindowClosed()), this, SLOT(checkRemainingWindows())); - } + // initialisation des menus de l'icone dans le systray + menu_systray = new QMenu(tr("QElectroTech")); + + quitter_qet = new QAction(QIcon(":/ico/exit.png"), tr("&Quitter"), this); + reduce_appli = new QAction(QIcon(":/ico/masquer.png"), tr("&Masquer"), this); + restore_appli = new QAction(QIcon(":/ico/restaurer.png"), tr("&Restaurer"), this); + reduce_diagrams = new QAction(QIcon(":/ico/masquer.png"), tr("&Masquer tous les \351diteurs de sch\351ma"), this); + restore_diagrams = new QAction(QIcon(":/ico/restaurer.png"), tr("&Restaurer tous les \351diteurs de sch\351ma"), this); + reduce_elements = new QAction(QIcon(":/ico/masquer.png"), tr("&Masquer tous les \351diteurs d'\351l\351ment"), this); + restore_elements = new QAction(QIcon(":/ico/restaurer.png"), tr("&Restaurer tous les \351diteurs d'\351l\351ment"), this); + new_diagram = new QAction(QIcon(":/ico/window_new.png"), tr("&Nouvel \351diteur de sch\351ma"), this); + new_element = new QAction(QIcon(":/ico/window_new.png"), tr("&Nouvel \351diteur d'\351l\351ment"), this); + + quitter_qet -> setStatusTip(tr("Ferme l'application QElectroTech")); + reduce_appli -> setToolTip(tr("R\351duire QElectroTech dans le systray")); + restore_appli -> setToolTip(tr("Restaurer QElectroTech")); + + connect(quitter_qet, SIGNAL(triggered()), this, SLOT(quitQET())); + connect(reduce_appli, SIGNAL(triggered()), this, SLOT(reduceEveryEditor())); + connect(restore_appli, SIGNAL(triggered()), this, SLOT(restoreEveryEditor())); + connect(reduce_diagrams, SIGNAL(triggered()), this, SLOT(reduceDiagramEditors())); + connect(restore_diagrams, SIGNAL(triggered()), this, SLOT(restoreDiagramEditors())); + connect(reduce_elements, SIGNAL(triggered()), this, SLOT(reduceElementEditors())); + connect(restore_elements, SIGNAL(triggered()), this, SLOT(restoreElementEditors())); + connect(new_diagram, SIGNAL(triggered()), this, SLOT(newDiagramEditor())); + connect(new_element, SIGNAL(triggered()), this, SLOT(newElementEditor())); + + // connexion pour le signalmapper + connect(&signal_map, SIGNAL(mapped(QWidget *)), this, SLOT(invertMainWindowVisibility(QWidget *))); + + // initialisation de l'icone du systray + qsti = new QSystemTrayIcon(QIcon(":/ico/qet.png"), this); + qsti -> setToolTip(tr("QElectroTech")); + connect(qsti, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(systray(QSystemTrayIcon::ActivationReason))); + qsti -> setContextMenu(menu_systray); + qsti -> show(); + + setQuitOnLastWindowClosed(false); + connect(this, SIGNAL(lastWindowClosed()), this, SLOT(checkRemainingWindows())); // Lorsque le style Plastique est active, on le remplace par une version amelioree if (qobject_cast(style())) {