From 8167e022a8fb81d31094da6a26918d0387101ffb Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Tue, 3 Sep 2019 19:33:22 +0100 Subject: use toolbar_items to generate more boilerplate code through macros --- frontends/gtk/toolbar_items.h | 114 +++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 56 deletions(-) (limited to 'frontends/gtk/toolbar_items.h') diff --git a/frontends/gtk/toolbar_items.h b/frontends/gtk/toolbar_items.h index cbb6a24b5..0de276f2a 100644 --- a/frontends/gtk/toolbar_items.h +++ b/frontends/gtk/toolbar_items.h @@ -79,68 +79,70 @@ typedef enum { /* * Item fields are: - * item identifier enum - * item name - * item initial visibility + * identifier enum + * name + * initial sensitivity + * if there is a toolbar click signal handler + * if the menu activate signal handler calls the toolbar click handler */ #ifndef TOOLBAR_ITEM -#define TOOLBAR_ITEM(a, b, c, d) +#define TOOLBAR_ITEM(a, b, c, d, e) #define TOOLBAR_ITEM_SET #endif -TOOLBAR_ITEM(BACK_BUTTON, back, false, back_button_clicked_cb) -TOOLBAR_ITEM(HISTORY_BUTTON, history, true, localhistory_button_clicked_cb) -TOOLBAR_ITEM(FORWARD_BUTTON, forward, false, forward_button_clicked_cb) -TOOLBAR_ITEM(STOP_BUTTON, stop, false, stop_button_clicked_cb) -TOOLBAR_ITEM(RELOAD_BUTTON, reload, true, reload_button_clicked_cb) -TOOLBAR_ITEM(HOME_BUTTON, home, true, home_button_clicked_cb) -TOOLBAR_ITEM(URL_BAR_ITEM, url_bar, true, NULL) -TOOLBAR_ITEM(WEBSEARCH_ITEM, websearch, true, NULL) -TOOLBAR_ITEM(THROBBER_ITEM, throbber, true, NULL) -TOOLBAR_ITEM(NEWWINDOW_BUTTON, newwindow, true, newwindow_button_clicked_cb) -TOOLBAR_ITEM(NEWTAB_BUTTON, newtab, true, newtab_button_clicked_cb) -TOOLBAR_ITEM(OPENFILE_BUTTON, openfile, true, openfile_button_clicked_cb) -TOOLBAR_ITEM(CLOSETAB_BUTTON, closetab, false, NULL) -TOOLBAR_ITEM(CLOSEWINDOW_BUTTON, closewindow, true, closewindow_button_clicked_cb) -TOOLBAR_ITEM(SAVEPAGE_BUTTON, savepage, true, savepage_button_clicked_cb) -TOOLBAR_ITEM(PDF_BUTTON, pdf, false, pdf_button_clicked_cb) -TOOLBAR_ITEM(PLAINTEXT_BUTTON, plaintext, true, plaintext_button_clicked_cb) -TOOLBAR_ITEM(DRAWFILE_BUTTON, drawfile, false, NULL) -TOOLBAR_ITEM(POSTSCRIPT_BUTTON, postscript, false, NULL) -TOOLBAR_ITEM(PRINTPREVIEW_BUTTON, printpreview, false, NULL) -TOOLBAR_ITEM(PRINT_BUTTON, print, true, print_button_clicked_cb) -TOOLBAR_ITEM(QUIT_BUTTON, quit, true, quit_button_clicked_cb) -TOOLBAR_ITEM(CUT_BUTTON, cut, true, cut_button_clicked_cb) -TOOLBAR_ITEM(COPY_BUTTON, copy, true, copy_button_clicked_cb) -TOOLBAR_ITEM(PASTE_BUTTON, paste, true, paste_button_clicked_cb) -TOOLBAR_ITEM(DELETE_BUTTON, delete, false, delete_button_clicked_cb) -TOOLBAR_ITEM(SELECTALL_BUTTON, selectall, true, selectall_button_clicked_cb) -TOOLBAR_ITEM(FIND_BUTTON, find, true, NULL) -TOOLBAR_ITEM(PREFERENCES_BUTTON, preferences, true, preferences_button_clicked_cb) -TOOLBAR_ITEM(ZOOMPLUS_BUTTON, zoomplus, true, zoomplus_button_clicked_cb) -TOOLBAR_ITEM(ZOOMMINUS_BUTTON, zoomminus, true, zoomminus_button_clicked_cb) -TOOLBAR_ITEM(ZOOMNORMAL_BUTTON, zoomnormal, true, zoomnormal_button_clicked_cb) -TOOLBAR_ITEM(FULLSCREEN_BUTTON, fullscreen, true, fullscreen_button_clicked_cb) -TOOLBAR_ITEM(VIEWSOURCE_BUTTON, viewsource, true, viewsource_button_clicked_cb) -TOOLBAR_ITEM(DOWNLOADS_BUTTON, downloads, true, downloads_button_clicked_cb) -TOOLBAR_ITEM(SAVEWINDOWSIZE_BUTTON, savewindowsize, true, savewindowsize_button_clicked_cb) -TOOLBAR_ITEM(TOGGLEDEBUGGING_BUTTON, toggledebugging, true, toggledebugging_button_clicked_cb) -TOOLBAR_ITEM(SAVEBOXTREE_BUTTON, debugboxtree, true, debugboxtree_button_clicked_cb) -TOOLBAR_ITEM(SAVEDOMTREE_BUTTON, debugdomtree, true, debugdomtree_button_clicked_cb) -TOOLBAR_ITEM(LOCALHISTORY_BUTTON, localhistory, true, localhistory_button_clicked_cb) -TOOLBAR_ITEM(GLOBALHISTORY_BUTTON, globalhistory, true, globalhistory_button_clicked_cb) -TOOLBAR_ITEM(ADDBOOKMARKS_BUTTON, addbookmarks, true, addbookmarks_button_clicked_cb) -TOOLBAR_ITEM(SHOWBOOKMARKS_BUTTON, showbookmarks, true, showbookmarks_button_clicked_cb) -TOOLBAR_ITEM(SHOWCOOKIES_BUTTON, showcookies, true, showcookies_button_clicked_cb) -TOOLBAR_ITEM(OPENLOCATION_BUTTON, openlocation, true, openlocation_button_clicked_cb) -TOOLBAR_ITEM(NEXTTAB_BUTTON, nexttab, false, NULL) -TOOLBAR_ITEM(PREVTAB_BUTTON, prevtab, false, NULL) -TOOLBAR_ITEM(CONTENTS_BUTTON, contents, true, contents_button_clicked_cb) -TOOLBAR_ITEM(GUIDE_BUTTON, guide, true, guide_button_clicked_cb) -TOOLBAR_ITEM(INFO_BUTTON, info, true, info_button_clicked_cb) -TOOLBAR_ITEM(ABOUT_BUTTON, about, true, about_button_clicked_cb) -TOOLBAR_ITEM(OPENMENU_BUTTON, openmenu, true, openmenu_button_clicked_cb) +TOOLBAR_ITEM(BACK_BUTTON, back, false, y, y) +TOOLBAR_ITEM(HISTORY_BUTTON, history, true, y, n) +TOOLBAR_ITEM(FORWARD_BUTTON, forward, false, y, y) +TOOLBAR_ITEM(STOP_BUTTON, stop, false, y, y) +TOOLBAR_ITEM(RELOAD_BUTTON, reload, true, y, y) +TOOLBAR_ITEM(HOME_BUTTON, home, true, y, y) +TOOLBAR_ITEM(URL_BAR_ITEM, url_bar, true, n, n) +TOOLBAR_ITEM(WEBSEARCH_ITEM, websearch, true, n, n) +TOOLBAR_ITEM(THROBBER_ITEM, throbber, true, n, n) +TOOLBAR_ITEM(NEWWINDOW_BUTTON, newwindow, true, y, y) +TOOLBAR_ITEM(NEWTAB_BUTTON, newtab, true, y, y) +TOOLBAR_ITEM(OPENFILE_BUTTON, openfile, true, y, y) +TOOLBAR_ITEM(CLOSETAB_BUTTON, closetab, false, n, n) +TOOLBAR_ITEM(CLOSEWINDOW_BUTTON, closewindow, true, y, y) +TOOLBAR_ITEM(SAVEPAGE_BUTTON, savepage, true, y, y) +TOOLBAR_ITEM(PDF_BUTTON, pdf, false, y, y) +TOOLBAR_ITEM(PLAINTEXT_BUTTON, plaintext, true, y, y) +TOOLBAR_ITEM(DRAWFILE_BUTTON, drawfile, false, n, n) +TOOLBAR_ITEM(POSTSCRIPT_BUTTON, postscript, false, n, n) +TOOLBAR_ITEM(PRINTPREVIEW_BUTTON, printpreview, false, n, y) +TOOLBAR_ITEM(PRINT_BUTTON, print, true, y, y) +TOOLBAR_ITEM(QUIT_BUTTON, quit, true, y, y) +TOOLBAR_ITEM(CUT_BUTTON, cut, true, y, y) +TOOLBAR_ITEM(COPY_BUTTON, copy, true, y, y) +TOOLBAR_ITEM(PASTE_BUTTON, paste, true, y, y) +TOOLBAR_ITEM(DELETE_BUTTON, delete, false, y, y) +TOOLBAR_ITEM(SELECTALL_BUTTON, selectall, true, y, y) +TOOLBAR_ITEM(FIND_BUTTON, find, true, n, n) +TOOLBAR_ITEM(PREFERENCES_BUTTON, preferences, true, y, y) +TOOLBAR_ITEM(ZOOMPLUS_BUTTON, zoomplus, true, y, y) +TOOLBAR_ITEM(ZOOMMINUS_BUTTON, zoomminus, true, y, y) +TOOLBAR_ITEM(ZOOMNORMAL_BUTTON, zoomnormal, true, y, y) +TOOLBAR_ITEM(FULLSCREEN_BUTTON, fullscreen, true, y, y) +TOOLBAR_ITEM(VIEWSOURCE_BUTTON, viewsource, true, y, y) +TOOLBAR_ITEM(DOWNLOADS_BUTTON, downloads, true, y, y) +TOOLBAR_ITEM(SAVEWINDOWSIZE_BUTTON, savewindowsize, true, y, y) +TOOLBAR_ITEM(TOGGLEDEBUGGING_BUTTON, toggledebugging, true, y, y) +TOOLBAR_ITEM(SAVEBOXTREE_BUTTON, debugboxtree, true, y, y) +TOOLBAR_ITEM(SAVEDOMTREE_BUTTON, debugdomtree, true, y, y) +TOOLBAR_ITEM(LOCALHISTORY_BUTTON, localhistory, true, y, y) +TOOLBAR_ITEM(GLOBALHISTORY_BUTTON, globalhistory, true, y, y) +TOOLBAR_ITEM(ADDBOOKMARKS_BUTTON, addbookmarks, true, y, y) +TOOLBAR_ITEM(SHOWBOOKMARKS_BUTTON, showbookmarks, true, y, y) +TOOLBAR_ITEM(SHOWCOOKIES_BUTTON, showcookies, true, y, y) +TOOLBAR_ITEM(OPENLOCATION_BUTTON, openlocation, true, y, y) +TOOLBAR_ITEM(NEXTTAB_BUTTON, nexttab, false, n, n) +TOOLBAR_ITEM(PREVTAB_BUTTON, prevtab, false, n, n) +TOOLBAR_ITEM(CONTENTS_BUTTON, contents, true, y, y) +TOOLBAR_ITEM(GUIDE_BUTTON, guide, true, y, y) +TOOLBAR_ITEM(INFO_BUTTON, info, true, y, y) +TOOLBAR_ITEM(ABOUT_BUTTON, about, true, y, y) +TOOLBAR_ITEM(OPENMENU_BUTTON, openmenu, true, y, n) #ifdef TOOLBAR_ITEM_SET #undef TOOLBAR_ITEM -- cgit v1.2.3