Commit 94a88ca4 authored by Johannes Schmid's avatar Johannes Schmid Committed by Johannes Schmid

Just use the GtkBuilder file and no longer autogenerate it (fixed intltool

2009-03-09  Johannes Schmid  <jhs@gnome.org>

	* plugins/project-wizard/Makefile.am:
	* plugins/project-wizard/anjuta-project-wizard.ui:
	Just use the GtkBuilder file and no longer autogenerate it (fixed intltool problems)
	
	* plugins/sourceview/sourceview-io.c (on_save_finished),
	(sourceview_io_save_as):
	* plugins/sourceview/sourceview.c (sourceview_dispose):
	#574376 – Save doesn't always save

svn path=/trunk/; revision=4839
parent 0809b904
2009-03-09 Johannes Schmid <jhs@Obelix>
* plugins/project-wizard/Makefile.am:
* plugins/project-wizard/anjuta-project-wizard.ui:
Just use the GtkBuilder file and no longer autogenerate it (fixed intltool problems)
* plugins/sourceview/sourceview-io.c (on_save_finished),
(sourceview_io_save_as):
* plugins/sourceview/sourceview.c (sourceview_dispose):
#574376 – Save doesn't always save
2009-03-07 James Liggett <jrliggett@cox.net>
* plugins/git/git-vcs-interface.c (git_ivcs_query_status):
......@@ -21,10 +21,6 @@ wizard_pixmaps_DATA = \
plugin_in_files = anjuta-project-wizard.plugin.in
%.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
# Create .ui file from .glade file
%.ui: %.glade
gtk-builder-convert $< $@
wizard_plugindir = $(anjuta_plugin_dir)
wizard_plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
<?xml version="1.0"?>
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkAssistant" id="druid_window">
<interface>
<object class="GtkAssistant" id="druid_window">
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<child>
<widget class="GtkNotebook" id="project_book">
<object class="GtkNotebook" id="project_book">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">6</property>
<child>
<widget class="GtkScrolledWindow" id="scrolledwindow1">
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_IN</property>
<child>
<widget class="GtkIconView" id="project_list">
<object class="GtkIconView" id="project_list">
<property name="width_request">468</property>
<property name="height_request">198</property>
<property name="visible">True</property>
......@@ -31,22 +30,21 @@
<property name="row_spacing">0</property>
<property name="column_spacing">12</property>
<property name="tooltip_column">2</property>
<signal name="selection_changed" handler="on_druid_project_select_icon"/>
</widget>
<signal handler="on_druid_project_select_icon" name="selection_changed"/>
</object>
</child>
</widget>
</object>
</child>
<child>
<widget class="GtkLabel" id="project_book_label">
<child type="tab">
<object class="GtkLabel" id="project_book_label">
<property name="visible">True</property>
<property name="xpad">5</property>
</widget>
</object>
<packing>
<property name="type">tab</property>
<property name="tab_fill">False</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="page_type">GTK_ASSISTANT_PAGE_INTRO</property>
<property name="title">Select project type</property>
......@@ -54,83 +52,80 @@
</packing>
</child>
<child>
<widget class="GtkHBox" id="hbox1">
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<widget class="GtkImage" id="error_icon">
<object class="GtkImage" id="error_icon">
<property name="visible">True</property>
<property name="yalign">0</property>
<property name="ypad">6</property>
<property name="stock">gtk-dialog-error</property>
<property name="icon_size">6</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="padding">6</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="vbox1">
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
<property name="spacing">6</property>
<child>
<widget class="GtkLabel" id="error_message">
<object class="GtkLabel" id="error_message">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Error</property>
<property name="use_markup">True</property>
<property name="wrap">True</property>
</widget>
</object>
<packing>
<property name="expand">False</property>
<property name="padding">6</property>
</packing>
</child>
<child>
<widget class="GtkExpander" id="error_detail">
<object class="GtkExpander" id="error_detail">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
<widget class="GtkLabel" id="label2">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="xpad">24</property>
<property name="wrap">True</property>
</widget>
</object>
</child>
<child>
<widget class="GtkLabel" id="label1">
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="label" translatable="yes">&lt;b&gt;Details&lt;/b&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="type">label_item</property>
</packing>
</object>
</child>
</widget>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</widget>
</object>
<packing>
<property name="title">Error</property>
<property name="header_image">applogo.png</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="progress_page">
<object class="GtkLabel" id="progress_page">
<property name="visible">True</property>
<property name="wrap">True</property>
</widget>
</object>
<packing>
<property name="page_type">GTK_ASSISTANT_PAGE_PROGRESS</property>
<property name="title">Application Assistant</property>
......@@ -138,10 +133,10 @@
</packing>
</child>
<child>
<widget class="GtkLabel" id="finish_page">
<object class="GtkLabel" id="finish_page">
<property name="visible">True</property>
<property name="use_markup">True</property>
</widget>
</object>
<packing>
<property name="page_type">GTK_ASSISTANT_PAGE_CONFIRM</property>
<property name="title">Summary</property>
......@@ -150,15 +145,15 @@
</packing>
</child>
<child>
<widget class="GtkScrolledWindow" id="property_page">
<object class="GtkScrolledWindow" id="property_page">
<property name="can_focus">True</property>
<property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<child>
<widget class="GtkViewport" id="viewport1">
<object class="GtkViewport" id="viewport1">
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
<widget class="GtkTable" id="property_table">
<object class="GtkTable" id="property_table">
<property name="border_width">5</property>
<property name="n_rows">5</property>
<property name="n_columns">2</property>
......@@ -194,11 +189,11 @@
<child>
<placeholder/>
</child>
</widget>
</object>
</child>
</widget>
</object>
</child>
</widget>
</object>
<packing>
<property name="header_image">applogo.png</property>
</packing>
......@@ -206,5 +201,5 @@
<child>
<placeholder/>
</child>
</widget>
</glade-interface>
</object>
</interface>
......@@ -258,6 +258,7 @@ on_save_finished (GObject* output_stream, GAsyncResult* result, gpointer data)
g_signal_emit_by_name (sio, "save-finished");
}
g_object_unref (output_stream);
g_object_unref (sio);
}
void
......@@ -337,6 +338,7 @@ sourceview_io_save_as (SourceviewIO* sio, GFile* file)
sio->file = file;
g_object_ref (file);
}
g_object_ref (sio);
}
static void insert_text_in_document(SourceviewIO* sio, const gchar* text, gsize len)
......
......@@ -682,7 +682,8 @@ sourceview_dispose(GObject *object)
g_source_remove (GPOINTER_TO_UINT (node->data));
}
g_slist_free (cobj->priv->idle_sources);
g_object_unref (cobj->priv->io);
sourceview_prefs_destroy(cobj);
G_OBJECT_CLASS (parent_class)->dispose (object);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment