Stellarium

Merge lp:~alexwolf/stellarium/MeteorShower-GUI into lp:~cardinot/stellarium/MeteorShowers

  1. MeteorShower-GUI
  2. Merge into MeteorShowers
Proposed by Alexander Wolf
Status: Merged
Merged at revision: 6435
Proposed branch: lp:~alexwolf/stellarium/MeteorShower-GUI
Merge into: lp:~cardinot/stellarium/MeteorShowers
Diff against target: 1319 lines (+405/-573)
6 files modified
plugins/MeteorShowers/src/MeteorShower.cpp (+6/-6)
plugins/MeteorShowers/src/MeteorShowers.cpp (+14/-49)
plugins/MeteorShowers/src/MeteorShowers.hpp (+14/-77)
plugins/MeteorShowers/src/gui/MeteorShowerDialog.cpp (+52/-86)
plugins/MeteorShowers/src/gui/MeteorShowerDialog.hpp (+3/-4)
plugins/MeteorShowers/src/gui/meteorShowerDialog.ui (+316/-351)
To merge this branch: bzr merge lp:~alexwolf/stellarium/MeteorShower-GUI
Reviewer Review Type Date Requested Status
Marcos Cardinot Approve
Review via email: mp+201281@code.launchpad.net

Description of the change

Refactored GUI, some optimization and bug fixing

