Browse Source

nyan cat operationel + look n felle susteme ajouté + chgm couleur

PCYoshi 10 years ago
parent
commit
89783b186e

+ 86
- 26
java/.idea/workspace.xml View File

1
 <?xml version="1.0" encoding="UTF-8"?>
1
 <?xml version="1.0" encoding="UTF-8"?>
2
 <project version="4">
2
 <project version="4">
3
   <component name="ChangeListManager">
3
   <component name="ChangeListManager">
4
-    <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="">
4
+    <list default="true" id="a647cb6a-4230-4101-a652-d7cfd0c21e24" name="Default" comment="nyan cat operationel + look n felle susteme ajouté + chgm couleur">
5
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/Bouton.class" afterPath="$PROJECT_DIR$/out/production/java/Bouton.class" />
5
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/out/production/java/InterfacePrincipale.class" afterPath="$PROJECT_DIR$/out/production/java/InterfacePrincipale.class" />
6
       <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$/out/production/java/MainAdminBddBurgerQuizz.class" afterPath="$PROJECT_DIR$/out/production/java/MainAdminBddBurgerQuizz.class" />
8
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Bouton.java" afterPath="$PROJECT_DIR$/src/Bouton.java" />
6
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/InterfacePrincipale.java" afterPath="$PROJECT_DIR$/src/InterfacePrincipale.java" />
9
       <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" />
10
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" afterPath="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
8
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
11
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
44
       <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
47
       <file leaf-file-name="InterfacePrincipale.java" pinned="false" current-in-tab="true">
45
         <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
48
         <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
46
           <provider selected="true" editor-type-id="text-editor">
49
           <provider selected="true" editor-type-id="text-editor">
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" />
50
+            <state vertical-scroll-proportion="0.33333334">
51
+              <caret line="83" column="4" selection-start-line="83" selection-start-column="4" selection-end-line="83" selection-end-column="4" />
49
               <folding>
52
               <folding>
50
                 <element signature="imports" expanded="true" />
53
                 <element signature="imports" expanded="true" />
51
               </folding>
54
               </folding>
57
         <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
60
         <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
58
           <provider selected="true" editor-type-id="text-editor">
61
           <provider selected="true" editor-type-id="text-editor">
59
             <state vertical-scroll-proportion="0.0">
62
             <state vertical-scroll-proportion="0.0">
60
-              <caret line="12" column="25" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="25" />
63
+              <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
61
               <folding />
64
               <folding />
62
             </state>
65
             </state>
63
           </provider>
66
           </provider>
67
         <entry file="file://$PROJECT_DIR$/src/Bouton.java">
70
         <entry file="file://$PROJECT_DIR$/src/Bouton.java">
68
           <provider selected="true" editor-type-id="text-editor">
71
           <provider selected="true" editor-type-id="text-editor">
69
             <state vertical-scroll-proportion="0.0">
72
             <state vertical-scroll-proportion="0.0">
70
-              <caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
73
+              <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
71
               <folding>
74
               <folding>
72
                 <element signature="imports" expanded="true" />
75
                 <element signature="imports" expanded="true" />
73
               </folding>
76
               </folding>
107
         <option value="$PROJECT_DIR$/src/GestionCategories.java" />
110
         <option value="$PROJECT_DIR$/src/GestionCategories.java" />
108
         <option value="$PROJECT_DIR$/src/GestionReponses.java" />
111
         <option value="$PROJECT_DIR$/src/GestionReponses.java" />
109
         <option value="$PROJECT_DIR$/src/GestionQuestions.java" />
112
         <option value="$PROJECT_DIR$/src/GestionQuestions.java" />
110
-        <option value="$PROJECT_DIR$/src/Bouton.java" />
111
         <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
113
         <option value="$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java" />
114
+        <option value="$PROJECT_DIR$/src/Bouton.java" />
112
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
115
         <option value="$PROJECT_DIR$/src/InterfacePrincipale.java" />
113
       </list>
116
       </list>
114
     </option>
117
     </option>
206
       <sortByType />
209
       <sortByType />
207
     </navigator>
210
     </navigator>
208
     <panes>
211
     <panes>
212
+      <pane id="PackagesPane" />
209
       <pane id="ProjectPane">
