1 files changed, 28 insertions, 14 deletions
diff --git a/gui/themes/modern.ini b/gui/themes/modern.ini
index 4a837ded16..d0486e3c3f 100644
--- a/gui/themes/modern.ini
+++ b/gui/themes/modern.ini
@@ -1,7 +1,7 @@
 # $URL$
 # $Id$
 [theme]
-version=11
+version=12
 
 [pixmaps]
 dialog_corner=dialog_bkgd_corner.bmp
@@ -54,10 +54,15 @@ button_top=button_bkgd_top.bmp
 button_left=button_bkgd_left.bmp
 button_bkgd=button_bkgd.bmp
 
-popupwidget_corner=widget_small_bkgd_corner.bmp
-popupwidget_top=widget_small_bkgd_top.bmp
-popupwidget_left=widget_small_bkgd_left.bmp
-popupwidget_bkgd=widget_small_bkgd.bmp
+popupwidget_corner=button_bkgd_corner.bmp
+popupwidget_top=button_bkgd_top.bmp
+popupwidget_left=button_bkgd_left.bmp
+popupwidget_bkgd=button_bkgd.bmp
+
+edittext_bkgd_corner=button_bkgd_corner.bmp
+edittext_bkgd_top=button_bkgd_top.bmp
+edittext_bkgd_left=button_bkgd_left.bmp
+edittext_bkgd=button_bkgd.bmp
 
 theme_logo=logo.bmp
 
@@ -113,11 +118,15 @@ scrollbar_button_highlight_end=200 70 50
 scrollbar_slider_highlight_start=255 210 200
 scrollbar_slider_highlight_end=200 70 50
 
-popupwidget_start=246 224 139
-pupupwidget_end=251 241 206
+popupwidget_start=251 241 206
+popupwidget_end=251 241 206
 popupwidget_highlight_start=246 224 139
 popupwidget_highlight_end=251 241 206
 
+edittext_background_start=247 228 166
+edittext_background_end=247 228 166
+
+
 caret_color=0 0 0
 
 [gradients]
@@ -138,7 +147,9 @@ tab=2
 scrollbar=1
 scrollbar_background=1
 
-popupwidget=3
+popupwidget=1
+
+edittext=1
 
 [extra]
 shadow_left_width=2
@@ -161,6 +172,7 @@ def_sliderWidth=kBigSliderWidth
 def_sliderHeight=kBigSliderHeight
 def_kLineHeight=16
 def_kFontHeight=14
+def_kPopUpHeight=(kLineHeight + 3)
 def_insetX=23
 def_insetY=94
 def_insetW=(w - buttonWidth - 17 * 2 - insetX)
@@ -186,6 +198,8 @@ ListWidget.hlLeftPadding=0
 ListWidget.hlRightPadding=0
 PopUpWidget.leftPadding=7
 PopUpWidget.rightPadding=7
+EditTextWidget.leftPadding=7
+EditTextWidget.rightPadding=7
 
 ###### chooser
 opHeight=insetH
@@ -268,13 +282,13 @@ gameoptions_tabwidget=0 vBorder parent.w (parent.h - buttonHeight - 8 - 2 * vBor
 opYoffset=vBorder
 gameoptions_id=gox (opYoffset + 2) gameOptionsLabelWidth kLineHeight
 gameoptions_id.align=kTextAlignRight
-gameoptions_domain=prev.x2 (prev.y - 1) (gow - prev.w) (prev.h + 2)
-opYoffset=(opYoffset + kLineHeight + 8)
+gameoptions_domain=prev.x2 (prev.y - 1) (gow - prev.w) kPopUpHeight
+opYoffset=(opYoffset + kLineHeight + 10)
 gameoptions_name=gox (opYoffset + 2) gameOptionsLabelWidth kLineHeight
 gameoptions_name.align=kTextAlignRight
-gameoptions_desc=prev.x2 (prev.y - 1) (gow - prev.w) (prev.h + 2)
+gameoptions_desc=prev.x2 (prev.y - 1) (gow - prev.w) kPopUpHeight
 opYoffset=(opYoffset + kLineHeight + 12)
-gameoptions_lang=gox (opYoffset - 1) gow (kLineHeight + 2)
+gameoptions_lang=gox (opYoffset - 1) gow kPopUpHeight
 opYoffset=(opYoffset + kLineHeight + 8)
 gameoptions_platform=prev.x opYoffset prev.w prev.h
 opYoffset=(opYoffset + kLineHeight + 8)
@@ -397,7 +411,7 @@ chooser_ok=(prev.x2 + 10) prev.y prev.w prev.h
 [graphicsControls]
 gcx=(opXoffset + 10)
 gcw=(parent.w - gcx - 25)
-grModePopup=(gcx - 5) (opYoffset - 1) (gcw + 5) (kLineHeight + 2)
+grModePopup=(gcx - 5) (opYoffset - 1) (gcw + 5) kPopUpHeight
 opYoffset=(opYoffset + kLineHeight + 8)
 grRenderPopup=prev.x (opYoffset - 1) prev.w prev.h
 opYoffset=(opYoffset + kLineHeight + 12)
@@ -409,7 +423,7 @@ opYoffset=(opYoffset + buttonHeight + 4)
 [audioControls]
 aux=(opXoffset + 10)
 auw=(parent.w - aux - 30)
-auMidiPopup=(aux) (opYoffset - 1) (auw + 5) (kLineHeight + 2)
+auMidiPopup=(aux) (opYoffset - 1) (auw + 5) kPopUpHeight
 opYoffset=(opYoffset + buttonHeight + 4)
 
 [volumeControls]