Hello community, here is the log from the commit of package kdbg checked in at Tue Dec 19 00:46:36 CET 2006. -------- --- KDE/kdbg/kdbg.changes 2006-05-29 09:55:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdbg/kdbg.changes 2006-12-18 22:25:15.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Dec 18 22:24:41 CET 2006 - stbinner@suse.de + +- 2.0.5 update + * Appearance of the main window for first-time users was improved. + * Improve file handling when the srcdir != builddir. + * Show value popups for members of 'this'. + * Allow user to give redirections in Program Arguments dialog. + +------------------------------------------------------------------- Old: ---- kdbg-2.0.4.tar.gz New: ---- kdbg-2.0.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdbg.spec ++++++ --- /var/tmp/diff_new_pack.RMm0hh/_old 2006-12-19 00:46:20.000000000 +0100 +++ /var/tmp/diff_new_pack.RMm0hh/_new 2006-12-19 00:46:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdbg (Version 2.0.4) +# spec file for package kdbg (Version 2.0.5) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,11 +12,11 @@ Name: kdbg BuildRequires: kdelibs3-devel -License: GPL +License: GNU General Public License (GPL) Group: Development/Tools/Debuggers Summary: Graphical User Interface for GDB Requires: gdb -Version: 2.0.4 +Version: 2.0.5 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://members.nextra.at/johsixt/kdbg.html @@ -60,8 +60,15 @@ /opt/kde3/share/applications/kde/*.desktop /opt/kde3/share/apps/kdbg /opt/kde3/share/icons/* +/opt/kde3/share/config/kdbgrc %changelog -n kdbg +* Mon Dec 18 2006 - stbinner@suse.de +- 2.0.5 update + * Appearance of the main window for first-time users was improved. + * Improve file handling when the srcdir != builddir. + * Show value popups for members of 'this'. + * Allow user to give redirections in Program Arguments dialog. * Mon May 29 2006 - stbinner@suse.de - 2.0.4 update * Fixed encoding of the Czech translation @@ -182,7 +189,7 @@ - ran old prepare_spec on spec file to switch to new prepare_spec. * Fri Aug 27 1999 - kettner@suse.de - New version 1.0beta2 -- Moved menu item to Applications. + - Moved menu item to Applications. * Thu Aug 05 1999 - kettner@suse.de - New version 1.0beta1 * Thu Jul 01 1999 - kettner@suse.de ++++++ kdbg-2.0.4.tar.gz -> kdbg-2.0.5.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/ChangeLog new/kdbg-2.0.5/ChangeLog --- old/kdbg-2.0.4/ChangeLog 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/ChangeLog 2006-12-17 17:47:59.000000000 +0100 @@ -1,3 +1,8 @@ +Later versions + + Please use the gitweb log at http://repo.or.cz/w/kdbg.git to browse + the changes. + Version 2.0.4 Fixed encoding of the Czech translation thanks to Jakub Galgonek. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/Makefile.in new/kdbg-2.0.5/Makefile.in --- old/kdbg-2.0.4/Makefile.in 2006-05-27 19:55:18.000000000 +0200 +++ new/kdbg-2.0.5/Makefile.in 2006-12-17 20:14:57.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 1.406 $ # @configure_input@ @@ -804,7 +804,7 @@ #>+ 2 -KDE_DIST=subdirs Makefile.in configure.files config.h.in configure.in configure.in.mid kdbg.spec aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 autogen.sh +KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in configure.in.mid kdbg.spec aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 autogen.sh #>+ 2 docs-am: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/aclocal.m4 new/kdbg-2.0.5/aclocal.m4 --- old/kdbg-2.0.4/aclocal.m4 2006-05-27 19:53:51.000000000 +0200 +++ new/kdbg-2.0.5/aclocal.m4 2006-12-17 18:28:02.000000000 +0100 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. @@ -28,7 +28,7 @@ # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.5])]) + [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/admin/cvs.sh new/kdbg-2.0.5/admin/cvs.sh --- old/kdbg-2.0.4/admin/cvs.sh 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/admin/cvs.sh 2006-09-25 22:49:49.000000000 +0200 @@ -30,7 +30,7 @@ required_autoconf_version="2.53 or newer" AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1` case $AUTOCONF_VERSION in - Autoconf*2.5* | autoconf*2.5* ) : ;; + Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;; "" ) echo "*** AUTOCONF NOT FOUND!." echo "*** KDE requires autoconf $required_autoconf_version" @@ -45,7 +45,7 @@ AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1` case $AUTOHEADER_VERSION in - Autoconf*2.5* | autoheader*2.5* ) : ;; + Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;; "" ) echo "*** AUTOHEADER NOT FOUND!." echo "*** KDE requires autoheader $required_autoconf_version" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/configure new/kdbg-2.0.5/configure --- old/kdbg-2.0.4/configure 2006-05-27 19:53:56.000000000 +0200 +++ new/kdbg-2.0.5/configure 2006-12-17 18:28:07.000000000 +0100 @@ -1950,7 +1950,7 @@ # Define the identity of the package. PACKAGE=kdbg - VERSION=2.0.4 + VERSION=2.0.5 cat >>confdefs.h <<_ACEOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/configure.in new/kdbg-2.0.5/configure.in --- old/kdbg-2.0.4/configure.in 2006-05-27 19:53:44.000000000 +0200 +++ new/kdbg-2.0.5/configure.in 2006-12-17 18:27:56.000000000 +0100 @@ -40,7 +40,7 @@ AC_ARG_PROGRAM dnl Automake doc recommends to do this only here. (Janos) -AM_INIT_AUTOMAKE(kdbg, 2.0.4) dnl searches for some needed programs +AM_INIT_AUTOMAKE(kdbg, 2.0.5) dnl searches for some needed programs KDE_SET_PREFIX diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/configure.in.in new/kdbg-2.0.5/configure.in.in --- old/kdbg-2.0.4/configure.in.in 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/configure.in.in 2006-12-17 17:49:47.000000000 +0100 @@ -1,4 +1,4 @@ #MIN_CONFIG -AM_INIT_AUTOMAKE(kdbg, 2.0.4) +AM_INIT_AUTOMAKE(kdbg, 2.0.5) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/Makefile.am new/kdbg-2.0.5/kdbg/Makefile.am --- old/kdbg-2.0.4/kdbg/Makefile.am 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/Makefile.am 2006-09-23 22:56:48.000000000 +0200 @@ -95,6 +95,9 @@ xdg_apps_DATA = kdbg.desktop +configdir = $(kde_confdir) +config_DATA = kdbgrc + rcdir = $(kde_datadir)/kdbg rc_DATA = kdbgui.rc @@ -110,4 +113,4 @@ $$LIST && mv messages.po $(top_srcdir)/po/kdbg.pot; \ rm -f rc.cpp -EXTRA_DIST = kdbg.desktop +EXTRA_DIST = kdbg.desktop kdbgrc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/Makefile.in new/kdbg-2.0.5/kdbg/Makefile.in --- old/kdbg-2.0.4/kdbg/Makefile.in 2006-05-27 19:55:18.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/Makefile.in 2006-12-17 20:14:57.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 1.406 $ # @configure_input@ @@ -17,8 +17,6 @@ -SOURCES = $(kdbg_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -54,8 +52,8 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rcdir)" \ - "$(DESTDIR)$(xdg_appsdir)" +am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" \ + "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(xdg_appsdir)" binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am_kdbg_OBJECTS = pgmargs.$(OBJEXT) procattach.$(OBJEXT) \ @@ -128,9 +126,10 @@ *) f=$$p;; \ esac; am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +configDATA_INSTALL = $(INSTALL_DATA) rcDATA_INSTALL = $(INSTALL_DATA) xdg_appsDATA_INSTALL = $(INSTALL_DATA) -DATA = $(rc_DATA) $(xdg_apps_DATA) +DATA = $(config_DATA) $(rc_DATA) $(xdg_apps_DATA) HEADERS = $(noinst_HEADERS) ETAGS = etags CTAGS = ctags @@ -481,9 +480,11 @@ # them while "make distclean", use DISTCLEANFILES CLEANFILES = $(kdbg_METASOURCES) xdg_apps_DATA = kdbg.desktop +configdir = $(kde_confdir) +config_DATA = kdbgrc rcdir = $(kde_datadir)/kdbg rc_DATA = kdbgui.rc -EXTRA_DIST = kdbg.desktop +EXTRA_DIST = kdbg.desktop kdbgrc #>- all: all-recursive #>+ 1 all: docs-am all-recursive @@ -626,6 +627,23 @@ distclean-libtool: -rm -f libtool uninstall-info-am: +install-configDATA: $(config_DATA) + @$(NORMAL_INSTALL) + test -z "$(configdir)" || $(mkdir_p) "$(DESTDIR)$(configdir)" + @list='$(config_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(configDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(configdir)/$$f'"; \ + $(configDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(configdir)/$$f"; \ + done + +uninstall-configDATA: + @$(NORMAL_UNINSTALL) + @list='$(config_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(configdir)/$$f'"; \ + rm -f "$(DESTDIR)$(configdir)/$$f"; \ + done install-rcDATA: $(rc_DATA) @$(NORMAL_INSTALL) test -z "$(rcdir)" || $(mkdir_p) "$(DESTDIR)$(rcdir)" @@ -840,7 +858,7 @@ all-am: Makefile $(PROGRAMS) $(DATA) $(HEADERS) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(xdg_appsdir)"; do \ + for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(rcdir)" "$(DESTDIR)$(xdg_appsdir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-recursive @@ -892,7 +910,8 @@ info-am: -install-data-am: install-rcDATA install-xdg_appsDATA +install-data-am: install-configDATA install-rcDATA \ + install-xdg_appsDATA install-exec-am: install-binPROGRAMS @@ -920,8 +939,8 @@ ps-am: -uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-rcDATA \ - uninstall-xdg_appsDATA +uninstall-am: uninstall-binPROGRAMS uninstall-configDATA \ + uninstall-info-am uninstall-rcDATA uninstall-xdg_appsDATA uninstall-info: uninstall-info-recursive @@ -931,16 +950,16 @@ distclean-compile distclean-generic distclean-libtool \ distclean-recursive distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-binPROGRAMS \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-rcDATA \ - install-strip install-xdg_appsDATA installcheck \ + install-configDATA install-data install-data-am install-exec \ + install-exec-am install-info install-info-am install-man \ + install-rcDATA install-strip install-xdg_appsDATA installcheck \ installcheck-am installdirs installdirs-am maintainer-clean \ maintainer-clean-generic maintainer-clean-recursive \ mostlyclean mostlyclean-compile mostlyclean-generic \ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \ tags tags-recursive uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-info-am uninstall-rcDATA \ - uninstall-xdg_appsDATA + uninstall-binPROGRAMS uninstall-configDATA uninstall-info-am \ + uninstall-rcDATA uninstall-xdg_appsDATA # Make messages.po and move it to $(top_srcdir)/po. "make merge" there. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/dbgdriver.h new/kdbg-2.0.5/kdbg/dbgdriver.h --- old/kdbg-2.0.4/kdbg/dbgdriver.h 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/dbgdriver.h 2006-11-19 20:43:50.000000000 +0100 @@ -276,7 +276,6 @@ virtual QStringList boolOptionList() const = 0; virtual bool startup(QString cmdStr); - void dequeueCmdByVar(VarTree* var); void setLogFileName(const QString& fname) { m_logFileName = fname; } protected: @@ -569,6 +568,9 @@ QString m_logFileName; QFile m_logFile; +public slots: + void dequeueCmdByVar(VarTree* var); + protected slots: virtual void slotReceiveOutput(KProcess*, char* buffer, int buflen); virtual void slotCommandRead(KProcess*); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/dbgmainwnd.cpp new/kdbg-2.0.5/kdbg/dbgmainwnd.cpp --- old/kdbg-2.0.4/kdbg/dbgmainwnd.cpp 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/dbgmainwnd.cpp 2006-09-26 20:57:43.000000000 +0200 @@ -217,7 +217,7 @@ KStdAction::showStatusbar(this, SLOT(slotViewStatusbar()), actionCollection()); // view menu - (void)new KToggleAction(i18n("&Find"), "find", 0, m_filesWindow, + (void)new KToggleAction(i18n("&Find"), "find", CTRL+Key_F, m_filesWindow, SLOT(slotViewFind()), actionCollection(), "view_find"); i18n("Source &code"); @@ -401,6 +401,28 @@ fixDockConfig(config, true); // upgrade readDockConfig(config); + // Workaround bug #87787: KDockManager stores the titles of the KDockWidgets + // in the config files, although they are localized: + // If the user changes the language, the titles remain in the previous language. + struct { QString text; QWidget* w; } dw[] = { + { i18n("Stack"), m_btWindow }, + { i18n("Locals"), m_localVariables }, + { i18n("Watches"), m_watches }, + { i18n("Registers"), m_registers }, + { i18n("Breakpoints"), m_bpTable }, + { i18n("Threads"), m_threads }, + { i18n("Output"), m_ttyWindow }, + { i18n("Memory"), m_memoryWindow } + }; + for (int i = 0; i < sizeof(dw)/sizeof(dw[0]); i++) + { + KDockWidget* w = dockParent(dw[i].w); + w->setTabPageLabel(dw[i].text); + // this actually changes the captions in the tabs: + QEvent ev(QEvent::CaptionChange); + w->event(&ev); + } + m_recentExecAction->loadEntries(config, RecentExecutables); DebuggerMainWndBase::restoreSettings(config); @@ -827,9 +849,18 @@ void DebuggerMainWnd::slotFileOpen() { - QString fileName = myGetFileName(i18n("Open"), - m_lastDirectory, - makeSourceFilter(), this); + // start browsing in the active file's directory + // fall back to last used directory (executable) + QString dir = m_lastDirectory; + QString fileName = m_filesWindow->activeFileName(); + if (!fileName.isEmpty()) { + QFileInfo fi(fileName); + dir = fi.dirPath(); + } + + fileName = myGetFileName(i18n("Open"), + dir, + makeSourceFilter(), this); if (!fileName.isEmpty()) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/debugger.cpp new/kdbg-2.0.5/kdbg/debugger.cpp --- old/kdbg-2.0.4/kdbg/debugger.cpp 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/debugger.cpp 2006-11-19 20:43:50.000000000 +0100 @@ -121,6 +121,10 @@ connect(driver, SIGNAL(inferiorRunning()), SLOT(slotInferiorRunning())); connect(driver, SIGNAL(enterIdleState()), SLOT(backgroundUpdate())); connect(driver, SIGNAL(enterIdleState()), SIGNAL(updateUI())); + connect(&m_localVariables, SIGNAL(removingItem(VarTree*)), + driver, SLOT(dequeueCmdByVar(VarTree*))); + connect(&m_watchVariables, SIGNAL(removingItem(VarTree*)), + driver, SLOT(dequeueCmdByVar(VarTree*))); // create the program settings object openProgramConfig(name); @@ -1316,8 +1320,10 @@ // old variable not in the new variables TRACE(QString("old var deleted: ") + n); v = m_localVariables.topLevelExprByName(n); - removeExpr(&m_localVariables, v); - if (v != 0) repaintNeeded = true; + if (v != 0) { + m_localVariables.removeExpr(v); + repaintNeeded = true; + } } else { // variable in both old and new lists: update TRACE(QString("update var: ") + n); @@ -1775,18 +1781,6 @@ cmd->m_exprWnd = wnd; } -/* removes expression from window */ -void KDebugger::removeExpr(ExprWnd* wnd, VarTree* var) -{ - if (var == 0) - return; - - // must remove any references to var from command queues - m_d->dequeueCmdByVar(var); - - wnd->removeExpr(var); -} - void KDebugger::handleSharedLibs(const char* output) { // delete all known libraries @@ -1865,7 +1859,7 @@ if (m_watchEvalExpr.findRef(item) >= 0) { m_watchEvalExpr.remove(); } - removeExpr(&m_watchVariables, item); + m_watchVariables.removeExpr(item); // item is invalid at this point! } @@ -2086,8 +2080,14 @@ // not found, check watch expressions v = m_watchVariables.topLevelExprByName(expr); if (v == 0) { - // nothing found; do nothing - return; + // try a member of 'this' + v = m_localVariables.topLevelExprByName("this"); + if (v != 0) + v = ExprWnd::ptrMemberByName(v, expr); + if (v == 0) { + // nothing found; do nothing + return; + } } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/debugger.h new/kdbg-2.0.5/kdbg/debugger.h --- old/kdbg-2.0.4/kdbg/debugger.h 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/debugger.h 2006-11-19 20:48:00.000000000 +0100 @@ -373,7 +373,6 @@ void exprExpandingHelper(ExprWnd* wnd, KTreeViewItem* item, bool& allow); void dereferencePointer(ExprWnd* wnd, VarTree* var, bool immediate); void determineType(ExprWnd* wnd, VarTree* var); - void removeExpr(ExprWnd* wnd, VarTree* var); void queueMemoryDump(bool immediate); CmdQueueItem* loadCoreFile(); void openProgramConfig(const QString& name); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/doc/Makefile.in new/kdbg-2.0.5/kdbg/doc/Makefile.in --- old/kdbg-2.0.4/kdbg/doc/Makefile.in 2006-05-27 19:55:18.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/doc/Makefile.in 2006-12-17 20:14:57.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 1.406 $ # @configure_input@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/doc/de/Makefile.in new/kdbg-2.0.5/kdbg/doc/de/Makefile.in --- old/kdbg-2.0.4/kdbg/doc/de/Makefile.in 2006-05-27 19:55:18.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/doc/de/Makefile.in 2006-12-17 20:14:57.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 1.406 $ # @configure_input@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/doc/en/Makefile.in new/kdbg-2.0.5/kdbg/doc/en/Makefile.in --- old/kdbg-2.0.4/kdbg/doc/en/Makefile.in 2006-05-27 19:55:18.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/doc/en/Makefile.in 2006-12-17 20:14:57.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 1.406 $ # @configure_input@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/doc/ru/Makefile.in new/kdbg-2.0.5/kdbg/doc/ru/Makefile.in --- old/kdbg-2.0.4/kdbg/doc/ru/Makefile.in 2006-05-27 19:55:18.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/doc/ru/Makefile.in 2006-12-17 20:14:57.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 1.406 $ # @configure_input@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/exprwnd.cpp new/kdbg-2.0.5/kdbg/exprwnd.cpp --- old/kdbg-2.0.4/kdbg/exprwnd.cpp 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/exprwnd.cpp 2006-11-19 20:43:50.000000000 +0100 @@ -282,11 +282,9 @@ void ExprWnd::updateExpr(VarTree* expr) { // search the root variable - QString p = expr->getText(); KPath path; - path.push(&p); + path.push(expr->getText()); KTreeViewItem* item = itemAt(path); - path.pop(); if (item == 0) { return; } @@ -474,12 +472,13 @@ ASSERT(display->childCount() == 0 || display->m_varKind != VarTree::VKsimple); // delete all children of display - KTreeViewItem* c; - while ((c = display->getChild()) != 0) { + while (VarTree* c = static_cast<VarTree*>(display->getChild())) { + unhookSubtree(c); display->removeChild(c); + delete c; } // insert copies of the newValues - for (c = newValues->getChild(); c != 0; c = c->getSibling()) { + for (KTreeViewItem* c = newValues->getChild(); c != 0; c = c->getSibling()) { VarTree* v = static_cast<VarTree*>(c); VarTree* vNew = new VarTree(v->getText(), v->m_nameKind); vNew->m_varKind = v->m_varKind; @@ -538,21 +537,50 @@ VarTree* ExprWnd::topLevelExprByName(const char* name) { - QString p = name; KPath path; - path.push(&p); + path.push(name); KTreeViewItem* item = itemAt(path); - path.pop(); return static_cast<VarTree*>(item); } +VarTree* ExprWnd::ptrMemberByName(VarTree* v, const QString& name) +{ + // v must be a pointer variable, must have children + if (v->m_varKind != VarTree::VKpointer || v->childCount() == 0) + return 0; + + // the only child of v is the pointer value that represents the struct + KTreeViewItem* item = v->getChild(); + return memberByName(static_cast<VarTree*>(item), name); +} + +VarTree* ExprWnd::memberByName(VarTree* v, const QString& name) +{ + // search immediate children for name + KTreeViewItem* item = v->getChild(); + while (item != 0 && item->getText() != name) + item = item->getSibling(); + + if (item != 0) + return static_cast<VarTree*>(item); + + // try in base classes + item = v->getChild(); + while (item != 0 && + static_cast<VarTree*>(item)->m_nameKind == VarTree::NKtype) + { + v = memberByName(static_cast<VarTree*>(item), name); + if (v != 0) + return v; + item = item->getSibling(); + } + return 0; +} + void ExprWnd::removeExpr(VarTree* item) { - // must remove any pointers scheduled for update from the list - sweepList(m_updatePtrs, item); - sweepList(m_updateType, item); - sweepList(m_updateStruct, item); + unhookSubtree(item); takeItem(item); delete item; @@ -560,7 +588,16 @@ updateValuesWidth(); } -void ExprWnd::sweepList(QList<VarTree>& list, VarTree* subTree) +void ExprWnd::unhookSubtree(VarTree* subTree) +{ + // must remove any pointers scheduled for update from the list + unhookSubtree(m_updatePtrs, subTree); + unhookSubtree(m_updateType, subTree); + unhookSubtree(m_updateStruct, subTree); + emit removingItem(subTree); +} + +void ExprWnd::unhookSubtree(QList<VarTree>& list, VarTree* subTree) { if (subTree == 0) return; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/exprwnd.h new/kdbg-2.0.5/kdbg/exprwnd.h --- old/kdbg-2.0.4/kdbg/exprwnd.h 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/exprwnd.h 2006-11-19 20:43:50.000000000 +0100 @@ -95,6 +95,10 @@ void updateStructValue(VarTree* display); /** get a top-level expression by name */ VarTree* topLevelExprByName(const char* name); + /** return a member of the struct that pointer \a v refers to */ + static VarTree* ptrMemberByName(VarTree* v, const QString& name); + /** return a member of the struct \a v */ + static VarTree* memberByName(VarTree* v, const QString& name); /** removes an expression; must be on the topmost level*/ void removeExpr(VarTree* item); /** retrieves the expression string at the specified line */ @@ -128,12 +132,14 @@ ValueEdit m_edit; /** remove items that are in the subTree from the list */ - static void sweepList(QList<VarTree>& list, VarTree* subTree); + void unhookSubtree(VarTree* subTree); + static void unhookSubtree(QList<VarTree>& list, VarTree* subTree); protected slots: void slotExpandOrCollapse(int); signals: + void removingItem(VarTree*); void editValueCommitted(int, const QString&); }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/gdbdriver.cpp new/kdbg-2.0.5/kdbg/gdbdriver.cpp --- old/kdbg-2.0.4/kdbg/gdbdriver.cpp 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/gdbdriver.cpp 2006-11-18 21:24:56.000000000 +0100 @@ -397,9 +397,12 @@ if (cmd == DCcd) { // need the working directory when parsing the output m_programWD = strArg; - } else if (cmd == DCsetargs) { - // attach saved redirection - strArg += m_redirect; + } else if (cmd == DCsetargs && !m_redirect.isEmpty()) { + /* + * Use saved redirection. We prepend it in front of the user's + * arguments so that the user can override the redirections. + */ + strArg = m_redirect + " " + strArg; } SIZED_QString(cmdString, MAX_FMTLEN+strArg.length()); @@ -443,13 +446,13 @@ */ static const char* const runRedir[8] = { "", - " </dev/null", - " >/dev/null", - " </dev/null >/dev/null", - " 2>/dev/null", - " </dev/null 2>/dev/null", - " >/dev/null 2>&1", - " </dev/null >/dev/null 2>&1" + "</dev/null", + ">/dev/null", + "</dev/null >/dev/null", + "2>/dev/null", + "</dev/null 2>/dev/null", + ">/dev/null 2>&1", + "</dev/null >/dev/null 2>&1" }; if (strArg.isEmpty()) intArg = 7; /* failsafe if no tty */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/kdbgrc new/kdbg-2.0.5/kdbg/kdbgrc --- old/kdbg-2.0.4/kdbg/kdbgrc 1970-01-01 01:00:00.000000000 +0100 +++ new/kdbg-2.0.5/kdbg/kdbgrc 2006-09-23 22:56:48.000000000 +0200 @@ -0,0 +1,50 @@ +[dock_setting_default] +Breakpoints:type=DOCK +Locals,Watches:first_name=Locals +Locals,Watches:last_name=Watches +Locals,Watches:orientation=1 +Locals,Watches:parent=yes +Locals,Watches:sepPos=68 +Locals,Watches:type=GROUP +Locals:type=DOCK +Main:Geometry=0,0,880,778 +Main:dock=Source +Main:view=Source,Stack,Breakpoints,Output,Locals,Watches +Main:visible=false +Memory:dockBackTo= +Memory:dockBackToPos=0 +Memory:geometry=0,0,640,409 +Memory:type=NULL_DOCK +Memory:visible=false +NameList=Source,Stack,Locals,Watches,Registers,Breakpoints,Output,Threads,Memory,Locals\\,Watches,Stack\\,Breakpoints\\,Output,Source\\,Stack\\,Breakpoints\\,Output,Source\\,Stack\\,Breakpoints\\,Output\\,Locals\\,Watches +Output:type=DOCK +Registers:dockBackTo= +Registers:dockBackToPos=0 +Registers:geometry=0,0,640,409 +Registers:type=NULL_DOCK +Registers:visible=false +Source,Stack,Breakpoints,Output,Locals,Watches:first_name=Source,Stack,Breakpoints,Output +Source,Stack,Breakpoints,Output,Locals,Watches:last_name=Locals,Watches +Source,Stack,Breakpoints,Output,Locals,Watches:orientation=0 +Source,Stack,Breakpoints,Output,Locals,Watches:parent=yes +Source,Stack,Breakpoints,Output,Locals,Watches:sepPos=63 +Source,Stack,Breakpoints,Output,Locals,Watches:type=GROUP +Source,Stack,Breakpoints,Output:first_name=Source +Source,Stack,Breakpoints,Output:last_name=Stack,Breakpoints,Output +Source,Stack,Breakpoints,Output:orientation=1 +Source,Stack,Breakpoints,Output:parent=yes +Source,Stack,Breakpoints,Output:sepPos=59 +Source,Stack,Breakpoints,Output:type=GROUP +Source:type=DOCK +Stack,Breakpoints,Output:curTab=1 +Stack,Breakpoints,Output:parent=yes +Stack,Breakpoints,Output:tabNames=Stack,Breakpoints,Output +Stack,Breakpoints,Output:type=TAB_GROUP +Stack:type=DOCK +Threads:dockBackTo= +Threads:dockBackToPos=0 +Threads:geometry=0,0,640,409 +Threads:type=NULL_DOCK +Threads:visible=false +Version=0.0.4 +Watches:type=DOCK diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/ktreeview.cpp new/kdbg-2.0.5/kdbg/ktreeview.cpp --- old/kdbg-2.0.4/kdbg/ktreeview.cpp 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/ktreeview.cpp 2006-11-18 21:24:56.000000000 +0100 @@ -27,6 +27,7 @@ #include <qapplication.h> /* used for QApplication::closingDown() */ #include <qkeycode.h> /* used for keyboard interface */ #include <qpainter.h> /* used to paint items */ +#include <qptrstack.h> #include <assert.h> /* @@ -918,9 +919,7 @@ return 0; // need a copy of the path because recursiveFind will destroy it - KPath pathCopy; - pathCopy.setAutoDelete(false); - pathCopy = path; + KPath pathCopy = path; return recursiveFind(pathCopy); } @@ -1463,7 +1462,7 @@ assert(item->owner == this); if (item != treeRoot) { itemPath(item->getParent(), path); - path.push(new QString(item->getText())); + path.push(item->getText()); } } @@ -1854,7 +1853,7 @@ return treeRoot; // get the next key - QString* searchString = path.pop(); + QString searchString = path.pop(); // find the parent item KTreeViewItem* parent = recursiveFind(path); @@ -1866,7 +1865,7 @@ */ KTreeViewItem* sibling = parent->getChild(); while (sibling != 0) { - if (*searchString == sibling->getText()) { + if (searchString == sibling->getText()) { break; /* found it! */ } sibling = sibling->getSibling(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/ktreeview.h new/kdbg-2.0.5/kdbg/ktreeview.h --- old/kdbg-2.0.4/kdbg/ktreeview.h 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/ktreeview.h 2006-11-18 21:24:56.000000000 +0100 @@ -26,12 +26,12 @@ #define KDE_KTREE_VIEW_H #include <qpixmap.h> /* used in items */ -#include <qptrstack.h> /* used to specify tree paths */ +#include <qvaluestack.h> /* used to specify tree paths */ #include <qstring.h> /* used in items */ #include "tableview.h" /* base class for widget */ // use stack of strings to represent path information -typedef QStack<QString> KPath; +typedef QValueStack<QString> KPath; class KTreeView; /* forward declaration */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/pics/Makefile.in new/kdbg-2.0.5/kdbg/pics/Makefile.in --- old/kdbg-2.0.4/kdbg/pics/Makefile.in 2006-05-27 19:55:18.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/pics/Makefile.in 2006-12-17 20:14:57.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 1.406 $ # @configure_input@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/procattachbase.cpp new/kdbg-2.0.5/kdbg/procattachbase.cpp --- old/kdbg-2.0.4/kdbg/procattachbase.cpp 2006-05-27 19:55:16.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/procattachbase.cpp 2006-12-17 18:29:17.000000000 +0100 @@ -1,9 +1,9 @@ #include <klocale.h> /**************************************************************************** -** Form implementation generated from reading ui file './procattachbase.ui' +** Form implementation generated from reading ui file '../../maint/kdbg/procattachbase.ui' ** -** Created: Sat May 27 19:55:16 2006 -** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.5 edited Aug 31 12:13 $) +** Created: Sun Dec 17 18:29:17 2006 +** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.6 edited Aug 31 2005 $) ** ** WARNING! All changes made in this file will be lost! ****************************************************************************/ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/procattachbase.h new/kdbg-2.0.5/kdbg/procattachbase.h --- old/kdbg-2.0.4/kdbg/procattachbase.h 2006-05-27 19:55:15.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/procattachbase.h 2006-12-17 18:29:03.000000000 +0100 @@ -1,8 +1,8 @@ /**************************************************************************** -** Form interface generated from reading ui file './procattachbase.ui' +** Form interface generated from reading ui file '../../maint/kdbg/procattachbase.ui' ** -** Created: Sat May 27 19:55:15 2006 -** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.5 edited Aug 31 12:13 $) +** Created: Sun Dec 17 18:29:03 2006 +** by: The User Interface Compiler ($Id: qt/main.cpp 3.3.6 edited Aug 31 2005 $) ** ** WARNING! All changes made in this file will be lost! ****************************************************************************/ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/testprogs/Makefile.in new/kdbg-2.0.5/kdbg/testprogs/Makefile.in --- old/kdbg-2.0.4/kdbg/testprogs/Makefile.in 2006-05-27 19:55:18.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/testprogs/Makefile.in 2006-12-17 20:14:57.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 1.406 $ # @configure_input@ @@ -15,8 +15,6 @@ @SET_MAKE@ -SOURCES = $(locals_SOURCES) $(maths_SOURCES) $(repeats_SOURCES) $(std_SOURCES) $(templates_SOURCES) $(testfile_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/testprogs/testfile.cpp new/kdbg-2.0.5/kdbg/testprogs/testfile.cpp --- old/kdbg-2.0.4/kdbg/testprogs/testfile.cpp 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/testprogs/testfile.cpp 2006-06-24 21:42:53.000000000 +0200 @@ -3,6 +3,7 @@ #include <qfile.h> #include <qfileinfo.h> #include <qdir.h> +#include <math.h> enum E { red, green, blue, yellow }; struct S { int x, y; S* s; }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/typetables/Makefile.in new/kdbg-2.0.5/kdbg/typetables/Makefile.in --- old/kdbg-2.0.4/kdbg/typetables/Makefile.in 2006-05-27 19:55:18.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/typetables/Makefile.in 2006-12-17 20:14:57.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 1.406 $ # @configure_input@ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/winstack.cpp new/kdbg-2.0.5/kdbg/winstack.cpp --- old/kdbg-2.0.4/kdbg/winstack.cpp 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/winstack.cpp 2006-09-24 14:55:42.000000000 +0200 @@ -68,6 +68,11 @@ } } +QSize WinStack::sizeHint() const +{ + return QSize(640, 480); +} + void WinStack::activate(const QString& fileName, int lineNo, const DbgAddr& address) { QFileInfo fi(fileName); @@ -282,6 +287,14 @@ } } +QString WinStack::activeFileName() const +{ + QString f; + if (m_activeWindow != 0) + f = m_activeWindow->fileName(); + return f; +} + void WinStack::slotFindForward() { if (m_activeWindow != 0) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/kdbg/winstack.h new/kdbg-2.0.5/kdbg/winstack.h --- old/kdbg-2.0.4/kdbg/winstack.h 2006-05-27 14:25:56.000000000 +0200 +++ new/kdbg-2.0.5/kdbg/winstack.h 2006-09-24 14:58:12.000000000 +0200 @@ -85,7 +85,9 @@ bool activeLine(QString& filename, int& lineNo, DbgAddr& address); void maybeTip(const QPoint& p); bool hasWindows() const { return m_fileList.size() > 0; } + QString activeFileName() const; + virtual QSize sizeHint() const; virtual void resizeEvent(QResizeEvent*); signals: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/po/Makefile.in new/kdbg-2.0.5/po/Makefile.in --- old/kdbg-2.0.4/po/Makefile.in 2006-05-27 19:55:18.000000000 +0200 +++ new/kdbg-2.0.5/po/Makefile.in 2006-12-17 20:14:57.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # KDE tags expanded automatically by am_edit - $Revision: 1.406 $ # @configure_input@ Binary files old/kdbg-2.0.4/po/fr.gmo and new/kdbg-2.0.5/po/fr.gmo differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kdbg-2.0.4/po/fr.po new/kdbg-2.0.5/po/fr.po --- old/kdbg-2.0.4/po/fr.po 2006-05-27 19:55:18.000000000 +0200 +++ new/kdbg-2.0.5/po/fr.po 2006-12-17 20:14:56.000000000 +0100 @@ -7,65 +7,64 @@ "Project-Id-Version: kdbg 1.0\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-07-10 15:01+0200\n" -"PO-Revision-Date: 2002-03-03 16:08MDT\n" -"Last-Translator: Xavier BRUNEAU<le_kid@club-internet.fr>\n" +"PO-Revision-Date: 2006-10-10 23:08MDT\n" +"Last-Translator: Sylvestre Ledru <sylvestre-kdbg@ecranbleu.org>\n" "Language-Team: none\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -"X-Generator: KBabel 0.9.5\n" #: memwindow.cpp:55 brkpt.cpp:334 msgid "Address" -msgstr "" +msgstr "Adresse" #: memwindow.cpp:70 msgid "B&ytes" -msgstr "" +msgstr "B&ytes" #: memwindow.cpp:71 msgid "Halfwords (&2 Bytes)" -msgstr "" +msgstr "Demi-mots (&2 Bytes)" #: memwindow.cpp:72 msgid "Words (&4 Bytes)" -msgstr "" +msgstr "Mots (&4 Bytes)" #: memwindow.cpp:73 msgid "Giantwords (&8 Bytes)" -msgstr "" +msgstr "Double-mots (&8 Bytes)" #: memwindow.cpp:75 regwnd.cpp:79 msgid "He&xadecimal" -msgstr "" +msgstr "He&xadecimal" #: memwindow.cpp:76 msgid "Signed &decimal" -msgstr "" +msgstr "&Décimal signé" #: memwindow.cpp:77 msgid "&Unsigned decimal" -msgstr "" +msgstr "Décimal non-signé" #: memwindow.cpp:78 regwnd.cpp:77 msgid "&Octal" -msgstr "" +msgstr "&Octal" #: memwindow.cpp:79 regwnd.cpp:76 msgid "&Binary" -msgstr "" +msgstr "&Binaire" #: memwindow.cpp:80 msgid "&Addresses" -msgstr "" +msgstr "&Adresses" #: memwindow.cpp:81 msgid "&Character" -msgstr "" +msgstr "&Caractère" #: memwindow.cpp:82 msgid "&Floatingpoint" -msgstr "" +msgstr "&Virgule flottante" #: memwindow.cpp:83 #, fuzzy @@ -74,7 +73,7 @@ #: memwindow.cpp:84 msgid "&Instructions" -msgstr "" +msgstr "&Instructions" #: brkpt.cpp:61 #, fuzzy @@ -83,15 +82,15 @@ #: brkpt.cpp:65 msgid "Add &Watchpoint" -msgstr "" +msgstr "Ajouter un &point de surveillance" #: brkpt.cpp:74 brkpt.cpp:239 msgid "&Disable" -msgstr "" +msgstr "&Désactiver" #: brkpt.cpp:79 brkpt.cpp:241 msgid "&Enable" -msgstr "" +msgstr "&Activer" #: brkpt.cpp:89 msgid "&View Code" @@ -103,11 +102,11 @@ #: brkpt.cpp:333 threadlist.cpp:41 msgid "Location" -msgstr "Endroit" +msgstr "Position" #: brkpt.cpp:335 msgid "Hits" -msgstr "" +msgstr "Hits" #: brkpt.cpp:336 msgid "Ignore" @@ -127,11 +126,11 @@ #: brkpt.cpp:465 msgid "Ignore &next hits:" -msgstr "" +msgstr "Ignore les hits &suivants" #: gdbdriver.cpp:1364 msgid "<additional entries of the array suppressed>" -msgstr "" +msgstr "<entrées supplémentaires du tableau supprimées>" #: gdbdriver.cpp:1919 xsldbgdriver.cpp:1351 msgid "New working directory: " @@ -142,8 +141,8 @@ "%1 exited unexpectedly.\n" "Restart the session (e.g. with File|Executable)." msgstr "" -"%1 c'est terminé involontairement.\n" -"Redémarrer votre travail (avec Fichier|Exécutable)." +"%1 s'est terminé involontairement.\n" +"Redémarrez votre session (avec Fichier|Exécutable)." #: debugger.cpp:806 msgid "" @@ -151,6 +150,9 @@ "%1\n" "Shall this command be used?" msgstr "" +"La commande pour le débogueur pour ce programme est :\n" +"%1\n" +"Cette commande doit-elle être utilisée ?" #: mainwndbase.cpp:42 msgid " Add " @@ -166,13 +168,15 @@ #: mainwndbase.cpp:285 msgid "Don't know how to debug language `%1'" -msgstr "" +msgstr "Ne sait pas débogguer le langage `%1'" #: mainwndbase.cpp:298 msgid "" "Could not start the debugger process.\n" "Please shut down KDbg and resolve the problem." msgstr "" +"Impossible de démarrer le processus de déboggage.\n" +"Quittez KDbg et corrigez le problème." #: mainwndbase.cpp:403 msgid ": Global options" @@ -180,11 +184,11 @@ #: mainwndbase.cpp:420 pgmsettings.cpp:114 msgid "&Debugger" -msgstr "" +msgstr "&Déboguer" #: mainwndbase.cpp:421 msgid "&Miscellaneous" -msgstr "" +msgstr "Di&vers" #: mainwndbase.cpp:490 msgid ": Program output" @@ -192,44 +196,44 @@ #: main.cpp:38 msgid "A Debugger" -msgstr "" +msgstr "Un débogueur" #: main.cpp:46 msgid "XSLT debugging" -msgstr "" +msgstr "Déboggage XSLT" #: main.cpp:49 msgid "Register groups and formating" -msgstr "" +msgstr "Groupes de registre et formatage" #: main.cpp:54 msgid "transcript of conversation with the debugger" -msgstr "" +msgstr "Log de la communication avec le débogueur" #: main.cpp:55 msgid "remote debugging via <device>" -msgstr "" +msgstr "Déboggage distant via <device>" #: main.cpp:56 msgid "specify language: C, XSLT" -msgstr "" +msgstr "Entrez le langage : C, XSLT" #: main.cpp:57 msgid "use language XSLT (deprecated)" -msgstr "" +msgstr "Utilise le langage XSLT (déprécié)" #: main.cpp:58 msgid "specify PID of process to debug" -msgstr "" +msgstr "Entrez le PID du processus à débogger" #: main.cpp:59 #, fuzzy msgid "path of executable to debug" -msgstr "Choisissez l'exécutable à déboguer" +msgstr "Choisissez l'exécutable à débogguer" #: main.cpp:60 msgid "a core file to use" -msgstr "" +msgstr "Fichier core à utiliser" #: main.cpp:125 msgid "Cannot start debugger." @@ -237,7 +241,7 @@ #: prefdebugger.cpp:20 msgid "To revert to the default settings, clear the entries." -msgstr "Pour les paramêtres par défauts, effacer les valeurs" +msgstr "Pour les paramêtres par défaut, effacez les valeurs" #: prefdebugger.cpp:24 msgid "How to invoke &GDB:" @@ -249,8 +253,8 @@ "%C will be replaced by a Bourne shell script that\n" "keeps the terminal window open." msgstr "" -"%T sera remplacer par un titre,\n" -"%C sera remplacer par un script qui\n" +"%T sera remplacé par un titre,\n" +"%C sera remplacé par un script qui\n" "garde la console active." #: prefdebugger.cpp:37 @@ -263,34 +267,36 @@ #: procattach.cpp:234 msgid "Specify the process number to attach to:" -msgstr "Entrez le numéro du processus auquel attacher :" +msgstr "Entrez le numéro du processus à attacher :" #: pgmsettings.cpp:24 msgid "" "How to invoke &GDB - leave empty to use\n" "the default from the global options:" msgstr "" +"Comment lancer &GDB - laissez la cellule vide\n" +"pour utiliser les valeurs par défault:" #: pgmsettings.cpp:59 msgid "&No input and output" -msgstr "" +msgstr "&Pas d'entrée/sortie" #: pgmsettings.cpp:64 msgid "&Only output, simple terminal emulation" -msgstr "" +msgstr "Uniquement la &sortie, émulation de terminal simple" #: pgmsettings.cpp:69 msgid "&Full terminal emulation" -msgstr "" +msgstr "&Emulation complète de terminal " #: pgmsettings.cpp:106 #, c-format msgid "%s: Settings for %s" -msgstr "" +msgstr "%s: Paramètres pour %s" #: pgmsettings.cpp:115 dbgmainwnd.cpp:230 msgid "&Output" -msgstr "" +msgstr "&Sortie" #: winstack.cpp:239 msgid "&More..." @@ -330,7 +336,7 @@ #: threadlist.cpp:40 msgid "Thread ID" -msgstr "" +msgstr "ID du Thread" #: dbgmainwnd.cpp:44 #, fuzzy @@ -339,20 +345,20 @@ #: dbgmainwnd.cpp:52 msgid "Stack" -msgstr "" +msgstr "Pile" #: dbgmainwnd.cpp:55 msgid "Locals" -msgstr "" +msgstr "Locales" #: dbgmainwnd.cpp:58 msgid "Watches" -msgstr "" +msgstr "Points de surveillance" #: dbgmainwnd.cpp:61 #, fuzzy msgid "Registers" -msgstr "Continuer" +msgstr "Registres" #: dbgmainwnd.cpp:64 msgid "Breakpoints" @@ -360,15 +366,15 @@ #: dbgmainwnd.cpp:67 msgid "Output" -msgstr "" +msgstr "Sortie" #: dbgmainwnd.cpp:70 msgid "Threads" -msgstr "" +msgstr "Threads" #: dbgmainwnd.cpp:73 msgid "Memory" -msgstr "" +msgstr "Mémoire" #: dbgmainwnd.cpp:193 msgid "&Open Source..." @@ -385,7 +391,7 @@ #: dbgmainwnd.cpp:200 #, fuzzy msgid "Recent E&xecutables" -msgstr "Exécutable" +msgstr "Exécutables récents" #: dbgmainwnd.cpp:203 msgid "&Core dump..." @@ -393,7 +399,7 @@ #: dbgmainwnd.cpp:208 msgid "This &Program..." -msgstr "" +msgstr "Ce &programme..." #: dbgmainwnd.cpp:211 msgid "&Global Options..." @@ -402,41 +408,41 @@ #: dbgmainwnd.cpp:219 #, fuzzy msgid "&Find" -msgstr "&Fenêtre" +msgstr "&Recherche" #: dbgmainwnd.cpp:222 msgid "Source &code" -msgstr "" +msgstr "Code &source" #: dbgmainwnd.cpp:224 msgid "Stac&k" -msgstr "" +msgstr "&Pile" #: dbgmainwnd.cpp:225 msgid "&Locals" -msgstr "" +msgstr "&Locales" #: dbgmainwnd.cpp:226 msgid "&Watched expressions" -msgstr "" +msgstr "&Expressions surveillées" #: dbgmainwnd.cpp:227 #, fuzzy msgid "&Registers" -msgstr "Continuer" +msgstr "&Registres" #: dbgmainwnd.cpp:228 #, fuzzy msgid "&Breakpoints" -msgstr "Points d'arrêt" +msgstr "&Points d'arrêt" #: dbgmainwnd.cpp:229 msgid "T&hreads" -msgstr "" +msgstr "T&hreads" #: dbgmainwnd.cpp:231 msgid "&Memory" -msgstr "" +msgstr "&Mémoire" #: dbgmainwnd.cpp:241 msgid "&Run" @@ -460,15 +466,15 @@ #: dbgmainwnd.cpp:260 msgid "Step i&nto by instruction" -msgstr "" +msgstr "&Entrer dans cette instruction" #: dbgmainwnd.cpp:264 msgid "Step o&ver by instruction" -msgstr "" +msgstr "&Passer cette instruction" #: dbgmainwnd.cpp:268 msgid "&Program counter to current line" -msgstr "" +msgstr "&Program Counter jusqu'à la ligne courante" #: dbgmainwnd.cpp:271 msgid "&Break" @@ -476,7 +482,7 @@ #: dbgmainwnd.cpp:274 msgid "&Kill" -msgstr "" +msgstr "&Tuer" #: dbgmainwnd.cpp:277 msgid "Re&start" @@ -504,7 +510,7 @@ #: dbgmainwnd.cpp:299 msgid "Watch Expression" -msgstr "" +msgstr "Expression surveillée" #: dbgmainwnd.cpp:302 #, fuzzy @@ -521,7 +527,7 @@ #: dbgmainwnd.cpp:337 msgid "Restart" -msgstr "Continuer" +msgstr "Redémarrer" #: dbgmainwnd.cpp:338 msgid "Core dump" @@ -539,20 +545,20 @@ #: dbgmainwnd.cpp:723 #, fuzzy msgid "|All source files\n" -msgstr "Recharger ce fichier source" +msgstr "Recharger ce fichier source\n" #: dbgmainwnd.cpp:724 #, fuzzy msgid "|Source files\n" -msgstr "Ouvrir un fichier source" +msgstr "Ouvrir un fichier source\n" #: dbgmainwnd.cpp:725 msgid "|Header files\n" -msgstr "" +msgstr "|Fichiers d'entête\n" #: dbgmainwnd.cpp:726 msgid "*|All files" -msgstr "" +msgstr "*|Tous les fichiers" #: dbgmainwnd.cpp:855 msgid "Select the executable to debug" @@ -564,32 +570,32 @@ #: xsldbgdriver.cpp:1460 msgid "No memory dump available" -msgstr "" +msgstr "Pas de dump de la mémoire disponible" #: prefmisc.cpp:22 msgid "&Pop into foreground when program stops" -msgstr "" +msgstr "&Apparait au premier plan quand le programme s'arrête" #: prefmisc.cpp:27 msgid "Time until window goes &back (in milliseconds):" -msgstr "" +msgstr "Temps à partir duquel la fenêtre revient (en millisecondes):" #: prefmisc.cpp:34 msgid "&Tabstop every (characters):" -msgstr "" +msgstr "&Tabstop chaque (caractères):" #: prefmisc.cpp:36 #, fuzzy msgid "File filter for &source files:" -msgstr "Recharger ce fichier source" +msgstr "Filtre fichier pour les fichier sources:" #: prefmisc.cpp:38 msgid "File filter for &header files:" -msgstr "" +msgstr "Filtre fichier pour les fichiers d'entête:" #: ttywnd.cpp:152 msgid "&Clear" -msgstr "" +msgstr "&Vider" #: pgmargs.cpp:41 msgid ": Program arguments" @@ -601,15 +607,15 @@ #: pgmargs.cpp:69 msgid "Options:" -msgstr "" +msgstr "Options:" #: pgmargs.cpp:91 msgid "Working directory:" -msgstr "Répertoire de travail" +msgstr "Répertoire de travail:" #: pgmargs.cpp:106 msgid "Environment variables (NAME=value):" -msgstr "Variables d'environment (Nom=Valeur):" +msgstr "Variables d'environnement (Nom=Valeur):" #: pgmargs.cpp:115 msgid "Name" @@ -621,48 +627,48 @@ #: pgmargs.cpp:328 msgid "Select a file name to insert as program argument" -msgstr "" +msgstr "Selectionner un nom de fichier à insérer comme argument de programme" #: regwnd.cpp:75 msgid "&GDB default" -msgstr "" +msgstr "Défaut &GDB" #: regwnd.cpp:78 msgid "&Decimal" -msgstr "" +msgstr "&Décimal" #: regwnd.cpp:80 msgid "Real (&e)" -msgstr "" +msgstr "Réel (&e)" #: regwnd.cpp:81 msgid "Real (&f)" -msgstr "" +msgstr "Réel (&f)" #: regwnd.cpp:82 msgid "&Real (g)" -msgstr "" +msgstr "&Réel (g)" #: regwnd.cpp:427 #, fuzzy msgid "Register" -msgstr "Continuer" +msgstr "Registre" #: regwnd.cpp:429 msgid "Decoded value" -msgstr "" +msgstr "Valeur décodée" #: regwnd.cpp:462 msgid "x86/x87 segment" -msgstr "" +msgstr "Segment x86/x87" #: regwnd.cpp:465 msgid "Flags" -msgstr "" +msgstr "Flags" #: regwnd.cpp:468 msgid "GP and others" -msgstr "" +msgstr "GR et autres" #, fuzzy #~ msgid "&Settings..." ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org