compbench-devel Mailing List for CompBenchmarks (Page 2)
Brought to you by:
xfred
Menu
▾
▴
compbench-devel
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(48) |
Oct
(51) |
Nov
(66) |
Dec
(83) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(242) |
Feb
(56) |
Mar
(95) |
Apr
(120) |
May
(127) |
Jun
(32) |
Jul
(10) |
Aug
(55) |
Sep
(114) |
Oct
(3) |
Nov
|
Dec
|
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:33:10
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16621 Modified Files: 07-compbenchmarks-core.pl Log Message: CBM::LibUI deprecated. Index: 07-compbenchmarks-core.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/07-compbenchmarks-core.pl,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** 07-compbenchmarks-core.pl 27 May 2007 16:06:37 -0000 1.7 --- 07-compbenchmarks-core.pl 19 Sep 2007 16:33:07 -0000 1.8 *************** *** 9,13 **** use strict; ! use CBM::LibUI; use Test::Simple tests => 115; --- 9,13 ---- use strict; ! # use CBM::LibUI; use Test::Simple tests => 115; |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:32:34
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv16337 Modified Files: 00-CBMSystem-public.pl Log Message: Bump to 0.5.0. Index: 00-CBMSystem-public.pl =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/00-CBMSystem-public.pl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** 00-CBMSystem-public.pl 4 Sep 2007 17:08:21 -0000 1.12 --- 00-CBMSystem-public.pl 19 Sep 2007 16:32:32 -0000 1.13 *************** *** 165,169 **** test_getLastCommand(); test_getLastCommandOutput(); ! ok($sys->Version() eq "0.5.0-BETA3"); $sys->done(); --- 165,169 ---- test_getLastCommand(); test_getLastCommandOutput(); ! ok($sys->Version() eq "0.5.0"); $sys->done(); |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:31:08
|
Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15822 Modified Files: Makefile.am Log Message: Minor changes on installation. Should be useless BTW. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/Makefile.am,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Makefile.am 29 Aug 2007 20:32:48 -0000 1.23 --- Makefile.am 19 Sep 2007 16:31:05 -0000 1.24 *************** *** 42,45 **** --- 42,47 ---- inst_pkgdatadir=@datarootdir@/compbenchmarks/@VERSION@/perl + libCBM_la_instdir=@datarootdir@/compbenchmarks/@VERSION@/perl + $(top_builddir)/CBM-PI/CBM_wrap.cxx: CBM.i $(CBMPI_DEP_H) |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:29:41
|
Update of /cvsroot/compbench/CompBenchmarks++ In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv15100 Modified Files: configure.in Log Message: perl/ sub-directory has been deprecated. Bump to 0.5.0. Index: configure.in =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/configure.in,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** configure.in 9 Sep 2007 18:23:31 -0000 1.39 --- configure.in 19 Sep 2007 16:29:38 -0000 1.40 *************** *** 15,19 **** AC_CANONICAL_TARGET ! AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0-BETA3) AM_CONFIG_HEADER(libcompbenchmarks/config.h) --- 15,19 ---- AC_CANONICAL_TARGET ! AM_INIT_AUTOMAKE(compbenchmarks, 0.5.0) AM_CONFIG_HEADER(libcompbenchmarks/config.h) *************** *** 271,276 **** libcompbenchmarks/share/system/Makefile libcompbenchmarks/share/system/cygwin/Makefile - libcompbenchmarks/share/perl/CBM/Makefile - libcompbenchmarks/share/perl/Makefile libcompbenchmarks/share/KB/Makefile libcompbenchmarks/share/KB/tcc/0.9.x/Makefile --- 271,274 ---- |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:29:04
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/perl/CBM In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14733 Removed Files: LibUI.pm Makefile.am Log Message: perl/ sub-directory has been deprecated. --- Makefile.am DELETED --- --- LibUI.pm DELETED --- |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:26:56
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/patches In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13965 Modified Files: Makefile.am Log Message: Simplified better rules (Mandriva compilant) for make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/patches/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 22 Jan 2007 18:24:45 -0000 1.2 --- Makefile.am 19 Sep 2007 16:26:50 -0000 1.3 *************** *** 8,14 **** # ----------------------------------------------------------------------------- ! data_DATA = scimark2.patch.gz benchpp.patch.gz ! datarootdir=@datarootdir@/compbenchmarks/@VERSION@/patches ! EXTRA_DIST = $(data_DATA) \ No newline at end of file --- 8,17 ---- # ----------------------------------------------------------------------------- ! patches_DATA = scimark2.patch.gz benchpp.patch.gz ! patchesdir=$(datadir)/compbenchmarks/@VERSION@/patches ! #inst_pkgdata_DATA=$(data_DATA) ! #inst_pkgdatadir=$(datarootdir) ! ! EXTRA_DIST = $(patches_DATA) \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:26:00
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/tcc/0.9.x In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13511/tcc/0.9.x Modified Files: Makefile.am Log Message: Simplified better rules (Mandriva compilant) for make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/tcc/0.9.x/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 17 Apr 2007 20:34:37 -0000 1.1 --- Makefile.am 19 Sep 2007 16:25:51 -0000 1.2 *************** *** 8,14 **** # ----------------------------------------------------------------------------- ! data_DATA = description.xml ! datarootdir=@datarootdir@/compbenchmarks/@VERSION@/KB/tcc/0.9.x ! EXTRA_DIST = $(data_DATA) \ No newline at end of file --- 8,17 ---- # ----------------------------------------------------------------------------- ! opt_DATA = description.xml ! optdir=@datarootdir@/compbenchmarks/@VERSION@/KB/tcc/0.9.x ! #inst_pkgdata_DATA=$(data_DATA) ! #inst_pkgdatadir=$(datarootdir) ! ! EXTRA_DIST = $(opt_DATA) \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:25:59
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gcc/3.0.x In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13511/gcc/3.0.x Modified Files: Makefile.am Log Message: Simplified better rules (Mandriva compilant) for make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gcc/3.0.x/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 5 Apr 2007 17:11:51 -0000 1.1 --- Makefile.am 19 Sep 2007 16:25:50 -0000 1.2 *************** *** 8,14 **** # ----------------------------------------------------------------------------- ! data_DATA = description.xml ! datarootdir=@datarootdir@/compbenchmarks/@VERSION@/KB/gcc/3.0.x ! EXTRA_DIST = $(data_DATA) \ No newline at end of file --- 8,17 ---- # ----------------------------------------------------------------------------- ! opt_DATA = description.xml ! optdir=$(datadir)/compbenchmarks/@VERSION@/KB/gcc/3.0.x ! #inst_pkgdata_DATA=$(data_DATA) ! #inst_pkgdatadir=$(datarootdir) ! ! EXTRA_DIST = $(opt_DATA) \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:25:59
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gcc/2.95.x In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13511/gcc/2.95.x Modified Files: Makefile.am Log Message: Simplified better rules (Mandriva compilant) for make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gcc/2.95.x/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 4 Apr 2007 18:31:34 -0000 1.1 --- Makefile.am 19 Sep 2007 16:25:50 -0000 1.2 *************** *** 8,14 **** # ----------------------------------------------------------------------------- ! data_DATA = description.xml ! datarootdir=@datarootdir@/compbenchmarks/@VERSION@/KB/gcc/2.95.x ! EXTRA_DIST = $(data_DATA) \ No newline at end of file --- 8,17 ---- # ----------------------------------------------------------------------------- ! opt_DATA = description.xml ! optdir=$(datadir)/compbenchmarks/@VERSION@/KB/gcc/2.95.x ! #inst_pkgdata_DATA=$(data_DATA) ! #inst_pkgdatadir=$(datarootdir) ! ! EXTRA_DIST = $(opt_DATA) \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:25:56
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gxx/3.0.x In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13511/gxx/3.0.x Modified Files: Makefile.am Log Message: Simplified better rules (Mandriva compilant) for make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gxx/3.0.x/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 17 Apr 2007 19:25:52 -0000 1.5 --- Makefile.am 19 Sep 2007 16:25:51 -0000 1.6 *************** *** 8,14 **** # ----------------------------------------------------------------------------- ! data_DATA = description.xml arch.xml profile.xml ! datarootdir=@datarootdir@/compbenchmarks/@VERSION@/KB/gxx/3.0.x ! EXTRA_DIST = $(data_DATA) \ No newline at end of file --- 8,17 ---- # ----------------------------------------------------------------------------- ! opt_DATA = description.xml arch.xml profile.xml ! optdir=$(datadir)/compbenchmarks/@VERSION@/KB/gxx/3.0.x ! # inst_pkgdata_DATA=$(data_DATA) ! # inst_pkgdatadir=$(datarootdir) ! ! EXTRA_DIST = $(opt_DATA) \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:25:56
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gxx/2.95.x In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13511/gxx/2.95.x Modified Files: Makefile.am Log Message: Simplified better rules (Mandriva compilant) for make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gxx/2.95.x/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Makefile.am 12 Apr 2007 16:50:36 -0000 1.3 --- Makefile.am 19 Sep 2007 16:25:51 -0000 1.4 *************** *** 8,12 **** # ----------------------------------------------------------------------------- ! data_DATA = description.xml \ mainopt.xml \ arch.xml \ --- 8,12 ---- # ----------------------------------------------------------------------------- ! opt_DATA = description.xml \ mainopt.xml \ arch.xml \ *************** *** 15,19 **** loops.xml ! datarootdir=@datarootdir@/compbenchmarks/@VERSION@/KB/gxx/2.95.x ! EXTRA_DIST = $(data_DATA) \ No newline at end of file --- 15,22 ---- loops.xml ! optdir=$(datadir)/compbenchmarks/@VERSION@/KB/gxx/2.95.x ! # inst_pkgdata_DATA=$(data_DATA) ! # inst_pkgdatadir=$(datarootdir) ! ! EXTRA_DIST = $(opt_DATA) |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:25:56
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gxx/3.1.x In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13511/gxx/3.1.x Modified Files: Makefile.am Log Message: Simplified better rules (Mandriva compilant) for make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gxx/3.1.x/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 17 Apr 2007 19:25:52 -0000 1.1 --- Makefile.am 19 Sep 2007 16:25:51 -0000 1.2 *************** *** 8,14 **** # ----------------------------------------------------------------------------- ! data_DATA = description.xml arch.xml profile.xml ! datarootdir=@datarootdir@/compbenchmarks/@VERSION@/KB/gxx/3.1.x ! EXTRA_DIST = $(data_DATA) \ No newline at end of file --- 8,18 ---- # ----------------------------------------------------------------------------- ! opt_DATA = description.xml arch.xml profile.xml ! # datarootdir=@datarootdir@/compbenchmarks/@VERSION@/KB/gxx/3.1.x ! optdir=$(datadir)/compbenchmarks/@VERSION@/KB/gxx/3.1.x ! # inst_pkgdata_DATA=$(data_DATA) ! # inst_pkgdatadir=$(datarootdir) ! ! EXTRA_DIST = $(opt_DATA) \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:25:56
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gcc/3.1.x In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13511/gcc/3.1.x Modified Files: Makefile.am Log Message: Simplified better rules (Mandriva compilant) for make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/gcc/3.1.x/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 17 Apr 2007 19:25:52 -0000 1.1 --- Makefile.am 19 Sep 2007 16:25:50 -0000 1.2 *************** *** 8,14 **** # ----------------------------------------------------------------------------- ! data_DATA = description.xml ! datarootdir=@datarootdir@/compbenchmarks/@VERSION@/KB/gcc/3.1.x ! EXTRA_DIST = $(data_DATA) \ No newline at end of file --- 8,17 ---- # ----------------------------------------------------------------------------- ! opt_DATA = description.xml ! optdir=$(datadir)/compbenchmarks/@VERSION@/KB/gcc/3.1.x ! #inst_pkgdata_DATA=$(data_DATA) ! #inst_pkgdatadir=$(datarootdir) ! ! EXTRA_DIST = $(opt_DATA) \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:25:55
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/g++/3.1.x In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13511/g++/3.1.x Modified Files: Makefile.am Log Message: Simplified better rules (Mandriva compilant) for make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/g++/3.1.x/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 17 Apr 2007 19:25:52 -0000 1.1 --- Makefile.am 19 Sep 2007 16:25:50 -0000 1.2 *************** *** 8,14 **** # ----------------------------------------------------------------------------- ! data_DATA = description.xml ! datarootdir=@datarootdir@/compbenchmarks/@VERSION@/KB/g++/3.1.x ! EXTRA_DIST = $(data_DATA) \ No newline at end of file --- 8,17 ---- # ----------------------------------------------------------------------------- ! opt_DATA = description.xml ! optdir=$(datadir)/compbenchmarks/@VERSION@/KB/g++/3.1.x ! # inst_pkgdata_DATA=$(data_DATA) ! # inst_pkgdatadir=$(datarootdir) ! ! EXTRA_DIST = $(opt_DATA) \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:25:55
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/g++/3.0.x In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13511/g++/3.0.x Modified Files: Makefile.am Log Message: Simplified better rules (Mandriva compilant) for make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/g++/3.0.x/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.am 5 Apr 2007 17:10:31 -0000 1.1 --- Makefile.am 19 Sep 2007 16:25:50 -0000 1.2 *************** *** 8,14 **** # ----------------------------------------------------------------------------- ! data_DATA = description.xml ! datarootdir=@datarootdir@/compbenchmarks/@VERSION@/KB/g++/3.0.x ! EXTRA_DIST = $(data_DATA) \ No newline at end of file --- 8,17 ---- # ----------------------------------------------------------------------------- ! opt_DATA = description.xml ! optdir=$(datadir)/compbenchmarks/@VERSION@/KB/g++/3.0.x ! #inst_pkgdata_DATA=$(data_DATA) ! #inst_pkgdatadir=$(datarootdir) ! ! EXTRA_DIST = $(opt_DATA) \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:25:55
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/g++/2.95.x In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13511/g++/2.95.x Modified Files: Makefile.am Log Message: Simplified better rules (Mandriva compilant) for make install. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/KB/g++/2.95.x/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.am 12 Apr 2007 16:51:31 -0000 1.2 --- Makefile.am 19 Sep 2007 16:25:50 -0000 1.3 *************** *** 8,14 **** # ----------------------------------------------------------------------------- ! data_DATA = description.xml ! datarootdir=@datarootdir@/compbenchmarks/@VERSION@/KB/g++/2.95.x ! EXTRA_DIST = $(data_DATA) \ No newline at end of file --- 8,17 ---- # ----------------------------------------------------------------------------- ! opt_DATA = description.xml ! optdir=$(datadir)/compbenchmarks/@VERSION@/KB/g++/2.95.x ! #inst_pkgdata_DATA=$(data_DATA) ! #inst_pkgdatadir=$(datarootdir) ! ! EXTRA_DIST = $(opt_DATA) \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:24:31
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv13122 Modified Files: Makefile.am Log Message: perl/ sub-directory has been deprecated. Index: Makefile.am =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/share/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 13 Mar 2007 20:40:35 -0000 1.4 --- Makefile.am 19 Sep 2007 16:24:26 -0000 1.5 *************** *** 8,10 **** # ----------------------------------------------------------------------------- ! SUBDIRS = patches system perl KB \ No newline at end of file --- 8,10 ---- # ----------------------------------------------------------------------------- ! SUBDIRS = patches system KB \ No newline at end of file |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:23:00
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12370 Modified Files: UI-Console.cpp Log Message: For SF's TID #142407 : More FS related messages handled. Index: UI-Console.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/UI/UI-Console.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** UI-Console.cpp 12 Sep 2007 18:58:43 -0000 1.10 --- UI-Console.cpp 19 Sep 2007 16:22:53 -0000 1.11 *************** *** 137,140 **** --- 137,156 ---- curmsg+=objectField(_msg, "name"); break; + case UIMsg::Create: + curmsg+="Creating "; + curmsg+=objectField(_msg, "name"); + break; + case UIMsg::Read: + curmsg+="Reading "; + curmsg+=objectField(_msg, "name"); + break; + case UIMsg::Write: + curmsg+="Writing "; + curmsg+=objectField(_msg, "name"); + break; + case UIMsg::Remove: + curmsg+="Removing "; + curmsg+=objectField(_msg, "name"); + break; case UIMsg::Group: curmsg+=objectField(_msg, "name"); |
|
From: Frederic T. <xf...@us...> - 2007-09-19 16:22:12
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv12052 Modified Files: System.cpp Log Message: For SF's TID #142407 : ~/.compbenchmarks checked and created if not existant. Index: System.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/System/System.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** System.cpp 28 Aug 2007 19:50:47 -0000 1.23 --- System.cpp 19 Sep 2007 16:22:03 -0000 1.24 *************** *** 159,163 **** } ! checkDirectory(rootDir); configuration=new CBM::Config(configurationFile); --- 159,169 ---- } ! if (!checkDirectory(rootDir)) { ! if (!mkdir(rootDir)) { ! std::cerr << "Can't create " << rootDir << std::endl; ! done(); ! return(0); ! } ! } configuration=new CBM::Config(configurationFile); *************** *** 667,671 **** CBM::cbmlib_done(); ! if (configuration->Changes()) { storeConfiguration(); } --- 673,677 ---- CBM::cbmlib_done(); ! if ((configuration) && (configuration->Changes())) { storeConfiguration(); } |
|
From: Frederic T. <xf...@us...> - 2007-09-17 19:38:51
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14597/Plan Modified Files: PlanAvailableBenchmark.cpp PlanAvailableBenchmark.h PlanDefineBatch.cpp PlanDefineBatch.h Log Message: Benchmark(s) can be registered within a plan. Index: PlanDefineBatch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** PlanDefineBatch.cpp 16 Sep 2007 19:22:27 -0000 1.19 --- PlanDefineBatch.cpp 17 Sep 2007 19:38:47 -0000 1.20 *************** *** 146,150 **** CBM::CompilerOption *O = item->Option(); - printf("here %x %x %x %x\n", B, OS, OG, O); if ((B) && (OS) && (OG) && (O)) PL->doOptionUnregister(B, OS, OG, O); --- 146,149 ---- *************** *** 218,221 **** --- 217,232 ---- } + PlanDefineBatchListItem::PlanDefineBatchListItem(CBM::Benchmark *_benchmark) + : QTreeWidgetItem(QStringList(_benchmark->Name().c_str()), + PIBenchmark), + CompilerHolder(0), + OptionSetHolder(0), + OptionsHolder(0), + OptionHolder(0), + BenchmarkHolder(_benchmark), + PlanBatchHolder(0) + { + } + PlanDefineBatchListItem::PlanDefineBatchListItem(CBM::CompilerOptionSet *_options) : QTreeWidgetItem(QStringList(_options->Id().c_str()), *************** *** 785,795 **** } else if (event->mimeData()->text()=="option") { - printf("yeah\n"); - PlanDefineBatchListItem *PlanItem = I->Parent(PIPlanBatch); event->setDropAction(Qt::MoveAction); CBM::CompilerOption *O = App->PlanCompilerOptionSelected(); PlanDefineBatchListItem *P = I->Parent(PIOptions); - printf("P=%x\n", P); if (P) { P->setExpanded(true); --- 796,803 ---- *************** *** 798,807 **** PlanDefineBatchListItem *OI = new PlanDefineBatchListItem(O); P->addChild(OI); - printf("there!\n"); } } ! } ! else ! event->accept(); } else event->ignore(); --- 806,828 ---- PlanDefineBatchListItem *OI = new PlanDefineBatchListItem(O); P->addChild(OI); } } ! } else ! if (event->mimeData()->text()=="benchmark") { ! PlanDefineBatchListItem *PlanItem = I->Parent(PIPlanBatch); ! event->setDropAction(Qt::MoveAction); ! CBM::Benchmark *B = App->PlanBenchmarkSelected(); ! ! PlanDefineBatchListItem *P = I->Parent(PIBenchmarks); ! if (P) { ! P->setExpanded(true); ! if (PlanItem->Batch()->add(B)) { ! PlanDefineBatchListItem *OI = new PlanDefineBatchListItem(B); ! P->addChild(OI); ! } ! } ! } ! else ! event->accept(); } else event->ignore(); Index: PlanDefineBatch.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** PlanDefineBatch.h 16 Sep 2007 19:22:27 -0000 1.14 --- PlanDefineBatch.h 17 Sep 2007 19:38:47 -0000 1.15 *************** *** 75,78 **** --- 75,79 ---- PlanDefineBatchListItem(CBM::PlanBatch *_batch); PlanDefineBatchListItem(CBM::Compiler *_compiler); + PlanDefineBatchListItem(CBM::Benchmark *_benchmark); virtual PlanDefineBatchListItem *Parent(PlanItemType _which); Index: PlanAvailableBenchmark.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanAvailableBenchmark.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlanAvailableBenchmark.cpp 17 May 2007 22:36:11 -0000 1.1 --- PlanAvailableBenchmark.cpp 17 Sep 2007 19:38:47 -0000 1.2 *************** *** 1,2 **** --- 1,8 ---- + #include <QMimeData> + #include <QDrag> + #include <QMouseEvent> + + #include <main.h> + #include <Plan/PlanAvailableBenchmark.h> *************** *** 25,28 **** --- 31,39 ---- this, SLOT(doRefreshBenchmarks())); + connect(this, SIGNAL(currentItemChanged(QTreeWidgetItem*, + QTreeWidgetItem*)), + this, SLOT(doSelectionChanged()), + Qt::QueuedConnection); + headerItem()->setHidden(true); doRefreshBenchmarks(); *************** *** 30,33 **** --- 41,70 ---- + void PlanAvailableBenchmarkList::mousePressEvent(QMouseEvent *event) + { + QTreeWidget::mousePressEvent(event); + + CBM::Benchmark *C = benchmarkSelected(); + + if (!C) + return; + + QString plainText = "benchmark"; + + QMimeData *mimeData = new QMimeData; + mimeData->setText(plainText); + + QDrag *drag = new QDrag(this); + drag->setMimeData(mimeData); + drag->setHotSpot(event->pos() - rect().topLeft()); + + Qt::DropAction dropAction = drag->start(Qt::CopyAction | Qt::MoveAction); + + if (dropAction == Qt::MoveAction) { + close(); + update(); + } + } + void PlanAvailableBenchmarkList::doRefreshBenchmarks(void) { *************** *** 66,69 **** --- 103,121 ---- } + void PlanAvailableBenchmarkList::doSelectionChanged(void) + { + emit App->planBenchmarkSelect(benchmarkSelected()); + } + + CBM::Benchmark *PlanAvailableBenchmarkList::benchmarkSelected(void) + { + PlanAvailableBenchmarkListItem *I = dynamic_cast<PlanAvailableBenchmarkListItem*>(currentItem()); + + if (!I) + return(0); + + return(I->Benchmark()); + } + PlanAvailableBenchmarkList::~PlanAvailableBenchmarkList() { Index: PlanAvailableBenchmark.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanAvailableBenchmark.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PlanAvailableBenchmark.h 17 May 2007 22:36:11 -0000 1.1 --- PlanAvailableBenchmark.h 17 Sep 2007 19:38:47 -0000 1.2 *************** *** 21,33 **** private: protected slots: virtual void doRefreshBenchmarks(void); signals: virtual void sigRefreshBenchmarks(void); ! public: PlanAvailableBenchmarkList(QWidget *parent = 0); virtual void refreshBenchmarks(void); virtual ~PlanAvailableBenchmarkList(); --- 21,36 ---- private: protected slots: + virtual void mousePressEvent(QMouseEvent *event); virtual void doRefreshBenchmarks(void); signals: virtual void sigRefreshBenchmarks(void); ! public slots: ! void doSelectionChanged(void); public: PlanAvailableBenchmarkList(QWidget *parent = 0); virtual void refreshBenchmarks(void); + virtual CBM::Benchmark *benchmarkSelected(void); virtual ~PlanAvailableBenchmarkList(); |
|
From: Frederic T. <xf...@us...> - 2007-09-17 19:38:51
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4 In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv14597 Modified Files: main.cpp main.h Log Message: Benchmark(s) can be registered within a plan. Index: main.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** main.cpp 13 Sep 2007 19:00:42 -0000 1.16 --- main.cpp 17 Sep 2007 19:38:47 -0000 1.17 *************** *** 125,129 **** --- 125,138 ---- pixmapRunning=I3.pixmap(12); + QIcon I4(":/icons/tip.png"); + pixmapInfo=I4.pixmap(12); + + QIcon I5(":/icons/logo.png"); + + setApplicationName("CompBenchmarks"); mainW=new QWidget; + mainW->setWindowIcon(I5); + + mainW->setWindowTitle("CompBenchmarks - Qt 4.x interface"); lay = new QHBoxLayout; *************** *** 133,136 **** --- 142,146 ---- console=new StatusConsole(sa); planCompilerSelected=0; + planBenchmarkSelected=0; planCompilerOptionSelected=0; App=this; *************** *** 201,204 **** --- 211,218 ---- Qt::QueuedConnection); + connect(this, SIGNAL(sigPlanBenchmarkSelected(CBM::Benchmark*)), + this, SLOT(doPlanBenchmarkSelected(CBM::Benchmark*)), + Qt::QueuedConnection); + connect(this, SIGNAL(sigPlanCompilerOptionSelected(CBM::CompilerOption*)), this, SLOT(doPlanCompilerOptionSelected(CBM::CompilerOption*)), *************** *** 243,246 **** --- 257,263 ---- return(&pixmapKO); break; + case Info: + return(&pixmapInfo); + break; } return(0); *************** *** 355,358 **** --- 372,380 ---- } + void Application::doPlanBenchmarkSelected(CBM::Benchmark *_benchmark) + { + planBenchmarkSelected=_benchmark; + } + void Application::doPlanCompilerOptionSelected(CBM::CompilerOption *_option) { *************** *** 432,435 **** --- 454,462 ---- } + void Application::planBenchmarkSelect(CBM::Benchmark *_benchmark) + { + emit sigPlanBenchmarkSelected(_benchmark); + } + void Application::planOptionSelect(CBM::CompilerOption *_option) { *************** *** 462,465 **** --- 489,496 ---- return(planCompilerSelected); } + CBM::Benchmark *Application::PlanBenchmarkSelected(void) + { + return(planBenchmarkSelected); + } CBM::CompilerOption *Application::PlanCompilerOptionSelected(void) *************** *** 501,504 **** --- 532,536 ---- app->mainW->show(); + result=app->exec(); delete(app); Index: main.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/main.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** main.h 13 Sep 2007 19:00:42 -0000 1.11 --- main.h 17 Sep 2007 19:38:47 -0000 1.12 *************** *** 20,24 **** Fatal, OK, ! KO } LedColor; class PackageInstallThread : public QThread, --- 20,24 ---- Fatal, OK, ! KO, Info } LedColor; class PackageInstallThread : public QThread, *************** *** 64,67 **** --- 64,68 ---- CBM::Compiler *planCompilerSelected; CBM::CompilerOption *planCompilerOptionSelected; + CBM::Benchmark *planBenchmarkSelected; QTabWidget *mainTab; *************** *** 72,75 **** --- 73,77 ---- QPixmap pixmapKO; QPixmap pixmapRunning; + QPixmap pixmapInfo; *************** *** 107,110 **** --- 109,113 ---- void sigPlanCompilerSelected(CBM::Compiler *_compiler); + void sigPlanBenchmarkSelected(CBM::Benchmark *_benchmark); void sigPlanCompilerOptionSelected(CBM::CompilerOption *_option); *************** *** 135,138 **** --- 138,142 ---- void doPlanCompilerSelected(CBM::Compiler *_compiler); void doPlanCompilerOptionSelected(CBM::CompilerOption *_option); + void doPlanBenchmarkSelected(CBM::Benchmark *_benchmark); public: *************** *** 163,169 **** --- 167,175 ---- virtual void planCompilerSelect(CBM::Compiler *_compiler); + virtual void planBenchmarkSelect(CBM::Benchmark *_benchmark); virtual void planOptionSelect(CBM::CompilerOption *_option); virtual CBM::Compiler *PlanCompilerSelected(void); + virtual CBM::Benchmark *PlanBenchmarkSelected(void); virtual CBM::CompilerOption *PlanCompilerOptionSelected(void); |
|
From: Frederic T. <xf...@us...> - 2007-09-17 19:14:38
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5402 Modified Files: Compiler-Options.cpp Log Message: Compiler(s) must be registered in Batch before related compilation options. Index: Compiler-Options.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Options.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Compiler-Options.cpp 16 Sep 2007 19:22:03 -0000 1.10 --- Compiler-Options.cpp 17 Sep 2007 19:14:32 -0000 1.11 *************** *** 65,68 **** --- 65,71 ---- int ok = 0; + if (!_batch->compilerNumber()) { + return("Please, add compilers in batch before adding options."); + } if (rin=="1\n") return("1\n"); |
|
From: Frederic T. <xf...@us...> - 2007-09-16 19:22:30
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1043 Modified Files: PlanDefineBatch.cpp PlanDefineBatch.h Log Message: Option removing handled. Index: PlanDefineBatch.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** PlanDefineBatch.cpp 16 Sep 2007 18:52:54 -0000 1.18 --- PlanDefineBatch.cpp 16 Sep 2007 19:22:27 -0000 1.19 *************** *** 56,59 **** --- 56,64 ---- addAction(QIcon(":/icons/remove.png"), tr("Remove options"), this, SLOT(doOptionsUnregister())); + + + if (item->type()==PIOption) + addAction(QIcon(":/icons/remove.png"), tr("Remove option"), + this, SLOT(doOptionUnregister())); *************** *** 134,140 **** } ! ! PlanDefineBatchContextMenu::~PlanDefineBatchContextMenu() --- 139,153 ---- } + void PlanDefineBatchContextMenu::doOptionUnregister(void) + { + CBM::CompilerOptions *OG = item->Parent(PIOptions)->OptionsGroup(); + CBM::CompilerOptionSet *OS = item->Parent(PIOptionSet)->OptionSet(); + CBM::PlanBatch *B = item->Parent(PIPlanBatch)->Batch(); + CBM::CompilerOption *O = item->Option(); ! printf("here %x %x %x %x\n", B, OS, OG, O); ! if ((B) && (OS) && (OG) && (O)) ! PL->doOptionUnregister(B, OS, OG, O); ! } PlanDefineBatchContextMenu::~PlanDefineBatchContextMenu() *************** *** 361,365 **** - printf("Item(batch,_set) > B=%x\n", _batch); PlanDefineBatchListItem *R = B->Nearest(PIOptionSets); PlanDefineBatchListItem *C; --- 374,377 ---- *************** *** 370,379 **** int i, n = R->childCount(); - printf("R childs=%d\n", n); for(i=0; i<n; i++) { C=(PlanDefineBatchListItem*) R->child(i); - printf("Child : %x, %d\n", C, C->type()); if (C->type()==PIOptionSet) { - printf("Item(batch,_set) > Child=%x, checking\n", C); if (C->OptionSet()==_options) { return(C); --- 382,388 ---- *************** *** 543,548 **** PlanDefineBatchListItem *R = B->Nearest(PIOptionSets); - printf("unreg B=%x (R=%x)\n", B, R); - if (R) { R->takeChild(R->indexOfChild(B)); --- 552,555 ---- *************** *** 607,610 **** --- 614,641 ---- } + void PlanDefineBatchList::doOptionUnregister(CBM::PlanBatch *_batch, + CBM::CompilerOptionSet *_set, + CBM::CompilerOptions *_options, + CBM::CompilerOption *_option) + { + PlanDefineBatchListItem *OG = Item(_batch, _set, _options); + PlanDefineBatchListItem *C; + + int i, n; + + if (!OG) + return; + + n=OG->childCount(); + + for(i=0; i<n; i++) { + C=(PlanDefineBatchListItem*) OG->child(i); + if ((C) && (C->Option()==_option)) { + delete(OG->takeChild(i)); + _options->remove(_option->Option()); + } + } + } + void PlanDefineBatchList::planBatchRenamed(CBM::PlanBatch *_batch, QString _newname) Index: PlanDefineBatch.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Plan/PlanDefineBatch.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** PlanDefineBatch.h 13 Sep 2007 19:00:42 -0000 1.13 --- PlanDefineBatch.h 16 Sep 2007 19:22:27 -0000 1.14 *************** *** 50,53 **** --- 50,54 ---- void doOptionsRegister(void); void doOptionsUnregister(void); + void doOptionUnregister(void); public: *************** *** 158,162 **** CBM::CompilerOptions *_options); ! virtual void doCompilerRemove(CBM::PlanBatch *_batch, --- 159,166 ---- CBM::CompilerOptions *_options); ! virtual void doOptionUnregister(CBM::PlanBatch *_batch, ! CBM::CompilerOptionSet *_set, ! CBM::CompilerOptions *_options, ! CBM::CompilerOption *_option); virtual void doCompilerRemove(CBM::PlanBatch *_batch, |
|
From: Frederic T. <xf...@us...> - 2007-09-16 19:22:11
|
Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv747 Modified Files: Compiler-Options.cpp Log Message: Message for option removing. Index: Compiler-Options.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Compiler/Compiler-Options.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Compiler-Options.cpp 16 Sep 2007 18:51:20 -0000 1.9 --- Compiler-Options.cpp 16 Sep 2007 19:22:03 -0000 1.10 *************** *** 111,114 **** --- 111,117 ---- std::vector<CBM::CompilerOption*> noptions; + int ok = 0; + + cbmUI->msgPlanOptionUnregister(_option->Option()); for(i=0;i<n;i++) { *************** *** 118,124 **** --- 121,132 ---- else { delete(O); + ok=1; } } options=noptions; + if (ok) + cbmUI->outputOK(); + else + cbmUI->outputKO(); } |
|
From: Frederic T. <xf...@us...> - 2007-09-16 18:53:34
|
Update of /cvsroot/compbench/CompBenchmarks++/Qt-4/Status In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22397 Modified Files: Status-Console.cpp Status-Console.h Status.cpp Status.h Log Message: UIMsg::Info handling. Index: Status-Console.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status-Console.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Status-Console.h 12 Sep 2007 17:00:45 -0000 1.3 --- Status-Console.h 16 Sep 2007 18:53:26 -0000 1.4 *************** *** 46,49 **** --- 46,51 ---- StatusConsole(QScrollArea *_sa, QWidget *parent = 0); + virtual CBM::UIMsg *outputInfo(std::string _text); + virtual void Display(CBM::UIMsg *_msg); virtual void DisplayProgressUpdate(CBM::UIMsg *_msg); Index: Status.h =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Status.h 11 Sep 2007 20:17:40 -0000 1.4 --- Status.h 16 Sep 2007 18:53:26 -0000 1.5 *************** *** 22,29 **** private: - QPixmap pixmapOK; - QPixmap pixmapKO; - QPixmap pixmapRunning; - LedColor ledColor; QLabel *icon; --- 22,25 ---- *************** *** 50,53 **** --- 46,63 ---- virtual ~StatusAction(); }; + + class StatusInfo : public QWidget { + private: + Q_OBJECT + + private: + QLabel *icon; + QLabel *label; + + public: + StatusInfo(std::string _label, + QWidget *_parent = 0); + virtual ~StatusInfo(); + }; } Index: Status.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Status.cpp 12 Sep 2007 17:00:45 -0000 1.6 --- Status.cpp 16 Sep 2007 18:53:26 -0000 1.7 *************** *** 58,61 **** --- 58,63 ---- ncolor=KO; break; + case CBM::UIMsg::Info: + break; } changeColor(ncolor); *************** *** 76,77 **** --- 78,104 ---- { } + + StatusInfo::StatusInfo(std::string _label, + QWidget *_parent) + : QWidget(_parent) + { + QHBoxLayout *lay = new QHBoxLayout; + + lay->setAlignment(Qt::AlignLeft); + icon=new QLabel(); + icon->setPixmap(*App->pixmapObject(Info)); + lay->addWidget(icon); + icon->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); + + label=new QLabel(_label.c_str()); + lay->addWidget(label); + label->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); + setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); + lay->setMargin(2); + lay->setSizeConstraint(QLayout::SetMinimumSize); + setLayout(lay); + } + + StatusInfo::~StatusInfo() + { + } Index: Status-Console.cpp =================================================================== RCS file: /cvsroot/compbench/CompBenchmarks++/Qt-4/Status/Status-Console.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Status-Console.cpp 12 Sep 2007 18:59:03 -0000 1.5 --- Status-Console.cpp 16 Sep 2007 18:53:26 -0000 1.6 *************** *** 42,45 **** --- 42,59 ---- } + CBM::UIMsg *StatusConsole::outputInfo(std::string _text) + { + CBM::UIMsg *msg = currentMsg(); + + printf("there outputInfo!!\n"); + StatusInfo *widget = new StatusInfo(_text, this); + widget->setContentsMargins(CBM::UI::depth(msg)*16, 0, 0, 0); + lay->addWidget(widget); + + autoscroll(); + + return(msg); + } + StatusAction *StatusConsole::MsgStatus(CBM::UIMsg *_msg) { *************** *** 51,59 **** child=lay->itemAt(i); r=dynamic_cast<StatusAction*>(child->widget()); ! if (r) { ! if (r->Message()==_msg) ! return(r); } - } return(0); --- 65,73 ---- child=lay->itemAt(i); r=dynamic_cast<StatusAction*>(child->widget()); ! if (r) { ! if (r->Message()==_msg) ! return(r); ! } } return(0); *************** *** 302,306 **** status=(CBM::UIMsg::Status)atoi(A->Value().c_str()); act=MsgStatus(msg); ! if (act) { act->changeStatus(status); if (flags(msg)==CBM::UIMsg::Progress) { --- 316,329 ---- status=(CBM::UIMsg::Status)atoi(A->Value().c_str()); act=MsgStatus(msg); ! printf("pushing msgdone, act=%x\n", act); ! if (!act) ! break; ! ! if (N->Value()!="") { ! printf("info : %s\n", N->Value().c_str()); ! CBM::cbmUI->outputInfo(N->Value()); ! } ! ! if (status!=CBM::UIMsg::Info) { act->changeStatus(status); if (flags(msg)==CBM::UIMsg::Progress) { |
