Browse Source

fin de journé

PCYoshi 9 years ago
parent
commit
cd529923b4

+ 105
- 151
java/.idea/workspace.xml View File

@@ -2,13 +2,9 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="">
5
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/Bouton.class" afterPath="$PROJECT_DIR$/out/production/java/Bouton.class" />
6 5
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale.class" />
7
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/rsc/burgerquizz.png" afterPath="$PROJECT_DIR$/rsc/burgerquizz.png" />
8
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/rsc/del.png" afterPath="$PROJECT_DIR$/rsc/del.png" />
9
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/rsc/edit.png" afterPath="$PROJECT_DIR$/rsc/edit.png" />
10
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/rsc/plus.png" afterPath="$PROJECT_DIR$/rsc/plus.png" />
11 6
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfacePrincipale.java" afterPath="$PROJECT_DIR$/src/InterfacePrincipale.java" />
7
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" afterPath="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
12 8
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
13 9
     </list>
14 10
     <ignored path="java.iws" />
@@ -48,8 +44,8 @@
48 44
       <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
49 45
         <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
50 46
           <provider selected="true" editor-type-id="text-editor">
51
-            <state vertical-scroll-proportion="0.74712646">
52
-              <caret line="51" column="10" selection-start-line="51" selection-start-column="10" selection-end-line="51" selection-end-column="10" />
47
+            <state vertical-scroll-proportion="0.33126935">
48
+              <caret line="82" column="90" selection-start-line="82" selection-start-column="90" selection-end-line="82" selection-end-column="90" />
53 49
               <folding>
54 50
                 <element signature="imports" expanded="true" />
55 51
               </folding>
@@ -61,11 +57,8 @@
61 57
         <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
62 58
           <provider selected="true" editor-type-id="text-editor">
63 59
             <state vertical-scroll-proportion="0.0">
64
-              <caret line="1" column="1" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="1" />
65
-              <folding>
66
-                <element signature="e#80#81#0" expanded="true" />
67
-                <element signature="e#147#148#0" expanded="true" />
68
-              </folding>
60
+              <caret line="12" column="25" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="25" />
61
+              <folding />
69 62
             </state>
70 63
           </provider>
71 64
         </entry>
@@ -74,7 +67,7 @@
74 67
         <entry file="file://$PROJECT_DIR$/src/Bouton.java">
75 68
           <provider selected="true" editor-type-id="text-editor">
76 69
             <state vertical-scroll-proportion="0.0">
77
-              <caret line="12" column="109" selection-start-line="12" selection-start-column="109" selection-end-line="12" selection-end-column="109" />
70
+              <caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
78 71
               <folding>
79 72
                 <element signature="imports" expanded="true" />
80 73
               </folding>
@@ -114,8 +107,8 @@
114 107
         <option value="$PROJECT_DIR$/src/GestionCategories.java" />
115 108
         <option value="$PROJECT_DIR$/src/GestionReponses.java" />
116 109
         <option value="$PROJECT_DIR$/src/GestionQuestions.java" />
117
-        <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
118 110
         <option value="$PROJECT_DIR$/src/Bouton.java" />
111
+        <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
119 112
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
120 113
       </list>
121 114
     </option>
@@ -213,8 +206,6 @@
213 206
       <sortByType />
214 207
     </navigator>
215 208
     <panes>
216
-      <pane id="Scope" />
217
-      <pane id="PackagesPane" />
218 209
       <pane id="ProjectPane">
219 210
         <subPane>
220 211
           <PATH>
@@ -249,7 +240,9 @@
249 240
           </PATH>
250 241
         </subPane>
251 242
       </pane>
243
+      <pane id="PackagesPane" />
252 244
       <pane id="Scratches" />
245
+      <pane id="Scope" />
253 246
     </panes>
254 247
   </component>
255 248
   <component name="PropertiesComponent">
@@ -260,128 +253,12 @@
260 253
     <property name="dynamic.classpath" value="false" />
