diff --git a/src/bin/options_background.c b/src/bin/options_background.c index 539c7434..b0dfae2f 100644 --- a/src/bin/options_background.c +++ b/src/bin/options_background.c @@ -691,6 +691,7 @@ options_background(Evas_Object *opbox, Evas_Object *term) evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.0); elm_object_text_set(o, _("Click on a picture to use it as background")); + elm_label_line_wrap_set(o, ELM_WRAP_WORD); elm_box_pack_end(bx_front, o); evas_object_show(o); diff --git a/src/bin/options_behavior.c b/src/bin/options_behavior.c index 16c77f31..dac8273f 100644 --- a/src/bin/options_behavior.c +++ b/src/bin/options_behavior.c @@ -495,6 +495,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) evas_object_size_hint_align_set(lbl, 0.0, 0.5); elm_box_pack_before(bx, lbl, o); elm_object_text_set(lbl, _("Audio Support for key presses DISABLED!")); + elm_label_line_wrap_set(lbl, ELM_WRAP_WORD); evas_object_show(lbl); } CX(_("Visual Bell"), disable_visual_bell, 1); @@ -591,6 +592,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) evas_object_size_hint_align_set(o, 0.0, 0.5); ctx->backlock_label = o; _update_backlog_title(ctx); + elm_label_line_wrap_set(o, ELM_WRAP_WORD); elm_box_pack_end(bx, o); evas_object_show(o); @@ -625,6 +627,7 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) evas_object_size_hint_weight_set(o, 0.0, 0.0); evas_object_size_hint_align_set(o, 0.0, 0.5); elm_object_text_set(o, _("Tab zoom/switch animation time:")); + elm_label_line_wrap_set(o, ELM_WRAP_WORD); tooltip = _("Set the time of the animation that
" "takes places on tab switches,
" "be them by key binding, mouse
" @@ -655,7 +658,6 @@ options_behavior(Evas_Object *opbox, Evas_Object *term) o = elm_check_add(opbox); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(o, EVAS_HINT_FILL, 0.5); - elm_object_text_set(o, _("Translucent")); elm_object_text_set(o, _("Auto hide the mouse cursor when idle:")); elm_check_state_set(o, config->hide_cursor < CONFIG_CURSOR_IDLE_TIMEOUT_MAX); elm_box_pack_end(bx, o); diff --git a/src/bin/options_elm.c b/src/bin/options_elm.c index ce8d8d29..eba1c0c5 100644 --- a/src/bin/options_elm.c +++ b/src/bin/options_elm.c @@ -170,6 +170,7 @@ options_elm(Evas_Object *opbox, Evas_Object *_term EINA_UNUSED) evas_object_size_hint_weight_set(lbl, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(lbl, 0.0, 0.0); elm_object_text_set(lbl, _("Select prefered size so that this text is readable.")); + elm_label_line_wrap_set(lbl, ELM_WRAP_WORD); elm_box_pack_end(bx, lbl); evas_object_show(lbl); @@ -177,6 +178,7 @@ options_elm(Evas_Object *opbox, Evas_Object *_term EINA_UNUSED) evas_object_size_hint_weight_set(lbl, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(lbl, 0.0, 0.0); elm_object_text_set(lbl, _("The scale configuration can also be changed through elementary's configuration panel.")); + elm_label_line_wrap_set(lbl, ELM_WRAP_WORD); elm_box_pack_end(bx, lbl); evas_object_show(lbl); } diff --git a/src/bin/win.c b/src/bin/win.c index 4f66c713..e3fe46fa 100644 --- a/src/bin/win.c +++ b/src/bin/win.c @@ -418,10 +418,17 @@ win_scale_wizard(Evas_Object *win, Term *term) evas_object_smart_callback_add(sl, "changed", _scale_round, NULL); evas_object_smart_callback_add(sl, "delay,changed", _scale_change, NULL); + bt = elm_button_add(win); + elm_object_text_set(bt, _("Done")); + elm_box_pack_end(bx, bt); + evas_object_smart_callback_add(bt, "clicked", _scale_done, ctx); + evas_object_show(bt); + lbl = elm_label_add(win); evas_object_size_hint_weight_set(lbl, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(lbl, EVAS_HINT_FILL, 0.5); elm_object_text_set(lbl, _("Select prefered size so that this text is readable.")); + elm_label_line_wrap_set(lbl, ELM_WRAP_WORD); elm_box_pack_end(bx, lbl); evas_object_show(lbl); @@ -429,18 +436,14 @@ win_scale_wizard(Evas_Object *win, Term *term) evas_object_size_hint_weight_set(lbl, EVAS_HINT_EXPAND, 0.0); evas_object_size_hint_align_set(lbl, EVAS_HINT_FILL, 0.5); elm_object_text_set(lbl, _("The scale configuration can be changed in the Settings (right click on the terminal) → Toolkit, or by starting the command elementary_config.")); + elm_label_line_wrap_set(lbl, ELM_WRAP_WORD); elm_box_pack_end(bx, lbl); evas_object_show(lbl); - bt = elm_button_add(win); - elm_object_text_set(bt, _("Done")); - elm_box_pack_end(bx, bt); - evas_object_smart_callback_add(bt, "clicked", _scale_done, ctx); - evas_object_show(bt); - evas_object_show(ctx->hv); elm_object_focus_set(ctx->hv, EINA_TRUE); + elm_object_focus_set(bt, EINA_TRUE); } /* }}} */