E CVS: mail rephorm
Enlightenment CVS committal Author : rephorm Project : e_modules Module : mail Dir : e_modules/mail Modified Files: e_mod_config_box.c Log Message: set ports for ssl pop/imap switch order of ssl and port entry (so the port doesn't change on you after you've typed it in -- in the normal flow at least) === RCS file: /cvs/e/e_modules/mail/e_mod_config_box.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_mod_config_box.c 13 Jun 2006 00:42:52 - 1.7 +++ e_mod_config_box.c 13 Jun 2006 01:30:29 - 1.8 @@ -164,18 +164,20 @@ e_widget_list_object_append(o, of, 1, 1, 0.5); of = e_widget_frametable_add(evas, _("Port Settings"), 1); - ob = e_widget_label_add(evas, _("Port:")); - e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 0, 1, 0); - ob = e_widget_entry_add(evas, &cfdata->port); - cfdata->port_entry = ob; - e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 0, 0, 1, 0); ob = e_widget_label_add(evas, _("Use SSL:")); - e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 0, 0, 1, 0); + e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 0, 1, 0); ob = e_widget_check_add(evas, "", &(cfdata->ssl)); + e_widget_on_change_hook_set(ob, _type_cb_change, cfdata); + e_widget_frametable_object_append(of, ob, 1, 0, 1, 1, 0, 0, 1, 0); + + ob = e_widget_label_add(evas, _("Port:")); + e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 0, 0, 1, 0); + ob = e_widget_entry_add(evas, &cfdata->port); + cfdata->port_entry = ob; e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 0, 0, 1, 0); e_widget_list_object_append(o, of, 1, 1, 0.5); - + of = e_widget_frametable_add(evas, _("Mailbox Settings"), 1); ob = e_widget_label_add(evas, _("Name:")); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 0, 1, 0); @@ -320,8 +322,16 @@ e_widget_disabled_set(cfdata->cur_path_entry, 1); e_widget_entry_text_set(cfdata->new_path_entry, ""); e_widget_entry_text_set(cfdata->cur_path_entry, ""); - e_widget_entry_text_set(cfdata->port_entry, "110"); - cfdata->port = strdup("110"); + if (cfdata->ssl) + { +e_widget_entry_text_set(cfdata->port_entry, "995"); +cfdata->port = strdup("995"); + } + else + { +e_widget_entry_text_set(cfdata->port_entry, "110"); +cfdata->port = strdup("110"); + } } else if ((cfdata->type == 1) || (cfdata->type == 3)) { @@ -331,8 +341,16 @@ e_widget_disabled_set(cfdata->cur_path_entry, 1); e_widget_entry_text_set(cfdata->cur_path_entry, ""); e_widget_entry_text_set(cfdata->new_path_entry, _("Inbox")); - e_widget_entry_text_set(cfdata->port_entry, "143"); - cfdata->port = strdup("143"); + if (cfdata->ssl) + { +e_widget_entry_text_set(cfdata->port_entry, "993"); +cfdata->port = strdup("993"); + } + else + { +e_widget_entry_text_set(cfdata->port_entry, "143"); +cfdata->port = strdup("143"); + } } else if (cfdata->type == 2) { @@ -340,6 +358,7 @@ e_widget_disabled_set(cfdata->new_path_entry, 0); e_widget_disabled_set(cfdata->cur_path_label, 0); e_widget_disabled_set(cfdata->cur_path_entry, 0); + e_widget_entry_text_set(cfdata->port_entry, ""); } } ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: screenshot devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : screenshot Dir : e_modules/screenshot Modified Files: TODO e_mod_config.c e_mod_main.c e_mod_main.h Log Message: Screenshot module can now optionally prompt for a filename when you take the shot (titansoccer) :) Removed a todo item. === RCS file: /cvs/e/e_modules/screenshot/TODO,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- TODO22 May 2006 09:16:32 - 1.7 +++ TODO13 Jun 2006 01:25:49 - 1.8 @@ -11,8 +11,6 @@ In the Advanced case, i'd leave the behaviour of the ss as is. -Option to allow prompting to user of filename to use. - * Nice to have * * The ss module should highlight when mouse overs it. Similarly as Start module does. === RCS file: /cvs/e/e_modules/screenshot/e_mod_config.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- e_mod_config.c 21 May 2006 15:07:31 - 1.22 +++ e_mod_config.c 13 Jun 2006 01:25:49 - 1.23 @@ -7,6 +7,7 @@ int method; int use_import; int use_scrot; + int prompt; double delay_time; char *location; char *filename; @@ -26,6 +27,8 @@ } scrot; int use_app; char *app; + + Evas_Object *file_entry; }; /* Protos */ @@ -35,6 +38,7 @@ static int _basic_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); static Evas_Object *_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata); static int _advanced_apply_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata); +static void _prompt_cb_change(void *data, Evas_Object *obj); /* Config Calls */ void @@ -63,6 +67,8 @@ static void _fill_data(Config_Item *ci, E_Config_Dialog_Data *cfdata) { + cfdata->prompt = ci->prompt; + if (ci->use_import == 1) cfdata->method = 0; else if (ci->use_scrot == 1) @@ -143,15 +149,20 @@ e_widget_list_object_append(o, of, 1, 1, 0.5); of = e_widget_frametable_add(evas, D_("File Settings"), 1); - ob = e_widget_label_add(evas, D_("Save Directory:")); + ob = e_widget_check_add(evas, D_("Always Prompt For Filename"), &(cfdata->prompt)); + e_widget_on_change_hook_set(ob, _prompt_cb_change, cfdata); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 0, 1, 0); + ob = e_widget_label_add(evas, D_("Save Directory:")); + e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 0, 0, 1, 0); ob = e_widget_entry_add(evas, &cfdata->location); - e_widget_frametable_object_append(of, ob, 1, 0, 2, 1, 1, 0, 1, 0); + e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 0, 1, 0); ob = e_widget_label_add(evas, D_("Filename:")); - e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 0, 0, 1, 0); + e_widget_frametable_object_append(of, ob, 0, 2, 1, 1, 0, 0, 1, 0); ob = e_widget_entry_add(evas, &cfdata->filename); - e_widget_frametable_object_append(of, ob, 1, 1, 2, 1, 1, 0, 1, 0); + cfdata->file_entry = ob; + e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 0, 1, 0); e_widget_list_object_append(o, of, 1, 1, 0.5); + return o; } @@ -163,6 +174,9 @@ Config_Item *ci; ci = cfd->data; + + ci->prompt = cfdata->prompt; + if (cfdata->method == 0) { ci->use_import = 1; @@ -188,7 +202,7 @@ evas_stringshare_del(ci->filename); if (cfdata->filename != NULL) { - cfdata->filename = ecore_file_strip_ext(cfdata->filename); +// cfdata->filename = ecore_file_strip_ext(cfdata->filename); ci->filename = evas_stringshare_add(cfdata->filename); } else @@ -234,20 +248,24 @@ of = e_widget_frametable_add(evas, D_("Image Viewer Settings"), 1); ob = e_widget_check_add(evas, D_("Launch Image Viewer After Screenshot"), &(cfdata->use_app)); - e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 0, 1, 0); + e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 1, 0, 1, 0); ob = e_widget_entry_add(evas, &(cfdata->app)); - e_widget_frametable_object_append(of, ob, 0, 1, 2, 1, 1, 0, 1, 0); + e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 1, 0, 1, 0); e_widget_list_object_append(o, of, 1, 1, 0.5); of = e_widget_frametable_add(evas, D_("File Settings"), 1); - ob = e_widget_label_add(evas, D_("Save Directory:")); + ob = e_widget_check_add(evas, D_("Always Prompt For Filename"), &(cfdata->prompt)); + e_widget_on_change_hook_set(ob, _prompt_cb_change, cfdata); e_widget_frametable_object_append(of, ob, 0, 0, 1, 1, 0, 0, 1, 0); + ob = e_widget_label_add(evas, D_("Save Directory:")); + e_widget_frametable_object_append(of, ob, 0, 1, 1, 1, 0, 0, 1, 0); ob = e_widget_entry_add(evas, &cfdata->location); - e_widget_frametable_object_append(of, ob, 1, 0, 2, 1, 1, 0, 1, 0); + e_widg
E CVS: mail rephorm
Enlightenment CVS committal Author : rephorm Project : e_modules Module : mail Dir : e_modules/mail Modified Files: e_mod_config_box.c Log Message: set the dialog's data after creating an mailbox (before, if you added a mailbox, hit apply, then changed something and hit apply again, a second copy would be created) === RCS file: /cvs/e/e_modules/mail/e_mod_config_box.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_mod_config_box.c 12 Jun 2006 20:52:15 - 1.6 +++ e_mod_config_box.c 13 Jun 2006 00:42:52 - 1.7 @@ -296,6 +296,7 @@ if (is_new) { + cfd->data = cb; mail_ci->boxes = evas_list_append(mail_ci->boxes, cb); e_config_save_queue(); _mail_box_added(mail_ci->id, cb->name); ___ 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-perl Modified Files: TODO Log Message: todo++ === RCS file: /cvs/e/e17/proto/etk-perl/TODO,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- TODO13 Jun 2006 00:13:44 - 1.4 +++ TODO13 Jun 2006 00:27:16 - 1.5 @@ -1,6 +1,8 @@ General TODO: = +- add some commonly used internal tree sorters to avoid the entire + perl -> c -> perl ... loop when sorting trees. - finish porting etk_test from C to perl - callback system needs to convert structs to perl equivalents - all functions that use use references to change multiple values need ___ 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-perl/etk_test Modified Files: etk_test.pl Log Message: - implement first event structure, "mouse_up" - fixes to Etk::Iconbox - finish iconbox test - misc cleanups === RCS file: /cvs/e/e17/proto/etk-perl/etk_test/etk_test.pl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- etk_test.pl 11 Jun 2006 18:59:27 - 1.12 +++ etk_test.pl 13 Jun 2006 00:13:44 - 1.13 @@ -13,6 +13,9 @@ use Etk::HPaned; use Etk::HSlider; use Etk::HSeparator; +use Etk::Iconbox; +use Etk::Iconbox::Icon; +use Etk::Iconbox::Model; use Etk::Image; use Etk::Label; use Etk::Main; @@ -201,6 +204,27 @@ } ); +my $_iconbox_folder = ""; +my %_iconbox_types = ( +jpg => "mimetypes/image-x-generic_48", +jpeg => "mimetypes/image-x-generic_48", +png => "mimetypes/image-x-generic_48", +bmp => "mimetypes/image-x-generic_48", +gif => "mimetypes/image-x-generic_48", +mp3 => "mimetypes/audio-x-generic_48", +ogg => "mimetypes/audio-x-generic_48", +wav => "mimetypes/audio-x-generic_48", +avi => "mimetypes/video-x-generic_48", +mpg => "mimetypes/video-x-generic_48", +mpeg => "mimetypes/video-x-generic_48", +gz => "mimetypes/package-x-generic_48", +tgz => "mimetypes/package-x-generic_48", +bz2 => "mimetypes/package-x-generic_48", +tbz2 => "mimetypes/package-x-generic_48", +zip => "mimetypes/package-x-generic_48", +rar => "mimetypes/package-x-generic_48" +); + # Count number of examples per category while (my ($key, $value) = each %buttons) { @@ -814,11 +838,77 @@ sub iconbox_window_show { my $win = Etk::Window->new("Etk-Perl Iconbox Test"); -my $label = Etk::Label->new("Etk::Iconbox test is not implemented yet."); +$win->SizeRequestSet(100, 100); -$win->Add($label); -$win->BorderWidthSet(10); +$_iconbox_folder = ""; +my $iconbox = Etk::Iconbox->new(); +my $model = Etk::Iconbox::Model->new($iconbox); +$model->GeometrySet(150, 20, 2, 2); +$model->IconGeometrySet(20, 0, 130, 16, 0.0, 0.5); +_iconbox_folder_set($iconbox, ""); + +$iconbox->SignalConnect("mouse_up", + sub { + my $event = shift; + my $icon = $iconbox->IconGetAtXY($event->{canvas_x}, + $event->{canvas_y}, 0, 1, 1); + return if($icon == undef); + if (-d $_iconbox_folder."/".$icon->LabelGet()) + { + _iconbox_folder_set($iconbox, $icon->LabelGet()); + } + } +); + +$win->Add($iconbox); $win->ShowAll(); +} + +sub _iconbox_folder_set +{ +my $iconbox = shift; +my $folder = shift; +my $file = undef; + +$folder = %ENV->{HOME} if($folder eq ""); +return if($folder eq ""); + +$iconbox->Clear(); +$iconbox->Append(Etk::Theme::IconThemeGet(), "actions/go-up_48", ".."); + +# Add directories +opendir(DIR, $_iconbox_folder."/".$folder) or die "can't opendir $folder: $!"; +while (defined($file = readdir(DIR))) { + if (-d "$_iconbox_folder/$folder/$file" && $file !~ /^\./) + { + $iconbox->Append(Etk::Theme::IconThemeGet(), + "places/folder_48", $file); + } +} +closedir(DIR); + +# Add files +opendir(DIR, $_iconbox_folder."/".$folder) or die "can't opendir $folder: $!"; +while (defined($file = readdir(DIR))) { + if (-f "$_iconbox_folder/$folder/$file" && $file !~ /^\./) + { + my @parts = split /\./, $file; + $parts[-1] =~ tr [A-Z] [a-z]; + if($_iconbox_types{$parts[-1]}) + { + $iconbox->Append(Etk::Theme::IconThemeGet(), + $_iconbox_types{$parts[-1]}, $file); + } + else + { + $iconbox->Append(Etk::Theme::IconThemeGet(), + "mimetypes/text-x-generic_48", $file); + } + } +} +closedir(DIR); + +$_iconbox_folder .= "/".$folder; } sub textview_window_show ___ 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-perl Modified Files: Etk.xs TODO Log Message: - implement first event structure, "mouse_up" - fixes to Etk::Iconbox - finish iconbox test - misc cleanups === RCS file: /cvs/e/e17/proto/etk-perl/Etk.xs,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- Etk.xs 11 Jun 2006 18:59:27 - 1.14 +++ Etk.xs 13 Jun 2006 00:13:44 - 1.15 @@ -93,11 +93,29 @@ { dSP; Callback_Signal_Data *cbd = NULL; - + Etk_Event_Mouse_Up_Down *event = value; + HV *event_hv; + SV *event_rv; cbd = data; + + event_hv = (HV*)sv_2mortal((SV*)newHV()); + + if(!strcmp(cbd->signal_name, "mouse_up")) + { + event_rv = newSViv(event->canvas.x); + hv_store(event_hv, "canvas_x", strlen("canvas_x"), event_rv, 0); + event_rv = newSViv(event->canvas.y); + hv_store(event_hv, "canvas_y", strlen("canvas_y"), event_rv, 0); + event_rv = newSViv(event->widget.x); + hv_store(event_hv, "widget_x", strlen("widget_x"), event_rv, 0); + event_rv = newSViv(event->widget.y); + hv_store(event_hv, "widget_y", strlen("widget_y"), event_rv, 0); + event_rv = newRV(event_hv); + } + PUSHMARK(SP) ; - //XPUSHs(sv_2mortal(newSViv(value))); + XPUSHs(sv_2mortal(event_rv)); XPUSHs(sv_2mortal(newSVsv(cbd->perl_data))); PUTBACK ; @@ -1392,27 +1410,27 @@ Etk_Iconbox_Icon * etk_iconbox_append(iconbox, filename, edje_group, label) - Etk_Iconbox * iconbox + Etk_Widget *iconbox char * filename char * edje_group char * label void etk_iconbox_clear(iconbox) - Etk_Iconbox * iconbox + Etk_Widget *iconbox Etk_Iconbox_Model * etk_iconbox_current_model_get(iconbox) - Etk_Iconbox * iconbox + Etk_Widget *iconbox void etk_iconbox_current_model_set(iconbox, model) - Etk_Iconbox * iconbox + Etk_Widget *iconbox Etk_Iconbox_Model * model void etk_iconbox_freeze(iconbox) - Etk_Iconbox * iconbox + Etk_Widget *iconbox SV * etk_iconbox_icon_data_get(icon) @@ -1454,7 +1472,7 @@ Etk_Iconbox_Icon * etk_iconbox_icon_get_at_xy(iconbox, x, y, over_cell, over_icon, over_label) - Etk_Iconbox * iconbox + Etk_Widget *iconbox int x int y Etk_Boolover_cell @@ -1565,25 +1583,25 @@ Etk_Iconbox_Model * etk_iconbox_model_new(iconbox) - Etk_Iconbox * iconbox + Etk_Widget *iconbox Etk_Widget * etk_iconbox_new() void etk_iconbox_select_all(iconbox) - Etk_Iconbox * iconbox + Etk_Widget *iconbox void etk_iconbox_thaw(iconbox) - Etk_Iconbox * iconbox + Etk_Widget *iconbox Etk_Type * etk_iconbox_type_get() void etk_iconbox_unselect_all(iconbox) - Etk_Iconbox * iconbox + Etk_Widget *iconbox void etk_image_copy(dest_image, src_image) === RCS file: /cvs/e/e17/proto/etk-perl/TODO,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- TODO9 Jun 2006 08:13:35 - 1.3 +++ TODO13 Jun 2006 00:13:44 - 1.4 @@ -7,7 +7,6 @@ to return a list of values to the perl caller - finish remaining signal_connect functions (swapped etc.) - perldoc everything -- wrap up functions that use (...): important ones are combo for now - create an evas_list to perl list converter - go over all enums and structs and port as needed - etk_argument.h @@ -28,3 +27,4 @@ - etk_types.h - etk_utils.h - etk_main.h [DONE] +- wrap up functions that use (...): important ones are combo for now [DONE] ___ 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-perl/lib/Etk Modified Files: Iconbox.pm Log Message: - implement first event structure, "mouse_up" - fixes to Etk::Iconbox - finish iconbox test - misc cleanups === RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Iconbox.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Iconbox.pm 7 Jun 2006 11:58:33 - 1.1 +++ Iconbox.pm 13 Jun 2006 00:13:45 - 1.2 @@ -75,6 +75,7 @@ my $icon = Etk::Iconbox::Icon->new(); $icon->{WIDGET} = Etk::etk_iconbox_icon_get_at_xy($self->{WIDGET}, $x, $y, $over_cell, $over_icon, $over_label); +return undef if($icon->{WIDGET} == undef); return $icon; } ___ 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-perl/lib/Etk/Iconbox Modified Files: Model.pm Log Message: - implement first event structure, "mouse_up" - fixes to Etk::Iconbox - finish iconbox test - misc cleanups === RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Iconbox/Model.pm,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Model.pm7 Jun 2006 11:58:34 - 1.1 +++ Model.pm13 Jun 2006 00:13:45 - 1.2 @@ -5,8 +5,8 @@ { my $class = shift; my $self = {}; -my $model = shift; -$self->{WIDGET} = Etk::etk_iconbox_model_new($model); +my $iconbox = shift; +$self->{WIDGET} = Etk::etk_iconbox_model_new($iconbox->{WIDGET}); bless($self, $class); return $self; } ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: Makefile.am Log Message: Remove whitespace trailing backslash in Makefile.am. Ok'd by hisham :) === RCS file: /cvs/e/e17/proto/exhibit/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.am 19 Apr 2006 09:19:19 - 1.4 +++ Makefile.am 12 Jun 2006 23:30:00 - 1.5 @@ -6,7 +6,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ config.h.in config.sub configure install-sh \ ltconfig ltmain.sh missing mkinstalldirs depcomp \ - stamp-h.in $(MYAPPNAME)_docs.tar \ + stamp-h.in $(MYAPPNAME)_docs.tar \ $(MYAPPNAME)_docs.tar.gz $(MYAPPNAME).c \ debian/changelog ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language Modified Files: TODO Log Message: * make use of /etc/X11/xkb/rules/xfree86.xml first and then /usr/lib/X11/xkb/rules/xfree86.xml Some users reported that they do not have xfree86.xml in /usr/lib/X11/... === RCS file: /cvs/e/e_modules/language/TODO,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- TODO1 Jun 2006 23:09:46 - 1.18 +++ TODO12 Jun 2006 21:52:28 - 1.19 @@ -1 +1,2 @@ -0. Check for Memleaks? forget somewere to clear list or remove an item from it? +1. Add gettext support +2. Check for Memleaks? forget somewere to clear list or remove an item from it? ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language sndev
Enlightenment CVS committal Author : sndev Project : e_modules Module : language Dir : e_modules/language/src/module Modified Files: e_mod_lang.c Log Message: * make use of /etc/X11/xkb/rules/xfree86.xml first and then /usr/lib/X11/xkb/rules/xfree86.xml Some users reported that they do not have xfree86.xml in /usr/lib/X11/... === RCS file: /cvs/e/e_modules/language/src/module/e_mod_lang.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- e_mod_lang.c1 Jun 2006 22:42:09 - 1.26 +++ e_mod_lang.c12 Jun 2006 21:52:28 - 1.27 @@ -203,9 +203,13 @@ if (!exml) return; if (!exml_init(exml)) EXML_RETURN_ON_ERROR(exml); - result = exml_file_read(exml, "/usr/lib/X11/xkb/rules/xfree86.xml"); + result = exml_file_read(exml, "/etc/X11/xkb/rules/xfree86.xml"); if (!result || result == -1) - EXML_RETURN_ON_ERROR(exml); + { + result = exml_file_read(exml, "/usr/lib/X11/xkb/rules/xfree86.xml"); + if (!result || result == -1) + EXML_RETURN_ON_ERROR(exml); + } exml_down(exml); @@ -287,9 +291,13 @@ if (!exml_init(exml)) EXML_RETURN_ON_ERROR(exml); - result = exml_file_read(exml, "/usr/lib/X11/xkb/rules/xfree86.xml"); + result = exml_file_read(exml, "/etc/X11/xkb/rules/xfree86.xml"); if (!result || result == -1) - EXML_RETURN_ON_ERROR(exml); + { + result = exml_file_read(exml, "/usr/lib/X11/xkb/rules/xfree86.xml"); + if (!result || result == -1) + EXML_RETURN_ON_ERROR(exml); + } if (strcasecmp(exml_tag_get(exml), "xkbConfigRegistry")) EXML_RETURN_ON_ERROR(exml); ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mail devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mail Dir : e_modules/mail Modified Files: module_icon.png module.eap newmail.png Log Message: Crop extra space from icons. === RCS file: /cvs/e/e_modules/mail/module_icon.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvs97wwjR and /tmp/cvsBWu01h differ === RCS file: /cvs/e/e_modules/mail/module.eap,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsBjUroV and /tmp/cvstKIq9l differ === RCS file: /cvs/e/e_modules/mail/newmail.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsXH5F4T and /tmp/cvs369eRk differ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mail devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mail Dir : e_modules/mail Modified Files: e_mod_config_box.c Log Message: When switching type to Imap, default the New Path entry to "Inbox" for users that do not know their default Imap path. === RCS file: /cvs/e/e_modules/mail/e_mod_config_box.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_mod_config_box.c 11 Jun 2006 17:44:39 - 1.5 +++ e_mod_config_box.c 12 Jun 2006 20:52:15 - 1.6 @@ -329,6 +329,7 @@ e_widget_disabled_set(cfdata->cur_path_label, 1); e_widget_disabled_set(cfdata->cur_path_entry, 1); e_widget_entry_text_set(cfdata->cur_path_entry, ""); + e_widget_entry_text_set(cfdata->new_path_entry, _("Inbox")); e_widget_entry_text_set(cfdata->port_entry, "143"); cfdata->port = strdup("143"); } ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mail devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mail Dir : e_modules/mail Modified Files: mail.edc imap.c pop.c mdir.c mbox.c e_mod_main.c Log Message: Fix centering label in the module. Reset mail count to zero on call to check mail so that we only get total of new mail. During checks, add new mail count to the total. === RCS file: /cvs/e/e_modules/mail/mail.edc,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- mail.edc12 Jun 2006 10:03:52 - 1.11 +++ mail.edc12 Jun 2006 20:45:10 - 1.12 @@ -16,32 +16,10 @@ max: 128 128; parts { -part - { - name: "clip"; - type: RECT; - mouse_events: 1; - description - { - state: "default" 0.0; - color: 255 255 255 255; - rel1 -{ - relative: 0.0 0.0; - offset: 0 0; -} - rel2 -{ - relative: 1.0 1.0; - offset: -1 -1; -} - } - } part { name: "logo"; type: IMAGE; - clip_to: "clip"; mouse_events: 1; description { @@ -78,14 +56,13 @@ { name: "new_label"; type: TEXT; - clip_to: "clip"; - effect: SOFT_SHADOW; + effect: OUTLINE_SOFT_SHADOW; mouse_events: 1; description { state: "default" 0.0; - color: 0 0 0 255; - color3: 255 255 255 42; + color: 255 255 255 255; + color3: 0 0 0 32; visible: 0; rel1 { @@ -103,10 +80,9 @@ { text: ""; font: "VeraBold"; - size: 14; + size: 16; min: 1 1; - align: 0.5 0.5; - text_class: "module_large"; + align: 1.0 0.5; } } description @@ -114,8 +90,6 @@ state: "visible" 0.0; inherit: "default" 0.0; visible: 1; - color: 0 0 0 255; - color3: 255 255 255 42; } } } === RCS file: /cvs/e/e_modules/mail/imap.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- imap.c 12 Jun 2006 20:21:28 - 1.3 +++ imap.c 12 Jun 2006 20:45:10 - 1.4 @@ -194,8 +194,9 @@ ecore_con_server_del(is->server); is->server = NULL; + inst = is->data; - inst->count = is->count; + inst->count += is->count; _mail_set_text(inst); return 0; @@ -258,9 +259,6 @@ is->count += num; ic->config->num_new = num; ic->config->num_total = total; -inst = is->data; -inst->count = num; -_mail_set_text(inst); if ((num > 0) && (ic->config->use_exec) && (ic->config->exec)) _mail_start_exe(ic->config); === RCS file: /cvs/e/e_modules/mail/pop.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- pop.c 12 Jun 2006 10:03:52 - 1.2 +++ pop.c 12 Jun 2006 20:45:10 - 1.3 @@ -192,7 +192,7 @@ pc->config->num_new = num; pc->config->num_total = num; } - inst->count = num; + inst->count += num; _mail_pop_client_quit(pc); if ((num > 0) && (pc->config->use_exec) && (pc->config->exec)) _mail_start_exe(pc->config); === RCS file: /cvs/e/e_modules/mail/mdir.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- mdir.c 12 Jun 2006 10:03:52 - 1.2 +++ mdir.c 12 Jun 2006 20:45:10 - 1.3 @@ -75,8 +75,9 @@ mc->config->num_total = _mail_mdir_get_files(mc->config->cur_path); mc->config->num_new = _mail_mdir_get_files(mc->config->new_path); + inst = mc->data; - inst->count = mc->config->num_new; + inst->count += mc->config
E CVS: mail devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mail Dir : e_modules/mail Modified Files: imap.c Log Message: Make imap update the text and icon. === RCS file: /cvs/e/e_modules/mail/imap.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- imap.c 12 Jun 2006 10:03:52 - 1.2 +++ imap.c 12 Jun 2006 20:21:28 - 1.3 @@ -207,6 +207,7 @@ Ecore_Con_Event_Server_Data *ev = event; ImapServer *is; ImapClient *ic; + Instance *inst; int len, num = 0, total = 0; char in[1024], out[1024], *spc; size_t slen; @@ -257,6 +258,9 @@ is->count += num; ic->config->num_new = num; ic->config->num_total = total; +inst = is->data; +inst->count = num; +_mail_set_text(inst); if ((num > 0) && (ic->config->use_exec) && (ic->config->exec)) _mail_start_exe(ic->config); ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/ibox Modified Files: e_mod_main.c Log Message: Fix formatting for a function. Conforms to E formats now. === RCS file: /cvs/e/e17/apps/e/src/modules/ibox/e_mod_main.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -3 -r1.56 -r1.57 --- e_mod_main.c12 Jun 2006 03:50:51 - 1.56 +++ e_mod_main.c12 Jun 2006 10:21:18 - 1.57 @@ -1179,7 +1179,8 @@ return 1; } -static int _ibox_cb_event_desk_show(void *data, int type, void *event) +static int +_ibox_cb_event_desk_show(void *data, int type, void *event) { E_Event_Desk_Show *ev; IBox *b; ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mail devilhorns
Enlightenment CVS committal Author : devilhorns Project : e_modules Module : mail Dir : e_modules/mail Modified Files: e_mod_main.c imap.c mbox.c mdir.c pop.c pop.h e_mod_main.h mail.edc Log Message: Ok, pop mail now works again :) General bug fixes when setting mail count on the module. Minor edc changes. Better cleanup when closing the module. === RCS file: /cvs/e/e_modules/mail/e_mod_main.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -3 -r1.22 -r1.23 --- e_mod_main.c11 Jun 2006 17:41:42 - 1.22 +++ e_mod_main.c12 Jun 2006 10:03:52 - 1.23 @@ -24,24 +24,6 @@ #include "mdir.h" #include "mbox.h" -typedef struct _Instance Instance; -typedef struct _Mail Mail; - -struct _Instance -{ - E_Gadcon_Client *gcc; - Evas_Object *mail_obj; - Mail *mail; - Ecore_Exe *exe; - Ecore_Timer *check_timer; -}; - -struct _Mail -{ - Instance *inst; - Evas_Object *mail_obj; -}; - /* Func Protos for Gadcon */ static E_Gadcon_Client *_gc_init(E_Gadcon *gc, const char *name, const char *id, const char *style); static void _gc_shutdown(E_Gadcon_Client *gcc); @@ -126,6 +108,7 @@ inst->check_timer = ecore_timer_add((ci->check_time * 60.0), _mail_cb_check, inst); break; case MAIL_TYPE_POP: + _mail_pop_add_mailbox(cb); if (!inst->check_timer) inst->check_timer = ecore_timer_add((ci->check_time * 60.0), _mail_cb_check, inst); break; @@ -409,6 +392,7 @@ _mail_imap_del_mailbox(cb); break; case MAIL_TYPE_POP: + _mail_pop_del_mailbox(cb); break; case MAIL_TYPE_MDIR: _mail_mdir_del_mailbox(cb); @@ -431,6 +415,10 @@ mail_config->items = evas_list_remove_list(mail_config->items, mail_config->items); free(ci); } + _mail_imap_shutdown(); + _mail_pop_shutdown(); + _mail_mdir_shutdown(); + _mail_mbox_shutdown(); free(mail_config); mail_config = NULL; E_CONFIG_DD_FREE(conf_box_edd); @@ -496,7 +484,7 @@ Instance *inst = data; Config_Item *ci; Evas_List *l; - int have_imap = 0; + int have_imap = 0, have_pop = 0; if (!inst) return 1; ci = _mail_config_item_get(inst->gcc->id); @@ -506,6 +494,7 @@ Config_Box *cb; cb = l->data; + if (!cb) continue; switch (cb->type) { case MAIL_TYPE_MDIR: @@ -513,7 +502,7 @@ case MAIL_TYPE_MBOX: break; case MAIL_TYPE_POP: -_mail_pop_check_mail(inst, cb); +have_pop = 1; break; case MAIL_TYPE_IMAP: have_imap = 1; @@ -521,20 +510,21 @@ } } if (have_imap) _mail_imap_check_mail(inst); + if (have_pop) _mail_pop_check_mail(inst); return 1; } void -_mail_set_text(void *data, int count) +_mail_set_text(void *data) { Instance *inst = data; char buf[1024]; if (!inst) return; - if (count > 0) + if (inst->count > 0) { - snprintf(buf, sizeof(buf), "%d", count); + snprintf(buf, sizeof(buf), "%d", inst->count); edje_object_part_text_set(inst->mail->mail_obj, "new_label", buf); edje_object_signal_emit(inst->mail->mail_obj, "new_mail", ""); } @@ -545,6 +535,18 @@ } } +void +_mail_start_exe(void *data) +{ + Config_Box *cb; + + cb = data; + if (!cb) return; + + exit_handler = ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _mail_cb_exe_exit, cb); + cb->exe = ecore_exe_run(cb->exec, cb); +} + static int _mail_cb_exe_exit(void *data, int type, void *event) { @@ -583,6 +585,7 @@ _mail_imap_add_mailbox(cb); break; case MAIL_TYPE_POP: + _mail_pop_add_mailbox(cb); break; case MAIL_TYPE_MDIR: _mail_mdir_add_mailbox(inst, cb); @@ -637,6 +640,7 @@ _mail_imap_del_mailbox(cb); break; case MAIL_TYPE_POP: + _mail_pop_del_mailbox(cb); break; case MAIL_TYPE_MDIR: _mail_mdir_del_mailbox(cb); === RCS file: /cvs/e/e_modules/mail/imap.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- imap.c 11 Jun 2006 17:37:53 - 1.1 +++ imap.c 12 Jun 2006 10:03:52 - 1.2 @@ -3,7 +3,7 @@ #include "imap.h" static ImapServer *_mail_imap_server_get(Ecore_Con_Server *server); -static ImapClient *_mail_imap_client_get(Config_Box *cb); +static ImapClient *_ma
E CVS: eveil kiwi
Enlightenment CVS committal Author : kiwi Project : e_modules Module : eveil Dir : e_modules/eveil Modified Files: Makefile.am configure.in e_mod_config.c e_mod_config_alarm.c e_mod_main.c e_mod_main.h Log Message: Massimo Maiurana patch for i18n support === RCS file: /cvs/e/e_modules/eveil/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 1 Jun 2006 12:55:25 - 1.2 +++ Makefile.am 12 Jun 2006 08:54:21 - 1.3 @@ -1,6 +1,6 @@ MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = +SUBDIRS = po EDJE_CC = @edje_cc@ EDJE_FLAGS = -id . -fd $(srcdir)/fonts === RCS file: /cvs/e/e_modules/eveil/configure.in,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- configure.in29 May 2006 08:42:20 - 1.1 +++ configure.in12 Jun 2006 08:54:22 - 1.2 @@ -20,7 +20,7 @@ AM_ENABLE_SHARED AM_PROG_LIBTOOL -ALL_LINGUAS="fi it ja ru sv" +ALL_LINGUAS="it" AC_SUBST(ALL_LINGUAS) AM_GNU_GETTEXT([external]) @@ -152,6 +152,7 @@ AC_OUTPUT([ Makefile +po/Makefile e_modules-eveil.spec ],[ ]) === RCS file: /cvs/e/e_modules/eveil/e_mod_config.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_mod_config.c 1 Jun 2006 12:55:25 - 1.3 +++ e_mod_config.c 12 Jun 2006 08:54:22 - 1.4 @@ -70,7 +70,7 @@ v->advanced.create_widgets = _advanced_create_widgets; cfd = e_config_dialog_new(e_container_current_get(e_manager_current_get()), -_("Eveil Configuration"), NULL, 0, v, NULL); +D_("Eveil Configuration"), NULL, 0, v, NULL); eveil_config->config_dialog = cfd; } @@ -183,9 +183,9 @@ { Evas_Object *of, *ob; - of = e_widget_frametable_add(evas, _("Alarm"), 0); + of = e_widget_frametable_add(evas, D_("Alarm"), 0); - ob = e_widget_check_add(evas, _("Active"), &(cfdata->alarms_active)); + ob = e_widget_check_add(evas, D_("Active"), &(cfdata->alarms_active)); e_widget_frametable_object_append(of, ob, 0, 0, 2, 1, 1, 1, 1, 10); ob = e_widget_ilist_add(evas, 16, 16, NULL); @@ -204,10 +204,10 @@ e_widget_table_object_append(o, of, 0, 0, 1, 1, 1, 1, 1, 1); - of = e_widget_frametable_add(evas, _("Timer"), 0); + of = e_widget_frametable_add(evas, D_("Timer"), 0); cfdata->timer_gui.slider_h = - e_widget_slider_add(evas, 1, 0, _("%1.0f hours"), + e_widget_slider_add(evas, 1, 0, D_("%1.0f hours"), (float)TIMER_TIME_MIN/3600, (float)TIMER_TIME_MAX/3600, 1.0, 0, NULL, &(cfdata->timer_time_h), 130); @@ -215,7 +215,7 @@ e_widget_frametable_object_append(of, cfdata->timer_gui.slider_h, 0, 0, 3, 1, 1, 0, 1, 0); cfdata->timer_gui.slider_m = - e_widget_slider_add(evas, 1, 0, _("%1.0f min"), + e_widget_slider_add(evas, 1, 0, D_("%1.0f min"), 0.0, 59.0, 1.0, 0, NULL, &(cfdata->timer_time_m), 130); @@ -223,7 +223,7 @@ e_widget_frametable_object_append(of, cfdata->timer_gui.slider_m, 0, 1, 3, 1, 1, 0, 1, 0); cfdata->timer_gui.slider_s = - e_widget_slider_add(evas, 1, 0, _("%1.0f sec"), + e_widget_slider_add(evas, 1, 0, D_("%1.0f sec"), 0.0, 59.0, 1.0, 0, NULL, &(cfdata->timer_time_s), 130); @@ -232,17 +232,17 @@ 0, 2, 3, 1, 1, 0, 1, 0); cfdata->timer_gui.button_start = - e_widget_button_add(evas, _("Start !"), NULL, _cb_timer_start, cfdata, NULL); + e_widget_button_add(evas, D_("Start !"), NULL, _cb_timer_start, cfdata, NULL); e_widget_disabled_set(cfdata->timer_gui.button_start, eveil_config->timer_state); e_widget_frametable_object_append(of, cfdata->timer_gui.button_start, 0, 3, 1, 1, 1, 1, 1, 1); cfdata->timer_gui.button_stop = - e_widget_button_add(evas, _("Stop !"), NULL, _cb_timer_stop, cfdata, NULL); + e_widget_button_add(evas, D_("Stop !"), NULL, _cb_timer_stop, cfdata, NULL); e_widget_disabled_set(cfdata->timer_gui.button_stop, !eveil_config->timer_state); e_widget_frametable_object_append(of, cfdata->timer_gui.button_stop, 1, 3, 1, 1, 1, 1, 1, 1); cfdata->timer_gui.button_zero = - e_widget_button_add(evas, _("Zero"), NULL, _cb_timer_zero, cfdata, NULL); + e_widget_button_add(evas, D_("Zero"), NULL, _cb_timer_zero, cfdata, NULL); e_widget_disabled_set(cfdata->timer_gui.button_zero, eveil_config->t
E CVS: eveil kiwi
Enlightenment CVS committal Author : kiwi Project : e_modules Module : eveil Dir : e_modules/eveil/po Added Files: .cvsignore Makefile.am it.po Log Message: Massimo Maiurana patch for i18n support ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: eveil kiwi
Enlightenment CVS committal Author : kiwi Project : e_modules Module : eveil Dir : e_modules/eveil/po Log Message: Directory /cvs/e/e_modules/eveil/po added to the repository ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e urandom
Enlightenment CVS committal Author : urandom Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: bg.po Log Message: the 3 buttons in the file dialog now point somewhere. === RCS file: /cvs/e/e17/apps/e/po/bg.po,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- bg.po 11 Jun 2006 08:52:19 - 1.13 +++ bg.po 12 Jun 2006 07:19:02 - 1.14 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2006-06-10 18:11+0300\n" -"PO-Revision-Date: 2006-06-11 11:35+0300\n" +"POT-Creation-Date: 2006-06-11 14:01+0300\n" +"PO-Revision-Date: 2006-06-12 10:07+0300\n" "Last-Translator: Viktor Kojouharov <[EMAIL PROTECTED]>\n" "Language-Team: English <[EMAIL PROTECTED]>\n" "MIME-Version: 1.0\n" @@ -1299,8 +1299,8 @@ msgstr "Ðез Ñамка" #: src/bin/e_int_border_menu.c:228 -#: src/bin/e_int_config_window_manipulation.c:145 -#: src/bin/e_int_config_window_manipulation.c:195 +#: src/bin/e_int_config_window_manipulation.c:144 +#: src/bin/e_int_config_window_manipulation.c:194 msgid "Fullscreen" msgstr "ЦÑл екÑан" @@ -1689,7 +1689,7 @@ msgstr "ÐÑнеÑоÑо вÑеме на ÑÑба, пÑеди пÑелиÑÑване:" #: src/bin/e_int_config_desks.c:194 -#: src/bin/e_int_config_window_manipulation.c:172 +#: src/bin/e_int_config_window_manipulation.c:171 #, c-format msgid "%1.1f sec" msgstr "%1.1f·Ñек" @@ -2085,15 +2085,15 @@ #: src/bin/e_int_config_fonts.c:78 msgid "Small Styled" -msgstr "ÐалÑк (ÑÑилизиÑано)" +msgstr "ÐалÑк (ÑÑилизиÑан)" #: src/bin/e_int_config_fonts.c:79 msgid "Normal Styled" -msgstr "ÐоÑмален (ÑÑилизиÑано)" +msgstr "ÐоÑмален (ÑÑилизиÑан)" #: src/bin/e_int_config_fonts.c:80 msgid "Large Styled" -msgstr "ÐолÑм (ÑÑилизиÑано)" +msgstr "ÐолÑм (ÑÑилизиÑан)" #: src/bin/e_int_config_fonts.c:132 msgid "Font Settings" @@ -2319,9 +2319,9 @@ msgstr "ÐолеÑа пÑи авÑоплÑзгане" #: src/bin/e_int_config_menus.c:141 src/bin/e_int_config_menus.c:145 -#: src/bin/e_int_config_window_manipulation.c:181 -#: src/bin/e_int_config_window_manipulation.c:185 -#: src/bin/e_int_config_window_manipulation.c:189 +#: src/bin/e_int_config_window_manipulation.c:180 +#: src/bin/e_int_config_window_manipulation.c:184 +#: src/bin/e_int_config_window_manipulation.c:188 #, c-format msgid "%2.0f pixels" msgstr "%2.0f·пикÑели" @@ -2331,7 +2331,7 @@ msgstr "ÐолеÑа на показалеÑа пÑи авÑоплÑзгане" #: src/bin/e_int_config_menus.c:149 -#: src/bin/e_int_config_window_manipulation.c:136 +#: src/bin/e_int_config_window_manipulation.c:135 msgid "Miscellaneous Options" msgstr "ÐÑÑги наÑÑÑойки" @@ -2625,89 +2625,89 @@ msgid "Use application provided icon instead" msgstr "Ðзползване на икони, добиÑи Ð¾Ñ Ð¿ÑогÑамаÑа" -#: src/bin/e_int_config_window_manipulation.c:137 -#: src/bin/e_int_config_window_manipulation.c:168 +#: src/bin/e_int_config_window_manipulation.c:136 +#: src/bin/e_int_config_window_manipulation.c:167 msgid "Automatically raise windows on mouse over" msgstr "ÐвÑомаÑиÑно повдигане на пÑозоÑеÑÑÑ Ð¿Ð¾Ð´ показалеÑа" -#: src/bin/e_int_config_window_manipulation.c:139 +#: src/bin/e_int_config_window_manipulation.c:138 msgid "When moving or resizing windows, resist at the boundaries" msgstr "" "ÐÑи движение/оÑазмеÑÑване на пÑозоÑÑи, да Ñе ÑÑпÑоÑивлÑÐ²Ð°Ñ Ð¿Ñи гÑаниÑиÑе" -#: src/bin/e_int_config_window_manipulation.c:143 -#: src/bin/e_int_config_window_manipulation.c:193 +#: src/bin/e_int_config_window_manipulation.c:142 +#: src/bin/e_int_config_window_manipulation.c:192 msgid "Maximize Policy" msgstr "ÐолиÑика на ÑголемÑване" -#: src/bin/e_int_config_window_manipulation.c:147 -#: src/bin/e_int_config_window_manipulation.c:197 +#: src/bin/e_int_config_window_manipulation.c:146 +#: src/bin/e_int_config_window_manipulation.c:196 msgid "Smart expansion" msgstr "Умно ÑголемÑване" -#: src/bin/e_int_config_window_manipulation.c:149 -#: src/bin/e_int_config_window_manipulation.c:199 +#: src/bin/e_int_config_window_manipulation.c:148 +#: src/bin/e_int_config_window_manipulation.c:198 msgid "Expand the window" msgstr "РазÑиÑÑване на пÑозоÑÑи" -#: src/bin/e_int_config_window_manipulation.c:151 -#: src/bin/e_int_config_window_manipulation.c:201 +#: src/bin/e_int_config_window_manipulation.c:150 +#: src/bin/e_int_config_window_manipulation.c:200 msgid "Fill available space" msgstr "ÐапÑлване на ÑвободноÑо мÑÑÑо" -#: src/bin/e_int_config_window_manipulation.c:1
E CVS: apps/e urandom
Enlightenment CVS committal Author : urandom Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_file_dialog.c e_file_selector.c e_file_selector.h e_widget_fileman.c e_widget_fileman.h Log Message: the 3 buttons in the file dialog now point somewhere. === RCS file: /cvs/e/e17/apps/e/src/bin/e_file_dialog.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_file_dialog.c 18 Feb 2006 04:35:26 - 1.12 +++ e_file_dialog.c 12 Jun 2006 07:19:03 - 1.13 @@ -5,12 +5,15 @@ * buttons, and a "Places" frame where the user can add his favorite places. * When the user selects a file, it will trigger a callback. */ - + static void _e_file_dialog_button1_click(void *data, E_Dialog *dia); static void _e_file_dialog_button2_click(void *data, E_Dialog *dia); static void _e_file_dialog_free(E_File_Dialog *dia); static void _e_file_dialog_file_select_cb(Evas_Object *obj, char *file, void *data); static void _e_file_dialog_file_hilite_cb(Evas_Object *obj, char *file, void *data); +static void _cb_icons(void *data, void *data2); +static void _cb_home(void *data, void *data2); +static void _cb_desktop(void *data, void *data2); EAPI E_File_Dialog * e_file_dialog_new(E_Container *con) @@ -44,20 +47,21 @@ dia->select_func = NULL; dia->hilite_func = NULL; dia->select_data = NULL; - evas = dia->dia->win->evas; + evas = dia->dia->win->evas; + + fm = e_widget_fileman_add(evas, &(dia->file)); + e_widget_fileman_select_callback_add(fm, _e_file_dialog_file_select_cb, dia); + e_widget_fileman_hilite_callback_add(fm, _e_file_dialog_file_hilite_cb, dia); ol = e_widget_list_add(evas, 0, 1); list = e_widget_framelist_add(evas, _("Places"), 0); e_widget_framelist_content_align_set(list, 0.5, 0.0); - e_widget_framelist_object_append(list, e_widget_button_add(evas, _("Home"), "fileman/home", NULL, NULL, NULL)); - e_widget_framelist_object_append(list, e_widget_button_add(evas, _("Desktop"), "fileman/desktop", NULL, NULL, NULL)); - e_widget_framelist_object_append(list, e_widget_button_add(evas, _("Icons"), "fileman/folder", NULL, NULL, NULL)); + e_widget_framelist_object_append(list, e_widget_button_add(evas, _("Home"), "fileman/home", _cb_home, fm, NULL)); + e_widget_framelist_object_append(list, e_widget_button_add(evas, _("Desktop"), "fileman/desktop", _cb_desktop, fm, NULL)); + e_widget_framelist_object_append(list, e_widget_button_add(evas, _("Icons"), "fileman/folder", _cb_icons, fm, NULL)); e_widget_list_object_append(ol, list, 1, 0, 0.0); - - fm = e_widget_fileman_add(evas, &(dia->file)); - e_widget_fileman_select_callback_add(fm, _e_file_dialog_file_select_cb, dia); - e_widget_fileman_hilite_callback_add(fm, _e_file_dialog_file_hilite_cb, dia); + e_widget_list_object_append(ol, fm, 1, 1, 0.0); e_widget_min_size_get(ol, &w, &h); @@ -146,4 +150,37 @@ e_object_unref(E_OBJECT(dia->dia)); E_FREE(dia->file); //free(dia); +} + +static void +_cb_icons(void *data, void *data2) +{ + Evas_Object *obj; + char path[PATH_MAX]; + + obj = data; + snprintf(path, PATH_MAX, "%s/.icons", e_user_homedir_get()); + e_widget_fileman_dir_set(obj, path); +} + +static void +_cb_desktop(void *data, void *data2) +{ + Evas_Object *obj; + char path[PATH_MAX]; + + obj = data; + snprintf(path, PATH_MAX, "%s/Desktop", e_user_homedir_get()); + e_widget_fileman_dir_set(obj, path); +} + +static void +_cb_home(void *data, void *data2) +{ + Evas_Object *obj; + char path[PATH_MAX]; + + obj = data; + snprintf(path, PATH_MAX, "%s", e_user_homedir_get()); + e_widget_fileman_dir_set(obj, path); } === RCS file: /cvs/e/e17/apps/e/src/bin/e_file_selector.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_file_selector.c 7 Jan 2006 10:39:45 - 1.8 +++ e_file_selector.c 12 Jun 2006 07:19:03 - 1.9 @@ -90,6 +90,14 @@ sd->func_data = data; } +EAPI void +e_file_selector_dir_set(Evas_Object *obj, const char *dir) +{ + API_ENTRY return; + + e_fm_dir_set(sd->files, dir); +} + static void _e_file_selector_scroll_set(Evas_Object *obj, Evas_Coord x, Evas_Coord y) { === RCS file: /cvs/e/e17/apps/e/src/bin/e_file_selector.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_file_selector.h 5 Dec 2005 22:20:33 - 1.3 +++ e_file_selector.h 12 Jun 2006 07:19:03 - 1.4 @@ -19,6 +19,7 @@ EAPI void e_file_selector_view_set(Evas_Object *object, int view); EAPI int e_file_selector_view_get(Evas_Object *object); EAPI v