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

Rewrite Midori.Viewable in Vala

Browse source
This commit is contained in:
Christian Dywan 2012-05-27 16:30:09 +02:00
parent 85153f3b49
commit a0a0325db4
10 changed files with 28 additions and 238 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
midori/midori-panel.h
View file

@ -12,11 +12,7 @@
#ifndef __MIDORI_PANEL_H__ #ifndef __MIDORI_PANEL_H__
#define __MIDORI_PANEL_H__ #define __MIDORI_PANEL_H__
#include <gtk/gtk.h> #include "midori-core.h"
#include <katze/katze.h>
#include "midori-viewable.h"
G_BEGIN_DECLS G_BEGIN_DECLS

163
midori/midori-viewable.c
View file

@ -1,163 +0,0 @@
/*
Copyright (C) 2008 Christian Dywan <christian@twotoasts.de>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
See the file COPYING for the full license text.
*/
#include "midori-viewable.h"
#include <glib/gi18n.h>
enum {
POPULATE_OPTION_MENU,
LAST_SIGNAL
};
static guint signals[LAST_SIGNAL];
static void
midori_viewable_base_init (MidoriViewableIface* iface);
static void
midori_viewable_base_finalize (MidoriViewableIface* iface);
GType
midori_viewable_get_type (void)
{
static GType viewable_type = 0;
if (!viewable_type)
{
const GTypeInfo viewable_info =
{
sizeof (MidoriViewableIface),
(GBaseInitFunc) midori_viewable_base_init,
(GBaseFinalizeFunc) midori_viewable_base_finalize,
};
viewable_type = g_type_register_static (G_TYPE_INTERFACE,
"MidoriViewable",
&viewable_info, 0);
g_type_interface_add_prerequisite (viewable_type, GTK_TYPE_WIDGET);
}
return viewable_type;
}
static const gchar*
midori_viewable_default_get_stock_id (MidoriViewable* viewable)
{
return NULL;
}
static const gchar*
midori_viewable_default_get_label (MidoriViewable* viewable)
{
return NULL;
}
static GtkWidget*
midori_viewable_default_get_toolbar (MidoriViewable* viewable)
{
return NULL;
}
static void
midori_viewable_base_init (MidoriViewableIface* iface)
{
static gboolean initialized = FALSE;
if (initialized)
return;
/**
* MidoriViewable::populate-option-menu:
* @viewable: the object on which the signal is emitted
* @menu: the #GtkMenu to populate
*
* Emitted when an Option menu is displayed, for instance
* when the user clicks the Options button in the panel.
*
* Deprecated: 0.2.3
*/
signals[POPULATE_OPTION_MENU] = g_signal_new (
"populate-option-menu",
G_TYPE_FROM_INTERFACE (iface),
(GSignalFlags)(G_SIGNAL_RUN_LAST),
0,
0,
NULL,
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
GTK_TYPE_MENU);
iface->get_stock_id = midori_viewable_default_get_stock_id;
iface->get_label = midori_viewable_default_get_label;
iface->get_toolbar = midori_viewable_default_get_toolbar;
initialized = TRUE;
}
static void
midori_viewable_base_finalize (MidoriViewableIface* iface)
{
}
/**
* midori_viewable_get_stock_id:
* @viewable: a #MidoriViewable
*
* Retrieves the stock ID of the viewable.
*
* Return value: a stock ID
**/
const gchar*
midori_viewable_get_stock_id (MidoriViewable* viewable)
{
g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), NULL);
return MIDORI_VIEWABLE_GET_IFACE (viewable)->get_stock_id (viewable);
}
/**
* midori_viewable_get_label:
* @viewable: a #MidoriViewable
*
* Retrieves the label of the viewable.
*
* Return value: a label string
**/
const gchar*
midori_viewable_get_label (MidoriViewable* viewable)
{
g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), NULL);
return MIDORI_VIEWABLE_GET_IFACE (viewable)->get_label (viewable);
}
/**
* midori_viewable_get_toolbar:
* @viewable: a #MidoriViewable
*
* Retrieves the toolbar of the viewable.
*
* Return value: a toolbar
**/
GtkWidget*
midori_viewable_get_toolbar (MidoriViewable* viewable)
{
GtkWidget* toolbar;
g_return_val_if_fail (MIDORI_IS_VIEWABLE (viewable), NULL);
toolbar = MIDORI_VIEWABLE_GET_IFACE (viewable)->get_toolbar (viewable);
if (!toolbar)
toolbar = gtk_toolbar_new ();
return toolbar;
}

61
midori/midori-viewable.h
View file

