Hey Gastal, Iscaro, As I said previously, you need to update COPYING_IMAGES with these images licenses / authorship.
Also, you dropped the multiple board sizes option, and I disagree, so please fix that. Using just the smaller version (the most boring) doesn't sounds nice for me. Do you have a good reason for that ? If it's just because your image set is small, you could disable the other modes considering the images set / theme, and keep the old one. Looks like the theme is broken for windows size different from what you expected, so please, fix it too. And don't put it in fullscreen mode by default. It's annoying. If you need that to run fine on Tizen, pass as command line argument or something like that. I disapprove negative feedback for players on games, so please substitute "you're slow like a turtle" for something less offensive. Finally, there are some variables left declared but not used and something used before initialized. So please, when compiling check for these kind of warnings. I'm working so I can't spend more time reviewing your commit line by line, but fixing these points I spotted is a good start. On Mon, Jun 11, 2012 at 9:33 AM, Enlightenment SVN <no-re...@enlightenment.org> wrote: > Log: > Making mobile friendly. > > Author: Guilherme Iscaro <isc...@profusion.mobi> > > Author: gastal > Date: 2012-06-11 05:33:43 -0700 (Mon, 11 Jun 2012) > New Revision: 71946 > Trac: http://trac.enlightenment.org/e/changeset/71946 > > Added: > trunk/GAMES/econcentration/data/images/cards.png > Removed: > trunk/GAMES/econcentration/data/images/icon_00.png > trunk/GAMES/econcentration/data/images/icon_09.png > trunk/GAMES/econcentration/data/images/icon_10.png > trunk/GAMES/econcentration/data/images/icon_11.png > trunk/GAMES/econcentration/data/images/icon_12.png > trunk/GAMES/econcentration/data/images/icon_13.png > trunk/GAMES/econcentration/data/images/icon_14.png > trunk/GAMES/econcentration/data/images/icon_15.png > trunk/GAMES/econcentration/data/images/icon_16.png > trunk/GAMES/econcentration/data/images/icon_17.png > trunk/GAMES/econcentration/data/images/icon_18.png > trunk/GAMES/econcentration/data/images/icon_19.png > trunk/GAMES/econcentration/data/images/icon_20.png > trunk/GAMES/econcentration/data/images/icon_21.png > trunk/GAMES/econcentration/data/images/icon_22.png > trunk/GAMES/econcentration/data/images/icon_23.png > trunk/GAMES/econcentration/data/images/icon_24.png > trunk/GAMES/econcentration/data/images/icon_25.png > trunk/GAMES/econcentration/data/images/icon_26.png > trunk/GAMES/econcentration/data/images/icon_27.png > trunk/GAMES/econcentration/data/images/icon_28.png > trunk/GAMES/econcentration/data/images/icon_29.png > trunk/GAMES/econcentration/data/images/icon_30.png > trunk/GAMES/econcentration/data/images/icon_31.png > Modified: > trunk/GAMES/econcentration/data/images/Makefile.am > trunk/GAMES/econcentration/data/images/icon_01.png > trunk/GAMES/econcentration/data/images/icon_02.png > trunk/GAMES/econcentration/data/images/icon_03.png > trunk/GAMES/econcentration/data/images/icon_04.png > trunk/GAMES/econcentration/data/images/icon_05.png > trunk/GAMES/econcentration/data/images/icon_06.png > trunk/GAMES/econcentration/data/images/icon_07.png > trunk/GAMES/econcentration/data/images/icon_08.png > trunk/GAMES/econcentration/src/bin/main.c > > Modified: trunk/GAMES/econcentration/data/images/Makefile.am > =================================================================== > --- trunk/GAMES/econcentration/data/images/Makefile.am 2012-06-11 12:21:17 > UTC (rev 71945) > +++ trunk/GAMES/econcentration/data/images/Makefile.am 2012-06-11 12:33:43 > UTC (rev 71946) > @@ -2,7 +2,7 @@ > > filesdir = $(datadir)/econcentration/images > files_DATA = \ > -icon_00.png \ > +cards.png \ > icon_01.png \ > icon_02.png \ > icon_03.png \ > @@ -10,29 +10,6 @@ > icon_05.png \ > icon_06.png \ > icon_07.png \ > -icon_08.png \ > -icon_09.png \ > -icon_10.png \ > -icon_11.png \ > -icon_12.png \ > -icon_13.png \ > -icon_14.png \ > -icon_15.png \ > -icon_16.png \ > -icon_17.png \ > -icon_18.png \ > -icon_19.png \ > -icon_20.png \ > -icon_21.png \ > -icon_22.png \ > -icon_23.png \ > -icon_24.png \ > -icon_25.png \ > -icon_26.png \ > -icon_27.png \ > -icon_28.png \ > -icon_29.png \ > -icon_30.png \ > -icon_31.png > +icon_08.png > > EXTRA_DIST = $(files_DATA) > > Modified: trunk/GAMES/econcentration/data/images/icon_01.png > =================================================================== > (Binary files differ) > > Modified: trunk/GAMES/econcentration/data/images/icon_02.png > =================================================================== > (Binary files differ) > > Modified: trunk/GAMES/econcentration/data/images/icon_03.png > =================================================================== > (Binary files differ) > > Modified: trunk/GAMES/econcentration/data/images/icon_04.png > =================================================================== > (Binary files differ) > > Modified: trunk/GAMES/econcentration/data/images/icon_05.png > =================================================================== > (Binary files differ) > > Modified: trunk/GAMES/econcentration/data/images/icon_06.png > =================================================================== > (Binary files differ) > > Modified: trunk/GAMES/econcentration/data/images/icon_07.png > =================================================================== > (Binary files differ) > > Modified: trunk/GAMES/econcentration/data/images/icon_08.png > =================================================================== > (Binary files differ) > > Modified: trunk/GAMES/econcentration/src/bin/main.c > =================================================================== > --- trunk/GAMES/econcentration/src/bin/main.c 2012-06-11 12:21:17 UTC (rev > 71945) > +++ trunk/GAMES/econcentration/src/bin/main.c 2012-06-11 12:33:43 UTC (rev > 71946) > @@ -23,19 +23,11 @@ > int play_time, attempts, found, board_size, prev_board_size, total_size; > Card cards[BOARD_SIZE_MAX]; > Card *first_card, *second_card; > - Evas_Object *time_lb, *attempts_lb, *found_lb, *won_lb, *inwin, *table; > + Evas_Object *time_lb, *attempts_lb, *won_lb, *popup, *table; > Ecore_Timer *play_timer, *show_timer, *dl_pop; > Eina_Bool running:1; > } Game; > > -static void > -_board_size_cb(void *data, Evas_Object *obj, void *event_info __UNUSED__) > -{ > - Game *game = data; > - game->board_size = elm_spinner_value_get(obj) * 2 + 2; > - game->total_size = game->board_size * game->board_size; > -} > - > static Eina_Bool > _play_timer_cb(void *data) > { > @@ -65,7 +57,7 @@ > _won_ok(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) > { > Game *game = data; > - evas_object_hide(game->inwin); > + evas_object_hide(game->popup); > } > > static void > @@ -76,12 +68,18 @@ > ecore_timer_del(game->play_timer); > game->play_timer = NULL; > > - evas_object_show(game->inwin); > - snprintf(buf, sizeof(buf), > - "Congratulations, you solved it!<br>" > - "You spent %i seconds and<br>" > - "made %i attempts.", > - game->play_time, game->attempts); > + evas_object_show(game->popup); > + > + if (game->play_time >= 0 && game->play_time <= 60) > + snprintf(buf, sizeof(buf), > + "Wow ! you're very fast.<br> I liked your ninja style.<br>"); > + else if (game->play_time > 60 && game->play_time <= 120) > + snprintf(buf, sizeof(buf), > + "Nice try, you won but try to be faster!<br>"); > + else > + snprintf(buf, sizeof(buf), > + "ZzzzZz. You won.<br>But you're slow like a turtle.<br>"); > + > elm_object_text_set(game->won_lb, buf); > } > > @@ -116,8 +114,6 @@ > > /* first and second cards match */ > game->found++; > - snprintf(buf, sizeof(buf), "%i", game->found); > - elm_object_text_set(game->found_lb, buf); > if (game->found == (game->total_size / 2)) > _player_win(game); > game->first_card = NULL; > @@ -155,10 +151,7 @@ > _populate_table(void *data) > { > Game *game = data; > - int values[] = {0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, > - 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14, 14, 15, 15, 16, 16, 17, 17, > - 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24, 25, 25, 26, > 26, > - 27, 27, 28, 28, 29, 29, 30, 30, 31, 31}; > + int values[] = {1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8}; > int i; > char buf[1024]; > Evas_Object *ic; > @@ -173,11 +166,10 @@ > game->cards[i].value = values[i]; > > ic = elm_icon_add(game->cards[i].flip); > - elm_object_scale_set(ic, 0.5); > + elm_object_scale_set(ic, 1); > snprintf(buf, sizeof(buf), "%s/images/icon_%02i.png", > PACKAGE_DATA_DIR, values[i]); > elm_icon_file_set(ic, buf, NULL); > - elm_icon_resizable_set(ic, 0, 0); > evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, > EVAS_HINT_EXPAND); > evas_object_size_hint_align_set(ic, 0.5, 0.5); > @@ -208,10 +200,15 @@ > _prepopulate_table(Game *game) > { > Evas_Object *fl, *bt, *table; > + char buf[1024]; > + Evas_Object *ic; > int i; > > table = game->table; > > + snprintf(buf, sizeof(buf), "%s/images/cards.png", > + PACKAGE_DATA_DIR); > + > for (i = 0; i < game->total_size; i++) > { > fl = elm_flip_add(table); > @@ -223,6 +220,7 @@ > evas_object_show(fl); > game->cards[i].flip = fl; > > + > bt = elm_button_add(table); > evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); > evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, > @@ -230,6 +228,16 @@ > elm_object_part_content_set(fl, "front", bt); > evas_object_show(bt); > > + > + ic = elm_icon_add(bt); > + elm_object_scale_set(ic, 1); > + elm_icon_file_set(ic, buf, NULL); > + evas_object_size_hint_weight_set(ic, EVAS_HINT_EXPAND, > + EVAS_HINT_EXPAND); > + evas_object_size_hint_align_set(ic, EVAS_HINT_FILL, EVAS_HINT_FILL); > + elm_object_part_content_set(bt, NULL, ic); > + evas_object_show(ic); > + > evas_object_data_set(bt, "card", &(game->cards[i])); > evas_object_smart_callback_add(bt, "clicked", _fl_selected, game); > } > @@ -249,7 +257,6 @@ > > elm_object_text_set(game->time_lb, "0 s"); > elm_object_text_set(game->attempts_lb, "0"); > - elm_object_text_set(game->found_lb, "0"); > > if (game->play_timer) > ecore_timer_del(game->play_timer); > @@ -285,22 +292,26 @@ > static Eina_Bool > _win_new(Game *game) > { > - Evas_Object *win, *inwin, *bg, *bx, *bxctl, *table, *bt, *sp, *fr, *lb; > + Evas_Object *win, *popup, *bg, *bx, *bxctl, *table, *bt, *sp, *fr, *lb, > + *boxLabels; > > win = elm_win_add(NULL, PACKAGE_NAME, ELM_WIN_BASIC); > if (!win) return EINA_FALSE; > evas_object_smart_callback_add(win, "delete,request", > _win_delete_request, game); > > + elm_win_fullscreen_set(win, EINA_TRUE); > + evas_object_move(win, 0, 0); > + > bg = elm_bg_add(win); > elm_win_resize_object_add(win, bg); > evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); > evas_object_show(bg); > > bx = elm_box_add(win); > - elm_box_horizontal_set(bx, EINA_TRUE); > evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); > elm_win_resize_object_add(win, bx); > + elm_box_padding_set(bx, 10, 10); > evas_object_show(bx); > > game->table = table = elm_table_add(win); > @@ -314,106 +325,81 @@ > bxctl = elm_box_add(win); > evas_object_size_hint_align_set(bxctl, EVAS_HINT_FILL, 0); > evas_object_show(bxctl); > - elm_box_pack_end(bx, bxctl); > + elm_box_pack_start(bx, bxctl); > + elm_box_horizontal_set(bxctl, EINA_TRUE); > > bt = elm_button_add(win); > - elm_object_text_set(bt, "New game"); > + elm_object_text_set(bt, "Start"); > evas_object_smart_callback_add(bt, "clicked", _start_game_cb, game); > evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0); > + evas_object_size_hint_min_set(bt, 180, 88); > evas_object_show(bt); > elm_box_pack_end(bxctl, bt); > > - bt = elm_button_add(win); > - elm_object_text_set(bt, "Quit"); > - evas_object_smart_callback_add(bt, "clicked", _win_delete_request, game); > - evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, 0); > - evas_object_show(bt); > - elm_box_pack_end(bxctl, bt); > + boxLabels = elm_box_add(win); > + evas_object_size_hint_weight_set(boxLabels, EVAS_HINT_EXPAND, > EVAS_HINT_EXPAND); > + evas_object_size_hint_align_set(boxLabels, EVAS_HINT_FILL, > EVAS_HINT_FILL); > + evas_object_show(boxLabels); > + elm_box_pack_end(bxctl, boxLabels); > + elm_box_horizontal_set(boxLabels, EINA_TRUE); > > - fr = elm_frame_add(win); > - evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); > - evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL); > - elm_object_text_set(fr, "Board size:"); > - elm_box_pack_end(bxctl, fr); > - evas_object_show(fr); > - > - sp = elm_spinner_add(win); > - elm_spinner_min_max_set(sp, 1, 3); > - elm_spinner_label_format_set(sp, "Board size: %.0f"); > - elm_spinner_step_set(sp, 1.0); > - elm_spinner_editable_set(sp, EINA_FALSE); > - elm_spinner_special_value_add(sp, 1, "Small"); > - elm_spinner_special_value_add(sp, 2, "Normal"); > - elm_spinner_special_value_add(sp, 3, "Big"); > - evas_object_smart_callback_add(sp, "changed", _board_size_cb, game); > - evas_object_size_hint_align_set(sp, EVAS_HINT_FILL, 0); > - elm_object_content_set(fr, sp); > - evas_object_show(sp); > - > - fr = elm_frame_add(win); > - evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); > - evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL); > - elm_object_text_set(fr, "Time:"); > - elm_box_pack_end(bxctl, fr); > - evas_object_show(fr); > - > - game->time_lb = lb = elm_label_add(win); > - elm_object_text_set(lb, "0 s"); > + game->attempts_lb = lb = elm_label_add(win); > + elm_object_text_set(lb, "0"); > evas_object_size_hint_weight_set(lb, 0.0, 0.0); > evas_object_size_hint_align_set(lb, 1, 0.5); > - elm_object_content_set(fr, lb); > + evas_object_color_set(lb, 255, 255, 255, 255); > + elm_box_pack_end(boxLabels, lb); > evas_object_show(lb); > > - fr = elm_frame_add(win); > - evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); > - evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL); > - elm_object_text_set(fr, "Attempts:"); > - elm_box_pack_end(bxctl, fr); > - evas_object_show(fr); > - > - game->attempts_lb = lb = elm_label_add(win); > - elm_object_text_set(lb, "0"); > + lb = elm_label_add(win); > + elm_object_text_set(lb, " attempts in "); > evas_object_size_hint_weight_set(lb, 0.0, 0.0); > evas_object_size_hint_align_set(lb, 1, 0.5); > - elm_object_content_set(fr, lb); > + evas_object_color_set(lb, 102, 102, 102, 255); > + elm_box_pack_end(boxLabels, lb); > evas_object_show(lb); > > - fr = elm_frame_add(win); > - evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); > - evas_object_size_hint_align_set(fr, EVAS_HINT_FILL, EVAS_HINT_FILL); > - elm_object_text_set(fr, "Found:"); > - elm_box_pack_end(bxctl, fr); > - evas_object_show(fr); > > - game->found_lb = lb = elm_label_add(win); > - elm_object_text_set(lb, "0"); > + game->time_lb = lb = elm_label_add(win); > + elm_object_text_set(lb, "0 s"); > evas_object_size_hint_weight_set(lb, 0.0, 0.0); > evas_object_size_hint_align_set(lb, 1, 0.5); > - elm_object_content_set(fr, lb); > + evas_object_color_set(lb, 255, 255, 255, 255); > + elm_box_pack_end(boxLabels, lb); > evas_object_show(lb); > > - game->inwin = inwin = elm_win_inwin_add(win); > - elm_object_style_set(inwin, "minimal"); > + bt = elm_button_add(win); > + elm_object_text_set(bt, "Quit"); > + evas_object_smart_callback_add(bt, "clicked", _win_delete_request, game); > + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); > + evas_object_size_hint_min_set(bt, 180, 88); > + evas_object_show(bt); > + elm_box_pack_end(bxctl, bt); > > - bx = elm_box_add(win); > + game->popup = popup = elm_popup_add(win); > + elm_object_part_text_set(popup, "title,text", "You won!"); > + > + bx = elm_box_add(popup); > evas_object_show(bx); > - elm_win_inwin_content_set(inwin, bx); > + evas_object_size_hint_align_set(bx, EVAS_HINT_FILL, EVAS_HINT_FILL); > > - game->won_lb = lb = elm_label_add(win); > + game->won_lb = lb = elm_label_add(popup); > evas_object_size_hint_weight_set(lb, 0.0, 0.0); > - evas_object_size_hint_align_set(lb, 0, 0); > + evas_object_size_hint_align_set(lb, 0.5, 0.5); > + evas_object_color_set(lb, 255, 255, 255, 255); > evas_object_show(lb); > elm_box_pack_end(bx, lb); > > - bt = elm_button_add(win); > + bt = elm_button_add(popup); > elm_object_text_set(bt, "Yay!"); > evas_object_smart_callback_add(bt, "clicked", _won_ok, game); > - evas_object_size_hint_align_set(bt, 0.5, 0.5); > + evas_object_size_hint_weight_set(fr, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); > + evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); > evas_object_show(bt); > elm_box_pack_end(bx, bt); > > - evas_object_resize(win, 480, 320); > - evas_object_size_hint_min_set(win, 480, 320); > + elm_object_content_set(popup, bx); > + > elm_win_title_set(win, "Econcentration"); > evas_object_show(win); > > > > ------------------------------------------------------------------------------ > Live Security Virtual Conference > Exclusive live event will cover all the ways today's security and > threat landscape has changed and how IT managers can respond. Discussions > will include endpoint security, mobile security and the latest in malware > threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ > _______________________________________________ > enlightenment-svn mailing list > enlightenment-...@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn -- Bruno Dilly Senior Developer ProFUSION embedded systems http://profusion.mobi ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