213
       <pane id="ProjectPane">
210
         <subPane>
214
         <subPane>
211
           <PATH>
215
           <PATH>
240
           </PATH>
244
           </PATH>
241
         </subPane>
245
         </subPane>
242
       </pane>
246
       </pane>
243
-      <pane id="PackagesPane" />
244
-      <pane id="Scratches" />
245
       <pane id="Scope" />
247
       <pane id="Scope" />
248
+      <pane id="Scratches" />
246
     </panes>
249
     </panes>
247
   </component>
250
   </component>
248
   <component name="PropertiesComponent">
251
   <component name="PropertiesComponent">
258
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
261
       <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
259
       <option name="MAIN_CLASS_NAME" value="MainAdminBddBurgerQuizz" />
262
       <option name="MAIN_CLASS_NAME" value="MainAdminBddBurgerQuizz" />
260
       <option name="VM_PARAMETERS" value="" />
263
       <option name="VM_PARAMETERS" value="" />
261
-      <option name="PROGRAM_PARAMETERS" value="-lolinternet" />
264
+      <option name="PROGRAM_PARAMETERS" value="" />
262
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
265
       <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" />
263
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
266
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
264
       <option name="ALTERNATIVE_JRE_PATH" value="" />
267
       <option name="ALTERNATIVE_JRE_PATH" value="" />
447
       <option name="project" value="LOCAL" />
450
       <option name="project" value="LOCAL" />
448
       <updated>1432645307191</updated>
451
       <updated>1432645307191</updated>
449
     </task>
452
     </task>
450
-    <option name="localTasksCounter" value="6" />
453
+    <task id="LOCAL-00006" summary="fin de journé">
454
+      <created>1432654182880</created>
455
+      <option name="number" value="00006" />
456
+      <option name="project" value="LOCAL" />
457
+      <updated>1432654182881</updated>
458
+    </task>
459
+    <option name="localTasksCounter" value="7" />
451
     <servers />
460
     <servers />
452
   </component>
461
   </component>
462
+  <component name="TodoView">
463
+    <todo-panel id="selected-file">
464
+      <is-autoscroll-to-source value="true" />
465
+    </todo-panel>
466
+    <todo-panel id="all">
467
+      <are-packages-shown value="true" />
468
+      <is-autoscroll-to-source value="true" />
469
+    </todo-panel>
470
+  </component>
453
   <component name="ToolWindowManager">
471
   <component name="ToolWindowManager">
454
     <frame x="0" y="27" width="1366" height="711" extended-state="0" />
472
     <frame x="0" y="27" width="1366" height="711" extended-state="0" />
455
     <editor active="true" />
473
     <editor active="true" />
459
       <window_info id="Designer" 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" />
477
       <window_info id="Designer" 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" />
460
       <window_info id="Palette" 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" />
478
       <window_info id="Palette" 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" />
461
       <window_info id="Terminal" 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" />
479
       <window_info id="Terminal" 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" />
480
+      <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" />
462
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
481
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
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" />
482
       <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" />
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" />
483
       <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" />
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" />
484
       <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" />
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" />
485
       <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" />
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" />
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" />
486
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32922536" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
487
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32922536" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
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" />
488
       <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" />
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" />
489
       <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" />
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" />
490
       <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" />
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" />
491
       <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" />
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" />
492
+      <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" />
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" />
493
       <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" />
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" />
494
       <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" />
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" />
477
       <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" />
495
       <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" />
478
-      <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="5" side_tool="false" content_ui="tabs" />
479
       <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" />
496
       <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" />
497
+      <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="5" side_tool="false" content_ui="tabs" />
480
     </layout>
498
     </layout>
481
   </component>
499
   </component>
482
   <component name="Vcs.Log.UiProperties">
500
   <component name="Vcs.Log.UiProperties">
496
     <MESSAGE value="evolution" />
514
     <MESSAGE value="evolution" />
497
     <MESSAGE value="evolution (pikachu evolue en raichu)" />
515
     <MESSAGE value="evolution (pikachu evolue en raichu)" />
498
     <MESSAGE value="+mieux l'interface et easter egg ajouté" />
