First pass renaming sreen and widgets.

22 files changed, 82 insertions, 82 deletions

diff --git a/src/screen/screen_analyze.c b/src/screen/analyze.c
index b249f81..516f7b9 100644
--- a/src/screen/screen_analyze.c
+++ b/src/screen/analyze.c
@@ -15,13 +15,13 @@
 #    include "music.h"
 #endif
 
-#include "screen_mainMenu.h"
-#include "screen_analyze.h"
+#include "mainMenu.h"
+#include "analyze.h"
 
 #include "widget.h"
-#include "widget_label.h"
-#include "widget_button.h"
-#include "widget_image.h"
+#include "label.h"
+#include "button.h"
+#include "image.h"
 
 static widget_t *image_backgorund;
 
@@ -156,7 +156,7 @@ void initScreenAnalyze()
 {
 	image_t *image;
 
-	image = getImage(IMAGE_GROUP_BASE, "screen_main");
+	image = getImage(IMAGE_GROUP_BASE, "main");
 	image_backgorund = newWidgetImage(0, 0, image);
 
 	listWidgetLabelName = newList();
diff --git a/src/screen/screen_analyze.h b/src/screen/analyze.h
index 8f975b4..8f975b4 100644
--- a/src/screen/screen_analyze.h
+++ b/src/screen/analyze.h
diff --git a/src/screen/screen_browser.c b/src/screen/browser.c
index f09ca18..f6aa702 100644
--- a/src/screen/screen_browser.c
+++ b/src/screen/browser.c
@@ -39,14 +39,14 @@ extern int errno;
 #    include "music.h"
 #endif
 
-#include "screen_gameType.h"
-#include "screen_browser.h"
+#include "gameType.h"
+#include "browser.h"
 
 #include "widget.h"
-#include "widget_image.h"
-#include "widget_label.h"
-#include "widget_button.h"
-#include "widget_select.h"
+#include "image.h"
+#include "label.h"
+#include "button.h"
+#include "select.h"
 
 #define SERVER_TIMEOUT	200
 
@@ -681,7 +681,7 @@ void initScreenBrowser()
 {
 	image_t *image;
 
-	image = getImage(IMAGE_GROUP_BASE, "screen_main");
+	image = getImage(IMAGE_GROUP_BASE, "main");
 	image_backgorund = newWidgetImage(0, 0, image);
 
 	button_back =
diff --git a/src/screen/screen_browser.h b/src/screen/browser.h
index e810e58..e810e58 100644
--- a/src/screen/screen_browser.h
+++ b/src/screen/browser.h
diff --git a/src/screen/screen_choiceArena.c b/src/screen/choiceArena.c
index 7bc6ce4..e73eea6 100644
--- a/src/screen/screen_choiceArena.c
+++ b/src/screen/choiceArena.c
@@ -15,14 +15,14 @@
 #    include "music.h"
 #endif
 
-#include "screen_mainMenu.h"
-#include "screen_choiceArena.h"
+#include "mainMenu.h"
+#include "choiceArena.h"
 
 #include "widget.h"
-#include "widget_label.h"
-#include "widget_button.h"
-#include "widget_image.h"
-#include "widget_buttonimage.h"
+#include "label.h"
+#include "button.h"
+#include "image.h"
+#include "buttonimage.h"
 
 static widget_t *image_backgorund;
 
@@ -143,7 +143,7 @@ void initScreenChoiceArena()
 	image_t *image;
 	int i;
 
-	image = getImage(IMAGE_GROUP_BASE, "screen_main");
+	image = getImage(IMAGE_GROUP_BASE, "main");
 	image_backgorund = newWidgetImage(0, 0, image);
 
 	button_back = newWidgetButton(_("back"), 100, WINDOW_SIZE_Y - 100, eventWidget);
diff --git a/src/screen/screen_choiceArena.h b/src/screen/choiceArena.h
index dbe12de..dbe12de 100644
--- a/src/screen/screen_choiceArena.h
+++ b/src/screen/choiceArena.h
diff --git a/src/screen/screen_credits.c b/src/screen/credits.c
index a3ed787..b78aec0 100644
--- a/src/screen/screen_credits.c
+++ b/src/screen/credits.c
@@ -15,12 +15,12 @@
 #    include "music.h"
 #endif
 
-#include "screen_credits.h"
+#include "credits.h"
 
 #include "widget.h"
-#include "widget_image.h"
-#include "widget_label.h"
-#include "widget_button.h"
+#include "image.h"
+#include "label.h"
+#include "button.h"
 
 static widget_t *image_backgorund;
 static widget_t *button_back;
@@ -105,7 +105,7 @@ void initScreenCredits()
 	image_t *image;
 	int i;
 
-	image = getImage(IMAGE_GROUP_BASE, "screen_main");
+	image = getImage(IMAGE_GROUP_BASE, "main");
 	image_backgorund = newWidgetImage(0, 0, image);
 
 	button_back = newWidgetButton(_("back"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2,
diff --git a/src/screen/screen_credits.h b/src/screen/credits.h
index 37c25f3..37c25f3 100644
--- a/src/screen/screen_credits.h
+++ b/src/screen/credits.h
diff --git a/src/screen/screen_downArena.c b/src/screen/downArena.c
index 94b2387..899d59f 100644
--- a/src/screen/screen_downArena.c
+++ b/src/screen/downArena.c
@@ -20,13 +20,13 @@
 #include "tcp.h"
 
 #include "widget.h"
-#include "widget_image.h"
-#include "widget_label.h"
-#include "widget_button.h"
+#include "image.h"
+#include "label.h"
+#include "button.h"
 
-#include "screen_setting.h"
-#include "screen_downArena.h"
-#include "screen_gameType.h"
+#include "setting.h"
+#include "downArena.h"
+#include "gameType.h"
 
 static sock_udp_t *sock_server_udp;
 static sock_tcp_t *sock_server_tcp;
@@ -369,7 +369,7 @@ void initScreenDownArena()
 {
 	image_t *image;
 
-	image = getImage(IMAGE_GROUP_BASE, "screen_main");
+	image = getImage(IMAGE_GROUP_BASE, "main");
 	image_backgorund = newWidgetImage(0, 0, image);
 
 	button_back =
diff --git a/src/screen/screen_downArena.h b/src/screen/downArena.h
index d9f25d7..d9f25d7 100644
--- a/src/screen/screen_downArena.h
+++ b/src/screen/downArena.h
diff --git a/src/screen/screen_gameType.c b/src/screen/gameType.c
index 1ef8461..c71e7ef 100644
--- a/src/screen/screen_gameType.c
+++ b/src/screen/gameType.c
@@ -19,17 +19,17 @@
 #    include "music.h"
 #endif
 
-#include "screen_gameType.h"
-#include "screen_setting.h"
+#include "gameType.h"
+#include "setting.h"
 
 #include "widget.h"
-#include "widget_label.h"
-#include "widget_button.h"
-#include "widget_image.h"
-#include "widget_textfield.h"
-#include "widget_choicegroup.h"
-#include "widget_check.h"
-#include "widget_select.h"
+#include "label.h"
+#include "button.h"
+#include "image.h"
+#include "textfield.h"
+#include "choicegroup.h"
+#include "check.h"
+#include "select.h"
 
 static widget_t *image_backgorund;
 
@@ -217,7 +217,7 @@ void initScreenGameType()
 {
 	image_t *image;
 
-	image = getImage(IMAGE_GROUP_BASE, "screen_main");
+	image = getImage(IMAGE_GROUP_BASE, "main");
 	image_backgorund = newWidgetImage(0, 0, image);
 
 	button_back = newWidgetButton(_("back"), 100, WINDOW_SIZE_Y - 100, eventWidget);
diff --git a/src/screen/screen_gameType.h b/src/screen/gameType.h
index 2c836fc..2c836fc 100644
--- a/src/screen/screen_gameType.h
+++ b/src/screen/gameType.h
diff --git a/src/screen/screen_mainMenu.c b/src/screen/mainMenu.c
index 84d57b8..2209d8e 100644
--- a/src/screen/screen_mainMenu.c
+++ b/src/screen/mainMenu.c
@@ -14,15 +14,15 @@
 #    include "music.h"
 #endif
 
-#include "screen_mainMenu.h"
-#include "screen_setting.h"
+#include "mainMenu.h"
+#include "setting.h"
 
 #include "widget.h"
-#include "widget_label.h"
-#include "widget_button.h"
-#include "widget_textfield.h"
-#include "widget_check.h"
-#include "widget_image.h"
+#include "label.h"
+#include "button.h"
+#include "textfield.h"
+#include "check.h"
+#include "image.h"
 
 static widget_t *image_backgorund;
 
@@ -103,7 +103,7 @@ void initScreenMainMenu()
 	image_t *image;
 
 	image =
-		addImageData("screen_main.png", IMAGE_NO_ALPHA, "screen_main",
+		addImageData("main.png", IMAGE_NO_ALPHA, "main",
 					 IMAGE_GROUP_BASE);
 	image_backgorund = newWidgetImage(0, 0, image);
 
diff --git a/src/screen/screen_mainMenu.h b/src/screen/mainMenu.h
index ecb369b..ecb369b 100644
--- a/src/screen/screen_mainMenu.h
+++ b/src/screen/mainMenu.h
diff --git a/src/screen/screen_setting.c b/src/screen/setting.c
index b52a9db..67e8ac9 100644
--- a/src/screen/screen_setting.c
+++ b/src/screen/setting.c
@@ -22,19 +22,19 @@
 #    include "sound.h"
 #endif
 
-#include "screen_mainMenu.h"
-#include "screen_setting.h"
-#include "screen_settingKeys.h"
-#include "screen_settingKeys.h"
-#include "screen_choiceArena.h"
+#include "mainMenu.h"
+#include "setting.h"
+#include "settingKeys.h"
+#include "settingKeys.h"
+#include "choiceArena.h"
 
 #include "widget.h"
-#include "widget_label.h"
-#include "widget_button.h"
-#include "widget_image.h"
-#include "widget_textfield.h"
-#include "widget_check.h"
-#include "widget_select.h"
+#include "label.h"
+#include "button.h"
+#include "image.h"
+#include "textfield.h"
+#include "check.h"
+#include "select.h"
 
 static widget_t *image_backgorund;
 
@@ -332,7 +332,7 @@ void initScreenSetting()
 	image_t *image;
 	int i;
 
-	image = getImage(IMAGE_GROUP_BASE, "screen_main");
+	image = getImage(IMAGE_GROUP_BASE, "main");
 	image_backgorund = newWidgetImage(0, 0, image);
 
 	button_back = newWidgetButton(_("back"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100, eventWidget);
diff --git a/src/screen/screen_setting.h b/src/screen/setting.h
index 9521cca..9521cca 100644
--- a/src/screen/screen_setting.h
+++ b/src/screen/setting.h
diff --git a/src/screen/screen_settingKeys.c b/src/screen/settingKeys.c
index 35215cf..ccd89f4 100644
--- a/src/screen/screen_settingKeys.c
+++ b/src/screen/settingKeys.c
@@ -21,15 +21,15 @@
 #    include "sound.h"

 #endif							/* 

  */

-#include "screen_mainMenu.h"

-#include "screen_setting.h"

-#include "screen_settingKeys.h"

+#include "mainMenu.h"

+#include "setting.h"

+#include "settingKeys.h"

 	

 #include "widget.h"

-#include "widget_button.h"

-#include "widget_image.h"

-#include "widget_catchkey.h"

-#include "widget_label.h"

+#include "button.h"

+#include "image.h"

+#include "catchkey.h"

+#include "label.h"

 

 static int keytable[KEY_LENGTH];

 

@@ -383,7 +383,7 @@ image_t * image;
 

 initKeyTable();

 	

-image = getImage(IMAGE_GROUP_BASE, "screen_main");

+image = getImage(IMAGE_GROUP_BASE, "main");

 	

 image_backgorund = newWidgetImage(0, 0, image);

 	

diff --git a/src/screen/screen_settingKeys.h b/src/screen/settingKeys.h
index c90006e..c90006e 100644
--- a/src/screen/screen_settingKeys.h
+++ b/src/screen/settingKeys.h
diff --git a/src/screen/screen_table.c b/src/screen/table.c
index b49de93..c9c005f 100644
--- a/src/screen/screen_table.c
+++ b/src/screen/table.c
@@ -17,11 +17,11 @@
 #    include "music.h"
 #endif
 
-#include "screen_table.h"
+#include "table.h"
 
-#include "widget_image.h"
-#include "widget_label.h"
-#include "widget_button.h"
+#include "image.h"
+#include "label.h"
+#include "button.h"
 
 static widget_t *image_backgorund;
 static widget_t *button_back;
@@ -198,7 +198,7 @@ void initScreenTable()
 {
 	image_t *image;
 
-	image = addImageData("screen_table.png", IMAGE_NO_ALPHA, "screen_table", IMAGE_GROUP_BASE);
+	image = addImageData("table.png", IMAGE_NO_ALPHA, "table", IMAGE_GROUP_BASE);
 	image_backgorund = newWidgetImage(0, 0, image);
 
 	button_back = newWidgetButton(_("back"), WINDOW_SIZE_X / 2 - WIDGET_BUTTON_WIDTH / 2,
diff --git a/src/screen/screen_table.h b/src/screen/table.h
index a91b233..a91b233 100644
--- a/src/screen/screen_table.h
+++ b/src/screen/table.h
diff --git a/src/screen/screen_world.c b/src/screen/world.c
index 8f2f6d2..5fa3ecd 100644
--- a/src/screen/screen_world.c
+++ b/src/screen/world.c
@@ -37,13 +37,13 @@
 #endif
 
 #include "screen.h"
-#include "screen_world.h"
-#include "screen_analyze.h"
-#include "screen_setting.h"
-#include "screen_gameType.h"
-#include "screen_settingKeys.h"
-#include "screen_choiceArena.h"
-#include "screen_table.h"
+#include "world.h"
+#include "analyze.h"
+#include "setting.h"
+#include "gameType.h"
+#include "settingKeys.h"
+#include "choiceArena.h"
+#include "table.h"
 
 
 static arena_t *arena;
diff --git a/src/screen/screen_world.h b/src/screen/world.h
index 67935f7..67935f7 100644
--- a/src/screen/screen_world.h
+++ b/src/screen/world.h