parent
e2b7c27106
commit
eae9d6b81c
|
@ -1691,8 +1691,7 @@ _fonts_data_fill(Evas *evas)
|
|||
{
|
||||
tc_data->font = eina_stringshare_add(efp->name);
|
||||
/* we're sure we recorded with only 1 style selected */
|
||||
tc_data->style =
|
||||
eina_stringshare_add(efp->styles->data);
|
||||
tc_data->style = eina_stringshare_add(efp->styles->data);
|
||||
elm_font_properties_free(efp);
|
||||
}
|
||||
}
|
||||
|
@ -2395,8 +2394,8 @@ _status_config_scrolling(Evas_Object *win,
|
|||
|
||||
sl = elm_slider_add(win);
|
||||
elm_object_tooltip_text_set(sl, "This is the number of pixels one should<br>"
|
||||
"travel while dragging a scroller's view to<br>"
|
||||
"actually trigger scrolling");
|
||||
"travel while dragging a scroller's view<br>"
|
||||
"to actually trigger scrolling");
|
||||
evas_object_data_set(win, "thumbscroll_threshold_slider", sl);
|
||||
evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0);
|
||||
evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
|
||||
|
@ -2457,9 +2456,10 @@ _status_config_scrolling(Evas_Object *win,
|
|||
|
||||
sl = elm_slider_add(win);
|
||||
elm_object_tooltip_text_set(sl, "This is the amount of lag between your<br>"
|
||||
"actual mouse cursor dragging movement and<br>"
|
||||
"a scroller's view movement itself, while<br>"
|
||||
"pushing it into bounce state manually");
|
||||
"actual mouse cursor dragging movement<br>"
|
||||
"and a scroller's view movement itself,<br>"
|
||||
"while pushing it into bounce state<br>"
|
||||
"manually");
|
||||
evas_object_data_set(win, "ts_border_friction_slider", sl);
|
||||
evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0);
|
||||
evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
|
||||
|
@ -2526,7 +2526,8 @@ _status_config_scrolling(Evas_Object *win,
|
|||
sl = elm_slider_add(win);
|
||||
elm_object_tooltip_text_set(sl, "This is the amount of inertia inertia<br>"
|
||||
"scrollers will impose at animations<br>"
|
||||
"triggered by Elementary widgets' zooming API");
|
||||
"triggered by Elementary widgets'<br>"
|
||||
"zooming API");
|
||||
evas_object_data_set(win, "zoom_scroll_friction_slider", sl);
|
||||
evas_object_size_hint_weight_set(sl, EVAS_HINT_EXPAND, 0.0);
|
||||
evas_object_size_hint_align_set(sl, EVAS_HINT_FILL, 0.5);
|
||||
|
|
|
@ -56,8 +56,14 @@ static Elm_Config * _config_system_load(void);
|
|||
static void _config_load(void);
|
||||
static void _config_update(void);
|
||||
static void _env_get(void);
|
||||
static size_t _elm_data_dir_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3 ,4);
|
||||
static size_t _elm_user_dir_snprintf(char *dst, size_t size, const char *fmt, ...) EINA_PRINTF(3 ,4);
|
||||
static size_t _elm_data_dir_snprintf(char *dst,
|
||||
size_t size,
|
||||
const char *fmt, ...)
|
||||
EINA_PRINTF(3, 4);
|
||||
static size_t _elm_user_dir_snprintf(char *dst,
|
||||
size_t size,
|
||||
const char *fmt, ...)
|
||||
EINA_PRINTF(3, 4);
|
||||
|
||||
#define ELM_CONFIG_VAL(edd, type, member, dtype) \
|
||||
EET_DATA_DESCRIPTOR_ADD_BASIC(edd, type, #member, member, dtype)
|
||||
|
@ -117,7 +123,9 @@ static const char *_atom_names[ATOM_COUNT] =
|
|||
#define ATOM_E_CONFIG 20
|
||||
|
||||
static Eina_Bool _prop_config_get(void);
|
||||
static Eina_Bool _prop_change(void *data __UNUSED__, int ev_type __UNUSED__, void *ev);
|
||||
static Eina_Bool _prop_change(void *data __UNUSED__,
|
||||
int ev_type __UNUSED__,
|
||||
void *ev);
|
||||
|
||||
static Eina_Bool
|
||||
_prop_config_get(void)
|
||||
|
@ -173,7 +181,9 @@ _prop_config_get(void)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_prop_change(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
|
||||
_prop_change(void *data __UNUSED__,
|
||||
int ev_type __UNUSED__,
|
||||
void *ev)
|
||||
{
|
||||
Ecore_X_Event_Window_Property *event = ev;
|
||||
|
||||
|
@ -490,6 +500,7 @@ _prop_change(void *data __UNUSED__, int ev_type __UNUSED__, void *ev)
|
|||
}
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
static void
|
||||
|
@ -596,7 +607,8 @@ _desc_shutdown(void)
|
|||
}
|
||||
|
||||
static int
|
||||
_sort_files_cb(const void *f1, const void *f2)
|
||||
_sort_files_cb(const void *f1,
|
||||
const void *f2)
|
||||
{
|
||||
return strcmp(f1, f2);
|
||||
}
|
||||
|
@ -608,7 +620,10 @@ _elm_config_current_profile_get(void)
|
|||
}
|
||||
|
||||
static size_t
|
||||
_elm_data_dir_snprintf(char *dst, size_t size, const char *fmt, ...)
|
||||
_elm_data_dir_snprintf(char *dst,
|
||||
size_t size,
|
||||
const char *fmt,
|
||||
...)
|
||||
{
|
||||
size_t data_dir_len, off;
|
||||
va_list ap;
|
||||
|
@ -630,7 +645,10 @@ _elm_data_dir_snprintf(char *dst, size_t size, const char *fmt, ...)
|
|||
}
|
||||
|
||||
static size_t
|
||||
_elm_user_dir_snprintf(char *dst, size_t size, const char *fmt, ...)
|
||||
_elm_user_dir_snprintf(char *dst,
|
||||
size_t size,
|
||||
const char *fmt,
|
||||
...)
|
||||
{
|
||||
const char *home;
|
||||
size_t user_dir_len, off;
|
||||
|
@ -658,7 +676,8 @@ _elm_user_dir_snprintf(char *dst, size_t size, const char *fmt, ...)
|
|||
}
|
||||
|
||||
const char *
|
||||
_elm_config_profile_dir_get(const char *prof, Eina_Bool is_user)
|
||||
_elm_config_profile_dir_get(const char *prof,
|
||||
Eina_Bool is_user)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
|
||||
|
@ -1104,7 +1123,8 @@ _config_load(void)
|
|||
}
|
||||
|
||||
static const char *
|
||||
_elm_config_eet_close_error_get(Eet_File *ef, char *file)
|
||||
_elm_config_eet_close_error_get(Eet_File *ef,
|
||||
char *file)
|
||||
{
|
||||
Eet_Error err;
|
||||
const char *erstr = NULL;
|
||||
|
@ -1118,6 +1138,7 @@ _elm_config_eet_close_error_get(Eet_File *ef, char *file)
|
|||
"deterimined. The file where the error occurred was: "
|
||||
"%s. This file has been deleted to avoid corrupt data.";
|
||||
break;
|
||||
|
||||
case EET_ERROR_WRITE_ERROR_FILE_TOO_BIG:
|
||||
erstr = "Elementary's settings files are too big "
|
||||
"for the file system they are being saved to. "
|
||||
|
@ -1127,6 +1148,7 @@ _elm_config_eet_close_error_get(Eet_File *ef, char *file)
|
|||
"The file where the error occurred was: %s ."
|
||||
"This file has been deleted to avoid corrupt data.";
|
||||
break;
|
||||
|
||||
case EET_ERROR_WRITE_ERROR_IO_ERROR:
|
||||
erstr = "An output error occurred when writing the settings "
|
||||
"files for Elementary. Your disk is having troubles "
|
||||
|
@ -1134,6 +1156,7 @@ _elm_config_eet_close_error_get(Eet_File *ef, char *file)
|
|||
"The file where the error occurred was: %s ."
|
||||
"This file has been deleted to avoid corrupt data.";
|
||||
break;
|
||||
|
||||
case EET_ERROR_WRITE_ERROR_OUT_OF_SPACE:
|
||||
erstr = "Elementary cannot write its settings file "
|
||||
"because it ran out of space to write the file. "
|
||||
|
@ -1142,12 +1165,14 @@ _elm_config_eet_close_error_get(Eet_File *ef, char *file)
|
|||
"The file where the error occurred was: %s ."
|
||||
"This file has been deleted to avoid corrupt data.";
|
||||
break;
|
||||
|
||||
case EET_ERROR_WRITE_ERROR_FILE_CLOSED:
|
||||
erstr = "Elementary unexpectedly had the settings file "
|
||||
"it was writing closed on it. This is very unusual. "
|
||||
"The file where the error occurred was: %s "
|
||||
"This file has been deleted to avoid corrupt data.";
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
@ -1418,8 +1443,10 @@ _env_get(void)
|
|||
if (s)
|
||||
{
|
||||
if (!strcasecmp(s, "none")) _elm_config->font_hinting = 0;
|
||||
else if (!strcasecmp(s, "auto")) _elm_config->font_hinting = 1;
|
||||
else if (!strcasecmp(s, "bytecode")) _elm_config->font_hinting = 2;
|
||||
else if (!strcasecmp(s, "auto"))
|
||||
_elm_config->font_hinting = 1;
|
||||
else if (!strcasecmp(s, "bytecode"))
|
||||
_elm_config->font_hinting = 2;
|
||||
}
|
||||
|
||||
s = getenv("ELM_FONT_PATH");
|
||||
|
@ -1691,3 +1718,4 @@ _elm_config_shutdown(void)
|
|||
}
|
||||
_desc_shutdown();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue