AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Use actual app name in app choosers

Browse Source 
Instead of using a strange composite of name and generic name.

https://bugzilla.gnome.org/show_bug.cgi?id=640005
This commit is contained in:
William Jon McCann 2011-01-20 16:40:29 -05:00 committed by Matthias Clasen
parent e2d42f3c4b
commit 120e289f56
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkappchooserbutton.c
View File

@ -299,7 +299,7 @@ gtk_app_chooser_button_populate (GtkAppChooserButton *self)
gtk_list_store_set (self->priv->store, &iter,
COLUMN_APP_INFO, app,
COLUMN_LABEL, g_app_info_get_display_name (app),
COLUMN_LABEL, g_app_info_get_name (app),
COLUMN_ICON, icon,
COLUMN_CUSTOM, FALSE,
-1);

22
gtk/gtkappchooserwidget.c
View File

@ -541,11 +541,9 @@ gtk_app_chooser_widget_add_section (GtkAppChooserWidget *self,
heading_added = TRUE;
}
app_string = g_markup_printf_escaped ("<b>%s</b>\n%s",
g_app_info_get_display_name (app) != NULL ?
g_app_info_get_display_name (app) : "",
g_app_info_get_description (app) != NULL ?
g_app_info_get_description (app) : "");
app_string = g_markup_printf_escaped ("%s",
g_app_info_get_name (app) != NULL ?
g_app_info_get_name (app) : "");
icon = g_app_info_get_icon (app);
unref_icon = FALSE;
@ -559,7 +557,7 @@ gtk_app_chooser_widget_add_section (GtkAppChooserWidget *self,
gtk_list_store_set (self->priv->program_list_store, &iter,
COLUMN_APP_INFO, app,
COLUMN_GICON, icon,
COLUMN_NAME, g_app_info_get_display_name (app),
COLUMN_NAME, g_app_info_get_name (app),
COLUMN_DESC, app_string,
COLUMN_EXEC, g_app_info_get_executable (app),
COLUMN_HEADING, FALSE,
@ -601,11 +599,9 @@ gtk_app_chooser_add_default (GtkAppChooserWidget *self,
g_free (string);
string = g_markup_printf_escaped ("<b>%s</b>\n%s",
g_app_info_get_display_name (app) != NULL ?
g_app_info_get_display_name (app) : "",
g_app_info_get_description (app) != NULL ?
g_app_info_get_description (app) : "");
string = g_markup_printf_escaped ("%s",
g_app_info_get_name (app) != NULL ?
g_app_info_get_name (app) : "");
icon = g_app_info_get_icon (app);
if (icon == NULL)
@ -618,7 +614,7 @@ gtk_app_chooser_add_default (GtkAppChooserWidget *self,
gtk_list_store_set (self->priv->program_list_store, &iter,
COLUMN_APP_INFO, app,
COLUMN_GICON, icon,
COLUMN_NAME, g_app_info_get_display_name (app),
COLUMN_NAME, g_app_info_get_name (app),
COLUMN_DESC, string,
COLUMN_EXEC, g_app_info_get_executable (app),
COLUMN_HEADING, FALSE,
@ -857,7 +853,7 @@ gtk_app_chooser_widget_add_items (GtkAppChooserWidget *self)
"gicon", COLUMN_GICON,
NULL);
g_object_set (renderer,
"stock-size", GTK_ICON_SIZE_DIALOG,
"stock-size", GTK_ICON_SIZE_MENU,
NULL);
/* app name renderer */