261 254
     <property name="restartRequiresConfirmation" value="true" />
262 255
   </component>
263
-  <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
264
-    <UpdatedFiles>
265
-      <FILE-GROUP>
266
-        <option name="myUpdateName" value="Updated from server" />
267
-        <option name="myStatusName" value="Changed on server" />
268
-        <option name="mySupportsDeletion" value="false" />
269
-        <option name="myCanBeAbsent" value="false" />
270
-        <option name="myId" value="CHANGED_ON_SERVER" />
271
-        <FILE-GROUP>
272
-          <option name="myUpdateName" value="Updated" />
273
-          <option name="myStatusName" value="Changed" />
274
-          <option name="mySupportsDeletion" value="false" />
275
-          <option name="myCanBeAbsent" value="false" />
276
-          <option name="myId" value="UPDATED" />
277
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../sql/CTITbq.sql</PATH>
278
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../sql/ITbq.sql</PATH>
279
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/model/class.connector.php</PATH>
280
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/model/class.questset.php</PATH>
281
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/model/classes.php</PATH>
282
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/test.php</PATH>
283
-        </FILE-GROUP>
284
-        <FILE-GROUP>
285
-          <option name="myUpdateName" value="Created" />
286
-          <option name="myStatusName" value="Created" />
287
-          <option name="mySupportsDeletion" value="false" />
288
-          <option name="myCanBeAbsent" value="false" />
289
-          <option name="myId" value="CREATED" />
290
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/../web/model/class.categorie.php</PATH>
291
-        </FILE-GROUP>
292
-        <FILE-GROUP>
293
-          <option name="myUpdateName" value="Deleted" />
294
-          <option name="myStatusName" value="Deleted" />
295
-          <option name="mySupportsDeletion" value="false" />
296
-          <option name="myCanBeAbsent" value="true" />
297
-          <option name="myId" value="REMOVED_FROM_REPOSITORY" />
298
-        </FILE-GROUP>
299
-        <FILE-GROUP>
300
-          <option name="myUpdateName" value="Restored" />
301
-          <option name="myStatusName" value="Will be restored" />
302
-          <option name="mySupportsDeletion" value="false" />
303
-          <option name="myCanBeAbsent" value="false" />
304
-          <option name="myId" value="RESTORED" />
305
-        </FILE-GROUP>
306
-      </FILE-GROUP>
307
-      <FILE-GROUP>
308
-        <option name="myUpdateName" value="Modified" />
309
-        <option name="myStatusName" value="Modified" />
310
-        <option name="mySupportsDeletion" value="false" />
311
-        <option name="myCanBeAbsent" value="false" />
312
-        <option name="myId" value="MODIFIED" />
313
-      </FILE-GROUP>
314
-      <FILE-GROUP>
315
-        <option name="myUpdateName" value="Skipped" />
316
-        <option name="myStatusName" value="Skipped" />
317
-        <option name="mySupportsDeletion" value="false" />
318
-        <option name="myCanBeAbsent" value="false" />
319
-        <option name="myId" value="SKIPPED" />
320
-      </FILE-GROUP>
321
-      <FILE-GROUP>
322
-        <option name="myUpdateName" value="Merged with conflicts" />
323
-        <option name="myStatusName" value="Will be merged with conflicts" />
324
-        <option name="mySupportsDeletion" value="false" />
325
-        <option name="myCanBeAbsent" value="false" />
326
-        <option name="myId" value="MERGED_WITH_CONFLICTS" />
327
-      </FILE-GROUP>
328
-      <FILE-GROUP>
329
-        <option name="myUpdateName" value="Merged with tree conflicts" />
330
-        <option name="myStatusName" value="Merged with tree conflicts" />
331
-        <option name="mySupportsDeletion" value="false" />
332
-        <option name="myCanBeAbsent" value="false" />
333
-        <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
334
-      </FILE-GROUP>
335
-      <FILE-GROUP>
336
-        <option name="myUpdateName" value="Merged with property conflicts" />
337
-        <option name="myStatusName" value="Will be merged with property conflicts" />
338
-        <option name="mySupportsDeletion" value="false" />
339
-        <option name="myCanBeAbsent" value="false" />
340
-        <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
341
-      </FILE-GROUP>
342
-      <FILE-GROUP>
343
-        <option name="myUpdateName" value="Merged" />
344
-        <option name="myStatusName" value="Will be merged" />
345
-        <option name="mySupportsDeletion" value="false" />
346
-        <option name="myCanBeAbsent" value="false" />
347
-        <option name="myId" value="MERGED" />
348
-      </FILE-GROUP>
349
-      <FILE-GROUP>
350
-        <option name="myUpdateName" value="Not in repository" />
351
-        <option name="myStatusName" value="Not in repository" />
352
-        <option name="mySupportsDeletion" value="true" />
353
-        <option name="myCanBeAbsent" value="false" />
354
-        <option name="myId" value="UNKNOWN" />
355
-      </FILE-GROUP>
356
-      <FILE-GROUP>
357
-        <option name="myUpdateName" value="Locally added" />
358
-        <option name="myStatusName" value="Locally added" />
359
-        <option name="mySupportsDeletion" value="false" />
360
-        <option name="myCanBeAbsent" value="false" />
361
-        <option name="myId" value="LOCALLY_ADDED" />
362
-      </FILE-GROUP>
363
-      <FILE-GROUP>
364
-        <option name="myUpdateName" value="Locally removed" />
365
-        <option name="myStatusName" value="Locally removed" />
366
-        <option name="mySupportsDeletion" value="false" />
367
-        <option name="myCanBeAbsent" value="false" />
368
-        <option name="myId" value="LOCALLY_REMOVED" />
369
-      </FILE-GROUP>
370
-      <FILE-GROUP>
371
-        <option name="myUpdateName" value="Switched" />
372
-        <option name="myStatusName" value="Switched" />
373
-        <option name="mySupportsDeletion" value="false" />
374
-        <option name="myCanBeAbsent" value="false" />
375
-        <option name="myId" value="SWITCHED" />
376
-      </FILE-GROUP>
377
-    </UpdatedFiles>
378
-  </component>
379 256
   <component name="RunManager" selected="Application.Main">
