Przeglądaj źródła

amelioration diverse concernant la boite de dialogue des parametres

PCYoshi 9 lat temu
rodzic
commit
e612993db1

+ 77
- 199
java/.idea/workspace.xml Wyświetl plik

@@ -7,12 +7,11 @@
7 7
   </component>
8 8
   <component name="ChangeListManager">
9 9
     <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="">
10
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$1.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$1.class" />
10 11
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanQuestionsListener.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanQuestionsListener.class" />
11 12
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanReponsesListener.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale$PanReponsesListener.class" />
12 13
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ConnexionBddDialog.java" afterPath="$PROJECT_DIR$/src/ConnexionBddDialog.java" />
13 14
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfacePrincipale.java" afterPath="$PROJECT_DIR$/src/InterfacePrincipale.java" />
14
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/NouvelleQuestionDialog.java" afterPath="$PROJECT_DIR$/src/NouvelleQuestionDialog.java" />
15
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/NouvelleReponseDialog.java" afterPath="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
16 15
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
17 16
     </list>
18 17
     <ignored path="java.iws" />
@@ -38,26 +37,43 @@
38 37
       <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
39 38
         <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
40 39
           <provider selected="true" editor-type-id="text-editor">
41
-            <state vertical-scroll-proportion="0.660221">
42
-              <caret line="118" column="55" selection-start-line="118" selection-start-column="55" selection-end-line="118" selection-end-column="55" />
40
+            <state vertical-scroll-proportion="0.61049724">
41
+              <caret line="86" column="8" selection-start-line="86" selection-start-column="8" selection-end-line="86" selection-end-column="8" />
43 42
               <folding>
44
-                <element signature="imports" expanded="true" />
45
-                <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
46
-                <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
47
-                <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
48
-                <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
43
+                <element signature="e#3561#3779#0" expanded="true" />
44
+                <element signature="e#3778#3779#0" expanded="true" />
49 45
               </folding>
50 46
             </state>
51 47
           </provider>
52 48
         </entry>
53 49
       </file>
50
+      <file leaf-file-name="MainAdminBddBurgerQuizz.java" pinned="false" current-in-tab="false">
51
+        <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
52
+          <provider selected="true" editor-type-id="text-editor">
53
+            <state vertical-scroll-proportion="0.0">
54
+              <caret line="7" column="8" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
55
+              <folding />
56
+            </state>
57
+          </provider>
58
+        </entry>
59
+      </file>
54 60
       <file leaf-file-name="ConnexionBddDialog.java" pinned="false" current-in-tab="false">
55 61
         <entry file="file://$PROJECT_DIR$/src/ConnexionBddDialog.java">
56 62
           <provider selected="true" editor-type-id="text-editor">
57 63
             <state vertical-scroll-proportion="0.0">
58
-              <caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
64
+              <caret line="96" column="8" selection-start-line="96" selection-start-column="8" selection-end-line="96" selection-end-column="8" />
59 65
               <folding>
60 66
                 <element signature="imports" expanded="true" />
67
+                <element signature="e#2720#2721#0" expanded="true" />
68
+                <element signature="e#2750#2751#0" expanded="true" />
69
+                <element signature="e#2775#2776#0" expanded="true" />
70
+                <element signature="e#2810#2811#0" expanded="true" />
71
+                <element signature="e#2836#2837#0" expanded="true" />
72
+                <element signature="e#2862#2863#0" expanded="true" />
73
+                <element signature="e#2891#2892#0" expanded="true" />
74
+                <element signature="e#2920#2921#0" expanded="true" />
75
+                <element signature="e#2952#2953#0" expanded="true" />
76
+                <element signature="e#3004#3005#0" expanded="true" />
61 77
               </folding>
62 78
             </state>
63 79
           </provider>
@@ -116,11 +132,9 @@
116 132
         <option value="$PROJECT_DIR$/src/Main.java" />
117 133
         <option value="$PROJECT_DIR$/src/Interface.java" />
118 134
         <option value="$PROJECT_DIR$/src/ConnectDialog.java" />
119
-        <option value="$PROJECT_DIR$/src/Bouton.java" />
120 135
         <option value="$PROJECT_DIR$/src/Categorie.java" />
121 136
         <option value="$PROJECT_DIR$/src/Reponses.java" />
122 137
         <option value="$PROJECT_DIR$/src/GestionCategories.java" />
