Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto/entropy
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_efolder_dialog.c
Log Message:
More efolder work
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_efolder_dialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- etk_efolder_dialog.c 29 Aug 2007 04:55:06 -0000 1.1
+++ etk_efolder_dialog.c 30 Aug 2007 13:07:02 -0000 1.2
@@ -1,37 +1,88 @@
#include <Etk.h>
#include "entropy.h"
-static Etk_Widget* _entropy_etk_efolder_dialog = NULL;
-static Ecore_Hash* _entropy_global_efolder_hash;
-static Etk_Widget* _entropy_etk_efolder_local_box;
-
typedef struct _Entropy_Etk_Efolder_Object {
char* name;
char* value;
} Entropy_Etk_Efolder_Object;
+typedef struct _Entropy_Etk_Efolder_Dialog {
+ Etk_Widget* tree;
+ Etk_Widget* dialog;
+ Etk_Widget* radio_tag;
+ Etk_Widget* radio_meta;
+ Etk_Widget* cmb_meta;
+ Etk_Widget* text_value;
+ Etk_Widget* button_add;
+ Etk_Widget* button_ok;
+ Etk_Widget* button_cancel;
+} Entropy_Etk_Efolder_Dialog;
+static Entropy_Etk_Efolder_Dialog* eeed = NULL;
+
void entropy_etk_efolder_dialog_close(Etk_Object* obj, void* data)
{
- Entropy_Etk_Efolder_Object* c_obj;
- Ecore_List* keys;
- char* key;
-
- if (!((int)data ==1)) etk_widget_hide(_entropy_etk_efolder_dialog);
-
+ //if (!((int)data ==1)) etk_widget_hide(_entropy_etk_efolder_dialog);
+ etk_widget_hide(eeed->dialog);
}
void entropy_etk_efolder_dialog_create()
{
- _entropy_etk_efolder_dialog = etk_window_new();
+ Etk_Tree_Col* col;
+ Etk_Widget* vbox;
+ Etk_Widget* hbox;
+
+ if (!eeed) {
+ eeed = entropy_malloc(sizeof(Entropy_Etk_Efolder_Dialog));
+ eeed->dialog = etk_window_new();
+
+ eeed->tree = etk_tree_new();
+ etk_tree_mode_set(ETK_TREE(eeed->tree), ETK_TREE_MODE_LIST);
+
+ col = etk_tree_col_new(ETK_TREE(eeed->tree), _("Type"),
150,0.0);
+ etk_tree_col_model_add(col, etk_tree_model_text_new());
+
+ col = etk_tree_col_new(ETK_TREE(eeed->tree), _("Key"), 150,0.0);
+ etk_tree_col_model_add(col, etk_tree_model_text_new());
+
+ col = etk_tree_col_new(ETK_TREE(eeed->tree), _("Value (if
applicable)"), 150,0.0);
+ etk_tree_col_model_add(col, etk_tree_model_text_new());
+
+ vbox = etk_vbox_new(ETK_FALSE,0);
+ etk_container_add(ETK_CONTAINER(eeed->dialog), vbox);
+ etk_box_append(ETK_BOX(vbox), eeed->tree,
ETK_BOX_START,ETK_BOX_EXPAND_FILL,0);
+
+ hbox = etk_hbox_new(ETK_TRUE,1);
+ etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_END,ETK_BOX_NONE,0);
+ eeed->radio_meta = etk_radio_button_new_with_label("Metadata",
NULL);
+ etk_box_append(ETK_BOX(hbox), eeed->radio_meta,
ETK_BOX_START,ETK_BOX_NONE,0);
+
+ eeed->radio_tag =
etk_radio_button_new_with_label_from_widget("Tag",
ETK_RADIO_BUTTON(eeed->radio_meta));
+ etk_box_append(ETK_BOX(hbox), eeed->radio_tag,
ETK_BOX_START,ETK_BOX_NONE,0);
+
+ eeed->text_value = etk_entry_new();
+ etk_box_append(ETK_BOX(hbox), eeed->text_value,
ETK_BOX_START,ETK_BOX_NONE,0);
+
+ eeed->cmb_meta = etk_combobox_new();
+ etk_box_append(ETK_BOX(hbox), eeed->cmb_meta,
ETK_BOX_START,ETK_BOX_NONE,0);
+
+ hbox = etk_hbox_new(ETK_TRUE,1);
+ etk_box_append(ETK_BOX(vbox), hbox, ETK_BOX_END,ETK_BOX_NONE,0);
+
+ eeed->button_ok =
etk_button_new_from_stock(ETK_STOCK_DIALOG_OK);
+ etk_box_append(ETK_BOX(hbox), eeed->button_ok,
ETK_BOX_START,ETK_BOX_NONE,0);
+ eeed->button_cancel =
etk_button_new_from_stock(ETK_STOCK_DIALOG_CANCEL);
+ etk_box_append(ETK_BOX(hbox), eeed->button_cancel,
ETK_BOX_START,ETK_BOX_NONE,0);
+ }
+
}
void entropy_etk_efolder_dialog_show()
{
- if (!_entropy_etk_efolder_dialog) {
+ if (!eeed) {
entropy_etk_efolder_dialog_create();
}
- etk_widget_show_all(_entropy_etk_efolder_dialog);
+ etk_widget_show_all(eeed->dialog);
}
-------------------------------------------------------------------------
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
