X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-ui-constants.h;h=82dd995cd640e9d9ea41f0b302fd895cca4800f4;hb=8d4419037aad046e1587b0df5dc9acff343adaf4;hp=7eb9ffb598a675dd3b9fa524c2df1545da0adee9;hpb=edeb005687eeda1957eee1ecbdd0c8e2ede3fff1;p=modest

diff --git a/src/widgets/modest-ui-constants.h b/src/widgets/modest-ui-constants.h
index 7eb9ffb..82dd995 100644
--- a/src/widgets/modest-ui-constants.h
+++ b/src/widgets/modest-ui-constants.h
@@ -27,6 +27,9 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon-defines.h>
+#endif
 
 #ifndef __MODEST_MAEMO_UI_CONSTANTS_H__
 #define __MODEST_MAEMO_UI_CONSTANTS_H__
@@ -35,18 +38,27 @@
  * title "RE: Standard widget spacing and padding?":
  */
 
-#ifdef MODEST_PLATFORM_MAEMO 
-#define MODEST_MARGIN_DEFAULT 6
-#define MODEST_MARGIN_DOUBLE 12
-#define MODEST_MARGIN_TRIPLE 18
-#define MODEST_MARGIN_HALF 3
+#ifndef MODEST_TOOLKIT_GTK 
 #define MODEST_MARGIN_NONE 0
-#define MODEST_DIALOG_WINDOW_MAX_HEIGHT 394
 #define MODEST_DIALOG_WINDOW_MIN_HEIGHT 172
 #define MODEST_DIALOG_WINDOW_MAX_WIDTH 642
 #define MODEST_DIALOG_WINDOW_MIN_WIDTH 172
-/* TODO: review this values with GNOME HIG */
+#ifdef MODEST_TOOLKIT_HILDON2
+#define MODEST_MARGIN_HALF HILDON_MARGIN_HALF
+#define MODEST_MARGIN_DEFAULT HILDON_MARGIN_DEFAULT
+#define MODEST_MARGIN_DOUBLE HILDON_MARGIN_DOUBLE
+#define MODEST_MARGIN_TRIPLE HILDON_MARGIN_TRIPLE
+#define MODEST_DIALOG_WINDOW_MAX_HEIGHT 320
+#define MODEST_EDITABLE_SIZE (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH)
 #else
+#define MODEST_MARGIN_HALF 3
+#define MODEST_MARGIN_DEFAULT 6
+#define MODEST_MARGIN_DOUBLE 12
+#define MODEST_MARGIN_TRIPLE 18
+#define MODEST_DIALOG_WINDOW_MAX_HEIGHT 394
+#endif
+#else /* MODEST_TOOLKIT_GTK */
+/* TODO: review this values with GNOME HIG */
 #define MODEST_MARGIN_DEFAULT 6
 #define MODEST_MARGIN_DOUBLE 12
 #define MODEST_MARGIN_TRIPLE 18
@@ -57,5 +69,7 @@
 #define MODEST_DIALOG_WINDOW_MAX_WIDTH 642
 #define MODEST_DIALOG_WINDOW_MIN_WIDTH 172
 #endif
+#define MODEST_FOLDER_PATH_SEPARATOR " / "
+#define MODEST_FOLDER_DOT " · "
 
 #endif /*__MODEST_MAEMO_UI_CONSTANTS_H__*/