GNOME.org
 

pygtk r3070 - in branches/pygtk-2-14: . docs/reference gtk

Author: paulp
Date: Tue Jan  6 21:19:30 2009
New Revision: 3070
URL: http://svn.gnome.org/viewvc/pygtk?rev=3070&view=rev

Log:
Merge from trunk:

2008-12-01  Gian Mario Tagliaretti  <gianmt gnome org>

	* gtk/Makefile.am:
	* gtk/gtkunixprint-2.12.defs:
	* gtk/gtkunixprint-2.14.defs:
	* gtk/gtkunixprint-base-types.defs:
	* gtk/gtkunixprint-base.defs:
	* gtk/gtkunixprint.defs: split gtkunixprint defs in order to support
	multiple gtk versions.


Added:
   branches/pygtk-2-14/gtk/gtkunixprint-2.12.defs
      - copied unchanged from r3053, /trunk/gtk/gtkunixprint-2.12.defs
   branches/pygtk-2-14/gtk/gtkunixprint-2.14.defs
      - copied unchanged from r3053, /trunk/gtk/gtkunixprint-2.14.defs
   branches/pygtk-2-14/gtk/gtkunixprint-base-types.defs
      - copied unchanged from r3053, /trunk/gtk/gtkunixprint-base-types.defs
   branches/pygtk-2-14/gtk/gtkunixprint-base.defs
      - copied unchanged from r3053, /trunk/gtk/gtkunixprint-base.defs
Removed:
   branches/pygtk-2-14/gtk/gtkunixprint.defs
Modified:
   branches/pygtk-2-14/   (props changed)
   branches/pygtk-2-14/ChangeLog
   branches/pygtk-2-14/docs/reference/pygtk-gtkprinter.xml
   branches/pygtk-2-14/gtk/Makefile.am

Modified: branches/pygtk-2-14/docs/reference/pygtk-gtkprinter.xml
==============================================================================
--- branches/pygtk-2-14/docs/reference/pygtk-gtkprinter.xml	(original)
+++ branches/pygtk-2-14/docs/reference/pygtk-gtkprinter.xml	Tue Jan  6 21:19:30 2009
@@ -67,11 +67,11 @@
         <methodparam></methodparam>
       </methodsynopsis>
       <methodsynopsis language="python">
-        <methodname><link linkend="method-gtkprinter--is-active">is_active</link></methodname>
+        <methodname><link linkend="method-gtkprinter--is-accepting-jobs">is_accepting_jobs</link></methodname>
         <methodparam></methodparam>
       </methodsynopsis>
       <methodsynopsis language="python">
-        <methodname><link linkend="method-gtkprinter--is-virtual">is_virtual</link></methodname>
+        <methodname><link linkend="method-gtkprinter--is-active">is_active</link></methodname>
         <methodparam></methodparam>
       </methodsynopsis>
       <methodsynopsis language="python">
@@ -79,6 +79,14 @@
         <methodparam></methodparam>
       </methodsynopsis>
       <methodsynopsis language="python">
+        <methodname><link linkend="method-gtkprinter--is-paused">is_paused</link></methodname>
+        <methodparam></methodparam>
+      </methodsynopsis>
+      <methodsynopsis language="python">
+        <methodname><link linkend="method-gtkprinter--is-virtual">is_virtual</link></methodname>
+        <methodparam></methodparam>
+      </methodsynopsis>
+      <methodsynopsis language="python">
         <methodname><link linkend="method-gtkprinter--compare">compare</link></methodname>
         <methodparam><parameter role="keyword">b</parameter></methodparam>
       </methodsynopsis>
@@ -115,10 +123,18 @@
 	  <tbody>
 
             <row valign="top">
-              <entry>"accepts-pdf"</entry>
+              <entry>"accepting-jobs"</entry>
+              <entry>Read</entry>
+              <entry>This property is <literal>True</literal> if the printer
+              is accepting jobs. Default value: <literal>True</literal>.
+              Available in GTK+ 2.14.</entry>
+            </row>
+
+            <row valign="top">
+              <entry>"accepts-ps"</entry>
               <entry>Read-Write-Construct Only</entry>
               <entry>if <literal>True</literal> this printer can accept
