E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c
Log Message:
[Etk_List_Viewer] We now use etk's stock icon for the folder, and we're going
to (soon) be able to change the icon sizes in the list view. For now, its all
using ETK_STOCK_LARGE (48x48 px)
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- etk_list_viewer.c 25 Jul 2007 17:01:03 - 1.83
+++ etk_list_viewer.c 28 Jul 2007 12:25:40 - 1.84
@@ -526,6 +526,7 @@
char buffer[50];
char date_buffer[26];
char* thumbnail_filename;
+ char* thumbnail_key;
viewer = instance-data;
@@ -540,9 +541,12 @@
if (!file-thumbnail) {
entropy_plugin_thumbnail_request(instance, file,
(void*)gui_event_callback);
- thumbnail_filename= PACKAGE_DATA_DIR /icons/default.png;
+thumbnail_filename= etk_theme_icon_path_get();
+/* [TODO] ETK_STOCK_BIG needs to be gotten from the config */
+thumbnail_key = etk_stock_key_get(ETK_STOCK_PLACES_FOLDER, ETK_STOCK_BIG);
} else {
- thumbnail_filename = file-thumbnail-thumbnail_filename;
+thumbnail_filename = file-thumbnail-thumbnail_filename;
+thumbnail_key = NULL;
}
col1 = etk_tree_nth_col_get(ETK_TREE(viewer-tree), 0);
@@ -556,7 +560,7 @@
if (!file-retrieved_stat) {
new_row = etk_tree_row_append(ETK_TREE(viewer-tree), NULL,
- col1, thumbnail_filename, NULL,
+ col1, thumbnail_filename, thumbnail_key,
col2, file-filename,
col4, file-mime_type,
NULL);
@@ -569,7 +573,7 @@
date_buffer[strlen(date_buffer)-1] = '\0';
new_row = etk_tree_row_append(ETK_TREE(viewer-tree), NULL,
- col1, thumbnail_filename, NULL,
+ col1, thumbnail_filename, thumbnail_key,
col2, file-filename,
col3, buffer,
col4, file-mime_type,
@@ -814,7 +818,7 @@
entropy_etk_file_list_viewer *viewer;
char **dnd_types;
int dnd_types_num=0;
-
+ Etk_Tree_Model *model;
instance = entropy_gui_component_instance_new ();
viewer = entropy_malloc (sizeof (entropy_etk_file_list_viewer));
@@ -824,9 +828,14 @@
viewer-tree = etk_tree_new();
etk_tree_mode_set(ETK_TREE(viewer-tree), ETK_TREE_MODE_LIST);
-
+
+ /* [TODO] We need to make this configurable, and replace the 48 by a proper
+ * value depending on SMALL, NORMAL, LARGE for etk_stock */
viewer-tree_col1 = etk_tree_col_new(ETK_TREE(viewer-tree), _(Icon),
48,0.0);
- etk_tree_col_model_add(viewer-tree_col1, etk_tree_model_image_new());
+ model = etk_tree_model_image_new();
+ etk_tree_rows_height_set(ETK_TREE(viewer-tree), 48);
+
+ etk_tree_col_model_add(viewer-tree_col1, model);
viewer-tree_col1 = etk_tree_col_new(ETK_TREE(viewer-tree), _(Filename),
150,0.0);
etk_tree_col_model_add(viewer-tree_col1, etk_tree_model_text_new());
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c
Log Message:
wrong stock id
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- etk_list_viewer.c 28 Jul 2007 12:25:40 - 1.84
+++ etk_list_viewer.c 28 Jul 2007 12:35:23 - 1.85
@@ -543,7 +543,7 @@
entropy_plugin_thumbnail_request(instance, file,
(void*)gui_event_callback);
thumbnail_filename= etk_theme_icon_path_get();
/* [TODO] ETK_STOCK_BIG needs to be gotten from the config */
-thumbnail_key = etk_stock_key_get(ETK_STOCK_PLACES_FOLDER, ETK_STOCK_BIG);
+thumbnail_key = etk_stock_key_get(ETK_STOCK_TEXT_X_GENERIC, ETK_STOCK_BIG);
} else {
thumbnail_filename = file-thumbnail-thumbnail_filename;
thumbnail_key = NULL;
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_structure_viewer.c
Log Message:
[Etk_Structure_Viewer] use stocks instead of custom shipped images
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_structure_viewer.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- etk_structure_viewer.c 25 Jul 2007 17:01:03 - 1.37
+++ etk_structure_viewer.c 28 Jul 2007 23:21:35 - 1.38
@@ -171,6 +171,8 @@
event_file_core *event;
Etk_Tree_Col* col;
Etk_Tree_Row* parent;
+ char* thumbnail_filename;
+ char* thumbnail_key;
viewer = instance-data;
parent = (Etk_Tree_Row*)viewer-parent_visual;
@@ -178,13 +180,16 @@
col = etk_tree_nth_col_get(ETK_TREE(parent-tree), 0);
etk_tree_freeze(ETK_TREE(viewer-tree));
+ /* [TODO] Make ETK_STOCK_BIG changable from options */
+ thumbnail_filename= etk_theme_icon_path_get();
+ thumbnail_key = etk_stock_key_get(ETK_STOCK_PLACES_FOLDER, ETK_STOCK_BIG);
if (!prow) {
new_row = etk_tree_row_append(
((Etk_Tree_Row*)viewer-parent_visual)-tree,
(Etk_Tree_Row*)viewer-parent_visual, col,
- PACKAGE_DATA_DIR /icons/folder.png, NULL,
_(file-filename), NULL);
+ thumbnail_filename, thumbnail_key, _(file-filename), NULL);
} else {
new_row = etk_tree_row_append( ((Etk_Tree_Row*)prow)-tree,
(Etk_Tree_Row*)prow, col,
- PACKAGE_DATA_DIR /icons/folder.png, NULL,
_(file-filename), NULL);
+ thumbnail_filename, thumbnail_key, _(file-filename), NULL);
}
ecore_hash_set(instance_map_hash, new_row, instance);
-
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now http://get.splunk.com/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/ruby-efl/src/etk/examples
Modified Files:
etk_test_button.rb etk_test_tree.rb
Log Message:
- add Ecore_Job to list of requirements
- update Etk bindings (examples work - need to do more thorough testing)
===
RCS file: /cvs/e/e17/proto/ruby-efl/src/etk/examples/etk_test_button.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_test_button.rb 31 Aug 2006 22:02:48 - 1.2
+++ etk_test_button.rb 2 May 2007 21:10:50 - 1.3
@@ -3,7 +3,7 @@
super()
self.title = Etk Button Test
self.border_width = 5
-EtkBase.signal_connect(delete_event, self,
Window.function(:hide_on_delete), nil)
+EtkBase.signal_connect(delete-event, self,
Window.function(:hide_on_delete), nil)
end
def create_widgets
@@ -16,7 +16,7 @@
button_normal.tooltip = This is a normal button
box.append(button_normal, Etk::BOX_START, Etk::BOX_NONE, 0)
-image = Image.new_from_file(PACKAGE_DATA_DIR + /images/e_icon.png)
+image = Image.new_from_file(PACKAGE_DATA_DIR + /images/e_icon.png,
nil)
button_normal = Button.new_with_label(Button with an image)
button_normal.tooltip = This is a normal button with an image
button_normal.image = image
@@ -57,4 +57,5 @@
create_widgets
self.show_all
end
-end
\ No newline at end of file
+end
+
===
RCS file: /cvs/e/e17/proto/ruby-efl/src/etk/examples/etk_test_tree.rb,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_test_tree.rb31 Aug 2006 22:02:48 - 1.2
+++ etk_test_tree.rb2 May 2007 21:10:50 - 1.3
@@ -9,7 +9,7 @@
def initialize
super()
self.title = Etk Tree Test
-EtkBase.signal_connect(delete_event, self,
Window.function(:hide_on_delete), nil)
+EtkBase.signal_connect(delete-event, self,
Window.function(:hide_on_delete), nil)
end
def create_widgets
@@ -27,10 +27,20 @@
tree.mode = Etk::TREE_MODE_TREE
tree.multiple_select = true
-col1 = TreeCol.wrap(tree.col_new(Column 1,
tree.model_icon_text_new(Etk::TREE_FROM_EDJE), 90))
-col2 = TreeCol.wrap(tree.col_new(Column 2, tree.model_double_new(),
60))
-col3 = TreeCol.wrap(tree.col_new(Column 3,
tree.model_image_new(Etk::TREE_FROM_FILE), 60))
-col4 = TreeCol.wrap(tree.col_new(Column 4,
tree.model_checkbox_new(), 40))
+
+ col1 = TreeCol.wrap(tree.col_new(Column 1, 90, 0.0))
+ col1.model_add(Tree.model_image_new())
+col1.model_add(Tree.model_text_new())
+
+ col2 = TreeCol.wrap(tree.col_new(Column 2, 60, 0.0))
+ col2.model_add(Tree.model_double_new())
+
+ col3 = TreeCol.wrap(tree.col_new(Column 3, 60, 0.0))
+ col3.model_add(Tree.model_image_new())
+
+ col4 = TreeCol.wrap(tree.col_new(Column 4, 40, 0.0))
+ col4.model_add(Tree.model_checkbox_new())
+
#col4 = etk_tree_col_new(ETK_TREE(tree), Column 4,
etk_tree_model_checkbox_new(ETK_TREE(tree)), 40);
tree.build
@@ -38,25 +48,26 @@
tree.freeze
0.upto(1) { |i|
-row = TreeRow.wrap(tree.va_call(:append, 'P',
- col1, Theme.icon_theme, places/user-home_16,
Row1,
- col2, 10.0,
- col3, PACKAGE_DATA_DIR + /images/1star.png,
- col4, false, nil))
-
-# notice that we are calling Tree.va_call and not tree.va_call (in
other words,
+row = Tree.wrap(tree.va_call(:row_append, 'P',
+nil,
+col1, Theme.icon_path,
places/user-home_16, Row1,
+col2, 10.0,
+col3, PACKAGE_DATA_DIR +
/images/1star.png, nil,
+col4, false, nil))
+
+# notice that we are calling Tree.va_call and not tree.va_call (in
other words,
# we're NOT calling an instance method)
-row = TreeRow.wrap(Tree.va_call(:append_to_row, 'P', row,
- col1, Theme.icon_theme, places/folder_16,
Row2,
- col2, 20.0,
- col3, PACKAGE_DATA_DIR + /images/2stars.png,
- col4, false, nil))
-Tree.va_call(:append_to_row, 'P', row,
- col1, Theme.icon_theme,
mimetypes/text-x-generic_16, Row3,
- col2, 30.0,
- col3,
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/ruby-efl/src/etk Modified Files: config.rb Log Message: - add Ecore_Job to list of requirements - update Etk bindings (examples work - need to do more thorough testing) === RCS file: /cvs/e/e17/proto/ruby-efl/src/etk/config.rb,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- config.rb 31 Aug 2006 22:00:41 - 1.3 +++ config.rb 2 May 2007 21:10:50 - 1.4 @@ -10,7 +10,7 @@ :external_types = [ 'Evas', 'Evas_Object', 'Evas_Hash', 'Evas_List', 'Evas_Modifier', 'Evas_Lock', 'Evas_Button_Flags', -'Ecore_Timer', 'Ecore_Evas', 'Ecore_X_Window', +'Ecore_Timer', 'Ecore_Job', 'Ecore_Evas', 'Ecore_X_Window', 'va_list', 'Evas_Event_Mouse_In', 'Evas_Event_Mouse_Out', 'Evas_Event_Mouse_Move', 'Evas_Event_Mouse_Up', 'Evas_Event_Mouse_Down', 'Evas_Event_Mouse_Wheel', - This SF.net email is sponsored by DB2 Express Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now. http://sourceforge.net/powerbar/db2/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor Log Message: Directory /cvs/e/e17/proto/edje_editor added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor/m4 Log Message: Directory /cvs/e/e17/proto/edje_editor/m4 added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor/src Log Message: Directory /cvs/e/e17/proto/edje_editor/src added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor/data Log Message: Directory /cvs/e/e17/proto/edje_editor/data added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor/data/fonts Log Message: Directory /cvs/e/e17/proto/edje_editor/data/fonts added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor/data/images Log Message: Directory /cvs/e/e17/proto/edje_editor/data/images added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor/src/bin Log Message: Directory /cvs/e/e17/proto/edje_editor/src/bin added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor/data/fonts Added Files: Makefile.am vera.ttf Log Message: DaveMDS's edje_editor app making its way to CVS. Now we can all contribute. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor/data/images Added Files: Makefile.am arrow_d.png arrow_l.png arrow_r.png arrow_u.png bg.png desc.png e17.png etk_focus.png fakewin.png focus.png image.png miniarrow.png none.png parent1.png parent1X.png parent1Y.png parent2X.png parent2Y.png rect.png rel1.png rel2.png shadow.png text.png Log Message: DaveMDS's edje_editor app making its way to CVS. Now we can all contribute. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor/m4 Added Files: ac_path_generic.m4 Log Message: DaveMDS's edje_editor app making its way to CVS. Now we can all contribute. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor/src/bin Added Files: .cvsignore Makefile.am callbacks.c callbacks.h evas.c evas.h interface.c interface.h main.c main.h parse.c parse.h Log Message: DaveMDS's edje_editor app making its way to CVS. Now we can all contribute. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor/src Added Files: .cvsignore Makefile.am Log Message: DaveMDS's edje_editor app making its way to CVS. Now we can all contribute. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor/data Added Files: Makefile.am edje_editor.edc Log Message: DaveMDS's edje_editor app making its way to CVS. Now we can all contribute. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor Added Files: AUTHORS COPYING COPYING-PLAIN ChangeLog INSTALL Makefile.am NEWS README TODO autogen.sh configure.in Log Message: DaveMDS's edje_editor app making its way to CVS. Now we can all contribute. - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/edje_editor Added Files: .cvsignore Log Message: add .cvsignore - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_image.c exhibit_main.c exhibit_tab.c
Log Message:
make exhibit compile again - might have to check some of the logic now where we
were using im-filename
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- exhibit_image.c 7 Oct 2006 11:39:19 - 1.39
+++ exhibit_image.c 30 Dec 2006 12:28:03 - 1.40
@@ -197,9 +197,16 @@
{
unsigned int *data;
int w, h;
-
- if(im-use_edje)
- return;
+ char *edje;
+ char *group;
+
+ etk_image_edje_get(im, edje, group);
+ if(edje != NULL)
+ {
+ free(edje);
+ free(group);
+ return;
+ }
etk_image_size_get(im, w, h);
@@ -208,8 +215,8 @@
if (data)
{
D((Undo: getting data %p, image %p\n, data, im));
- evas_object_image_data_set(im-image_object, data);
- evas_object_image_data_update_add(im-image_object, 0, 0, w, h);
+ evas_object_image_data_set(etk_image_evas_object_get(im), data);
+ evas_object_image_data_update_add(etk_image_evas_object_get(im), 0, 0,
w, h);
etk_object_data_set(ETK_OBJECT(im), undo, NULL);
}
}
@@ -221,12 +228,19 @@
int w, h;
int x, y;
unsigned int *p1, *p2, tmp;
+ char *edje;
+ char *group;
- if(im-use_edje)
- return;
+ etk_image_edje_get(im, edje, group);
+ if(edje != NULL)
+ {
+ free(edje);
+ free(group);
+ return;
+ }
etk_image_size_get(im, w, h);
- data = evas_object_image_data_get(im-image_object, ETK_TRUE);
+ data = evas_object_image_data_get(etk_image_evas_object_get(im), ETK_TRUE);
_ex_image_data_copy(im, data, w, h); /* for undo */
for (y = 0; y h; y++)
@@ -243,8 +257,8 @@
}
}
- evas_object_image_data_set(im-image_object, data);
- evas_object_image_data_update_add(im-image_object, 0, 0, w, h);
+ evas_object_image_data_set(etk_image_evas_object_get(im), data);
+ evas_object_image_data_update_add(etk_image_evas_object_get(im), 0, 0, w,
h);
}
void
@@ -254,12 +268,19 @@
int w, h;
int x, y;
unsigned int *p1, *p2, tmp;
+ char *edje;
+ char *group;
- if(im-use_edje)
- return;
+ etk_image_edje_get(im, edje, group);
+ if(edje != NULL)
+ {
+ free(edje);
+ free(group);
+ return;
+ }
etk_image_size_get(im, w, h);
- data = evas_object_image_data_get(im-image_object, ETK_TRUE);
+ data = evas_object_image_data_get(etk_image_evas_object_get(im), ETK_TRUE);
_ex_image_data_copy(im, data, w, h); /* for undo */
for (y = 0; y (h 1); y++)
@@ -276,8 +297,8 @@
}
}
- evas_object_image_data_set(im-image_object, data);
- evas_object_image_data_update_add(im-image_object, 0, 0, w, h);
+ evas_object_image_data_set(etk_image_evas_object_get(im), data);
+ evas_object_image_data_update_add(etk_image_evas_object_get(im), 0, 0, w,
h);
}
/* Directions (source is right/down):
@@ -291,12 +312,19 @@
{
unsigned int *data, *data2, *to, *from;
int x, y, w, hw, iw, ih;
-
- if(im-use_edje)
- return;
+ char *edje;
+ char *group;
+
+ etk_image_edje_get(im, edje, group);
+ if(edje != NULL)
+ {
+ free(edje);
+ free(group);
+ return;
+ }
etk_image_size_get(im, iw, ih);
- data2 = evas_object_image_data_get(im-image_object, ETK_FALSE);
+ data2 = evas_object_image_data_get(etk_image_evas_object_get(im),
ETK_FALSE);
data = malloc(iw * ih * sizeof(unsigned int));
from = data2;
@@ -338,9 +366,9 @@
to += hw;
}
- evas_object_image_size_set(im-image_object, iw, ih);
- evas_object_image_data_set(im-image_object, data);
- evas_object_image_data_update_add(im-image_object, 0, 0, iw, ih);
+ evas_object_image_size_set(etk_image_evas_object_get(im), iw, ih);
+ evas_object_image_data_set(etk_image_evas_object_get(im), data);
+ evas_object_image_data_update_add(etk_image_evas_object_get(im), 0, 0, iw,
ih);
etk_widget_size_request_set(ETK_WIDGET(im), iw, ih);
@@ -358,12 +386,19 @@
int *as, *rs, *gs, *bs;
int rad = 2;
unsigned int *p1, *p2;
+ char *edje;
+ char *group;
- if(im-use_edje)
- return;
+ etk_image_edje_get(im, edje, group);
+ if(edje != NULL)
+ {
+ free(edje);
+ free(group);
+ return;
+ }
etk_image_size_get(im, w, h);
- data2 = evas_object_image_data_get(im-image_object, ETK_TRUE);
+ data2 = evas_object_image_data_get(etk_image_evas_object_get(im), ETK_TRUE);
_ex_image_data_copy(im, data2, w, h); /* for undo */
rad =
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_image.c etk_image.h
Log Message:
[Etk_Image] add etk_image_new_from_evas_object / set_from_evas_object.
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_image.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- etk_image.c 6 Oct 2006 17:04:14 - 1.25
+++ etk_image.c 25 Dec 2006 14:04:53 - 1.26
@@ -19,6 +19,7 @@
ETK_IMAGE_FILE_PROPERTY,
ETK_IMAGE_EDJE_FILE_PROPERTY,
ETK_IMAGE_EDJE_GROUP_PROPERTY,
+ ETK_IMAGE_EVAS_OBJECT_PROPERTY,
ETK_IMAGE_KEEP_ASPECT_PROPERTY,
ETK_IMAGE_USE_EDJE_PROPERTY,
ETK_IMAGE_STOCK_ID_PROPERTY,
@@ -61,6 +62,8 @@
ETK_PROPERTY_STRING, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_string(NULL));
etk_type_property_add(image_type, edje_group,
ETK_IMAGE_EDJE_GROUP_PROPERTY,
ETK_PROPERTY_STRING, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_string(NULL));
+ etk_type_property_add(image_type, evas_object,
ETK_IMAGE_EVAS_OBJECT_PROPERTY,
+ ETK_PROPERTY_POINTER, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_pointer(NULL));
etk_type_property_add(image_type, keep_aspect,
ETK_IMAGE_KEEP_ASPECT_PROPERTY,
ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_TRUE));
etk_type_property_add(image_type, use_edje,
ETK_IMAGE_USE_EDJE_PROPERTY,
@@ -108,6 +111,16 @@
}
/**
+ * @brief Creates a new image from the given evas object
+ * @param evas_object the evas object to use for the image
+ * @return Returns the new image widget
+ */
+Etk_Widget *etk_image_new_from_evas_object(Evas_Object *evas_object)
+{
+ return etk_widget_new(ETK_IMAGE_TYPE, evas_object, evas_object, NULL);
+}
+
+/**
* @brief Creates a new image and loads the image corresponding to the stock id
* @param stock_id the stock id corresponding to the image
* @param stock_size the size of the image to load
@@ -248,6 +261,78 @@
}
/**
+ * @brief Loads the image from an evas object
+ * @param image an image
+ * @param evas_object the evas object to use
+ */
+void etk_image_set_from_evas_object(Etk_Image *image, Evas_Object *evas_object)
+{
+ Etk_Widget *widget;
+
+ if (!(widget = ETK_WIDGET(image)) || !evas_object)
+ return;
+
+ if (image-image_object != evas_object)
+ {
+ if (image-image_object (image-filename || image-use_edje))
+evas_object_del(image-image_object);
+ image-image_object = evas_object;
+ etk_object_notify(ETK_OBJECT(image), evas_object);
+ }
+
+ if (image-edje_group)
+ {
+ free(image-edje_group);
+ image-edje_group = NULL;
+ etk_object_notify(ETK_OBJECT(image), edje_group);
+ }
+ if (image-edje_filename)
+ {
+ free(image-edje_filename);
+ image-edje_filename = NULL;
+ etk_object_notify(ETK_OBJECT(image), edje_file);
+ }
+ if (image-use_edje)
+ {
+ image-use_edje = ETK_FALSE;
+ image-object_type_changed = ETK_TRUE;
+ etk_object_notify(ETK_OBJECT(image), use_edje);
+ }
+ if (image-filename)
+ {
+ free(image-filename);
+ image-filename = NULL;
+ etk_object_notify(ETK_OBJECT(image), image_file);
+ }
+
+ if (!image-use_object)
+ {
+ image-use_object = ETK_TRUE;
+ image-object_type_changed = ETK_TRUE;
+ etk_object_notify(ETK_OBJECT(image), use_object);
+ }
+ if (image-stock_id != ETK_STOCK_NO_STOCK)
+ {
+ image-stock_id = ETK_STOCK_NO_STOCK;
+ etk_object_notify(ETK_OBJECT(image), stock_id);
+ }
+
+ _etk_image_load(image);
+}
+
+/**
+ * @brief Gets the evas object of the image
+ * @param image an image
+ * @return Returns the evas object of the image
+ */
+Evas_Object *etk_image_evas_object_get(Etk_Image *image)
+{
+ if (!image)
+ return NULL;
+ return image-image_object;
+}
+
+/**
* @brief Loads the image corresponding to the stock id
* @param image an image
* @param stock_id the stock id corresponding to the image
@@ -303,10 +388,12 @@
}
else
{
- if (!image-use_edje)
- evas_object_image_size_get(image-image_object, width, height);
+ if (image-use_object)
+ evas_object_geometry_get(image-image_object, NULL, NULL, width,
height);
+ else if (image-use_edje)
+ edje_object_size_min_get(image-image_object, width, height);
else
- edje_object_size_min_get(image-image_object, width, height);
+ evas_object_image_size_get(image-image_object, width, height);
}
}
@@ -386,6 +473,7 @@
image-stock_size = ETK_STOCK_SMALL;
image-keep_aspect = ETK_TRUE;
image-use_edje = ETK_FALSE;
+ image-use_object = ETK_FALSE;
image-object_type_changed = ETK_FALSE;
widget-size_request = _etk_image_size_request;
@@ -425,6 +513,9 @@
case
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: etk_spinner.c Log Message: [Etk_Spinner] The scanf family of functions doesnt accept %.Xf, only %f works - cant set precision === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_spinner.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- etk_spinner.c 28 Nov 2006 21:40:07 - 1.1 +++ etk_spinner.c 19 Dec 2006 21:40:24 - 1.2 @@ -662,7 +662,7 @@ return; text = etk_editable_text_get(spinner-editable_object); - if (sscanf(text, spinner-value_format, value) != 1) + if (sscanf(text, %f, value) != 1) value = 0.0; etk_range_value_set(ETK_RANGE(spinner), value); } - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: etk_spinner.c Log Message: [Etk_Spinner] Make sure we update the spinners value from the text when we hit the up / down arrow. This solves a bug when entering the value using the keyboard then trying to use the arrows. === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_spinner.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- etk_spinner.c 19 Dec 2006 21:40:24 - 1.2 +++ etk_spinner.c 19 Dec 2006 21:43:50 - 1.3 @@ -606,6 +606,8 @@ if (!(spinner = ETK_SPINNER(data))) return 1; + + _etk_spinner_update_value_from_text(spinner); range = ETK_RANGE(spinner); etk_range_value_set(range, range-value - range-step_increment); @@ -624,6 +626,8 @@ if (!(spinner = ETK_SPINNER(data))) return 1; + + _etk_spinner_update_value_from_text(spinner); range = ETK_RANGE(spinner); etk_range_value_set(range, range-value + range-step_increment); - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/tools/etk_prefs
Modified Files:
etk_prefs.c
Log Message:
--warnings
===
RCS file: /cvs/e/e17/proto/etk/src/tools/etk_prefs/etk_prefs.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_prefs.c 6 Oct 2006 17:04:15 - 1.4
+++ etk_prefs.c 19 Dec 2006 22:01:57 - 1.5
@@ -9,7 +9,6 @@
void etk_prefs_standard_item_add(Etk_Widget *tree, char *icon, char *label,
void (*func) (void));
static void _etk_prefs_row_clicked(Etk_Object *object, Etk_Tree_Row *row,
Etk_Event_Mouse_Up *event, void *data);
-static void _etk_prefs_destroy(void *data);
static Etk_Widget *_etk_prefs_theme_tab_create();
static void _etk_prefs_theme_row_selected_cb(Etk_Object *object, Etk_Tree_Row
*row, void *data);
static Etk_Widget *_etk_prefs_theme_preview_get(const char *theme);
@@ -113,12 +112,6 @@
if (num)
etk_notebook_current_page_set(ETK_NOTEBOOK(data), *num);
-}
-
-static void _etk_prefs_destroy(void *data)
-{
- etk_object_destroy(ETK_OBJECT(data));
- etk_main_quit();
}
static Etk_Widget *_etk_prefs_theme_tab_create()
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_engine.c etk_filechooser_widget.c
Log Message:
--warnings
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_engine.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- etk_engine.c8 Oct 2006 10:04:54 - 1.14
+++ etk_engine.c19 Dec 2006 22:01:57 - 1.15
@@ -171,7 +171,7 @@
handle = dlopen(filename, RTLD_LAZY | RTLD_GLOBAL);
if (!handle)
{
- char *error;
+ const char *error;
error = dlerror();
ETK_WARNING(Etk can not dlopen the requested engine: %s, error ? error
: Unknown error);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_filechooser_widget.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_filechooser_widget.c19 Dec 2006 21:52:03 - 1.15
+++ etk_filechooser_widget.c19 Dec 2006 22:01:57 - 1.16
@@ -244,7 +244,7 @@
if (!filechooser_widget !(filechooser_widget-files_tree))
return NULL;
- if (row =
etk_tree_selected_row_get(ETK_TREE(filechooser_widget-files_tree)))
+ if ((row =
etk_tree_selected_row_get(ETK_TREE(filechooser_widget-files_tree
etk_tree_row_fields_get(row, filechooser_widget-files_name_col, NULL,
NULL, filename, NULL);
return filename;
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: AUTHORS configure.in Log Message: add Friedrich's fullscreen code, implement Chady's -f flag and bump up version === RCS file: /cvs/e/e17/proto/exhibit/AUTHORS,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- AUTHORS 10 Aug 2006 17:05:48 - 1.5 +++ AUTHORS 14 Dec 2006 12:07:46 - 1.6 @@ -3,6 +3,7 @@ Hisham 'CodeWarrior' Mardambey [EMAIL PROTECTED] Martin 'balony' Sarajervi [EMAIL PROTECTED] Simon 'MoOm' Treny [EMAIL PROTECTED] +Friedrich 'phriedrich' Preuß [EMAIL PROTECTED] Thanks: === === RCS file: /cvs/e/e17/proto/exhibit/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- configure.in29 Jul 2006 19:50:04 - 1.9 +++ configure.in14 Dec 2006 12:07:46 - 1.10 @@ -9,7 +9,7 @@ AC_CANONICAL_HOST AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(exhibit, 0.0.1) +AM_INIT_AUTOMAKE(exhibit, 0.1.0) AC_PREREQ(2.52) - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys - and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
Makefile.am exhibit.h exhibit_main.c exhibit_menus.c
exhibit_tab.c
Added Files:
exhibit_model_wobbly.c exhibit_model_wobbly.h
Log Message:
Why hello Mr. Wobbles!
- add new etk tree model for wobbly icons
- minor bug with thumb geometry (cant be bothered fixing this instant)
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/Makefile.am,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- Makefile.am 14 Mar 2006 01:01:15 - 1.9
+++ Makefile.am 15 Sep 2006 11:30:10 - 1.10
@@ -21,7 +21,8 @@
exhibit_favorites.h \
exhibit_options.h \
exhibit_comment.h \
-exhibit_comment_jpeg.h
+exhibit_comment_jpeg.h \
+exhibit_model_wobbly.h
exhibit_SOURCES = \
exhibit_file.c \
@@ -36,6 +37,7 @@
exhibit_options.c \
exhibit_comment.c \
exhibit_comment_jpeg.c \
+exhibit_model_wobbly.c \
$(exhibit_INCLUDES)
exhibit_LDADD = @my_libs@
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- exhibit.h 3 Sep 2006 12:41:30 - 1.35
+++ exhibit.h 15 Sep 2006 11:30:10 - 1.36
@@ -10,6 +10,7 @@
#include Ecore_File.h
#include Ecore_X_Cursor.h
#include Evas.h
+#include Edje.h
#include Ecore_Evas.h
#include Epsilon.h
#include etk/Etk.h
@@ -197,7 +198,7 @@
Etk_Widget*zoom_out[2];
Etk_Widget*fit[2];
Etk_Widget*original[2];
- Etk_Widget*sort;
+ Etk_Widget*sort_bar;
Etk_Widget*sizebar;
Etk_Widget*resbar;
Etk_Widget*zoombar;
@@ -284,6 +285,7 @@
#include exhibit_favorites.h
#include exhibit_options.h
#include exhibit_comment.h
+#include exhibit_model_wobbly.h
extern Exhibit *e;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- exhibit_main.c 13 Sep 2006 21:36:09 - 1.82
+++ exhibit_main.c 15 Sep 2006 11:30:10 - 1.83
@@ -806,7 +806,7 @@
}
e-zoom_in[0] = etk_button_new();
- e-zoom_in[1] =
etk_image_new_from_edje(PACKAGE_DATA_DIR/images/images.edj, zoom_in);
+ e-zoom_in[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR/gui.edj,
zoom_in);
etk_button_image_set(ETK_BUTTON(e-zoom_in[0]), ETK_IMAGE(e-zoom_in[1]));
etk_signal_connect_swapped(clicked, ETK_OBJECT(e-zoom_in[0]),
ETK_CALLBACK(_ex_tab_current_zoom_in), e);
etk_table_attach(ETK_TABLE(e-table), e-zoom_in[0],
@@ -814,7 +814,7 @@
0, 0, ETK_TABLE_NONE);
e-zoom_out[0] = etk_button_new();
- e-zoom_out[1] =
etk_image_new_from_edje(PACKAGE_DATA_DIR/images/images.edj, zoom_out);
+ e-zoom_out[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR/gui.edj,
zoom_out);
etk_button_image_set(ETK_BUTTON(e-zoom_out[0]), ETK_IMAGE(e-zoom_out[1]));
etk_signal_connect_swapped(clicked, ETK_OBJECT(e-zoom_out[0]),
ETK_CALLBACK(_ex_tab_current_zoom_out), e);
etk_table_attach(ETK_TABLE(e-table), e-zoom_out[0],
@@ -822,7 +822,7 @@
0, 0, ETK_TABLE_NONE);
e-fit[0] = etk_button_new();
- e-fit[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR/images/images.edj,
fit_to_window);
+ e-fit[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR/gui.edj,
fit_to_window);
etk_button_image_set(ETK_BUTTON(e-fit[0]), ETK_IMAGE(e-fit[1]));
etk_signal_connect_swapped(clicked, ETK_OBJECT(e-fit[0]),
ETK_CALLBACK(_ex_tab_current_fit_to_window), e);
etk_table_attach(ETK_TABLE(e-table), e-fit[0],
@@ -830,7 +830,7 @@
0, 0, ETK_TABLE_NONE);
e-original[0] = etk_button_new();
- e-original[1] =
etk_image_new_from_edje(PACKAGE_DATA_DIR/images/images.edj, one_to_one);
+ e-original[1] = etk_image_new_from_edje(PACKAGE_DATA_DIR/gui.edj,
one_to_one);
etk_button_image_set(ETK_BUTTON(e-original[0]), ETK_IMAGE(e-original[1]));
etk_signal_connect_swapped(clicked, ETK_OBJECT(e-original[0]),
ETK_CALLBACK(_ex_tab_current_zoom_one_to_one), e);
etk_table_attach(ETK_TABLE(e-table), e-original[0],
@@ -913,22 +913,23 @@
ETK_CALLBACK(_ex_main_window_tab_toggled_cb), NULL);
e-hbox = etk_hbox_new(ETK_TRUE, 0);
- e-sort = etk_label_new(Sort by date);
+ e-sort_bar = etk_statusbar_new();
+ etk_statusbar_push(ETK_STATUSBAR(e-sort_bar), Sort by date, 0);
+ etk_statusbar_has_resize_grip_set(ETK_STATUSBAR(e-sort_bar), ETK_FALSE);
etk_box_append(ETK_BOX(e-vbox), e-hbox, ETK_BOX_END, ETK_BOX_NONE, 0);
- etk_box_append(ETK_BOX(e-hbox), e-sort, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
+ etk_box_append(ETK_BOX(e-hbox), e-sort_bar, ETK_BOX_START, ETK_BOX_NONE,
0);
{
Etk_Widget *menu;
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit/data/images Added Files: e17_fileman_thumb_bg.png e17_mini_button_shadow2.png Log Message: Why hello Mr. Wobbles! - add new etk tree model for wobbly icons - minor bug with thumb geometry (cant be bothered fixing this instant) - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: TODO Log Message: Why hello Mr. Wobbles! - add new etk tree model for wobbly icons - minor bug with thumb geometry (cant be bothered fixing this instant) === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- TODO13 Sep 2006 22:25:27 - 1.18 +++ TODO15 Sep 2006 11:30:09 - 1.19 @@ -8,7 +8,7 @@ - Close tab - Create window - Close window -- Rightclick menu on thumbs (rightclick without having to select, would be +- Right-click menu on thumbs (rightclick without having to select, would be nice if you want to delete an image without viewing it in fullsize and then you wont have to wait for the loading if it for example is a big image). - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit/data Modified Files: Makefile.am Added Files: gui.edc Removed Files: images.edc Log Message: Why hello Mr. Wobbles! - add new etk tree model for wobbly icons - minor bug with thumb geometry (cant be bothered fixing this instant) === RCS file: /cvs/e/e17/proto/exhibit/data/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 14 Dec 2005 11:33:28 - 1.1 +++ Makefile.am 15 Sep 2006 11:30:09 - 1.2 @@ -1,18 +1,18 @@ MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = images.edc +EXTRA_DIST = gui.edc EDJE_CC = edje_cc EDJE_FLAGS = \ -v \ -id $(top_srcdir)/data/images -imagedir = $(pkgdatadir)/images -image_DATA = images.edj +guidir = $(pkgdatadir) +gui_DATA = gui.edj -images.edj: Makefile images.edc +gui.edj: Makefile gui.edc $(EDJE_CC) $(EDJE_FLAGS) \ - $(top_srcdir)/data/images.edc \ - $(top_builddir)/data/images.edj - + $(top_srcdir)/data/gui.edc \ + $(top_builddir)/data/gui.edj + clean-local: rm -f *.edj - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/extrackt Modified Files: configure.in Log Message: HAVE_ET - HAVE_EET, thanks chris. === RCS file: /cvs/e/e17/proto/extrackt/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- configure.in10 Jul 2006 05:59:50 - 1.4 +++ configure.in11 Sep 2006 21:32:48 - 1.5 @@ -126,7 +126,7 @@ eet, 0.9.10, [ - AC_DEFINE(HAVE_ET, 1, have EET) + AC_DEFINE(HAVE_EET, 1, have EET) eet=EET eet_libs=`eet-config --libs` eet_includes=`eet-config --cflags` - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_main.c exhibit_menus.c exhibit_menus.h exhibit_sort.c
Log Message:
enable the sort menu in the statusbar - you will not see it because of a small
etk bug being fixed
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- exhibit_main.c 2 Sep 2006 01:43:23 - 1.74
+++ exhibit_main.c 2 Sep 2006 12:33:08 - 1.75
@@ -865,9 +865,10 @@
etk_signal_connect(current_page_changed, ETK_OBJECT(e-notebook),
ETK_CALLBACK(_ex_main_window_tab_toggled_cb), NULL);
- e-hbox = etk_hbox_new(ETK_TRUE, 0);
+ e-hbox = etk_hbox_new(ETK_TRUE, 0);
+ e-sort = etk_label_new(Sort by date);
etk_box_append(ETK_BOX(e-vbox), e-hbox, ETK_BOX_END, ETK_BOX_NONE, 0);
-
+ etk_box_append(ETK_BOX(e-hbox), e-sort, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
{
Etk_Widget *menu;
Etk_Widget *menu_item;
@@ -877,8 +878,9 @@
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Sort by name),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Sort by date),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Sort by size),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Sort by resolution),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
_ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(menu), NULL, NULL);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Ascending),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
+ _ex_menu_item_new(EX_MENU_ITEM_CHECK, _(Ascending),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Sort),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu), NULL, NULL);
}
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- exhibit_menus.c 2 Sep 2006 01:43:23 - 1.34
+++ exhibit_menus.c 2 Sep 2006 12:33:08 - 1.35
@@ -52,6 +52,9 @@
case EX_MENU_ITEM_NORMAL:
menu_item = etk_menu_item_image_new_with_label(label);
break;
+ case EX_MENU_ITEM_CHECK:
+ menu_item = etk_menu_item_check_new_with_label(label);
+ break;
case EX_MENU_ITEM_SEPERATOR:
menu_item = etk_menu_item_separator_new();
break;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- exhibit_menus.h 18 Aug 2006 10:36:41 - 1.12
+++ exhibit_menus.h 2 Sep 2006 12:33:08 - 1.13
@@ -7,6 +7,7 @@
typedef enum _Ex_Menu_Item_Type
{
EX_MENU_ITEM_NORMAL,
+ EX_MENU_ITEM_CHECK,
EX_MENU_ITEM_SEPERATOR
} Ex_Menu_Item_Type;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_sort.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- exhibit_sort.c 2 Sep 2006 01:43:23 - 1.7
+++ exhibit_sort.c 2 Sep 2006 12:33:08 - 1.8
@@ -139,10 +139,9 @@
etk_tree_sort(ETK_TREE(e-cur_tab-itree), _ex_sort_itree_date_compare_cb,
ETK_TRUE, e-cur_tab-icol, NULL);
}
-
void
_ex_sort_label_mouse_down_cb(Etk_Object *object, void *event_info, void *data)
{
- etk_menu_popup(ETK_MENU(data));
+ etk_menu_popup(ETK_MENU(data));
}
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_main.c
Log Message:
exhibit /path/to/image.jpg - take symlinks into account
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -3 -r1.76 -r1.77
--- exhibit_main.c 2 Sep 2006 14:13:59 - 1.76
+++ exhibit_main.c 2 Sep 2006 14:33:35 - 1.77
@@ -629,7 +629,7 @@
_ex_main_window_show(char *dir)
{
Ex_Tab *tab;
- char *file;
+ char file[PATH_MAX];
char *homedir;
const char **dnd_types;
int dnd_types_num;
@@ -667,7 +667,6 @@
if(!ecore_file_is_dir(e-options-fav_path))
ecore_file_mkdir(e-options-fav_path);
- file = NULL;
tab = NULL;
e-win = etk_window_new();
@@ -858,7 +857,7 @@
dir2 = ecore_file_get_dir(dir);
tab = _ex_tab_new(e, dir2);
E_FREE(dir2);
-file = strdup(dir);
+realpath(dir, file);
}
else
tab = _ex_tab_new(e, .);
@@ -916,7 +915,6 @@
_ex_tab_select(tab);
etk_widget_show_all(e-win);
- E_FREE(file);
}
int
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/tools/etk_prefs
Modified Files:
etk_prefs.c
Log Message:
- [Etk_Prefs] We dont need to destroy the widgets in the preview pane and
create them again for every theme change. Just apply the theme to the parent
widget and watch it propagate to the children. werd.
===
RCS file: /cvs/e/e17/proto/etk/src/tools/etk_prefs/etk_prefs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_prefs.c 31 Aug 2006 17:55:51 - 1.2
+++ etk_prefs.c 1 Sep 2006 13:44:20 - 1.3
@@ -196,7 +196,7 @@
static void _etk_prefs_theme_row_selected_cb(Etk_Object *object, Etk_Tree_Row
*row, void *data)
{
- static Etk_Widget *child = NULL;
+ Etk_Widget *child = NULL;
Etk_Tree *tree;
char *icol_string;
Etk_Widget *preview;
@@ -205,11 +205,6 @@
preview = data;
etk_tree_row_fields_get(row, etk_tree_nth_col_get(tree, 0), icol_string,
NULL, NULL, NULL);
- if(child)
- {
- etk_container_remove(ETK_CONTAINER(preview), child);
- etk_object_destroy(ETK_OBJECT(child));
- }
child = _etk_prefs_theme_preview_get(icol_string);
etk_container_add(ETK_CONTAINER(preview), child);
etk_widget_show_all(child);
@@ -218,7 +213,7 @@
static Etk_Widget *_etk_prefs_theme_preview_get(const char *theme)
{
char file[PATH_MAX];
- Etk_Widget *box;
+ static Etk_Widget *box = NULL;
Etk_Widget *widget;
Etk_Widget *vbox;
Etk_Widget *frame;
@@ -240,7 +235,13 @@
free(_etk_prefs_widget_theme);
_etk_prefs_widget_theme = strdup(theme);
- box = etk_vbox_new(ETK_FALSE, 0);
+ if (box)
+ {
+ etk_widget_theme_file_set(box, file);
+ return box;
+ }
+
+ box = etk_vbox_new(ETK_FALSE, 0);
etk_widget_theme_file_set(box, file);
frame = etk_frame_new(Buttons);
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_comment.c exhibit_main.c exhibit_menus.c
exhibit_tab.c
Log Message:
- remove our own notebook like logic and use a tab-less notebook when in single
view. show tabs when in tabbed view. note: tab deletion still not done
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- exhibit.h 1 Sep 2006 21:51:38 - 1.33
+++ exhibit.h 1 Sep 2006 23:39:22 - 1.34
@@ -206,7 +206,7 @@
Etk_Widget*app3_menu;
Etk_Widget*app4_menu;
Etk_Widget*submenu;
-
+
intzoom;
intbrightness;
intcontrast;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- exhibit_comment.c 15 Aug 2006 18:45:51 - 1.11
+++ exhibit_comment.c 1 Sep 2006 23:39:22 - 1.12
@@ -10,17 +10,8 @@
_ex_comment_show(Exhibit *e)
{
e-cur_tab-comment.vbox = etk_vbox_new(ETK_FALSE, 0);
- if(evas_list_count(e-tabs) == 1)
- {
- /* we only have 1 tab, ie, no notebook */
- etk_paned_child2_set(ETK_PANED(e-hpaned), e-cur_tab-comment.vbox,
ETK_TRUE);
- }
- else
- {
- /* we have multiple tabs */
- etk_notebook_page_child_set(ETK_NOTEBOOK(e-notebook), e-cur_tab-num,
e-cur_tab-comment.vbox);
- }
-
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e-notebook), e-cur_tab-num,
e-cur_tab-comment.vbox);
+
if (e-cur_tab-fit_window)
etk_box_append(ETK_BOX(e-cur_tab-comment.vbox), e-cur_tab-alignment,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
else
@@ -59,22 +50,10 @@
if(!e-cur_tab-comment.visible)
return;
- if(evas_list_count(e-tabs) == 1)
- {
- /* we only have 1 tab, ie, no notebook */
- if (e-cur_tab-fit_window)
- etk_paned_child2_set(ETK_PANED(e-hpaned), e-cur_tab-alignment,
ETK_TRUE);
- else
- etk_paned_child2_set(ETK_PANED(e-hpaned), e-cur_tab-scrolled_view,
ETK_TRUE);
- }
+ if (e-cur_tab-fit_window)
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e-notebook), e-cur_tab-num,
e-cur_tab-alignment);
else
- {
- /* we have multiple tabs */
- if (e-cur_tab-fit_window)
- etk_notebook_page_child_set(ETK_NOTEBOOK(e-notebook),
e-cur_tab-num, e-cur_tab-alignment);
- else
- etk_notebook_page_child_set(ETK_NOTEBOOK(e-notebook),
e-cur_tab-num, e-cur_tab-scrolled_view);
- }
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e-notebook), e-cur_tab-num,
e-cur_tab-scrolled_view);
etk_object_destroy(ETK_OBJECT(e-cur_tab-comment.textview));
etk_object_destroy(ETK_OBJECT(e-cur_tab-comment.save));
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- exhibit_main.c 1 Sep 2006 22:41:37 - 1.72
+++ exhibit_main.c 1 Sep 2006 23:39:22 - 1.73
@@ -2,7 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
*/
#include exhibit.h
-#include Ecore_File.h
extern pid_t pid;
extern Evas_List *thumb_list;
@@ -84,7 +83,8 @@
etk_window_title_set(ETK_WINDOW(e-win), title);
/* Save the path of where the image really is in case
- we browse more in the dtree */
+* we browse more in the dtree
+*/
e-cur_tab-set_img_path = malloc(PATH_MAX);
memset(e-cur_tab-set_img_path, 0, PATH_MAX);
e-cur_tab-cur_file = malloc(PATH_MAX);
@@ -96,7 +96,7 @@
e-cur_tab-image_loaded = ETK_TRUE;
etk_widget_show(ETK_WIDGET(e-cur_tab-image));
- if(_ex_file_is_ebg(image))
+ if (_ex_file_is_ebg(image))
{
/* can we do this without the size request? it doesnt look good */
etk_widget_size_request_set(ETK_WIDGET(e-cur_tab-image), 800, 600);
@@ -182,7 +182,7 @@
etk_tree_freeze(ETK_TREE(e-cur_tab-dtree));
getcwd(e-cur_tab-cur_path, PATH_MAX);
- if(strlen(e-cur_tab-cur_path) PATH_MAX - 2)
+ if (strlen(e-cur_tab-cur_path) PATH_MAX - 2)
{
int len = strlen(e-cur_tab-cur_path);
e-cur_tab-cur_path[len] = '/';
@@ -255,9 +255,9 @@
_ex_main_monitor_dir, NULL);
}
- /* Set the dir to the current dir at the end so we avoid
- stepdown like .. if we just call the refresh on
- the listing like after a delete */
+ /* Set the dir to the current dir at the end so we avoid stepdown
+* like .. if we just call the refresh on the listing like after a delete
+*/
e-cur_tab-dir = strdup(.);
closedir(dir);
@@ -364,7 +364,7 @@
{
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: TODO Log Message: - remove our own notebook like logic and use a tab-less notebook when in single view. show tabs when in tabbed view. note: tab deletion still not done === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- TODO1 Sep 2006 20:23:50 - 1.15 +++ TODO1 Sep 2006 23:39:22 - 1.16 @@ -8,9 +8,17 @@ - Close tab - Create window - Close window +- menus + * release notes + + +=== + 1.15 o DONE: -- ++ add monitor code to add / remove / reload images as they change on disk ++ use notebook all the time (hide tabs when not needed) + open in should be generated from options + andy's comments feature + sorting - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: TODO Log Message: clean === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- TODO1 Sep 2006 23:39:22 - 1.16 +++ TODO1 Sep 2006 23:42:50 - 1.17 @@ -9,12 +9,8 @@ - Create window - Close window - menus - * release notes - - -=== + * release notes - 1.15 o DONE: -- + add monitor code to add / remove / reload images as they change on disk - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/lib Modified Files: etk_dialog.c Log Message: typo causing improper dialog fill / expand behaviour === RCS file: /cvs/e/e17/proto/etk/src/lib/etk_dialog.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- etk_dialog.c15 Aug 2006 15:59:01 - 1.11 +++ etk_dialog.c31 Aug 2006 16:04:55 - 1.12 @@ -93,9 +93,9 @@ return; if (pack_at_end) - etk_box_prepend(ETK_BOX(dialog-main_area_vbox), widget, ETK_BOX_END, ETK_DIALOG_FILL_POLICY(fill, padding), padding); + etk_box_prepend(ETK_BOX(dialog-main_area_vbox), widget, ETK_BOX_END, ETK_DIALOG_FILL_POLICY(fill, expand), padding); else - etk_box_append(ETK_BOX(dialog-main_area_vbox), widget, ETK_BOX_START, ETK_DIALOG_FILL_POLICY(fill, padding), padding); + etk_box_append(ETK_BOX(dialog-main_area_vbox), widget, ETK_BOX_START, ETK_DIALOG_FILL_POLICY(fill, expand), padding); } /** @@ -115,9 +115,9 @@ return; if (pack_at_end) - etk_box_prepend(ETK_BOX(dialog-action_area_hbox), widget, ETK_BOX_END, ETK_DIALOG_FILL_POLICY(fill, padding), padding); + etk_box_prepend(ETK_BOX(dialog-action_area_hbox), widget, ETK_BOX_END, ETK_DIALOG_FILL_POLICY(fill, expand), padding); else - etk_box_append(ETK_BOX(dialog-action_area_hbox), widget, ETK_BOX_START, ETK_DIALOG_FILL_POLICY(fill, padding), padding); + etk_box_append(ETK_BOX(dialog-action_area_hbox), widget, ETK_BOX_START, ETK_DIALOG_FILL_POLICY(fill, expand), padding); } /** @@ -142,9 +142,9 @@ etk_object_data_set_full(ETK_OBJECT(button), _Etk_Dialog::response_id, id, free); if (pack_at_end) - etk_box_prepend(ETK_BOX(dialog-action_area_hbox), ETK_WIDGET(button), ETK_BOX_END, ETK_DIALOG_FILL_POLICY(fill, padding), padding); + etk_box_prepend(ETK_BOX(dialog-action_area_hbox), ETK_WIDGET(button), ETK_BOX_END, ETK_DIALOG_FILL_POLICY(fill, expand), padding); else - etk_box_append(ETK_BOX(dialog-action_area_hbox), ETK_WIDGET(button), ETK_BOX_START, ETK_DIALOG_FILL_POLICY(fill, padding), padding); + etk_box_append(ETK_BOX(dialog-action_area_hbox), ETK_WIDGET(button), ETK_BOX_START, ETK_DIALOG_FILL_POLICY(fill, expand), padding); etk_signal_connect(clicked, ETK_OBJECT(button), ETK_CALLBACK(_etk_dialog_button_clicked_cb), dialog); } - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/tools Log Message: Directory /cvs/e/e17/proto/etk/src/tools added to the repository - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/tools/etk_prefs Log Message: Directory /cvs/e/e17/proto/etk/src/tools/etk_prefs added to the repository - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/tools/etk_prefs Modified Files: etk_prefs.c Log Message: [Etk_Prefs] use a paned widget instead of an hbox on the main window === RCS file: /cvs/e/e17/proto/etk/src/tools/etk_prefs/etk_prefs.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- etk_prefs.c 31 Aug 2006 17:32:06 - 1.1 +++ etk_prefs.c 31 Aug 2006 17:55:51 - 1.2 @@ -34,7 +34,7 @@ Etk_Widget *dialog; Etk_Widget *tree; Etk_Widget *notebook; - Etk_Widget *hbox; + Etk_Widget *paned; Etk_Tree_Col *col; /* main dialog to hold everything */ @@ -50,7 +50,7 @@ tree = etk_tree_new(); etk_tree_headers_visible_set(ETK_TREE(tree), ETK_FALSE); etk_signal_connect(row_clicked, ETK_OBJECT(tree), ETK_CALLBACK(_etk_prefs_row_clicked), notebook); - etk_widget_size_request_set(tree, 220, 240); + etk_widget_size_request_set(tree, 180, 240); etk_tree_mode_set(ETK_TREE(tree), ETK_TREE_MODE_LIST); etk_tree_multiple_select_set(ETK_TREE(tree), ETK_FALSE); etk_tree_row_height_set(ETK_TREE(tree), 52); @@ -64,10 +64,10 @@ etk_prefs_standard_item_add(tree, categories/preferences-system_48, _(General), NULL); etk_tree_thaw(ETK_TREE(tree)); - /* hbox to hold the tree on one side and the pref's contents on the other */ - hbox = etk_hbox_new(0, 0); - etk_box_append(ETK_BOX(hbox), tree, ETK_BOX_START, ETK_BOX_NONE, 0); - etk_box_append(ETK_BOX(hbox), notebook, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); + /* paned to hold the tree on one side and the pref's contents on the other */ + paned = etk_hpaned_new(); + etk_paned_child1_set(ETK_PANED(paned), tree, ETK_FALSE); + etk_paned_child2_set(ETK_PANED(paned), notebook, ETK_TRUE); /* Some buttons */ etk_dialog_button_add_from_stock(ETK_DIALOG(dialog), ETK_STOCK_DIALOG_CLOSE, ETK_RESPONSE_CLOSE); @@ -76,7 +76,7 @@ etk_signal_connect(response, ETK_OBJECT(dialog), ETK_CALLBACK(_etk_prefs_response_cb), dialog); etk_container_border_width_set(ETK_CONTAINER(dialog), 5); - etk_dialog_pack_in_main_area(ETK_DIALOG(dialog), hbox, ETK_TRUE, ETK_TRUE, + etk_dialog_pack_in_main_area(ETK_DIALOG(dialog), paned, ETK_TRUE, ETK_TRUE, 0, ETK_FALSE); /* create tabs */ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/tools Added Files: Makefile.am Log Message: add src/tools for various tools to come. add src/tools/etk_prefs, an application that allows the user to control several of etk's preferences. right now, it allows you to change themes placed in ~/.e/etk/themes or the global theme path. - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/tools/etk_prefs Added Files: Makefile.am etk_prefs.c Log Message: add src/tools for various tools to come. add src/tools/etk_prefs, an application that allows the user to control several of etk's preferences. right now, it allows you to change themes placed in ~/.e/etk/themes or the global theme path. - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
Etk.h Makefile.am etk_main.c etk_theme.c etk_theme.h
Log Message:
add src/tools for various tools to come.
add src/tools/etk_prefs, an application that allows the user to control several
of etk's preferences. right now, it allows you to change themes placed in
~/.e/etk/themes or the global theme path.
===
RCS file: /cvs/e/e17/proto/etk/src/lib/Etk.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- Etk.h 24 Aug 2006 18:09:16 - 1.40
+++ Etk.h 31 Aug 2006 17:32:06 - 1.41
@@ -19,8 +19,9 @@
#include etk_string.h
#include etk_type.h
#include etk_types.h
+#include etk_config.h
#include etk_utils.h
-
+
#include etk_alignment.h
#include etk_bin.h
#include etk_box.h
===
RCS file: /cvs/e/e17/proto/etk/src/lib/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- Makefile.am 24 Aug 2006 18:09:16 - 1.44
+++ Makefile.am 31 Aug 2006 17:32:06 - 1.45
@@ -83,7 +83,8 @@
etk_utils.h \
etk_viewport.h \
etk_widget.h \
-etk_window.h
+etk_window.h \
+etk_config.h
libetk_la_SOURCES = \
etk_alignment.c \
@@ -152,6 +153,7 @@
etk_viewport.c \
etk_widget.c \
etk_window.c \
+etk_config.c \
$(ETKHEADERS)
installed_headersdir = $(prefix)/include/etk
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_main.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- etk_main.c 21 Aug 2006 11:18:28 - 1.31
+++ etk_main.c 31 Aug 2006 17:32:06 - 1.32
@@ -16,6 +16,7 @@
#include etk_object.h
#include etk_toplevel_widget.h
#include etk_utils.h
+#include etk_config.h
#include etk_theme.h
#include etk_dnd.h
#include etk_tooltips.h
@@ -90,12 +91,18 @@
}
/* Initialize the subsystems of Etk */
- etk_theme_init();
if (!etk_engine_init())
{
ETK_WARNING(Etk_Engine initialization failed!);
return 0;
}
+ if (!etk_config_init())
+ {
+ETK_WARNING(Etk_Config initialization failed!);
+return 0;
+ }
+ etk_config_load();
+ etk_theme_init();
if (!etk_engine_load(engine_name ? engine_name :
ecore_evas_software_x11))
{
ETK_WARNING(Etk can not load the requested engine!);
@@ -140,6 +147,8 @@
etk_tooltips_shutdown();
etk_dnd_shutdown();
etk_engine_shutdown();
+ /* TODO: do we want to save the config here? hmm... */
+ etk_config_shutdown();
etk_theme_shutdown();
evas_list_free(_etk_main_toplevel_widgets);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_theme.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_theme.c 7 Apr 2006 15:36:11 - 1.5
+++ etk_theme.c 31 Aug 2006 17:32:06 - 1.6
@@ -7,6 +7,7 @@
#include Edje.h
#include etk_widget.h
#include etk_string.h
+#include etk_config.h
#include config.h
#define ETK_THEME_PARENT_GET(widget) ((widget)-theme_parent ?
(widget)-theme_parent : (widget)-parent)
@@ -21,11 +22,11 @@
/** @brief Initializes the theming system of Etk. Do not call it manually,
etk_init() calls it! */
void etk_theme_init()
{
- _etk_theme_default_widget_theme = _etk_theme_find(themes, default);
+ _etk_theme_default_widget_theme = _etk_theme_find(themes,
etk_config_widget_theme_get());
_etk_theme_default_icon_theme = _etk_theme_find(icons, default);
/* TODO: etk_config: add support of non default themes */
- etk_theme_widget_theme_set(default);
+ etk_theme_widget_theme_set(etk_config_widget_theme_get());
etk_theme_icon_theme_set(default);
}
@@ -80,6 +81,46 @@
const char *etk_theme_default_widget_theme_get()
{
return _etk_theme_default_widget_theme;
+}
+
+/**
+ * @brief Gets the list of available widget themes
+ * @return Returns an Evas_List of available widget themes
+ */
+Evas_List *etk_theme_widget_theme_available_get()
+{
+ Ecore_List *files;
+ Evas_List *themes = NULL;
+ char *home;
+ char *path;
+ char *file;
+
+ if ((home = getenv(HOME)))
+ {
+ /* TODO: etk_config_dir_get? */
+ path = malloc(strlen(home) + strlen(/.e/etk/themes/) + 1);
+ sprintf(path, %s/.e/etk/themes/, home);
+ files = ecore_file_ls(path);
+ if (files)
+ {
+ecore_list_goto_first(files);
+while((file = ecore_list_next(files)))
+ themes = evas_list_append(themes, ecore_file_strip_ext(file));
+ }
+ free(path);
+ }
+
+ path = malloc(strlen(PACKAGE_DATA_DIR/themes/) + 1);
+ sprintf(path, PACKAGE_DATA_DIR/themes/);
+
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src Modified Files: Makefile.am Log Message: add src/tools for various tools to come. add src/tools/etk_prefs, an application that allows the user to control several of etk's preferences. right now, it allows you to change themes placed in ~/.e/etk/themes or the global theme path. === RCS file: /cvs/e/e17/proto/etk/src/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 27 Jul 2006 01:26:17 - 1.2 +++ Makefile.am 31 Aug 2006 17:32:06 - 1.3 @@ -1,3 +1,3 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = lib engines bin +SUBDIRS = lib engines bin tools - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk Modified Files: configure.in Log Message: add src/tools for various tools to come. add src/tools/etk_prefs, an application that allows the user to control several of etk's preferences. right now, it allows you to change themes placed in ~/.e/etk/themes or the global theme path. === RCS file: /cvs/e/e17/proto/etk/configure.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- configure.in31 Jul 2006 23:23:11 - 1.18 +++ configure.in31 Aug 2006 17:32:05 - 1.19 @@ -260,6 +260,8 @@ src/engines/ecore_evas_software_x11/Makefile src/engines/ecore_fb/Makefile src/bin/Makefile +src/tools/Makefile +src/tools/etk_prefs/Makefile data/Makefile data/themes/Makefile data/themes/default/Makefile - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/lib Added Files: etk_config.c etk_config.h Log Message: add etk_config, etk's internal configuration system for themes, fonts, styles, etc... - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/tools Added Files: .cvsignore Log Message: cvsignore++ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/tools/etk_prefs Added Files: .cvsignore Log Message: cvsignore++ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_theme.c
Log Message:
path fix
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_theme.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- etk_theme.c 31 Aug 2006 17:32:06 - 1.6
+++ etk_theme.c 31 Aug 2006 19:41:31 - 1.7
@@ -23,10 +23,12 @@
void etk_theme_init()
{
_etk_theme_default_widget_theme = _etk_theme_find(themes,
etk_config_widget_theme_get());
+ if (!_etk_theme_default_widget_theme)
+ _etk_theme_default_widget_theme = strdup(default);
_etk_theme_default_icon_theme = _etk_theme_find(icons, default);
/* TODO: etk_config: add support of non default themes */
- etk_theme_widget_theme_set(etk_config_widget_theme_get());
+ etk_theme_widget_theme_set(_etk_theme_default_widget_theme);
etk_theme_icon_theme_set(default);
}
@@ -276,7 +278,7 @@
{
/* TODO: etk_config_dir_get? */
path = malloc(strlen(home) + strlen(subdir) + strlen(/.etk//.edj) +
strlen(theme_name) + 1);
- sprintf(path, %s/.etk/%s/%s.edj, home, subdir, theme_name);
+ sprintf(path, %s/.e/etk/%s/%s.edj, home, subdir, theme_name);
if (ecore_file_exists(path))
return path;
else
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit/src/bin Modified Files: exhibit_image.c Log Message: E's desktop bg group changed, now we can set E backgrounds again. rock. === RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- exhibit_image.c 15 Aug 2006 22:21:47 - 1.34 +++ exhibit_image.c 23 Aug 2006 21:18:43 - 1.35 @@ -1073,7 +1073,7 @@ roots = ecore_x_window_root_list(num); ecore_x_window_size_get(roots[0], w, h); snprintf(filename_s, PATH_MAX, /tmp/%s.png, filenoext); - snprintf(static_bg, PATH_MAX, edje_thumb %s desktop/background %s -g %dx%d -og %dx%d, im-filename, filename_s, w, h, w, h); + snprintf(static_bg, PATH_MAX, edje_thumb %s e/desktop/background %s -g %dx%d -og %dx%d, im-filename, filename_s, w, h, w, h); snprintf(e_bg_set, PATH_MAX, enlightenment_remote -default-bg-set %s, im-filename); snprintf(esetroot_s, PATH_MAX, Esetroot %s %s , esetroot_opt, filename_s); @@ -1115,7 +1115,7 @@ engrave_file_image_add(edj, image); grp = engrave_group_new(); - engrave_group_name_set(grp, desktop/background); + engrave_group_name_set(grp, e/desktop/background); engrave_file_group_add(edj, grp); part = engrave_part_new(ENGRAVE_PART_TYPE_IMAGE); - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/estickies/src/bin
Modified Files:
stickies.c
Log Message:
- copy/cut/paste respects the selected text now
- control-a selects all text in the sticky
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/stickies.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- stickies.c 18 Aug 2006 10:39:01 - 1.10
+++ stickies.c 21 Aug 2006 12:07:37 - 1.11
@@ -73,6 +73,17 @@
{
etk_clipboard_text_request(ETK_WIDGET(s-win));
}
+ else if(!strcmp(ev-key, a))
+ {
+Etk_Textblock_Iter *cursor;
+Etk_Textblock_Iter *selection;
+
+cursor =
etk_textblock_object_cursor_get(ETK_TEXT_VIEW(s-textview)-textblock_object);
+selection =
etk_textblock_object_selection_bound_get(ETK_TEXT_VIEW(s-textview)-textblock_object);
+
+etk_textblock_iter_backward_start(selection);
+etk_textblock_iter_forward_end(cursor);
+ }
}
}
@@ -559,10 +570,9 @@
cursor =
etk_textblock_object_cursor_get(ETK_TEXT_VIEW(s-textview)-textblock_object);
selection =
etk_textblock_object_selection_bound_get(ETK_TEXT_VIEW(s-textview)-textblock_object);
- /* TODO:
-* handle the case where we are pasting and there's a selection
-*/
-
+ if(cursor != selection)
+ etk_textblock_delete_range(ETK_TEXT_VIEW(s-textview)-textblock,
+ cursor, selection);
etk_textblock_insert(ETK_TEXT_VIEW(s-textview)-textblock, cursor,
ev_text-text, strlen(ev_text-text));
}
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/estickies/src/bin Modified Files: stickies.c Log Message: better do it this way to avoid having to recompile the app if the struct changes === RCS file: /cvs/e/e17/proto/estickies/src/bin/stickies.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- stickies.c 21 Aug 2006 12:07:37 - 1.11 +++ stickies.c 21 Aug 2006 12:30:56 - 1.12 @@ -56,7 +56,7 @@ iter2 = etk_textblock_object_selection_bound_get(ETK_TEXT_VIEW(s-textview)-textblock_object); string = etk_textblock_range_text_get( - ETK_TEXT_VIEW(s-textview)-textblock, + etk_text_view_textblock_get(ETK_TEXT_VIEW(s-textview)), iter1, iter2, ETK_FALSE); if(string (text = etk_string_get(string))) @@ -66,7 +66,7 @@ } if(!strcmp(ev-key, x)) - etk_textblock_delete_range(ETK_TEXT_VIEW(s-textview)-textblock, + etk_textblock_delete_range(etk_text_view_textblock_get(ETK_TEXT_VIEW(s-textview)), iter1, iter2); } else if(!strcmp(ev-key, v)) @@ -349,10 +349,10 @@ s-textview = etk_text_view_new(); etk_widget_repeat_mouse_events_set(s-textview, ETK_TRUE); if(s-text) - etk_textblock_text_set(ETK_TEXT_VIEW(s-textview)-textblock, s-text, + etk_textblock_text_set(etk_text_view_textblock_get(ETK_TEXT_VIEW(s-textview)), s-text, ETK_TRUE); else - etk_textblock_text_set(ETK_TEXT_VIEW(s-textview)-textblock, , + etk_textblock_text_set(etk_text_view_textblock_get(ETK_TEXT_VIEW(s-textview)), , ETK_TRUE); etk_box_append(ETK_BOX(vbox), s-textview, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0); @@ -570,10 +570,9 @@ cursor = etk_textblock_object_cursor_get(ETK_TEXT_VIEW(s-textview)-textblock_object); selection = etk_textblock_object_selection_bound_get(ETK_TEXT_VIEW(s-textview)-textblock_object); - if(cursor != selection) - etk_textblock_delete_range(ETK_TEXT_VIEW(s-textview)-textblock, - cursor, selection); - etk_textblock_insert(ETK_TEXT_VIEW(s-textview)-textblock, cursor, + etk_textblock_delete_range(etk_text_view_textblock_get(ETK_TEXT_VIEW(s-textview)), + cursor, selection); + etk_textblock_insert(etk_text_view_textblock_get(ETK_TEXT_VIEW(s-textview)), cursor, ev_text-text, strlen(ev_text-text)); } - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_tool_button.c etk_tool_button.h etk_types.h
Log Message:
toggle button for toolbar (edc not finished yet)
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_tool_button.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_tool_button.c 15 Aug 2006 20:56:19 - 1.2
+++ etk_tool_button.c 17 Aug 2006 15:44:07 - 1.3
@@ -5,13 +5,13 @@
#include etk_button.h
-
/**
* @addtogroup Etk_Tool_Button
* @{
*/
static void _etk_tool_button_constructor(Etk_Tool_Button *tool_button);
+static void _etk_tool_toggle_button_constructor(Etk_Tool_Toggle_Button
*tool_toggle_button);
/**
*
@@ -57,9 +57,9 @@
}
/**
- * @brief Creates a new tool button with a label and an icon defined by a
stock id
+ * @brief Creates a new tool toggle button with a label and an icon defined by
a stock id
* @param stock_id the stock id corresponding to a label and an icon
- * @return Returns the new tool button widget
+ * @return Returns the new tool toggle button widget
* @see Etk_Stock
*/
Etk_Widget *etk_tool_button_new_from_stock(Etk_Stock_Id stock_id)
@@ -72,6 +72,58 @@
return tool_button;
}
+/**
+ * @brief Gets the type of an Etk_Tool_Toggle_Button
+ * @return Returns the type of an Etk_Tool_Toggle_Button
+ */
+Etk_Type *etk_tool_toggle_button_type_get()
+{
+ static Etk_Type *tool_toggle_button_type = NULL;
+
+ if (!tool_toggle_button_type)
+ {
+ tool_toggle_button_type = etk_type_new(Etk_Tool_Toggle_Button,
ETK_TOGGLE_BUTTON_TYPE, sizeof(Etk_Tool_Toggle_Button),
+ ETK_CONSTRUCTOR(_etk_tool_toggle_button_constructor), NULL);
+ }
+
+ return tool_toggle_button_type;
+}
+
+/**
+ * @brief Creates a new tool toggle button
+ * @return Returns the new tool toggle button widget
+ */
+Etk_Widget *etk_tool_toggle_button_new()
+{
+ return etk_widget_new(ETK_TOOL_TOGGLE_BUTTON_TYPE, theme_group,
toolbar/toggle_button,
+ style, ETK_BUTTON_BOTH_VERT, NULL);
+}
+
+/**
+ * @brief Creates a new tool toggle button with a label
+ * @return Returns the new tool toggle button widget
+ */
+Etk_Widget *etk_tool_toggle_button_new_with_label(const char *label)
+{
+ return etk_widget_new(ETK_TOOL_TOGGLE_BUTTON_TYPE, theme_group,
toolbar/toggle_button,
+ label, label, style, ETK_BUTTON_BOTH_VERT, NULL);
+}
+
+/**
+ * @brief Creates a new tool toggle button with a label and an icon defined by
a stock id
+ * @param stock_id the stock id corresponding to a label and an icon
+ * @return Returns the new tool toggle button widget
+ * @see Etk_Stock
+ */
+Etk_Widget *etk_tool_toggle_button_new_from_stock(Etk_Stock_Id stock_id)
+{
+ Etk_Widget *tool_toggle_button;
+
+ tool_toggle_button = etk_tool_toggle_button_new();
+ etk_button_set_from_stock(ETK_BUTTON(tool_toggle_button), stock_id);
+
+ return tool_toggle_button;
+}
/**
*
@@ -83,5 +135,12 @@
static void _etk_tool_button_constructor(Etk_Tool_Button *tool_button)
{
if (!tool_button)
+ return;
+}
+
+/* Initializes the tool toggle button */
+static void _etk_tool_toggle_button_constructor(Etk_Tool_Toggle_Button
*tool_toggle_button)
+{
+ if (!tool_toggle_button)
return;
}
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_tool_button.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_tool_button.h 13 Aug 2006 15:33:17 - 1.1
+++ etk_tool_button.h 17 Aug 2006 15:44:07 - 1.2
@@ -3,6 +3,7 @@
#define _ETK_TOOL_BUTTON_H_
#include etk_button.h
+#include etk_toggle_button.h
#include etk_stock.h
#include etk_types.h
@@ -14,7 +15,7 @@
/** Gets the type of a tool button */
#define ETK_TOOL_BUTTON_TYPE (etk_tool_button_type_get())
-/** Casts the object to an Etk_Button */
+/** Casts the object to an Etk_Tool_Button */
#define ETK_TOOL_BUTTON(obj) (ETK_OBJECT_CAST((obj),
ETK_TOOL_BUTTON_TYPE, Etk_Tool_Button))
/** Checks if the object is an Etk_Tool_Button */
#define ETK_IS_TOOL_BUTTON(obj)(ETK_OBJECT_CHECK_TYPE((obj),
ETK_TOOL_BUTTON_TYPE))
@@ -34,6 +35,37 @@
Etk_Widget *etk_tool_button_new();
Etk_Widget *etk_tool_button_new_with_label(const char *label);
Etk_Widget *etk_tool_button_new_from_stock(Etk_Stock_Id stock_id);
+
+/** @} */
+
+/**
+ * @defgroup Etk_Tool_Toggle_Button Etk_Tool_Toggle_Button
+ * @brief The Etk_Tool_Toggle_Button widget is similar to an Etk_Toggle_Button
but it has a specific toolbar friendly theme
+ * @{
+ */
+
+/** Gets the type of a tool toggle button */
+#define ETK_TOOL_TOGGLE_BUTTON_TYPE (etk_tool_toggle_button_type_get())
+/** Casts the object to an Etk_Tool_Toggle_Button */
+#define ETK_TOOL_TOGGLE_BUTTON(obj) (ETK_OBJECT_CAST((obj),
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/src/bin Modified Files: etk_menu_test.c Log Message: toggle button for toolbar (edc not finished yet) === RCS file: /cvs/e/e17/proto/etk/src/bin/etk_menu_test.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- etk_menu_test.c 15 Aug 2006 17:43:29 - 1.16 +++ etk_menu_test.c 17 Aug 2006 15:44:07 - 1.17 @@ -72,7 +72,7 @@ sep = etk_vseparator_new(); etk_toolbar_append(ETK_TOOLBAR(toolbar), sep); - button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_FIND); + button = etk_tool_toggle_button_new_from_stock(ETK_STOCK_EDIT_FIND); etk_toolbar_append(ETK_TOOLBAR(toolbar), button); /* Window body */ - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
toolbar.edc
Log Message:
toggle button for toolbar (edc not finished yet)
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/toolbar.edc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- toolbar.edc 16 Aug 2006 14:24:24 - 1.3
+++ toolbar.edc 17 Aug 2006 15:44:06 - 1.4
@@ -161,7 +161,7 @@
offset: -1 -1;
}
image {
- normal: menu_item_highlight.png;
+ normal: button_down.png;
border: 8 8 8 8;
}
fill {
@@ -495,6 +495,544 @@
source: ;
action: STATE_SET invisible 0.0;
target: left_widget_swallow;
+ }
+ }
+}
+
+/* TODO: this is ripped off from the menubar's item
+ * we need to clean it a bit, and remove the left_widget swallow thing
+ */
+group {
+ name: toolbar/toggle_button;
+ parts {
+ part {
+ name: item_rect;
+ type: RECT;
+ description {
+state: default 0.0;
+color: 255 255 255 0;
+rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+}
+rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+}
+ }
+ }
+ part {
+ name: left_widget_swallow;
+ type: SWALLOW;
+ mouse_events: 0;
+ description {
+state: invisible 0.0;
+visible: 0;
+rel1 {
+ relative: 0.0 0.0;
+ offset: 0 0;
+}
+rel2 {
+ relative: 0.0 1.0;
+ offset: 0 -1;
+}
+ }
+ description {
+state: visible 0.0;
+rel1 {
+ relative: 0.0 0.5;
+ offset: 3 -8;
+}
+rel2 {
+ relative: 0.0 0.5;
+ offset: 18 7;
+}
+ }
+ }
+ part {
+ name: item_shadow2;
+ mouse_events: 0;
+ description {
+state: default 0.0;
+visible: 0;
+color: 255 255 255 255;
+rel1 {
+ relative: 1.0 0.0;
+ offset: 0 0;
+ to_x: left_widget_swallow;
+}
+rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+}
+image {
+ normal: menu_item_shadow2.png;
+ border: 8 8 8 8;
+}
+fill {
+ smooth: 0;
+}
+ }
+ description {
+state: active 0.0;
+inherit: default 0.0;
+visible: 1;
+color: 255 255 255 255;
+ }
+ }
+ part {
+ name: item_shadow1;
+ mouse_events: 0;
+ description {
+state: default 0.0;
+visible: 0;
+color: 255 255 255 255;
+rel1 {
+ relative: 1.0 0.0;
+ offset: 0 0;
+ to_x: left_widget_swallow;
+}
+rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+}
+image {
+ normal: menu_item_shadow1.png;
+ border: 8 8 8 8;
+}
+fill {
+ smooth: 0;
+}
+ }
+ description {
+state: active 0.0;
+inherit: default 0.0;
+visible: 1;
+color: 255 255 255 255;
+ }
+ }
+ part {
+ name: item_highlight;
+ mouse_events: 0;
+ description {
+state: default 0.0;
+visible: 0;
+color: 255 255 255 0;
+rel1 {
+ relative: 1.0 0.0;
+ offset: 0 0;
+ to_x: left_widget_swallow;
+}
+rel2 {
+ relative: 1.0 1.0;
+ offset: -1 -1;
+}
+image {
+ normal: button_down.png;
+ border: 8 8 8 8;
+}
+fill {
+ smooth: 0;
+}
+ }
+ description {
+state: active 0.0;
+inherit: default 0.0;
+visible: 1;
+color: 255 255 255 255;
+ }
+ description {
+state: on 0.0;
+inherit: default 0.0;
+ visible: 1;
+ color: 255 255 255 255;
+image {
+ normal: button_toggled.png;
+}
+ }
+ }
+ part {
+ name: swallow_area;
+ type: SWALLOW;
+ mouse_events: 1;
+ description {
+state: default 0.0;
+color: 0 0 0
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_toolbar.c
Log Message:
check orientation when flipping separators
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_toolbar.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_toolbar.c 15 Aug 2006 20:56:19 - 1.4
+++ etk_toolbar.c 16 Aug 2006 06:05:53 - 1.5
@@ -169,12 +169,12 @@
for (l = children; l; l = l-next)
{
- if (ETK_IS_VSEPARATOR(l-data))
+ if (ETK_IS_VSEPARATOR(l-data) toolbar-orientation ==
ETK_TOOLBAR_HORIZ)
{
etk_object_destroy(ETK_OBJECT(l-data));
l-data = etk_hseparator_new();
}
- else if (ETK_IS_HSEPARATOR(l-data))
+ else if (ETK_IS_HSEPARATOR(l-data) toolbar-orientation ==
ETK_TOOLBAR_VERT)
{
etk_object_destroy(ETK_OBJECT(l-data));
l-data = etk_vseparator_new();
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/enhance Modified Files: AUTHORS TODO Log Message: AUTHOR++ TODO++ === RCS file: /cvs/e/e17/proto/enhance/AUTHORS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- AUTHORS 3 Apr 2006 22:16:48 - 1.3 +++ AUTHORS 16 Aug 2006 06:11:28 - 1.4 @@ -2,6 +2,9 @@ Hisham 'CodeWarrior' Mardam Bey [EMAIL PROTECTED] +Samuel 'lok' Mendes [EMAIL PROTECTED] +Ugo 'nerochiaro' Riboni [EMAIL PROTECTED] +Simon 'MoOm' Treny [EMAIL PROTECTED] Thanks: === === RCS file: /cvs/e/e17/proto/enhance/TODO,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- TODO7 Feb 2006 00:34:31 - 1.1 +++ TODO16 Aug 2006 06:11:28 - 1.2 @@ -1,4 +1,6 @@ TODO: +- enable enhance to generate C code +- test with glade3 - look out for recursive naming (2 widgets with same name) - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
toolbar.edc
Log Message:
clickity click effect on toolbar buttons
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/toolbar.edc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- toolbar.edc 15 Aug 2006 17:43:29 - 1.2
+++ toolbar.edc 16 Aug 2006 14:24:24 - 1.3
@@ -108,6 +108,10 @@
visible: 1;
color: 255 255 255 255;
}
+description {
+state: down 0.0;
+inherit: default 0.0;
+}
}
part {
name: item_shadow1;
@@ -163,7 +167,7 @@
fill {
smooth: 0;
}
- }
+ }
description {
state: active 0.0;
inherit: default 0.0;
@@ -356,6 +360,20 @@
}
}
programs {
+ program {
+name: button_pressed;
+signal: pressed;
+source: ;
+action: STATE_SET down 0.0;
+ target: item_shadow2;
+ }
+ program {
+name: button_released;
+signal: released;
+source: ;
+action: STATE_SET active 0.0;
+ target: item_shadow2;
+ }
program {
name: go_active_pre;
signal: enter;
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_button.c
Log Message:
this was destroying the image, lok's test app caught it.
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- etk_button.c15 Aug 2006 20:56:19 - 1.25
+++ etk_button.c16 Aug 2006 22:04:29 - 1.26
@@ -324,7 +324,10 @@
if (button-box)
{
if (button-image)
+ {
+etk_signal_disconnect(child_removed, ETK_OBJECT(button-box),
ETK_CALLBACK(_etk_button_image_removed_cb));
etk_container_remove(ETK_CONTAINER(button-box),
ETK_WIDGET(button-image));
+ }
if (button-label)
etk_container_remove(ETK_CONTAINER(button-box),
ETK_WIDGET(button-label));
etk_object_destroy(ETK_OBJECT(button-box));
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_toolbar.c etk_toolbar.h
Log Message:
add functions to get / set orientation. add insets. add some separators for
show.
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_toolbar.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_toolbar.c 15 Aug 2006 15:59:01 - 1.2
+++ etk_toolbar.c 15 Aug 2006 17:43:29 - 1.3
@@ -85,6 +85,55 @@
etk_box_prepend(ETK_BOX(toolbar-box), widget, ETK_BOX_START, ETK_BOX_NONE,
0);
}
+/**
+ * @brief Sets the toolbar's orientation (horizontal or vertical)
+ * @param toolbar the toolbar
+ * @param orientation the orientation
+ */
+void etk_toolbar_orientation_set(Etk_Toolbar *toolbar, int orientation)
+{
+ Evas_List *children;
+ Evas_List *l;
+
+ if (!toolbar || toolbar-orientation == orientation ||
+ (orientation != ETK_TOOLBAR_ORIENTATION_HORIZONTAL
+ orientation != ETK_TOOLBAR_ORIENTATION_VERTICAL))
+ return;
+
+ children = etk_container_children_get(ETK_CONTAINER(toolbar-box));
+
+ for (l = children; l; l = l-next)
+ etk_container_remove(ETK_CONTAINER(toolbar-box), ETK_WIDGET(l-data));
+
+ etk_object_destroy(ETK_OBJECT(toolbar-box));
+
+ toolbar-orientation = orientation;
+ if (toolbar-orientation == ETK_TOOLBAR_ORIENTATION_VERTICAL)
+ toolbar-box = etk_vbox_new(ETK_FALSE, 0);
+ else
+ toolbar-box = etk_hbox_new(ETK_FALSE, 0);
+
+ etk_widget_parent_set(toolbar-box, ETK_WIDGET(toolbar));
+ etk_widget_visibility_locked_set(ETK_WIDGET(toolbar-box), ETK_TRUE);
+ etk_widget_show(toolbar-box);
+
+ for (l = children; l; l = l-next)
+ etk_box_append(ETK_BOX(toolbar-box), ETK_WIDGET(l-data),
ETK_BOX_START, ETK_BOX_NONE, 0);
+}
+
+/**
+ * @brief Gets the toolbar's orientation (horizontal or vertical)
+ * @param toolbar the toolbar
+ * @return the orientation
+ */
+int etk_toolbar_orientation_get(Etk_Toolbar *toolbar)
+{
+ if (!toolbar)
+ return ETK_FALSE;
+
+ return toolbar-orientation;
+}
+
/**
*
* Etk specific functions
@@ -131,7 +180,7 @@
switch (property_id)
{
case ETK_TOOLBAR_ORIENTATION_PROPERTY:
- //etk_window_title_set(window, etk_property_value_string_get(value));
+ etk_toolbar_orientation_set(toolbar,
etk_property_value_int_get(value));
break;
default:
break;
@@ -149,7 +198,7 @@
switch (property_id)
{
case ETK_TOOLBAR_ORIENTATION_PROPERTY:
- //etk_property_value_string_set(value, etk_window_title_get(window));
+ etk_property_value_int_set(value, toolbar-orientation);
break;
default:
break;
@@ -171,10 +220,14 @@
static void _etk_toolbar_size_allocate(Etk_Widget *widget, Etk_Geometry
geometry)
{
Etk_Toolbar *toolbar;
+ Etk_Size size;
if (!(toolbar = ETK_TOOLBAR(widget)))
return;
-
+
+ etk_widget_size_request(toolbar-box, size);
+ geometry.w = ETK_MAX(geometry.w, size.w);
+ geometry.h = ETK_MAX(geometry.h, size.h);
etk_widget_size_allocate(ETK_WIDGET(toolbar-box), geometry);
}
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_toolbar.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_toolbar.h 13 Aug 2006 15:33:17 - 1.1
+++ etk_toolbar.h 15 Aug 2006 17:43:29 - 1.2
@@ -5,6 +5,7 @@
#include etk_widget.h
#include etk_box.h
#include etk_types.h
+#include etk_utils.h
/**
* @defgroup Etk_Toolbar Etk_Toolbar
@@ -50,6 +51,9 @@
void etk_toolbar_append(Etk_Toolbar *toolbar, Etk_Widget *widget);
void etk_toolbar_prepend(Etk_Toolbar *toolbar, Etk_Widget *widget);
+
+void etk_toolbar_orientation_set(Etk_Toolbar *toolbar, int orientation);
+int etk_toolbar_orientation_get(Etk_Toolbar *toolbar);
/** @} */
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_menu_test.c
Log Message:
add functions to get / set orientation. add insets. add some separators for
show.
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_menu_test.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- etk_menu_test.c 15 Aug 2006 15:59:01 - 1.15
+++ etk_menu_test.c 15 Aug 2006 17:43:29 - 1.16
@@ -23,7 +23,8 @@
Etk_Widget *radio_item;
Etk_Widget *label;
Etk_Widget *toolbar;
- Etk_Widget *button;
+ Etk_Widget *button;
+ Etk_Widget *sep;
if (win)
{
@@ -34,7 +35,7 @@
win = etk_window_new();
etk_window_title_set(ETK_WINDOW(win), Etk Menu Test);
etk_signal_connect(delete_event, ETK_OBJECT(win),
ETK_CALLBACK(etk_window_hide_on_delete), NULL);
- etk_widget_size_request_set(win, 300, 200);
+ etk_widget_size_request_set(win, 325, 240);
/
* The window
@@ -52,20 +53,27 @@
button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_COPY);
etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+
button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_CUT);
etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_PASTE);
etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
- button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_FIND);
- etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+ sep = etk_vseparator_new();
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), sep);
button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_UNDO);
etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_REDO);
- etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+
+ sep = etk_vseparator_new();
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), sep);
+
+ button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_FIND);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
/* Window body */
label = etk_label_new(Click me! :));
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/data/themes/default/widgets
Modified Files:
toolbar.edc
Log Message:
add functions to get / set orientation. add insets. add some separators for
show.
===
RCS file: /cvs/e/e17/proto/etk/data/themes/default/widgets/toolbar.edc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- toolbar.edc 13 Aug 2006 15:33:17 - 1.1
+++ toolbar.edc 15 Aug 2006 17:43:29 - 1.2
@@ -1,5 +1,8 @@
group {
name: toolbar;
+ data {
+ item: inset 1 1 2 2;
+ }
parts {
part {
name: toolbar;
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
Etk.h etk_button.c etk_button.h etk_tool_button.c
etk_toolbar.c etk_toolbar.h
Log Message:
- buttons now have a stock_size property
- buttons now have a style property that can control their appearence (icon,
text, icon + text horiz, or icon + text vert)
- toolbar can change its orientation (horiz or vert)
- toolbar gets a style property that will affect its children's property
(icons, text, both, both vert)
- toolbar will automatically change the orientation of any separators it holds
once its orientation changes
===
RCS file: /cvs/e/e17/proto/etk/src/lib/Etk.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- Etk.h 13 Aug 2006 15:33:17 - 1.36
+++ Etk.h 15 Aug 2006 20:56:19 - 1.37
@@ -26,7 +26,6 @@
#include etk_stock.h
#include etk_bin.h
#include etk_box.h
-#include etk_toolbar.h
#include etk_table.h
#include etk_alignment.h
#include etk_frame.h
@@ -42,6 +41,7 @@
#include etk_toggle_button.h
#include etk_check_button.h
#include etk_radio_button.h
+#include etk_toolbar.h
#include etk_tool_button.h
#include etk_editable_text_object.h
#include etk_textblock.h
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- etk_button.c15 Aug 2006 15:59:01 - 1.24
+++ etk_button.c15 Aug 2006 20:56:19 - 1.25
@@ -29,7 +29,8 @@
ETK_BUTTON_IMAGE_PROPERTY,
ETK_BUTTON_XALIGN_PROPERTY,
ETK_BUTTON_YALIGN_PROPERTY,
- ETK_BUTTON_TOOL_PROPERTY
+ ETK_BUTTON_STYLE_PROPERTY,
+ ETK_BUTTON_STOCK_SIZE_PROPERTY
};
static void _etk_button_constructor(Etk_Button *button);
@@ -83,8 +84,10 @@
ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_float(0.5));
etk_type_property_add(button_type, yalign, ETK_BUTTON_YALIGN_PROPERTY,
ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_float(0.5));
- etk_type_property_add(button_type, tool, ETK_BUTTON_TOOL_PROPERTY,
- ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_FALSE));
+ etk_type_property_add(button_type, style, ETK_BUTTON_STYLE_PROPERTY,
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_BUTTON_BOTH_VERT));
+ etk_type_property_add(button_type, stock_size,
ETK_BUTTON_STOCK_SIZE_PROPERTY,
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_STOCK_SMALL));
button_type-property_set = _etk_button_property_set;
button_type-property_get = _etk_button_property_get;
@@ -243,10 +246,7 @@
if (!button)
return;
- if (button-tool)
- image = etk_image_new_from_stock(stock_id, ETK_STOCK_MEDIUM);
- else
- image = etk_image_new_from_stock(stock_id, ETK_STOCK_SMALL);
+ image = etk_image_new_from_stock(stock_id, button-stock_size);
etk_widget_show(image);
etk_widget_visibility_locked_set(image, ETK_TRUE);
label = etk_stock_label_get(stock_id);
@@ -308,19 +308,19 @@
}
/**
- * @brief Sets wether the button is a toolbar button or not
+ * @brief Sets the style of the button (icon, text, both vertically, both
horizontally
* @param button a button
- * @param tool ETK_TRUE for a toolbar button, ETK_FALSE otherwise
+ * @param style the style to give the button
*/
-void etk_button_tool_set(Etk_Button *button, Etk_Bool tool)
+void etk_button_style_set(Etk_Button *button, Etk_Button_Style style)
{
if (!button)
return;
- if (button-tool == tool)
+ if (button-style == style)
return;
- button-tool = tool;
+ button-style = style;
if (button-box)
{
if (button-image)
@@ -331,20 +331,62 @@
button-box = NULL;
}
_etk_button_children_create(button);
- etk_object_notify(ETK_OBJECT(button), tool);
+ etk_object_notify(ETK_OBJECT(button), style);
}
/**
- * @brief Gets wether the button is a toolbar button or not
+ * @brief Sets the style of the button (icon, text, both vertically, both
horizontally
* @param button a button
- * @return Returns a boolean indication of its a toolbar button or not
+ * @return Returns the button's style
*/
-Etk_Bool etk_button_tool_get(Etk_Button *button)
+Etk_Button_Style etk_button_style_get(Etk_Button *button)
{
if (!button)
return ETK_FALSE;
- return button-tool;
+ return button-style;
+}
+
+/**
+ * @brief Sets the button's stock size
+ * @param button a button
+ * @param style the stock size
+ */
+void etk_button_stock_size_set(Etk_Button *button, Etk_Stock_Size size)
+{
+ Etk_Stock_Id stock_id;
+ Etk_Stock_Size stock_size;
+
+ if (!button)
+
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/enhance/src/lib
Modified Files:
Enhance.h enhance.c
Log Message:
nerochiaro making his patch better
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/Enhance.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Enhance.h 8 Aug 2006 19:02:41 - 1.3
+++ Enhance.h 14 Aug 2006 09:11:31 - 1.4
@@ -117,13 +117,13 @@
/* Gets the next signal name + handler name for a certain part in the GUI.
Returns NULL if there are no more. */
Enhance_Signals_Enumerator enhance_signals_next(Enhance *en,
Enhance_Signals_Enumerator current, char **signal, char **handler);
-/* Starts the enumeration of all GUI parts. You should always call
enhance_widgets_end to close it. */
+/* Starts the enumeration of all GUI parts. */
Enhance_Widgets_Enumerator enhance_widgets_start(Enhance *en);
/* Gets the next GUI part. Return NULL if there are no more GUI parts. */
const char* enhance_widgets_next(Enhance *en,
Enhance_Widgets_Enumerator* enumeration);
-/* Ends an enumeration of all GUI parts. */
+/* Ends an enumeration of all GUI parts. You don't need to call this if
widgets_next returns NULL. But calling it anyway is legal. */
voidenhance_widgets_end(Enhance *en,
Enhance_Widgets_Enumerator* enumeration);
#ifdef __cplusplus
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- enhance.c 8 Aug 2006 21:45:42 - 1.18
+++ enhance.c 14 Aug 2006 09:11:31 - 1.19
@@ -1129,26 +1129,30 @@
const char*
enhance_widgets_next(Enhance *en, Enhance_Widgets_Enumerator* enumerator)
{
- Evas_List *list;
+ Evas_List *list,*prev;
char* data;
if (enumerator == NULL) return NULL;
-
list = *enumerator;
+ if (list == NULL) return NULL;
+
data = evas_list_data(list);
- *enumerator = evas_list_prev(list);
+ prev = evas_list_prev(list);
+ if (prev == NULL) enhance_widgets_end(en, enumerator);
+
+ *enumerator = prev;
return data;
}
void
enhance_widgets_end(Enhance *en, Enhance_Widgets_Enumerator* enumerator)
{
- Evas_List *l;
+ Evas_List *list;
- l = *enumerator;
- for (; l; l = evas_list_next(l)) E_FREE(l-data);
- evas_list_free(l);
-
+ if (enumerator == NULL) return;
+
+ list = *enumerator;
+ if (list != NULL) evas_list_free(list);
*enumerator = NULL;
}
@@ -1184,11 +1188,13 @@
_e_signal_hash_free(Evas_Hash *hash, const char *key, void *data, void *fdata)
{
Evas_List *signals;
- Evas_List *l;
+ void *item;
signals = data;
- for(l = signals; l; l = l-next)
- E_FREE(l-data);
+ for(; signals; signals = evas_list_next(signals)) {
+ item = evas_list_data(signals);
+ E_FREE(item);
+ }
evas_list_free(signals);
return 1;
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
Etk.h Makefile.am etk_button.c etk_types.h
Added Files:
etk_tool_button.c etk_tool_button.h etk_toolbar.c
etk_toolbar.h
Log Message:
add toolbar and a tool_button. ***THIS IS NOT READY YET***
===
RCS file: /cvs/e/e17/proto/etk/src/lib/Etk.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- Etk.h 27 Jul 2006 01:04:52 - 1.35
+++ Etk.h 13 Aug 2006 15:33:17 - 1.36
@@ -26,6 +26,7 @@
#include etk_stock.h
#include etk_bin.h
#include etk_box.h
+#include etk_toolbar.h
#include etk_table.h
#include etk_alignment.h
#include etk_frame.h
@@ -41,6 +42,7 @@
#include etk_toggle_button.h
#include etk_check_button.h
#include etk_radio_button.h
+#include etk_tool_button.h
#include etk_editable_text_object.h
#include etk_textblock.h
#include etk_entry.h
===
RCS file: /cvs/e/e17/proto/etk/src/lib/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- Makefile.am 27 Jul 2006 01:04:52 - 1.40
+++ Makefile.am 13 Aug 2006 15:33:17 - 1.41
@@ -80,7 +80,9 @@
etk_viewport.h \
etk_widget.h \
etk_window.h \
-etk_engine.h
+etk_engine.h \
+etk_toolbar.h \
+etk_tool_button.h
libetk_la_SOURCES = \
etk_alignment.c \
@@ -146,6 +148,8 @@
etk_widget.c \
etk_window.c \
etk_engine.c \
+etk_toolbar.c \
+etk_tool_button.c \
$(ETKHEADERS)
installed_headersdir = $(prefix)/include/etk
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- etk_button.c13 Aug 2006 10:41:15 - 1.21
+++ etk_button.c13 Aug 2006 15:33:17 - 1.22
@@ -378,6 +378,7 @@
button-is_pressed = ETK_FALSE;
button-xalign = 0.5;
button-yalign = 0.5;
+ button-tool = ETK_FALSE;
etk_signal_connect(realize, ETK_OBJECT(button),
ETK_CALLBACK(_etk_button_realize_cb), NULL);
etk_signal_connect(key_down, ETK_OBJECT(button),
ETK_CALLBACK(_etk_button_key_down_cb), NULL);
@@ -603,7 +604,7 @@
if (!button-box)
{
if (button-tool)
- button-box = etk_vbox_new(ETK_FALSE, 8);
+ button-box = etk_vbox_new(ETK_FALSE, 1);
else
button-box = etk_hbox_new(ETK_FALSE, 8);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_types.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- etk_types.h 27 Jul 2006 16:49:35 - 1.49
+++ etk_types.h 13 Aug 2006 15:33:17 - 1.50
@@ -101,6 +101,8 @@
typedef struct Etk_Textblock_Node Etk_Textblock_Node;
typedef struct _Etk_Toggle_Button Etk_Toggle_Button;
typedef struct _Etk_Toplevel_Widget Etk_Toplevel_Widget;
+typedef struct _Etk_Toolbar Etk_Toolbar;
+typedef struct _Etk_Tool_Button Etk_Tool_Button;
typedef struct _Etk_Tree Etk_Tree;
typedef struct _Etk_Tree_Col Etk_Tree_Col;
typedef struct _Etk_Tree_Model Etk_Tree_Model;
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/widgets Added Files: tool_button.edc toolbar.edc Log Message: add toolbar and a tool_button. ***THIS IS NOT READY YET*** - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default/images Modified Files: images.edc Added Files: toolbar.png Log Message: add toolbar and a tool_button. ***THIS IS NOT READY YET*** === RCS file: /cvs/e/e17/proto/etk/data/themes/default/images/images.edc,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- images.edc 7 Aug 2006 20:01:21 - 1.29 +++ images.edc 13 Aug 2006 15:33:17 - 1.30 @@ -95,4 +95,5 @@ image: wm_bg_overlay.png COMP; image: wm_border.png COMP; image: wm_shadow.png COMP; + image: toolbar.png COMP; } - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/bin
Modified Files:
etk_menu_test.c
Log Message:
add toolbar and a tool_button. ***THIS IS NOT READY YET***
===
RCS file: /cvs/e/e17/proto/etk/src/bin/etk_menu_test.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_menu_test.c 24 Jun 2006 17:54:06 - 1.13
+++ etk_menu_test.c 13 Aug 2006 15:33:17 - 1.14
@@ -22,7 +22,9 @@
Etk_Widget *menu_item;
Etk_Widget *radio_item;
Etk_Widget *label;
-
+ Etk_Widget *toolbar;
+ Etk_Widget *button;
+
if (win)
{
etk_widget_show_all(ETK_WIDGET(win));
@@ -42,7 +44,28 @@
menu_bar = etk_menu_bar_new();
etk_box_pack_start(ETK_BOX(vbox), menu_bar, ETK_FALSE, ETK_FALSE, 0);
+
+ toolbar = etk_toolbar_new();
+ etk_box_pack_start(ETK_BOX(vbox), toolbar, ETK_FALSE, ETK_FALSE, 0);
+
+ button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_COPY);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+
+ button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_CUT);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+
+ button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_PASTE);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+
+ button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_FIND);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+
+ button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_UNDO);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+ button = etk_tool_button_new_from_stock(ETK_STOCK_EDIT_REDO);
+ etk_toolbar_append(ETK_TOOLBAR(toolbar), button);
+
label = etk_label_new(Click me! :));
etk_label_alignment_set(ETK_LABEL(label), 0.5, 0.5);
etk_widget_pass_mouse_events_set(label, ETK_TRUE);
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/etk/data/themes/default Modified Files: default.edc Log Message: add toolbar and a tool_button. ***THIS IS NOT READY YET*** === RCS file: /cvs/e/e17/proto/etk/data/themes/default/default.edc,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- default.edc 30 Jul 2006 21:09:31 - 1.21 +++ default.edc 13 Aug 2006 15:33:16 - 1.22 @@ -31,6 +31,7 @@ #include widgets/tooltips.edc #include widgets/iconbox.edc #include widgets/colorpicker.edc + #include widgets/toolbar.edc #include wm/background.edc #include wm/borders.edc - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_button.c etk_button.h
Log Message:
give Etk_Button a new property, tool, that will change it to use a vertical
layout instead of a horizontal one and will grow the stock icon (if used) from
SMALL to MEDIUM.
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- etk_button.c8 Aug 2006 18:51:22 - 1.20
+++ etk_button.c13 Aug 2006 10:41:15 - 1.21
@@ -28,7 +28,8 @@
ETK_BUTTON_LABEL_PROPERTY,
ETK_BUTTON_IMAGE_PROPERTY,
ETK_BUTTON_XALIGN_PROPERTY,
- ETK_BUTTON_YALIGN_PROPERTY
+ ETK_BUTTON_YALIGN_PROPERTY,
+ ETK_BUTTON_TOOL_PROPERTY
};
static void _etk_button_constructor(Etk_Button *button);
@@ -82,6 +83,8 @@
ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_float(0.5));
etk_type_property_add(button_type, yalign, ETK_BUTTON_YALIGN_PROPERTY,
ETK_PROPERTY_FLOAT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_float(0.5));
+ etk_type_property_add(button_type, tool, ETK_BUTTON_TOOL_PROPERTY,
+ ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_FALSE));
button_type-property_set = _etk_button_property_set;
button_type-property_get = _etk_button_property_get;
@@ -206,8 +209,8 @@
if (button-image)
{
- etk_signal_disconnect(child_removed, ETK_OBJECT(button-hbox),
ETK_CALLBACK(_etk_button_image_removed_cb));
- etk_container_remove(ETK_CONTAINER(button-hbox),
ETK_WIDGET(button-image));
+ etk_signal_disconnect(child_removed, ETK_OBJECT(button-box),
ETK_CALLBACK(_etk_button_image_removed_cb));
+ etk_container_remove(ETK_CONTAINER(button-box),
ETK_WIDGET(button-image));
}
button-image = image;
@@ -239,8 +242,11 @@
if (!button)
return;
-
- image = etk_image_new_from_stock(stock_id, ETK_STOCK_SMALL);
+
+ if (button-tool)
+ image = etk_image_new_from_stock(stock_id, ETK_STOCK_MEDIUM);
+ else
+ image = etk_image_new_from_stock(stock_id, ETK_STOCK_SMALL);
etk_widget_show(image);
etk_widget_visibility_locked_set(image, ETK_TRUE);
label = etk_stock_label_get(stock_id);
@@ -303,6 +309,46 @@
*yalign = button ? button-yalign : 0;
}
+/**
+ * @brief Sets wether the button is a toolbar button or not
+ * @param button a button
+ * @param tool ETK_TRUE for a toolbar button, ETK_FALSE otherwise
+ */
+void etk_button_tool_set(Etk_Button *button, Etk_Bool tool)
+{
+ if (!button)
+ return;
+
+ if (button-tool == tool)
+ return;
+
+ button-tool = tool;
+ if (button-box)
+ {
+ if (button-image)
+etk_container_remove(ETK_CONTAINER(button-box),
ETK_WIDGET(button-image));
+ if (button-label)
+etk_container_remove(ETK_CONTAINER(button-box),
ETK_WIDGET(button-label));
+ etk_object_destroy(ETK_OBJECT(button-box));
+ button-box = NULL;
+ }
+ _etk_button_children_create(button);
+ etk_object_notify(ETK_OBJECT(button), tool);
+}
+
+/**
+ * @brief Gets wether the button is a toolbar button or not
+ * @param button a button
+ * @return Returns a boolean indication of its a toolbar button or not
+ */
+Etk_Bool etk_button_tool_get(Etk_Button *button)
+{
+ if (!button)
+ return ETK_FALSE;
+
+ return button-tool;
+}
+
/**
*
* Etk specific functions
@@ -315,7 +361,7 @@
if (!button)
return;
- button-hbox = NULL;
+ button-box = NULL;
button-image = NULL;
button-alignment = NULL;
@@ -362,6 +408,8 @@
break;
case ETK_BUTTON_YALIGN_PROPERTY:
etk_button_alignment_set(button, button-xalign,
etk_property_value_float_get(value));
+ case ETK_BUTTON_TOOL_PROPERTY:
+ etk_button_tool_set(button, etk_property_value_bool_get(value));
default:
break;
}
@@ -389,6 +437,9 @@
case ETK_BUTTON_YALIGN_PROPERTY:
etk_property_value_float_set(value, button-yalign);
break;
+ case ETK_BUTTON_TOOL_PROPERTY:
+ etk_property_value_bool_set(value, button-tool);
+ break;
default:
break;
}
@@ -412,7 +463,7 @@
etk_widget_theme_signal_emit(ETK_WIDGET(button), pressed);
}
-/* Called when the image is removed from the hbox */
+/* Called when the image is removed from the box */
static void _etk_button_image_removed_cb(Etk_Object *object, Etk_Widget
*child, void *data)
{
Etk_Button *button;
@@ -528,8 +579,20 @@
if (button-image)
{
- if (!button-alignment)
+ Etk_Stock_Id stock_id;
+ Etk_Stock_Size stock_size;
+
+ etk_image_stock_get(button-image, stock_id, stock_size);
+ if (stock_id != ETK_STOCK_NO_STOCK)
{
+
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/entrance_edit_gui/src/gui Modified Files: main.c theme.c Log Message: dont include etk/Etk.h (use Etk.h since etk-config --cflags should give you the proper include path), why are we using autoconf 2.60 here? === RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/main.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- main.c 12 Aug 2006 14:54:42 - 1.2 +++ main.c 12 Aug 2006 15:23:53 - 1.3 @@ -1,4 +1,4 @@ -#include etk/Etk.h +#include Etk.h #include Entrance_Widgets.h #include Egui.h === RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/theme.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- theme.c 12 Aug 2006 14:54:42 - 1.2 +++ theme.c 12 Aug 2006 15:23:53 - 1.3 @@ -1,7 +1,7 @@ #include limits.h #include Ecore_File.h #include Ecore_Data.h -#include etk/Etk.h +#include Etk.h #include Entrance_Widgets.h //#include Egui.h - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_main.c exhibit_menus.c exhibit_options.c
exhibit_slideshow.c exhibit_tab.c
Log Message:
more work on options - balony
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- exhibit.h 10 Aug 2006 04:01:10 - 1.25
+++ exhibit.h 10 Aug 2006 17:05:48 - 1.26
@@ -35,7 +35,8 @@
#define EX_DEFAULT_SHARPEN_THRESH 2
#define EX_DEFAULT_BRIGHTEN_THRESH 100
#define EX_DEFAULT_SLIDE_INTERVAL 5.0
-#define EX_DEFAULT_COMMENTS_VISIBLE 0
+#define EX_DEFAULT_COMMENTS_HIDDEN 0
+#define EX_DEFAULT_COMMENTS_VISIBLE 1
#define EX_DEFAULT_WINDOW_WIDTH 700
#define EX_DEFAULT_WINDOW_HEIGHT 500
@@ -91,6 +92,9 @@
Etk_Widget *blur_thresh;
Etk_Widget *sharpen_thresh;
Etk_Widget *brighten_thresh;
+
+ Etk_Widget *slide_interval;
+ Etk_Widget *comments_visible;
};
struct _Ex_Tab
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- exhibit_main.c 10 Aug 2006 04:01:10 - 1.61
+++ exhibit_main.c 10 Aug 2006 17:05:48 - 1.62
@@ -140,6 +140,9 @@
E_FREE(data2);
etk_object_data_set(ETK_OBJECT(e-cur_tab-image), undo, NULL);
+
+ if (e-options-comments_visible)
+ _ex_comment_show(e);
if(e-cur_tab-comment.visible)
_ex_comment_load(e);
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_menus.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- exhibit_menus.c 10 Aug 2006 04:01:10 - 1.25
+++ exhibit_menus.c 10 Aug 2006 17:05:48 - 1.26
@@ -386,24 +386,42 @@
void
_ex_menu_comments_cb(Etk_Object *obj, void *data)
{
- Exhibit *e;
- Etk_Tree_Row *r;
- char *icol_string;
+ Exhibit *e = data;
EX_MENU_ITEM_GET_RETURN(obj);
- e = data;
- r = etk_tree_selected_row_get(ETK_TREE(e-cur_tab-itree));
- if(!r) return;
-
- etk_tree_row_fields_get(r,
etk_tree_nth_col_get(ETK_TREE(e-cur_tab-itree), 0), NULL, icol_string,
etk_tree_nth_col_get(ETK_TREE(e-cur_tab-itree), 1),NULL);
-
+ if (!e-cur_tab-image_loaded)
+ return;
+
if(!e-cur_tab-comment.visible)
{
+ e-options-comments_visible = EX_DEFAULT_COMMENTS_VISIBLE;
_ex_comment_show(e);
- _ex_comment_load(e);
+ _ex_comment_load(e);
+
+ if(e-opt_dialog)
+ {
+/* If the options dialog is open, toggle the checkbox */
+if (!etk_toggle_button_active_get
+ (ETK_TOGGLE_BUTTON(e-opt_dialog-comments_visible)))
+
etk_toggle_button_toggle(ETK_TOGGLE_BUTTON(e-opt_dialog-comments_visible));
+ }
}
else
- _ex_comment_hide(e);
+ {
+ e-options-comments_visible = EX_DEFAULT_COMMENTS_HIDDEN;
+ _ex_comment_hide(e);
+
+ if(e-opt_dialog)
+ {
+/* If the options dialog is open, toggle the checkbox */
+if (etk_toggle_button_active_get
+ (ETK_TOGGLE_BUTTON(e-opt_dialog-comments_visible)))
+
etk_toggle_button_toggle(ETK_TOGGLE_BUTTON(e-opt_dialog-comments_visible));
+ }
+ }
+
+ /* Save this as settings since we want remember state for this */
+ _ex_options_save(e);
}
void
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_options.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- exhibit_options.c 10 Aug 2006 04:01:10 - 1.7
+++ exhibit_options.c 10 Aug 2006 17:05:48 - 1.8
@@ -183,7 +183,7 @@
e-options-sharpen_thresh = EX_DEFAULT_SHARPEN_THRESH;
e-options-brighten_thresh = EX_DEFAULT_BRIGHTEN_THRESH;
e-options-slide_interval = EX_DEFAULT_SLIDE_INTERVAL;
- e-options-comments_visible = EX_DEFAULT_COMMENTS_VISIBLE;
+ e-options-comments_visible = EX_DEFAULT_COMMENTS_HIDDEN;
e-options-default_view = EX_IMAGE_ONE_TO_ONE;
e-options-default_sort = 0; /* TODO: enumerate sort types */
e-options-last_w = EX_DEFAULT_WINDOW_WIDTH;
@@ -334,6 +334,7 @@
{
Ex_Options_Dialog *dialog = e-opt_dialog;
const char *string;
+ double ss_int;
/* STANDARD VIEW */
@@ -349,6 +350,21 @@
e-options-default_view = EX_IMAGE_FIT_TO_WINDOW;
_ex_tab_current_fit_to_window(e);
}
+
+ /* COMMENTS */
+ if (IS_SELECTED(dialog-comments_visible))
+ {
+ D((Comments EX_DEFAULT_COMMENTS_VISIBLE\n));
+ e-options-comments_visible = EX_DEFAULT_COMMENTS_VISIBLE;
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: AUTHORS TODO Log Message: more work on options - balony === RCS file: /cvs/e/e17/proto/exhibit/AUTHORS,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- AUTHORS 10 Aug 2006 04:01:10 - 1.4 +++ AUTHORS 10 Aug 2006 17:05:48 - 1.5 @@ -1,7 +1,7 @@ Authors: Hisham 'CodeWarrior' Mardambey [EMAIL PROTECTED] -Martin 'balonly' Sarajervi [EMAIL PROTECTED] +Martin 'balony' Sarajervi [EMAIL PROTECTED] Simon 'MoOm' Treny [EMAIL PROTECTED] Thanks: === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- TODO10 Aug 2006 04:06:33 - 1.11 +++ TODO10 Aug 2006 17:05:48 - 1.12 @@ -14,12 +14,7 @@ - options * provide tab for open in applications - * slide show speed - * comments visibile / hidden by default (with remembering last state) -- image operations: - * crop - o DONE: -- + andy's comments feature @@ -36,6 +31,8 @@ + new window + options + dialog (common options) + + slide show speed + + comments visibile / hidden by default (with remembering last state) + key shotcuts + x - fit / unfit to window + s (slideshow) - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_comment.c exhibit_image.c exhibit_main.c
exhibit_options.c exhibit_sort.c exhibit_tab.c
Log Message:
- patch from balony:
sorting in options
save after rotate option
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- exhibit.h 10 Aug 2006 17:05:48 - 1.26
+++ exhibit.h 11 Aug 2006 02:30:57 - 1.27
@@ -62,6 +62,14 @@
EX_IMAGE_ZOOM_OUT = -4
} Ex_Images;
+typedef enum _Ex_Sort
+{
+ EX_SORT_BY_DATE = -1,
+ EX_SORT_BY_SIZE = -2,
+ EX_SORT_BY_NAME = -3,
+ EX_SORT_BY_RESOLUTION = -4
+} Ex_Sort;
+
struct _Ex_Options
{
char *app1;
@@ -77,8 +85,10 @@
double slide_interval;
int comments_visible;
+ int rotate_autosave;
int default_view;
int default_sort;
+ int default_sort_tmp;
int last_w;
int last_h;
@@ -95,6 +105,12 @@
Etk_Widget *slide_interval;
Etk_Widget *comments_visible;
+ Etk_Widget *rotate_autosave;
+ Etk_Widget *default_sort;
+ Etk_Combobox_Item *sort_date;
+ Etk_Combobox_Item *sort_size;
+ Etk_Combobox_Item *sort_name;
+ Etk_Combobox_Item *sort_resolution;
};
struct _Ex_Tab
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- exhibit_comment.c 2 Aug 2006 03:10:43 - 1.9
+++ exhibit_comment.c 11 Aug 2006 02:30:57 - 1.10
@@ -9,9 +9,6 @@
void
_ex_comment_show(Exhibit *e)
{
- if(e-cur_tab-comment.visible)
- return;
-
e-cur_tab-comment.vbox = etk_vbox_new(ETK_FALSE, 0);
if(evas_list_count(e-tabs) == 1)
{
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- exhibit_image.c 10 Aug 2006 04:01:10 - 1.29
+++ exhibit_image.c 11 Aug 2006 02:30:57 - 1.30
@@ -342,7 +342,11 @@
evas_object_image_size_set(im-image_object, iw, ih);
evas_object_image_data_set(im-image_object, data);
evas_object_image_data_update_add(im-image_object, 0, 0, iw, ih);
- etk_widget_size_request_set(ETK_WIDGET(im), iw, ih);
+ etk_widget_size_request_set(ETK_WIDGET(im), iw, ih);
+
+
+ if (e-options-rotate_autosave)
+ _ex_image_save(ETK_IMAGE(e-cur_tab-image));
}
void
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- exhibit_main.c 10 Aug 2006 17:05:48 - 1.62
+++ exhibit_main.c 11 Aug 2006 02:30:57 - 1.63
@@ -104,13 +104,12 @@
{
etk_image_set_from_file(ETK_IMAGE(e-cur_tab-image), image);
- if (e-options-default_view == EX_IMAGE_FIT_TO_WINDOW)
+ if (e-cur_tab-fit_window)
{
_ex_tab_current_fit_to_window(e);
D((Setting EX_IMAGE_FIT_TO_WINDOW loaded and used\n));
-
}
- else if (e-options-default_view == EX_IMAGE_ONE_TO_ONE)
+ else
{
_ex_tab_current_zoom_one_to_one(e);
D((Setting EX_IMAGE_ONE_TO_ONE loaded and used\n));
@@ -143,9 +142,6 @@
if (e-options-comments_visible)
_ex_comment_show(e);
-
- if(e-cur_tab-comment.visible)
- _ex_comment_load(e);
}
static int
@@ -256,6 +252,18 @@
}
etk_tree_thaw(ETK_TREE(e-cur_tab-itree));
+
+ D((e-options-default_sort: %d\n, e-options-default_sort));
+
+ if (e-options-default_sort == EX_SORT_BY_DATE)
+ _ex_sort_date_cb(NULL, NULL);
+ else if (e-options-default_sort == EX_SORT_BY_SIZE)
+ _ex_sort_size_cb(NULL, NULL);
+ else if (e-options-default_sort == EX_SORT_BY_NAME)
+ _ex_sort_name_cb(NULL, NULL);
+ else if (e-options-default_sort == EX_SORT_BY_RESOLUTION)
+ _ex_sort_resol_cb(NULL, NULL);
+
etk_tree_thaw(ETK_TREE(e-cur_tab-dtree));
etk_tree_sort(ETK_TREE(e-cur_tab-dtree), _ex_main_dtree_compare_cb,
ETK_TRUE, e-cur_tab-dcol, NULL);
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_options.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- exhibit_options.c 10 Aug 2006 17:05:48 - 1.8
+++ exhibit_options.c 11 Aug 2006 02:30:57 - 1.9
@@ -94,7 +94,9 @@
CFG_OPTIONS_NEWI(rt, brighten_thresh, EET_T_DOUBLE);
CFG_OPTIONS_NEWI(lt, slide_interval, EET_T_DOUBLE);
CFG_OPTIONS_NEWI(cv, comments_visible, EET_T_INT);
+ CFG_OPTIONS_NEWI(ra,
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_image.c exhibit_main.c exhibit_main.h
exhibit_menus.c exhibit_options.c exhibit_options.h
Log Message:
- AUTHORS++
- patch from balony for options dialog
- x will fit / unfit image
- s will start / stop slideshow
- some cleanups and removal of unused stuff
- TODO updates
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- exhibit.h 3 Aug 2006 13:12:17 - 1.24
+++ exhibit.h 10 Aug 2006 04:01:10 - 1.25
@@ -47,6 +47,7 @@
typedef struct _Exhibit Exhibit;
typedef struct _Ex_Options Ex_Options;
+typedef struct _Ex_Options_Dialog Ex_Options_Dialog;
typedef struct _Ex_Tab Ex_Tab;
typedef struct _Ex_Thumb Ex_Thumb;
typedef struct _Ex_Filedialog Ex_Filedialog;
@@ -82,6 +83,16 @@
int last_h;
};
+struct _Ex_Options_Dialog
+{
+ Etk_Widget *dv_btn_1;
+ Etk_Widget *dv_btn_2;
+
+ Etk_Widget *blur_thresh;
+ Etk_Widget *sharpen_thresh;
+ Etk_Widget *brighten_thresh;
+};
+
struct _Ex_Tab
{
char *dir;
@@ -157,6 +168,7 @@
Ex_Tab*cur_tab;
Ex_Options *options;
+ Ex_Options_Dialog *opt_dialog;
Ex_Config_Version *version;
struct {
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- exhibit_image.c 3 Aug 2006 13:12:17 - 1.28
+++ exhibit_image.c 10 Aug 2006 04:01:10 - 1.29
@@ -353,15 +353,18 @@
int x, y, mx, my, mw, mh, mt, xx, yy;
int a, r, g, b;
int *as, *rs, *gs, *bs;
- int rad = 2; /* maybe make this configurable later */
+ int rad = 2;
unsigned int *p1, *p2;
if(im-use_edje)
return;
-
+
etk_image_size_get(im, w, h);
data2 = evas_object_image_data_get(im-image_object, ETK_TRUE);
_ex_image_data_copy(im, data2, w, h); /* for undo */
+
+ rad = e-options-blur_thresh;
+ D((_ex_image_blur: using rad: %d\n, rad));
if (rad 1)
return;
@@ -454,7 +457,7 @@
int w, h;
int x, y;
int a, r, g, b;
- int rad = 2; /* maybe make this configurable later */
+ int rad = 2;
unsigned int *p1, *p2;
if(im-use_edje)
@@ -465,6 +468,11 @@
_ex_image_data_copy(im, data2, w, h); /* for undo */
data = malloc(w * h * sizeof(unsigned int));
+
+ /* FIXME I cant see any difference with this changed?? -- Balony */
+ rad = e-options-sharpen_thresh;
+ D((_ex_image_sharpen: using rad: %d\n, rad));
+
if (rad == 0)
return;
else
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- exhibit_main.c 3 Aug 2006 13:12:17 - 1.60
+++ exhibit_main.c 10 Aug 2006 04:01:10 - 1.61
@@ -10,12 +10,6 @@
Exhibit *e;
Evas_List *event_handlers;
-
-
-static void _ex_main_button_zoom_in_cb(Etk_Object *obj, void *data);
-static void _ex_main_button_zoom_out_cb(Etk_Object *obj, void *data);
-static void _ex_main_button_zoom_one_to_one_cb(Etk_Object *obj, void *data);
-static void _ex_main_button_fit_to_window_cb(Etk_Object *obj, void *data);
static int _ex_main_dtree_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data);
static void _ex_main_goto_dir_clicked_cb(Etk_Object *object, void *data);
static void _ex_main_entry_dir_key_down_cb(Etk_Object *object, void *event,
void *data);
@@ -52,46 +46,6 @@
}
}
-static void
-_ex_main_button_zoom_in_cb(Etk_Object *obj, void *data)
-{
- Exhibit *e;
-
- e = data;
-
- _ex_tab_current_zoom_in(e);
-}
-
-static void
-_ex_main_button_zoom_out_cb(Etk_Object *obj, void *data)
-{
- Exhibit *e;
-
- e = data;
-
- _ex_tab_current_zoom_out(e);
-}
-
-static void
-_ex_main_button_zoom_one_to_one_cb(Etk_Object *obj, void *data)
-{
- Exhibit *e;
-
- e = data;
-
- _ex_tab_current_zoom_one_to_one(e);
-}
-
-static void
-_ex_main_button_fit_to_window_cb(Etk_Object *obj, void *data)
-{
- Exhibit *e;
-
- e = data;
-
- _ex_tab_current_fit_to_window(e);
-}
-
void
_ex_main_image_unset()
{
@@ -149,17 +103,18 @@
else
{
etk_image_set_from_file(ETK_IMAGE(e-cur_tab-image), image);
-
- if (e-cur_tab-fit_window)
- {
- _ex_main_button_fit_to_window_cb(NULL, e);
-e-options-default_view = EX_IMAGE_FIT_TO_WINDOW;
- }
- else
- {
- _ex_main_button_zoom_one_to_one_cb(NULL, e);
-
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: AUTHORS README TODO Log Message: - AUTHORS++ - patch from balony for options dialog - x will fit / unfit image - s will start / stop slideshow - some cleanups and removal of unused stuff - TODO updates === RCS file: /cvs/e/e17/proto/exhibit/AUTHORS,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- AUTHORS 3 Mar 2006 00:44:37 - 1.3 +++ AUTHORS 10 Aug 2006 04:01:10 - 1.4 @@ -1,9 +1,7 @@ -Main author: - +Authors: + Hisham 'CodeWarrior' Mardambey [EMAIL PROTECTED] - -Contributions: -== +Martin 'balonly' Sarajervi [EMAIL PROTECTED] Simon 'MoOm' Treny [EMAIL PROTECTED] Thanks: === RCS file: /cvs/e/e17/proto/exhibit/README,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- README 14 Dec 2005 11:39:40 - 1.2 +++ README 10 Aug 2006 04:01:10 - 1.3 @@ -11,6 +11,7 @@ - sharpen / blur - saving - resizing (needs implementation) -- zooming in and out (needs implementation) -- drag and drop (needs implementation) -- image sorting (needs implementation) +- zooming in and out +- drag and drop +- image sorting + === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- TODO3 Aug 2006 13:12:17 - 1.9 +++ TODO10 Aug 2006 04:01:10 - 1.10 @@ -14,15 +14,9 @@ * about - options - * dialog * slide show speed * comments visibile / hidden by default (with remembering last state) -- key shotcuts - * x - fit / unfit to window - -- make slideshow display its status in the statusbar(s) - - image operations: * crop @@ -34,11 +28,18 @@ + dnd + fix .spec file + make argv work with /path/to/image.png and not only /path/to/dir ++ make slideshow display its status in the statusbar(s) + save window geometry between sessions + menus + save image as + delete (needs message dialog) - + new window + + new window ++ options + + dialog (common options) ++ key shotcuts + + x - fit / unfit to window + + s (slideshow) + + control-q (quit) = * RELEASSE 0.2.0: - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: TODO Log Message: TODO++ === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- TODO10 Aug 2006 04:01:10 - 1.10 +++ TODO10 Aug 2006 04:06:33 - 1.11 @@ -5,15 +5,15 @@ o TODO: -- --menus - * search +- menus * rename - * open in options based on config values + * open in should be generated from options * refresh * release notes * about - options + * provide tab for open in applications * slide show speed * comments visibile / hidden by default (with remembering last state) @@ -49,7 +49,10 @@ -- - integrate with evfs for file tagging and categories - integrate with libgphoto for digicam interaction - +- menus + * search +- image operations: + * crop * MISC FEATURES: @@ -64,7 +67,8 @@ === - fix autocomplete (combobox?) -- if we're scrolled to the end of the dir tree, clicking on a dir needs to - reset the scrollbar to the top. - if we're looking at a LOT of images and change dir before they have finished loading, then the images will thumbnail and load in the current dir + ++ if we're scrolled to the end of the dir tree, clicking on a dir needs to + reset the scrollbar to the top. - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/enhance/src/lib
Modified Files:
Enhance.h enhance.c
Log Message:
- patch from nerochiaro to add widget enumerators (another step for more
friendliness for scripting languages)
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/Enhance.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Enhance.h 5 Aug 2006 17:11:18 - 1.2
+++ Enhance.h 8 Aug 2006 19:02:41 - 1.3
@@ -69,6 +69,7 @@
} Enhance_Signal_Handling;
typedef Evas_List* Enhance_Signals_Enumerator;
+typedef Evas_List* Enhance_Widgets_Enumerator;
typedef struct _Enhance Enhance;
@@ -81,7 +82,7 @@
Evas_Hash *radio_groups; /* radio groups used */
char *main_window;/* main window to show */
Enhance_Signal_Handling signal_handling; /* how the signals should be
handled */
-};
+};
/* Initialize and shutdown the enhance subsystems */
voidenhance_init();
@@ -98,23 +99,32 @@
void enhance_signal_handling_set(Enhance *en,
Enhance_Signal_Handling mode);
/* Loads / parses a Glade XML file showing main_window */
-voidenhance_file_load(Enhance *en, char *main_window, char *file);
+voidenhance_file_load(Enhance *en, const char *main_window, const char
*file);
/* Sets / gets a void *data variable of a particular callback */
-voidenhance_callback_data_set(Enhance *en, char *cb_name, void *data);
-void *enhance_callback_data_get(Enhance *en, char *cb_name);
+voidenhance_callback_data_set(Enhance *en, const char *cb_name, void
*data);
+void *enhance_callback_data_get(Enhance *en, const char *cb_name);
/* Gets the internal Etk_Widget for a certain part in the GUI */
-Etk_Widget *enhance_var_get(Enhance *en, char *string);
+Etk_Widget *enhance_var_get(Enhance *en, const char *string);
/* Gets the number of signal handlers for a certain part in the GUI */
-intenhance_signals_count(Enhance *en, char *widget);
+intenhance_signals_count(Enhance *en, const char
*widget);
/* Gets the first signal name + handler name for a certain part in the GUI.
Returns NULL if there are none. */
-Enhance_Signals_Enumerator enhance_signals_first(Enhance *en, char* widget,
char **signal, char **handler);
+Enhance_Signals_Enumerator enhance_signals_first(Enhance *en, const char*
widget, char **signal, char **handler);
/* Gets the next signal name + handler name for a certain part in the GUI.
Returns NULL if there are no more. */
Enhance_Signals_Enumerator enhance_signals_next(Enhance *en,
Enhance_Signals_Enumerator current, char **signal, char **handler);
+
+/* Starts the enumeration of all GUI parts. You should always call
enhance_widgets_end to close it. */
+Enhance_Widgets_Enumerator enhance_widgets_start(Enhance *en);
+
+/* Gets the next GUI part. Return NULL if there are no more GUI parts. */
+const char* enhance_widgets_next(Enhance *en,
Enhance_Widgets_Enumerator* enumeration);
+
+/* Ends an enumeration of all GUI parts. */
+voidenhance_widgets_end(Enhance *en,
Enhance_Widgets_Enumerator* enumeration);
#ifdef __cplusplus
}
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- enhance.c 8 Aug 2006 03:40:41 - 1.16
+++ enhance.c 8 Aug 2006 19:02:42 - 1.17
@@ -752,10 +752,6 @@
sig_hndl[0] = name;
sig_hndl[1] = handler;
-#if DEBUG
- printf(STORING %s %s = %s\n, parent_id, sig_hndl[0], sig_hndl[1]);
-#endif
-
signals = evas_hash_find(en-signals, parent_id);
signals = evas_list_append(signals, sig_hndl);
en-signals = evas_hash_add(en-signals, parent_id, signals);
@@ -1028,7 +1024,7 @@
}
void
-enhance_file_load(Enhance *en, char *main_window, char *file)
+enhance_file_load(Enhance *en, const char *main_window, const char *file)
{
EXML *xml;
EXML_Node *node;
@@ -1048,7 +1044,7 @@
}
Etk_Widget *
-enhance_var_get(Enhance *en, char *string)
+enhance_var_get(Enhance *en, const char *string)
{
E_Widget *widget;
@@ -1063,14 +1059,11 @@
}
int
-enhance_signals_count(Enhance *en, char *widget)
+enhance_signals_count(Enhance *en, const char *widget)
{
Evas_List *signals;
signals = evas_hash_find(en-signals, widget);
-#if DEBUG
- printf(READING %p \n, signals);
-#endif
return evas_list_count(signals);
}
@@ -1082,20 +1075,13 @@
sig_hndl = cur-data;
*signal = sig_hndl[0];
*handler = sig_hndl[1];
-#if DEBUG
- printf(PRINTING: %s = %s\n, *signal, *handler);
-#endif
}
Enhance_Signals_Enumerator
-enhance_signals_first(Enhance *en, char*
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/estickies/src/bin
Modified Files:
stickies.c
Log Message:
- poor morlenxus hit control-d waiting for a confirmation dialog but never got
one. well, now he will. sorry for your sticky (=
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/stickies.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- stickies.c 6 Aug 2006 16:55:06 - 1.7
+++ stickies.c 8 Aug 2006 21:43:33 - 1.8
@@ -39,7 +39,7 @@
}
else if(!strcmp(ev-key, d))
{
-_e_sticky_delete(s);
+_e_sticky_delete_confirm(s);
}
else if(!strcmp(ev-key, q))
{
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/enhance/src/lib
Modified Files:
enhance.c
Log Message:
- comment out this function until its implemented again.
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- enhance.c 7 Aug 2006 03:40:34 - 1.15
+++ enhance.c 8 Aug 2006 03:40:41 - 1.16
@@ -690,7 +690,11 @@
IF_PARENT_CLASS(GtkNotebook)
{
PROPERTY_BOOL;
- etk_notebook_show_tabs_set(ETK_NOTEBOOK(wid-wid), value);
+/* FIXME: Simon removed this.
+ *lok, wanna implement again without issues?
+ *
+ * etk_notebook_show_tabs_set(ETK_NOTEBOOK(wid-wid), value);
+ */
}
}
}
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/estickies/src/bin
Modified Files:
conf.c stickies.c stickies.h
Log Message:
- implement sticky note locking
- remember sticky / locked status across sessions
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/conf.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- conf.c 5 Aug 2006 16:46:51 - 1.4
+++ conf.c 6 Aug 2006 16:55:06 - 1.5
@@ -174,7 +174,7 @@
char *home;
int size;
E_Config_Stickies *stickies = NULL;
-
+
home = getenv(HOME);
if(!home)
{
@@ -250,7 +250,7 @@
intret;
E_Config_Stickies *stickies = NULL;
Evas_List *l;
-
+
home = getenv(HOME);
if(!home)
return 0;
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/stickies.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- stickies.c 4 Aug 2006 15:05:20 - 1.6
+++ stickies.c 6 Aug 2006 16:55:06 - 1.7
@@ -211,9 +211,10 @@
E_Sticky *s;
s = data;
-
+
etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(s-stick_toggle),
etk_window_sticky_get(ETK_WINDOW(object)));
+ s-stick = etk_window_sticky_get(ETK_WINDOW(object));
}
static Etk_Widget *
@@ -259,7 +260,8 @@
s = E_NEW(1, E_Sticky);
s-theme = NULL;
-
+ s-stick = 0;
+ s-locked = 0;
_e_sticky_window_add(s);
return s;
}
@@ -278,7 +280,7 @@
s-win = etk_window_new();
etk_window_title_set(ETK_WINDOW(s-win), estickies);
- etk_window_wmclass_set(ETK_WINDOW(s-win), _estickies, _estickies);
+ etk_window_wmclass_set(ETK_WINDOW(s-win), estickies, estickies);
etk_window_decorated_set(ETK_WINDOW(s-win), ETK_FALSE);
etk_window_shaped_set(ETK_WINDOW(s-win), ETK_TRUE);
etk_widget_theme_file_set(s-win, theme);
@@ -308,17 +310,19 @@
button_stick)));
etk_signal_connect_swapped(clicked, ETK_OBJECT(s-stick_toggle),
ETK_CALLBACK(_e_sticky_stick_toggle), s);
- //etk_tooltips_tip_set(button, Make sticky visible on all desktops);
+ //etk_tooltips_tip_set(button, Make sticky visible on all desktops);
etk_box_pack_start(ETK_BOX(hbox), s-stick_toggle, ETK_FALSE, ETK_FALSE, 0);
- s-lock_button = etk_button_new();
- etk_object_properties_set(ETK_OBJECT(s-lock_button),
+ s-lock_toggle = etk_toggle_button_new();
+ etk_object_properties_set(ETK_OBJECT(s-lock_toggle),
focusable, ETK_FALSE, NULL);
- etk_button_image_set(ETK_BUTTON(s-lock_button),
+ etk_button_image_set(ETK_BUTTON(s-lock_toggle),
ETK_IMAGE(etk_image_new_from_edje(theme,
button_lock)));
- //etk_tooltips_tip_set(button, Lock sticky (read-only));
- etk_box_pack_start(ETK_BOX(hbox), s-lock_button, ETK_FALSE, ETK_FALSE, 0);
+ etk_signal_connect_swapped(toggled, ETK_OBJECT(s-lock_toggle),
+ ETK_CALLBACK(_e_sticky_lock_toggle), s);
+ //etk_tooltips_tip_set(button, Lock sticky (read-only));
+ etk_box_pack_start(ETK_BOX(hbox), s-lock_toggle, ETK_FALSE, ETK_FALSE, 0);
s-close_button = etk_button_new();
etk_object_properties_set(ETK_OBJECT(s-close_button),
@@ -433,6 +437,30 @@
{
etk_window_sticky_set(ETK_WINDOW(s-win),
!etk_window_sticky_get(ETK_WINDOW(s-win)));
+ s-stick = !etk_window_sticky_get(ETK_WINDOW(s-win));
+}
+
+void
+_e_sticky_lock_toggle(E_Sticky *s)
+{
+ s-locked =
etk_toggle_button_active_get(ETK_TOGGLE_BUTTON(s-lock_toggle));
+
etk_textblock_object_cursor_visible_set(ETK_TEXT_VIEW(s-textview)-textblock_object,
+ !s-locked);
+ etk_object_properties_set(ETK_OBJECT(s-textview),
+focusable, !s-locked, NULL);
+ if(s-locked)
+ {
+ etk_object_properties_set(ETK_OBJECT(s-win),
+ focusable, ETK_TRUE, NULL);
+ etk_widget_unfocus(s-textview);
+ etk_widget_focus(s-win);
+ }
+ else
+ {
+ etk_widget_focus(s-textview);
+ etk_object_properties_set(ETK_OBJECT(s-win),
+ focusable, ETK_FALSE, NULL);
+ }
}
void
@@ -442,6 +470,21 @@
}
void
+_e_sticky_lock_set(E_Sticky *s, Etk_Bool on)
+{
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(s-lock_toggle), on);
+}
+
+void
+_e_sticky_properties_set(E_Sticky *s)
+{
+ if(s-stick == 1)
+ etk_window_sticky_set(ETK_WINDOW(s-win), ETK_TRUE);
+ if(s-locked == 1)
+ _e_sticky_lock_set(s, ETK_TRUE);
+}
+
+void
_e_sticky_theme_apply(E_Sticky *s, char *theme)
{
char theme_file[PATH_MAX];
@@ -466,7 +509,7 @@
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/enhance/src/lib
Modified Files:
enhance.c
Log Message:
fix segv in hash free()ing.
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- enhance.c 31 Jul 2006 20:06:55 - 1.12
+++ enhance.c 5 Aug 2006 16:18:43 - 1.13
@@ -1041,7 +1041,6 @@
E_Widget *widget;
widget = data;
- evas_hash_del(hash, key, data);
if(widget-packing)
{
E_FREE(widget-packing-x_options);
@@ -1060,7 +1059,8 @@
if(!en) return;
exml_destroy(en-xml);
evas_hash_foreach(en-widgets, _e_widget_hash_free, en);
- ecore_hash_destroy(_en_stock_items_hash);
+ evas_hash_free(en-widgets);
+ ecore_hash_destroy(_en_stock_items_hash);
E_FREE(en-main_window);
E_FREE(en);
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_combobox.c
Log Message:
this stops extrackt crashing. is it due to something else?
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_combobox.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- etk_combobox.c 30 Jul 2006 21:09:32 - 1.18
+++ etk_combobox.c 5 Aug 2006 16:18:57 - 1.19
@@ -986,7 +986,7 @@
col_geometry.w = combobox-cols[i]-size;
}
- if (combobox-active_item_children[j])
+ if (combobox-active_item_children combobox-active_item_children[j])
{
memcpy(child_geometry, col_geometry, sizeof(Etk_Geometry));
etk_container_child_space_fill(combobox-active_item_children[j],
child_geometry,
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/enhance/examples
Modified Files:
dialog.glade enhance_test.c
Log Message:
fix segv in hash free()ing.
===
RCS file: /cvs/e/e17/proto/enhance/examples/dialog.glade,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- dialog.glade11 Jul 2006 03:16:41 - 1.1
+++ dialog.glade5 Aug 2006 16:18:43 - 1.2
@@ -19,6 +19,7 @@
property name=focus_on_mapTrue/property
property name=urgency_hintFalse/property
property name=has_separatorTrue/property
+ signal name=delete_event handler=on_window1_delete_event
last_modification_time=Fri, 04 Aug 2006 19:59:06 GMT/
child internal-child=vbox
widget class=GtkVBox id=dialog-vbox1
===
RCS file: /cvs/e/e17/proto/enhance/examples/enhance_test.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- enhance_test.c 2 Aug 2006 05:53:59 - 1.8
+++ enhance_test.c 5 Aug 2006 16:18:43 - 1.9
@@ -20,7 +20,7 @@
return 1;
}
-int main(void)
+int main(int argc, char **argv)
{
char *string1;
char *string2;
@@ -33,7 +33,7 @@
data = string1;
enhance_init();
- etk_init(NULL,NULL);
+ etk_init(argc, argv);
en = enhance_new();
enhance_callback_data_set(en, rip_only_clicked, data);
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/estickies/src/bin
Modified Files:
about.c conf.c
Log Message:
- close eet file when we need to use default conf due to improper configs
version.
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/about.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- about.c 4 Aug 2006 15:05:20 - 1.2
+++ about.c 5 Aug 2006 16:46:51 - 1.3
@@ -43,9 +43,9 @@
uses Etk. It uses Etk's runtime theming support
to change the look and feel of the windows and
buttons.\n
- bp align=\center\style effect=\glow\
- VERSION
- /style/p/b,
+ p align=\center\style effect=glow color1=#fa14
color2=#fe87
+ bVERSION/b
+ /style/p,
ETK_TRUE);
etk_container_add(ETK_CONTAINER(frame), desctext);
etk_box_pack_start(ETK_BOX(vbox), frame, ETK_FALSE, ETK_FALSE, 0);
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/conf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- conf.c 4 Aug 2006 15:05:20 - 1.3
+++ conf.c 5 Aug 2006 16:46:51 - 1.4
@@ -216,6 +216,7 @@
if(_e_config_version_compare(v, ss-version) != 0)
{
ERROR(Your version / configuration of E-Stickies is not valid!);
+eet_close(ef);
_e_config_defaults_apply(ss);
return 0;
}
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/enhance/src/lib
Modified Files:
Enhance.h enhance.c
Log Message:
- patch from netochiaro to make on the fly signal connections optional and more
friendly for scripting languages
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/Enhance.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Enhance.h 7 Feb 2006 00:34:32 - 1.1
+++ Enhance.h 5 Aug 2006 17:11:18 - 1.2
@@ -60,16 +60,27 @@
#define E_STRDUP(str) strdup(str)
#endif
-
+
+typedef enum Enhance_Signal_Handling
+{
+ ENHANCE_SIGNAL_CONNECT, /** Signals are automatically connected
upon file_load */
+ ENHANCE_SIGNAL_STORE, /** Only a list of signal names + handler
names is kept */
+ ENHANCE_SIGNAL_NONE,/** Signals are completely ignored */
+} Enhance_Signal_Handling;
+
+typedef Evas_List* Enhance_Signals_Enumerator;
+
typedef struct _Enhance Enhance;
-
+
struct _Enhance
{
EXML *xml;/* xml document */
Evas_Hash *widgets;/* all the allocated widgets */
Evas_Hash *callback_data; /* void *data variables for callbacks */
+ Evas_Hash *signals;/* signal name + callback name association for
each widget */
Evas_Hash *radio_groups; /* radio groups used */
char *main_window;/* main window to show */
+ Enhance_Signal_Handling signal_handling; /* how the signals should be
handled */
};
/* Initialize and shutdown the enhance subsystems */
@@ -79,7 +90,13 @@
/* Create / destroy an Enhance object */
Enhance*enhance_new();
voidenhance_free(Enhance *en);
-
+
+/* Gets how Enhance will manage the signal handlers it encounters */
+Enhance_Signal_Handling enhance_signal_handling_get(Enhance *en);
+
+/* Sets how Enhance will manage the signal handlers it encounters */
+void enhance_signal_handling_set(Enhance *en,
Enhance_Signal_Handling mode);
+
/* Loads / parses a Glade XML file showing main_window */
voidenhance_file_load(Enhance *en, char *main_window, char *file);
@@ -89,6 +106,15 @@
/* Gets the internal Etk_Widget for a certain part in the GUI */
Etk_Widget *enhance_var_get(Enhance *en, char *string);
+
+/* Gets the number of signal handlers for a certain part in the GUI */
+intenhance_signals_count(Enhance *en, char *widget);
+
+/* Gets the first signal name + handler name for a certain part in the GUI.
Returns NULL if there are none. */
+Enhance_Signals_Enumerator enhance_signals_first(Enhance *en, char* widget,
char **signal, char **handler);
+
+/* Gets the next signal name + handler name for a certain part in the GUI.
Returns NULL if there are no more. */
+Enhance_Signals_Enumerator enhance_signals_next(Enhance *en,
Enhance_Signals_Enumerator current, char **signal, char **handler);
#ifdef __cplusplus
}
===
RCS file: /cvs/e/e17/proto/enhance/src/lib/enhance.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- enhance.c 5 Aug 2006 16:18:43 - 1.13
+++ enhance.c 5 Aug 2006 17:11:18 - 1.14
@@ -695,36 +695,57 @@
void *handle;
void *data = NULL;
etk_callback_type func;
+ Evas_List *signals;
+ char **sig_hndl;
name = ecore_hash_get(node-attributes, name);
if(!name) return;
-
+
handler = ecore_hash_get(node-attributes, handler);
if(!handler) return;
- handle = dlopen(NULL, RTLD_NOW | RTLD_LOCAL);
- if(!handle)
- return;
-
- func = dlsym(handle, handler);
- if(!func)
- {
- printf(ENHANCE ERROR!!!\n
- Error loading dynamic callback: %s\n
- %s\n,
- handler, dlerror());
- return;
- }
-
parent_id = ecore_hash_get(node-parent-attributes, id);
if(!parent_id) return;
- wid = evas_hash_find(en-widgets, parent_id);
- if(!wid) return;
-
- data = evas_hash_find(en-callback_data, handler);
+
+ if (en-signal_handling == ENHANCE_SIGNAL_CONNECT)
+ {
+ handle = dlopen(NULL, RTLD_NOW | RTLD_LOCAL);
+ if(!handle)
+return;
+
+ func = dlsym(handle, handler);
+ if(!func)
+{
+ printf(ENHANCE ERROR!!!\n
+ Error loading dynamic callback: %s\n
+ %s\n,
+ handler, dlerror());
+ return;
+}
- etk_signal_connect(name, ETK_OBJECT(wid-wid),
- ETK_CALLBACK(func), data);
+ wid = evas_hash_find(en-widgets, parent_id);
+ if(!wid) return;
+
+ data = evas_hash_find(en-callback_data, handler);
+
+ etk_signal_connect(name, ETK_OBJECT(wid-wid),
+ ETK_CALLBACK(func), data);
+ return;
+ }
+ else
+ {
+
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_image.c exhibit_image.h exhibit_main.c
exhibit_main.h exhibit_menus.c exhibit_menus.h
exhibit_slideshow.c exhibit_tab.c
Log Message:
- new patch from balony:
- Added the run command (hardcoded for now, config based later)
- work on the menus
- general dialog function for simple usage
- Statusbar report in slideshow
- New tabs from menu now
- some cleanups and minor fixes
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- exhibit.h 2 Aug 2006 19:23:22 - 1.23
+++ exhibit.h 3 Aug 2006 13:12:17 - 1.24
@@ -224,4 +224,6 @@
#include exhibit_options.h
#include exhibit_comment.h
+extern Exhibit *e;
+
#endif
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- exhibit_image.c 2 Aug 2006 19:23:22 - 1.27
+++ exhibit_image.c 3 Aug 2006 13:12:17 - 1.28
@@ -83,6 +83,11 @@
etk_toplevel_widget_pointer_push(ETK_TOPLEVEL_WIDGET(e-win),
ETK_POINTER_MOVE);
}
+ else if(ev-button == 2)
+ {
+ /* TODO Make this function configurable in options */
+ _ex_tab_current_fit_to_window(e);
+ }
else if(ev-button == 3)
{
Etk_Widget *menu_item;
@@ -97,34 +102,35 @@
#endif
e-menu = etk_menu_new();
- menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Sort),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e-menu), ETK_CALLBACK(_ex_menu_run_in_cb),
e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Undo), ETK_STOCK_EDIT_UNDO,
ETK_MENU_SHELL(e-menu), ETK_CALLBACK(_ex_menu_undo_cb), e);
+ _ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(e-menu), NULL, NULL);
+
+menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Run in ...),
ETK_STOCK_APPLICATION_X_EXECUTABLE, ETK_MENU_SHELL(e-menu),
ETK_CALLBACK(_ex_menu_run_in_cb), e);
+submenu = etk_menu_new();
+etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(submenu));
+_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(The Gimp),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_menu_run_in_cb),
e);
+_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(XV), ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_menu_run_in_cb), e);
+_ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Xpaint),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_menu_run_in_cb),
e);
+ menu_item = _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Favorites),
ETK_STOCK_EMBLEM_FAVORITE, ETK_MENU_SHELL(e-menu),
ETK_CALLBACK(_ex_menu_run_in_cb), e);
submenu = etk_menu_new();
etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(submenu));
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Undo), ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(e-menu), ETK_CALLBACK(_ex_menu_undo_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(e-menu), NULL, NULL);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Date), ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_date_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Size), ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_size_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Name), ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_name_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Resolution),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(submenu), ETK_CALLBACK(_ex_sort_resol_cb),
e);
-
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(in The Gimp),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e-menu), ETK_CALLBACK(_ex_menu_run_in_cb),
e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(in XV), ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(e-menu), ETK_CALLBACK(_ex_menu_run_in_cb), e);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(in Xpaint),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e-menu), ETK_CALLBACK(_ex_menu_run_in_cb),
e);
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Add to favorites),
ETK_STOCK_EMBLEM_PHOTOS, ETK_MENU_SHELL(submenu),
ETK_CALLBACK(_ex_menu_add_to_fav_cb), e);
+ if(_ex_image_is_favorite(e))
+ _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Remove from favorites),
ETK_STOCK_LIST_REMOVE, ETK_MENU_SHELL(submenu),
ETK_CALLBACK(_ex_menu_remove_from_fav_cb), e);
_ex_menu_item_new(EX_MENU_ITEM_SEPERATOR, NULL, ETK_STOCK_NO_STOCK,
ETK_MENU_SHELL(e-menu), NULL, NULL);
- _ex_menu_item_new(EX_MENU_ITEM_NORMAL, _(Rotate clockwise),
ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(e-menu),
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/estickies/data/images Log Message: Directory /cvs/e/e17/proto/estickies/data/images added to the repository - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/estickies/data/images Added Files: Makefile.am estickies.png Log Message: add an about dialog - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/estickies/src/bin
Modified Files:
Makefile.am stickies.c stickies.h theme_chooser.h
Added Files:
about.c about.h
Log Message:
add an about dialog
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 31 Jul 2006 00:31:45 - 1.2
+++ Makefile.am 4 Aug 2006 04:30:40 - 1.3
@@ -18,6 +18,7 @@
stickies.c \
conf.c \
theme_chooser.c \
+about.c \
$(estickies_INCLUDES)
estickies_LDADD = @my_libs@
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/stickies.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- stickies.c 3 Aug 2006 02:40:11 - 1.4
+++ stickies.c 4 Aug 2006 04:30:40 - 1.5
@@ -212,7 +212,8 @@
_etk_menu_stock_item_new(Save, ETK_STOCK_DOCUMENT_SAVE,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_e_config_save), ss);
_etk_menu_stock_item_new(Delete, ETK_STOCK_EDIT_DELETE,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_e_sticky_delete_confirm), s);
_etk_menu_stock_item_new(Options, ETK_STOCK_PREFERENCES_DESKTOP_THEME,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_e_theme_chooser_show), s);
- _etk_menu_stock_item_new(Quit, ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu),
ETK_CALLBACK(etk_main_quit), NULL);
+ _etk_menu_stock_item_new(About, ETK_STOCK_DIALOG_INFORMATION,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_e_about_show), NULL);
+ _etk_menu_stock_item_new(Quit, ETK_STOCK_DIALOG_CLOSE,
ETK_MENU_SHELL(menu), ETK_CALLBACK(etk_main_quit), NULL);
etk_menu_popup(ETK_MENU(menu));
}
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/stickies.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- stickies.h 3 Aug 2006 02:40:11 - 1.3
+++ stickies.h 4 Aug 2006 04:30:40 - 1.4
@@ -38,6 +38,7 @@
#include conf.h
#include theme_chooser.h
+#include about.h
struct _E_Config_Sticky
{
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/theme_chooser.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- theme_chooser.h 31 Jul 2006 00:31:45 - 1.1
+++ theme_chooser.h 4 Aug 2006 04:30:40 - 1.2
@@ -4,5 +4,3 @@
void _e_theme_chooser_show(E_Sticky *s);
#endif
-
-
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/estickies Modified Files: configure.in Log Message: add an about dialog === RCS file: /cvs/e/e17/proto/estickies/configure.in,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- configure.in31 Jul 2006 00:31:45 - 1.2 +++ configure.in4 Aug 2006 04:30:40 - 1.3 @@ -140,6 +140,7 @@ src/Makefile src/bin/Makefile data/Makefile +data/images/Makefile data/themes/Makefile data/themes/default/Makefile data/themes/default/images/Makefile - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/estickies/data Modified Files: Makefile.am Log Message: add an about dialog === RCS file: /cvs/e/e17/proto/estickies/data/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 30 Jul 2006 04:46:29 - 1.1 +++ Makefile.am 4 Aug 2006 04:30:40 - 1.2 @@ -1,2 +1,2 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = themes +SUBDIRS = images themes - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_comment_jpeg.c exhibit_favorites.c
exhibit_favorites.h exhibit_image.c exhibit_image.h
exhibit_main.c exhibit_menus.c exhibit_options.c exhibit_tab.c
Log Message:
- more code from balony, dialog fixed + general goodiness
- add debug calls (-DEX_DEBUG)
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- exhibit.h 2 Aug 2006 03:10:43 - 1.21
+++ exhibit.h 2 Aug 2006 17:31:03 - 1.22
@@ -36,6 +36,11 @@
#define EX_DEFAULT_SLIDE_INTERVAL 5.0
#define EX_DEFAULT_COMMENTS_VISIBLE 0
+#ifdef EX_DEBUG
+# define D(x) do {printf(__FILE__ :%d: , __LINE__); printf x;
fflush(stdout);} while (0)
+#else
+# define D(x) ((void) 0)
+#endif
typedef struct _Exhibit Exhibit;
typedef struct _Ex_Options Ex_Options;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment_jpeg.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- exhibit_comment_jpeg.c 16 Mar 2006 12:42:39 - 1.4
+++ exhibit_comment_jpeg.c 2 Aug 2006 17:31:03 - 1.5
@@ -1,5 +1,4 @@
/*
- * common.c
* Updated by HandyAndE
*
* based on:
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_favorites.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- exhibit_favorites.c 3 Jan 2006 15:02:15 - 1.1
+++ exhibit_favorites.c 2 Aug 2006 17:31:03 - 1.2
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#include exhibit.h
void
@@ -19,7 +22,7 @@
ecore_file_symlink(realpath, new_path);
if(realpath)
- free(realpath);
+ E_FREE(realpath);
}
void
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_favorites.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- exhibit_favorites.h 3 Jan 2006 15:02:15 - 1.1
+++ exhibit_favorites.h 2 Aug 2006 17:31:03 - 1.2
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#ifndef _EX_FAVORITES_H
#define _EX_FAVORITES_H
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -3 -r1.25 -r1.26
--- exhibit_image.c 2 Aug 2006 03:10:43 - 1.25
+++ exhibit_image.c 2 Aug 2006 17:31:03 - 1.26
@@ -18,6 +18,11 @@
#define G_VAL(p) ((DATA8 *)(p))[1]
#define B_VAL(p) ((DATA8 *)(p))[0]
+static void _ex_image_delete_dialog_response(Etk_Object *obj, int response_id,
void *data);
+static void _ex_image_delete_cb(void *data);
+
+
+
void
_ex_image_mouse_wheel(Etk_Object *object, void *event, void *data)
{
@@ -171,13 +176,13 @@
data2 = etk_object_data_get(ETK_OBJECT(im), undo);
if(data2)
- free(data2);
+ E_FREE(data2);
data2 = malloc(w * h * sizeof(unsigned int));
memcpy(data2, data, w * h * sizeof(unsigned int));
etk_object_data_set(ETK_OBJECT(im), undo, data2);
- printf(Undo: setting data %p size %d, image %p\n, data,
-w * h * sizeof(unsigned int), im);
+ D((Undo: setting data %p size %d, image %p\n, data,
+w * h * sizeof(unsigned int), im));
return data2;
}
@@ -197,7 +202,7 @@
if (data)
{
- printf(Undo: getting data %p, image %p\n, data, im);
+ D((Undo: getting data %p, image %p\n, data, im));
evas_object_image_data_set(im-image_object, data);
evas_object_image_data_update_add(im-image_object, 0, 0, w, h);
etk_object_data_set(ETK_OBJECT(im), undo, NULL);
@@ -555,12 +560,14 @@
return;
sprintf(file, %s/%s, dir, basename);
- printf(Saving: %s\n, file);
+ D((Saving: %s\n, file));
/* Dont fork for the tree polulating to work */
evas_object_image_save(im-image_object, file, NULL, NULL);
/* Refresh list if the file is saved in our dir */
+ D((Image path: %s - Cur path: %s\n, fd-e-cur_tab-set_img_path,
+fd-e-cur_tab-cur_path));
if (!strcmp(fd-e-cur_tab-set_img_path, fd-e-cur_tab-cur_path))
{
etk_tree_clear(ETK_TREE(fd-e-cur_tab-itree));
@@ -612,7 +619,7 @@
label = etk_label_new(Filename:);
etk_box_pack_start(ETK_BOX(vbox), label, ETK_FALSE, ETK_FALSE, 0);
- printf (Selected original filename: %s\n, e-cur_tab-cur_file);
+ D((Selected original filename: %s\n, e-cur_tab-cur_file));
fd-entry = etk_entry_new();
etk_entry_text_set(ETK_ENTRY(fd-entry), e-cur_tab-cur_file);
@@ -636,7 +643,7 @@
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_favorites.c exhibit_image.c exhibit_main.c
exhibit_main.h exhibit_menus.c exhibit_options.c
exhibit_sort.c exhibit_tab.c exhibit_tab.h
Log Message:
- lots of cleanups, moving code around, making things more logical
- config now saves window W and H and uses them next time it starts
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- exhibit.h 2 Aug 2006 17:31:03 - 1.22
+++ exhibit.h 2 Aug 2006 19:23:22 - 1.23
@@ -5,11 +5,12 @@
#define _EX_H
#include Eet.h
-#include Evas.h
#include Ecore.h
#include Ecore_X.h
#include Ecore_File.h
#include Ecore_X_Cursor.h
+#include Evas.h
+#include Ecore_Evas.h
#include Epsilon.h
#include etk/Etk.h
#include stdio.h
@@ -35,7 +36,9 @@
#define EX_DEFAULT_BRIGHTEN_THRESH 100
#define EX_DEFAULT_SLIDE_INTERVAL 5.0
#define EX_DEFAULT_COMMENTS_VISIBLE 0
-
+#define EX_DEFAULT_WINDOW_WIDTH 700
+#define EX_DEFAULT_WINDOW_HEIGHT 500
+
#ifdef EX_DEBUG
# define D(x) do {printf(__FILE__ :%d: , __LINE__); printf x;
fflush(stdout);} while (0)
#else
@@ -73,7 +76,10 @@
double slide_interval;
int comments_visible;
int default_view;
- int default_sort;
+ int default_sort;
+
+ int last_w;
+ int last_h;
};
struct _Ex_Tab
@@ -141,9 +147,7 @@
Etk_Widget*resbar;
Etk_Widget*zoombar;
Etk_Widget*menu;
- Etk_Widget*win;
-
- char fav_path[PATH_MAX];
+ Etk_Widget*win;
intzoom;
intbrightness;
@@ -194,8 +198,6 @@
};
#define WINDOW_TITLE Exhibit
-#define WINDOW_WIDTH 700
-#define WINDOW_HEIGHT 500
#define ZOOM_MAX 16
#define ZOOM_MIN -16
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_favorites.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exhibit_favorites.c 2 Aug 2006 17:31:03 - 1.2
+++ exhibit_favorites.c 2 Aug 2006 19:23:22 - 1.3
@@ -9,16 +9,16 @@
char new_path[PATH_MAX];
char *realpath;
- if(!ecore_file_is_dir(e-fav_path))
+ if(!ecore_file_is_dir(e-options-fav_path))
{
- if(ecore_file_exists(e-fav_path))
+ if(ecore_file_exists(e-options-fav_path))
return;
- if(!ecore_file_mkdir(e-fav_path))
+ if(!ecore_file_mkdir(e-options-fav_path))
return;
}
realpath = ecore_file_realpath(path);
- snprintf(new_path, sizeof(new_path), %s/%s, e-fav_path, path);
+ snprintf(new_path, sizeof(new_path), %s/%s, e-options-fav_path, path);
ecore_file_symlink(realpath, new_path);
if(realpath)
@@ -30,6 +30,6 @@
{
char new_path[PATH_MAX];
- snprintf(new_path, sizeof(new_path), %s/%s, e-fav_path, path);
+ snprintf(new_path, sizeof(new_path), %s/%s, e-options-fav_path, path);
ecore_file_unlink(new_path);
}
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- exhibit_image.c 2 Aug 2006 17:31:03 - 1.26
+++ exhibit_image.c 2 Aug 2006 19:23:22 - 1.27
@@ -37,9 +37,9 @@
if(evas_key_modifier_is_set(evas_key_modifier_get(evas), Control))
{
if (ev-z 0)
- _ex_main_button_zoom_in_cb(NULL, data);
+ _ex_tab_current_zoom_in(data);
else
- _ex_main_button_zoom_out_cb(NULL, data);
+ _ex_tab_current_zoom_out(data);
}
else
{
@@ -1073,7 +1073,7 @@
if(!r) return ETK_FALSE;
etk_tree_row_fields_get(r,
etk_tree_nth_col_get(ETK_TREE(e-cur_tab-itree), 0), NULL, icol_string,
etk_tree_nth_col_get(ETK_TREE(e-cur_tab-itree), 1),NULL);
- snprintf(path, sizeof(path), %s/%s, e-fav_path, icol_string);
+ snprintf(path, sizeof(path), %s/%s, e-options-fav_path, icol_string);
if(ecore_file_exists(path))
return ETK_TRUE;
return ETK_FALSE;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- exhibit_main.c 2 Aug 2006 17:31:03 - 1.58
+++ exhibit_main.c 2 Aug 2006 19:23:22 - 1.59
@@ -3,15 +3,24 @@
*/
#include exhibit.h
#include Ecore_File.h
-#include Ecore_Evas.h
+
extern pid_t pid;
extern Evas_List *thumb_list;
Exhibit *e;
-Ecore_Evas *ee_buf;
-Evas *evas_buf;
Evas_List *event_handlers;
+static void _ex_main_button_zoom_in_cb(Etk_Object *obj, void *data);
+static void _ex_main_button_zoom_out_cb(Etk_Object *obj, void *data);
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: TODO Log Message: - TODO++/-- === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- TODO2 Aug 2006 03:10:43 - 1.7 +++ TODO2 Aug 2006 19:35:20 - 1.8 @@ -7,23 +7,23 @@ -- -menus * new window - * save image as * search * rename - * delete + * delete (needs message dialog) * open in options based on config values * refresh * release notes * about - options + * dialog * slide show speed * comments visibile / hidden by default (with remembering last state) - key shotcuts * x - fit / unfit to window -- save window geometry between sessions +- make slideshow display its status in the statusbar(s) o DONE: -- @@ -33,6 +33,10 @@ + dnd + fix .spec file + make argv work with /path/to/image.png and not only /path/to/dir ++ save window geometry between sessions ++ menus + + save image as + = * RELEASSE 0.2.0: - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/estickies/src/bin
Modified Files:
stickies.c stickies.h
Log Message:
- confirmation dialog when the [x] button is pressed (which deletes, not
closes, need to change image soon)
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/stickies.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- stickies.c 2 Aug 2006 05:53:59 - 1.3
+++ stickies.c 3 Aug 2006 02:40:11 - 1.4
@@ -15,6 +15,7 @@
static void _e_sticky_focus_in_cb(Etk_Object *object, void *data);
static void _e_sticky_focus_out_cb(Etk_Object *object, void *data);
static void _e_sticky_sticky_cb(Etk_Object *object, const char *property_name,
void *data);
+static void _e_sticky_delete_confirm_cb(Etk_Object *obj, int response_id, void
*data);
static void
_e_sticky_key_down_cb(Etk_Object *object, void *event, void *data)
@@ -209,7 +210,7 @@
menu = etk_menu_new();
_etk_menu_stock_item_new(New, ETK_STOCK_DOCUMENT_OPEN,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_e_sticky_new_show_append), NULL);
_etk_menu_stock_item_new(Save, ETK_STOCK_DOCUMENT_SAVE,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_e_config_save), ss);
- _etk_menu_stock_item_new(Delete, ETK_STOCK_EDIT_DELETE,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_e_sticky_delete), s);
+ _etk_menu_stock_item_new(Delete, ETK_STOCK_EDIT_DELETE,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_e_sticky_delete_confirm), s);
_etk_menu_stock_item_new(Options, ETK_STOCK_PREFERENCES_DESKTOP_THEME,
ETK_MENU_SHELL(menu), ETK_CALLBACK(_e_theme_chooser_show), s);
_etk_menu_stock_item_new(Quit, ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menu),
ETK_CALLBACK(etk_main_quit), NULL);
etk_menu_popup(ETK_MENU(menu));
@@ -290,7 +291,7 @@
ETK_IMAGE(etk_image_new_from_edje(theme,
button_close)));
etk_signal_connect_swapped(clicked, ETK_OBJECT(s-close_button),
- ETK_CALLBACK(_e_sticky_delete), s);
+ ETK_CALLBACK(_e_sticky_delete_confirm), s);
//etk_tooltips_tip_set(button, Delete this sticky);
etk_box_pack_start(ETK_BOX(hbox), s-close_button, ETK_FALSE, ETK_FALSE, 0);
@@ -335,6 +336,24 @@
}
void
+_e_sticky_delete_confirm(E_Sticky *s)
+{
+ Etk_Widget *dialog;
+
+ dialog = etk_message_dialog_new(ETK_MESSAGE_DIALOG_QUESTION,
+ ETK_MESSAGE_DIALOG_YES_NO,
+ Are you sure you want to delete this
sticky?);
+ etk_signal_connect_swapped(delete_event, ETK_OBJECT(dialog),
+ ETK_CALLBACK(etk_object_destroy), dialog);
+ etk_signal_connect(response, ETK_OBJECT(dialog),
+ ETK_CALLBACK(_e_sticky_delete_confirm_cb), s);
+ etk_container_border_width_set(ETK_CONTAINER(dialog), 4);
+
+ etk_window_title_set(ETK_WINDOW(dialog), Confirm Deletion);
+ etk_widget_show_all(dialog);
+}
+
+void
_e_sticky_move(E_Sticky *s, int x, int y)
{
etk_window_move(ETK_WINDOW(s-win), x, y);
@@ -425,6 +444,23 @@
for(l = ss-stickies; l; l = l-next)
_e_sticky_theme_apply(l-data, theme);
+}
+
+static void
+_e_sticky_delete_confirm_cb(Etk_Object *obj, int response_id, void *data)
+{
+ switch(response_id)
+ {
+ case ETK_RESPONSE_YES:
+ if(data)
+ _e_sticky_delete(data);
+ break;
+
+ default:
+ break;
+ }
+
+ etk_object_destroy(obj);
}
int main(int argc, char **argv)
===
RCS file: /cvs/e/e17/proto/estickies/src/bin/stickies.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- stickies.h 31 Jul 2006 00:31:45 - 1.2
+++ stickies.h 3 Aug 2006 02:40:11 - 1.3
@@ -104,5 +104,6 @@
void _e_sticky_load_from(E_Sticky *s);
void _e_sticky_theme_apply(E_Sticky *s, char *theme);
void _e_sticky_theme_apply_all(char *theme);
-
+void _e_sticky_delete_confirm(E_Sticky *s);
+
#endif
-
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_comment.c exhibit_comment.h exhibit_image.c
exhibit_image.h exhibit_main.c exhibit_main.h exhibit_menus.c
exhibit_menus.h exhibit_tab.c exhibit_tab.h
Log Message:
more work from balony (saving, deleting), some cleanups
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- exhibit.h 29 Jul 2006 19:50:04 - 1.20
+++ exhibit.h 2 Aug 2006 03:10:43 - 1.21
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#ifndef _EX_H
#define _EX_H
@@ -72,7 +75,13 @@
{
char *dir;
char cur_path[PATH_MAX];
- char cur_file[PATH_MAX];
+
+ /* Path and filename of the dir to the
+ currently set image */
+ char *set_img_path;
+ char *cur_file;
+ intimage_loaded;
+
intnum;
Etk_Bool fit_window;
@@ -85,6 +94,7 @@
Etk_Widget*itree;
Etk_Widget*scrolled_view;
Etk_Widget*alignment;
+ Etk_Widget*dialog;
Etk_Tree_Col *dcol;
Etk_Tree_Col *icol;
@@ -167,7 +177,8 @@
Etk_Widget *win;
Etk_Widget *filechooser;
Etk_Widget *entry;
- Etk_Image *im;
+ Etk_Image *im;
+ Exhibit *e;
};
struct _Ex_Config_Version
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- exhibit_comment.c 29 Jul 2006 19:50:04 - 1.8
+++ exhibit_comment.c 2 Aug 2006 03:10:43 - 1.9
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#include exhibit.h
static void _ex_comment_save_clicked_cb(Etk_Object *obj, void *data);
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exhibit_comment.h 14 Mar 2006 01:01:15 - 1.2
+++ exhibit_comment.h 2 Aug 2006 03:10:43 - 1.3
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#ifndef _EX_COMMENT_H
#define _EX_COMMENT_H
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- exhibit_image.c 29 Jul 2006 21:18:37 - 1.24
+++ exhibit_image.c 2 Aug 2006 03:10:43 - 1.25
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#include exhibit.h
#include Ecore_File.h
#include Ecore_Evas.h
@@ -173,7 +176,8 @@
data2 = malloc(w * h * sizeof(unsigned int));
memcpy(data2, data, w * h * sizeof(unsigned int));
etk_object_data_set(ETK_OBJECT(im), undo, data2);
- printf(Undo: setting data %p size %d\n, data, w * h * sizeof(unsigned
int));
+ printf(Undo: setting data %p size %d, image %p\n, data,
+w * h * sizeof(unsigned int), im);
return data2;
}
@@ -193,7 +197,7 @@
if (data)
{
- printf(Undo: getting data %p\n, data);
+ printf(Undo: getting data %p, image %p\n, data, im);
evas_object_image_data_set(im-image_object, data);
evas_object_image_data_update_add(im-image_object, 0, 0, w, h);
etk_object_data_set(ETK_OBJECT(im), undo, NULL);
@@ -530,7 +534,7 @@
{
Etk_Event_Key_Up_Down *ev = event;
- if(!strcmp(ev-key, Return) || !strcmp(ev-key, KP_Enter))
+ if (!strcmp(ev-key, Return) || !strcmp(ev-key, KP_Enter))
_ex_image_save_as_cb(data);
}
@@ -538,46 +542,49 @@
_ex_image_save_as_cb(void *data)
{
Ex_Filedialog *fd = data;
- pid_t pid;
char file[1024];
const char *basename;
const char *dir;
+ Etk_Image *im = ETK_IMAGE(fd-e-cur_tab-image);
basename = etk_entry_text_get(ETK_ENTRY(fd-entry));
dir = etk_filechooser_widget_current_folder_get
- (ETK_FILECHOOSER_WIDGET(fd-filechooser));
+ (ETK_FILECHOOSER_WIDGET(fd-filechooser));
- if (!basename || !dir)
- return;
-
- sprintf(file, %s/%s, dir, basename);
+ if (!dir || !basename)
+return;
+
+ sprintf(file, %s/%s, dir, basename);
printf(Saving: %s\n, file);
-
- pid = fork();
- if(!pid)
+
+ /* Dont fork for the tree polulating to work */
+ evas_object_image_save(im-image_object, file, NULL, NULL);
+
+ /* Refresh list if the file is saved in our dir */
+ if (!strcmp(fd-e-cur_tab-set_img_path, fd-e-cur_tab-cur_path))
{
- evas_object_image_save(fd-im-image_object, file, NULL, NULL);
- exit(0);
+
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: TODO Log Message: more work from balony (saving, deleting), some cleanups === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- TODO10 Mar 2006 12:05:55 - 1.6 +++ TODO2 Aug 2006 03:10:43 - 1.7 @@ -1,6 +1,10 @@ -TODO (release version 1.0.0 when this is done): -=== + +* RELEASE 0.1.0: + + +o TODO: + -- -menus * new window * save image as @@ -14,26 +18,43 @@ - options * slide show speed - * path to favorites * comments visibile / hidden by default (with remembering last state) -- wallpaper setting - center, stretch, tile - -- andy's comments feature - * gui bits - * comment code - - key shotcuts * x - fit / unfit to window +- save window geometry between sessions + +o DONE: + -- ++ andy's comments feature + sorting + wheel changing / zooming + dnd + fix .spec file + make argv work with /path/to/image.png and not only /path/to/dir -BUGS: -= += +* RELEASSE 0.2.0: += + +o TODO: + -- +- integrate with evfs for file tagging and categories +- integrate with libgphoto for digicam interaction + + +* MISC FEATURES: + + +o TODO: + -- +- wallpaper setting - center, stretch, tile +- path to favorites (will be replace by evfs) + +=== +* BUGS: +=== - fix autocomplete (combobox?) - if we're scrolled to the end of the dir tree, clicking on a dir needs to - Take Surveys. Earn Cash. Influence the Future of IT Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT business topics through brief surveys -- and earn cash http://www.techsay.com/default.php?page=join.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