516
     <MESSAGE value="+mieux l'interface et easter egg ajouté" />
499
-    <option name="LAST_COMMIT_MESSAGE" value="+mieux l'interface et easter egg ajouté" />
517
+    <MESSAGE value="fin de journé" />
518
+    <MESSAGE value="nyan cat operationel + look n felle susteme ajouté + chgm couleur" />
519
+    <option name="LAST_COMMIT_MESSAGE" value="nyan cat operationel + look n felle susteme ajouté + chgm couleur" />
500
   </component>
520
   </component>
501
   <component name="XDebuggerManager">
521
   <component name="XDebuggerManager">
502
-    <breakpoint-manager />
522
+    <breakpoint-manager>
523
+      <option name="time" value="3" />
524
+    </breakpoint-manager>
503
     <watches-manager />
525
     <watches-manager />
504
   </component>
526
   </component>
505
   <component name="antWorkspaceConfiguration">
527
   <component name="antWorkspaceConfiguration">
530
     <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
552
     <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
531
       <provider selected="true" editor-type-id="text-editor">
553
       <provider selected="true" editor-type-id="text-editor">
532
         <state vertical-scroll-proportion="0.0">
554
         <state vertical-scroll-proportion="0.0">
555
+          <caret line="12" column="25" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="25" />
556
+          <folding />
557
+        </state>
558
+      </provider>
559
+    </entry>
560
+    <entry file="file://$PROJECT_DIR$/src/Bouton.java">
561
+      <provider selected="true" editor-type-id="text-editor">
562
+        <state vertical-scroll-proportion="0.0">
563
+          <caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
564
+          <folding>
565
+            <element signature="imports" expanded="true" />
566
+          </folding>
567
+        </state>
568
+      </provider>
569
+    </entry>
570
+    <entry file="file://$PROJECT_DIR$/mcd.png">
571
+      <provider selected="true" editor-type-id="images">
572
+        <state />
573
+      </provider>
574
+    </entry>
575
+    <entry file="file://$PROJECT_DIR$/java.png">
576
+      <provider selected="true" editor-type-id="images">
577
+        <state />
578
+      </provider>
579
+    </entry>
580
+    <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
581
+      <provider selected="true" editor-type-id="text-editor">
582
+        <state vertical-scroll-proportion="0.0">
583
+          <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
584
+          <folding>
585
+            <element signature="imports" expanded="true" />
586
+          </folding>
587
+        </state>
588
+      </provider>
589
+    </entry>
590
+    <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
591
+      <provider selected="true" editor-type-id="text-editor">
592
+        <state vertical-scroll-proportion="0.0">
533
           <caret line="1" column="1" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="1" />
593
           <caret line="1" column="1" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="1" />
534
           <folding />
594
           <folding />
535
         </state>
595
         </state>
758
         <state />
818
         <state />
759
       </provider>
819
       </provider>
760
     </entry>
820
     </entry>
821
+    <entry file="file://$PROJECT_DIR$/java.png">
822
+      <provider selected="true" editor-type-id="images">
823
+        <state />
824
+      </provider>
825
+    </entry>
761
     <entry file="file://$PROJECT_DIR$/src/Bouton.java">
826
     <entry file="file://$PROJECT_DIR$/src/Bouton.java">
762
       <provider selected="true" editor-type-id="text-editor">
827
       <provider selected="true" editor-type-id="text-editor">
763
         <state vertical-scroll-proportion="0.0">
828
         <state vertical-scroll-proportion="0.0">
764
-          <caret line="7" column="5" selection-start-line="7" selection-start-column="5" selection-end-line="7" selection-end-column="5" />
829
+          <caret line="13" column="10" selection-start-line="13" selection-start-column="10" selection-end-line="13" selection-end-column="10" />
765
           <folding>
830
           <folding>
766
             <element signature="imports" expanded="true" />
831
             <element signature="imports" expanded="true" />
767
           </folding>
832
           </folding>
768
         </state>
833
         </state>
769
       </provider>
834
       </provider>
770
     </entry>
835
     </entry>
771
-    <entry file="file://$PROJECT_DIR$/java.png">
772
-      <provider selected="true" editor-type-id="images">
773
-        <state />
774
-      </provider>
775
-    </entry>
776
     <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
