Break down the device titles as vendor and model

This commit is contained in:
Pierre Pronchery 2015-08-22 13:56:25 +02:00
parent 52e34520e5
commit ceec507cf3
10 changed files with 26 additions and 12 deletions

View File

@ -1,4 +1,5 @@
title=HTC TouchPro
vendor=HTC
model=TouchPro
icon=stock_cell-phone
dpi=285
width=480

View File

@ -1,4 +1,5 @@
title=Jolla
vendor=Jolla
model=Jolla
icon=simulator-jolla-jolla
dpi=244
height=960

View File

@ -1,4 +1,5 @@
title=Lenovo IdeaPad S10-3t
vendor=Lenovo
model=IdeaPad S10-3t
icon=simulator-lenovo-ideapad-s10-3t
dpi=117
height=600

View File

@ -1,4 +1,5 @@
title=Nokia N800
vendor=Nokia
model=N800
icon=simulator-nokia-n800
dpi=225
width=800

View File

@ -1,4 +1,5 @@
title=Nokia N9
vendor=Nokia
model=N9
icon=simulator-nokia-n9
dpi=244
width=480

View File

@ -1,4 +1,5 @@
title=Nokia N900
vendor=Nokia
model=N900
icon=simulator-nokia-n900
dpi=267
width=800

View File

@ -1,4 +1,5 @@
title=Openmoko Neo1973
vendor=Openmoko
model=Neo1973
icon=simulator-openmoko-neo1973
dpi=280
width=480

View File

@ -1,4 +1,5 @@
title=Openmoko Freerunner
vendor=Openmoko
model=Freerunner
icon=simulator-openmoko-freerunner
dpi=280
width=480

View File

@ -1,4 +1,5 @@
title=Sharp Zaurus SL-C3200
vendor=Sharp
model=Zaurus SL-C3200
icon=simulator-sharp-zaurus-sl-c3200
width=640
height=480

View File

@ -371,6 +371,8 @@ static void _new_chooser_list(GtkListStore * store)
size_t len;
Config * config;
char const * p;
char const * q;
String * title;
GdkPixbuf * pixbuf = NULL;
if((dir = opendir(models)) == NULL)
@ -391,11 +393,14 @@ static void _new_chooser_list(GtkListStore * store)
if((p = config_get(config, NULL, "icon")) != NULL)
pixbuf = gtk_icon_theme_load_icon(icontheme, p, size, 0,
NULL);
if((p = config_get(config, NULL, "title")) == NULL)
p = de->d_name;
p = config_get(config, NULL, "vendor");
q = config_get(config, NULL, "model");
title = string_new_append((p != NULL) ? p : "",
(q != NULL) ? " " : de->d_name, q, NULL);
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter, 0, de->d_name, 1, pixbuf,
2, p, -1);
2, title, -1);
string_delete(title);
if(pixbuf != NULL)
{
g_object_unref(pixbuf);