ide: minor layout tweaks, GLCtrl: Fixed for X11 #990

git-svn-id: svn://ultimatepp.org/upp/trunk@8198 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-02-23 15:21:29 +00:00
parent 68a0b5c9c8
commit f539fa700a
2 changed files with 13 additions and 13 deletions

View file

@ -5,7 +5,7 @@ library(WIN32 GCC) "glaux glu32 opengl32";
library(LINUX | BSD) "GL GLU";
library((LINUX | FREEBSD) & (!X11 | !NOGTK)) "gdkglext-x11-1.0 gtkglext-x11-1.0";
library((LINUX | BSD) & !X11 & !NOGTK) "gdkglext-x11-1.0 gtkglext-x11-1.0";
file
GLCtrl.h,

View file

@ -116,7 +116,7 @@ LAYOUT(UppLayout, 936, 576)
ITEM(Option, bold, SetLabel(t_("Bold")).RightPosZ(52, 44).TopPosZ(4, 20))
ITEM(Option, italic, SetLabel(t_("Italic")).RightPosZ(4, 44).TopPosZ(4, 20))
ITEM(Option, optimize_speed, SetLabel(t_("Optimize for speed")).LeftPosZ(248, 120).TopPosZ(28, 20))
ITEM(Label, dv___9, SetLabel(t_("&Accepts")).HSizePosZ(368, 524).TopPosZ(28, 19))
ITEM(Label, dv___9, SetLabel(t_("&Accepts")).LeftPosZ(368, 44).TopPosZ(28, 19))
ITEM(EditString, accepts, HSizePosZ(412, 356).TopPosZ(28, 19))
ITEM(Label, dv___11, SetLabel(t_("Encoding")).RightPosZ(300, 48).TopPosZ(28, 19))
ITEM(DropList, charset, RightPosZ(184, 112).TopPosZ(28, 19))
@ -616,21 +616,21 @@ LAYOUT(VirtualsLayout, 712, 496)
ITEM(EditString, find, LeftPosZ(72, 124).BottomPosZ(9, 19))
END_LAYOUT
LAYOUT(UppOptDlg, 520, 68)
LAYOUT(UppOptDlg, 520, 92)
ITEM(Label, dv___0, SetLabel(t_("When")).LeftPosZ(4, 36).TopPosZ(8, 19))
ITEM(EditString, when, LeftPosZ(40, 128).TopPosZ(8, 19))
ITEM(Label, dv___2, SetLabel(t_(":")).LeftPosZ(176, 8).TopPosZ(8, 19))
ITEM(EditString, text, LeftPosZ(184, 328).TopPosZ(8, 19))
ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(380, 64).TopPosZ(36, 24))
ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(448, 64).TopPosZ(36, 24))
ITEM(Label, info, LeftPosZ(4, 368).TopPosZ(36, 21))
ITEM(EditString, when, LeftPosZ(40, 472).TopPosZ(8, 19))
ITEM(Label, dv___2, SetLabel(t_(":")).LeftPosZ(40, 152).TopPosZ(32, 19))
ITEM(EditString, text, LeftPosZ(52, 460).TopPosZ(32, 19))
ITEM(Button, ok, SetLabel(t_("OK")).LeftPosZ(380, 64).TopPosZ(60, 24))
ITEM(Button, cancel, SetLabel(t_("Cancel")).LeftPosZ(448, 64).TopPosZ(60, 24))
ITEM(Label, info, LeftPosZ(4, 368).TopPosZ(60, 21))
END_LAYOUT
LAYOUT(UppOptPushDlg, 340, 68)
LAYOUT(UppOptPushDlg, 340, 92)
ITEM(Label, dv___0, SetLabel(t_("When")).LeftPosZ(4, 36).TopPosZ(8, 19))
ITEM(EditString, when, LeftPosZ(40, 128).TopPosZ(8, 19))
ITEM(Label, dv___2, SetLabel(t_(":")).LeftPosZ(176, 8).TopPosZ(8, 19))
ITEM(DataPusher, text, HSizePosZ(184, 8).TopPosZ(8, 20))
ITEM(EditString, when, LeftPosZ(40, 292).TopPosZ(8, 19))
ITEM(Label, dv___2, SetLabel(t_(":")).LeftPosZ(40, 8).TopPosZ(32, 19))
ITEM(DataPusher, text, HSizePosZ(48, 8).TopPosZ(32, 20))
ITEM(Button, ok, SetLabel(t_("OK")).RightPosZ(76, 64).BottomPosZ(8, 24))
ITEM(Button, cancel, SetLabel(t_("Cancel")).RightPosZ(8, 64).BottomPosZ(8, 24))
END_LAYOUT