Mercurial > hg > octave-lyh
view scripts/java/module.mk @ 16512:7f2395651a1c
dialog boxes with Qt widgets
* dialog.h, dialog.cc: New files.
* libgui/src/module.mk: Update file lists.
* main-window.h, main-window.ccmain_window::connect_uiwidget_links,
main_window::handle_create_dialog,
main_window::handle_create_listview,
main_window::handle_create_inputlayout): New functions.
(main_window::construct): Call connect_uiwidget_links.
* octave-link.h, octave-link.cc (octave_link::message_dialog,
octave_link::do_message_dialog, octave_link::list_dialog,
octave_link::do_list_dialog, octave_link::input_dialog,
octave_link::do_input_dialog): New functions.
* octave-qt-link.h, octave-qt-link.cc (octave_qt_link::message_dialog,
octave_qt_link::do_message_dialog, octave_qt_link::list_dialog,
octave_qt_link::do_list_dialog, octave_qt_link::input_dialog,
octave_qt_link::do_input_dialog, make_qstring_list): New functions.
* octave-link.cc (F__octave_link_edit_file__): Call
flush_octave_stdout before running the edit file action.
(F__octave_link_message_dialog__, F__octave_link_list_dialog__,
__octave_link_input_dialog__): New functions.
* errordlg.m, helpdlg.m, inputdlg.m, listdlg.m, msgbox.m, warndlg.m:
New demos adapted from dlgtest.m
* dlgtest.m: Delete.
* scripts/java/module.mk: Remove it from the list of files.
* inputdlg.m: Try __octave_link_input_dialog__ first. Only try java
method if JAVA feature is available.
* listdlg.m: Likwise, for __octave_link_list_dialog__.
* private/message_dialog.m: Likewise, for
__octave_link_message_dialog__.
author | Daniel J Sebald <daniel.sebald@ieee.org>, John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 13 Apr 2013 15:22:34 -0400 |
parents | ff061068a66c |
children |
line wrap: on
line source
FCN_FILE_DIRS += java java_FCN_FILES = \ java/javaArray.m \ java/javaaddpath.m \ java/javaclasspath.m \ java/javamem.m \ java/javarmpath.m \ java/usejava.m FCN_FILES += $(java_FCN_FILES) PKG_ADD_FILES += java/PKG_ADD DIRSTAMP_FILES += java/$(octave_dirstamp) if AMCOND_HAVE_JAVA JAR_FILES += java/octave.jar endif org_octave_dir = org/octave if AMCOND_HAVE_JAVA JAVA_SRC = \ $(org_octave_dir)/ClassHelper.java \ $(org_octave_dir)/OctClassLoader.java \ $(org_octave_dir)/Octave.java \ $(org_octave_dir)/OctaveReference.java \ $(org_octave_dir)/Matrix.java \ $(org_octave_dir)/JDialogBox.java \ $(org_octave_dir)/DlgListener.java \ $(org_octave_dir)/TeXtranslator.java \ $(org_octave_dir)/TeXcode.java endif JAVA_CLASSES = $(JAVA_SRC:.java=.class) JAVA_IMAGES = \ $(org_octave_dir)/images/question.png \ $(org_octave_dir)/images/error.png \ $(org_octave_dir)/images/warning.png \ $(org_octave_dir)/images/information.png \ $(org_octave_dir)/images/octave.png java_JAVA_SRC = $(addprefix java/, $(JAVA_SRC)) java_JAVA_CLASSES = $(addprefix java/, $(JAVA_CLASSES)) java_JAVA_IMAGES = $(addprefix java/, $(JAVA_IMAGES)) srcdir_java_JAVA_IMAGES = $(addprefix $(srcdir)/java/, $(JAVA_IMAGES)) %.class : %.java $(MKDIR_P) java/$(org_octave_dir) ( cd $(srcdir)/java; "$(JAVAC)" -source 1.3 -target 1.3 -d $(abs_builddir)/java $(org_octave_dir)/$(<F) ) java/images.stamp: $(srcdir_java_JAVA_IMAGES) if [ "x$(srcdir)" != "x." ]; then \ $(MKDIR_P) java/$(org_octave_dir)/images; \ cp $(srcdir_java_JAVA_IMAGES) java/$(org_octave_dir)/images; \ fi touch $@ if AMCOND_HAVE_JAVA java/octave.jar: java/images.stamp $(java_JAVA_CLASSES) ( cd java; "$(JAR)" cf octave.jar.t $(JAVA_CLASSES) $(JAVA_IMAGES) ) mv $@.t $@ endif EXTRA_DIST += $(JAR_FILES) $(java_JAVA_SRC) $(java_JAVA_IMAGES) CLEANFILES += $(JAR_FILES) $(java_JAVA_CLASSES) DISTCLEANFILES += java/images.stamp