836
     <entry file="file://$PROJECT_DIR$/src/MainAdminBddBurgerQuizz.java">
777
       <provider selected="true" editor-type-id="text-editor">
837
       <provider selected="true" editor-type-id="text-editor">
778
         <state vertical-scroll-proportion="0.0">
838
         <state vertical-scroll-proportion="0.0">
779
-          <caret line="12" column="25" selection-start-line="12" selection-start-column="12" selection-end-line="12" selection-end-column="25" />
839
+          <caret line="14" column="4" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
780
           <folding />
840
           <folding />
781
         </state>
841
         </state>
782
       </provider>
842
       </provider>
783
     </entry>
843
     </entry>
784
     <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
844
     <entry file="file://$PROJECT_DIR$/src/InterfacePrincipale.java">
785
       <provider selected="true" editor-type-id="text-editor">
845
       <provider selected="true" editor-type-id="text-editor">
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" />
846
+        <state vertical-scroll-proportion="0.33333334">
847
+          <caret line="83" column="4" selection-start-line="83" selection-start-column="4" selection-end-line="83" selection-end-column="4" />
788
           <folding>
848
           <folding>
789
             <element signature="imports" expanded="true" />
849
             <element signature="imports" expanded="true" />
790
           </folding>
850
           </folding>

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


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


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


+ 3
- 3
java/src/Bouton.java View File

7
 	public Bouton(String text, Icon icon)
7
 	public Bouton(String text, Icon icon)
8
 	{
8
 	{
9
 		super(text, icon);
9
 		super(text, icon);
10
-		setBackground(Color.WHITE);
10
+		//setBackground(Color.WHITE);
11
 		setFocusPainted(false);
11
 		setFocusPainted(false);
12
-		Border border = BorderFactory.createLineBorder(Color.BLACK, 2);
12
+		//Border border = BorderFactory.createLineBorder(Color.BLACK, 2);
13
 		//http://stackoverflow.com/questions/10274750/java-swing-setting-margins-on-textarea-with-line-border
13
 		//http://stackoverflow.com/questions/10274750/java-swing-setting-margins-on-textarea-with-line-border
14
-		setBorder(BorderFactory.createCompoundBorder(border, BorderFactory.createEmptyBorder(5, 5, 5, 5)));
14
+		//setBorder(BorderFactory.createCompoundBorder(border, BorderFactory.createEmptyBorder(5, 5, 5, 5)));
15
 		setIconTextGap(10);
15
 		setIconTextGap(10);
16
 	}
16
 	}
17
 }
17
 }

+ 25
- 11
java/src/InterfacePrincipale.java View File

46
 		createPanelQuestion();
46
 		createPanelQuestion();
47
 
47
 
48
 		getContentPane().add(new JLabel(new ImageIcon("rsc/burgerquizz.png")), BorderLayout.NORTH);
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
 
49
 
56
-		//getContentPane().add(panCategories, BorderLayout.WEST);
57
-		//getContentPane().add(panQuestions, BorderLayout.EAST);
50
+		JSplitPane sp1 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,panReponses,panQuestions);
51
+		JSplitPane sp2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT,panCategories,sp1);
52
+		sp1.setBorder(BorderFactory.createEmptyBorder());
53
+		sp2.setBorder(BorderFactory.createLineBorder(new Color(238,238,238),5));
54
+
55
+		JPanel conteneur = new JPanel();
56
+		conteneur.setLayout(new BorderLayout());
57
+		conteneur.setBorder(BorderFactory.createEmptyBorder(0,5,5,5));
58
+		conteneur.add(sp2, BorderLayout.CENTER);
59
+
60
+		Color bg = new Color(220,220,220);
61
+		//getContentPane().setBackground(bg);
62
+		panQuestions.setBackground(bg);
63
+		panReponses.setBackground(bg);
64
+		panCategories.setBackground(bg);
65
+		//conteneur.setBackground(bg);
66
+
67
+		getContentPane().add(conteneur, BorderLayout.CENTER);
58
 
68
 
59
 		pack();
69
 		pack();
60
 		setLocationRelativeTo(null);
70
 		setLocationRelativeTo(null);
