X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-ui-constants.h;h=17bb04a616977f3a8b35c15c182de34cd3bab43d;hb=fcc836f3307ad7605580274e241cbcd456ad28be;hp=0566ee4af7e4b9336ec06acc565a1fe1e2eeec24;hpb=f0d8f53cb1a775d9caff277a4538c2aedb4e358b;p=modest diff --git a/src/widgets/modest-ui-constants.h b/src/widgets/modest-ui-constants.h index 0566ee4..17bb04a 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 +#endif #ifndef __MODEST_MAEMO_UI_CONSTANTS_H__ #define __MODEST_MAEMO_UI_CONSTANTS_H__ @@ -35,19 +38,38 @@ * title "RE: Standard widget spacing and padding?": */ -#ifdef MODEST_PLATFORM_MAEMO +#ifndef MODEST_TOOLKIT_GTK +#define MODEST_MARGIN_NONE 0 +#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_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 345 +#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_MARGIN_HALF 3 -#define MODEST_MARGIN_NONE 0 +#define MODEST_DIALOG_WINDOW_MAX_HEIGHT 394 +#endif +#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 +#define MODEST_FOLDER_PATH_SEPARATOR " / " +#define MODEST_FOLDER_DOT " · " #endif /*__MODEST_MAEMO_UI_CONSTANTS_H__*/