Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
wizard: add initial language settings (first page)
  • Loading branch information
@perexg
perexg committed Jan 1, 2016
1 parent d48352b commit f1c3369
Show file tree
Hide file tree
Showing 7 changed files with 199 additions and 34 deletions.
2 changes: 2 additions & 0 deletions src/api/api_wizard.c
View file
Expand Up @@ -80,6 +80,8 @@ api_wizard_init ( void )
static api_hook_t ah[] = {
{ "wizard/hello/load", ACCESS_ADMIN, wizard_idnode_load_simple, wizard_hello },
{ "wizard/hello/save", ACCESS_ADMIN, wizard_idnode_save_simple, wizard_hello },
{ "wizard/login/load", ACCESS_ADMIN, wizard_idnode_load_simple, wizard_login },
{ "wizard/login/save", ACCESS_ADMIN, wizard_idnode_save_simple, wizard_login },
{ "wizard/network/load", ACCESS_ADMIN, wizard_idnode_load_simple, wizard_network },
{ "wizard/network/save", ACCESS_ADMIN, wizard_idnode_save_simple, wizard_network },
{ "wizard/input/load", ACCESS_ADMIN, wizard_idnode_load_simple, wizard_input },
Expand Down
1 change: 1 addition & 0 deletions src/htsmsg.h
View file
Expand Up @@ -88,6 +88,7 @@ typedef struct htsmsg_field {

#define HTSMSG_FOREACH(f, msg) TAILQ_FOREACH(f, &(msg)->hm_fields, hmf_link)
#define HTSMSG_FIRST(msg) TAILQ_FIRST(&(msg)->hm_fields)
#define HTSMSG_NEXT(f) TAILQ_NEXT(f, hmf_link)

/**
* Create a new map
Expand Down
3 changes: 2 additions & 1 deletion src/webui/static/app/config.js
View file
Expand Up @@ -24,14 +24,15 @@ tvheadend.baseconf = function(panel, index) {
};

tvheadend.idnode_simple(panel, {
id: 'base_config',
url: 'api/config',
title: _('Base'),
iconCls: 'baseconf',
tabIndex: index,
comet: 'config',
labelWidth: 250,
tbar: [wizardButton],
postsave: function(data, abuttons) {
postsave: function(data) {
var l = data['uilevel'];
if (l >= 0) {
var tr = {0:'basic',1:'advanced',2:'expert'};
Expand Down
9 changes: 6 additions & 3 deletions src/webui/static/app/idnode.js
View file
Expand Up @@ -1073,8 +1073,9 @@ tvheadend.idnode_editor = function(_uilevel, item, conf)
text: conf.saveText || _('Save'),
iconCls: conf.saveIconCls || 'save',
handler: function() {
var node = null;
if (panel.getForm().isDirty() || conf.alwaysDirty) {
var node = panel.getForm().getFieldValues();
node = panel.getForm().getFieldValues();
node.uuid = conf.uuids ? conf.uuids : item.uuid;
tvheadend.Ajax({
url: conf.saveURL || 'api/idnode/save',
Expand All @@ -1084,14 +1085,16 @@ tvheadend.idnode_editor = function(_uilevel, item, conf)
success: function(d) {
if (conf.win)
conf.win.close();
if (conf.postsave)
conf.postsave(conf, node);
}
});
} else {
if (conf.win)
conf.win.close();
if (conf.postsave)
conf.postsave(conf, node);
}
if (conf.postsave)
conf.postsave(conf);
}
});
buttons.push(saveBtn);
Expand Down
11 changes: 9 additions & 2 deletions src/webui/static/app/wizard.js
View file
Expand Up @@ -8,7 +8,8 @@ tvheadend.wizard_start = function(page) {

var w = null;
var tabMapping = {
hello: 'access_entry',
hello: 'base_config',
login: 'access_entry',
network: 'mpegts_network',
input: 'tvadapters',
status: 'status_streams',
Expand Down Expand Up @@ -103,7 +104,13 @@ tvheadend.wizard_start = function(page) {
comet: m.events,
noApply: true,
noUIlevel: true,
postsave: function(conf) {
postsave: function(conf, data) {
if (data) {
if (('ui_lang' in data) && data['ui_lang'] != tvh_locale_lang) {
window.location.reload();
return;
}
}
if (!last)
newpage(conf, 'page_next_');
else
Expand Down
206 changes: 178 additions & 28 deletions src/wizard.c
View file
@@ -1,6 +1,6 @@
/*
* tvheadend, Wizard
* Copyright (C) 2015 Jaroslav Kysela
* Copyright (C) 2015,2016 Jaroslav Kysela
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -17,6 +17,7 @@
*/

#include "tvheadend.h"
#include "config.h"
#include "access.h"
#include "settings.h"
#include "input.h"
Expand Down Expand Up @@ -98,23 +99,182 @@ static wizard_page_t *page_init(const char *class_name, const char *caption)
return page;
}

/*
*
*/

static const void *hello_get_network(void *o)
{
strcpy(prop_sbuf, "Test123");
return &prop_sbuf_ptr;
}

static int hello_set_network(void *o, const void *v)
{
return 0;
}

/*
* Hello
*/

typedef struct wizard_hello {
char ui_lang[32];
char epg_lang1[32];
char epg_lang2[32];
char epg_lang3[32];
} wizard_hello_t;


static void hello_save(idnode_t *in)
{
wizard_page_t *p = (wizard_page_t *)in;
wizard_hello_t *w = p->aux;
char buf[32];
size_t l = 0;
int save = 0;

printf("hello save '%s'\n", w->ui_lang);
if (w->ui_lang[0] && strcmp(config.language_ui ?: "", w->ui_lang)) {
free(config.language_ui);
config.language_ui = strdup(w->ui_lang);
printf("language_ui = '%s'\n", config.language_ui);
save = 1;
}
buf[0] = '\0';
if (w->epg_lang1[0])
tvh_strlcatf(buf, sizeof(buf), l, "%s", w->epg_lang1);
if (w->epg_lang2[0])
tvh_strlcatf(buf, sizeof(buf), l, "%s%s", l > 0 ? "," : "", w->epg_lang2);
if (w->epg_lang3[0])
tvh_strlcatf(buf, sizeof(buf), l, "%s%s", l > 0 ? "," : "", w->epg_lang3);
if (buf[0] && strcmp(buf, config.language ?: "")) {
free(config.language);
config.language = strdup(buf);
printf("language = '%s'\n", config.language);
save = 1;
}
if (save)
config_save();
}

BASIC_STR_OPS(wizard_hello_t, ui_lang)
BASIC_STR_OPS(wizard_hello_t, epg_lang1)
BASIC_STR_OPS(wizard_hello_t, epg_lang2)
BASIC_STR_OPS(wizard_hello_t, epg_lang3)

DESCRIPTION_FCN(hello, N_("\
Enter the languages for the web user interface and \
for EPG texts.\
"))

wizard_page_t *wizard_hello(void)
{
static const property_group_t groups[] = {
{
.name = N_("Web interface"),
.number = 1,
},
{
.name = N_("EPG Language (priority order)"),
.number = 2,
},
{}
};
static const property_t props[] = {
{
.type = PT_STR,
.id = "ui_lang",
.name = N_("Language"),
.get = wizard_get_value_ui_lang,
.set = wizard_set_value_ui_lang,
.list = language_get_ui_list,
.group = 1
},
{
.type = PT_STR,
.id = "epg_lang1",
.name = N_("Language 1"),
.get = wizard_get_value_epg_lang1,
.set = wizard_set_value_epg_lang1,
.list = language_get_list,
.group = 2
},
{
.type = PT_STR,
.id = "epg_lang2",
.name = N_("Language 2"),
.get = wizard_get_value_epg_lang2,
.set = wizard_set_value_epg_lang2,
.list = language_get_list,
.group = 2
},
{
.type = PT_STR,
.id = "epg_lang3",
.name = N_("Language 3"),
.get = wizard_get_value_epg_lang3,
.set = wizard_set_value_epg_lang3,
.list = language_get_list,
.group = 2
},
ICON(),
DESCRIPTION(hello),
NEXT_BUTTON(login),
{}
};
wizard_page_t *page =
page_init("wizard_hello",
N_("Welcome - Tvheadend - your TV streaming server and video recorder"));
idclass_t *ic = (idclass_t *)page->idnode.in_class;
wizard_hello_t *w;
htsmsg_t *m;
htsmsg_field_t *f;
const char *s;
int idx;

ic->ic_properties = props;
ic->ic_groups = groups;
ic->ic_save = hello_save;
page->aux = w = calloc(1, sizeof(wizard_hello_t));

if (config.language_ui)
strncpy(w->ui_lang, config.language_ui, sizeof(w->ui_lang));

m = htsmsg_csv_2_list(config.language, ',');
f = m ? HTSMSG_FIRST(m) : NULL;
for (idx = 0; idx < 3 && f != NULL; idx++) {
s = htsmsg_field_get_string(f);
if (s == NULL) break;
switch (idx) {
case 0: strncpy(w->epg_lang1, s, sizeof(w->epg_lang1) - 1); break;
case 1: strncpy(w->epg_lang2, s, sizeof(w->epg_lang2) - 1); break;
case 2: strncpy(w->epg_lang3, s, sizeof(w->epg_lang3) - 1); break;
}
f = HTSMSG_NEXT(f);
}
htsmsg_destroy(m);

return page;
}

/*
* Login/Network access
*/

typedef struct wizard_login {
char network[256];
char admin_username[32];
char admin_password[32];
char username[32];
char password[32];
} wizard_hello_t;
} wizard_login_t;


