##// END OF EJS Templates
Merge pull request #7822 from mspacek/master...
Min RK -
r20473:450bb8a8 merge
parent child Browse files
Show More
@@ -626,14 +626,14 b' command-line application), there are a few options:'
626 objects in your application.
626 objects in your application.
627
627
628 * Start a standard IPython kernel in the process of the external Qt
628 * Start a standard IPython kernel in the process of the external Qt
629 application. See :file:`examples/lib/ipkernel_qtapp.py` for an example. Due
629 application. See :file:`examples/Embedding/ipkernel_qtapp.py` for an example. Due
630 to IPython's two-process model, the QtConsole itself will live in another
630 to IPython's two-process model, the QtConsole itself will live in another
631 process with its own QApplication, and thus cannot be embedded in the main
631 process with its own QApplication, and thus cannot be embedded in the main
632 GUI.
632 GUI.
633
633
634 * Start a special IPython kernel, the
634 * Start a special IPython kernel, the
635 :class:`IPython.kernel.inprocess.ipkernel.InProcessKernel`, that allows a
635 :class:`IPython.kernel.inprocess.ipkernel.InProcessKernel`, that allows a
636 QtConsole in the same process. See :file:`examples/inprocess/embedded_qtconsole.py`
636 QtConsole in the same process. See :file:`examples/Embedding/inprocess_qtconsole.py`
637 for an example. While the QtConsole can now be embedded in the main GUI, one
637 for an example. While the QtConsole can now be embedded in the main GUI, one
638 cannot connect to the kernel from other consoles as there are no real ZMQ
638 cannot connect to the kernel from other consoles as there are no real ZMQ
639 sockets anymore.
639 sockets anymore.
@@ -853,7 +853,7 b' Second, when using the ``PyOSInputHook`` approach, a GUI application should'
853 in IPython and as standalone apps need to have special code to detects how the
853 in IPython and as standalone apps need to have special code to detects how the
854 application is being run. We highly recommend using IPython's support for this.
854 application is being run. We highly recommend using IPython's support for this.
855 Since the details vary slightly between toolkits, we point you to the various
855 Since the details vary slightly between toolkits, we point you to the various
856 examples in our source directory :file:`examples/lib` that demonstrate
856 examples in our source directory :file:`examples/Embedding` that demonstrate
857 these capabilities.
857 these capabilities.
858
858
859 Third, unlike previous versions of IPython, we no longer "hijack" (replace
859 Third, unlike previous versions of IPython, we no longer "hijack" (replace
@@ -862,7 +862,7 b' actually need to run the real event loops to do so. This is often needed to'
862 process pending events at critical points.
862 process pending events at critical points.
863
863
864 Finally, we also have a number of examples in our source directory
864 Finally, we also have a number of examples in our source directory
865 :file:`examples/lib` that demonstrate these capabilities.
865 :file:`examples/Embedding` that demonstrate these capabilities.
866
866
867 PyQt and PySide
867 PyQt and PySide
868 ---------------
868 ---------------
General Comments 0
You need to be logged in to leave comments. Login now