- libvala-0.5.1 migration

 - html-doclet, devhelp-doclet
  - new Icons for abstract classes, static methods and abstract methods (Frederick Zipp)
  - navigation fixes

svn path=/trunk/; revision=12

diff --git a/src/doclets/devhelp/deps/Makefile.am b/src/doclets/devhelp/deps/Makefile.am
index 294ab1a0d2f3bb18bb97615ad7c2c7e9910a9bde..22e2b75a09d1588c0d4f5699e3ddb2579f6a3299 100644 (file)
--- a/src/doclets/devhelp/deps/Makefile.am
+++ b/src/doclets/devhelp/deps/Makefile.am
@@ -5,6 +5,9 @@ vapidir = $(libdir)/valadoc/plugins/devhelp/deps/
 
 
 dist_vapi_DATA =    \
+    abstractclass.png \
+    abstractmethod.png \
+    staticmethod.png \
        style.css       \
        class.png       \
        interface.png   \

diff --git a/src/doclets/devhelp/deps/abstractclass.png b/src/doclets/devhelp/deps/abstractclass.png
new file mode 100644 (file)
index 0000000..4aaf937
Binary files /dev/null and b/src/doclets/devhelp/deps/abstractclass.png differ

diff --git a/src/doclets/devhelp/deps/abstractmethod.png b/src/doclets/devhelp/deps/abstractmethod.png
new file mode 100644 (file)
index 0000000..93003f7
Binary files /dev/null and b/src/doclets/devhelp/deps/abstractmethod.png differ

diff --git a/src/doclets/devhelp/deps/staticmethod.png b/src/doclets/devhelp/deps/staticmethod.png
new file mode 100644 (file)
index 0000000..4e76a24
Binary files /dev/null and b/src/doclets/devhelp/deps/staticmethod.png differ