123
-        <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
124 138
         <option value="$PROJECT_DIR$/src/Question.java" />
125 139
         <option value="$PROJECT_DIR$/src/GestionReponses.java" />
126 140
         <option value="$PROJECT_DIR$/src/ConnexionBDD.java" />
@@ -128,6 +142,8 @@
128 142
         <option value="$PROJECT_DIR$/src/NouvelleQuestionDialog.java" />
129 143
         <option value="$PROJECT_DIR$/src/NouvelleReponseDialog.java" />
130 144
         <option value="$PROJECT_DIR$/src/ConnexionBddDialog.java" />
145
+        <option value="$PROJECT_DIR$/src/Bouton.java" />
146
+        <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
131 147
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
132 148
       </list>
133 149
     </option>
@@ -247,6 +263,8 @@
247 263
       <sortByType />
248 264
     </navigator>
249 265
     <panes>
266
+      <pane id="Scratches" />
267
+      <pane id="PackagesPane" />
250 268
       <pane id="ProjectPane">
251 269
         <subPane>
252 270
           <PATH>
@@ -282,8 +300,6 @@
282 300
         </subPane>
283 301
       </pane>
284 302
       <pane id="Scope" />
285
-      <pane id="Scratches" />
286
-      <pane id="PackagesPane" />
287 303
     </panes>
288 304
   </component>
289 305
   <component name="PropertiesComponent">
@@ -311,121 +327,6 @@
311 327
       <recent name="" />
312 328
     </key>
313 329
   </component>
