+2008-11-24 Claudio Saavedra <csaavedra@igalia.com>
+
+ Based on initial code by Christian Dywan (christian@imendio.com)
+
+ * doc/hildon-docs.sgml: Add section for hildon-main.
+ * examples/*.c: (main): Replace gtk_main() calls with hildon_gtk_main().
+ * src/Makefile.am: Add new hildon-main.[ch]
+ * src/hildon-defines.h: Update the icon sizes.
+ * src/hildon-main.c: (+hildon_init), (+hildon_gtk_init): Add
+ new library initialization files and register icon sizes.
+ * src/hildon-main.h: New declarations.
+ * src/hildon.h: Include hildon-main.h
+
+ Add new initialization functions to the library. These methods
+ will register the hildon specific icon sizes and can be used in the
+ future for other hildon specific bits.
+
+ Fixes: NB#92476 (Update icon size constants to Fremantle (hildon-defines.h))
+ Fixes: NB#93075 (Update icon size constants to Fremantle)
+
2008-11-21 Claudio Saavedra <csaavedra@igalia.com>
* src/hildon-window.c: (hildon_window_realize),
<chapter>
<title>Other</title>
+ <xi:include href="xml/hildon-main.xml"/>
<xi:include href="xml/hildon-gtk.xml"/>
<xi:include href="xml/hildon-sound.xml"/>
<xi:include href="xml/hildon-helper.xml"/>
HildonAppMenu *menu;
GtkAccelGroup *accel;
- gtk_init (&argc, &argv);
+ hildon_gtk_init (&argc, &argv);
label = gtk_label_new ("This is an example of the\nHildonAppMenu widget.\n\n"
"Click on the titlebar\nto pop up the menu.");
int
main (int argc,
- char **args)
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
GtkWidget *window = hildon_window_new ();
int
main (int argc,
- char **args)
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
GtkWidget *window = hildon_window_new ();
GtkCellRenderer *renderer;
GtkTreeViewColumn *column;
- gtk_init (&argc, &argv);
+ hildon_gtk_init (&argc, &argv);
/* Main window */
#if 1
GtkBox *hbox;
GtkWidget *align;
- gtk_init (&argc, &argv);
+ hildon_gtk_init (&argc, &argv);
vbox = GTK_BOX (gtk_vbox_new (FALSE, 10));
hbox = GTK_BOX (gtk_hbox_new (TRUE, 10));
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
GtkSizeGroup *size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
GtkWidget *table;
int i;
- gtk_init (&argc, &argv);
+ hildon_gtk_init (&argc, &argv);
win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
vbox = GTK_BOX (gtk_vbox_new (FALSE, 10));
int
main (int argc,
- char **args)
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (hildon_code_dialog_new ());
g_signal_connect (G_OBJECT (dialog), "input", G_CALLBACK (on_input), NULL);
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
GtkWidget *button = hildon_color_button_new ();
GtkWidget *label = gtk_label_new ("Pick the color:");
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
GtkWidget *chooser = hildon_color_chooser_new ();
int
main (int argc,
- char **args)
+ char **argv)
{
g_thread_init (NULL);
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
GtkWidget *window = hildon_window_new ();
}
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
GtkWidget *window = hildon_window_new ();
}
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
HildonProgram *program = NULL;
GtkWidget *window = NULL;
GtkWidget *button;
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
program = hildon_program_get_instance ();
g_set_application_name ("hildon-date-button-example");
}
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
guint y, m, d;
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
HildonDateEditor *date_editor = HILDON_DATE_EDITOR (hildon_date_editor_new ());
int
main (int argc,
- char **args)
+ char **argv)
{
HildonDialog *d, *d2;
GtkWidget *label, *label2;
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
/* First dialog, using hildon_dialog_new() */
GtkWidget *button;
GtkWidget *area;
- gtk_init (&argc, &argv);
+ hildon_gtk_init (&argc, &argv);
gtk_rc_parse_string ("style \"fremantle-widget\" {\n"
" GtkWidget::hildon-mode = 1\n"
GtkWidget *placeholderentry, *placeholderbutton, *placeholderhbox;
GtkBox *vbox;
- gtk_init (&argc, &argv);
+ hildon_gtk_init (&argc, &argv);
/* Window and vbox to pack everything */
win = hildon_stackable_window_new ();
}
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
GtkWidget *window = hildon_window_new ();
}
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
GtkDrawingArea *area = GTK_DRAWING_AREA (gtk_drawing_area_new ());
gtk_widget_set_size_request (GTK_WIDGET (area), 320, 240);
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (hildon_get_password_dialog_new (NULL, TRUE));
hildon_get_password_dialog_set_message ((HildonGetPasswordDialog *) dialog, "Enter secret password");
}
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
+
GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
GtkButton *button = GTK_BUTTON (gtk_button_new_with_label ("mute"));
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
HildonHVolumebar *bar_1 = HILDON_HVOLUMEBAR (hildon_hvolumebar_new ());
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
HildonHVolumebar *bar = HILDON_HVOLUMEBAR (hildon_hvolumebar_new ());
int
main (int argc,
- char **args)
+ char **argv)
{
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
g_timeout_add (2000, (GSourceFunc) on_idle, NULL);
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
+ g_debug ("Extra small pixel size: %d", HILDON_ICON_PIXEL_SIZE_XSMALL);
g_debug ("Small pixel size: %d", HILDON_ICON_PIXEL_SIZE_SMALL);
+ g_debug ("Stylus pixel size: %d", HILDON_ICON_PIXEL_SIZE_STYLUS);
+ g_debug ("Finger pixel size: %d", HILDON_ICON_PIXEL_SIZE_FINGER);
+ g_debug ("Thumb pixel size: %d", HILDON_ICON_PIXEL_SIZE_THUMB);
+ g_debug ("Large pixel size: %d", HILDON_ICON_PIXEL_SIZE_LARGE);
+ g_debug ("Extra large pixel size: %d", HILDON_ICON_PIXEL_SIZE_XLARGE);
g_debug ("Wizard pixel size: %d", HILDON_ICON_PIXEL_SIZE_WIZARD);
g_debug ("Toolbar pixel size: %d", HILDON_ICON_PIXEL_SIZE_TOOLBAR);
g_debug ("Note pixel size: %d", HILDON_ICON_PIXEL_SIZE_NOTE);
g_debug ("Big note pixel size: %d", HILDON_ICON_PIXEL_SIZE_BIG_NOTE);
-
+
return 0;
}
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonWindow *window = HILDON_WINDOW (hildon_window_new ());
GtkWidget *button = gtk_button_new_with_label ("Click me");
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
GtkWidget *window = hildon_window_new ();
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (hildon_login_dialog_new (NULL));
-
+
hildon_login_dialog_set_message ((HildonLoginDialog *) dialog, "Enter password to login");
gtk_widget_show_all (GTK_WIDGET (dialog));
}
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
gtk_window_set_title (GTK_WINDOW (dialog), "icons");
}
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
GtkWidget *window = hildon_window_new ();
int
main (int argc,
- char **args)
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
GtkWidget *editor = hildon_number_editor_new (2, 5);
GtkWidget *label = gtk_label_new ("Enter number:");
}
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
int i;
HildonProgram *program;
GtkWidget *window, *panarea, *button;
GtkWidget *hbox, *vbox;
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
program = hildon_program_get_instance ();
}
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
int i;
HildonProgram *program;
GtkCellRenderer *renderer;
GtkListStore *store;
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
program = hildon_program_get_instance ();
}
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
int i;
HildonProgram *program;
gboolean jump = FALSE;
GSList *stocks, *item;
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
program = hildon_program_get_instance ();
GtkWidget *padbox;
GtkWidget *button;
- gtk_init (&argc, &argv);
+ hildon_gtk_init (&argc, &argv);
gtk_rc_parse_string ("style \"fremantle-widget\" {\n"
" GtkWidget::hildon-mode = 1\n"
GtkWidget *padbox;
GtkWidget *button;
- gtk_init (&argc, &argv);
+ hildon_gtk_init (&argc, &argv);
gtk_rc_parse_string ("style \"fremantle-widget\" {\n"
" GtkWidget::hildon-mode = 1\n"
}
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
int i;
HildonProgram *program;
GtkCellRenderer *renderer;
GtkListStore *store;
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
program = hildon_program_get_instance ();
}
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
HildonProgram *program = NULL;
GtkWidget *window = NULL;
GtkWidget *button;
GtkWidget *selector;
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
program = hildon_program_get_instance ();
g_set_application_name ("hildon-picker-button-example");
}
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
HildonProgram *program = NULL;
GtkWidget *window = NULL;
GtkWidget *button;
GtkWidget *selector;
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
program = hildon_program_get_instance ();
g_set_application_name ("hildon-picker-button-example");
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
GtkWidget *window = hildon_window_new ();
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
HildonSeekbar *bar = HILDON_SEEKBAR (hildon_seekbar_new ());
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (hildon_set_password_dialog_new (NULL, TRUE));
hildon_set_password_dialog_set_message ((HildonSetPasswordDialog *) dialog, "Enter new password");
#include "hildon.h"
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (hildon_sort_dialog_new (NULL));
hildon_sort_dialog_add_sort_key (HILDON_SORT_DIALOG (dialog), "First key");
int
main (int argc,
- char **args)
+ char **argv)
{
GtkWidget *window;
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
g_set_application_name ("stack");
GtkWidget *textviewframe;
GtkBox *vbox;
- gtk_init (&argc, &argv);
+ hildon_gtk_init (&argc, &argv);
/* Window and vbox to pack everything */
win = hildon_stackable_window_new ();
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
GtkWidget *window = hildon_window_new ();
}
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
HildonProgram *program = NULL;
GtkWidget *window = NULL;
GtkWidget *button;
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
program = hildon_program_get_instance ();
g_set_application_name ("hildon-time-button-example");
#include "hildon.h"
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
HildonTimeEditor *time_editor = HILDON_TIME_EDITOR (hildon_time_editor_new ());
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (hildon_time_picker_new (NULL));
gtk_widget_show_all (GTK_WIDGET (dialog));
}
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
window = HILDON_WINDOW (hildon_window_new ());
int
main (int argc,
- char **args)
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
GtkWidget *window = hildon_window_new ();
hildon_program_add_window (program, HILDON_WINDOW (window));
- gtk_init (&argc, &args);
-
HildonSeekbar *bar = HILDON_SEEKBAR (hildon_seekbar_new ());
gtk_widget_set_size_request (GTK_WIDGET (bar), 400, -1);
};
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
HildonProgram *program = NULL;
GtkWidget *window = NULL;
GtkWidget *selector;
gint i;
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
program = hildon_program_get_instance ();
g_set_application_name
}
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
HildonProgram *program = NULL;
GtkWidget *window = NULL;
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
program = hildon_program_get_instance ();
g_set_application_name
}
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
HildonProgram *program = NULL;
GtkWidget *window = NULL;
- gtk_init (&argc, &args);
+ hildon_gtk_init (&argc, &argv);
program = hildon_program_get_instance ();
g_set_application_name
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
HildonVVolumebar *bar = HILDON_VVOLUMEBAR (hildon_vvolumebar_new ());
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkDialog *dialog = GTK_DIALOG (gtk_dialog_new ());
GtkWidget *picker = hildon_weekday_picker_new ();
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
GtkWidget *window = hildon_window_new ();
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
GtkWidget *window = hildon_window_new ();
#include "hildon.h"
int
-main (int argc,
- char **args)
+main (int argc,
+ char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
HildonProgram *program = hildon_program_get_instance ();
GtkWidget *window = hildon_window_new ();
}
int
-main (int argc, char **args)
+main (int argc, char **argv)
{
- gtk_init (&argc, &args);
-
+ hildon_gtk_init (&argc, &argv);
+
GtkWidget *notebook = gtk_notebook_new ();
GtkWidget *label_1 = gtk_label_new ("Page 1");
GtkWidget *label_2 = gtk_label_new ("Page 2");
hildon-button.c \
hildon-check-button.c \
hildon-gtk.c \
- hildon-dialog.c
+ hildon-dialog.c \
+ hildon-main.c
libhildon_@API_VERSION_MAJOR@_built_public_headers = \
hildon-enum-types.h \
hildon-button.h \
hildon-check-button.h \
hildon-gtk.h \
- hildon-version.h
+ hildon-version.h \
+ hildon-main.h
libhildon_@API_VERSION_MAJOR@_include_HEADERS = \
$(libhildon_@API_VERSION_MAJOR@_public_headers) \
G_BEGIN_DECLS
-#define HILDON_ICON_SIZE_SMALL \
- gtk_icon_size_from_name ("gtk-menu")
+/* New hildon icon sizes. */
+
+#define HILDON_ICON_SIZE_XSMALL gtk_icon_size_from_name ("hildon-xsmall")
+
+#define HILDON_ICON_SIZE_SMALL gtk_icon_size_from_name ("hildon-small")
+
+#define HILDON_ICON_SIZE_STYLUS gtk_icon_size_from_name ("hildon-stylus")
+
+#define HILDON_ICON_SIZE_FINGER gtk_icon_size_from_name ("hildon-finger")
+
+#define HILDON_ICON_SIZE_THUMB gtk_icon_size_from_name ("hildon-thumb")
+
+#define HILDON_ICON_SIZE_LARGE gtk_icon_size_from_name ("hildon-large")
+
+#define HILDON_ICON_SIZE_XLARGE gtk_icon_size_from_name ("hildon-xlarge")
+
+/* Old hildon icon sizes. To be removed. */
#define HILDON_ICON_SIZE_TOOLBAR \
gtk_icon_size_from_name ("gtk-menu")
/* Actual icon sizes */
+/* New sizes */
+#define HILDON_ICON_PIXEL_SIZE_XSMALL \
+ hildon_get_icon_pixel_size (HILDON_ICON_SIZE_XSMALL)
+
#define HILDON_ICON_PIXEL_SIZE_SMALL \
hildon_get_icon_pixel_size (HILDON_ICON_SIZE_SMALL)
+#define HILDON_ICON_PIXEL_SIZE_STYLUS \
+ hildon_get_icon_pixel_size (HILDON_ICON_SIZE_STYLUS)
+
+#define HILDON_ICON_PIXEL_SIZE_FINGER \
+ hildon_get_icon_pixel_size (HILDON_ICON_SIZE_FINGER)
+
+#define HILDON_ICON_PIXEL_SIZE_THUMB \
+ hildon_get_icon_pixel_size (HILDON_ICON_SIZE_THUMB)
+
+#define HILDON_ICON_PIXEL_SIZE_LARGE \
+ hildon_get_icon_pixel_size (HILDON_ICON_SIZE_LARGE)
+
+#define HILDON_ICON_PIXEL_SIZE_XLARGE \
+ hildon_get_icon_pixel_size (HILDON_ICON_SIZE_XLARGE)
+
+/* old sizes */
#define HILDON_ICON_PIXEL_SIZE_TOOLBAR \
hildon_get_icon_pixel_size (HILDON_ICON_SIZE_TOOLBAR)
--- /dev/null
+/*
+ * This file is part of the hildon library
+ *
+ * Copyright (C) 2008 Nokia Corporation, all rights reserved.
+ *
+ * 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; version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+/**
+ * SECTION:hildon-main
+ * @Short_Description: Library initialization.
+ *
+ */
+
+
+#include <gtk/gtk.h>
+#include "hildon-main.h"
+
+/**
+ * hildon_init:
+ * @argc: Address of the <parameter>argc</parameter>
+ * parameter of your main() function. Changed if any arguments were
+ * handled.
+ * @argv: Address of the <parameter>argv</parameter>
+ * parameter of main(). Any parameters understood by hildon_init()
+ * are stripped before return.
+ *
+ * Initializes the hildon library. Call this function after calling gtk_init()
+ * and before using any hildon or GTK+ functions in your program.
+ *
+ **/
+void
+hildon_init (void)
+{
+ /* Register icon sizes */
+ gtk_icon_size_register ("hildon-xsmall", 16, 16);
+ gtk_icon_size_register ("hildon-small", 24, 24);
+ gtk_icon_size_register ("hildon-stylus", 32, 32);
+ gtk_icon_size_register ("hildon-finger", 48, 48);
+ gtk_icon_size_register ("hildon-thumb", 64, 64);
+ gtk_icon_size_register ("hildon-large", 96, 96);
+ gtk_icon_size_register ("hildon-xlarge", 128, 128);
+}
+
+/**
+ * hildon_gtk_init:
+ * @argc: Address of the <parameter>argc</parameter>
+ * parameter of your main() function. Changed if any arguments were
+ * handled.
+ * @argv: Address of the <parameter>argv</parameter>
+ * parameter of main(). Any parameters understood by gtk_init()
+ * are stripped before return.
+ *
+ * Convenience function to initialize the GTK+ and hildon
+ * libraries. Use this function to replace a call to gtk_init() and also
+ * initialize the hildon library. See hildon_init() and gtk_init() for details.
+ *
+ **/
+void
+hildon_gtk_init (int *argc, char ***argv)
+{
+ gtk_init (argc, argv);
+ hildon_init ();
+}
--- /dev/null
+/*
+ * This file is part of the hildon library
+ *
+ * Copyright (C) 2008 Nokia Corporation, all rights reserved.
+ *
+ * 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; version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+G_BEGIN_DECLS
+
+void hildon_init (void);
+void hildon_gtk_init (int *argc, char ***argv);
+
+G_END_DECLS
#include "hildon-check-button.h"
#include "hildon-gtk.h"
#include "hildon-dialog.h"
+#include "hildon-main.h"
#endif