- Timestamp:
- 06/25/10 19:19:00 (14 years ago)
- Location:
- trunk/yao/src/interface
- Files:
-
- 4 added
- 14 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/yao/src/interface/src/MainWindow.cpp
r359 r362 37 37 38 38 setWindowTitle(" Visual YAO "); //Gives a title to the mainwindow. 39 espace = new QWorkspace; //Crée un espace de travail. Ici, ça serait notre zone centrale 39 pt_espace = new QWorkspace; //Crée un espace de travail. Ici, ça serait notre zone centrale 40 pt_espace = &espace; 40 41 fv = new FilesViewer(); //Création d'un espace montrant l'arborescence des fichiers sur le disque dûr. 41 42 … … 47 48 addDockWidget(Qt::LeftDockWidgetArea, dock2); 48 49 49 setCentralWidget( espace); //Ici, se précise la zone centrale de la QMainWindow.50 setCentralWidget(pt_espace); //Ici, se précise la zone centrale de la QMainWindow. 50 51 51 52 // Appel des differentes méthodes crées. … … 123 124 124 125 // Les actions du menu fichier 125 actionNouveauProjet = new QAction(tr(" Nouveau projet"), this);126 actionNouveauProjet = new QAction(tr("&Nouveau projet"), this); 126 127 actionNouveauProjet->setIcon(QIcon("Images/icons/newfile.png")); 127 128 actionNouveauProjet->setStatusTip("Créer un nouveau projet"); 129 actionNouveauProjet->setShortcut(tr("Ctrl+N")); 128 130 //connect(actionNouveauProjet, SIGNAL(triggered()), this, SLOT(activateToolBarButtons())); 129 131 connect(actionNouveauProjet, SIGNAL(triggered()), this, SLOT(createNewProjectWindow())); … … 240 242 } 241 243 /********************************** Implementation of the method Implementation de la methode toolBarActions() ****************************************/ 242 void MainWindow::toolBarActions(QWorkspace *espace) {244 void MainWindow::toolBarActions(QWorkspace &espace) { 243 245 244 246 m_constantButton = new QPushButton(tr("Defval"), this); … … 291 293 292 294 m_constantWindow = new ConstantWindow(&theConstantTable, &theHeaderList, &the_mwc); //Then create the object and initialize it. 293 espace ->addWindow(m_constantWindow)->move(0, 0); //Put the object in the workspace (here, espace is the QWorkspace's object.)295 espace.addWindow(m_constantWindow)->move(0, 0); //Put the object in the workspace (here, espace is the QWorkspace's object.) 294 296 m_constantWindow->show();// shows the object. 295 297 } … … 306 308 307 309 m_hatnameWindow = new HatNameWindow(&theHeaderList, &theConstantTable); //Then create the object and initialize it. 308 espace ->addWindow(m_hatnameWindow)->move(350, 0); //Put the object in the workspace (here, espace is the QWorkspace's object.)310 espace.addWindow(m_hatnameWindow)->move(350, 0); //Put the object in the workspace (here, espace is the QWorkspace's object.) 309 311 m_hatnameWindow->show();// shows the object. 310 312 } … … 318 320 319 321 m_contextWindow = new ContextWindow(&theContext, &theConstantTable, &the_mwc); //mwc.getContext(); 320 espace ->addWindow(m_contextWindow)->move(5, 0);322 espace.addWindow(m_contextWindow)->move(5, 0); 321 323 m_contextWindow->show(); 322 324 } … … 330 332 331 333 m_trajectoryWindow = new TrajectoryWindow(&theTrajectoryTable, &theConstantTable); //mwc.getTraj(); 332 espace ->addWindow(m_trajectoryWindow)->move(30, 10);334 espace.addWindow(m_trajectoryWindow)->move(30, 10); 333 335 m_trajectoryWindow->show(); 334 336 … … 345 347 346 348 m_spaceWindow = new SpaceWindow(&theSpaceTable, &theTrajectoryTable, &theConstantTable); //mwc.getSpace(); 347 espace ->addWindow(m_spaceWindow)->move(30, 20);349 espace.addWindow(m_spaceWindow)->move(30, 20); 348 350 m_spaceWindow->show(); 349 351 } … … 357 359 if (m_operaWindow == NULL) { //to test if the object is already created. 358 360 m_operaWindow = new OperaWindow(&theSpaceTable, &theTrajectoryTable, &theConstantTable); //mwc.getOpera(); 359 espace ->addWindow(m_operaWindow)->move(5, 8);361 espace.addWindow(m_operaWindow)->move(5, 8); 360 362 m_operaWindow->show(); 361 363 } … … 369 371 if (m_netwardWindow == NULL) { //to test if the object is already created. 370 372 m_netwardWindow = new NetwardWindow; //mwc.getNetward(); 371 espace ->addWindow(m_netwardWindow)->move(5, 15);373 espace.addWindow(m_netwardWindow)->move(5, 15); 372 374 m_netwardWindow->show(); 373 375 } … … 381 383 if (m_modulWindow == NULL) { //to test if the object is already created. 382 384 m_modulWindow = new ModulWindow(&theModulTable, &theSpaceTable, &theOperaTable, &theConstantTable, &the_mwc); //mwc.getModul(); 383 espace ->addWindow(m_modulWindow);384 espace ->addWindow(m_modulWindow)->move(30, 15);385 espace.addWindow(m_modulWindow); 386 espace.addWindow(m_modulWindow)->move(30, 15); 385 387 m_modulWindow->show(); 386 388 } … … 395 397 if (m_ctinWindow == NULL) { //to test if the object is already created. 396 398 m_ctinWindow = new ConnectionWindow; //mwc.getCtin(); 397 espace ->addWindow(m_ctinWindow)->move(0, 0);399 espace.addWindow(m_ctinWindow)->move(0, 0); 398 400 m_ctinWindow->show(); 399 401 } … … 408 410 if (m_orderWindow == NULL) { //to test if the object is already created. 409 411 m_orderWindow = new OrderWindow; //mwc.getOrder(); 410 espace ->addWindow(m_orderWindow)->move(2, 0);412 espace.addWindow(m_orderWindow)->move(2, 0); 411 413 m_orderWindow->show(); 412 414 } … … 420 422 if (m_insertFCTWindow == NULL) { //to test if the object is already created. 421 423 m_insertFCTWindow = new InsertFCTWindow; //mwc.getInsertFCT(); 422 espace ->addWindow(m_insertFCTWindow)->move(30, 20);424 espace.addWindow(m_insertFCTWindow)->move(30, 20); 423 425 m_insertFCTWindow->show(); 424 426 } … … 472 474 /**************************************** Implementation of the method nouveauProjet (SLOT) *******************************************************/ 473 475 void MainWindow::createNewProjectWindow() { // Affiche la fenetre nouveau projet lorsqu'elle est appelée. 474 475 newProjectWindow = new QDialog(espace); // L'objet sera affiché dans "espace". 476 newProjectWindow->setWindowTitle("Création d'un nouveau projet."); 476 //QWorkspace test; 477 m_newProjectWindow = new NewProjectWindow(espace); 478 //m_newProjectWindow->show(); 479 /*newProjectWindow = new QDialog(pt_espace); // L'objet sera affiché dans "espace". 480 //newProjectWindow->setWindowTitle("Création d'un nouveau projet."); 477 481 478 482 QLabel *m_labelProjetDescription = new QLabel("BrÚve description du projet: "); … … 518 522 newProjectWindow->resize(baseSize().width(), (height()/3)+80); //Permet de refixer les dimensions de la fenetre. 519 523 524 newProjectWindow->hide(); 520 525 connect(m_buttonCreateNewProject, SIGNAL(clicked()), this, SLOT(createProjectDirectory())); //Pour la création du répertoire. 526 //instance ++; //Permet de compter le nombre de "Nouveau Projet" crées. 521 527 connect(this, SIGNAL(newProjectIsCreated()), newProjectWindow, SLOT(close())); //Fermeture automatique de la fenetre lorsqu'un nouveau projet est crée 522 528 connect(m_buttonPath, SIGNAL(clicked()), this, SLOT(openPathWindow())); … … 524 530 connect(m_buttonHelp, SIGNAL(clicked()), this, SLOT(helpMessage()));// Pour la fermeture de fenetre. 525 531 526 //instance ++; //Permet de compter le nombre de "Nouveau Projet" crées.527 532 newProjectWindow->exec(); 533 */ 528 534 } 529 535 … … 537 543 //delete m_hatnameWindow; 538 544 m_hatnameWindow = new HatNameWindow(&theHeaderList, &theConstantTable); //Crée un autre objet. 539 espace ->addWindow(m_hatnameWindow)->move(350, 0);545 espace.addWindow(m_hatnameWindow)->move(350, 0); 540 546 m_hatnameWindow->show(); 541 espace ->setActiveWindow(m_constantWindow);547 espace.setActiveWindow(m_constantWindow); 542 548 m_hatnameWindow->update(); 543 549 } … … 554 560 //delete m_hatnameWindow; 555 561 m_hatnameWindow = new HatNameWindow(&theHeaderList, &theConstantTable); //Crée un autre objet. 556 espace ->addWindow(m_hatnameWindow)->move(350, 0);562 espace.addWindow(m_hatnameWindow)->move(350, 0); 557 563 m_hatnameWindow->show(); 558 espace ->setActiveWindow(m_constantWindow);564 espace.setActiveWindow(m_constantWindow); 559 565 } 560 566 else … … 562 568 } 563 569 /********************************************* Implementation of the method helpMessage() *********************************************************/ 564 void MainWindow::helpMessage() {570 /*void MainWindow::helpMessage() { 565 571 566 572 QMessageBox msgBox; … … 572 578 573 579 msgBox.exec(); 574 } 580 }*/ 575 581 /**************************************************** Implementation of the method openPathWindow() ***********************************************/ 576 void MainWindow::openPathWindow() {582 /*void MainWindow::openPathWindow() { 577 583 578 584 QString dir = QFileDialog::getExistingDirectory(this, tr("Open Directory"), "/home", QFileDialog::ShowDirsOnly | … … 583 589 584 590 585 } 591 }*/ 586 592 /***************************************** Implementation of the method montrerActionGenererD() ****************************************************/ 587 593 -
trunk/yao/src/interface/src/ModulWindow.cpp
r361 r362 26 26 localConstantTable = aConstantTable; 27 27 m_localModulTable = aModulTable; 28 m_localSpaceTable = aSpaceTable; 29 m_localOperaTable = anOperatorTable; 28 30 29 31 QRegExp regExp("[A-Za-z_][A-Za-z1-9_]{0,}"); 30 32 m_modulNameLine->setValidator(new QRegExpValidator(regExp, this)); 31 m_comboModulOpera->setDisabled(true); 32 m_comboModulTarget->insertItem(0, " "); 33 m_comboModulTarget->insertItem(1, "uptime"); 34 m_comboModulTarget->insertItem(2, "steptime"); 35 m_comboModulTarget->insertItem(3, "alltime"); 36 37 m_comboModulInter2->setDisabled(true); 38 m_comboModulInter3->setDisabled(true); 33 34 m_modulOperaCombo->setDisabled(true); 35 m_modulTargetCombo->insertItem(0, " "); 36 m_modulTargetCombo->insertItem(1, "uptime"); 37 m_modulTargetCombo->insertItem(2, "steptime"); 38 m_modulTargetCombo->insertItem(3, "alltime"); 39 40 m_modulInter2Combo->setDisabled(true); 41 m_modulInter3Combo->setDisabled(true); 39 42 40 43 if (isModulTableEmpty()) 41 44 m_modulDelButton->setDisabled(true); 42 //m_ checkBoxModulArray->setDisabled(true);45 //m_modulArrayCheckBox->setDisabled(true); 43 46 // for (Table<Constant>::reverse_iterator it = localConstantTable->rbegin(); it != localConstantTable->rend(); it++) { 44 47 // cout << it->getName().c_str() << endl; 45 //m_ comboModulSpaceName->insertItem(2, "DOUBLE");46 // m_ comboModulAutonet->insertItem(2, QString(it->getName().c_str()));48 //m_modulSpaceComboName->insertItem(2, "DOUBLE"); 49 // m_modulAutonetCombo->insertItem(2, QString(it->getName().c_str())); 47 50 //m_comboModulClonof->insertItem(1, QString(it->().c_str())); 48 51 // m_comboModulLopera->insertItem(1, QString(it->getName().c_str())); 49 // } 52 53 m_modulSpaceCombo->insertItem(0, " "); 54 m_modulOperaCombo->insertItem(0, " "); 55 56 for (Table<Space>::reverse_iterator it = m_localSpaceTable->rbegin(); it != m_localSpaceTable->rend(); it++) { 57 58 m_modulSpaceCombo->insertItem(1, QString(it->getProperty(0).c_str())); 59 m_modulOperaCombo->insertItem(1, QString(it->getProperty(0).c_str())); 60 61 } 62 50 63 m_modulModel = new QStandardItemModel(0, 11); 51 m_modulModel->setHorizontalHeaderLabels(QStringList() << "Nom " << "space/opera" << "input" << "output" << "target" << "noward" << "autonet" << "netward" << "cout" << "lopera" << "tempo");64 m_modulModel->setHorizontalHeaderLabels(QStringList() << "Nom module" << "space/opera" << "input" << "output" << "target" << "noward" << "autonet" << "netward" << "cout" << "lopera" << "tempo"); 52 65 53 66 m_modulTableView->setModel(m_modulModel); … … 56 69 m_modulTableView->setSelectionBehavior(QAbstractItemView::SelectRows); 57 70 m_modulTableView->resizeColumnsToContents(); 58 //m_modulTableView-> 59 60 if (m_lineModulInput->text().isEmpty()) 61 m_checkBoxModulArray->setDisabled(true); 71 72 for (Table<Modul>::iterator it = m_localModulTable->begin(); it != m_localModulTable->end(); it++) { 73 74 int row = m_modulModel->rowCount(); 75 76 //m_modulModel->setItem(row, 0, new QStandardItem(QString(it->getProperty(0).c_str()))); /*!< Gets the name.*/ 77 m_modulModel->setItem(row, 1, new QStandardItem(QString(it->getSpaceOrOperator().c_str()))); /*!< Gets the dimension (1, 2 or 3).*/ 78 //m_modulModel->setItem(row, 2, new QStandardItem(QString(it->getProperty(2).c_str()))); /*!< Gets the choosed in the space directive .*/ 79 } 80 81 82 83 if (m_modulInputLine->text().isEmpty()) 84 m_modulArrayCheckBox->setDisabled(true); 62 85 //cout << "vide! cooool" << endl; 63 //connect(m_ lineModulInput, SIGNAL(textEdited(QString )), this, SLOT(close()));64 65 connect(m_ buttonModulQuit, SIGNAL(clicked()), this, SLOT(close()));66 connect(m_ buttonModulAdd, SIGNAL(clicked()), this, SLOT(addModulRow()));86 //connect(m_modulInputLine, SIGNAL(textEdited(QString )), this, SLOT(close())); 87 88 connect(m_modulQuitButton, SIGNAL(clicked()), this, SLOT(close())); 89 connect(m_modulAddButton, SIGNAL(clicked()), this, SLOT(addModulRow())); 67 90 connect(m_modulDelButton, SIGNAL(clicked()), this, SLOT(deleteModulRow())); 68 connect(m_ buttonModulHelp, SIGNAL(clicked()), this, SLOT(callModulHelp()));69 70 connect(m_ checkBoxModulNoward, SIGNAL(toggled(bool )), m_checkBoxModulSpec, SLOT(setDisabled(bool )));71 connect(m_ checkBoxModulNoward, SIGNAL(toggled(bool )), m_checkBoxModulNetward, SLOT(setDisabled(bool )));72 connect(m_ checkBoxModulNoward, SIGNAL(toggled(bool )), m_labelModulAutonet, SLOT(setDisabled(bool )));73 connect(m_ checkBoxModulNoward, SIGNAL(toggled(bool )), m_comboModulAutonet, SLOT(setDisabled(bool )));74 75 connect(m_ spaceRadioButton, SIGNAL(toggled(bool )), m_comboModulOpera, SLOT(setDisabled(bool )));76 connect(m_ operaRadioButton, SIGNAL(toggled(bool )), m_comboModulSpace, SLOT(setDisabled(bool )));77 78 79 80 connect(m_buttonLoperaAdd, SIGNAL(clicked()), this, SLOT(add O_EXTOBJRow()));81 82 connect(m_buttonLoperaDel, SIGNAL(clicked()), this, SLOT(delete O_EXTOBJRow()));91 connect(m_modulHelpButton, SIGNAL(clicked()), this, SLOT(callModulHelp())); 92 93 connect(m_modulNowardCheckBox, SIGNAL(toggled(bool )), m_modulSpecCheckBox, SLOT(setDisabled(bool ))); 94 connect(m_modulNowardCheckBox, SIGNAL(toggled(bool )), m_modulNetwardCheckBox, SLOT(setDisabled(bool ))); 95 connect(m_modulNowardCheckBox, SIGNAL(toggled(bool )), m_labelModulAutonet, SLOT(setDisabled(bool ))); 96 connect(m_modulNowardCheckBox, SIGNAL(toggled(bool )), m_modulAutonetCombo, SLOT(setDisabled(bool ))); 97 98 connect(m_modulSpaceRadioButton, SIGNAL(toggled(bool )), m_modulOperaCombo, SLOT(setDisabled(bool ))); 99 connect(m_modulOperaRadioButton, SIGNAL(toggled(bool )), m_modulSpaceCombo, SLOT(setDisabled(bool ))); 100 101 102 103 connect(m_buttonLoperaAdd, SIGNAL(clicked()), this, SLOT(addLoperaRow())); 104 105 connect(m_buttonLoperaDel, SIGNAL(clicked()), this, SLOT(deleteLoperaRow())); 83 106 84 107 setFixedWidth(baseSize().width() + 766); … … 90 113 void ModulWindow::addModulRow() { 91 114 92 /*m_ comboModulSpaceName->setCurrentIndex(0);93 m_ comboModulOperaName->setCurrentIndex(0);94 m_ comboModulAutonet->setCurrentIndex(0);115 /*m_modulSpaceComboName->setCurrentIndex(0); 116 m_modulOperaComboName->setCurrentIndex(0); 117 m_modulAutonetCombo->setCurrentIndex(0); 95 118 m_comboModulClonof->setCurrentIndex(0); 96 119 m_comboModulLopera->setCurrentIndex(0); 97 120 m_checkBoxNoward->setChecked(false); 98 121 m_checkBoxTempo->setChecked(false); 99 m_ checkBoxCout->setChecked(false);122 m_m_modulCoutCheckBox->setChecked(false); 100 123 m_checkBoxSpec->setChecked(false); 101 124 m_checkBoxNetward->setChecked(false); 102 125 m_checkBoxModulHidjac->setChecked(false); 103 126 m_checkBoxModulManage->setChecked(false); 104 m_ checkBoxModulArray->setChecked(false);127 m_modulArrayCheckBox->setChecked(false); 105 128 */ 106 //filesList.append(m_ comboModulSpaceName->currentText());129 //filesList.append(m_modulSpaceComboName->currentText()); 107 130 //filesListModele->setStringList(filesList); 108 //testContenu(compteur); 131 132 //m_modulNameLine 133 //m_modulSpaceCombo 134 //m_modulOperaCombo 135 //m_modulNowardCheckBox 136 //m_modulInputLine 137 //m_modulOutputLine 138 //m_modulTargetCombo 139 //m_modulAutonetCombo 140 //m_modulInter1Combo 141 //m_modulCoutCheckBox 142 //m_modulNetwardCheckBox 143 //m_loperaListView 144 145 string modulName = m_modulNameLine->text().toStdString() , 146 modulParent, 147 modulAttributs; 109 148 110 149 int row = m_modulModel->rowCount(); 111 /*if (!localMwc->isIntegerLiteral(m_ comboModulAutonet->currentText().toStdString())) {150 /*if (!localMwc->isIntegerLiteral(m_modulAutonetCombo->currentText().toStdString())) { 112 151 113 152 QMessageBox::critical(this, "Avertissement", "CaractÚre(s) non permis dans le champ \"O_PARALLEL\"."); 114 153 return; // Arrêt de la méthode 115 154 }*/ 116 // m_modulModel->setItem(row, 0, new QStandardItem(m_comboModulSpaceName->currentText())); 117 // m_modulModel->setItem(row, 1, new QStandardItem(m_comboModulOperaName->currentText())); 118 // m_modulModel->setItem(row, 2, new QStandardItem(m_comboModulAutonet->currentText())); 119 // m_modulModel->setItem(row, 3, new QStandardItem(m_comboModulClonof->currentText())); 120 155 156 if (m_modulSpaceRadioButton->isChecked()) 157 modulParent = m_modulSpaceCombo->currentText().toStdString() ; 158 else 159 modulParent = m_modulOperaCombo->currentText().toStdString() ; 160 161 if (!(modulName.empty() || modulParent.empty() )) { 162 163 m_modulModel->setItem(row, 0, new QStandardItem(QString(modulName.c_str()))); 164 m_modulModel->setItem(row, 1, new QStandardItem(QString(modulParent.c_str()))); 165 // m_modulModel->setItem(row, 2, new QStandardItem(m_modulAutonetCombo->currentText())); 166 // m_modulModel->setItem(row, 3, new QStandardItem(m_comboModulClonof->currentText())); 167 168 (m_modulSpaceRadioButton->isChecked())? m_localModulTable->push_back(Modul(modulName, m_localSpaceTable->find(modulParent), true)): m_localModulTable->push_back(Modul(modulName, m_localOperaTable->find(modulParent), false)); 169 170 } 121 171 // m_modulModel->setItem(row, 4, new QStandardItem(m_comboModulLopera->currentText())); 122 172 //if (m_checkBoxNoward->isChecked()) 123 173 // m_checkBoxNoward->isChecked()?m_modulModel->setItem(row, 5, new QStandardItem("oui")):m_modulModel->setItem(row, 5, new QStandardItem("non")); 124 174 //m_checkBoxTempo->isChecked() ?m_modulModel->setItem(row, 6, new QStandardItem("oui")):m_modulModel->setItem(row, 6, new QStandardItem("non")); 125 //m_ checkBoxCout->isChecked()?m_modulModel->setItem(row, 7, new QStandardItem("oui")):m_modulModel->setItem(row, 7, new QStandardItem("non"));175 //m_m_modulCoutCheckBox->isChecked()?m_modulModel->setItem(row, 7, new QStandardItem("oui")):m_modulModel->setItem(row, 7, new QStandardItem("non")); 126 176 //m_checkBoxSpec->isChecked()?m_modulModel->setItem(row, 8, new QStandardItem("oui")):m_modulModel->setItem(row, 8, new QStandardItem("non")); 127 177 //m_checkBoxNetward->isChecked()?m_modulModel->setItem(row, 9, new QStandardItem("oui")):m_modulModel->setItem(row, 9, new QStandardItem("non")); 128 178 //m_checkBoxModulHidjac->isChecked()?m_modulModel->setItem(row, 10, new QStandardItem("oui")):m_modulModel->setItem(row, 10, new QStandardItem("non")); 129 179 //m_checkBoxModulManage->isChecked()?m_modulModel->setItem(row, 11, new QStandardItem("oui")):m_modulModel->setItem(row, 11, new QStandardItem("non")); 130 //m_ checkBoxModulArray->isChecked()?m_modulModel->setItem(row, 12, new QStandardItem("oui")):m_modulModel->setItem(row, 12, new QStandardItem("non"));180 //m_modulArrayCheckBox->isChecked()?m_modulModel->setItem(row, 12, new QStandardItem("oui")):m_modulModel->setItem(row, 12, new QStandardItem("non")); 131 181 132 182 eraseDataFromLineEdit(); … … 134 184 135 185 } 136 /**************************************** Implémentation de la méthode add O_EXTOBJRow() **************************************************************/137 void ModulWindow::add O_EXTOBJRow() {138 139 O_EXTOBJModele->appendRow(new QStandardItem(m_comboModulLopera->currentText()));186 /**************************************** Implémentation de la méthode addLoperaRow() **************************************************************/ 187 void ModulWindow::addLoperaRow() { 188 189 m_loperaModel->appendRow(new QStandardItem(m_comboModulLopera->currentText())); 140 190 m_comboModulLopera->setCurrentIndex(0); 141 191 } 142 192 143 /**************************************** Implémentation de la méthode delete O_EXTOBJRow() **********************************************************/144 void ModulWindow::delete O_EXTOBJRow() {193 /**************************************** Implémentation de la méthode deleteLoperaRow() **********************************************************/ 194 void ModulWindow::deleteLoperaRow() { 145 195 146 196 QItemSelectionModel *selection = m_loperaListView->selectionModel(); 147 O_EXTOBJIndex = selection->currentIndex();148 if (! O_EXTOBJIndex.isValid())197 m_loperaIndex = selection->currentIndex(); 198 if (!m_loperaIndex.isValid()) 149 199 return; 150 QVariant element = O_EXTOBJModele->data(O_EXTOBJIndex, Qt::DisplayRole);151 int r = O_EXTOBJIndex.row();200 QVariant element = m_loperaModel->data(m_loperaIndex, Qt::DisplayRole); 201 int r = m_loperaIndex.row(); 152 202 if (selection->hasSelection()) { 153 O_EXTOBJModele->removeRows(m_loperaListView->currentIndex().row(), 1);203 m_loperaModel->removeRows(m_loperaListView->currentIndex().row(), 1); 154 204 //localHeaderList->erase(localHeaderList->begin() + r); 155 205 //if(isHeaderListEmpty()) m_delHatButton->setDisabled(true); … … 160 210 void ModulWindow::eraseDataFromLineEdit() { 161 211 162 /*m_ comboModulSpaceName->setCurrentIndex(0);163 m_ comboModulOperaName->setCurrentIndex(0);164 m_ comboModulAutonet->setCurrentIndex(0);212 /*m_modulSpaceComboName->setCurrentIndex(0); 213 m_modulOperaComboName->setCurrentIndex(0); 214 m_modulAutonetCombo->setCurrentIndex(0); 165 215 m_comboModulClonof->setCurrentIndex(0); 166 216 m_comboModulLopera->setCurrentIndex(0); 167 217 m_checkBoxNoward->setChecked(false); 168 218 m_checkBoxTempo->setChecked(false); 169 m_ checkBoxCout->setChecked(false);219 m_m_modulCoutCheckBox->setChecked(false); 170 220 m_checkBoxSpec->setChecked(false); 171 221 m_checkBoxNetward->setChecked(false); 172 222 m_checkBoxModulHidjac->setChecked(false); 173 223 m_checkBoxModulManage->setChecked(false); 174 m_ checkBoxModulArray->setChecked(false);224 m_modulArrayCheckBox->setChecked(false); 175 225 */ 176 226 } … … 185 235 //filesListModele->setStringList(filesList); //On indique au modÚle la liste des éléments à afficher. 186 236 187 compteur --;188 //testContenu(compteur);189 237 190 238 } -
trunk/yao/src/interface/src/include/MainWindow.hpp
r356 r362 35 35 #include "ContextWindow.hpp" 36 36 #include "OrderWindow.hpp" 37 #include "NewProjectWindow.hpp" 37 38 38 39 /*! … … 54 55 MainWindow(QWidget *parent = 0); 55 56 56 void toolBarActions(QWorkspace *espace);57 void toolBarActions(QWorkspace &espace); 57 58 void createActions(); 58 59 void createToolBar(); … … 95 96 void montrerActionGenererD(); 96 97 void createNewProjectWindow(); 97 void helpMessage();98 //void helpMessage(); 98 99 void createDefvalWindow(); 99 100 void createHatNameWindow(); … … 121 122 void changeColorOrderButton(); 122 123 void createProjectDirectory(); 123 void openPathWindow();124 //void openPathWindow(); 124 125 void setTitle(); 125 126 void hatUpdate(); … … 201 202 QToolBar *yaoToolBar; //Crée une barre d'outils 202 203 QStatusBar *barreEtat; 203 QWorkspace *espace; 204 QWorkspace espace; 205 QWorkspace *pt_espace; 204 206 QTableWidget *tableWidget; 205 207 QString curFile; … … 216 218 OrderWindow *m_orderWindow; 217 219 InsertFCTWindow *m_insertFCTWindow; 220 221 NewProjectWindow *m_newProjectWindow; 218 222 219 223 FilesViewer *fv; -
trunk/yao/src/interface/src/include/ModulWindow.hpp
r359 r362 28 28 void saveModulData(); 29 29 void addModulRow(); 30 void add O_EXTOBJRow();31 void delete O_EXTOBJRow();30 void addLoperaRow(); 31 void deleteLoperaRow(); 32 32 void deleteModulRow(); 33 33 void callModulHelp(); … … 41 41 private: 42 42 QStandardItemModel *m_modulModel; 43 QStandardItemModel * O_EXTOBJModele;43 QStandardItemModel *m_loperaModel; 44 44 QModelIndex index; 45 QModelIndex O_EXTOBJIndex;45 QModelIndex m_loperaIndex; 46 46 yao::Table <yao::Modul> *m_localModulTable; 47 47 std::vector<std::string> anVector; 48 48 yao::Table <yao::Constant> *localConstantTable; 49 yao::Table <yao::Space> *m_localSpaceTable; 50 yao::Table <yao::Operator> *m_localOperaTable; 49 51 MainWindowController *localMwc; 50 int compteur;51 52 52 53 }; -
trunk/yao/src/interface/src/ui_/connectionwindow.ui
r356 r362 57 57 <string>Ajouter</string> 58 58 </property> 59 <property name="default"> 60 <bool>true</bool> 61 </property> 59 62 </widget> 60 63 </item> … … 70 73 <property name="text"> 71 74 <string>Quitter</string> 75 </property> 76 <property name="autoDefault"> 77 <bool>true</bool> 72 78 </property> 73 79 </widget> … … 86 92 <property name="text"> 87 93 <string>Aide</string> 94 </property> 95 <property name="autoDefault"> 96 <bool>true</bool> 88 97 </property> 89 98 </widget> -
trunk/yao/src/interface/src/ui_/constantwindow.ui
r345 r362 113 113 <string>Aide</string> 114 114 </property> 115 <property name="autoDefault"> 116 <bool>true</bool> 117 </property> 115 118 </widget> 116 119 <widget class="QWidget" name="layoutWidget"> … … 119 122 <x>220</x> 120 123 <y>40</y> 121 <width>8 1</width>124 <width>87</width> 122 125 <height>95</height> 123 126 </rect> … … 128 131 <property name="text"> 129 132 <string>Ajouter</string> 133 </property> 134 <property name="default"> 135 <bool>true</bool> 130 136 </property> 131 137 </widget> … … 143 149 <string>Quitter</string> 144 150 </property> 151 <property name="autoDefault"> 152 <bool>true</bool> 153 </property> 154 <property name="default"> 155 <bool>false</bool> 156 </property> 157 <property name="flat"> 158 <bool>false</bool> 159 </property> 145 160 </widget> 146 161 </item> … … 153 168 <tabstop>m_ligneValeur</tabstop> 154 169 <tabstop>m_addButton</tabstop> 170 <tabstop>m_delButton</tabstop> 155 171 <tabstop>m_quitButton</tabstop> 156 172 <tabstop>m_helpButton</tabstop> 173 <tabstop>m_tableView</tabstop> 157 174 </tabstops> 158 175 <resources/> -
trunk/yao/src/interface/src/ui_/contextwindow.ui
r359 r362 349 349 <string>Ajouter</string> 350 350 </property> 351 <property name="default"> 352 <bool>true</bool> 353 </property> 351 354 </widget> 352 355 </item> … … 362 365 <property name="text"> 363 366 <string>Quitter</string> 367 </property> 368 <property name="autoDefault"> 369 <bool>true</bool> 364 370 </property> 365 371 </widget> … … 378 384 <property name="text"> 379 385 <string>Aide</string> 386 </property> 387 <property name="autoDefault"> 388 <bool>true</bool> 380 389 </property> 381 390 </widget> -
trunk/yao/src/interface/src/ui_/insertfctwindow.ui
r358 r362 126 126 <x>230</x> 127 127 <y>20</y> 128 <width>8 1</width>128 <width>87</width> 129 129 <height>95</height> 130 130 </rect> … … 135 135 <property name="text"> 136 136 <string>Ajouter</string> 137 </property> 138 <property name="default"> 139 <bool>true</bool> 137 140 </property> 138 141 </widget> … … 149 152 <property name="text"> 150 153 <string>Quitter</string> 154 </property> 155 <property name="autoDefault"> 156 <bool>true</bool> 151 157 </property> 152 158 </widget> … … 166 172 <string>Aide</string> 167 173 </property> 174 <property name="autoDefault"> 175 <bool>true</bool> 176 </property> 168 177 </widget> 169 178 </widget> -
trunk/yao/src/interface/src/ui_/modulwindow.ui
r361 r362 7 7 <x>0</x> 8 8 <y>0</y> 9 <width>7 66</width>9 <width>778</width> 10 10 <height>520</height> 11 11 </rect> … … 19 19 <x>10</x> 20 20 <y>10</y> 21 <width>7 51</width>21 <width>761</width> 22 22 <height>301</height> 23 23 </rect> … … 72 72 </property> 73 73 <property name="buddy"> 74 <cstring>m_ lineModulInput</cstring>74 <cstring>m_modulInputLine</cstring> 75 75 </property> 76 76 </widget> … … 90 90 </item> 91 91 <item> 92 <widget class="QLineEdit" name="m_ lineModulInput"/>92 <widget class="QLineEdit" name="m_modulInputLine"/> 93 93 </item> 94 94 </layout> … … 102 102 </property> 103 103 <property name="buddy"> 104 <cstring> lineModulOutput</cstring>104 <cstring>m_modulOutputLine</cstring> 105 105 </property> 106 106 </widget> … … 120 120 </item> 121 121 <item> 122 <widget class="QLineEdit" name=" lineModulOutput"/>122 <widget class="QLineEdit" name="m_modulOutputLine"/> 123 123 </item> 124 124 </layout> … … 132 132 </property> 133 133 <property name="buddy"> 134 <cstring>m_ comboModulTarget</cstring>134 <cstring>m_modulTargetCombo</cstring> 135 135 </property> 136 136 </widget> 137 137 </item> 138 138 <item> 139 <widget class="QComboBox" name="m_ comboModulTarget"/>139 <widget class="QComboBox" name="m_modulTargetCombo"/> 140 140 </item> 141 141 </layout> … … 143 143 </layout> 144 144 </widget> 145 <widget class="QCheckBox" name="m_ checkBoxModulArray">145 <widget class="QCheckBox" name="m_modulArrayCheckBox"> 146 146 <property name="geometry"> 147 147 <rect> … … 182 182 <layout class="QVBoxLayout" name="verticalLayout_3"> 183 183 <item> 184 <widget class="QCheckBox" name="m_ checkBoxModulNoward">184 <widget class="QCheckBox" name="m_modulNowardCheckBox"> 185 185 <property name="text"> 186 186 <string>noward</string> … … 189 189 </item> 190 190 <item> 191 <widget class="QCheckBox" name=" checkBoxTempo">191 <widget class="QCheckBox" name="m_modulTempoCheckBox"> 192 192 <property name="text"> 193 193 <string>tempo</string> … … 196 196 </item> 197 197 <item> 198 <widget class="QCheckBox" name=" checkBoxCout">198 <widget class="QCheckBox" name="m_modulCoutCheckBox"> 199 199 <property name="text"> 200 200 <string>cout</string> … … 203 203 </item> 204 204 <item> 205 <widget class="QCheckBox" name="m_ checkBoxModulSpec">205 <widget class="QCheckBox" name="m_modulSpecCheckBox"> 206 206 <property name="text"> 207 207 <string>spec</string> … … 210 210 </item> 211 211 <item> 212 <widget class="QCheckBox" name="m_ checkBoxModulNetward">212 <widget class="QCheckBox" name="m_modulNetwardCheckBox"> 213 213 <property name="text"> 214 214 <string>netward</string> … … 217 217 </item> 218 218 <item> 219 <widget class="QCheckBox" name=" checkBoxModulHidjac">219 <widget class="QCheckBox" name="m_modulHidjacCheckBox"> 220 220 <property name="text"> 221 221 <string>hidjac</string> … … 224 224 </item> 225 225 <item> 226 <widget class="QCheckBox" name=" checkBoxModulManage">226 <widget class="QCheckBox" name="m_modulManageCheckBox"> 227 227 <property name="text"> 228 228 <string>manage_ctin</string> … … 238 238 <x>460</x> 239 239 <y>10</y> 240 <width>2 81</width>241 <height>1 21</height>240 <width>291</width> 241 <height>131</height> 242 242 </rect> 243 243 </property> … … 253 253 <x>10</x> 254 254 <y>10</y> 255 <width>2 61</width>255 <width>271</width> 256 256 <height>31</height> 257 257 </rect> … … 264 264 </property> 265 265 <property name="buddy"> 266 <cstring>m_ comboModulInter1</cstring>266 <cstring>m_modulInter1Combo</cstring> 267 267 </property> 268 268 </widget> … … 271 271 <layout class="QHBoxLayout" name="horizontalLayout"> 272 272 <item> 273 <widget class="QComboBox" name="m_ comboModulInter1"/>273 <widget class="QComboBox" name="m_modulInter1Combo"/> 274 274 </item> 275 275 <item> 276 <widget class="QComboBox" name="m_ comboModulInter2"/>276 <widget class="QComboBox" name="m_modulInter2Combo"/> 277 277 </item> 278 278 <item> 279 <widget class="QComboBox" name="m_ comboModulInter3"/>279 <widget class="QComboBox" name="m_modulInter3Combo"/> 280 280 </item> 281 281 </layout> … … 288 288 <x>10</x> 289 289 <y>50</y> 290 <width>2 61</width>290 <width>272</width> 291 291 <height>68</height> 292 292 </rect> … … 303 303 </property> 304 304 <property name="buddy"> 305 <cstring>m_ comboModulAutonet</cstring>305 <cstring>m_modulAutonetCombo</cstring> 306 306 </property> 307 307 </widget> 308 308 </item> 309 309 <item> 310 <widget class="QComboBox" name="m_ comboModulAutonet"/>310 <widget class="QComboBox" name="m_modulAutonetCombo"/> 311 311 </item> 312 312 </layout> … … 320 320 </property> 321 321 <property name="buddy"> 322 <cstring> comboModulCovt</cstring>322 <cstring>m_modulCovtCombo</cstring> 323 323 </property> 324 324 </widget> … … 338 338 </item> 339 339 <item> 340 <widget class="QComboBox" name=" comboModulCovt"/>340 <widget class="QComboBox" name="m_modulCovtCombo"/> 341 341 </item> 342 342 </layout> … … 354 354 </property> 355 355 <property name="buddy"> 356 <cstring> comboModulClonol</cstring>356 <cstring>m_modulClonolCombo</cstring> 357 357 </property> 358 358 </widget> 359 359 </item> 360 360 <item> 361 <widget class="QComboBox" name=" comboModulClonol"/>361 <widget class="QComboBox" name="m_modulClonolCombo"/> 362 362 </item> 363 363 </layout> … … 371 371 </property> 372 372 <property name="buddy"> 373 <cstring> comboClonof</cstring>373 <cstring>m_modulClonofCombo</cstring> 374 374 </property> 375 375 </widget> 376 376 </item> 377 377 <item> 378 <widget class="QComboBox" name=" comboClonof"/>378 <widget class="QComboBox" name="m_modulClonofCombo"/> 379 379 </item> 380 380 </layout> … … 389 389 <rect> 390 390 <x>460</x> 391 <y>1 40</y>392 <width>2 81</width>393 <height>1 51</height>391 <y>150</y> 392 <width>291</width> 393 <height>141</height> 394 394 </rect> 395 395 </property> … … 404 404 <rect> 405 405 <x>20</x> 406 <y> 20</y>406 <y>10</y> 407 407 <width>171</width> 408 408 <height>29</height> … … 429 429 <rect> 430 430 <x>20</x> 431 <y> 60</y>431 <y>50</y> 432 432 <width>81</width> 433 433 <height>81</height> … … 435 435 </property> 436 436 </widget> 437 <widget class="Q PushButton" name="m_buttonLoperaAdd">437 <widget class="QWidget" name="layoutWidget"> 438 438 <property name="geometry"> 439 439 <rect> 440 440 <x>110</x> 441 <y> 80</y>442 <width>8 1</width>443 <height> 27</height>441 <y>60</y> 442 <width>87</width> 443 <height>62</height> 444 444 </rect> 445 445 </property> 446 <property name="text"> 447 <string>Ajouter</string> 448 </property> 449 </widget> 450 <widget class="QPushButton" name="m_buttonLoperaDel"> 451 <property name="enabled"> 452 <bool>true</bool> 453 </property> 454 <property name="geometry"> 455 <rect> 456 <x>110</x> 457 <y>110</y> 458 <width>81</width> 459 <height>27</height> 460 </rect> 461 </property> 462 <property name="text"> 463 <string>Supprimer</string> 464 </property> 446 <layout class="QVBoxLayout" name="verticalLayout_6"> 447 <item> 448 <widget class="QPushButton" name="m_buttonLoperaAdd"> 449 <property name="text"> 450 <string>Ajouter</string> 451 </property> 452 <property name="autoDefault"> 453 <bool>true</bool> 454 </property> 455 </widget> 456 </item> 457 <item> 458 <widget class="QPushButton" name="m_buttonLoperaDel"> 459 <property name="enabled"> 460 <bool>true</bool> 461 </property> 462 <property name="text"> 463 <string>Supprimer</string> 464 </property> 465 <property name="autoDefault"> 466 <bool>true</bool> 467 </property> 468 </widget> 469 </item> 470 </layout> 465 471 </widget> 466 472 </widget> … … 470 476 <x>10</x> 471 477 <y>70</y> 472 <width>30 1</width>478 <width>307</width> 473 479 <height>29</height> 474 480 </rect> … … 476 482 <layout class="QHBoxLayout" name="horizontalLayout_13"> 477 483 <item> 478 <widget class="QRadioButton" name="m_ spaceRadioButton">484 <widget class="QRadioButton" name="m_modulSpaceRadioButton"> 479 485 <property name="text"> 480 486 <string>space</string> … … 486 492 </item> 487 493 <item> 488 <widget class="QComboBox" name="m_ comboModulSpace"/>489 </item> 490 <item> 491 <widget class="QRadioButton" name="m_ operaRadioButton">494 <widget class="QComboBox" name="m_modulSpaceCombo"/> 495 </item> 496 <item> 497 <widget class="QRadioButton" name="m_modulOperaRadioButton"> 492 498 <property name="text"> 493 499 <string>opera</string> … … 496 502 </item> 497 503 <item> 498 <widget class="QComboBox" name="m_ comboModulOpera"/>504 <widget class="QComboBox" name="m_modulOperaCombo"/> 499 505 </item> 500 506 </layout> … … 506 512 <x>10</x> 507 513 <y>320</y> 508 <width>7 51</width>514 <width>761</width> 509 515 <height>191</height> 510 516 </rect> … … 537 543 <layout class="QVBoxLayout" name="verticalLayout_4"> 538 544 <item> 539 <widget class="QPushButton" name="m_ buttonModulAdd">545 <widget class="QPushButton" name="m_modulAddButton"> 540 546 <property name="text"> 541 547 <string>&Ajouter</string> 548 </property> 549 <property name="default"> 550 <bool>true</bool> 542 551 </property> 543 552 </widget> … … 554 563 </item> 555 564 <item> 556 <widget class="QPushButton" name="m_ buttonModulQuit">565 <widget class="QPushButton" name="m_modulQuitButton"> 557 566 <property name="text"> 558 567 <string>&Quitter</string> 559 568 </property> 569 <property name="autoDefault"> 570 <bool>true</bool> 571 </property> 560 572 </widget> 561 573 </item> 562 574 </layout> 563 575 </widget> 564 <widget class="QPushButton" name="m_ buttonModulHelp">576 <widget class="QPushButton" name="m_modulHelpButton"> 565 577 <property name="geometry"> 566 578 <rect> … … 574 586 <string>Aide</string> 575 587 </property> 588 <property name="autoDefault"> 589 <bool>true</bool> 590 </property> 576 591 </widget> 577 592 </widget> … … 579 594 <tabstops> 580 595 <tabstop>m_modulNameLine</tabstop> 581 <tabstop>m_ operaRadioButton</tabstop>582 <tabstop>m_ lineModulInput</tabstop>583 <tabstop>m_ checkBoxModulArray</tabstop>584 <tabstop> lineModulOutput</tabstop>585 <tabstop>m_ comboModulTarget</tabstop>586 <tabstop>m_ checkBoxModulNoward</tabstop>587 <tabstop> checkBoxTempo</tabstop>588 <tabstop> checkBoxCout</tabstop>589 <tabstop>m_ checkBoxModulSpec</tabstop>590 <tabstop>m_ checkBoxModulNetward</tabstop>591 <tabstop> checkBoxModulHidjac</tabstop>592 <tabstop> checkBoxModulManage</tabstop>593 <tabstop>m_ comboModulInter1</tabstop>594 <tabstop>m_ comboModulInter2</tabstop>595 <tabstop>m_ comboModulInter3</tabstop>596 <tabstop>m_ comboModulAutonet</tabstop>597 <tabstop> comboModulClonol</tabstop>598 <tabstop> comboModulCovt</tabstop>599 <tabstop> comboClonof</tabstop>596 <tabstop>m_modulOperaRadioButton</tabstop> 597 <tabstop>m_modulInputLine</tabstop> 598 <tabstop>m_modulArrayCheckBox</tabstop> 599 <tabstop>m_modulOutputLine</tabstop> 600 <tabstop>m_modulTargetCombo</tabstop> 601 <tabstop>m_modulNowardCheckBox</tabstop> 602 <tabstop>m_modulTempoCheckBox</tabstop> 603 <tabstop>m_modulCoutCheckBox</tabstop> 604 <tabstop>m_modulSpecCheckBox</tabstop> 605 <tabstop>m_modulNetwardCheckBox</tabstop> 606 <tabstop>m_modulHidjacCheckBox</tabstop> 607 <tabstop>m_modulManageCheckBox</tabstop> 608 <tabstop>m_modulInter1Combo</tabstop> 609 <tabstop>m_modulInter2Combo</tabstop> 610 <tabstop>m_modulInter3Combo</tabstop> 611 <tabstop>m_modulAutonetCombo</tabstop> 612 <tabstop>m_modulClonolCombo</tabstop> 613 <tabstop>m_modulCovtCombo</tabstop> 614 <tabstop>m_modulClonofCombo</tabstop> 600 615 <tabstop>m_comboModulLopera</tabstop> 601 616 <tabstop>m_buttonLoperaAdd</tabstop> 602 617 <tabstop>m_buttonLoperaDel</tabstop> 603 618 <tabstop>m_loperaListView</tabstop> 604 <tabstop>m_ buttonModulAdd</tabstop>619 <tabstop>m_modulAddButton</tabstop> 605 620 <tabstop>m_modulDelButton</tabstop> 606 <tabstop>m_ buttonModulQuit</tabstop>621 <tabstop>m_modulQuitButton</tabstop> 607 622 <tabstop>m_modulTableView</tabstop> 608 <tabstop>m_ buttonModulHelp</tabstop>623 <tabstop>m_modulHelpButton</tabstop> 609 624 </tabstops> 610 625 <resources/> 611 626 <connections> 612 627 <connection> 613 <sender>m_ buttonModulQuit</sender>628 <sender>m_modulQuitButton</sender> 614 629 <signal>clicked()</signal> 615 630 <receiver>ModulWindow</receiver> -
trunk/yao/src/interface/src/ui_/netwardwindow.ui
r357 r362 130 130 <string>Ajouter</string> 131 131 </property> 132 <property name="default"> 133 <bool>true</bool> 134 </property> 132 135 </widget> 133 136 </item> … … 143 146 <property name="text"> 144 147 <string>Quitter</string> 148 </property> 149 <property name="autoDefault"> 150 <bool>true</bool> 145 151 </property> 146 152 </widget> … … 159 165 <property name="text"> 160 166 <string>Aide</string> 167 </property> 168 <property name="autoDefault"> 169 <bool>true</bool> 161 170 </property> 162 171 </widget> -
trunk/yao/src/interface/src/ui_/operawindow.ui
r361 r362 29 29 <enum>QFrame::Raised</enum> 30 30 </property> 31 <widget class="QWidget" name=" ">31 <widget class="QWidget" name="layoutWidget"> 32 32 <property name="geometry"> 33 33 <rect> … … 243 243 <string>Aide</string> 244 244 </property> 245 <property name="autoDefault"> 246 <bool>true</bool> 247 </property> 245 248 </widget> 246 249 <widget class="QTableView" name="m_operaTableView"> … … 259 262 <x>380</x> 260 263 <y>20</y> 261 <width>8 1</width>264 <width>87</width> 262 265 <height>95</height> 263 266 </rect> … … 269 272 <string>Ajouter</string> 270 273 </property> 274 <property name="default"> 275 <bool>true</bool> 276 </property> 271 277 </widget> 272 278 </item> … … 282 288 <property name="text"> 283 289 <string>Quitter</string> 290 </property> 291 <property name="autoDefault"> 292 <bool>true</bool> 284 293 </property> 285 294 </widget> -
trunk/yao/src/interface/src/ui_/orderwindow.ui
r350 r362 92 92 <x>550</x> 93 93 <y>20</y> 94 <width>1 41</width>94 <width>151</width> 95 95 <height>62</height> 96 96 </rect> … … 102 102 <string>Supprimer le dernier</string> 103 103 </property> 104 <property name="autoDefault"> 105 <bool>true</bool> 106 </property> 104 107 </widget> 105 108 </item> … … 108 111 <property name="text"> 109 112 <string>Supprimer tout</string> 113 </property> 114 <property name="autoDefault"> 115 <bool>true</bool> 110 116 </property> 111 117 </widget> … … 128 134 <string>Ajouter</string> 129 135 </property> 136 <property name="autoDefault"> 137 <bool>true</bool> 138 </property> 130 139 </widget> 131 140 </item> … … 134 143 <property name="text"> 135 144 <string>Supprimer</string> 145 </property> 146 <property name="autoDefault"> 147 <bool>true</bool> 136 148 </property> 137 149 </widget> … … 228 240 <x>20</x> 229 241 <y>60</y> 230 <width>8 1</width>231 <height>12 1</height>242 <width>87</width> 243 <height>128</height> 232 244 </rect> 233 245 </property> … … 282 294 <x>500</x> 283 295 <y>40</y> 284 <width>1 41</width>296 <width>151</width> 285 297 <height>62</height> 286 298 </rect> … … 292 304 <string>Supprimer le dernier</string> 293 305 </property> 306 <property name="autoDefault"> 307 <bool>true</bool> 308 </property> 294 309 </widget> 295 310 </item> … … 298 313 <property name="text"> 299 314 <string>Supprimer tout</string> 315 </property> 316 <property name="autoDefault"> 317 <bool>true</bool> 300 318 </property> 301 319 </widget> … … 308 326 <x>630</x> 309 327 <y>170</y> 310 <width>8 1</width>328 <width>87</width> 311 329 <height>62</height> 312 330 </rect> … … 318 336 <string>Ajouter</string> 319 337 </property> 338 <property name="autoDefault"> 339 <bool>true</bool> 340 </property> 320 341 </widget> 321 342 </item> … … 324 345 <property name="text"> 325 346 <string>Supprimer</string> 347 </property> 348 <property name="autoDefault"> 349 <bool>true</bool> 326 350 </property> 327 351 </widget> -
trunk/yao/src/interface/src/ui_/spacewindow.ui
r359 r362 203 203 <property name="geometry"> 204 204 <rect> 205 <x> 410</x>205 <x>390</x> 206 206 <y>140</y> 207 207 <width>41</width> … … 211 211 <property name="text"> 212 212 <string>Aide</string> 213 </property> 214 <property name="autoDefault"> 215 <bool>true</bool> 213 216 </property> 214 217 </widget> … … 228 231 <x>390</x> 229 232 <y>30</y> 230 <width>8 1</width>233 <width>87</width> 231 234 <height>95</height> 232 235 </rect> … … 238 241 <string>Ajouter</string> 239 242 </property> 243 <property name="default"> 244 <bool>true</bool> 245 </property> 240 246 </widget> 241 247 </item> … … 251 257 <property name="text"> 252 258 <string>Quitter</string> 259 </property> 260 <property name="autoDefault"> 261 <bool>true</bool> 253 262 </property> 254 263 </widget> -
trunk/yao/src/interface/src/ui_/trajectorywindow.ui
r359 r362 168 168 <string>Aide</string> 169 169 </property> 170 <property name="autoDefault"> 171 <bool>true</bool> 172 </property> 170 173 </widget> 171 174 <widget class="QWidget" name="layoutWidget"> … … 184 187 <string>Ajouter</string> 185 188 </property> 189 <property name="default"> 190 <bool>true</bool> 191 </property> 186 192 </widget> 187 193 </item> … … 197 203 <property name="text"> 198 204 <string>Quitter</string> 205 </property> 206 <property name="autoDefault"> 207 <bool>true</bool> 199 208 </property> 200 209 </widget>
Note: See TracChangeset
for help on using the changeset viewer.