static void hello_save(idnode_t *in)
static void login_save(idnode_t *in)
{
wizard_page_t *p = (wizard_page_t *)in;
wizard_hello_t *w = p->aux;
wizard_login_t *w = p->aux;
access_entry_t *ae, *ae_next;
passwd_entry_t *pw, *pw_next;
htsmsg_t *conf;
Expand Down Expand Up @@ -191,24 +351,13 @@ static void hello_save(idnode_t *in)
}
}

BASIC_STR_OPS(wizard_hello_t, network)
BASIC_STR_OPS(wizard_hello_t, admin_username)
BASIC_STR_OPS(wizard_hello_t, admin_password)
BASIC_STR_OPS(wizard_hello_t, username)
BASIC_STR_OPS(wizard_hello_t, password)

static const void *hello_get_network(void *o)
{
strcpy(prop_sbuf, "Test123");
return &prop_sbuf_ptr;
}

static int hello_set_network(void *o, const void *v)
{
return 0;
}
BASIC_STR_OPS(wizard_login_t, network)
BASIC_STR_OPS(wizard_login_t, admin_username)
BASIC_STR_OPS(wizard_login_t, admin_password)
BASIC_STR_OPS(wizard_login_t, username)
BASIC_STR_OPS(wizard_login_t, password)