380 257
     <configuration default="false" name="Main" type="Application" factoryName="Application" temporary="true">
381 258
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
382 259
       <option name="MAIN_CLASS_NAME" value="MainAdminBddBurgerQuizz" />
383 260
       <option name="VM_PARAMETERS" value="" />
384
-      <option name="PROGRAM_PARAMETERS" value="" />
261
+      <option name="PROGRAM_PARAMETERS" value="-lolinternet" />
385 262
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
386 263
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
387 264
       <option name="ALTERNATIVE_JRE_PATH" value="" />
@@ -564,12 +441,18 @@
564 441
       <option name="project" value="LOCAL" />
565 442
       <updated>1432635393109</updated>
566 443
     </task>
567
-    <option name="localTasksCounter" value="5" />
444
+    <task id="LOCAL-00005" summary="+mieux l'interface et easter egg ajouté">
445
+      <created>1432645307191</created>
446
+      <option name="number" value="00005" />
447
+      <option name="project" value="LOCAL" />
448
+      <updated>1432645307191</updated>
449
+    </task>
450
+    <option name="localTasksCounter" value="6" />
568 451
     <servers />
569 452
   </component>
570 453
   <component name="ToolWindowManager">
571 454
     <frame x="0" y="27" width="1366" height="711" extended-state="0" />
572
-    <editor active="false" />
455
+    <editor active="true" />
573 456
     <layout>
574 457
       <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" />
575 458
       <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" />
@@ -580,14 +463,14 @@
580 463
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3996479" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
581 464
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32922536" sideWeight="0.5030441" order="7" side_tool="true" content_ui="tabs" />
582 465
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
583
-      <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32922536" sideWeight="0.49695587" order="7" side_tool="false" content_ui="tabs" />
466
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32922536" sideWeight="0.49695587" order="7" side_tool="false" content_ui="tabs" />
584 467
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32922536" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
585 468
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
586 469
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
587 470
       <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
