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

Update panel handling according to latest changes

Browse source
This commit is contained in:
Christian Dywan 2008-12-04 01:45:32 +01:00
parent e4f401c7e7
commit b956a73914
1 changed files with 7 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
midori/main.c
View file

@ -19,6 +19,7 @@
#include "midori-browser.h" #include "midori-browser.h"
#include "midori-console.h" #include "midori-console.h"
#include "midori-extension.h" #include "midori-extension.h"
#include "midori-extensions.h"
#include "midori-panel.h" #include "midori-panel.h"
#include "midori-stock.h" #include "midori-stock.h"
#include "midori-view.h" #include "midori-view.h"
@ -977,25 +978,6 @@ katze_array_to_file (KatzeArray* array,
return TRUE; return TRUE;
} }
static void
midori_view_console_message_cb (GtkWidget* view,
const gchar* message,
gint line,
const gchar* source_id,
MidoriConsole* console)
{
midori_console_add (console, message, line, source_id);
}
static void
midori_browser_add_tab_cb (MidoriBrowser* browser,
MidoriView* view,
MidoriConsole* console)
{
g_signal_connect (view, "console-message",
G_CALLBACK (midori_view_console_message_cb), console);
}
static void static void
midori_app_add_browser_cb (MidoriApp* app, midori_app_add_browser_cb (MidoriApp* app,
MidoriBrowser* browser, MidoriBrowser* browser,
@ -1003,7 +985,6 @@ midori_app_add_browser_cb (MidoriApp* app,
{ {
GtkWidget* panel; GtkWidget* panel;
GtkWidget* addon; GtkWidget* addon;
GtkWidget* toolbar;
panel = katze_object_get_object (browser, "panel"); panel = katze_object_get_object (browser, "panel");
@ -1016,40 +997,24 @@ midori_app_add_browser_cb (MidoriApp* app,
#endif #endif
/* Console */ /* Console */
addon = midori_console_new (); addon = g_object_new (MIDORI_TYPE_CONSOLE, "app", app, NULL);
gtk_widget_show (addon); gtk_widget_show (addon);
toolbar = midori_console_get_toolbar (MIDORI_CONSOLE (addon)); midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon));
gtk_widget_show (toolbar);
midori_panel_append_widget (MIDORI_PANEL (panel), addon,
STOCK_CONSOLE, _("Console"), toolbar);
g_signal_connect (browser, "add-tab",
G_CALLBACK (midori_browser_add_tab_cb), addon);
/* Userscripts */ /* Userscripts */
addon = midori_addons_new (MIDORI_ADDON_USER_SCRIPTS, GTK_WIDGET (browser)); addon = midori_addons_new (MIDORI_ADDON_USER_SCRIPTS, GTK_WIDGET (browser));
gtk_widget_show (addon); gtk_widget_show (addon);
toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon));
gtk_widget_show (toolbar);
midori_panel_append_widget (MIDORI_PANEL (panel), addon,
STOCK_SCRIPTS, _("Userscripts"), toolbar);
/* Userstyles */ /* Userstyles */
addon = midori_addons_new (MIDORI_ADDON_USER_STYLES, GTK_WIDGET (browser)); addon = midori_addons_new (MIDORI_ADDON_USER_STYLES, GTK_WIDGET (browser));
gtk_widget_show (addon); gtk_widget_show (addon);
toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon));
gtk_widget_show (toolbar);
midori_panel_append_widget (MIDORI_PANEL (panel), addon,
STOCK_STYLES, _("Userstyles"), toolbar);
/* Extensions */ /* Extensions */
#if 0 addon = g_object_new (MIDORI_TYPE_EXTENSIONS, "app", app, NULL);
addon = midori_addons_new (MIDORI_ADDON_EXTENSIONS);
gtk_widget_show (addon); gtk_widget_show (addon);
toolbar = midori_addons_get_toolbar (MIDORI_ADDONS (addon)); midori_panel_append_page (MIDORI_PANEL (panel), MIDORI_VIEWABLE (addon));
gtk_widget_show (toolbar);
midori_panel_append_page (MIDORI_PANEL (panel), addon,
STOCK_EXTENSIONS, _("Extensions"), toolbar);
#endif
} }
static void static void