LocationDialog.hpp   LocationDialog.hpp 
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.
*/ */
#ifndef _LOCATIONDIALOG_HPP_ #ifndef _LOCATIONDIALOG_HPP_
#define _LOCATIONDIALOG_HPP_ #define _LOCATIONDIALOG_HPP_
#include <QObject> #include <QObject>
#include "StelDialog.hpp" #include "StelDialog.hpp"
class Ui_locationDialogForm; class Ui_locationDialogForm;
class QModelIndex; class QModelIndex;
skipping to change at line 40 skipping to change at line 40
class LocationDialog : public StelDialog class LocationDialog : public StelDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
LocationDialog(); LocationDialog();
virtual ~LocationDialog(); virtual ~LocationDialog();
//! Notify that the application style changed //! Notify that the application style changed
void styleChanged(); void styleChanged();
public slots: public slots:
void languageChanged(); void retranslate();
protected: protected:
//! Initialize the dialog widgets and connect the signals/slots //! Initialize the dialog widgets and connect the signals/slots
virtual void createDialogContent(); virtual void createDialogContent();
Ui_locationDialogForm* ui; Ui_locationDialogForm* ui;
private: private:
//! Set the values of all the fields from a location info //! Set the values of all the fields from a location info
//! Also move the observer to this position //! Also move the observer to this position
void setFieldsFromLocation(const StelLocation& loc); void setFieldsFromLocation(const StelLocation& loc);
skipping to change at line 73 skipping to change at line 73
//! Update the map for the given location. //! Update the map for the given location.
void setMapForLocation(const StelLocation& loc); void setMapForLocation(const StelLocation& loc);
//! Populates the drop-down list of planets. //! Populates the drop-down list of planets.
//! The displayed names are localized in the current interface langu age. //! The displayed names are localized in the current interface langu age.
//! The original names are kept in the user data field of each QComb oBox //! The original names are kept in the user data field of each QComb oBox
//! item. //! item.
void populatePlanetList(); void populatePlanetList();
//! Populates the drop-down list of countries.
//! The displayed names are localized in the current interface langu
age.
//! The original names are kept in the user data field of each QComb
oBox
//! item.
void populateCountryList();
private slots: private slots:
//! Update the widget to make sure it is synchrone if the location i s changed programmatically //! Update the widget to make sure it is synchrone if the location i s changed programmatically
//! This function should be called repeatidly with e.g. a timer //! This function should be called repeatidly with e.g. a timer
void updateFromProgram(); void updateFromProgram();
//! Called when the map is clicked //! Called when the map is clicked
void setPositionFromMap(double longitude, double latitude); void setPositionFromMap(double longitude, double latitude);
//! Called when the user activates an item from the list //! Called when the user activates an item from the list
void listItemActivated(const QModelIndex&); void listItemActivated(const QModelIndex&);
 End of changes. 3 change blocks. 
2 lines changed or deleted 10 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/