Menu
▾
▴
E SVN: davemds IN branches/edje_editor_elm: . data data/images src/bin
|
From: Enlightenment S. <no-...@en...> - 2009-08-03 12:59:07
|
Log:
Update elementary branch to my current status.
Note that is just a work in progress, does NOT compile on your machine atm.
Author: davemds
Date: 2009-08-03 04:59:15 -0700 (Mon, 03 Aug 2009)
New Revision: 41569
Added:
branches/edje_editor_elm/data/elemele.edc branches/edje_editor_elm/data/images/add.png branches/edje_editor_elm/data/images/dia_warning.png branches/edje_editor_elm/data/images/doc_new.png branches/edje_editor_elm/data/images/doc_open.png branches/edje_editor_elm/data/images/doc_save.png branches/edje_editor_elm/data/images/doc_save_as.png branches/edje_editor_elm/data/images/elm_arrow_down.png branches/edje_editor_elm/data/images/elm_frame.png branches/edje_editor_elm/data/images/go-down.png branches/edje_editor_elm/data/images/go-up.png branches/edje_editor_elm/data/images/media-playback-pause.png branches/edje_editor_elm/data/images/media-playback-start.png branches/edje_editor_elm/data/images/preferences-system.png branches/edje_editor_elm/data/images/remove.png branches/edje_editor_elm/data/images/system-log-out.png
Modified:
branches/edje_editor_elm/configure.ac branches/edje_editor_elm/data/Makefile.am branches/edje_editor_elm/data/edje_editor.edc branches/edje_editor_elm/src/bin/Makefile.am branches/edje_editor_elm/src/bin/edje_editor_canvas.c branches/edje_editor_elm/src/bin/edje_editor_canvas.h branches/edje_editor_elm/src/bin/edje_editor_consolle.c branches/edje_editor_elm/src/bin/edje_editor_consolle.h branches/edje_editor_elm/src/bin/edje_editor_dialogs.c branches/edje_editor_elm/src/bin/edje_editor_dialogs.h branches/edje_editor_elm/src/bin/edje_editor_group.c branches/edje_editor_elm/src/bin/edje_editor_group.h branches/edje_editor_elm/src/bin/edje_editor_part.c branches/edje_editor_elm/src/bin/edje_editor_part.h branches/edje_editor_elm/src/bin/edje_editor_toolbar.c branches/edje_editor_elm/src/bin/edje_editor_toolbar.h branches/edje_editor_elm/src/bin/edje_editor_tree.c branches/edje_editor_elm/src/bin/edje_editor_tree.h branches/edje_editor_elm/src/bin/edje_editor_window.c branches/edje_editor_elm/src/bin/edje_editor_window.h branches/edje_editor_elm/src/bin/main.c branches/edje_editor_elm/src/bin/main.h
Modified: branches/edje_editor_elm/configure.ac
===================================================================
--- branches/edje_editor_elm/configure.ac 2009-08-03 11:50:07 UTC (rev 41568)
+++ branches/edje_editor_elm/configure.ac 2009-08-03 11:59:15 UTC (rev 41569)
@@ -9,7 +9,7 @@
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE(edje_editor, 0.3.2)
+AM_INIT_AUTOMAKE(edje_editor, 0.4.0)
AC_PREREQ(2.52)
@@ -88,7 +88,7 @@
PKG_CHECK_MODULES(ECORE, [ecore >= 0.9.9.043])
PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0.043])
PKG_CHECK_MODULES(EVAS, [evas >= 0.9.9.043])
-PKG_CHECK_MODULES(ETK, [etk >= 0.1.0.042])
+PKG_CHECK_MODULES([ELEMENTARY], [elementary])
AC_SUBST(packagesrcdir)
Modified: branches/edje_editor_elm/data/Makefile.am
===================================================================
--- branches/edje_editor_elm/data/Makefile.am 2009-08-03 11:50:07 UTC (rev 41568)
+++ branches/edje_editor_elm/data/Makefile.am 2009-08-03 11:59:15 UTC (rev 41569)
@@ -72,7 +72,7 @@
icon_DATA = edje_editor.png
-edje_editor.edj: edje_editor.edc Makefile
+edje_editor.edj: edje_editor.edc elemele.edc Makefile
$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/edje_editor.edc \
$(top_builddir)/data/edje_editor.edj
Modified: branches/edje_editor_elm/data/edje_editor.edc
===================================================================
--- branches/edje_editor_elm/data/edje_editor.edc 2009-08-03 11:50:07 UTC (rev 41568)
+++ branches/edje_editor_elm/data/edje_editor.edc 2009-08-03 11:59:15 UTC (rev 41569)
@@ -129,22 +129,54 @@
group { \
name: NAME; \
min: W H; \
- max: W H; \
parts { \
part { \
name: "StaticImage"; \
type: IMAGE; \
mouse_events: EVENTS; \
- description{ \
+ description { \
state: "default" 0.0; \
- rel1 {relative: 0.0 0.0; offset: 0 0;} \
- rel2 {relative: 0.0 0.0; offset: W H;} \
+ aspect: 1.0 1.0; \
+ aspect_preference: BOTH; \
image {normal: FILE;} \
} \
} \
} \
}
+#define LINE(NAME, ALPHA, Y) \
+ part { name: NAME; \
+ type: TEXT; \
+ mouse_events: 0; \
+ description { state: "default" 0.0; \
+ color: 80 80 80 ALPHA; \
+ rel1 {relative: 0.0 1.0; offset: 5 Y; to: "con_bg";} \
+ rel2 {relative: 1.0 1.0; to: "con_bg";} \
+ text{ \
+ text: ""; \
+ font: "vera.ttf"; \
+ size: 10; \
+ align: 0.0 0.5; \
+ } \
+ } \
+ }
+
+ //~ part { name: "line2";
+ //~ type: TEXT;
+ //~ mouse_events: 0;
+ //~ description { state: "default" 0.0;
+ //~ color: 80 80 80 190;
+ //~ rel1 {relative: 0.0 0.6; offset: 5 0; to: "con_bg";}
+ //~ rel2 {relative: 1.0 0.8; to: "con_bg";}
+ //~ text{
+ //~ text: "";
+ //~ font: "vera.ttf";
+ //~ size: 10;
+ //~ align: 0.0 0.5;
+ //~ }
+ //~ }
+ //~ }
+
images {
image: "backdrop.png" LOSSY 95;
image: "bg1.png" LOSSY 95;
@@ -197,6 +229,13 @@
image: "grad_sinusoidal.png" LOSSY 95;
image: "data_icon.png" LOSSY 95;
image: "colors_icon.png" LOSSY 95;
+ image: "doc_new.png" LOSSY 95;
+ image: "doc_open.png" LOSSY 95;
+ image: "doc_save.png" LOSSY 95;
+ image: "doc_save_as.png" LOSSY 95;
+ image: "add.png" LOSSY 95;
+ image: "remove.png" LOSSY 95;
+ image: "dia_warning.png" LOSSY 95;
}
fonts {
@@ -236,6 +275,14 @@
STATIC_IMAGE("GRAD_RECTANGULAR.PNG", "grad_rectangular.png", 15, 15, 0);
STATIC_IMAGE("GRAD_ANGULAR.PNG", "grad_angular.png", 15, 15, 0);
STATIC_IMAGE("GRAD_SINUSOIDAL.PNG", "grad_sinusoidal.png", 15, 15, 0);
+ STATIC_IMAGE("DOC_NEW.PNG", "doc_new.png", 10, 10, 0);
+ STATIC_IMAGE("DOC_OPEN.PNG", "doc_open.png", 10, 10, 0);
+ STATIC_IMAGE("DOC_SAVE.PNG", "doc_save.png", 10, 10, 0);
+ STATIC_IMAGE("DOC_SAVE_AS.PNG", "doc_save_as.png", 10, 10, 0);
+ STATIC_IMAGE("DOC_SAVE_AS.PNG", "doc_save_as.png", 10, 10, 0);
+ STATIC_IMAGE("ADD.PNG", "add.png", 10, 10, 0);
+ STATIC_IMAGE("REMOVE.PNG", "remove.png", 10, 10, 0);
+ STATIC_IMAGE("WARN.PNG", "dia_warning.png", 48, 48, 0);
group{
name: "BG3_I.PNG";
@@ -255,36 +302,30 @@
}
}
}
+ /************************************************************
+ /* Elementary Layout
/************************************************************/
- /* MainUI
- /************************************************************/
- group{
- name: "MainUI";
- min: 600 200;
+ group { name: "layout";
parts {
/* background */
- part {
- name: "background";
+ part { name: "background";
type: IMAGE;
mouse_events: 0;
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
rel1 {relative: 0.0 0.0; offset: 0 0;}
rel2 {relative: 1.0 1.0; offset: 0 0;}
image {normal: "bg1.png";}
color_class: "cc_background";
fill { size {relative: 0.0 0.0; offset: 240 240;} }
}
- description {
- state: "default" 0.1;
+ description { state: "default" 0.1;
rel1 {relative: 0.0 0.0; offset: 0 0;}
rel2 {relative: 1.0 1.0; offset: 0 0;}
image {normal: "bg2.png";}
color_class: "cc_background";
fill { size {relative: 0.0 0.0; offset: 80 80;} }
}
- description {
- state: "default" 0.2;
+ description { state: "default" 0.2;
rel1 {relative: 0.0 0.0; offset: 0 0;}
rel2 {relative: 1.0 1.0; offset: 0 0;}
image {normal: "bg3.png";}
@@ -292,18 +333,51 @@
fill { size {relative: 0.0 0.0; offset: 16 16;} }
}
}
- /* top */
- part {
- name: "top";
+ /* top */
+ part { name: "top";
type: IMAGE;
mouse_events: 0;
- description {
- state: "default" 0.0;
+ description { state: "default" 0.0;
rel1 {relative: 0.0 0.0; offset: 0 0;}
rel2 {relative: 1.0 0.0; offset: 0 170;}
image {normal: "backdrop.png";}
}
}
+ /* toolbar swallow */
+ part { name: "toolbar";
+ type: SWALLOW;
+ description { state: "default" 0.0;
+ rel1 {relative: 0.0 0.0; offset: 150 0;}
+ rel2 {relative: 1.0 0.0; offset: 0 45;}
+ }
+ }
+ /* tree swallow */
+ part { name: "tree";
+ type: SWALLOW;
+ description { state: "default" 0.0;
+ rel1 {relative: 0.0 0.0; offset: 3 55;}
+ rel2 {relative: 0.0 1.0; offset: 265 -2;}
+ }
+ }
+ /* consolle */
+ part { name: "con_bg";
+ type: RECT;
+ mouse_events: 0;
+ description { state: "default" 0.0;
+ color: 255 255 0 0;
+ rel1 {relative: 1.0 1.0; offset: 0 -100; to: "tree";}
+ rel2 {relative: 1.0 1.0; offset: 0 -5;}
+ }
+ }
+ LINE("line1", 240, -10)
+ LINE("line2", 220, -32)
+ LINE("line3", 190, -54)
+ LINE("line4", 160, -76)
+ LINE("line5", 130, -98)
+ LINE("line6", 100, -120)
+ LINE("line7", 70, -142)
+ LINE("line8", 40, -164)
+
/* Frames hidden starter */
part {
name: "frames_starter";
@@ -318,7 +392,7 @@
}
//EXAMPLE: FRAME (name, w, h, img_name, place_after)
FRAME("group", 230, 70, "lbl_group.png", 14, 50, "frames_starter")
- FRAME("part", 230, 240, "lbl_part.png", 14, 35,"group_frame")
+ FRAME("part", 230, 70, "lbl_part.png", 14, 35,"group_frame")
FRAME("description", 260, 130, "lbl_desc.png", 14, 42, "part_frame")
FRAME("rect", 120, 77, "lbl_rect.png", 14, 72, "description_frame")
FRAME("text", 250, 180, "lbl_text.png", 14, 36, "rect_frame")
@@ -330,17 +404,6 @@
FRAME("script", 250, 250, "lbl_script.png", 14, 45, "program_frame")
}
programs {
- FRAME_PROG("group");
- FRAME_PROG("part");
- FRAME_PROG("description");
- FRAME_PROG("rect");
- FRAME_PROG("text");
- FRAME_PROG("image");
- FRAME_PROG("gradient");
- FRAME_PROG("fill");
- FRAME_PROG("position");
- FRAME_PROG("program");
- FRAME_PROG("script");
program{
name: "set_bg1";
signal: "set_bg1";
@@ -369,6 +432,17 @@
action: STATE_SET "default" 0.3;
target: "background";
}
+ FRAME_PROG("group");
+ FRAME_PROG("part");
+ FRAME_PROG("description");
+ FRAME_PROG("rect");
+ FRAME_PROG("text");
+ FRAME_PROG("image");
+ FRAME_PROG("gradient");
+ FRAME_PROG("fill");
+ FRAME_PROG("position");
+ FRAME_PROG("program");
+ FRAME_PROG("script");
}
}
/************************************************************/
@@ -659,118 +733,35 @@
}
}
/************************************************************/
- /* Consolle */
+ /* ELM LABEL */
/************************************************************/
- group{
- name: "Consolle";
+ group { name: "elm/label/base/default";
+ styles
+ {
+ style { name: "textblock_style";
+ base: "font=Sans font_size=11 align=left color=#666 wrap=word";
+
+ tag: "br" "\n";
+ tag: "hilight" "+ font=Sans:style=Bold";
+ tag: "b" "+ font=Sans:style=Bold";
+ tag: "tab" "\t";
+ }
+ }
parts {
- part {
- name: "bg";
- type: RECT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- color: 255 255 0 0;
- rel1 {relative: 0.0 0.0;}
- rel2 {relative: 1.0 1.0;}
- }
- }
- part {
- name: "signal_swallow";
- type: SWALLOW;
- mouse_events: 1;
- description {
- state: "default" 0.0;
- color: 80 80 80 0;
- rel1 {relative: 0.0 1.0; to: "bg";}
- rel2 {relative: 1.0 1.4; to: "bg";}
- }
- }
- part {
- name: "line1";
- type: TEXT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- color: 80 80 80 220;
- rel1 {relative: 0.0 0.8; offset: 5 0; to: "bg";}
- rel2 {relative: 1.0 1.0; to: "bg";}
- text{
- text: "";
- font: "vera.ttf";
- size: 10;
- align: 0.0 0.5;
- }
- }
- }
- part {
- name: "line2";
- type: TEXT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- color: 80 80 80 190;
- rel1 {relative: 0.0 0.6; offset: 5 0; to: "bg";}
- rel2 {relative: 1.0 0.8; to: "bg";}
- text{
- text: "";
- font: "vera.ttf";
- size: 10;
- align: 0.0 0.5;
- }
- }
- }
- part {
- name: "line3";
- type: TEXT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- color: 80 80 80 160;
- rel1 {relative: 0.0 0.4; offset: 5 0; to: "bg";}
- rel2 {relative: 1.0 0.6; to: "bg";}
- text{
- text: "";
- font: "vera.ttf";
- size: 10;
- align: 0.0 0.5;
- }
- }
- }
- part {
- name: "line4";
- type: TEXT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- color: 80 80 80 130;
- rel1 {relative: 0.0 0.2; offset: 5 0; to: "bg";}
- rel2 {relative: 1.0 0.4; to: "bg";}
- text{
- text: "";
- font: "vera.ttf";
- size: 10;
- align: 0.0 0.5;
- }
- }
- }
- part {
- name: "line5";
- type: TEXT;
- mouse_events: 0;
- description {
- state: "default" 0.0;
- color: 80 80 80 100;
- rel1 {relative: 0.0 0.0; offset: 5 0; to: "bg";}
- rel2 {relative: 1.0 0.2; to: "bg";}
- text{
- text: "";
- font: "vera.ttf";
- size: 10;
- align: 0.0 0.5;
- }
- }
- }
+ part { name: "elm.text";
+ type: TEXTBLOCK;
+ mouse_events: 0;
+ scale: 1;
+ description { state: "default" 0.0;
+ text {
+ style: "textblock_style";
+ min: 1 1;
+ }
+ }
+ }
}
}
+
+#include "elemele.edc"
+
}
Added: branches/edje_editor_elm/data/elemele.edc
Added: branches/edje_editor_elm/data/images/add.png
Property changes on: branches/edje_editor_elm/data/images/add.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/edje_editor_elm/data/images/dia_warning.png
Property changes on: branches/edje_editor_elm/data/images/dia_warning.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/edje_editor_elm/data/images/doc_new.png
Property changes on: branches/edje_editor_elm/data/images/doc_new.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/edje_editor_elm/data/images/doc_open.png
Property changes on: branches/edje_editor_elm/data/images/doc_open.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/edje_editor_elm/data/images/doc_save.png
Property changes on: branches/edje_editor_elm/data/images/doc_save.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/edje_editor_elm/data/images/doc_save_as.png
Property changes on: branches/edje_editor_elm/data/images/doc_save_as.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/edje_editor_elm/data/images/elm_arrow_down.png
Property changes on: branches/edje_editor_elm/data/images/elm_arrow_down.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/edje_editor_elm/data/images/elm_frame.png
Property changes on: branches/edje_editor_elm/data/images/elm_frame.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/edje_editor_elm/data/images/go-down.png
Property changes on: branches/edje_editor_elm/data/images/go-down.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/edje_editor_elm/data/images/go-up.png
Property changes on: branches/edje_editor_elm/data/images/go-up.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/edje_editor_elm/data/images/media-playback-pause.png
Property changes on: branches/edje_editor_elm/data/images/media-playback-pause.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/edje_editor_elm/data/images/media-playback-start.png
Property changes on: branches/edje_editor_elm/data/images/media-playback-start.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/edje_editor_elm/data/images/preferences-system.png
Property changes on: branches/edje_editor_elm/data/images/preferences-system.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/edje_editor_elm/data/images/remove.png
Property changes on: branches/edje_editor_elm/data/images/remove.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/edje_editor_elm/data/images/system-log-out.png
Property changes on: branches/edje_editor_elm/data/images/system-log-out.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/edje_editor_elm/src/bin/Makefile.am
===================================================================
--- branches/edje_editor_elm/src/bin/Makefile.am 2009-08-03 11:50:07 UTC (rev 41568)
+++ branches/edje_editor_elm/src/bin/Makefile.am 2009-08-03 11:59:15 UTC (rev 41569)
@@ -4,63 +4,29 @@
INCLUDES = \
-Wall -g \
-I$(top_srcdir)/lib \
-@ECORE_CFLAGS@ \
-@ETK_CFLAGS@ \
-@EVAS_CFLAGS@ \
-@EDJE_CFLAGS@
+@ELEMENTARY_CFLAGS@
bin_PROGRAMS = edje_editor
-edje_editor_INCLUDES = \
-edje_editor_images.h \
+edje_editor_SOURCES = \
+edje_editor_window.c \
+edje_editor_window.h \
+edje_editor_tree.c \
edje_editor_tree.h \
-edje_editor_group.h \
-edje_editor_part.h \
-edje_editor_state.h \
-edje_editor_position.h \
-edje_editor_text.h \
-edje_editor_rect.h \
-edje_editor_program.h \
-edje_editor_script.h \
-edje_editor_toolbar.h \
+edje_editor_canvas.c \
edje_editor_canvas.h \
-edje_editor_consolle.h \
+edje_editor_toolbar.c \
+edje_editor_toolbar.h \
+edje_editor_dialogs.c \
edje_editor_dialogs.h \
-edje_editor_window.h \
-edje_editor_gradient.h \
-edje_editor_fill.h \
-edje_editor_spectra.h \
-edje_editor_spectra_widget.h \
-edje_editor_tree_model_spectra.h \
-edje_editor_data.h \
-edje_editor_colors.h \
-main.h
-
-
-edje_editor_SOURCES = \
-edje_editor_images.c \
-edje_editor_tree.c \
+edje_editor_consolle.c \
+edje_editor_consolle.h \
edje_editor_group.c \
+edje_editor_group.h \
edje_editor_part.c \
-edje_editor_state.c \
-edje_editor_position.c \
-edje_editor_text.c \
-edje_editor_rect.c \
-edje_editor_program.c \
-edje_editor_script.c \
-edje_editor_toolbar.c \
-edje_editor_canvas.c \
-edje_editor_consolle.c \
-edje_editor_dialogs.c \
-edje_editor_window.c \
-edje_editor_gradient.c \
-edje_editor_fill.c \
-edje_editor_spectra.c \
-edje_editor_spectra_widget.c \
-edje_editor_tree_model_spectra.c \
-edje_editor_data.c \
-edje_editor_colors.c \
+edje_editor_part.h \
main.c \
-$(edje_editor_INCLUDES)
+main.h
-edje_editor_LDADD = @ECORE_LIBS@ @ETK_LIBS@ @EVAS_LIBS@ @EDJE_LIBS@
+
+edje_editor_LDADD = @ELEMENTARY_LIBS@
Modified: branches/edje_editor_elm/src/bin/edje_editor_canvas.c
===================================================================
--- branches/edje_editor_elm/src/bin/edje_editor_canvas.c 2009-08-03 11:50:07 UTC (rev 41568)
+++ branches/edje_editor_elm/src/bin/edje_editor_canvas.c 2009-08-03 11:59:15 UTC (rev 41569)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2008 Davide Andreoli (see AUTHORS)
+/* Copyright (C) 2006-2009 Davide Andreoli (see AUTHORS)
*
* This file is part of Edje_editor.
* Edje_editor is free software: you can redistribute it and/or modify
@@ -15,9 +15,6 @@
* along with Edje_editor. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <Etk.h>
-#include <Edje.h>
-#include <Edje_Edit.h>
#include "main.h"
@@ -40,14 +37,14 @@
// MoveBox
if ((int)(long)data == DRAG_MOVEBOX)
{
- evas_pointer_output_xy_get(UI_evas, &mouse_x, &mouse_y);
+ evas_pointer_output_xy_get(evas_object_evas_get(ui.win), &mouse_x, &mouse_y);
_canvas_move_fake(mouse_x - dx, mouse_y + 16 - dy);
}
// Resize fake win
if ((int)(long)data == DRAG_MINIARROW)
{
- edje_object_part_geometry_get(EV_fakewin,"miniarrow", &x, &y, NULL, NULL);
+ edje_object_part_geometry_get(EV_fakewin, "miniarrow", &x, &y, NULL, NULL);
if (x < 0) x = 0;
if (y < 0) y = 0;
_canvas_resize_fake((int)x,(int)y);
@@ -56,116 +53,115 @@
// Move Rel1 Point
if ((int)(long)data == DRAG_REL1)
{
- evas_pointer_output_xy_get(UI_evas, &mouse_x, &mouse_y);
+ evas_pointer_output_xy_get(evas_object_evas_get(ui.win), &mouse_x, &mouse_y);
//Calc the rel1_relative_x value
evas_object_geometry_get(EV_rel1X_parent_handler, &parentx,
&parenty, &parentw, &parenth);
- edje_edit_state_rel1_relative_x_set(edje_o, Cur.part->string,
- Cur.state->string, (float)(mouse_x - parentx)/(float)parentw);
+ edje_edit_state_rel1_relative_x_set(ui.edje_o, cur.part,
+ cur.state, (float)(mouse_x - parentx)/(float)parentw);
//Calc the rel1_relative_y value
evas_object_geometry_get(EV_rel1Y_parent_handler, &parentx,
&parenty, &parentw, &parenth);
- edje_edit_state_rel1_relative_y_set(edje_o, Cur.part->string,
- Cur.state->string,(float)(mouse_y - parenty)/(float)parenth);
+ edje_edit_state_rel1_relative_y_set(ui.edje_o, cur.part,
+ cur.state,(float)(mouse_y - parenty)/(float)parenth);
- position_frame_update();
+ //~ position_frame_update();
+
}
// Move Rel2 Point
if ((int)(long)data == DRAG_REL2)
{
- evas_pointer_output_xy_get(UI_evas, &mouse_x, &mouse_y);
+ evas_pointer_output_xy_get(evas_object_evas_get(ui.win), &mouse_x, &mouse_y);
//Calc the rel2_relative_x value
evas_object_geometry_get(EV_rel2X_parent_handler,
&parentx, &parenty, &parentw, &parenth);
- edje_edit_state_rel2_relative_x_set(edje_o, Cur.part->string,
- Cur.state->string, (float)(mouse_x - parentx)/(float)parentw);
+ edje_edit_state_rel2_relative_x_set(ui.edje_o, cur.part,
+ cur.state, (float)(mouse_x - parentx)/(float)parentw);
//Calc the rel2_relative_y value
evas_object_geometry_get(EV_rel2Y_parent_handler, &parentx,
&parenty, &parentw, &parenth);
- edje_edit_state_rel2_relative_y_set(edje_o, Cur.part->string,
- Cur.state->string, (float)(mouse_y - parenty)/(float)parenth);
+ edje_edit_state_rel2_relative_y_set(ui.edje_o, cur.part,
+ cur.state, (float)(mouse_y - parenty)/(float)parenth);
- position_frame_update();
+ //~ position_frame_update(); TODO
}
// Move Move Handler
if ((int)(long)data == DRAG_MOVE)
{
- evas_pointer_output_xy_get(UI_evas, &mouse_x, &mouse_y);
+ evas_pointer_output_xy_get(evas_object_evas_get(ui.win), &mouse_x, &mouse_y);
//Calc the rel1_relative_x value
evas_object_geometry_get(EV_rel1X_parent_handler, &parentx,
&parenty, &parentw, &parenth);
- edje_edit_state_rel1_relative_x_set(edje_o,
- Cur.part->string, Cur.state->string,
+ edje_edit_state_rel1_relative_x_set(ui.edje_o, cur.part, cur.state,
(float)(mouse_x - parentx - dx)/(float)parentw);
//Calc the rel1_relative_y value
evas_object_geometry_get(EV_rel1Y_parent_handler, &parentx,
&parenty, &parentw, &parenth);
- edje_edit_state_rel1_relative_y_set(edje_o,
- Cur.part->string, Cur.state->string,
+ edje_edit_state_rel1_relative_y_set(ui.edje_o,
+ cur.part, cur.state,
(float)(mouse_y - parenty - dy)/(float)parenth);
//Calc the rel2_relative_x value
evas_object_geometry_get(EV_rel2X_parent_handler,
&parentx, &parenty, &parentw, &parenth);
- edje_edit_state_rel2_relative_x_set(edje_o,
- Cur.part->string, Cur.state->string,
+ edje_edit_state_rel2_relative_x_set(ui.edje_o,
+ cur.part, cur.state,
(float)(mouse_x - parentx - dx + dx2)/(float)parentw);
//Calc the rel2_relative_y value
evas_object_geometry_get(EV_rel2Y_parent_handler, &parentx,
&parenty, &parentw, &parenth);
- edje_edit_state_rel2_relative_y_set(edje_o,
- Cur.part->string, Cur.state->string,
+ edje_edit_state_rel2_relative_y_set(ui.edje_o,
+ cur.part, cur.state,
(float)(mouse_y - parenty - dy + dy2)/(float)parenth);
- position_frame_update();
+ //~ position_frame_update(); TODO
}
// Move First Gradient Point Handler
if ((int)(long)data == DRAG_GRAD_1 || (int)(long)data == DRAG_GRAD_2 )
{
- evas_pointer_output_xy_get(UI_evas, &mouse_x, &mouse_y);
+ evas_pointer_output_xy_get(evas_object_evas_get(ui.win), &mouse_x, &mouse_y);
evas_object_geometry_get(EV_focus_handler, &parentx, &parenty,
&parentw, &parenth);
//printf("GELLA %d %d %d %d [%f] [m %d %d]\n", fhx, fhy, fhw, fhh, (float)(mouse_x - fhx)/(float)fhx, mouse_x, mouse_y);
if ((int)(long)data == DRAG_GRAD_1)
{
- if (edje_edit_state_gradient_use_fill_get(edje_o, Cur.part->string,
- Cur.state->string))
+ if (edje_edit_state_gradient_use_fill_get(ui.edje_o, cur.part, cur.state))
{//Update fill origin
- edje_edit_state_fill_origin_relative_x_set(edje_o, Cur.part->string,
- Cur.state->string, (float)(mouse_x - parentx - dx)/(float)parentw);
- edje_edit_state_fill_origin_relative_y_set(edje_o, Cur.part->string,
- Cur.state->string, (float)(mouse_y - parenty - dy)/(float)parenth);
+ edje_edit_state_fill_origin_relative_x_set(ui.edje_o, cur.part,
+ cur.state, (float)(mouse_x - parentx - dx)/(float)parentw);
+ edje_edit_state_fill_origin_relative_y_set(ui.edje_o, cur.part,
+ cur.state, (float)(mouse_y - parenty - dy)/(float)parenth);
}
else
{//Update gradient rel
- edje_edit_state_gradient_rel1_relative_x_set(edje_o, Cur.part->string,
- Cur.state->string, (float)(mouse_x - parentx - dx)/(float)parentw);
- edje_edit_state_gradient_rel1_relative_y_set(edje_o, Cur.part->string,
- Cur.state->string, (float)(mouse_y - parenty - dy)/(float)parenth);
+ edje_edit_state_gradient_rel1_relative_x_set(ui.edje_o, cur.part,
+ cur.state, (float)(mouse_x - parentx - dx)/(float)parentw);
+ edje_edit_state_gradient_rel1_relative_y_set(ui.edje_o, cur.part,
+ cur.state, (float)(mouse_y - parenty - dy)/(float)parenth);
}
}
else
{
- if (edje_edit_state_gradient_use_fill_get(edje_o, Cur.part->string,
- Cur.state->string))
+ if (edje_edit_state_gradient_use_fill_get(ui.edje_o, cur.part,
+ cur.state))
{//Update fill origin
- edje_edit_state_fill_size_relative_x_set(edje_o, Cur.part->string,
- Cur.state->string, (float)(mouse_x - parentx - dx)/(float)parentw);
- edje_edit_state_fill_size_relative_y_set(edje_o, Cur.part->string,
- Cur.state->string, (float)(mouse_y - parenty - dy)/(float)parenth);
+ edje_edit_state_fill_size_relative_x_set(ui.edje_o, cur.part,
+ cur.state, (float)(mouse_x - parentx - dx)/(float)parentw);
+ edje_edit_state_fill_size_relative_y_set(ui.edje_o, cur.part,
+ cur.state, (float)(mouse_y - parenty - dy)/(float)parenth);
}
else
{//Update gradient rel
- edje_edit_state_gradient_rel2_relative_x_set(edje_o, Cur.part->string,
- Cur.state->string, (float)(mouse_x - parentx - dx)/(float)parentw);
- edje_edit_state_gradient_rel2_relative_y_set(edje_o, Cur.part->string,
- Cur.state->string, (float)(mouse_y - parenty - dy)/(float)parenth);
+ edje_edit_state_gradient_rel2_relative_x_set(ui.edje_o, cur.part,
+ cur.state, (float)(mouse_x - parentx - dx)/(float)parentw);
+ edje_edit_state_gradient_rel2_relative_y_set(ui.edje_o, cur.part,
+ cur.state, (float)(mouse_y - parenty - dy)/(float)parenth);
}
}
- gradient_frame_update();
- fill_frame_update();
+ //~ gradient_frame_update(); TODO
+ //~ fill_frame_update(); TODO
}
canvas_redraw();
@@ -203,11 +199,10 @@
evas_object_event_callback_add(EV_move_handler, EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb,(void*)DRAG_MOVE);
evas_object_geometry_get(EV_rel1_handler, &x, &y, NULL, NULL);
- evas_pointer_output_xy_get(UI_evas, &mx, &my);
+ evas_pointer_output_xy_get(evas_object_evas_get(ui.win), &mx, &my);
dx = mx - x - 3;
dy = my - y - 3;
- edje_object_part_geometry_get(edje_o, Cur.part->string, NULL, NULL,
- &dx2, &dy2);
+ edje_object_part_geometry_get(ui.edje_o, cur.part, NULL, NULL, &dx2, &dy2);
evas_object_show(EV_rel1X_align_guide);
evas_object_raise(EV_rel1X_align_guide);
@@ -224,7 +219,7 @@
evas_object_event_callback_add(EV_movebox, EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb, (void*)DRAG_MOVEBOX);
evas_object_geometry_get(EV_movebox, &x, &y, NULL, NULL);
- evas_pointer_output_xy_get(UI_evas, &mx, &my);
+ evas_pointer_output_xy_get(evas_object_evas_get(ui.win), &mx, &my);
dx = mx - x;
dy = my - y;
}
@@ -234,7 +229,7 @@
evas_object_event_callback_add(EV_grad1_handler, EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb, (void*)DRAG_GRAD_1);
evas_object_geometry_get(EV_grad1_handler, &x, &y, NULL, NULL);
- evas_pointer_output_xy_get(UI_evas, &mx, &my);
+ evas_pointer_output_xy_get(evas_object_evas_get(ui.win), &mx, &my);
dx = mx - x;
dy = my - y;
}
@@ -243,7 +238,7 @@
evas_object_event_callback_add(EV_grad2_handler, EVAS_CALLBACK_MOUSE_MOVE,
_canvas_drag_cb, data);
evas_object_geometry_get(EV_grad2_handler, &x, &y, NULL, NULL);
- evas_pointer_output_xy_get(UI_evas, &mx, &my);
+ evas_pointer_output_xy_get(evas_object_evas_get(ui.win), &mx, &my);
dx = mx - x;
dy = my - y;
}
@@ -315,22 +310,22 @@
int o1x, o1y, o2x, o2y;
const char *state;
- state = edje_edit_part_selected_state_get(edje_o, Cur.part->string);
- o1x = edje_edit_state_rel1_offset_x_get(edje_o, Cur.part->string, state);
- o1y = edje_edit_state_rel1_offset_y_get(edje_o, Cur.part->string, state);
- o2x = edje_edit_state_rel2_offset_x_get(edje_o, Cur.part->string, state);
- o2y = edje_edit_state_rel2_offset_y_get(edje_o, Cur.part->string, state);
+ state = edje_edit_part_selected_state_get(ui.edje_o, cur.part);
+ o1x = edje_edit_state_rel1_offset_x_get(ui.edje_o, cur.part, state);
+ o1y = edje_edit_state_rel1_offset_y_get(ui.edje_o, cur.part, state);
+ o2x = edje_edit_state_rel2_offset_x_get(ui.edje_o, cur.part, state);
+ o2y = edje_edit_state_rel2_offset_y_get(ui.edje_o, cur.part, state);
edje_edit_string_free(state);
// If a part is selected draw the Focus Handler (only the yellow box)
- if (etk_string_length_get(Cur.part))//&& Cur.ep->current_state)
+ if (cur.part)//&& Cur.ep->current_state)
{
int wx, wy;
int px,py,pw,ph;
evas_object_geometry_get(EV_fakewin,&wx,&wy,NULL,NULL);
- edje_object_part_geometry_get(edje_o, Cur.part->string, &px, &py, &pw, &ph);
+ edje_object_part_geometry_get(ui.edje_o, cur.part, &px, &py, &pw, &ph);
//printf("CURRENT STATE: %s - %d\n",state,o1x);
@@ -342,7 +337,7 @@
pw + o1x - o2x + 2,
ph + o1y - o2y + 2);
- if (edje_edit_part_type_get(edje_o, Cur.part->string) == EDJE_PART_TYPE_SWALLOW)
+ if (edje_edit_part_type_get(ui.edje_o, cur.part) == EDJE_PART_TYPE_SWALLOW)
edje_object_signal_emit(EV_focus_handler, "SwallShow", "edje_editor");
else
edje_object_signal_emit(EV_focus_handler, "SwallHide", "edje_editor");
@@ -354,7 +349,7 @@
// if a part description is selected draw also
// the parent handlers (the red and blue lines)
- if (etk_string_length_get(Cur.state) && etk_string_length_get(Cur.part))
+ if (cur.state && cur.part)
{
int px,py,pw,ph;
int rx,ry,rw,rh;
@@ -363,7 +358,7 @@
//Get the geometry of fakewin
evas_object_geometry_get(EV_fakewin,&fx,&fy,&fw,&fh);
- edje_object_part_geometry_get(edje_o, Cur.part->string, &px, &py, &pw, &ph);
+ edje_object_part_geometry_get(ui.edje_o, cur.part, &px, &py, &pw, &ph);
// printf("FW geom: %d %d %d %d\n",fx,fy,fw,fh);
// printf("PA geom: %d %d %d %d\n",px,py,pw,ph);
@@ -388,11 +383,10 @@
evas_object_raise(EV_move_handler);
//draw Rel1X_ParentH (top line)
- rel = edje_edit_state_rel1_to_x_get(edje_o, Cur.part->string,
- Cur.state->string);
+ rel = edje_edit_state_rel1_to_x_get(ui.edje_o, cur.part, cur.state);
if(rel)
{
- edje_object_part_geometry_get(edje_o, rel, &rx, &ry, &rw, &rh);
+ edje_object_part_geometry_get(ui.edje_o, rel, &rx, &ry, &rw, &rh);
ParentX = fx + rx;
ParentY = fy + ry;
ParentW = rw;
@@ -406,9 +400,9 @@
ParentX+ParentW, ParentY);
//draw Rel1Y_ParentH (left line)
- if((rel = edje_edit_state_rel1_to_y_get(edje_o, Cur.part->string, Cur.state->string)))
+ if((rel = edje_edit_state_rel1_to_y_get(ui.edje_o, cur.part, cur.state)))
{
- edje_object_part_geometry_get(edje_o, rel, &rx, &ry, &rw, &rh);
+ edje_object_part_geometry_get(ui.edje_o, rel, &rx, &ry, &rw, &rh);
ParentX = fx + rx;
ParentY = fy + ry;
ParentW = rw;
@@ -422,9 +416,9 @@
ParentX, ParentY+ParentH);
//draw Rel2X_ParentH (bottom line)
- if((rel = edje_edit_state_rel2_to_x_get(edje_o, Cur.part->string, Cur.state->string)))
+ if((rel = edje_edit_state_rel2_to_x_get(ui.edje_o, cur.part, cur.state)))
{
- edje_object_part_geometry_get(edje_o, rel, &rx, &ry, &rw, &rh);
+ edje_object_part_geometry_get(ui.edje_o, rel, &rx, &ry, &rw, &rh);
ParentX = fx + rx;
ParentY = fy + ry;
ParentW = rw;
@@ -438,9 +432,9 @@
ParentX+ParentW, ParentY+ParentH);
//draw Rel2Y_ParentH (right line)
- if((rel = edje_edit_state_rel2_to_y_get(edje_o, Cur.part->string, Cur.state->string)))
+ if((rel = edje_edit_state_rel2_to_y_get(ui.edje_o, cur.part, cur.state)))
{
- edje_object_part_geometry_get(edje_o, rel, &rx, &ry, &rw, &rh);
+ edje_object_part_geometry_get(ui.edje_o, rel, &rx, &ry, &rw, &rh);
ParentX = fx + rx;
ParentY = fy + ry;
ParentW = rw;
@@ -462,50 +456,48 @@
evas_object_line_xy_set(EV_rel2Y_align_guide, 0, py + 2, 2000, py + 2); //TODO FIX 2000
//Place the gradient handler
- if (edje_edit_part_type_get(edje_o, Cur.part->string) == EDJE_PART_TYPE_GRADIENT)
+ if (edje_edit_part_type_get(ui.edje_o, cur.part) == EDJE_PART_TYPE_GRADIENT)
{
double gx, gy, gox, goy;
const char *type;
int p1x,p1y,p2x,p2y;
- edje_object_part_geometry_get(edje_o, Cur.part->string, &ParentX, &ParentY, &ParentW, &ParentH);
- type = edje_edit_state_gradient_type_get(edje_o, Cur.part->string,
- Cur.state->string);
+ edje_object_part_geometry_get(ui.edje_o, cur.part, &ParentX, &ParentY, &ParentW, &ParentH);
+ type = edje_edit_state_gradient_type_get(ui.edje_o, cur.part,
+ cur.state);
//First point
- if (edje_edit_state_gradient_use_fill_get(edje_o, Cur.part->string,
- Cur.state->string))
+ if (edje_edit_state_gradient_use_fill_get(ui.edje_o, cur.part, cur.state))
{
- gx = edje_edit_state_fill_origin_relative_x_get(edje_o, Cur.part->string, Cur.state->string);
- gy = edje_edit_state_fill_origin_relative_y_get(edje_o, Cur.part->string, Cur.state->string);
- gox = edje_edit_state_fill_origin_offset_x_get(edje_o, Cur.part->string, Cur.state->string);
- goy = edje_edit_state_fill_origin_offset_y_get(edje_o, Cur.part->string, Cur.state->string);
+ gx = edje_edit_state_fill_origin_relative_x_get(ui.edje_o, cur.part, cur.state);
+ gy = edje_edit_state_fill_origin_relative_y_get(ui.edje_o, cur.part, cur.state);
+ gox = edje_edit_state_fill_origin_offset_x_get(ui.edje_o, cur.part, cur.state);
+ goy = edje_edit_state_fill_origin_offset_y_get(ui.edje_o, cur.part, cur.state);
}
else
{
- gx = edje_edit_state_gradient_rel1_relative_x_get(edje_o, Cur.part->string, Cur.state->string);
- gy = edje_edit_state_gradient_rel1_relative_y_get(edje_o, Cur.part->string, Cur.state->string);
- gox = edje_edit_state_gradient_rel1_offset_x_get(edje_o, Cur.part->string, Cur.state->string);
- goy = edje_edit_state_gradient_rel1_offset_y_get(edje_o, Cur.part->string, Cur.state->string);
+ gx = edje_edit_state_gradient_rel1_relative_x_get(ui.edje_o, cur.part, cur.state);
+ gy = edje_edit_state_gradient_rel1_relative_y_get(ui.edje_o, cur.part, cur.state);
+ gox = edje_edit_state_gradient_rel1_offset_x_get(ui.edje_o, cur.part, cur.state);
+ goy = edje_edit_state_gradient_rel1_offset_y_get(ui.edje_o, cur.part, cur.state);
}
p1x = ParentX + fx + (pw * gx) + gox;
p1y = ParentY + fy + (ph * gy) + goy;
evas_object_move(EV_grad1_handler, p1x, p1y);
//Second point
- if (edje_edit_state_gradient_use_fill_get(edje_o, Cur.part->string,
- Cur.state->string))
+ if (edje_edit_state_gradient_use_fill_get(ui.edje_o, cur.part, cur.state))
{
- gx = edje_edit_state_fill_size_relative_x_get(edje_o, Cur.part->string, Cur.state->string);
- gy = edje_edit_state_fill_size_relative_y_get(edje_o, Cur.part->string, Cur.state->string);
- gox = edje_edit_state_fill_size_offset_x_get(edje_o, Cur.part->string, Cur.state->string);
- goy = edje_edit_state_fill_size_offset_y_get(edje_o, Cur.part->string, Cur.state->string);
+ gx = edje_edit_state_fill_size_relative_x_get(ui.edje_o, cur.part, cur.state);
+ gy = edje_edit_state_fill_size_relative_y_get(ui.edje_o, cur.part, cur.state);
+ gox = edje_edit_state_fill_size_offset_x_get(ui.edje_o, cur.part, cur.state);
+ goy = edje_edit_state_fill_size_offset_y_get(ui.edje_o, cur.part, cur.state);
}
else
{
- gx = edje_edit_state_gradient_rel2_relative_x_get(edje_o, Cur.part->string, Cur.state->string);
- gy = edje_edit_state_gradient_rel2_relative_y_get(edje_o, Cur.part->string, Cur.state->string);
- gox = edje_edit_state_gradient_rel2_offset_x_get(edje_o, Cur.part->string, Cur.state->string);
- goy = edje_edit_state_gradient_rel2_offset_y_get(edje_o, Cur.part->string, Cur.state->string);
+ gx = edje_edit_state_gradient_rel2_relative_x_get(ui.edje_o, cur.part, cur.state);
+ gy = edje_edit_state_gradient_rel2_relative_y_get(ui.edje_o, cur.part, cur.state);
+ gox = edje_edit_state_gradient_rel2_offset_x_get(ui.edje_o, cur.part, cur.state);
+ goy = edje_edit_state_gradient_rel2_offset_y_get(ui.edje_o, cur.part, cur.state);
}
p2x = ParentX + fx + (pw * gx) + gox;
p2y = ParentY + fy + (ph * gy) + goy;
@@ -567,8 +559,8 @@
int min_w = 0;
int min_h = 0;
- edje_object_size_min_get(edje_o, &min_w, &min_h);
- edje_object_size_max_get(edje_o, &max_w, &max_h);
+ edje_object_size_min_get(ui.edje_o, &min_w, &min_h);
+ edje_object_size_max_get(ui.edje_o, &max_w, &max_h);
if (max_w > 0 && w > max_w) w = max_w;
if (max_h > 0 && h > max_h) h = max_h;
@@ -583,9 +575,8 @@
evas_object_resize(EV_movebox, w+8, 14);
edje_object_part_drag_value_set(EV_fakewin, "miniarrow",
(double)w, (double)h);
- char buf[100];
- snprintf(buf,100,"Current size: %d x %d",w,h);
- etk_label_set(ETK_LABEL(UI_CurrentGroupSizeLabel), buf);
+
+ group_size_update(w, h);
}
static void
@@ -601,12 +592,16 @@
void
canvas_prepare(void)
{
+ Evas *evas;
+
+ evas = evas_object_evas_get(ui.win);
+
//Create Focus Handler
- EV_focus_handler = edje_object_add(UI_evas);
+ EV_focus_handler = edje_object_add(evas);
edje_object_file_set(EV_focus_handler, EdjeFile, "FocusH");
//Create Rel1 handler
- EV_rel1_handler = edje_object_add(UI_evas);
+ EV_rel1_handler = edje_object_add(evas);
edje_object_file_set(EV_rel1_handler, EdjeFile, "Rel1H");
edje_object_signal_callback_add(EV_rel1_handler, "START_DRAG", "rel1",
_canvas_drag_start_cb, (void*)DRAG_REL1);
@@ -614,7 +609,7 @@
_canvas_drag_end_cb, (void*)DRAG_REL1);
//Create Rel2 handler
- EV_rel2_handler = edje_object_add(UI_evas);
+ EV_rel2_handler = edje_object_add(evas);
edje_object_file_set(EV_rel2_handler, EdjeFile, "Rel2H");
edje_object_signal_callback_add(EV_rel2_handler, "START_DRAG", "rel2",
_canvas_drag_start_cb, (void*)DRAG_REL2);
@@ -622,7 +617,7 @@
_canvas_drag_end_cb, (void*)DRAG_REL2);
//Create Move handler
- EV_move_handler = edje_object_add(UI_evas);
+ EV_move_handler = edje_object_add(evas);
edje_object_file_set(EV_move_handler, EdjeFile, "MoveH");
edje_object_signal_callback_add(EV_move_handler, "START_DRAG", "MoveH",
_canvas_drag_start_cb, (void*)DRAG_MOVE);
@@ -630,49 +625,49 @@
_canvas_drag_end_cb, (void*)DRAG_MOVE);
//Create two Gradient handlers
- EV_grad1_handler = edje_object_add(UI_evas);
+ EV_grad1_handler = edje_object_add(evas);
edje_object_file_set(EV_grad1_handler, EdjeFile, "GradH");
edje_object_signal_callback_add(EV_grad1_handler, "START_DRAG", "GradH",
_canvas_drag_start_cb, (void*)DRAG_GRAD_1);
edje_object_signal_callback_add(EV_grad1_handler, "END_DRAG", "GradH",
_canvas_drag_end_cb, (void*)DRAG_GRAD_1);
- EV_grad2_handler = edje_object_add(UI_evas);
+ EV_grad2_handler = edje_object_add(evas);
edje_object_file_set(EV_grad2_handler, EdjeFile, "GradH");
edje_object_signal_callback_add(EV_grad2_handler, "START_DRAG", "GradH",
_canvas_drag_start_cb, (void*)DRAG_GRAD_2);
edje_object_signal_callback_add(EV_grad2_handler, "END_DRAG", "GradH",
_canvas_drag_end_cb, (void*)DRAG_GRAD_2);
//Create Gradient line
- EV_gradient_line = evas_object_line_add(UI_evas);
+ EV_gradient_line = evas_object_line_add(evas);
evas_object_color_set(EV_gradient_line, 42, 42, 42, 200);
//Create Parent Handlers
- EV_rel1X_parent_handler = evas_object_line_add(UI_evas);
+ EV_rel1X_parent_handler = evas_object_line_add(evas);
evas_object_color_set(EV_rel1X_parent_handler, 255, 0, 0, 200);
- EV_rel1Y_parent_handler = evas_object_line_add(UI_evas);
+ EV_rel1Y_parent_handler = evas_object_line_add(evas);
evas_object_color_set(EV_rel1Y_parent_handler, 255, 0, 0, 200);
- EV_rel2X_parent_handler = evas_object_line_add(UI_evas);
+ EV_rel2X_parent_handler = evas_object_line_add(evas);
evas_object_color_set(EV_rel2X_parent_handler, 0, 0, 255, 200);
- EV_rel2Y_parent_handler = evas_object_line_add(UI_evas);
+ EV_rel2Y_parent_handler = evas_object_line_add(evas);
evas_object_color_set(EV_rel2Y_parent_handler, 0, 0, 255, 200);
//Create Align Guides
- EV_rel1X_align_guide = evas_object_line_add(UI_evas);
+ EV_rel1X_align_guide = evas_object_line_add(evas);
evas_object_color_set(EV_rel1X_align_guide, 180, 0, 0, 180);
- EV_rel1Y_align_guide = evas_object_line_add(UI_evas);
+ EV_rel1Y_align_guide = evas_object_line_add(evas);
evas_object_color_set(EV_rel1Y_align_guide, 180, 0, 0, 180);
- EV_rel2X_align_guide = evas_object_line_add(UI_evas);
+ EV_rel2X_align_guide = evas_object_line_add(evas);
evas_object_color_set(EV_rel2X_align_guide, 0, 0, 180, 180);
- EV_rel2Y_align_guide = evas_object_line_add(UI_evas);
+ EV_rel2Y_align_guide = evas_object_line_add(evas);
evas_object_color_set(EV_rel2Y_align_guide, 0, 0, 180, 180);
// Create Fake win
- EV_fakewin = edje_object_add(UI_evas);
+ EV_fakewin = edje_object_add(evas);
edje_object_file_set(EV_fakewin, EdjeFile, "FakeWin");
edje_object_signal_callback_add(EV_fakewin,"DRAG","miniarrow",
_canvas_drag_cb, (void*)DRAG_MINIARROW);
@@ -680,7 +675,7 @@
_canvas_drag_end_cb, (void*)DRAG_MINIARROW);
// Create MoveBox
- EV_movebox = evas_object_rectangle_add(UI_evas);
+ EV_movebox = evas_object_rectangle_add(evas);
evas_object_color_set(EV_movebox, 0, 0, 0, 0);
evas_object_event_callback_add(EV_movebox, EVAS_CALLBACK_MOUSE_DOWN,
_canvas_drag_start_cb, (void*)DRAG_MOVEBOX);
@@ -688,7 +683,7 @@
_canvas_drag_end_cb, (void*)DRAG_MOVEBOX);
//Place Fakewin
- _canvas_move_fake(TREE_WIDTH + 15, 75);
+ _canvas_move_fake(300, 75);
_canvas_resize_fake(200, 200);
}
@@ -697,8 +692,8 @@
{
int x, y, w, h;
- //printf("DRAW ALL\n");
- if (etk_string_length_get(Cur.group))
+ //~ printf("DRAW ALL\n");
+ if (cur.group)
{
//Get the geometry of fakewin
evas_object_geometry_get(EV_fakewin,&x,&y,&w,&h);
@@ -708,8 +703,8 @@
evas_object_geometry_get(EV_fakewin,&x,&y,&w,&h);
//place edje editing object
- evas_object_move(edje_o, x, y);
- evas_object_resize(edje_o, w+1, h);
+ evas_object_move(ui.edje_o, x, y);
+ evas_object_resize(ui.edje_o, w+1, h);
evas_object_show(EV_fakewin);
evas_object_show(EV_movebox);
@@ -717,7 +712,7 @@
evas_object_raise(EV_movebox);
// evas_object_raise(focus_handler);
- if (etk_string_length_get(Cur.part))
+ if (cur.part)
{
_canvas_draw_focus();
return;
Modified: branches/edje_editor_elm/src/bin/edje_editor_canvas.h
===================================================================
--- branches/edje_editor_elm/src/bin/edje_editor_canvas.h 2009-08-03 11:50:07 UTC (rev 41568)
+++ branches/edje_editor_elm/src/bin/edje_editor_canvas.h 2009-08-03 11:59:15 UTC (rev 41569)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2008 Davide Andreoli (see AUTHORS)
+/* Copyright (C) 2006-2009 Davide Andreoli (see AUTHORS)
*
* This file is part of Edje_editor.
* Edje_editor is free software: you can redistribute it and/or modify
@@ -15,8 +15,8 @@
* along with Edje_editor. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _EDJE_EDITOR_EVAS_H_
-#define _EDJE_EDITOR_EVAS_H_
+#ifndef _EDJE_EDITOR_CANVAS_H_
+#define _EDJE_EDITOR_CANVAS_H_
Evas_Object *EV_fakewin; //The simple window implementation
Evas_Object *EV_movebox; //The object used for moving fakewin
Modified: branches/edje_editor_elm/src/bin/edje_editor_consolle.c
===================================================================
--- branches/edje_editor_elm/src/bin/edje_editor_consolle.c 2009-08-03 11:50:07 UTC (rev 41568)
+++ branches/edje_editor_elm/src/bin/edje_editor_consolle.c 2009-08-03 11:59:15 UTC (rev 41569)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2008 Davide Andreoli (see AUTHORS)
+/* Copyright (C) 2006-2009 Davide Andreoli (see AUTHORS)
*
* This file is part of Edje_editor.
* Edje_editor is free software: you can redistribute it and/or modify
@@ -15,149 +15,40 @@
* along with Edje_editor. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <string.h>
-#include <Etk.h>
-#include <Edje.h>
-#include <Edje_Edit.h>
#include "main.h"
-/*** Locals ***/
-static void _consolle_entry_item_append_ifnotexist(Etk_Widget *combo_entry, const char *text);
-static Etk_Widget* _create_signal_embed(void);
-static Etk_Widget *UI_SignalEmitEntry;
-static Etk_Widget *UI_SourceEmitEntry;
-
/*** Callbacks ***/
-Etk_Bool
-_consolle_button_click_cb(Etk_Button *button, void *data)
-{
- const char *sig, *sou;
+//~ Etk_Bool
+//~ _consolle_button_click_cb(Etk_Button *button, void *data)
+//~ {
+ //~ const char *sig, *sou;
+//~
+ //~ sig = etk_entry_text_get(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SignalEmitEntry))));
+ //~ sou = etk_entry_text_get(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SourceEmitEntry))));
+//~
+ //~ edje_object_signal_emit(edje_o, sig, sou);
+//~
+ //~ _consolle_entry_item_append_ifnotexist(UI_SignalEmitEntry, sig);
+ //~ _consolle_entry_item_append_ifnotexist(UI_SourceEmitEntry, sou);
+//~
+ //~ return ETK_TRUE;
+//~ }
- sig = etk_entry_text_get(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SignalEmitEntry))));
- sou = etk_entry_text_get(ETK_ENTRY(etk_combobox_entry_entry_get(ETK_COMBOBOX_ENTRY(UI_SourceEmitEntry))));
-
- edje_object_signal_emit(edje_o, sig, sou);
-
- _consolle_entry_item_append_ifnotexist(UI_SignalEmitEntry, sig);
- _consolle_entry_item_append_ifnotexist(UI_SourceEmitEntry, sou);
-
- return ETK_TRUE;
-}
-
-Etk_Bool
-_consolle_combobox_entry_activated_cb(Etk_Combobox_Entry *combo, void *data)
-{
- Etk_Combobox_Entry_Item *item;
- Etk_Widget *entry;
- char *str;
-
- entry = etk_combobox_entry_entry_get(combo);
- item = etk_combobox_entry_active_item_get(combo);
-
- str = etk_combobox_entry_item_field_get(item, 0);
- etk_entry_text_set(ETK_ENTRY(entry), str);
-
- return ETK_TRUE;
-}
-
-
-/*** Internals ***/
-static void
-_consolle_entry_item_append_ifnotexist(Etk_Widget *combo_entry, const char *text)
-{
- Etk_Combobox_Entry_Item *item;
- char *str;
-
- if (!text || strlen(text) < 1) return;
-
- item = etk_combobox_entry_first_item_get(ETK_COMBOBOX_ENTRY(combo_entry));
- while (item)
- {
- str = etk_combobox_entry_item_field_get(item, 0);
- if (!strcmp(str, text))
- return;
- item = etk_combobox_entry_item_next_get(item);
- }
-
- etk_combobox_entry_item_append(ETK_COMBOBOX_ENTRY(combo_entry), text);
-}
-
-static Etk_Widget*
-_create_signal_embed(void)
-{
- Etk_Widget *hbox;
- Etk_Widget *label;
- Etk_Widget *button;
-
- //hbox
- hbox = etk_hbox_new(ETK_FALSE, 3);
-
- //UI_SignalEmitEntry
- label = etk_label_new("<b>Signal</b>");
- etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
- UI_SignalEmitEntry = etk_combobox_entry_new();
- etk_combobox_entry_items_height_set(ETK_COMBOBOX_ENTRY(UI_SignalEmitEntry), 18);
- etk_combobox_entry_column_add(ETK_COMBOBOX_ENTRY(UI_SignalEmitEntry),
- ETK_COMBOBOX_ENTRY_LABEL, 75, ETK_COMBOBOX_ENTRY_EXPAND, 0.0);
- etk_combobox_entry_build(ETK_COMBOBOX_ENTRY(UI_SignalEmitEntry));
- etk_box_append(ETK_BOX(hbox), UI_SignalEmitEntry, 0, ETK_BOX_NONE, 0);
-
- //UI_SourceEmitEntry
- label = etk_label_new("<b>Source</b>");
- etk_box_append(ETK_BOX(hbox), label, ETK_BOX_START, ETK_BOX_NONE, 0);
- UI_SourceEmitEntry = etk_combobox_entry_new();
- etk_combobox_entry_items_height_set(ETK_COMBOBOX_ENTRY(UI_SourceEmitEntry), 18);
- etk_combobox_entry_column_add(ETK_COMBOBOX_ENTRY(UI_SourceEmitEntry),
- ETK_COMBOBOX_ENTRY_LABEL, 75, ETK_COMBOBOX_ENTRY_EXPAND, 0.0);
- etk_combobox_entry_build(ETK_COMBOBOX_ENTRY(UI_SourceEmitEntry));
- etk_box_append(ETK_BOX(hbox), UI_SourceEmitEntry, ETK_BOX_START, ETK_BOX_NONE, 0);
-
- //button
- button = etk_button_new_from_stock(ETK_STOCK_DIALOG_OK);
- etk_object_properties_set(ETK_OBJECT(button), "label", "Emit", NULL);
- etk_box_append(ETK_BOX(hbox), button, ETK_BOX_START, ETK_BOX_NONE, 0);
-
- etk_signal_connect("active-item-changed", ETK_OBJECT(UI_SignalEmitEntry),
- ETK_CALLBACK(_consolle_combobox_entry_activated_cb), NULL);
- etk_signal_connect("active-item-changed", ETK_OBJECT(UI_SourceEmitEntry),
- ETK_CALLBACK(_consolle_combobox_entry_activated_cb), NULL);
-
- etk_signal_connect("clicked", ETK_OBJECT(button),
- ETK_CALLBACK(_consolle_button_click_cb), NULL);
- return hbox;
-}
-
-
/*** Implementation ***/
-Evas_Object *
-consolle_create(void)
-{
- Etk_Widget *embed;
- EV_Consolle = edje_object_add(UI_evas);
- edje_object_file_set(EV_Consolle, EdjeFile, "Consolle");
- evas_object_show(EV_Consolle);
-
- //Embed Signal Emit
- embed = etk_embed_new(UI_evas);
- etk_container_add(ETK_CONTAINER(embed), _create_signal_embed());
- etk_embed_position_method_set(ETK_EMBED(embed), window_embed_position_set,
- UI_ecore_MainWin);
- etk_widget_show_all(embed);
- edje_object_part_swallow(EV_Consolle,"signal_swallow",
- etk_embed_object_get(ETK_EMBED(embed)));
- return EV_Consolle;
-}
-
void
consolle_clear(void)
{
- edje_object_part_text_set(EV_Consolle, "line1", "");
- edje_object_part_text_set(EV_Consolle, "line2", "");
- edje_object_part_text_set(EV_Consolle, "line3", "");
- edje_object_part_text_set(EV_Consolle, "line4", "");
- edje_object_part_text_set(EV_Consolle, "line5", "");
+ //~ printf("CLEAR\n");
+ edje_object_part_text_set(ui.edje_ui, "line1", "");
+ edje_object_part_text_set(ui.edje_ui, "line2", "");
+ edje_object_part_text_set(ui.edje_ui, "line3", "");
+ edje_object_part_text_set(ui.edje_ui, "line4", "");
+ edje_object_part_text_set(ui.edje_ui, "line5", "");
+ edje_object_part_text_set(ui.edje_ui, "line6", "");
+ edje_object_part_text_set(ui.edje_ui, "line7", "");
+ edje_object_part_text_set(ui.edje_ui, "line8", "");
while(stack)
{
@@ -166,22 +57,26 @@
}
consolle_count = 0;
}
+
void
consolle_log(char *text)
{
- //printf("LOG: %s\n", text);
+ //~ printf("LOG: %s\n", text);
stack = eina_list_prepend(stack, eina_stringshare_add(text));
- while (eina_list_count(stack) > 5)
+ while (eina_list_count(stack) > 8)
{
eina_stringshare_del(eina_list_data_get(eina_list_last(stack)));
stack = eina_list_remove_list(stack, eina_list_last(stack));
}
- edje_object_part_text_set(EV_Consolle, "line1", eina_list_nth(stack, 0));
- edje_object_part_text_set(EV_Consolle, "line2", eina_list_nth(stack, 1));
- edje_object_part_text_set(EV_Consolle, "line3", eina_list_nth(stack, 2));
- edje_object_part_text_set(EV_Consolle, "line4", eina_list_nth(stack, 3));
- edje_object_part_text_set(EV_Consolle, "line5", eina_list_nth(stack, 4));
+ edje_object_part_text_set(ui.edje_ui, "line1", eina_list_nth(stack, 0));
+ edje_object_part_text_set(ui.edje_ui, "line2", eina_list_nth(stack, 1));
+ edje_object_part_text_set(ui.edje_ui, "line3", eina_list_nth(stack, 2));
+ edje_object_part_text_set(ui.edje_ui, "line4", eina_list_nth(stack, 3));
+ edje_object_part_text_set(ui.edje_ui, "line5", eina_list_nth(stack, 4));
+ edje_object_part_text_set(ui.edje_ui, "line6", eina_list_nth(stack, 4));
+ edje_object_part_text_set(ui.edje_ui, "line7", eina_list_nth(stack, 4));
+ edje_object_part_text_set(ui.edje_ui, "line8", eina_list_nth(stack, 4));
}
Modified: branches/edje_editor_elm/src/bin/edje_editor_consolle.h
===================================================================
--- branches/edje_editor_elm/src/bin/edje_editor_consolle.h 2009-08-03 11:50:07 UTC (rev 41568)
+++ branches/edje_editor_elm/src/bin/edje_editor_consolle.h 2009-08-03 11:59:15 UTC (rev 41569)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2006-2008 Davide Andreoli (see AUTHORS)
+/* Copyright (C) 2006-2009 Davide Andreoli (see AUTHORS)
*
* This file is part of Edje_editor.
* Edje_editor is free software: you can redistribute it and/or modify
@@ -19,20 +19,11 @@
#define _EDJE_EDITOR_CONSOLLE_H_
-Evas_Object *EV_Consolle; //The lower consolle panel
Eina_List *stack; //Stack for the consolle
-int consolle_count; //Counter for the consolle
+int consolle_count;
-
-
-Evas_Object* consolle_create(void);
void cons...
[truncated message content] |