@ -1,61 +0,0 @@
/*
Copyright (C) 2008 Christian Dywan <christian@twotoasts.de>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
See the file COPYING for the full license text.
*/
#ifndef __MIDORI_VIEWABLE_H__
#define __MIDORI_VIEWABLE_H__
#include <katze/katze.h>
G_BEGIN_DECLS
#define MIDORI_TYPE_VIEWABLE \
(midori_viewable_get_type ())
#define MIDORI_VIEWABLE(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), MIDORI_TYPE_VIEWABLE, MidoriViewable))
#define MIDORI_IS_VIEWABLE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), MIDORI_TYPE_VIEWABLE))
#define MIDORI_VIEWABLE_GET_IFACE(inst) \
(G_TYPE_INSTANCE_GET_INTERFACE ((inst), MIDORI_TYPE_VIEWABLE, \
MidoriViewableIface))
typedef struct _MidoriViewable MidoriViewable;
typedef struct _MidoriViewableIface MidoriViewableIface;
struct _MidoriViewableIface
{
GTypeInterface base_iface;
/* Virtual functions */
const gchar*
(*get_stock_id) (MidoriViewable* viewable);
const gchar*
(*get_label) (MidoriViewable* viewable);
GtkWidget*
(*get_toolbar) (MidoriViewable* viewable);
};
GType
midori_viewable_get_type (void) G_GNUC_CONST;
const gchar*
midori_viewable_get_stock_id (MidoriViewable* viewable);
const gchar*
midori_viewable_get_label (MidoriViewable* viewable);
GtkWidget*
midori_viewable_get_toolbar (MidoriViewable* viewable);
G_END_DECLS
#endif /* __MIDORI_VIEWABLE_H__ */

23
midori/midori-viewable.vala Normal file
View file

@ -0,0 +1,23 @@
/*
Copyright (C) 2008 Christian Dywan <christian@twotoasts.de>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
See the file COPYING for the full license text.
*/
namespace Midori {
public interface Viewable {
public abstract unowned string get_stock_id ();
public abstract unowned string get_label ();
public abstract Gtk.Widget get_toolbar ();
/* Emitted when an Option menu is displayed, for instance
* when the user clicks the Options button in the panel.
* Deprecated: 0.2.3 */
public signal void populate_option_menu (Gtk.Menu menu);
}
}

1
midori/midori.h
View file

@ -22,7 +22,6 @@
#include "midori-preferences.h" #include "midori-preferences.h"
#include "midori-searchaction.h" #include "midori-searchaction.h"
#include "midori-view.h" #include "midori-view.h"
#include "midori-viewable.h"
#include "midori-websettings.h" #include "midori-websettings.h"
#include "midori-platform.h" #include "midori-platform.h"
#include <midori/midori-core.h> /* Vala API */ #include <midori/midori-core.h> /* Vala API */

2
panels/midori-bookmarks.c
View file

@ -16,7 +16,7 @@
#include "midori-browser.h" #include "midori-browser.h"
#include "midori-platform.h" #include "midori-platform.h"
#include "midori-view.h" #include "midori-view.h"
#include "midori-viewable.h" #include "midori-core.h"
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <string.h> #include <string.h>

1
panels/midori-extensions.c
View file

@ -14,7 +14,6 @@
#include "midori-app.h" #include "midori-app.h"
#include "midori-extension.h" #include "midori-extension.h"
#include "midori-platform.h" #include "midori-platform.h"
#include "midori-viewable.h"
#include "midori-core.h" #include "midori-core.h"
#include <glib/gi18n.h> #include <glib/gi18n.h>

2
panels/midori-history.c
View file

@ -16,7 +16,7 @@
#include "midori-browser.h" #include "midori-browser.h"
#include "midori-platform.h" #include "midori-platform.h"
#include "midori-view.h" #include "midori-view.h"
#include "midori-viewable.h" #include "midori-core.h"
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <string.h> #include <string.h>

1
panels/midori-transfers.c
View file

@ -15,6 +15,7 @@
#include "midori-browser.h" #include "midori-browser.h"
#include "midori-platform.h" #include "midori-platform.h"
#include "midori-view.h" #include "midori-view.h"
#include "midori-core.h"
#include <glib/gi18n.h> #include <glib/gi18n.h>

6
panels/midori-transfers.h
View file

@ -12,11 +12,7 @@
#ifndef __MIDORI_TRANSFERS_H__ #ifndef __MIDORI_TRANSFERS_H__
#define __MIDORI_TRANSFERS_H__ #define __MIDORI_TRANSFERS_H__
#include <gtk/gtk.h> #include "midori-core.h"
#include <katze/katze.h>
#include "midori-viewable.h"
G_BEGIN_DECLS G_BEGIN_DECLS