TelescopeDialog.cpp   TelescopeDialog.cpp 
skipping to change at line 178 skipping to change at line 178
QString name; QString name;
ConnectionType connectionType; ConnectionType connectionType;
QString equinox; QString equinox;
QString host; QString host;
int portTCP; int portTCP;
int delay; int delay;
bool connectAtStartup; bool connectAtStartup;
QList<double> circles; QList<double> circles;
QString serverName; QString serverName;
QString portSerial; QString portSerial;
if(!telescopeManager->getTelescopeAtSlot(slotNumber, connect QString rts2Url;
ionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, se QString rts2Username;
rverName, portSerial)) QString rts2Password;
if(!telescopeManager->getTelescopeAtSlot(slotNumber, connect
ionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, se
rverName, portSerial, rts2Url, rts2Username, rts2Password))
continue; continue;
//Determine the server type //Determine the server type
telescopeType[slotNumber] = connectionType; telescopeType[slotNumber] = connectionType;
//Determine the telescope's status //Determine the telescope's status
if (telescopeManager->isConnectedClientAtSlot(slotNumber)) if (telescopeManager->isConnectedClientAtSlot(slotNumber))
{ {
telescopeStatus[slotNumber] = StatusConnected; telescopeStatus[slotNumber] = StatusConnected;
} }
skipping to change at line 255 skipping to change at line 258
void TelescopeDialog::setAboutText() void TelescopeDialog::setAboutText()
{ {
//TODO: Expand //TODO: Expand
QString aboutPage = "<html><head></head><body>"; QString aboutPage = "<html><head></head><body>";
aboutPage += "<h2>" + q_("Telescope Control plug-in") + "</h2><table width=\"90%\">"; aboutPage += "<h2>" + q_("Telescope Control plug-in") + "</h2><table width=\"90%\">";
aboutPage += "<tr width=\"30%\"><td><strong>" + q_("Version") + ":</ strong></td><td>" + TELESCOPE_CONTROL_VERSION + "</td></tr>"; aboutPage += "<tr width=\"30%\"><td><strong>" + q_("Version") + ":</ strong></td><td>" + TELESCOPE_CONTROL_VERSION + "</td></tr>";
aboutPage += "<tr><td rowspan=4><strong>" + q_("Authors") + "</stron g></td><td>Johannes Gajdosik</td></td>"; aboutPage += "<tr><td rowspan=4><strong>" + q_("Authors") + "</stron g></td><td>Johannes Gajdosik</td></td>";
aboutPage += "<tr><td>Michael Heinz</td></tr>"; aboutPage += "<tr><td>Michael Heinz</td></tr>";
aboutPage += "<tr><td>Bogdan Marinov &lt;bogdan.marinov84@gmail.com& gt; (" + q_("Plug-in and GUI programming") + ")</td></tr>"; aboutPage += "<tr><td>Bogdan Marinov &lt;bogdan.marinov84@gmail.com& gt; (" + q_("Plug-in and GUI programming") + ")</td></tr>";
aboutPage += "<tr><td>Petr Kubánek (" + q_("RTS2 support") + ")</td> </tr>";
aboutPage += "</table>"; aboutPage += "</table>";
aboutPage += "<p>" + q_("This plug-in is based on and reuses a lot o f code under the GNU General Public License:") + "</p><ul>"; aboutPage += "<p>" + q_("This plug-in is based on and reuses a lot o f code under the GNU General Public License:") + "</p><ul>";
aboutPage += "<li>" + q_("the Telescope, TelescopeDummy, TelescopeTc p and TelescopeMgr classes in Stellarium's code (the client side of Stellar ium's original telescope control feature);") + "</li>"; aboutPage += "<li>" + q_("the Telescope, TelescopeDummy, TelescopeTc p and TelescopeMgr classes in Stellarium's code (the client side of Stellar ium's original telescope control feature);") + "</li>";
aboutPage += "<li>" + q_("the telescope server core code (licensed u nder the LGPL)") + "</li>"; aboutPage += "<li>" + q_("the telescope server core code (licensed u nder the LGPL)") + "</li>";
aboutPage += "<li>" + q_("the TelescopeServerLx200 telescope server core code (originally licensed under the LGPL)"); aboutPage += "<li>" + q_("the TelescopeServerLx200 telescope server core code (originally licensed under the LGPL)");
aboutPage += "<br/>" + q_("Author of all of the above - the client, the server core, and the LX200 server, along with the Stellarium telescope control network protocol (over TCP/IP), is <b>Johannes Gajdosik</b>.") + "< /li>"; aboutPage += "<br/>" + q_("Author of all of the above - the client, the server core, and the LX200 server, along with the Stellarium telescope control network protocol (over TCP/IP), is <b>Johannes Gajdosik</b>.") + "< /li>";
aboutPage += "<li>" + q_("the TelescopeServerNexStar telescope serve r core code (originally licensed under the LGPL, based on TelescopeServerLx 200) by <b>Michael Heinz</b>.") + "</li></ul>"; aboutPage += "<li>" + q_("the TelescopeServerNexStar telescope serve r core code (originally licensed under the LGPL, based on TelescopeServerLx 200) by <b>Michael Heinz</b>.") + "</li></ul>";
aboutPage += "<h3>" + q_("Links") + "</h3>"; aboutPage += "<h3>" + q_("Links") + "</h3>";
skipping to change at line 504 skipping to change at line 508
typeLabel = N_("local, external"); typeLabel = N_("local, external");
break; break;
case ConnectionRemote: case ConnectionRemote:
// TRANSLATORS: Telescope connection type // TRANSLATORS: Telescope connection type
typeLabel = N_("remote, unknown"); typeLabel = N_("remote, unknown");
break; break;
case ConnectionVirtual: case ConnectionVirtual:
// TRANSLATORS: Telescope connection type // TRANSLATORS: Telescope connection type
typeLabel = N_("virtual"); typeLabel = N_("virtual");
break; break;
case ConnectionRTS2:
// TRANSLATORS: Telescope connection type
typeLabel = N_("RTS2");
break;
default: default:
; ;
} }
return typeLabel; return typeLabel;
} }
void TelescopeDialog::addModelRow(int number, void TelescopeDialog::addModelRow(int number,
ConnectionType type, ConnectionType type,
TelescopeStatus status, TelescopeStatus status,
const QString& name) const QString& name)
{ {
Q_ASSERT(telescopeListModel); Q_ASSERT(telescopeListModel);
QStandardItem* tempItem = 0; QStandardItem* tempItem = Q_NULLPTR;
int lastRow = telescopeListModel->rowCount(); int lastRow = telescopeListModel->rowCount();
// Number // Number
tempItem = new QStandardItem(QString::number(number)); tempItem = new QStandardItem(QString::number(number));
tempItem->setEditable(false); tempItem->setEditable(false);
telescopeListModel->setItem(lastRow, ColumnSlot, tempItem); telescopeListModel->setItem(lastRow, ColumnSlot, tempItem);
// Checkbox // Checkbox
//TODO: This is not updated, because it was commented out //TODO: This is not updated, because it was commented out
//tempItem = new QStandardItem; //tempItem = new QStandardItem;
//tempItem->setEditable(false); //tempItem->setEditable(false);
 End of changes. 4 change blocks. 
4 lines changed or deleted 12 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/