summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog41
-rw-r--r--po/POTFILES.in463
-rw-r--r--po/fr.po401
-rw-r--r--po/openida.pot393
-rw-r--r--src/debug/debugger-int.h5
-rw-r--r--src/debug/debugger.c24
-rw-r--r--src/debug/debugger.h3
-rw-r--r--src/debug/jdwp/debugger.c99
-rw-r--r--src/debug/jdwp/tcp.c14
-rw-r--r--src/editor.c4
-rw-r--r--src/gui/menus/Makefile.am1
-rw-r--r--src/gui/menus/debug.c128
-rw-r--r--src/gui/menus/debug.h38
-rw-r--r--src/gui/menus/help.c5
-rw-r--r--src/gui/menus/help.h2
-rw-r--r--src/gui/menus/menubar.c16
-rw-r--r--src/gui/menus/menubar.h2
-rw-r--r--src/project.c36
-rw-r--r--src/project.h7
-rw-r--r--src/shell.c2
20 files changed, 1066 insertions, 618 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e4a956..60be647 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+11-01-06 Cyrille Bagard <nocbos@gmail.com>
+
+ * po/fr.po:
+ * po/openida.pot:
+ * po/POTFILES.in:
+ Update translations.
+
+ * src/debug/debugger.c:
+ * src/debug/debugger.h:
+ * src/debug/debugger-int.h:
+ * src/debug/jdwp/debugger.c:
+ Attach the debugger to a given target.
+
+ * src/debug/jdwp/tcp.c:
+ Provide logs.
+
+ * src/editor.c:
+ Update code. Typo.
+
+ * src/gui/menus/debug.c:
+ * src/gui/menus/debug.h:
+ New entries: begin to build the 'Debug' menu.
+
+ * src/gui/menus/help.c:
+ * src/gui/menus/help.h:
+ Handle an accelerator group.
+
+ * src/gui/menus/Makefile.am:
+ Add the debug.[ch] files to libguimenus_la_SOURCES.
+
+ * src/gui/menus/menubar.c:
+ * src/gui/menus/menubar.h:
+ Handle an accelerator group and insert the 'Debug' menu.
+
+ * src/project.c:
+ * src/project.h:
+ Provide a debugger for a given loaded binary.
+
+ * src/shell.c:
+ Disable an untranslatable string.
+
11-01-05 Cyrille Bagard <nocbos@gmail.com>
* src/panels/log.c:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 72c146e..c914828 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,234 +1,277 @@
# List of source files which contain translatable strings.
-src/panel/registers.c
-src/panel/log.c
-src/panel/strings.c
-src/panel/panels.c
-src/panel/symbols.c
-src/plugins/context.c
-src/plugins/pglist.c
-src/plugins/plugin.c
-src/plugins/pyoida/py_binary.c
-src/plugins/pyoida/py_line.c
-src/plugins/pyoida/py_log.c
-src/plugins/pyoida/pyoida.c
-src/plugins/overjump/overjump.c
-src/shell.c
-src/main.c
-src/glibext/gbuffersegment.c
-src/glibext/gbufferline.c
-src/glibext/gcodebuffer.c
-src/glibext/delayed.c
-src/configuration.c
-src/analysis/type.c
-src/analysis/line_code.c
-src/analysis/line_comment.c
-src/analysis/routine.c
-src/analysis/line.c
src/analysis/binary.c
-src/analysis/decomp/instruction.c
src/analysis/decomp/decompiler.c
-src/analysis/decomp/rtl.c
-src/analysis/variable.c
+src/analysis/disass/disassembler.c
+src/analysis/disass/fetch.c
+src/analysis/disass/links.c
+src/analysis/disass/output.c
src/analysis/exporter.c
-src/analysis/roptions.c
+src/analysis/line.c
+src/analysis/line_code.c
+src/analysis/line_comment.c
src/analysis/line_prologue.c
-src/dlg_sections.c
-src/graph/dot.c
-src/graph/layout.c
-src/graph/node.c
-src/dialogs/export.c
-src/dialogs/about.c
-src/dialogs/plugins.c
-src/dialogs/binparts.c
-src/common/extstr.c
+src/analysis/roptions.c
+src/analysis/routine.c
+src/analysis/type.c
+src/analysis/variable.c
+src/arch/archbase.c
+src/arch/arm/processor.c
+src/arch/artificial.c
+src/arch/dalvik/dop_aget.c
+src/arch/dalvik/dop_aput.c
+src/arch/dalvik/dop_arithm.c
+src/arch/dalvik/dop_array.c
+src/arch/dalvik/dop_const.c
+src/arch/dalvik/dop_if.c
+src/arch/dalvik/dop_invoke.c
+src/arch/dalvik/dop_ret.c
+src/arch/dalvik/instruction.c
+src/arch/dalvik/op_add.c
+src/arch/dalvik/op_aget.c
+src/arch/dalvik/op_and.c
+src/arch/dalvik/op_aput.c
+src/arch/dalvik/op_array.c
+src/arch/dalvik/op_check.c
+src/arch/dalvik/op_cmp.c
+src/arch/dalvik/op_const.c
+src/arch/dalvik/op_div.c
+src/arch/dalvik/operand.c
+src/arch/dalvik/operands/args.c
+src/arch/dalvik/operands/pool.c
+src/arch/dalvik/operands/register.c
+src/arch/dalvik/operands/target.c
+src/arch/dalvik/op_goto.c
+src/arch/dalvik/op_if.c
+src/arch/dalvik/op_iget.c
+src/arch/dalvik/op_invoke.c
+src/arch/dalvik/op_iput.c
+src/arch/dalvik/op_move.c
+src/arch/dalvik/op_mul.c
+src/arch/dalvik/op_new.c
+src/arch/dalvik/op_nop.c
+src/arch/dalvik/op_or.c
+src/arch/dalvik/op_rem.c
+src/arch/dalvik/op_ret.c
+src/arch/dalvik/op_rsub.c
+src/arch/dalvik/op_sget.c
+src/arch/dalvik/op_sput.c
+src/arch/dalvik/op_sub.c
+src/arch/dalvik/op_to.c
+src/arch/dalvik/op_xor.c
+src/arch/dalvik/processor.c
+src/arch/dalvik/register.c
+src/arch/immediate.c
+src/arch/instruction.c
+src/arch/jvm/instruction.c
+src/arch/jvm/op_add.c
+src/arch/jvm/op_const.c
+src/arch/jvm/op_convert.c
+src/arch/jvm/op_dup.c
+src/arch/jvm/operand.c
+src/arch/jvm/op_getput.c
+src/arch/jvm/op_invoke.c
+src/arch/jvm/op_load.c
+src/arch/jvm/op_monitor.c
+src/arch/jvm/op_nop.c
+src/arch/jvm/op_pop.c
+src/arch/jvm/op_ret.c
+src/arch/jvm/op_store.c
+src/arch/jvm/processor.c
+src/arch/mips/instruction.c
+src/arch/mips/op_add.c
+src/arch/mips/op_and.c
+src/arch/mips/op_branch.c
+src/arch/mips/operand.c
+src/arch/mips/op_jump.c
+src/arch/mips/op_load.c
+src/arch/mips/op_nop.c
+src/arch/mips/op_sr.c
+src/arch/mips/op_store.c
+src/arch/mips/op_sub.c
+src/arch/mips/processor.c
+src/arch/mips/registers.c
+src/arch/operand.c
+src/arch/processor.c
+src/arch/x86/instruction.c
+src/arch/x86/op_adc.c
+src/arch/x86/op_add.c
+src/arch/x86/op_and.c
+src/arch/x86/op_arpl.c
+src/arch/x86/op_call.c
+src/arch/x86/op_cld.c
+src/arch/x86/op_cmp.c
+src/arch/x86/op_cmps.c
+src/arch/x86/op_dec.c
+src/arch/x86/operand.c
+src/arch/x86/op_hlt.c
+src/arch/x86/op_inc.c
+src/arch/x86/op_int.c
+src/arch/x86/op_jump.c
+src/arch/x86/op_lea.c
+src/arch/x86/op_leave.c
+src/arch/x86/op_mov.c
+src/arch/x86/op_movs.c
+src/arch/x86/op_movsx.c
+src/arch/x86/op_movzx.c
+src/arch/x86/op_mul.c
+src/arch/x86/op_nop.c
+src/arch/x86/op_not.c
+src/arch/x86/op_or.c
+src/arch/x86/op_pop.c
+src/arch/x86/op_push.c
+src/arch/x86/op_rcl.c
+src/arch/x86/op_rcr.c
+src/arch/x86/op_ret.c
+src/arch/x86/op_rol.c
+src/arch/x86/op_ror.c
+src/arch/x86/op_sar.c
+src/arch/x86/op_sbb.c
+src/arch/x86/op_scas.c
+src/arch/x86/op_set.c
+src/arch/x86/op_shl.c
+src/arch/x86/op_shr.c
+src/arch/x86/op_stos.c
+src/arch/x86/op_sub.c
+src/arch/x86/op_test.c
+src/arch/x86/op_xchg.c
+src/arch/x86/op_xor.c
+src/arch/x86/processor.c
+src/arch/x86/registers.c
+src/common/dllist.c
+src/common/endianness.c
src/common/environment.c
-src/common/xml.c
+src/common/extstr.c
src/common/leb128.c
-src/common/endianness.c
-src/common/dllist.c
-src/editor.c
-src/xdg.c
-src/project.c
-src/gtkext/iodamarshal.c
-src/gtkext/gtkdockpanel.c
-src/gtkext/gtksourceview.c
-src/gtkext/gtklinkrenderer.c
-src/gtkext/gtkbinview.c
-src/gtkext/gtkgraphview.c
-src/gtkext/easygtk.c
-src/gtkext/support.c
-src/gtkext/gtkdockitem.c
-src/gtkext/gtkextstatusbar.c
-src/gtkext/gtkblockview.c
-src/gtkext/gtkdropwindow.c
-src/gtkext/gtkviewpanel.c
-src/debug/debugger.c
-src/debug/ptrace/options.c
-src/debug/ptrace/ptrace.c
+src/common/net.c
+src/common/xml.c
+src/configuration.c
src/debug/break.c
+src/debug/debugger.c
src/debug/debuggers.c
-src/debug/remgdb/tcp.c
+src/debug/jdwp/debugger.c
+src/debug/jdwp/misc/header.c
+src/debug/jdwp/misc/types.c
+src/debug/jdwp/packet.c
+src/debug/jdwp/sets/list.c
+src/debug/jdwp/sets/vm.c
+src/debug/jdwp/tcp.c
+src/debug/packet.c
src/debug/remgdb/gdb.c
-src/debug/remgdb/packet.c
src/debug/remgdb/helpers.c
+src/debug/remgdb/packet.c
src/debug/remgdb/stream.c
-src/panels/panel.c
-src/panels/registers.c
-src/panels/log.c
-src/panels/strings.c
-src/panels/symbols.c
-src/panels/breaks.c
-src/panels/glimpse.c
-src/params.c
-src/format/format.c
+src/debug/remgdb/tcp.c
+src/debug/stream.c
+src/decomp/context.c
+src/decomp/expr/arithm.c
+src/decomp/expr/array.c
+src/decomp/expr/assign.c
+src/decomp/expr/block.c
+src/decomp/expr/call.c
+src/decomp/expr/cond.c
+src/decomp/expr/dalvik/array.c
+src/decomp/expression.c
+src/decomp/expr/immediate.c
+src/decomp/expr/pseudo.c
+src/decomp/expr/return.c
+src/decomp/instr/ite.c
+src/decomp/instruction.c
+src/decomp/lang/asm.c
+src/decomp/lang/java.c
+src/decomp/output.c
+src/dialogs/about.c
+src/dialogs/binparts.c
+src/dialogs/export.c
+src/dialogs/plugins.c
+src/dlg_sections.c
+src/editor.c
+src/format/dbg_format.c
+src/format/dex/class.c
+src/format/dex/dex.c
+src/format/dex/dex-int.c
+src/format/dex/method.c
+src/format/dex/pool.c
+src/format/dwarf/abbrev.c
+src/format/dwarf/d_dwarf.c
+src/format/dwarf/dwarf.c
+src/format/dwarf/info.c
+src/format/dwarf/utils.c
+src/format/elf/elf.c
+src/format/elf/elf-int.c
src/format/elf/helper_mips.c
+src/format/elf/helper_x86.c
src/format/elf/program.c
+src/format/elf/section.c
src/format/elf/strings.c
-src/format/elf/elf-int.c
src/format/elf/symbols.c
-src/format/elf/section.c
-src/format/elf/helper_x86.c
-src/format/elf/elf.c
src/format/executable.c
-src/format/pe/pe-int.c
-src/format/pe/symbols.c
-src/format/pe/section.c
-src/format/pe/pe.c
src/format/exe_format.c
-src/format/dwarf/abbrev.c
-src/format/dwarf/d_dwarf.c
-src/format/dwarf/utils.c
-src/format/dwarf/dwarf.c
-src/format/dwarf/info.c
-src/format/symbol.c
-src/format/dbg_format.c
-src/format/part.c
+src/format/format.c
+src/format/java/attribute.c
+src/format/java/e_java.c
+src/format/java/field.c
+src/format/java/java.c
src/format/java/java-int.c
src/format/java/method.c
-src/format/java/java.c
-src/format/java/e_java.c
-src/format/java/attribute.c
src/format/java/pool.c
-src/format/java/field.c
-src/format/dex/method.c
-src/format/dex/class.c
-src/format/dex/dex.c
-src/format/dex/pool.c
-src/format/dex/dex-int.c
-src/format/mangling/libjavamangling_la-java_tok.c
src/format/mangling/context.c
+src/format/mangling/demangler.c
+src/format/mangling/itanium_gram.c
src/format/mangling/itanium_tok.c
src/format/mangling/libjavamangling_la-java_gram.c
-src/format/mangling/itanium_gram.c
-src/format/mangling/demangler.c
-src/arch/instruction.c
-src/arch/x86/op_rol.c
-src/arch/x86/op_movs.c
-src/arch/x86/op_sub.c
-src/arch/x86/op_adc.c
-src/arch/x86/op_stos.c
-src/arch/x86/registers.c
-src/arch/x86/instruction.c
-src/arch/x86/op_ret.c
-src/arch/x86/op_not.c
-src/arch/x86/op_push.c
-src/arch/x86/op_test.c
-src/arch/x86/op_arpl.c
-src/arch/x86/op_hlt.c
-src/arch/x86/op_rcl.c
-src/arch/x86/op_mov.c
-src/arch/x86/op_cmp.c
-src/arch/x86/processor.c
-src/arch/x86/op_sar.c
-src/arch/x86/op_mul.c
-src/arch/x86/operand.c
-src/arch/x86/op_jump.c
-src/arch/x86/op_pop.c
-src/arch/x86/op_lea.c
-src/arch/x86/op_scas.c
-src/arch/x86/op_ror.c
-src/arch/x86/op_leave.c
-src/arch/x86/op_inc.c
-src/arch/x86/op_call.c
-src/arch/x86/op_cmps.c
-src/arch/x86/op_set.c
-src/arch/x86/op_movzx.c
-src/arch/x86/op_dec.c
-src/arch/x86/op_nop.c
-src/arch/x86/op_xchg.c
-src/arch/x86/op_shl.c
-src/arch/x86/op_rcr.c
-src/arch/x86/op_xor.c
-src/arch/x86/op_add.c
-src/arch/x86/op_and.c
-src/arch/x86/op_shr.c
-src/arch/x86/op_int.c
-src/arch/x86/op_cld.c
-src/arch/x86/op_movsx.c
-src/arch/x86/op_sbb.c
-src/arch/x86/op_or.c
-src/arch/processor.c
-src/arch/mips/op_sub.c
-src/arch/mips/registers.c
-src/arch/mips/instruction.c
-src/arch/mips/op_branch.c
-src/arch/mips/op_store.c
-src/arch/mips/processor.c
-src/arch/mips/operand.c
-src/arch/mips/op_jump.c
-src/arch/mips/op_sr.c
-src/arch/mips/op_nop.c
-src/arch/mips/op_add.c
-src/arch/mips/op_and.c
-src/arch/mips/op_load.c
-src/arch/operand.c
-src/arch/archbase.c
-src/arch/arm/processor.c
-src/arch/dalvik/op_rsub.c
-src/arch/dalvik/op_sub.c
-src/arch/dalvik/op_iget.c
-src/arch/dalvik/instruction.c
-src/arch/dalvik/op_invoke.c
-src/arch/dalvik/op_ret.c
-src/arch/dalvik/op_sget.c
-src/arch/dalvik/op_new.c
-src/arch/dalvik/op_array.c
-src/arch/dalvik/op_aget.c
-src/arch/dalvik/op_check.c
-src/arch/dalvik/op_sput.c
-src/arch/dalvik/op_cmp.c
-src/arch/dalvik/op_const.c
-src/arch/dalvik/processor.c
-src/arch/dalvik/op_mul.c
-src/arch/dalvik/op_if.c
-src/arch/dalvik/operand.c
-src/arch/dalvik/op_move.c
-src/arch/dalvik/op_div.c
-src/arch/dalvik/op_aput.c
-src/arch/dalvik/register.c
-src/arch/dalvik/op_to.c
-src/arch/dalvik/op_nop.c
-src/arch/dalvik/op_rem.c
-src/arch/dalvik/op_goto.c
-src/arch/dalvik/op_iput.c
-src/arch/dalvik/op_xor.c
-src/arch/dalvik/op_add.c
-src/arch/dalvik/op_and.c
-src/arch/dalvik/op_or.c
-src/arch/immediate.c
-src/arch/jvm/op_getput.c
-src/arch/jvm/op_dup.c
-src/arch/jvm/instruction.c
-src/arch/jvm/op_invoke.c
-src/arch/jvm/op_ret.c
-src/arch/jvm/op_store.c
-src/arch/jvm/op_monitor.c
-src/arch/jvm/op_const.c
-src/arch/jvm/processor.c
-src/arch/jvm/operand.c
-src/arch/jvm/op_pop.c
-src/arch/jvm/op_convert.c
-src/arch/jvm/op_nop.c
-src/arch/jvm/op_add.c
-src/arch/jvm/op_load.c
-src/arch/artificial.c
+src/format/mangling/libjavamangling_la-java_tok.c
+src/format/part.c
+src/format/pe/pe.c
+src/format/pe/pe-int.c
+src/format/pe/section.c
+src/format/pe/symbols.c
+src/format/symbol.c
+src/glibext/delayed.c
+src/glibext/gbufferline.c
+src/glibext/gbuffersegment.c
+src/glibext/gcodebuffer.c
+src/glibext/gnhash.c
+src/graph/dot.c
+src/graph/layout.c
+src/graph/node.c
+src/gtkext/easygtk.c
+src/gtkext/gtkbinview.c
+src/gtkext/gtkblockview.c
+src/gtkext/gtkblockview.old.c
+src/gtkext/gtkbufferview.c
+src/gtkext/gtkdockitem.c
+src/gtkext/gtkdockpanel.c
+src/gtkext/gtkdropwindow.c
+src/gtkext/gtkextstatusbar.c
+src/gtkext/gtkgraphview.c
+src/gtkext/gtklinkrenderer.c
+src/gtkext/gtksourceview.c
+src/gtkext/gtkviewpanel.c
+src/gtkext/iodamarshal.c
+src/gtkext/support.c
+src/gui/editem.c
+src/gui/menus/debug.c
+src/gui/menus/help.c
+src/gui/menus/menubar.c
+src/gui/tb/source.c
+src/gui/tb/toolbar.c
+src/main.c
+src/panels/breaks.c
+src/panels/glimpse.c
+src/panels/log.c
+src/panels/panel.c
+src/panels/registers.c
+src/panels/strings.c
+src/panels/symbols.c
+src/params.c
+src/plugins/context.c
+src/plugins/overjump/overjump.c
+src/plugins/pglist.c
+src/plugins/plugin.c
+src/plugins/pyoida/py_binary.c
+src/plugins/pyoida/py_line.c
+src/plugins/pyoida/py_log.c
+src/plugins/pyoida/pyoida.c
+src/project.c
+src/shell.c
+src/xdg.c
diff --git a/po/fr.po b/po/fr.po
index df24935..bfa48b5 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: openida 0.0.1\n"
"Report-Msgid-Bugs-To: nocbos@gmail.com\n"
-"POT-Creation-Date: 2010-11-04 16:24+0100\n"
+"POT-Creation-Date: 2011-01-06 02:08+0100\n"
"PO-Revision-Date: 2010-11-04 16:11+0100\n"
"Last-Translator: cyrille <nocbos@gmail.com>\n"
"Language-Team: French\n"
@@ -17,96 +17,149 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: src/panel/registers.c:100 src/panels/registers.c:101
-msgid "Registers:"
+#: src/analysis/binary.c:348
+msgid "default"
msgstr ""
-#: src/panel/registers.c:179 src/panels/registers.c:180
-msgid "Segments:"
+#: src/analysis/binary.c:371
+#, c-format
+msgid "Opening '%s' file..."
msgstr ""
-#: src/panel/strings.c:87 src/panels/strings.c:87 src/panels/breaks.c:189
-msgid "Address"
+#: src/analysis/binary.c:381
+msgid "Unknown binary format"
msgstr ""
-#: src/panel/strings.c:91 src/panels/strings.c:91 src/panels/breaks.c:209
-msgid "String"
+#: src/analysis/binary.c:389
+msgid "Detected architecture: ARM"
msgstr ""
-#: src/plugins/pyoida/py_log.c:118
-msgid "Invalid type of message"
+#: src/analysis/binary.c:392
+msgid "Detected architecture: Dalvik Virtual Machine"
msgstr ""
-#: src/shell.c:164
-msgid ""
-"Exit detected ; lauching an new Python shell...\n"
-"\r"
+#: src/analysis/binary.c:395
+msgid "Detected architecture: Java Virtual Machine"
msgstr ""
-#: src/analysis/binary.c:299
-msgid "Disassembling..."
+#: src/analysis/binary.c:398
+msgid ""
+"Detected architecture: Microprocessor without Interlocked Pipeline Stages"
msgstr ""
-#: src/analysis/binary.c:307
-msgid "Establishing links..."
+#: src/analysis/binary.c:401
+msgid "Detected architecture: i386"
msgstr ""
-#: src/analysis/binary.c:315
-msgid "Finding remaining limits..."
+#: src/analysis/binary.c:404
+msgid "Unknown architecture"
msgstr ""
-#: src/analysis/binary.c:734
-msgid "default"
+#: src/analysis/binary.c:1161 src/analysis/binary.c:1164
+msgid "Group"
msgstr ""
-#: src/analysis/binary.c:757
-#, c-format
-msgid "Opening '%s' file..."
+#: src/analysis/decomp/decompiler.c:77
+msgid "Binary data decompiled by OpenIDA"
msgstr ""
-#: src/analysis/binary.c:767
-msgid "Unknown binary format"
+#: src/analysis/decomp/decompiler.c:81 src/analysis/disass/disassembler.c:288
+msgid "OpenIDA is free software - © 2008-2010 Cyrille Bagard"
msgstr ""
-#: src/analysis/binary.c:775
-msgid "Detected architecture: ARM"
+#: src/analysis/decomp/decompiler.c:90
+msgid "whole binary"
msgstr ""
-#: src/analysis/binary.c:778
-msgid "Detected architecture: Dalvik Virtual Machine"
+#: src/analysis/decomp/decompiler.c:92 src/analysis/decomp/decompiler.c:95
+#: src/analysis/disass/disassembler.c:296
+#: src/analysis/disass/disassembler.c:299
+msgid "File: "
msgstr ""
-#: src/analysis/binary.c:781
-msgid "Detected architecture: Java Virtual Machine"
+#: src/analysis/disass/disassembler.c:207
+msgid "Disassembling..."
msgstr ""
-#: src/analysis/binary.c:784
-msgid ""
-"Detected architecture: Microprocessor without Interlocked Pipeline Stages"
+#: src/analysis/disass/disassembler.c:216
+msgid "Establishing links..."
msgstr ""
-#: src/analysis/binary.c:787
-msgid "Detected architecture: i386"
+#: src/analysis/disass/disassembler.c:224
+msgid "Finding remaining limits..."
msgstr ""
-#: src/analysis/binary.c:790
-msgid "Unknown architecture"
+#: src/analysis/disass/disassembler.c:234
+msgid "Printing disassembled code..."
msgstr ""
-#: src/analysis/binary.c:1432
+#: src/analysis/disass/disassembler.c:284
msgid "Disassembly generated by OpenIDA"
msgstr "Désassemblage généré par OpenIDA"
-#: src/analysis/binary.c:1443 src/analysis/binary.c:1446
-msgid "File: "
+#: src/analysis/disass/disassembler.c:313
+#: src/analysis/disass/disassembler.c:316
+msgid "Sha256: "
msgstr ""
-#: src/analysis/binary.c:1460 src/analysis/binary.c:1463
-msgid "Sha256: "
+#: src/debug/jdwp/debugger.c:196
+#, c-format
+msgid "The debugger is '%s' (JRE %d.%d; VM %s)."
+msgstr "Le débogueur est '%s' (JRE %d.%d ; VM %s)."
+
+#: src/debug/jdwp/tcp.c:187
+#, c-format
+msgid "Error while connecting to the JDWP server at %s:%s."
+msgstr "Erreur lors de la connexion au serveur JDWP sur %s:%s."
+
+#: src/debug/jdwp/tcp.c:193
+#, c-format
+msgid "Connected to %s:%hd."
+msgstr "Connecté à %s:%hd."
+
+#: src/debug/jdwp/tcp.c:211
+msgid "Failure in the first JDWP handshake."
+msgstr "Echec des premiers échanges JDWP."
+
+#: src/dialogs/about.c:70 src/gui/menus/help.c:65
+msgid "About"
+msgstr "A propos"
+
+#: src/dialogs/binparts.c:138
+msgid "Content to display"
msgstr ""
-#: src/analysis/binary.c:1568 src/analysis/binary.c:1571
-msgid "Group"
+#: src/dialogs/binparts.c:160
+msgid "Model :"
+msgstr ""
+
+#: src/dialogs/binparts.c:210
+msgid "Active"
+msgstr ""
+
+#: src/dialogs/binparts.c:215
+msgid "Name"
+msgstr ""
+
+#: src/dialogs/binparts.c:220 src/gui/menus/debug.c:69
+#: src/gui/menus/debug.c:104 src/gui/menus/debug.c:119
+msgid "Start"
+msgstr "Démarrer"
+
+#: src/dialogs/binparts.c:224
+msgid "End"
+msgstr ""
+
+#: src/dialogs/binparts.c:282
+msgid "Default"
+msgstr ""
+
+#: src/dialogs/binparts.c:283
+msgid "Routines"
+msgstr ""
+
+#: src/dialogs/binparts.c:284
+msgid "User"
msgstr ""
#: src/dialogs/export.c:151
@@ -153,11 +206,11 @@ msgstr ""
msgid "<b>Items to display</b>"
msgstr ""
-#: src/dialogs/export.c:473 src/editor.c:324
+#: src/dialogs/export.c:473 src/editor.c:346
msgid "Virtual address"
msgstr ""
-#: src/dialogs/export.c:477 src/editor.c:327
+#: src/dialogs/export.c:477 src/editor.c:349
msgid "Binary code"
msgstr ""
@@ -173,10 +226,6 @@ msgstr ""
msgid "Exporting binary lines..."
msgstr ""
-#: src/dialogs/about.c:70 src/editor.c:428
-msgid "About"
-msgstr ""
-
#: src/dialogs/plugins.c:106
msgid "Plugins selection"
msgstr ""
@@ -225,269 +274,271 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: src/dialogs/binparts.c:138
-msgid "Content to display"
-msgstr ""
-
-#: src/dialogs/binparts.c:160
-msgid "Model :"
-msgstr ""
-
-#: src/dialogs/binparts.c:210
-msgid "Active"
-msgstr ""
-
-#: src/dialogs/binparts.c:215
-msgid "Name"
-msgstr ""
-
-#: src/dialogs/binparts.c:220
-msgid "Start"
-msgstr ""
-
-#: src/dialogs/binparts.c:224
-msgid "End"
-msgstr ""
-
-#: src/dialogs/binparts.c:282
-msgid "Default"
-msgstr ""
-
-#: src/dialogs/binparts.c:283
-msgid "Routines"
-msgstr ""
-
-#: src/dialogs/binparts.c:284
-msgid "User"
-msgstr ""
-
-#: src/editor.c:240
+#: src/editor.c:253
msgid "OpenIDA"
msgstr ""
-#: src/editor.c:263
+#: src/editor.c:283
msgid "_File"
msgstr "_Fichier"
-#: src/editor.c:270
+#: src/editor.c:290
msgid "New project"
msgstr ""
-#: src/editor.c:274
+#: src/editor.c:294
msgid "Open project"
msgstr ""
-#: src/editor.c:280
+#: src/editor.c:300
msgid "Save project"
msgstr ""
-#: src/editor.c:283
+#: src/editor.c:303
msgid "Save project as..."
msgstr ""
-#: src/editor.c:289
+#: src/editor.c:309
msgid "Recent projects..."
msgstr ""
-#: src/editor.c:295
+#: src/editor.c:317
msgid "_View"
msgstr ""
-#: src/editor.c:302
+#: src/editor.c:324
msgid "Text view"
msgstr ""
-#: src/editor.c:309
+#: src/editor.c:331
msgid "Graph view"
msgstr ""
-#: src/editor.c:316
+#: src/editor.c:338
msgid "Source code"
msgstr ""
-#: src/editor.c:333
+#: src/editor.c:355
+msgid "Toolbar"
+msgstr ""
+
+#: src/editor.c:361
+msgid "Source file"
+msgstr ""
+
+#: src/editor.c:370
msgid "_Project"
msgstr ""
-#: src/editor.c:340
+#: src/editor.c:377
msgid "Add a binary..."
msgstr ""
-#: src/editor.c:343
+#: src/editor.c:380
msgid "Remove a binary"
msgstr ""
-#: src/editor.c:354
+#: src/editor.c:391
msgid "_Binary"
msgstr ""
-#: src/editor.c:361
+#: src/editor.c:398
msgid "Select parts..."
msgstr ""
-#: src/editor.c:364
+#: src/editor.c:401
msgid "Select plugins..."
msgstr ""
-#: src/editor.c:370
+#: src/editor.c:407
msgid "Export..."
msgstr ""
-#: src/editor.c:375
+#: src/editor.c:412 src/gui/menus/debug.c:63
msgid "_Debug"
-msgstr ""
+msgstr "_Débogage"
-#: src/editor.c:382
+#: src/editor.c:419
msgid "Start process"
msgstr ""
-#: src/editor.c:385
+#: src/editor.c:422
msgid "Pause process"
msgstr ""
-#: src/editor.c:388
+#: src/editor.c:425
msgid "Resume process"
msgstr ""
-#: src/editor.c:391
+#: src/editor.c:428
msgid "Kill process"
msgstr ""
-#: src/editor.c:397
+#: src/editor.c:434
msgid "Step into"
msgstr ""
-#: src/editor.c:400
+#: src/editor.c:437
msgid "Step over"
msgstr ""
-#: src/editor.c:403
+#: src/editor.c:440
msgid "Run until ret"
msgstr ""
-#: src/editor.c:415
+#: src/editor.c:452
msgid "_Plugins"
msgstr ""
-#: src/editor.c:421
-msgid "_Help"
-msgstr ""
-
-#: src/editor.c:479
+#: src/editor.c:510
msgid "Registers"
msgstr ""
-#: src/editor.c:496
+#: src/editor.c:527
msgid "Messages"
msgstr ""
-#: src/editor.c:499
+#: src/editor.c:530
msgid "Strings"
msgstr ""
-#: src/editor.c:506
+#: src/editor.c:537
msgid "Shell"
msgstr ""
-#: src/editor.c:594
+#: src/editor.c:625
msgid "The current project will be lost. Do you you want to save it ?"
msgstr ""
-#: src/editor.c:699
+#: src/editor.c:730
msgid "Open a project"
msgstr ""
-#: src/editor.c:781
+#: src/editor.c:812
msgid "Save the project as..."
msgstr ""
-#: src/editor.c:974
+#: src/editor.c:1005
msgid "Open a binary file"
msgstr ""
-#: src/gtkext/gtkblockview.c:324
-msgid "Inserting lines..."
+#: src/format/dwarf/info.c:483
+msgid "[no name]"
msgstr ""
-#: src/debug/ptrace/ptrace.c:302
+#: src/format/elf/elf.c:182
#, c-format
-msgid "Starting to debug %s..."
+msgid ""
+"Corrupted program header size (%hu); fixed ! -- replacing 0x%04hx by 0x"
+"%04hx at offset 0x%x"
msgstr ""
-#: src/debug/ptrace/ptrace.c:378
+#: src/format/elf/elf.c:191
#, c-format
-msgid "Finished to debug %s..."
-msgstr ""
-
-#: src/panels/symbols.c:181
-msgid "Symbols"
-msgstr ""
-
-#: src/panels/breaks.c:156
-msgid "Breakpoints"
+msgid ""
+"Corrupted section header size (%hu); fixed ! -- replacing 0x%04hx by 0x"
+"%04hx at offset 0x%x"
msgstr ""
-#: src/panels/glimpse.c:105
-msgid "Glimpse"
+#: src/format/elf/symbols.c:99
+msgid "Binary is dynamically linked"
msgstr ""
-#: src/format/format.c:338
-msgid "Dalvik Executable"
+#: src/format/elf/symbols.c:106
+msgid "Binary is statically linked"
msgstr ""
-#: src/format/format.c:340 src/format/exe_format.c:242
+#: src/format/exe_format.c:242 src/format/format.c:489
msgid "ELF"
msgstr ""
-#: src/format/format.c:341 src/format/exe_format.c:243
+#: src/format/exe_format.c:243 src/format/format.c:490
msgid "Java"
msgstr ""
-#: src/format/format.c:342
-msgid "PE"
+#: src/format/exe_format.c:244
+msgid "Portable Executable"
msgstr ""
-#: src/format/format.c:373 src/format/exe_format.c:301
+#: src/format/exe_format.c:301 src/format/format.c:522
#, c-format
msgid "%s is matching..."
msgstr ""
-#: src/format/elf/symbols.c:99
-msgid "Binary is dynamically linked"
+#: src/format/format.c:487
+msgid "Dalvik Executable"
msgstr ""
-#: src/format/elf/symbols.c:106
-msgid "Binary is statically linked"
+#: src/format/format.c:491
+msgid "PE"
msgstr ""
-#: src/format/elf/elf.c:182
+#: src/format/java/attribute.c:239
#, c-format
-msgid ""
-"Corrupted program header size (%hu); fixed ! -- replacing 0x%04hx by 0x"
-"%04hx at offset 0x%x"
+msgid "Attribute name not supported: '%s'"
msgstr ""
-#: src/format/elf/elf.c:191
+#: src/format/java/attribute.c:243
#, c-format
-msgid ""
-"Corrupted section header size (%hu); fixed ! -- replacing 0x%04hx by 0x"
-"%04hx at offset 0x%x"
+msgid "Size indication of the attribute '%s' not verified: %d vs %d"
msgstr ""
-#: src/format/exe_format.c:244
-msgid "Portable Executable"
+#: src/gtkext/gtkblockview.old.c:324
+msgid "Inserting lines..."
msgstr ""
-#: src/format/dwarf/info.c:483
-msgid "[no name]"
+#: src/gui/menus/debug.c:100
+msgid "No available debug module for this binary !"
+msgstr "Pas de module de débogage disponible pour ce binaire !"
+
+#: src/gui/menus/debug.c:108
+msgid "Failed to initialize the debugger."
+msgstr "Echec de l'initialisation du débogueur."
+
+#: src/gui/menus/debug.c:112
+msgid "Stop"
+msgstr "Arrêter"
+
+#: src/gui/menus/help.c:59
+msgid "_Help"
+msgstr "_Aide"
+
+#: src/gui/tb/source.c:85
+msgid " Source: "
msgstr ""
-#: src/format/java/attribute.c:239
-#, c-format
-msgid "Attribute name not supported: '%s'"
+#: src/gui/tb/source.c:116
+msgid "Source files"
msgstr ""
-#: src/format/java/attribute.c:243
-#, c-format
-msgid "Size indication of the attribute '%s' not verified: %d vs %d"
+#: src/panels/breaks.c:156
+msgid "Breakpoints"
+msgstr ""
+
+#: src/panels/breaks.c:189 src/panels/strings.c:87
+msgid "Address"
+msgstr ""
+
+#: src/panels/breaks.c:209 src/panels/strings.c:91
+msgid "String"
+msgstr ""
+
+#: src/panels/glimpse.c:105
+msgid "Glimpse"
+msgstr ""
+
+#: src/panels/registers.c:101
+msgid "Registers:"
+msgstr ""
+
+#: src/panels/registers.c:180
+msgid "Segments:"
+msgstr ""
+
+#: src/panels/symbols.c:181
+msgid "Symbols"
+msgstr ""
+
+#: src/plugins/pyoida/py_log.c:118
+msgid "Invalid type of message"
msgstr ""
diff --git a/po/openida.pot b/po/openida.pot
index da896ae..abdc091 100644
--- a/po/openida.pot
+++ b/po/openida.pot
@@ -8,105 +8,158 @@ msgid ""
msgstr ""
"Project-Id-Version: openida 0.0.1\n"
"Report-Msgid-Bugs-To: nocbos@gmail.com\n"
-"POT-Creation-Date: 2010-11-04 16:24+0100\n"
+"POT-Creation-Date: 2011-01-06 02:08+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/panel/registers.c:100 src/panels/registers.c:101
-msgid "Registers:"
+#: src/analysis/binary.c:348
+msgid "default"
msgstr ""
-#: src/panel/registers.c:179 src/panels/registers.c:180
-msgid "Segments:"
+#: src/analysis/binary.c:371
+#, c-format
+msgid "Opening '%s' file..."
msgstr ""
-#: src/panel/strings.c:87 src/panels/strings.c:87 src/panels/breaks.c:189
-msgid "Address"
+#: src/analysis/binary.c:381
+msgid "Unknown binary format"
msgstr ""
-#: src/panel/strings.c:91 src/panels/strings.c:91 src/panels/breaks.c:209
-msgid "String"
+#: src/analysis/binary.c:389
+msgid "Detected architecture: ARM"
msgstr ""
-#: src/plugins/pyoida/py_log.c:118
-msgid "Invalid type of message"
+#: src/analysis/binary.c:392
+msgid "Detected architecture: Dalvik Virtual Machine"
+msgstr ""
+
+#: src/analysis/binary.c:395
+msgid "Detected architecture: Java Virtual Machine"
msgstr ""
-#: src/shell.c:164
+#: src/analysis/binary.c:398
msgid ""
-"Exit detected ; lauching an new Python shell...\n"
-"\r"
+"Detected architecture: Microprocessor without Interlocked Pipeline Stages"
+msgstr ""
+
+#: src/analysis/binary.c:401
+msgid "Detected architecture: i386"
+msgstr ""
+
+#: src/analysis/binary.c:404
+msgid "Unknown architecture"
+msgstr ""
+
+#: src/analysis/binary.c:1161 src/analysis/binary.c:1164
+msgid "Group"
+msgstr ""
+
+#: src/analysis/decomp/decompiler.c:77
+msgid "Binary data decompiled by OpenIDA"
+msgstr ""
+
+#: src/analysis/decomp/decompiler.c:81 src/analysis/disass/disassembler.c:288
+msgid "OpenIDA is free software - © 2008-2010 Cyrille Bagard"
msgstr ""
-#: src/analysis/binary.c:299
+#: src/analysis/decomp/decompiler.c:90
+msgid "whole binary"
+msgstr ""
+
+#: src/analysis/decomp/decompiler.c:92 src/analysis/decomp/decompiler.c:95
+#: src/analysis/disass/disassembler.c:296
+#: src/analysis/disass/disassembler.c:299
+msgid "File: "
+msgstr ""
+
+#: src/analysis/disass/disassembler.c:207
msgid "Disassembling..."
msgstr ""
-#: src/analysis/binary.c:307
+#: src/analysis/disass/disassembler.c:216
msgid "Establishing links..."
msgstr ""
-#: src/analysis/binary.c:315
+#: src/analysis/disass/disassembler.c:224
msgid "Finding remaining limits..."
msgstr ""
-#: src/analysis/binary.c:734
-msgid "default"
+#: src/analysis/disass/disassembler.c:234
+msgid "Printing disassembled code..."
+msgstr ""
+
+#: src/analysis/disass/disassembler.c:284
+msgid "Disassembly generated by OpenIDA"
msgstr ""
-#: src/analysis/binary.c:757
+#: src/analysis/disass/disassembler.c:313
+#: src/analysis/disass/disassembler.c:316
+msgid "Sha256: "
+msgstr ""
+
+#: src/debug/jdwp/debugger.c:196
#, c-format
-msgid "Opening '%s' file..."
+msgid "The debugger is '%s' (JRE %d.%d; VM %s)."
msgstr ""
-#: src/analysis/binary.c:767
-msgid "Unknown binary format"
+#: src/debug/jdwp/tcp.c:187
+#, c-format
+msgid "Error while connecting to the JDWP server at %s:%s."
msgstr ""
-#: src/analysis/binary.c:775
-msgid "Detected architecture: ARM"
+#: src/debug/jdwp/tcp.c:193
+#, c-format
+msgid "Connected to %s:%hd."
msgstr ""
-#: src/analysis/binary.c:778
-msgid "Detected architecture: Dalvik Virtual Machine"
+#: src/debug/jdwp/tcp.c:211
+msgid "Failure in the first JDWP handshake."
msgstr ""
-#: src/analysis/binary.c:781
-msgid "Detected architecture: Java Virtual Machine"
+#: src/dialogs/about.c:70 src/gui/menus/help.c:65
+msgid "About"
msgstr ""
-#: src/analysis/binary.c:784
-msgid ""
-"Detected architecture: Microprocessor without Interlocked Pipeline Stages"
+#: src/dialogs/binparts.c:138
+msgid "Content to display"
msgstr ""
-#: src/analysis/binary.c:787
-msgid "Detected architecture: i386"
+#: src/dialogs/binparts.c:160
+msgid "Model :"
msgstr ""
-#: src/analysis/binary.c:790
-msgid "Unknown architecture"
+#: src/dialogs/binparts.c:210
+msgid "Active"
msgstr ""
-#: src/analysis/binary.c:1432
-msgid "Disassembly generated by OpenIDA"
+#: src/dialogs/binparts.c:215
+msgid "Name"
msgstr ""
-#: src/analysis/binary.c:1443 src/analysis/binary.c:1446
-msgid "File: "
+#: src/dialogs/binparts.c:220 src/gui/menus/debug.c:69
+#: src/gui/menus/debug.c:104 src/gui/menus/debug.c:119
+msgid "Start"
msgstr ""
-#: src/analysis/binary.c:1460 src/analysis/binary.c:1463
-msgid "Sha256: "
+#: src/dialogs/binparts.c:224
+msgid "End"
msgstr ""
-#: src/analysis/binary.c:1568 src/analysis/binary.c:1571
-msgid "Group"
+#: src/dialogs/binparts.c:282
+msgid "Default"
+msgstr ""
+
+#: src/dialogs/binparts.c:283
+msgid "Routines"
+msgstr ""
+
+#: src/dialogs/binparts.c:284
+msgid "User"
msgstr ""
#: src/dialogs/export.c:151
@@ -153,11 +206,11 @@ msgstr ""
msgid "<b>Items to display</b>"
msgstr ""
-#: src/dialogs/export.c:473 src/editor.c:324
+#: src/dialogs/export.c:473 src/editor.c:346
msgid "Virtual address"
msgstr ""
-#: src/dialogs/export.c:477 src/editor.c:327
+#: src/dialogs/export.c:477 src/editor.c:349
msgid "Binary code"
msgstr ""
@@ -173,10 +226,6 @@ msgstr ""
msgid "Exporting binary lines..."
msgstr ""
-#: src/dialogs/about.c:70 src/editor.c:428
-msgid "About"
-msgstr ""
-
#: src/dialogs/plugins.c:106
msgid "Plugins selection"
msgstr ""
@@ -225,269 +274,271 @@ msgstr ""
msgid "Cancel"
msgstr ""
-#: src/dialogs/binparts.c:138
-msgid "Content to display"
-msgstr ""
-
-#: src/dialogs/binparts.c:160
-msgid "Model :"
-msgstr ""
-
-#: src/dialogs/binparts.c:210
-msgid "Active"
-msgstr ""
-
-#: src/dialogs/binparts.c:215
-msgid "Name"
-msgstr ""
-
-#: src/dialogs/binparts.c:220
-msgid "Start"
-msgstr ""
-
-#: src/dialogs/binparts.c:224
-msgid "End"
-msgstr ""
-
-#: src/dialogs/binparts.c:282
-msgid "Default"
-msgstr ""
-
-#: src/dialogs/binparts.c:283
-msgid "Routines"
-msgstr ""
-
-#: src/dialogs/binparts.c:284
-msgid "User"
-msgstr ""
-
-#: src/editor.c:240
+#: src/editor.c:253
msgid "OpenIDA"
msgstr ""
-#: src/editor.c:263
+#: src/editor.c:283
msgid "_File"
msgstr ""
-#: src/editor.c:270
+#: src/editor.c:290
msgid "New project"
msgstr ""
-#: src/editor.c:274
+#: src/editor.c:294
msgid "Open project"
msgstr ""
-#: src/editor.c:280
+#: src/editor.c:300
msgid "Save project"
msgstr ""
-#: src/editor.c:283
+#: src/editor.c:303
msgid "Save project as..."
msgstr ""
-#: src/editor.c:289
+#: src/editor.c:309
msgid "Recent projects..."
msgstr ""
-#: src/editor.c:295
+#: src/editor.c:317
msgid "_View"
msgstr ""
-#: src/editor.c:302
+#: src/editor.c:324
msgid "Text view"
msgstr ""
-#: src/editor.c:309
+#: src/editor.c:331
msgid "Graph view"
msgstr ""
-#: src/editor.c:316
+#: src/editor.c:338
msgid "Source code"
msgstr ""
-#: src/editor.c:333
+#: src/editor.c:355
+msgid "Toolbar"
+msgstr ""
+
+#: src/editor.c:361
+msgid "Source file"
+msgstr ""
+
+#: src/editor.c:370
msgid "_Project"
msgstr ""
-#: src/editor.c:340
+#: src/editor.c:377
msgid "Add a binary..."
msgstr ""
-#: src/editor.c:343
+#: src/editor.c:380
msgid "Remove a binary"
msgstr ""
-#: src/editor.c:354
+#: src/editor.c:391
msgid "_Binary"
msgstr ""
-#: src/editor.c:361
+#: src/editor.c:398
msgid "Select parts..."
msgstr ""
-#: src/editor.c:364
+#: src/editor.c:401
msgid "Select plugins..."
msgstr ""
-#: src/editor.c:370
+#: src/editor.c:407
msgid "Export..."
msgstr ""
-#: src/editor.c:375
+#: src/editor.c:412 src/gui/menus/debug.c:63
msgid "_Debug"
msgstr ""
-#: src/editor.c:382
+#: src/editor.c:419
msgid "Start process"
msgstr ""
-#: src/editor.c:385
+#: src/editor.c:422
msgid "Pause process"
msgstr ""
-#: src/editor.c:388
+#: src/editor.c:425
msgid "Resume process"
msgstr ""
-#: src/editor.c:391
+#: src/editor.c:428
msgid "Kill process"
msgstr ""
-#: src/editor.c:397
+#: src/editor.c:434
msgid "Step into"
msgstr ""
-#: src/editor.c:400
+#: src/editor.c:437
msgid "Step over"
msgstr ""
-#: src/editor.c:403
+#: src/editor.c:440
msgid "Run until ret"
msgstr ""
-#: src/editor.c:415
+#: src/editor.c:452
msgid "_Plugins"
msgstr ""
-#: src/editor.c:421
-msgid "_Help"
-msgstr ""
-
-#: src/editor.c:479
+#: src/editor.c:510
msgid "Registers"
msgstr ""
-#: src/editor.c:496
+#: src/editor.c:527
msgid "Messages"
msgstr ""
-#: src/editor.c:499
+#: src/editor.c:530
msgid "Strings"
msgstr ""
-#: src/editor.c:506
+#: src/editor.c:537
msgid "Shell"
msgstr ""
-#: src/editor.c:594
+#: src/editor.c:625
msgid "The current project will be lost. Do you you want to save it ?"
msgstr ""
-#: src/editor.c:699
+#: src/editor.c:730
msgid "Open a project"
msgstr ""
-#: src/editor.c:781
+#: src/editor.c:812
msgid "Save the project as..."
msgstr ""
-#: src/editor.c:974
+#: src/editor.c:1005
msgid "Open a binary file"
msgstr ""
-#: src/gtkext/gtkblockview.c:324
-msgid "Inserting lines..."
+#: src/format/dwarf/info.c:483
+msgid "[no name]"
msgstr ""
-#: src/debug/ptrace/ptrace.c:302
+#: src/format/elf/elf.c:182
#, c-format
-msgid "Starting to debug %s..."
+msgid ""
+"Corrupted program header size (%hu); fixed ! -- replacing 0x%04hx by 0x"
+"%04hx at offset 0x%x"
msgstr ""
-#: src/debug/ptrace/ptrace.c:378
+#: src/format/elf/elf.c:191
#, c-format
-msgid "Finished to debug %s..."
-msgstr ""
-
-#: src/panels/symbols.c:181
-msgid "Symbols"
-msgstr ""
-
-#: src/panels/breaks.c:156
-msgid "Breakpoints"
+msgid ""
+"Corrupted section header size (%hu); fixed ! -- replacing 0x%04hx by 0x"
+"%04hx at offset 0x%x"
msgstr ""
-#: src/panels/glimpse.c:105
-msgid "Glimpse"
+#: src/format/elf/symbols.c:99
+msgid "Binary is dynamically linked"
msgstr ""
-#: src/format/format.c:338
-msgid "Dalvik Executable"
+#: src/format/elf/symbols.c:106
+msgid "Binary is statically linked"
msgstr ""
-#: src/format/format.c:340 src/format/exe_format.c:242
+#: src/format/exe_format.c:242 src/format/format.c:489
msgid "ELF"
msgstr ""
-#: src/format/format.c:341 src/format/exe_format.c:243
+#: src/format/exe_format.c:243 src/format/format.c:490
msgid "Java"
msgstr ""
-#: src/format/format.c:342
-msgid "PE"
+#: src/format/exe_format.c:244
+msgid "Portable Executable"
msgstr ""
-#: src/format/format.c:373 src/format/exe_format.c:301
+#: src/format/exe_format.c:301 src/format/format.c:522
#, c-format
msgid "%s is matching..."
msgstr ""
-#: src/format/elf/symbols.c:99
-msgid "Binary is dynamically linked"
+#: src/format/format.c:487
+msgid "Dalvik Executable"
msgstr ""
-#: src/format/elf/symbols.c:106
-msgid "Binary is statically linked"
+#: src/format/format.c:491
+msgid "PE"
msgstr ""
-#: src/format/elf/elf.c:182
+#: src/format/java/attribute.c:239
#, c-format
-msgid ""
-"Corrupted program header size (%hu); fixed ! -- replacing 0x%04hx by 0x"
-"%04hx at offset 0x%x"
+msgid "Attribute name not supported: '%s'"
msgstr ""
-#: src/format/elf/elf.c:191
+#: src/format/java/attribute.c:243
#, c-format
-msgid ""
-"Corrupted section header size (%hu); fixed ! -- replacing 0x%04hx by 0x"
-"%04hx at offset 0x%x"
+msgid "Size indication of the attribute '%s' not verified: %d vs %d"
msgstr ""
-#: src/format/exe_format.c:244
-msgid "Portable Executable"
+#: src/gtkext/gtkblockview.old.c:324
+msgid "Inserting lines..."
msgstr ""
-#: src/format/dwarf/info.c:483
-msgid "[no name]"
+#: src/gui/menus/debug.c:100
+msgid "No available debug module for this binary !"
msgstr ""
-#: src/format/java/attribute.c:239
-#, c-format
-msgid "Attribute name not supported: '%s'"
+#: src/gui/menus/debug.c:108
+msgid "Failed to initialize the debugger."
msgstr ""
-#: src/format/java/attribute.c:243
-#, c-format
-msgid "Size indication of the attribute '%s' not verified: %d vs %d"
+#: src/gui/menus/debug.c:112
+msgid "Stop"
+msgstr ""
+
+#: src/gui/menus/help.c:59
+msgid "_Help"
+msgstr ""
+
+#: src/gui/tb/source.c:85
+msgid " Source: "
+msgstr ""
+
+#: src/gui/tb/source.c:116
+msgid "Source files"
+msgstr ""
+
+#: src/panels/breaks.c:156
+msgid "Breakpoints"
+msgstr ""
+
+#: src/panels/breaks.c:189 src/panels/strings.c:87
+msgid "Address"
+msgstr ""
+
+#: src/panels/breaks.c:209 src/panels/strings.c:91
+msgid "String"
+msgstr ""
+
+#: src/panels/glimpse.c:105
+msgid "Glimpse"
+msgstr ""
+
+#: src/panels/registers.c:101
+msgid "Registers:"
+msgstr ""
+
+#: src/panels/registers.c:180
+msgid "Segments:"
+msgstr ""
+
+#: src/panels/symbols.c:181
+msgid "Symbols"
+msgstr ""
+
+#: src/plugins/pyoida/py_log.c:118
+msgid "Invalid type of message"
msgstr ""
diff --git a/src/debug/debugger-int.h b/src/debug/debugger-int.h
index 642efd7..f27667c 100644
--- a/src/debug/debugger-int.h
+++ b/src/debug/debugger-int.h
@@ -32,6 +32,9 @@
+/* Procède au démarrage effectif de la session de débogage. */
+typedef bool (* attach_debugger_fc) (GBinaryDebugger *);
+
/* Démarre, met en pause ou tue une procédure de débogage. */
typedef bool (* basic_debugger_fc) (GBinaryDebugger *);
@@ -49,6 +52,8 @@ struct _GBinaryDebugger
GOpenidaBinary *binary; /* Cible à traiter */
+ attach_debugger_fc attach; /* Démarre le débogueur */
+
basic_debugger_fc run; /* Démarre le débogueur */
basic_debugger_fc pause; /* Met en pause le débogueur */
resume_debugger_fc resume; /* Relance le débogueur */
diff --git a/src/debug/debugger.c b/src/debug/debugger.c
index 7f66a0b..4f5eb19 100644
--- a/src/debug/debugger.c
+++ b/src/debug/debugger.c
@@ -136,6 +136,30 @@ GBinaryDebugger *g_new_binary_debugger(DebuggerType type, GOpenidaBinary *binary
* *
* Description : Démarre une procédure de débogage. *
* *
+* Retour : Bilan de l'opération. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+bool g_binary_debugger_attach(GBinaryDebugger *debugger)
+{
+ bool result; /* Bilan à retourner */
+
+ if (debugger->attach == NULL) result = true;
+ else result = debugger->attach(debugger);
+
+ return result;
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : debugger = débogueur à manipuler ici. *
+* *
+* Description : Démarre une procédure de débogage. *
+* *
* Retour : - *
* *
* Remarques : - *
diff --git a/src/debug/debugger.h b/src/debug/debugger.h
index 521d346..e3b90f4 100644
--- a/src/debug/debugger.h
+++ b/src/debug/debugger.h
@@ -76,6 +76,9 @@ GType g_binary_debugger_get_type(void);
GBinaryDebugger *g_new_binary_debugger(DebuggerType, GOpenidaBinary *);
/* Démarre une procédure de débogage. */
+bool g_binary_debugger_attach(GBinaryDebugger *);
+
+/* Démarre une procédure de débogage. */
void g_binary_debugger_run(GBinaryDebugger *);
/* Reprend une procédure de débogage. */
diff --git a/src/debug/jdwp/debugger.c b/src/debug/jdwp/debugger.c
index a99c6d0..829d31c 100644
--- a/src/debug/jdwp/debugger.c
+++ b/src/debug/jdwp/debugger.c
@@ -24,12 +24,14 @@
#include "debugger.h"
-#include "packet.h"
-#include "tcp.h"
+#include <i18n.h>
+#include "packet.h"
+#include "tcp.h"
#include "../debugger-int.h"
#include "../stream.h"
+#include "../../panels/log.h"
@@ -61,6 +63,8 @@ static void g_java_debugger_class_init(GJavaDebuggerClass *);
/* Procède à l'initialisation du débogueur utilisant Java. */
static void g_java_debugger_init(GJavaDebugger *);
+/* Procède au démarrage effectif de la session de débogage. */
+static bool g_java_debugger_attach(GJavaDebugger *);
/* Indique le type défini par la GLib pour le débogueur java. */
@@ -103,6 +107,9 @@ static void g_java_debugger_init(GJavaDebugger *debugger)
GBinaryDebugger *parent; /* Instance parente */
parent = G_BINARY_DEBUGGER(debugger);
+
+ parent->attach = (attach_debugger_fc)g_java_debugger_attach;
+
#if 0
parent->run = (basic_debugger_fc)g_java_debugger_run;
parent->resume = (resume_debugger_fc)g_java_debugger_resume;
@@ -118,7 +125,7 @@ static void g_java_debugger_init(GJavaDebugger *debugger)
* Paramètres : binary = binaire représenter à déboguer. *
* options = paramètres destinés au débogage. *
* *
-* Description : Crée un débogueur utilisant un serveur JAVA distant. *
+* Description : Crée un débogueur utilisant un serveur Java distant. *
* *
* Retour : Instance de débogueur mise en place ou NULL. *
* *
@@ -140,65 +147,67 @@ GBinaryDebugger *g_java_debugger_new(GOpenidaBinary *binary, void *options)
}
+/******************************************************************************
+* *
+* Paramètres : debugger = instance du module de débogage chargé. *
+* *
+* Description : Procède au démarrage effectif de la session de débogage. *
+* *
+* Retour : Bilan de l'opération. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
-
-
-
-
-void test_java(void)
+static bool g_java_debugger_attach(GJavaDebugger *debugger)
{
- GBinaryDebugger *debugger;
- GDebugPacket *packet;
- GDebugPacket *packet2;
- jdwp_payload *payload;
-
- printf("JDWP-start !!!!\n");
-
- printf("size == %d\n", sizeof(jdwp_header));
-
-
- debugger = g_java_debugger_new(NULL, NULL);
-
+ bool result; /* Bilan à retourner */
+ GDebugPacket *req; /* Requête à formuler */
+ GDebugPacket *ret; /* Obtention de la réponse */
+ jdwp_payload *payload; /* Charge utile d'une réponse */
- g_debug_stream_connect(G_JAVA_DEBUGGER(debugger)->stream);
+ req = NULL;
+ ret = NULL;
+ /* Connexion physique */
- packet = g_debug_stream_get_free_packet(G_JAVA_DEBUGGER(debugger)->stream);
+ result = g_debug_stream_connect(debugger->stream);
+ if (!result) goto gjda_error;
+ /* Demande de version */
- g_jdwp_packet_set_request_header(G_JDWP_PACKET(packet), JDWP_CST_VIRTUAL_MACHINE, JDWP_CMD_VM_VERSION);
+ req = g_debug_stream_get_free_packet(debugger->stream);
- if (!g_debug_stream_send_packet(G_JAVA_DEBUGGER(debugger)->stream, packet))
- printf("erreur envoi\n");
+ g_jdwp_packet_set_request_header(G_JDWP_PACKET(req),
+ JDWP_CST_VIRTUAL_MACHINE, JDWP_CMD_VM_VERSION);
- packet2 = g_debug_stream_recv_packet(G_JAVA_DEBUGGER(debugger)->stream, (filter_packet_fc)g_jdwp_packet_is_reply, packet);
+ if (!g_debug_stream_send_packet(debugger->stream, req))
+ goto gjda_error;
- if (!packet2)
- printf("erreur réception\n");
+ ret = g_debug_stream_recv_packet(debugger->stream,
+ (filter_packet_fc)g_jdwp_packet_is_reply, req);
+ if (!ret) goto gjda_error;
- if (!g_jdwp_packet_parse_payload(G_JDWP_PACKET(packet2), JDWP_CST_VIRTUAL_MACHINE, JDWP_CMD_VM_VERSION))
- printf("erreur de décodage\n");
+ if (!g_jdwp_packet_parse_payload(G_JDWP_PACKET(ret), JDWP_CST_VIRTUAL_MACHINE, JDWP_CMD_VM_VERSION))
+ goto gjda_error;
- payload = g_jdwp_packet_get_payload(G_JDWP_PACKET(packet2));
+ payload = g_jdwp_packet_get_payload(G_JDWP_PACKET(ret));
+ log_variadic_message(LMT_INFO, _("The debugger is '%s' (JRE %d.%d; VM %s)."),
+ payload->vs_reply.description.value,
+ payload->vs_reply.jdwp_major, payload->vs_reply.jdwp_minor,
+ payload->vs_reply.vm_version.value);
+ g_jdwp_packet_free_payload(G_JDWP_PACKET(ret), JDWP_CST_VIRTUAL_MACHINE, JDWP_CMD_VM_VERSION);
- printf("-----------\n");
+ gjda_error:
- printf("desc :: '%s'\n", payload->vs_reply.description.value);
+ if (req != NULL)
+ g_debug_stream_mark_packet_as_free(debugger->stream, req);
- printf("version :: %d.%d\n", payload->vs_reply.jdwp_major, payload->vs_reply.jdwp_minor);
+ if (ret != NULL)
+ g_debug_stream_mark_packet_as_free(debugger->stream, ret);
- printf("version :: '%s'\n", payload->vs_reply.vm_version.value);
- printf("name :: '%s'\n", payload->vs_reply.vm_name.value);
-
- printf("-----------\n");
-
-
-
- g_jdwp_packet_free_payload(G_JDWP_PACKET(packet2), JDWP_CST_VIRTUAL_MACHINE, JDWP_CMD_VM_VERSION);
-
-
- printf("JDWP-end !!!!\n");
+ return result;
}
diff --git a/src/debug/jdwp/tcp.c b/src/debug/jdwp/tcp.c
index 38acd29..d4ec1d7 100644
--- a/src/debug/jdwp/tcp.c
+++ b/src/debug/jdwp/tcp.c
@@ -32,11 +32,15 @@
#include <sys/types.h>
+#include <i18n.h>
+
+
#include "packet.h"
#include "misc/header.h"
#include "sets/list.h"
#include "../stream-int.h"
#include "../../common/net.h"
+#include "../../panels/log.h"
@@ -180,12 +184,14 @@ static bool g_jdwp_tcp_client_connect(GJdwpTcpClient *client)
sock = connect_via_tcp(client->server, client->port, &addr);
if (sock == -1)
{
- printf("Echec de connexion au serveur JDWP sur %s:%s\n",
- client->server, client->port);
+ log_variadic_message(LMT_ERROR, _("Error while connecting to the JDWP server at %s:%s."),
+ //printf("Echec de connexion au serveur JDWP sur %s:%s\n",
+ client->server, client->port);
return false;
}
- printf("Connecté à %s:%hd\n", client->server, ntohs(addr.sin_port));
+ log_variadic_message(LMT_PROCESS, _("Connected to %s:%hd."),
+ client->server, ntohs(addr.sin_port));
if (send(sock, "JDWP-Handshake", 14, 0) != 14)
goto gjtcc_error;
@@ -202,7 +208,7 @@ static bool g_jdwp_tcp_client_connect(GJdwpTcpClient *client)
gjtcc_error:
- printf("Echec des premiers échanges !\n");
+ log_simple_message(LMT_ERROR, _("Failure in the first JDWP handshake."));
close(sock);
diff --git a/src/editor.c b/src/editor.c
index 78d890e..4211b73 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -269,7 +269,7 @@ GtkWidget *create_editor(void)
/* Intégration des menus */
- editem = g_menu_bar_new(ref);
+ editem = g_menu_bar_new(ref, accgroup);
menuboard = g_editor_item_get_widget(editem);
gtk_box_pack_start(GTK_BOX(vbox1), menuboard, FALSE, FALSE, 0);
@@ -891,7 +891,7 @@ void mcb_view_change_support(GtkRadioMenuItem *menuitem, GObject *ref)
GSList *iter; /* Boucle de parcours */
BinaryView view; /* Nouvelle vue à présenter */
GOpenidaBinary *binary; /* Edition courante */
- GtkViewPanel *pview; /* Afficheur effectif de code */
+ GtkViewPanel *pview; /* Afficheur effectif de code */
GtkWidget *panel; /* Nouveau support à utiliser */
GDockItem *ditem; /* Panneau avec ses infos. */
diff --git a/src/gui/menus/Makefile.am b/src/gui/menus/Makefile.am
index b9e127d..36fffc2 100644
--- a/src/gui/menus/Makefile.am
+++ b/src/gui/menus/Makefile.am
@@ -2,6 +2,7 @@
noinst_LTLIBRARIES = libguimenus.la
libguimenus_la_SOURCES = \
+ debug.h debug.c \
help.h help.c \
menubar.h menubar.c
diff --git a/src/gui/menus/debug.c b/src/gui/menus/debug.c
new file mode 100644
index 0000000..366d789
--- /dev/null
+++ b/src/gui/menus/debug.c
@@ -0,0 +1,128 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * debug.c - gestion du menu 'Débogage'
+ *
+ * Copyright (C) 2011 Cyrille Bagard
+ *
+ * This file is part of OpenIDA.
+ *
+ * OpenIDA is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * OpenIDA is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+#include "debug.h"
+
+
+#include <string.h>
+
+
+#include <i18n.h>
+
+
+#include "../../project.h"
+#include "../../gtkext/easygtk.h"
+#include "../../panels/log.h"
+
+
+
+/* Réagit avec le menu "Débogage -> Démarrer/Arrêter". */
+static void mcb_debug_start_stop(GtkMenuItem *, GObject *);
+
+
+
+/******************************************************************************
+* *
+* Paramètres : ref = espace de référencement global. *
+* accgroup = groupe d'accélérateurs pour les menus. *
+* *
+* Description : Construit le menu "Aide". *
+* *
+* Retour : Panneau de menus mis en place. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+GtkWidget *build_menu_debug(GObject *ref, GtkAccelGroup *accgroup)
+{
+ GtkWidget *result; /* Support à retourner */
+ GtkWidget *menubar; /* Support pour éléments */
+ GtkWidget *submenuitem; /* Sous-élément de menu */
+
+ result = gtk_menu_item_new_with_mnemonic(_("_Debug"));
+ gtk_widget_show(result);
+
+ menubar = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(result), menubar);
+
+ submenuitem = qck_create_menu_item(ref, "mnu_start_stop", _("Start"), G_CALLBACK(mcb_debug_start_stop), ref);
+ add_accelerator_to_menu_item(submenuitem, "F9", accgroup);
+ gtk_container_add(GTK_CONTAINER(menubar), submenuitem);
+
+ submenuitem = qck_create_menu_separator();
+ gtk_container_add(GTK_CONTAINER(menubar), submenuitem);
+
+ return result;
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : menuitem = élément de menu sélectionné. *
+* ref = adresse de l'espace de référencement global. *
+* *
+* Description : Réagit avec le menu "Débogage -> Démarrer/Arrêter". *
+* *
+* Retour : - *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+static void mcb_debug_start_stop(GtkMenuItem *menuitem, GObject *ref)
+{
+ GOpenidaBinary *binary; /* Edition courante */
+ GBinaryDebugger *debugger; /* Module prêt à emploi */
+
+ binary = (GOpenidaBinary *)g_object_get_data(ref, "current_binary");
+ debugger = get_main_debugger_for_binary(get_current_openida_project(), binary);
+
+ if (debugger == NULL)
+ {
+ log_simple_message(LMT_ERROR, _("No available debug module for this binary !"));
+ return;
+ }
+
+ if (strcmp(gtk_menu_item_get_label(menuitem), _("Start")) == 0)
+ {
+ if (!g_binary_debugger_attach(debugger))
+ {
+ log_simple_message(LMT_ERROR, _("Failed to initialize the debugger."));
+ return;
+ }
+
+ gtk_menu_item_set_label(menuitem, _("Stop"));
+
+ }
+ else
+ {
+ /* TODO */
+
+ gtk_menu_item_set_label(menuitem, _("Start"));
+
+ }
+
+}
diff --git a/src/gui/menus/debug.h b/src/gui/menus/debug.h
new file mode 100644
index 0000000..7b08f60
--- /dev/null
+++ b/src/gui/menus/debug.h
@@ -0,0 +1,38 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * debug.h - prototypes pour la gestion du menu 'Débogage'
+ *
+ * Copyright (C) 2011 Cyrille Bagard
+ *
+ * This file is part of OpenIDA.
+ *
+ * OpenIDA is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * OpenIDA is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+#ifndef _GUI_MENUS_DEBUG_H
+#define _GUI_MENUS_DEBUG_H
+
+
+#include <gtk/gtk.h>
+
+
+
+/* Construit le menu "Aide". */
+GtkWidget *build_menu_debug(GObject *, GtkAccelGroup *);
+
+
+
+#endif /* _GUI_MENUS_DEBUG_H */
diff --git a/src/gui/menus/help.c b/src/gui/menus/help.c
index b1fb545..eb17301 100644
--- a/src/gui/menus/help.c
+++ b/src/gui/menus/help.c
@@ -40,7 +40,8 @@ static void mcb_help_about(GtkMenuItem *, GObject *);
/******************************************************************************
* *
-* Paramètres : ref = espace de référencement global. *
+* Paramètres : ref = espace de référencement global. *
+* accgroup = groupe d'accélérateurs pour les menus. *
* *
* Description : Construit le menu "Aide". *
* *
@@ -50,7 +51,7 @@ static void mcb_help_about(GtkMenuItem *, GObject *);
* *
******************************************************************************/
-GtkWidget *build_menu_help(GObject *ref)
+GtkWidget *build_menu_help(GObject *ref, GtkAccelGroup *accgroup)
{
GtkWidget *result; /* Support à retourner */
GtkWidget *menubar; /* Support pour éléments */
diff --git a/src/gui/menus/help.h b/src/gui/menus/help.h
index 0c2d345..675a9e7 100644
--- a/src/gui/menus/help.h
+++ b/src/gui/menus/help.h
@@ -31,7 +31,7 @@
/* Construit le menu "Aide". */
-GtkWidget *build_menu_help(GObject *);
+GtkWidget *build_menu_help(GObject *, GtkAccelGroup *);
diff --git a/src/gui/menus/menubar.c b/src/gui/menus/menubar.c
index af27888..4718caa 100644
--- a/src/gui/menus/menubar.c
+++ b/src/gui/menus/menubar.c
@@ -25,6 +25,7 @@
#include "menubar.h"
+#include "debug.h"
#include "help.h"
#include "../editem-int.h"
@@ -104,10 +105,8 @@ static void g_menu_bar_init(GMenuBar *bar)
/******************************************************************************
* *
-* Paramètres : ref = espace de référencement global. *
-* name = nom associé à l'élément. *
-* widget = composant à présenter à l'affichage. *
-* label = étiquette destinée au menu. *
+* Paramètres : ref = espace de référencement global. *
+* accgroup = groupe d'accélérateurs pour les menus. *
* *
* Description : Compose la barre de menus principale. *
* *
@@ -117,7 +116,7 @@ static void g_menu_bar_init(GMenuBar *bar)
* *
******************************************************************************/
-GEditorItem *g_menu_bar_new(GObject *ref)
+GEditorItem *g_menu_bar_new(GObject *ref, GtkAccelGroup *accgroup)
{
GMenuBar *result; /* Structure à retourner */
GEditorItem *item; /* Autre version de l'élément */
@@ -132,9 +131,14 @@ GEditorItem *g_menu_bar_new(GObject *ref)
g_object_ref(ref);
item->ref = ref;
+ /* Débogage */
+
+ menuitem = build_menu_debug(ref, accgroup);
+ gtk_container_add(GTK_CONTAINER(item->widget), menuitem);
+
/* Aide */
- menuitem = build_menu_help(ref);
+ menuitem = build_menu_help(ref, accgroup);
gtk_container_add(GTK_CONTAINER(item->widget), menuitem);
return G_EDITOR_ITEM(result);
diff --git a/src/gui/menus/menubar.h b/src/gui/menus/menubar.h
index e7dcf6d..ffb4c87 100644
--- a/src/gui/menus/menubar.h
+++ b/src/gui/menus/menubar.h
@@ -49,7 +49,7 @@ typedef struct _GMenuBarClass GMenuBarClass;
GType g_menu_bar_get_type(void);
/* Compose la barre de menus principale. */
-GEditorItem *g_menu_bar_new(GObject *);
+GEditorItem *g_menu_bar_new(GObject *, GtkAccelGroup *);
diff --git a/src/project.c b/src/project.c
index 70cbef1..60767be 100644
--- a/src/project.c
+++ b/src/project.c
@@ -614,6 +614,42 @@ const GOpenidaBinary **get_openida_project_binaries(const openida_project *proje
+
+
+/******************************************************************************
+* *
+* Paramètres : project = projet à consulter. *
+* binary = binaire chargé, encadré et concerné. *
+* *
+* Description : Fournit un module de débogage prêt à emploi. *
+* *
+* Retour : Instance prête à devenir effective. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+GBinaryDebugger *get_main_debugger_for_binary(const openida_project *project, const GOpenidaBinary *binary)
+{
+ return g_java_debugger_new(binary, NULL); /* FIXME */
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
/* ---------------------------------------------------------------------------------- */
/* PARTIE GRAPHIQUE DES [DE]CHARGEMENTS */
/* ---------------------------------------------------------------------------------- */
diff --git a/src/project.h b/src/project.h
index 7f45c28..d9b36c1 100644
--- a/src/project.h
+++ b/src/project.h
@@ -29,6 +29,7 @@
#include "analysis/binary.h"
+#include "debug/debugger.h"
#include "gtkext/gtkviewpanel.h"
#include "gtkext/gtkdockitem.h"
@@ -95,6 +96,12 @@ const GOpenidaBinary **get_openida_project_binaries(const openida_project *, siz
+/* Fournit un module de débogage prêt à emploi. */
+GBinaryDebugger *get_main_debugger_for_binary(const openida_project *, const GOpenidaBinary *);
+
+
+
+
/* ---------------------- PARTIE GRAPHIQUE DES [DE]CHARGEMENTS ---------------------- */
diff --git a/src/shell.c b/src/shell.c
index 76e26bb..78e807f 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -161,7 +161,7 @@ GtkWidget *build_shell_panel(GObject *ref)
static void terminal_child_exited_cb(VteReaper *reaper, GPid pid, gint status, VteTerminal *term)
{
- vte_terminal_feed(term, _("Exit detected ; lauching an new Python shell...\n\r"), -1);
+ //vte_terminal_feed(term, ("Exit detected ; lauching an new Python shell...\n\r"), -1);
run_new_shell_in_terminal(term);
generated by cgit v0.11.2-87-g4458 at 2024-04-28 22:49:01 (GMT)