Now captioned in hildon2 accept markup strings

[modest] / src / hildon2 / modest-maemo-utils.h

diff --git a/src/hildon2/modest-maemo-utils.h b/src/hildon2/modest-maemo-utils.h
index cb5a71f..c5777a1 100644 (file)
--- a/src/hildon2/modest-maemo-utils.h
+++ b/src/hildon2/modest-maemo-utils.h
@@ -37,8 +37,9 @@
 #include <libosso.h>
 #include "widgets/modest-global-settings-dialog.h"
 #include "widgets/modest-validating-entry.h"
+#include <hildon/hildon-gtk.h>
 
-#define MODEST_MAEMO_UTILS_MYDOCS_FOLDER "MyDocs"
+#define MODEST_MAEMO_UTILS_MYDOCS_ENV "MYDOCSDIR"
 #define MODEST_MAEMO_UTILS_DEFAULT_IMAGE_FOLDER ".images"
 
 
@@ -123,14 +124,26 @@ void modest_maemo_utils_set_osso_context (osso_context_t *osso_context);
  */
 GtkWidget *modest_maemo_utils_get_manager_menubar_as_menu (GtkUIManager *manager, const gchar *item_name);
 
-GtkWidget *modest_maemo_utils_create_captioned    (GtkSizeGroup *group,
-                                                  const gchar *label_text,
+GtkWidget *modest_maemo_utils_create_captioned    (GtkSizeGroup *title_size_group,
+                                                  GtkSizeGroup *value_size_group,
+                                                  const gchar *title,
+                                                  gboolean use_markup,
                                                   GtkWidget *control);
 
-void
-modest_maemo_utils_create_picker_layout (GtkSizeGroup *sizegroup, 
-                                        const gchar *label, 
-                                        GtkWidget *picker);
+GtkWidget *modest_maemo_utils_create_captioned_with_size_type    (GtkSizeGroup *title_size_group,
+                                                                 GtkSizeGroup *value_size_group,
+                                                                 const gchar *title,
+                                                                 gboolean use_markup,
+                                                                 GtkWidget *control,
+                                                                 HildonSizeType size_type);
+
+void       modest_maemo_utils_set_hbutton_layout (GtkSizeGroup *title_sizegroup, 
+                                                 GtkSizeGroup *value_sizegroup,
+                                                 const gchar *title, 
+                                                 GtkWidget *button);
+void       modest_maemo_utils_set_vbutton_layout (GtkSizeGroup *sizegroup, 
+                                                 const gchar *title, 
+                                                 GtkWidget *button);
 
 GtkWidget *modest_maemo_utils_create_group_box (const gchar *label, GtkWidget *contents);