townperson picker for town attitude range

src/dialogxml/dialogs/dialog.cpp

@@ -936,6 +936,7 @@ bool cDialog::addLabelFor(std::string key, std::string label, eLabelPos where, s
 	key += "-label";
 	rectangle labelRect = ctrl.getBounds();
 	// TODO I think these are completely wrong? But am afraid of changing it having unintended impacts.
+	// offset for labels on right side is absolutely not working right.
 	switch(where) {
 		case LABEL_LEFT:
 			labelRect.right = labelRect.left;

src/dialogxml/dialogs/pictchoice.cpp

@@ -93,19 +93,19 @@ void cPictChoice::fillPage(){
 	cLedGroup& group = dynamic_cast<cLedGroup&>(dlg["group"]);
 	group.setSelected(""); // unselect all LEDs, since the currently selected one may be on another page
 	for(size_t i = 0; i < per_page; i++){
+		int idx = page * per_page + i;
 		std::ostringstream sout;
 		sout << "led" << i + 1;
-		if(page * per_page + i >= picts.size())
+		if(idx >= picts.size() || picts[idx].first < 0)
 			dlg[sout.str()].hide();
 		else
 			dlg[sout.str()].show();
-		if(page * per_page + i == cur)
+		if(idx == cur)
 			group.setSelected(sout.str());
 		clear_sstr(sout);
 		sout << "pic" << i + 1;
 		cPict& pic = dynamic_cast<cPict&>(dlg[sout.str()]);
-		int idx = page * per_page + i;
-		if(idx < picts.size()){
+		if(idx < picts.size() && picts[idx].first >= 0){
 			pic.show();
 			if(labels.size() > idx){
 				// TODO clicking on the label text will not trigger the led/pict's click handler