61
 		setVisible(true);
71
 		setVisible(true);
62
-		//modem56k();
63
 	}
72
 	}
64
 
73
 
65
 	public void modem56k()
74
 	public void modem56k()
80
 
89
 
81
 	public void nyan()
90
 	public void nyan()
82
 	{
91
 	{
83
-		getContentPane().add(new JLabel(new ImageIcon("rsc/nyan.gif")), BorderLayout.SOUTH);
92
+		BorderLayout bl = (BorderLayout)getContentPane().getLayout();
93
+		JLabel l = (JLabel)bl.getLayoutComponent(BorderLayout.NORTH);
94
+		l.setIcon(new ImageIcon("rsc/nyan.gif"));
95
+		//getContentPane().add(new JLabel(new ImageIcon("rsc/nyan.gif")), BorderLayout.SOUTH);
84
 		setLocationRelativeTo(null);
96
 		setLocationRelativeTo(null);
85
 		pack();
97
 		pack();
86
 	}
98
 	}
144
 		addR.setAlignmentX(CENTER_ALIGNMENT);
156
 		addR.setAlignmentX(CENTER_ALIGNMENT);
145
 		delR.setAlignmentX(CENTER_ALIGNMENT);
157
 		delR.setAlignmentX(CENTER_ALIGNMENT);
146
 		editR.setAlignmentX(CENTER_ALIGNMENT);
158
 		editR.setAlignmentX(CENTER_ALIGNMENT);
147
-		//comboRepCat.(tab);
159
+
148
 		comboRepCat.setAlignmentX(CENTER_ALIGNMENT);
160
 		comboRepCat.setAlignmentX(CENTER_ALIGNMENT);
149
 		addR.setMaximumSize(new Dimension(300,34));
161
 		addR.setMaximumSize(new Dimension(300,34));
150
 		delR.setMaximumSize(new Dimension(300,34));
162
 		delR.setMaximumSize(new Dimension(300,34));
151
 		editR.setMaximumSize(new Dimension(300,34));
163
 		editR.setMaximumSize(new Dimension(300,34));
164
+		comboRepCat.setMaximumSize(new Dimension(1000,34));
152
 
165
 
153
 		panReponses.add(addR);
166
 		panReponses.add(addR);
154
 		panReponses.add(Box.createRigidArea(new Dimension(1,5)));
167
 		panReponses.add(Box.createRigidArea(new Dimension(1,5)));
184
 		addQ.setMaximumSize(new Dimension(208,34));
197
 		addQ.setMaximumSize(new Dimension(208,34));
185
 		delQ.setMaximumSize(new Dimension(208,34));
198
 		delQ.setMaximumSize(new Dimension(208,34));
186
 		editQ.setMaximumSize(new Dimension(208,34));
199
 		editQ.setMaximumSize(new Dimension(208,34));
200
+		comboQueRep.setMaximumSize(new Dimension(1000,34));
187
 
201
 
188
 		panQuestions.add(addQ);
202
 		panQuestions.add(addQ);
189
 		panQuestions.add(Box.createRigidArea(new Dimension(1,5)));
203
 		panQuestions.add(Box.createRigidArea(new Dimension(1,5)));

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

1
+import javax.swing.*;
2
+
1
 public class MainAdminBddBurgerQuizz
3
 public class MainAdminBddBurgerQuizz
2
 {
4
 {
3
 	public static void main(String args[])
5
 	public static void main(String args[])
4
 	{
6
 	{
7
+		try {
8
+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
9
+		} catch (ClassNotFoundException e) {
10
+			e.printStackTrace();
11
+		} catch (InstantiationException e) {
12
+			e.printStackTrace();
13
+		} catch (IllegalAccessException e) {
14
+			e.printStackTrace();
15
+		} catch (UnsupportedLookAndFeelException e) {
16
+			e.printStackTrace();
17
+		}
5
 		InterfacePrincipale alain_chabat = new InterfacePrincipale();
18
 		InterfacePrincipale alain_chabat = new InterfacePrincipale();
6
 
19
 
7
 		if(args.length >=1 && args[0].equals("-56k"))
20
 		if(args.length >=1 && args[0].equals("-56k"))