anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: http://bugzilla.lyx.org/show_bug.cgi?id=452

Browse Source 
ControlMath.C: cleanup order of symbols in math panel
iconpalette.C: 6 cols since many symbols come in pairs
Rrightarrow.xpm: was missing
searrow.xpm: was north east
swarrow.xpm: was north west


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16316 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Edwin Leuven 2006-12-17 17:36:00 +00:00
parent 822df54fc2
commit dc8bba7918
5 changed files with 173 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/images/math/Rrightarrow.xpm Normal file
View File

@ -0,0 +1,29 @@
/* XPM */
static char *Rrightarrow[] = {
/* columns rows colors chars-per-pixel */
"25 21 2 1",
" c black",
". c None",
/* pixels */
"............... .........",
"............... .........",
"................ ........",
"................. .......",
" ......",
".................. .....",
"................... ....",
".................... ...",
"..................... ..",
"...................... .",
" ",
"...................... .",
"..................... ..",
".................... ...",
"................... ....",
".................. .....",
" ......",
"................. .......",
"................ ........",
"............... .........",
"............... ........."
};

49
lib/images/math/searrow.xpm
View File

@ -1,29 +1,28 @@
/* XPM */
static char *a[] = {
static char *searrow[] = {
/* columns rows colors chars-per-pixel */
"20 20 3 1",
" c #000000",
". c #000000",
"X c None",
"20 20 2 1",
" c black",
". c None",
/* pixels */
"XXXXXXXXXXXXXX.XXXXX",
"XXXXXXXXXXXXXXX....X",
"XXXXXXXXXXXXXXXXX..X",
"XXXXXXXXXXXXXXXX.X.X",
"XXXXXXXXXXXXXXX.XX.X",
"XXXXXXXXXXXXXX.XXX.X",
"XXXXXXXXXXXXX.XXXXX.",
"XXXXXXXXXXXX.XXXXXXX",
"XXXXXXXXXXX.XXXXXXXX",
"XXXXXXXXXX.XXXXXXXXX",
"XXXXXXXXX.XXXXXXXXXX",
"XXXXXXXX.XXXXXXXXXXX",
"XXXXXXX.XXXXXXXXXXXX",
"XXXXXX.XXXXXXXXXXXXX",
"XXXXX.XXXXXXXXXXXXXX",
"XXXX.XXXXXXXXXXXXXXX",
"XXX.XXXXXXXXXXXXXXXX",
"XX..XXXXXXXXXXXXXXXX",
"X..XXXXXXXXXXXXXXXXX",
"..XXXXXXXXXXXXXXXXXX"
" ..................",
". .................",
".. ................",
"... ...............",
".... ..............",
"..... .............",
"...... ............",
"....... ...........",
"........ ..........",
"......... .........",
".......... ........",
"........... ...... ",
"............ .... ",
"............. ... ",
".............. . ",
"............... ",
"................ ",
"............... ",
".............. ",
"............. ....."
};

49
lib/images/math/swarrow.xpm
View File

@ -1,29 +1,28 @@
/* XPM */
static char *a[] = {
static char *swarrow[] = {
/* columns rows colors chars-per-pixel */
"20 20 3 1",
" c #000000",
". c #000000",
"X c None",
"21 20 2 1",
" c black",
". c None",
/* pixels */
"XXXXX.XXXXXXXXXXXXXX",
"X....XXXXXXXXXXXXXXX",
"X..XXXXXXXXXXXXXXXXX",
"X.X.XXXXXXXXXXXXXXXX",
"X.XX.XXXXXXXXXXXXXXX",
"X.XXX.XXXXXXXXXXXXXX",
".XXXXX.XXXXXXXXXXXXX",
"XXXXXXX.XXXXXXXXXXXX",
"XXXXXXXX.XXXXXXXXXXX",
"XXXXXXXXX.XXXXXXXXXX",
"XXXXXXXXXX.XXXXXXXXX",
"XXXXXXXXXXX.XXXXXXXX",
"XXXXXXXXXXXX.XXXXXXX",
"XXXXXXXXXXXXX.XXXXXX",
"XXXXXXXXXXXXXX.XXXXX",
"XXXXXXXXXXXXXXX.XXXX",
"XXXXXXXXXXXXXXX..XXX",
"XXXXXXXXXXXXXXXX..XX",
"XXXXXXXXXXXXXXXXX..X",
"XXXXXXXXXXXXXXXXXX.."
"................... ",
".................. .",
"................. ..",
"................ ...",
"............... ....",
".............. .....",
"............. ......",
"............ .......",
"........... ........",
".......... .........",
"......... ..........",
"........ ...........",
" ...... ............",
" .... .............",
" .. ..............",
" . ...............",
" ................",
" .................",
" ...............",
" .............."
};

135
src/frontends/controllers/ControlMath.C
View File

@ -126,14 +126,20 @@ char const * latex_deco[] = {
int const nr_latex_deco = sizeof(latex_deco) / sizeof(char const *) - 1;
char const * latex_arrow[] = {
"downarrow", "leftarrow", "Downarrow", "Leftarrow",
"hookleftarrow", "rightarrow", "uparrow", "Rightarrow", "Uparrow",
"hookrightarrow", "updownarrow", "Leftrightarrow", "leftharpoonup",
"rightharpoonup", "rightleftharpoons", "leftrightarrow", "Updownarrow",
"leftharpoondown", "rightharpoondown", "mapsto",
"Longleftarrow", "Longrightarrow", "Longleftrightarrow",
"longleftrightarrow", "longleftarrow", "longrightarrow", "longmapsto",
"nwarrow", "nearrow", "swarrow", "searrow", "",
"leftarrow", "rightarrow",
"downarrow", "uparrow", "updownarrow", "leftrightarrow",
"Leftarrow", "Rightarrow",
"Downarrow", "Uparrow", "Updownarrow", "Leftrightarrow",
"Longleftrightarrow", "Longleftarrow", "Longrightarrow",
"longleftrightarrow", "longleftarrow", "longrightarrow",
"leftharpoondown", "rightharpoondown",
"mapsto", "longmapsto",
"nwarrow", "nearrow",
"leftharpoonup", "rightharpoonup",
"hookleftarrow", "hookrightarrow",
"swarrow", "searrow",
"rightleftharpoons",
"",
};
int const nr_latex_arrow = sizeof(latex_arrow) / sizeof(char const *);
@ -225,50 +231,95 @@ char const * latex_ams_misc[] = {
int const nr_latex_ams_misc = sizeof(latex_ams_misc) / sizeof(char const *);
char const * latex_ams_arrows[] = {
"dashrightarrow", "dashleftarrow", "leftleftarrows",
"leftrightarrows", "Lleftarrow", "twoheadleftarrow",
"leftarrowtail", "looparrowleft", "leftrightharpoons",
"curvearrowleft", "circlearrowleft", "Lsh",
"upuparrows", "upharpoonleft", "downharpoonleft",
"multimap", "leftrightsquigarrow", "rightrightarrows",
"rightleftarrows", "rightrightarrows", "rightleftarrows",
"twoheadrightarrow", "rightarrowtail", "looparrowright",
"rightleftharpoons", "curvearrowright", "circlearrowright",
"Rsh", "downdownarrows", "upharpoonright",
"downharpoonright", "rightsquigarrow",
"nleftarrow", "nrightarrow", "nLeftarrow",
"nRightarrow", "nleftrightarrow", "nLeftrightarrow", ""
"dashleftarrow", "dashrightarrow",
"leftleftarrows", "leftrightarrows",
"rightrightarrows", "rightleftarrows",
"Lleftarrow", "Rrightarrow",
"twoheadleftarrow", "twoheadrightarrow",
"leftarrowtail", "rightarrowtail",
"looparrowleft", "looparrowright",
"curvearrowleft", "curvearrowright",
"circlearrowleft", "circlearrowright",
"Lsh", "Rsh",
"upuparrows", "downdownarrows",
"upharpoonleft", "upharpoonright",
"downharpoonleft", "downharpoonright",
"leftrightharpoons", "rightleftharpoons",
"rightsquigarrow", "leftrightsquigarrow",
"nleftarrow", "nrightarrow", "nleftrightarrow",
"nLeftarrow", "nRightarrow", "nLeftrightarrow",
"multimap",
""
};
int const nr_latex_ams_arrows = sizeof(latex_ams_arrows) / sizeof(char const *);
char const * latex_ams_rel[] = {
"leqq", "leqslant", "eqslantless", "eqslantgtr", "gtrsim", "gtrapprox",
"lesssim", "lessapprox", "approxeq", "gtrdot", "ggg", "gtrless",
"lessdot", "lll", "lessgtr", "gtreqless", "gtreqqless", "eqcirc",
"lesseqgtr", "lesseqqgtr", "doteqdot", "circeq", "triangleq", "thicksim",
"risingdotseq", "fallingdotseq", "backsim", "thickapprox", "supseteqq", "Supset",
"backsimeq", "subseteqq", "Subset", "sqsupset", "succcurlyeq", "curlyeqsucc",
"sqsubset", "preccurlyeq", "curlyeqprec", "succsim", "succapprox", "vartriangleright",
"precsim", "precapprox", "vartriangleleft", "trianglerighteq", "Vdash", "shortmid",
"trianglelefteq", "vDash", "Vvdash", "shortparallel", "between", "pitchfork",
"smallsmile", "smallfrown", "bumpeq", "varpropto", "blacktriangleleft", "therefore",
"Bumpeq", "geqq", "geqslant", "backepsilon", "blacktriangleright", "because", ""
"leqq", "geqq",
"leqslant", "geqslant",
"eqslantless", "eqslantgtr",
"lesssim", "gtrsim",
"lessapprox", "gtrapprox",
"approxeq", "triangleq",
"lessdot", "gtrdot",
"lll", "ggg",
"lessgtr", "gtrless",
"lesseqgtr", "gtreqless",
"lesseqqgtr", "gtreqqless",
"eqcirc", "circeq",
"thicksim", "thickapprox",
"backsim", "backsimeq",
"subseteqq", "supseteqq",
"Subset", "Supset",
"sqsubset", "sqsupset",
"preccurlyeq", "succcurlyeq",
"curlyeqprec", "curlyeqsucc",
"precsim", "succsim",
"precapprox", "succapprox",
"vartriangleleft", "vartriangleright",
"trianglelefteq", "trianglerighteq",
"bumpeq", "Bumpeq",
"doteqdot", "risingdotseq", "fallingdotseq",
"vDash", "Vvdash", "Vdash",
"shortmid", "shortparallel",
"smallsmile", "smallfrown",
"blacktriangleleft", "blacktriangleright",
"because", "therefore",
"backepsilon",
"varpropto",
"between",
"pitchfork",
""
};
int const nr_latex_ams_rel = sizeof(latex_ams_rel) / sizeof(char const *);
char const * latex_ams_nrel[] = {
"nless", "nleq", "nleqslant", "ngeqslant", "ngeqq", "gneq",
"nleqq", "lneq", "lneqq", "gneqq", "gvertneqq", "gnsim",
"lvertneqq", "lnsim", "lnapprox", "gnapprox", "nsucc", "nsucceq",
"nprec", "npreceq", "precnsim","succnsim", "succnapprox", "ncong",
"precnapprox", "nsim", "nshortmid", "nshortparallel", "nparallel", "nvDash",
"nmid", "nvdash", "nvDash", "nVDash", "ntriangleright", "ntrianglerighteq",
"ntriangleleft", "ntrianglelefteq", "nsubseteq", "nsupseteq", "nsupseteqq", "supsetneq",
"subsetneq", "varsubsetneq", "subsetneqq", "varsupsetneq", "supsetneqq", "varsupsetneqq",
"varsubsetneqq", "ngtr", "ngeq", "", "", ""
"nless", "ngtr",
"nleq", "ngeq",
"nleqslant", "ngeqslant",
"nleqq", "ngeqq",
"lneq", "gneq",
"lneqq", "gneqq",
"lvertneqq", "gvertneqq",
"lnsim", "gnsim",
"lnapprox", "gnapprox",
"nprec", "nsucc",
"npreceq", "nsucceq",
"precnsim", "succnsim",
"precnapprox", "succnapprox",
"subsetneq", "supsetneq",
"subsetneqq", "supsetneqq",
"nsubseteq", "nsupseteq", "nsupseteqq",
"nvdash", "nvDash", "nVDash",
"varsubsetneq", "varsupsetneq",
"varsubsetneqq", "varsupsetneqq",
"ntriangleleft", "ntriangleright",
"ntrianglelefteq", "ntrianglerighteq",
"ncong", "nsim",
"nmid", "nshortmid",
"nparallel", "nshortparallel",
"", "", ""
};
int const nr_latex_ams_nrel = sizeof(latex_ams_nrel) / sizeof(char const *);

6
src/frontends/qt4/iconpalette.C
View File

@ -97,9 +97,9 @@ void FlowLayout::setGeometry(const QRect &rect)
QSize FlowLayout::sizeHint() const
{
int const ncols = 5;
int const rows = (itemList.size() - 1 )/ncols + 1;
int const cols = qMin(rows * itemList.size(), ncols);
// default to (max) 6 columns
int const cols = qMin(itemList.size(), 6);
int const rows = (itemList.size() - 1 )/6 + 1;
return QSize(cols * minimumSize().width() + 1,
rows * minimumSize().height() + 1);
}