314
-  <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
315
-    <UpdatedFiles>
316
-      <FILE-GROUP>
317
-        <option name="myUpdateName" value="Updated from server" />
318
-        <option name="myStatusName" value="Changed on server" />
319
-        <option name="mySupportsDeletion" value="false" />
320
-        <option name="myCanBeAbsent" value="false" />
321
-        <option name="myId" value="CHANGED_ON_SERVER" />
322
-        <FILE-GROUP>
323
-          <option name="myUpdateName" value="Updated" />
324
-          <option name="myStatusName" value="Changed" />
325
-          <option name="mySupportsDeletion" value="false" />
326
-          <option name="myCanBeAbsent" value="false" />
327
-          <option name="myId" value="UPDATED" />
328
-        </FILE-GROUP>
329
-        <FILE-GROUP>
330
-          <option name="myUpdateName" value="Created" />
331
-          <option name="myStatusName" value="Created" />
332
-          <option name="mySupportsDeletion" value="false" />
333
-          <option name="myCanBeAbsent" value="false" />
334
-          <option name="myId" value="CREATED" />
335
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/multi/README</PATH>
336
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/multi/client/index.html</PATH>
337
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/multi/client/js/game.js</PATH>
338
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/multi/server/npm-debug.log</PATH>
339
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/multi/server/package.json</PATH>
340
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/multi/server/server.js</PATH>
341
-        </FILE-GROUP>
342
-        <FILE-GROUP>
343
-          <option name="myUpdateName" value="Deleted" />
344
-          <option name="myStatusName" value="Deleted" />
345
-          <option name="mySupportsDeletion" value="false" />
346
-          <option name="myCanBeAbsent" value="true" />
347
-          <option name="myId" value="REMOVED_FROM_REPOSITORY" />
348
-        </FILE-GROUP>
349
-        <FILE-GROUP>
350
-          <option name="myUpdateName" value="Restored" />
351
-          <option name="myStatusName" value="Will be restored" />
352
-          <option name="mySupportsDeletion" value="false" />
353
-          <option name="myCanBeAbsent" value="false" />
354
-          <option name="myId" value="RESTORED" />
355
-        </FILE-GROUP>
356
-      </FILE-GROUP>
357
-      <FILE-GROUP>
358
-        <option name="myUpdateName" value="Modified" />
359
-        <option name="myStatusName" value="Modified" />
360
-        <option name="mySupportsDeletion" value="false" />
361
-        <option name="myCanBeAbsent" value="false" />
362
-        <option name="myId" value="MODIFIED" />
363
-      </FILE-GROUP>
364
-      <FILE-GROUP>
365
-        <option name="myUpdateName" value="Skipped" />
366
-        <option name="myStatusName" value="Skipped" />
367
-        <option name="mySupportsDeletion" value="false" />
368
-        <option name="myCanBeAbsent" value="false" />
369
-        <option name="myId" value="SKIPPED" />
370
-      </FILE-GROUP>
371
-      <FILE-GROUP>
372
-        <option name="myUpdateName" value="Merged with conflicts" />
373
-        <option name="myStatusName" value="Will be merged with conflicts" />
374
-        <option name="mySupportsDeletion" value="false" />
375
-        <option name="myCanBeAbsent" value="false" />
376
-        <option name="myId" value="MERGED_WITH_CONFLICTS" />
377
-      </FILE-GROUP>
378
-      <FILE-GROUP>
379
-        <option name="myUpdateName" value="Merged with tree conflicts" />
380
-        <option name="myStatusName" value="Merged with tree conflicts" />
381
-        <option name="mySupportsDeletion" value="false" />
382
-        <option name="myCanBeAbsent" value="false" />
383
-        <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
384
-      </FILE-GROUP>
385
-      <FILE-GROUP>
386
-        <option name="myUpdateName" value="Merged with property conflicts" />
387
-        <option name="myStatusName" value="Will be merged with property conflicts" />
388
-        <option name="mySupportsDeletion" value="false" />
389
-        <option name="myCanBeAbsent" value="false" />
390
-        <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
391
-      </FILE-GROUP>
392
-      <FILE-GROUP>
393
-        <option name="myUpdateName" value="Merged" />
394
-        <option name="myStatusName" value="Will be merged" />
395
-        <option name="mySupportsDeletion" value="false" />
396
-        <option name="myCanBeAbsent" value="false" />
397
-        <option name="myId" value="MERGED" />
398
-      </FILE-GROUP>
399
-      <FILE-GROUP>
400
-        <option name="myUpdateName" value="Not in repository" />
401
-        <option name="myStatusName" value="Not in repository" />
402
-        <option name="mySupportsDeletion" value="true" />
403
-        <option name="myCanBeAbsent" value="false" />
404
-        <option name="myId" value="UNKNOWN" />
405
-      </FILE-GROUP>
406
-      <FILE-GROUP>
407
-        <option name="myUpdateName" value="Locally added" />
408
-        <option name="myStatusName" value="Locally added" />
409
-        <option name="mySupportsDeletion" value="false" />
410
-        <option name="myCanBeAbsent" value="false" />
411
-        <option name="myId" value="LOCALLY_ADDED" />
412
-      </FILE-GROUP>
413
-      <FILE-GROUP>
414
-        <option name="myUpdateName" value="Locally removed" />
415
-        <option name="myStatusName" value="Locally removed" />
416
-        <option name="mySupportsDeletion" value="false" />
417
-        <option name="myCanBeAbsent" value="false" />
418
-        <option name="myId" value="LOCALLY_REMOVED" />
419
-      </FILE-GROUP>
420
-      <FILE-GROUP>
421
-        <option name="myUpdateName" value="Switched" />
422
-        <option name="myStatusName" value="Switched" />
423
-        <option name="mySupportsDeletion" value="false" />
424
-        <option name="myCanBeAbsent" value="false" />
425
-        <option name="myId" value="SWITCHED" />
426
-      </FILE-GROUP>
427
-    </UpdatedFiles>
428
-  </component>
429 330
   <component name="RunManager" selected="Application.Main">
430 331
     <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
431 332
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
@@ -737,7 +638,7 @@
737 638
   </component>
738 639
   <component name="ToolWindowManager">
739 640
     <frame x="-1" y="27" width="1368" height="712" extended-state="6" />
740
-    <editor active="false" />
641
+    <editor active="true" />
741 642
     <layout>
742 643
       <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
743 644
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
@@ -760,8 +661,8 @@
760 661
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
761 662
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32864675" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
762 663
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
763
-      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
764 664
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
665
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
765 666
     </layout>
766 667
   </component>
767 668
   <component name="Vcs.Log.UiProperties">
@@ -838,11 +739,8 @@
838 739
         <state vertical-scroll-proportion="0.0">
839 740
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
840 741
           <folding>
841
-            <element signature="imports" expanded="true" />
842
-            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
843
-            <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
844
-            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
845
-            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
742
+            <element signature="e#3561#3779#0" expanded="true" />
743
+            <element signature="e#3778#3779#0" expanded="true" />
846 744
           </folding>
847 745
         </state>
