[elvystrac] r2305 - fixed bug when deleting panels twice (double connect of signals)
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Wed, 29 Dec 2010 10:05:36 +0100
Author: JirkaH
Date: 2010-12-29 10:05:36 +0100 (Wed, 29 Dec 2010)
New Revision: 2305
Modified:
trunk/client/elvys-client/Makefile
trunk/client/elvys-client/elvys-client.pro.user
trunk/client/elvys-client/src/Makefile
trunk/client/elvys-client/src/category.cpp
trunk/client/elvys-client/src/panel.cpp
trunk/client/elvys-client/src/pdfviewer.cpp
trunk/client/elvys-client/src/pdfviewer.h
Log:
fixed bug when deleting panels twice (double connect of signals)
Modified: trunk/client/elvys-client/Makefile
===================================================================
--- trunk/client/elvys-client/Makefile 2010-12-12 19:37:33 UTC (rev 2304)
+++ trunk/client/elvys-client/Makefile 2010-12-29 09:05:36 UTC (rev 2305)
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: elvys-client
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Mon Aug 16 16:37:16 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Dec 29 09:31:46 2010
# Project: elvys-client.pro
# Template: subdirs
# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ -unix
CONFIG+=release -o Makefile elvys-client.pro
@@ -103,6 +103,10 @@
install_subtargets: sub-src-install_subtargets FORCE
uninstall_subtargets: sub-src-uninstall_subtargets FORCE
+sub-src-check: src/$(MAKEFILE)
+ cd src/ && $(MAKE) check
+check: sub-src-check
+
mocclean: compiler_moc_header_clean compiler_moc_source_clean
mocables: compiler_moc_header_make_all compiler_moc_source_make_all
Modified: trunk/client/elvys-client/elvys-client.pro.user
===================================================================
--- trunk/client/elvys-client/elvys-client.pro.user 2010-12-12 19:37:33 UTC
(rev 2304)
+++ trunk/client/elvys-client/elvys-client.pro.user 2010-12-29 09:05:36 UTC
(rev 2305)
@@ -46,7 +46,7 @@
</data>
<data>
<variable>activebuildconfiguration</variable>
- <value type="QString">Debug</value>
+ <value type="QString">Release</value>
</data>
<data>
<variable>buildConfiguration-Debug</variable>
@@ -94,7 +94,7 @@
<value type="QString">CVS_RSH=ssh</value>
<value
type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-06HqdAQu23,guid=944a5402d74b158ebd467fa700000064</value>
<value type="QString">DESKTOP_SESSION=KDE-4</value>
- <value type="QString">DISPLAY=:0</value>
+ <value type="QString">DISPLAY=:0.0</value>
<value type="QString">DM_CONTROL=/var/run/xdmctl</value>
<value type="QString">EDITOR=/usr/bin/vim</value>
<value type="QString">FLTK_DOCDIR=/usr/share/doc/fltk-1.1.9-r1/html</value>
@@ -172,7 +172,7 @@
<value type="QString">CVS_RSH=ssh</value>
<value
type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-06HqdAQu23,guid=944a5402d74b158ebd467fa700000064</value>
<value type="QString">DESKTOP_SESSION=KDE-4</value>
- <value type="QString">DISPLAY=:0</value>
+ <value type="QString">DISPLAY=:0.0</value>
<value type="QString">DM_CONTROL=/var/run/xdmctl</value>
<value type="QString">EDITOR=/usr/bin/vim</value>
<value type="QString">FLTK_DOCDIR=/usr/share/doc/fltk-1.1.9-r1/html</value>
@@ -246,7 +246,7 @@
<value type="QString">CVS_RSH=ssh</value>
<value
type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-06HqdAQu23,guid=944a5402d74b158ebd467fa700000064</value>
<value type="QString">DESKTOP_SESSION=KDE-4</value>
- <value type="QString">DISPLAY=:0</value>
+ <value type="QString">DISPLAY=:0.0</value>
<value type="QString">DM_CONTROL=/var/run/xdmctl</value>
<value type="QString">EDITOR=/usr/bin/vim</value>
<value type="QString">FLTK_DOCDIR=/usr/share/doc/fltk-1.1.9-r1/html</value>
@@ -321,21 +321,22 @@
<value type="QString">ANT_HOME=/usr/share/ant</value>
<value type="QString">CLASSPATH=.</value>
<value type="QString">CONFIG_PROTECT=/usr/share/X11/xkb /var/lib/hsqldb
/usr/share/config /usr/kde/3.5/share/config /usr/kde/3.5/env
/usr/kde/3.5/shutdown</value>
- <value type="QString">CONFIG_PROTECT_MASK=/etc/sandbox.d /etc/env.d/java/
/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/
/etc/php/apache2-php5/ext-active/ /etc/udev/rules.d /etc/fonts/fonts.conf
/etc/gconf /etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c
/etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d
/etc/revdep-rebuild</value>
+ <value type="QString">CONFIG_PROTECT_MASK=/etc/sandbox.d /etc/env.d/java/
/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/
/etc/php/apache2-php5/ext-active/ /etc/fonts/fonts.conf /etc/gconf
/etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c
/etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d
/etc/revdep-rebuild</value>
<value type="QString">CVS_RSH=ssh</value>
- <value
type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-h7uNl0Vgrj,guid=dae8859370952b976d4b4c174b3671f0</value>
+ <value
type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-vGXmovdXRj,guid=1bd22b0d67222d4c00c1be240000006d</value>
<value type="QString">DESKTOP_SESSION=KDE-4</value>
<value type="QString">DISPLAY=:0.0</value>
<value type="QString">DM_CONTROL=/var/run/xdmctl</value>
<value type="QString">EDITOR=/usr/bin/vim</value>
- <value type="QString">FLTK_DOCDIR=/usr/share/doc/fltk-1.1.9/html</value>
+ <value type="QString">FLTK_DOCDIR=/usr/share/doc/fltk-1.1.9-r1/html</value>
+ <value type="QString">GCC_SPECS=</value>
<value type="QString">GDK_USE_XFT=1</value>
<value type="QString">GS_LIB=/home/keruom/.fonts</value>
<value
type="QString">GTK2_RC_FILES=/etc/gtk-2.0/gtkrc:/home/keruom/.gtkrc-2.0:/home/keruom/.gtkrc-2.0-kde4:/home/keruom/.kde4/share/config/gtkrc-2.0</value>
<value
type="QString">GTK_RC_FILES=/etc/gtk/gtkrc:/home/keruom/.gtkrc::/home/keruom/.kde4/share/config/gtkrc</value>
<value type="QString">HG=/usr/bin/hg</value>
<value type="QString">HOME=/home/keruom</value>
- <value
type="QString">INFOPATH=/usr/share/info:/usr/share/binutils-data/i686-pc-linux-gnu/2.18/info:/usr/share/gcc-data/i686-pc-linux-gnu/4.3.4/info:/usr/share/info/emacs-23</value>
+ <value
type="QString">INFOPATH=/usr/share/info:/usr/share/binutils-data/i686-pc-linux-gnu/2.20.1/info:/usr/share/gcc-data/i686-pc-linux-gnu/4.3.4/info:/usr/share/info/emacs-23</value>
<value
type="QString">JAVAC=/home/keruom/.gentoo/java-config-2/current-user-vm/bin/javac</value>
<value type="QString">JAVACC_HOME=/usr/share/javacc/</value>
<value
type="QString">JAVA_HOME=/home/keruom/.gentoo/java-config-2/current-user-vm</value>
@@ -350,7 +351,7 @@
<value type="QString">LESS=-R -M --shift 5</value>
<value type="QString">LESSOPEN=|lesspipe.sh %s</value>
<value type="QString">LOGNAME=keruom</value>
- <value
type="QString">MANPATH=/home/keruom/.gentoo/java-config-2/current-user-vm/man:/usr/local/share/man:/usr/share/man:/usr/share/binutils-data/i686-pc-linux-gnu/2.18/man:/usr/share/gcc-data/i686-pc-linux-gnu/4.3.4/man:/etc/java-config/system-vm/man/:/usr/lib/php5/man/:/usr/kde/3.5/share/man:/usr/qt/3/doc/man:/opt/opera/share/man</value>
+ <value
type="QString">MANPATH=/home/keruom/.gentoo/java-config-2/current-user-vm/man:/usr/local/share/man:/usr/share/man:/usr/share/binutils-data/i686-pc-linux-gnu/2.20.1/man:/usr/share/gcc-data/i686-pc-linux-gnu/4.3.4/man:/etc/java-config/system-vm/man/:/usr/lib/php5/man/:/usr/kde/3.5/share/man:/usr/qt/3/doc/man</value>
<value type="QString">OPENGL_PROFILE=nvidia</value>
<value type="QString">PAGER=/usr/bin/less</value>
<value
type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/i686-pc-linux-gnu/gcc-bin/4.3.4:/usr/kde/3.5/bin:/usr/qt/3/bin:/usr/libexec/gpc/i686-pc-linux-gnu/3.4:/usr/games/bin</value>
@@ -360,23 +361,25 @@
<value
type="QString">QT_PLUGIN_PATH=/home/keruom/.kde4/lib/kde4/plugins/:/usr/lib/kde4/plugins/</value>
<value type="QString">RUBYOPT=-rauto_gem</value>
<value type="QString">R_HOME=/usr/lib/R</value>
- <value
type="QString">SESSION_MANAGER=local/LenR61:@/tmp/.ICE-unix/6852,unix/LenR61:/tmp/.ICE-unix/6852</value>
- <value
type="QString">SGML_CATALOG_FILES=/etc/sgml/sgml-lite.cat:/etc/sgml/openjade-1.3.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/sgml-ent.cat</value>
+ <value
type="QString">SESSION_MANAGER=local/LenR61:@/tmp/.ICE-unix/7057,unix/LenR61:/tmp/.ICE-unix/7057</value>
+ <value
type="QString">SGML_CATALOG_FILES=/etc/sgml/sgml-lite.cat:/etc/sgml/openjade-1.3.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/xml-docbook-4.3.cat:/etc/sgml/xml-docbook-4.5.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/sgml-ent.cat:/etc/sgml/xml-docbook-4.4.cat:/etc/sgml/xml-docbook-4.2.cat</value>
<value type="QString">SHELL=/bin/bash</value>
<value type="QString">SHLVL=1</value>
<value type="QString">STRIGI_PLUGIN_PATH=/usr/lib/strigi:</value>
<value type="QString">TEXINPUTS=/usr/lib/ocaml/ocamldoc:</value>
<value type="QString">USER=keruom</value>
+ <value type="QString">VBOX_APP_HOME=/opt/VirtualBox</value>
<value type="QString">WINDOWPATH=7</value>
<value type="QString">XCURSOR_THEME=Oxygen_Black</value>
<value type="QString">XDG_CONFIG_DIRS=/etc/xdg</value>
<value
type="QString">XDG_DATA_DIRS=/usr/share:/usr/local/share:/usr/share</value>
- <value
type="QString">XDG_SESSION_COOKIE=d9adc4154425c11fe992e29e4870ae75-1261859312.208849-1513521714</value>
+ <value type="QString">XDG_MENU_PREFIX=kde-4.4-</value>
+ <value
type="QString">XDG_SESSION_COOKIE=d9adc4154425c11fe992e29e4870ae75-1283512208.241597-1099977798</value>
<value type="QString">XDM_MANAGED=method=classic</value>
- <value type="QString">_=/usr/bin/kdeinit4</value>
+ <value type="QString">_=/usr/lib/kde4/libexec/start_kdeinit_wrapper</value>
</valuelist>
<valuelist key="abstractProcess.arguments" type="QVariantList">
- <value
type="QString">/home/keruom/elvys/branches/client/elvys-client-tabs/elvys-client.pro</value>
+ <value
type="QString">/home/keruom/elvys/trunk/client/elvys-client/elvys-client.pro</value>
<value type="QString">-spec</value>
<value type="QString">linux-g++</value>
<value type="QString">-r</value>
@@ -384,7 +387,7 @@
</valuelist>
<value key="abstractProcess.command" type="QString">/usr/bin/qmake</value>
<value key="abstractProcess.enabled" type="bool">false</value>
- <value key="abstractProcess.workingDirectory"
type="QString">/home/keruom/elvys/branches/client/elvys-client-tabs</value>
+ <value key="abstractProcess.workingDirectory"
type="QString">/home/keruom/elvys/trunk/client/elvys-client</value>
<value key="buildConfiguration" type=""></value>
</valuemap>
</data>
@@ -396,21 +399,22 @@
<value type="QString">ANT_HOME=/usr/share/ant</value>
<value type="QString">CLASSPATH=.</value>
<value type="QString">CONFIG_PROTECT=/usr/share/X11/xkb /var/lib/hsqldb
/usr/share/config /usr/kde/3.5/share/config /usr/kde/3.5/env
/usr/kde/3.5/shutdown</value>
- <value type="QString">CONFIG_PROTECT_MASK=/etc/sandbox.d /etc/env.d/java/
/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/
/etc/php/apache2-php5/ext-active/ /etc/udev/rules.d /etc/fonts/fonts.conf
/etc/gconf /etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c
/etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d
/etc/revdep-rebuild</value>
+ <value type="QString">CONFIG_PROTECT_MASK=/etc/sandbox.d /etc/env.d/java/
/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/
/etc/php/apache2-php5/ext-active/ /etc/fonts/fonts.conf /etc/gconf
/etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c
/etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d
/etc/revdep-rebuild</value>
<value type="QString">CVS_RSH=ssh</value>
- <value
type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-h7uNl0Vgrj,guid=dae8859370952b976d4b4c174b3671f0</value>
+ <value
type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-vGXmovdXRj,guid=1bd22b0d67222d4c00c1be240000006d</value>
<value type="QString">DESKTOP_SESSION=KDE-4</value>
<value type="QString">DISPLAY=:0.0</value>
<value type="QString">DM_CONTROL=/var/run/xdmctl</value>
<value type="QString">EDITOR=/usr/bin/vim</value>
- <value type="QString">FLTK_DOCDIR=/usr/share/doc/fltk-1.1.9/html</value>
+ <value type="QString">FLTK_DOCDIR=/usr/share/doc/fltk-1.1.9-r1/html</value>
+ <value type="QString">GCC_SPECS=</value>
<value type="QString">GDK_USE_XFT=1</value>
<value type="QString">GS_LIB=/home/keruom/.fonts</value>
<value
type="QString">GTK2_RC_FILES=/etc/gtk-2.0/gtkrc:/home/keruom/.gtkrc-2.0:/home/keruom/.gtkrc-2.0-kde4:/home/keruom/.kde4/share/config/gtkrc-2.0</value>
<value
type="QString">GTK_RC_FILES=/etc/gtk/gtkrc:/home/keruom/.gtkrc::/home/keruom/.kde4/share/config/gtkrc</value>
<value type="QString">HG=/usr/bin/hg</value>
<value type="QString">HOME=/home/keruom</value>
- <value
type="QString">INFOPATH=/usr/share/info:/usr/share/binutils-data/i686-pc-linux-gnu/2.18/info:/usr/share/gcc-data/i686-pc-linux-gnu/4.3.4/info:/usr/share/info/emacs-23</value>
+ <value
type="QString">INFOPATH=/usr/share/info:/usr/share/binutils-data/i686-pc-linux-gnu/2.20.1/info:/usr/share/gcc-data/i686-pc-linux-gnu/4.3.4/info:/usr/share/info/emacs-23</value>
<value
type="QString">JAVAC=/home/keruom/.gentoo/java-config-2/current-user-vm/bin/javac</value>
<value type="QString">JAVACC_HOME=/usr/share/javacc/</value>
<value
type="QString">JAVA_HOME=/home/keruom/.gentoo/java-config-2/current-user-vm</value>
@@ -425,7 +429,7 @@
<value type="QString">LESS=-R -M --shift 5</value>
<value type="QString">LESSOPEN=|lesspipe.sh %s</value>
<value type="QString">LOGNAME=keruom</value>
- <value
type="QString">MANPATH=/home/keruom/.gentoo/java-config-2/current-user-vm/man:/usr/local/share/man:/usr/share/man:/usr/share/binutils-data/i686-pc-linux-gnu/2.18/man:/usr/share/gcc-data/i686-pc-linux-gnu/4.3.4/man:/etc/java-config/system-vm/man/:/usr/lib/php5/man/:/usr/kde/3.5/share/man:/usr/qt/3/doc/man:/opt/opera/share/man</value>
+ <value
type="QString">MANPATH=/home/keruom/.gentoo/java-config-2/current-user-vm/man:/usr/local/share/man:/usr/share/man:/usr/share/binutils-data/i686-pc-linux-gnu/2.20.1/man:/usr/share/gcc-data/i686-pc-linux-gnu/4.3.4/man:/etc/java-config/system-vm/man/:/usr/lib/php5/man/:/usr/kde/3.5/share/man:/usr/qt/3/doc/man</value>
<value type="QString">OPENGL_PROFILE=nvidia</value>
<value type="QString">PAGER=/usr/bin/less</value>
<value
type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/i686-pc-linux-gnu/gcc-bin/4.3.4:/usr/kde/3.5/bin:/usr/qt/3/bin:/usr/libexec/gpc/i686-pc-linux-gnu/3.4:/usr/games/bin</value>
@@ -435,20 +439,22 @@
<value
type="QString">QT_PLUGIN_PATH=/home/keruom/.kde4/lib/kde4/plugins/:/usr/lib/kde4/plugins/</value>
<value type="QString">RUBYOPT=-rauto_gem</value>
<value type="QString">R_HOME=/usr/lib/R</value>
- <value
type="QString">SESSION_MANAGER=local/LenR61:@/tmp/.ICE-unix/6852,unix/LenR61:/tmp/.ICE-unix/6852</value>
- <value
type="QString">SGML_CATALOG_FILES=/etc/sgml/sgml-lite.cat:/etc/sgml/openjade-1.3.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/sgml-ent.cat</value>
+ <value
type="QString">SESSION_MANAGER=local/LenR61:@/tmp/.ICE-unix/7057,unix/LenR61:/tmp/.ICE-unix/7057</value>
+ <value
type="QString">SGML_CATALOG_FILES=/etc/sgml/sgml-lite.cat:/etc/sgml/openjade-1.3.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/xml-docbook-4.3.cat:/etc/sgml/xml-docbook-4.5.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/sgml-ent.cat:/etc/sgml/xml-docbook-4.4.cat:/etc/sgml/xml-docbook-4.2.cat</value>
<value type="QString">SHELL=/bin/bash</value>
<value type="QString">SHLVL=1</value>
<value type="QString">STRIGI_PLUGIN_PATH=/usr/lib/strigi:</value>
<value type="QString">TEXINPUTS=/usr/lib/ocaml/ocamldoc:</value>
<value type="QString">USER=keruom</value>
+ <value type="QString">VBOX_APP_HOME=/opt/VirtualBox</value>
<value type="QString">WINDOWPATH=7</value>
<value type="QString">XCURSOR_THEME=Oxygen_Black</value>
<value type="QString">XDG_CONFIG_DIRS=/etc/xdg</value>
<value
type="QString">XDG_DATA_DIRS=/usr/share:/usr/local/share:/usr/share</value>
- <value
type="QString">XDG_SESSION_COOKIE=d9adc4154425c11fe992e29e4870ae75-1261859312.208849-1513521714</value>
+ <value type="QString">XDG_MENU_PREFIX=kde-4.4-</value>
+ <value
type="QString">XDG_SESSION_COOKIE=d9adc4154425c11fe992e29e4870ae75-1283512208.241597-1099977798</value>
<value type="QString">XDM_MANAGED=method=classic</value>
- <value type="QString">_=/usr/bin/kdeinit4</value>
+ <value type="QString">_=/usr/lib/kde4/libexec/start_kdeinit_wrapper</value>
</valuelist>
<value key="abstractProcess.IgnoreReturnValue" type="bool">false</value>
<valuelist key="abstractProcess.arguments" type="QVariantList">
@@ -456,7 +462,7 @@
</valuelist>
<value key="abstractProcess.command" type="QString">/usr/bin/make</value>
<value key="abstractProcess.enabled" type="bool">true</value>
- <value key="abstractProcess.workingDirectory"
type="QString">/home/keruom/elvys/branches/client/elvys-client-tabs</value>
+ <value key="abstractProcess.workingDirectory"
type="QString">/home/keruom/elvys/trunk/client/elvys-client</value>
</valuemap>
</data>
<data>
@@ -467,21 +473,22 @@
<value type="QString">ANT_HOME=/usr/share/ant</value>
<value type="QString">CLASSPATH=.</value>
<value type="QString">CONFIG_PROTECT=/usr/share/X11/xkb /var/lib/hsqldb
/usr/share/config /usr/kde/3.5/share/config /usr/kde/3.5/env
/usr/kde/3.5/shutdown</value>
- <value type="QString">CONFIG_PROTECT_MASK=/etc/sandbox.d /etc/env.d/java/
/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/
/etc/php/apache2-php5/ext-active/ /etc/udev/rules.d /etc/fonts/fonts.conf
/etc/gconf /etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c
/etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d
/etc/revdep-rebuild</value>
+ <value type="QString">CONFIG_PROTECT_MASK=/etc/sandbox.d /etc/env.d/java/
/etc/php/cli-php5/ext-active/ /etc/php/cgi-php5/ext-active/
/etc/php/apache2-php5/ext-active/ /etc/fonts/fonts.conf /etc/gconf
/etc/terminfo /etc/ca-certificates.conf /etc/texmf/web2c
/etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d
/etc/revdep-rebuild</value>
<value type="QString">CVS_RSH=ssh</value>
- <value
type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-h7uNl0Vgrj,guid=dae8859370952b976d4b4c174b3671f0</value>
+ <value
type="QString">DBUS_SESSION_BUS_ADDRESS=unix:abstract=/tmp/dbus-06HqdAQu23,guid=944a5402d74b158ebd467fa700000064</value>
<value type="QString">DESKTOP_SESSION=KDE-4</value>
<value type="QString">DISPLAY=:0.0</value>
<value type="QString">DM_CONTROL=/var/run/xdmctl</value>
<value type="QString">EDITOR=/usr/bin/vim</value>
- <value type="QString">FLTK_DOCDIR=/usr/share/doc/fltk-1.1.9/html</value>
+ <value type="QString">FLTK_DOCDIR=/usr/share/doc/fltk-1.1.9-r1/html</value>
+ <value type="QString">GCC_SPECS=</value>
<value type="QString">GDK_USE_XFT=1</value>
<value type="QString">GS_LIB=/home/keruom/.fonts</value>
<value
type="QString">GTK2_RC_FILES=/etc/gtk-2.0/gtkrc:/home/keruom/.gtkrc-2.0:/home/keruom/.gtkrc-2.0-kde4:/home/keruom/.kde4/share/config/gtkrc-2.0</value>
<value
type="QString">GTK_RC_FILES=/etc/gtk/gtkrc:/home/keruom/.gtkrc::/home/keruom/.kde4/share/config/gtkrc</value>
<value type="QString">HG=/usr/bin/hg</value>
<value type="QString">HOME=/home/keruom</value>
- <value
type="QString">INFOPATH=/usr/share/info:/usr/share/binutils-data/i686-pc-linux-gnu/2.18/info:/usr/share/gcc-data/i686-pc-linux-gnu/4.3.4/info:/usr/share/info/emacs-23</value>
+ <value
type="QString">INFOPATH=/usr/share/info:/usr/share/binutils-data/i686-pc-linux-gnu/2.20.1/info:/usr/share/gcc-data/i686-pc-linux-gnu/4.3.4/info:/usr/share/info/emacs-23</value>
<value
type="QString">JAVAC=/home/keruom/.gentoo/java-config-2/current-user-vm/bin/javac</value>
<value type="QString">JAVACC_HOME=/usr/share/javacc/</value>
<value
type="QString">JAVA_HOME=/home/keruom/.gentoo/java-config-2/current-user-vm</value>
@@ -496,7 +503,7 @@
<value type="QString">LESS=-R -M --shift 5</value>
<value type="QString">LESSOPEN=|lesspipe.sh %s</value>
<value type="QString">LOGNAME=keruom</value>
- <value
type="QString">MANPATH=/home/keruom/.gentoo/java-config-2/current-user-vm/man:/usr/local/share/man:/usr/share/man:/usr/share/binutils-data/i686-pc-linux-gnu/2.18/man:/usr/share/gcc-data/i686-pc-linux-gnu/4.3.4/man:/etc/java-config/system-vm/man/:/usr/lib/php5/man/:/usr/kde/3.5/share/man:/usr/qt/3/doc/man:/opt/opera/share/man</value>
+ <value
type="QString">MANPATH=/home/keruom/.gentoo/java-config-2/current-user-vm/man:/usr/local/share/man:/usr/share/man:/usr/share/binutils-data/i686-pc-linux-gnu/2.20.1/man:/usr/share/gcc-data/i686-pc-linux-gnu/4.3.4/man:/etc/java-config/system-vm/man/:/usr/lib/php5/man/:/usr/kde/3.5/share/man:/usr/qt/3/doc/man</value>
<value type="QString">OPENGL_PROFILE=nvidia</value>
<value type="QString">PAGER=/usr/bin/less</value>
<value
type="QString">PATH=/usr/bin:/usr/local/bin:/usr/bin:/bin:/opt/bin:/usr/i686-pc-linux-gnu/gcc-bin/4.3.4:/usr/kde/3.5/bin:/usr/qt/3/bin:/usr/libexec/gpc/i686-pc-linux-gnu/3.4:/usr/games/bin</value>
@@ -506,20 +513,22 @@
<value
type="QString">QT_PLUGIN_PATH=/home/keruom/.kde4/lib/kde4/plugins/:/usr/lib/kde4/plugins/</value>
<value type="QString">RUBYOPT=-rauto_gem</value>
<value type="QString">R_HOME=/usr/lib/R</value>
- <value
type="QString">SESSION_MANAGER=local/LenR61:@/tmp/.ICE-unix/6852,unix/LenR61:/tmp/.ICE-unix/6852</value>
- <value
type="QString">SGML_CATALOG_FILES=/etc/sgml/sgml-lite.cat:/etc/sgml/openjade-1.3.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/sgml-ent.cat</value>
+ <value
type="QString">SESSION_MANAGER=local/LenR61:@/tmp/.ICE-unix/7117,unix/LenR61:/tmp/.ICE-unix/7117</value>
+ <value
type="QString">SGML_CATALOG_FILES=/etc/sgml/sgml-lite.cat:/etc/sgml/openjade-1.3.2.cat:/etc/sgml/dsssl-docbook-stylesheets.cat:/etc/sgml/sgml-docbook.cat:/etc/sgml/xml-docbook-4.3.cat:/etc/sgml/xml-docbook-4.5.cat:/etc/sgml/sgml-docbook-3.1.cat:/etc/sgml/sgml-ent.cat:/etc/sgml/xml-docbook-4.4.cat:/etc/sgml/xml-docbook-4.2.cat</value>
<value type="QString">SHELL=/bin/bash</value>
<value type="QString">SHLVL=1</value>
<value type="QString">STRIGI_PLUGIN_PATH=/usr/lib/strigi:</value>
<value type="QString">TEXINPUTS=/usr/lib/ocaml/ocamldoc:</value>
<value type="QString">USER=keruom</value>
+ <value type="QString">VBOX_APP_HOME=/opt/VirtualBox</value>
<value type="QString">WINDOWPATH=7</value>
<value type="QString">XCURSOR_THEME=Oxygen_Black</value>
<value type="QString">XDG_CONFIG_DIRS=/etc/xdg</value>
<value
type="QString">XDG_DATA_DIRS=/usr/share:/usr/local/share:/usr/share</value>
- <value
type="QString">XDG_SESSION_COOKIE=d9adc4154425c11fe992e29e4870ae75-1261859312.208849-1513521714</value>
+ <value type="QString">XDG_MENU_PREFIX=kde-4.4-</value>
+ <value
type="QString">XDG_SESSION_COOKIE=d9adc4154425c11fe992e29e4870ae75-1282888187.308281-1037105945</value>
<value type="QString">XDM_MANAGED=method=classic</value>
- <value type="QString">_=/usr/bin/kdeinit4</value>
+ <value type="QString">_=/usr/lib/kde4/libexec/start_kdeinit_wrapper</value>
</valuelist>
<value key="abstractProcess.IgnoreReturnValue" type="bool">true</value>
<valuelist key="abstractProcess.arguments" type="QVariantList">
@@ -528,7 +537,7 @@
</valuelist>
<value key="abstractProcess.command" type="QString">/usr/bin/make</value>
<value key="abstractProcess.enabled" type="bool">true</value>
- <value key="abstractProcess.workingDirectory"
type="QString">/home/keruom/elvys/branches/client/elvys-client-tabs</value>
+ <value key="abstractProcess.workingDirectory"
type="QString">/home/keruom/elvys/trunk/client/elvys-client</value>
<value key="cleanConfig" type="bool">true</value>
<valuelist key="makeargs" type="QVariantList">
<value type="QString">clean</value>
Modified: trunk/client/elvys-client/src/Makefile
===================================================================
--- trunk/client/elvys-client/src/Makefile 2010-12-12 19:37:33 UTC (rev
2304)
+++ trunk/client/elvys-client/src/Makefile 2010-12-29 09:05:36 UTC (rev
2305)
@@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: ../bin/elvys-client
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Fri Aug 27 16:01:51 2010
+# Generated by qmake (2.01a) (Qt 4.6.3) on: Wed Dec 29 09:31:46 2010
# Project: src.pro
# Template: app
# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ -unix
CONFIG+=release -o Makefile src.pro
@@ -367,6 +367,8 @@
-$(DEL_FILE) Makefile
+check: first
+
mocclean: compiler_moc_header_clean compiler_moc_source_clean
mocables: compiler_moc_header_make_all compiler_moc_source_make_all
@@ -1423,7 +1425,11 @@
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o hasher.o hasher.cpp
pdfdimension.o: pdfdimension.cpp pdfdimension.h \
- constants.h
+ constants.h \
+ pdffiller.h \
+ document.h \
+ pdfpage.h \
+ pageselector.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o pdfdimension.o pdfdimension.cpp
pdfcommondocument.o: pdfcommondocument.cpp pdfcommondocument.h \
Modified: trunk/client/elvys-client/src/category.cpp
===================================================================
--- trunk/client/elvys-client/src/category.cpp 2010-12-12 19:37:33 UTC (rev
2304)
+++ trunk/client/elvys-client/src/category.cpp 2010-12-29 09:05:36 UTC (rev
2305)
@@ -21,9 +21,8 @@
dummyPanel = new Panel(DUMMY_PANEL_ID);
docParser = new XMLPanelDocParser();
connect(this, SIGNAL(docuMaintananceStarted()), this,
SLOT(docMaintananceStarted()));
- connect(this, SIGNAL(docuMaintananceFinished()), this,
SLOT(docMaintananceFinished()));
+ connect(this, SIGNAL(docuMaintananceFinished()), this,
SLOT(docMaintananceFinished()));
connect(layoutMaint, SIGNAL(maintananceFinished()), this,
SLOT(showAndHidePanels())); // make sure that after layout change we will have
spare panel
- connect(this, SIGNAL(docuMaintananceFinished()), this,
SLOT(docMaintananceFinished()));
connect(layoutMaint, SIGNAL(layoutAboutToChange()), this,
SLOT(destroyLayout()));
@@ -442,7 +441,7 @@
}
-/** Slot to be called when documentConfig reading start. Together with
=docMaintananceFinished function, it serves for keeping track
+/** Slot to be called when documentConfig reading starts. Together with
=docMaintananceFinished function, it serves for keeping track
of panels which are not included in new document config, ie. panels which
should be removed.
*/
@@ -458,8 +457,9 @@
void Category::docMaintananceFinished() {
Panel * panel;
-
+ qDebug() << "looking for old panels";
foreach( panel, panels ) { // make sure that every panel was found in
configuration - otherwise delete it
+ qDebug() << "inspecting panel id:" << panel; //->id();
if ( panelsFound.find(panel->id()) == panelsFound.end() ) { //
delete candidate
if (panel->id() != SPARE_PANEL_ID) {
deletePanel(panel->id());
Modified: trunk/client/elvys-client/src/panel.cpp
===================================================================
--- trunk/client/elvys-client/src/panel.cpp 2010-12-12 19:37:33 UTC (rev
2304)
+++ trunk/client/elvys-client/src/panel.cpp 2010-12-29 09:05:36 UTC (rev
2305)
@@ -180,6 +180,7 @@
QRectF rectF;
int x, y, w, h;
+ qDebug() << "resizing documents for panel" << objectName();
documents = findChildren<Document *>();
foreach (document, documents) {
Modified: trunk/client/elvys-client/src/pdfviewer.cpp
===================================================================
--- trunk/client/elvys-client/src/pdfviewer.cpp 2010-12-12 19:37:33 UTC (rev
2304)
+++ trunk/client/elvys-client/src/pdfviewer.cpp 2010-12-29 09:05:36 UTC (rev
2305)
@@ -22,14 +22,30 @@
timeOpened = 0;
scroll = NULL;
- //setParent(parent);
pageKeyBase = "PDFVIEWER";
+
+ timer = new QTimer();
+ timer->setSingleShot(true);
+ connect(timer, SIGNAL(timeout()), this, SLOT(getFirstPageSmall()));
+ scheduleBuffer();
}
void PDFViewer::getFirstPageSmall() {
emit getPage(-1, size(), getPageKey(size(), SMALL_PAGE_IDENTIFIER));
}
+/** Schedules buffering.
+ */
+
+void PDFViewer::scheduleBuffer() {
+ if ( isVisible() == false ) {
+ int when = random() % 100; //100second is a maxium period of
time to wait with buffering
+ qDebug() << "Scheduling buffering of small page in " << when
+1 << "seconds";
+ timer->start((when+1)*1000);
+ }
+}
+
+
void PDFViewer::pageReady(PageSelector selector, PDFPage * page) {
if ( ! selector.desc.contains(pageKeyBase)) { //this page was not
requested by us
return;
@@ -401,6 +417,7 @@
update();
//getFirstPageSmall();
}
+ qDebug() << "Resize event of PDF viewer" << event->oldSize() << size()
<< "geometry:" << normalGeometry();
}
Modified: trunk/client/elvys-client/src/pdfviewer.h
===================================================================
--- trunk/client/elvys-client/src/pdfviewer.h 2010-12-12 19:37:33 UTC (rev
2304)
+++ trunk/client/elvys-client/src/pdfviewer.h 2010-12-29 09:05:36 UTC (rev
2305)
@@ -4,6 +4,7 @@
#include <QScrollArea>
#include <QList>
+#include <QTimer>
#include <QRect>
#include "pdfzoomed.h"
@@ -44,19 +45,23 @@
virtual void focusInEvent ( QFocusEvent * event );
virtual void focusOutEvent ( QFocusEvent * event );
- private:
+ private slots:
void getFirstPageSmall();
+
+ private:
QRect getScrollGeometry();
virtual void zoom();
virtual void unzoom();
virtual void totallyUnZoom();
virtual void showPDF();
+ void scheduleBuffer();
int adjustScrollBar(QScrollBar * scrollBar, double factor);
void scrollByOnePage(ElvysNs::Direction);
int scaled; ///< current level of scaling. 0 means zoomed to
"normal" size
PDFZoomed * pdfZoomed;
+ QTimer * timer;
QScrollArea * scroll;
QPixmap myPixmap;
Other related posts:
- » [elvystrac] r2305 - fixed bug when deleting panels twice (double connect of signals) - elvys