To post a comment you must log in.
Revision history for this message
Marcos Cardinot (cardinot) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/MeteorShowers/src/MeteorShower.cpp'
2--- plugins/MeteorShowers/src/MeteorShower.cpp 2013-12-22 22:27:47 +0000
3+++ plugins/MeteorShowers/src/MeteorShower.cpp 2014-01-11 11:16:18 +0000
4@@ -321,23 +321,23 @@
5 else
6 oss << "<b>" << q_("Generic data for the year %1").arg(skyYear) << "</b> <br />";
7
8- if(start.fromString("MM") == finish.fromString("MM"))
9+ if(start.toString("M") == finish.toString("M"))
10 {
11 oss << QString("%1: %2 - %3 %4")
12 .arg(q_("Active"))
13- .arg(start.toString("dd"))
14- .arg(finish.toString("dd"))
15+ .arg(start.toString("d"))
16+ .arg(finish.toString("d"))
17 .arg(start.toString("MMMM"));
18 }
19 else
20 {
21 oss << QString("%1: %2 - %3")
22 .arg(q_("Active"))
23- .arg(start.toString("dd MMMM"))
24- .arg(finish.toString("dd MMMM"));
25+ .arg(start.toString("d MMMM"))
26+ .arg(finish.toString("d MMMM"));
27 }
28 oss << "<br />";
29- oss << q_("Maximum: %1").arg(peak.toString("dd MMMM"));
30+ oss << q_("Maximum: %1").arg(peak.toString("d MMMM"));
31
32 QString slong = QString::number( MeteorShower::getSolarLongitude(peak), 'f', 2 );
33 oss << QString(" (%1 %2&deg;)").arg(q_("Solar longitude is")).arg(slong);
34
35=== modified file 'plugins/MeteorShowers/src/MeteorShowers.cpp'
36--- plugins/MeteorShowers/src/MeteorShowers.cpp 2013-12-22 23:25:46 +0000
37+++ plugins/MeteorShowers/src/MeteorShowers.cpp 2014-01-11 11:16:18 +0000
38@@ -282,6 +282,10 @@
39
40 void MeteorShowers::drawMarker(StelCore* core, StelPainter& painter)
41 {
42+ if(!getFlagRadiant())
43+ return;
44+
45+ Q_UNUSED(core);
46 painter.setFont(labelFont);
47
48 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
49@@ -291,17 +295,8 @@
50 foreach(const MeteorShowerP& ms, mShowers)
51 {
52 bool flag=true;
53- switch(ms->getStatus())
54- {
55- case 1:
56- flag = flagShowARR;
57- break;
58- case 2:
59- flag = flagShowARG;
60- break;
61- default:
62- flag = flagShowIR;
63- }
64+ if (ms->getStatus()==0 && getFlagActiveRadiant())
65+ flag = false;
66
67 ms->updateCurrentData(skyDate);
68
69@@ -359,22 +354,8 @@
70 {
71 foreach(const activeData &a, activeInfo)
72 {
73- // Checks if the meteor stream can be showed
74- bool flag=true;
75- switch(a.status)
76- {
77- case 1:
78- flag = flagShowStreamARR;
79- break;
80- case 2:
81- flag = flagShowStreamARG;
82- break;
83- default:
84- flag = false;
85- }
86-
87- if(!flag)
88- continue; //next
89+ //if (a.status>0)
90+ // continue;
91
92 // step through and draw all active meteors
93 for(std::vector<MeteorStream*>::iterator iter = active[index].begin(); iter != active[index].end(); ++iter)
94@@ -807,19 +788,13 @@
95 conf->setValue("url", "http://stellarium.org/json/showers.json");
96 conf->setValue("update_frequency_hours", 100);
97 conf->setValue("flag_show_ms_button", true);
98+ conf->setValue("flag_show_radiants", true);
99+ conf->setValue("flag_active_radiants", false);
100
101 conf->setValue("colorARG", "0, 255, 240");
102 conf->setValue("colorARR", "255, 240, 0");
103 conf->setValue("colorIR", "255, 255, 255");
104
105- conf->setValue("show_activeRadiantRealData_stream", true);
106- conf->setValue("show_activeRadiantGenericData_stream", true);
107- conf->setValue("show_inactiveRadiant_stream", false);
108-
109- conf->setValue("show_activeRadiantRealData_marker", true);
110- conf->setValue("show_activeRadiantGenericData_marker", true);
111- conf->setValue("show_inactiveRadiant_marker", false);
112-
113 conf->setValue("show_radiant_labels", true);
114
115 conf->endGroup();
116@@ -941,6 +916,8 @@
117 updatesEnabled = conf->value("updates_enabled", true).toBool();
118 enableAtStartup = conf->value("enable_at_startup", false).toBool();
119 flagShowMSButton = conf->value("flag_show_ms_button", true).toBool();
120+ flagShowMSRadiant = conf->value("flag_show_radiants", true).toBool();
121+ flagShowAR = conf->value("flag_active_radiants", false).toBool();
122
123 Vec3f color;
124 color = StelUtils::strToVec3f(conf->value("colorARG", "0, 255, 240").toString());
125@@ -950,13 +927,6 @@
126 color = StelUtils::strToVec3f(conf->value("colorIR", "255, 255, 255").toString());
127 colorIR = QColor(color[0],color[1],color[2]);
128
129- flagShowStreamARG = conf->value("show_activeRadiantGenericData_stream", true).toBool();
130- flagShowStreamARR = conf->value("show_activeRadiantRealData_stream", true).toBool();
131-
132- flagShowARG = conf->value("show_activeRadiantGenericData_marker", true).toBool();
133- flagShowARR = conf->value("show_activeRadiantRealData_marker", true).toBool();
134- flagShowIR = conf->value("show_inactiveRadiant_marker", false).toBool();
135-
136 MeteorShower::showLabels = conf->value("show_radiant_labels", true).toBool();
137 labelFont.setPixelSize(conf->value("font_size", 13).toInt());
138
139@@ -972,6 +942,8 @@
140 conf->setValue("updates_enabled", updatesEnabled);
141 conf->setValue("enable_at_startup", enableAtStartup);
142 conf->setValue("flag_show_ms_button", flagShowMSButton);
143+ conf->setValue("flag_show_radiants", flagShowMSRadiant);
144+ conf->setValue("flag_active_radiants", flagShowAR);
145
146 int r,g,b;
147 colorARG.getRgb(&r,&g,&b);
148@@ -981,13 +953,6 @@
149 colorIR.getRgb(&r,&g,&b);
150 conf->setValue("colorIR", QString("%1, %2, %3").arg(r).arg(g).arg(b));
151
152- conf->setValue("show_activeRadiantGenericData_stream", flagShowStreamARG);
153- conf->setValue("show_activeRadiantRealData_stream", flagShowStreamARR);
154-
155- conf->setValue("show_activeRadiantGenericData_marker", flagShowARG);
156- conf->setValue("show_activeRadiantRealData_marker", flagShowARR);
157- conf->setValue("show_inactiveRadiant_marker", flagShowIR);
158-
159 conf->setValue("show_radiant_labels", MeteorShower::showLabels);
160 conf->setValue("font_size", labelFont.pixelSize());
161
162
163=== modified file 'plugins/MeteorShowers/src/MeteorShowers.hpp'
164--- plugins/MeteorShowers/src/MeteorShowers.hpp 2013-12-22 23:25:46 +0000
165+++ plugins/MeteorShowers/src/MeteorShowers.hpp 2014-01-11 11:16:18 +0000
166@@ -139,9 +139,6 @@
167 updatesEnabled=b;
168 }
169
170- bool getEnableAtStartup(void) {return enableAtStartup;}
171- void setEnableAtStartup(bool b) {enableAtStartup=b;}
172-
173 //! get the date and time the TLE elements were updated
174 QDateTime getLastUpdate(void)
175 {
176@@ -208,41 +205,6 @@
177 //! @return false: hidden
178 bool getFlagLabels();
179
180- //! Get status of active radiant based on generic data
181- //! @return false: hidden
182- bool getFlagARG()
183- {
184- return flagShowARG;
185- }
186-
187- //! Get status of active radiant based on real data
188- //! @return false: hidden
189- bool getFlagARR()
190- {
191- return flagShowARR;
192- }
193-
194- //! Get inactive radiant status
195- //! @return false: hidden
196- bool getFlagIR()
197- {
198- return flagShowIR;
199- }
200-
201- //! Get the meteor stream status of active radiant based on generic data.
202- //! @return false: hidden
203- bool getFlagShowStreamARG()
204- {
205- return flagShowStreamARG;
206- }
207-
208- //! Get the meteor stream status of active radiant based on real data.
209- //! @return false: hidden
210- bool getFlagShowStreamARR()
211- {
212- return flagShowStreamARR;
213- }
214-
215 signals:
216 //! @param state the new update state.
217 void updateStateChanged(MeteorShowers::UpdateState state);
218@@ -267,10 +229,7 @@
219
220 //! Define whether the button toggling meteor showers should be visible
221 void setFlagShowMSButton(bool b);
222- bool getFlagShowMSButton(void)
223- {
224- return flagShowMSButton;
225- }
226+ bool getFlagShowMSButton(void) { return flagShowMSButton; }
227
228 //! set the label font size.
229 //! @param size the pixel size of the font
230@@ -280,40 +239,14 @@
231 //! @param false: hidden
232 void setFlagLabels(bool b);
233
234- //! Enable/disable marker of active radiant based on generic data.
235- //! @param false: hidden
236- void setFlagARG(bool b)
237- {
238- flagShowARG = b;
239- }
240-
241- //! Enable/disable marker of active radiant based on real data.
242- //! @param false: hidden
243- void setFlagARR(bool b)
244- {
245- flagShowARR = b;
246- }
247-
248- //! Enable/disable inactive radiant marker.
249- //! @param false: hidden
250- void setFlagIR(bool b)
251- {
252- flagShowIR = b;
253- }
254-
255- //! Enable/disable meteor stream of active radiant based on generic data.
256- //! @param false: hidden
257- void setFlagShowStreamARG(bool b)
258- {
259- flagShowStreamARG = b;
260- }
261-
262- //! Enable/disable meteor stream of active radiant based on real data.
263- //! @param false: hidden
264- void setFlagShowStreamARR(bool b)
265- {
266- flagShowStreamARR = b;
267- }
268+ bool getFlagActiveRadiant(void) { return flagShowAR; }
269+ void setFlagActiveRadiant(bool b) { flagShowAR=b; }
270+
271+ bool getEnableAtStartup(void) {return enableAtStartup;}
272+ void setEnableAtStartup(bool b) {enableAtStartup=b;}
273+
274+ bool getFlagRadiant(void) { return flagShowMSRadiant; }
275+ void setFlagRadiant(bool b) { flagShowMSRadiant=b; }
276
277 private:
278 // Upgrade config.ini: rename old key settings to new
279@@ -381,7 +314,8 @@
280 // GUI
281 MeteorShowerDialog* configDialog;
282 bool flagShowMS;
283- bool flagShowMSButton;
284+ bool flagShowMSButton;
285+ bool flagShowMSRadiant;
286 QPixmap* OnIcon;
287 QPixmap* OffIcon;
288 QPixmap* GlowIcon;
289@@ -410,6 +344,9 @@
290 std::vector<std::vector<MeteorStream*> > active; // Matrix containing all active meteors
291 int ZHR;
292 const static double zhrToWsr = 1.6667f/3600.f; // factor to convert from zhr to whole earth per second rate
293+
294+ bool flagShowAR; //! Show marker of active radiant
295+
296 bool flagShow;
297 bool flagShowARG; //! Show marker of active radiant based on generic data
298 bool flagShowARR; //! Show marker of active radiant based on generic data
299
300=== modified file 'plugins/MeteorShowers/src/gui/MeteorShowerDialog.cpp'
301--- plugins/MeteorShowers/src/gui/MeteorShowerDialog.cpp 2013-12-22 23:25:46 +0000
302+++ plugins/MeteorShowers/src/gui/MeteorShowerDialog.cpp 2014-01-11 11:16:18 +0000
303@@ -72,27 +72,38 @@
304 ui->setupUi(dialog);
305 ui->tabs->setCurrentIndex(0);
306 connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(retranslate()));
307+ plugin = GETSTELMODULE(MeteorShowers);
308
309- // Settings tab / updates group
310- ui->displayModeCheckBox->setChecked(GETSTELMODULE(MeteorShowers)->getFlagShowMS());
311- connect(ui->displayModeCheckBox, SIGNAL(stateChanged(int)), this, SLOT(setDistributionEnabled(int)));
312- ui->displayAtStartupCheckBox->setChecked(GETSTELMODULE(MeteorShowers)->getEnableAtStartup());
313- connect(ui->displayAtStartupCheckBox, SIGNAL(stateChanged(int)), this, SLOT(setDisplayAtStartupEnabled(int)));
314- ui->displayShowMeteorShowerButton->setChecked(GETSTELMODULE(MeteorShowers)->getFlagShowMSButton());
315- connect(ui->displayShowMeteorShowerButton, SIGNAL(stateChanged(int)), this, SLOT(setDisplayShowMeteorShowerButton(int)));
316- connect(ui->internetUpdatesCheckbox, SIGNAL(stateChanged(int)), this, SLOT(setUpdatesEnabled(int)));
317+ // Settings tab / updates group
318+ connect(ui->internetUpdates, SIGNAL(clicked(bool)), this, SLOT(setUpdatesEnabled(bool)));
319 connect(ui->updateButton, SIGNAL(clicked()), this, SLOT(updateJSON()));
320- connect(GETSTELMODULE(MeteorShowers), SIGNAL(updateStateChanged(MeteorShowers::UpdateState)), this, SLOT(updateStateReceiver(MeteorShowers::UpdateState)));
321- connect(GETSTELMODULE(MeteorShowers), SIGNAL(jsonUpdateComplete(void)), this, SLOT(updateCompleteReceiver(void)));
322+ connect(plugin, SIGNAL(updateStateChanged(MeteorShowers::UpdateState)), this, SLOT(updateStateReceiver(MeteorShowers::UpdateState)));
323+ connect(plugin, SIGNAL(jsonUpdateComplete(void)), this, SLOT(updateCompleteReceiver(void)));
324 connect(ui->updateFrequencySpinBox, SIGNAL(valueChanged(int)), this, SLOT(setUpdateValues(int)));
325 refreshUpdateValues(); // fetch values for last updated and so on
326- // if the state didn't change, setUpdatesEnabled will not be called, so we force it
327- setUpdatesEnabled(ui->internetUpdatesCheckbox->checkState());
328
329 updateTimer = new QTimer(this);
330 connect(updateTimer, SIGNAL(timeout()), this, SLOT(refreshUpdateValues()));
331 updateTimer->start(7000);
332
333+ // Settings tab / radiant group
334+ ui->displayRadiant->setChecked(plugin->getFlagRadiant());
335+ connect(ui->displayRadiant, SIGNAL(clicked(bool)), plugin, SLOT(setFlagRadiant(bool)));
336+ ui->activeRadiantsOnly->setChecked(plugin->getFlagActiveRadiant());
337+ connect(ui->activeRadiantsOnly, SIGNAL(clicked(bool)), plugin, SLOT(setFlagActiveRadiant(bool)));
338+ ui->radiantLabels->setChecked(plugin->getFlagLabels());
339+ connect(ui->radiantLabels, SIGNAL(clicked(bool)), plugin, SLOT(setFlagLabels(bool)));
340+ ui->fontSizeSpinBox->setValue(plugin->getLabelFontSize());
341+ connect(ui->fontSizeSpinBox, SIGNAL(valueChanged(int)), plugin, SLOT(setLabelFontSize(int)));
342+
343+ // Settings tab / meteor showers group
344+ ui->displayMeteorShower->setChecked(plugin->getEnableAtStartup());
345+ connect(ui->displayMeteorShower, SIGNAL(clicked(bool)), plugin, SLOT(setEnableAtStartup(bool)));
346+ ui->displayShowMeteorShowerButton->setChecked(plugin->getFlagShowMSButton());
347+ connect(ui->displayShowMeteorShowerButton, SIGNAL(clicked(bool)), plugin, SLOT(setFlagShowMSButton(bool)));
348+
349+ // /////////////////////////////////////////
350+
351 connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close()));
352
353 connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(restoreDefaults()));
354@@ -104,16 +115,6 @@
355 connect(ui->changeColorARR, SIGNAL(clicked()), this, SLOT(setColorARR()));
356 connect(ui->changeColorIR, SIGNAL(clicked()), this, SLOT(setColorIR()));
357
358- connect(ui->showStreamARG, SIGNAL(clicked(bool)), GETSTELMODULE(MeteorShowers), SLOT(setFlagShowStreamARG(bool)));
359- connect(ui->showStreamARR, SIGNAL(clicked(bool)), GETSTELMODULE(MeteorShowers), SLOT(setFlagShowStreamARR(bool)));
360-
361- connect(ui->showARG, SIGNAL(clicked(bool)), GETSTELMODULE(MeteorShowers), SLOT(setFlagARG(bool)));
362- connect(ui->showARR, SIGNAL(clicked(bool)), GETSTELMODULE(MeteorShowers), SLOT(setFlagARR(bool)));
363- connect(ui->showIR, SIGNAL(clicked(bool)), GETSTELMODULE(MeteorShowers), SLOT(setFlagIR(bool)));
364-
365- connect(ui->labelsGroup, SIGNAL(clicked(bool)), GETSTELMODULE(MeteorShowers), SLOT(setFlagLabels(bool)));
366- connect(ui->fontSizeSpinBox, SIGNAL(valueChanged(int)), GETSTELMODULE(MeteorShowers), SLOT(setLabelFontSize(int)));
367-
368 // About tab
369 setAboutHtml();
370 StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui());
371@@ -138,13 +139,12 @@
372
373 void MeteorShowerDialog::refreshUpdateValues(void)
374 {
375- ui->lastUpdateDateTimeEdit->setDateTime(GETSTELMODULE(MeteorShowers)->getLastUpdate());
376- ui->updateFrequencySpinBox->setValue(GETSTELMODULE(MeteorShowers)->getUpdateFrequencyHours());
377- int secondsToUpdate = GETSTELMODULE(MeteorShowers)->getSecondsToUpdate();
378- ui->internetUpdatesCheckbox->setChecked(GETSTELMODULE(MeteorShowers)->getUpdatesEnabled());
379- if (!GETSTELMODULE(MeteorShowers)->getUpdatesEnabled())
380+ ui->lastUpdateDateTimeEdit->setDateTime(plugin->getLastUpdate());
381+ ui->updateFrequencySpinBox->setValue(plugin->getUpdateFrequencyHours());
382+ int secondsToUpdate = plugin->getSecondsToUpdate();
383+ if (!plugin->getUpdatesEnabled())
384 ui->nextUpdateLabel->setText(q_("Internet updates disabled"));
385- else if (GETSTELMODULE(MeteorShowers)->getUpdateState() == MeteorShowers::Updating)
386+ else if (plugin->getUpdateState() == MeteorShowers::Updating)
387 ui->nextUpdateLabel->setText(q_("Updating now..."));
388 else if (secondsToUpdate <= 60)
389 ui->nextUpdateLabel->setText(q_("Next update: < 1 minute"));
390@@ -156,40 +156,18 @@
391
392 void MeteorShowerDialog::setUpdateValues(int hours)
393 {
394- GETSTELMODULE(MeteorShowers)->setUpdateFrequencyHours(hours);
395- refreshUpdateValues();
396-}
397-
398-void MeteorShowerDialog::setUpdatesEnabled(int checkState)
399-{
400- bool b = checkState != Qt::Unchecked;
401- GETSTELMODULE(MeteorShowers)->setUpdatesEnabled(b);
402- ui->updateFrequencySpinBox->setEnabled(b);
403- if(b)
404- ui->updateButton->setText(q_("Update now"));
405- else
406- ui->updateButton->setText(q_("Update from files"));
407-
408- refreshUpdateValues();
409-}
410-
411-void MeteorShowerDialog::setDistributionEnabled(int checkState)
412-{
413- bool b = checkState != Qt::Unchecked;
414- GETSTELMODULE(MeteorShowers)->setFlagShowMS(b);
415-}
416-
417-void MeteorShowerDialog::setDisplayAtStartupEnabled(int checkState)
418-{
419- bool b = checkState != Qt::Unchecked;
420- GETSTELMODULE(MeteorShowers)->setEnableAtStartup(b);
421-}
422-
423-void MeteorShowerDialog::setDisplayShowMeteorShowerButton(int checkState)
424-{
425- bool b = checkState != Qt::Unchecked;
426- GETSTELMODULE(MeteorShowers)->setFlagShowMSButton(b);
427-}
428+ plugin->setUpdateFrequencyHours(hours);
429+ refreshUpdateValues();
430+}
431+
432+void MeteorShowerDialog::setUpdatesEnabled(bool checkState)
433+{
434+ plugin->setUpdatesEnabled(checkState);
435+ ui->updateFrequencySpinBox->setEnabled(checkState);
436+ ui->updateButton->setText(q_("Update now"));
437+ refreshUpdateValues();
438+}
439+
440
441 void MeteorShowerDialog::updateStateReceiver(MeteorShowers::UpdateState state)
442 {
443@@ -216,47 +194,35 @@
444 void MeteorShowerDialog::restoreDefaults(void)
445 {
446 qDebug() << "MeteorShowers::restoreDefaults";
447- GETSTELMODULE(MeteorShowers)->restoreDefaults();
448- GETSTELMODULE(MeteorShowers)->readSettingsFromConfig();
449+ plugin->restoreDefaults();
450+ plugin->readSettingsFromConfig();
451 updateGuiFromSettings();
452 }
453
454 void MeteorShowerDialog::updateGuiFromSettings(void)
455-{
456- ui->internetUpdatesCheckbox->setChecked(GETSTELMODULE(MeteorShowers)->getUpdatesEnabled());
457-
458- ui->showStreamARG->setChecked(GETSTELMODULE(MeteorShowers)->getFlagShowStreamARG());
459- ui->showStreamARR->setChecked(GETSTELMODULE(MeteorShowers)->getFlagShowStreamARR());
460-
461- ui->showARG->setChecked(GETSTELMODULE(MeteorShowers)->getFlagARG());
462- ui->showARR->setChecked(GETSTELMODULE(MeteorShowers)->getFlagARR());
463- ui->showIR->setChecked(GETSTELMODULE(MeteorShowers)->getFlagIR());
464-
465- ui->labelsGroup->setChecked(GETSTELMODULE(MeteorShowers)->getFlagLabels());
466- ui->fontSizeSpinBox->setValue(GETSTELMODULE(MeteorShowers)->getLabelFontSize());
467-
468+{
469 refreshUpdateValues();
470 refreshColorMarkers();
471 }
472
473 void MeteorShowerDialog::saveSettings(void)
474 {
475- GETSTELMODULE(MeteorShowers)->saveSettingsToConfig();
476+ plugin->saveSettingsToConfig();
477 }
478
479 void MeteorShowerDialog::updateJSON(void)
480 {
481- if(GETSTELMODULE(MeteorShowers)->getUpdatesEnabled())
482+ if(plugin->getUpdatesEnabled())
483 {
484- GETSTELMODULE(MeteorShowers)->updateJSON();
485+ plugin->updateJSON();
486 }
487 }
488
489 void MeteorShowerDialog::refreshColorMarkers(void)
490 {
491- setTextureColor(ui->textureARG, GETSTELMODULE(MeteorShowers)->getColorARG());
492- setTextureColor(ui->textureARR, GETSTELMODULE(MeteorShowers)->getColorARR());
493- setTextureColor(ui->textureIR, GETSTELMODULE(MeteorShowers)->getColorIR());
494+ setTextureColor(ui->textureARG, plugin->getColorARG());
495+ setTextureColor(ui->textureARR, plugin->getColorARR());
496+ setTextureColor(ui->textureIR, plugin->getColorIR());
497 }
498
499 void MeteorShowerDialog::setTextureColor(QLabel *texture, QColor color)
500@@ -270,19 +236,19 @@
501 {
502 QColor color = QColorDialog::getColor();
503 setTextureColor(ui->textureARG, color);
504- GETSTELMODULE(MeteorShowers)->setColorARG(color);
505+ plugin->setColorARG(color);
506 }
507
508 void MeteorShowerDialog::setColorARR()
509 {
510 QColor color = QColorDialog::getColor();
511 setTextureColor(ui->textureARR, color);
512- GETSTELMODULE(MeteorShowers)->setColorARR(color);
513+ plugin->setColorARR(color);
514 }
515
516 void MeteorShowerDialog::setColorIR()
517 {
518 QColor color = QColorDialog::getColor();
519 setTextureColor(ui->textureIR, color);
520- GETSTELMODULE(MeteorShowers)->setColorIR(color);
521+ plugin->setColorIR(color);
522 }
523
524=== modified file 'plugins/MeteorShowers/src/gui/MeteorShowerDialog.hpp'
525--- plugins/MeteorShowers/src/gui/MeteorShowerDialog.hpp 2013-12-22 17:14:18 +0000
526+++ plugins/MeteorShowers/src/gui/MeteorShowerDialog.hpp 2014-01-11 11:16:18 +0000
527@@ -30,6 +30,7 @@
528
529 class Ui_meteorShowerDialog;
530 class QTimer;
531+class MeteorShowers;
532
533 class MeteorShowerDialog : public StelDialog
534 {
535@@ -50,10 +51,7 @@
536
537 private slots:
538 void setUpdateValues(int hours);
539- void setUpdatesEnabled(int checkState);
540- void setDistributionEnabled(int checkState);
541- void setDisplayAtStartupEnabled(int checkState);
542- void setDisplayShowMeteorShowerButton(int checkState);
543+ void setUpdatesEnabled(bool checkState);
544 void updateStateReceiver(MeteorShowers::UpdateState state);
545 void updateCompleteReceiver();
546 void restoreDefaults(void);
547@@ -65,6 +63,7 @@
548
549 private:
550 Ui_meteorShowerDialog* ui;
551+ MeteorShowers* plugin;
552 void setAboutHtml(void);
553 void updateGuiFromSettings(void);
554 QTimer* updateTimer;
555
556=== modified file 'plugins/MeteorShowers/src/gui/meteorShowerDialog.ui'
557--- plugins/MeteorShowers/src/gui/meteorShowerDialog.ui 2013-12-22 23:25:46 +0000
558+++ plugins/MeteorShowers/src/gui/meteorShowerDialog.ui 2014-01-11 11:16:18 +0000
559@@ -7,7 +7,7 @@
560 <x>0</x>
561 <y>0</y>
562 <width>530</width>
563- <height>480</height>
564+ <height>404</height>
565 </rect>
566 </property>
567 <property name="windowTitle">
568@@ -146,25 +146,21 @@
569 </attribute>
570 <layout class="QVBoxLayout" name="verticalLayout_3">
571 <item>
572- <widget class="QGroupBox" name="updatesGroup">
573+ <widget class="QGroupBox" name="internetUpdates">
574 <property name="title">
575- <string>Update catalog from Internet</string>
576+ <string>Update data from Internet</string>
577 </property>
578 <property name="flat">
579 <bool>true</bool>
580 </property>
581 <property name="checkable">
582- <bool>false</bool>
583+ <bool>true</bool>
584+ </property>
585+ <property name="checked">
586+ <bool>true</bool>
587 </property>
588 <layout class="QVBoxLayout" name="verticalLayout_12">
589 <item>
590- <widget class="QCheckBox" name="internetUpdatesCheckbox">
591- <property name="text">
592- <string>Update from Internet sources</string>
593- </property>
594- </widget>
595- </item>
596- <item>
597 <layout class="QGridLayout" name="gridLayout">
598 <item row="0" column="0">
599 <widget class="QLabel" name="lastUpdateLabel">
600@@ -239,38 +235,34 @@
601 </widget>
602 </item>
603 <item>
604- <widget class="QGroupBox" name="displayBox">
605+ <widget class="QGroupBox" name="displayMeteorShowerBox">
606+ <property name="toolTip">
607+ <string/>
608+ </property>
609 <property name="title">
610- <string>Settings for meteor showers</string>
611+ <string>Meteor showers</string>
612 </property>
613 <property name="flat">
614 <bool>true</bool>
615 </property>
616- <layout class="QVBoxLayout" name="verticalLayout">
617- <item>
618- <widget class="QCheckBox" name="displayModeCheckBox">
619- <property name="toolTip">
620- <string/>
621- </property>
622- <property name="text">
623- <string>Enable display of radiants of meteor showers</string>
624- </property>
625- </widget>
626- </item>
627- <item>
628- <widget class="QCheckBox" name="displayAtStartupCheckBox">
629- <property name="text">
630- <string>Enable display at startup</string>
631- </property>
632- </widget>
633- </item>
634- <item>
635+ <property name="checkable">
636+ <bool>false</bool>
637+ </property>
638+ <layout class="QGridLayout" name="gridLayout_8">
639+ <item row="1" column="0">
640 <widget class="QCheckBox" name="displayShowMeteorShowerButton">
641 <property name="text">
642 <string>Show meteor showers button on toolbar</string>
643 </property>
644 </widget>
645 </item>
646+ <item row="0" column="0">
647+ <widget class="QCheckBox" name="displayMeteorShower">
648+ <property name="text">
649+ <string>Enable display of meteor showers at startup</string>
650+ </property>
651+ </widget>
652+ </item>
653 </layout>
654 </widget>
655 </item>
656@@ -324,348 +316,316 @@
657 <bool>true</bool>
658 </property>
659 <attribute name="title">
660- <string>Radiant</string>
661+ <string>Radiants</string>
662 </attribute>
663 <layout class="QVBoxLayout" name="verticalLayout_4">
664 <item>
665- <widget class="QGroupBox" name="activeRealData">
666- <property name="title">
667- <string>Active Radiant - Real Data</string>
668- </property>
669- <layout class="QGridLayout" name="gridLayout_2">
670- <property name="topMargin">
671- <number>4</number>
672- </property>
673- <property name="bottomMargin">
674- <number>4</number>
675- </property>
676- <item row="0" column="1">
677- <widget class="QFrame" name="frame">
678- <property name="frameShape">
679- <enum>QFrame::NoFrame</enum>
680- </property>
681- <property name="frameShadow">
682- <enum>QFrame::Raised</enum>
683- </property>
684- <property name="lineWidth">
685- <number>0</number>
686- </property>
687- <layout class="QVBoxLayout" name="verticalLayout_5">
688- <property name="spacing">
689- <number>9</number>
690- </property>
691- <property name="topMargin">
692- <number>0</number>
693- </property>
694- <property name="bottomMargin">
695- <number>0</number>
696- </property>
697- <item>
698- <widget class="QCheckBox" name="showStreamARR">
699- <property name="text">
700- <string>Displays the meteor stream.</string>
701- </property>
702- </widget>
703- </item>
704- <item>
705- <widget class="QCheckBox" name="showARR">
706- <property name="toolTip">
707- <string>It doesn't affect the drawing of the meteor showers.</string>
708- </property>
709- <property name="text">
710- <string>Show all markers of active radiant based on real data.</string>
711- </property>
712- </widget>
713- </item>
714- <item>
715- <widget class="QPushButton" name="changeColorARR">
716- <property name="text">
717- <string>Change Color</string>
718- </property>
719- </widget>
720- </item>
721- </layout>
722- <zorder>changeColorARR</zorder>
723- <zorder>showARR</zorder>
724- <zorder>showStreamARR</zorder>
725- </widget>
726- </item>
727- <item row="0" column="0">
728- <widget class="QFrame" name="frame_6">
729- <property name="minimumSize">
730- <size>
731- <width>64</width>
732- <height>64</height>
733- </size>
734- </property>
735- <property name="maximumSize">
736- <size>
737- <width>64</width>
738- <height>64</height>
739- </size>
740- </property>
741- <property name="frameShape">
742- <enum>QFrame::StyledPanel</enum>
743- </property>
744- <property name="frameShadow">
745- <enum>QFrame::Raised</enum>
746- </property>
747- <widget class="QLabel" name="textureARR">
748- <property name="geometry">
749- <rect>
750- <x>0</x>
751- <y>0</y>
752- <width>64</width>
753- <height>64</height>
754- </rect>
755- </property>
756- <property name="minimumSize">
757- <size>
758- <width>64</width>
759- <height>64</height>
760- </size>
761- </property>
762- <property name="maximumSize">
763- <size>
764- <width>64</width>
765- <height>64</height>
766- </size>
767- </property>
768- <property name="styleSheet">
769- <string notr="true">background-image: url(:/MeteorShowers/radiantSetting.png);</string>
770- </property>
771- <property name="text">
772- <string/>
773- </property>
774- </widget>
775- </widget>
776- </item>
777- </layout>
778- </widget>
779- </item>
780- <item>
781- <widget class="QGroupBox" name="activeGenericData">
782- <property name="title">
783- <string>Active Radiant - Generic Data</string>
784- </property>
785- <layout class="QGridLayout" name="gridLayout_3">
786- <property name="topMargin">
787- <number>4</number>
788- </property>
789- <property name="bottomMargin">
790- <number>4</number>
791- </property>
792- <item row="0" column="0">
793- <widget class="QFrame" name="frame_4">
794- <property name="minimumSize">
795- <size>
796- <width>64</width>
797- <height>64</height>
798- </size>
799- </property>
800- <property name="maximumSize">
801- <size>
802- <width>64</width>
803- <height>64</height>
804- </size>
805- </property>
806- <property name="frameShape">
807- <enum>QFrame::StyledPanel</enum>
808- </property>
809- <property name="frameShadow">
810- <enum>QFrame::Raised</enum>
811- </property>
812- <widget class="QLabel" name="textureARG">
813- <property name="geometry">
814- <rect>
815- <x>0</x>
816- <y>0</y>
817- <width>64</width>
818- <height>64</height>
819- </rect>
820- </property>
821- <property name="minimumSize">
822- <size>
823- <width>64</width>
824- <height>64</height>
825- </size>
826- </property>
827- <property name="maximumSize">
828- <size>
829- <width>64</width>
830- <height>64</height>
831- </size>
832- </property>
833- <property name="styleSheet">
834- <string notr="true">background-image: url(:/MeteorShowers/radiantSetting.png);</string>
835- </property>
836- <property name="text">
837- <string/>
838- </property>
839- </widget>
840- </widget>
841- </item>
842- <item row="0" column="1">
843- <widget class="QFrame" name="frame_2">
844- <property name="frameShape">
845- <enum>QFrame::NoFrame</enum>
846- </property>
847- <property name="frameShadow">
848- <enum>QFrame::Raised</enum>
849- </property>
850- <property name="lineWidth">
851- <number>0</number>
852- </property>
853- <layout class="QVBoxLayout" name="verticalLayout_6">
854- <property name="spacing">
855- <number>9</number>
856- </property>
857- <property name="topMargin">
858- <number>0</number>
859- </property>
860- <property name="bottomMargin">
861- <number>0</number>
862- </property>
863- <item>
864- <widget class="QCheckBox" name="showStreamARG">
865- <property name="text">
866- <string>Displays the meteor stream.</string>
867- </property>
868- </widget>
869- </item>
870- <item>
871- <widget class="QCheckBox" name="showARG">
872- <property name="toolTip">
873- <string>It doesn't affect the drawing of the meteor showers.</string>
874- </property>
875- <property name="text">
876- <string>Show all markers of active radiant based on generic data.</string>
877- </property>
878- </widget>
879- </item>
880- <item>
881+ <widget class="QGroupBox" name="groupBox">
882+ <property name="title">
883+ <string>Color of radiants markers</string>
884+ </property>
885+ <layout class="QGridLayout" name="gridLayout_5">
886+ <property name="leftMargin">
887+ <number>0</number>
888+ </property>
889+ <property name="topMargin">
890+ <number>0</number>
891+ </property>
892+ <property name="rightMargin">
893+ <number>0</number>
894+ </property>
895+ <property name="bottomMargin">
896+ <number>0</number>
897+ </property>
898+ <property name="spacing">
899+ <number>0</number>
900+ </property>
901+ <item row="0" column="1" alignment="Qt::AlignHCenter">
902+ <widget class="QGroupBox" name="activeGenericData">
903+ <property name="minimumSize">
904+ <size>
905+ <width>86</width>
906+ <height>0</height>
907+ </size>
908+ </property>
909+ <property name="toolTip">
910+ <string>Active Radiant - Generic Data</string>
911+ </property>
912+ <property name="alignment">
913+ <set>Qt::AlignCenter</set>
914+ </property>
915+ <layout class="QGridLayout" name="gridLayout_3">
916+ <property name="leftMargin">
917+ <number>0</number>
918+ </property>
919+ <property name="topMargin">
920+ <number>0</number>
921+ </property>
922+ <property name="rightMargin">
923+ <number>0</number>
924+ </property>
925+ <property name="bottomMargin">
926+ <number>0</number>
927+ </property>
928+ <property name="spacing">
929+ <number>0</number>
930+ </property>
931+ <item row="1" column="0">
932 <widget class="QPushButton" name="changeColorARG">
933- <property name="text">
934+ <property name="toolTip">
935 <string>Change Color</string>
936 </property>
937+ <property name="text">
938+ <string notr="true">...</string>
939+ </property>
940+ </widget>
941+ </item>
942+ <item row="0" column="0">
943+ <widget class="QFrame" name="frame_4">
944+ <property name="minimumSize">
945+ <size>
946+ <width>64</width>
947+ <height>64</height>
948+ </size>
949+ </property>
950+ <property name="maximumSize">
951+ <size>
952+ <width>64</width>
953+ <height>64</height>
954+ </size>
955+ </property>
956+ <property name="frameShape">
957+ <enum>QFrame::StyledPanel</enum>
958+ </property>
959+ <property name="frameShadow">
960+ <enum>QFrame::Raised</enum>
961+ </property>
962+ <widget class="QLabel" name="textureARG">
963+ <property name="geometry">
964+ <rect>
965+ <x>0</x>
966+ <y>0</y>
967+ <width>64</width>
968+ <height>64</height>
969+ </rect>
970+ </property>
971+ <property name="minimumSize">
972+ <size>
973+ <width>64</width>
974+ <height>64</height>
975+ </size>
976+ </property>
977+ <property name="maximumSize">
978+ <size>
979+ <width>64</width>
980+ <height>64</height>
981+ </size>
982+ </property>
983+ <property name="styleSheet">
984+ <string notr="true">background-image: url(:/MeteorShowers/radiantSetting.png);</string>
985+ </property>
986+ <property name="text">
987+ <string/>
988+ </property>
989+ </widget>
990 </widget>
991 </item>
992 </layout>
993 </widget>
994 </item>
995- </layout>
996- </widget>
997- </item>
998- <item>
999- <widget class="QGroupBox" name="inactive">
1000- <property name="title">
1001- <string>Inactive Radiant</string>
1002- </property>
1003- <layout class="QGridLayout" name="gridLayout_4">
1004- <property name="topMargin">
1005- <number>4</number>
1006- </property>
1007- <property name="bottomMargin">
1008- <number>4</number>
1009- </property>
1010- <item row="0" column="1">
1011- <widget class="QFrame" name="frame_3">
1012- <property name="frameShape">
1013- <enum>QFrame::NoFrame</enum>
1014- </property>
1015- <property name="frameShadow">
1016- <enum>QFrame::Raised</enum>
1017- </property>
1018- <property name="lineWidth">
1019- <number>0</number>
1020- </property>
1021- <layout class="QVBoxLayout" name="verticalLayout_7">
1022- <property name="spacing">
1023- <number>9</number>
1024+ <item row="0" column="2" alignment="Qt::AlignHCenter">
1025+ <widget class="QGroupBox" name="inactive">
1026+ <property name="minimumSize">
1027+ <size>
1028+ <width>86</width>
1029+ <height>0</height>
1030+ </size>
1031+ </property>
1032+ <property name="toolTip">
1033+ <string>Inactive Radiant</string>
1034+ </property>
1035+ <property name="alignment">
1036+ <set>Qt::AlignCenter</set>
1037+ </property>
1038+ <layout class="QGridLayout" name="gridLayout_4">
1039+ <property name="leftMargin">
1040+ <number>0</number>
1041 </property>
1042 <property name="topMargin">
1043 <number>0</number>
1044 </property>
1045+ <property name="rightMargin">
1046+ <number>0</number>
1047+ </property>
1048 <property name="bottomMargin">
1049 <number>0</number>
1050 </property>
1051- <item>
1052- <widget class="QCheckBox" name="showIR">
1053- <property name="toolTip">
1054- <string>It doesn't affect the drawing of the meteor showers.</string>
1055- </property>
1056- <property name="text">
1057- <string>Show all markers of inactive radiant.</string>
1058- </property>
1059- </widget>
1060- </item>
1061- <item>
1062+ <property name="spacing">
1063+ <number>0</number>
1064+ </property>
1065+ <item row="1" column="0">
1066 <widget class="QPushButton" name="changeColorIR">
1067+ <property name="toolTip">
1068+ <string>Change Color</string>
1069+ </property>
1070 <property name="text">
1071- <string>Change Color</string>
1072- </property>
1073+ <string notr="true">...</string>
1074+ </property>
1075+ </widget>
1076+ </item>
1077+ <item row="0" column="0">
1078+ <widget class="QFrame" name="frame_5">
1079+ <property name="minimumSize">
1080+ <size>
1081+ <width>64</width>
1082+ <height>64</height>
1083+ </size>
1084+ </property>
1085+ <property name="maximumSize">
1086+ <size>
1087+ <width>64</width>
1088+ <height>64</height>
1089+ </size>
1090+ </property>
1091+ <property name="frameShape">
1092+ <enum>QFrame::StyledPanel</enum>
1093+ </property>
1094+ <property name="frameShadow">
1095+ <enum>QFrame::Raised</enum>
1096+ </property>
1097+ <widget class="QLabel" name="textureIR">
1098+ <property name="geometry">
1099+ <rect>
1100+ <x>0</x>
1101+ <y>0</y>
1102+ <width>64</width>
1103+ <height>64</height>
1104+ </rect>
1105+ </property>
1106+ <property name="minimumSize">
1107+ <size>
1108+ <width>64</width>
1109+ <height>64</height>
1110+ </size>
1111+ </property>
1112+ <property name="maximumSize">
1113+ <size>
1114+ <width>64</width>
1115+ <height>64</height>
1116+ </size>
1117+ </property>
1118+ <property name="styleSheet">
1119+ <string notr="true">background-image: url(:/MeteorShowers/radiantSetting.png);</string>
1120+ </property>
1121+ <property name="text">
1122+ <string/>
1123+ </property>
1124+ </widget>
1125 </widget>
1126 </item>
1127 </layout>
1128 </widget>
1129 </item>
1130- <item row="0" column="0">
1131- <widget class="QFrame" name="frame_5">
1132+ <item row="0" column="0" alignment="Qt::AlignHCenter">
1133+ <widget class="QGroupBox" name="activeRealData">
1134 <property name="minimumSize">
1135 <size>
1136- <width>64</width>
1137- <height>64</height>
1138- </size>
1139- </property>
1140- <property name="maximumSize">
1141- <size>
1142- <width>64</width>
1143- <height>64</height>
1144- </size>
1145- </property>
1146- <property name="frameShape">
1147- <enum>QFrame::StyledPanel</enum>
1148- </property>
1149- <property name="frameShadow">
1150- <enum>QFrame::Raised</enum>
1151- </property>
1152- <widget class="QLabel" name="textureIR">
1153- <property name="geometry">
1154- <rect>
1155- <x>0</x>
1156- <y>0</y>
1157- <width>64</width>
1158- <height>64</height>
1159- </rect>
1160- </property>
1161- <property name="minimumSize">
1162- <size>
1163- <width>64</width>
1164- <height>64</height>
1165- </size>
1166- </property>
1167- <property name="maximumSize">
1168- <size>
1169- <width>64</width>
1170- <height>64</height>
1171- </size>
1172- </property>
1173- <property name="styleSheet">
1174- <string notr="true">background-image: url(:/MeteorShowers/radiantSetting.png);</string>
1175- </property>
1176- <property name="text">
1177- <string/>
1178- </property>
1179- </widget>
1180+ <width>0</width>
1181+ <height>121</height>
1182+ </size>
1183+ </property>
1184+ <property name="toolTip">
1185+ <string>Active Radiant - Real Data</string>
1186+ </property>
1187+ <property name="alignment">
1188+ <set>Qt::AlignCenter</set>
1189+ </property>
1190+ <layout class="QGridLayout" name="gridLayout_2">
1191+ <property name="leftMargin">
1192+ <number>0</number>
1193+ </property>
1194+ <property name="topMargin">
1195+ <number>0</number>
1196+ </property>
1197+ <property name="rightMargin">
1198+ <number>0</number>
1199+ </property>
1200+ <property name="bottomMargin">
1201+ <number>0</number>
1202+ </property>
1203+ <property name="spacing">
1204+ <number>0</number>
1205+ </property>
1206+ <item row="1" column="0">
1207+ <widget class="QPushButton" name="changeColorARR">
1208+ <property name="toolTip">
1209+ <string>Change Color</string>
1210+ </property>
1211+ <property name="text">
1212+ <string notr="true">...</string>
1213+ </property>
1214+ </widget>
1215+ </item>
1216+ <item row="0" column="0">
1217+ <widget class="QFrame" name="frame_6">
1218+ <property name="minimumSize">
1219+ <size>
1220+ <width>64</width>
1221+ <height>64</height>
1222+ </size>
1223+ </property>
1224+ <property name="maximumSize">
1225+ <size>
1226+ <width>64</width>
1227+ <height>64</height>
1228+ </size>
1229+ </property>
1230+ <property name="frameShape">
1231+ <enum>QFrame::StyledPanel</enum>
1232+ </property>
1233+ <property name="frameShadow">
1234+ <enum>QFrame::Raised</enum>
1235+ </property>
1236+ <widget class="QLabel" name="textureARR">
1237+ <property name="geometry">
1238+ <rect>
1239+ <x>0</x>
1240+ <y>0</y>
1241+ <width>64</width>
1242+ <height>64</height>
1243+ </rect>
1244+ </property>
1245+ <property name="minimumSize">
1246+ <size>
1247+ <width>64</width>
1248+ <height>64</height>
1249+ </size>
1250+ </property>
1251+ <property name="maximumSize">
1252+ <size>
1253+ <width>64</width>
1254+ <height>64</height>
1255+ </size>
1256+ </property>
1257+ <property name="styleSheet">
1258+ <string notr="true">background-image: url(:/MeteorShowers/radiantSetting.png);</string>
1259+ </property>
1260+ <property name="text">
1261+ <string/>
1262+ </property>
1263+ </widget>
1264+ </widget>
1265+ </item>
1266+ </layout>
1267 </widget>
1268 </item>
1269 </layout>
1270 </widget>
1271 </item>
1272 <item>
1273- <widget class="QGroupBox" name="labelsGroup">
1274+ <widget class="QGroupBox" name="displayRadiant">
1275 <property name="title">
1276- <string>Label</string>
1277+ <string>Radiants for meteor showers</string>
1278 </property>
1279 <property name="flat">
1280 <bool>true</bool>
1281@@ -673,22 +633,27 @@
1282 <property name="checkable">
1283 <bool>true</bool>
1284 </property>
1285- <layout class="QGridLayout" name="gridLayout_5">
1286- <property name="topMargin">
1287- <number>4</number>
1288- </property>
1289- <property name="bottomMargin">
1290- <number>4</number>
1291- </property>
1292+ <layout class="QGridLayout" name="gridLayout_9">
1293+ <item row="1" column="0">
1294+ <widget class="QCheckBox" name="radiantLabels">
1295+ <property name="text">
1296+ <string>Show labels of radiants</string>
1297+ </property>
1298+ </widget>
1299+ </item>
1300 <item row="0" column="0">
1301- <widget class="QLabel" name="label">
1302+ <widget class="QCheckBox" name="activeRadiantsOnly">
1303 <property name="text">
1304- <string>Label font size (pixels):</string>
1305+ <string>Show active radiants only</string>
1306 </property>
1307 </widget>
1308 </item>
1309- <item row="0" column="1">
1310- <widget class="QSpinBox" name="fontSizeSpinBox"/>
1311+ <item row="1" column="1">
1312+ <widget class="QSpinBox" name="fontSizeSpinBox">
1313+ <property name="toolTip">
1314+ <string>Label font size (pixels)</string>
1315+ </property>
1316+ </widget>
1317 </item>
1318 </layout>
1319 </widget>

Subscribers

People subscribed via source and target branches