From: Jürgen Spitzmüller <spitz@lyx.org>
Date: Sun, 29 Nov 2009 17:15:22 +0000 (+0000)
Subject: * Include bibtex and makeindex logs to log file dialog.
X-Git-Tag: 2.0.0~4995
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f73e3b358edb2a1eb31ccc4b944d56f057a563f2;p=features.git

* Include bibtex and makeindex logs to log file dialog.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32230 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/frontends/qt4/GuiLog.cpp b/src/frontends/qt4/GuiLog.cpp
index 138aeeff21..320b977316 100644
--- a/src/frontends/qt4/GuiLog.cpp
+++ b/src/frontends/qt4/GuiLog.cpp
@@ -19,6 +19,7 @@
 #include "Lexer.h"
 
 #include "support/docstring.h"
+#include "support/FileName.h"
 #include "support/gettext.h"
 
 #include <QTextBrowser>
@@ -117,6 +118,8 @@ GuiLog::GuiLog(GuiView & lv)
 	connect(findPB, SIGNAL(clicked()), this, SLOT(find()));
 	// FIXME: find via returnPressed() does not work!
 	connect(findLE, SIGNAL(returnPressed()), this, SLOT(find()));
+	connect(logTypeCO, SIGNAL(activated(int)),
+		this, SLOT(typeChanged(int)));
 
 	bc().setPolicy(ButtonPolicy::OkCancelPolicy);
 
@@ -146,6 +149,25 @@ void GuiLog::updateContents()
 }
 
 
