Mercurial > hg > octave-nkf
annotate scripts/prefs/addpref.m @ 15137:16a6b0a6855d gui
GUI: support for octave arguments and integrate with run-octave.
* src/octave.h (octave_initialize_interpreter, octave_execute_interpreter):
New functions.
(octave_cmdline_argc, octave_cmdline_argv, octave_embedded): New variables.
* src/octave.cc (octave_cmdline_argc, octave_cmdline_argv, octave_embedded):
New variables.
(octave_initialize_interpreter, octave_execute_interpreter): New functions.
(octave_main): Rewrite using them.
* run-octave.in (octave_executable): New variable.
(-gui): New option flag.
* gui/src/octave-adapter/octave-main-thread.cc (octave_main_thread::run):
Use octave_execute_interpreter.
* gui/src/octave-gui.cc (dissociate_terminal): New function.
(main): Use it. Also use octave_initialize_interpreter.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sun, 05 Aug 2012 16:15:58 -0400 |
parents | 5d3a684236b0 |
children | 1c89599167a6 |
rev | line source |
---|---|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
13943
diff
changeset
|
1 ## Copyright (C) 2012 John W. Eaton |
13261
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2 ## |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
3 ## This file is part of Octave. |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
4 ## |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
5 ## Octave is free software; you can redistribute it and/or modify it |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
6 ## under the terms of the GNU General Public License as published by |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
7 ## the Free Software Foundation; either version 3 of the License, or (at |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
8 ## your option) any later version. |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
9 ## |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
10 ## Octave is distributed in the hope that it will be useful, but |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
13 ## General Public License for more details. |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
14 ## |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
15 ## You should have received a copy of the GNU General Public License |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
16 ## along with Octave; see the file COPYING. If not, see |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
17 ## <http://www.gnu.org/licenses/>. |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
18 |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
19 ## -*- texinfo -*- |
13929
9cae456085c2
Grammarcheck of documentation before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents:
13261
diff
changeset
|
20 ## @deftypefn {Function File} {} addpref (@var{group}, @var{pref}, @var{val}) |
13261
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
21 ## Add a preference @var{pref} and associated value @var{val} to the |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
22 ## named preference group @var{group}. |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
23 ## |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
24 ## The named preference group must be a character string. |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
25 ## |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
26 ## The preference @var{pref} may be a character string or a cell array |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
27 ## of character strings. The corresponding value @var{val} may be any |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
28 ## value, or, if @var{pref} is a cell array of strings, @var{val} |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
29 ## must be a cell array of values with the same size as @var{pref}. |
13943
5820f8ce683e
doc: Add undocumented functions to manual for 3.6.0 release
Rik <octave@nomad.inbox5.com>
parents:
13929
diff
changeset
|
30 ## @seealso{setpref, getpref, ispref, rmpref} |
13261
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
31 ## @end deftypefn |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
32 |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
33 ## Author: jwe |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
34 |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
35 function addpref (group, pref, val) |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
36 |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
37 if (nargin == 3) |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
38 if (ischar (group)) |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
39 prefs = loadprefs (); |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
40 if (ischar (pref)) |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
41 if (isfield (group, pref)) |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
42 error ("preference %s already exists in group %s", pref, group); |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
43 else |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
44 prefs.(group).(pref) = val; |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
45 endif |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
46 elseif (iscellstr (pref)) |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
47 if (size_equal (pref, val)) |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
48 for i = 1:numel (pref) |
13261
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
49 if (isfield (group, pref{i})) |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
50 error ("preference %s already exists in group %s", |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
51 pref{i}, group); |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
52 else |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
53 prefs.(group).(pref{i}) = val; |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
54 endif |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
55 endfor |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
56 else |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
57 error ("size mismatch for pref and val"); |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
58 endif |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
59 else |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
60 error ("expecting pref to be a character string or cellstr"); |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
61 endif |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
62 saveprefs (prefs); |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
63 else |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
64 error ("expecting group to be a character string"); |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
65 endif |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
66 else |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
67 print_usage (); |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
68 endif |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
69 |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
70 endfunction |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
71 |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
72 %% Testing these functions will require some care to avoid wiping out |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
73 %% existing (or creating unwanted) preferences for the user running the |
9134ca9d4ec8
new functions for Matlab compatibility
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
74 %% tests. |