diff --git a/src/doclets/devhelp/deps/style.css b/src/doclets/devhelp/deps/style.css
index 2b0cbbc73c44ad6eb44c3cbe0a058fba7b9da0d8..a7e710f0d0ee8e64201b34134fc5233b8137450a 100644 (file)
--- a/src/doclets/devhelp/deps/style.css
+++ b/src/doclets/devhelp/deps/style.css
@@ -167,8 +167,34 @@ h3.main_title {
 
 
 
+.main_inline_navigation_virtual_property {
+       list-style-image: url(property.png);
+}
+.main_inline_navigation_abstract_property {
+       list-style-image: url(property.png);
+}
+.navi_abstract_prop {
+       list-style-image: url(property.png);
+}
+.navi_virtual_prop {
+       list-style-image: url(property.png);
+}
+
+
 
 
+.navi_abstract_class, .main_inline_navigation_abstract_class {
+       list-style-image: url(abstractclass.png);
+}
+.main_inline_navigation_abstract_method, .navi_abstract_method {
+       list-style-image: url( abstractmethod.png );
+}
+.navi_construction_method, .main_list_m, .main_inline_navigation_construction_method {
+       list-style-image: url(method.png);
+}
+.navi_static_method, .main_inline_navigation_static_method {
+       list-style-image: url(staticmethod.png);
+}
 
 .navi_package_index, .main_inline_navigation_package {
        list-style-image: url(packages.png)
@@ -179,9 +205,6 @@ h3.main_title {
 .main_navi_errdomcode {
        list-style-image: url(errorcode.png)
 }
-.navi_construction_method, .main_list_m {
-       list-style-image: url(method.png)
-}
 .navi_error_domain, .main_list_errdom {
        list-style-image: url(errordomain.png)
 }

diff --git a/src/doclets/html/deps/Makefile.am b/src/doclets/html/deps/Makefile.am
index 1dfdb5d6f95ce03db1040436fdfaf103d2c8ba3f..db572ab4da801a9516ba7378a57142ee5595c719 100644 (file)
--- a/src/doclets/html/deps/Makefile.am
+++ b/src/doclets/html/deps/Makefile.am
@@ -5,6 +5,9 @@ vapidir = $(libdir)/valadoc/plugins/template/deps/
 
 
 dist_vapi_DATA =     \
+    abstractclass.png \
+    abstractmethod.png \
+    staticmethod.png \
        main.css        \
        class.png       \
        enumvalue.png   \

diff --git a/src/doclets/html/deps/abstractclass.png b/src/doclets/html/deps/abstractclass.png
new file mode 100644 (file)
index 0000000..4aaf937
Binary files /dev/null and b/src/doclets/html/deps/abstractclass.png differ

diff --git a/src/doclets/html/deps/abstractmethod.png b/src/doclets/html/deps/abstractmethod.png
new file mode 100644 (file)
index 0000000..93003f7
Binary files /dev/null and b/src/doclets/html/deps/abstractmethod.png differ

diff --git a/src/doclets/html/deps/main.css b/src/doclets/html/deps/main.css
index d97790a7ccf2f8ad8e67aff4f17f7ab527824e60..51e5c59b44ca7a6b2f319b1e863f4cfc4514bda3 100644 (file)
--- a/src/doclets/html/deps/main.css
+++ b/src/doclets/html/deps/main.css
@@ -167,60 +167,86 @@ h3.main_title {
 
 
 
+.main_inline_navigation_virtual_property {
+       list-style-image: url(property.png);
+}
+.main_inline_navigation_abstract_property {
+       list-style-image: url(property.png);
+}
+.navi_abstract_prop {
+       list-style-image: url(property.png);
+}
+.navi_virtual_prop {
+       list-style-image: url(property.png);
+}
+
+
+.navi_abstract_class, .main_inline_navigation_abstract_class {
+       list-style-image: url(abstractclass.png);
+}
+.main_inline_navigation_abstract_method, .navi_abstract_method {
+       list-style-image: url( abstractmethod.png );
+}
+.navi_construction_method, .main_list_m, .main_inline_navigation_construction_method {
+       list-style-image: url(method.png);
+}
+.navi_static_method, .main_inline_navigation_static_method {
+       list-style-image: url(staticmethod.png);
+}
 
 
+.navi_virtual_method, .main_inline_navigation_virtual_method {
+       list-style-image: url(method.png);
+}
 
 .navi_package_index, .main_inline_navigation_package {
-       list-style-image: url(packages.png)
+       list-style-image: url(packages.png);
 }
 .main_navi_enval {
-       list-style-image: url(enumvalue.png)
+       list-style-image: url(enumvalue.png);
 }
 .main_navi_errdomcode {
-       list-style-image: url(errorcode.png)
-}
-.navi_construction_method, .main_list_m {
-       list-style-image: url(method.png)
+       list-style-image: url(errorcode.png);
 }
 .navi_error_domain, .main_list_errdom {
-       list-style-image: url(errordomain.png)
+       list-style-image: url(errordomain.png);
 }
 .navi_namespace, .main_list_ns, .main_inline_navigation_namespace {
-       list-style-image: url(namespace.png)
+       list-style-image: url(namespace.png);
 }
 .navi_method, .main_inline_navigation_method {
-       list-style-image: url(method.png)
+       list-style-image: url(method.png);
 }
 .navi_struct, .main_list_stru, .main_inline_navigation_struct {
-       list-style-image: url(struct.png)
+       list-style-image: url(struct.png);
 }
 .navi_iface, .main_list_iface {
-       list-style-image: url(interface.png)
+       list-style-image: url(interface.png);
 }
 .navi_field, .main_inline_navigation_fields, .main_list_field {
-       list-style-image: url(field.png)
+       list-style-image: url(field.png);
 }
 .navi_class, .main_inline_navigation_class, .main_list_cl {
-       list-style-image: url(class.png)
+       list-style-image: url(class.png);
 }
 .navi_enum, .main_list_en {
-       list-style-image: url(enum.png)
+       list-style-image: url(enum.png);
 }
 .navi_prop, .main_inline_navigation_property, .main_list_prop {
-       list-style-image: url(property.png)
+       list-style-image: url(property.png);
 }
 .navi_del, .main_list_del, .main_inline_navigation_delegate {
-       list-style-image: url(delegate.png)
+       list-style-image: url(delegate.png);
 }
 .navi_sig, .main_inline_navigation_signal, .main_list_sig {
-       list-style-image: url(signal.png)
+       list-style-image: url(signal.png);
 }
 .navi_package, .main_inline_navigation_package {
-       list-style-image: url(package.png)
+       list-style-image: url(package.png);
 }
 
 .main_inline_navigation_constant, .navi_constant {
-       list-style-image: url(constant.png)
+       list-style-image: url(constant.png);
 }
 
 

diff --git a/src/doclets/html/deps/staticmethod.png b/src/doclets/html/deps/staticmethod.png
new file mode 100644 (file)
index 0000000..4e76a24
Binary files /dev/null and b/src/doclets/html/deps/staticmethod.png differ

diff --git a/src/doclets/htmlhelpers/htmlhelpers.vala b/src/doclets/htmlhelpers/htmlhelpers.vala
index 3bac0458257635d6e33bcc0af8c2f9cf14d88386..ea9528000c33d43dc702d86d665a49ef044f5231 100644 (file)
--- a/src/doclets/htmlhelpers/htmlhelpers.vala
+++ b/src/doclets/htmlhelpers/htmlhelpers.vala
@@ -5,10 +5,20 @@ using GLib;
 
 
 public const string css_inline_navigation = "main_inline_navigation";
+
 public const string css_inline_navigation_property = "main_inline_navigation_property";
+public const string css_inline_navigation_virtual_property = "main_inline_navigation_virtual_property";
+public const string css_inline_navigation_abstract_property = "main_inline_navigation_abstract_property";
+
 public const string css_inline_navigation_method = "main_inline_navigation_method";
+public const string css_inline_navigation_static_method = "main_inline_navigation_static_method";
+public const string css_inline_navigation_virtual_method = "main_inline_navigation_virtual_method";
+public const string css_inline_navigation_abstract_method = "main_inline_navigation_abstract_method";
+public const string css_inline_navigation_construction_method = "main_inline_navigation_construction_method";
+
 public const string css_inline_navigation_signal = "main_inline_navigation_signal";
 public const string css_inline_navigation_fields = "main_inline_navigation_fields";
+public const string css_inline_navigation_abstract_class = "main_inline_navigation_abstract_class";
 public const string css_inline_navigation_class = "main_inline_navigation_class";
 public const string css_inline_navigation_enum = "main_inline_navigation_enum";
 public const string css_inline_navigation_struct = "main_inline_navigation_struct";
@@ -22,18 +32,27 @@ public const string css_site_header = "site_header";
 
 public const string css_navi_package_index = "navi_package_index";
 public const string css_navi_package = "navi_package";
-public const string css_navi_construction_method = "navi_construction_method";
+
+public const string css_navi_creation_method = "navi_creation_method";
+
 public const string css_navi_error_domain = "navi_error_domain";
 public const string css_navi_namespace = "navi_namespace";
+public const string css_navi_abstract_method = "navi_abstract_method";
+public const string css_navi_virtual_method = "navi_virtual_method";
+public const string css_navi_static_method = "navi_static_method";
+public const string css_navi_construction_method = "navi_construction_method";
 public const string css_navi_method = "navi_method";
 public const string css_navi_struct = "navi_struct";
 public const string css_navi_iface = "navi_iface";
 public const string css_navi_field = "navi_field";
 public const string css_navi_class = "navi_class";
+public const string css_navi_abstract_class = "navi_abstract_class";
 public const string css_navi_enum = "navi_enum";
 public const string css_navi_link = "navi_link";
 public const string css_navi_constant = "navi_constant";
 public const string css_navi_prop = "navi_prop";
+public const string css_navi_abstract_prop = "navi_abstract_prop";
+public const string css_navi_virtual_prop = "navi_virtual_prop";
 public const string css_navi_del = "navi_del";
 public const string css_navi_sig = "navi_sig";
 public const string css_navi = "navi_main";
@@ -425,8 +444,9 @@ public abstract class Valadoc.BasicHtmlLanglet : Valadoc.Langlet {
                        modifiers.append ( " override " );
 
 
+               file.printf ( " <span class=\"%s\">%s</span> ", css_keyword, modifiers.str );
                this.write_type_reference ( prop.return_type, file );
-               file.printf ( " <span class=\"%s\">%s</span>%s { ", css_keyword, modifiers.str, prop.name );
+               file.printf ( " %s { ", prop.name );
 
                if ( prop.setter != null )
                        this.write_property_accessor ( prop.setter, file );
@@ -528,8 +548,6 @@ public abstract class Valadoc.BasicHtmlLanglet : Valadoc.Langlet {
 
                if ( cl.is_abstract )
                        modifiers.append ( "abstract " );
-               else if ( cl.is_static )
-                       modifiers.append ( "static " );
 
                file.printf ( "<span class=\"%s\">%s class</span> %s", css_keyword, modifiers.str, cl.name );
 
@@ -543,10 +561,7 @@ public abstract class Valadoc.BasicHtmlLanglet : Valadoc.Langlet {
 
                this.write_accessor ( iface, file );
 
-               if ( iface.is_static  )
-                       file.printf ( "<span class=\"%s\">static interface</span> %s", css_keyword, iface.name );
-               else
-                       file.printf ( "<span class=\"%s\">interface</span> %s", css_keyword, iface.name );
+               file.printf ( "<span class=\"%s\">interface</span> %s", css_keyword, iface.name );
 
                this.write_template_parameters ( iface, ptr );
                this.write_inheritance_list ( iface, file );
@@ -625,7 +640,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
                else if ( element is Struct )
                        style = css_navi_struct;
                else if ( element is Class )
-                       style = css_navi_class;
+                       style = ( ((Class)element).is_abstract )? css_navi_abstract_class : css_navi_class;
                else if ( element is Interface )
                        style = css_navi_iface;
                else if ( element is Package ) {
@@ -657,6 +672,8 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
 
                if ( mself == null )
                        mself = element;
+               else if ( mself.name == null )
+                       mself = mself.parent;
 
                string package_name = element.file.name;
 
@@ -725,7 +742,8 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
                this.write_navi_child_enums_without_childs ( file, ns, mself );
                this.write_navi_child_error_domains_without_childs ( file, ns, mself );
                this.write_navi_child_delegates ( file, ns, mself );
-               this.write_navi_child_methods ( file, ns, mself );
+               this.write_navi_child_static_methods ( file, ns, mself );
+               this.write_navi_child_methods ( file, ns, mself ); // remove
                this.write_navi_child_fields ( file, ns, mself );
                this.write_navi_child_constants ( file, ns, mself );
        }
@@ -744,6 +762,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
        protected void write_navi_struct_inline ( GLib.FileStream file, Struct stru, Basic mself ) {
                file.printf ( "<ul class=\"%s\">\n", css_navi );
                this.write_navi_child_construction_methods ( file, stru, mself );
+               this.write_navi_child_static_methods ( file, stru, mself );
                this.write_navi_child_methods ( file, stru, mself );
                this.write_navi_child_fields ( file, stru, mself );
                this.write_navi_child_constants ( file, stru, mself );
@@ -759,6 +778,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
 
        protected void write_navi_interface_inline ( GLib.FileStream file, Interface iface, Basic mself ) {
                file.printf ( "<ul class=\"%s\">\n", css_navi );
+               this.write_navi_child_static_methods ( file, iface, mself );
                this.write_navi_child_delegates ( file, iface, mself );
                this.write_navi_child_methods ( file, iface, mself );
                this.write_navi_child_signals ( file, iface, mself );
@@ -782,7 +802,8 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
                        this.write_navi_entry ( file, env, en, css_navi_enval, true ); // en => mself
                }
 
-               this.write_navi_child_methods ( file, en, mself );
+               this.write_navi_child_static_methods ( file, en, mself );
+               this.write_navi_child_methods ( file, en, mself ); // remove
                file.puts ( "</ul>\n" );
        }
 
@@ -801,7 +822,8 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
                        this.write_navi_entry ( file, ec, errdom, css_navi_errdomcode, true ); // errdom => mself
                }
 
-               this.write_navi_child_methods ( file, errdom, mself );
+               this.write_navi_child_static_methods ( file, errdom, mself );
+               this.write_navi_child_methods ( file, errdom, mself ); // remove
                file.puts ( "</ul>\n" );
        }
 
@@ -822,6 +844,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
        protected void write_navi_class_inline ( GLib.FileStream file, Class cl, Basic mself ) {
                file.printf ( "<ul class=\"%s\">\n", css_navi );
                this.write_navi_child_construction_methods ( file, cl, mself );
+               this.write_navi_child_static_methods ( file, cl, mself );
                this.write_navi_child_classes_without_childs ( file, cl, mself );
                this.write_navi_child_structs_without_childs ( file, cl, mself );
                this.write_navi_child_enums_without_childs ( file, cl, mself );
@@ -966,6 +989,26 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
        }
 
        protected void write_navi_child_methods_collection ( GLib.FileStream file, Gee.Collection<Method> methods, Basic mself ) {
+               foreach ( Method m in methods ) {
+                       if ( !m.is_static ) {
+                               string css;
+                               if ( m.is_virtual || m.is_override )
+                                       css = css_navi_virtual_method;
+                               else if ( m.is_abstract )
+                                       css = css_navi_abstract_method;
+                               else
+                                       css = css_navi_method;
+
+
+                               if ( m == mself )
+                                       this.write_navi_entry ( file, m, mself, css, false );
+                               else
+                                       this.write_navi_entry ( file, m, mself, css, true );
+                       }
+               }
+       }
+
+       protected void write_navi_child_construction_methods_collection ( GLib.FileStream file, Gee.Collection<Method> methods, Basic mself ) {
                foreach ( Method m in methods ) {
                        if ( m == mself )
                                this.write_navi_entry ( file, m, mself, css_navi_construction_method, false );
@@ -974,17 +1017,33 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
                }
        }
 
+       protected void write_navi_child_static_methods_collection ( GLib.FileStream file, Gee.Collection<Method> methods, Basic mself ) {
+               foreach ( Method m in methods ) {
+                       if ( m.is_static ) {
+                               if ( m == mself )
+                                       this.write_navi_entry ( file, m, mself, css_navi_static_method, false );
+                               else
+                                       this.write_navi_entry ( file, m, mself, css_navi_static_method, true );
+                       }
+               }
+       }
+
        protected void write_navi_child_methods ( GLib.FileStream file, MethodHandler mh, Basic mself ) {
                Gee.ReadOnlyCollection<Method> methods = mh.get_method_list ( );
                this.write_navi_child_methods_collection ( file, methods, mself );
        }
 
+       protected void write_navi_child_static_methods ( GLib.FileStream file, MethodHandler mh, Basic mself ) {
+               Gee.ReadOnlyCollection<Method> methods = mh.get_method_list ( );
+               this.write_navi_child_static_methods_collection ( file, methods, mself );
+       }
+
        protected void write_navi_child_classes_without_childs_collection ( GLib.FileStream file, Gee.Collection<Class> classes, Basic mself ) {
                foreach ( Class cl in classes ) {
                        if ( cl == mself )
-                               this.write_navi_entry ( file, cl, mself, css_navi_class, false );
+                               this.write_navi_entry ( file, cl, mself, (cl.is_abstract)? css_navi_abstract_class : css_navi_class, false );
                        else
-                               this.write_navi_entry ( file, cl, mself, css_navi_class, true );
+                               this.write_navi_entry ( file, cl, mself, (cl.is_abstract)? css_navi_abstract_class : css_navi_class, true );
                }
        }
 
@@ -995,7 +1054,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
 
        protected void write_navi_child_construction_methods ( GLib.FileStream file, ConstructionMethodHandler cmh, Basic mself ) {
                Gee.ReadOnlyCollection<Method> methods = cmh.get_construction_method_list ( );
-               this.write_navi_child_methods_collection ( file, methods, mself );
+               this.write_navi_child_construction_methods_collection ( file, methods, mself );
        }
 
        protected void write_navi_child_signals ( GLib.FileStream file, SignalHandler sh, Basic mself ) {
@@ -1013,10 +1072,18 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
                Gee.ReadOnlyCollection<Property> properties = ph.get_property_list ( );
 
                foreach ( Property p in properties ) {
+                       string css;
+                       if ( p.is_virtual )
+                               css = css_navi_virtual_prop;
+                       else if ( p.is_abstract )
+                               css = css_navi_abstract_prop;
+                       else
+                               css = css_navi_prop;
+
                        if ( p == mself )
-                               this.write_navi_entry ( file, p, mself, css_navi_prop, false );
+                               this.write_navi_entry ( file, p, mself, css, false );
                        else
-                               this.write_navi_entry ( file, p, mself, css_navi_prop, true );
+                               this.write_navi_entry ( file, p, mself, css, true );
                }
        }
 
@@ -1329,7 +1396,17 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
                        file.printf ( "<h3 class=\"%s\">Methods:</h3>\n", css_title );
                        file.printf ( "<ul class=\"%s\">\n", css_inline_navigation );
                        foreach ( Method m in imethods ) {
-                               file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a></li>\n", css_inline_navigation_method, css_navi_link, this.get_link(m, mh), m.name );
+                               string css;
+                               if ( m.is_static )
+                                       css = css_inline_navigation_static_method;
+                               else if ( m.is_abstract )
+                                       css = css_inline_navigation_abstract_method;
+                               else if ( m.is_virtual || m.is_override )
+                                       css = css_inline_navigation_virtual_method;
+                               else
+                                       css = css_inline_navigation_method;
+
+                               file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a></li>\n", css, css_navi_link, this.get_link(m, mh), m.name );
                        }
                        file.puts ( "</ul>\n" );
                }
@@ -1348,7 +1425,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
                        file.printf ( "<h3 class=\"%s\">Static Methods:</h3>\n", css_title );
                        file.printf ( "<ul class=\"%s\">\n", css_inline_navigation );
                        foreach ( Method m in static_methods ) {
-                               file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a></li>\n", css_inline_navigation_method, css_navi_link, this.get_link(m, mh), m.name );
+                               file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a></li>\n", css_inline_navigation_static_method, css_navi_link, this.get_link(m, mh), m.name );
                        }
                        file.puts ( "</ul>\n" );
                }
@@ -1489,7 +1566,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
                        file.printf ( "<h3 class=\"%s\">Construction Methods:</h3>\n", css_title );
                        file.printf ( "<ul class=\"%s\">\n", css_inline_navigation );
                        foreach ( Method m in methods ) {
-                               file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a></li>\n", css_inline_navigation_method, css_navi_link, this.get_link(m, cmh), m.name );
+                               file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a></li>\n", css_inline_navigation_construction_method, css_navi_link, this.get_link(m, cmh), m.name );
                        }
                        file.puts ( "</ul>\n" );
                }
@@ -1531,7 +1608,15 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
                        file.printf ( "<h3 class=\"%s\">Properties:</h3>\n", css_title );
                        file.printf ( "<ul class=\"%s\">\n", css_inline_navigation );
                        foreach ( Property prop in properties ) {
-                               file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a></li>\n", css_inline_navigation_property, css_navi_link, this.get_link(prop, ph), prop.name );
+                               string css;
+                               if ( prop.is_virtual )
+                                       css = css_inline_navigation_virtual_property;
+                               else if ( prop.is_abstract )
+                                       css = css_inline_navigation_abstract_property;
+                               else
+                                       css = css_inline_navigation_property;
+
+                               file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a></li>\n", css, css_navi_link, this.get_link(prop, ph), prop.name );
                        }
                        file.puts ( "</ul>\n" );
                }
@@ -1563,7 +1648,7 @@ public abstract class Valadoc.BasicHtmlDoclet : Valadoc.Doclet {
                                        name = subcl.name;
                                }
 
-                               file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a></li>\n", css_inline_navigation_class, css_navi_link, this.get_link(subcl, clh), name );
+                               file.printf ( "\t<li class=\"%s\"><a class=\"%s\" href=\"%s\">%s</a></li>\n", (subcl.is_abstract)? css_inline_navigation_abstract_class : css_inline_navigation_class, css_navi_link, this.get_link(subcl, clh), name );
                        }
                        file.puts ( "</ul>\n" );
                }

