Revert "Revert "Revert "First pass renaming sreen and widgets."""

This reverts commit 87821f04c9565450d8e724be76993ae5ea2c20c4.

19 files changed, 11 insertions, 11 deletions

diff --git a/src/widget/widget.c b/src/widget/widget.c
index f33e643..b72a463 100644
--- a/src/widget/widget.c
+++ b/src/widget/widget.c
@@ -5,7 +5,7 @@
 #include "main.h"
 
 #include "widget.h"
-#include "label.h"
+#include "widget_label.h"
 
 widget_t *newWidget(int type, int x, int y, int w, int h, void *private_data)
 {
diff --git a/src/widget/button.c b/src/widget/widget_button.c
index e2db211..c2afcad 100644
--- a/src/widget/button.c
+++ b/src/widget/widget_button.c
@@ -9,7 +9,7 @@
 #include "font.h"
 
 #include "widget.h"
-#include "button.h"
+#include "widget_button.h"
 
 widget_t *newWidgetButton(char *text, int x, int y, void (*fce_event) (void *))
 {
diff --git a/src/widget/button.h b/src/widget/widget_button.h
index ac238be..ac238be 100644
--- a/src/widget/button.h
+++ b/src/widget/widget_button.h
diff --git a/src/widget/buttonimage.c b/src/widget/widget_buttonimage.c
index 1859ef0..dd20e62 100644
--- a/src/widget/buttonimage.c
+++ b/src/widget/widget_buttonimage.c
@@ -8,7 +8,7 @@
 #include "image.h"
 
 #include "widget.h"
-#include "buttonimage.h"
+#include "widget_buttonimage.h"
 
 widget_t *newWidgetButtonimage(image_t * image, int x, int y, void (*fce_event) (void *))
 {
diff --git a/src/widget/buttonimage.h b/src/widget/widget_buttonimage.h
index 5a0ab7c..5a0ab7c 100644
--- a/src/widget/buttonimage.h
+++ b/src/widget/widget_buttonimage.h
diff --git a/src/widget/catchkey.c b/src/widget/widget_catchkey.c
index ecfb993..b213890 100644
--- a/src/widget/catchkey.c
+++ b/src/widget/widget_catchkey.c
@@ -7,7 +7,7 @@
 #include "font.h"
 
 #include "widget.h"
-#include "catchkey.h"
+#include "widget_catchkey.h"
 
 widget_t *newWidgetCatchkey(int key, int x, int y, void *event)
 {
diff --git a/src/widget/catchkey.h b/src/widget/widget_catchkey.h
index 106bc92..106bc92 100644
--- a/src/widget/catchkey.h
+++ b/src/widget/widget_catchkey.h
diff --git a/src/widget/check.c b/src/widget/widget_check.c
index 7ef4b8b..e574211 100644
--- a/src/widget/check.c
+++ b/src/widget/widget_check.c
@@ -7,7 +7,7 @@
 #include "image.h"
 
 #include "widget.h"
-#include "check.h"
+#include "widget_check.h"
 
 widget_t *newWidgetCheck(int x, int y, bool_t status,  void (*fce_event) (void *))
 {
diff --git a/src/widget/check.h b/src/widget/widget_check.h
index 007e82c..007e82c 100644
--- a/src/widget/check.h
+++ b/src/widget/widget_check.h
diff --git a/src/widget/choicegroup.c b/src/widget/widget_choicegroup.c
index 0eb562a..1045f81 100644
--- a/src/widget/choicegroup.c
+++ b/src/widget/widget_choicegroup.c
@@ -7,7 +7,7 @@
 #include "image.h"
 
 #include "widget.h"
-#include "choicegroup.h"
+#include "widget_choicegroup.h"
 
 widget_t *newWidgetChoicegroup(int x, int y, bool_t status, list_t * list, void (*fce_event) (void *))
 {
diff --git a/src/widget/choicegroup.h b/src/widget/widget_choicegroup.h
index a892d74..a892d74 100644
--- a/src/widget/choicegroup.h
+++ b/src/widget/widget_choicegroup.h
diff --git a/src/widget/image.c b/src/widget/widget_image.c
index 2c9702f..ad49f9e 100644
--- a/src/widget/image.c
+++ b/src/widget/widget_image.c
@@ -9,7 +9,7 @@
 #include "font.h"
 
 #include "widget.h"
-#include "image.h"
+#include "widget_image.h"
 
 widget_t *newWidgetImage(int x, int y, image_t * image)
 {
diff --git a/src/widget/image.h b/src/widget/widget_image.h
index 61bf89a..081fbda 100644
--- a/src/widget/image.h
+++ b/src/widget/widget_image.h
@@ -8,7 +8,7 @@
 #    include "widget.h"
 
 typedef struct widget_image {
-	image_t *widget_image;
+	image_t *image;
 } widget_image_t;
 
 extern widget_t *newWidgetImage(int x, int y, image_t * image);
diff --git a/src/widget/label.c b/src/widget/widget_label.c
index a2d0a48..e3c907c 100644
--- a/src/widget/label.c
+++ b/src/widget/widget_label.c
@@ -5,7 +5,7 @@
 #include "main.h"
 #include "interface.h"
 #include "font.h"
-#include "label.h"
+#include "widget_label.h"
 #include "widget.h"
 
 widget_t *newWidgetLabel(char *text, int x, int y, int bind)
diff --git a/src/widget/label.h b/src/widget/widget_label.h
index 743db7e..743db7e 100644
--- a/src/widget/label.h
+++ b/src/widget/widget_label.h
diff --git a/src/widget/select.c b/src/widget/widget_select.c
index 5e290e2..f53e583 100644
--- a/src/widget/select.c
+++ b/src/widget/widget_select.c
@@ -7,7 +7,7 @@
 #include "font.h"
 
 #include "widget.h"
-#include "select.h"
+#include "widget_select.h"
 
 widget_t *newWidgetSelect(int x, int y, void (*fce_event) (void *))
 {
diff --git a/src/widget/select.h b/src/widget/widget_select.h
index 9d772cc..9d772cc 100644
--- a/src/widget/select.h
+++ b/src/widget/widget_select.h
diff --git a/src/widget/textfield.c b/src/widget/widget_textfield.c
index edc74a8..6a8824a 100644
--- a/src/widget/textfield.c
+++ b/src/widget/widget_textfield.c
@@ -8,7 +8,7 @@
 #include "image.h"
 
 #include "widget.h"
-#include "textfield.h"
+#include "widget_textfield.h"
 
 //#define ZZEEXX86_READKEY
 
diff --git a/src/widget/textfield.h b/src/widget/widget_textfield.h
index 7991deb..7991deb 100644
--- a/src/widget/textfield.h
+++ b/src/widget/widget_textfield.h