From 1a4096fd821803cf3a41311ac1c99caac8f11b54 Mon Sep 17 00:00:00 2001 From: Quentin Date: Fri, 17 Jan 2014 10:43:23 +0100 Subject: [PATCH] renamed: fichier/dir/aa -> fichier/dir/aa.txt new file: fichier/dir/sa.html renamed: fichier/dir/zz -> fichier/dir/zz.txt renamed: fichier/ff -> fichier/ff.txt deleted: sauv/aa renamed: sauv/ff -> sauv/ff.txt modified: v/Vue1.rb --- fichier/dir/{aa => aa.txt} | 0 fichier/dir/sa.html | 21 +++++++++++++++++++++ fichier/dir/{zz => zz.txt} | 0 fichier/{ff => ff.txt} | 0 sauv/aa | 1 - sauv/{ff => ff.txt} | 0 v/Vue1.rb | 11 ++++++++++- 7 files changed, 31 insertions(+), 2 deletions(-) rename fichier/dir/{aa => aa.txt} (100%) create mode 100644 fichier/dir/sa.html rename fichier/dir/{zz => zz.txt} (100%) rename fichier/{ff => ff.txt} (100%) delete mode 100644 sauv/aa rename sauv/{ff => ff.txt} (100%) diff --git a/fichier/dir/aa b/fichier/dir/aa.txt similarity index 100% rename from fichier/dir/aa rename to fichier/dir/aa.txt diff --git a/fichier/dir/sa.html b/fichier/dir/sa.html new file mode 100644 index 0000000..35290c4 --- /dev/null +++ b/fichier/dir/sa.html @@ -0,0 +1,21 @@ + + + + + + + + Boutique Marchande sur le Web + + +
+

Boutique marchande

+
+ +
diff --git a/fichier/dir/zz b/fichier/dir/zz.txt similarity index 100% rename from fichier/dir/zz rename to fichier/dir/zz.txt diff --git a/fichier/ff b/fichier/ff.txt similarity index 100% rename from fichier/ff rename to fichier/ff.txt diff --git a/sauv/aa b/sauv/aa deleted file mode 100644 index 0637a08..0000000 --- a/sauv/aa +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/sauv/ff b/sauv/ff.txt similarity index 100% rename from sauv/ff rename to sauv/ff.txt diff --git a/v/Vue1.rb b/v/Vue1.rb index 53229bf..6ca17ee 100644 --- a/v/Vue1.rb +++ b/v/Vue1.rb @@ -73,7 +73,16 @@ class Vue1 @ctrl.recupUrlsDoss(@chaine) else if(File.exist?(@chaine)) #si c'est un fichier -> existant utilisation du controleur adéquat - @ctrl.recupUrls(@chaine) + if(File.extname(@chaine)== ".txt" || File.extname(@chaine)== ".html" ) + @ctrl.recupUrls(@chaine) + else + i = Gtk::MessageDialog.new(Gtk::Window.new, Gtk::Dialog::DESTROY_WITH_PARENT, + Gtk::MessageDialog::ERROR, + Gtk::MessageDialog::BUTTONS_CLOSE, + "Erreur : fichier extension invalide !") + i.run + i.destroy + end else #gestion saisie invalide d = Gtk::MessageDialog.new(Gtk::Window.new, Gtk::Dialog::DESTROY_WITH_PARENT, Gtk::MessageDialog::ERROR,