588 471
       <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
589 472
       <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1674277" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
590
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.37323943" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
473
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.37323943" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
591 474
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
592 475
       <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" />
593 476
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -612,7 +495,8 @@
612 495
     <MESSAGE value="creation classe de base" />
613 496
     <MESSAGE value="evolution" />
614 497
     <MESSAGE value="evolution (pikachu evolue en raichu)" />
615
-    <option name="LAST_COMMIT_MESSAGE" value="evolution (pikachu evolue en raichu)" />
498
+    <MESSAGE value="+mieux l'interface et easter egg ajouté" />
499
+    <option name="LAST_COMMIT_MESSAGE" value="+mieux l'interface et easter egg ajouté" />
616 500
   </component>
617 501
   <component name="XDebuggerManager">
618 502
     <breakpoint-manager />
@@ -647,13 +531,86 @@
647 531
       <provider selected="true" editor-type-id="text-editor">
648 532
         <state vertical-scroll-proportion="0.0">
649 533
           <caret line="1" column="1" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="1" />
534
+          <folding />
535
+        </state>
536
+      </provider>
537
+    </entry>
538
+    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
539
+      <provider selected="true" editor-type-id="text-editor">
540
+        <state vertical-scroll-proportion="0.0">
541
+          <caret line="12" column="109" selection-start-line="12" selection-start-column="109" selection-end-line="12" selection-end-column="109" />
650 542
           <folding>
651
-            <element signature="e#80#81#0" expanded="true" />
652
-            <element signature="e#147#148#0" expanded="true" />
543
+            <element signature="imports" expanded="true" />
653 544
           </folding>
654 545
         </state>
655 546
       </provider>
656 547
     </entry>
548
+    <entry file="file://$PROJECT_DIR$/mcd.png">
549
+      <provider selected="true" editor-type-id="images">
550
+        <state />
551
+      </provider>
552
+    </entry>
553
+    <entry file="file://$PROJECT_DIR$/java.png">
554
+      <provider selected="true" editor-type-id="images">
555
+        <state />
556
+      </provider>
557
+    </entry>
558
+    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
559
+      <provider selected="true" editor-type-id="text-editor">
560
+        <state vertical-scroll-proportion="0.0">
561
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
562
+          <folding>
563
+            <element signature="imports" expanded="true" />
564
+          </folding>
565
+        </state>
566
+      </provider>
567
+    </entry>
568
+    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
569
+      <provider selected="true" editor-type-id="text-editor">
570
+        <state vertical-scroll-proportion="0.0">
571
+          <caret line="1" column="1" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="1" />
572
+          <folding />
573
+        </state>
574
+      </provider>
575
+    </entry>
576
+    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
577
+      <provider selected="true" editor-type-id="text-editor">
578
+        <state vertical-scroll-proportion="0.0">
579
+          <caret line="12" column="109" selection-start-line="12" selection-start-column="109" selection-end-line="12" selection-end-column="109" />
580
+          <folding>
581
+            <element signature="imports" expanded="true" />
582
+          </folding>
583
+        </state>
584
+      </provider>
585
+    </entry>
586
+    <entry file="file://$PROJECT_DIR$/mcd.png">
587
+      <provider selected="true" editor-type-id="images">
588
+        <state />
589
+      </provider>
590
+    </entry>
591
+    <entry file="file://$PROJECT_DIR$/java.png">
592
+      <provider selected="true" editor-type-id="images">
593
+        <state />
594
+      </provider>
595
+    </entry>
596
+    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
597
+      <provider selected="true" editor-type-id="text-editor">
598
+        <state vertical-scroll-proportion="0.0">
599
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
600
+          <folding>
601
+            <element signature="imports" expanded="true" />
602
+          </folding>
603
+        </state>
604
+      </provider>
605
+    </entry>
606
+    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
607
+      <provider selected="true" editor-type-id="text-editor">
608
+        <state vertical-scroll-proportion="0.0">
609
+          <caret line="1" column="1" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="1" />
610
+          <folding />
611
+        </state>
612
+      </provider>
613
+    </entry>
657 614
     <entry file="file://$PROJECT_DIR$/src/Bouton.java">
