Merge lp:~daggerstab/stellarium/custom-object-info-gui into lp:stellarium
- custom-object-info-gui
- Merge into trunk
Proposed by
Bogdan Marinov
Status: | Merged |
---|---|
Merged at revision: | 5450 |
Proposed branch: | lp:~daggerstab/stellarium/custom-object-info-gui |
Merge into: | lp:stellarium |
Diff against target: |
1753 lines (+477/-963) 12 files modified
src/CMakeLists.txt (+0/-4) src/core/StelObject.hpp (+9/-3) src/core/StelObjectMgr.cpp (+0/-154) src/core/StelObjectMgr.hpp (+0/-2) src/gui/ConfigurationDialog.cpp (+100/-40) src/gui/ConfigurationDialog.hpp (+8/-8) src/gui/CustomInfoDialog.cpp (+0/-249) src/gui/CustomInfoDialog.hpp (+0/-96) src/gui/CustomInfoDialog.ui (+0/-286) src/gui/SkyGui.cpp (+30/-1) src/gui/SkyGui.hpp (+2/-0) src/gui/configurationDialog.ui (+328/-120) |
To merge this branch: | bzr merge lp:~daggerstab/stellarium/custom-object-info-gui |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexander Wolf | Approve | ||
Review via email: mp+115778@code.launchpad.net |
Commit message
Description of the change
I've rewritten the feature allowing customization of the information displayed for a selected object that was introduced before the previous release.
Now instead of a separate window it's a tab in the Configuration window.It also works in a different manner than the original feature, though I've kept the same keys in the configuration file.
A possible modification is moving it to the Sky and viewing options window.
I the changes are approved, I'd like to merge them in the trunk myself.
To post a comment you must log in.
Revision history for this message
Alexander Wolf (alexwolf) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'src/CMakeLists.txt' | |||
2 | --- src/CMakeLists.txt 2012-06-14 03:22:36 +0000 | |||
3 | +++ src/CMakeLists.txt 2012-07-19 16:10:25 +0000 | |||
4 | @@ -415,8 +415,6 @@ | |||
5 | 415 | gui/AddRemoveLandscapesDialog.cpp | 415 | gui/AddRemoveLandscapesDialog.cpp |
6 | 416 | gui/AtmosphereDialog.hpp | 416 | gui/AtmosphereDialog.hpp |
7 | 417 | gui/AtmosphereDialog.cpp | 417 | gui/AtmosphereDialog.cpp |
8 | 418 | gui/CustomInfoDialog.hpp | ||
9 | 419 | gui/CustomInfoDialog.cpp | ||
10 | 420 | gui/StelDialog.hpp | 418 | gui/StelDialog.hpp |
11 | 421 | gui/StelDialog.cpp) | 419 | gui/StelDialog.cpp) |
12 | 422 | 420 | ||
13 | @@ -436,7 +434,6 @@ | |||
14 | 436 | gui/ConfigurationDialog.hpp | 434 | gui/ConfigurationDialog.hpp |
15 | 437 | gui/AddRemoveLandscapesDialog.hpp | 435 | gui/AddRemoveLandscapesDialog.hpp |
16 | 438 | gui/AtmosphereDialog.hpp | 436 | gui/AtmosphereDialog.hpp |
17 | 439 | gui/CustomInfoDialog.hpp | ||
18 | 440 | gui/StelDialog.hpp) | 437 | gui/StelDialog.hpp) |
19 | 441 | 438 | ||
20 | 442 | ################# compiles .ui files ############ | 439 | ################# compiles .ui files ############ |
21 | @@ -448,7 +445,6 @@ | |||
22 | 448 | gui/searchDialogGui.ui | 445 | gui/searchDialogGui.ui |
23 | 449 | gui/configurationDialog.ui | 446 | gui/configurationDialog.ui |
24 | 450 | gui/AtmosphereDialog.ui | 447 | gui/AtmosphereDialog.ui |
25 | 451 | gui/CustomInfoDialog.ui | ||
26 | 452 | gui/addRemoveLandscapesDialog.ui) | 448 | gui/addRemoveLandscapesDialog.ui) |
27 | 453 | 449 | ||
28 | 454 | IF(ENABLE_SCRIPT_CONSOLE) | 450 | IF(ENABLE_SCRIPT_CONSOLE) |
29 | 455 | 451 | ||
30 | === modified file 'src/core/StelObject.hpp' | |||
31 | --- src/core/StelObject.hpp 2012-04-13 16:42:43 +0000 | |||
32 | +++ src/core/StelObject.hpp 2012-07-19 16:10:25 +0000 | |||
33 | @@ -20,6 +20,7 @@ | |||
34 | 20 | #ifndef _STELOBJECT_HPP_ | 20 | #ifndef _STELOBJECT_HPP_ |
35 | 21 | #define _STELOBJECT_HPP_ | 21 | #define _STELOBJECT_HPP_ |
36 | 22 | 22 | ||
37 | 23 | #include <QFlags> | ||
38 | 23 | #include <QString> | 24 | #include <QString> |
39 | 24 | #include "VecMath.hpp" | 25 | #include "VecMath.hpp" |
40 | 25 | #include "StelObjectType.hpp" | 26 | #include "StelObjectType.hpp" |
41 | @@ -38,7 +39,8 @@ | |||
42 | 38 | //! filter results of getInfoString. The precise definition of these should | 39 | //! filter results of getInfoString. The precise definition of these should |
43 | 39 | //! be documented in the getInfoString documentation for the derived classes | 40 | //! be documented in the getInfoString documentation for the derived classes |
44 | 40 | //! for all specifiers which are defined in that derivative. | 41 | //! for all specifiers which are defined in that derivative. |
46 | 41 | enum InfoStringGroup | 42 | //! Use InfoStringGroup instead. |
47 | 43 | enum InfoStringGroupFlags | ||
48 | 42 | { | 44 | { |
49 | 43 | Name = 0x00000001, //!< An object's name | 45 | Name = 0x00000001, //!< An object's name |
50 | 44 | CatalogNumber = 0x00000002, //!< Catalog numbers | 46 | CatalogNumber = 0x00000002, //!< Catalog numbers |
51 | @@ -55,11 +57,13 @@ | |||
52 | 55 | HourAngle = 0x00001000, //!< The hour angle + DE (of date) | 57 | HourAngle = 0x00001000, //!< The hour angle + DE (of date) |
53 | 56 | AbsoluteMagnitude = 0x00002000 //!< The absolute magnitude | 58 | AbsoluteMagnitude = 0x00002000 //!< The absolute magnitude |
54 | 57 | }; | 59 | }; |
55 | 60 | typedef QFlags<InfoStringGroupFlags> InfoStringGroup; | ||
56 | 61 | Q_FLAGS(InfoStringGroup) | ||
57 | 58 | 62 | ||
58 | 59 | //! A pre-defined set of specifiers for the getInfoString flags argument to getInfoString | 63 | //! A pre-defined set of specifiers for the getInfoString flags argument to getInfoString |
60 | 60 | static const InfoStringGroup AllInfo = (InfoStringGroup)(Name|CatalogNumber|Magnitude|RaDecJ2000|RaDecOfDate|AltAzi|Distance|Size|Extra1|Extra2|Extra3|HourAngle|AbsoluteMagnitude); | 64 | static const InfoStringGroupFlags AllInfo = (InfoStringGroupFlags)(Name|CatalogNumber|Magnitude|RaDecJ2000|RaDecOfDate|AltAzi|Distance|Size|Extra1|Extra2|Extra3|HourAngle|AbsoluteMagnitude); |
61 | 61 | //! A pre-defined set of specifiers for the getInfoString flags argument to getInfoString | 65 | //! A pre-defined set of specifiers for the getInfoString flags argument to getInfoString |
63 | 62 | static const InfoStringGroup ShortInfo = (InfoStringGroup)(Name|CatalogNumber|Magnitude|RaDecJ2000); | 66 | static const InfoStringGroupFlags ShortInfo = (InfoStringGroupFlags)(Name|CatalogNumber|Magnitude|RaDecJ2000); |
64 | 63 | 67 | ||
65 | 64 | virtual ~StelObject() {} | 68 | virtual ~StelObject() {} |
66 | 65 | 69 | ||
67 | @@ -148,4 +152,6 @@ | |||
68 | 148 | void postProcessInfoString(QString& str, const InfoStringGroup& flags) const; | 152 | void postProcessInfoString(QString& str, const InfoStringGroup& flags) const; |
69 | 149 | }; | 153 | }; |
70 | 150 | 154 | ||
71 | 155 | Q_DECLARE_OPERATORS_FOR_FLAGS(StelObject::InfoStringGroup) | ||
72 | 156 | |||
73 | 151 | #endif // _STELOBJECT_HPP_ | 157 | #endif // _STELOBJECT_HPP_ |
74 | 152 | 158 | ||
75 | === modified file 'src/core/StelObjectMgr.cpp' | |||
76 | --- src/core/StelObjectMgr.cpp 2012-04-13 16:50:19 +0000 | |||
77 | +++ src/core/StelObjectMgr.cpp 2012-07-19 16:10:25 +0000 | |||
78 | @@ -32,7 +32,6 @@ | |||
79 | 32 | #include <QString> | 32 | #include <QString> |
80 | 33 | #include <QDebug> | 33 | #include <QDebug> |
81 | 34 | #include <QStringList> | 34 | #include <QStringList> |
82 | 35 | #include <QSettings> | ||
83 | 36 | 35 | ||
84 | 37 | StelObjectMgr::StelObjectMgr() : searchRadiusPixel(30.f), distanceWeight(1.f) | 36 | StelObjectMgr::StelObjectMgr() : searchRadiusPixel(30.f), distanceWeight(1.f) |
85 | 38 | { | 37 | { |
86 | @@ -245,156 +244,3 @@ | |||
87 | 245 | result.sort(); | 244 | result.sort(); |
88 | 246 | return result; | 245 | return result; |
89 | 247 | } | 246 | } |
90 | 248 | |||
91 | 249 | int StelObjectMgr::getCustomInfoString(void) | ||
92 | 250 | { | ||
93 | 251 | QSettings* conf = StelApp::getInstance().getSettings(); | ||
94 | 252 | |||
95 | 253 | bool Name = conf->value("custom_selected_info/flag_show_name", false).toBool(); | ||
96 | 254 | bool CatalogNumber = conf->value("custom_selected_info/flag_show_catalognumber", false).toBool(); | ||
97 | 255 | bool Magnitude = conf->value("custom_selected_info/flag_show_magnitude", false).toBool(); | ||
98 | 256 | bool RaDecJ2000 = conf->value("custom_selected_info/flag_show_radecj2000", false).toBool(); | ||
99 | 257 | bool RaDecOfDate = conf->value("custom_selected_info/flag_show_radecofdate", false).toBool(); | ||
100 | 258 | bool AltAz = conf->value("custom_selected_info/flag_show_altaz", false).toBool(); | ||
101 | 259 | bool Distance = conf->value("custom_selected_info/flag_show_distance", false).toBool(); | ||
102 | 260 | bool Size = conf->value("custom_selected_info/flag_show_size", false).toBool(); | ||
103 | 261 | bool Extra1 = conf->value("custom_selected_info/flag_show_extra1", false).toBool(); | ||
104 | 262 | bool Extra2 = conf->value("custom_selected_info/flag_show_extra2", false).toBool(); | ||
105 | 263 | bool Extra3 = conf->value("custom_selected_info/flag_show_extra3", false).toBool(); | ||
106 | 264 | bool HourAngle = conf->value("custom_selected_info/flag_show_hourangle", false).toBool(); | ||
107 | 265 | bool AbsoluteMagnitude = conf->value("custom_selected_info/flag_show_absolutemagnitude", false).toBool(); | ||
108 | 266 | |||
109 | 267 | int OctZero = 0x00000000; | ||
110 | 268 | |||
111 | 269 | int NameOct; | ||
112 | 270 | if (Name) | ||
113 | 271 | { | ||
114 | 272 | NameOct = StelObject::Name; | ||
115 | 273 | } | ||
116 | 274 | else | ||
117 | 275 | { | ||
118 | 276 | NameOct = OctZero; | ||
119 | 277 | } | ||
120 | 278 | |||
121 | 279 | int CatalogNumberOct; | ||
122 | 280 | if (CatalogNumber) | ||
123 | 281 | { | ||
124 | 282 | CatalogNumberOct = StelObject::CatalogNumber; | ||
125 | 283 | } | ||
126 | 284 | else | ||
127 | 285 | { | ||
128 | 286 | CatalogNumberOct = OctZero; | ||
129 | 287 | } | ||
130 | 288 | |||
131 | 289 | int MagnitudeOct; | ||
132 | 290 | if (Magnitude) | ||
133 | 291 | { | ||
134 | 292 | MagnitudeOct = StelObject::Magnitude; | ||
135 | 293 | } | ||
136 | 294 | else | ||
137 | 295 | { | ||
138 | 296 | MagnitudeOct = OctZero; | ||
139 | 297 | } | ||
140 | 298 | |||
141 | 299 | int RaDecJ2000Oct; | ||
142 | 300 | if (RaDecJ2000) | ||
143 | 301 | { | ||
144 | 302 | RaDecJ2000Oct = StelObject::RaDecJ2000; | ||
145 | 303 | } | ||
146 | 304 | else | ||
147 | 305 | { | ||
148 | 306 | RaDecJ2000Oct = OctZero; | ||
149 | 307 | } | ||
150 | 308 | |||
151 | 309 | int RaDecOfDateOct; | ||
152 | 310 | if (RaDecOfDate) | ||
153 | 311 | { | ||
154 | 312 | RaDecOfDateOct = StelObject::RaDecOfDate; | ||
155 | 313 | } | ||
156 | 314 | else | ||
157 | 315 | { | ||
158 | 316 | RaDecOfDateOct = OctZero; | ||
159 | 317 | } | ||
160 | 318 | |||
161 | 319 | int AltAzOct; | ||
162 | 320 | if (AltAz) | ||
163 | 321 | { | ||
164 | 322 | AltAzOct = StelObject::AltAzi; | ||
165 | 323 | } | ||
166 | 324 | else | ||
167 | 325 | { | ||
168 | 326 | AltAzOct = OctZero; | ||
169 | 327 | } | ||
170 | 328 | |||
171 | 329 | int DistanceOct; | ||
172 | 330 | if (Distance) | ||
173 | 331 | { | ||
174 | 332 | DistanceOct = StelObject::Distance; | ||
175 | 333 | } | ||
176 | 334 | else | ||
177 | 335 | { | ||
178 | 336 | DistanceOct = OctZero; | ||
179 | 337 | } | ||
180 | 338 | |||
181 | 339 | int SizeOct; | ||
182 | 340 | if (Size) | ||
183 | 341 | { | ||
184 | 342 | SizeOct = StelObject::Size; | ||
185 | 343 | } | ||
186 | 344 | else | ||
187 | 345 | { | ||
188 | 346 | SizeOct = OctZero; | ||
189 | 347 | } | ||
190 | 348 | |||
191 | 349 | int Extra1Oct; | ||
192 | 350 | if (Extra1) | ||
193 | 351 | { | ||
194 | 352 | Extra1Oct = StelObject::Extra1; | ||
195 | 353 | } | ||
196 | 354 | else | ||
197 | 355 | { | ||
198 | 356 | Extra1Oct = OctZero; | ||
199 | 357 | } | ||
200 | 358 | |||
201 | 359 | int Extra2Oct; | ||
202 | 360 | if (Extra2) | ||
203 | 361 | { | ||
204 | 362 | Extra2Oct = StelObject::Extra2; | ||
205 | 363 | } | ||
206 | 364 | else | ||
207 | 365 | { | ||
208 | 366 | Extra2Oct = OctZero; | ||
209 | 367 | } | ||
210 | 368 | |||
211 | 369 | int Extra3Oct; | ||
212 | 370 | if (Extra3) | ||
213 | 371 | { | ||
214 | 372 | Extra3Oct = StelObject::Extra3; | ||
215 | 373 | } | ||
216 | 374 | else | ||
217 | 375 | { | ||
218 | 376 | Extra3Oct = OctZero; | ||
219 | 377 | } | ||
220 | 378 | |||
221 | 379 | int HourAngleOct; | ||
222 | 380 | if (HourAngle) | ||
223 | 381 | { | ||
224 | 382 | HourAngleOct = StelObject::HourAngle; | ||
225 | 383 | } | ||
226 | 384 | else | ||
227 | 385 | { | ||
228 | 386 | HourAngleOct = OctZero; | ||
229 | 387 | } | ||
230 | 388 | |||
231 | 389 | int AbsoluteMagnitudeOct; | ||
232 | 390 | if (AbsoluteMagnitude) | ||
233 | 391 | { | ||
234 | 392 | AbsoluteMagnitudeOct = StelObject::AbsoluteMagnitude; | ||
235 | 393 | } | ||
236 | 394 | else | ||
237 | 395 | { | ||
238 | 396 | AbsoluteMagnitudeOct = OctZero; | ||
239 | 397 | } | ||
240 | 398 | |||
241 | 399 | return (NameOct|CatalogNumberOct|MagnitudeOct|RaDecJ2000Oct|RaDecOfDateOct|AltAzOct|DistanceOct|SizeOct|Extra1Oct|Extra2Oct|Extra3Oct|HourAngleOct|AbsoluteMagnitudeOct); | ||
242 | 400 | } | ||
243 | 401 | 247 | ||
244 | === modified file 'src/core/StelObjectMgr.hpp' | |||
245 | --- src/core/StelObjectMgr.hpp 2012-04-13 16:42:43 +0000 | |||
246 | +++ src/core/StelObjectMgr.hpp 2012-07-19 16:10:25 +0000 | |||
247 | @@ -126,8 +126,6 @@ | |||
248 | 126 | //! Default to 1. | 126 | //! Default to 1. |
249 | 127 | void setDistanceWeight(float newDistanceWeight) {distanceWeight=newDistanceWeight;} | 127 | void setDistanceWeight(float newDistanceWeight) {distanceWeight=newDistanceWeight;} |
250 | 128 | 128 | ||
251 | 129 | int getCustomInfoString(void); | ||
252 | 130 | |||
253 | 131 | signals: | 129 | signals: |
254 | 132 | //! Indicate that the selected StelObjects has changed. | 130 | //! Indicate that the selected StelObjects has changed. |
255 | 133 | //! @param action define if the user requested that the objects are added to the selection or just replace it | 131 | //! @param action define if the user requested that the objects are added to the selection or just replace it |
256 | 134 | 132 | ||
257 | === modified file 'src/gui/ConfigurationDialog.cpp' | |||
258 | --- src/gui/ConfigurationDialog.cpp 2012-06-29 14:07:11 +0000 | |||
259 | +++ src/gui/ConfigurationDialog.cpp 2012-07-19 16:10:25 +0000 | |||
260 | @@ -2,6 +2,7 @@ | |||
261 | 2 | * Stellarium | 2 | * Stellarium |
262 | 3 | * Copyright (C) 2008 Fabien Chereau | 3 | * Copyright (C) 2008 Fabien Chereau |
263 | 4 | * Copyright (C) 2012 Timothy Reaves | 4 | * Copyright (C) 2012 Timothy Reaves |
264 | 5 | * Copyright (C) 2012 Bogdan Marinov | ||
265 | 5 | * | 6 | * |
266 | 6 | * This program is free software; you can redistribute it and/or | 7 | * This program is free software; you can redistribute it and/or |
267 | 7 | * modify it under the terms of the GNU General Public License | 8 | * modify it under the terms of the GNU General Public License |
268 | @@ -20,7 +21,6 @@ | |||
269 | 20 | 21 | ||
270 | 21 | #include "Dialog.hpp" | 22 | #include "Dialog.hpp" |
271 | 22 | #include "ConfigurationDialog.hpp" | 23 | #include "ConfigurationDialog.hpp" |
272 | 23 | #include "CustomInfoDialog.hpp" | ||
273 | 24 | #include "StelMainGraphicsView.hpp" | 24 | #include "StelMainGraphicsView.hpp" |
274 | 25 | #include "StelMainWindow.hpp" | 25 | #include "StelMainWindow.hpp" |
275 | 26 | #include "ui_configurationDialog.h" | 26 | #include "ui_configurationDialog.h" |
276 | @@ -64,7 +64,6 @@ | |||
277 | 64 | ConfigurationDialog::ConfigurationDialog(StelGui* agui) : StelDialog(agui), starCatalogDownloadReply(NULL), currentDownloadFile(NULL), progressBar(NULL), gui(agui) | 64 | ConfigurationDialog::ConfigurationDialog(StelGui* agui) : StelDialog(agui), starCatalogDownloadReply(NULL), currentDownloadFile(NULL), progressBar(NULL), gui(agui) |
278 | 65 | { | 65 | { |
279 | 66 | ui = new Ui_configurationDialogForm; | 66 | ui = new Ui_configurationDialogForm; |
280 | 67 | customInfoDialog = NULL; | ||
281 | 68 | hasDownloadedStarCatalog = false; | 67 | hasDownloadedStarCatalog = false; |
282 | 69 | isDownloadingStarCatalog = false; | 68 | isDownloadingStarCatalog = false; |
283 | 70 | savedProjectionType = StelApp::getInstance().getCore()->getCurrentProjectionType(); | 69 | savedProjectionType = StelApp::getInstance().getCore()->getCurrentProjectionType(); |
284 | @@ -73,9 +72,7 @@ | |||
285 | 73 | ConfigurationDialog::~ConfigurationDialog() | 72 | ConfigurationDialog::~ConfigurationDialog() |
286 | 74 | { | 73 | { |
287 | 75 | delete ui; | 74 | delete ui; |
291 | 76 | ui=NULL; | 75 | ui = 0; |
289 | 77 | delete customInfoDialog; | ||
290 | 78 | customInfoDialog = NULL; | ||
292 | 79 | } | 76 | } |
293 | 80 | 77 | ||
294 | 81 | void ConfigurationDialog::retranslate() | 78 | void ConfigurationDialog::retranslate() |
295 | @@ -150,34 +147,30 @@ | |||
296 | 150 | resetStarCatalogControls(); | 147 | resetStarCatalogControls(); |
297 | 151 | 148 | ||
298 | 152 | // Selected object info | 149 | // Selected object info |
300 | 153 | if (gui->getInfoTextFilters() == (StelObject::InfoStringGroup)0) | 150 | if (gui->getInfoTextFilters() == StelObject::InfoStringGroup(0)) |
301 | 154 | { | 151 | { |
302 | 155 | ui->noSelectedInfoRadio->setChecked(true); | 152 | ui->noSelectedInfoRadio->setChecked(true); |
303 | 156 | ui->pushButtonCustomInfoDialog->setEnabled(false); | ||
304 | 157 | } | 153 | } |
306 | 158 | else if (gui->getInfoTextFilters() == StelObject::InfoStringGroup(StelObject::ShortInfo)) | 154 | else if (gui->getInfoTextFilters() == StelObject::ShortInfo) |
307 | 159 | { | 155 | { |
308 | 160 | ui->briefSelectedInfoRadio->setChecked(true); | 156 | ui->briefSelectedInfoRadio->setChecked(true); |
309 | 161 | ui->pushButtonCustomInfoDialog->setEnabled(false); | ||
310 | 162 | } | 157 | } |
312 | 163 | else if (gui->getInfoTextFilters() == StelObject::InfoStringGroup(StelObject::AllInfo)) | 158 | else if (gui->getInfoTextFilters() == StelObject::AllInfo) |
313 | 164 | { | 159 | { |
314 | 165 | ui->allSelectedInfoRadio->setChecked(true); | 160 | ui->allSelectedInfoRadio->setChecked(true); |
315 | 166 | ui->pushButtonCustomInfoDialog->setEnabled(false); | ||
316 | 167 | } | 161 | } |
317 | 168 | else | 162 | else |
318 | 169 | { | 163 | { |
319 | 170 | ui->customSelectedInfoRadio->setChecked(true); | 164 | ui->customSelectedInfoRadio->setChecked(true); |
320 | 171 | ui->pushButtonCustomInfoDialog->setEnabled(true); | ||
321 | 172 | } | 165 | } |
323 | 173 | 166 | updateSelectedInfoCheckBoxes(); | |
324 | 167 | |||
325 | 174 | connect(ui->noSelectedInfoRadio, SIGNAL(released()), this, SLOT(setNoSelectedInfo())); | 168 | connect(ui->noSelectedInfoRadio, SIGNAL(released()), this, SLOT(setNoSelectedInfo())); |
326 | 175 | connect(ui->allSelectedInfoRadio, SIGNAL(released()), this, SLOT(setAllSelectedInfo())); | 169 | connect(ui->allSelectedInfoRadio, SIGNAL(released()), this, SLOT(setAllSelectedInfo())); |
327 | 176 | connect(ui->briefSelectedInfoRadio, SIGNAL(released()), this, SLOT(setBriefSelectedInfo())); | 170 | connect(ui->briefSelectedInfoRadio, SIGNAL(released()), this, SLOT(setBriefSelectedInfo())); |
332 | 177 | connect(ui->customSelectedInfoRadio, SIGNAL(released()), this, SLOT(setCustomSelectedInfo())); | 171 | connect(ui->buttonGroupDisplayedFields, SIGNAL(buttonClicked(int)), |
333 | 178 | 172 | this, SLOT(setSelectedInfoFromCheckBoxes())); | |
334 | 179 | connect(ui->pushButtonCustomInfoDialog, SIGNAL(clicked()), this, SLOT(showCustomInfoDialog())); | 173 | |
331 | 180 | |||
335 | 181 | // Navigation tab | 174 | // Navigation tab |
336 | 182 | // Startup time | 175 | // Startup time |
337 | 183 | if (core->getStartupTimeMode()=="actual") | 176 | if (core->getStartupTimeMode()=="actual") |
338 | @@ -262,8 +255,6 @@ | |||
339 | 262 | connect(ui->pluginConfigureButton, SIGNAL(clicked()), this, SLOT(pluginConfigureCurrentSelection())); | 255 | connect(ui->pluginConfigureButton, SIGNAL(clicked()), this, SLOT(pluginConfigureCurrentSelection())); |
340 | 263 | populatePluginsList(); | 256 | populatePluginsList(); |
341 | 264 | 257 | ||
342 | 265 | |||
343 | 266 | connect(ui->stackListWidget, SIGNAL(currentItemChanged(QListWidgetItem *, QListWidgetItem *)), this, SLOT(changePage(QListWidgetItem *, QListWidgetItem*))); | ||
344 | 267 | updateConfigLabels(); | 258 | updateConfigLabels(); |
345 | 268 | } | 259 | } |
346 | 269 | 260 | ||
347 | @@ -315,25 +306,58 @@ | |||
348 | 315 | void ConfigurationDialog::setNoSelectedInfo(void) | 306 | void ConfigurationDialog::setNoSelectedInfo(void) |
349 | 316 | { | 307 | { |
350 | 317 | gui->setInfoTextFilters(StelObject::InfoStringGroup(0)); | 308 | gui->setInfoTextFilters(StelObject::InfoStringGroup(0)); |
352 | 318 | ui->pushButtonCustomInfoDialog->setEnabled(false); | 309 | updateSelectedInfoCheckBoxes(); |
353 | 319 | } | 310 | } |
354 | 320 | 311 | ||
355 | 321 | void ConfigurationDialog::setAllSelectedInfo(void) | 312 | void ConfigurationDialog::setAllSelectedInfo(void) |
356 | 322 | { | 313 | { |
357 | 323 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelObject::AllInfo)); | 314 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelObject::AllInfo)); |
359 | 324 | ui->pushButtonCustomInfoDialog->setEnabled(false); | 315 | updateSelectedInfoCheckBoxes(); |
360 | 325 | } | 316 | } |
361 | 326 | 317 | ||
362 | 327 | void ConfigurationDialog::setBriefSelectedInfo(void) | 318 | void ConfigurationDialog::setBriefSelectedInfo(void) |
363 | 328 | { | 319 | { |
364 | 329 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelObject::ShortInfo)); | 320 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelObject::ShortInfo)); |
366 | 330 | ui->pushButtonCustomInfoDialog->setEnabled(false); | 321 | updateSelectedInfoCheckBoxes(); |
367 | 331 | } | 322 | } |
368 | 332 | 323 | ||
370 | 333 | void ConfigurationDialog::setCustomSelectedInfo(void) | 324 | void ConfigurationDialog::setSelectedInfoFromCheckBoxes() |
371 | 334 | { | 325 | { |
374 | 335 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString())); | 326 | // As this signal will be called when a checbox is toggled, |
375 | 336 | ui->pushButtonCustomInfoDialog->setEnabled(true); | 327 | // change the general mode to Custom. |
376 | 328 | if (!ui->customSelectedInfoRadio->isChecked()) | ||
377 | 329 | ui->customSelectedInfoRadio->setChecked(true); | ||
378 | 330 | |||
379 | 331 | StelObject::InfoStringGroup flags(0); | ||
380 | 332 | |||
381 | 333 | if (ui->checkBoxName->isChecked()) | ||
382 | 334 | flags |= StelObject::Name; | ||
383 | 335 | if (ui->checkBoxCatalogNumbers->isChecked()) | ||
384 | 336 | flags |= StelObject::CatalogNumber; | ||
385 | 337 | if (ui->checkBoxVisualMag->isChecked()) | ||
386 | 338 | flags |= StelObject::Magnitude; | ||
387 | 339 | if (ui->checkBoxAbsoluteMag->isChecked()) | ||
388 | 340 | flags |= StelObject::AbsoluteMagnitude; | ||
389 | 341 | if (ui->checkBoxRaDecJ2000->isChecked()) | ||
390 | 342 | flags |= StelObject::RaDecJ2000; | ||
391 | 343 | if (ui->checkBoxRaDecOfDate->isChecked()) | ||
392 | 344 | flags |= StelObject::RaDecOfDate; | ||
393 | 345 | if (ui->checkBoxHourAngle->isChecked()) | ||
394 | 346 | flags |= StelObject::HourAngle; | ||
395 | 347 | if (ui->checkBoxAltAz->isChecked()) | ||
396 | 348 | flags |= StelObject::AltAzi; | ||
397 | 349 | if (ui->checkBoxDistance->isChecked()) | ||
398 | 350 | flags |= StelObject::Distance; | ||
399 | 351 | if (ui->checkBoxSize->isChecked()) | ||
400 | 352 | flags |= StelObject::Size; | ||
401 | 353 | if (ui->checkBoxExtra1->isChecked()) | ||
402 | 354 | flags |= StelObject::Extra1; | ||
403 | 355 | if (ui->checkBoxExtra2->isChecked()) | ||
404 | 356 | flags |= StelObject::Extra2; | ||
405 | 357 | if (ui->checkBoxExtra3->isChecked()) | ||
406 | 358 | flags |= StelObject::Extra3; | ||
407 | 359 | |||
408 | 360 | gui->setInfoTextFilters(flags); | ||
409 | 337 | } | 361 | } |
410 | 338 | 362 | ||
411 | 339 | 363 | ||
412 | @@ -463,14 +487,46 @@ | |||
413 | 463 | langName = StelApp::getInstance().getLocaleMgr().getSkyLanguage(); | 487 | langName = StelApp::getInstance().getLocaleMgr().getSkyLanguage(); |
414 | 464 | conf->setValue("localization/sky_locale", StelTranslator::nativeNameToIso639_1Code(langName)); | 488 | conf->setValue("localization/sky_locale", StelTranslator::nativeNameToIso639_1Code(langName)); |
415 | 465 | 489 | ||
417 | 466 | if (gui->getInfoTextFilters() == (StelObject::InfoStringGroup)0) | 490 | // configuration dialog / selected object info tab |
418 | 491 | const StelObject::InfoStringGroup& flags = gui->getInfoTextFilters(); | ||
419 | 492 | if (flags == StelObject::InfoStringGroup(0)) | ||
420 | 467 | conf->setValue("gui/selected_object_info", "none"); | 493 | conf->setValue("gui/selected_object_info", "none"); |
422 | 468 | else if (gui->getInfoTextFilters() == StelObject::InfoStringGroup(StelObject::ShortInfo)) | 494 | else if (flags == StelObject::InfoStringGroup(StelObject::ShortInfo)) |
423 | 469 | conf->setValue("gui/selected_object_info", "short"); | 495 | conf->setValue("gui/selected_object_info", "short"); |
425 | 470 | else if (gui->getInfoTextFilters() == StelObject::InfoStringGroup(StelObject::AllInfo)) | 496 | else if (flags == StelObject::InfoStringGroup(StelObject::AllInfo)) |
426 | 471 | conf->setValue("gui/selected_object_info", "all"); | 497 | conf->setValue("gui/selected_object_info", "all"); |
427 | 472 | else | 498 | else |
428 | 499 | { | ||
429 | 473 | conf->setValue("gui/selected_object_info", "custom"); | 500 | conf->setValue("gui/selected_object_info", "custom"); |
430 | 501 | |||
431 | 502 | conf->beginGroup("custom_selected_info"); | ||
432 | 503 | conf->setValue("flag_show_name", (bool) (flags & StelObject::Name)); | ||
433 | 504 | conf->setValue("flag_show_catalognumber", | ||
434 | 505 | (bool) (flags & StelObject::CatalogNumber)); | ||
435 | 506 | conf->setValue("flag_show_magnitude", | ||
436 | 507 | (bool) (flags & StelObject::Magnitude)); | ||
437 | 508 | conf->setValue("flag_show_absolutemagnitude", | ||
438 | 509 | (bool) (flags & StelObject::AbsoluteMagnitude)); | ||
439 | 510 | conf->setValue("flag_show_radecj2000", | ||
440 | 511 | (bool) (flags & StelObject::RaDecJ2000)); | ||
441 | 512 | conf->setValue("flag_show_radecofdate", | ||
442 | 513 | (bool) (flags & StelObject::RaDecOfDate)); | ||
443 | 514 | conf->setValue("flag_show_hourangle", | ||
444 | 515 | (bool) (flags & StelObject::HourAngle)); | ||
445 | 516 | conf->setValue("flag_show_altaz", | ||
446 | 517 | (bool) (flags & StelObject::AltAzi)); | ||
447 | 518 | conf->setValue("flag_show_distance", | ||
448 | 519 | (bool) (flags & StelObject::Distance)); | ||
449 | 520 | conf->setValue("flag_show_size", | ||
450 | 521 | (bool) (flags & StelObject::Size)); | ||
451 | 522 | conf->setValue("flag_show_extra1", | ||
452 | 523 | (bool) (flags & StelObject::Extra1)); | ||
453 | 524 | conf->setValue("flag_show_extra2", | ||
454 | 525 | (bool) (flags & StelObject::Extra2)); | ||
455 | 526 | conf->setValue("flag_show_extra3", | ||
456 | 527 | (bool) (flags & StelObject::Extra3)); | ||
457 | 528 | conf->endGroup(); | ||
458 | 529 | } | ||
459 | 474 | 530 | ||
460 | 475 | // toolbar auto-hide status | 531 | // toolbar auto-hide status |
461 | 476 | conf->setValue("gui/auto_hide_horizontal_toolbar", gui->getAutoHideHorizontalButtonBar()); | 532 | conf->setValue("gui/auto_hide_horizontal_toolbar", gui->getAutoHideHorizontalButtonBar()); |
462 | @@ -710,13 +766,6 @@ | |||
463 | 710 | setStartupTimeMode(); | 766 | setStartupTimeMode(); |
464 | 711 | } | 767 | } |
465 | 712 | 768 | ||
466 | 713 | void ConfigurationDialog::changePage(QListWidgetItem *current, QListWidgetItem *previous) | ||
467 | 714 | { | ||
468 | 715 | if (!current) | ||
469 | 716 | current = previous; | ||
470 | 717 | ui->configurationStackedWidget->setCurrentIndex(ui->stackListWidget->row(current)); | ||
471 | 718 | } | ||
472 | 719 | |||
473 | 720 | 769 | ||
474 | 721 | void ConfigurationDialog::resetStarCatalogControls() | 770 | void ConfigurationDialog::resetStarCatalogControls() |
475 | 722 | { | 771 | { |
476 | @@ -936,10 +985,21 @@ | |||
477 | 936 | resetStarCatalogControls(); | 985 | resetStarCatalogControls(); |
478 | 937 | } | 986 | } |
479 | 938 | 987 | ||
481 | 939 | void ConfigurationDialog::showCustomInfoDialog() | 988 | void ConfigurationDialog::updateSelectedInfoCheckBoxes() |
482 | 940 | { | 989 | { |
487 | 941 | if(customInfoDialog == NULL) | 990 | const StelObject::InfoStringGroup& flags = gui->getInfoTextFilters(); |
488 | 942 | customInfoDialog = new CustomInfoDialog(); | 991 | |
489 | 943 | 992 | ui->checkBoxName->setChecked(flags & StelObject::Name); | |
490 | 944 | customInfoDialog->setVisible(true); | 993 | ui->checkBoxCatalogNumbers->setChecked(flags & StelObject::CatalogNumber); |
491 | 994 | ui->checkBoxVisualMag->setChecked(flags & StelObject::Magnitude); | ||
492 | 995 | ui->checkBoxAbsoluteMag->setChecked(flags & StelObject::AbsoluteMagnitude); | ||
493 | 996 | ui->checkBoxRaDecJ2000->setChecked(flags & StelObject::RaDecJ2000); | ||
494 | 997 | ui->checkBoxRaDecOfDate->setChecked(flags & StelObject::RaDecOfDate); | ||
495 | 998 | ui->checkBoxHourAngle->setChecked(flags & StelObject::HourAngle); | ||
496 | 999 | ui->checkBoxAltAz->setChecked(flags & StelObject::AltAzi); | ||
497 | 1000 | ui->checkBoxDistance->setChecked(flags & StelObject::Distance); | ||
498 | 1001 | ui->checkBoxSize->setChecked(flags & StelObject::Size); | ||
499 | 1002 | ui->checkBoxExtra1->setChecked(flags & StelObject::Extra1); | ||
500 | 1003 | ui->checkBoxExtra2->setChecked(flags & StelObject::Extra2); | ||
501 | 1004 | ui->checkBoxExtra3->setChecked(flags & StelObject::Extra3); | ||
502 | 945 | } | 1005 | } |
503 | 946 | 1006 | ||
504 | === modified file 'src/gui/ConfigurationDialog.hpp' | |||
505 | --- src/gui/ConfigurationDialog.hpp 2012-04-13 18:02:25 +0000 | |||
506 | +++ src/gui/ConfigurationDialog.hpp 2012-07-19 16:10:25 +0000 | |||
507 | @@ -32,7 +32,6 @@ | |||
508 | 32 | class QNetworkAccessManager; | 32 | class QNetworkAccessManager; |
509 | 33 | class QListWidgetItem; | 33 | class QListWidgetItem; |
510 | 34 | class StelGui; | 34 | class StelGui; |
511 | 35 | class CustomInfoDialog; | ||
512 | 36 | 35 | ||
513 | 37 | class ConfigurationDialog : public StelDialog | 36 | class ConfigurationDialog : public StelDialog |
514 | 38 | { | 37 | { |
515 | @@ -77,7 +76,11 @@ | |||
516 | 77 | void setNoSelectedInfo(void); | 76 | void setNoSelectedInfo(void); |
517 | 78 | void setAllSelectedInfo(void); | 77 | void setAllSelectedInfo(void); |
518 | 79 | void setBriefSelectedInfo(void); | 78 | void setBriefSelectedInfo(void); |
520 | 80 | void setCustomSelectedInfo(void); | 79 | //! Set the selected object info fields from the "Displayed Fields" boxes. |
521 | 80 | //! Called when any of the boxes has been clicked. Sets the | ||
522 | 81 | //! "selected info" mode to "Custom". | ||
523 | 82 | void setSelectedInfoFromCheckBoxes(); | ||
524 | 83 | |||
525 | 81 | void selectLanguage(const QString& languageCode); | 84 | void selectLanguage(const QString& languageCode); |
526 | 82 | void setStartupTimeMode(); | 85 | void setStartupTimeMode(); |
527 | 83 | void setDiskViewport(bool); | 86 | void setDiskViewport(bool); |
528 | @@ -131,16 +134,13 @@ | |||
529 | 131 | #endif | 134 | #endif |
530 | 132 | void setFixedDateTimeToCurrent(); | 135 | void setFixedDateTimeToCurrent(); |
531 | 133 | 136 | ||
532 | 134 | void changePage(QListWidgetItem *current, QListWidgetItem *previous); | ||
533 | 135 | |||
534 | 136 | void showCustomInfoDialog(); | ||
535 | 137 | |||
536 | 138 | private: | 137 | private: |
537 | 139 | StelGui* gui; | 138 | StelGui* gui; |
538 | 140 | 139 | ||
539 | 141 | int savedProjectionType; | 140 | int savedProjectionType; |
542 | 142 | 141 | ||
543 | 143 | CustomInfoDialog* customInfoDialog; | 142 | //! Set the displayed fields checkboxes from the current displayed fields. |
544 | 143 | void updateSelectedInfoCheckBoxes(); | ||
545 | 144 | }; | 144 | }; |
546 | 145 | 145 | ||
547 | 146 | #endif // _CONFIGURATIONDIALOG_HPP_ | 146 | #endif // _CONFIGURATIONDIALOG_HPP_ |
548 | 147 | 147 | ||
549 | === removed file 'src/gui/CustomInfoDialog.cpp' | |||
550 | --- src/gui/CustomInfoDialog.cpp 2012-04-13 18:02:25 +0000 | |||
551 | +++ src/gui/CustomInfoDialog.cpp 1970-01-01 00:00:00 +0000 | |||
552 | @@ -1,249 +0,0 @@ | |||
553 | 1 | /* | ||
554 | 2 | * This program is distributed in the hope that it will be useful, | ||
555 | 3 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
556 | 4 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
557 | 5 | * GNU General Public License for more details. | ||
558 | 6 | * You should have received a copy of the GNU General Public License | ||
559 | 7 | * along with this program; if not, write to the Free Software | ||
560 | 8 | * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. | ||
561 | 9 | */ | ||
562 | 10 | |||
563 | 11 | #include "CustomInfoDialog.hpp" | ||
564 | 12 | #include "ui_CustomInfoDialog.h" | ||
565 | 13 | |||
566 | 14 | #include "Dialog.hpp" | ||
567 | 15 | #include "StelApp.hpp" | ||
568 | 16 | #include "StelObjectMgr.hpp" | ||
569 | 17 | |||
570 | 18 | #include <QDebug> | ||
571 | 19 | |||
572 | 20 | CustomInfoDialog::CustomInfoDialog() | ||
573 | 21 | { | ||
574 | 22 | ui = new Ui_CustomInfoDialogForm; | ||
575 | 23 | conf = StelApp::getInstance().getSettings(); | ||
576 | 24 | gui = StelApp::getInstance().getGui(); | ||
577 | 25 | } | ||
578 | 26 | |||
579 | 27 | CustomInfoDialog::~CustomInfoDialog() | ||
580 | 28 | { | ||
581 | 29 | delete ui; | ||
582 | 30 | ui=NULL; | ||
583 | 31 | } | ||
584 | 32 | |||
585 | 33 | void CustomInfoDialog::retranslate() | ||
586 | 34 | { | ||
587 | 35 | if (dialog) | ||
588 | 36 | ui->retranslateUi(dialog); | ||
589 | 37 | } | ||
590 | 38 | |||
591 | 39 | |||
592 | 40 | void CustomInfoDialog::createDialogContent() | ||
593 | 41 | { | ||
594 | 42 | ui->setupUi(dialog); | ||
595 | 43 | |||
596 | 44 | //Signals and slots | ||
597 | 45 | connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate())); | ||
598 | 46 | connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); | ||
599 | 47 | |||
600 | 48 | //An object's name | ||
601 | 49 | ui->nameCheckBox->setChecked(getNameCustomInfoFlag()); | ||
602 | 50 | connect(ui->nameCheckBox, SIGNAL(toggled(bool)), this, SLOT(setNameCustomInfoFlag(bool))); | ||
603 | 51 | |||
604 | 52 | //Catalog numbers | ||
605 | 53 | ui->catalogNumberCheckBox->setChecked(getCatalogNumberCustomInfoFlag()); | ||
606 | 54 | connect(ui->catalogNumberCheckBox, SIGNAL(toggled(bool)), this, SLOT(setCatalogNumberCustomInfoFlag(bool))); | ||
607 | 55 | |||
608 | 56 | //Magnitude related data | ||
609 | 57 | ui->magnitudeCheckBox->setChecked(getMagnitudeCustomInfoFlag()); | ||
610 | 58 | connect(ui->magnitudeCheckBox, SIGNAL(toggled(bool)), this, SLOT(setMagnitudeCustomInfoFlag(bool))); | ||
611 | 59 | |||
612 | 60 | //The equatorial position (J2000 ref) | ||
613 | 61 | ui->raDecJ2000CheckBox->setChecked(getRaDecJ2000CustomInfoFlag()); | ||
614 | 62 | connect(ui->raDecJ2000CheckBox, SIGNAL(toggled(bool)), this, SLOT(setRaDecJ2000CustomInfoFlag(bool))); | ||
615 | 63 | |||
616 | 64 | //The equatorial position (of date) | ||
617 | 65 | ui->raDecOfDateCheckBox->setChecked(getRaDecOfDateCustomInfoFlag()); | ||
618 | 66 | connect(ui->raDecOfDateCheckBox, SIGNAL(toggled(bool)), this, SLOT(setRaDecOfDateCustomInfoFlag(bool))); | ||
619 | 67 | |||
620 | 68 | //The position (Altitude/Azimuth) | ||
621 | 69 | ui->altAzCheckBox->setChecked(getAltAzCustomInfoFlag()); | ||
622 | 70 | connect(ui->altAzCheckBox, SIGNAL(toggled(bool)), this, SLOT(setAltAzCustomInfoFlag(bool))); | ||
623 | 71 | |||
624 | 72 | //Info about an object's distance | ||
625 | 73 | ui->distanceCheckBox->setChecked(getDistanceCustomInfoFlag()); | ||
626 | 74 | connect(ui->distanceCheckBox, SIGNAL(toggled(bool)), this, SLOT(setDistanceCustomInfoFlag(bool))); | ||
627 | 75 | |||
628 | 76 | //Info about an object's size | ||
629 | 77 | ui->sizeCheckBox->setChecked(getSizeCustomInfoFlag()); | ||
630 | 78 | connect(ui->sizeCheckBox, SIGNAL(toggled(bool)), this, SLOT(setSizeCustomInfoFlag(bool))); | ||
631 | 79 | |||
632 | 80 | //Derived class-specific extra fields | ||
633 | 81 | ui->extra1CheckBox->setChecked(getExtra1CustomInfoFlag()); | ||
634 | 82 | connect(ui->extra1CheckBox, SIGNAL(toggled(bool)), this, SLOT(setExtra1CustomInfoFlag(bool))); | ||
635 | 83 | |||
636 | 84 | //Derived class-specific extra fields | ||
637 | 85 | ui->extra2CheckBox->setChecked(getExtra2CustomInfoFlag()); | ||
638 | 86 | connect(ui->extra2CheckBox, SIGNAL(toggled(bool)), this, SLOT(setExtra2CustomInfoFlag(bool))); | ||
639 | 87 | |||
640 | 88 | //Derived class-specific extra fields | ||
641 | 89 | ui->extra3CheckBox->setChecked(getExtra3CustomInfoFlag()); | ||
642 | 90 | connect(ui->extra3CheckBox, SIGNAL(toggled(bool)), this, SLOT(setExtra3CustomInfoFlag(bool))); | ||
643 | 91 | |||
644 | 92 | //The hour angle + DE (of date) | ||
645 | 93 | ui->hourAngleCheckBox->setChecked(getHourAngleCustomInfoFlag()); | ||
646 | 94 | connect(ui->hourAngleCheckBox, SIGNAL(toggled(bool)), this, SLOT(setHourAngleCustomInfoFlag(bool))); | ||
647 | 95 | |||
648 | 96 | //The absolute magnitude | ||
649 | 97 | ui->absoluteMagnitudeCheckBox->setChecked(getAbsoluteMagnitudeCustomInfoFlag()); | ||
650 | 98 | connect(ui->absoluteMagnitudeCheckBox, SIGNAL(toggled(bool)), this, SLOT(setAbsoluteMagnitudeCustomInfoFlag(bool))); | ||
651 | 99 | |||
652 | 100 | } | ||
653 | 101 | |||
654 | 102 | void CustomInfoDialog::setVisible(bool v) | ||
655 | 103 | { | ||
656 | 104 | StelDialog::setVisible(v); | ||
657 | 105 | } | ||
658 | 106 | |||
659 | 107 | bool CustomInfoDialog::getNameCustomInfoFlag() | ||
660 | 108 | { | ||
661 | 109 | return conf->value("custom_selected_info/flag_show_name", false).toBool(); | ||
662 | 110 | } | ||
663 | 111 | |||
664 | 112 | void CustomInfoDialog::setNameCustomInfoFlag(bool flag) | ||
665 | 113 | { | ||
666 | 114 | conf->setValue("custom_selected_info/flag_show_name", flag); | ||
667 | 115 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString())); | ||
668 | 116 | } | ||
669 | 117 | |||
670 | 118 | bool CustomInfoDialog::getCatalogNumberCustomInfoFlag() | ||
671 | 119 | { | ||
672 | 120 | return conf->value("custom_selected_info/flag_show_catalognumber", false).toBool(); | ||
673 | 121 | } | ||
674 | 122 | |||
675 | 123 | void CustomInfoDialog::setCatalogNumberCustomInfoFlag(bool flag) | ||
676 | 124 | { | ||
677 | 125 | conf->setValue("custom_selected_info/flag_show_catalognumber", flag); | ||
678 | 126 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString())); | ||
679 | 127 | } | ||
680 | 128 | |||
681 | 129 | bool CustomInfoDialog::getMagnitudeCustomInfoFlag() | ||
682 | 130 | { | ||
683 | 131 | return conf->value("custom_selected_info/flag_show_magnitude", false).toBool(); | ||
684 | 132 | } | ||
685 | 133 | |||
686 | 134 | void CustomInfoDialog::setMagnitudeCustomInfoFlag(bool flag) | ||
687 | 135 | { | ||
688 | 136 | conf->setValue("custom_selected_info/flag_show_magnitude", flag); | ||
689 | 137 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString())); | ||
690 | 138 | } | ||
691 | 139 | |||
692 | 140 | bool CustomInfoDialog::getRaDecJ2000CustomInfoFlag() | ||
693 | 141 | { | ||
694 | 142 | return conf->value("custom_selected_info/flag_show_radecj2000", false).toBool(); | ||
695 | 143 | } | ||
696 | 144 | |||
697 | 145 | void CustomInfoDialog::setRaDecJ2000CustomInfoFlag(bool flag) | ||
698 | 146 | { | ||
699 | 147 | conf->setValue("custom_selected_info/flag_show_radecj2000", flag); | ||
700 | 148 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString())); | ||
701 | 149 | } | ||
702 | 150 | |||
703 | 151 | bool CustomInfoDialog::getRaDecOfDateCustomInfoFlag() | ||
704 | 152 | { | ||
705 | 153 | return conf->value("custom_selected_info/flag_show_radecofdate", false).toBool(); | ||
706 | 154 | } | ||
707 | 155 | |||
708 | 156 | void CustomInfoDialog::setRaDecOfDateCustomInfoFlag(bool flag) | ||
709 | 157 | { | ||
710 | 158 | conf->setValue("custom_selected_info/flag_show_radecofdate", flag); | ||
711 | 159 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString())); | ||
712 | 160 | } | ||
713 | 161 | |||
714 | 162 | bool CustomInfoDialog::getAltAzCustomInfoFlag() | ||
715 | 163 | { | ||
716 | 164 | return conf->value("custom_selected_info/flag_show_altaz", false).toBool(); | ||
717 | 165 | } | ||
718 | 166 | |||
719 | 167 | void CustomInfoDialog::setAltAzCustomInfoFlag(bool flag) | ||
720 | 168 | { | ||
721 | 169 | conf->setValue("custom_selected_info/flag_show_altaz", flag); | ||
722 | 170 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString())); | ||
723 | 171 | } | ||
724 | 172 | |||
725 | 173 | bool CustomInfoDialog::getDistanceCustomInfoFlag() | ||
726 | 174 | { | ||
727 | 175 | return conf->value("custom_selected_info/flag_show_distance", false).toBool(); | ||
728 | 176 | } | ||
729 | 177 | |||
730 | 178 | void CustomInfoDialog::setDistanceCustomInfoFlag(bool flag) | ||
731 | 179 | { | ||
732 | 180 | conf->setValue("custom_selected_info/flag_show_distance", flag); | ||
733 | 181 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString())); | ||
734 | 182 | } | ||
735 | 183 | |||
736 | 184 | bool CustomInfoDialog::getSizeCustomInfoFlag() | ||
737 | 185 | { | ||
738 | 186 | return conf->value("custom_selected_info/flag_show_size", false).toBool(); | ||
739 | 187 | } | ||
740 | 188 | |||
741 | 189 | void CustomInfoDialog::setSizeCustomInfoFlag(bool flag) | ||
742 | 190 | { | ||
743 | 191 | conf->setValue("custom_selected_info/flag_show_size", flag); | ||
744 | 192 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString())); | ||
745 | 193 | } | ||
746 | 194 | |||
747 | 195 | bool CustomInfoDialog::getExtra1CustomInfoFlag() | ||
748 | 196 | { | ||
749 | 197 | return conf->value("custom_selected_info/flag_show_extra1", false).toBool(); | ||
750 | 198 | } | ||
751 | 199 | |||
752 | 200 | void CustomInfoDialog::setExtra1CustomInfoFlag(bool flag) | ||
753 | 201 | { | ||
754 | 202 | conf->setValue("custom_selected_info/flag_show_extra1", flag); | ||
755 | 203 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString())); | ||
756 | 204 | } | ||
757 | 205 | |||
758 | 206 | bool CustomInfoDialog::getExtra2CustomInfoFlag() | ||
759 | 207 | { | ||
760 | 208 | return conf->value("custom_selected_info/flag_show_extra2", false).toBool(); | ||
761 | 209 | } | ||
762 | 210 | |||
763 | 211 | void CustomInfoDialog::setExtra2CustomInfoFlag(bool flag) | ||
764 | 212 | { | ||
765 | 213 | conf->setValue("custom_selected_info/flag_show_extra2", flag); | ||
766 | 214 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString())); | ||
767 | 215 | } | ||
768 | 216 | |||
769 | 217 | bool CustomInfoDialog::getExtra3CustomInfoFlag() | ||
770 | 218 | { | ||
771 | 219 | return conf->value("custom_selected_info/flag_show_extra3", false).toBool(); | ||
772 | 220 | } | ||
773 | 221 | |||
774 | 222 | void CustomInfoDialog::setExtra3CustomInfoFlag(bool flag) | ||
775 | 223 | { | ||
776 | 224 | conf->setValue("custom_selected_info/flag_show_extra3", flag); | ||
777 | 225 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString())); | ||
778 | 226 | } | ||
779 | 227 | |||
780 | 228 | bool CustomInfoDialog::getHourAngleCustomInfoFlag() | ||
781 | 229 | { | ||
782 | 230 | return conf->value("custom_selected_info/flag_show_hourangle", false).toBool(); | ||
783 | 231 | } | ||
784 | 232 | |||
785 | 233 | void CustomInfoDialog::setHourAngleCustomInfoFlag(bool flag) | ||
786 | 234 | { | ||
787 | 235 | conf->setValue("custom_selected_info/flag_show_hourangle", flag); | ||
788 | 236 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString())); | ||
789 | 237 | } | ||
790 | 238 | |||
791 | 239 | bool CustomInfoDialog::getAbsoluteMagnitudeCustomInfoFlag() | ||
792 | 240 | { | ||
793 | 241 | return conf->value("custom_selected_info/flag_show_absolutemagnitude", false).toBool(); | ||
794 | 242 | } | ||
795 | 243 | |||
796 | 244 | void CustomInfoDialog::setAbsoluteMagnitudeCustomInfoFlag(bool flag) | ||
797 | 245 | { | ||
798 | 246 | conf->setValue("custom_selected_info/flag_show_absolutemagnitude", flag); | ||
799 | 247 | gui->setInfoTextFilters(StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString())); | ||
800 | 248 | } | ||
801 | 249 | |||
802 | 250 | 0 | ||
803 | === removed file 'src/gui/CustomInfoDialog.hpp' | |||
804 | --- src/gui/CustomInfoDialog.hpp 2012-04-13 18:02:25 +0000 | |||
805 | +++ src/gui/CustomInfoDialog.hpp 1970-01-01 00:00:00 +0000 | |||
806 | @@ -1,96 +0,0 @@ | |||
807 | 1 | /* | ||
808 | 2 | * Stellarium | ||
809 | 3 | * | ||
810 | 4 | * Copyright (C) 2012 Alexander Wolf | ||
811 | 5 | * | ||
812 | 6 | * This program is free software; you can redistribute it and/or | ||
813 | 7 | * modify it under the terms of the GNU General Public License | ||
814 | 8 | * as published by the Free Software Foundation; either version 2 | ||
815 | 9 | * of the License, or (at your option) any later version. | ||
816 | 10 | * | ||
817 | 11 | * This program is distributed in the hope that it will be useful, | ||
818 | 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
819 | 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
820 | 14 | * GNU General Public License for more details. | ||
821 | 15 | * You should have received a copy of the GNU General Public License | ||
822 | 16 | * along with this program; if not, write to the Free Software | ||
823 | 17 | * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335, USA. | ||
824 | 18 | */ | ||
825 | 19 | |||
826 | 20 | // AW: Methods copied largely from AddRemoveLandscapesDialog | ||
827 | 21 | |||
828 | 22 | #ifndef _CUSTOMINFODIALOG_HPP_ | ||
829 | 23 | #define _CUSTOMINFODIALOG_HPP_ | ||
830 | 24 | |||
831 | 25 | #include <QObject> | ||
832 | 26 | #include <QSettings> | ||
833 | 27 | #include "StelDialog.hpp" | ||
834 | 28 | #include "StelGui.hpp" | ||
835 | 29 | |||
836 | 30 | class Ui_CustomInfoDialogForm; | ||
837 | 31 | |||
838 | 32 | //! @class CustomInfoDialog | ||
839 | 33 | class CustomInfoDialog : public StelDialog | ||
840 | 34 | { | ||
841 | 35 | Q_OBJECT | ||
842 | 36 | |||
843 | 37 | public: | ||
844 | 38 | CustomInfoDialog(); | ||
845 | 39 | virtual ~CustomInfoDialog(); | ||
846 | 40 | |||
847 | 41 | public slots: | ||
848 | 42 | void retranslate(); | ||
849 | 43 | void setVisible(bool); | ||
850 | 44 | |||
851 | 45 | protected: | ||
852 | 46 | //! Initialize the dialog widgets and connect the signals/slots. | ||
853 | 47 | virtual void createDialogContent(); | ||
854 | 48 | Ui_CustomInfoDialogForm *ui; | ||
855 | 49 | |||
856 | 50 | private slots: | ||
857 | 51 | bool getNameCustomInfoFlag(); | ||
858 | 52 | void setNameCustomInfoFlag(bool flag); | ||
859 | 53 | |||
860 | 54 | bool getCatalogNumberCustomInfoFlag(); | ||
861 | 55 | void setCatalogNumberCustomInfoFlag(bool flag); | ||
862 | 56 | |||
863 | 57 | bool getMagnitudeCustomInfoFlag(); | ||
864 | 58 | void setMagnitudeCustomInfoFlag(bool flag); | ||
865 | 59 | |||
866 | 60 | bool getRaDecJ2000CustomInfoFlag(); | ||
867 | 61 | void setRaDecJ2000CustomInfoFlag(bool flag); | ||
868 | 62 | |||
869 | 63 | bool getRaDecOfDateCustomInfoFlag(); | ||
870 | 64 | void setRaDecOfDateCustomInfoFlag(bool flag); | ||
871 | 65 | |||
872 | 66 | bool getAltAzCustomInfoFlag(); | ||
873 | 67 | void setAltAzCustomInfoFlag(bool flag); | ||
874 | 68 | |||
875 | 69 | bool getDistanceCustomInfoFlag(); | ||
876 | 70 | void setDistanceCustomInfoFlag(bool flag); | ||
877 | 71 | |||
878 | 72 | bool getSizeCustomInfoFlag(); | ||
879 | 73 | void setSizeCustomInfoFlag(bool flag); | ||
880 | 74 | |||
881 | 75 | bool getExtra1CustomInfoFlag(); | ||
882 | 76 | void setExtra1CustomInfoFlag(bool flag); | ||
883 | 77 | |||
884 | 78 | bool getExtra2CustomInfoFlag(); | ||
885 | 79 | void setExtra2CustomInfoFlag(bool flag); | ||
886 | 80 | |||
887 | 81 | bool getExtra3CustomInfoFlag(); | ||
888 | 82 | void setExtra3CustomInfoFlag(bool flag); | ||
889 | 83 | |||
890 | 84 | bool getHourAngleCustomInfoFlag(); | ||
891 | 85 | void setHourAngleCustomInfoFlag(bool flag); | ||
892 | 86 | |||
893 | 87 | bool getAbsoluteMagnitudeCustomInfoFlag(); | ||
894 | 88 | void setAbsoluteMagnitudeCustomInfoFlag(bool flag); | ||
895 | 89 | |||
896 | 90 | private: | ||
897 | 91 | StelGuiBase* gui; | ||
898 | 92 | QSettings* conf; | ||
899 | 93 | |||
900 | 94 | }; | ||
901 | 95 | |||
902 | 96 | #endif // _CUSTOMINFODIALOG_HPP_ | ||
903 | 97 | 0 | ||
904 | === removed file 'src/gui/CustomInfoDialog.ui' | |||
905 | --- src/gui/CustomInfoDialog.ui 2012-04-02 16:56:13 +0000 | |||
906 | +++ src/gui/CustomInfoDialog.ui 1970-01-01 00:00:00 +0000 | |||
907 | @@ -1,286 +0,0 @@ | |||
908 | 1 | <?xml version="1.0" encoding="UTF-8"?> | ||
909 | 2 | <ui version="4.0"> | ||
910 | 3 | <class>CustomInfoDialogForm</class> | ||
911 | 4 | <widget class="QWidget" name="CustomInfoDialogForm"> | ||
912 | 5 | <property name="sizePolicy"> | ||
913 | 6 | <sizepolicy hsizetype="Expanding" vsizetype="Expanding"> | ||
914 | 7 | <horstretch>0</horstretch> | ||
915 | 8 | <verstretch>0</verstretch> | ||
916 | 9 | </sizepolicy> | ||
917 | 10 | </property> | ||
918 | 11 | <layout class="QVBoxLayout" name="verticalLayout"> | ||
919 | 12 | <property name="spacing"> | ||
920 | 13 | <number>0</number> | ||
921 | 14 | </property> | ||
922 | 15 | <property name="margin"> | ||
923 | 16 | <number>0</number> | ||
924 | 17 | </property> | ||
925 | 18 | <item> | ||
926 | 19 | <widget class="BarFrame" name="TitleBar"> | ||
927 | 20 | <property name="minimumSize"> | ||
928 | 21 | <size> | ||
929 | 22 | <width>16</width> | ||
930 | 23 | <height>25</height> | ||
931 | 24 | </size> | ||
932 | 25 | </property> | ||
933 | 26 | <property name="maximumSize"> | ||
934 | 27 | <size> | ||
935 | 28 | <width>16777215</width> | ||
936 | 29 | <height>25</height> | ||
937 | 30 | </size> | ||
938 | 31 | </property> | ||
939 | 32 | <property name="frameShape"> | ||
940 | 33 | <enum>QFrame::StyledPanel</enum> | ||
941 | 34 | </property> | ||
942 | 35 | <layout class="QHBoxLayout"> | ||
943 | 36 | <property name="leftMargin"> | ||
944 | 37 | <number>0</number> | ||
945 | 38 | </property> | ||
946 | 39 | <property name="topMargin"> | ||
947 | 40 | <number>0</number> | ||
948 | 41 | </property> | ||
949 | 42 | <property name="rightMargin"> | ||
950 | 43 | <number>4</number> | ||
951 | 44 | </property> | ||
952 | 45 | <property name="bottomMargin"> | ||
953 | 46 | <number>0</number> | ||
954 | 47 | </property> | ||
955 | 48 | <item> | ||
956 | 49 | <spacer> | ||
957 | 50 | <property name="orientation"> | ||
958 | 51 | <enum>Qt::Horizontal</enum> | ||
959 | 52 | </property> | ||
960 | 53 | <property name="sizeHint" stdset="0"> | ||
961 | 54 | <size> | ||
962 | 55 | <width>40</width> | ||
963 | 56 | <height>20</height> | ||
964 | 57 | </size> | ||
965 | 58 | </property> | ||
966 | 59 | </spacer> | ||
967 | 60 | </item> | ||
968 | 61 | <item> | ||
969 | 62 | <widget class="QLabel" name="stelWindowTitle"> | ||
970 | 63 | <property name="palette"> | ||
971 | 64 | <palette> | ||
972 | 65 | <active/> | ||
973 | 66 | <inactive/> | ||
974 | 67 | <disabled/> | ||
975 | 68 | </palette> | ||
976 | 69 | </property> | ||
977 | 70 | <property name="font"> | ||
978 | 71 | <font/> | ||
979 | 72 | </property> | ||
980 | 73 | <property name="text"> | ||
981 | 74 | <string>Selected object information</string> | ||
982 | 75 | </property> | ||
983 | 76 | </widget> | ||
984 | 77 | </item> | ||
985 | 78 | <item> | ||
986 | 79 | <spacer> | ||
987 | 80 | <property name="orientation"> | ||
988 | 81 | <enum>Qt::Horizontal</enum> | ||
989 | 82 | </property> | ||
990 | 83 | <property name="sizeHint" stdset="0"> | ||
991 | 84 | <size> | ||
992 | 85 | <width>40</width> | ||
993 | 86 | <height>20</height> | ||
994 | 87 | </size> | ||
995 | 88 | </property> | ||
996 | 89 | </spacer> | ||
997 | 90 | </item> | ||
998 | 91 | <item> | ||
999 | 92 | <widget class="QPushButton" name="closeStelWindow"> | ||
1000 | 93 | <property name="minimumSize"> | ||
1001 | 94 | <size> | ||
1002 | 95 | <width>16</width> | ||
1003 | 96 | <height>16</height> | ||
1004 | 97 | </size> | ||
1005 | 98 | </property> | ||
1006 | 99 | <property name="maximumSize"> | ||
1007 | 100 | <size> | ||
1008 | 101 | <width>16</width> | ||
1009 | 102 | <height>16</height> | ||
1010 | 103 | </size> | ||
1011 | 104 | </property> | ||
1012 | 105 | <property name="focusPolicy"> | ||
1013 | 106 | <enum>Qt::NoFocus</enum> | ||
1014 | 107 | </property> | ||
1015 | 108 | <property name="text"> | ||
1016 | 109 | <string/> | ||
1017 | 110 | </property> | ||
1018 | 111 | </widget> | ||
1019 | 112 | </item> | ||
1020 | 113 | </layout> | ||
1021 | 114 | </widget> | ||
1022 | 115 | </item> | ||
1023 | 116 | <item> | ||
1024 | 117 | <widget class="QGroupBox" name="customInfoGroupBox"> | ||
1025 | 118 | <property name="title"> | ||
1026 | 119 | <string>Custom Info Settings</string> | ||
1027 | 120 | </property> | ||
1028 | 121 | <property name="alignment"> | ||
1029 | 122 | <set>Qt::AlignCenter</set> | ||
1030 | 123 | </property> | ||
1031 | 124 | <layout class="QVBoxLayout" name="verticalLayout_3"> | ||
1032 | 125 | <property name="margin"> | ||
1033 | 126 | <number>0</number> | ||
1034 | 127 | </property> | ||
1035 | 128 | <item> | ||
1036 | 129 | <widget class="QCheckBox" name="nameCheckBox"> | ||
1037 | 130 | <property name="toolTip"> | ||
1038 | 131 | <string>Display info about an object's name</string> | ||
1039 | 132 | </property> | ||
1040 | 133 | <property name="text"> | ||
1041 | 134 | <string>An object's name</string> | ||
1042 | 135 | </property> | ||
1043 | 136 | </widget> | ||
1044 | 137 | </item> | ||
1045 | 138 | <item> | ||
1046 | 139 | <widget class="QCheckBox" name="catalogNumberCheckBox"> | ||
1047 | 140 | <property name="toolTip"> | ||
1048 | 141 | <string>Display info about a catalog numbers</string> | ||
1049 | 142 | </property> | ||
1050 | 143 | <property name="text"> | ||
1051 | 144 | <string>Catalog numbers</string> | ||
1052 | 145 | </property> | ||
1053 | 146 | </widget> | ||
1054 | 147 | </item> | ||
1055 | 148 | <item> | ||
1056 | 149 | <widget class="QCheckBox" name="magnitudeCheckBox"> | ||
1057 | 150 | <property name="toolTip"> | ||
1058 | 151 | <string>Display info about a visual magnitude</string> | ||
1059 | 152 | </property> | ||
1060 | 153 | <property name="text"> | ||
1061 | 154 | <string>Visual magnitude</string> | ||
1062 | 155 | </property> | ||
1063 | 156 | </widget> | ||
1064 | 157 | </item> | ||
1065 | 158 | <item> | ||
1066 | 159 | <widget class="QCheckBox" name="absoluteMagnitudeCheckBox"> | ||
1067 | 160 | <property name="toolTip"> | ||
1068 | 161 | <string>Display info about an absolute magnitude</string> | ||
1069 | 162 | </property> | ||
1070 | 163 | <property name="text"> | ||
1071 | 164 | <string>Absolute magnitude</string> | ||
1072 | 165 | </property> | ||
1073 | 166 | </widget> | ||
1074 | 167 | </item> | ||
1075 | 168 | <item> | ||
1076 | 169 | <widget class="QCheckBox" name="raDecJ2000CheckBox"> | ||
1077 | 170 | <property name="toolTip"> | ||
1078 | 171 | <string>Display the equatorial position (J2000 ref)</string> | ||
1079 | 172 | </property> | ||
1080 | 173 | <property name="text"> | ||
1081 | 174 | <string>The equatorial coordinates (J2000 ref)</string> | ||
1082 | 175 | </property> | ||
1083 | 176 | </widget> | ||
1084 | 177 | </item> | ||
1085 | 178 | <item> | ||
1086 | 179 | <widget class="QCheckBox" name="raDecOfDateCheckBox"> | ||
1087 | 180 | <property name="toolTip"> | ||
1088 | 181 | <string>Display the equatorial position (of date)</string> | ||
1089 | 182 | </property> | ||
1090 | 183 | <property name="text"> | ||
1091 | 184 | <string>The equatorial coordinates (of date)</string> | ||
1092 | 185 | </property> | ||
1093 | 186 | </widget> | ||
1094 | 187 | </item> | ||
1095 | 188 | <item> | ||
1096 | 189 | <widget class="QCheckBox" name="altAzCheckBox"> | ||
1097 | 190 | <property name="toolTip"> | ||
1098 | 191 | <string>Display the altitude and azimuth position</string> | ||
1099 | 192 | </property> | ||
1100 | 193 | <property name="text"> | ||
1101 | 194 | <string>The alt-azimuthal coordinates</string> | ||
1102 | 195 | </property> | ||
1103 | 196 | </widget> | ||
1104 | 197 | </item> | ||
1105 | 198 | <item> | ||
1106 | 199 | <widget class="QCheckBox" name="hourAngleCheckBox"> | ||
1107 | 200 | <property name="toolTip"> | ||
1108 | 201 | <string>Display the hour angle + DE (of date)</string> | ||
1109 | 202 | </property> | ||
1110 | 203 | <property name="text"> | ||
1111 | 204 | <string>The hour angle</string> | ||
1112 | 205 | </property> | ||
1113 | 206 | </widget> | ||
1114 | 207 | </item> | ||
1115 | 208 | <item> | ||
1116 | 209 | <widget class="QCheckBox" name="distanceCheckBox"> | ||
1117 | 210 | <property name="toolTip"> | ||
1118 | 211 | <string>Display info about an object's distance</string> | ||
1119 | 212 | </property> | ||
1120 | 213 | <property name="text"> | ||
1121 | 214 | <string>Object's distance</string> | ||
1122 | 215 | </property> | ||
1123 | 216 | </widget> | ||
1124 | 217 | </item> | ||
1125 | 218 | <item> | ||
1126 | 219 | <widget class="QCheckBox" name="sizeCheckBox"> | ||
1127 | 220 | <property name="toolTip"> | ||
1128 | 221 | <string>Display info about an object's size</string> | ||
1129 | 222 | </property> | ||
1130 | 223 | <property name="text"> | ||
1131 | 224 | <string>Object's size</string> | ||
1132 | 225 | </property> | ||
1133 | 226 | </widget> | ||
1134 | 227 | </item> | ||
1135 | 228 | <item> | ||
1136 | 229 | <widget class="QCheckBox" name="extra1CheckBox"> | ||
1137 | 230 | <property name="toolTip"> | ||
1138 | 231 | <string>Display a derived class-specific extra fields</string> | ||
1139 | 232 | </property> | ||
1140 | 233 | <property name="text"> | ||
1141 | 234 | <string>Additional info (Extra 1)</string> | ||
1142 | 235 | </property> | ||
1143 | 236 | </widget> | ||
1144 | 237 | </item> | ||
1145 | 238 | <item> | ||
1146 | 239 | <widget class="QCheckBox" name="extra2CheckBox"> | ||
1147 | 240 | <property name="toolTip"> | ||
1148 | 241 | <string>Display a derived class-specific extra fields</string> | ||
1149 | 242 | </property> | ||
1150 | 243 | <property name="text"> | ||
1151 | 244 | <string>Additional info (Extra 2)</string> | ||
1152 | 245 | </property> | ||
1153 | 246 | </widget> | ||
1154 | 247 | </item> | ||
1155 | 248 | <item> | ||
1156 | 249 | <widget class="QCheckBox" name="extra3CheckBox"> | ||
1157 | 250 | <property name="toolTip"> | ||
1158 | 251 | <string>Display a derived class-specific extra fields</string> | ||
1159 | 252 | </property> | ||
1160 | 253 | <property name="text"> | ||
1161 | 254 | <string>Additional info (Extra 3)</string> | ||
1162 | 255 | </property> | ||
1163 | 256 | </widget> | ||
1164 | 257 | </item> | ||
1165 | 258 | <item> | ||
1166 | 259 | <spacer name="verticalSpacer"> | ||
1167 | 260 | <property name="orientation"> | ||
1168 | 261 | <enum>Qt::Vertical</enum> | ||
1169 | 262 | </property> | ||
1170 | 263 | <property name="sizeHint" stdset="0"> | ||
1171 | 264 | <size> | ||
1172 | 265 | <width>20</width> | ||
1173 | 266 | <height>40</height> | ||
1174 | 267 | </size> | ||
1175 | 268 | </property> | ||
1176 | 269 | </spacer> | ||
1177 | 270 | </item> | ||
1178 | 271 | </layout> | ||
1179 | 272 | </widget> | ||
1180 | 273 | </item> | ||
1181 | 274 | </layout> | ||
1182 | 275 | </widget> | ||
1183 | 276 | <customwidgets> | ||
1184 | 277 | <customwidget> | ||
1185 | 278 | <class>BarFrame</class> | ||
1186 | 279 | <extends>QFrame</extends> | ||
1187 | 280 | <header>Dialog.hpp</header> | ||
1188 | 281 | <container>1</container> | ||
1189 | 282 | </customwidget> | ||
1190 | 283 | </customwidgets> | ||
1191 | 284 | <resources/> | ||
1192 | 285 | <connections/> | ||
1193 | 286 | </ui> | ||
1194 | 287 | 0 | ||
1195 | === modified file 'src/gui/SkyGui.cpp' | |||
1196 | --- src/gui/SkyGui.cpp 2012-04-13 16:50:19 +0000 | |||
1197 | +++ src/gui/SkyGui.cpp 2012-07-19 16:10:25 +0000 | |||
1198 | @@ -49,7 +49,36 @@ | |||
1199 | 49 | } | 49 | } |
1200 | 50 | else if (objectInfo == "custom") | 50 | else if (objectInfo == "custom") |
1201 | 51 | { | 51 | { |
1203 | 52 | infoTextFilters = StelObject::InfoStringGroup(StelApp::getInstance().getStelObjectMgr().getCustomInfoString()); | 52 | infoTextFilters = StelObject::InfoStringGroup(0); |
1204 | 53 | |||
1205 | 54 | conf->beginGroup("custom_selected_info"); | ||
1206 | 55 | if (conf->value("flag_show_name", false).toBool()) | ||
1207 | 56 | infoTextFilters |= StelObject::Name; | ||
1208 | 57 | if (conf->value("flag_show_catalognumber", false).toBool()) | ||
1209 | 58 | infoTextFilters |= StelObject::CatalogNumber; | ||
1210 | 59 | if (conf->value("flag_show_magnitude", false).toBool()) | ||
1211 | 60 | infoTextFilters |= StelObject::Magnitude; | ||
1212 | 61 | if (conf->value("flag_show_absolutemagnitude", false).toBool()) | ||
1213 | 62 | infoTextFilters |= StelObject::AbsoluteMagnitude; | ||
1214 | 63 | if (conf->value("flag_show_radecj2000", false).toBool()) | ||
1215 | 64 | infoTextFilters |= StelObject::RaDecJ2000; | ||
1216 | 65 | if (conf->value("flag_show_radecofdate", false).toBool()) | ||
1217 | 66 | infoTextFilters |= StelObject::RaDecOfDate; | ||
1218 | 67 | if (conf->value("flag_show_hourangle", false).toBool()) | ||
1219 | 68 | infoTextFilters |= StelObject::HourAngle; | ||
1220 | 69 | if (conf->value("flag_show_altaz", false).toBool()) | ||
1221 | 70 | infoTextFilters |= StelObject::AltAzi; | ||
1222 | 71 | if (conf->value("flag_show_distance", false).toBool()) | ||
1223 | 72 | infoTextFilters |= StelObject::Distance; | ||
1224 | 73 | if (conf->value("flag_show_size", false).toBool()) | ||
1225 | 74 | infoTextFilters |= StelObject::Size; | ||
1226 | 75 | if (conf->value("flag_show_extra1", false).toBool()) | ||
1227 | 76 | infoTextFilters |= StelObject::Extra1; | ||
1228 | 77 | if (conf->value("flag_show_extra2", false).toBool()) | ||
1229 | 78 | infoTextFilters |= StelObject::Extra2; | ||
1230 | 79 | if (conf->value("flag_show_extra3", false).toBool()) | ||
1231 | 80 | infoTextFilters |= StelObject::Extra3; | ||
1232 | 81 | conf->endGroup(); | ||
1233 | 53 | } | 82 | } |
1234 | 54 | else | 83 | else |
1235 | 55 | { | 84 | { |
1236 | 56 | 85 | ||
1237 | === modified file 'src/gui/SkyGui.hpp' | |||
1238 | --- src/gui/SkyGui.hpp 2012-02-19 00:21:59 +0000 | |||
1239 | +++ src/gui/SkyGui.hpp 2012-07-19 16:10:25 +0000 | |||
1240 | @@ -38,6 +38,8 @@ | |||
1241 | 38 | class InfoPanel : public QGraphicsTextItem | 38 | class InfoPanel : public QGraphicsTextItem |
1242 | 39 | { | 39 | { |
1243 | 40 | public: | 40 | public: |
1244 | 41 | //! Reads "gui/selected_object_info", etc from the configuration file. | ||
1245 | 42 | //! @todo Bad idea to read from the configuration file in a constructor? --BM | ||
1246 | 41 | InfoPanel(QGraphicsItem* parent); | 43 | InfoPanel(QGraphicsItem* parent); |
1247 | 42 | void setInfoTextFilters(const StelObject::InfoStringGroup& aflags) {infoTextFilters=aflags;} | 44 | void setInfoTextFilters(const StelObject::InfoStringGroup& aflags) {infoTextFilters=aflags;} |
1248 | 43 | const StelObject::InfoStringGroup& getInfoTextFilters(void) const {return infoTextFilters;} | 45 | const StelObject::InfoStringGroup& getInfoTextFilters(void) const {return infoTextFilters;} |
1249 | 44 | 46 | ||
1250 | === modified file 'src/gui/configurationDialog.ui' | |||
1251 | --- src/gui/configurationDialog.ui 2012-06-29 14:07:11 +0000 | |||
1252 | +++ src/gui/configurationDialog.ui 2012-07-19 16:10:25 +0000 | |||
1253 | @@ -6,13 +6,10 @@ | |||
1254 | 6 | <rect> | 6 | <rect> |
1255 | 7 | <x>0</x> | 7 | <x>0</x> |
1256 | 8 | <y>0</y> | 8 | <y>0</y> |
1259 | 9 | <width>428</width> | 9 | <width>525</width> |
1260 | 10 | <height>463</height> | 10 | <height>465</height> |
1261 | 11 | </rect> | 11 | </rect> |
1262 | 12 | </property> | 12 | </property> |
1263 | 13 | <property name="styleSheet"> | ||
1264 | 14 | <string notr="true"/> | ||
1265 | 15 | </property> | ||
1266 | 16 | <layout class="QVBoxLayout"> | 13 | <layout class="QVBoxLayout"> |
1267 | 17 | <property name="spacing"> | 14 | <property name="spacing"> |
1268 | 18 | <number>0</number> | 15 | <number>0</number> |
1269 | @@ -132,9 +129,6 @@ | |||
1270 | 132 | </property> | 129 | </property> |
1271 | 133 | <item row="1" column="0"> | 130 | <item row="1" column="0"> |
1272 | 134 | <widget class="QStackedWidget" name="configurationStackedWidget"> | 131 | <widget class="QStackedWidget" name="configurationStackedWidget"> |
1273 | 135 | <property name="currentIndex"> | ||
1274 | 136 | <number>1</number> | ||
1275 | 137 | </property> | ||
1276 | 138 | <widget class="QWidget" name="page"> | 132 | <widget class="QWidget" name="page"> |
1277 | 139 | <layout class="QVBoxLayout" name="verticalLayout_10"> | 133 | <layout class="QVBoxLayout" name="verticalLayout_10"> |
1278 | 140 | <property name="spacing"> | 134 | <property name="spacing"> |
1279 | @@ -145,18 +139,6 @@ | |||
1280 | 145 | </property> | 139 | </property> |
1281 | 146 | <item> | 140 | <item> |
1282 | 147 | <widget class="QGroupBox" name="groupBox_2"> | 141 | <widget class="QGroupBox" name="groupBox_2"> |
1283 | 148 | <property name="sizePolicy"> | ||
1284 | 149 | <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | ||
1285 | 150 | <horstretch>0</horstretch> | ||
1286 | 151 | <verstretch>0</verstretch> | ||
1287 | 152 | </sizepolicy> | ||
1288 | 153 | </property> | ||
1289 | 154 | <property name="minimumSize"> | ||
1290 | 155 | <size> | ||
1291 | 156 | <width>0</width> | ||
1292 | 157 | <height>0</height> | ||
1293 | 158 | </size> | ||
1294 | 159 | </property> | ||
1295 | 160 | <property name="title"> | 142 | <property name="title"> |
1296 | 161 | <string>Program language</string> | 143 | <string>Program language</string> |
1297 | 162 | </property> | 144 | </property> |
1298 | @@ -190,106 +172,7 @@ | |||
1299 | 190 | </widget> | 172 | </widget> |
1300 | 191 | </item> | 173 | </item> |
1301 | 192 | <item> | 174 | <item> |
1302 | 193 | <widget class="QGroupBox" name="groupBox_4"> | ||
1303 | 194 | <property name="sizePolicy"> | ||
1304 | 195 | <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> | ||
1305 | 196 | <horstretch>0</horstretch> | ||
1306 | 197 | <verstretch>0</verstretch> | ||
1307 | 198 | </sizepolicy> | ||
1308 | 199 | </property> | ||
1309 | 200 | <property name="font"> | ||
1310 | 201 | <font> | ||
1311 | 202 | <weight>50</weight> | ||
1312 | 203 | <bold>false</bold> | ||
1313 | 204 | <kerning>true</kerning> | ||
1314 | 205 | </font> | ||
1315 | 206 | </property> | ||
1316 | 207 | <property name="title"> | ||
1317 | 208 | <string>Selected object information</string> | ||
1318 | 209 | </property> | ||
1319 | 210 | <layout class="QVBoxLayout" name="verticalLayout_5"> | ||
1320 | 211 | <property name="margin"> | ||
1321 | 212 | <number>0</number> | ||
1322 | 213 | </property> | ||
1323 | 214 | <item> | ||
1324 | 215 | <layout class="QHBoxLayout" name="horizontalLayout_13"> | ||
1325 | 216 | <item> | ||
1326 | 217 | <widget class="QRadioButton" name="allSelectedInfoRadio"> | ||
1327 | 218 | <property name="toolTip"> | ||
1328 | 219 | <string>Display all information available</string> | ||
1329 | 220 | </property> | ||
1330 | 221 | <property name="text"> | ||
1331 | 222 | <string>All available</string> | ||
1332 | 223 | </property> | ||
1333 | 224 | </widget> | ||
1334 | 225 | </item> | ||
1335 | 226 | <item> | ||
1336 | 227 | <widget class="QRadioButton" name="briefSelectedInfoRadio"> | ||
1337 | 228 | <property name="toolTip"> | ||
1338 | 229 | <string>Display less information</string> | ||
1339 | 230 | </property> | ||
1340 | 231 | <property name="text"> | ||
1341 | 232 | <string>Short</string> | ||
1342 | 233 | </property> | ||
1343 | 234 | </widget> | ||
1344 | 235 | </item> | ||
1345 | 236 | </layout> | ||
1346 | 237 | </item> | ||
1347 | 238 | <item> | ||
1348 | 239 | <layout class="QHBoxLayout" name="horizontalLayout_14"> | ||
1349 | 240 | <item> | ||
1350 | 241 | <layout class="QHBoxLayout" name="horizontalLayout_16"> | ||
1351 | 242 | <item> | ||
1352 | 243 | <widget class="QRadioButton" name="customSelectedInfoRadio"> | ||
1353 | 244 | <property name="toolTip"> | ||
1354 | 245 | <string>Display user settings information</string> | ||
1355 | 246 | </property> | ||
1356 | 247 | <property name="text"> | ||
1357 | 248 | <string>Customized</string> | ||
1358 | 249 | </property> | ||
1359 | 250 | </widget> | ||
1360 | 251 | </item> | ||
1361 | 252 | <item> | ||
1362 | 253 | <widget class="QPushButton" name="pushButtonCustomInfoDialog"> | ||
1363 | 254 | <property name="enabled"> | ||
1364 | 255 | <bool>true</bool> | ||
1365 | 256 | </property> | ||
1366 | 257 | <property name="text"> | ||
1367 | 258 | <string notr="true">...</string> | ||
1368 | 259 | </property> | ||
1369 | 260 | </widget> | ||
1370 | 261 | </item> | ||
1371 | 262 | </layout> | ||
1372 | 263 | </item> | ||
1373 | 264 | <item> | ||
1374 | 265 | <widget class="QRadioButton" name="noSelectedInfoRadio"> | ||
1375 | 266 | <property name="toolTip"> | ||
1376 | 267 | <string>Display no information</string> | ||
1377 | 268 | </property> | ||
1378 | 269 | <property name="text"> | ||
1379 | 270 | <string>None</string> | ||
1380 | 271 | </property> | ||
1381 | 272 | </widget> | ||
1382 | 273 | </item> | ||
1383 | 274 | </layout> | ||
1384 | 275 | </item> | ||
1385 | 276 | </layout> | ||
1386 | 277 | </widget> | ||
1387 | 278 | </item> | ||
1388 | 279 | <item> | ||
1389 | 280 | <widget class="QGroupBox" name="groupBox_6"> | 175 | <widget class="QGroupBox" name="groupBox_6"> |
1390 | 281 | <property name="sizePolicy"> | ||
1391 | 282 | <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> | ||
1392 | 283 | <horstretch>0</horstretch> | ||
1393 | 284 | <verstretch>0</verstretch> | ||
1394 | 285 | </sizepolicy> | ||
1395 | 286 | </property> | ||
1396 | 287 | <property name="font"> | ||
1397 | 288 | <font> | ||
1398 | 289 | <weight>50</weight> | ||
1399 | 290 | <bold>false</bold> | ||
1400 | 291 | </font> | ||
1401 | 292 | </property> | ||
1402 | 293 | <property name="title"> | 176 | <property name="title"> |
1403 | 294 | <string>Default options</string> | 177 | <string>Default options</string> |
1404 | 295 | </property> | 178 | </property> |
1405 | @@ -405,6 +288,243 @@ | |||
1406 | 405 | </item> | 288 | </item> |
1407 | 406 | </layout> | 289 | </layout> |
1408 | 407 | </widget> | 290 | </widget> |
1409 | 291 | <widget class="QWidget" name="pageSelectedObjectInfo"> | ||
1410 | 292 | <layout class="QVBoxLayout" name="verticalLayout_2"> | ||
1411 | 293 | <property name="spacing"> | ||
1412 | 294 | <number>0</number> | ||
1413 | 295 | </property> | ||
1414 | 296 | <property name="margin"> | ||
1415 | 297 | <number>0</number> | ||
1416 | 298 | </property> | ||
1417 | 299 | <item> | ||
1418 | 300 | <widget class="QGroupBox" name="groupBox_4"> | ||
1419 | 301 | <property name="sizePolicy"> | ||
1420 | 302 | <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> | ||
1421 | 303 | <horstretch>0</horstretch> | ||
1422 | 304 | <verstretch>0</verstretch> | ||
1423 | 305 | </sizepolicy> | ||
1424 | 306 | </property> | ||
1425 | 307 | <property name="title"> | ||
1426 | 308 | <string>Selected object information</string> | ||
1427 | 309 | </property> | ||
1428 | 310 | <layout class="QVBoxLayout" name="verticalLayout_5"> | ||
1429 | 311 | <property name="margin"> | ||
1430 | 312 | <number>0</number> | ||
1431 | 313 | </property> | ||
1432 | 314 | <item> | ||
1433 | 315 | <widget class="QRadioButton" name="allSelectedInfoRadio"> | ||
1434 | 316 | <property name="toolTip"> | ||
1435 | 317 | <string>Display all information available</string> | ||
1436 | 318 | </property> | ||
1437 | 319 | <property name="text"> | ||
1438 | 320 | <string>All available</string> | ||
1439 | 321 | </property> | ||
1440 | 322 | </widget> | ||
1441 | 323 | </item> | ||
1442 | 324 | <item> | ||
1443 | 325 | <widget class="QRadioButton" name="briefSelectedInfoRadio"> | ||
1444 | 326 | <property name="toolTip"> | ||
1445 | 327 | <string>Display less information</string> | ||
1446 | 328 | </property> | ||
1447 | 329 | <property name="text"> | ||
1448 | 330 | <string>Short</string> | ||
1449 | 331 | </property> | ||
1450 | 332 | </widget> | ||
1451 | 333 | </item> | ||
1452 | 334 | <item> | ||
1453 | 335 | <widget class="QRadioButton" name="noSelectedInfoRadio"> | ||
1454 | 336 | <property name="toolTip"> | ||
1455 | 337 | <string>Display no information</string> | ||
1456 | 338 | </property> | ||
1457 | 339 | <property name="text"> | ||
1458 | 340 | <string>None</string> | ||
1459 | 341 | </property> | ||
1460 | 342 | </widget> | ||
1461 | 343 | </item> | ||
1462 | 344 | <item> | ||
1463 | 345 | <widget class="QRadioButton" name="customSelectedInfoRadio"> | ||
1464 | 346 | <property name="toolTip"> | ||
1465 | 347 | <string>Display user settings information</string> | ||
1466 | 348 | </property> | ||
1467 | 349 | <property name="text"> | ||
1468 | 350 | <string>Customized</string> | ||
1469 | 351 | </property> | ||
1470 | 352 | </widget> | ||
1471 | 353 | </item> | ||
1472 | 354 | </layout> | ||
1473 | 355 | </widget> | ||
1474 | 356 | </item> | ||
1475 | 357 | <item> | ||
1476 | 358 | <widget class="QGroupBox" name="groupBoxDisplayedFields"> | ||
1477 | 359 | <property name="sizePolicy"> | ||
1478 | 360 | <sizepolicy hsizetype="Preferred" vsizetype="Expanding"> | ||
1479 | 361 | <horstretch>0</horstretch> | ||
1480 | 362 | <verstretch>0</verstretch> | ||
1481 | 363 | </sizepolicy> | ||
1482 | 364 | </property> | ||
1483 | 365 | <property name="title"> | ||
1484 | 366 | <string>Displayed fields</string> | ||
1485 | 367 | </property> | ||
1486 | 368 | <layout class="QGridLayout" name="gridLayoutDisplayedFields"> | ||
1487 | 369 | <property name="margin"> | ||
1488 | 370 | <number>0</number> | ||
1489 | 371 | </property> | ||
1490 | 372 | <item row="0" column="1"> | ||
1491 | 373 | <widget class="QCheckBox" name="checkBoxVisualMag"> | ||
1492 | 374 | <property name="text"> | ||
1493 | 375 | <string>Visual magnitude</string> | ||
1494 | 376 | </property> | ||
1495 | 377 | <attribute name="buttonGroup"> | ||
1496 | 378 | <string notr="true">buttonGroupDisplayedFields</string> | ||
1497 | 379 | </attribute> | ||
1498 | 380 | </widget> | ||
1499 | 381 | </item> | ||
1500 | 382 | <item row="6" column="0"> | ||
1501 | 383 | <widget class="QCheckBox" name="checkBoxExtra1"> | ||
1502 | 384 | <property name="toolTip"> | ||
1503 | 385 | <string>Spectral class, nebula type, etc.</string> | ||
1504 | 386 | </property> | ||
1505 | 387 | <property name="text"> | ||
1506 | 388 | <string>Additional information 1</string> | ||
1507 | 389 | </property> | ||
1508 | 390 | <attribute name="buttonGroup"> | ||
1509 | 391 | <string notr="true">buttonGroupDisplayedFields</string> | ||
1510 | 392 | </attribute> | ||
1511 | 393 | </widget> | ||
1512 | 394 | </item> | ||
1513 | 395 | <item row="7" column="0" colspan="2"> | ||
1514 | 396 | <widget class="QCheckBox" name="checkBoxExtra3"> | ||
1515 | 397 | <property name="text"> | ||
1516 | 398 | <string>Additional information 3</string> | ||
1517 | 399 | </property> | ||
1518 | 400 | <attribute name="buttonGroup"> | ||
1519 | 401 | <string notr="true">buttonGroupDisplayedFields</string> | ||
1520 | 402 | </attribute> | ||
1521 | 403 | </widget> | ||
1522 | 404 | </item> | ||
1523 | 405 | <item row="1" column="0"> | ||
1524 | 406 | <widget class="QCheckBox" name="checkBoxCatalogNumbers"> | ||
1525 | 407 | <property name="text"> | ||
1526 | 408 | <string>Catalog number(s)</string> | ||
1527 | 409 | </property> | ||
1528 | 410 | <attribute name="buttonGroup"> | ||
1529 | 411 | <string notr="true">buttonGroupDisplayedFields</string> | ||
1530 | 412 | </attribute> | ||
1531 | 413 | </widget> | ||
1532 | 414 | </item> | ||
1533 | 415 | <item row="0" column="0"> | ||
1534 | 416 | <widget class="QCheckBox" name="checkBoxName"> | ||
1535 | 417 | <property name="text"> | ||
1536 | 418 | <string>Name</string> | ||
1537 | 419 | </property> | ||
1538 | 420 | <attribute name="buttonGroup"> | ||
1539 | 421 | <string notr="true">buttonGroupDisplayedFields</string> | ||
1540 | 422 | </attribute> | ||
1541 | 423 | </widget> | ||
1542 | 424 | </item> | ||
1543 | 425 | <item row="6" column="1"> | ||
1544 | 426 | <widget class="QCheckBox" name="checkBoxExtra2"> | ||
1545 | 427 | <property name="toolTip"> | ||
1546 | 428 | <string/> | ||
1547 | 429 | </property> | ||
1548 | 430 | <property name="text"> | ||
1549 | 431 | <string>Additional information 2</string> | ||
1550 | 432 | </property> | ||
1551 | 433 | <attribute name="buttonGroup"> | ||
1552 | 434 | <string notr="true">buttonGroupDisplayedFields</string> | ||
1553 | 435 | </attribute> | ||
1554 | 436 | </widget> | ||
1555 | 437 | </item> | ||
1556 | 438 | <item row="1" column="1"> | ||
1557 | 439 | <widget class="QCheckBox" name="checkBoxAbsoluteMag"> | ||
1558 | 440 | <property name="text"> | ||
1559 | 441 | <string>Absolute magnitude</string> | ||
1560 | 442 | </property> | ||
1561 | 443 | <attribute name="buttonGroup"> | ||
1562 | 444 | <string notr="true">buttonGroupDisplayedFields</string> | ||
1563 | 445 | </attribute> | ||
1564 | 446 | </widget> | ||
1565 | 447 | </item> | ||
1566 | 448 | <item row="4" column="1"> | ||
1567 | 449 | <widget class="QCheckBox" name="checkBoxAltAz"> | ||
1568 | 450 | <property name="toolTip"> | ||
1569 | 451 | <string>Horizontal coordinates</string> | ||
1570 | 452 | </property> | ||
1571 | 453 | <property name="text"> | ||
1572 | 454 | <string>Altitude/Azimuth</string> | ||
1573 | 455 | </property> | ||
1574 | 456 | <attribute name="buttonGroup"> | ||
1575 | 457 | <string notr="true">buttonGroupDisplayedFields</string> | ||
1576 | 458 | </attribute> | ||
1577 | 459 | </widget> | ||
1578 | 460 | </item> | ||
1579 | 461 | <item row="5" column="1"> | ||
1580 | 462 | <widget class="QCheckBox" name="checkBoxSize"> | ||
1581 | 463 | <property name="toolTip"> | ||
1582 | 464 | <string>Angular or physical size</string> | ||
1583 | 465 | </property> | ||
1584 | 466 | <property name="text"> | ||
1585 | 467 | <string>Size</string> | ||
1586 | 468 | </property> | ||
1587 | 469 | <attribute name="buttonGroup"> | ||
1588 | 470 | <string notr="true">buttonGroupDisplayedFields</string> | ||
1589 | 471 | </attribute> | ||
1590 | 472 | </widget> | ||
1591 | 473 | </item> | ||
1592 | 474 | <item row="3" column="0" colspan="2"> | ||
1593 | 475 | <widget class="QCheckBox" name="checkBoxRaDecOfDate"> | ||
1594 | 476 | <property name="toolTip"> | ||
1595 | 477 | <string>Geocentric equatorial coordinates, equinox of date</string> | ||
1596 | 478 | </property> | ||
1597 | 479 | <property name="text"> | ||
1598 | 480 | <string>Right ascension/Declination (of date)</string> | ||
1599 | 481 | </property> | ||
1600 | 482 | <attribute name="buttonGroup"> | ||
1601 | 483 | <string notr="true">buttonGroupDisplayedFields</string> | ||
1602 | 484 | </attribute> | ||
1603 | 485 | </widget> | ||
1604 | 486 | </item> | ||
1605 | 487 | <item row="5" column="0"> | ||
1606 | 488 | <widget class="QCheckBox" name="checkBoxDistance"> | ||
1607 | 489 | <property name="text"> | ||
1608 | 490 | <string>Distance</string> | ||
1609 | 491 | </property> | ||
1610 | 492 | <attribute name="buttonGroup"> | ||
1611 | 493 | <string notr="true">buttonGroupDisplayedFields</string> | ||
1612 | 494 | </attribute> | ||
1613 | 495 | </widget> | ||
1614 | 496 | </item> | ||
1615 | 497 | <item row="2" column="0" colspan="2"> | ||
1616 | 498 | <widget class="QCheckBox" name="checkBoxRaDecJ2000"> | ||
1617 | 499 | <property name="toolTip"> | ||
1618 | 500 | <string>Geocentric equatorial coordinates, equinox of J2000.0</string> | ||
1619 | 501 | </property> | ||
1620 | 502 | <property name="text"> | ||
1621 | 503 | <string>Right ascension/Declination (J2000)</string> | ||
1622 | 504 | </property> | ||
1623 | 505 | <attribute name="buttonGroup"> | ||
1624 | 506 | <string notr="true">buttonGroupDisplayedFields</string> | ||
1625 | 507 | </attribute> | ||
1626 | 508 | </widget> | ||
1627 | 509 | </item> | ||
1628 | 510 | <item row="4" column="0"> | ||
1629 | 511 | <widget class="QCheckBox" name="checkBoxHourAngle"> | ||
1630 | 512 | <property name="toolTip"> | ||
1631 | 513 | <string>Topocentric equatorial coordinates</string> | ||
1632 | 514 | </property> | ||
1633 | 515 | <property name="text"> | ||
1634 | 516 | <string>Hour angle/Declination</string> | ||
1635 | 517 | </property> | ||
1636 | 518 | <attribute name="buttonGroup"> | ||
1637 | 519 | <string notr="true">buttonGroupDisplayedFields</string> | ||
1638 | 520 | </attribute> | ||
1639 | 521 | </widget> | ||
1640 | 522 | </item> | ||
1641 | 523 | </layout> | ||
1642 | 524 | </widget> | ||
1643 | 525 | </item> | ||
1644 | 526 | </layout> | ||
1645 | 527 | </widget> | ||
1646 | 408 | <widget class="QWidget" name="page_2"> | 528 | <widget class="QWidget" name="page_2"> |
1647 | 409 | <layout class="QVBoxLayout" name="verticalLayout_11"> | 529 | <layout class="QVBoxLayout" name="verticalLayout_11"> |
1648 | 410 | <property name="spacing"> | 530 | <property name="spacing"> |
1649 | @@ -1131,6 +1251,18 @@ | |||
1650 | 1131 | </item> | 1251 | </item> |
1651 | 1132 | <item> | 1252 | <item> |
1652 | 1133 | <property name="text"> | 1253 | <property name="text"> |
1653 | 1254 | <string>Information</string> | ||
1654 | 1255 | </property> | ||
1655 | 1256 | <property name="toolTip"> | ||
1656 | 1257 | <string>Selected object information</string> | ||
1657 | 1258 | </property> | ||
1658 | 1259 | <property name="icon"> | ||
1659 | 1260 | <iconset resource="../../data/gui/guiRes.qrc"> | ||
1660 | 1261 | <normaloff>:/graphicGui/tabicon-info.png</normaloff>:/graphicGui/tabicon-info.png</iconset> | ||
1661 | 1262 | </property> | ||
1662 | 1263 | </item> | ||
1663 | 1264 | <item> | ||
1664 | 1265 | <property name="text"> | ||
1665 | 1134 | <string>Navigation</string> | 1266 | <string>Navigation</string> |
1666 | 1135 | </property> | 1267 | </property> |
1667 | 1136 | <property name="icon"> | 1268 | <property name="icon"> |
1668 | @@ -1183,8 +1315,84 @@ | |||
1669 | 1183 | <container>1</container> | 1315 | <container>1</container> |
1670 | 1184 | </customwidget> | 1316 | </customwidget> |
1671 | 1185 | </customwidgets> | 1317 | </customwidgets> |
1672 | 1318 | <tabstops> | ||
1673 | 1319 | <tabstop>programLanguageComboBox</tabstop> | ||
1674 | 1320 | <tabstop>setViewingOptionAsDefaultPushButton</tabstop> | ||
1675 | 1321 | <tabstop>restoreDefaultsButton</tabstop> | ||
1676 | 1322 | <tabstop>allSelectedInfoRadio</tabstop> | ||
1677 | 1323 | <tabstop>briefSelectedInfoRadio</tabstop> | ||
1678 | 1324 | <tabstop>noSelectedInfoRadio</tabstop> | ||
1679 | 1325 | <tabstop>customSelectedInfoRadio</tabstop> | ||
1680 | 1326 | <tabstop>checkBoxName</tabstop> | ||
1681 | 1327 | <tabstop>checkBoxCatalogNumbers</tabstop> | ||
1682 | 1328 | <tabstop>checkBoxVisualMag</tabstop> | ||
1683 | 1329 | <tabstop>checkBoxAbsoluteMag</tabstop> | ||
1684 | 1330 | <tabstop>checkBoxRaDecJ2000</tabstop> | ||
1685 | 1331 | <tabstop>checkBoxRaDecOfDate</tabstop> | ||
1686 | 1332 | <tabstop>checkBoxHourAngle</tabstop> | ||
1687 | 1333 | <tabstop>checkBoxAltAz</tabstop> | ||
1688 | 1334 | <tabstop>checkBoxDistance</tabstop> | ||
1689 | 1335 | <tabstop>checkBoxSize</tabstop> | ||
1690 | 1336 | <tabstop>checkBoxExtra1</tabstop> | ||
1691 | 1337 | <tabstop>checkBoxExtra2</tabstop> | ||
1692 | 1338 | <tabstop>checkBoxExtra3</tabstop> | ||
1693 | 1339 | <tabstop>enableKeysNavigationCheckBox</tabstop> | ||
1694 | 1340 | <tabstop>enableMouseNavigationCheckBox</tabstop> | ||
1695 | 1341 | <tabstop>systemTimeRadio</tabstop> | ||
1696 | 1342 | <tabstop>todayRadio</tabstop> | ||
1697 | 1343 | <tabstop>todayTimeSpinBox</tabstop> | ||
1698 | 1344 | <tabstop>fixedTimeRadio</tabstop> | ||
1699 | 1345 | <tabstop>fixedDateTimeEdit</tabstop> | ||
1700 | 1346 | <tabstop>fixedDateTimeCurrentButton</tabstop> | ||
1701 | 1347 | <tabstop>mouseTimeoutCheckbox</tabstop> | ||
1702 | 1348 | <tabstop>mouseTimeoutSpinBox</tabstop> | ||
1703 | 1349 | <tabstop>showFlipButtonsCheckbox</tabstop> | ||
1704 | 1350 | <tabstop>showNebulaBgButtonCheckbox</tabstop> | ||
1705 | 1351 | <tabstop>sphericMirrorCheckbox</tabstop> | ||
1706 | 1352 | <tabstop>diskViewportCheckbox</tabstop> | ||
1707 | 1353 | <tabstop>gravityLabelCheckbox</tabstop> | ||
1708 | 1354 | <tabstop>selectSingleConstellationButton</tabstop> | ||
1709 | 1355 | <tabstop>autoZoomResetsDirectionCheckbox</tabstop> | ||
1710 | 1356 | <tabstop>screenshotBrowseButton</tabstop> | ||
1711 | 1357 | <tabstop>screenshotDirEdit</tabstop> | ||
1712 | 1358 | <tabstop>invertScreenShotColorsCheckBox</tabstop> | ||
1713 | 1359 | <tabstop>getStarsButton</tabstop> | ||
1714 | 1360 | <tabstop>downloadRetryButton</tabstop> | ||
1715 | 1361 | <tabstop>downloadCancelButton</tabstop> | ||
1716 | 1362 | <tabstop>scriptInfoBrowser</tabstop> | ||
1717 | 1363 | <tabstop>runScriptButton</tabstop> | ||
1718 | 1364 | <tabstop>stopScriptButton</tabstop> | ||
1719 | 1365 | <tabstop>closeWindowAtScriptRunCheckbox</tabstop> | ||
1720 | 1366 | <tabstop>pluginsInfoBrowser</tabstop> | ||
1721 | 1367 | <tabstop>pluginLoadAtStartupCheckBox</tabstop> | ||
1722 | 1368 | <tabstop>pluginConfigureButton</tabstop> | ||
1723 | 1369 | </tabstops> | ||
1724 | 1186 | <resources> | 1370 | <resources> |
1725 | 1187 | <include location="../../data/gui/guiRes.qrc"/> | 1371 | <include location="../../data/gui/guiRes.qrc"/> |
1726 | 1188 | </resources> | 1372 | </resources> |
1728 | 1189 | <connections/> | 1373 | <connections> |
1729 | 1374 | <connection> | ||
1730 | 1375 | <sender>stackListWidget</sender> | ||
1731 | 1376 | <signal>currentRowChanged(int)</signal> | ||
1732 | 1377 | <receiver>configurationStackedWidget</receiver> | ||
1733 | 1378 | <slot>setCurrentIndex(int)</slot> | ||
1734 | 1379 | <hints> | ||
1735 | 1380 | <hint type="sourcelabel"> | ||
1736 | 1381 | <x>237</x> | ||
1737 | 1382 | <y>62</y> | ||
1738 | 1383 | </hint> | ||
1739 | 1384 | <hint type="destinationlabel"> | ||
1740 | 1385 | <x>237</x> | ||
1741 | 1386 | <y>281</y> | ||
1742 | 1387 | </hint> | ||
1743 | 1388 | </hints> | ||
1744 | 1389 | </connection> | ||
1745 | 1390 | </connections> | ||
1746 | 1391 | <buttongroups> | ||
1747 | 1392 | <buttongroup name="buttonGroupDisplayedFields"> | ||
1748 | 1393 | <property name="exclusive"> | ||
1749 | 1394 | <bool>false</bool> | ||
1750 | 1395 | </property> | ||
1751 | 1396 | </buttongroup> | ||
1752 | 1397 | </buttongroups> | ||
1753 | 1190 | </ui> | 1398 | </ui> |