Author: spitz
Date: Tue Jan 4 12:50:35 2011
New Revision: 37105
URL: http://www.lyx.org/trac/changeset/37105
Log:
* InsetIndex does not have a dialog anymore since it's a collapsable. Also, it
is (and never was) an InsetCommand.
This also fixes the crash reported at #7180.
Modified:
lyx-devel/branches/BRANCH_1_6_X/src/LyXAction.cpp
lyx-devel/branches/BRANCH_1_6_X/src/LyXFunc.cpp
lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiView.cpp
lyx-devel/branches/BRANCH_1_6_X/status.16x
Modified: lyx-devel/branches/BRANCH_1_6_X/src/LyXAction.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/src/LyXAction.cpp Tue Jan 4 12:32:04
2011 (r37104)
+++ lyx-devel/branches/BRANCH_1_6_X/src/LyXAction.cpp Tue Jan 4 12:50:35
2011 (r37105)
@@ -2509,7 +2509,7 @@
* \li Syntax: dialog-show <NAME> [<DATA>]
* \li Params: <NAME>:
aboutlyx|bibitem|bibtex|box|branch|changes|character|citation|\n
document|errorlist|ert|external|file|findreplace|float|graphics|\n
-
include|index|info|nomenclature|label|log|mathdelimiter|mathmatrix|\n
+ include|info|nomenclature|label|log|mathdelimiter|mathmatrix|\n
note|paragraph|prefs|print|ref|sendto|space|spellchecker|symbols|\n
tabular|tabularcreate|thesaurus|texinfo|toc|href|view-source|vspace\n
wrap|listings|<SPECIAL> \n
Modified: lyx-devel/branches/BRANCH_1_6_X/src/LyXFunc.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/src/LyXFunc.cpp Tue Jan 4 12:32:04
2011 (r37104)
+++ lyx-devel/branches/BRANCH_1_6_X/src/LyXFunc.cpp Tue Jan 4 12:50:35
2011 (r37105)
@@ -1253,7 +1253,6 @@
switch (code) {
case BIBITEM_CODE:
case BIBTEX_CODE:
- case INDEX_CODE:
case LABEL_CODE:
case NOMENCL_CODE:
case REF_CODE:
Modified: lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiView.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiView.cpp Tue Jan
4 12:32:04 2011 (r37104)
+++ lyx-devel/branches/BRANCH_1_6_X/src/frontends/qt4/GuiView.cpp Tue Jan
4 12:50:35 2011 (r37105)
@@ -2436,7 +2436,7 @@
char const * const dialognames[] = {
"aboutlyx", "bibitem", "bibtex", "box", "branch", "changes", "character",
"citation", "document", "errorlist", "ert", "external", "file",
-"findreplace", "float", "graphics", "include", "index", "info",
"nomenclature", "label", "log",
+"findreplace", "float", "graphics", "include", "info", "nomenclature",
"label", "log",
"mathdelimiter", "mathmatrix", "mathspace", "note", "paragraph", "prefs",
"print",
"ref", "sendto", "space", "spellchecker", "symbols", "tabular",
"tabularcreate",
Modified: lyx-devel/branches/BRANCH_1_6_X/status.16x
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/status.16x Tue Jan 4 12:32:04 2011
(r37104)
+++ lyx-devel/branches/BRANCH_1_6_X/status.16x Tue Jan 4 12:50:35 2011
(r37105)
@@ -87,6 +87,10 @@
- Fix crash when inserting quotes with a selection spanning multiple
paragraphs (bug 7200).
+
+- Remove traces of long removed index settings dialog. This fixes a crash
+ when issueing the non-functional lfuns "dialog-show index" and
+ "dialog-show-new-inset index" (bug 7180).
- Correctly save the settings of UI components. They could disappear
when starting LyX with a modified default.ui file and changing the