658 615
       <provider selected="true" editor-type-id="text-editor">
659 616
         <state vertical-scroll-proportion="0.0">
@@ -801,13 +758,12 @@
801 758
         <state />
802 759
       </provider>
803 760
     </entry>
804
-    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
761
+    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
805 762
       <provider selected="true" editor-type-id="text-editor">
806 763
         <state vertical-scroll-proportion="0.0">
807
-          <caret line="1" column="1" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="1" />
764
+          <caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
808 765
           <folding>
809
-            <element signature="e#80#81#0" expanded="true" />
810
-            <element signature="e#147#148#0" expanded="true" />
766
+            <element signature="imports" expanded="true" />
811 767
           </folding>
812 768
         </state>
813 769
       </provider>
@@ -817,20 +773,18 @@
817 773
         <state />
818 774
       </provider>
819 775
     </entry>
820
-    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
776
+    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
821 777
       <provider selected="true" editor-type-id="text-editor">
822 778
         <state vertical-scroll-proportion="0.0">
823
-          <caret line="12" column="109" selection-start-line="12" selection-start-column="109" selection-end-line="12" selection-end-column="109" />
824
-          <folding>
825
-            <element signature="imports" expanded="true" />
826
-          </folding>
779
+          <caret line="12" column="25" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="25" />
780
+          <folding />
827 781
         </state>
828 782
       </provider>
829 783
     </entry>
830 784
     <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
831 785
       <provider selected="true" editor-type-id="text-editor">
832
-        <state vertical-scroll-proportion="0.74712646">
833
-          <caret line="51" column="10" selection-start-line="51" selection-start-column="10" selection-end-line="51" selection-end-column="10" />
786
+        <state vertical-scroll-proportion="0.33126935">
787
+          <caret line="82" column="90" selection-start-line="82" selection-start-column="90" selection-end-line="82" selection-end-column="90" />
834 788
           <folding>
835 789
             <element signature="imports" expanded="true" />
836 790
           </folding>

BIN
java/out/production/java/InterfacePrincipale.class View File


+ 31
- 6
java/src/InterfacePrincipale.java View File

@@ -46,13 +46,23 @@ public class InterfacePrincipale extends JFrame
46 46
 		createPanelQuestion();
47 47
 
48 48
 		getContentPane().add(new JLabel(new ImageIcon("rsc/burgerquizz.png")), BorderLayout.NORTH);
49
+		//getContentPane().add(panCategories, BorderLayout.WEST);
50
+		JSplitPane sp = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,panReponses,panQuestions);
51
+		JSplitPane sp2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,panCategories,sp);
52
+		sp.setBorder(BorderFactory.createEmptyBorder());
53
+		sp2.setBorder(BorderFactory.createEmptyBorder());
54
+		getContentPane().add(sp2, BorderLayout.CENTER);
55
+
56
+		//getContentPane().add(panCategories, BorderLayout.WEST);
57
+		//getContentPane().add(panQuestions, BorderLayout.EAST);
58
+
49 59
 		pack();
50 60
 		setLocationRelativeTo(null);
51 61
 		setVisible(true);
52 62
 		//modem56k();
53 63
 	}
54 64
 
55
-	private void modem56k()
65
+	public void modem56k()
56 66
 	{
57 67
 		int i =0;
58 68
 		while(i != 500)
@@ -68,6 +78,13 @@ public class InterfacePrincipale extends JFrame
68 78
 		}
69 79
 	}
70 80
 