DESCRIPTION_FCN(hello, N_("\
DESCRIPTION_FCN(login, N_("\
Enter the access control details to secure your system. \
The first part of this covers the IPv4 network details \
for address-based access to the system; for example, \
Expand All @@ -223,7 +372,7 @@ This wizard should be run only on the initial setup. Please, cancel \
it, if you are not willing to touch the current configuration.\
"))

wizard_page_t *wizard_hello(void)
wizard_page_t *wizard_login(void)
{
static const property_group_t groups[] = {
{
Expand Down Expand Up @@ -282,22 +431,23 @@ wizard_page_t *wizard_hello(void)
.group = 3
},
ICON(),
DESCRIPTION(hello),
DESCRIPTION(login),
PREV_BUTTON(hello),
NEXT_BUTTON(network),
{}
};
wizard_page_t *page =
page_init("wizard_hello",
page_init("wizard_login",
N_("Welcome - Tvheadend - your TV streaming server and video recorder"));
idclass_t *ic = (idclass_t *)page->idnode.in_class;
wizard_hello_t *w;
wizard_login_t *w;
access_entry_t *ae;
passwd_entry_t *pw;

ic->ic_properties = props;
ic->ic_groups = groups;
ic->ic_save = hello_save;
page->aux = w = calloc(1, sizeof(wizard_hello_t));
ic->ic_save = login_save;
page->aux = w = calloc(1, sizeof(wizard_login_t));

TAILQ_FOREACH(ae, &access_entries, ae_link) {
if (!ae->ae_wizard)
Expand Down Expand Up @@ -394,7 +544,7 @@ wizard_page_t *wizard_network(void)
NETWORK(4, N_("Network 4")),
ICON(),
DESCRIPTION(network),
PREV_BUTTON(hello),
PREV_BUTTON(login),
NEXT_BUTTON(input),
{}
};
Expand Down
1 change: 1 addition & 0 deletions src/wizard.h
View file
Expand Up @@ -31,6 +31,7 @@ typedef struct wizard_page {
typedef wizard_page_t *(*wizard_build_fcn_t)(void);

wizard_page_t *wizard_hello(void);
wizard_page_t *wizard_login(void);
wizard_page_t *wizard_network(void);
wizard_page_t *wizard_input(void);
wizard_page_t *wizard_status(void);
Expand Down

0 comments on commit f1c3369

Please sign in to comment.