[Goodies-commits] r2036 - in xfce4-quicklauncher-plugin/trunk: . panel-plugin
Masse Nicolas
bountykiller at xfce.org
Sat Sep 16 13:53:05 CEST 2006
Author: bountykiller
Date: 2006-09-16 11:53:03 +0000 (Sat, 16 Sep 2006)
New Revision: 2036
Modified:
xfce4-quicklauncher-plugin/trunk/ChangeLog
xfce4-quicklauncher-plugin/trunk/TODO
xfce4-quicklauncher-plugin/trunk/libtool
xfce4-quicklauncher-plugin/trunk/panel-plugin/callbacks.c
xfce4-quicklauncher-plugin/trunk/panel-plugin/main.c
xfce4-quicklauncher-plugin/trunk/panel-plugin/types.h
Log:
remove eventboxes since it corrupted the background when a theme was used. Still some stuff need to be fixed
Modified: xfce4-quicklauncher-plugin/trunk/ChangeLog
===================================================================
--- xfce4-quicklauncher-plugin/trunk/ChangeLog 2006-09-15 20:06:38 UTC (rev 2035)
+++ xfce4-quicklauncher-plugin/trunk/ChangeLog 2006-09-16 11:53:03 UTC (rev 2036)
@@ -1,3 +1,8 @@
+
++removed the use of eventboxes. Looks better when a theme is used.
++hopefully fix some compilation problems with netbsd
++lot of new translations (thanks to the people working on this)
+
version 1.91:
**************
+make dist now works
Modified: xfce4-quicklauncher-plugin/trunk/TODO
===================================================================
--- xfce4-quicklauncher-plugin/trunk/TODO 2006-09-15 20:06:38 UTC (rev 2035)
+++ xfce4-quicklauncher-plugin/trunk/TODO 2006-09-16 11:53:03 UTC (rev 2036)
@@ -1,3 +1,9 @@
+For Next Vesrion
+*****************
+-fix some problem for finding the right widget when using multiple lines
+-fix a problem with images still zoomed when the mouse leave the panel
+-test with the panel on the left or on the right
+
For Vesrion 2.0
***************
-drag 'n drop support (with the app-finder for example)
Modified: xfce4-quicklauncher-plugin/trunk/libtool
===================================================================
--- xfce4-quicklauncher-plugin/trunk/libtool 2006-09-15 20:06:38 UTC (rev 2035)
+++ xfce4-quicklauncher-plugin/trunk/libtool 2006-09-16 11:53:03 UTC (rev 2036)
@@ -40,11 +40,11 @@
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
# The names of the tagged configurations supported by this script.
-available_tags=" CXX F77"
+available_tags=" CXX"
# ### BEGIN LIBTOOL CONFIG
-# Libtool was configured on host GENTOO:
+# Libtool was configured on host arch:
# Shell to use when invoking shell scripts.
SHELL="/bin/sh"
@@ -97,7 +97,7 @@
EGREP="/bin/grep -E"
# The linker used to build libraries.
-LD="/usr/i686-pc-linux-gnu/bin/ld"
+LD="/usr/bin/ld"
# Whether we need hard or soft links.
LN_S="ln -s"
@@ -328,7 +328,7 @@
sys_lib_search_path_spec=" /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/4.1.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../../i686-pc-linux-gnu/4.1.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../../ /lib/i686-pc-linux-gnu/4.1.1/ /lib/ /usr/lib/i686-pc-linux-gnu/4.1.1/ /usr/lib/"
# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib //usr//lib/opengl/xorg-x11/lib /usr/i686-pc-linux-gnu/lib /usr/lib/gcc/i686-pc-linux-gnu/4.1.1 /usr/lib/nspr /usr/lib/nss /usr/lib /usr/lib/openmotif-2.2 /opt/blackdown-jdk-1.4.2.02/jre/lib/i386/ /opt/blackdown-jdk-1.4.2.02/jre/lib/i386/native_threads/ /opt/blackdown-jdk-1.4.2.02/jre/lib/i386/classic/ /opt/blackdown-jdk-1.4.2.02/jre/lib/i386/server/ /usr/kde/3.5/lib /usr/qt/3/lib /usr/lib/libstdc++-v3/ "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /opt/xfce4/lib /opt/gnome/lib "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
@@ -385,9 +385,6 @@
# function.
progpath="$0"
-# define SED for historic ltconfig's generated by Libtool 1.3
-test -z "$SED" && SED=sed
-
# The name of this program:
progname=`echo "$progpath" | $SED $basename`
modename="$progname"
@@ -406,13 +403,6 @@
if test -n "${ZSH_VERSION+set}" ; then
setopt NO_GLOB_SUBST
fi
-# Same for EGREP, and just to be sure, do LTCC as well
-if test "X$EGREP" = X ; then
- EGREP=egrep
-fi
-if test "X$LTCC" = X ; then
- LTCC=${CC-gcc}
-fi
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
@@ -499,30 +489,6 @@
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
-if test -z "$max_cmd_len"; then
- i=0
- testring="ABCD"
- new_result=
-
- # If test is not a shell built-in, we'll probably end up computing a
- # maximum length that is only half of the actual maximum length, but
- # we can't tell.
- while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
- = "XX$testring") >/dev/null 2>&1 &&
- new_result=`expr "X$testring" : ".*" 2>&1` &&
- max_cmd_len="$new_result" &&
- test "$i" != 17 # 1/2 MB should be enough
- do
- i=`expr $i + 1`
- testring="$testring$testring"
- done
- testring=
- # Add a significant safety factor because C++ compilers can tack on massive
- # amounts of additional arguments before passing them to the linker.
- # It appears as though 1/2 is a usable value.
- max_cmd_len=`expr $max_cmd_len \/ 2`
-fi
-
#####################################
# Shell function definitions:
# This seems to be the best place for them
@@ -643,21 +609,7 @@
esac
CC_quoted="$CC_quoted $arg"
done
- # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
- trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
- # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
- extendcc=${host}-${CC}
- # and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc
- # (Gentoo-specific hack because we always export $CHOST)
- mungedcc=${CHOST-${host}}-${trimedcc}
case "$@ " in
- "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
- "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
- tagname=CC
- break ;;
- "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
- "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
- "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\
" $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
# The compiler in the base compile command matches
# the one in the tagged configuration.
@@ -1251,7 +1203,7 @@
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
if test "$need_locks" = yes; then
- until $run ln "$srcfile" "$lockfile" 2>/dev/null; do
+ until $run ln "$progpath" "$lockfile" 2>/dev/null; do
$show "Waiting for $lockfile to be removed"
sleep 2
done
@@ -4042,13 +3994,6 @@
*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
esac
done
- # It is ok to link against an archive when
- # building a shared library.
- if $AR -t $potlib > /dev/null 2>&1; then
- newdeplibs="$newdeplibs $a_deplib"
- a_deplib=""
- break 2
- fi
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
| ${SED} 10q \
| $EGREP "$file_magic_regex" > /dev/null; then
@@ -5786,11 +5731,6 @@
$echo >> $output "\
if test \"\$libtool_execute_magic\" != \"$magic\"; then
# Run the actual program with our arguments.
-
- # Make sure env LD_LIBRARY_PATH does not mess us up
- if test -n \"\${LD_LIBRARY_PATH+set}\"; then
- export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
- fi
"
case $host in
# Backslashes separate directories on plain windows
@@ -6018,53 +5958,9 @@
$echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
exit $EXIT_FAILURE
fi
- if test "X$EGREP" = X ; then
- EGREP=egrep
- fi
- # We do not want portage's install root ($D) present. Check only for
- # this if the .la is being installed.
- if test "$installed" = yes && test "$D"; then
- eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
- else
- mynewdependency_lib="$libdir/$name"
- fi
- # Do not add duplicates
- if test "$mynewdependency_lib"; then
- my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
- if test -z "$my_little_ninja_foo_1"; then
- newdependency_libs="$newdependency_libs $mynewdependency_lib"
- fi
- fi
+ newdependency_libs="$newdependency_libs $libdir/$name"
;;
- *)
- if test "$installed" = yes; then
- # Rather use S=WORKDIR if our version of portage supports it.
- # This is because some ebuild (gcc) do not use $S as buildroot.
- if test "$PWORKDIR"; then
- S="$PWORKDIR"
- fi
- # We do not want portage's build root ($S) present.
- my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
- # We do not want portage's install root ($D) present.
- my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
- if test -n "$my_little_ninja_foo_2" && test "$S"; then
- mynewdependency_lib=""
- elif test -n "$my_little_ninja_foo_3" && test "$D"; then
- eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
- else
- mynewdependency_lib="$deplib"
- fi
- else
- mynewdependency_lib="$deplib"
- fi
- # Do not add duplicates
- if test "$mynewdependency_lib"; then
- my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
- if test -z "$my_little_ninja_foo_4"; then
- newdependency_libs="$newdependency_libs $mynewdependency_lib"
- fi
- fi
- ;;
+ *) newdependency_libs="$newdependency_libs $deplib" ;;
esac
done
dependency_libs="$newdependency_libs"
@@ -6116,10 +6012,6 @@
case $host,$output,$installed,$module,$dlname in
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
esac
- # Do not add duplicates
- if test "$installed" = yes && test "$D"; then
- install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
- fi
$echo > $output "\
# $outputname - a libtool library file
# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
@@ -7323,7 +7215,7 @@
# End:
# ### BEGIN LIBTOOL TAG CONFIG: CXX
-# Libtool was configured on host GENTOO:
+# Libtool was configured on host arch:
# Shell to use when invoking shell scripts.
SHELL="/bin/sh"
@@ -7376,7 +7268,7 @@
EGREP="/bin/grep -E"
# The linker used to build libraries.
-LD="/usr/i686-pc-linux-gnu/bin/ld"
+LD="/usr/bin/ld"
# Whether we need hard or soft links.
LN_S="ln -s"
@@ -7521,7 +7413,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc/i686-pc-linux-gnu/4.1.1 -L/usr/lib/gcc/i686-pc-linux-gnu/4.1.1 -L/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../../../i686-pc-linux-gnu/lib -L/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../.."
+compiler_lib_search_path="-L/usr/lib/gcc/i686-pc-linux-gnu/4.1.1 -L/usr/lib/gcc/i686-pc-linux-gnu/4.1.1 -L/usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../.."
# Method to check whether dependent libraries are shared objects.
deplibs_check_method="pass_all"
@@ -7604,7 +7496,7 @@
sys_lib_search_path_spec=" /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/4.1.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../../i686-pc-linux-gnu/4.1.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../../ /lib/i686-pc-linux-gnu/4.1.1/ /lib/ /usr/lib/i686-pc-linux-gnu/4.1.1/ /usr/lib/"
# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib //usr//lib/opengl/xorg-x11/lib /usr/i686-pc-linux-gnu/lib /usr/lib/gcc/i686-pc-linux-gnu/4.1.1 /usr/lib/nspr /usr/lib/nss /usr/lib /usr/lib/openmotif-2.2 /opt/blackdown-jdk-1.4.2.02/jre/lib/i386/ /opt/blackdown-jdk-1.4.2.02/jre/lib/i386/native_threads/ /opt/blackdown-jdk-1.4.2.02/jre/lib/i386/classic/ /opt/blackdown-jdk-1.4.2.02/jre/lib/i386/server/ /usr/kde/3.5/lib /usr/qt/3/lib /usr/lib/libstdc++-v3/ "
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /opt/xfce4/lib /opt/gnome/lib "
# Fix the shell variable $srcfile for the compiler.
fix_srcfile_path=""
@@ -7626,311 +7518,3 @@
# ### END LIBTOOL TAG CONFIG: CXX
-# ### BEGIN LIBTOOL TAG CONFIG: F77
-
-# Libtool was configured on host GENTOO:
-
-# Shell to use when invoking shell scripts.
-SHELL="/bin/sh"
-
-# Whether or not to build shared libraries.
-build_libtool_libs=yes
-
-# Whether or not to build static libraries.
-build_old_libs=no
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=no
-
-# Whether or not to optimize for fast installation.
-fast_install=yes
-
-# The host system.
-host_alias=
-host=i686-pc-linux-gnu
-host_os=linux-gnu
-
-# The build system.
-build_alias=
-build=i686-pc-linux-gnu
-build_os=linux-gnu
-
-# An echo program that does not interpret backslashes.
-echo="echo"
-
-# The archiver.
-AR="ar"
-AR_FLAGS="cru"
-
-# A C compiler.
-LTCC="gcc"
-
-# LTCC compiler flags.
-LTCFLAGS="-g -O2"
-
-# A language-specific compiler.
-CC="gfortran"
-
-# Is the compiler the GNU C compiler?
-with_gcc=yes
-
-# An ERE matcher.
-EGREP="/bin/grep -E"
-
-# The linker used to build libraries.
-LD="/usr/i686-pc-linux-gnu/bin/ld"
-
-# Whether we need hard or soft links.
-LN_S="ln -s"
-
-# A BSD-compatible nm program.
-NM="/usr/bin/nm -B"
-
-# A symbol stripping program
-STRIP="strip"
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=file
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="dlltool"
-
-# Used on cygwin: object dumper.
-OBJDUMP="objdump"
-
-# Used on cygwin: assembler.
-AS="as"
-
-# The name of the directory that contains temporary libtool files.
-objdir=.libs
-
-# How to create reloadable object files.
-reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-
-# How to pass a linker flag through the compiler.
-wl="-Wl,"
-
-# Object file suffix (normally "o").
-objext="o"
-
-# Old archive suffix (normally "a").
-libext="a"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='.so'
-
-# Executable file suffix (normally "").
-exeext=""
-
-# Additional compiler flags for building library objects.
-pic_flag=" -fPIC"
-pic_mode=default
-
-# What is the maximum length of a command?
-max_cmd_len=32768
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
-
-# Must we lock files when doing compilation?
-need_locks="no"
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=no
-
-# Do we need a version for libraries?
-need_version=no
-
-# Whether dlopen is supported.
-dlopen_support=unknown
-
-# Whether dlopen of programs is supported.
-dlopen_self=unknown
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=unknown
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=""
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=""
-
-# Library versioning type.
-version_type=linux
-
-# Format of library name prefix.
-libname_spec="lib\$name"
-
-# List of archive names. First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
-
-# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}\${shared_ext}\$major"
-
-# Commands used to build and install an old-style archive.
-RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
-old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$oldlib"
-old_postuninstall_cmds=""
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=""
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=""
-
-# Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
- cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
- \$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
- \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
-postinstall_cmds=""
-postuninstall_cmds=""
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=""
-module_expsym_cmds=""
-
-# Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=""
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=""
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=""
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=""
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=""
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p'"
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'"
-
-# This is the shared library runtime path variable.
-runpath_var=LD_RUN_PATH
-
-# This is the shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=immediate
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
-
-# Flag to hardcode $libdir into a binary during linking.
-# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
-
-# If ld is used when linking, flag to hardcode $libdir into
-# a binary during linking. This must work even if $libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=""
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=""
-
-# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=no
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=no
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=unsupported
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=no
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=unknown
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/4.1.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../../i686-pc-linux-gnu/4.1.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.1.1/../../../ /lib/i686-pc-linux-gnu/4.1.1/ /lib/ /usr/lib/i686-pc-linux-gnu/4.1.1/ /usr/lib/"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/lib //usr//lib/opengl/xorg-x11/lib /usr/i686-pc-linux-gnu/lib /usr/lib/gcc/i686-pc-linux-gnu/4.1.1 /usr/lib/nspr /usr/lib/nss /usr/lib /usr/lib/openmotif-2.2 /opt/blackdown-jdk-1.4.2.02/jre/lib/i386/ /opt/blackdown-jdk-1.4.2.02/jre/lib/i386/native_threads/ /opt/blackdown-jdk-1.4.2.02/jre/lib/i386/classic/ /opt/blackdown-jdk-1.4.2.02/jre/lib/i386/server/ /usr/kde/3.5/lib /usr/qt/3/lib /usr/lib/libstdc++-v3/ "
-
-# Fix the shell variable $srcfile for the compiler.
-fix_srcfile_path=""
-
-# Set to yes if exported symbols are required.
-always_export_symbols=no
-
-# The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=""
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-
-# Symbols that must always be exported.
-include_expsyms=""
-
-# ### END LIBTOOL TAG CONFIG: F77
-
Modified: xfce4-quicklauncher-plugin/trunk/panel-plugin/callbacks.c
===================================================================
--- xfce4-quicklauncher-plugin/trunk/panel-plugin/callbacks.c 2006-09-15 20:06:38 UTC (rev 2035)
+++ xfce4-quicklauncher-plugin/trunk/panel-plugin/callbacks.c 2006-09-16 11:53:03 UTC (rev 2036)
@@ -483,7 +483,7 @@
launcher->command = (gchar*) g_malloc(sizeof(gchar) * (strlen(arg2)+1));
strcpy(launcher->command, arg2);
gtk_list_store_set(GTK_LIST_STORE(treemodel), &iter, 1, launcher->command, -1);
- launcher_update_command(launcher);
+ gtk_tooltips_set_tip(launcher->tooltip, launcher->image, launcher->command, launcher->command);
gtk_tree_path_free(path);
}
}
@@ -502,9 +502,9 @@
} else
file_chooser_set_preview_widget_active(chooser, FALSE);
g_free(filename);
-}
-
-
-
-
+}
+
+
+
+
Modified: xfce4-quicklauncher-plugin/trunk/panel-plugin/main.c
===================================================================
--- xfce4-quicklauncher-plugin/trunk/panel-plugin/main.c 2006-09-15 20:06:38 UTC (rev 2035)
+++ xfce4-quicklauncher-plugin/trunk/panel-plugin/main.c 2006-09-16 11:53:03 UTC (rev 2036)
@@ -28,7 +28,7 @@
#include "types.h"
#include "callbacks.h"
-#include <glib/gprintf.h>
+#include <glib/gprintf.h>
#include <libxfcegui4/libxfcegui4.h>
#include <string.h>
@@ -43,6 +43,7 @@
void quicklauncher_save_config(t_quicklauncher *quicklauncher, const gchar* filename);
/* Launcher funcs */
+gboolean launcher_clicked (t_launcher *launcher, gboolean pressed);
t_launcher* launcher_load_config(XfceRc *rcfile, gint num, t_quicklauncher *quicklauncher);
void launcher_save_config(t_launcher *launcher, XfceRc *rcfile, guint16 num);
@@ -124,8 +125,6 @@
liste ; liste = g_list_next(liste) )
{
launcher_update_icon((t_launcher*)liste->data, quicklauncher->icon_size);
- gtk_container_set_border_width( GTK_CONTAINER( ( (t_launcher*)liste->data)->widget),
- (int)quicklauncher->icon_size/8);
//printf("%d %d \n",(int) 0.75 * size/quicklauncher->nb_lines, (int)quicklauncher->icon_size/8);
}
return TRUE;
@@ -184,7 +183,6 @@
quicklauncher_add_element(t_quicklauncher *quicklauncher, t_launcher *launcher)
{
quicklauncher->launchers = g_list_append(quicklauncher->launchers, (gpointer)launcher);
- xfce_panel_plugin_add_action_widget(quicklauncher->plugin, launcher->widget);
quicklauncher->nb_launcher++;
}
@@ -231,11 +229,10 @@
{
for(j=0; (j < launch_per_line) && (toplace); ++j, toplace = g_list_next(toplace))
{
- g_assert(toplace && GTK_IS_WIDGET(((t_launcher*)toplace->data)->widget) );
+ g_assert(toplace && GTK_IS_WIDGET(((t_launcher*)toplace->data)->image) );
gtk_table_attach_defaults( GTK_TABLE(quicklauncher->table),
- ((t_launcher*)toplace->data)->widget,
+ ((t_launcher*)toplace->data)->image,
j, j+1, i, i+1);
- //gtk_container_add (GTK_CONTAINER (quicklauncher->hbox[i]), ((t_launcher*)toplace->data)->widget);
}
}
}
@@ -250,8 +247,7 @@
{
for( launcher = g_list_first(quicklauncher->launchers);
launcher; launcher = g_list_next(launcher) )
- gtk_container_remove(GTK_CONTAINER(quicklauncher->table),
- ((t_launcher*)launcher->data)->widget);
+ gtk_container_remove(GTK_CONTAINER(quicklauncher->table), ((t_launcher*)launcher->data)->image);
}
}
@@ -279,7 +275,7 @@
quicklauncher_empty_widgets(quicklauncher);
quicklauncher->nb_lines = nb_lines;
quicklauncher_set_size(quicklauncher->plugin,
- xfce_panel_plugin_get_size(quicklauncher->plugin),quicklauncher);
+ xfce_panel_plugin_get_size(quicklauncher->plugin),quicklauncher);
quicklauncher_organize(quicklauncher);
}
}
@@ -306,7 +302,76 @@
//g_assert(quicklauncher->nb_launcher == 4);
}
+int _quicklauncher_get_numlauncher(t_quicklauncher *quicklauncher, gdouble x, gdouble y)
+{
+ int row, col, nb_lines, launch_per_line;
+ col = ( (int)x/quicklauncher->icon_size);
+ row = ( (int)y/quicklauncher->icon_size);
+ nb_lines = MIN(quicklauncher->nb_lines, quicklauncher->nb_launcher);
+ if(!(quicklauncher->nb_launcher % quicklauncher->nb_lines))
+ launch_per_line = quicklauncher->nb_launcher / quicklauncher->nb_lines;
+ else
+ launch_per_line = quicklauncher->nb_launcher / quicklauncher->nb_lines + 1;
+ return (launch_per_line * row + col);
+}
+static gboolean
+quicklauncher_clicked(XfcePanelPlugin *plugin, GdkEventButton *event, t_quicklauncher *quicklauncher)
+{
+ t_launcher *launcher;
+ int n_launcher;
+ DBG ("quicklauncher_clicked");
+ if (event->button != 1)return FALSE;
+ n_launcher = _quicklauncher_get_numlauncher(quicklauncher, event->x, event->y);
+ DBG ("%d", n_launcher);
+ launcher = (t_launcher*) g_list_nth_data(quicklauncher->launchers, n_launcher);
+ if(!launcher)
+ return FALSE;
+ if (event->type == GDK_BUTTON_PRESS)
+ launcher_clicked (launcher, TRUE);
+ else if (event->type == GDK_BUTTON_RELEASE)
+ launcher_clicked (launcher, FALSE);
+ return TRUE;
+}
+
+
+
+static gboolean
+quicklauncher_moved(XfcePanelPlugin *plugin, GdkEventMotion *event, t_quicklauncher *quicklauncher)
+{
+ int n_launcher;
+ static int n_old_launcher;
+ t_launcher *launcher;
+ DBG ("moved: %f %f", event->x, event->y);
+ n_launcher = _quicklauncher_get_numlauncher(quicklauncher, event->x, event->y);
+ DBG ("old is: %d\tnew is %d", n_old_launcher, n_launcher);
+ if (n_launcher == n_old_launcher) return FALSE;
+ launcher = (t_launcher*) g_list_nth_data(quicklauncher->launchers, n_old_launcher);
+ if (launcher)
+ launcher_passthrough(launcher, FALSE);
+ launcher = (t_launcher*) g_list_nth_data(quicklauncher->launchers, n_launcher);
+ if (launcher)
+ launcher_passthrough(launcher, TRUE);
+ n_old_launcher = n_launcher;
+ return TRUE;
+}
+
+static void
+_quicklauncher_update_command(t_quicklauncher *quicklauncher)
+{
+ g_assert(GTK_IS_TABLE(quicklauncher->table));
+ if (quicklauncher->command_ids[0] )
+ {
+ g_signal_handler_disconnect(quicklauncher->plugin, quicklauncher->command_ids[0]);
+ g_signal_handler_disconnect(quicklauncher->plugin, quicklauncher->command_ids[1]);
+ g_signal_handler_disconnect(quicklauncher->plugin, quicklauncher->command_ids[2]);
+ }
+ quicklauncher->command_ids[0] = g_signal_connect(quicklauncher->plugin, "button_press_event", G_CALLBACK(quicklauncher_clicked), quicklauncher);
+ quicklauncher->command_ids[1] = g_signal_connect(quicklauncher->plugin, "button-release-event", G_CALLBACK(quicklauncher_clicked), quicklauncher);
+ quicklauncher->command_ids[2] = g_signal_connect(quicklauncher->plugin, "motion-notify-event", G_CALLBACK(quicklauncher_moved), quicklauncher);
+ DBG ("Update Command ids: %d %d %d", quicklauncher->command_ids[0], quicklauncher->command_ids[1], quicklauncher->command_ids[2]);
+}
+
t_quicklauncher *
quicklauncher_new (XfcePanelPlugin *plugin)
{
@@ -315,18 +380,20 @@
DBG ("create quicklauncher");
quicklauncher = g_new0(t_quicklauncher, 1);
- filename = xfce_panel_plugin_save_location(plugin, TRUE);
- quicklauncher->icon_size = (gint) (0.75 * xfce_panel_plugin_get_size(plugin)/2);
+ filename = xfce_panel_plugin_save_location(plugin, TRUE);
+ quicklauncher->icon_size = (gint) (0.75 * xfce_panel_plugin_get_size(plugin)/2);
DBG ("icon size: %d", quicklauncher->icon_size);
if((!filename) || (!quicklauncher_load_config(quicklauncher, filename) ) )
quicklauncher_load_default(quicklauncher);
quicklauncher->orientation = xfce_panel_plugin_get_orientation(plugin);
quicklauncher->plugin = plugin;
+ gtk_widget_add_events(GTK_WIDGET(plugin),GDK_POINTER_MOTION_MASK);
quicklauncher->table = g_object_ref(gtk_table_new(2, 2, TRUE));
gtk_table_set_col_spacings(GTK_TABLE(quicklauncher->table), 0);
gtk_container_add( GTK_CONTAINER(quicklauncher->plugin), quicklauncher->table);
- xfce_panel_plugin_add_action_widget(quicklauncher->plugin, quicklauncher->table);
+ _quicklauncher_update_command(quicklauncher);
+ //xfce_panel_plugin_add_action_widget(quicklauncher->plugin, quicklauncher->table);
gtk_widget_show(quicklauncher->table);
quicklauncher_organize(quicklauncher);
@@ -400,7 +467,6 @@
_create_pixbuf(gint id, const gchar* name, gint size)
{
GdkPixbuf *pixbuf;
- DBG ("creating pixbuf %d", size);
if(id != XFCE_ICON_CATEGORY_EXTERN)
pixbuf = xfce_icon_theme_load_category(DEFAULT_ICON_THEME, id, size);
else
@@ -411,16 +477,12 @@
}
gboolean
-launcher_clicked (GtkWidget *event_box, GdkEventButton *event, t_launcher *launcher)
+launcher_clicked (t_launcher *launcher, gboolean pressed)
{
- int size = 1.25 * launcher->quicklauncher->icon_size;
- if (event->button != 1)
- return FALSE;
- if (event->type == GDK_BUTTON_PRESS)
+ DBG ("Launcher clicked => %s", launcher->command);
+ if (pressed)
{
- g_assert(launcher->zoomed_img);
- if(event->x < 0 || event->x > size || event->y < 0 || event->y > size)
- return FALSE;
+ g_assert(launcher->zoomed_img);
if (!launcher->clicked_img)
{
launcher->clicked_img = gdk_pixbuf_copy (launcher->zoomed_img);
@@ -428,35 +490,31 @@
}
gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->clicked_img);
}
- else if (event->type == GDK_BUTTON_RELEASE)
+ else
{
- //g_assert(launcher->clicked_img);
- if (event->x > 0 && event->x < size && event->y > 0 && event->y < size)
- xfce_exec(launcher->command, FALSE, FALSE, NULL);
+ g_assert(launcher->clicked_img);
+ xfce_exec(launcher->command, FALSE, FALSE, NULL);
gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->def_img);
- gtk_container_set_border_width(GTK_CONTAINER (event_box),
- (int)launcher->quicklauncher->icon_size/8);
- //gtk_widget_set_size_request(launcher->image, size, size);
}
return TRUE;
}
+
gboolean
-launcher_passthrought(GtkWidget *widget, GdkEventCrossing *event, t_launcher *launcher)
+launcher_passthrough (t_launcher *launcher, gboolean enter)
{
- if (event->type == GDK_ENTER_NOTIFY)
+ if (enter)
{
+ DBG ("Entred: size=%d", launcher->quicklauncher->icon_size);
int size = 1.25 * launcher->quicklauncher->icon_size;
if (!launcher->zoomed_img)
launcher->zoomed_img = gdk_pixbuf_scale_simple(launcher->def_img, size, size, GDK_INTERP_HYPER);
- gtk_container_set_border_width(GTK_CONTAINER (widget), 0);
gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->zoomed_img);
}
else
{
+ DBG ("Exit");
gtk_image_set_from_pixbuf (GTK_IMAGE(launcher->image), launcher->def_img);
- gtk_container_set_border_width(GTK_CONTAINER (widget),
- (int)(launcher->quicklauncher->icon_size/8));
}
return TRUE;
}
@@ -482,50 +540,21 @@
}
-void
-launcher_update_command(t_launcher *launcher)
-{
- if (launcher->command_ids[0] )
- {
- g_signal_handler_disconnect(launcher->widget, launcher->command_ids[0]);
- g_signal_handler_disconnect(launcher->widget, launcher->command_ids[1]);
- g_signal_handler_disconnect(launcher->widget, launcher->command_ids[2]);
- g_signal_handler_disconnect(launcher->widget, launcher->command_ids[3]);
- }
- gtk_tooltips_set_tip(launcher->tooltip, launcher->widget, launcher->command, launcher->command);
- launcher->command_ids[0] = g_signal_connect(launcher->widget, "button_press_event",
- G_CALLBACK(launcher_clicked), launcher);
- launcher->command_ids[1] = g_signal_connect(launcher->widget, "button-release-event",
- G_CALLBACK(launcher_clicked), launcher);
- launcher->command_ids[2] = g_signal_connect(launcher->widget, "enter-notify-event",
- G_CALLBACK(launcher_passthrought), launcher);
- launcher->command_ids[3] = g_signal_connect(launcher->widget, "leave-notify-event",
- G_CALLBACK(launcher_passthrought), launcher);
-}
-
void create_launcher(t_launcher *launcher)
{
- launcher->widget = g_object_ref(gtk_event_box_new());
launcher->image = g_object_ref(gtk_image_new());
launcher->tooltip = gtk_tooltips_new();
- gtk_container_set_border_width(GTK_CONTAINER (launcher->widget),
- (int)launcher->quicklauncher->icon_size/8);
- gtk_container_add (GTK_CONTAINER (launcher->widget), launcher->image);
- gtk_event_box_set_above_child(GTK_EVENT_BOX(launcher->widget), FALSE);
-
launcher_update_icon(launcher, launcher->quicklauncher->icon_size);
- g_assert(!launcher->command_ids[0]);
- launcher_update_command(launcher) ;
+ gtk_tooltips_set_tip(launcher->tooltip, launcher->image, launcher->command, launcher->command);
gtk_widget_show (launcher->image);
- gtk_widget_show (launcher->widget);
}
t_launcher *
launcher_new (const gchar *command, gint icon_id, const gchar *icon_name, t_quicklauncher* quicklauncher)
{
- t_launcher *launcher;
+ t_launcher *launcher;
launcher = g_new0 (t_launcher, 1);
- if(command)
+ if(command)
launcher->command = g_strdup(command);
else launcher->command = NULL;
launcher->icon_id = icon_id;
@@ -545,7 +574,6 @@
UNREF(launcher->zoomed_img);
UNREF(launcher->clicked_img);
//g_object_unref(launcher->tooltip);
- g_object_unref(launcher->widget);
g_object_unref(launcher->image);
//gtk_widget_destroy(launcher->widget); //useless: handled by gtk
Modified: xfce4-quicklauncher-plugin/trunk/panel-plugin/types.h
===================================================================
--- xfce4-quicklauncher-plugin/trunk/panel-plugin/types.h 2006-09-15 20:06:38 UTC (rev 2035)
+++ xfce4-quicklauncher-plugin/trunk/panel-plugin/types.h 2006-09-16 11:53:03 UTC (rev 2036)
@@ -52,6 +52,7 @@
GtkOrientation orientation;
gint nb_lines;
gint nb_launcher;
+ gulong command_ids[3];
}
t_quicklauncher;
@@ -82,7 +83,6 @@
typedef struct
{
- GtkWidget *widget;
GtkWidget *image;
GdkPixbuf *def_img;
GdkPixbuf *zoomed_img;
@@ -92,7 +92,6 @@
gchar *icon_name;
gint icon_id;
t_quicklauncher *quicklauncher;
- gulong command_ids[4];
}
t_launcher;
@@ -104,22 +103,14 @@
const gchar *icon_name, t_quicklauncher *quicklauncher);
void launcher_free (t_launcher *launcher);
-
-void launcher_update_command(t_launcher *launcher);
-
void launcher_update_icon(t_launcher *launcher, gint size) ;
t_quicklauncher *quicklauncher_new (XfcePanelPlugin *plugin);
-
void quicklauncher_add_element(t_quicklauncher *quicklauncher, t_launcher *launcher);
-
t_launcher* quicklauncher_remove_element(t_quicklauncher *quicklauncher, gint num);
-
void quicklauncher_organize(t_quicklauncher *quicklauncher);
-
void quicklauncher_empty_widgets(t_quicklauncher *quicklauncher);
-
void quicklauncher_set_nblines(t_quicklauncher *quicklauncher, gint nb_lines);
#endif
More information about the Goodies-commits
mailing list