Editing Documentation/Maemo 5 Developer Guide/Porting Software/Porting MaemoPad
Warning: You are not logged in.
Your IP address will be recorded in this page's edit history.
The edit can be undone.
Please check the comparison below to verify that this is what you want to do, and then save the changes below to finish undoing the edit.
Latest revision | Your text | ||
Line 1: | Line 1: | ||
- | + | == Porting MaemoPad from Diablo to Fremantle == | |
- | + | This is a practical example of porting a Diablo (Maemo 4.1) application to Fremantle (Maemo 5). The example application, MaemoPad, is a simple Notepad-like editor. | |
+ | <div align="CENTER"> | ||
+ | |||
+ | {| summary="MaemoPad" | ||
+ | |+ align="BOTTOM" |'''Figure:''' MaemoPad | ||
+ | |- | ||
+ | | | ||
+ | [[Image:maemopad.png|MaemoPad]] | ||
+ | |} | ||
+ | |||
+ | </div> | ||
- | |||
Porting from Diablo to Fremantle involved mostly changes in GTK+- and Hildon-specific parts of the code, because newer versions of these libraries are now in use, and because of the new Fremantle GUI guidelines. This subsection will first explain how to install MaemoPad, and then proceeds to describing the main changes in the code. The reader is recommended to familiarize with chapters [[Documentation/Maemo 5 Developer Guide/Application Development|Application Development]] and [[Documentation/Maemo 5 Developer Guide/Human Interface Guidelines|Human Interface Guidelines]] before this one. For reference, see GTK+ and Hildon APIs from [http://maemo.org/development/sdks/maemo_5_api_documentation/ Maemo Fremantle APIs]. | Porting from Diablo to Fremantle involved mostly changes in GTK+- and Hildon-specific parts of the code, because newer versions of these libraries are now in use, and because of the new Fremantle GUI guidelines. This subsection will first explain how to install MaemoPad, and then proceeds to describing the main changes in the code. The reader is recommended to familiarize with chapters [[Documentation/Maemo 5 Developer Guide/Application Development|Application Development]] and [[Documentation/Maemo 5 Developer Guide/Human Interface Guidelines|Human Interface Guidelines]] before this one. For reference, see GTK+ and Hildon APIs from [http://maemo.org/development/sdks/maemo_5_api_documentation/ Maemo Fremantle APIs]. | ||
Line 10: | Line 19: | ||
=== Installing MaemoPad === | === Installing MaemoPad === | ||
- | MaemoPad can be installed and tested in the | + | MaemoPad can be installed and tested in the scratchbox environment. |
* If not already activated, activate the X86 target, go to the testing directory, and download the source package of maemopad application. | * If not already activated, activate the X86 target, go to the testing directory, and download the source package of maemopad application. | ||
- | + | [sbox-FREMANTLE_ARMEL] > sb-conf select FREMANTLE_X86 | |
- | [sbox-FREMANTLE_ARMEL] > sb-conf select FREMANTLE_X86 | + | [sbox-FREMANTLE_X86 ~] > mkdir maemopad |
- | [sbox-FREMANTLE_X86 ~] > mkdir maemopad | + | [sbox-FREMANTLE_X86 ~/maemopad] > cd maemopad |
- | [sbox-FREMANTLE_X86 ~/maemopad] > cd maemopad | + | [sbox-FREMANTLE_X86 ~/maemopad] > apt-get source maemopad |
- | [sbox-FREMANTLE_X86 ~/maemopad] > apt-get source maemopad | + | ...apt output... |
- | ...apt output... | + | |
- | + | ||
* Check that you have the correct files. | * Check that you have the correct files. | ||
- | + | ||
- | + | [sbox-FREMANTLE_X86: ~/maemopad] > ls -l | |
- | [sbox-FREMANTLE_X86: ~/maemopad] > ls -l | + | total 352 |
- | total 352 | + | drwxrwxr-x 6 maemo maemo 4096 Jul 28 14:09 maemopad-2.5 |
- | drwxrwxr-x 6 maemo maemo 4096 Jul 28 14:09 maemopad-2.5 | + | -rw-rw-r-- 1 maemo maemo 465 Jul 6 16:02 maemopad_2.5.dsc |
- | -rw-rw-r-- 1 maemo maemo 465 Jul 6 16:02 maemopad_2.5.dsc | + | -rw-rw-r-- 1 maemo maemo 346129 Jul 6 16:02 maemopad_2.5.tar.gz |
- | -rw-rw-r-- 1 maemo maemo 346129 Jul 6 16:02 maemopad_2.5.tar.gz | + | |
- | + | ||
* Go to the <code>maemopad-2.5</code> source directory, and build the maemopad package with <code>dpkg-buildpackage</code> command as shown here: | * Go to the <code>maemopad-2.5</code> source directory, and build the maemopad package with <code>dpkg-buildpackage</code> command as shown here: | ||
- | + | ||
- | + | [sbox-FREMANTLE_X86: ~/maemopad] > cd maemopad-2.5 | |
- | [sbox-FREMANTLE_X86: ~/maemopad] > cd maemopad-2.5 | + | [sbox-FREMANTLE_X86: ~/maemopad/maemopad-2.5] > dpkg-buildpackage -rfakeroot |
- | [sbox-FREMANTLE_X86: ~/maemopad/maemopad-2.5] > dpkg-buildpackage -rfakeroot | + | dpkg-buildpackage: source package is maemopad |
- | dpkg-buildpackage: source package is maemopad | + | dpkg-buildpackage: source version is 2.5 |
- | dpkg-buildpackage: source version is 2.5 | + | dpkg-buildpackage: source changed by Soumya Bijjal <soumya.3.bijjal@nokia.com> |
- | dpkg-buildpackage: source changed by Soumya Bijjal <soumya.3.bijjal@nokia.com> | + | dpkg-buildpackage: host architecture i386 |
- | dpkg-buildpackage: host architecture i386 | + | dpkg-buildpackage: source version without epoch 2.3 |
- | dpkg-buildpackage: source version without epoch 2.3 | + | .... etc .... |
- | .... etc .... | + | |
- | + | ||
* Install the newly compiled <code>maemopad_2.5_i386.deb</code> file inside the Scratchbox environment: | * Install the newly compiled <code>maemopad_2.5_i386.deb</code> file inside the Scratchbox environment: | ||
- | + | ||
- | + | [sbox-FREMANTLE_X86: ~/maemopad] > dpkg -i maemopad_2.5_i386.deb | |
- | [sbox-FREMANTLE_X86: ~/maemopad] > dpkg -i maemopad_2.5_i386.deb | + | ... output from dpkg ... |
- | ... output from dpkg ... | + | |
- | + | ||
* Make sure you have the SDK UI running in Xephyr. | * Make sure you have the SDK UI running in Xephyr. | ||
Line 57: | Line 58: | ||
The MaemoPad source code resides in folder <code>maemopad-2.5/src:</code> | The MaemoPad source code resides in folder <code>maemopad-2.5/src:</code> | ||
- | + | [sbox-FREMANTLE_X86: ~/maemopad] ls maemopad-2.5/src | |
- | [sbox-FREMANTLE_X86: ~/maemopad] ls maemopad-2.5/src | + | total 280 |
- | total 280 | + | -rw-rw-r-- 1 maemo maemo 25491 Jul 28 15:45 Makefile |
- | -rw-rw-r-- 1 maemo maemo 25491 Jul 28 15:45 Makefile | + | -rw-rw-r-- 1 maemo maemo 491 Jul 28 14:09 Makefile.am |
- | -rw-rw-r-- 1 maemo maemo 491 Jul 28 14:09 Makefile.am | + | -rw-rw-r-- 1 maemo maemo 23238 Jul 28 14:09 Makefile.in |
- | -rw-rw-r-- 1 maemo maemo 23238 Jul 28 14:09 Makefile.in | + | -rwxrwxr-x 1 maemo maemo 83433 Jul 28 15:45 maemopad |
- | -rwxrwxr-x 1 maemo maemo 83433 Jul 28 15:45 maemopad | + | -rw-rw-r-- 1 maemo maemo 82928 Jul 28 15:45 maemopad-maemopad-window.o |
- | -rw-rw-r-- 1 maemo maemo 82928 Jul 28 15:45 maemopad-maemopad-window.o | + | -rw-rw-r-- 1 maemo maemo 18564 Jul 28 15:45 maemopad-main.o |
- | -rw-rw-r-- 1 maemo maemo 18564 Jul 28 15:45 maemopad-main.o | + | -rw-rw-r-- 1 maemo maemo 20400 Jul 28 14:09 maemopad-window.c |
- | -rw-rw-r-- 1 maemo maemo 20400 Jul 28 14:09 maemopad-window.c | + | -rw-rw-r-- 1 maemo maemo 2391 Jul 28 14:09 maemopad-window.h |
- | -rw-rw-r-- 1 maemo maemo 2391 Jul 28 14:09 maemopad-window.h | + | -rw-rw-r-- 1 maemo maemo 2193 Jul 28 14:09 main.c |
- | -rw-rw-r-- 1 maemo maemo 2193 Jul 28 14:09 main.c | + | |
- | + | ||
For comparison, the Diablo version of MaemoPad can also be examined: | For comparison, the Diablo version of MaemoPad can also be examined: | ||
- | + | [sbox-FREMANTLE_X86: ~/maemopad] > svn export https://vcs.maemo.org/svn/\ | |
- | [sbox-FREMANTLE_X86: ~/maemopad] > svn export https://vcs.maemo.org/svn/\ | + | maemoexamples/tags/maemo_4.1/maemopad diablo_maemopad |
- | maemoexamples/tags/maemo_4.1/maemopad diablo_maemopad | + | [sbox-FREMANTLE_X86: ~/src] ls -lR diablo_maemopad/src |
- | [sbox-FREMANTLE_X86: ~/src] ls -lR diablo_maemopad/src | + | diablo_maemopad/src/: |
- | diablo_maemopad/src/: | + | total 16 |
- | total 16 | + | -rw-rw-r-- 1 maemo maemo 537 May 15 2008 Makefile.am |
- | -rw-rw-r-- 1 maemo maemo 537 May 15 2008 Makefile.am | + | -rw-rw-r-- 1 maemo maemo 557 May 15 2008 appdata.h |
- | -rw-rw-r-- 1 maemo maemo 557 May 15 2008 appdata.h | + | -rw-rw-r-- 1 maemo maemo 2789 Dec 3 2008 main.c |
- | -rw-rw-r-- 1 maemo maemo 2789 Dec 3 2008 main.c | + | drwxrwxr-x 2 maemo maemo 4096 Aug 20 11:53 ui |
- | drwxrwxr-x 2 maemo maemo 4096 Aug 20 11:53 ui | + | |
- | + | diablo_maemopad/src/ui: | |
- | diablo_maemopad/src/ui: | + | total 36 |
- | total 36 | + | -rw-rw-r-- 1 maemo maemo 12163 Dec 3 2008 callbacks.c |
- | -rw-rw-r-- 1 maemo maemo 12163 Dec 3 2008 callbacks.c | + | -rw-rw-r-- 1 maemo maemo 1682 Oct 29 2008 callbacks.h |
- | -rw-rw-r-- 1 maemo maemo 1682 Oct 29 2008 callbacks.h | + | -rw-rw-r-- 1 maemo maemo 14982 Dec 3 2008 interface.c |
- | -rw-rw-r-- 1 maemo maemo 14982 Dec 3 2008 interface.c | + | -rw-rw-r-- 1 maemo maemo 2695 Dec 3 2008 interface.h |
- | -rw-rw-r-- 1 maemo maemo 2695 Dec 3 2008 interface.h | + | |
- | + | ||
=== Code reorganization === | === Code reorganization === | ||
Line 106: | Line 103: | ||
maemopad-window.c | maemopad-window.c | ||
- | + | ||
- | #include <gdk/gdkkeysyms.h | + | #include <gdk/gdkkeysyms.h> |
- | + | ||
to include GDK definition for key "f", <code>GDK_f</code> to replace the earlier <code>HILDON_HARDKEY_FULLSCREEN</code>. Callback for Esc was completely removed. The full-screen action itself was principally unchanged. The key event function was modified correspondingly: | to include GDK definition for key "f", <code>GDK_f</code> to replace the earlier <code>HILDON_HARDKEY_FULLSCREEN</code>. Callback for Esc was completely removed. The full-screen action itself was principally unchanged. The key event function was modified correspondingly: | ||
- | Diablo callbacks.c | + | Diablo callbacks.c |
- | + | gboolean key_press(GtkWidget * widget, GdkEventKey * event, | |
- | gboolean key_press(GtkWidget * widget, GdkEventKey * event, | + | gpointer data) |
- | + | { | |
- | { | + | ... |
- | + | if (event->keyval == HILDON_HARDKEY_FULLSCREEN && !keypressed){ | |
- | + | keypressed = TRUE; | |
- | + | ... | |
- | + | if (event->keyval == HILDON_HARDKEY_ESC && !keypressed){ | |
- | + | keypressed = TRUE; | |
- | + | ... | |
- | + | ||
- | + | ||
- | + | ||
Fremantle maemopad-window.c | Fremantle maemopad-window.c | ||
- | + | static gboolean maemopad_window_on_key_press(GtkWidget *widget, GdkEventKey *event, | |
- | static gboolean maemopad_window_on_key_press(GtkWidget *widget, GdkEventKey *event, | + | gpointer data) |
- | + | { | |
- | { | + | ... |
- | + | if (event->keyval == GDK_f && (event->state & GDK_CONTROL_MASK) && !self- >key_pressed) { | |
- | + | self->key_pressed = TRUE; | |
- | + | ... | |
- | + | ||
- | + | ||
=== Dropped libraries === | === Dropped libraries === | ||
Line 142: | Line 134: | ||
Hildon help library, libhildonhelp, was dropped from Fremantle so all dependencies to it had to be removed. | Hildon help library, libhildonhelp, was dropped from Fremantle so all dependencies to it had to be removed. | ||
- | libhildonhelp-dev needs to removed from build | + | libhildonhelp-dev needs to removed from build depencies: |
Diablo: debian/control: | Diablo: debian/control: | ||
- | + | Build-Depends: debhelper (>= 4.0.0), intltool, | |
- | Build-Depends: debhelper (>= 4.0.0), intltool, | + | libhildon1-dev, libgtk2.0-dev, libosso-gnomevfs2-dev, |
- | + | libglib2.0-dev, libdbus-glib-1-dev, libosso-dev, libmodest-dbus-client-dev, | |
- | + | conbtdialogs-dev,libhildonhelp-dev, libhildonfm2-dev, osso-af-settings | |
- | + | ||
- | + | ||
Fremantle: debian/control: | Fremantle: debian/control: | ||
- | + | Build-Depends: debhelper (>= 4.0.0), intltool, | |
- | Build-Depends: debhelper (>= 4.0.0), intltool, | + | libhildon1-dev, libgtk2.0-dev, libosso-gnomevfs2-dev, |
- | + | libglib2.0-dev, libdbus-glib-1-dev, libosso-dev, libmodest-dbus-client-dev, | |
- | + | conbtdialogs-dev, libhildonfm2-dev, osso-af-settings | |
- | + | ||
- | + | ||
Callback and all other help stuff removed: | Callback and all other help stuff removed: | ||
Line 166: | Line 154: | ||
Diablo callbacks.c | Diablo callbacks.c | ||
- | + | /* help */ | |
- | /* help */ | + | void callback_help( GtkAction * action, gpointer data ) |
- | void callback_help( GtkAction * action, gpointer data ) | + | { |
- | { | + | osso_return_t retval; |
- | + | /* connect pointer to our AppUIData struct */ | |
- | + | AppUIData *mainview = NULL; | |
- | + | mainview = ( AppUIData * ) data; | |
- | + | g_assert(mainview != NULL && mainview->data != NULL ); | |
- | + | retval = hildon_help_show( | |
- | + | mainview->data->osso, /* osso_context */ | |
- | + | HELP_TOPIC_ID, /* topic id */ | |
- | + | HILDON_HELP_SHOW_DIALOG); | |
- | + | } | |
- | } | + | |
- | + | ||
Diablo interface.c | Diablo interface.c | ||
- | + | GtkWidget *help = NULL; | |
- | GtkWidget *help = NULL; | + | help = gtk_menu_item_new_with_label( _("Help") ); |
- | help = gtk_menu_item_new_with_label( _("Help") ); | + | gtk_menu_append( main_menu, help ); |
- | gtk_menu_append( main_menu, help ); | + | g_signal_connect( G_OBJECT( help ), "activate", |
- | g_signal_connect( G_OBJECT( help ), "activate", | + | G_CALLBACK ( callback_help ), main ); |
- | + | ||
- | + | ||
Diablo callbacks.c | Diablo callbacks.c | ||
- | + | #include <hildon/hildon-help.h> | |
- | #include <hildon/hildon-help.h> | + | #define HELP_TOPIC_ID "Example_MaemoPad_Content" |
- | #define HELP_TOPIC_ID "Example_MaemoPad_Content" | + | |
- | + | ||
Diablo configure.ac: | Diablo configure.ac: | ||
- | + | PKG_CHECK_MODULES(HILDON, hildon-1 hildon-fm-2 hildon-help conbtdialogs) | |
- | PKG_CHECK_MODULES(HILDON, hildon-1 hildon-fm-2 hildon-help conbtdialogs) | + | |
- | + | ||
Fremantle configure.ac: | Fremantle configure.ac: | ||
- | + | ||
- | + | PKG_CHECK_MODULES(HILDON, hildon-1 hildon-fm-2 conbtdialogs) | |
- | PKG_CHECK_MODULES(HILDON, hildon-1 hildon-fm-2 conbtdialogs) | + | |
- | + | ||
Removed data/help directory which contained an example help file. | Removed data/help directory which contained an example help file. | ||
Line 216: | Line 194: | ||
Diablo data/Makefile.am: | Diablo data/Makefile.am: | ||
- | + | ||
- | + | helpfile_engb_DATA = help/en_GB/MaemoPad.xml | |
- | helpfile_engb_DATA = help/en_GB/MaemoPad.xml | + | -EXTRA_DIST = $(serviceentry_DATA) $(desktopentry_DATA) $(icon_26x26_DATA) $(icon_40x40_DATA) |
- | -EXTRA_DIST = $(serviceentry_DATA) $(desktopentry_DATA) $(icon_26x26_DATA) $(icon_40x40_DATA) | + | $(icon_scalable_DATA) *$(helpfile_engb_DATA)* |
- | $(icon_scalable_DATA) *$(helpfile_engb_DATA)* | + | |
- | + | ||
Diablo data/Makefile.am: | Diablo data/Makefile.am: | ||
- | + | # Help file install directory | |
- | # Help file install directory | + | helpfile_engbdir=$datadir/hildon-help/en_GB |
- | helpfile_engbdir=$datadir/hildon-help/en_GB | + | AC_SUBST(helpfile_engbdir) |
- | AC_SUBST(helpfile_engbdir) | + | |
- | + | ||
=== GUI design changes === | === GUI design changes === | ||
Line 237: | Line 212: | ||
Diablo interface.h | Diablo interface.h | ||
- | + | /* Toolbar */ | |
- | /* Toolbar */ | + | GtkWidget* toolbar; |
- | GtkWidget* toolbar; | + | GtkWidget* iconw; |
- | GtkWidget* iconw; | + | GtkToolItem* new_tb; |
- | GtkToolItem* new_tb; | + | GtkToolItem* open_tb; |
- | GtkToolItem* open_tb; | + | ... |
- | ... | + | GtkToolItem* fullscreen_tb; |
- | GtkToolItem* fullscreen_tb; | + | |
- | + | ||
- | Also the menu system was changed. In Diablo, a | + | Also the menu system was changed. In Diablo, a GtkMenu was used, but it was replaced with a HildonAppMenu in Fremantle, as shown in Figure: |
- | [[Image:maemopad_menu.png | + | <div align="CENTER"> |
+ | |||
+ | {| summary="MaemoPad Menu" | ||
+ | |+ align="BOTTOM" |'''Figure:''' MaemoPad Menu | ||
+ | |- | ||
+ | | | ||
+ | <div align="CENTER">[[Image:maemopad_menu.png|MaemoPad menu]]</div> | ||
+ | |} | ||
+ | |||
+ | </div> | ||
Function <code>create_menu()</code> is responsible for creating the menus in both versions: | Function <code>create_menu()</code> is responsible for creating the menus in both versions: | ||
Line 255: | Line 237: | ||
Diablo interface.c | Diablo interface.c | ||
- | + | static void create_menu( AppUIData *main ) | |
- | static void create_menu( AppUIData *main ) | + | { |
- | { | + | /* Create needed handles */ |
- | + | GtkMenu *main_menu; | |
- | + | GtkWidget *file_menu, *edit_menu, *sendvia_menu; | |
- | + | GtkWidget *separator = NULL; | |
- | + | GtkWidget *close = NULL; | |
- | + | /* Create main menu and new menus for submenus in our drop down menu */ | |
- | + | main_menu = GTK_MENU( gtk_menu_new () ); | |
- | + | file_menu = gtk_menu_new (); | |
- | + | edit_menu = gtk_menu_new (); | |
- | + | sendvia_menu = gtk_menu_new (); | |
- | + | /* Create the menu items */ | |
- | + | main->file_item = gtk_menu_item_new_with_label ( _("File") ); | |
- | + | main->new_item = gtk_menu_item_new_with_label ( _("New") ); | |
- | + | main->open_item = gtk_menu_item_new_with_label ( _("Open") ); | |
- | + | ... | |
- | + | /* Add menu items to right menus */ | |
- | + | gtk_menu_append( main_menu, main->file_item ); | |
- | + | gtk_menu_append( file_menu, main->new_item ); | |
- | + | gtk_menu_append( file_menu, main->open_item ); | |
- | + | ... | |
- | + | gtk_menu_append( main_menu, close ); | |
- | + | /* Add submenus to the right items */ | |
- | + | gtk_menu_item_set_submenu( GTK_MENU_ITEM (main->file_item), file_menu ); | |
- | + | gtk_menu_item_set_submenu( GTK_MENU_ITEM (main->edit_item), edit_menu ); | |
- | + | gtk_menu_item_set_submenu( GTK_MENU_ITEM (main->sendvia_item), sendvia_menu ); | |
- | + | /* Attach the callback functions to the activate signal */ | |
- | + | g_signal_connect( G_OBJECT( main->new_item ), "activate", | |
- | + | G_CALLBACK ( callback_file_new), main ); | |
- | + | g_signal_connect( G_OBJECT( main->open_item ), "activate", | |
- | + | G_CALLBACK ( callback_file_open), main ); | |
- | + | ... | |
- | + | g_signal_connect( G_OBJECT( close ), "activate", gtk_main_quit, NULL ); | |
- | + | /* Add menu to HildonWindow */ | |
- | + | hildon_window_set_menu(main->data->window, main_menu); | |
- | + | /* We need to show menu items */ | |
- | + | gtk_widget_show_all( GTK_WIDGET( main_menu ) ); | |
- | + | } | |
- | } | + | |
- | + | ||
Fremantle maemopad-window.c | Fremantle maemopad-window.c | ||
- | + | static GtkWidget* add_menu_item (GtkWidget *main_menu, const gchar* title, | |
- | static GtkWidget* add_menu_item (GtkWidget *main_menu, const gchar* title, | + | GCallback clicked_callback, gpointer user_data) |
- | + | { | |
- | { | + | HildonAppMenu *app_menu = HILDON_APP_MENU (main_menu); |
- | + | /* Create a button, add it, and return it: */ | |
- | + | GtkWidget *button = hildon_button_new_with_text (HILDON_SIZE_AUTO, | |
- | + | HILDON_BUTTON_ARRANGEMENT_VERTICAL, title, NULL); | |
- | + | gtk_widget_show (button); | |
- | + | g_signal_connect_after (button, "clicked", | |
- | + | G_CALLBACK (clicked_callback), user_data); | |
- | + | hildon_app_menu_append (app_menu, GTK_BUTTON (button)); | |
- | + | return button; | |
- | + | } | |
- | } | + | /* Create the menu items needed: */ |
- | /* Create the menu items needed: */ | + | static void create_menu (MaemopadWindow *self) |
- | static void create_menu (MaemopadWindow *self) | + | { |
- | { | + | /* Create needed handles */ |
- | + | GtkWidget *main_menu = hildon_app_menu_new (); | |
- | + | /* Create the menu items */ | |
- | + | self->new_item = add_menu_item (main_menu, _("New"), | |
- | + | G_CALLBACK (&maemopad_window_on_menu_file_new), self); | |
- | + | self->open_item = add_menu_item (main_menu, _("Open"), | |
- | + | G_CALLBACK (&maemopad_window_on_menu_file_open), self); | |
- | + | ... | |
- | + | self->close_item = add_menu_item (main_menu, _("Close"), | |
- | + | G_CALLBACK (&maemopad_window_on_menu_close), self); | |
- | + | /* Add menu to HildonWindow */ | |
- | + | hildon_window_set_app_menu ( | |
- | + | HILDON_WINDOW (self), | |
- | + | HILDON_APP_MENU (main_menu)); | |
- | + | /* We need to show menu items */ | |
- | + | gtk_widget_show_all (GTK_WIDGET (main_menu)); | |
- | + | } | |
- | } | + | |
- | + | ||
As a result to changes in the .c file, the following menu widget declarations used in Diablo became unnecessary: | As a result to changes in the .c file, the following menu widget declarations used in Diablo became unnecessary: | ||
Line 339: | Line 319: | ||
Diablo interface.h | Diablo interface.h | ||
- | + | GtkWidget *file_item; | |
- | GtkWidget *file_item; | + | GtkWidget *edit_item; |
- | GtkWidget *edit_item; | + | GtkWidget *sendvia_item; |
- | GtkWidget *sendvia_item; | + | |
- | + | ||
- | Menu callbacks were also changed. There were some changes in the callbacks themselves as a result of code reorganizations, but the main change from the menu viewpoint was that the 1st arguments of the callbacks were changed from | + | |
+ | |||
+ | Menu callbacks were also changed. There were some changes in the callbacks themselves as a result of code reorganizations, but the main change from the menu viewpoint was that the 1st arguments of the callbacks were changed from GtkAction to GtkButton, like in the following example: | ||
Diablo callbacks.c | Diablo callbacks.c | ||
- | + | void callback_file_new(GtkAction * action, gpointer data) | |
- | void callback_file_new(GtkAction * action, gpointer data) | + | |
- | + | ||
Fremantle maemopad-window.c | Fremantle maemopad-window.c | ||
- | + | static void maemopad_window_on_menu_file_new (GtkButton *button, gpointer data) | |
- | static void maemopad_window_on_menu_file_new (GtkButton *button, gpointer data) | + | |
- | + | ||
=== Other updates in GTK+ and Hildon === | === Other updates in GTK+ and Hildon === | ||
+ | |||
<ul> | <ul> | ||
<li> | <li> | ||
Rich text support was changed with the new GTK+, as described in [http://live.gnome.org/Maemo/Gtk210Migration Maemo-GTK+ 2.6 to 2.10 Migration].This required editing two lines: | Rich text support was changed with the new GTK+, as described in [http://live.gnome.org/Maemo/Gtk210Migration Maemo-GTK+ 2.6 to 2.10 Migration].This required editing two lines: | ||
+ | <br /><br /> | ||
+ | Part of function create_textarea() in Diablo interface.c | ||
- | + | <pre> | |
- | + | ||
- | + | ||
/* Enable Rich Text Support */ | /* Enable Rich Text Support */ | ||
gtk_text_buffer_set_can_paste_rich_text ( main->buffer, TRUE ); | gtk_text_buffer_set_can_paste_rich_text ( main->buffer, TRUE ); | ||
gtk_text_buffer_set_rich_text_format ( main->buffer, "RTF" ); | gtk_text_buffer_set_rich_text_format ( main->buffer, "RTF" ); | ||
- | </ | + | </pre> |
- | Part of function | + | Part of function create_textarea() in Fremantle maemopad-window.c |
- | < | + | <pre> |
/* Enable Rich Text Support */ | /* Enable Rich Text Support */ | ||
gtk_text_buffer_register_serialize_tagset (self->buffer, "RTF"); | gtk_text_buffer_register_serialize_tagset (self->buffer, "RTF"); | ||
gtk_text_buffer_register_deserialize_tagset (self->buffer, "RTF"); | gtk_text_buffer_register_deserialize_tagset (self->buffer, "RTF"); | ||
- | </ | + | </pre> |
</li> | </li> | ||
- | |||
- | |||
+ | <li> | ||
+ | HildonFontSelectionDialog was deprecated and replaced with a GtkFontButton. | ||
+ | In Diablo, the font callback was a callback to a regular GtkAction: | ||
+ | <br /><br /> | ||
callback.c | callback.c | ||
- | < | + | <pre> |
void callback_font( GtkAction * action, gpointer data ) | void callback_font( GtkAction * action, gpointer data ) | ||
{ | { | ||
Line 398: | Line 378: | ||
} | } | ||
} | } | ||
- | </ | + | </pre> |
- | + | ||
- | + | ||
+ | Function <code>callback_font</code> got the font from an auxiliary function <code>interface_font_chooser()</code> and then modified the font in the text view. The auxiliary function <code>interface_font_chooser()</code> in turn opened a HildonFontSelectionDialog that returned the font parameters: | ||
+ | <br /><br /> | ||
callback.c | callback.c | ||
- | < | + | <pre> |
/* Font chooser */ | /* Font chooser */ | ||
PangoFontDescription* interface_font_chooser( AppUIData * main ) | PangoFontDescription* interface_font_chooser( AppUIData * main ) | ||
Line 437: | Line 417: | ||
return font; | return font; | ||
} | } | ||
- | </ | + | </pre> |
- | |||
+ | Instead of the deprecated HildonFontSelectionDialog, Fremantle uses a GtkFontButton directly in the font button callback: | ||
+ | <br /><br /> | ||
maemopad-window.c | maemopad-window.c | ||
- | < | + | <pre> |
/* font */ | /* font */ | ||
static void maemopad_window_on_font_set (GtkFontButton *button, gpointer data) | static void maemopad_window_on_font_set (GtkFontButton *button, gpointer data) | ||
Line 460: | Line 441: | ||
} | } | ||
} | } | ||
- | </ | + | </pre> |
- | This | + | This GtkFontButton was initialized in function <code>create_menu()</code> (see above) in maemopad-window.c so that it would respond to the <code>"font-set"</code> signal and call the callback above: |
- | + | self->font_item = gtk_font_button_new (); | |
- | self->font_item = gtk_font_button_new (); | + | gtk_widget_show (self->font_item); |
- | gtk_widget_show (self->font_item); | + | g_signal_connect_after (self->font_item, "font-set", |
- | g_signal_connect_after (self->font_item, "font-set", | + | G_CALLBACK (maemopad_window_on_font_set), self); |
- | + | hildon_app_menu_append (HILDON_APP_MENU (main_menu), GTK_BUTTON (self->font_item)); | |
- | hildon_app_menu_append (HILDON_APP_MENU (main_menu), GTK_BUTTON (self->font_item)); | + | |
- | + | ||
</li> | </li> | ||
- | |||
- | |||
+ | <li> | ||
+ | Instead of GtkTextView, a [http://maemo.org/api_refs/5.0/5.0-final/hildon/HildonTextView.html HildonTextView] is now used: | ||
+ | <br /><br /> | ||
Diablo callback.c | Diablo callback.c | ||
- | < | + | <pre> |
/* Create the text area */ | /* Create the text area */ | ||
void create_textarea( AppUIData *main ) | void create_textarea( AppUIData *main ) | ||
Line 489: | Line 469: | ||
... | ... | ||
} | } | ||
- | </ | + | </pre> |
Fremantle maemopad-window.c | Fremantle maemopad-window.c | ||
- | < | + | <pre> |
static void create_textarea (MaemopadWindow *self) | static void create_textarea (MaemopadWindow *self) | ||
{ | { | ||
Line 502: | Line 482: | ||
self->buffer = hildon_text_view_get_buffer (GTK_TEXT_VIEW (self->textview)); | self->buffer = hildon_text_view_get_buffer (GTK_TEXT_VIEW (self->textview)); | ||
} | } | ||
- | </ | + | </pre> |
</li> | </li> | ||
+ | |||
<li> | <li> | ||
All Hildon applications should now initialize hildon before using it. In maemopad this is done by calling <code>hildon_gtk_init()</code> which also calls <code>gtk_init()</code> so the original call can be removed: | All Hildon applications should now initialize hildon before using it. In maemopad this is done by calling <code>hildon_gtk_init()</code> which also calls <code>gtk_init()</code> so the original call can be removed: | ||
- | + | <br /><br /> | |
Diablo main.c | Diablo main.c | ||
- | < | + | <pre> |
/* Init the gtk - must be called before any hildon stuff */ | /* Init the gtk - must be called before any hildon stuff */ | ||
gtk_init( &argc, &argv ); | gtk_init( &argc, &argv ); | ||
- | </ | + | </pre> |
Fremantle main.c | Fremantle main.c | ||
- | < | + | <pre> |
/* Inititialize GTK+ and hildon: */ | /* Inititialize GTK+ and hildon: */ | ||
hildon_gtk_init( &argc, &argv ); | hildon_gtk_init( &argc, &argv ); | ||
- | </ | + | </pre> |
[[Category:Development]] | [[Category:Development]] | ||
[[Category:Documentation]] | [[Category:Documentation]] | ||
[[Category:Fremantle]] | [[Category:Fremantle]] |
Learn more about Contributing to the wiki.