848 746
       </provider>
@@ -876,11 +774,8 @@
876 774
         <state vertical-scroll-proportion="0.0">
877 775
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
878 776
           <folding>
879
-            <element signature="imports" expanded="true" />
880
-            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
881
-            <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
882
-            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
883
-            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
777
+            <element signature="e#3561#3779#0" expanded="true" />
778
+            <element signature="e#3778#3779#0" expanded="true" />
884 779
           </folding>
885 780
         </state>
886 781
       </provider>
@@ -914,11 +809,8 @@
914 809
         <state vertical-scroll-proportion="0.0">
915 810
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
916 811
           <folding>
917
-            <element signature="imports" expanded="true" />
918
-            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
919
-            <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
920
-            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
921
-            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
812
+            <element signature="e#3561#3779#0" expanded="true" />
813
+            <element signature="e#3778#3779#0" expanded="true" />
922 814
           </folding>
923 815
         </state>
924 816
       </provider>
@@ -952,11 +844,8 @@
952 844
         <state vertical-scroll-proportion="0.0">
953 845
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
954 846
           <folding>
955
-            <element signature="imports" expanded="true" />
956
-            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
957
-            <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
958
-            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
959
-            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
847
+            <element signature="e#3561#3779#0" expanded="true" />
848
+            <element signature="e#3778#3779#0" expanded="true" />
960 849
           </folding>
961 850
         </state>
962 851
       </provider>
@@ -990,11 +879,8 @@
990 879
         <state vertical-scroll-proportion="0.0">
991 880
           <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
992 881
           <folding>
993
-            <element signature="imports" expanded="true" />
994
-            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
995
-            <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
996
-            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
997
-            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
882
+            <element signature="e#3561#3779#0" expanded="true" />
883
+            <element signature="e#3778#3779#0" expanded="true" />
998 884
           </folding>
999 885
         </state>
1000 886
       </provider>
@@ -1049,11 +935,8 @@
1049 935
         <state vertical-scroll-proportion="0.0">
1050 936
           <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
1051 937
           <folding>
1052
-            <element signature="imports" expanded="true" />
1053
-            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1054
-            <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1055
-            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1056
-            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
938
+            <element signature="e#3561#3779#0" expanded="true" />
939
+            <element signature="e#3778#3779#0" expanded="true" />
1057 940
           </folding>
1058 941
         </state>
1059 942
       </provider>
@@ -1084,13 +967,6 @@
1084 967
         <state />
1085 968
       </provider>
1086 969
     </entry>
1087
-    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
1088
-      <provider selected="true" editor-type-id="text-editor">
1089
-        <state vertical-scroll-proportion="0.5719626">
1090
-          <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
1091
-        </state>
1092
-      </provider>
1093
-    </entry>
1094 970
     <entry file="file://$PROJECT_DIR$/src/Categorie.java">
1095 971
       <provider selected="true" editor-type-id="text-editor">
1096 972
         <state vertical-scroll-proportion="0.0">
@@ -1098,23 +974,10 @@
1098 974
         </state>
1099 975
       </provider>
1100 976
     </entry>
1101
-    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
1102
-      <provider selected="true" editor-type-id="text-editor">
1103
-        <state vertical-scroll-proportion="0.51657456">
1104
-          <caret line="11" column="44" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="44" />
1105
-          <folding />
1106
-        </state>
1107
-      </provider>
1108
-    </entry>
1109 977
     <entry file="file://$PROJECT_DIR$/src/GestionCategories.java">
1110 978
       <provider selected="true" editor-type-id="text-editor">
1111 979
         <state vertical-scroll-proportion="2.4738805">
1112 980
           <caret line="93" column="38" selection-start-line="93" selection-start-column="38" selection-end-line="93" selection-end-column="38" />
1113
-          <folding>
1114
-            <element signature="imports" expanded="false" />
1115
-            <element signature="e#2160#2161#0" expanded="false" />
1116
-            <element signature="e#2188#2189#0" expanded="false" />
1117
-          </folding>
1118 981
         </state>
1119 982
       </provider>
1120 983
     </entry>
@@ -1142,11 +1005,6 @@
1142 1005
       <provider selected="true" editor-type-id="text-editor">
1143 1006
         <state vertical-scroll-proportion="0.0">
