StelMainWindow.cpp   StelMainWindow.cpp 
skipping to change at line 17 skipping to change at line 17
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, U SA. * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA.
*/ */
#include "StelMainWindow.hpp" #include "StelMainWindow.hpp"
#include <stdexcept> #include <stdexcept>
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelMainGraphicsView.hpp" #include "StelMainGraphicsView.hpp"
#include "StelFileMgr.hpp" #include "StelFileMgr.hpp"
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelTranslator.hpp" #include "StelTranslator.hpp"
skipping to change at line 89 skipping to change at line 89
// Update the translated title // Update the translated title
void StelMainWindow::initTitleI18n() void StelMainWindow::initTitleI18n()
{ {
QString appNameI18n = q_("Stellarium %1").arg(StelUtils::getApplicat ionVersion()); QString appNameI18n = q_("Stellarium %1").arg(StelUtils::getApplicat ionVersion());
setWindowTitle(appNameI18n); setWindowTitle(appNameI18n);
} }
void StelMainWindow::init(QSettings* conf) void StelMainWindow::init(QSettings* conf)
{ {
resize(conf->value("video/screen_w", 800).toInt(), conf->value("vide int width = conf->value("video/screen_w", 800).toInt();
o/screen_h", 600).toInt()); int height = conf->value("video/screen_h", 600).toInt();
resize(width, height);
if (conf->value("video/fullscreen", true).toBool()) if (conf->value("video/fullscreen", true).toBool())
{ {
setFullScreen(true); setFullScreen(true);
} }
else else
{ {
setFullScreen(false); setFullScreen(false);
int x = conf->value("video/screen_x", 0).toInt();
int y = conf->value("video/screen_y", 0).toInt();
move(x, y);
} }
show(); show();
// Process the event to make the window visible and create the openG L context. // Process the event to make the window visible and create the openG L context.
QCoreApplication::processEvents(); QCoreApplication::processEvents();
mainGraphicsView->init(conf); mainGraphicsView->init(conf);
} }
void StelMainWindow::deinit() void StelMainWindow::deinit()
{ {
mainGraphicsView->deinitGL(); mainGraphicsView->deinitGL();
 End of changes. 3 change blocks. 
3 lines changed or deleted 7 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/