Menu
▾
▴
wxdevcenter-cvs — cvs/svn commits for wxDevCenter and StdPlugin
You can subscribe to this list here.
| 2005 |
Jan
(98) |
Feb
(101) |
Mar
(60) |
Apr
(38) |
May
(26) |
Jun
|
Jul
|
Aug
(159) |
Sep
(78) |
Oct
(31) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
(6) |
Oct
|
Nov
(1) |
Dec
(3) |
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
(8) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <cur...@us...> - 2009-09-10 10:54:55
|
Revision: 53
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=53&view=rev
Author: cursorstar
Date: 2009-09-10 10:54:46 +0000 (Thu, 10 Sep 2009)
Log Message:
-----------
Add begin of search text in files.
Add bookmark raising.
Modified Paths:
--------------
trunk/wxdevcenter/config.guess
trunk/wxdevcenter/config.sub
trunk/wxdevcenter/configure
trunk/wxdevcenter/configure.ac
trunk/wxdevcenter/src/Makefile.am
trunk/wxdevcenter/src/Makefile.in
trunk/wxdevcenter/src/docview/document.cpp
trunk/wxdevcenter/src/docview/document.hpp
trunk/wxdevcenter/src/docview/view.cpp
trunk/wxdevcenter/src/docview/view.hpp
trunk/wxdevcenter/src/plugins/text/Makefile.am
trunk/wxdevcenter/src/plugins/text/Makefile.in
trunk/wxdevcenter/src/plugins/text/bookmark.hpp
trunk/wxdevcenter/src/plugins/text/view.cpp
trunk/wxdevcenter/src/plugins/text/view.hpp
trunk/wxdevcenter/src/sys/Makefile.am
trunk/wxdevcenter/src/sys/Makefile.in
trunk/wxdevcenter/src/sys/bookmark.cpp
trunk/wxdevcenter/src/sys/bookmark.hpp
trunk/wxdevcenter/src/sys/task.cpp
trunk/wxdevcenter/src/ui/stdframe.cpp
trunk/wxdevcenter/src/ui/workbar.cpp
trunk/wxdevcenter/src/ui/workbar.hpp
Modified: trunk/wxdevcenter/config.guess
===================================================================
--- trunk/wxdevcenter/config.guess 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/config.guess 2009-09-10 10:54:46 UTC (rev 53)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2008-09-28'
+timestamp='2009-02-03'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -348,7 +348,20 @@
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+ # If there is a compiler, see if it is configured for 64-bit objects.
+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
+ # This test works for both compilers.
+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
+ grep IS_64BIT_ARCH >/dev/null
+ then
+ SUN_ARCH="x86_64"
+ fi
+ fi
+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
@@ -1160,6 +1173,16 @@
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
&& { echo i486-ncr-sysv4; exit; } ;;
+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
+ OS_REL='.3'
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
exit ;;
@@ -1346,6 +1369,9 @@
i*86:rdos:*:*)
echo ${UNAME_MACHINE}-pc-rdos
exit ;;
+ i*86:AROS:*:*)
+ echo ${UNAME_MACHINE}-pc-aros
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
Modified: trunk/wxdevcenter/config.sub
===================================================================
--- trunk/wxdevcenter/config.sub 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/config.sub 2009-09-10 10:54:46 UTC (rev 53)
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
-timestamp='2008-09-08'
+timestamp='2009-02-03'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -122,6 +122,7 @@
case $maybe_os in
nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -249,6 +250,7 @@
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
+ | lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
@@ -279,7 +281,7 @@
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
| score \
- | sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -331,6 +333,7 @@
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
+ | lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
@@ -362,7 +365,7 @@
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
@@ -443,6 +446,10 @@
basic_machine=m68k-apollo
os=-bsd
;;
+ aros)
+ basic_machine=i386-pc
+ os=-aros
+ ;;
aux)
basic_machine=m68k-apple
os=-aux
@@ -1200,7 +1207,7 @@
we32k)
basic_machine=we32k-att
;;
- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@@ -1272,8 +1279,9 @@
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -kopensolaris* \
| -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
- | -aos* \
+ | -aos* | -aros* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
Modified: trunk/wxdevcenter/configure
===================================================================
--- trunk/wxdevcenter/configure 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/configure 2009-09-10 10:54:46 UTC (rev 53)
@@ -5942,8 +5942,24 @@
fi
-WXCONFIG=wx-config
+#AM_OPTIONS_WXCONFIG
+#reqwx=2.8.8
+#AM_PATH_WXCONFIG($reqwx, wxWin=1)
+#if test "$wxWin" != 1; then
+# AC_MSG_ERROR([
+# wxWidgets must be installed on your system.
+#
+# Please check that wx-config is in path, the directory
+# where wxWidgets libraries are installed (returned by
+# 'wx-config --libs' or 'wx-config --static --libs' command)
+# is in LD_LIBRARY_PATH or equivalent variable and
+# wxWidgets version is $reqwx or above.
+# ])
+#fi
+
+WXCONFIG="wx-config"
+
# Check whether --with-wx-config was given.
if test "${with_wx_config+set}" = set; then
withval=$with_wx_config;
@@ -9610,7 +9626,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 9613 "configure"' > conftest.$ac_ext
+ echo '#line 9629 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -11783,11 +11799,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11786: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11802: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11790: \$? = $ac_status" >&5
+ echo "$as_me:11806: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12073,11 +12089,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12076: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12092: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12080: \$? = $ac_status" >&5
+ echo "$as_me:12096: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12177,11 +12193,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12180: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12196: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12184: \$? = $ac_status" >&5
+ echo "$as_me:12200: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14590,7 +14606,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14593 "configure"
+#line 14609 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14690,7 +14706,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14693 "configure"
+#line 14709 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -17099,11 +17115,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17102: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17118: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17106: \$? = $ac_status" >&5
+ echo "$as_me:17122: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -17203,11 +17219,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17206: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17222: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17210: \$? = $ac_status" >&5
+ echo "$as_me:17226: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18799,11 +18815,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18802: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18818: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18806: \$? = $ac_status" >&5
+ echo "$as_me:18822: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18903,11 +18919,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18906: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18922: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18910: \$? = $ac_status" >&5
+ echo "$as_me:18926: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21131,11 +21147,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:21134: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21150: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:21138: \$? = $ac_status" >&5
+ echo "$as_me:21154: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -21421,11 +21437,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:21424: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21440: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:21428: \$? = $ac_status" >&5
+ echo "$as_me:21444: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -21525,11 +21541,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:21528: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:21544: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:21532: \$? = $ac_status" >&5
+ echo "$as_me:21548: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -24463,7 +24479,7 @@
-ac_config_files="$ac_config_files Makefile src/Makefile src/ui/Makefile src/ui/dialog/Makefile src/sys/Makefile src/docview/Makefile src/plugins/Makefile src/plugins/text/Makefile src/plugins/bitmap/Makefile share/Makefile share/xrc/Makefile po/Makefile.in"
+ac_config_files="$ac_config_files Makefile src/Makefile src/ui/Makefile src/ui/dialog/Makefile src/sys/Makefile src/docview/Makefile src/plugins/Makefile src/plugins/text/Makefile src/plugins/bitmap/Makefile src/tools/Makefile share/Makefile share/xrc/Makefile po/Makefile.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -25129,6 +25145,7 @@
"src/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;;
"src/plugins/text/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/text/Makefile" ;;
"src/plugins/bitmap/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/bitmap/Makefile" ;;
+ "src/tools/Makefile") CONFIG_FILES="$CONFIG_FILES src/tools/Makefile" ;;
"share/Makefile") CONFIG_FILES="$CONFIG_FILES share/Makefile" ;;
"share/xrc/Makefile") CONFIG_FILES="$CONFIG_FILES share/xrc/Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
Modified: trunk/wxdevcenter/configure.ac
===================================================================
--- trunk/wxdevcenter/configure.ac 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/configure.ac 2009-09-10 10:54:46 UTC (rev 53)
@@ -12,7 +12,23 @@
AM_PROG_CC_STDC
AC_HEADER_STDC
-WXCONFIG=wx-config
+#AM_OPTIONS_WXCONFIG
+#reqwx=2.8.8
+#AM_PATH_WXCONFIG($reqwx, wxWin=1)
+#if test "$wxWin" != 1; then
+# AC_MSG_ERROR([
+# wxWidgets must be installed on your system.
+#
+# Please check that wx-config is in path, the directory
+# where wxWidgets libraries are installed (returned by
+# 'wx-config --libs' or 'wx-config --static --libs' command)
+# is in LD_LIBRARY_PATH or equivalent variable and
+# wxWidgets version is $reqwx or above.
+# ])
+#fi
+
+
+WXCONFIG="wx-config"
AC_ARG_WITH(wx-config,
[[ --with-wx-config=FILE
Use the given path to wx-config when determining
@@ -84,6 +100,7 @@
src/plugins/Makefile
src/plugins/text/Makefile
src/plugins/bitmap/Makefile
+src/tools/Makefile
share/Makefile
share/xrc/Makefile
po/Makefile.in
Modified: trunk/wxdevcenter/src/Makefile.am
===================================================================
--- trunk/wxdevcenter/src/Makefile.am 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/Makefile.am 2009-09-10 10:54:46 UTC (rev 53)
@@ -5,6 +5,7 @@
SUBDIRS = \
ui\
sys\
+ tools\
docview \
. \
plugins
@@ -31,6 +32,7 @@
ui/libuistd.la \
ui/dialog/libuidialog.la \
sys/libsys.la \
+ tools/libtools.la \
docview/libdocview.la
Modified: trunk/wxdevcenter/src/Makefile.in
===================================================================
--- trunk/wxdevcenter/src/Makefile.in 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/Makefile.in 2009-09-10 10:54:46 UTC (rev 53)
@@ -53,7 +53,8 @@
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libwxdevcenter_la_DEPENDENCIES = ui/libui.la ui/libuistd.la \
- ui/dialog/libuidialog.la sys/libsys.la docview/libdocview.la
+ ui/dialog/libuidialog.la sys/libsys.la tools/libtools.la \
+ docview/libdocview.la
am_libwxdevcenter_la_OBJECTS =
libwxdevcenter_la_OBJECTS = $(am_libwxdevcenter_la_OBJECTS)
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
@@ -265,6 +266,7 @@
SUBDIRS = \
ui\
sys\
+ tools\
docview \
. \
plugins
@@ -289,6 +291,7 @@
ui/libuistd.la \
ui/dialog/libuidialog.la \
sys/libsys.la \
+ tools/libtools.la \
docview/libdocview.la
wxdevcenter_SOURCES = \
Modified: trunk/wxdevcenter/src/docview/document.cpp
===================================================================
--- trunk/wxdevcenter/src/docview/document.cpp 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/docview/document.cpp 2009-09-10 10:54:46 UTC (rev 53)
@@ -62,7 +62,7 @@
return OnCreate();
}
-bool dcDocument::OnOpenDocument(const wxURI& uri)
+bool dcDocument::OnOpenDocument(wxURI& uri)
{
if ( !DoOpenDocument(uri) )
return false;
@@ -248,14 +248,21 @@
return true;
}
-bool dcDocument::DoOpenDocument(const wxURI& uri)
+bool dcDocument::DoOpenDocument(wxURI& uri)
{
+ // Simple URI validation (trucate fragment)
+ // TODO change it with next gen FS and URI
+ wxString path = uri.BuildURI();
+ int idx = path.Find(wxT('#'), true);
+ if(idx!=wxNOT_FOUND)
+ path = path.Mid(0, idx);
+ uri = path;
+
// TODO change FS
- wxString path = uri.BuildURI();
wxFileName name = path;
wxFileType* type = wxTheMimeTypesManager->GetFileTypeFromExtension(name.GetExt());
wxString mime;
-
+
wxFileInputStream store(path);
if (store.GetLastError() == wxSTREAM_NO_ERROR)
{
@@ -397,6 +404,13 @@
return true;
}
+void dcDocument::Raise(const wxString& uriFragment)
+{
+ dcView* view = GetFirstView();
+ if(view!=NULL)
+ view->Raise(uriFragment);
+}
+
void dcDocument::Dump()
{
printf(" dcDocument '%s' :\n", (const char*)GetFilename().mb_str(wxConvLibc));
@@ -655,20 +669,6 @@
EVT_UPDATE_UI(wxdcID_SAVE, dcDocumentManager::OnUpdateHaveModifiedDocument)
EVT_UPDATE_UI(wxdcID_SAVEAS, dcDocumentManager::OnUpdateHaveDocument)
EVT_UPDATE_UI(wxdcID_SAVEALL, dcDocumentManager::OnUpdateHaveDocument)
-
-
-
-//// EVT_MENU(wxID_UNDO, wxDocManager::OnUndo)
-//// EVT_MENU(wxID_REDO, wxDocManager::OnRedo)
-//// EVT_UPDATE_UI(wxID_UNDO, wxDocManager::OnUpdateUndo)
-//// EVT_UPDATE_UI(wxID_REDO, wxDocManager::OnUpdateRedo)
-////
-////#if wxUSE_PRINTING_ARCHITECTURE
-//// EVT_MENU(wxID_PRINT, wxDocManager::OnPrint)
-//// EVT_MENU(wxID_PREVIEW, wxDocManager::OnPreview)
-//// EVT_UPDATE_UI(wxID_PRINT, wxDocManager::OnUpdatePrint)
-//// EVT_UPDATE_UI(wxID_PREVIEW, wxDocManager::OnUpdatePreview)
-////#endif
END_EVENT_TABLE()
void dcDocumentManager::InitializeClass()
@@ -882,6 +882,15 @@
dcDocument* dcDocumentManager::GetDocument(const wxURI& uri)const
{
+ // Remove URI fragment
+ // TODO change it with FS and URI ng
+ wxString path = uri.BuildUnescapedURI();
+ int idx = path.Find(wxT('#'), true);
+ if(idx!=wxNOT_FOUND)
+ path = path.Mid(0, idx);
+ wxURI newuri(path);
+
+ // Do the search
for(const_iterator iter=begin(); iter!=end(); iter++)
{
dcDocumentTemplate* templ = *iter;
@@ -890,7 +899,7 @@
for(obj_const_iterator it=templ->begin(); it!=templ->end(); it++)
{
dcDocument* doc = *it;
- if(doc->GetURI()==uri)
+ if(doc->GetURI()==newuri)
return doc;
}
}
@@ -930,15 +939,40 @@
return doc;
}
-dcDocument* dcDocumentManager::OpenDocument(wxString uri)
+dcDocument* dcDocumentManager::OpenDocument(const wxString& uri)
{
dcDocumentTemplate* templ = NULL;
dcDocument* doc;
wxArrayString arr;
- if(uri.IsEmpty())
+
+ // Split URI base and fragment
+ // TODO change it with FS and URI ng
+ wxString path = uri, fragment;
+ int idx = path.Find(wxT('#'), true);
+ if(idx!=wxNOT_FOUND)
+ {
+ fragment = path.Mid(idx+1);
+ path = path.Mid(0, idx);
+ }
+
+ // Intend to find specified document.
+ if(!path.IsEmpty())
+ {
+ dcDocument* doc = GetDocument(path);
+ if(doc!=NULL)
+ {
+ doc->Raise(fragment);
+ return doc;
+ }
+ }
+
+ // Query user for documents
+ if(path.IsEmpty())
arr = ChooseDocumentPathsForOpening(NULL, true, true, &templ);
else
- arr.Add(uri);
+ arr.Add(path);
+
+ // Open documents
for(int i=0; i<arr.GetCount(); i++)
{
wxURI u = arr[i];
@@ -946,10 +980,17 @@
if(t)
doc = DoOpenDocument(u, t);
}
+
+ // Goto to URI fragment
+ if(arr.GetCount()==1 && doc!=NULL)
+ {
+ doc->Raise(fragment);
+ }
+
return doc;
}
-dcDocument* dcDocumentManager::DoOpenDocument(const wxURI& uri, dcDocumentTemplate* templ)
+dcDocument* dcDocumentManager::DoOpenDocument(wxURI& uri, dcDocumentTemplate* templ)
{
dcDocument* doc = NULL;
@@ -962,8 +1003,7 @@
view->Raise();
return doc;
}
-
-
+
// Create and load it
if(templ!=NULL && !uri.BuildURI().IsEmpty())
{
@@ -1100,6 +1140,7 @@
void dcDocumentManager::OnFileSaveAll(wxCommandEvent& event)
{
+ // TODO
wxMessageBox(_("dcDocumentManager::OnFileSaveAll : Not implemented"));
}
Modified: trunk/wxdevcenter/src/docview/document.hpp
===================================================================
--- trunk/wxdevcenter/src/docview/document.hpp 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/docview/document.hpp 2009-09-10 10:54:46 UTC (rev 53)
@@ -78,7 +78,7 @@
virtual bool SaveAs();
virtual bool Revert(){return false;}
virtual bool OnNewDocument();
- virtual bool OnOpenDocument(const wxURI& uri);
+ virtual bool OnOpenDocument(wxURI& uri);
virtual bool OnSaveDocument(const wxURI& uri);
virtual bool OnCloseDocument();
@@ -118,6 +118,9 @@
* \return Empty if no title can be extracted.*/
virtual wxString SuggestTitleFromURI()const;
+ /** Raise the current document, specifying a fragment. */
+ virtual void Raise(const wxString& uriFragment);
+
/**
* Dump
*/
@@ -132,7 +135,7 @@
/** \} */
virtual bool DoSaveDocument(const wxURI& uri);
- virtual bool DoOpenDocument(const wxURI& uri);
+ virtual bool DoOpenDocument(wxURI& uri);
virtual bool InitDocument();
};
@@ -289,6 +292,7 @@
dcActionGroupEntry* m_actions;
public:
static dcDocumentManager& GetManager(){return *s_manager;}
+ static dcDocumentManager& getInstance(){return *s_manager;}
dcDocumentManager();
virtual ~dcDocumentManager();
@@ -341,10 +345,12 @@
virtual dcDocument* CreateDocument(dcDocumentTemplate* templ=NULL);
/** Open an existing document.
+ * If already open, raise instance.
+ * Intend to go to specified fragment if any.
* \param uri URI of the document to open.
- * \return The new document or NULL if error or canceled by user.
+ * \return The the document or NULL if error or canceled by user.
*/
- virtual dcDocument* OpenDocument(wxString str = wxT(""));
+ virtual dcDocument* OpenDocument(const wxString& str = wxEmptyString);
/**
* Add a file to the more recent file list.
@@ -381,11 +387,11 @@
/**
* Really open a document.
- * \param uri URI of the document.
+ * \param uri URI of the document, validated (remove eventually fragment and other).
* \param templ Template to instantiate.
* \return The new document or NULL if error.
*/
- virtual dcDocument* DoOpenDocument(const wxURI& uri, dcDocumentTemplate* templ);
+ virtual dcDocument* DoOpenDocument(wxURI& uri, dcDocumentTemplate* templ);
/**
* Create a file history.
Modified: trunk/wxdevcenter/src/docview/view.cpp
===================================================================
--- trunk/wxdevcenter/src/docview/view.cpp 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/docview/view.cpp 2009-09-10 10:54:46 UTC (rev 53)
@@ -63,11 +63,14 @@
{
}
-void dcView::Raise()
+void dcView::Raise(const wxString& uriFragment)
{
dcViewFrame* frame = GetFrame();
if(frame)
frame->Raise();
+ wxWindow::Raise();
+ if(!uriFragment.IsEmpty())
+ ScrollToFragment(uriFragment);
}
void dcView::Dump()
Modified: trunk/wxdevcenter/src/docview/view.hpp
===================================================================
--- trunk/wxdevcenter/src/docview/view.hpp 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/docview/view.hpp 2009-09-10 10:54:46 UTC (rev 53)
@@ -39,7 +39,10 @@
dcViewFrame *GetFrame() const;
/** Raise the view. */
- void Raise();
+ void Raise(const wxString& uriFragment = wxEmptyString);
+
+ /** Scroll to a specified part of the document (by URI fragment).*/
+ virtual void ScrollToFragment(const wxString& uriFragment){}
/**
* Dump
*/
Modified: trunk/wxdevcenter/src/plugins/text/Makefile.am
===================================================================
--- trunk/wxdevcenter/src/plugins/text/Makefile.am 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/plugins/text/Makefile.am 2009-09-10 10:54:46 UTC (rev 53)
@@ -18,7 +18,9 @@
editctrl.hpp \
editctrl.cpp \
bookmark.hpp \
- bookmark.cpp
+ bookmark.cpp \
+ text-search.hpp \
+ text-search.cpp
libtext_la_CXXFLAGS = \
-Iscintilla/include\
Modified: trunk/wxdevcenter/src/plugins/text/Makefile.in
===================================================================
--- trunk/wxdevcenter/src/plugins/text/Makefile.in 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/plugins/text/Makefile.in 2009-09-10 10:54:46 UTC (rev 53)
@@ -45,7 +45,7 @@
libtext_la_DEPENDENCIES =
am_libtext_la_OBJECTS = libtext_la-text.lo libtext_la-view.lo \
libtext_la-prefs.lo libtext_la-editctrl.lo \
- libtext_la-bookmark.lo
+ libtext_la-bookmark.lo libtext_la-text-search.lo
libtext_la_OBJECTS = $(am_libtext_la_OBJECTS)
libtext_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libtext_la_CXXFLAGS) \
@@ -253,7 +253,9 @@
editctrl.hpp \
editctrl.cpp \
bookmark.hpp \
- bookmark.cpp
+ bookmark.cpp \
+ text-search.hpp \
+ text-search.cpp
libtext_la_CXXFLAGS = \
-Iscintilla/include\
@@ -316,6 +318,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtext_la-bookmark.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtext_la-editctrl.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtext_la-prefs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtext_la-text-search.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtext_la-text.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtext_la-view.Plo@am__quote@
@@ -375,6 +378,13 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtext_la_CXXFLAGS) $(CXXFLAGS) -c -o libtext_la-bookmark.lo `test -f 'bookmark.cpp' || echo '$(srcdir)/'`bookmark.cpp
+libtext_la-text-search.lo: text-search.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtext_la_CXXFLAGS) $(CXXFLAGS) -MT libtext_la-text-search.lo -MD -MP -MF $(DEPDIR)/libtext_la-text-search.Tpo -c -o libtext_la-text-search.lo `test -f 'text-search.cpp' || echo '$(srcdir)/'`text-search.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libtext_la-text-search.Tpo $(DEPDIR)/libtext_la-text-search.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='text-search.cpp' object='libtext_la-text-search.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtext_la_CXXFLAGS) $(CXXFLAGS) -c -o libtext_la-text-search.lo `test -f 'text-search.cpp' || echo '$(srcdir)/'`text-search.cpp
+
mostlyclean-libtool:
-rm -f *.lo
Modified: trunk/wxdevcenter/src/plugins/text/bookmark.hpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/bookmark.hpp 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/plugins/text/bookmark.hpp 2009-09-10 10:54:46 UTC (rev 53)
@@ -26,7 +26,6 @@
class wxListCtrl;
class dcTextView;
-
struct dcBookmark
{
long line;
Modified: trunk/wxdevcenter/src/plugins/text/view.cpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/view.cpp 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/plugins/text/view.cpp 2009-09-10 10:54:46 UTC (rev 53)
@@ -155,6 +155,53 @@
dcView::OnInitialUpdate();
}
+void dcTextView::ScrollToFragment(const wxString& uriFragment)
+{
+ wxString str1 = uriFragment.BeforeFirst(wxT('-')),
+ str2 = uriFragment.AfterFirst(wxT('-'));
+
+ long l;
+ long pos1 = -1, pos2 = -1, width = -1, line1 = -1;
+
+ m_txt->SetFocus();
+
+ if(!str2.IsEmpty())
+ {
+ // Decode str2
+ if(str2[0]==wxT('w') || str2[0]==wxT('W'))
+ {
+ str2.Remove(0, 1);
+ if(str2.ToLong(&l))
+ width = l;
+ }
+ else
+ {
+ if(str2.ToLong(&l))
+ pos2 = l;
+ }
+ }
+
+
+ // Decode str1
+ if(str1[0]==wxT('l') || str1[0]==wxT('L'))
+ {
+ str1.Remove(0, 1);
+ if(str1.ToLong(&l))
+ m_txt->GotoLine(l);
+ }
+ else
+ {
+ if(str1.ToLong(&l))
+ {
+ pos1 = l;
+ if(pos2>=0)
+ m_txt->SetSelection(pos1+1, pos2+1);
+ else
+ m_txt->SetCurrentPos(pos1+1);
+ }
+ }
+}
+
void dcTextView::UpdatePrefs()
{
m_txt->InitializePrefs(m_lang);
Modified: trunk/wxdevcenter/src/plugins/text/view.hpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/view.hpp 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/plugins/text/view.hpp 2009-09-10 10:54:46 UTC (rev 53)
@@ -73,6 +73,8 @@
void SetFocusToTextCtrl();
virtual void UpdatePrefs();
+
+ void ScrollToFragment(const wxString& uriFragment);
protected:
void OnInitialUpdate();
Modified: trunk/wxdevcenter/src/sys/Makefile.am
===================================================================
--- trunk/wxdevcenter/src/sys/Makefile.am 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/sys/Makefile.am 2009-09-10 10:54:46 UTC (rev 53)
@@ -15,7 +15,11 @@
config.hpp \
config.cpp \
task.hpp \
- task.cpp
+ task.cpp \
+ bookmark.hpp \
+ bookmark.cpp \
+ search.hpp \
+ search.cpp
libsys_la_CXXFLAGS = \
-DPLUGIN_LIBDIR="\"$(PLUGIN_LIBDIR)\"" \
Modified: trunk/wxdevcenter/src/sys/Makefile.in
===================================================================
--- trunk/wxdevcenter/src/sys/Makefile.in 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/sys/Makefile.in 2009-09-10 10:54:46 UTC (rev 53)
@@ -44,7 +44,8 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsys_la_LIBADD =
am_libsys_la_OBJECTS = libsys_la-action.lo libsys_la-manager.lo \
- libsys_la-plugin.lo libsys_la-config.lo libsys_la-task.lo
+ libsys_la-plugin.lo libsys_la-config.lo libsys_la-task.lo \
+ libsys_la-bookmark.lo libsys_la-search.lo
libsys_la_OBJECTS = $(am_libsys_la_OBJECTS)
libsys_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libsys_la_CXXFLAGS) \
@@ -250,7 +251,11 @@
config.hpp \
config.cpp \
task.hpp \
- task.cpp
+ task.cpp \
+ bookmark.hpp \
+ bookmark.cpp \
+ search.hpp \
+ search.cpp
libsys_la_CXXFLAGS = \
-DPLUGIN_LIBDIR="\"$(PLUGIN_LIBDIR)\"" \
@@ -309,9 +314,11 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-action.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-bookmark.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-config.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-manager.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-search.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-task.Plo@am__quote@
.cpp.o:
@@ -370,6 +377,20 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-task.lo `test -f 'task.cpp' || echo '$(srcdir)/'`task.cpp
+libsys_la-bookmark.lo: bookmark.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-bookmark.lo -MD -MP -MF $(DEPDIR)/libsys_la-bookmark.Tpo -c -o libsys_la-bookmark.lo `test -f 'bookmark.cpp' || echo '$(srcdir)/'`bookmark.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libsys_la-bookmark.Tpo $(DEPDIR)/libsys_la-bookmark.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='bookmark.cpp' object='libsys_la-bookmark.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-bookmark.lo `test -f 'bookmark.cpp' || echo '$(srcdir)/'`bookmark.cpp
+
+libsys_la-search.lo: search.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-search.lo -MD -MP -MF $(DEPDIR)/libsys_la-search.Tpo -c -o libsys_la-search.lo `test -f 'search.cpp' || echo '$(srcdir)/'`search.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libsys_la-search.Tpo $(DEPDIR)/libsys_la-search.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='search.cpp' object='libsys_la-search.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-search.lo `test -f 'search.cpp' || echo '$(srcdir)/'`search.cpp
+
mostlyclean-libtool:
-rm -f *.lo
Modified: trunk/wxdevcenter/src/sys/bookmark.cpp
===================================================================
--- trunk/wxdevcenter/src/sys/bookmark.cpp 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/sys/bookmark.cpp 2009-09-10 10:54:46 UTC (rev 53)
@@ -19,6 +19,7 @@
#include "../wxdevcenter.hpp"
#include "bookmark.hpp"
+#include "../docview/document.hpp"
dcBookmark::dcBookmark(const wxString& location, const wxString& description):
uri(location),
@@ -66,3 +67,32 @@
{
descript = description;
}
+
+//==========================================================================
+// dcBookmarkModule
+//==========================================================================
+IMPLEMENT_DYNAMIC_CLASS(dcBookmarkModule, wxModule)
+
+dcBookmarkModule::dcBookmarkModule()
+{
+ AddDependency(CLASSINFO(dcDocumentModule));
+}
+
+bool dcBookmarkModule::OnInit()
+{
+ return true;
+}
+
+void dcBookmarkModule::OnExit()
+{
+}
+
+bool dcBookmarkModule::open(const dcBookmark* bm)
+{
+ if(bm!=NULL)
+ {
+ dcDocumentManager::getInstance().OpenDocument(bm->getLocation());
+ return true;
+ }
+ return false;
+}
\ No newline at end of file
Modified: trunk/wxdevcenter/src/sys/bookmark.hpp
===================================================================
--- trunk/wxdevcenter/src/sys/bookmark.hpp 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/sys/bookmark.hpp 2009-09-10 10:54:46 UTC (rev 53)
@@ -20,6 +20,9 @@
#ifndef _BOOKMARK_HPP_
#define _BOOKMARK_HPP_
+/**
+ * dcBookmark
+ */
class dcBookmark
{
public:
@@ -40,4 +43,19 @@
wxString descript;
};
+
+/**
+ * dcBookmarkModule
+ */
+class dcBookmarkModule: public wxModule
+{
+ DECLARE_DYNAMIC_CLASS(dcBookmarkModule)
+public:
+ dcBookmarkModule();
+ virtual bool OnInit();
+ virtual void OnExit();
+
+ static bool open(const dcBookmark* bm);
+};
+
#endif // _BOOKMARK_HPP_
Modified: trunk/wxdevcenter/src/sys/task.cpp
===================================================================
--- trunk/wxdevcenter/src/sys/task.cpp 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/sys/task.cpp 2009-09-10 10:54:46 UTC (rev 53)
@@ -481,6 +481,7 @@
{
wxMutexGuiEnter();
set(min, max, pos);
+ wxMutexGuiLeave();
}
void dcAsyncTaskWorkBarItem::onMaxChange(int max, dcAsynchronousTask* task)
@@ -506,6 +507,7 @@
SetBackgroundColour(mixColour(col, 3, *wxGREEN, 1));
GetSizer()->Show(cancel, false, true);
GetSizer()->Show(close, true, true);
+ close->Enable();
break;
}
case dcTask::FAILED:
@@ -513,6 +515,7 @@
SetBackgroundColour(mixColour(col, 3, *wxRED, 1));
GetSizer()->Show(cancel, false, true);
GetSizer()->Show(close, true, true);
+ close->Enable();
break;
}
default:
@@ -553,7 +556,7 @@
bool dcTaskModule::OnInit()
{
dcWorkBarTemplate* wbtempl = new dcWorkBarTemplate(_("Tasks"), _("Background tasks"),
- CLASSINFO(dcAsyncTaskWorkBar), &wxGetApp());
+ CLASSINFO(dcAsyncTaskWorkBar), &wxGetApp(), wxSize(400, 240));
dcWorkBarManager::GetManager().RegisterTemplate(wbtempl);
return true;
}
Modified: trunk/wxdevcenter/src/ui/stdframe.cpp
===================================================================
--- trunk/wxdevcenter/src/ui/stdframe.cpp 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/ui/stdframe.cpp 2009-09-10 10:54:46 UTC (rev 53)
@@ -272,8 +272,12 @@
wb->Show();
wxAuiPaneInfo info;
info.Name(wb->GetTemplate()->GetName()).Caption(wb->GetTemplate()->GetName())
- .BestSize(wb->GetBestSize()).MinSize(wb->GetMinSize()).MaxSize(wb->GetMaxSize())
- .Left();
+ .BestSize(wb->GetBestSize()).MinSize(wb->GetMinSize()).MaxSize(wb->GetMaxSize());
+
+ if(wb->GetTemplate()->getOrientation()&wxHORIZONTAL)
+ info.Bottom();
+ else
+ info.Left();
m_mgr.AddPane(wb, info);
}
}
Modified: trunk/wxdevcenter/src/ui/workbar.cpp
===================================================================
--- trunk/wxdevcenter/src/ui/workbar.cpp 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/ui/workbar.cpp 2009-09-10 10:54:46 UTC (rev 53)
@@ -43,6 +43,10 @@
return GetTemplate()->SatisfyPerspective(perspec);
}
+wxSize dcWorkBar::DoGetBestSize() const{
+ wxSize sz = GetTemplate()->getDefaultSize();
+ return sz!=wxDefaultSize?sz:wxPanel::DoGetBestSize();
+}
//==========================================================================
// dcWorkBarTemplate
@@ -55,10 +59,21 @@
EVT_UPDATE_ACTION_UI(wxID_ANY, dcWorkBarTemplate::OnUpdateActionUIEvent)
END_EVENT_TABLE()
-dcWorkBarTemplate::dcWorkBarTemplate(const wxString& typeName, const wxString& descr, wxClassInfo *classInfo, wxEvtHandler* target):
+dcWorkBarTemplate::dcWorkBarTemplate(const wxString& typeName, const wxString& descr,
+ wxClassInfo *classInfo, wxEvtHandler* target,
+ wxSize defSize,int orient):
Template<dcWorkBar>(classInfo, typeName, descr),
-m_target(target)
+m_target(target),
+m_defSize(defSize),
+m_orient(orient)
{
+ if(orient==0 && m_defSize!=wxDefaultSize)
+ {
+ if(m_defSize.x>m_defSize.y)
+ m_orient = wxHORIZONTAL;
+ else
+ m_orient = wxVERTICAL;
+ }
}
dcWorkBar* dcWorkBarTemplate::GetWorkBar(dcTopFrame* frame)
Modified: trunk/wxdevcenter/src/ui/workbar.hpp
===================================================================
--- trunk/wxdevcenter/src/ui/workbar.hpp 2009-08-09 16:33:23 UTC (rev 52)
+++ trunk/wxdevcenter/src/ui/workbar.hpp 2009-09-10 10:54:46 UTC (rev 53)
@@ -38,6 +38,8 @@
virtual bool SatisfyPerspective(const dcPerspective& perspec)const;
virtual void OnNewPerspective(bool shown, const dcPerspective& perspec){}
+
+ virtual wxSize DoGetBestSize() const;
};
@@ -52,17 +54,25 @@
friend class dcWorkBarManager;
protected:
wxEvtHandler* m_target;
-
+ wxSize m_defSize;
+ int m_orient;
public:
dcWorkBarTemplate(const wxString& typeName,
const wxString& descr,
wxClassInfo* classInfo = NULL,
- wxEvtHandler* target = NULL);
+ wxEvtHandler* target = NULL,
+ wxSize defSize = wxDefaultSize,
+ int orient = 0 /** Can be wxHORIZONTAL or wxVERTICAL or 0 for autodef*/);
virtual ~dcWorkBarTemplate(){}
virtual dcWorkBar* GetWorkBar(dcTopFrame* frame);
virtual dcWorkBar* CreateWorkBar(dcTopFrame* frame){return GetWorkBar(frame);}
+ virtual wxSize getDefaultSize()const{return m_defSize;}
+ virtual void setDefaultSize(wxSize sz){m_defSize = sz;}
+ virtual int getOrientation()const{return m_orient;}
+ virtual void setOrientation(int orient){m_orient = orient;}
+
dcWorkBarTemplate& Target(wxEvtHandler* target){SetTarget(target); return *this;}
void SetTarget(wxEvtHandler* target){m_target = target;}
wxEvtHandler* GetTarget()const{return m_target;}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cur...@us...> - 2009-08-09 16:33:30
|
Revision: 52
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=52&view=rev
Author: cursorstar
Date: 2009-08-09 16:33:23 +0000 (Sun, 09 Aug 2009)
Log Message:
-----------
Little fix
Modified Paths:
--------------
trunk/wxdevcenter/src/ui/art.cpp
Modified: trunk/wxdevcenter/src/ui/art.cpp
===================================================================
--- trunk/wxdevcenter/src/ui/art.cpp 2009-08-09 16:32:46 UTC (rev 51)
+++ trunk/wxdevcenter/src/ui/art.cpp 2009-08-09 16:33:23 UTC (rev 52)
@@ -55,6 +55,7 @@
bool dcArtProviderModule::OnInit()
{
wxArtProvider::Push(new dcArtProvider);
+ return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cur...@us...> - 2009-08-09 16:32:58
|
Revision: 51
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=51&view=rev
Author: cursorstar
Date: 2009-08-09 16:32:46 +0000 (Sun, 09 Aug 2009)
Log Message:
-----------
Add notion of "global action target"
Modified Paths:
--------------
trunk/wxdevcenter/src/application.hpp
trunk/wxdevcenter/src/docview/document.hpp
trunk/wxdevcenter/src/docview/view.hpp
trunk/wxdevcenter/src/sys/action.cpp
trunk/wxdevcenter/src/sys/action.hpp
trunk/wxdevcenter/src/ui/frame.hpp
trunk/wxdevcenter/src/ui/perspective.cpp
trunk/wxdevcenter/src/ui/workbar.cpp
Modified: trunk/wxdevcenter/src/application.hpp
===================================================================
--- trunk/wxdevcenter/src/application.hpp 2009-08-08 16:37:56 UTC (rev 50)
+++ trunk/wxdevcenter/src/application.hpp 2009-08-09 16:32:46 UTC (rev 51)
@@ -9,7 +9,7 @@
/**
* Application class.
*/
-class dcApplication : public wxApp
+class dcApplication : public wxApp, public dcGlobalActionTarget
{
DECLARE_EVENT_TABLE()
public:
Modified: trunk/wxdevcenter/src/docview/document.hpp
===================================================================
--- trunk/wxdevcenter/src/docview/document.hpp 2009-08-08 16:37:56 UTC (rev 50)
+++ trunk/wxdevcenter/src/docview/document.hpp 2009-08-09 16:32:46 UTC (rev 51)
@@ -271,7 +271,7 @@
/**
* Document manager
*/
-class WXDLLIMPEXP_WXDEVCENTER dcDocumentManager : public Manager<dcDocument, dcDocumentTemplate>, public wxEvtHandler
+class WXDLLIMPEXP_WXDEVCENTER dcDocumentManager : public Manager<dcDocument, dcDocumentTemplate>, public wxEvtHandler, public dcGlobalActionTarget
{
DECLARE_EVENT_TABLE()
DECLARE_CLASS(dcDocumentManager)
Modified: trunk/wxdevcenter/src/docview/view.hpp
===================================================================
--- trunk/wxdevcenter/src/docview/view.hpp 2009-08-08 16:37:56 UTC (rev 50)
+++ trunk/wxdevcenter/src/docview/view.hpp 2009-08-09 16:32:46 UTC (rev 51)
@@ -126,7 +126,7 @@
/**
* View manager.
*/
-class WXDLLIMPEXP_WXDEVCENTER dcViewManager : public Manager<dcView, dcViewTemplate>, public wxEvtHandler
+class WXDLLIMPEXP_WXDEVCENTER dcViewManager : public Manager<dcView, dcViewTemplate>, public wxEvtHandler, public dcGlobalActionTarget
{
DECLARE_EVENT_TABLE()
DECLARE_CLASS(dcViewManager)
Modified: trunk/wxdevcenter/src/sys/action.cpp
===================================================================
--- trunk/wxdevcenter/src/sys/action.cpp 2009-08-08 16:37:56 UTC (rev 50)
+++ trunk/wxdevcenter/src/sys/action.cpp 2009-08-09 16:32:46 UTC (rev 51)
@@ -113,10 +113,13 @@
bool dcAction::SatisfyPerspective(const dcPerspective& perspec)const
{
- if(GetTarget()==NULL)
+ wxEvtHandler* handler = GetTarget();
+ if(handler==NULL)
return false;
- else if(perspec.HasTarget(GetTarget()))
+ else if(dcGlobalActionTarget::isInstance(handler))
return true;
+ else if(perspec.HasTarget(handler))
+ return true;
else
return false;
}
Modified: trunk/wxdevcenter/src/sys/action.hpp
===================================================================
--- trunk/wxdevcenter/src/sys/action.hpp 2009-08-08 16:37:56 UTC (rev 50)
+++ trunk/wxdevcenter/src/sys/action.hpp 2009-08-09 16:32:46 UTC (rev 51)
@@ -536,7 +536,21 @@
};
+/**
+ * Global action target.
+ * Special class marker to specify a target is alwayes present.
+ * Such target class must derive from this.
+ */
+class dcGlobalActionTarget
+{
+public:
+ /** Test if an object is a global action target. */
+ static bool isInstance(wxEvtHandler* handler){
+ return dynamic_cast<dcGlobalActionTarget*>(handler)!=NULL;
+ }
+};
+
/**
* Action module
*/
Modified: trunk/wxdevcenter/src/ui/frame.hpp
===================================================================
--- trunk/wxdevcenter/src/ui/frame.hpp 2009-08-08 16:37:56 UTC (rev 50)
+++ trunk/wxdevcenter/src/ui/frame.hpp 2009-08-09 16:32:46 UTC (rev 51)
@@ -123,7 +123,7 @@
/**
* FrameManager
*/
-class WXDLLIMPEXP_WXDEVCENTER dcFrameManager : public Manager<dcTopFrame, dcFrameTemplate>, public wxEvtHandler
+class WXDLLIMPEXP_WXDEVCENTER dcFrameManager : public Manager<dcTopFrame, dcFrameTemplate>, public wxEvtHandler, public dcGlobalActionTarget
{
DECLARE_CLASS(dcFrameManager)
DECLARE_NO_COPY_CLASS(dcFrameManager)
Modified: trunk/wxdevcenter/src/ui/perspective.cpp
===================================================================
--- trunk/wxdevcenter/src/ui/perspective.cpp 2009-08-08 16:37:56 UTC (rev 50)
+++ trunk/wxdevcenter/src/ui/perspective.cpp 2009-08-09 16:32:46 UTC (rev 51)
@@ -84,15 +84,6 @@
return true;
}
- if(dynamic_cast<const wxApp*>(target))
- return true;
- if(dynamic_cast<const dcDocumentManager*>(target))
- return true;
- if(dynamic_cast<const dcViewManager*>(target))
- return true;
- if(dynamic_cast<const dcFrameManager*>(target))
- return true;
-
return false;
}
Modified: trunk/wxdevcenter/src/ui/workbar.cpp
===================================================================
--- trunk/wxdevcenter/src/ui/workbar.cpp 2009-08-08 16:37:56 UTC (rev 50)
+++ trunk/wxdevcenter/src/ui/workbar.cpp 2009-08-09 16:32:46 UTC (rev 51)
@@ -78,10 +78,13 @@
bool dcWorkBarTemplate::SatisfyPerspective(const dcPerspective& perspec)const
{
- if(GetTarget()==NULL)
+ wxEvtHandler* handler = GetTarget();
+ if(handler==NULL)
return false;
- else if(perspec.HasTarget(GetTarget()))
+ else if(dcGlobalActionTarget::isInstance(handler))
return true;
+ else if(perspec.HasTarget(handler))
+ return true;
else
return false;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cur...@us...> - 2009-08-08 16:38:05
|
Revision: 50
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=50&view=rev
Author: cursorstar
Date: 2009-08-08 16:37:56 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
Add bookmark notion (1st step - collision with text bookmark)
Added Paths:
-----------
trunk/wxdevcenter/src/sys/bookmark.cpp
trunk/wxdevcenter/src/sys/bookmark.hpp
Added: trunk/wxdevcenter/src/sys/bookmark.cpp
===================================================================
--- trunk/wxdevcenter/src/sys/bookmark.cpp (rev 0)
+++ trunk/wxdevcenter/src/sys/bookmark.cpp 2009-08-08 16:37:56 UTC (rev 50)
@@ -0,0 +1,68 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * wxdevcenter
+ * Copyright (C) Emilien KIA 2009 <emi...@fr...>
+ *
+ * wxdevcenter is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wxdevcenter is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../wxdevcenter.hpp"
+#include "bookmark.hpp"
+
+dcBookmark::dcBookmark(const wxString& location, const wxString& description):
+uri(location),
+descript(description)
+{
+}
+
+dcBookmark::dcBookmark(const wxURI& uri, const wxString& description):
+uri(uri),
+descript(description)
+{
+}
+
+wxURI dcBookmark::getURI()const
+{
+ return uri;
+}
+
+wxURI& dcBookmark::getURI()
+{
+ return uri;
+}
+
+wxString dcBookmark::getLocation()const
+{
+ return uri.BuildUnescapedURI();
+}
+
+wxString dcBookmark::getDescription()const
+{
+ return descript;
+}
+
+void dcBookmark::setURI(const wxURI& uri)
+{
+ this->uri = uri;
+}
+
+void dcBookmark::setLocation(const wxString& location)
+{
+ uri.Create(location);
+}
+
+void dcBookmark::setDescription(const wxString& description)
+{
+ descript = description;
+}
Added: trunk/wxdevcenter/src/sys/bookmark.hpp
===================================================================
--- trunk/wxdevcenter/src/sys/bookmark.hpp (rev 0)
+++ trunk/wxdevcenter/src/sys/bookmark.hpp 2009-08-08 16:37:56 UTC (rev 50)
@@ -0,0 +1,43 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * wxdevcenter
+ * Copyright (C) Emilien KIA 2009 <emi...@fr...>
+ *
+ * wxdevcenter is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wxdevcenter is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _BOOKMARK_HPP_
+#define _BOOKMARK_HPP_
+
+class dcBookmark
+{
+public:
+ dcBookmark(const wxString& location=wxEmptyString, const wxString& description=wxEmptyString);
+ dcBookmark(const wxURI& uri, const wxString& description=wxEmptyString);
+
+ virtual wxURI getURI()const;
+ virtual wxURI& getURI();
+ virtual wxString getLocation()const;
+ virtual wxString getDescription()const;
+
+ virtual void setURI(const wxURI& uri);
+ virtual void setLocation(const wxString& location);
+ virtual void setDescription(const wxString& description);
+
+private:
+ wxURI uri;
+ wxString descript;
+};
+
+#endif // _BOOKMARK_HPP_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <cur...@us...> - 2009-08-08 15:22:10
|
Revision: 49
http://wxdevcenter.svn.sourceforge.net/wxdevcenter/?rev=49&view=rev
Author: cursorstar
Date: 2009-08-08 15:22:02 +0000 (Sat, 08 Aug 2009)
Log Message:
-----------
Add task support.
Modified Paths:
--------------
trunk/wxdevcenter/src/plugins/text/bookmark.cpp
trunk/wxdevcenter/src/plugins/text/text.cpp
trunk/wxdevcenter/src/plugins/text/view.cpp
trunk/wxdevcenter/src/plugins/text/view.hpp
trunk/wxdevcenter/src/sys/Makefile.am
trunk/wxdevcenter/src/sys/Makefile.in
Added Paths:
-----------
trunk/wxdevcenter/src/sys/task.cpp
trunk/wxdevcenter/src/sys/task.hpp
Modified: trunk/wxdevcenter/src/plugins/text/bookmark.cpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/bookmark.cpp 2009-08-04 05:19:15 UTC (rev 48)
+++ trunk/wxdevcenter/src/plugins/text/bookmark.cpp 2009-08-08 15:22:02 UTC (rev 49)
@@ -243,6 +243,7 @@
m_list->InsertColumn(0, _("Line"), wxLIST_FORMAT_LEFT, 48);
m_list->InsertColumn(1, _("Name"));
+ return true;
}
void dcBookmarkWorkBar::OnNewPerspective(bool shown, const dcPerspective& perspec)
Modified: trunk/wxdevcenter/src/plugins/text/text.cpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/text.cpp 2009-08-04 05:19:15 UTC (rev 48)
+++ trunk/wxdevcenter/src/plugins/text/text.cpp 2009-08-08 15:22:02 UTC (rev 49)
@@ -332,7 +332,6 @@
GetCommandProcessor()->Store(new cmdTextInsert(this, pos, len, text));
Modify();
}
- dump();
}
void dcTextDocument::RelayDocWatcherEventRemove(int pos, int len, int linesAdded, const char *text)
@@ -344,7 +343,6 @@
GetCommandProcessor()->Store(new cmdTextRemove(this, pos, len, text));
Modify();
}
- dump();
}
void dcTextDocument::dump()
@@ -508,10 +506,6 @@
m_actionsTools = new dcActionGroupEntry(viewTempl, wxID_ANY, wxdcACTION_GROUP_ENTRY_TOOLS, wxT(""), wxT(""), wxT(""), wxdcACTION_GROUP_PRIORITY_TOOLS);
dcActionManager::Register(m_actionsTools);
-// m_actionsTools->Append(XRCID("TEST1"), _("Test1"));
-// m_actionsTools->Append(XRCID("TEST2"), _("Test2"));
-// m_actionsTools->Append(XRCID("TEST3"), _("Test3"));
-
dcActionGroup* modify = m_actionsTools->AppendSubGroup(wxID_ANY, _("Modify"));
modify->Append(XRCID("CHANGE_UPPER"), _("Change upper"), _("Change case upper"));
modify->Append(XRCID("CHANGE_LOWER"), _("Change lower"), _("Change case lower"));
Modified: trunk/wxdevcenter/src/plugins/text/view.cpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/view.cpp 2009-08-04 05:19:15 UTC (rev 48)
+++ trunk/wxdevcenter/src/plugins/text/view.cpp 2009-08-08 15:22:02 UTC (rev 49)
@@ -95,29 +95,8 @@
EVT_ACTION(XRCID("NEXT_BOOKMARK"), dcTextView::OnNextBookmark)
EVT_ACTION(XRCID("PREV_BOOKMARK"), dcTextView::OnPrevBookmark)
EVT_ACTION(XRCID("CLEAR_BOOKMARK"), dcTextView::OnClearBookmark)
-
-// EVT_ACTION(XRCID("TEST1"), dcTextView::OnTest1)
-// EVT_ACTION(XRCID("TEST2"), dcTextView::OnTest2)
-// EVT_ACTION(XRCID("TEST3"), dcTextView::OnTest3)
END_EVENT_TABLE()
-void dcTextView::OnTest1(dcActionEvent& event)
-{
- GetDocument()->insertText(0, _("Bonjour"));
-}
-
-void dcTextView::OnTest2(dcActionEvent& event)
-{
- GetDocument()->removeText(0, 3);
-}
-
-void dcTextView::OnTest3(dcActionEvent& event)
-{
- GetDocument()->replaceText(0, 3, _("Bonjour"));
-}
-
-
-
dcTextView::dcTextView():
dcView(),
m_lang(wxID_ANY),
Modified: trunk/wxdevcenter/src/plugins/text/view.hpp
===================================================================
--- trunk/wxdevcenter/src/plugins/text/view.hpp 2009-08-04 05:19:15 UTC (rev 48)
+++ trunk/wxdevcenter/src/plugins/text/view.hpp 2009-08-08 15:22:02 UTC (rev 49)
@@ -80,10 +80,6 @@
void UpdateBookmarkWorkBar();
private:
- void OnTest1(dcActionEvent& event);
- void OnTest2(dcActionEvent& event);
- void OnTest3(dcActionEvent& event);
-
void OnCut(dcActionEvent& event);
void OnCopy(dcActionEvent& event);
void OnPaste(dcActionEvent& event);
Modified: trunk/wxdevcenter/src/sys/Makefile.am
===================================================================
--- trunk/wxdevcenter/src/sys/Makefile.am 2009-08-04 05:19:15 UTC (rev 48)
+++ trunk/wxdevcenter/src/sys/Makefile.am 2009-08-08 15:22:02 UTC (rev 49)
@@ -13,7 +13,9 @@
plugin.hpp \
plugin.cpp \
config.hpp \
- config.cpp
+ config.cpp \
+ task.hpp \
+ task.cpp
libsys_la_CXXFLAGS = \
-DPLUGIN_LIBDIR="\"$(PLUGIN_LIBDIR)\"" \
Modified: trunk/wxdevcenter/src/sys/Makefile.in
===================================================================
--- trunk/wxdevcenter/src/sys/Makefile.in 2009-08-04 05:19:15 UTC (rev 48)
+++ trunk/wxdevcenter/src/sys/Makefile.in 2009-08-08 15:22:02 UTC (rev 49)
@@ -44,7 +44,7 @@
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsys_la_LIBADD =
am_libsys_la_OBJECTS = libsys_la-action.lo libsys_la-manager.lo \
- libsys_la-plugin.lo libsys_la-config.lo
+ libsys_la-plugin.lo libsys_la-config.lo libsys_la-task.lo
libsys_la_OBJECTS = $(am_libsys_la_OBJECTS)
libsys_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(libsys_la_CXXFLAGS) \
@@ -248,7 +248,9 @@
plugin.hpp \
plugin.cpp \
config.hpp \
- config.cpp
+ config.cpp \
+ task.hpp \
+ task.cpp
libsys_la_CXXFLAGS = \
-DPLUGIN_LIBDIR="\"$(PLUGIN_LIBDIR)\"" \
@@ -310,6 +312,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-config.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-manager.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsys_la-task.Plo@am__quote@
.cpp.o:
@am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -360,6 +363,13 @@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-config.lo `test -f 'config.cpp' || echo '$(srcdir)/'`config.cpp
+libsys_la-task.lo: task.cpp
+@am__fastdepCXX_TRUE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -MT libsys_la-task.lo -MD -MP -MF $(DEPDIR)/libsys_la-task.Tpo -c -o libsys_la-task.lo `test -f 'task.cpp' || echo '$(srcdir)/'`task.cpp
+@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/libsys_la-task.Tpo $(DEPDIR)/libsys_la-task.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='task.cpp' object='libsys_la-task.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@ $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libsys_la_CXXFLAGS) $(CXXFLAGS) -c -o libsys_la-task.lo `test -f 'task.cpp' || echo '$(srcdir)/'`task.cpp
+
mostlyclean-libtool:
-rm -f *.lo
Added: trunk/wxdevcenter/src/sys/task.cpp
===================================================================
--- trunk/wxdevcenter/src/sys/task.cpp (rev 0)
+++ trunk/wxdevcenter/src/sys/task.cpp 2009-08-08 15:22:02 UTC (rev 49)
@@ -0,0 +1,563 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * wxdevcenter
+ * Copyright (C) Emilien KIA 2009 <emi...@fr...>
+ *
+ * wxdevcenter is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wxdevcenter is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+#include "../wxdevcenter.hpp"
+#include "../application.hpp"
+#include "task.hpp"
+
+#include <wx/thread.h>
+
+//==========================================================================
+// dcTask
+//==========================================================================
+
+dcTask::dcTask():
+name(),
+comment(),
+art(),
+min(0),
+max(0),
+pos(0),
+state(WAITING)
+{
+}
+
+dcTask::dcTask(const wxString& name, int min, int max):
+name(name),
+comment(),
+art(),
+min(min),
+max(max),
+pos(min),
+state(WAITING)
+{
+}
+
+dcTask::dcTask(const wxString& name, const wxString& art, int min, int max):
+name(name),
+comment(),
+art(art),
+min(min),
+max(max),
+pos(min),
+state(WAITING)
+{
+}
+
+void dcTask::run()
+{
+ setState(RUNNING);
+ if(execute())
+ setState(SUCCESS);
+ else
+ setState(FAILED);
+}
+
+//==========================================================================
+// dcTaskThread
+//=========================================================================
+class dcTaskThread : public wxThread
+{
+public:
+ dcTaskThread(dcAsynchronousTask* async):wxThread(),async(async){}
+ virtual ExitCode Entry();
+protected:
+ dcAsynchronousTask* async;
+};
+
+void* dcTaskThread::Entry(){
+ if(async!=NULL){
+ async->run();
+ async->clearThread();
+ }
+}
+
+
+//==========================================================================
+// dcAsynchronousTask
+//==========================================================================
+
+dcAsynchronousTask::dcAsynchronousTask():
+dcTask(),
+interrupted(false)
+{
+}
+
+dcAsynchronousTask::dcAsynchronousTask(const wxString& name, int min, int max):
+dcTask(name, min, max),
+interrupted(false)
+{
+}
+
+dcAsynchronousTask::dcAsynchronousTask(const wxString& name, const wxString& art, int min, int max):
+dcTask(name, art, min, max),
+interrupted(false)
+{
+}
+
+
+void dcAsynchronousTask::clearThread(){
+ wxCriticalSectionLocker locker(cs);
+ thread=NULL;
+}
+
+wxString dcAsynchronousTask::getName()const{
+ wxCriticalSectionLocker locker(cs);
+ return dcTask::getName();
+}
+
+wxString dcAsynchronousTask::getComment()const{
+ wxCriticalSectionLocker locker(cs);
+ return dcTask::getComment();
+}
+
+wxString dcAsynchronousTask::getArt()const{
+ wxCriticalSectionLocker locker(cs);
+ return dcTask::getArt();
+}
+
+int dcAsynchronousTask::getMin()const{
+ wxCriticalSectionLocker locker(cs);
+ return dcTask::getMin();
+}
+
+int dcAsynchronousTask::getMax()const{
+ wxCriticalSectionLocker locker(cs);
+ return dcTask::getMax();
+}
+
+int dcAsynchronousTask::getPos()const{
+ wxCriticalSectionLocker locker(cs);
+ return dcTask::getPos();
+}
+
+dcTask::State dcAsynchronousTask::getState()const{
+ wxCriticalSectionLocker locker(cs);
+ return dcTask::getState();
+}
+
+void dcAsynchronousTask::setName(const wxString& name){
+ {
+ wxCriticalSectionLocker locker(cs);
+ dcTask::setName(name);
+ }
+ callNameChanged();
+}
+
+void dcAsynchronousTask::setComment(const wxString& comment){
+ {
+ wxCriticalSectionLocker locker(cs);
+ dcTask::setComment(comment);
+ }
+ callCommentChanged();
+}
+
+void dcAsynchronousTask::setArt(const wxString& art){
+ wxCriticalSectionLocker locker(cs);
+ dcTask::setArt(art);
+}
+
+void dcAsynchronousTask::setMin(int min){
+ {
+ wxCriticalSectionLocker locker(cs);
+ dcTask::setMin(min);
+ }
+ callMinChanged();
+}
+
+void dcAsynchronousTask::setMax(int max){
+ {
+ wxCriticalSectionLocker locker(cs);
+ dcTask::setMax(max);
+ }
+ callMaxChanged();
+}
+
+void dcAsynchronousTask::setPos(int pos){
+ {
+ wxCriticalSectionLocker locker(cs);
+ dcTask::setPos(pos);
+ }
+ callPosChanged();
+}
+
+void dcAsynchronousTask::setState(State state){
+ {
+ wxCriticalSectionLocker locker(cs);
+ dcTask::setState(state);
+ }
+ callStateChanged();
+}
+
+bool dcAsynchronousTask::runAsync(){
+ thread = new dcTaskThread(this);
+ if(thread!=NULL){
+ if(thread->Create()!=wxTHREAD_NO_ERROR)
+ return false;
+ return thread->Run()==wxTHREAD_NO_ERROR;
+ }
+ return false;
+}
+
+void dcAsynchronousTask::addListner(Listener* listner)
+{
+ listners.insert(listner);
+}
+
+void dcAsynchronousTask::remListner(Listener* listner)
+{
+ listners.erase(listner);
+}
+
+void dcAsynchronousTask::callNameChanged(){
+ wxString str = getName();
+ for(std::set<Listener*>::iterator iter=listners.begin(); iter!=listners.end(); iter++)
+ (*iter)->onNameChange(str, this);
+}
+
+void dcAsynchronousTask::callCommentChanged(){
+ wxString str = getComment();
+ for(std::set<Listener*>::iterator iter=listners.begin(); iter!=listners.end(); iter++)
+ (*iter)->onCommentChange(str, this);
+}
+
+void dcAsynchronousTask::callMinChanged(){
+ int i = getMin();
+ for(std::set<Listener*>::iterator iter=listners.begin(); iter!=listners.end(); iter++)
+ (*iter)->onMinChange(i, this);
+}
+
+void dcAsynchronousTask::callMaxChanged(){
+ int i = getMax();
+ for(std::set<Listener*>::iterator iter=listners.begin(); iter!=listners.end(); iter++)
+ (*iter)->onMaxChange(i, this);
+}
+
+void dcAsynchronousTask::callPosChanged(){
+ int i = getPos();
+ for(std::set<Listener*>::iterator iter=listners.begin(); iter!=listners.end(); iter++)
+ (*iter)->onPosChange(i, this);
+}
+
+void dcAsynchronousTask::callStateChanged(){
+ State s = getState();
+ for(std::set<Listener*>::iterator iter=listners.begin(); iter!=listners.end(); iter++)
+ (*iter)->onStateChange(s, this);
+}
+
+void dcAsynchronousTask::interrupt(){
+ wxCriticalSectionLocker locker(cs);
+ interrupted = true;
+}
+
+bool dcAsynchronousTask::isInterrupted()const{
+ wxCriticalSectionLocker locker(cs);
+ return interrupted;
+}
+
+
+
+//==========================================================================
+// dcTaskManager
+//==========================================================================
+
+dcAsynchronousTaskManager dcAsynchronousTaskManager::instance;
+
+void dcAsynchronousTaskManager::add(dcAsynchronousTask* task, bool run)
+{
+ tasks.push_back(task);
+ callAddTask(task);
+ if(run)
+ task->runAsync();
+}
+
+void dcAsynchronousTaskManager::rem(dcAsynchronousTask* task, bool del)
+{
+ callRemTask(task);
+ if(del)
+ delete task;
+}
+
+void dcAsynchronousTaskManager::addListner(Listener* listner)
+{
+ listners.insert(listner);
+}
+
+void dcAsynchronousTaskManager::remListner(Listener* listner)
+{
+ listners.erase(listner);
+}
+
+void dcAsynchronousTaskManager::callAddTask(dcAsynchronousTask* task)
+{
+ for(std::set<Listener*>::iterator iter=listners.begin(); iter!=listners.end(); iter++)
+ (*iter)->onAddTask(task, this);
+}
+
+void dcAsynchronousTaskManager::callRemTask(dcAsynchronousTask* task)
+{
+ for(std::set<Listener*>::iterator iter=listners.begin(); iter!=listners.end(); iter++)
+ (*iter)->onRemTask(task, this);
+}
+
+
+//==========================================================================
+// dcAsyncTaskWorkBar
+//==========================================================================
+
+IMPLEMENT_DYNAMIC_CLASS(dcAsyncTaskWorkBar, dcWorkBar)
+
+BEGIN_EVENT_TABLE(dcAsyncTaskWorkBar, dcWorkBar)
+END_EVENT_TABLE()
+
+dcAsyncTaskWorkBar::dcAsyncTaskWorkBar():
+dcWorkBar(),
+scrolled(NULL)
+{
+}
+
+bool dcAsyncTaskWorkBar::Create(wxWindow* parent, wxWindowID id)
+{
+ if(!dcWorkBar::Create(parent, id))
+ return false;
+
+ wxSizer *szTop = new wxBoxSizer(wxVERTICAL),
+ *szScrolled = new wxBoxSizer(wxVERTICAL);
+ scrolled = new wxScrolledWindow(this, wxID_ANY);
+ szTop->Add(scrolled, 1, wxEXPAND);
+ scrolled->SetSizer(szScrolled);
+ SetSizer(szTop);
+
+ dcAsynchronousTaskManager::getInstance().addListner(this);
+
+ return true;
+}
+
+wxSizer* dcAsyncTaskWorkBar::getScrollSizer()
+{
+ return scrolled!=NULL?scrolled->GetSizer():NULL;
+}
+
+void dcAsyncTaskWorkBar::onAddTask(dcAsynchronousTask* task, dcAsynchronousTaskManager*)
+{
+ dcAsyncTaskWorkBarItem* item = new dcAsyncTaskWorkBarItem(task, this, wxID_ANY);
+ map[task] = item;
+ getScrollSizer()->Add(item, 0, wxEXPAND);
+ getScrollSizer()->Layout();
+}
+
+void dcAsyncTaskWorkBar::onRemTask(dcAsynchronousTask* task, dcAsynchronousTaskManager*)
+{
+ PanelMap::iterator iter = map.find(task);
+ if(iter!=map.end())
+ {
+ dcAsyncTaskWorkBarItem* item = iter->second;
+ map.erase(iter);
+ getScrollSizer()->Detach(item);
+ item->Destroy();
+ }
+}
+
+
+//==========================================================================
+// dcAsyncTaskWorkBarItem
+//==========================================================================
+
+IMPLEMENT_DYNAMIC_CLASS(dcAsyncTaskWorkBarItem, wxPanel)
+
+BEGIN_EVENT_TABLE(dcAsyncTaskWorkBarItem, wxPanel)
+ EVT_BUTTON(wxID_CLOSE, dcAsyncTaskWorkBarItem::onClose)
+END_EVENT_TABLE()
+
+dcAsyncTaskWorkBarItem::dcAsyncTaskWorkBarItem():
+wxPanel(),
+task(NULL),
+min(-1),
+max(-1),
+pos(-1)
+{
+}
+
+dcAsyncTaskWorkBarItem::dcAsyncTaskWorkBarItem(dcAsynchronousTask* task, wxWindow* parent, wxWindowID id):
+wxPanel(),
+task(NULL),
+min(-1),
+max(-1),
+pos(-1)
+{
+ Create(task, parent, id);
+}
+
+bool dcAsyncTaskWorkBarItem::Create(dcAsynchronousTask* task, wxWindow* parent, wxWindowID id)
+{
+ if(!wxPanel::Create(parent, id))
+ return false;
+
+ this->task = task;
+
+ title = new wxStaticText(this, wxID_ANY, task->getName());
+ comment = new wxStaticText(this, wxID_ANY, task->getComment());
+ progress = new wxGauge(this, wxID_ANY, 1);
+ cancel = new wxButton(this, wxID_CANCEL);
+ close = new wxButton(this, wxID_CLOSE);
+
+ cancel->Enable(task->canInterrupt());
+
+ wxFont font = title->GetFont();
+ font.SetWeight(wxFONTWEIGHT_BOLD);
+ title->SetFont(font);
+
+ wxSizer *topSz = new wxBoxSizer(wxVERTICAL),
+ *pgSz = new wxBoxSizer(wxHORIZONTAL);
+ topSz->Add(title, 0, wxEXPAND);
+ topSz->Add(comment, 0, wxEXPAND);
+ pgSz->Add(progress, 1, wxALIGN_CENTER|wxALL, 4);
+ pgSz->Add(cancel, 0, wxEXPAND|wxALL, 4);
+ pgSz->Add(close, 0, wxEXPAND|wxALL, 4);
+ topSz->Add(pgSz, 0, wxEXPAND);
+ SetSizer(topSz);
+
+ set(task->getMin(), task->getMax(), task->getPos());
+ task->addListner(this);
+
+ col = GetBackgroundColour();
+
+ return true;
+}
+
+void dcAsyncTaskWorkBarItem::set(int min, int max, int pos)
+{
+ if(min!=this->min || max!=this->max)
+ {
+ if(min<max)
+ {
+ progress->SetRange(max-min);
+ }
+ this->min = min;
+ this->max = max;
+ }
+
+ if(pos!=this->pos)
+ {
+ if(min<max)
+ progress->SetValue(pos-min);
+ else
+ progress->Pulse();
+ this->pos = pos;
+ }
+}
+
+
+void dcAsyncTaskWorkBarItem::onNameChange(const wxString& title, dcAsynchronousTask* task)
+{
+ wxMutexGuiEnter();
+ this->title->SetLabel(title);
+ wxMutexGuiLeave();
+}
+
+void dcAsyncTaskWorkBarItem::onCommentChange(const wxString& comment, dcAsynchronousTask* task)
+{
+ wxMutexGuiEnter();
+ this->comment->SetLabel(comment);
+ wxMutexGuiLeave();
+}
+
+void dcAsyncTaskWorkBarItem::onMinChange(int min, dcAsynchronousTask* task)
+{
+ wxMutexGuiEnter();
+ set(min, max, pos);
+}
+
+void dcAsyncTaskWorkBarItem::onMaxChange(int max, dcAsynchronousTask* task)
+{
+ wxMutexGuiEnter();
+ set(min, max, pos);
+ wxMutexGuiLeave();
+}
+
+void dcAsyncTaskWorkBarItem::onPosChange(int pos, dcAsynchronousTask* task)
+{
+ wxMutexGuiEnter();
+ set(min, max, pos);
+ wxMutexGuiLeave();
+}
+
+void dcAsyncTaskWorkBarItem::onStateChange(dcTask::State state, dcAsynchronousTask* task)
+{
+ wxMutexGuiEnter();
+ switch(state){
+ case dcTask::SUCCESS:
+ {
+ SetBackgroundColour(mixColour(col, 3, *wxGREEN, 1));
+ GetSizer()->Show(cancel, false, true);
+ GetSizer()->Show(close, true, true);
+ break;
+ }
+ case dcTask::FAILED:
+ {
+ SetBackgroundColour(mixColour(col, 3, *wxRED, 1));
+ GetSizer()->Show(cancel, false, true);
+ GetSizer()->Show(close, true, true);
+ break;
+ }
+ default:
+ {
+ SetBackgroundColour(col);
+ GetSizer()->Show(cancel, true, true);
+ GetSizer()->Show(close, false, true);
+ break;
+ }
+ }
+ wxMutexGuiLeave();
+}
+
+wxColour dcAsyncTaskWorkBarItem::mixColour(const wxColour& col1, int ratio1, const wxColour& col2, int ratio2)
+{
+ int r = ((int)col1.Red())*ratio1 + ((int)col2.Red())*ratio2,
+ g = ((int)col1.Green())*ratio1 + ((int)col2.Green())*ratio2,
+ b = ((int)col1.Blue())*ratio1 + ((int)col2.Blue())*ratio2;
+ return wxColour(r/(ratio1+ratio2), g/(ratio1+ratio2), b/(ratio1+ratio2));
+}
+
+void dcAsyncTaskWorkBarItem::onClose(wxCommandEvent& event)
+{
+ dcAsynchronousTaskManager::getInstance().rem(task);
+}
+
+
+//==========================================================================
+// dcTaskModule
+//==========================================================================
+IMPLEMENT_DYNAMIC_CLASS(dcTaskModule, wxModule)
+
+dcTaskModule::dcTaskModule()
+{
+ AddDependency(CLASSINFO(dcWorkBarModule));
+}
+
+bool dcTaskModule::OnInit()
+{
+ dcWorkBarTemplate* wbtempl = new dcWorkBarTemplate(_("Tasks"), _("Background tasks"),
+ CLASSINFO(dcAsyncTaskWorkBar), &wxGetApp());
+ dcWorkBarManager::GetManager().RegisterTemplate(wbtempl);
+ return true;
+}
+
+void dcTaskModule::OnExit()
+{
+}
Added: trunk/wxdevcenter/src/sys/task.hpp
===================================================================
--- trunk/wxdevcenter/src/sys/task.hpp (rev 0)
+++ trunk/wxdevcenter/src/sys/task.hpp 2009-08-08 15:22:02 UTC (rev 49)
@@ -0,0 +1,257 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 4; tab-width: 4 -*- */
+/*
+ * wxdevcenter
+ * Copyright (C) Emilien KIA 2009 <emi...@fr...>
+ *
+ * wxdevcenter is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * wxdevcenter is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _TASK_HPP_
+#define _TASK_HPP_
+
+#include <list>
+#include <set>
+#include <map>
+
+class dcTask;
+class dcAsynchronousTask;
+class dcAsyncTaskWorkBarItem;
+class dcTaskThread;
+typedef std::list<dcAsynchronousTask*> dcAsynchronousTaskList;
+
+/**
+ * Base class for task.
+ * Implements execute() with specific code.
+ */
+class dcTask
+{
+public:
+ enum State {
+ WAITING,
+ WAIT_DEPENDS,
+ RUNNING,
+ PAUSED,
+ SUCCESS,
+ FAILED
+ };
+
+ dcTask();
+ dcTask(const wxString& name, int min, int max);
+ dcTask(const wxString& name, const wxString& art, int min, int max);
+
+ virtual wxString getName()const{return name;}
+ virtual wxString getComment()const{return comment;}
+ virtual wxString getArt()const{return art;}
+ virtual int getMin()const{return min;}
+ virtual int getMax()const{return max;}
+ virtual int getPos()const{return pos;}
+
+ virtual State getState()const{return state;}
+
+ virtual bool canPause()const{return false;}
+ virtual void pause(){}
+ virtual void resume(){}
+
+ virtual bool canInterrupt()const{return false;}
+ virtual void interrupt(){}
+
+ /** Run task synchronously. */
+ virtual void run();
+
+protected:
+ virtual void setName(const wxString& name){this->name = name;}
+ virtual void setComment(const wxString& comment){this->comment = comment;}
+ virtual void setArt(const wxString& art){this->art = art;}
+ virtual void setMin(int min){this->min = min;}
+ virtual void setMax(int max){this->max = max;}
+ virtual void setPos(int pos){this->pos = pos;}
+
+ virtual void setState(State state){this->state = state;}
+
+ virtual bool execute()=0;
+
+private:
+ wxString name, comment, art;
+ int min, pos, max;
+
+ State state;
+};
+
+/**
+ * Asynchronous task.
+ */
+class dcAsynchronousTask : public dcTask
+{
+ friend class dcTaskThread;
+public:
+ class Listener{
+ public:
+ virtual void onNameChange(const wxString& title, dcAsynchronousTask* task)=0;
+ virtual void onCommentChange(const wxString& comment, dcAsynchronousTask* task)=0;
+ virtual void onMinChange(int min, dcAsynchronousTask* task)=0;
+ virtual void onMaxChange(int max, dcAsynchronousTask* task)=0;
+ virtual void onPosChange(int pos, dcAsynchronousTask* task)=0;
+ virtual void onStateChange(dcTask::State state, dcAsynchronousTask* task)=0;
+ };
+
+ dcAsynchronousTask();
+ dcAsynchronousTask(const wxString& name, int min, int max);
+ dcAsynchronousTask(const wxString& name, const wxString& art, int min, int max);
+
+ virtual wxString getName()const;
+ virtual wxString getComment()const;
+ virtual wxString getArt()const;
+ virtual int getMin()const;
+ virtual int getMax()const;
+ virtual int getPos()const;
+ virtual State getState()const;
+
+ virtual void interrupt();
+
+ /** Run task asynchronously. */
+ virtual bool runAsync();
+ void addListner(Listener* listner);
+ void remListner(Listener* listner);
+
+protected:
+ virtual void setName(const wxString& name);
+ virtual void setComment(const wxString& comment);
+ virtual void setArt(const wxString& art);
+ virtual void setMin(int min);
+ virtual void setMax(int max);
+ virtual void setPos(int pos);
+ virtual void setState(State state);
+
+ virtual bool isInterrupted()const;
+
+
+ void clearThread();
+
+ void callNameChanged();
+ void callCommentChanged();
+ void callMinChanged();
+ void callMaxChanged();
+ void callPosChanged();
+ void callStateChanged();
+
+private:
+ mutable wxCriticalSection cs;
+ dcTaskThread* thread;
+ std::set<Listener*> listners;
+ bool interrupted;
+};
+
+/**
+ * Asynchronous task manager.
+ */
+class dcAsynchronousTaskManager
+{
+public:
+ class Listener{
+ public:
+ virtual void onAddTask(dcAsynchronousTask* task, dcAsynchronousTaskManager* manager)=0;
+ virtual void onRemTask(dcAsynchronousTask* task, dcAsynchronousTaskManager* manager)=0;
+ };
+
+ /** Singleton retriever. */
+ static dcAsynchronousTaskManager& getInstance(){return instance;}
+
+ void add(dcAsynchronousTask* task, bool run=true);
+ void rem(dcAsynchronousTask* task, bool del=true);
+
+ void addListner(Listener* listner);
+ void remListner(Listener* listner);
+protected:
+ void callAddTask(dcAsynchronousTask* task);
+ void callRemTask(dcAsynchronousTask* task);
+
+private:
+ dcAsynchronousTaskList tasks;
+
+ static dcAsynchronousTaskManager instance;
+
+ std::set<Listener*> listners;
+};
+
+
+/**
+ * Asynchronous task list work bar.
+ */
+class dcAsyncTaskWorkBar: public dcWorkBar, protected dcAsynchronousTaskManager::Listener
+{
+ DECLARE_DYNAMIC_CLASS(dcAsyncTaskWorkBar)
+ DECLARE_EVENT_TABLE()
+public:
+ dcAsyncTaskWorkBar();
+ bool Create(wxWindow* parent, wxWindowID id);
+protected:
+ virtual void onAddTask(dcAsynchronousTask* task, dcAsynchronousTaskManager* manager);
+ virtual void onRemTask(dcAsynchronousTask* task, dcAsynchronousTaskManager* manager);
+
+ wxSizer* getScrollSizer();
+ wxScrolledWindow* scrolled;
+
+ typedef std::map<dcAsynchronousTask*, dcAsyncTaskWorkBarItem*> PanelMap;
+ PanelMap map;
+};
+
+/**
+ * Asynchronous task list item.
+ */
+class dcAsyncTaskWorkBarItem : public wxPanel, protected dcAsynchronousTask::Listener
+{
+ DECLARE_DYNAMIC_CLASS(dcAsyncTaskWorkBarItem)
+ DECLARE_EVENT_TABLE()
+public:
+ dcAsyncTaskWorkBarItem();
+ dcAsyncTaskWorkBarItem(dcAsynchronousTask* task, wxWindow* parent, wxWindowID id);
+ bool Create(dcAsynchronousTask* task, wxWindow* parent, wxWindowID id);
+
+protected:
+ virtual void onNameChange(const wxString& title, dcAsynchronousTask* task);
+ virtual void onCommentChange(const wxString& comment, dcAsynchronousTask* task);
+ virtual void onMinChange(int min, dcAsynchronousTask* task);
+ virtual void onMaxChange(int max, dcAsynchronousTask* task);
+ virtual void onPosChange(int pos, dcAsynchronousTask* task);
+ virtual void onStateChange(dcTask::State state, dcAsynchronousTask* task);
+
+ void set(int min, int max, int pos);
+
+ dcAsynchronousTask *task;
+ wxStaticText *title, *comment;
+ wxGauge *progress;
+ wxButton *cancel, *close;
+ int min, max, pos;
+
+ wxColour col;
+
+ static wxColour mixColour(const wxColour& col1, int ratio1, const wxColour& col2, int ratio2);
+private:
+ void onClose(wxCommandEvent& event);
+};
+
+
+/**
+ * dcTaskModule
+ */
+class dcTaskModule: public wxModule
+{
+ DECLARE_DYNAMIC_CLASS(dcTaskModule)
+public:
+ dcTaskModule();
+ virtual bool OnInit();
+ virtual void OnExit();
+};
+
+#endif // _TASK_HPP_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Emilien K. <cur...@us...> - 2005-10-17 19:25:42
|
Update of /cvsroot/wxdevcenter/StdPlugin/plugins/StdPlugin.Bitmap In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1759/plugins/StdPlugin.Bitmap Modified Files: plugin.xml Log Message: Fix plugin names. Index: plugin.xml =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/plugins/StdPlugin.Bitmap/plugin.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** plugin.xml 11 Aug 2005 14:44:27 -0000 1.1 --- plugin.xml 17 Oct 2005 19:25:33 -0000 1.2 *************** *** 7,11 **** <requires> ! <module name="Bitmap-0.3.0" /> </requires> --- 7,11 ---- <requires> ! <dynlib name="Bitmap-0.3.0" /> </requires> |
|
From: Emilien K. <cur...@us...> - 2005-10-17 19:25:42
|
Update of /cvsroot/wxdevcenter/StdPlugin/plugins/StdPlugin.Text In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1759/plugins/StdPlugin.Text Modified Files: plugin.xml Log Message: Fix plugin names. Index: plugin.xml =================================================================== RCS file: /cvsroot/wxdevcenter/StdPlugin/plugins/StdPlugin.Text/plugin.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** plugin.xml 11 Aug 2005 14:44:27 -0000 1.1 --- plugin.xml 17 Oct 2005 19:25:34 -0000 1.2 *************** *** 7,11 **** <requires> ! <module name="Text-0.3.0" /> </requires> --- 7,11 ---- <requires> ! <dynlib name="Text-0.3.0" /> </requires> |
|
From: Emilien K. <cur...@us...> - 2005-10-15 16:54:55
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29482/include/wxDevCenter Modified Files: language.h Log Message: Fix a lack of version increment. Index: language.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/language.h,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** language.h 11 Oct 2005 19:54:24 -0000 1.11 --- language.h 15 Oct 2005 16:54:44 -0000 1.12 *************** *** 37,41 **** #define WXDC_NAME "wxDevCenter" ! #define WXDC_VERSION "0.1.x - developpment version" #define WXDC_URL "http://www.arcallians.org" #define WXDC_ARCALLIANS "Arcallians" --- 37,41 ---- #define WXDC_NAME "wxDevCenter" ! #define WXDC_VERSION "0.3.x - developpment version" #define WXDC_URL "http://www.arcallians.org" #define WXDC_ARCALLIANS "Arcallians" |
|
From: Emilien K. <cur...@us...> - 2005-10-15 16:24:12
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24539/include/wxDevCenter Modified Files: Plugin.h Element.h Log Message: Rewrite of plugin management/loading system. Index: Element.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Element.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Element.h 11 Oct 2005 19:54:24 -0000 1.4 --- Element.h 15 Oct 2005 16:24:04 -0000 1.5 *************** *** 92,96 **** namespace plugins { ! class DynLibRefData; } --- 92,96 ---- namespace plugins { ! class DynLib; } *************** *** 101,105 **** class WXDC_DLL_BASE Element { ! friend class plugins::DynLibRefData; DECLARE_CLASS(Element) private: --- 101,105 ---- class WXDC_DLL_BASE Element { ! friend class plugins::DynLib; DECLARE_CLASS(Element) private: Index: Plugin.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/Plugin.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Plugin.h 11 Oct 2005 19:54:24 -0000 1.6 --- Plugin.h 15 Oct 2005 16:24:04 -0000 1.7 *************** *** 28,31 **** --- 28,61 ---- + /** @page Plugins Gestion des extensions. + * @section plugins_intro Introduction. + * Le wxDevCenter est base sur un système d'extensions avec dépendances à trois niveaux : + * - Les Groupes de fonctions (features). + * - Les gréffons (plugins). + * - Les bibliothèques dynamiques (dynlibs). + * Chacun des éléments de chaque niveau peut être lié à des élément du même niveau ou du niveau inférieur + * (Une feature peut etre liée à d'autres features et à des plugins mais pas directement au dynlibs). + * + * @section plugins_loading Processus de chargement. + * @subsection plugins_loading_preload Préchargement des features et des plugins. + * Avant tout utilisation des plugins, il est nécessaire de précharger les descripteurs de features et de plugins + * (respectivement feature.xml et plugin.xml) pour initialiser la tables d'extensions et éviter tout problème de dépendance + * ou de surcharge de fonction. + * + * De plus, le gestionnaire de configuration permettant de surcharger les chemins d'accès, si deux descripteurs identiques sont trouvés + * en deux emplacements différents, seul le dernier chemin de configuration est conservé. + * L'identité des extensions sont fait par identifiant (et non le nom) ansi que par le numéro de version. + * + * Une fois toutes les descriptions chargées et nettoyées, + * la table des dynlibs est remplies avec les identifiants des dynlibs. + * Ces identifiants sont de la forme "nomduplugin/nomdeladynlib" le nom de la dynlib pouvant être décorée d'un numéro de version + * mais sans aucune décoration d'extension (.dll/.so ou un préfixe lib). + * + * @subsection plugins_loading_load Chargement des features, des plugins et des dynlibs. + * Les features, les plugins et les dynlibs étant prédéclarés, un chargement récursif est effectué. + * + **/ + + #ifndef __WXDEVCENTER_PLUGIN #define __WXDEVCENTER_PLUGIN *************** *** 105,108 **** --- 135,139 ---- Version& operator=(wxString str) { + str.Trim(false).Trim(true); wxString s; long l; *************** *** 132,189 **** ! /** Descriptif de module. ! * Objet référençable des modules.*/ ! class WXDC_DLL_BASE DynLibRefData : public wxObjectRefData { ! friend class DynLib; ! protected: ! /** Flag d'état du module.*/ ! unsigned short m_flagState; ! ! /** Chemin du module.*/ ! wxString m_strPath; ! ! /** Objet wx accédant à la dll/so.*/ ! wxDynamicLibrary m_DLL; ! ! /** Gestionnaire des éléments de plugins enregistrés.*/ ! BaseElementManager m_Elements; public: ! DynLibRefData(); ! virtual ~DynLibRefData(); ! ! /** Débugage : Dump du contenu. */ ! wxDEBUG_CODE(wxString Dump();) ! ! /** Charge le module. ! * @param strLongName Nom long du module. ! * @return Vrai si chargement réussi.*/ ! bool Load(wxString strLongName); ! /** Teste si le module est chargé. ! * @return Vrai si le module est chargé.*/ ! bool IsLoaded()const{return m_DLL.IsLoaded();} ! /** Teste si le module est initialisé. ! * @return Vrai si le module est initialisé.*/ ! bool IsInitialized()const{return (m_flagState&Initialized)!=0;} ! ! /** Décharge le module.*/ ! bool Unload(); ! /** Initialise le contenu du module.*/ ! bool Initialize(); ! /** Finalise le contenu du module.*/ ! bool Finalize(); ! ! /** Drapeaux d'états du module.*/ ! enum DynLibState ! { ! Initial = 0x0000, ! Registered = 0x0001, ! Loaded = 0x0002, ! Initialized = 0x0004, ! Error = 0xFFFF ! }; ! }; /** Classe de description d'un module. * Un module est une dll/so qui contient des objets enregistrables. --- 163,193 ---- ! /** Structure représentant une condition sur les versions.*/ ! class WXDC_DLL_BASE VersionCondition { ! struct AtomVersionCondition ! { ! enum AtomVersionConditionOperator ! { ! AVCO_EGUAL, ! AVCO_DIFF, ! AVCO_SUPEGUAL, ! AVCO_SUP, ! AVCO_INFEGUAL, ! AVCO_INF ! }oper; ! Version ver; ! AtomVersionCondition* pNext; ! }; ! AtomVersionCondition* m_pFirst; public: ! VersionCondition():m_pFirst(NULL){} ! VersionCondition(wxString str):m_pFirst(NULL){Set(str);} ! void Set(wxString str); ! wxString Get()const; ! bool Test(Version ver)const; }; + /** Classe de description d'un module. * Un module est une dll/so qui contient des objets enregistrables. *************** *** 194,207 **** DECLARE_CLASS(DynLib) protected: ! /** Accesseur sur la référence de module.*/ ! DynLibRefData* GetDynLibRef()const {return (DynLibRefData*) GetRefData();} ! // create a new m_refData ! virtual wxObjectRefData *CreateRefData() const{return new DynLibRefData;} public: /** Constructeur.*/ ! DynLib(); ! /** Constructeur.*/ ! DynLib(const DynLib& module):wxObject(){Ref(module);} /** Débugage : Dump du contenu. */ --- 198,220 ---- DECLARE_CLASS(DynLib) protected: ! // Identifier. (pluginname/dynlibname) ! wxString m_strID; ! ! /** Flag d'état du module.*/ ! unsigned short m_flagState; ! ! /** Chemin du module.*/ ! wxString m_strPath; + /** Objet wx accédant à la dll/so.*/ + wxDynamicLibrary* m_pDLL; + + /** Gestionnaire des éléments de plugins enregistrés.*/ + BaseElementManager m_Elements; public: /** Constructeur.*/ ! DynLib(wxString strDynLib=wxT("")); ! /** Destructeur.*/ ! ~DynLib(); /** Débugage : Dump du contenu. */ *************** *** 215,223 **** /** Retourne le nom de la dynlib.*/ wxString GetName(); /** Charge le module et enregistre son contenu. - * @param strLongName Nom long du module. * @return Vrai si chargement réussi.*/ ! bool Load(wxString strLongName); /** Décharge le module.*/ bool Unload(); --- 228,237 ---- /** Retourne le nom de la dynlib.*/ wxString GetName(); + /** Retourne l'identifiant de la dynlib.*/ + wxString GetID()const{return m_strID;} /** Charge le module et enregistre son contenu. * @return Vrai si chargement réussi.*/ ! bool Load(); /** Décharge le module.*/ bool Unload(); *************** *** 227,231 **** bool Finalize(); ! }; --- 241,253 ---- bool Finalize(); ! /** Drapeaux d'états du module.*/ ! enum DynLibState ! { ! Initial = 0x0000, ! Registered = 0x0001, ! Loaded = 0x0002, ! Initialized = 0x0004, ! Error = 0xFFFF ! }; }; *************** *** 257,260 **** --- 279,287 ---- unsigned short m_Status; + /** Identifiant de la fonctionnalité.*/ + wxString m_strID; + /** Version de la fonctionnalité.*/ + Version m_Version; + /** Nom de la fonctionnalité.*/ wxString m_strName; *************** *** 263,268 **** /** Description de la fonctionnalité.*/ wxString m_strDescript; - /** Version de la fonctionnalité.*/ - Version m_Version; /** Auteur du plugin.*/ wxString m_strAuthor; --- 290,293 ---- *************** *** 298,317 **** wxString GetDescriptorFilePath()const{return m_strDescriptFilePath;} /** Acces sur le nom.*/ wxString GetName()const{return m_strName;} /** Acces sur la description.*/ wxString GetDescript()const{return m_strDescript;} - /** Acces sur la version.*/ - Version GetVersion()const{return m_Version;} /** Teste si le plugin peut être chargé.*/ bool CheckValidity(); /** Précharge la description du plugin. ! * @param strName Nom du plugin * @return Faux si le plugin est mal décrit.*/ ! bool PreLoad(wxString strName); ! /** Charge le plugin. ! * @param strName Nom du plugin.*/ ! bool Load(wxString strName); /** Décharge le plugin.*/ bool Unload(); --- 323,344 ---- wxString GetDescriptorFilePath()const{return m_strDescriptFilePath;} + /** Acces sur l'ID.*/ + wxString GetID()const{return m_strID;} + /** Acces sur la version.*/ + Version GetVersion()const{return m_Version;} + /** Acces sur le nom.*/ wxString GetName()const{return m_strName;} /** Acces sur la description.*/ wxString GetDescript()const{return m_strDescript;} /** Teste si le plugin peut être chargé.*/ bool CheckValidity(); /** Précharge la description du plugin. ! * @param strPath Chemin du plugin * @return Faux si le plugin est mal décrit.*/ ! bool PreLoad(wxString strPath); ! /** Charge le plugin.*/ ! bool Load(); /** Décharge le plugin.*/ bool Unload(); *************** *** 343,347 **** ErrDescript = 0x0200, WarningMask = 0x00F0, ! ErrFlag = 0x0F00 }; protected: --- 370,374 ---- ErrDescript = 0x0200, WarningMask = 0x00F0, ! ErrMask = 0x0F00 }; protected: *************** *** 351,362 **** unsigned short m_Status; ! /** Nom de la fonctionnalité.*/ ! wxString m_strName; /** Chemin du fichier de description.*/ wxString m_strDescriptFilePath; /** Description de la fonctionnalité.*/ wxString m_strDescript; - /** Version de la fonctionnalité.*/ - Version m_Version; /** Auteur de la fonctionnalité.*/ wxString m_strAuthor; --- 378,395 ---- unsigned short m_Status; ! /** Identifiant de la fonctionnalité.*/ ! wxString m_strID; ! /** Version de la fonctionnalité.*/ ! Version m_Version; ! ! /** Chemin de base du contenu.*/ ! wxString m_strBasePath; /** Chemin du fichier de description.*/ wxString m_strDescriptFilePath; + + /** Nom de la fonctionnalité.*/ + wxString m_strName; /** Description de la fonctionnalité.*/ wxString m_strDescript; /** Auteur de la fonctionnalité.*/ wxString m_strAuthor; *************** *** 386,392 **** bool CheckValidity(); /** Précharge la description de la fonctionnalité. ! * @param strName Nom de la fonctionnalité. * @return Faux si la fonctionnalité est mal décrite.*/ ! bool PreLoad(wxString strName); /** Teste si la fonctionnalité est chargée.*/ bool IsLoaded()const; --- 419,425 ---- bool CheckValidity(); /** Précharge la description de la fonctionnalité. ! * @param strPath Chemin de la fonctionnalité. * @return Faux si la fonctionnalité est mal décrite.*/ ! bool PreLoad(wxString strPath); /** Teste si la fonctionnalité est chargée.*/ bool IsLoaded()const; *************** *** 395,400 **** bool IsInitialized()const{return (m_Status&Initialized)!=0;} /** Charge la fonctionnalité. ! * @param strName Nom de la fonctionnalité.*/ ! bool Load(wxString strName); /** Décharge la fonctionnalité.*/ bool Unload(); --- 428,433 ---- bool IsInitialized()const{return (m_Status&Initialized)!=0;} /** Charge la fonctionnalité. ! */ ! bool Load(); /** Décharge la fonctionnalité.*/ bool Unload(); *************** *** 404,413 **** bool Finalize(); /** Acces sur le nom.*/ wxString GetName()const{return m_strName;} /** Acces sur la description.*/ wxString GetDescript()const{return m_strDescript;} - /** Acces sur la version.*/ - Version GetVersion()const{return m_Version;} /** Fixe le chemin du fichier de description.*/ --- 437,449 ---- bool Finalize(); + /** Acces sur l'ID.*/ + wxString GetID()const{return m_strID;} + /** Acces sur la version.*/ + Version GetVersion()const{return m_Version;} + /** Acces sur le nom.*/ wxString GetName()const{return m_strName;} /** Acces sur la description.*/ wxString GetDescript()const{return m_strDescript;} /** Fixe le chemin du fichier de description.*/ *************** *** 428,436 **** }; ! WX_DECLARE_STRING_HASH_MAP_WITH_DECL(Feature, FeatureMap, class WXDC_DLL_BASE); ! WX_DECLARE_STRING_HASH_MAP_WITH_DECL(Plugin, PluginMap, class WXDC_DLL_BASE); ! WX_DECLARE_STRING_HASH_MAP_WITH_DECL(DynLib, DynLibMap, class WXDC_DLL_BASE); /** Chargeur de plugins avec prise en charge des fonctionnalités. --- 464,494 ---- }; + /** + * Feature descriptor direct container. + */ + class FeatureManager : public Vector<Feature> + { + public: + void Register(const Feature& feature){Add(feature);} + }; ! /** ! * Plugin descriptor direct container. ! */ ! class PluginManager : public Vector<Plugin> ! { ! public: ! void Register(const Plugin& plugin){Add(plugin);} ! ! }; + /** + * DynLib descriptor direct container. + */ + class DynLibManager : public Vector<DynLib> + { + public: + void Register(const DynLib& dynlib){Add(dynlib);} + }; /** Chargeur de plugins avec prise en charge des fonctionnalités. *************** *** 440,446 **** DECLARE_CLASS(PluginLoader) protected: ! FeatureMap m_FeatureMap; /**> Fonctionnalité indéxé par son nom.*/ ! PluginMap m_PluginMap; /**> Plugin indexé par son nom.*/ ! DynLibMap m_DynLibMap; /**> DynLib indexé par son chemin.*/ static PluginLoader s_PluginManager; --- 498,504 ---- DECLARE_CLASS(PluginLoader) protected: ! FeatureManager m_FeatureManager; ! PluginManager m_PluginManager; ! DynLibManager m_DynLibManager; static PluginLoader s_PluginManager; *************** *** 458,521 **** /** Accesseur sur une feature.*/ ! Feature* GetFeature(wxString strFeature); /** Accesseur sur un plugin.*/ ! Plugin* GetPlugin(wxString strPlugin); /** Accesseur sur une dynlib.*/ ! DynLib* GetDynLib(wxString strDynLib); /** Charge tous les plugins.*/ bool Load(); ! /** Charge un module à l'adresse spécifiée. ! * @param strPath Adrese du module. ! * @return Adresse du descripteur de module associé si chargé et NULL sinon..*/ ! DynLib* LoadDynLib(wxString strPath); ! ! /** Précharge la description des fonctionnalités et des plugins.*/ void PreLoadDescription(); ! /** Débugage : Dump du contenu. */ ! wxDEBUG_CODE(wxString Dump();) ! /** Précharge la description d'une fonctionnalité. ! * Le fichier "feature.xml" est parsé et analysé. ! * @param strName Nom de la fonctionnalité. ! * @return Adresse du descripteur de fonctionnalité si chargé, NULL sinon.*/ ! Feature* PreLoadFeature(wxString strName); ! /** Précharge la description d'un plugin. ! * Le fichier "plugin.xml" est parsé et analysé. ! * @param strName Nom du plugin. ! * @return Adrese du descripteur des plugins si chargé, NULL sinon.*/ ! Plugin* PreLoadPlugin(wxString strName); /** Charge un plugin ainsi que toutes ses dépendances. ! * Le plugin est recherché uniquement dans le répertoire des plugins. ! * @param strName Nom du plugin. * @return Adrese du descripteur des plugins si chargé, NULL sinon.*/ ! Plugin* LoadPlugin(wxString strName); /** Charge une fonctionnalité. ! * La fonctionnalité est recherchée uniquement dans le répertoire des fonctionnalité. ! * @param strName Nom de la fonctionnalité. * @return Adresse du descripteur de fonctionnalité si chargé, NULL sinon.*/ ! Feature* LoadFeature(wxString strName); - /** Initialise un plugin ainsi que toutes ses dépendances. - * @param strName Nom du plugin. - * @return Vrai si le plugin est correctement initialisé. - */ - bool InitializePlugin(wxString strName); /** Initialise une fonctionnalité. ! * @param strName Nom de la fonctionnalité. * @return Vrai si la fonctionnalité est correctement initialisé. */ ! bool InitializeFeature(wxString strName); /** Initialise un module. ! * @param strName Nom du module. * @return Vrai si le module est correctement initialisé. */ ! bool InitializeDynLib(wxString strName); /** Initialise le contenu chargé. --- 516,573 ---- /** Accesseur sur une feature.*/ ! Feature* GetFeature(wxString strID, wxString strVer=wxT("")); /** Accesseur sur un plugin.*/ ! Plugin* GetPlugin(wxString strID, wxString strVer=wxT("")); /** Accesseur sur une dynlib.*/ ! DynLib* GetDynLib(wxString strName); /** Charge tous les plugins.*/ bool Load(); ! /** Précharge la description des fonctionnalités et des plugins. ! * Résoud la surcharge des descriptions.*/ void PreLoadDescription(); ! /** Resoud les conflits de versions. ! * Désactives les versions non exploitées. ! */ ! void ResolveVersions(); + /** Remplit la table des dynlibs.*/ + void FillDynLibManager(); ! /** Débugage : Dump du contenu. */ ! wxDEBUG_CODE(wxString Dump();) ! /** Charge un module. ! * @param lIndex Index du module. ! * @return Adresse du descripteur de module associé si chargé et NULL sinon..*/ ! DynLib* LoadDynLib(unsigned long lIndex); /** Charge un plugin ainsi que toutes ses dépendances. ! * @param lIndex Index du plugin. * @return Adrese du descripteur des plugins si chargé, NULL sinon.*/ ! Plugin* LoadPlugin(unsigned long lIndex); /** Charge une fonctionnalité. ! * @param lIndex Index de la fonctionnalité. * @return Adresse du descripteur de fonctionnalité si chargé, NULL sinon.*/ ! Feature* LoadFeature(unsigned long lIndex); /** Initialise une fonctionnalité. ! * @param lIndex Index de la fonctionnalité. * @return Vrai si la fonctionnalité est correctement initialisé. */ ! bool InitializeFeature(unsigned long lIndex); ! /** Initialise un plugin ainsi que toutes ses dépendances. ! * @param lIndex Index du plugin. ! * @return Vrai si le plugin est correctement initialisé. ! */ ! bool InitializePlugin(unsigned long lIndex); /** Initialise un module. ! * @param lIndex Index du module. * @return Vrai si le module est correctement initialisé. */ ! bool InitializeDynLib(unsigned long lIndex); /** Initialise le contenu chargé. |
|
From: Emilien K. <cur...@us...> - 2005-10-15 16:24:11
|
Update of /cvsroot/wxdevcenter/wxDevCenter/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24539/src Modified Files: Plugin.cpp Log Message: Rewrite of plugin management/loading system. Index: Plugin.cpp =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/src/Plugin.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Plugin.cpp 11 Oct 2005 19:54:24 -0000 1.12 --- Plugin.cpp 15 Oct 2005 16:24:04 -0000 1.13 *************** *** 32,143 **** #include <wx/file.h> #include <wx/dir.h> /** ! * Implémentation de la classe wxDevCenter::plugins::ModuleRefData. */ ! DynLibRefData::DynLibRefData(): ! wxObjectRefData(), ! m_flagState(Initial), [...1408 lines suppressed...] void PluginLoader::Initialize() { + unsigned long l; wxString str; wxLogDebug("Initializing ..."); ! wxLogDebug("Initialize features :"); ! for(l=0; l<m_FeatureManager.GetCount(); l++) ! InitializeFeature(l); ! wxLogDebug("Initialize plugins :"); ! for(l=0; l<m_PluginManager.GetCount(); l++) ! InitializePlugin(l); ! wxLogDebug("Initialize dynlibs :"); ! for(l=0; l<m_DynLibManager.GetCount(); l++) ! InitializeDynLib(l); } |
|
From: Andreas T. <cor...@us...> - 2005-10-12 10:40:27
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3020/build/bakefiles Modified Files: install.bkl Log Message: Fix .desktop filename at install. Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles/install.bkl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** install.bkl 12 Oct 2005 10:36:32 -0000 1.5 --- install.bkl 12 Oct 2005 10:40:10 -0000 1.6 *************** *** 87,91 **** <srcdir>data</srcdir> <install-to>$(DATADIR)/applications</install-to> ! <files>$wxdevcenter.desktop</files> </data-files> --- 87,91 ---- <srcdir>data</srcdir> <install-to>$(DATADIR)/applications</install-to> ! <files>wxdevcenter.desktop</files> </data-files> |
|
From: Andreas T. <cor...@us...> - 2005-10-12 10:40:27
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3020 Modified Files: GNUmakefile Log Message: Fix .desktop filename at install. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** GNUmakefile 12 Oct 2005 10:36:32 -0000 1.15 --- GNUmakefile 12 Oct 2005 10:40:10 -0000 1.16 *************** *** 199,203 **** done $(INSTALL) -d $(prefix)/share/applications ! (cd data/ ; $(INSTALL) -m 644 $wxdevcenter.desktop $(prefix)/share/applications) $(INSTALL) -d $(prefix)/share/pixmaps (cd data/icons/ ; $(INSTALL) -m 644 wxDevCenter.png $(prefix)/share/pixmaps) --- 199,203 ---- done $(INSTALL) -d $(prefix)/share/applications ! (cd data/ ; $(INSTALL) -m 644 wxdevcenter.desktop $(prefix)/share/applications) $(INSTALL) -d $(prefix)/share/pixmaps (cd data/icons/ ; $(INSTALL) -m 644 wxDevCenter.png $(prefix)/share/pixmaps) |
|
From: Andreas T. <cor...@us...> - 2005-10-12 10:36:41
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2389/build/bakefiles Modified Files: install.bkl Log Message: Fix path for features/wxDC/feature.xml Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles/install.bkl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** install.bkl 12 Oct 2005 10:31:09 -0000 1.4 --- install.bkl 12 Oct 2005 10:36:32 -0000 1.5 *************** *** 80,84 **** <install-to>$(DATADIR)/wxDevCenter/features</install-to> <files> ! wxdc/feature.xml </files> </data-files-tree> --- 80,84 ---- <install-to>$(DATADIR)/wxDevCenter/features</install-to> <files> ! wxDC/feature.xml </files> </data-files-tree> |
|
From: Andreas T. <cor...@us...> - 2005-10-12 10:36:41
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2389 Modified Files: GNUmakefile Log Message: Fix path for features/wxDC/feature.xml Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** GNUmakefile 12 Oct 2005 10:31:09 -0000 1.14 --- GNUmakefile 12 Oct 2005 10:36:32 -0000 1.15 *************** *** 192,196 **** done $(INSTALL) -d $(prefix)/share/wxDevCenter/features ! for f in wxdc/feature.xml; do \ if test ! -d $(prefix)/share/wxDevCenter/features/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/features/`dirname $$f`; \ --- 192,196 ---- done $(INSTALL) -d $(prefix)/share/wxDevCenter/features ! for f in wxDC/feature.xml; do \ if test ! -d $(prefix)/share/wxDevCenter/features/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/features/`dirname $$f`; \ |
|
From: Andreas T. <cor...@us...> - 2005-10-12 10:31:18
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1404 Modified Files: GNUmakefile Log Message: Fix wxWidgets.png in install. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** GNUmakefile 11 Oct 2005 19:59:35 -0000 1.13 --- GNUmakefile 12 Oct 2005 10:31:09 -0000 1.14 *************** *** 1,5 **** # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.9 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= --- 1,5 ---- # ========================================================================= # This makefile was generated by ! # Bakefile 0.1.8 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= *************** *** 66,70 **** ./build/$(BUILD)/wxDevCenterLib_Command.o \ ./build/$(BUILD)/wxDevCenterLib_Config.o \ ! ./build/$(BUILD)/wxDevCenterLib_Config_unix.o \ ./build/$(BUILD)/wxDevCenterLib_DocManager.o \ ./build/$(BUILD)/wxDevCenterLib_DocType.o \ --- 66,70 ---- ./build/$(BUILD)/wxDevCenterLib_Command.o \ ./build/$(BUILD)/wxDevCenterLib_Config.o \ ! ./build/$(BUILD)/wxDevCenterLib_Config-unix.o \ ./build/$(BUILD)/wxDevCenterLib_DocManager.o \ ./build/$(BUILD)/wxDevCenterLib_DocType.o \ *************** *** 97,101 **** $(CXXFLAGS) WXDC.FS.UNIX_OBJECTS = \ ! ./build/$(BUILD)/wxdc.fs.unix_FileSystemStandard_unix.o WXDC.UI.FRAMES_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) \ $(__UNICODE_DEFINE_p) $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) \ --- 97,101 ---- $(CXXFLAGS) WXDC.FS.UNIX_OBJECTS = \ ! ./build/$(BUILD)/wxdc.fs.unix_FileSystemStandard-unix.o WXDC.UI.FRAMES_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) \ $(__UNICODE_DEFINE_p) $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) \ *************** *** 185,189 **** done $(INSTALL) -d $(prefix)/share/wxDevCenter/data ! for f in icons/cd-dvd.ico icons/computer.ico icons/desktop.ico icons/dir.ico icons/docs.ico icons/floppy.ico icons/harddrive.ico icons/icon-big.ico icons/icon-list.ico icons/icon-report.ico icons/none.ico icons/Progs.ico icons/ramdisk.ico icons/remote.ico icons/removeable.ico icons/shortcut.ico icons/unknow.ico icons/wxDevCenter.ico icons/wx.png icons/wxDevCenter.png icons/dynlib.png icons/dynlibs.png icons/feature.png icons/features.png icons/plugin.png icons/plugins.png icons/pluginfs.png; do \ if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \ --- 185,189 ---- done $(INSTALL) -d $(prefix)/share/wxDevCenter/data ! for f in icons/cd-dvd.ico icons/computer.ico icons/desktop.ico icons/dir.ico icons/docs.ico icons/floppy.ico icons/harddrive.ico icons/icon-big.ico icons/icon-list.ico icons/icon-report.ico icons/none.ico icons/Progs.ico icons/ramdisk.ico icons/remote.ico icons/removeable.ico icons/shortcut.ico icons/unknow.ico icons/wxDevCenter.ico icons/wxWidgets.png icons/wxDevCenter.png icons/dynlib.png icons/dynlibs.png icons/feature.png icons/features.png icons/plugin.png icons/plugins.png icons/pluginfs.png; do \ if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \ *************** *** 262,266 **** $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/wxDevCenterLib_Config_unix.o: ./src/unix/Config-unix.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< --- 262,266 ---- $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/wxDevCenterLib_Config-unix.o: ./src/unix/Config-unix.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 328,332 **** $(CXX) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/wxdc.fs.unix_FileSystemStandard_unix.o: ./src/unix/FileSystemStandard-unix.cpp $(CXX) -c -o $@ $(WXDC.FS.UNIX_CXXFLAGS) $(CPPDEPS) $< --- 328,332 ---- $(CXX) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/wxdc.fs.unix_FileSystemStandard-unix.o: ./src/unix/FileSystemStandard-unix.cpp $(CXX) -c -o $@ $(WXDC.FS.UNIX_CXXFLAGS) $(CPPDEPS) $< |
|
From: Andreas T. <cor...@us...> - 2005-10-12 10:31:17
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1404/build/bakefiles Modified Files: install.bkl Log Message: Fix wxWidgets.png in install. Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles/install.bkl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** install.bkl 11 Oct 2005 19:59:35 -0000 1.3 --- install.bkl 12 Oct 2005 10:31:09 -0000 1.4 *************** *** 62,66 **** icons/wxDevCenter.ico ! icons/wx.png icons/wxDevCenter.png --- 62,66 ---- icons/wxDevCenter.ico ! icons/wxWidgets.png icons/wxDevCenter.png |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:59:43
|
Update of /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31104/build/bakefiles Modified Files: install.bkl Log Message: Add PluginFileSystem icons. Index: install.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/build/bakefiles/install.bkl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** install.bkl 11 Oct 2005 19:54:24 -0000 1.2 --- install.bkl 11 Oct 2005 19:59:35 -0000 1.3 *************** *** 60,66 **** --- 60,75 ---- icons/shortcut.ico icons/unknow.ico + icons/wxDevCenter.ico icons/wx.png icons/wxDevCenter.png + + icons/dynlib.png + icons/dynlibs.png + icons/feature.png + icons/features.png + icons/plugin.png + icons/plugins.png + icons/pluginfs.png </files> </data-files-tree> |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:59:43
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31104 Modified Files: GNUmakefile Log Message: Add PluginFileSystem icons. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** GNUmakefile 11 Oct 2005 19:54:24 -0000 1.12 --- GNUmakefile 11 Oct 2005 19:59:35 -0000 1.13 *************** *** 185,189 **** done $(INSTALL) -d $(prefix)/share/wxDevCenter/data ! for f in icons/cd-dvd.ico icons/computer.ico icons/desktop.ico icons/dir.ico icons/docs.ico icons/floppy.ico icons/harddrive.ico icons/icon-big.ico icons/icon-list.ico icons/icon-report.ico icons/none.ico icons/Progs.ico icons/ramdisk.ico icons/remote.ico icons/removeable.ico icons/shortcut.ico icons/unknow.ico icons/wxDevCenter.ico icons/wx.png icons/wxDevCenter.png; do \ if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \ --- 185,189 ---- done $(INSTALL) -d $(prefix)/share/wxDevCenter/data ! for f in icons/cd-dvd.ico icons/computer.ico icons/desktop.ico icons/dir.ico icons/docs.ico icons/floppy.ico icons/harddrive.ico icons/icon-big.ico icons/icon-list.ico icons/icon-report.ico icons/none.ico icons/Progs.ico icons/ramdisk.ico icons/remote.ico icons/removeable.ico icons/shortcut.ico icons/unknow.ico icons/wxDevCenter.ico icons/wx.png icons/wxDevCenter.png icons/dynlib.png icons/dynlibs.png icons/feature.png icons/features.png icons/plugin.png icons/plugins.png icons/pluginfs.png; do \ if test ! -d $(prefix)/share/wxDevCenter/data/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/share/wxDevCenter/data/`dirname $$f`; \ |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:59:42
|
Update of /cvsroot/wxdevcenter/wxDevCenter/data/icons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31104/data/icons Added Files: dynlib.png plugins.png feature.png pluginfs.png plugin.png features.png dynlibs.png Log Message: Add PluginFileSystem icons. --- NEW FILE: dynlibs.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: feature.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: plugin.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dynlib.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: pluginfs.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: plugins.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: features.png --- (This appears to be a binary file; contents omitted.) |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:56:32
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30264 Removed Files: wx.bkl Log Message: Remove. --- wx.bkl DELETED --- |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:54:37
|
Update of /cvsroot/wxdevcenter/wxDevCenter/plugins/wxdc.fs.msw In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659/plugins/wxdc.fs.msw Added Files: plugin.xml Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. --- NEW FILE: plugin.xml --- <?xml version="1.0" encoding="UTF-8"?> <plugin id="wxdc.fs.msw" version="0.3.0" label="wxdc.fs.msw" provider-name="Arcallians"> <description>wxDevCenter base plugin for MS Windows FileSystem</description> <copyright>Notes</copyright> <license>Licence</license> <requires> <dynlib name="wxdc_fs_msw-0.3.0" /> </requires> </plugin> |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:54:37
|
Update of /cvsroot/wxdevcenter/wxDevCenter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659 Modified Files: wxDevCenter.bkl GNUmakefile Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. Index: GNUmakefile =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/GNUmakefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** GNUmakefile 14 Sep 2005 14:19:11 -0000 1.11 --- GNUmakefile 11 Oct 2005 19:54:24 -0000 1.12 *************** *** 17,26 **** prefix = /usr/local - # - AR = ar - - # - RANLIB = ranlib - # C++ compiler CXX = g++ --- 17,20 ---- *************** *** 50,53 **** --- 44,50 ---- WXPORTNAME = gtk2 + # Version of installed wxDockIt. [21] + WXDOCKIT = 21 + *************** *** 59,73 **** CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD - SPECIFIC_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) $(__UNICODE_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) $(__WXUSINGDLL_p) \ - `wx-config --cppflags` -Iinclude -DwxDC_INSTALL_TARGET=\"$(prefix)\" \ - $(CPPFLAGS) $(CXXFLAGS) - SPECIFIC_OBJECTS = \ - ./build/$(BUILD)/specific_Config.o \ - ./build/$(BUILD)/specific_FileSystemStandard.o WXDEVCENTERLIB_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) \ $(__UNICODE_DEFINE_p) $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) \ ! $(__WXUSINGDLL_p) `wx-config --cppflags` -Iinclude -fPIC -DPIC $(CPPFLAGS) \ ! $(CXXFLAGS) WXDEVCENTERLIB_OBJECTS = \ ./build/$(BUILD)/wxDevCenterLib_AboutBox.o \ --- 56,63 ---- CPPDEPS = -MT$@ -MF`echo $@ | sed -e 's,\.o$$,.d,'` -MD WXDEVCENTERLIB_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) \ $(__UNICODE_DEFINE_p) $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) \ ! $(__WXUSINGDLL_p) `wx-config --cppflags` -Iinclude \ ! -DwxDC_INSTALL_TARGET=\"$(prefix)\" -fPIC -DPIC $(CPPFLAGS) $(CXXFLAGS) WXDEVCENTERLIB_OBJECTS = \ ./build/$(BUILD)/wxDevCenterLib_AboutBox.o \ *************** *** 76,79 **** --- 66,70 ---- ./build/$(BUILD)/wxDevCenterLib_Command.o \ ./build/$(BUILD)/wxDevCenterLib_Config.o \ + ./build/$(BUILD)/wxDevCenterLib_Config_unix.o \ ./build/$(BUILD)/wxDevCenterLib_DocManager.o \ ./build/$(BUILD)/wxDevCenterLib_DocType.o \ *************** *** 88,96 **** ./build/$(BUILD)/wxDevCenterLib_Frame.o \ ./build/$(BUILD)/wxDevCenterLib_Layout.o \ - ./build/$(BUILD)/wxDevCenterLib_MainFrame.o \ ./build/$(BUILD)/wxDevCenterLib_Manager.o \ - ./build/$(BUILD)/wxDevCenterLib_MDIFrame.o \ ./build/$(BUILD)/wxDevCenterLib_MiniView.o \ ./build/$(BUILD)/wxDevCenterLib_Plugin.o \ ./build/$(BUILD)/wxDevCenterLib_Project.o \ ./build/$(BUILD)/wxDevCenterLib_StatusBar.o \ --- 79,86 ---- ./build/$(BUILD)/wxDevCenterLib_Frame.o \ ./build/$(BUILD)/wxDevCenterLib_Layout.o \ ./build/$(BUILD)/wxDevCenterLib_Manager.o \ ./build/$(BUILD)/wxDevCenterLib_MiniView.o \ ./build/$(BUILD)/wxDevCenterLib_Plugin.o \ + ./build/$(BUILD)/wxDevCenterLib_PluginFileSystem.o \ ./build/$(BUILD)/wxDevCenterLib_Project.o \ ./build/$(BUILD)/wxDevCenterLib_StatusBar.o \ *************** *** 102,112 **** WXDEVCENTER_OBJECTS = \ ./build/$(BUILD)/wxDevCenter_AppImpl.o ### Conditionally set variables: ### ifeq ($(BUILD),debug) - SUFFIX = D - endif - ifeq ($(BUILD),debug) ifeq ($(UNICODE),1) WXLIBPOSTFIX = ud --- 92,112 ---- WXDEVCENTER_OBJECTS = \ ./build/$(BUILD)/wxDevCenter_AppImpl.o + WXDC.FS.UNIX_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) \ + $(__UNICODE_DEFINE_p) $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) \ + $(__WXUSINGDLL_p) `wx-config --cppflags` -Iinclude -fPIC -DPIC $(CPPFLAGS) \ + $(CXXFLAGS) + WXDC.FS.UNIX_OBJECTS = \ + ./build/$(BUILD)/wxdc.fs.unix_FileSystemStandard_unix.o + WXDC.UI.FRAMES_CXXFLAGS = -D_THREAD_SAFE -pthread $(__WARNINGS) \ + $(__UNICODE_DEFINE_p) $(__DEBUG_DEFINE_p) $(__OPTIMIZEFLAG) $(__DEBUGINFO) \ + $(__WXUSINGDLL_p) `wx-config --cppflags` -Iinclude -fPIC -DPIC $(CPPFLAGS) \ + $(CXXFLAGS) + WXDC.UI.FRAMES_OBJECTS = \ + ./build/$(BUILD)/wxdc.ui.frames_MainFrame.o \ + ./build/$(BUILD)/wxdc.ui.frames_MDIFrame.o ### Conditionally set variables: ### ifeq ($(BUILD),debug) ifeq ($(UNICODE),1) WXLIBPOSTFIX = ud *************** *** 129,137 **** WXVERSIONTAG = 2.6 endif ! ifeq ($(BUILD),debug) ! FREEDESKTOP_MENU_FILE = wxdevcenterd.desktop ! endif ! ifeq ($(BUILD),release) ! FREEDESKTOP_MENU_FILE = wxdevcenter.desktop endif ifeq ($(BUILD),debug) --- 129,134 ---- WXVERSIONTAG = 2.6 endif ! ifeq ($(WXDOCKIT),21) ! WXDOCKIT_VERSION = 2.1 endif ifeq ($(BUILD),debug) *************** *** 170,178 **** ### Targets: ### ! all: ./lib/libspecific.a lib/libwxDevCenterLib.so ./bin/wxDevCenter$(SUFFIX) ! install: all install_wxDevCenterLib install_wxDevCenter $(INSTALL) -d $(prefix)/include ! for f in wxDevCenter.h wxDevCenterPlugin.h wxDevCenter/AboutBox.h wxDevCenter/Application.h wxDevCenter/ArtProvider.h wxDevCenter/Command.h wxDevCenter/Config.h wxDevCenter/DocView.h wxDevCenter/Element.h wxDevCenter/FileSystem.h wxDevCenter/FileSystemCtrl.h wxDevCenter/FileSystemListCtrl.h wxDevCenter/FileSystemTreeCtrl.h wxDevCenter/FileSystemStandard.h wxDevCenter/FileTools.h wxDevCenter/Frame.h wxDevCenter/language.h wxDevCenter/Layout.h wxDevCenter/MainFrame.h wxDevCenter/Manager.h wxDevCenter/MDIFrame.h wxDevCenter/Plugin.h wxDevCenter/Project.h wxDevCenter/setup.h wxDevCenter/StatusBar.h wxDevCenter/WorkBar.h wxDevCenter/unix/Config.h wxDevCenter/unix/FileSystemStandard.h; do \ if test ! -d $(prefix)/include/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/include/`dirname $$f`; \ --- 167,182 ---- ### Targets: ### ! all: lib/libwxDevCenterLib.so ./bin/wxDevCenter ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so ! install: all install_wxDevCenterLib install_wxDevCenter install_wxdc.fs.unix install_wxdc.ui.frames ! $(INSTALL) -d $(prefix)/share/wxDevCenter/plugins ! for f in wxdc.fs.msw/plugin.xml wxdc.fs.unix/plugin.xml wxdc.ui.frames/plugin.xml; do \ ! if test ! -d $(prefix)/share/wxDevCenter/plugins/`dirname $$f` ; then \ ! $(INSTALL) -d $(prefix)/share/wxDevCenter/plugins/`dirname $$f`; \ ! fi; \ ! $(INSTALL) -m 644 plugins//$$f $(prefix)/share/wxDevCenter/plugins/$$f; \ ! done $(INSTALL) -d $(prefix)/include ! for f in wxDevCenter.h wxDevCenterPlugin.h wxDevCenter/AboutBox.h wxDevCenter/Application.h wxDevCenter/ArtProvider.h wxDevCenter/Command.h wxDevCenter/Config.h wxDevCenter/DocView.h wxDevCenter/Element.h wxDevCenter/FileSystem.h wxDevCenter/FileSystemCtrl.h wxDevCenter/FileSystemListCtrl.h wxDevCenter/FileSystemTreeCtrl.h wxDevCenter/FileTools.h wxDevCenter/Frame.h wxDevCenter/language.h wxDevCenter/Layout.h wxDevCenter/Manager.h wxDevCenter/Plugin.h wxDevCenter/PluginFileSystem.h wxDevCenter/Project.h wxDevCenter/setup.h wxDevCenter/StatusBar.h wxDevCenter/WorkBar.h wxDevCenter/unix/Config.h wxDevCenter/unix/FileSystemStandard.h; do \ if test ! -d $(prefix)/include/`dirname $$f` ; then \ $(INSTALL) -d $(prefix)/include/`dirname $$f`; \ *************** *** 187,192 **** $(INSTALL) -m 644 data//$$f $(prefix)/share/wxDevCenter/data/$$f; \ done $(INSTALL) -d $(prefix)/share/applications ! (cd data/ ; $(INSTALL) -m 644 $(FREEDESKTOP_MENU_FILE) $(prefix)/share/applications) $(INSTALL) -d $(prefix)/share/pixmaps (cd data/icons/ ; $(INSTALL) -m 644 wxDevCenter.png $(prefix)/share/pixmaps) --- 191,203 ---- $(INSTALL) -m 644 data//$$f $(prefix)/share/wxDevCenter/data/$$f; \ done + $(INSTALL) -d $(prefix)/share/wxDevCenter/features + for f in wxdc/feature.xml; do \ + if test ! -d $(prefix)/share/wxDevCenter/features/`dirname $$f` ; then \ + $(INSTALL) -d $(prefix)/share/wxDevCenter/features/`dirname $$f`; \ + fi; \ + $(INSTALL) -m 644 features//$$f $(prefix)/share/wxDevCenter/features/$$f; \ + done $(INSTALL) -d $(prefix)/share/applications ! (cd data/ ; $(INSTALL) -m 644 $wxdevcenter.desktop $(prefix)/share/applications) $(INSTALL) -d $(prefix)/share/pixmaps (cd data/icons/ ; $(INSTALL) -m 644 wxDevCenter.png $(prefix)/share/pixmaps) *************** *** 197,212 **** rm -f ./build/$(BUILD)/*.o rm -f ./build/$(BUILD)/*.d - rm -f ./lib/libspecific.a rm -f lib/libwxDevCenterLib.so rm -f lib/libwxDevCenterLib.so ! rm -f ./bin/wxDevCenter$(SUFFIX) ! ! ./lib/libspecific.a: $(SPECIFIC_OBJECTS) ! rm -f $@ ! $(AR) rcu $@ $(SPECIFIC_OBJECTS) ! $(RANLIB) $@ ! lib/libwxDevCenterLib.so: $(WXDEVCENTERLIB_OBJECTS) ./lib/libspecific.a ./lib/libspecific.a ! $(CXX) -shared -fPIC -o $@ $(WXDEVCENTERLIB_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) ./lib/libspecific.a -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_fl-$(WXVERSIONTAG) -lwxdockit-2.1 install_wxDevCenterLib: --- 208,221 ---- rm -f ./build/$(BUILD)/*.o rm -f ./build/$(BUILD)/*.d rm -f lib/libwxDevCenterLib.so rm -f lib/libwxDevCenterLib.so ! rm -f ./bin/wxDevCenter ! rm -f ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so ! rm -f ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so ! rm -f ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so ! rm -f ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so ! lib/libwxDevCenterLib.so: $(WXDEVCENTERLIB_OBJECTS) ! $(CXX) -shared -fPIC -o $@ $(WXDEVCENTERLIB_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwxdockit-$(WXDOCKIT_VERSION) install_wxDevCenterLib: *************** *** 215,230 **** install -c lib/libwxDevCenterLib.so $(prefix)/lib ! ./bin/wxDevCenter$(SUFFIX): $(WXDEVCENTER_OBJECTS) lib/libwxDevCenterLib.so ! $(CXX) -o $@ $(WXDEVCENTER_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L./lib -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwxDevCenterLib -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG) install_wxDevCenter: $(INSTALL) -d $(prefix)/bin ! install -c ./bin/wxDevCenter$(SUFFIX) $(prefix)/bin ! ./build/$(BUILD)/specific_Config.o: ./src/unix/Config.cpp ! $(CXX) -c -o $@ $(SPECIFIC_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/specific_FileSystemStandard.o: ./src/unix/FileSystemStandard.cpp ! $(CXX) -c -o $@ $(SPECIFIC_CXXFLAGS) $(CPPDEPS) $< ./build/$(BUILD)/wxDevCenterLib_AboutBox.o: ./src/AboutBox.cpp --- 224,249 ---- install -c lib/libwxDevCenterLib.so $(prefix)/lib ! ./bin/wxDevCenter: $(WXDEVCENTER_OBJECTS) lib/libwxDevCenterLib.so ! $(CXX) -o $@ $(WXDEVCENTER_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L./lib -lwxDevCenterLib -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_core-$(WXVERSIONTAG) install_wxDevCenter: $(INSTALL) -d $(prefix)/bin ! install -c ./bin/wxDevCenter $(prefix)/bin ! ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so: $(WXDC.FS.UNIX_OBJECTS) lib/libwxDevCenterLib.so ! $(CXX) -shared -fPIC -o $@ $(WXDC.FS.UNIX_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L./lib -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwxDevCenterLib ! install_wxdc.fs.unix: ! $(INSTALL) -d $(prefix)/lib/wxDevCenter/plugins/wxdc.fs.unix ! $(INSTALL) -m 644 ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/wxdc.fs.unix ! install -c ./plugins/wxdc.fs.unix/libwxdc_fs_unix-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/wxdc.fs.unix ! ! ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so: $(WXDC.UI.FRAMES_OBJECTS) lib/libwxDevCenterLib.so ! $(CXX) -shared -fPIC -o $@ $(WXDC.UI.FRAMES_OBJECTS) $(LDFLAGS) -pthread $(__DEBUGINFO) `wx-config --libs` -L./lib -lwx_base$(WXLIBPOSTFIX)-$(WXVERSIONTAG) -lwx_base$(WXLIBPOSTFIX)_xml-$(WXVERSIONTAG) -lwx_$(WXPORTNAME)$(WXLIBPOSTFIX)_adv-$(WXVERSIONTAG) -lwxdockit-$(WXDOCKIT_VERSION) -lwxDevCenterLib ! ! install_wxdc.ui.frames: ! $(INSTALL) -d $(prefix)/lib/wxDevCenter/plugins/wxdc.ui.frames ! $(INSTALL) -m 644 ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/wxdc.ui.frames ! install -c ./plugins/wxdc.ui.frames/libwxdc_ui_frames-0.3.0.so $(prefix)/lib/wxDevCenter/plugins/wxdc.ui.frames ./build/$(BUILD)/wxDevCenterLib_AboutBox.o: ./src/AboutBox.cpp *************** *** 243,246 **** --- 262,268 ---- $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< + ./build/$(BUILD)/wxDevCenterLib_Config_unix.o: ./src/unix/Config-unix.cpp + $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< + ./build/$(BUILD)/wxDevCenterLib_DocManager.o: ./src/DocManager.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 279,291 **** $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< - ./build/$(BUILD)/wxDevCenterLib_MainFrame.o: ./src/MainFrame.cpp - $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< - ./build/$(BUILD)/wxDevCenterLib_Manager.o: ./src/Manager.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< - ./build/$(BUILD)/wxDevCenterLib_MDIFrame.o: ./src/MDIFrame.cpp - $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< - ./build/$(BUILD)/wxDevCenterLib_MiniView.o: ./src/MiniView.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< --- 301,307 ---- *************** *** 294,297 **** --- 310,316 ---- $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< + ./build/$(BUILD)/wxDevCenterLib_PluginFileSystem.o: ./src/PluginFileSystem.cpp + $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< + ./build/$(BUILD)/wxDevCenterLib_Project.o: ./src/Project.cpp $(CXX) -c -o $@ $(WXDEVCENTERLIB_CXXFLAGS) $(CPPDEPS) $< *************** *** 309,313 **** $(CXX) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(CPPDEPS) $< ! .PHONY: all install uninstall clean install_wxDevCenterLib install_wxDevCenter --- 328,341 ---- $(CXX) -c -o $@ $(WXDEVCENTER_CXXFLAGS) $(CPPDEPS) $< ! ./build/$(BUILD)/wxdc.fs.unix_FileSystemStandard_unix.o: ./src/unix/FileSystemStandard-unix.cpp ! $(CXX) -c -o $@ $(WXDC.FS.UNIX_CXXFLAGS) $(CPPDEPS) $< ! ! ./build/$(BUILD)/wxdc.ui.frames_MainFrame.o: ./src/MainFrame.cpp ! $(CXX) -c -o $@ $(WXDC.UI.FRAMES_CXXFLAGS) $(CPPDEPS) $< ! ! ./build/$(BUILD)/wxdc.ui.frames_MDIFrame.o: ./src/MDIFrame.cpp ! $(CXX) -c -o $@ $(WXDC.UI.FRAMES_CXXFLAGS) $(CPPDEPS) $< ! ! .PHONY: all install uninstall clean install_wxDevCenterLib install_wxDevCenter install_wxdc.fs.unix install_wxdc.ui.frames Index: wxDevCenter.bkl =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/wxDevCenter.bkl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxDevCenter.bkl 24 Apr 2005 16:10:56 -0000 1.11 --- wxDevCenter.bkl 11 Oct 2005 19:54:24 -0000 1.12 *************** *** 2,10 **** <makefile> ! <include file="build/wx.bkl" /> ! <include file="build/wxDevCenter.bkl" /> ! <include file="build/install.bkl" /> </makefile> --- 2,21 ---- <makefile> ! <!-- Default wxWidgets template definition. --> ! <include file="build/bakefiles/wx.bkl" /> ! <!-- wxDevCenter rule definition. --> ! <include file="build/bakefiles/wxDevCenter.bkl" /> ! <!-- Standard modules. --> ! <if cond="PLATFORM_WIN32=='1'"> ! <include file="build/bakefiles/wxDevCenter-msw.bkl" /> ! </if> ! <if cond="PLATFORM_UNIX=='1'"> ! <include file="build/bakefiles/wxDevCenter-unix.bkl" /> ! </if> ! ! <!-- Installation rules. --> ! <include file="build/bakefiles/install.bkl" /> </makefile> |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:54:36
|
Update of /cvsroot/wxdevcenter/wxDevCenter/features/wxDC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659/features/wxDC Added Files: feature.xml Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. --- NEW FILE: feature.xml --- <?xml version="1.0" encoding="UTF-8"?> <feature id="wxDC" version="0.3.0" label="wxDC" provider-name="Arcallians"> <description>wxDevCenter base features.</description> <copyright>Notes</copyright> <license>Licence</license> <requires> <plugin name="wxdc.fs.msw" /> <plugin name="wxdc.fs.unix" /> <plugin name="wxdc.ui.frames" /> </requires> </feature> |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:54:36
|
Update of /cvsroot/wxdevcenter/wxDevCenter/plugins/wxdc.fs.unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659/plugins/wxdc.fs.unix Added Files: plugin.xml Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. --- NEW FILE: plugin.xml --- <?xml version="1.0" encoding="UTF-8"?> <plugin id="wxdc.fs.unix" version="0.3.0" label="wxdc.fs.unix" provider-name="Arcallians"> <description>wxDevCenter base plugin for unix FileSystem</description> <copyright>Notes</copyright> <license>Licence</license> <requires> <dynlib name="wxdc_fs_unix-0.3.0" /> </requires> </plugin> |
|
From: Emilien K. <cur...@us...> - 2005-10-11 19:54:35
|
Update of /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29659/include/wxDevCenter/unix Modified Files: FileSystemStandard.h Log Message: Move bakefiles to /build/bakefiles. Modularize frames. Create PluginFileSystem and show it in AboutBox. Index: FileSystemStandard.h =================================================================== RCS file: /cvsroot/wxdevcenter/wxDevCenter/include/wxDevCenter/unix/FileSystemStandard.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FileSystemStandard.h 17 Aug 2005 16:33:18 -0000 1.3 --- FileSystemStandard.h 11 Oct 2005 19:54:25 -0000 1.4 *************** *** 43,48 **** * Valables pour les systèmes UNIX, Linux, MacOS. */ ! class FileSystemStandardUnix : public FileSystemStandardBase { protected: FilePath m_strFindPath; --- 43,49 ---- * Valables pour les systèmes UNIX, Linux, MacOS. */ ! class WXDC_DLL_PLUGIN FileSystemStandardUnix : public FileSystemStandard { + DECLARE_DYNAMIC_CLASS(FileSystemStandardUnix) protected: FilePath m_strFindPath; *************** *** 62,67 **** }; - typedef FileSystemStandardUnix FileSystemStandard; - --- 63,66 ---- |
