X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fwidgets%2Fmodest-ui-constants.h;h=aba36e31aab04f26d43b84111558a9664fb0d300;hb=4bd81ff5d465420ea507dfcd28a33715d498a9a4;hp=8d42c2e805c95b215100902a700614f58d77c1fd;hpb=6f1c50d08d450b4b83ad6dca70219848adb7fdac;p=modest diff --git a/src/widgets/modest-ui-constants.h b/src/widgets/modest-ui-constants.h index 8d42c2e..aba36e3 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__ @@ -36,20 +39,27 @@ */ #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_MIN_HEIGHT 172 #define MODEST_DIALOG_WINDOW_MAX_WIDTH 642 #define MODEST_DIALOG_WINDOW_MIN_WIDTH 172 #ifdef MODEST_TOOLKIT_HILDON2 -#define MODEST_DIALOG_WINDOW_MAX_HEIGHT 355 +#define MODEST_COMPACT_HEADER_BG "#404040" +#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_DIALOG_WINDOW_MAX_HEIGHT 394 +#define MODEST_EDITABLE_SIZE 0 #endif +#define MODEST_SECONDARY_COLOR "grey" #else /* MODEST_TOOLKIT_GTK */ /* TODO: review this values with GNOME HIG */ #define MODEST_MARGIN_DEFAULT 6 @@ -61,6 +71,8 @@ #define MODEST_DIALOG_WINDOW_MIN_HEIGHT 172 #define MODEST_DIALOG_WINDOW_MAX_WIDTH 642 #define MODEST_DIALOG_WINDOW_MIN_WIDTH 172 +#define MODEST_EDITABLE_SIZE 0 +#define MODEST_SECONDARY_COLOR "#444444" #endif #define MODEST_FOLDER_PATH_SEPARATOR " / " #define MODEST_FOLDER_DOT " · "