viking

commit b8f4349f85d7845aab23300866e49f04880e7e2b
parent a39dabc25fe800bad84558ed4c71bc7fa5d72d2c
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Mon, 24 Sep 2012 08:34:30 -0600

main: add some comments and settings

Diffstat:
M
main.c
 | 
21
+++++++++++++--------

1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/main.c b/main.c
@@ -1411,9 +1411,7 @@ elm_main(int argc, char *argv[])
 
 	elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
 
-	ewk_network_tls_ca_certificates_path_set(ca_bundle);
-
-	win = elm_win_add(NULL, "evi", ELM_WIN_BASIC);
+	win = elm_win_add(NULL, "viking", ELM_WIN_BASIC);
 	elm_win_autodel_set(win, EINA_TRUE);
 	// elm_win_shaped_set(win, EINA_TRUE);
 	// elm_win_screen_constrain_set(win, EINA_TRUE);
@@ -1438,20 +1436,28 @@ elm_main(int argc, char *argv[])
 
 	evas_object_smart_callback_add(win, "delete,request", _win_del_request_cb, ad);
 
+	ewk_network_tls_ca_certificates_path_set(ca_bundle);
 	ewk_settings_icon_database_path_set("./");
+	ewk_settings_application_cache_path_set("./");
+	ewk_settings_shadow_dom_enable_set(EINA_TRUE);
+
 	ewk_cookies_file_set("cookies.txt");
+	ewk_cookies_policy_set(EWK_COOKIE_JAR_ACCEPT_NO_THIRD_PARTY);
 
+	/* program bacground */
 	bg = elm_bg_add(win);
 	evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	elm_win_resize_object_add(win, bg);
-	// elm_bg_color_set(bg, 255, 255, 255);
+	elm_bg_color_set(bg, 0, 0, 0);
 	evas_object_show(bg);
 
+	/* main box that everything goes into, resizes with window */
 	box = elm_box_add(win);
 	evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	elm_win_resize_object_add(win, box);
 	evas_object_show(box);
 
+	/* widget that shows the web pages */
 	naviframe = elm_naviframe_add(win);
 	evas_object_size_hint_weight_set(naviframe, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	evas_object_size_hint_align_set(naviframe, EVAS_HINT_FILL, EVAS_HINT_FILL);
@@ -1462,21 +1468,20 @@ elm_main(int argc, char *argv[])
 	status_bar = elm_box_add(win);
 	elm_box_homogeneous_set(status_bar, EINA_FALSE);
 	elm_box_horizontal_set(status_bar, EINA_TRUE);
-	evas_object_size_hint_weight_set(status_bar, EVAS_HINT_EXPAND, 0.0);
 	evas_object_size_hint_align_set(status_bar, EVAS_HINT_FILL, EVAS_HINT_FILL);
 	elm_box_pack_end(box, status_bar);
 	evas_object_show(status_bar);
 
 	/* status bar url */
 	status_url = elm_label_add(win);
-	evas_object_size_hint_weight_set(status_url, 0.0, EVAS_HINT_EXPAND);
+	evas_object_size_hint_weight_set(status_url, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	evas_object_size_hint_align_set(status_url, 0.0, EVAS_HINT_FILL);
 	elm_box_pack_end(status_bar, status_url);
 	evas_object_show(status_url);
 
 	/* status bar state (load progress, mod keys, scroll %) */
 	status_state = elm_label_add(win);
-	evas_object_size_hint_weight_set(status_state, 1.0, EVAS_HINT_EXPAND);
+	evas_object_size_hint_weight_set(status_state, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
 	evas_object_size_hint_align_set(status_state, 1.0, EVAS_HINT_FILL);
 	elm_box_pack_end(status_bar, status_state);
 	evas_object_show(status_state);
@@ -1550,10 +1555,10 @@ elm_main(int argc, char *argv[])
 
 	elm_run();
 	elm_shutdown();
-	ewk_shutdown();
 
 	free(ad->modkeys);
 	eina_list_free(ad->buffer_list);
+	eina_hash_free(ad->downloads);
 
 	return 0;
 }