author | eilers <eilers> | 2003-12-15 09:44:38 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-12-15 09:44:38 (UTC) |
commit | 4682cc1b6213262a8a09df7a8c8e547d8740f803 (patch) (unidiff) | |
tree | f38aa82e4cbf763474795146d7b84a456b119f95 /development/macosx | |
parent | 3159e108d49cb08b4891c8d3a33209f45e0e58f6 (diff) | |
download | opie-4682cc1b6213262a8a09df7a8c8e547d8740f803.zip opie-4682cc1b6213262a8a09df7a8c8e547d8740f803.tar.gz opie-4682cc1b6213262a8a09df7a8c8e547d8740f803.tar.bz2 |
Patch now includes missing files..
-rw-r--r-- | development/macosx/README_MACOSX | 6 | ||||
-rw-r--r-- | development/macosx/config-files/qt-2.3.2/darwin-g++-shared | 94 | ||||
-rw-r--r-- | development/macosx/config-files/qte-2.3.7/darwin-generic-g++-shared | 98 | ||||
-rw-r--r-- | development/macosx/qt232-X11.patch | 666 |
4 files changed, 658 insertions, 206 deletions
diff --git a/development/macosx/README_MACOSX b/development/macosx/README_MACOSX index 1c7119a..a468700 100644 --- a/development/macosx/README_MACOSX +++ b/development/macosx/README_MACOSX | |||
@@ -35,21 +35,15 @@ Before compiling for MacOS-X, you need the following: | |||
35 | 2. QT-2.3.2 for X11 (Provided by Trolltech) | 35 | 2. QT-2.3.2 for X11 (Provided by Trolltech) |
36 | 3. QT/E-2.3.7 (Provided by Trolltech) | 36 | 3. QT/E-2.3.7 (Provided by Trolltech) |
37 | 4. Patches for QT-2.3.2 for MacOSX (take the one in this directory !) | 37 | 4. Patches for QT-2.3.2 for MacOSX (take the one in this directory !) |
38 | 5. Patches for QT/E-2.3.7 for MacOSX (take the one, provided in $OPIEDIR/qt) | 38 | 5. Patches for QT/E-2.3.7 for MacOSX (take the one, provided in $OPIEDIR/qt) |
39 | 39 | ||
40 | The Patch for QT-2.3.2 is provided in this directory and is called "qt232-X11.patch". | 40 | The Patch for QT-2.3.2 is provided in this directory and is called "qt232-X11.patch". |
41 | Please copy the file "darwin-g++-shared" from the directory "./config-files/qt-2.3.2" into the directory "configs" | ||
42 | within the qt-2.3.2 directory !! | ||
43 | 41 | ||
44 | The Patch for QT/E for Opie, including all other opie-patches is available in the | 42 | The Patch for QT/E for Opie, including all other opie-patches is available in the |
45 | qt-directory ($OPIEDIR/qt) and is called "qte237-all-macosx.patch". | 43 | qt-directory ($OPIEDIR/qt) and is called "qte237-all-macosx.patch". |
46 | To be able to compile, you have to copy the file from the directory "./config-files/qte-2.3.7" | ||
47 | into the directory "configs" within the base directory of qt/e. | ||
48 | Secondly, you have to copy the file "qconfig-qpe.h" from the Directory "$OPIEDIR/qt" into the "tools" directory | ||
49 | within the base directory of qt/e. Then, please add the line "#define QT_NO_SOUND" to this file. | ||
50 | 44 | ||
51 | Please read further, how to compile the stuff. | 45 | Please read further, how to compile the stuff. |
52 | 46 | ||
53 | HOWTO COMPILE: | 47 | HOWTO COMPILE: |
54 | ------------- | 48 | ------------- |
55 | 49 | ||
diff --git a/development/macosx/config-files/qt-2.3.2/darwin-g++-shared b/development/macosx/config-files/qt-2.3.2/darwin-g++-shared deleted file mode 100644 index 18d3b15..0000000 --- a/development/macosx/config-files/qt-2.3.2/darwin-g++-shared +++ b/dev/null | |||
@@ -1,94 +0,0 @@ | |||
1 | # Compiling | ||
2 | INTERFACE_DECL_PATH = . | ||
3 | SYSCONF_CXX = g++ | ||
4 | SYSCONF_CC = gcc | ||
5 | DASHCROSS = | ||
6 | |||
7 | # Compiling with support libraries | ||
8 | SYSCONF_CXXFLAGS_X11= -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 | ||
9 | SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include | ||
10 | SYSCONF_CXXFLAGS_OPENGL= -I/usr/X11R6/include | ||
11 | |||
12 | # Compiling YACC output | ||
13 | SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses | ||
14 | |||
15 | # Linking with support libraries | ||
16 | SYSCONF_RPATH_X11= -L/usr/X11R6/lib | ||
17 | SYSCONF_RPATH_QT= -L$(QTDIR)/lib | ||
18 | SYSCONF_RPATH_OPENGL= -L/usr/X11R6/lib | ||
19 | |||
20 | # Linking with support libraries | ||
21 | # X11 | ||
22 | SYSCONF_LFLAGS_X11= -L/usr/X11R6/lib | ||
23 | SYSCONF_LIBS_X11= -lXext -lX11 -lm | ||
24 | # Qt, Qt+OpenGL | ||
25 | SYSCONF_LFLAGS_QT= -L$(QTDIR)/lib | ||
26 | SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) | ||
27 | SYSCONF_LIBS_QT_OPENGL= | ||
28 | # OpenGL | ||
29 | SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib | ||
30 | SYSCONF_LIBS_OPENGL= -lGLU -lGL -lXmu | ||
31 | # Yacc | ||
32 | SYSCONF_LIBS_YACC= | ||
33 | |||
34 | # Linking applications | ||
35 | SYSCONF_LINK = g++ | ||
36 | SYSCONF_LFLAGS = | ||
37 | SYSCONF_LIBS = | ||
38 | |||
39 | # Link flags for shared objects | ||
40 | SYSCONF_LFLAGS_SHOBJ= -dynamiclib | ||
41 | |||
42 | # Flags for threading | ||
43 | SYSCONF_CFLAGS_THREAD= -pthread -D_THREAD_SAFE | ||
44 | SYSCONF_CXXFLAGS_THREAD= -pthread -D_THREAD_SAFE | ||
45 | SYSCONF_LFLAGS_THREAD= -pthread | ||
46 | SYSCONF_LIBS_THREAD= | ||
47 | |||
48 | # Meta-object compiler | ||
49 | SYSCONF_MOC = $(QTDIR)/bin/moc | ||
50 | |||
51 | # UI compiler | ||
52 | SYSCONF_UIC = $(QTDIR)/bin/uic | ||
53 | |||
54 | # Linking shared libraries | ||
55 | # - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 | ||
56 | # - Place target in $(DESTDIR) - which has a trailing / | ||
57 | # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) | ||
58 | # | ||
59 | SYSCONF_LINK_SHLIB= g++ | ||
60 | SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) | ||
61 | SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -dynamiclib \ | ||
62 | $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ | ||
63 | $(OBJECTS) $(OBJMOC) $(LIBS) && \ | ||
64 | mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ | ||
65 | cd $(DESTDIR) && \ | ||
66 | rm -f lib$(TARGET).dylib lib$(TARGET).dylib.$(VER_MAJ) lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN); \ | ||
67 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib; \ | ||
68 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib.$(VER_MAJ); \ | ||
69 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN) | ||
70 | |||
71 | # Linking static libraries | ||
72 | # - Build the $(TARGET) library, eg. lib$(TARGET).a | ||
73 | # - Place target in $(DESTDIR) - which has a trailing / | ||
74 | # | ||
75 | SYSCONF_AR = ar cqs | ||
76 | SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a | ||
77 | SYSCONF_LINK_LIB_STATIC= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ | ||
78 | $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) | ||
79 | # Compiling application source | ||
80 | SYSCONF_CXXFLAGS= -pipe -fno-exceptions -O2 -Wall -W | ||
81 | SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 -Wall -W | ||
82 | # Default link type (static linking is still be used where required) | ||
83 | SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED) | ||
84 | SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED) | ||
85 | # Compiling library source | ||
86 | SYSCONF_CXXFLAGS_LIB= -fPIC | ||
87 | SYSCONF_CFLAGS_LIB= -fPIC | ||
88 | # Compiling shared-object source | ||
89 | SYSCONF_CXXFLAGS_SHOBJ= -fPIC | ||
90 | SYSCONF_CFLAGS_SHOBJ= -fPIC | ||
91 | # Linking Qt | ||
92 | SYSCONF_LIBS_QTLIB= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) | ||
93 | # Linking Qt applications | ||
94 | SYSCONF_LIBS_QTAPP= | ||
diff --git a/development/macosx/config-files/qte-2.3.7/darwin-generic-g++-shared b/development/macosx/config-files/qte-2.3.7/darwin-generic-g++-shared deleted file mode 100644 index ebeabfc..0000000 --- a/development/macosx/config-files/qte-2.3.7/darwin-generic-g++-shared +++ b/dev/null | |||
@@ -1,98 +0,0 @@ | |||
1 | # Compiling | ||
2 | INTERFACE_DECL_PATH = . | ||
3 | SYSCONF_CXX = g++ | ||
4 | SYSCONF_CC = gcc | ||
5 | DASHCROSS = | ||
6 | |||
7 | # Compiling with support libraries | ||
8 | SYSCONF_CXXFLAGS_X11= -I/usr/X11R6/include | ||
9 | SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include | ||
10 | SYSCONF_CXXFLAGS_QTOPIA= -I$(QPEDIR)/include | ||
11 | SYSCONF_CXXFLAGS_OPENGL= -I/usr/X11R6/include | ||
12 | |||
13 | # Compiling YACC output | ||
14 | SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses | ||
15 | |||
16 | # Linking with support libraries | ||
17 | SYSCONF_RPATH_X11= -L/usr/X11R6/lib | ||
18 | SYSCONF_RPATH_QT= -L$(QTDIR)/lib | ||
19 | SYSCONF_RPATH_QTOPIA= -L$(QPEDIR)/lib | ||
20 | SYSCONF_RPATH_OPENGL= -L/usr/X11R6/lib | ||
21 | |||
22 | # Linking with support libraries | ||
23 | # X11 | ||
24 | SYSCONF_LFLAGS_X11= -L/usr/X11R6/lib | ||
25 | SYSCONF_LIBS_X11= | ||
26 | # Qt, Qt+OpenGL | ||
27 | SYSCONF_LFLAGS_QT= -L$(QTDIR)/lib | ||
28 | SYSCONF_LFLAGS_QTOPIA= -L$(QPEDIR)/lib | ||
29 | SYSCONF_LIBS_QT = -lqte$(QT_THREAD_SUFFIX) | ||
30 | SYSCONF_LIBS_QT_OPENGL= | ||
31 | SYSCONF_LIBS_QTOPIA= -lqtopia | ||
32 | # OpenGL | ||
33 | SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib | ||
34 | SYSCONF_LIBS_OPENGL= -lGLU -lGL -lXmu | ||
35 | # Yacc | ||
36 | SYSCONF_LIBS_YACC= | ||
37 | |||
38 | # Linking applications | ||
39 | SYSCONF_LINK = g++ | ||
40 | SYSCONF_LFLAGS = | ||
41 | SYSCONF_LIBS = | ||
42 | |||
43 | # Link flags for shared objects | ||
44 | SYSCONF_LFLAGS_SHOBJ= -dynamiclib | ||
45 | |||
46 | # Flags for threading | ||
47 | SYSCONF_CFLAGS_THREAD= -pthread -D_THREAD_SAFE | ||
48 | SYSCONF_CXXFLAGS_THREAD= -pthread -D_THREAD_SAFE | ||
49 | SYSCONF_LFLAGS_THREAD= -pthread | ||
50 | SYSCONF_LIBS_THREAD= | ||
51 | |||
52 | # Meta-object compiler | ||
53 | SYSCONF_MOC = $(QTDIR)/bin/moc | ||
54 | |||
55 | # UI compiler | ||
56 | SYSCONF_UIC = $(QTDIR)/bin/uic | ||
57 | |||
58 | # Linking shared libraries | ||
59 | # - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 | ||
60 | # - Place target in $(DESTDIR) - which has a trailing / | ||
61 | # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) | ||
62 | # | ||
63 | SYSCONF_LINK_SHLIB= g++ | ||
64 | SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) | ||
65 | SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -dynamiclib \ | ||
66 | $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ | ||
67 | $(OBJECTS) $(OBJMOC) $(LIBS) && \ | ||
68 | mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ | ||
69 | cd $(DESTDIR) && \ | ||
70 | rm -f lib$(TARGET).dylib lib$(TARGET).dylib.$(VER_MAJ) lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN); \ | ||
71 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib; \ | ||
72 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib.$(VER_MAJ); \ | ||
73 | ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN) | ||
74 | |||
75 | # Linking static libraries | ||
76 | # - Build the $(TARGET) library, eg. lib$(TARGET).a | ||
77 | # - Place target in $(DESTDIR) - which has a trailing / | ||
78 | # | ||
79 | SYSCONF_AR = ar cqs | ||
80 | SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a | ||
81 | SYSCONF_LINK_LIB_STATIC= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ | ||
82 | $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) | ||
83 | # Compiling application source | ||
84 | SYSCONF_CXXFLAGS= -pipe -fno-exceptions -DQWS -fno-rtti -fno-exceptions -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -O0 -Wall -W -DNO_DEBUG | ||
85 | SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 -Wall -W | ||
86 | # Default link type (static linking is still be used where required) | ||
87 | SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED) | ||
88 | SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED) | ||
89 | # Compiling library source | ||
90 | SYSCONF_CXXFLAGS_LIB= -fPIC | ||
91 | SYSCONF_CFLAGS_LIB= -fPIC | ||
92 | # Compiling shared-object source | ||
93 | SYSCONF_CXXFLAGS_SHOBJ= -fPIC | ||
94 | SYSCONF_CFLAGS_SHOBJ= -fPIC | ||
95 | # Linking Qt | ||
96 | SYSCONF_LIBS_QTLIB= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) | ||
97 | # Linking Qt applications | ||
98 | SYSCONF_LIBS_QTAPP= | ||
diff --git a/development/macosx/qt232-X11.patch b/development/macosx/qt232-X11.patch index 2816956..66e2877 100644 --- a/development/macosx/qt232-X11.patch +++ b/development/macosx/qt232-X11.patch | |||
@@ -1,7 +1,105 @@ | |||
1 | diff -ru qt-2.3.2/include/qconfig.h qt-2.3.2_changed/include/qconfig.h | 1 | diff -uNr --exclude-from=./diff_ignore qt-2.3.2/configs/darwin-g++-shared qt-2.3.2_changed/configs/darwin-g++-shared |
2 | --- qt-2.3.2/configs/darwin-g++-sharedThu Jan 1 01:00:00 1970 | ||
3 | +++ qt-2.3.2_changed/configs/darwin-g++-sharedSun Nov 16 12:33:53 2003 | ||
4 | @@ -0,0 +1,94 @@ | ||
5 | +# Compiling | ||
6 | +INTERFACE_DECL_PATH = . | ||
7 | +SYSCONF_CXX = g++ | ||
8 | +SYSCONF_CC = gcc | ||
9 | +DASHCROSS = | ||
10 | + | ||
11 | +# Compiling with support libraries | ||
12 | +SYSCONF_CXXFLAGS_X11= -I/usr/X11R6/include -I/usr/X11R6/include/freetype2 | ||
13 | +SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include | ||
14 | +SYSCONF_CXXFLAGS_OPENGL= -I/usr/X11R6/include | ||
15 | + | ||
16 | +# Compiling YACC output | ||
17 | +SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses | ||
18 | + | ||
19 | +# Linking with support libraries | ||
20 | +SYSCONF_RPATH_X11= -L/usr/X11R6/lib | ||
21 | +SYSCONF_RPATH_QT= -L$(QTDIR)/lib | ||
22 | +SYSCONF_RPATH_OPENGL= -L/usr/X11R6/lib | ||
23 | + | ||
24 | +# Linking with support libraries | ||
25 | +# X11 | ||
26 | +SYSCONF_LFLAGS_X11= -L/usr/X11R6/lib | ||
27 | +SYSCONF_LIBS_X11= -lXext -lX11 -lm | ||
28 | +# Qt, Qt+OpenGL | ||
29 | +SYSCONF_LFLAGS_QT= -L$(QTDIR)/lib | ||
30 | +SYSCONF_LIBS_QT = -lqt$(QT_THREAD_SUFFIX) | ||
31 | +SYSCONF_LIBS_QT_OPENGL= | ||
32 | +# OpenGL | ||
33 | +SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib | ||
34 | +SYSCONF_LIBS_OPENGL= -lGLU -lGL -lXmu | ||
35 | +# Yacc | ||
36 | +SYSCONF_LIBS_YACC= | ||
37 | + | ||
38 | +# Linking applications | ||
39 | +SYSCONF_LINK = g++ | ||
40 | +SYSCONF_LFLAGS = | ||
41 | +SYSCONF_LIBS = | ||
42 | + | ||
43 | +# Link flags for shared objects | ||
44 | +SYSCONF_LFLAGS_SHOBJ= -dynamiclib | ||
45 | + | ||
46 | +# Flags for threading | ||
47 | +SYSCONF_CFLAGS_THREAD= -pthread -D_THREAD_SAFE | ||
48 | +SYSCONF_CXXFLAGS_THREAD= -pthread -D_THREAD_SAFE | ||
49 | +SYSCONF_LFLAGS_THREAD= -pthread | ||
50 | +SYSCONF_LIBS_THREAD= | ||
51 | + | ||
52 | +# Meta-object compiler | ||
53 | +SYSCONF_MOC = $(QTDIR)/bin/moc | ||
54 | + | ||
55 | +# UI compiler | ||
56 | +SYSCONF_UIC = $(QTDIR)/bin/uic | ||
57 | + | ||
58 | +# Linking shared libraries | ||
59 | +# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2 | ||
60 | +# - Place target in $(DESTDIR) - which has a trailing / | ||
61 | +# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) | ||
62 | +# | ||
63 | +SYSCONF_LINK_SHLIB= g++ | ||
64 | +SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) | ||
65 | +SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -dynamiclib \ | ||
66 | + $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ | ||
67 | + $(OBJECTS) $(OBJMOC) $(LIBS) && \ | ||
68 | + mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ | ||
69 | + cd $(DESTDIR) && \ | ||
70 | + rm -f lib$(TARGET).dylib lib$(TARGET).dylib.$(VER_MAJ) lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN); \ | ||
71 | + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib; \ | ||
72 | + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib.$(VER_MAJ); \ | ||
73 | + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN) | ||
74 | + | ||
75 | +# Linking static libraries | ||
76 | +# - Build the $(TARGET) library, eg. lib$(TARGET).a | ||
77 | +# - Place target in $(DESTDIR) - which has a trailing / | ||
78 | +# | ||
79 | +SYSCONF_AR = ar cqs | ||
80 | +SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a | ||
81 | +SYSCONF_LINK_LIB_STATIC= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ | ||
82 | + $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) | ||
83 | +# Compiling application source | ||
84 | +SYSCONF_CXXFLAGS= -pipe -fno-exceptions -O2 -Wall -W | ||
85 | +SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 -Wall -W | ||
86 | +# Default link type (static linking is still be used where required) | ||
87 | +SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED) | ||
88 | +SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED) | ||
89 | +# Compiling library source | ||
90 | +SYSCONF_CXXFLAGS_LIB= -fPIC | ||
91 | +SYSCONF_CFLAGS_LIB= -fPIC | ||
92 | +# Compiling shared-object source | ||
93 | +SYSCONF_CXXFLAGS_SHOBJ= -fPIC | ||
94 | +SYSCONF_CFLAGS_SHOBJ= -fPIC | ||
95 | +# Linking Qt | ||
96 | +SYSCONF_LIBS_QTLIB= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) | ||
97 | +# Linking Qt applications | ||
98 | +SYSCONF_LIBS_QTAPP= | ||
99 | diff -uNr --exclude-from=./diff_ignore qt-2.3.2/include/qconfig.h qt-2.3.2_changed/include/qconfig.h | ||
2 | --- qt-2.3.2/include/qconfig.hFri Jan 26 14:43:06 2001 | 100 | --- qt-2.3.2/include/qconfig.hFri Jan 26 14:43:06 2001 |
3 | +++ qt-2.3.2_changed/include/qconfig.hSun Nov 16 12:57:23 2003 | 101 | +++ qt-2.3.2_changed/include/qconfig.hSun Nov 16 12:57:23 2003 |
4 | @@ -1,10 +1 @@ | 102 | @@ -1,10 +1 @@ |
5 | -// Empty leaves all features enabled. See doc/html/features.html for choices. | 103 | -// Empty leaves all features enabled. See doc/html/features.html for choices. |
6 | - | 104 | - |
7 | -// Note that disabling some features will produce a libqt that is not | 105 | -// Note that disabling some features will produce a libqt that is not |
@@ -10,25 +108,25 @@ diff -ru qt-2.3.2/include/qconfig.h qt-2.3.2_changed/include/qconfig.h | |||
10 | -// and where the application-suite is often a fixed set. | 108 | -// and where the application-suite is often a fixed set. |
11 | - | 109 | - |
12 | -#ifndef QT_DLL | 110 | -#ifndef QT_DLL |
13 | -#define QT_DLL // Internal | 111 | -#define QT_DLL // Internal |
14 | -#endif | 112 | -#endif |
15 | +// Everything | 113 | +// Everything |
16 | diff -ru qt-2.3.2/include/qglobal.h qt-2.3.2_changed/include/qglobal.h | 114 | diff -uNr --exclude-from=./diff_ignore qt-2.3.2/include/qglobal.h qt-2.3.2_changed/include/qglobal.h |
17 | --- qt-2.3.2/include/qglobal.hMon Oct 29 15:21:15 2001 | 115 | --- qt-2.3.2/include/qglobal.hMon Oct 29 15:21:15 2001 |
18 | +++ qt-2.3.2_changed/include/qglobal.hSat Oct 25 13:08:27 2003 | 116 | +++ qt-2.3.2_changed/include/qglobal.hSat Oct 25 13:08:27 2003 |
19 | @@ -73,6 +73,8 @@ | 117 | @@ -73,6 +73,8 @@ |
20 | 118 | ||
21 | #if defined(macintosh) | 119 | #if defined(macintosh) |
22 | #define _OS_MAC_ | 120 | #define _OS_MAC_ |
23 | +#elif defined(__APPLE__) | 121 | +#elif defined(__APPLE__) |
24 | +#define _OS_MACX_ | 122 | +#define _OS_MACX_ |
25 | #elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__) | 123 | #elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__) |
26 | #define _OS_MSDOS_ | 124 | #define _OS_MSDOS_ |
27 | #elif defined(OS2) || defined(_OS2) || defined(__OS2__) | 125 | #elif defined(OS2) || defined(_OS2) || defined(__OS2__) |
28 | diff -ru qt-2.3.2/include/qmodules.h qt-2.3.2_changed/include/qmodules.h | 126 | diff -uNr --exclude-from=./diff_ignore qt-2.3.2/include/qmodules.h qt-2.3.2_changed/include/qmodules.h |
29 | --- qt-2.3.2/include/qmodules.hFri Aug 31 17:00:56 2001 | 127 | --- qt-2.3.2/include/qmodules.hFri Aug 31 17:00:56 2001 |
30 | +++ qt-2.3.2_changed/include/qmodules.hSun Nov 16 12:57:23 2003 | 128 | +++ qt-2.3.2_changed/include/qmodules.hSun Nov 16 12:57:23 2003 |
31 | @@ -1,14 +1,12 @@ | 129 | @@ -1,14 +1,12 @@ |
32 | -#ifndef QT_H | 130 | -#ifndef QT_H |
33 | -#endif // QT_H | 131 | -#endif // QT_H |
34 | - | 132 | - |
@@ -44,37 +142,37 @@ diff -ru qt-2.3.2/include/qmodules.h qt-2.3.2_changed/include/qmodules.h | |||
44 | +#define QT_MODULE_NETWORK | 142 | +#define QT_MODULE_NETWORK |
45 | #define QT_MODULE_CANVAS | 143 | #define QT_MODULE_CANVAS |
46 | +#define QT_MODULE_TABLE | 144 | +#define QT_MODULE_TABLE |
47 | #define QT_MODULE_XML | 145 | #define QT_MODULE_XML |
48 | -#define QT_MODULE_NETWORK | 146 | -#define QT_MODULE_NETWORK |
49 | +#define QT_MODULE_OPENGL | 147 | +#define QT_MODULE_OPENGL |
50 | diff -ru qt-2.3.2/src/network/qdns.cpp qt-2.3.2_changed/src/network/qdns.cpp | 148 | diff -uNr --exclude-from=./diff_ignore qt-2.3.2/src/network/qdns.cpp qt-2.3.2_changed/src/network/qdns.cpp |
51 | --- qt-2.3.2/src/network/qdns.cppMon Oct 29 15:21:14 2001 | 149 | --- qt-2.3.2/src/network/qdns.cppMon Oct 29 15:21:14 2001 |
52 | +++ qt-2.3.2_changed/src/network/qdns.cppSun Nov 16 13:11:41 2003 | 150 | +++ qt-2.3.2_changed/src/network/qdns.cppSun Nov 16 13:11:41 2003 |
53 | @@ -1981,7 +1981,7 @@ | 151 | @@ -1981,7 +1981,7 @@ |
54 | domains = new QStrList( TRUE ); | 152 | domains = new QStrList( TRUE ); |
55 | domains->setAutoDelete( TRUE ); | 153 | domains->setAutoDelete( TRUE ); |
56 | 154 | ||
57 | - res_init(); | 155 | - res_init(); |
58 | + //res_init(); (se) | 156 | + //res_init(); (se) |
59 | int i; | 157 | int i; |
60 | // find the name servers to use | 158 | // find the name servers to use |
61 | for( i=0; i < MAXNS && i < _res.nscount; i++ ) { | 159 | for( i=0; i < MAXNS && i < _res.nscount; i++ ) { |
62 | diff -ru qt-2.3.2/src/network/qsocketdevice_unix.cpp qt-2.3.2_changed/src/network/qsocketdevice_unix.cpp | 160 | diff -uNr --exclude-from=./diff_ignore qt-2.3.2/src/network/qsocketdevice_unix.cpp qt-2.3.2_changed/src/network/qsocketdevice_unix.cpp |
63 | --- qt-2.3.2/src/network/qsocketdevice_unix.cppMon Oct 29 15:21:14 2001 | 161 | --- qt-2.3.2/src/network/qsocketdevice_unix.cppMon Oct 29 15:21:14 2001 |
64 | +++ qt-2.3.2_changed/src/network/qsocketdevice_unix.cppSat Oct 25 13:08:27 2003 | 162 | +++ qt-2.3.2_changed/src/network/qsocketdevice_unix.cppSat Oct 25 13:08:27 2003 |
65 | @@ -112,7 +112,7 @@ | 163 | @@ -112,7 +112,7 @@ |
66 | #if defined(_OS_LINUX_) && defined(__GLIBC__) && ( __GLIBC__ >= 2 ) | 164 | #if defined(_OS_LINUX_) && defined(__GLIBC__) && ( __GLIBC__ >= 2 ) |
67 | // new linux is Single Unix 1998, not old linux | 165 | // new linux is Single Unix 1998, not old linux |
68 | # define SOCKLEN_T socklen_t | 166 | # define SOCKLEN_T socklen_t |
69 | -#elif defined(BSD4_4) | 167 | -#elif defined(BSD4_4) |
70 | +#elif defined(BSD4_4) && !defined(_OS_MACX_) | 168 | +#elif defined(BSD4_4) && !defined(_OS_MACX_) |
71 | // BSD 4.4 | 169 | // BSD 4.4 |
72 | # if defined(_OS_FREEBSD_) && __FreeBSD_version < 400000 | 170 | # if defined(_OS_FREEBSD_) && __FreeBSD_version < 400000 |
73 | // FreeBSD 4.0 and higher | 171 | // FreeBSD 4.0 and higher |
74 | diff -ru qt-2.3.2/src/tools/qconfig.h qt-2.3.2_changed/src/tools/qconfig.h | 172 | diff -uNr --exclude-from=./diff_ignore qt-2.3.2/src/tools/qconfig.h qt-2.3.2_changed/src/tools/qconfig.h |
75 | --- qt-2.3.2/src/tools/qconfig.hFri Jan 26 14:43:06 2001 | 173 | --- qt-2.3.2/src/tools/qconfig.hFri Jan 26 14:43:06 2001 |
76 | +++ qt-2.3.2_changed/src/tools/qconfig.hSun Nov 16 12:57:23 2003 | 174 | +++ qt-2.3.2_changed/src/tools/qconfig.hSun Nov 16 12:57:23 2003 |
77 | @@ -1,10 +1 @@ | 175 | @@ -1,10 +1 @@ |
78 | -// Empty leaves all features enabled. See doc/html/features.html for choices. | 176 | -// Empty leaves all features enabled. See doc/html/features.html for choices. |
79 | - | 177 | - |
80 | -// Note that disabling some features will produce a libqt that is not | 178 | -// Note that disabling some features will produce a libqt that is not |
@@ -83,25 +181,25 @@ diff -ru qt-2.3.2/src/tools/qconfig.h qt-2.3.2_changed/src/tools/qconfig.h | |||
83 | -// and where the application-suite is often a fixed set. | 181 | -// and where the application-suite is often a fixed set. |
84 | - | 182 | - |
85 | -#ifndef QT_DLL | 183 | -#ifndef QT_DLL |
86 | -#define QT_DLL // Internal | 184 | -#define QT_DLL // Internal |
87 | -#endif | 185 | -#endif |
88 | +// Everything | 186 | +// Everything |
89 | diff -ru qt-2.3.2/src/tools/qglobal.h qt-2.3.2_changed/src/tools/qglobal.h | 187 | diff -uNr --exclude-from=./diff_ignore qt-2.3.2/src/tools/qglobal.h qt-2.3.2_changed/src/tools/qglobal.h |
90 | --- qt-2.3.2/src/tools/qglobal.hMon Oct 29 15:21:15 2001 | 188 | --- qt-2.3.2/src/tools/qglobal.hMon Oct 29 15:21:15 2001 |
91 | +++ qt-2.3.2_changed/src/tools/qglobal.hSat Oct 25 13:08:27 2003 | 189 | +++ qt-2.3.2_changed/src/tools/qglobal.hSat Oct 25 13:08:27 2003 |
92 | @@ -73,6 +73,8 @@ | 190 | @@ -73,6 +73,8 @@ |
93 | 191 | ||
94 | #if defined(macintosh) | 192 | #if defined(macintosh) |
95 | #define _OS_MAC_ | 193 | #define _OS_MAC_ |
96 | +#elif defined(__APPLE__) | 194 | +#elif defined(__APPLE__) |
97 | +#define _OS_MACX_ | 195 | +#define _OS_MACX_ |
98 | #elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__) | 196 | #elif defined(MSDOS) || defined(_MSDOS) || defined(__MSDOS__) |
99 | #define _OS_MSDOS_ | 197 | #define _OS_MSDOS_ |
100 | #elif defined(OS2) || defined(_OS2) || defined(__OS2__) | 198 | #elif defined(OS2) || defined(_OS2) || defined(__OS2__) |
101 | diff -ru qt-2.3.2/src/tools/qmodules.h qt-2.3.2_changed/src/tools/qmodules.h | 199 | diff -uNr --exclude-from=./diff_ignore qt-2.3.2/src/tools/qmodules.h qt-2.3.2_changed/src/tools/qmodules.h |
102 | --- qt-2.3.2/src/tools/qmodules.hFri Aug 31 17:00:56 2001 | 200 | --- qt-2.3.2/src/tools/qmodules.hFri Aug 31 17:00:56 2001 |
103 | +++ qt-2.3.2_changed/src/tools/qmodules.hSun Nov 16 12:57:23 2003 | 201 | +++ qt-2.3.2_changed/src/tools/qmodules.hSun Nov 16 12:57:23 2003 |
104 | @@ -1,14 +1,12 @@ | 202 | @@ -1,14 +1,12 @@ |
105 | -#ifndef QT_H | 203 | -#ifndef QT_H |
106 | -#endif // QT_H | 204 | -#endif // QT_H |
107 | - | 205 | - |
@@ -117,6 +215,558 @@ diff -ru qt-2.3.2/src/tools/qmodules.h qt-2.3.2_changed/src/tools/qmodules.h | |||
117 | +#define QT_MODULE_NETWORK | 215 | +#define QT_MODULE_NETWORK |
118 | #define QT_MODULE_CANVAS | 216 | #define QT_MODULE_CANVAS |
119 | +#define QT_MODULE_TABLE | 217 | +#define QT_MODULE_TABLE |
120 | #define QT_MODULE_XML | 218 | #define QT_MODULE_XML |
121 | -#define QT_MODULE_NETWORK | 219 | -#define QT_MODULE_NETWORK |
122 | +#define QT_MODULE_OPENGL | 220 | +#define QT_MODULE_OPENGL |
221 | diff -uNr --exclude-from=./diff_ignore qt-2.3.2/src-mt.mk qt-2.3.2_changed/src-mt.mk | ||
222 | --- qt-2.3.2/src-mt.mkThu Jan 1 01:00:00 1970 | ||
223 | +++ qt-2.3.2_changed/src-mt.mkSun Nov 16 12:57:23 2003 | ||
224 | @@ -0,0 +1,2 @@ | ||
225 | +all: | ||
226 | +@echo "(not building threaded Qt)" | ||
227 | diff -uNr --exclude-from=./diff_ignore qt-2.3.2/tools/qvfb/config.cpp qt-2.3.2_changed/tools/qvfb/config.cpp | ||
228 | --- qt-2.3.2/tools/qvfb/config.cppThu Jan 1 01:00:00 1970 | ||
229 | +++ qt-2.3.2_changed/tools/qvfb/config.cppSun Nov 16 13:29:37 2003 | ||
230 | @@ -0,0 +1,459 @@ | ||
231 | +/**************************************************************************** | ||
232 | +** Form implementation generated from reading ui file 'config.ui' | ||
233 | +** | ||
234 | +** Created: Sun Nov 16 13:29:37 2003 | ||
235 | +** by: The User Interface Compiler (uic) | ||
236 | +** | ||
237 | +** WARNING! All changes made in this file will be lost! | ||
238 | +****************************************************************************/ | ||
239 | +#include "config.h" | ||
240 | + | ||
241 | +#include <qbuttongroup.h> | ||
242 | +#include <qcombobox.h> | ||
243 | +#include <qgroupbox.h> | ||
244 | +#include <qlabel.h> | ||
245 | +#include <qpushbutton.h> | ||
246 | +#include <qradiobutton.h> | ||
247 | +#include <qslider.h> | ||
248 | +#include <qspinbox.h> | ||
249 | +#include "gammaview.h" | ||
250 | +#include <qlayout.h> | ||
251 | +#include <qvariant.h> | ||
252 | +#include <qtooltip.h> | ||
253 | +#include <qwhatsthis.h> | ||
254 | + | ||
255 | +/* | ||
256 | + * Constructs a Config which is a child of 'parent', with the | ||
257 | + * name 'name' and widget flags set to 'f' | ||
258 | + * | ||
259 | + * The dialog will by default be modeless, unless you set 'modal' to | ||
260 | + * TRUE to construct a modal dialog. | ||
261 | + */ | ||
262 | +Config::Config( QWidget* parent, const char* name, bool modal, WFlags fl ) | ||
263 | + : QDialog( parent, name, modal, fl ) | ||
264 | +{ | ||
265 | + if ( !name ) | ||
266 | +setName( "Config" ); | ||
267 | + resize( 481, 645 ); | ||
268 | + setCaption( tr( "Configure" ) ); | ||
269 | + setSizeGripEnabled( TRUE ); | ||
270 | + ConfigLayout = new QGridLayout( this ); | ||
271 | + ConfigLayout->setSpacing( 6 ); | ||
272 | + ConfigLayout->setMargin( 11 ); | ||
273 | + | ||
274 | + ButtonGroup2 = new QButtonGroup( this, "ButtonGroup2" ); | ||
275 | + ButtonGroup2->setTitle( tr( "Depth" ) ); | ||
276 | + | ||
277 | + depth_1 = new QRadioButton( ButtonGroup2, "depth_1" ); | ||
278 | + depth_1->setGeometry( QRect( 11, 19, 229, 19 ) ); | ||
279 | + depth_1->setText( tr( "1 bit monochrome" ) ); | ||
280 | + | ||
281 | + depth_4gray = new QRadioButton( ButtonGroup2, "depth_4gray" ); | ||
282 | + depth_4gray->setGeometry( QRect( 11, 44, 229, 19 ) ); | ||
283 | + depth_4gray->setText( tr( "4 bit grayscale" ) ); | ||
284 | + | ||
285 | + depth_8 = new QRadioButton( ButtonGroup2, "depth_8" ); | ||
286 | + depth_8->setGeometry( QRect( 11, 69, 229, 19 ) ); | ||
287 | + depth_8->setText( tr( "8 bit" ) ); | ||
288 | + | ||
289 | + depth_12 = new QRadioButton( ButtonGroup2, "depth_12" ); | ||
290 | + depth_12->setGeometry( QRect( 11, 94, 229, 19 ) ); | ||
291 | + depth_12->setText( tr( "12 (16) bit" ) ); | ||
292 | + | ||
293 | + depth_16 = new QRadioButton( ButtonGroup2, "depth_16" ); | ||
294 | + depth_16->setGeometry( QRect( 11, 119, 229, 19 ) ); | ||
295 | + depth_16->setText( tr( "16 bit" ) ); | ||
296 | + | ||
297 | + depth_32 = new QRadioButton( ButtonGroup2, "depth_32" ); | ||
298 | + depth_32->setGeometry( QRect( 11, 144, 229, 19 ) ); | ||
299 | + depth_32->setText( tr( "32 bit" ) ); | ||
300 | + | ||
301 | + ConfigLayout->addWidget( ButtonGroup2, 0, 1 ); | ||
302 | + | ||
303 | + Layout1 = new QHBoxLayout; | ||
304 | + Layout1->setSpacing( 6 ); | ||
305 | + Layout1->setMargin( 0 ); | ||
306 | + QSpacerItem* spacer = new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ); | ||
307 | + Layout1->addItem( spacer ); | ||
308 | + | ||
309 | + buttonOk = new QPushButton( this, "buttonOk" ); | ||
310 | + buttonOk->setText( tr( "&OK" ) ); | ||
311 | + buttonOk->setAutoDefault( TRUE ); | ||
312 | + buttonOk->setDefault( TRUE ); | ||
313 | + Layout1->addWidget( buttonOk ); | ||
314 | + | ||
315 | + buttonCancel = new QPushButton( this, "buttonCancel" ); | ||
316 | + buttonCancel->setText( tr( "&Cancel" ) ); | ||
317 | + buttonCancel->setAutoDefault( TRUE ); | ||
318 | + Layout1->addWidget( buttonCancel ); | ||
319 | + | ||
320 | + ConfigLayout->addMultiCellLayout( Layout1, 3, 3, 0, 1 ); | ||
321 | + | ||
322 | + GroupBox1 = new QGroupBox( this, "GroupBox1" ); | ||
323 | + GroupBox1->setTitle( tr( "Gamma" ) ); | ||
324 | + GroupBox1->setColumnLayout(0, Qt::Vertical ); | ||
325 | + GroupBox1->layout()->setSpacing( 0 ); | ||
326 | + GroupBox1->layout()->setMargin( 0 ); | ||
327 | + GroupBox1Layout = new QGridLayout( GroupBox1->layout() ); | ||
328 | + GroupBox1Layout->setAlignment( Qt::AlignTop ); | ||
329 | + GroupBox1Layout->setSpacing( 6 ); | ||
330 | + GroupBox1Layout->setMargin( 11 ); | ||
331 | + | ||
332 | + TextLabel3 = new QLabel( GroupBox1, "TextLabel3" ); | ||
333 | + TextLabel3->setText( tr( "Blue" ) ); | ||
334 | + | ||
335 | + GroupBox1Layout->addWidget( TextLabel3, 6, 0 ); | ||
336 | + | ||
337 | + bslider = new QSlider( GroupBox1, "bslider" ); | ||
338 | + QPalette pal; | ||
339 | + QColorGroup cg; | ||
340 | + cg.setColor( QColorGroup::Foreground, black ); | ||
341 | + cg.setColor( QColorGroup::Button, QColor( 0, 0, 255) ); | ||
342 | + cg.setColor( QColorGroup::Light, QColor( 127, 127, 255) ); | ||
343 | + cg.setColor( QColorGroup::Midlight, QColor( 63, 63, 255) ); | ||
344 | + cg.setColor( QColorGroup::Dark, QColor( 0, 0, 127) ); | ||
345 | + cg.setColor( QColorGroup::Mid, QColor( 0, 0, 170) ); | ||
346 | + cg.setColor( QColorGroup::Text, black ); | ||
347 | + cg.setColor( QColorGroup::BrightText, white ); | ||
348 | + cg.setColor( QColorGroup::ButtonText, black ); | ||
349 | + cg.setColor( QColorGroup::Base, white ); | ||
350 | + cg.setColor( QColorGroup::Background, QColor( 220, 220, 220) ); | ||
351 | + cg.setColor( QColorGroup::Shadow, black ); | ||
352 | + cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); | ||
353 | + cg.setColor( QColorGroup::HighlightedText, white ); | ||
354 | + pal.setActive( cg ); | ||
355 | + cg.setColor( QColorGroup::Foreground, black ); | ||
356 | + cg.setColor( QColorGroup::Button, QColor( 0, 0, 255) ); | ||
357 | + cg.setColor( QColorGroup::Light, QColor( 127, 127, 255) ); | ||
358 | + cg.setColor( QColorGroup::Midlight, QColor( 38, 38, 255) ); | ||
359 | + cg.setColor( QColorGroup::Dark, QColor( 0, 0, 127) ); | ||
360 | + cg.setColor( QColorGroup::Mid, QColor( 0, 0, 170) ); | ||
361 | + cg.setColor( QColorGroup::Text, black ); | ||
362 | + cg.setColor( QColorGroup::BrightText, white ); | ||
363 | + cg.setColor( QColorGroup::ButtonText, black ); | ||
364 | + cg.setColor( QColorGroup::Base, white ); | ||
365 | + cg.setColor( QColorGroup::Background, QColor( 220, 220, 220) ); | ||
366 | + cg.setColor( QColorGroup::Shadow, black ); | ||
367 | + cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); | ||
368 | + cg.setColor( QColorGroup::HighlightedText, white ); | ||
369 | + pal.setInactive( cg ); | ||
370 | + cg.setColor( QColorGroup::Foreground, QColor( 128, 128, 128) ); | ||
371 | + cg.setColor( QColorGroup::Button, QColor( 0, 0, 255) ); | ||
372 | + cg.setColor( QColorGroup::Light, QColor( 127, 127, 255) ); | ||
373 | + cg.setColor( QColorGroup::Midlight, QColor( 38, 38, 255) ); | ||
374 | + cg.setColor( QColorGroup::Dark, QColor( 0, 0, 127) ); | ||
375 | + cg.setColor( QColorGroup::Mid, QColor( 0, 0, 170) ); | ||
376 | + cg.setColor( QColorGroup::Text, black ); | ||
377 | + cg.setColor( QColorGroup::BrightText, white ); | ||
378 | + cg.setColor( QColorGroup::ButtonText, QColor( 128, 128, 128) ); | ||
379 | + cg.setColor( QColorGroup::Base, white ); | ||
380 | + cg.setColor( QColorGroup::Background, QColor( 220, 220, 220) ); | ||
381 | + cg.setColor( QColorGroup::Shadow, black ); | ||
382 | + cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); | ||
383 | + cg.setColor( QColorGroup::HighlightedText, white ); | ||
384 | + pal.setDisabled( cg ); | ||
385 | + bslider->setPalette( pal ); | ||
386 | + bslider->setMaxValue( 400 ); | ||
387 | + bslider->setValue( 100 ); | ||
388 | + bslider->setOrientation( QSlider::Horizontal ); | ||
389 | + | ||
390 | + GroupBox1Layout->addWidget( bslider, 6, 1 ); | ||
391 | + | ||
392 | + blabel = new QLabel( GroupBox1, "blabel" ); | ||
393 | + blabel->setText( tr( "1.0" ) ); | ||
394 | + | ||
395 | + GroupBox1Layout->addWidget( blabel, 6, 2 ); | ||
396 | + QSpacerItem* spacer_2 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); | ||
397 | + GroupBox1Layout->addItem( spacer_2, 5, 1 ); | ||
398 | + | ||
399 | + TextLabel2 = new QLabel( GroupBox1, "TextLabel2" ); | ||
400 | + TextLabel2->setText( tr( "Green" ) ); | ||
401 | + | ||
402 | + GroupBox1Layout->addWidget( TextLabel2, 4, 0 ); | ||
403 | + | ||
404 | + gslider = new QSlider( GroupBox1, "gslider" ); | ||
405 | + cg.setColor( QColorGroup::Foreground, black ); | ||
406 | + cg.setColor( QColorGroup::Button, QColor( 0, 255, 0) ); | ||
407 | + cg.setColor( QColorGroup::Light, QColor( 127, 255, 127) ); | ||
408 | + cg.setColor( QColorGroup::Midlight, QColor( 63, 255, 63) ); | ||
409 | + cg.setColor( QColorGroup::Dark, QColor( 0, 127, 0) ); | ||
410 | + cg.setColor( QColorGroup::Mid, QColor( 0, 170, 0) ); | ||
411 | + cg.setColor( QColorGroup::Text, black ); | ||
412 | + cg.setColor( QColorGroup::BrightText, white ); | ||
413 | + cg.setColor( QColorGroup::ButtonText, black ); | ||
414 | + cg.setColor( QColorGroup::Base, white ); | ||
415 | + cg.setColor( QColorGroup::Background, QColor( 220, 220, 220) ); | ||
416 | + cg.setColor( QColorGroup::Shadow, black ); | ||
417 | + cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); | ||
418 | + cg.setColor( QColorGroup::HighlightedText, white ); | ||
419 | + pal.setActive( cg ); | ||
420 | + cg.setColor( QColorGroup::Foreground, black ); | ||
421 | + cg.setColor( QColorGroup::Button, QColor( 0, 255, 0) ); | ||
422 | + cg.setColor( QColorGroup::Light, QColor( 127, 255, 127) ); | ||
423 | + cg.setColor( QColorGroup::Midlight, QColor( 38, 255, 38) ); | ||
424 | + cg.setColor( QColorGroup::Dark, QColor( 0, 127, 0) ); | ||
425 | + cg.setColor( QColorGroup::Mid, QColor( 0, 170, 0) ); | ||
426 | + cg.setColor( QColorGroup::Text, black ); | ||
427 | + cg.setColor( QColorGroup::BrightText, white ); | ||
428 | + cg.setColor( QColorGroup::ButtonText, black ); | ||
429 | + cg.setColor( QColorGroup::Base, white ); | ||
430 | + cg.setColor( QColorGroup::Background, QColor( 220, 220, 220) ); | ||
431 | + cg.setColor( QColorGroup::Shadow, black ); | ||
432 | + cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); | ||
433 | + cg.setColor( QColorGroup::HighlightedText, white ); | ||
434 | + pal.setInactive( cg ); | ||
435 | + cg.setColor( QColorGroup::Foreground, QColor( 128, 128, 128) ); | ||
436 | + cg.setColor( QColorGroup::Button, QColor( 0, 255, 0) ); | ||
437 | + cg.setColor( QColorGroup::Light, QColor( 127, 255, 127) ); | ||
438 | + cg.setColor( QColorGroup::Midlight, QColor( 38, 255, 38) ); | ||
439 | + cg.setColor( QColorGroup::Dark, QColor( 0, 127, 0) ); | ||
440 | + cg.setColor( QColorGroup::Mid, QColor( 0, 170, 0) ); | ||
441 | + cg.setColor( QColorGroup::Text, black ); | ||
442 | + cg.setColor( QColorGroup::BrightText, white ); | ||
443 | + cg.setColor( QColorGroup::ButtonText, QColor( 128, 128, 128) ); | ||
444 | + cg.setColor( QColorGroup::Base, white ); | ||
445 | + cg.setColor( QColorGroup::Background, QColor( 220, 220, 220) ); | ||
446 | + cg.setColor( QColorGroup::Shadow, black ); | ||
447 | + cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); | ||
448 | + cg.setColor( QColorGroup::HighlightedText, white ); | ||
449 | + pal.setDisabled( cg ); | ||
450 | + gslider->setPalette( pal ); | ||
451 | + gslider->setMaxValue( 400 ); | ||
452 | + gslider->setValue( 100 ); | ||
453 | + gslider->setOrientation( QSlider::Horizontal ); | ||
454 | + | ||
455 | + GroupBox1Layout->addWidget( gslider, 4, 1 ); | ||
456 | + | ||
457 | + glabel = new QLabel( GroupBox1, "glabel" ); | ||
458 | + glabel->setText( tr( "1.0" ) ); | ||
459 | + | ||
460 | + GroupBox1Layout->addWidget( glabel, 4, 2 ); | ||
461 | + | ||
462 | + TextLabel7 = new QLabel( GroupBox1, "TextLabel7" ); | ||
463 | + TextLabel7->setText( tr( "All" ) ); | ||
464 | + | ||
465 | + GroupBox1Layout->addWidget( TextLabel7, 0, 0 ); | ||
466 | + | ||
467 | + TextLabel8 = new QLabel( GroupBox1, "TextLabel8" ); | ||
468 | + TextLabel8->setText( tr( "1.0" ) ); | ||
469 | + | ||
470 | + GroupBox1Layout->addWidget( TextLabel8, 0, 2 ); | ||
471 | + | ||
472 | + gammaslider = new QSlider( GroupBox1, "gammaslider" ); | ||
473 | + cg.setColor( QColorGroup::Foreground, black ); | ||
474 | + cg.setColor( QColorGroup::Button, white ); | ||
475 | + cg.setColor( QColorGroup::Light, white ); | ||
476 | + cg.setColor( QColorGroup::Midlight, white ); | ||
477 | + cg.setColor( QColorGroup::Dark, QColor( 127, 127, 127) ); | ||
478 | + cg.setColor( QColorGroup::Mid, QColor( 170, 170, 170) ); | ||
479 | + cg.setColor( QColorGroup::Text, black ); | ||
480 | + cg.setColor( QColorGroup::BrightText, white ); | ||
481 | + cg.setColor( QColorGroup::ButtonText, black ); | ||
482 | + cg.setColor( QColorGroup::Base, white ); | ||
483 | + cg.setColor( QColorGroup::Background, QColor( 220, 220, 220) ); | ||
484 | + cg.setColor( QColorGroup::Shadow, black ); | ||
485 | + cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); | ||
486 | + cg.setColor( QColorGroup::HighlightedText, white ); | ||
487 | + pal.setActive( cg ); | ||
488 | + cg.setColor( QColorGroup::Foreground, black ); | ||
489 | + cg.setColor( QColorGroup::Button, white ); | ||
490 | + cg.setColor( QColorGroup::Light, white ); | ||
491 | + cg.setColor( QColorGroup::Midlight, white ); | ||
492 | + cg.setColor( QColorGroup::Dark, QColor( 127, 127, 127) ); | ||
493 | + cg.setColor( QColorGroup::Mid, QColor( 170, 170, 170) ); | ||
494 | + cg.setColor( QColorGroup::Text, black ); | ||
495 | + cg.setColor( QColorGroup::BrightText, white ); | ||
496 | + cg.setColor( QColorGroup::ButtonText, black ); | ||
497 | + cg.setColor( QColorGroup::Base, white ); | ||
498 | + cg.setColor( QColorGroup::Background, QColor( 220, 220, 220) ); | ||
499 | + cg.setColor( QColorGroup::Shadow, black ); | ||
500 | + cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); | ||
501 | + cg.setColor( QColorGroup::HighlightedText, white ); | ||
502 | + pal.setInactive( cg ); | ||
503 | + cg.setColor( QColorGroup::Foreground, QColor( 128, 128, 128) ); | ||
504 | + cg.setColor( QColorGroup::Button, white ); | ||
505 | + cg.setColor( QColorGroup::Light, white ); | ||
506 | + cg.setColor( QColorGroup::Midlight, white ); | ||
507 | + cg.setColor( QColorGroup::Dark, QColor( 127, 127, 127) ); | ||
508 | + cg.setColor( QColorGroup::Mid, QColor( 170, 170, 170) ); | ||
509 | + cg.setColor( QColorGroup::Text, black ); | ||
510 | + cg.setColor( QColorGroup::BrightText, white ); | ||
511 | + cg.setColor( QColorGroup::ButtonText, QColor( 128, 128, 128) ); | ||
512 | + cg.setColor( QColorGroup::Base, white ); | ||
513 | + cg.setColor( QColorGroup::Background, QColor( 220, 220, 220) ); | ||
514 | + cg.setColor( QColorGroup::Shadow, black ); | ||
515 | + cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); | ||
516 | + cg.setColor( QColorGroup::HighlightedText, white ); | ||
517 | + pal.setDisabled( cg ); | ||
518 | + gammaslider->setPalette( pal ); | ||
519 | + gammaslider->setMaxValue( 400 ); | ||
520 | + gammaslider->setValue( 100 ); | ||
521 | + gammaslider->setOrientation( QSlider::Horizontal ); | ||
522 | + | ||
523 | + GroupBox1Layout->addWidget( gammaslider, 0, 1 ); | ||
524 | + | ||
525 | + TextLabel1_2 = new QLabel( GroupBox1, "TextLabel1_2" ); | ||
526 | + TextLabel1_2->setText( tr( "Red" ) ); | ||
527 | + | ||
528 | + GroupBox1Layout->addWidget( TextLabel1_2, 2, 0 ); | ||
529 | + | ||
530 | + rlabel = new QLabel( GroupBox1, "rlabel" ); | ||
531 | + rlabel->setText( tr( "1.0" ) ); | ||
532 | + | ||
533 | + GroupBox1Layout->addWidget( rlabel, 2, 2 ); | ||
534 | + | ||
535 | + rslider = new QSlider( GroupBox1, "rslider" ); | ||
536 | + cg.setColor( QColorGroup::Foreground, black ); | ||
537 | + cg.setColor( QColorGroup::Button, QColor( 255, 0, 0) ); | ||
538 | + cg.setColor( QColorGroup::Light, QColor( 255, 127, 127) ); | ||
539 | + cg.setColor( QColorGroup::Midlight, QColor( 255, 63, 63) ); | ||
540 | + cg.setColor( QColorGroup::Dark, QColor( 127, 0, 0) ); | ||
541 | + cg.setColor( QColorGroup::Mid, QColor( 170, 0, 0) ); | ||
542 | + cg.setColor( QColorGroup::Text, black ); | ||
543 | + cg.setColor( QColorGroup::BrightText, white ); | ||
544 | + cg.setColor( QColorGroup::ButtonText, black ); | ||
545 | + cg.setColor( QColorGroup::Base, white ); | ||
546 | + cg.setColor( QColorGroup::Background, QColor( 220, 220, 220) ); | ||
547 | + cg.setColor( QColorGroup::Shadow, black ); | ||
548 | + cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); | ||
549 | + cg.setColor( QColorGroup::HighlightedText, white ); | ||
550 | + pal.setActive( cg ); | ||
551 | + cg.setColor( QColorGroup::Foreground, black ); | ||
552 | + cg.setColor( QColorGroup::Button, QColor( 255, 0, 0) ); | ||
553 | + cg.setColor( QColorGroup::Light, QColor( 255, 127, 127) ); | ||
554 | + cg.setColor( QColorGroup::Midlight, QColor( 255, 38, 38) ); | ||
555 | + cg.setColor( QColorGroup::Dark, QColor( 127, 0, 0) ); | ||
556 | + cg.setColor( QColorGroup::Mid, QColor( 170, 0, 0) ); | ||
557 | + cg.setColor( QColorGroup::Text, black ); | ||
558 | + cg.setColor( QColorGroup::BrightText, white ); | ||
559 | + cg.setColor( QColorGroup::ButtonText, black ); | ||
560 | + cg.setColor( QColorGroup::Base, white ); | ||
561 | + cg.setColor( QColorGroup::Background, QColor( 220, 220, 220) ); | ||
562 | + cg.setColor( QColorGroup::Shadow, black ); | ||
563 | + cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); | ||
564 | + cg.setColor( QColorGroup::HighlightedText, white ); | ||
565 | + pal.setInactive( cg ); | ||
566 | + cg.setColor( QColorGroup::Foreground, QColor( 128, 128, 128) ); | ||
567 | + cg.setColor( QColorGroup::Button, QColor( 255, 0, 0) ); | ||
568 | + cg.setColor( QColorGroup::Light, QColor( 255, 127, 127) ); | ||
569 | + cg.setColor( QColorGroup::Midlight, QColor( 255, 38, 38) ); | ||
570 | + cg.setColor( QColorGroup::Dark, QColor( 127, 0, 0) ); | ||
571 | + cg.setColor( QColorGroup::Mid, QColor( 170, 0, 0) ); | ||
572 | + cg.setColor( QColorGroup::Text, black ); | ||
573 | + cg.setColor( QColorGroup::BrightText, white ); | ||
574 | + cg.setColor( QColorGroup::ButtonText, QColor( 128, 128, 128) ); | ||
575 | + cg.setColor( QColorGroup::Base, white ); | ||
576 | + cg.setColor( QColorGroup::Background, QColor( 220, 220, 220) ); | ||
577 | + cg.setColor( QColorGroup::Shadow, black ); | ||
578 | + cg.setColor( QColorGroup::Highlight, QColor( 10, 95, 137) ); | ||
579 | + cg.setColor( QColorGroup::HighlightedText, white ); | ||
580 | + pal.setDisabled( cg ); | ||
581 | + rslider->setPalette( pal ); | ||
582 | + rslider->setMaxValue( 400 ); | ||
583 | + rslider->setValue( 100 ); | ||
584 | + rslider->setOrientation( QSlider::Horizontal ); | ||
585 | + | ||
586 | + GroupBox1Layout->addWidget( rslider, 2, 1 ); | ||
587 | + QSpacerItem* spacer_3 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); | ||
588 | + GroupBox1Layout->addItem( spacer_3, 3, 1 ); | ||
589 | + QSpacerItem* spacer_4 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); | ||
590 | + GroupBox1Layout->addItem( spacer_4, 1, 1 ); | ||
591 | + | ||
592 | + PushButton3 = new QPushButton( GroupBox1, "PushButton3" ); | ||
593 | + PushButton3->setText( tr( "Set all to 1.0" ) ); | ||
594 | + | ||
595 | + GroupBox1Layout->addMultiCellWidget( PushButton3, 8, 8, 0, 2 ); | ||
596 | + | ||
597 | + MyCustomWidget1 = new GammaView( GroupBox1, "MyCustomWidget1" ); | ||
598 | + | ||
599 | + GroupBox1Layout->addMultiCellWidget( MyCustomWidget1, 0, 8, 3, 3 ); | ||
600 | + QSpacerItem* spacer_5 = new QSpacerItem( 20, 20, QSizePolicy::Minimum, QSizePolicy::Expanding ); | ||
601 | + GroupBox1Layout->addItem( spacer_5, 7, 1 ); | ||
602 | + | ||
603 | + ConfigLayout->addMultiCellWidget( GroupBox1, 2, 2, 0, 1 ); | ||
604 | + | ||
605 | + ButtonGroup1 = new QButtonGroup( this, "ButtonGroup1" ); | ||
606 | + ButtonGroup1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, ButtonGroup1->sizePolicy().hasHeightForWidth() ) ); | ||
607 | + ButtonGroup1->setTitle( tr( "Size" ) ); | ||
608 | + ButtonGroup1->setColumnLayout(0, Qt::Vertical ); | ||
609 | + ButtonGroup1->layout()->setSpacing( 0 ); | ||
610 | + ButtonGroup1->layout()->setMargin( 0 ); | ||
611 | + ButtonGroup1Layout = new QVBoxLayout( ButtonGroup1->layout() ); | ||
612 | + ButtonGroup1Layout->setAlignment( Qt::AlignTop ); | ||
613 | + ButtonGroup1Layout->setSpacing( 6 ); | ||
614 | + ButtonGroup1Layout->setMargin( 11 ); | ||
615 | + | ||
616 | + size_240_320 = new QRadioButton( ButtonGroup1, "size_240_320" ); | ||
617 | + size_240_320->setText( tr( "240x320 \"PDA\"" ) ); | ||
618 | + ButtonGroup1Layout->addWidget( size_240_320 ); | ||
619 | + | ||
620 | + size_320_240 = new QRadioButton( ButtonGroup1, "size_320_240" ); | ||
621 | + size_320_240->setText( tr( "320x240 \"TV\"" ) ); | ||
622 | + ButtonGroup1Layout->addWidget( size_320_240 ); | ||
623 | + | ||
624 | + size_640_480 = new QRadioButton( ButtonGroup1, "size_640_480" ); | ||
625 | + size_640_480->setText( tr( "640x480 \"VGA\"" ) ); | ||
626 | + ButtonGroup1Layout->addWidget( size_640_480 ); | ||
627 | + | ||
628 | + Layout1_2 = new QHBoxLayout; | ||
629 | + Layout1_2->setSpacing( 6 ); | ||
630 | + Layout1_2->setMargin( 0 ); | ||
631 | + | ||
632 | + size_custom = new QRadioButton( ButtonGroup1, "size_custom" ); | ||
633 | + size_custom->setText( tr( "Custom" ) ); | ||
634 | + Layout1_2->addWidget( size_custom ); | ||
635 | + | ||
636 | + size_width = new QSpinBox( ButtonGroup1, "size_width" ); | ||
637 | + size_width->setMaxValue( 1280 ); | ||
638 | + size_width->setMinValue( 1 ); | ||
639 | + size_width->setLineStep( 16 ); | ||
640 | + size_width->setValue( 400 ); | ||
641 | + Layout1_2->addWidget( size_width ); | ||
642 | + | ||
643 | + size_height = new QSpinBox( ButtonGroup1, "size_height" ); | ||
644 | + size_height->setMaxValue( 1024 ); | ||
645 | + size_height->setMinValue( 1 ); | ||
646 | + size_height->setLineStep( 16 ); | ||
647 | + size_height->setValue( 300 ); | ||
648 | + Layout1_2->addWidget( size_height ); | ||
649 | + ButtonGroup1Layout->addLayout( Layout1_2 ); | ||
650 | + | ||
651 | + Layout8 = new QHBoxLayout; | ||
652 | + Layout8->setSpacing( 6 ); | ||
653 | + Layout8->setMargin( 0 ); | ||
654 | + | ||
655 | + size_skin = new QRadioButton( ButtonGroup1, "size_skin" ); | ||
656 | + size_skin->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)0, (QSizePolicy::SizeType)0, size_skin->sizePolicy().hasHeightForWidth() ) ); | ||
657 | + size_skin->setText( tr( "Skin" ) ); | ||
658 | + Layout8->addWidget( size_skin ); | ||
659 | + | ||
660 | + skin = new QComboBox( FALSE, ButtonGroup1, "skin" ); | ||
661 | + skin->insertItem( tr( "pda.skin" ) ); | ||
662 | + skin->insertItem( tr( "ipaq.skin" ) ); | ||
663 | + skin->insertItem( tr( "qpe.skin" ) ); | ||
664 | + skin->insertItem( tr( "cassiopeia.skin" ) ); | ||
665 | + skin->insertItem( tr( "other.skin" ) ); | ||
666 | + skin->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, skin->sizePolicy().hasHeightForWidth() ) ); | ||
667 | + Layout8->addWidget( skin ); | ||
668 | + ButtonGroup1Layout->addLayout( Layout8 ); | ||
669 | + | ||
670 | + ConfigLayout->addWidget( ButtonGroup1, 0, 0 ); | ||
671 | + | ||
672 | + TextLabel1 = new QLabel( this, "TextLabel1" ); | ||
673 | + TextLabel1->setText( tr( "<p>Note that any applications using the virtual framebuffer will be terminated if you change the Size or Depth <i>above</i>. You may freely modify the Gamma <i>below</i>." ) ); | ||
674 | + | ||
675 | + ConfigLayout->addMultiCellWidget( TextLabel1, 1, 1, 0, 1 ); | ||
676 | + | ||
677 | + // signals and slots connections | ||
678 | + connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) ); | ||
679 | + connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) ); | ||
680 | +} | ||
681 | + | ||
682 | +/* | ||
683 | + * Destroys the object and frees any allocated resources | ||
684 | + */ | ||
685 | +Config::~Config() | ||
686 | +{ | ||
687 | + // no need to delete child widgets, Qt does it all for us | ||
688 | +} | ||
689 | + | ||
690 | diff -uNr --exclude-from=./diff_ignore qt-2.3.2/tools/qvfb/config.h qt-2.3.2_changed/tools/qvfb/config.h | ||
691 | --- qt-2.3.2/tools/qvfb/config.hThu Jan 1 01:00:00 1970 | ||
692 | +++ qt-2.3.2_changed/tools/qvfb/config.hSun Nov 16 13:29:26 2003 | ||
693 | @@ -0,0 +1,79 @@ | ||
694 | +/**************************************************************************** | ||
695 | +** Form interface generated from reading ui file 'config.ui' | ||
696 | +** | ||
697 | +** Created: Sun Nov 16 13:29:26 2003 | ||
698 | +** by: The User Interface Compiler (uic) | ||
699 | +** | ||
700 | +** WARNING! All changes made in this file will be lost! | ||
701 | +****************************************************************************/ | ||
702 | +#ifndef CONFIG_H | ||
703 | +#define CONFIG_H | ||
704 | + | ||
705 | +#include <qvariant.h> | ||
706 | +#include <qdialog.h> | ||
707 | +class QVBoxLayout; | ||
708 | +class QHBoxLayout; | ||
709 | +class QGridLayout; | ||
710 | +class GammaView; | ||
711 | +class QButtonGroup; | ||
712 | +class QComboBox; | ||
713 | +class QGroupBox; | ||
714 | +class QLabel; | ||
715 | +class QPushButton; | ||
716 | +class QRadioButton; | ||
717 | +class QSlider; | ||
718 | +class QSpinBox; | ||
719 | + | ||
720 | +class Config : public QDialog | ||
721 | +{ | ||
722 | + Q_OBJECT | ||
723 | + | ||
724 | +public: | ||
725 | + Config( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); | ||
726 | + ~Config(); | ||
727 | + | ||
728 | + QButtonGroup* ButtonGroup2; | ||
729 | + QRadioButton* depth_1; | ||
730 | + QRadioButton* depth_4gray; | ||
731 | + QRadioButton* depth_8; | ||
732 | + QRadioButton* depth_12; | ||
733 | + QRadioButton* depth_16; | ||
734 | + QRadioButton* depth_32; | ||
735 | + QPushButton* buttonOk; | ||
736 | + QPushButton* buttonCancel; | ||
737 | + QGroupBox* GroupBox1; | ||
738 | + QLabel* TextLabel3; | ||
739 | + QSlider* bslider; | ||
740 | + QLabel* blabel; | ||
741 | + QLabel* TextLabel2; | ||
742 | + QSlider* gslider; | ||
743 | + QLabel* glabel; | ||
744 | + QLabel* TextLabel7; | ||
745 | + QLabel* TextLabel8; | ||
746 | + QSlider* gammaslider; | ||
747 | + QLabel* TextLabel1_2; | ||
748 | + QLabel* rlabel; | ||
749 | + QSlider* rslider; | ||
750 | + QPushButton* PushButton3; | ||
751 | + GammaView* MyCustomWidget1; | ||
752 | + QButtonGroup* ButtonGroup1; | ||
753 | + QRadioButton* size_240_320; | ||
754 | + QRadioButton* size_320_240; | ||
755 | + QRadioButton* size_640_480; | ||
756 | + QRadioButton* size_custom; | ||
757 | + QSpinBox* size_width; | ||
758 | + QSpinBox* size_height; | ||
759 | + QRadioButton* size_skin; | ||
760 | + QComboBox* skin; | ||
761 | + QLabel* TextLabel1; | ||
762 | + | ||
763 | +protected: | ||
764 | + QGridLayout* ConfigLayout; | ||
765 | + QHBoxLayout* Layout1; | ||
766 | + QGridLayout* GroupBox1Layout; | ||
767 | + QVBoxLayout* ButtonGroup1Layout; | ||
768 | + QHBoxLayout* Layout1_2; | ||
769 | + QHBoxLayout* Layout8; | ||
770 | +}; | ||
771 | + | ||
772 | +#endif // CONFIG_H | ||