diff options
Diffstat (limited to 'gtk')
-rw-r--r-- | gtk/menu.c | 67 | ||||
-rw-r--r-- | gtk/menu.h | 34 | ||||
-rw-r--r-- | gtk/scaffolding.c | 38 | ||||
-rw-r--r-- | gtk/toolbar.c | 8 | ||||
-rw-r--r-- | gtk/toolbar.h | 4 |
5 files changed, 94 insertions, 57 deletions
diff --git a/gtk/menu.c b/gtk/menu.c index 1d136fdf4..065ee6bdf 100644 --- a/gtk/menu.c +++ b/gtk/menu.c @@ -249,25 +249,28 @@ static struct nsgtk_toolbars_submenu *nsgtk_menu_toolbars_submenu( * \param group the 'global' in a gtk sense accelerator reference */ -static struct nsgtk_debugging_submenu *nsgtk_menu_debugging_submenu( +static struct nsgtk_developer_submenu *nsgtk_menu_developer_submenu( GtkAccelGroup *group) { - struct nsgtk_debugging_submenu *ret = - malloc(sizeof(struct nsgtk_debugging_submenu)); - if (ret == NULL) { + struct nsgtk_developer_submenu *dmenu = + malloc(sizeof(struct nsgtk_developer_submenu)); + if (dmenu == NULL) { warn_user(messages_get("NoMemory"), 0); return NULL; } - ret->debugging_menu = GTK_MENU(gtk_menu_new()); - if (ret->debugging_menu == NULL) { + dmenu->developer_menu = GTK_MENU(gtk_menu_new()); + if (dmenu->developer_menu == NULL) { warn_user(messages_get("NoMemory"), 0); - free(ret); + free(dmenu); return NULL; } - IMAGE_ITEM(debugging, toggledebugging, gtkToggleDebugging, ret, group); - IMAGE_ITEM(debugging, saveboxtree, gtkSaveBoxTree, ret, group); - IMAGE_ITEM(debugging, savedomtree, gtkSaveDomTree, ret, group); - return ret; + + IMAGE_ITEM(developer, viewsource, gtkPageSource, dmenu, group); + IMAGE_ITEM(developer, toggledebugging, gtkToggleDebugging, dmenu, group); + IMAGE_ITEM(developer, debugboxtree, gtkDebugBoxTree, dmenu, group); + IMAGE_ITEM(developer, debugdomtree, gtkDebugDomTree, dmenu, group); + + return dmenu; } /** @@ -364,20 +367,16 @@ static struct nsgtk_view_menu *nsgtk_menu_view_submenu(GtkAccelGroup *group) ADD_SEP(view, ret); IMAGE_ITEM(view, scaleview, gtkScaleView, ret, group); IMAGE_ITEM(view, fullscreen, gtkFullScreen, ret, group); - IMAGE_ITEM(view, viewsource, gtkViewSource, ret, group); ADD_SEP(view, ret); IMAGE_ITEM(view, images, gtkImages, ret, group); IMAGE_ITEM(view, toolbars, gtkToolbars, ret, group); IMAGE_ITEM(view, tabs, gtkTabs, ret, group); ADD_SEP(view, ret); - IMAGE_ITEM(view, downloads, gtkDownloads, ret, group); IMAGE_ITEM(view, savewindowsize, gtkSaveWindowSize, ret, group); - IMAGE_ITEM(view, debugging, gtkDebugging, ret, group); SET_SUBMENU(scaleview, ret); SET_SUBMENU(images, ret); SET_SUBMENU(toolbars, ret); SET_SUBMENU(tabs, ret); - SET_SUBMENU(debugging, ret); return ret; @@ -412,8 +411,6 @@ static struct nsgtk_nav_menu *nsgtk_menu_nav_submenu(GtkAccelGroup *group) IMAGE_ITEM(nav, addbookmarks, gtkAddBookMarks, ret, group); IMAGE_ITEM(nav, showbookmarks, gtkShowBookMarks, ret, group); ADD_SEP(nav, ret); - IMAGE_ITEM(nav, showcookies, gtkShowCookies, ret, group); - ADD_SEP(nav, ret); IMAGE_ITEM(nav, openlocation, gtkOpenLocation, ret, group); @@ -421,10 +418,35 @@ static struct nsgtk_nav_menu *nsgtk_menu_nav_submenu(GtkAccelGroup *group) } /** -* creates a help menu -* \param group the 'global' in a gtk sense accelerator reference -*/ + * creates the tools menu + * \param group the 'global' in a gtk sense accelerator reference + */ +static struct nsgtk_tools_menu *nsgtk_menu_tools_submenu(GtkAccelGroup *group) +{ + struct nsgtk_tools_menu *ret = malloc(sizeof(struct nsgtk_tools_menu)); + if (ret == NULL) { + warn_user(messages_get("NoMemory"), 0); + return NULL; + } + ret->tools_menu = GTK_MENU(gtk_menu_new()); + if (ret->tools_menu == NULL) { + warn_user(messages_get("NoMemory"), 0); + free(ret); + return NULL; + } + + IMAGE_ITEM(tools, downloads, gtkDownloads, ret, group); + IMAGE_ITEM(tools, showcookies, gtkShowCookies, ret, group); + IMAGE_ITEM(tools, developer, gtkDeveloper, ret, group); + SET_SUBMENU(developer, ret); + return ret; +} + +/** + * creates a help menu + * \param group the 'global' in a gtk sense accelerator reference + */ static struct nsgtk_help_menu *nsgtk_menu_help_submenu(GtkAccelGroup *group) { struct nsgtk_help_menu *ret = malloc(sizeof(struct nsgtk_help_menu)); @@ -468,6 +490,7 @@ nsgtk_menu_bar_create(GtkMenuShell *menubar, GtkAccelGroup *group) nmenu->edit_submenu = nsgtk_menu_edit_submenu(group); nmenu->view_submenu = nsgtk_menu_view_submenu(group); nmenu->nav_submenu = nsgtk_menu_nav_submenu(group); + nmenu->tools_submenu = nsgtk_menu_tools_submenu(group); nmenu->help_submenu = nsgtk_menu_help_submenu(group); if (menubar != NULL) { @@ -478,6 +501,7 @@ nsgtk_menu_bar_create(GtkMenuShell *menubar, GtkAccelGroup *group) ATTACH_PARENT(menubar, gtkEdit, nmenu->edit_submenu->edit, group); ATTACH_PARENT(menubar, gtkView, nmenu->view_submenu->view, group); ATTACH_PARENT(menubar, gtkNavigate, nmenu->nav_submenu->nav, group); + ATTACH_PARENT(menubar, gtkTools, nmenu->tools_submenu->tools, group); ATTACH_PARENT(menubar, gtkHelp, nmenu->help_submenu->help, group); } @@ -503,6 +527,9 @@ struct nsgtk_popup_menu *nsgtk_popup_menu_create(GtkAccelGroup *group) IMAGE_ITEM(popup, nav, gtkNavigate, nmenu, group); SET_SUBMENU(nav, nmenu); + IMAGE_ITEM(popup, tools, gtkTools, nmenu, group); + SET_SUBMENU(tools, nmenu); + IMAGE_ITEM(popup, help, gtkHelp, nmenu, group); SET_SUBMENU(help, nmenu); diff --git a/gtk/menu.h b/gtk/menu.h index 59d10b1c2..b14c0bb82 100644 --- a/gtk/menu.h +++ b/gtk/menu.h @@ -55,17 +55,13 @@ struct nsgtk_view_menu { GtkImageMenuItem *scaleview_menuitem; struct nsgtk_scaleview_submenu *scaleview_submenu; GtkImageMenuItem *fullscreen_menuitem; - GtkImageMenuItem *viewsource_menuitem; GtkImageMenuItem *images_menuitem; struct nsgtk_images_submenu *images_submenu; GtkImageMenuItem *toolbars_menuitem; struct nsgtk_toolbars_submenu *toolbars_submenu; GtkImageMenuItem *tabs_menuitem; struct nsgtk_tabs_submenu *tabs_submenu; - GtkImageMenuItem *downloads_menuitem; GtkImageMenuItem *savewindowsize_menuitem; - GtkImageMenuItem *debugging_menuitem; - struct nsgtk_debugging_submenu *debugging_submenu; }; struct nsgtk_nav_menu { @@ -78,10 +74,19 @@ struct nsgtk_nav_menu { GtkImageMenuItem *globalhistory_menuitem; GtkImageMenuItem *addbookmarks_menuitem; GtkImageMenuItem *showbookmarks_menuitem; - GtkImageMenuItem *showcookies_menuitem; GtkImageMenuItem *openlocation_menuitem; }; +struct nsgtk_tools_menu { + GtkMenuItem *tools; /* Tools menu item on menubar */ + GtkMenu *tools_menu; + + GtkImageMenuItem *showcookies_menuitem; + GtkImageMenuItem *downloads_menuitem; + GtkImageMenuItem *developer_menuitem; + struct nsgtk_developer_submenu *developer_submenu; +}; + struct nsgtk_help_menu { GtkMenuItem *help; /* Help menu item on menubar */ GtkMenu *help_menu; @@ -91,6 +96,7 @@ struct nsgtk_help_menu { GtkImageMenuItem *about_menuitem; }; + struct nsgtk_export_submenu { GtkMenu *export_menu; GtkImageMenuItem *plaintext_menuitem; @@ -125,11 +131,13 @@ struct nsgtk_toolbars_submenu { GtkCheckMenuItem *toolbar_menuitem; }; -struct nsgtk_debugging_submenu { - GtkMenu *debugging_menu; +struct nsgtk_developer_submenu { + GtkMenu *developer_menu; + + GtkImageMenuItem *viewsource_menuitem; GtkImageMenuItem *toggledebugging_menuitem; - GtkImageMenuItem *saveboxtree_menuitem; - GtkImageMenuItem *savedomtree_menuitem; + GtkImageMenuItem *debugboxtree_menuitem; + GtkImageMenuItem *debugdomtree_menuitem; }; @@ -139,7 +147,8 @@ struct nsgtk_bar_submenu { struct nsgtk_edit_menu *edit_submenu; struct nsgtk_view_menu *view_submenu; struct nsgtk_nav_menu *nav_submenu; - struct nsgtk_tabs_menu *tabs_submenu; + struct nsgtk_tabs_submenu *tabs_submenu; + struct nsgtk_tools_menu *tools_submenu; struct nsgtk_help_menu *help_submenu; }; @@ -159,7 +168,10 @@ struct nsgtk_popup_menu { struct nsgtk_nav_menu *nav_submenu; GtkImageMenuItem *tabs_menuitem; - struct nsgtk_tabs_menu *tabs_submenu; + struct nsgtk_tabs_submenu *tabs_submenu; + + GtkImageMenuItem *tools_menuitem; + struct nsgtk_tools_menu *tools_submenu; GtkImageMenuItem *help_menuitem; struct nsgtk_help_menu *help_submenu; diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c index 05d3f3377..5d9c58745 100644 --- a/gtk/scaffolding.c +++ b/gtk/scaffolding.c @@ -1289,7 +1289,7 @@ MULTIHANDLER(toggledebugging) return TRUE; } -MULTIHANDLER(saveboxtree) +MULTIHANDLER(debugboxtree) { GtkWidget *save_dialog; @@ -1333,7 +1333,7 @@ MULTIHANDLER(saveboxtree) return TRUE; } -MULTIHANDLER(savedomtree) +MULTIHANDLER(debugdomtree) { GtkWidget *save_dialog; @@ -2644,18 +2644,12 @@ void nsgtk_scaffolding_toolbar_size_allocate(GtkWidget *widget, void nsgtk_scaffolding_toolbar_init(struct gtk_scaffolding *g) { #define ITEM_MAIN(p, q, r)\ - g->buttons[p##_BUTTON]->main =\ - g->menu_bar->q->r##_menuitem;\ - g->buttons[p##_BUTTON]->rclick =\ - g->menu_popup->q->r##_menuitem;\ - g->buttons[p##_BUTTON]->mhandler =\ - nsgtk_on_##r##_activate_menu;\ - g->buttons[p##_BUTTON]->bhandler =\ - nsgtk_on_##r##_activate_button;\ - g->buttons[p##_BUTTON]->dataplus =\ - nsgtk_toolbar_##r##_button_data;\ - g->buttons[p##_BUTTON]->dataminus =\ - nsgtk_toolbar_##r##_toolbar_button_data + g->buttons[p##_BUTTON]->main = g->menu_bar->q->r##_menuitem;\ + g->buttons[p##_BUTTON]->rclick = g->menu_popup->q->r##_menuitem;\ + g->buttons[p##_BUTTON]->mhandler = nsgtk_on_##r##_activate_menu;\ + g->buttons[p##_BUTTON]->bhandler = nsgtk_on_##r##_activate_button;\ + g->buttons[p##_BUTTON]->dataplus = nsgtk_toolbar_##r##_button_data;\ + g->buttons[p##_BUTTON]->dataminus = nsgtk_toolbar_##r##_toolbar_button_data #define ITEM_SUB(p, q, r, s)\ g->buttons[p##_BUTTON]->main =\ @@ -2691,6 +2685,7 @@ void nsgtk_scaffolding_toolbar_init(struct gtk_scaffolding *g) nsgtk_toolbar_##q##_button_data;\ g->buttons[p##_ITEM]->dataminus =\ nsgtk_toolbar_##q##_toolbar_button_data + ITEM_ITEM(WEBSEARCH, websearch); ITEM_ITEM(THROBBER, throbber); ITEM_MAIN(NEWWINDOW, file_submenu, newwindow); @@ -2714,8 +2709,7 @@ void nsgtk_scaffolding_toolbar_init(struct gtk_scaffolding *g) ITEM_MAIN(RELOAD, view_submenu, reload); ITEM_POP(RELOAD, reload); ITEM_MAIN(FULLSCREEN, view_submenu, fullscreen); - ITEM_MAIN(VIEWSOURCE, view_submenu, viewsource); - ITEM_MAIN(DOWNLOADS, view_submenu, downloads); + ITEM_MAIN(DOWNLOADS, tools_submenu, downloads); ITEM_MAIN(SAVEWINDOWSIZE, view_submenu, savewindowsize); ITEM_MAIN(BACK, nav_submenu, back); ITEM_POP(BACK, back); @@ -2726,7 +2720,7 @@ void nsgtk_scaffolding_toolbar_init(struct gtk_scaffolding *g) ITEM_MAIN(GLOBALHISTORY, nav_submenu, globalhistory); ITEM_MAIN(ADDBOOKMARKS, nav_submenu, addbookmarks); ITEM_MAIN(SHOWBOOKMARKS, nav_submenu, showbookmarks); - ITEM_MAIN(SHOWCOOKIES, nav_submenu, showcookies); + ITEM_MAIN(SHOWCOOKIES, tools_submenu, showcookies); ITEM_MAIN(OPENLOCATION, nav_submenu, openlocation); ITEM_MAIN(CONTENTS, help_submenu, contents); ITEM_MAIN(INFO, help_submenu, info); @@ -2742,10 +2736,14 @@ void nsgtk_scaffolding_toolbar_init(struct gtk_scaffolding *g) ITEM_SUB(NEXTTAB, view_submenu, tabs, nexttab); ITEM_SUB(PREVTAB, view_submenu, tabs, prevtab); ITEM_SUB(CLOSETAB, view_submenu, tabs, closetab); - ITEM_SUB(TOGGLEDEBUGGING, view_submenu, debugging, toggledebugging); - ITEM_SUB(SAVEBOXTREE, view_submenu, debugging, saveboxtree); - ITEM_SUB(SAVEDOMTREE, view_submenu, debugging, savedomtree); + + /* development submenu */ + ITEM_SUB(VIEWSOURCE, tools_submenu, developer, viewsource); + ITEM_SUB(TOGGLEDEBUGGING, tools_submenu, developer, toggledebugging); + ITEM_SUB(SAVEBOXTREE, tools_submenu, developer, debugboxtree); + ITEM_SUB(SAVEDOMTREE, tools_submenu, developer, debugdomtree); ITEM_BUTTON(HISTORY, history); + /* disable items that make no sense initially, as well as * as-yet-unimplemented items */ SENSITIVITY(BACK); diff --git a/gtk/toolbar.c b/gtk/toolbar.c index c60bab6f1..39d8cf510 100644 --- a/gtk/toolbar.c +++ b/gtk/toolbar.c @@ -807,8 +807,8 @@ GtkWidget *nsgtk_toolbar_make_widget(nsgtk_scaffolding *g, MAKE_MENUBUTTON(DOWNLOADS, gtkDownloads) MAKE_MENUBUTTON(SAVEWINDOWSIZE, gtkSaveWindowSize) MAKE_MENUBUTTON(TOGGLEDEBUGGING, gtkToggleDebugging) - MAKE_MENUBUTTON(SAVEBOXTREE, gtkSaveBoxTree) - MAKE_MENUBUTTON(SAVEDOMTREE, gtkSaveDomTree) + MAKE_MENUBUTTON(SAVEBOXTREE, gtkDebugBoxTree) + MAKE_MENUBUTTON(SAVEDOMTREE, gtkDebugDomTree) MAKE_MENUBUTTON(LOCALHISTORY, gtkLocalHistory) MAKE_MENUBUTTON(GLOBALHISTORY, gtkGlobalHistory) MAKE_MENUBUTTON(ADDBOOKMARKS, gtkAddBookMarks) @@ -972,8 +972,8 @@ DATAHANDLER(find, FIND, window) DATAHANDLER(downloads, DOWNLOADS, window) DATAHANDLER(savewindowsize, SAVEWINDOWSIZE, window) DATAHANDLER(toggledebugging, TOGGLEDEBUGGING, window) -DATAHANDLER(saveboxtree, SAVEBOXTREE, window) -DATAHANDLER(savedomtree, SAVEDOMTREE, window) +DATAHANDLER(debugboxtree, SAVEBOXTREE, window) +DATAHANDLER(debugdomtree, SAVEDOMTREE, window) DATAHANDLER(localhistory, LOCALHISTORY, window) DATAHANDLER(globalhistory, GLOBALHISTORY, window) DATAHANDLER(addbookmarks, ADDBOOKMARKS, window) diff --git a/gtk/toolbar.h b/gtk/toolbar.h index bcad5cd7e..c853458cd 100644 --- a/gtk/toolbar.h +++ b/gtk/toolbar.h @@ -81,8 +81,8 @@ TOOLPROTO(nexttab); TOOLPROTO(prevtab); TOOLPROTO(savewindowsize); TOOLPROTO(toggledebugging); -TOOLPROTO(saveboxtree); -TOOLPROTO(savedomtree); +TOOLPROTO(debugboxtree); +TOOLPROTO(debugdomtree); TOOLPROTO(contents); TOOLPROTO(guide); TOOLPROTO(info); |