From 7a2f989f7679bde9ba45b4f015273c65b5c075a0 Mon Sep 17 00:00:00 2001
From: Raspbeguy <guy.godfroy@telecom-sudparis.eu>
Date: Wed, 9 Apr 2014 19:52:13 +0200
Subject: [PATCH] Re-modif

---
 .gitignore                    |  3 ++-
 sources/GUI/makefile          |  7 ++-----
 sources/GUI/ponytracker.glade | 27 +--------------------------
 sources/GUI/premierTest.c     |  9 ++++-----
 4 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/.gitignore b/.gitignore
index d408562..1ffcf12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,5 @@ sources/lecture/.lecture.c.swp
 sources/lecture/.lecture.h.swp
 sources/lecture/lecture.o
 sources/GUI/premierTest
-sources/lecture.o
\ No newline at end of file
+sources/lecture.o
+sources/GUI/coucou
\ No newline at end of file
diff --git a/sources/GUI/makefile b/sources/GUI/makefile
index 101fde0..405625d 100644
--- a/sources/GUI/makefile
+++ b/sources/GUI/makefile
@@ -1,10 +1,7 @@
 all : premierTest clean
 
-premierTest : premierTest.o
-	gcc -Wall premierTest.o -o premierTest `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0`
-
-premierTest.o : premierTest.c
-	gcc -Wall -c premierTest.c `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0`
+premierTest : premierTest.c
+	gcc -Wall premierTest.c -o premierTest `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0`
 
 clean : premierTest
 	rm -f *.o
diff --git a/sources/GUI/ponytracker.glade b/sources/GUI/ponytracker.glade
index 8c4d709..46f234c 100644
--- a/sources/GUI/ponytracker.glade
+++ b/sources/GUI/ponytracker.glade
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
 <interface>
-  <requires lib="gtk+" version="3.6"/>
+  <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkWindow" id="ajoutinstrument">
     <property name="can_focus">False</property>
     <child>
@@ -377,18 +376,6 @@
                 <property name="relief">none</property>
                 <property name="focus_on_click">False</property>
                 <property name="orientation">vertical</property>
-                <child internal-child="plus_button">
-                  <object class="GtkButton" id="scalebutton-plus_button1">
-                    <property name="can_focus">False</property>
-                    <property name="receives_default">False</property>
-                  </object>
-                </child>
-                <child internal-child="minus_button">
-                  <object class="GtkButton" id="scalebutton-minus_button1">
-                    <property name="can_focus">False</property>
-                    <property name="receives_default">False</property>
-                  </object>
-                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -405,18 +392,6 @@
                 <property name="relief">none</property>
                 <property name="focus_on_click">False</property>
                 <property name="orientation">vertical</property>
-                <child internal-child="plus_button">
-                  <object class="GtkButton" id="scalebutton-plus_button2">
-                    <property name="can_focus">False</property>
-                    <property name="receives_default">False</property>
-                  </object>
-                </child>
-                <child internal-child="minus_button">
-                  <object class="GtkButton" id="scalebutton-minus_button2">
-                    <property name="can_focus">False</property>
-                    <property name="receives_default">False</property>
-                  </object>
-                </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
diff --git a/sources/GUI/premierTest.c b/sources/GUI/premierTest.c
index aa803a0..75c3688 100644
--- a/sources/GUI/premierTest.c
+++ b/sources/GUI/premierTest.c
@@ -1,4 +1,3 @@
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <gtk/gtk.h>
@@ -14,7 +13,7 @@ int main( int argc, char *argv[] ) {
   gtk_builder_add_from_file( monBuilder, "ponytracker.glade", NULL);
   gtk_builder_connect_signals( monBuilder, NULL);
 
-  maFenetre = GTK_WIDGET( gtk_builder_get_object( monBuilder, "fenetrePrincipale"));
+  maFenetre = GTK_WIDGET( gtk_builder_get_object( monBuilder, "fenetreprincipale"));
 
   gtk_widget_show_all (maFenetre);
   gtk_main();
@@ -38,7 +37,7 @@ void fenetreSample ( int argc, char *argv[] )
   gtk_builder_add_from_file( monBuilderSample, "ponytracker.glade", NULL);
   gtk_builder_connect_signals( monBuilderSample, NULL);
 
-  maFenetreSample = GTK_WIDGET( gtk_builder_get_object( monBuilderSample, "ajoutSample"));
+  maFenetreSample = GTK_WIDGET( gtk_builder_get_object( monBuilderSample, "ajoutsample"));
 
   gtk_widget_show_all (maFenetreSample);
 }
@@ -55,7 +54,7 @@ void fenetreInstrument ( int argc, char *argv[] )
   gtk_builder_add_from_file( monBuilderInstrument, "ponytracker.glade", NULL);
   gtk_builder_connect_signals( monBuilderInstrument, NULL);
 
-  maFenetreInstrument = GTK_WIDGET( gtk_builder_get_object( monBuilderInstrument, "ajoutInstrument"));
+  maFenetreInstrument = GTK_WIDGET( gtk_builder_get_object( monBuilderInstrument, "ajoutinstrument"));
 
   gtk_widget_show_all (maFenetreInstrument);
 }
@@ -72,7 +71,7 @@ void fenetreMotif ( int argc, char *argv[] )
   gtk_builder_add_from_file( monBuilderMotif, "ponytracker.glade", NULL);
   gtk_builder_connect_signals( monBuilderMotif, NULL);
 
-  maFenetreMotif = GTK_WIDGET( gtk_builder_get_object( monBuilderMotif, "ajoutMotif"));
+  maFenetreMotif = GTK_WIDGET( gtk_builder_get_object( monBuilderMotif, "ajoutmotif"));
 
   gtk_widget_show_all (maFenetreMotif);
 }