TelescopeDialog.cpp   TelescopeDialog.cpp 
skipping to change at line 181 skipping to change at line 181
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;
QString rts2Url; QString rts2Url;
QString rts2Username; QString rts2Username;
QString rts2Password; QString rts2Password;
if(!telescopeManager->getTelescopeAtSlot(slotNumber, connect int rts2Refresh;
ionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, se if(!telescopeManager->getTelescopeAtSlot(slotNumber, connect
rverName, portSerial, rts2Url, rts2Username, rts2Password)) ionType, name, equinox, host, portTCP, delay, connectAtStartup, circles, se
rverName, portSerial, rts2Url, rts2Username, rts2Password, rts2Refresh))
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 254 skipping to change at line 255
QTimer* updateTimer = new QTimer(this); QTimer* updateTimer = new QTimer(this);
connect(updateTimer, SIGNAL(timeout()), this, SLOT(updateTelescopeSt ates())); connect(updateTimer, SIGNAL(timeout()), this, SLOT(updateTelescopeSt ates()));
updateTimer->start(200); updateTimer->start(200);
} }
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") + ":</ aboutPage += "<tr width=\"30%\"><td><strong>" + q_("Version") + ":</
strong></td><td>" + TELESCOPE_CONTROL_VERSION + "</td></tr>"; strong></td><td>" + TELESCOPE_CONTROL_PLUGIN_VERSION + "</td></tr>";
aboutPage += "<tr><td rowspan=4><strong>" + q_("Authors") + "</stron aboutPage += "<tr><td><strong>" + q_("License") + ":</strong></td><t
g></td><td>Johannes Gajdosik</td></td>"; d>" + TELESCOPE_CONTROL_PLUGIN_LICENSE + "</td></tr>";
aboutPage += "<tr><td rowspan=3><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> aboutPage += "<tr><td rowspan=2><strong>" + q_("Contributors") + ":<
</tr>"; /strong></td><td>Petr Kubánek (" + q_("RTS2 support") + ")</td></tr>";
aboutPage += "<tr><td>Alexander Wolf &lt;alex.v.wolf@gmail.com&gt;</
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>";
 End of changes. 3 change blocks. 
9 lines changed or deleted 14 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/