-              PDF. Available in GTK+ 2.10.</entry>
+              PostScript. Available in GTK+ 2.10.</entry>
             </row>
 
             <row valign="top">
@@ -173,6 +189,15 @@
 	    </row>
 
 	    <row valign="top">
+	      <entry>"paused"</entry>
+	      <entry>Read</entry>
+	      <entry>This property is <literal>True</literal> if this printer is paused. A paused
+              printer still accepts jobs, but it does not print them.
+              Default value: <literal>False</literal>
+              Available in GTK+ 2.14.</entry>
+	    </row>
+
+	    <row valign="top">
 	      <entry>"state-message"</entry>
 	      <entry>Read</entry>
 	      <entry>A string giving the current state of the printer.
@@ -531,6 +556,30 @@
 
     </refsect2>
 
+    <refsect2 id="method-gtkprinter--is-accepting-jobs">
+      <title>gtkunixprint.Printer.is_accepting_jobs</title>
+
+      <programlisting><methodsynopsis language="python">
+        <methodname>is_accepting_jobs</methodname>
+        <methodparam></methodparam>
+      </methodsynopsis></programlisting>
+
+      <variablelist>
+        <varlistentry>
+          <term><emphasis>Returns</emphasis>&nbsp;:</term>
+          <listitem><simpara><literal>True</literal> if printer is accepting jobs.</simpara></listitem>
+        </varlistentry>
+      </variablelist>
+
+      <note>
+        <para>This method is available in PyGTK 2.14 and above.</para>
+      </note>
+
+      <para>The <methodname>is_accepting_jobs</methodname>() method returns
+      whether the printer is accepting jobs</para>
+
+    </refsect2>
+
     <refsect2 id="method-gtkprinter--is-active">
       <title>gtkunixprint.Printer.is_active</title>
 
@@ -556,6 +605,31 @@
 
     </refsect2>
 
+    <refsect2 id="method-gtkprinter--is-paused">
+      <title>gtkunixprint.Printer.is_paused</title>
+
+      <programlisting><methodsynopsis language="python">
+        <methodname>is_paused</methodname>
+        <methodparam></methodparam>
+      </methodsynopsis></programlisting>
+
+      <variablelist>
+        <varlistentry>
+          <term><emphasis>Returns</emphasis>&nbsp;:</term>
+          <listitem><simpara><literal>True</literal> if the printer is paused.</simpara></listitem>
+        </varlistentry>
+      </variablelist>
+
+      <note>
+        <para>This method is available in PyGTK 2.14 and above.</para>
+      </note>
+
+      <para>The <methodname>is_paused</methodname>() method returns
+      whether the printer is currently paused. A paused printer still accepts
+      jobs, but it is not printing them.</para>
+
+    </refsect2>
+
     <refsect2 id="method-gtkprinter--is-virtual">
       <title>gtkunixprint.Printer.is_virtual</title>
 

Modified: branches/pygtk-2-14/gtk/Makefile.am
==============================================================================
--- branches/pygtk-2-14/gtk/Makefile.am	(original)
+++ branches/pygtk-2-14/gtk/Makefile.am	Tue Jan  6 21:19:30 2009
@@ -26,7 +26,7 @@
 pygtk_PYTHON = 			\
 	__init__.py 		\
 	_lazyutils.py		\
-	compat.py			\
+	compat.py		\
 	deprecation.py		\
 	keysyms.py
 
@@ -43,12 +43,22 @@
 # gtk module
 GTK_DEFS = gtk-base.defs
 GDK_DEFS = gdk-base.defs
+GTKUNIXPRINT_DEFS = gtkunixprint-base.defs
 GTK_TYPES_DEFS = gtk-base-types.defs
 GDK_TYPES_DEFS = gdk-base-types.defs
+GTKUNIXPRINT_TYPES_DEFS = gtkunixprint-base-types.defs
 
 GTK_2_10_DEFS = gdk-2.10.defs gtk-2.10.defs gtk-2.10-types.defs