diff --git a/src/libvaladoc/doctree.vala b/src/libvaladoc/doctree.vala
index d72bf55f1ae57d5d723d7852e767f2553611ee66..5b626f2be894c5d4d34e8feb72b12c0f14223d65 100755 (executable)
--- a/src/libvaladoc/doctree.vala
+++ b/src/libvaladoc/doctree.vala
@@ -1809,6 +1809,9 @@ public class Valadoc.TypeReference : Basic {
                        if ( node == null )
                                return false;
 
+                       if ( node is Vala.Constant )
+                               return false;
+
                        if ( node is Vala.FormalParameter ) {
                                var direction = ((Vala.FormalParameter)node).direction;
 
@@ -3020,13 +3023,6 @@ public class Valadoc.Class : ContainerDataType, Visitable, ClassHandler, StructH
                }
        }
 
-       // remove
-       public bool is_static {
-               get {
-                       return this.vclass.is_static;
-               }
-       }
-
        public override void visit ( Doclet doclet ) {
                if ( !this.is_visitor_accessible ( ) )
                        return ;
@@ -3853,12 +3849,6 @@ public class Valadoc.Interface : ContainerDataType, Visitable, SignalHandler, Pr
                this.add_enums ( enums );
        }
 
-       public bool is_static {
-               get {
-                       return this.vinterface.is_static;
-               }
-       }
-
        public string?# comment_str {
                get {
                        return this.vinterface.source_reference.comment;

diff --git a/src/valadoc/valadoc.vala b/src/valadoc/valadoc.vala
index ef005a5a0f6571d99b0bb1d95c449c2e5d0054b9..dfe78c56d37d2f2b49b39cad4f27f9e8d77b9a14 100755 (executable)
--- a/src/valadoc/valadoc.vala
+++ b/src/valadoc/valadoc.vala
@@ -382,7 +382,7 @@ public class ValaDoc : Object {
                if ( pkg_name == null )
                        return true;
 
-               if ( pkg_name == "glib-2.0" )
+               if ( pkg_name == "glib-2.0" || pkg_name == "gobject-2.0" )
                        return false;
 
                foreach (string package in this.packages ) {
@@ -454,6 +454,10 @@ public class ValaDoc : Object {
                        Report.error (null, "glib-2.0 not found in specified Vala API directories");
                }
 
+               if (!add_package (context, "gobject-2.0")) {
+                       Report.error (null, "gobject-2.0 not found in specified Vala API directories");
+               }
+
                if ( this.packages != null ) {
                        foreach (string package in this.packages ) {
                                if (!add_package (context, package)) {
@@ -482,12 +486,6 @@ public class ValaDoc : Object {
                        return quit ();
                }
 
-               var attributeprocessor = new AttributeProcessor ();
-               attributeprocessor.process( context );
-               if (Report.get_errors () > 0) {
-                       return quit ();
-               }
-
                var resolver = new SymbolResolver ();
                resolver.resolve( context );
                if (Report.get_errors () > 0) {