+void GuiLog::typeChanged(int i)
+{
+	string const type =
+		fromqstr(logTypeCO->itemData(i).toString());
+	string ext;
+	if (type == "latex")
+		ext = "log";
+	else if (type == "bibtex")
+		ext = "blg";
+	else if (type == "index")
+		ext = "ilg";
+
+	if (!ext.empty())
+		logfile_.changeExtension(ext);
+
+	updateContents();
+}
+
+
 void GuiLog::find()
 {
 	logTB->find(findLE->text());
@@ -194,19 +216,35 @@ bool GuiLog::initialiseParams(string const & data)
 		// Parsing of the data failed.
 		return false;
 
-	if (logtype == "latex")
+	logTypeCO->setEnabled(logtype == "latex");
+	logTypeCO->clear();
+	
+	FileName log(logfile);
+	
+	if (logtype == "latex") {
 		type_ = LatexLog;
+		logTypeCO->addItem(qt_("LaTeX"), toqstr(logtype));
+		FileName tmp = log;
+		tmp.changeExtension("blg");
+		if (tmp.exists())
+			logTypeCO->addItem(qt_("BibTeX"), QString("bibtex"));
+		tmp.changeExtension("ilg");
+		if (tmp.exists())
+			logTypeCO->addItem(qt_("Index"), QString("index"));
 	// FIXME: not sure "literate" still works.
-	else if (logtype == "literate")
+	} else if (logtype == "literate") {
 		type_ = LiterateLog;
-	else if (logtype == "lyx2lyx")
+		logTypeCO->addItem(qt_("Literate"), toqstr(logtype));
+	} else if (logtype == "lyx2lyx") {
 		type_ = Lyx2lyxLog;
-	else if (logtype == "vc")
+		logTypeCO->addItem(qt_("LyX2LyX"), toqstr(logtype));
+	} else if (logtype == "vc") {
 		type_ = VCLog;
-	else
+		logTypeCO->addItem(qt_("Version Control"), toqstr(logtype));
+	} else
 		return false;
 
-	logfile_ = FileName(logfile);
+	logfile_ = log;
 
 	updateContents();
 
@@ -256,7 +294,7 @@ void GuiLog::getContents(ostream & ss) const
 
 	switch (type_) {
 	case LatexLog:
-		ss << to_utf8(_("No LaTeX log file found."));
+		ss << to_utf8(_("Log file not found."));
 		break;
 	case LiterateLog:
 		ss << to_utf8(_("No literate programming build log file found."));
diff --git a/src/frontends/qt4/GuiLog.h b/src/frontends/qt4/GuiLog.h
index e8bdbb901b..2a9ebb6e7a 100644
--- a/src/frontends/qt4/GuiLog.h
+++ b/src/frontends/qt4/GuiLog.h
@@ -41,6 +41,8 @@ private Q_SLOTS:
 	void on_nextErrorPB_clicked();
 	/// jump to next warning
 	void on_nextWarningPB_clicked();
+	/// Log type changed
+	void typeChanged(int);
 
 private:
 	/// Apply changes
diff --git a/src/frontends/qt4/ui/LogUi.ui b/src/frontends/qt4/ui/LogUi.ui
index d26abb0080..ddf6ebcd39 100644
--- a/src/frontends/qt4/ui/LogUi.ui
+++ b/src/frontends/qt4/ui/LogUi.ui
@@ -6,7 +6,7 @@
     <x>0</x>
     <y>0</y>
     <width>421</width>
-    <height>441</height>
+    <height>474</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -22,14 +22,7 @@
    <property name="spacing" >
     <number>6</number>
    </property>
-   <item row="2" column="1" colspan="5" >
-    <widget class="QLineEdit" name="findLE" >
-     <property name="toolTip" >
-      <string>Hit Enter to search, or click Go!</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" >
+   <item row="3" column="0" >
     <widget class="QLabel" name="findLA" >
      <property name="text" >
       <string>&amp;Find:</string>
@@ -39,89 +32,122 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="0" colspan="7" >
-    <widget class="QTextBrowser" name="logTB" />
-   </item>
-   <item row="1" column="3" colspan="2" >
-    <widget class="QPushButton" name="nextErrorPB" >
+   <item row="3" column="1" colspan="5" >
+    <widget class="QLineEdit" name="findLE" >
      <property name="toolTip" >
-      <string>Jump to the next error message.</string>
+      <string>Hit Enter to search, or click Go!</string>
      </property>
+    </widget>
+   </item>
+   <item row="0" column="0" >
+    <widget class="QLabel" name="logTypeLA" >
      <property name="text" >
-      <string>Next &amp;Error</string>
+      <string>Log &amp;Type:</string>
+     </property>
+     <property name="buddy" >
+      <cstring>logTypeCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="5" colspan="2" >
-    <widget class="QPushButton" name="nextWarningPB" >
+   <item row="0" column="4" colspan="3" >
+    <spacer>
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" >
+      <size>
+       <width>161</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1" colspan="3" >
+    <widget class="QComboBox" name="logTypeCO" />
+   </item>
+   <item row="1" column="0" colspan="7" >
+    <widget class="QTextBrowser" name="logTB" />
+   </item>
+   <item row="4" column="4" colspan="2" >
+    <widget class="QPushButton" name="updatePB" >
      <property name="toolTip" >
-      <string>Jump to the next warning message.</string>
+      <string>Update the display</string>
      </property>
      <property name="text" >
-      <string>Next &amp;Warning</string>
+      <string>&amp;Update</string>
+     </property>
+     <property name="default" >
+      <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="2" column="6" >
-    <widget class="QPushButton" name="findPB" >
+   <item row="4" column="6" >
+    <widget class="QPushButton" name="closePB" >
      <property name="text" >
-      <string>&amp;Go!</string>
+      <string>&amp;Close</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="3" >
+   <item row="4" column="2" colspan="2" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
+     <property name="sizeType" >
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
      <property name="sizeHint" >
       <size>
-       <width>201</width>
-       <height>20</height>
+       <width>111</width>
+       <height>26</height>
       </size>
      </property>
     </spacer>
    </item>
-   <item row="3" column="0" colspan="2" >
+   <item row="4" column="0" colspan="2" >
     <widget class="QPushButton" name="copyPB" >
      <property name="text" >
       <string>Copy to Clip&amp;board</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="2" colspan="2" >
+   <item row="2" column="0" colspan="3" >
     <spacer>
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>
      </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
      <property name="sizeHint" >
       <size>
-       <width>111</width>
-       <height>26</height>
+       <width>201</width>
+       <height>20</height>
       </size>
      </property>
     </spacer>
    </item>
    <item row="3" column="6" >
-    <widget class="QPushButton" name="closePB" >
+    <widget class="QPushButton" name="findPB" >
      <property name="text" >
-      <string>&amp;Close</string>
+      <string>&amp;Go!</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="4" colspan="2" >
-    <widget class="QPushButton" name="updatePB" >
+   <item row="2" column="5" colspan="2" >
+    <widget class="QPushButton" name="nextWarningPB" >
      <property name="toolTip" >
-      <string>Update the display</string>
+      <string>Jump to the next warning message.</string>
      </property>
      <property name="text" >
-      <string>&amp;Update</string>
+      <string>Next &amp;Warning</string>
      </property>
-     <property name="default" >
-      <bool>true</bool>
+    </widget>
+   </item>
+   <item row="2" column="3" colspan="2" >
+    <widget class="QPushButton" name="nextErrorPB" >
+     <property name="toolTip" >
+      <string>Jump to the next error message.</string>
+     </property>
+     <property name="text" >
+      <string>Next &amp;Error</string>
      </property>
     </widget>
    </item>