-GTK_2_12_DEFS = gdk-2.12.defs gtk-2.12.defs gtk-2.12-types.defs
-GTK_2_14_DEFS = gdk-2.14.defs gtk-2.14.defs gtk-2.14-types.defs
+GTK_2_12_DEFS =
+	gdk-2.12.defs		\
+	gtk-2.12.defs		\
+	gtk-2.12-types.defs	\
+	gtkunixprint-2.12.defs
+GTK_2_14_DEFS =
+	gdk-2.14.defs		\
+	gtk-2.14.defs		\
+	gtk-2.14-types.defs 	\
+	gtkunixprint-2.14.defs
 
 if HAVE_GTK_2_10
 GDK_DEFS += gdk-2.10.defs 
@@ -60,6 +70,7 @@
 GDK_DEFS += gdk-2.12.defs 
 GTK_DEFS += gtk-2.12.defs 
 GTK_TYPES_DEFS += gtk-2.12-types.defs
+GTKUNIXPRINT_DEFS += gtkunixprint-2.12.defs
 endif
 
 
@@ -67,6 +78,7 @@
 GDK_DEFS += gdk-2.14.defs 
 GTK_DEFS += gtk-2.14.defs 
 GTK_TYPES_DEFS += gtk-2.14-types.defs
+GTKUNIXPRINT_DEFS += gtkunixprint-2.14.defs
 endif
 
 CREATEDEFS = $(PYTHON) $(CODEGENDIR)/createdefs.py
@@ -129,6 +141,12 @@
 gtk-types.defs: $(GTK_TYPES_DEFS) Makefile
 	$(CREATEDEFS) $@ $(GTK_TYPES_DEFS)
 
+gtkunixprint.defs: $(GTKUNIXPRINT_DEFS) Makefile
+	$(CREATEDEFS) $@ $(GTKUNIXPRINT_DEFS)
+
+gtkunixprint-types.defs: $(GTKUNIXPRINT_TYPES_DEFS) Makefile
+	$(CREATEDEFS) $@ $(GTKUNIXPRINT_TYPES_DEFS)
+
 gdk.c: gdk-types.defs gdk.defs $(GDK_OVERRIDES)
 gtk.c: gdk-types.defs gtk-types.defs gtk.defs gdk-types.defs $(GTK_OVERRIDES)
 _gtk_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTK_CFLAGS)
@@ -167,11 +185,22 @@
 endif
 
 # gtkunixprint module
-GTKUNIXPRINT_DEFS = gtkunixprint.defs
-CLEANFILES += gtkunixprint.c
-EXTRA_DIST += $(GTKUNIXPRINT_DEFS) gtkunixprint.override
-gtkunixprint.c: $(GTKUNIXPRINT_DEFS) gtkunixprint.override gdk-types.defs \
-	gtk-types.defs
+CLEANFILES +=			\
+	gtkunixprint.c 		\
+	gtkunixprint.defs 	\
+	gtkunixprint-types.defs
+		
+
+EXTRA_DIST +=				\
+	$(GTKUNIXPRINT_DEFS)		\
+	$(GTKUNIXPRINT_TYPES_DEFS)	\
+	gtkunixprint.override
+
+gtkunixprint.c:						\
+	 gtkunixprint-types.defs gtkunixprint.defs	\
+		gtkunixprint.override gdk-types.defs	\
+		gtk-types.defs
+
 gtkunixprint_la_CFLAGS = $(PYCAIRO_CFLAGS) $(GTKUNIXPRINT_CFLAGS)
 gtkunixprint_la_LIBADD = $(GTKUNIXPRINT_LIBS)
 gtkunixprint_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initgtkunixprint
@@ -179,7 +208,7 @@
 nodist_gtkunixprint_la_SOURCES = gtkunixprint.c
 if BUILD_GTKUNIXPRINT
 pkgpyexec_LTLIBRARIES = gtkunixprint.la
-defs_DATA += $(GTKUNIXPRINT_DEFS)
+defs_DATA += $(GTKUNIXPRINT_DEFS) $(GTKUNIXPRINT_TYPES_DEFS)
 endif
 
 if PLATFORM_WIN32
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]