1 files changed, 51 insertions, 2 deletions

diff --git a/common/common.h b/common/common.h
index 34d8345..b3bcc6a 100644
--- a/common/common.h
+++ b/common/common.h
@@ -296,6 +296,10 @@ enum
 #define SIZE_GRIP_SIZE 12
 
 #define USE_LIGHTER_POPUP_MENU (opts.lighterPopupMenuBgnd)
+#define USE_BORDER(B)          (GB_SHINE!=(B) && GB_NONE!=(B))
+#define DRAW_MENU_BORDER       (APPEARANCE_FLAT!=opts.menuBgndAppearance && opts.version>=MAKE_VERSION(1,7) && \
+                                USE_BORDER(getGradient(opts.menuBgndAppearance, &opts)->border))
+
 #define USE_GLOW_FOCUS(mouseOver) (FOCUS_GLOW==opts.focus && (MO_GLOW!=opts.coloredMouseOver || !(mouseOver)))
 
 #define USE_SHADED_MENU_BAR_COLORS (SHADE_CUSTOM==opts.shadeMenubars || SHADE_BLEND_SELECTED==opts.shadeMenubars)
@@ -552,6 +556,32 @@ typedef enum
 
 typedef struct
 {
+#if defined __cplusplus
+    TQString   file;
+    TQPixmap   img;
+#else // __cplusplus
+    const char *file;
+    GdkPixbuf *img;
+#endif // __cplusplus
+} TQtCPixmap;
+
+#define BGND_IMG_ON_BORDER (IMG_FILE==opts.bgndImage.type && opts.bgndImage.onBorder)
+
+typedef enum
+{
+    PP_TL,
+    PP_TM,
+    PP_TR,
+    PP_BL,
+    PP_BM,
+    PP_BR,
+    PP_LM,
+    PP_RM,
+    PP_CENTRED,
+} EPixPos;
+
+typedef struct
+{
     EImageType type;
     bool       loaded;
 #if defined __cplusplus
@@ -566,6 +596,13 @@ typedef struct
 
 typedef enum
 {
+    THIN_BUTTONS    = 0x0001,
+    THIN_MENU_ITEMS = 0x0002,
+    THIN_FRAMES     = 0x0004
+} EThinFlags;
+
+typedef enum
+{
     SQUARE_NONE               = 0x0000,
     SQUARE_ENTRY              = 0x0001,
     SQUARE_PROGRESS           = 0x0002,
@@ -713,6 +750,7 @@ typedef enum
         APPEARANCE_FADE, /* Only for poupmenu items! */
         APPEARANCE_STRIPED = APPEARANCE_FADE, /* Only for windows  and menus */
         APPEARANCE_NONE = APPEARANCE_FADE, /* Only for titlebars */
+        APPEARANCE_FILE,  /* Only for windows  and menus */
         APPEARANCE_LV_BEVELLED, /* To be used only with getGradient */
         APPEARANCE_AGUA_MOD,
         APPEARANCE_LV_AGUA,
@@ -777,6 +815,13 @@ typedef enum
 
 typedef enum
 {
+    TBTN_STANDARD,
+    TBTN_RAISED,
+    TBTN_JOINED
+} ETBarBtn;
+
+typedef enum
+{
     BORDER_FLAT,
     BORDER_RAISED,
     BORDER_SUNKEN,
@@ -1056,7 +1101,8 @@ typedef struct
                      splitterHighlight,
                      crSize,
                      gbFactor,
-                     gbLabel;
+                     gbLabel,
+                     thin;
     ERound           round;
     bool             embolden,
                      highlightTab,
@@ -1088,8 +1134,8 @@ typedef struct
                      mapKdeIcons,
 #if defined CONFIG_DIALOG || ( defined QT4_OR_ABOVE) || !defined __cplusplus
                      gtkButtonOrder,
-                     fadeLines,
 #endif
+                     fadeLines,
                      reorderGtkButtons,
                      borderMenuitems,
                      colorMenubarMouseOver,
@@ -1154,6 +1200,7 @@ typedef struct
     ESliderStyle     sliderStyle;
     EMouseOver       coloredMouseOver;
     ETBarBorder      toolbarBorders;
+    ETBarBtn         tbarBtns;
     EDefBtnIndicator defBtnIndicator;
     ELine            sliderThumbs,
                      handles,
@@ -1221,6 +1268,8 @@ typedef struct
 #else
     Gradient         *customGradient[NUM_CUSTOM_GRAD];
 #endif
+    TQtCPixmap        bgndPixmap;
+    TQtCPixmap        menuBgndPixmap;
     TQtCImage         bgndImage,
                      menuBgndImage;
 #if !defined __cplusplus || ( defined QT4_OR_ABOVE)