81
+	public void nyan()
82
+	{
83
+		getContentPane().add(new JLabel(new ImageIcon("rsc/nyan.gif")), BorderLayout.SOUTH);
84
+		setLocationRelativeTo(null);
85
+		pack();
86
+	}
87
+
71 88
 	private void loadImgBouton()
72 89
 	{
73 90
 		plusImg = new ImageIcon("rsc/plus.png");
@@ -99,11 +116,12 @@ public class InterfacePrincipale extends JFrame
99 116
 		editC.setMaximumSize(new Dimension(208,34));
100 117
 
101 118
 		panCategories.add(addC);
119
+		panCategories.add(Box.createRigidArea(new Dimension(1,5)));
102 120
 		panCategories.add(delC);
121
+		panCategories.add(Box.createRigidArea(new Dimension(1,10)));
103 122
 		panCategories.add(sp);
123
+		panCategories.add(Box.createRigidArea(new Dimension(1,10)));
104 124
 		panCategories.add(editC);
105
-
106
-		getContentPane().add(panCategories, BorderLayout.WEST);
107 125
 	}
108 126
 
109 127
 	private void createPanelReponses()
@@ -126,17 +144,21 @@ public class InterfacePrincipale extends JFrame
126 144
 		addR.setAlignmentX(CENTER_ALIGNMENT);
127 145
 		delR.setAlignmentX(CENTER_ALIGNMENT);
128 146
 		editR.setAlignmentX(CENTER_ALIGNMENT);
147
+		//comboRepCat.(tab);
148
+		comboRepCat.setAlignmentX(CENTER_ALIGNMENT);
129 149
 		addR.setMaximumSize(new Dimension(300,34));
130 150
 		delR.setMaximumSize(new Dimension(300,34));
131 151
 		editR.setMaximumSize(new Dimension(300,34));
132 152
 
133 153
 		panReponses.add(addR);
154
+		panReponses.add(Box.createRigidArea(new Dimension(1,5)));
134 155
 		panReponses.add(delR);
156
+		panReponses.add(Box.createRigidArea(new Dimension(1, 10)));
135 157
 		panReponses.add(sp);
158
+		panReponses.add(Box.createRigidArea(new Dimension(1, 10)));
136 159
 		panReponses.add(comboRepCat);
160
+		panReponses.add(Box.createRigidArea(new Dimension(1, 5)));
137 161
 		panReponses.add(editR);
138
-
139
-		getContentPane().add(panReponses, BorderLayout.CENTER);
140 162
 	}
141 163
 
142 164
 	private void createPanelQuestion()
@@ -164,10 +186,13 @@ public class InterfacePrincipale extends JFrame
164 186
 		editQ.setMaximumSize(new Dimension(208,34));
165 187
 
166 188
 		panQuestions.add(addQ);
189
+		panQuestions.add(Box.createRigidArea(new Dimension(1,5)));
167 190
 		panQuestions.add(delQ);
191
+		panQuestions.add(Box.createRigidArea(new Dimension(1, 10)));
168 192
 		panQuestions.add(sp);
193
+		panQuestions.add(Box.createRigidArea(new Dimension(1, 10)));
169 194
 		panQuestions.add(comboQueRep);
195
+		panQuestions.add(Box.createRigidArea(new Dimension(1, 5)));
170 196
 		panQuestions.add(editQ);
171
-		getContentPane().add(panQuestions, BorderLayout.EAST);
172 197
 	}
173 198
 }

+ 9
- 0
java/src/MainAdminBddBurgerQuizz.java View File

@@ -3,5 +3,14 @@ public class MainAdminBddBurgerQuizz
3 3
 	public static void main(String args[])
4 4
 	{
5 5
 		InterfacePrincipale alain_chabat = new InterfacePrincipale();
6
+
7
+		if(args.length >=1 && args[0].equals("-56k"))
8
+		{
9
+			alain_chabat.modem56k();
10
+		}
11
+		else if(args.length >=1 && args[0].equals("-lolinternet"))
12
+		{
13
+			alain_chabat.nyan();
14
+		}
6 15
 	}
7 16
 }