François Drouhard 9 жил өмнө
parent
commit
e540910904

+ 0 - 1
Chronometre.cpp

@@ -29,7 +29,6 @@
 #include <QDebug>
 
 Chronometre::Chronometre (const QString & nom , QWidget * parent = 0) : QGroupBox (nom , parent) {
-
 	heure = 0;
 	minute = 0;
 	seconde = 0;

+ 5 - 1
MaFenetre.cpp

@@ -27,9 +27,9 @@
 #include <QPushButton>
 #include <QKeyEvent>
 #include <QApplication>
+#include <QLabel>
 
 MaFenetre::MaFenetre() : QWidget () {
-        setFixedSize (400,150);
 	marche = false;
 	chrono1 = new Chronometre("Joueur 1" , this);
 	chrono2 = new Chronometre("Joueur 2" , this);
@@ -66,12 +66,16 @@ MaFenetre::MaFenetre() : QWidget () {
 	
 	layoutBoutons = new QHBoxLayout;
 	layoutBoutons->addWidget (boutonQuitter);
+
+    ///////////////////////////// Aide /////////////////////////////////////
+    QLabel *labelAide = new QLabel ("<b>Aide</b><br />Espace : Lancer le chrono/Donner le chrono<br />Entrée : Stopper les deux chronos");
 	
 	
 	/////////////////////////////Mise en page finale ///////////////////////////
 	layoutComplet = new QVBoxLayout;
 	layoutComplet->addLayout (layoutChrono);
 	layoutComplet->addLayout (layoutBoutonSwitch);
+    layoutComplet->addWidget (labelAide);
 	layoutComplet->addLayout (layoutBoutons);
 	setLayout (layoutComplet);
 	setWindowTitle ("ChronoCheckMate");

+ 2 - 2
MaFenetre.h

@@ -52,8 +52,8 @@ class MaFenetre : public QWidget { // On h
 	Chronometre *chrono2;
 	QHBoxLayout *layoutChrono;
 	QHBoxLayout *layoutBoutons;
-	QVBoxLayout *layoutComplet;
-	QPushButton *boutonQuitter;
+    QVBoxLayout *layoutComplet;
+    QPushButton *boutonQuitter;
 	QPushButton *boutonDemarrer;
 	QPushButton *boutonSwitch;
 	QPushButton *boutonArreter;

+ 2 - 2
chronoCheckMate.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.4.1, 2015-07-19T20:30:18. -->
+<!-- Written by Qt Creator 2.4.1, 2015-07-19T22:32:19. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -52,7 +52,7 @@
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.DesktopTarget</value>
-   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
+   <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
    <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
    <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">