Commit bdf29211 authored by Sebastien Granjoux's avatar Sebastien Granjoux

Fix #564659 – Port anjuta to use Gtk+ print instead of deprecated

	* plugins/editor/print.h,
	plugins/editor/aneditor.cxx,
	plugins/editor/print.c,
	configure.in:
	Fix #564659 – Port anjuta to use Gtk+ print instead of deprecated
	gnomeprint

	* plugins/editor/text_editor.c:
	Fix one debugging error message

	* plugins/editor/Makefile.am:
	Add log domain

svn path=/trunk/; revision=4623
parent 68cdd036
2008-01-21 Michael Trimarchi <michael@evidence.eu.com>
reviewed by: Sébastien Granjoux <seb.sfo@free.fr>
* plugins/scratchbox/plugin.c,
plugins/scratchbox/anjuta-scratchbox.glade,
plugins/scratchbox/anjuta-scratchbox-48.png,
(added) plugins/scratchbox/anjuta-scratchbox-panel.png,
plugins/scratchbox/anjuta-scratchbox.plugin.in,
plugins/scratchbox/Makefile.am:
Fix bug #565320 – sbox2 support for anjuta
2009-01-21 Massimo Cora' <mcora@svn.gnome.org>
* plugins/symbol-db/symbol-db-engine-utils.c
(sdb_util_load_symbol_pixbufs):
fixed warning for "prototype protected"
2009-01-20 Johannes Schmid <jhs@gnome.org>
* configure.in:
* plugins/Makefile.am:
* plugins/editor/.cvsignore:
* plugins/editor/Makefile.am:
* plugins/editor/aneditor-autocomplete.cxx:
* plugins/editor/aneditor-calltip.cxx:
* plugins/editor/aneditor-indent.cxx:
* plugins/editor/aneditor-priv.h:
* plugins/editor/aneditor.cxx:
* plugins/editor/aneditor.h:
* plugins/editor/anjuta-bookmark-16.xpm:
* plugins/editor/anjuta-breakpoint-disabled-16.xpm:
* plugins/editor/anjuta-breakpoint-enabled-16.xpm:
* plugins/editor/anjuta-editor-scintilla-plugin.svg:
* plugins/editor/anjuta-editor-scintilla.glade:
* plugins/editor/anjuta-editor.plugin.in:
* plugins/editor/anjuta-linemark-16.xpm:
* plugins/editor/anjuta-pcmark-16.xpm:
* plugins/editor/lexer.h:
* plugins/editor/plugin.c:
* plugins/editor/plugin.h:
* plugins/editor/print.c:
* plugins/editor/print.h:
* plugins/editor/properties.cxx:
* plugins/editor/properties.h:
* plugins/editor/properties/.cvsignore:
* plugins/editor/properties/Makefile.am:
* plugins/editor/properties/anjuta.properties:
* plugins/editor/properties/styles.properties:
* plugins/editor/properties/user.properties:
* plugins/editor/properties_cxx.h:
* plugins/editor/scintilla/.cvsignore:
* plugins/editor/scintilla/AutoComplete.cxx:
* plugins/editor/scintilla/AutoComplete.h:
* plugins/editor/scintilla/CallTip.cxx:
* plugins/editor/scintilla/CallTip.h:
* plugins/editor/scintilla/CellBuffer.cxx:
* plugins/editor/scintilla/CellBuffer.h:
* plugins/editor/scintilla/CharClassify.cxx:
* plugins/editor/scintilla/CharClassify.h:
* plugins/editor/scintilla/CharacterSet.h:
* plugins/editor/scintilla/ContractionState.cxx:
* plugins/editor/scintilla/ContractionState.h:
* plugins/editor/scintilla/Converter.h:
* plugins/editor/scintilla/Decoration.cxx:
* plugins/editor/scintilla/Decoration.h:
* plugins/editor/scintilla/Document.cxx:
* plugins/editor/scintilla/Document.h:
* plugins/editor/scintilla/DocumentAccessor.cxx:
* plugins/editor/scintilla/DocumentAccessor.h:
* plugins/editor/scintilla/Editor.cxx:
* plugins/editor/scintilla/Editor.h:
* plugins/editor/scintilla/ExternalLexer.cxx:
* plugins/editor/scintilla/ExternalLexer.h:
* plugins/editor/scintilla/Indicator.cxx:
* plugins/editor/scintilla/Indicator.h:
* plugins/editor/scintilla/KeyMap.cxx:
* plugins/editor/scintilla/KeyMap.h:
* plugins/editor/scintilla/KeyWords.cxx:
* plugins/editor/scintilla/LexAPDL.cxx:
* plugins/editor/scintilla/LexASY.cxx:
* plugins/editor/scintilla/LexAU3.cxx:
* plugins/editor/scintilla/LexAVE.cxx:
* plugins/editor/scintilla/LexAbaqus.cxx:
* plugins/editor/scintilla/LexAda.cxx:
* plugins/editor/scintilla/LexAsm.cxx:
* plugins/editor/scintilla/LexAsn1.cxx:
* plugins/editor/scintilla/LexBaan.cxx:
* plugins/editor/scintilla/LexBash.cxx:
* plugins/editor/scintilla/LexBasic.cxx:
* plugins/editor/scintilla/LexBullant.cxx:
* plugins/editor/scintilla/LexCLW.cxx:
* plugins/editor/scintilla/LexCPP.cxx:
* plugins/editor/scintilla/LexCSS.cxx:
* plugins/editor/scintilla/LexCaml.cxx:
* plugins/editor/scintilla/LexCmake.cxx:
* plugins/editor/scintilla/LexConf.cxx:
* plugins/editor/scintilla/LexCrontab.cxx:
* plugins/editor/scintilla/LexCsound.cxx:
* plugins/editor/scintilla/LexD.cxx:
* plugins/editor/scintilla/LexEScript.cxx:
* plugins/editor/scintilla/LexEiffel.cxx:
* plugins/editor/scintilla/LexErlang.cxx:
* plugins/editor/scintilla/LexFlagship.cxx:
* plugins/editor/scintilla/LexForth.cxx:
* plugins/editor/scintilla/LexFortran.cxx:
* plugins/editor/scintilla/LexGAP.cxx:
* plugins/editor/scintilla/LexGui4Cli.cxx:
* plugins/editor/scintilla/LexHTML.cxx:
* plugins/editor/scintilla/LexHaskell.cxx:
* plugins/editor/scintilla/LexInno.cxx:
* plugins/editor/scintilla/LexKix.cxx:
* plugins/editor/scintilla/LexLisp.cxx:
* plugins/editor/scintilla/LexLout.cxx:
* plugins/editor/scintilla/LexLua.cxx:
* plugins/editor/scintilla/LexMMIXAL.cxx:
* plugins/editor/scintilla/LexMPT.cxx:
* plugins/editor/scintilla/LexMSSQL.cxx:
* plugins/editor/scintilla/LexMagik.cxx:
* plugins/editor/scintilla/LexMatlab.cxx:
* plugins/editor/scintilla/LexMetapost.cxx:
* plugins/editor/scintilla/LexMySQL.cxx:
* plugins/editor/scintilla/LexNsis.cxx:
* plugins/editor/scintilla/LexOpal.cxx:
* plugins/editor/scintilla/LexOthers.cxx:
* plugins/editor/scintilla/LexPB.cxx:
* plugins/editor/scintilla/LexPLM.cxx:
* plugins/editor/scintilla/LexPOV.cxx:
* plugins/editor/scintilla/LexPS.cxx:
* plugins/editor/scintilla/LexPascal.cxx:
* plugins/editor/scintilla/LexPerl.cxx:
* plugins/editor/scintilla/LexPowerShell.cxx:
* plugins/editor/scintilla/LexProgress.cxx:
* plugins/editor/scintilla/LexPython.cxx:
* plugins/editor/scintilla/LexR.cxx:
* plugins/editor/scintilla/LexRebol.cxx:
* plugins/editor/scintilla/LexRuby.cxx:
* plugins/editor/scintilla/LexSQL.cxx:
* plugins/editor/scintilla/LexScriptol.cxx:
* plugins/editor/scintilla/LexSmalltalk.cxx:
* plugins/editor/scintilla/LexSpecman.cxx:
* plugins/editor/scintilla/LexSpice.cxx:
* plugins/editor/scintilla/LexTADS3.cxx:
* plugins/editor/scintilla/LexTCL.cxx:
* plugins/editor/scintilla/LexTeX.cxx:
* plugins/editor/scintilla/LexVB.cxx:
* plugins/editor/scintilla/LexVHDL.cxx:
* plugins/editor/scintilla/LexVerilog.cxx:
* plugins/editor/scintilla/LexYAML.cxx:
* plugins/editor/scintilla/LineMarker.cxx:
* plugins/editor/scintilla/LineMarker.h:
* plugins/editor/scintilla/Makefile.am:
* plugins/editor/scintilla/Partitioning.h:
* plugins/editor/scintilla/PlatGTK.cxx:
* plugins/editor/scintilla/PositionCache.cxx:
* plugins/editor/scintilla/PositionCache.h:
* plugins/editor/scintilla/PropSet.cxx:
* plugins/editor/scintilla/README.sync:
* plugins/editor/scintilla/RESearch.cxx:
* plugins/editor/scintilla/RESearch.h:
* plugins/editor/scintilla/RunStyles.cxx:
* plugins/editor/scintilla/RunStyles.h:
* plugins/editor/scintilla/SVector.h:
* plugins/editor/scintilla/ScintillaBase.cxx:
* plugins/editor/scintilla/ScintillaBase.h:
* plugins/editor/scintilla/ScintillaGTK.cxx:
* plugins/editor/scintilla/SplitVector.h:
* plugins/editor/scintilla/Style.cxx:
* plugins/editor/scintilla/Style.h:
* plugins/editor/scintilla/StyleContext.cxx:
* plugins/editor/scintilla/StyleContext.h:
* plugins/editor/scintilla/UniConversion.cxx:
* plugins/editor/scintilla/UniConversion.h:
* plugins/editor/scintilla/ViewStyle.cxx:
* plugins/editor/scintilla/ViewStyle.h:
* plugins/editor/scintilla/WindowAccessor.cxx:
* plugins/editor/scintilla/XPM.cxx:
* plugins/editor/scintilla/XPM.h:
* plugins/editor/scintilla/include/.cvsignore:
* plugins/editor/scintilla/include/Accessor.h:
* plugins/editor/scintilla/include/Face.py:
* plugins/editor/scintilla/include/HFacer.py:
* plugins/editor/scintilla/include/KeyWords.h:
* plugins/editor/scintilla/include/Makefile.am:
* plugins/editor/scintilla/include/Platform.h:
* plugins/editor/scintilla/include/PropSet.h:
* plugins/editor/scintilla/include/SString.h:
* plugins/editor/scintilla/include/SciLexer.h:
* plugins/editor/scintilla/include/Scintilla.h:
* plugins/editor/scintilla/include/Scintilla.iface:
* plugins/editor/scintilla/include/ScintillaWidget.h:
* plugins/editor/scintilla/include/WindowAccessor.h:
* plugins/editor/scintilla/lexers.make:
* plugins/editor/scintilla/patches/scintilla-64-bit.diff:
* plugins/editor/scintilla/patches/scintilla-pango-always.diff:
* plugins/editor/scintilla/patches/scintilla-string-fix.diff:
* plugins/editor/scintilla/scintilla-marshal.c:
* plugins/editor/scintilla/scintilla-marshal.h:
* plugins/editor/scintilla/scintilla-marshal.list:
* plugins/editor/scintilla/test-scintilla.cxx:
* plugins/editor/scintilla/update-properties.pl:
* plugins/editor/style-editor.c:
* plugins/editor/style-editor.h:
* plugins/editor/text-editor-iterable.c:
* plugins/editor/text-editor-iterable.h:
* plugins/editor/text_editor.c:
* plugins/editor/text_editor.h:
* plugins/editor/text_editor_cbs.c:
* plugins/editor/text_editor_cbs.h:
* plugins/editor/text_editor_prefs.c:
* plugins/editor/text_editor_prefs.h:
* plugins/gbf-am/gbf-am.plugin.in:
* plugins/gbf-mkfile/gbf-mkfile.plugin.in:
* plugins/scintilla/anjuta-editor.plugin.in:
* plugins/sourceview/sourceview.plugin.in:
* src/Makefile.am:
Reenabled scintilla by default and moved it from
plugins/editor to plugins/scintilla. Also updated the
plugin descriptions
2009-01-20 Jens Georg <mail@jensge.org>
* plugins/gtodo/gtodo-plain.xsl:
export only non-empty (contains at least one undone item)
categories
* TODO: Updated
2008-01-20 Sébastien Granjoux <seb.sfo@free.fr>
* plugins/editor/print.h,
plugins/editor/aneditor.cxx,
plugins/editor/print.c,
configure.in:
Fix #564659 – Port anjuta to use Gtk+ print instead of deprecated
gnomeprint
* plugins/editor/text_editor.c:
Fix one debugging error message
* plugins/editor/Makefile.am:
Add log domain
2009-01-20 Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
* plugins/terminal/terminal.c (terminal_set_preferences),
(preferences_changed), (terminal_child_exited_cb),
(terminal_execute), (init_shell), (terminal_focus_cb),
(terminal_keypress_cb), (terminal_click_cb),
(on_project_root_added), (create_terminal), (create_box),
(terminal_create), (activate_plugin), (deactivate_plugin),
(terminal_plugin_instance_init):
#566696 – Make the terminal plugin open in the directory of the project
2009-01-20 Massimo Cora' <mcora@svn.gnome.org>
* plugins/symbol-db/symbol-db-engine-core.c:
* plugins/symbol-db/symbol-db-engine-queries.c:
fixed #568254 – build fail on symbol-db-engine-core.c with suncc
2009-01-20 Massimo Cora' <mcora@svn.gnome.org>
* plugins/project-manager/gbf-tree-data.c:
build fix, missing include.
2.25.5:
2009-01-20 Johannes Schmid <jhs@gnome.org>
* configure.in: Fixed gnomeprint dependency (hopefully the last release that requires it)
2009-01-19 Johannes Schmid <jhs@gnome.org>
* NEWS:
* configure.in: Updated for release
2009-01-19 Johannes Schmid <jhs@gnome.org>
* plugins/project-manager/gbf-project-view.c
(gbf_project_view_instance_init):
#567967 – build fail with sun cc because zero-sized struct
2009-01-20 Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
reviewed by: Johannes Schmid <jhs@gnome.org>
* plugins/debug-manager/breakpoints.c (create_breakpoint_gui):
* plugins/debug-manager/plugin.c (dma_plugin_activate):
#568068 – critical warnings on activation of debug-manager
2009-01-19 Jens Georg <mail@jensge.org>
* plugins/gtodo/Makefile.am:
* plugins/gtodo/callback.c (message_box):
* plugins/gtodo/egg-datetime.c (egg_datetime_get_type),
(egg_datetime_set_property):
* plugins/gtodo/egg-datetime.h:
* plugins/gtodo/export.c (export_gui), (on_file_type_changed_cb),
(gtodo_export_gui_create_extra_widget):
* plugins/gtodo/interface.c (gtodo_load_settings),
(on_export_clicked_cb), (gui_create_todo_widget), (stock_icons):
* plugins/gtodo/libgtodo.c (gtodo_client_export):
* plugins/gtodo/libgtodo.h:
* plugins/gtodo/main.h:
* plugins/gtodo/preferences.c (preferences_widget),
(pref_gconf_set_notifications):
- #531717 - remove tray icon
- enable export button which is now able to save to XML, HTML and plaintext
- port patches from libegg to eggdatetime.[ch]
* TODO: synced with gtodo plugin (now that we have export ;)
2009-01-19 Jens Georg <mail@jensge.org>
* configure.in
* src/main.c
* plugins/glade/plugin.c
* src/anjuta.c
* libanjuta/anjuta-utils.c
* libanjuta/anjuta-preferences.c
* libanjuta/anjuta-plugin-manager.c:
#511589 - port to gio - removing everything that remains
2009-01-19 Jens Georg <mail@jensge.org>
* plugins/gbf-mkfile/Makefile.am:
* plugins/gbf-mkfile/gbf-mkfile-project.c (uri_is_equal),
(uri_is_parent), (uri_normalize), (uri_get_chrooted_path),
(xml_new_change_doc), (monitor_cb), (monitor_add),
(monitors_setup), (sax_start_element), (spawn_shutdown),
(spawn_kill_child), (spawn_script), (project_reload),
(project_update), (gbf_mkfile_project_set_config),
(gbf_mkfile_project_set_group_config),
(gbf_mkfile_project_set_target_config), (impl_load), (impl_probe),
(impl_add_group), (impl_remove_group), (impl_add_target),
(impl_remove_target), (impl_add_source), (impl_remove_source):
#511589 - port to gio. Removed resolution of "~" in uris; also
fixes a bug creating uris like "file:///a/b/c/a/b/c.c" for file
entries
2009-01-19 Jens Georg <mail@jensge.org>
reviewed by: <delete if not using a buddy>
* plugins/gbf-am/Makefile.am:
* plugins/gbf-am/gbf-am-project.c (uri_is_equal), (uri_is_parent),
(uri_normalize), (uri_get_chrooted_path), (xml_new_change_doc),
(monitor_cb), (monitor_add), (monitors_setup), (spawn_shutdown),
(spawn_write_child), (spawn_kill_child), (spawn_script),
(project_reload), (project_update), (gbf_am_project_set_config),
(gbf_am_project_set_group_config),
(gbf_am_project_set_target_config), (impl_load), (impl_probe),
(impl_add_group), (impl_remove_group), (impl_add_target),
(impl_remove_target), (impl_add_source), (impl_remove_source):
#511589 - port to gio. Removed resolution of "~" in uris
2009-01-19 Jens Georg <mail@jensge.org>
* plugins/project-manager/gbf-project-util.c
(browse_button_clicked_cb):
* plugins/project-manager/gbf-tree-data.c
(gbf_tree_data_new_source):
* plugins/project-manager/plugin.c (update_title),
(on_popup_add_to_project), (project_manager_load_gbf),
(get_uri_vfs_type), (get_element_id_from_uri),
(iproject_manager_get_element_type), (ifile_open):
#511589 - Fix port to GIO of project manager
2009-01-19 Jens Georg <mail@jensge.org>
* plugins/document-manager/Makefile.am:
* plugins/glade/anjuta-design-document.c:
* plugins/gtodo/Makefile.am:
* plugins/indent/indent-util.c (indent_get_buffer):
* plugins/patch/plugin.c:
* plugins/search/search-replace_backend.c (create_search_entries):
* plugins/sourceview/Makefile.am:
* plugins/valgrind/preferences.c:
* plugins/valgrind/vgdefaultview.c:
* plugins/valgrind/vggeneralprefs.c:
#511589 - mostly cosmetical changes like removing #include directives,
makefile references etc.
2009-01-18 Johannes Schmid <jhs@gnome.org>
* plugins/file-manager/file-model.c (file_model_update_file):
Don't show the status of directories
2009-01-18 Johannes Schmid <jhs@gnome.org>
* plugins/file-manager/Makefile.am:
* plugins/file-manager/file-model.c (get_vcs_emblem),
(file_model_vcs_status_callback), (file_model_update_file),
(file_model_new):
* plugins/file-manager/file-model.h:
* plugins/file-manager/file-view.c (file_view_init):
Show the vcs status with emblems (from Subclipse/TurtoiseSVN, icons are GPL)
2009-01-17 Johannes Schmid <jhs@gnome.org>
* plugins/file-manager/file-model.c (file_model_update_file),
(on_row_expanded_async), (file_model_refresh):
#568008 – invalid g_object_unref in file-manager
(Carl-Anton Ingmarsson)
2009-01-17 Johannes Schmid <jhs@gnome.org>
* plugins/document-manager/anjuta-bookmarks.c
(anjuta_bookmarks_add_file), (anjuta_bookmarks_session_save):
Clear the bookmarks panel when the session is save to avoid adding too many
bookmarks to the old session.
2009-01-17 Massimo Cora' <mcora@svn.gnome.org>
* plugins/language-support-cpp-java/cpp-java-assist.c
(cpp_java_assist_show_calltip):
#568020 – critical warning on bracket completion
2009-01-17 Jens Georg <mail@jensge.org>
reviewed by: Massimo Cora' <mcora@svn.gnome.org>
* plugins/symbol-db/test/benchmark.c (get_files):
#511589 – Anjuta uses GNOME-VFS
2009-01-17 James Liggett <jrliggett@cox.net>
* plugins/subversion/subversion-log-dialog.c (subversion_show_log),
(on_log_view_button_clicked), (subversion_log_window_create),
(on_fm_subversion_log):
Make the View Log command in the Subversion plugin act immediately when
activated from the file manager context menu.
Fixes Bug 565353 – View Log and Diff context menu commands should
act immediately
2009-01-16 James Liggett <jrliggett@cox.net>
* plugins/subversion/subversion-diff-dialog.c
(subversion_show_diff), (on_subversion_diff_response),
(on_fm_subversion_diff):
When invoked from the file manager's context menu, the Subversion plugin's
Diff command now works immediately, bypassing the dialog.
Partially fixes Bug 565353 – View Log and Diff context menu commands should
act immediately
2009-01-16 Carl-Anton Ingmarsson <ca.ingmarsson@gmail.com>
reviewed by: Massimo Cora' <mcora@svn.gnome.org>
* plugins/symbol-db/plugin.c (find_file_line), (goto_file_tag):
fixed #568028 – goto [declaration|implementation] should prefer the current
file.
2009-01-16 Massimo Cora' <mcora@svn.gnome.org>
* plugins/symbol-db/plugin.c (goto_file_tag):
* plugins/symbol-db/symbol-db-engine-core.c
(sdb_engine_execute_unknown_sql), (sdb_engine_ctags_output_thread),
(sdb_engine_set_defaults_db_parameters),
(symbol_db_engine_file_exists), (sdb_engine_get_unique_scan_id),
(sdb_engine_add_new_symbol), (sdb_engine_update_file),
(on_scan_update_files_symbols_end),
(symbol_db_engine_update_project_symbols),
(symbol_db_engine_remove_file),
2009-01-21 Massimo Cora' <mcora@svn.gnome.org>
* plugins/symbol-db/symbol-db-engine-utils.c
# Plugin glade file
anjuta_gladedir = $(anjuta_glade_dir)
anjuta_glade_DATA = anjuta-scratchbox.glade
anjuta_glade_DATA = anjuta-scratchbox.glade \
anjuta-scratchbox-panel.png
# Plugin Icon file
anjuta_pixmapsdir = $(anjuta_image_dir)
......
......@@ -18,36 +18,120 @@
<property name="yalign">0</property>
<property name="left_padding">12</property>
<child>
<widget class="GtkVBox" id="vbox2">
<widget class="GtkTable" id="table1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="column_spacing">5</property>
<property name="row_spacing">5</property>
<child>
<widget class="GtkHBox" id="hbox1">
<widget class="GtkHSeparator" id="hseparator2">
<property name="visible">True</property>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">Scratchbox directory:</property>
</widget>
<packing>
<property name="expand">False</property>
</packing>
</child>
<child>
<widget class="GtkFileChooserButton" id="preferences_folder:text:/scratchbox:0:build.scratchbox.path">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
<property name="title" translatable="yes">Select Scratchbox Folder</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="right_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
</widget>
<packing>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">Scratchbox directory:</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Scratchbox version:</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="preferences_combo:text:Sbox1,Sbox2:0:scratchbox.version">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="items">Sbox1
Sbox2</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkFileChooserButton" id="preferences_folder:text:/scratchbox:0:build.scratchbox.path">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="preview_widget_active">False</property>
<property name="action">GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER</property>
<property name="title" translatable="yes">Select Scratchbox Folder</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Scratchbox target:</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
</widget>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<widget class="GtkComboBox" id="combo_target">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="items">host</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
</widget>
......@@ -55,13 +139,35 @@
</widget>
</child>
<child>
<widget class="GtkLabel" id="label106">
<widget class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;Scratchbox Options&lt;/b&gt;
<property name="homogeneous">True</property>
<child>
<widget class="GtkLabel" id="label106">
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
<property name="ypad">14</property>
<property name="label" translatable="yes">&lt;b&gt;Scratchbox Options&lt;/b&gt;
</property>
<property name="use_markup">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_FILL</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkImage" id="anjuta-scratchbox-panel">
<property name="visible">True</property>
<property name="pixbuf">anjuta-scratchbox-panel.png</property>
</widget>
<packing>
<property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
</widget>
<packing>
<property name="type">label_item</property>
......
[Anjuta Plugin]
_Name=Scratchbox
_Description=Change build commands to use scratchbox 1
_Description=Change build commands to use scratchbox 1 or 2
Location=anjuta-scratchbox:ScratchboxPlugin
Icon=anjuta-scratchbox-48.png
Interfaces=IAnjutaEnvironment
......@@ -27,6 +27,7 @@
#include "plugin.h"
#include <libanjuta/anjuta-launcher.h>
#include <libanjuta/anjuta-debug.h>
#include <libanjuta/interfaces/ianjuta-environment.h>
#include <libanjuta/interfaces/ianjuta-preferences.h>
......@@ -38,8 +39,11 @@
#define GLADE_FILE PACKAGE_DATA_DIR"/glade/anjuta-scratchbox.glade"
#define SB_ENTRY "preferences_folder:text:/scratchbox:0:build.scratchbox.path"
#define SB_TARGET_ENTRY "combo_target"
#define SB_SBOX_ENTRY "preferences_combo:text:Sbox1,Sbox2:0:scratchbox.version"
#define PREF_SB_PATH "build.scratchbox.path"
#define PREF_SB_VERSION "scratchbox.version"
/* Type defintions
*---------------------------------------------------------------------------*/
......@@ -52,10 +56,36 @@ struct _ScratchboxPluginClass
struct _ScratchboxPlugin
{
AnjutaPlugin parent;
AnjutaLauncher *launcher;
/* Plugin Data */
gchar *user_dir;
gchar **target_list;
gchar *sb_dir;
gchar *target;
gint id;
gint combo_element;
GString *buffer;
};
GladeXML *gxml;
#define EXECUTE_CMD 0
#define TARGET_LIST 1
static gchar *
sbox2_commands_args[][2] = {
{ "bin/sb2", "-t" }, /* execute command */
{ "bin/sb2-config", "-l"}, /* target list */
{ NULL, NULL },
};
static gchar *
sbox1_commands_args[][2] = {
{ "bin/login", "-d" },
{ "bin/sb-conf", "--list" }, /* target list */
{ NULL, NULL },
};
/* Callback for saving session
*---------------------------------------------------------------------------*/
......@@ -63,15 +93,177 @@ struct _ScratchboxPlugin
static void
on_session_save (AnjutaShell *shell, AnjutaSessionPhase phase, AnjutaSession *session, ScratchboxPlugin *self)
{
if (phase != ANJUTA_SESSION_PHASE_NORMAL)
return;
}
static void on_session_load (AnjutaShell *shell, AnjutaSessionPhase phase, AnjutaSession *session, ScratchboxPlugin *self)
{
if (phase != ANJUTA_SESSION_PHASE_NORMAL)
return;
}
/* Callbacks
*---------------------------------------------------------------------------*/
static void on_list_terminated (AnjutaLauncher *launcher, gint child_pid,
gint status, gulong time_taken, gpointer data)
{
g_return_if_fail (launcher != NULL);
ScratchboxPlugin* plugin = ANJUTA_PLUGIN_SCRATCHBOX (data);
if (!(status != 0 || !plugin->buffer)) {
/* Program terminate normaly */
gint str_splitted_length;
gint i;