* http://www.cecill.info/ *\r
* as published by : *\r
* *\r
- * Commissariat ᅵ l'Energie Atomique *\r
+ * Commissariat a l'Energie Atomique *\r
* - CEA, *\r
- * 31-33 rue de la Fï¿œdï¿œration, 75752 PARIS cedex 15. *\r
+ * 31-33 rue de la Federation, 75752 PARIS cedex 15. *\r
* FRANCE *\r
* Centre National de la Recherche Scientifique *\r
* - CNRS, *\r
//........................ une petite deco (le bandeau) ...............................\r
m_pUI->label_Bandeau->setPixmap (QPixmap( G_pCApp->getPathAppli() + "/Ressources/Bandeau Personnes.png" ));\r
m_pUI->label_Bandeau->setScaledContents ( TRUE );\r
- m_pUI->pushButton_Apropos->setIcon ( QIcon (Theme::getIcon("22x22/help.png"))) ;\r
+ m_pUI->m_action_A_Propos->setIcon ( QIcon (Theme::getIcon("22x22/help.png"))) ;\r
//........................ initaliser les listes ......................................\r
InitAllComboTelType();\r
InitComboSpec();\r
connect( m_pUI->pushButton_Effacer, SIGNAL( clicked ()) , this, SLOT( Slot_pushButton_Effacer_clicked()) );\r
connect( m_pUI->pushButton_NouvelleFiche, SIGNAL( clicked ()) , this, SLOT( Slot_pushButton_NouvelleFiche_clicked()) );\r
connect( m_pUI->pushButton_Enregistrer, SIGNAL( clicked ()) , this, SLOT( Slot_pushButton_Enregistrer_clicked()) );\r
- connect( m_pUI->pushButton_Apropos, SIGNAL( clicked()), this, SLOT( Slot_pushButton_Apropos_clicked()) );\r
+ connect( m_pUI->m_action_A_Propos, SIGNAL( clicked()), this, SLOT( Slot_pushButton_Apropos_clicked()) );\r
//................... effacer le header des identifiants ...................\r
QHeaderView *pQHeaderView = m_pUI->treeWidget_ListeMedecins->header();\r
pQHeaderView->hideSection (2);\r
setWindowTitle(tr("Directory - Data Medical Design - Version:")+G_pCApp->m_NUM_VERSION.remove("@").remove("#").remove("="));\r
m_pUI->pushButtonOK->setEnabled(G_pCApp->argc() > 1);\r
getAndSetPositions();\r
+ QTimer::singleShot(500, this, SLOT(Slot_ActivateMainWindow())); // pour avoir la fenetre en avant plan sur ubuntu unity\r
+}\r
+//--------------------------------------- Slot_ActivateMainWindow ---------------------------------------------------\r
+void C_Dlg_personnes::Slot_ActivateMainWindow()\r
+{ //if (G_pCApp->getDroits().length()) setWindowFlags(Qt::WindowStaysOnTopHint);\r
show();\r
setWindowState(windowState() & ~Qt::WindowMinimized);\r
activateWindow();\r
C_Dlg_personnes::~C_Dlg_personnes()\r
{ delete m_pUI;\r
}\r
+\r
+\r
+//----------------------------------- Slot_pushButton_Apropos_clicked -----------------------------------------------------------------------\r
+void C_Dlg_personnes::Slot_pushButton_Apropos_clicked()\r
+{QTimer::singleShot ( 100, this,SLOT(Slot_actionAproposDisplay()) );\r
+}\r
+\r
+//------------------------ Slot_Apropos_Proc_finished -----------------------------------------\r
+void C_Dlg_personnes::Slot_Apropos_Proc_finished (int, QProcess::ExitStatus)\r
+{if (m_Apropos_Proc)\r
+ {m_Apropos_Proc->terminate();\r
+ m_Apropos_Proc->waitForFinished (5000);\r
+ delete m_Apropos_Proc;\r
+ m_Apropos_Proc = 0;\r
+ m_pUI->m_action_A_Propos->setDisabled(FALSE);\r
+ }\r
+}\r
+//----------------------------------- Slot_actionAproposDisplay -----------------------------------------------------------------------\r
+void C_Dlg_personnes::Slot_actionAproposDisplay()\r
+{ QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));\r
+ QString macAdr;\r
+ //QString ipAdr = G_pCApp->get_Current_IP_Adr(&macAdr);\r
+\r
+ //CGestIni::Param_UpdateToDisk(G_pCApp->pathAppli()+"Ressources/Changements.html",m_pGUI->textEdit_Changements->toHtml()\r
+ // .replace("{{IP_ADR}}", ipAdr)\r
+ // .replace("{{MAC_ADR}}", macAdr)\r
+ // .replace("{{PATH_INI}}",G_pCApp->pathIni()));\r
+ QString pathExeAPropos = CGestIni::Construct_Name_Exe("APropos", QFileInfo (qApp->argv()[0]).path());\r
+ //QString pathBinRessources = CGestIni::Construct_PathBin_Module("APropos", QFileInfo (qApp->argv()[0]).path())+"Ressources/";\r
+ QStringList argList;\r
+\r
+ //......................... completer les autres arguments .........................................\r
+ argList << "personnes"; // 1 nom du module\r
+ argList << tr("Module for directory management"); // 2 description courte\r
+ argList << G_pCApp->m_NUM_VERSION.remove("@").remove("#").remove("=")+ " Qt : " + QT_VERSION_STR; // 3 numero de version\r
+ argList << G_pCApp->getPathAppli()+"Ressources/Changements.html"; // 4 fichiers d�crivant les changements\r
+ argList <<""; // 5 Icone par defaut\r
+ argList <<""; // 6 aide en ligne (vide pour prendre celle par defaut)\r
+ argList <<""; // 7 apropos (on met une chaine vide pour qu'il prenne celui par d?faut)\r
+ argList << G_pCApp->getBDVersionNumber(); // 8 numero de version de la base de donnee\r
+ //QProcess::startDetached (pathExeAPropos, argList);\r
+\r
+ if (m_Apropos_Proc==0)\r
+ {m_pUI->m_action_A_Propos->setDisabled(TRUE);\r
+ m_Apropos_Proc = new QProcess(this);\r
+ connect( m_Apropos_Proc, SIGNAL(finished ( int, QProcess::ExitStatus)), this, SLOT(Slot_Apropos_Proc_finished (int, QProcess::ExitStatus)) );\r
+ connect( m_Apropos_Proc, SIGNAL(error ( QProcess::ProcessError )), G_pCApp, SLOT(Slot_error ( QProcess::ProcessError )) );\r
+ m_Apropos_Proc->start(pathExeAPropos, argList);\r
+ m_Apropos_Proc->waitForStarted (4000);\r
+ //m_Apropos_Proc->waitForFinished (-1); // crash crash bug QT connu sauf si -1 comme paramètre\r
+ //..... pour contourner le bug on fait une boucle d'attente un peu sale ....\r
+ /*\r
+ G_pCApp->processEvents ();\r
+ while ( (procState = m_Apropos_Proc->state())== QProcess::Running ) // && QFile::exists(pathBinRessources+"~A_propos.html")\r
+ { //qDebug(QString::number(procState).toAscii());\r
+ QApplication::processEvents ( QEventLoop::ExcludeUserInput );\r
+ }\r
+ */\r
+ //if (m_Apropos_Proc) delete m_Apropos_Proc;\r
+ //m_Apropos_Proc = 0;\r
+ //QFile::remove(pathBinRessources+"~A_propos.html");\r
+ //m_action_A_Propos->setDisabled(FALSE);\r
+ }\r
+ QApplication::restoreOverrideCursor();\r
+}\r
+\r
+//--------------------------------------- tryToStopAPropos ----------------------------------------------------------\r
+void C_Dlg_personnes::tryToStopAPropos()\r
+{Slot_Apropos_Proc_finished (0, QProcess::NormalExit);\r
+ //if (m_Apropos_Proc==0) return;\r
+ //m_Apropos_Proc->kill(); // terminate() ne fonctionne pas\r
+}\r
+\r
+/*\r
+\r
+\r
+\r
//----------------------------------- Slot_pushButton_Apropos_clicked -----------------------------------------------------------------------\r
void C_Dlg_personnes::Slot_pushButton_Apropos_clicked()\r
{ CGestIni::Param_UpdateToDisk(G_pCApp->getPathAppli()+"Ressources/Changements.html",m_pUI->textEdit_Changements->toHtml());\r
{if (m_Apropos_Proc==0) return;\r
m_Apropos_Proc->kill(); // terminate() ne fonctionne pas\r
}\r
-\r
+*/\r
//--------------------------------------- Slot_pushButtonOK_clicked ----------------------------------------------------------\r
void C_Dlg_personnes::Slot_pushButtonOK_clicked()\r
{setExchangeFile();\r