aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilippe Caseiro <puppetmaster.e17@gmail.com>2006-02-03 12:18:22 +0100
committerPuppet_Master <puppetmaster.e17@gmail.com>2006-02-03 12:18:22 +0100
commitae70b0c54a6047e124b22c6953804303173c42b0 (patch)
treef1f247313c0ddff690fd3e2608acb4c953974ae7
parentUpdates for Source Mage tools ;) (diff)
downloadensorcel-ae70b0c54a6047e124b22c6953804303173c42b0.tar.gz
indent cleanning
image add code continue on tool box
-rw-r--r--data/images/toolbox.pngbin0 -> 19030 bytes
-rw-r--r--src/ensorcel.c4
-rw-r--r--src/ensorcel.h2
-rw-r--r--src/ensorcel_config.h1
-rw-r--r--src/ensorcel_launch.c2
-rw-r--r--src/ensorcel_sorcery_actions.c16
-rw-r--r--src/ensorcel_sourcemage_tools.c47
7 files changed, 34 insertions, 38 deletions
diff --git a/data/images/toolbox.png b/data/images/toolbox.png
new file mode 100644
index 0000000..4bfe9d6
--- /dev/null
+++ b/data/images/toolbox.png
Binary files differ
diff --git a/src/ensorcel.c b/src/ensorcel.c
index b6dff35..429dbb1 100644
--- a/src/ensorcel.c
+++ b/src/ensorcel.c
@@ -1,6 +1,6 @@
#include "ensorcel.h"
-static void _ensorcel_main_quit_cb ();
+static void _ensorcel_main_quit_cb ();
static Ensorcel_Button_Set tests[] = {
{
@@ -23,7 +23,7 @@ static Ensorcel_Button_Set tests[] = {
ensorcel_install_window_create},
{
"Tools Box",
- ensorcel_sorcery_tools_window_create },
+ ensorcel_sorcery_tools_window_create},
};
static int num_tests = sizeof (tests) / sizeof (tests[0]);
diff --git a/src/ensorcel.h b/src/ensorcel.h
index ef744cc..19f6a20 100644
--- a/src/ensorcel.h
+++ b/src/ensorcel.h
@@ -97,7 +97,7 @@ void ensorcel_install_window_create (void *data);
void ensorcel_progress_window_create (void *data);
void ensorcel_spell_window_create (void *data);
void ensorcel_error_popup (void *data);
-void ensorcel_sorcery_tools_window_create (void *data);
+void ensorcel_sorcery_tools_window_create (void *data);
Ensorcel_Tree_Skel *ensorcel_tree_initialise (int tree_w, int tree_h, const char *name_col1,
const char *name_col2, const char *name_col3,
diff --git a/src/ensorcel_config.h b/src/ensorcel_config.h
index 9a3990d..8706f66 100644
--- a/src/ensorcel_config.h
+++ b/src/ensorcel_config.h
@@ -12,6 +12,7 @@
#define LOGOSPELLENSORCEL DATAPATH"images/spell_logo.png"
#define LOGOGRIMOIREENSORCEL DATAPATH"images/grimoire.png"
#define ENSORCELLOGOOPTIONSTITLE DATAPATH"images/sorcery_options.png"
+#define ENSORCELTOOLBOX DATAPATH"images/toolbox.png"
#define ENSORCELMAXLINE 80
#define TRUE 1
diff --git a/src/ensorcel_launch.c b/src/ensorcel_launch.c
index fffae29..ad20ea7 100644
--- a/src/ensorcel_launch.c
+++ b/src/ensorcel_launch.c
@@ -51,7 +51,7 @@ static int ensorcel_exe_exit (void *data, int type _UNUSED_, void *event)
printf ("__DEBUG__ :: etk_label_set (%p, %s)\n", strings->label, strings->tb_exe);
if (strings->label)
- etk_label_set (strings->label, strings->tb_exe);
+ etk_label_set (strings->label, strings->tb_exe);
printf ("__DEBUG__ :: DONE (%s)\n", etk_label_get (strings->label));
diff --git a/src/ensorcel_sorcery_actions.c b/src/ensorcel_sorcery_actions.c
index aef73a5..0e5e4f0 100644
--- a/src/ensorcel_sorcery_actions.c
+++ b/src/ensorcel_sorcery_actions.c
@@ -2,20 +2,20 @@
void ensorcel_cast (void *data _UNUSED_)
{
- char cmd[30];
- char *name = data;
+ char cmd[30];
+ char *name = data;
- sprintf(cmd,"xterm -e cast -c %s",name);
- ensorcel_cmd_run(cmd,NULL);
+ sprintf (cmd, "xterm -e cast -c %s", name);
+ ensorcel_cmd_run (cmd, NULL);
printf ("Cast");
}
void ensorcel_dispel (void *data _UNUSED_)
{
- char cmd[30];
- char *name = data;
+ char cmd[30];
+ char *name = data;
- sprintf(cmd,"xterm -e dispel -c %s",name);
- ensorcel_cmd_run(cmd,NULL);
+ sprintf (cmd, "xterm -e dispel -c %s", name);
+ ensorcel_cmd_run (cmd, NULL);
printf ("dispel\n");
}
diff --git a/src/ensorcel_sourcemage_tools.c b/src/ensorcel_sourcemage_tools.c
index 1f915ef..00df2d2 100644
--- a/src/ensorcel_sourcemage_tools.c
+++ b/src/ensorcel_sourcemage_tools.c
@@ -11,12 +11,12 @@ static Etk_Bool _ensorcel_sorcery_tools_window_deleted_cb (void *data)
void ensorcel_sorcery_tools_window_create (void *data _UNUSED_)
{
static Etk_Widget *win = NULL;
- Etk_Widget *lb_info;
+ Etk_Widget *lb_gaze;
+ Etk_Widget *lb_netconf;
Etk_Widget *vbox;
Etk_Widget *hbox;
Etk_Widget *bt_ok;
- Etk_Widget *fm_main;
- Etk_Widget *note_book;
+ Etk_Widget *note_book;
/*Etk_Widget *image; */
@@ -26,39 +26,34 @@ void ensorcel_sorcery_tools_window_create (void *data _UNUSED_)
etk_signal_connect ("delete_event", ETK_OBJECT (win),
ETK_CALLBACK (_ensorcel_sorcery_tools_window_deleted_cb), win);
+ /* BOX CREATION */
vbox = etk_vbox_new (FALSE, 0);
hbox = etk_hbox_new (FALSE, 0);
- fm_main = etk_frame_new (_("About"));
-
- lb_info = etk_label_new
- ("<center>This Application is an frontend<br></center>"
- "<center>for <h3>SourceMage</h3>'s <h2>Sorcery</h2><br></center>"
- "<br><center>Writen by Philippe \"Puppet_Master\" Caseiro </center><br>"
- "<center>With the help (for heavy debugging) of :</center><br>"
- "<br><center> Bertrand \"GuYgUy\" Jacquin (Beber) </center><br>"
- "<center> and </center><br>"
- "<center> Vincent \"Caro\" Torri </center><br>"
- "<center>Ensorcel is under <hilight>HEAVY DEVELOPMENT</hilight> and it</center><br>"
- "<center>is not stable. Many features are incomplete or even non-existant</center><br>"
- "<center>yet and may have many bugs.You have been <hilight>WARNED!</hilight></center>"
- "<br>" "<center><h2>License</h2></center><br><center><h2>GPLv2</h2></center><br>");
+
+ /* LABELS CREATION */
+ lb_gaze = etk_label_new ("<h1>GAZE</h1>" "<br>Searching Tool");
+ lb_netconf = etk_label_new ("<h1>NETCONF</h1>" "<br>NetWork Configuration Tool");
+
+ /* NOTE BOOK CREATION */
note_book = etk_notebook_new ();
- etk_widget_size_request_set (ETK_WIDGET (note_book), 500, 600);
- etk_notebook_page_append (ETK_NOTEBOOK (note_book), "Gaze", lb_info);
- etk_notebook_page_append (ETK_NOTEBOOK (note_book), "NetConf", lb_info);
- etk_notebook_page_append (ETK_NOTEBOOK (note_book), "Ohter", lb_info);
-
- bt_ok = ensorcel_button_create ("I'm Warned", "clicked", IMGOKENSORCEL,
+ etk_widget_size_request_set (ETK_WIDGET (note_book), 800, 600);
+
+ /* NOTE BOOK PAGES ADD */
+ etk_notebook_page_append (ETK_NOTEBOOK (note_book), "Gaze", lb_gaze);
+ etk_notebook_page_append (ETK_NOTEBOOK (note_book), "NetConf", lb_netconf);
+
+ /* QUIT BUTTON CREATION */
+ bt_ok = ensorcel_button_create ("Quit", "clicked", IMGEXITSORCEL,
ETK_CALLBACK (_ensorcel_sorcery_tools_window_deleted_cb), win);
+ /* WIDGET PLACEMENT */
+ etk_box_pack_start (ETK_BOX (vbox), etk_image_new_from_file (ENSORCELTOOLBOX), FALSE, FALSE, 0);
etk_box_pack_start (ETK_BOX (vbox), note_book, FALSE, FALSE, 0);
- /* etk_box_pack_start(ETK_BOX(vbox), etk_image_edje_file_get("images/sorcery_tools.edj"), FALSE, FALSE, 0); */
etk_box_pack_end (ETK_BOX (vbox), hbox, FALSE, FALSE, 0);
etk_box_pack_end (ETK_BOX (hbox), bt_ok, FALSE, FALSE, 0);
- etk_container_add (ETK_CONTAINER (fm_main), vbox);
- etk_container_add (ETK_CONTAINER (win), fm_main);
+ etk_container_add (ETK_CONTAINER (win), vbox);
etk_widget_show_all (win);