Re: [patch] insetlisting/caption

[Jürgen Spitzmüller]

Bo Peng wrote:
> I can modify Jurgen's patch later today

Bo, please also include this patch (a bugfix and a semantic correction).

Jürgen

Index: src/frontends/qt4/QListings.cpp
===================================================================
--- src/frontends/qt4/QListings.cpp	(Revision 18312)
+++ src/frontends/qt4/QListings.cpp	(Arbeitskopie)
@@ -108,7 +108,7 @@
 	
 	bool left = numberLeftCB->checkState() == Qt::Checked;
 	bool right = numberRightCB->checkState() == Qt::Checked;
-	string step = fromqstr(numberStepLE->text());
+	string stepnumber = fromqstr(numberStepLE->text());
 	string numberfontsize = fromqstr(numberFontSizeCO->currentText());
 	string firstline = fromqstr(firstlineLE->text());
 	string lastline = fromqstr(lastlineLE->text());
@@ -147,6 +147,8 @@
 		par.addParam("firstline", firstline);
 	if (!lastline.empty())
 		par.addParam("lastline", lastline);
+	if (!stepnumber.empty())
+		par.addParam("stepnumber", stepnumber);
 	if (basicstyle != "")
 		par.addParam("basicstyle", basicstyle);
 	if (breakline)
@@ -172,7 +174,7 @@
 		if (!isOK) {
 			isOK = true;
 			// listingsTB->setTextColor("black");
-			listingsTB->setPlainText("Input listings parameters below. Enter ? for a list of parameters.");
+			listingsTB->setPlainText("Input listings parameters on the right. Enter ? for a list of parameters.");
 			okPB->setEnabled(true);
 		}
 	} catch (invalidParam & e) {
@@ -203,7 +205,7 @@
 	
 	bcview().setOK(dialog_->okPB);
 	bcview().setCancel(dialog_->closePB);
-	dialog_->listingsTB->setPlainText("Input listings parameters below. Enter ? for a list of parameters.");
+	dialog_->listingsTB->setPlainText("Input listings parameters on the right. Enter ? for a list of parameters.");
 
 	update_contents();
 }
@@ -257,7 +259,7 @@
 	dialog_->placementLE->setValidator(new QRegExpValidator(QRegExp("[tbph]*"), this));
 
 	//
-	dialog_->listingsTB->setPlainText("Input listings parameters below. Enter ? for a list of parameters.");
+	dialog_->listingsTB->setPlainText("Input listings parameters on the right. Enter ? for a list of parameters.");
 
 	// set values from param string
 	InsetListingsParams & params = controller().params();