debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Put the Preferences menuitem in the Tools menu under Win32

Browse source
This commit is contained in:
Christian Dywan 2009-07-20 08:13:29 +02:00
parent e8ffec6b28
commit ff8489da20
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
midori/midori-browser.c
View file

@ -4432,8 +4432,10 @@ static const gchar* ui_markup =
"<separator/>" "<separator/>"
"<menuitem action='Find'/>" "<menuitem action='Find'/>"
"<menuitem action='FindNext'/>" "<menuitem action='FindNext'/>"
#ifndef G_OS_WIN32
"<separator/>" "<separator/>"
"<menuitem action='Preferences'/>" "<menuitem action='Preferences'/>"
#endif
"</menu>" "</menu>"
"<menu action='View'>" "<menu action='View'>"
"<menu action='Toolbars'>" "<menu action='Toolbars'>"
@ -4478,6 +4480,10 @@ static const gchar* ui_markup =
"<menuitem action='ManageSearchEngines'/>" "<menuitem action='ManageSearchEngines'/>"
"<menuitem action='ClearPrivateData'/>" "<menuitem action='ClearPrivateData'/>"
/* Panel items shall be appended here */ /* Panel items shall be appended here */
#ifdef G_OS_WIN32
"<separator/>"
"<menuitem action='Preferences'/>"
#endif
"</menu>" "</menu>"
"<menuitem action='Window'/>" "<menuitem action='Window'/>"
"<menu action='Help'>" "<menu action='Help'>"
@ -4917,7 +4923,7 @@ midori_browser_init (MidoriBrowser* browser)
gtk_ui_manager_get_widget (ui_manager, "/menubar/Tools"))); gtk_ui_manager_get_widget (ui_manager, "/menubar/Tools")));
menuitem = gtk_separator_menu_item_new (); menuitem = gtk_separator_menu_item_new ();
gtk_widget_show (menuitem); gtk_widget_show (menuitem);
gtk_menu_shell_append (GTK_MENU_SHELL (browser->menu_tools), menuitem); gtk_menu_shell_insert (GTK_MENU_SHELL (browser->menu_tools), menuitem, 3);
homepage = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Homepage"); homepage = gtk_ui_manager_get_widget (ui_manager, "/menubar/Go/Homepage");
g_signal_connect (homepage, "button-press-event", g_signal_connect (homepage, "button-press-event",

2
midori/midori-panel.c
View file

@ -661,7 +661,7 @@ midori_panel_append_page (MidoriPanel* panel,
g_signal_connect (menuitem, "activate", g_signal_connect (menuitem, "activate",
G_CALLBACK (midori_panel_menu_item_activate_cb), G_CALLBACK (midori_panel_menu_item_activate_cb),
panel); panel);
gtk_menu_shell_append (GTK_MENU_SHELL (panel->menu), menuitem); gtk_menu_shell_insert (GTK_MENU_SHELL (panel->menu), menuitem, 4);
g_object_set_data (G_OBJECT (scrolled), "panel-menuitem", menuitem); g_object_set_data (G_OBJECT (scrolled), "panel-menuitem", menuitem);
g_signal_connect (viewable, "destroy", g_signal_connect (viewable, "destroy",
G_CALLBACK (midori_panel_widget_destroy_cb), menuitem); G_CALLBACK (midori_panel_widget_destroy_cb), menuitem);