DeforaOS/Browser
DeforaOS/Browser
2
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Avoid Gtk+ constants for stock icons

Browse Source 
They are being deprecated.
This commit is contained in:
Pierre Pronchery 2018-10-29 15:58:45 -03:00
parent fd548811fa
commit cbcd11d51f
3 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/browser/browser.c
View File

@ -227,21 +227,21 @@ static char const * _authors[] =
/* toolbar */
static DesktopToolbar _browser_toolbar[] =
{
{ N_("Back"), G_CALLBACK(on_back), GTK_STOCK_GO_BACK, GDK_MOD1_MASK,
{ N_("Back"), G_CALLBACK(on_back), "go-previous", GDK_MOD1_MASK,
GDK_KEY_Left, NULL },
{ N_("Up"), G_CALLBACK(on_updir), GTK_STOCK_GO_UP, 0, 0, NULL },
{ N_("Forward"), G_CALLBACK(on_forward), GTK_STOCK_GO_FORWARD,
GDK_MOD1_MASK, GDK_KEY_Right, NULL },
{ N_("Refresh"), G_CALLBACK(on_refresh), GTK_STOCK_REFRESH, 0, 0,
{ N_("Up"), G_CALLBACK(on_updir), "go-up", 0, 0, NULL },
{ N_("Forward"), G_CALLBACK(on_forward), "go-next", GDK_MOD1_MASK,
GDK_KEY_Right, NULL },
{ N_("Refresh"), G_CALLBACK(on_refresh), "gtk-refresh", 0, 0,
NULL },
{ "", NULL, NULL, 0, 0, NULL },
{ N_("Home"), G_CALLBACK(on_home), GTK_STOCK_HOME, 0, 0, NULL },
{ N_("Home"), G_CALLBACK(on_home), "go-home", 0, 0, NULL },
{ "", NULL, NULL, 0, 0, NULL },
{ N_("Cut"), G_CALLBACK(on_cut), GTK_STOCK_CUT, 0, 0, NULL },
{ N_("Copy"), G_CALLBACK(on_copy), GTK_STOCK_COPY, 0, 0, NULL },
{ N_("Paste"), G_CALLBACK(on_paste), GTK_STOCK_PASTE, 0, 0, NULL },
{ N_("Cut"), G_CALLBACK(on_cut), "edit-cut", 0, 0, NULL },
{ N_("Copy"), G_CALLBACK(on_copy), "edit-copy", 0, 0, NULL },
{ N_("Paste"), G_CALLBACK(on_paste), "edit-paste", 0, 0, NULL },
{ "", NULL, NULL, 0, 0, NULL },
{ N_("Properties"), G_CALLBACK(on_properties), GTK_STOCK_PROPERTIES, 0,
{ N_("Properties"), G_CALLBACK(on_properties), "document-properties", 0,
0, NULL },
{ NULL, NULL, NULL, 0, 0, NULL }
};

27
src/browser/window.c
View File

@ -152,46 +152,41 @@ static const DesktopMenu _browserwindow_menu_file[] =
NULL, GDK_CONTROL_MASK, GDK_KEY_O },
{ "", NULL, NULL, 0, 0 },
{ N_("_Properties"), G_CALLBACK(_browserwindow_on_file_properties),
GTK_STOCK_PROPERTIES, GDK_MOD1_MASK, GDK_KEY_Return },
"document-properties", GDK_MOD1_MASK, GDK_KEY_Return },
{ "", NULL, NULL, 0, 0 },
{ N_("_Close"), G_CALLBACK(_browserwindow_on_file_close),
GTK_STOCK_CLOSE, GDK_CONTROL_MASK, GDK_KEY_W },
"window-close", GDK_CONTROL_MASK, GDK_KEY_W },
{ NULL, NULL, NULL, 0, 0 }
};
static const DesktopMenu _browserwindow_menu_edit[] =
{
{ N_("_Cut"), G_CALLBACK(_browserwindow_on_edit_cut), GTK_STOCK_CUT,
{ N_("_Cut"), G_CALLBACK(_browserwindow_on_edit_cut), "edit-cut",
GDK_CONTROL_MASK, GDK_KEY_X },
{ N_("Cop_y"), G_CALLBACK(_browserwindow_on_edit_copy), GTK_STOCK_COPY,
{ N_("Cop_y"), G_CALLBACK(_browserwindow_on_edit_copy), "edit-copy",
GDK_CONTROL_MASK, GDK_KEY_C },
{ N_("_Paste"), G_CALLBACK(_browserwindow_on_edit_paste),
GTK_STOCK_PASTE, GDK_CONTROL_MASK, GDK_KEY_V },
{ N_("_Paste"), G_CALLBACK(_browserwindow_on_edit_paste), "edit-paste",
GDK_CONTROL_MASK, GDK_KEY_V },
{ "", NULL, NULL, 0, 0 },
{ N_("_Delete"), G_CALLBACK(_browserwindow_on_edit_delete),
GTK_STOCK_DELETE, 0, 0 },
"edit-delete", 0, 0 },
{ "", NULL, NULL, 0, 0 },
{ N_("Select _All"), G_CALLBACK(_browserwindow_on_edit_select_all),
#if GTK_CHECK_VERSION(2, 10, 0)
GTK_STOCK_SELECT_ALL,
#else
"edit-select-all",
#endif
GDK_CONTROL_MASK, GDK_KEY_A },
"edit-select-all", GDK_CONTROL_MASK, GDK_KEY_A },
{ N_("_Unselect all"), G_CALLBACK(_browserwindow_on_edit_unselect_all),
NULL, 0, 0 },
{ "", NULL, NULL, 0, 0 },
{ N_("_Preferences"), G_CALLBACK(_browserwindow_on_edit_preferences),
GTK_STOCK_PREFERENCES, GDK_CONTROL_MASK, GDK_KEY_P },
"gtk-preferences", GDK_CONTROL_MASK, GDK_KEY_P },
{ NULL, NULL, NULL, 0, 0 }
};
static const DesktopMenu _browserwindow_menu_view[] =
{
{ N_("_Refresh"), G_CALLBACK(_browserwindow_on_view_refresh),
GTK_STOCK_REFRESH, GDK_CONTROL_MASK, GDK_KEY_R },
"view-refresh", GDK_CONTROL_MASK, GDK_KEY_R },
{ "", NULL, NULL, 0, 0 },
{ N_("_Home"), G_CALLBACK(_browserwindow_on_view_home), GTK_STOCK_HOME,
{ N_("_Home"), G_CALLBACK(_browserwindow_on_view_home), "go-home",
GDK_MOD1_MASK, GDK_KEY_Home },
#if GTK_CHECK_VERSION(2, 6, 0)
{ "", NULL, NULL, 0, 0 },

6
src/view.c
View File

@ -148,7 +148,7 @@ static DesktopMenu _view_menu_file[] =
{ N_("Open _with..."), G_CALLBACK(_view_on_file_open_with), NULL, 0,
0 },
{ "", NULL, NULL, 0, 0 },
{ N_("_Close"), G_CALLBACK(_view_on_file_close), GTK_STOCK_CLOSE,
{ N_("_Close"), G_CALLBACK(_view_on_file_close), "window-close",
GDK_CONTROL_MASK, GDK_KEY_W },
{ NULL, NULL, NULL, 0, 0 }
};
@ -161,9 +161,9 @@ static DesktopMenu _view_menu_file_edit[] =
0 },
{ "", NULL, NULL, 0, 0 },
{ N_("_Properties"), G_CALLBACK(_view_on_file_properties),
GTK_STOCK_PROPERTIES, GDK_MOD1_MASK, GDK_KEY_Return },
"document-properties", GDK_MOD1_MASK, GDK_KEY_Return },
{ "", NULL, NULL, 0, 0 },
{ N_("_Close"), G_CALLBACK(_view_on_file_close), GTK_STOCK_CLOSE,
{ N_("_Close"), G_CALLBACK(_view_on_file_close), "window-close",
GDK_CONTROL_MASK, GDK_KEY_W },
{ NULL, NULL, NULL, 0, 0 }
};