anjuta r4839 - in trunk: . plugins/project-wizard plugins/sourceview
- From: jhs svn gnome org
- To: svn-commits-list gnome org
- Subject: anjuta r4839 - in trunk: . plugins/project-wizard plugins/sourceview
- Date: Mon, 9 Mar 2009 08:44:40 +0000 (UTC)
Author: jhs
Date: Mon Mar 9 08:44:40 2009
New Revision: 4839
URL: http://svn.gnome.org/viewvc/anjuta?rev=4839&view=rev
Log:
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
Added:
trunk/plugins/project-wizard/anjuta-project-wizard.ui
Removed:
trunk/plugins/project-wizard/anjuta-project-wizard.glade
Modified:
trunk/ChangeLog
trunk/plugins/project-wizard/Makefile.am
trunk/plugins/sourceview/sourceview-io.c
trunk/plugins/sourceview/sourceview.c
Modified: trunk/plugins/project-wizard/Makefile.am
==============================================================================
--- trunk/plugins/project-wizard/Makefile.am (original)
+++ trunk/plugins/project-wizard/Makefile.am Mon Mar 9 08:44:40 2009
@@ -21,10 +21,6 @@
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)
Added: trunk/plugins/project-wizard/anjuta-project-wizard.ui
==============================================================================
--- (empty file)
+++ trunk/plugins/project-wizard/anjuta-project-wizard.ui Mon Mar 9 08:44:40 2009
@@ -0,0 +1,205 @@
+<?xml version="1.0"?>
+<!--*- mode: xml -*-->
+<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>
+ <object class="GtkNotebook" id="project_book">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">6</property>
+ <child>
+ <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>
+ <object class="GtkIconView" id="project_list">
+ <property name="width_request">468</property>
+ <property name="height_request">198</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="pixbuf_column">0</property>
+ <property name="text_column">1</property>
+ <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+ <property name="row_spacing">0</property>
+ <property name="column_spacing">12</property>
+ <property name="tooltip_column">2</property>
+ <signal handler="on_druid_project_select_icon" name="selection_changed"/>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="project_book_label">
+ <property name="visible">True</property>
+ <property name="xpad">5</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="page_type">GTK_ASSISTANT_PAGE_INTRO</property>
+ <property name="title">Select project type</property>
+ <property name="header_image">applogo.png</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="padding">6</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkExpander" id="error_detail">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <child>
+ <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>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Details</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="title">Error</property>
+ <property name="header_image">applogo.png</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="progress_page">
+ <property name="visible">True</property>
+ <property name="wrap">True</property>
+ </object>
+ <packing>
+ <property name="page_type">GTK_ASSISTANT_PAGE_PROGRESS</property>
+ <property name="title">Application Assistant</property>
+ <property name="header_image">applogo.png</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="finish_page">
+ <property name="visible">True</property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="page_type">GTK_ASSISTANT_PAGE_CONFIRM</property>
+ <property name="title">Summary</property>
+ <property name="header_image">applogo.png</property>
+ <property name="sidebar_image">appwizard.png</property>
+ </packing>
+ </child>
+ <child>
+ <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>
+ <object class="GtkViewport" id="viewport1">
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <object class="GtkTable" id="property_table">
+ <property name="border_width">5</property>
+ <property name="n_rows">5</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="header_image">applogo.png</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+</interface>
Modified: trunk/plugins/sourceview/sourceview-io.c
==============================================================================
--- trunk/plugins/sourceview/sourceview-io.c (original)
+++ trunk/plugins/sourceview/sourceview-io.c Mon Mar 9 08:44:40 2009
@@ -258,6 +258,7 @@
g_signal_emit_by_name (sio, "save-finished");
}
g_object_unref (output_stream);
+ g_object_unref (sio);
}
void
@@ -337,6 +338,7 @@
sio->file = file;
g_object_ref (file);
}
+ g_object_ref (sio);
}
static void insert_text_in_document(SourceviewIO* sio, const gchar* text, gsize len)
Modified: trunk/plugins/sourceview/sourceview.c
==============================================================================
--- trunk/plugins/sourceview/sourceview.c (original)
+++ trunk/plugins/sourceview/sourceview.c Mon Mar 9 08:44:40 2009
@@ -682,7 +682,8 @@
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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
