e shot: have hide and cancel button work properly (they were inverted before).

Also change to more user-friendly button labels.

 TODO: Have a popup present the url after completion when hidden.


SVN revision: 72842
This commit is contained in:
Chidambar Zinnoury 2012-06-26 06:43:22 +00:00
parent 4b02035868
commit 1e3423ccd7
1 changed files with 4 additions and 3 deletions

View File

@ -239,7 +239,7 @@ _win_save_cb(void *data __UNUSED__, void *data2 __UNUSED__)
evas_object_show(o);
e_widget_size_min_get(o, &mw, &mh);
e_dialog_content_set(dia, o, mw, mh);
e_dialog_button_add(dia, _("OK"), NULL,
e_dialog_button_add(dia, _("Save"), NULL,
_file_select_ok_cb, NULL);
e_dialog_button_add(dia, _("Cancel"), NULL,
_file_select_cancel_cb, NULL);
@ -279,18 +279,19 @@ _upload_ok_cb(void *data __UNUSED__, E_Dialog *dia)
e_object_del(E_OBJECT(win));
win = NULL;
}
_share_done();
}
static void
_upload_cancel_cb(void *data __UNUSED__, E_Dialog *dia)
{
o_label = NULL;
if (dia) e_util_defer_object_del(E_OBJECT(dia));
if (win)
{
e_object_del(E_OBJECT(win));
win = NULL;
}
_share_done();
}
static Eina_Bool
@ -479,7 +480,7 @@ _win_share_cb(void *data __UNUSED__, void *data2 __UNUSED__)
e_widget_size_min_get(ol, &mw, &mh);
e_dialog_content_set(dia, ol, mw, mh);
e_dialog_button_add(dia, _("OK"), NULL, _upload_ok_cb, NULL);
e_dialog_button_add(dia, _("Hide"), NULL, _upload_ok_cb, NULL);
e_dialog_button_add(dia, _("Cancel"), NULL, _upload_cancel_cb, NULL);
e_dialog_resizable_set(dia, 1);
e_win_centered_set(dia->win, 1);