This is a manual merge of branch drop split view intro trunk.

[modest] / src / widgets / modest-ui-constants.h

diff --git a/src/widgets/modest-ui-constants.h b/src/widgets/modest-ui-constants.h
index 0566ee4..fa5cc0b 100644 (file)
--- a/src/widgets/modest-ui-constants.h
+++ b/src/widgets/modest-ui-constants.h
@@ -35,19 +35,31 @@
  * title "RE: Standard widget spacing and padding?":
  */
 
-#ifdef MODEST_PLATFORM_MAEMO 
+#ifndef MODEST_TOOLKIT_GTK 
 #define MODEST_MARGIN_DEFAULT 6
 #define MODEST_MARGIN_DOUBLE 12
 #define MODEST_MARGIN_TRIPLE 18
 #define MODEST_MARGIN_HALF 3
 #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
+#ifdef MODEST_TOOLKIT_HILDON2
+#define MODEST_EDITABLE_SIZE (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH)
+#endif
+#define MODEST_FOLDER_PATH_SEPARATOR " / "
+#else /* MODEST_TOOLKIT_GTK */
 /* TODO: review this values with GNOME HIG */
-#else
 #define MODEST_MARGIN_DEFAULT 6
 #define MODEST_MARGIN_DOUBLE 12
 #define MODEST_MARGIN_TRIPLE 18
 #define MODEST_MARGIN_HALF 3
 #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
 #endif
 
 #endif /*__MODEST_MAEMO_UI_CONSTANTS_H__*/