s/wallpaper/background/

terminology-1.2
Boris Faure 5 years ago
parent 7f8396d55b
commit adb818b697
  1. 2
      src/bin/Makefile.am
  2. 2
      src/bin/meson.build
  3. 10
      src/bin/options.c
  4. 6
      src/bin/options_background.c
  5. 7
      src/bin/options_background.h
  6. 7
      src/bin/options_wallpaper.h

@ -33,7 +33,7 @@ options.c options.h \
options_font.c options_font.h \
options_theme.c options_theme.h \
options_themepv.c options_themepv.h \
options_wallpaper.c options_wallpaper.h \
options_background.c options_background.h \
options_colors.c options_colors.h \
options_behavior.c options_behavior.h \
options_keys.c options_keys.h \

@ -11,7 +11,7 @@ terminology_sources = ['private.h',
'options_font.c', 'options_font.h',
'options_theme.c', 'options_theme.h',
'options_themepv.c', 'options_themepv.h',
'options_wallpaper.c', 'options_wallpaper.h',
'options_background.c', 'options_background.h',
'options_colors.c', 'options_colors.h',
'options_behavior.c', 'options_behavior.h',
'options_keys.c', 'options_keys.h',

@ -4,7 +4,7 @@
#include "options.h"
#include "options_font.h"
#include "options_theme.h"
#include "options_wallpaper.h"
#include "options_background.h"
#include "options_colors.h"
#include "options_video.h"
#include "options_behavior.h"
@ -28,7 +28,7 @@ static enum option_mode {
OPTION_NONE = 0,
OPTION_FONT,
OPTION_THEME,
OPTION_WALLPAPER,
OPTION_BACKGROUND,
OPTION_COLORS,
OPTION_VIDEO,
OPTION_BEHAVIOR,
@ -62,7 +62,7 @@ _cb_op_del_delay(void *_data EINA_UNUSED)
evas_object_del(op_opbox);
evas_object_del(op_frame);
options_font_clear();
options_wallpaper_clear();
options_background_clear();
options_theme_clear();
op_opbox = NULL;
op_frame = NULL;
@ -92,7 +92,7 @@ _cb_opdt_hide_done(void *data,
case OPTION_NONE: break;
case OPTION_FONT: options_font(op_opbox, data); break;
case OPTION_THEME: options_theme(op_opbox, data); break;
case OPTION_WALLPAPER: options_wallpaper(op_opbox, data); break;
case OPTION_BACKGROUND: options_background(op_opbox, data); break;
case OPTION_COLORS: options_colors(op_opbox, data); break;
case OPTION_VIDEO: options_video(op_opbox, data); break;
case OPTION_BEHAVIOR: options_behavior(op_opbox, data); break;
@ -176,7 +176,7 @@ options_toggle(Evas_Object *win, Evas_Object *bg, Evas_Object *term,
it_fn =
ITEM_APPEND("preferences-desktop-font", _("Font"), FONT);
ITEM_APPEND("preferences-desktop-theme", _("Theme"), THEME);
ITEM_APPEND("preferences-desktop-wallpaper", _("Wallpaper"), WALLPAPER);
ITEM_APPEND("preferences-desktop-background", _("Background"), BACKGROUND);
ITEM_APPEND("video-display", _("Video"), VIDEO);
ITEM_APPEND("preferences-desktop-theme", _("Colors"), COLORS);
ITEM_APPEND("preferences-system", _("Behavior"), BEHAVIOR);

@ -5,7 +5,7 @@
#include "termio.h"
#include "media.h"
#include "options.h"
#include "options_wallpaper.h"
#include "options_background.h"
#include "extns.h"
#include "media.h"
#include "main.h"
@ -453,7 +453,7 @@ _cb_grid_doubleclick(void *_data EINA_UNUSED,
}
void
options_wallpaper(Evas_Object *opbox, Evas_Object *term)
options_background(Evas_Object *opbox, Evas_Object *term)
{
Evas_Object *frame, *o, *bx, *bx2;
Config *config = termio_config_get(term);
@ -584,7 +584,7 @@ options_wallpaper(Evas_Object *opbox, Evas_Object *term)
}
void
options_wallpaper_clear(void)
options_background_clear(void)
{
Background_Item *item;

@ -0,0 +1,7 @@
#ifndef _OPTIONS_BACKGROUND_H__
#define _OPTIONS_BACKGROUND_H__ 1
void options_background(Evas_Object *opbox, Evas_Object *term);
void options_background_clear(void);
#endif

@ -1,7 +0,0 @@
#ifndef _OPTIONS_WALLPAPER_H__
#define _OPTIONS_WALLPAPER_H__ 1
void options_wallpaper(Evas_Object *opbox, Evas_Object *term);
void options_wallpaper_clear(void);
#endif
Loading…
Cancel
Save