1144 1007
           <caret line="84" column="28" selection-start-line="84" selection-start-column="28" selection-end-line="84" selection-end-column="28" />
1145
-          <folding>
1146
-            <element signature="imports" expanded="false" />
1147
-            <element signature="e#2627#2628#0" expanded="false" />
1148
-            <element signature="e#2653#2654#0" expanded="false" />
1149
-          </folding>
1150 1008
         </state>
1151 1009
       </provider>
1152 1010
     </entry>
@@ -1154,11 +1012,6 @@
1154 1012
       <provider selected="true" editor-type-id="text-editor">
1155 1013
         <state vertical-scroll-proportion="0.0">
1156 1014
           <caret line="89" column="36" selection-start-line="89" selection-start-column="36" selection-end-line="89" selection-end-column="36" />
1157
-          <folding>
1158
-            <element signature="imports" expanded="false" />
1159
-            <element signature="e#2985#2986#0" expanded="false" />
1160
-            <element signature="e#3013#3014#0" expanded="false" />
1161
-          </folding>
1162 1015
         </state>
1163 1016
       </provider>
1164 1017
     </entry>
@@ -1197,23 +1050,48 @@
1197 1050
     <entry file="file://$PROJECT_DIR$/src/ConnexionBddDialog.java">
1198 1051
       <provider selected="true" editor-type-id="text-editor">
1199 1052
         <state vertical-scroll-proportion="0.0">
1200
-          <caret line="38" column="0" selection-start-line="38" selection-start-column="0" selection-end-line="38" selection-end-column="0" />
1053
+          <caret line="96" column="8" selection-start-line="96" selection-start-column="8" selection-end-line="96" selection-end-column="8" />
1201 1054
           <folding>
1202 1055
             <element signature="imports" expanded="true" />
1056
+            <element signature="e#2720#2721#0" expanded="true" />
1057
+            <element signature="e#2750#2751#0" expanded="true" />
1058
+            <element signature="e#2775#2776#0" expanded="true" />
1059
+            <element signature="e#2810#2811#0" expanded="true" />
1060
+            <element signature="e#2836#2837#0" expanded="true" />
1061
+            <element signature="e#2862#2863#0" expanded="true" />
1062
+            <element signature="e#2891#2892#0" expanded="true" />
1063
+            <element signature="e#2920#2921#0" expanded="true" />
1064
+            <element signature="e#2952#2953#0" expanded="true" />
1065
+            <element signature="e#3004#3005#0" expanded="true" />
1203 1066
           </folding>
1204 1067
         </state>
1205 1068
       </provider>
1206 1069
     </entry>
1207
-    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
1070
+    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
1208 1071
       <provider selected="true" editor-type-id="text-editor">
1209
-        <state vertical-scroll-proportion="0.660221">
1210
-          <caret line="118" column="55" selection-start-line="118" selection-start-column="55" selection-end-line="118" selection-end-column="55" />
1072
+        <state vertical-scroll-proportion="0.0">
1073
+          <caret line="7" column="8" selection-start-line="7" selection-start-column="8" selection-end-line="7" selection-end-column="8" />
1074
+          <folding />
1075
+        </state>
1076
+      </provider>
1077
+    </entry>
1078
+    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
1079
+      <provider selected="true" editor-type-id="text-editor">
1080
+        <state vertical-scroll-proportion="0.20165746">
1081
+          <caret line="6" column="40" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" />
1211 1082
           <folding>
1212 1083
             <element signature="imports" expanded="true" />
1213
-            <element signature="method#loadImgBouton#0;class#InterfacePrincipale#0" expanded="false" />
1214
-            <element signature="method#createPanelCategories#0;class#InterfacePrincipale#0" expanded="false" />
1215
-            <element signature="method#modem56k#0;class#InterfacePrincipale#0" expanded="false" />
1216
-            <element signature="method#nyan#0;class#InterfacePrincipale#0" expanded="false" />
1084
+          </folding>
1085
+        </state>
1086
+      </provider>
1087
+    </entry>
1088
+    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
1089
+      <provider selected="true" editor-type-id="text-editor">
1090
+        <state vertical-scroll-proportion="0.61049724">
1091
+          <caret line="86" column="8" selection-start-line="86" selection-start-column="8" selection-end-line="86" selection-end-column="8" />
1092
+          <folding>
1093
+            <element signature="e#3561#3779#0" expanded="true" />
1094
+            <element signature="e#3778#3779#0" expanded="true" />
1217 1095
           </folding>
1218 1096
         </state>
1219 1097
       </provider>

BIN
java/out/production/java/InterfacePrincipale$1.class Wyświetl plik


BIN
java/out/production/java/InterfacePrincipale$PanQuestionsListener.class Wyświetl plik


BIN
java/out/production/java/InterfacePrincipale$PanReponsesListener.class Wyświetl plik


+ 34
- 3
java/src/ConnexionBddDialog.java Wyświetl plik

@@ -80,9 +80,40 @@ public class ConnexionBddDialog extends JDialog implements ActionListener
80 80
 		return modifEffectuees;
81 81
 	}
82 82
 
83
-	public void actionPerformed(ActionEvent actionEvent)
83
+	public void actionPerformed(ActionEvent e)
84 84
 	{
85
-		modifEffectuees = false;
86
-		setVisible(false);
85
+		if(e.getSource() == defParams)
86
+		{
87
+			nomBdd.setText("burgerquizz");
88
+			port.setValue(3306);
89
+			ip.setText("localhost");
90
+			login.setText("alain");
91
+			password.setText("chabat");
92
+		}
93
+		else
94
+		{
95
+			modifEffectuees = false;
96
+			setVisible(false);
97
+		}
98
+	}
99
+
100
+	public String getNomBdd() {
101
+		return nomBdd.getText();
102
+	}
103
+
104
+	public int getPort() {
105
+		return (int) port.getValue();
106
+	}
107
+
108
+	public String getIp() {
109
+		return ip.getText();
110
+	}
111
+
112
+	public String getLogin() {
113
+		return login.getText();
114
+	}
115
+
116
+	public String getPassword() {
117
+		return String.valueOf(password.getPassword());
87 118
 	}
88 119
 }

+ 14
- 7
java/src/InterfacePrincipale.java Wyświetl plik

@@ -50,8 +50,6 @@ public class InterfacePrincipale extends JFrame
50 50
 
51 51
 	public InterfacePrincipale()
52 52
 	{
53
-		ConnexionBddDialog cbddd = new ConnexionBddDialog("efr",85,"42:42:42:42","eflgr","fmr,grgerge", null);
54
-		cbddd.afficher();
55 53
 		bdd = new ConnexionBDD("burgerquizz", 3306, "localhost", "alain", "chabat");
56 54
 
57 55
 		setTitle("Administration base de données de l'aplication BurgerQuizz");
@@ -105,21 +103,30 @@ public class InterfacePrincipale extends JFrame
105 103
 
106 104
 	private void createStatusBar()
107 105
 	{
108
-		statusBar = new JPanel(new BorderLayout());
106
+		statusBar = new JPanel(new BorderLayout(0,0));
109 107
 		statusText = new JLabel("Application demarrée, connexion à la base de donné effective. ");
110 108
 
111 109
 		Border border = BorderFactory.createMatteBorder(3,0,0,0, new Color(220,220,220));
112 110
 		statusBar.setBorder(BorderFactory.createCompoundBorder(BorderFactory.createEmptyBorder(10,70,5,70),border));
113 111
 
112
+		statusText.setHorizontalAlignment(SwingConstants.CENTER);
113
+
114 114
 		config = new Bouton("Configuration", setupImg);
115
-		config.setPreferredSize(new Dimension(250, 34));
115
+		config.setPreferredSize(new Dimension(200, 34));
116 116
 		JPanel p = new JPanel();
117
-		p.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
117
+		p.setLayout(new BorderLayout());
118
+		p.add(config, BorderLayout.CENTER);
119
+		p.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
118 120
 
119 121
 		statusBar.add(statusText, BorderLayout.CENTER);
120
-		p.add(config, BorderLayout.EAST);
121 122
 		statusBar.add(p, BorderLayout.EAST);
122
-		//statusBar.add(config, BorderLayout.EAST);
123
+
124
+		config.addActionListener(new ActionListener() {
125
+			public void actionPerformed(ActionEvent actionEvent) {
126
+				ConnexionBddDialog cbddd = new ConnexionBddDialog("efr",85,"42:42:42:42","eflgr","fmr,grgerge", null);
127
+				cbddd.afficher();
128
+			}
129
+		});
123 130
 	}
124 131
 
125 132
 	private void createPanelCategories()