Merge lp:~treaves/stellarium/SearchGoto into lp:stellarium
- SearchGoto
- Merge into trunk
Status: | Merged |
---|---|
Merged at revision: | 4880 |
Proposed branch: | lp:~treaves/stellarium/SearchGoto |
Merge into: | lp:stellarium |
Diff against target: |
704 lines (+436/-47) 5 files modified
data/gui/normalStyle.css (+7/-0) src/gui/AngleSpinBox.cpp (+20/-10) src/gui/SearchDialog.cpp (+60/-26) src/gui/SearchDialog.hpp (+4/-2) src/gui/searchDialogGui.ui (+345/-9) |
To merge this branch: | bzr merge lp:~treaves/stellarium/SearchGoto |
Related bugs: | |
Related blueprints: |
Greek Character Input
(Undefined)
Search/go to redesign
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
treaves | Approve | ||
Review via email: mp+58005@code.launchpad.net |
Commit message
Description of the change
Added a Greek 'keyboard' for entering Greek characters.
Added (re-enabled) absolute GOTO spin boxes.
treaves (treaves) : | # |
barrykgerdes (barrygastro) wrote : | # |
treaves (treaves) wrote : | # |
Good idea Barry. Just committed.
On Sat, Apr 16, 2011 at 6:11 PM, barrykgerdes <email address hidden>wrote:
>
> Hi Tim
> The new search panel looks great and works well however I think there
> should be a title abve the keyboard stating what it is eg "Keboard for Greek
> Character Entry"
>
> Barry Gerdes
> Beaumont Hills Observatory
> S 33' 41' 44" E 150' 56' 32"
>
>
>
>
> > To: <email address hidden>
> > From: <email address hidden>
> > Subject: [Merge] lp:~treaves/stellarium/SearchGoto into lp:stellarium
> > Date: Sat, 16 Apr 2011 16:14:53 +0000
> >
> > treaves has proposed merging lp:~treaves/stellarium/SearchGoto into
> lp:stellarium.
> >
> > Requested reviews:
> > Stellarium (stellarium)
> >
> > For more details, see:
> > https:/
> >
> > Added a Greek 'keyboard' for entering Greek characters.
> > Added (re-enabled) absolute GOTO spin boxes.
> > --
> > https:/
> > Your team Stellarium is requested to review the proposed merge of
> lp:~treaves/stellarium/SearchGoto into lp:stellarium.
>
> --
> https:/
> You are the owner of lp:~treaves/stellarium/SearchGoto.
>
Preview Diff
1 | === modified file 'data/gui/normalStyle.css' |
2 | --- data/gui/normalStyle.css 2010-11-16 19:58:21 +0000 |
3 | +++ data/gui/normalStyle.css 2011-04-16 16:14:51 +0000 |
4 | @@ -192,6 +192,13 @@ |
5 | border: none; |
6 | } |
7 | |
8 | +QGroupBox#greekLettersGroupBox { |
9 | + font-size: 18px; |
10 | + padding-bottom: 0px; |
11 | + padding-top: 0px; |
12 | + background: transparent; |
13 | +} |
14 | + |
15 | QPushButton { |
16 | border: 1px solid rgb(0, 0, 0); |
17 | border-radius: 4px; |
18 | |
19 | === modified file 'src/gui/AngleSpinBox.cpp' |
20 | --- src/gui/AngleSpinBox.cpp 2010-02-16 15:33:33 +0000 |
21 | +++ src/gui/AngleSpinBox.cpp 2011-04-16 16:14:51 +0000 |
22 | @@ -164,9 +164,9 @@ |
23 | |
24 | QValidator::State AngleSpinBox::validate(QString& input, int& pos) const |
25 | { |
26 | + Q_UNUSED(pos); |
27 | QValidator::State state; |
28 | stringToDouble(input, &state); |
29 | - pos = pos; // shut up the compiler |
30 | return state; |
31 | } |
32 | |
33 | @@ -210,8 +210,10 @@ |
34 | input = input.mid(positivePrefix(prefix).length()); |
35 | } |
36 | |
37 | - QRegExp dmsRx("^\\s*(\\d+)\\s*[d\\x00b0](\\s*(\\d+(\\.\\d*)?)\\s*[m'](\\s*(\\d+(\\.\\d*)?)\\s*[s\"]\\s*)?)?$", Qt::CaseInsensitive); |
38 | - QRegExp hmsRx("^\\s*(\\d+)\\s*h(\\s*(\\d+(\\.\\d*)?)\\s*[m'](\\s*(\\d+(\\.\\d*)?)\\s*[s\"]\\s*)?)?$", Qt::CaseInsensitive); |
39 | + QRegExp dmsRx("^\\s*(\\d+)\\s*[d\\x00b0](\\s*(\\d+(\\.\\d*)?)\\s*[m'](\\s*(\\d+(\\.\\d*)?)\\s*[s\"]\\s*)?)?$", |
40 | + Qt::CaseInsensitive); |
41 | + QRegExp hmsRx("^\\s*(\\d+)\\s*h(\\s*(\\d+(\\.\\d*)?)\\s*[m'](\\s*(\\d+(\\.\\d*)?)\\s*[s\"]\\s*)?)?$", |
42 | + Qt::CaseInsensitive); |
43 | QRegExp decRx("^(\\d+(\\.\\d*)?)(\\s*[\\x00b0]\\s*)?$"); |
44 | QRegExp badRx("[^hdms0-9 \\x00b0'\"\\.]", Qt::CaseInsensitive); |
45 | |
46 | @@ -370,9 +372,12 @@ |
47 | signInd = negativePrefix(currentPrefixType); |
48 | |
49 | if (angleSpinBoxFormat == DMSLetters) |
50 | - lineEdit()->setText(QString("%1%2d %3m %4s").arg(signInd).arg(d).arg(m).arg(s, 0, 'f', decimalPlaces, ' ')); |
51 | + lineEdit()->setText(QString("%1%2d %3m %4s") |
52 | + .arg(signInd).arg(d).arg(m).arg(s, 0, 'f', decimalPlaces, ' ')); |
53 | else |
54 | - lineEdit()->setText(QString("%1%2%3 %4' %5\"").arg(signInd).arg(d).arg(QChar(176)).arg(m).arg(s, 0, 'f', decimalPlaces, ' ')); |
55 | + lineEdit()->setText(QString("%1%2%3 %4' %5\"") |
56 | + .arg(signInd).arg(d).arg(QChar(176)).arg(m) |
57 | + .arg(s, 0, 'f', decimalPlaces, ' ')); |
58 | break; |
59 | } |
60 | case HMSLetters: |
61 | @@ -409,9 +414,11 @@ |
62 | s= 0.0; |
63 | |
64 | if (angleSpinBoxFormat == HMSLetters) |
65 | - lineEdit()->setText(QString("%1h %2m %3s").arg(h).arg(m).arg(s, 0, 'f', decimalPlaces, ' ')); |
66 | + lineEdit()->setText(QString("%1h %2m %3s") |
67 | + .arg(h).arg(m).arg(s, 0, 'f', decimalPlaces, ' ')); |
68 | else |
69 | - lineEdit()->setText(QString("%1h %2' %3\"").arg(h).arg(m).arg(s, 0, 'f', decimalPlaces, ' ')); |
70 | + lineEdit()->setText(QString("%1h %2' %3\"") |
71 | + .arg(h).arg(m).arg(s, 0, 'f', decimalPlaces, ' ')); |
72 | break; |
73 | } |
74 | case DecimalDeg: |
75 | @@ -427,13 +434,16 @@ |
76 | signInd = negativePrefix(currentPrefixType); |
77 | } |
78 | |
79 | - // lineEdit()->setText(QString("%1%2").arg(radAngle * 180.0 / M_PI, 0, 'g', decimalPlaces, ' ').arg(QChar(176))); |
80 | - lineEdit()->setText(QString("%1%2%3").arg(signInd).arg(fmod(angle * 180.0 / M_PI, 360.0), 0, 'f', decimalPlaces, ' ').arg(QChar(176))); |
81 | + lineEdit()->setText(QString("%1%2%3") |
82 | + .arg(signInd) |
83 | + .arg(fmod(angle * 180.0 / M_PI, 360.0), 0, 'f', decimalPlaces, ' ') |
84 | + .arg(QChar(176))); |
85 | break; |
86 | } |
87 | default: |
88 | { |
89 | - qWarning() << "AngleSpinBox::formatText - WARNING - unknown format" << (int)(angleSpinBoxFormat); |
90 | + qWarning() << "AngleSpinBox::formatText - WARNING - unknown format" |
91 | + << (int)(angleSpinBoxFormat); |
92 | break; |
93 | } |
94 | } |
95 | |
96 | === modified file 'src/gui/SearchDialog.cpp' |
97 | --- src/gui/SearchDialog.cpp 2011-01-30 15:56:36 +0000 |
98 | +++ src/gui/SearchDialog.cpp 2011-04-16 16:14:51 +0000 |
99 | @@ -22,18 +22,19 @@ |
100 | #include "ui_searchDialogGui.h" |
101 | #include "StelApp.hpp" |
102 | #include "StelCore.hpp" |
103 | -#include "StelObjectMgr.hpp" |
104 | #include "StelModuleMgr.hpp" |
105 | #include "StelMovementMgr.hpp" |
106 | #include "StelNavigator.hpp" |
107 | +#include "StelObjectMgr.hpp" |
108 | #include "StelUtils.hpp" |
109 | |
110 | -#include <QTextEdit> |
111 | +#include <QDebug> |
112 | +#include <QFrame> |
113 | #include <QLabel> |
114 | +#include <QPushButton> |
115 | #include <QString> |
116 | #include <QStringList> |
117 | -#include <QDebug> |
118 | -#include <QFrame> |
119 | +#include <QTextEdit> |
120 | |
121 | #include "SimbadSearcher.hpp" |
122 | |
123 | @@ -124,22 +125,26 @@ |
124 | greekLetters.insert("gamma", QString(QChar(0x03B3))); |
125 | greekLetters.insert("delta", QString(QChar(0x03B4))); |
126 | greekLetters.insert("epsilon", QString(QChar(0x03B5))); |
127 | + |
128 | greekLetters.insert("zeta", QString(QChar(0x03B6))); |
129 | greekLetters.insert("eta", QString(QChar(0x03B7))); |
130 | greekLetters.insert("theta", QString(QChar(0x03B8))); |
131 | greekLetters.insert("iota", QString(QChar(0x03B9))); |
132 | greekLetters.insert("kappa", QString(QChar(0x03BA))); |
133 | - greekLetters.insert("lambda", QString(QChar(0x03BB))); |
134 | + |
135 | + greekLetters.insert("lambda", QString(QChar(0x03BB))); |
136 | greekLetters.insert("mu", QString(QChar(0x03BC))); |
137 | greekLetters.insert("nu", QString(QChar(0x03BD))); |
138 | greekLetters.insert("xi", QString(QChar(0x03BE))); |
139 | greekLetters.insert("omicron", QString(QChar(0x03BF))); |
140 | - greekLetters.insert("pi", QString(QChar(0x03C0))); |
141 | + |
142 | + greekLetters.insert("pi", QString(QChar(0x03C0))); |
143 | greekLetters.insert("rho", QString(QChar(0x03C1))); |
144 | greekLetters.insert("sigma", QString(QChar(0x03C3))); // second lower-case sigma shouldn't affect anything |
145 | greekLetters.insert("tau", QString(QChar(0x03C4))); |
146 | greekLetters.insert("upsilon", QString(QChar(0x03C5))); |
147 | - greekLetters.insert("phi", QString(QChar(0x03C6))); |
148 | + |
149 | + greekLetters.insert("phi", QString(QChar(0x03C6))); |
150 | greekLetters.insert("chi", QString(QChar(0x03C7))); |
151 | greekLetters.insert("psi", QString(QChar(0x03C8))); |
152 | greekLetters.insert("omega", QString(QChar(0x03C9))); |
153 | @@ -175,23 +180,46 @@ |
154 | { |
155 | ui->setupUi(dialog); |
156 | connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SLOT(languageChanged())); |
157 | - setSimpleStyle(true); |
158 | +// setSimpleStyle(); |
159 | connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())); |
160 | - connect(ui->lineEditSearchSkyObject, SIGNAL(textChanged(const QString&)), this, SLOT(onTextChanged(const QString&))); |
161 | + connect(ui->lineEditSearchSkyObject, SIGNAL(textChanged(const QString&)), |
162 | + this, SLOT(onSearchTextChanged(const QString&))); |
163 | connect(ui->pushButtonGotoSearchSkyObject, SIGNAL(clicked()), this, SLOT(gotoObject())); |
164 | - onTextChanged(ui->lineEditSearchSkyObject->text()); |
165 | + onSearchTextChanged(ui->lineEditSearchSkyObject->text()); |
166 | connect(ui->lineEditSearchSkyObject, SIGNAL(returnPressed()), this, SLOT(gotoObject())); |
167 | - dialog->installEventFilter(this); |
168 | + |
169 | + ui->lineEditSearchSkyObject->installEventFilter(this); |
170 | ui->RAAngleSpinBox->setDisplayFormat(AngleSpinBox::HMSLetters); |
171 | ui->DEAngleSpinBox->setDisplayFormat(AngleSpinBox::DMSSymbols); |
172 | ui->DEAngleSpinBox->setPrefixType(AngleSpinBox::NormalPlus); |
173 | |
174 | - // This simply doesn't work. Probably a Qt bug |
175 | - ui->RAAngleSpinBox->setFocusPolicy(Qt::NoFocus); |
176 | - ui->DEAngleSpinBox->setFocusPolicy(Qt::NoFocus); |
177 | - |
178 | connect(ui->RAAngleSpinBox, SIGNAL(valueChanged()), this, SLOT(manualPositionChanged())); |
179 | connect(ui->DEAngleSpinBox, SIGNAL(valueChanged()), this, SLOT(manualPositionChanged())); |
180 | + |
181 | + connect(ui->alphaPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
182 | + connect(ui->betaPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
183 | + connect(ui->gammaPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
184 | + connect(ui->deltaPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
185 | + connect(ui->epsilonPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
186 | + connect(ui->zetaPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
187 | + connect(ui->etaPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
188 | + connect(ui->thetaPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
189 | + connect(ui->iotaPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
190 | + connect(ui->kappaPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
191 | + connect(ui->lambdaPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
192 | + connect(ui->muPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
193 | + connect(ui->nuPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
194 | + connect(ui->xiPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
195 | + connect(ui->omicronPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
196 | + connect(ui->piPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
197 | + connect(ui->rhoPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
198 | + connect(ui->sigmaPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
199 | + connect(ui->tauPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
200 | + connect(ui->upsilonPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
201 | + connect(ui->phiPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
202 | + connect(ui->chiPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
203 | + connect(ui->psiPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
204 | + connect(ui->omegaPushButton, SIGNAL(clicked(bool)), this, SLOT(greekLetterClicked())); |
205 | } |
206 | |
207 | void SearchDialog::setVisible(bool v) |
208 | @@ -203,14 +231,15 @@ |
209 | ui->lineEditSearchSkyObject->setFocus(); |
210 | } |
211 | |
212 | -void SearchDialog::setSimpleStyle(bool b) |
213 | +void SearchDialog::setSimpleStyle() |
214 | { |
215 | - ui->RAAngleSpinBox->setVisible(!b); |
216 | - ui->DEAngleSpinBox->setVisible(!b); |
217 | + ui->RAAngleSpinBox->setVisible(false); |
218 | + ui->DEAngleSpinBox->setVisible(false); |
219 | ui->simbadStatusLabel->setVisible(false); |
220 | - ui->raDecLabel->setVisible(!b); |
221 | + ui->raDecLabel->setVisible(false); |
222 | } |
223 | |
224 | + |
225 | void SearchDialog::manualPositionChanged() |
226 | { |
227 | ui->completionLabel->clearValues(); |
228 | @@ -221,7 +250,7 @@ |
229 | mvmgr->moveToJ2000(pos, 0.05); |
230 | } |
231 | |
232 | -void SearchDialog::onTextChanged(const QString& text) |
233 | +void SearchDialog::onSearchTextChanged(const QString& text) |
234 | { |
235 | if (simbadReply) |
236 | { |
237 | @@ -253,7 +282,9 @@ |
238 | matches += objectMgr->listMatchingObjectsI18n(greekText, (5 - matches.size())); |
239 | } |
240 | else |
241 | + { |
242 | matches = objectMgr->listMatchingObjectsI18n(trimmedText, 5); |
243 | + } |
244 | |
245 | ui->completionLabel->setValues(matches); |
246 | ui->completionLabel->selectFirst(); |
247 | @@ -295,11 +326,19 @@ |
248 | simbadReply=NULL; |
249 | |
250 | // Update push button enabled state |
251 | - // Update push button enabled state |
252 | ui->pushButtonGotoSearchSkyObject->setEnabled(!ui->completionLabel->isEmpty()); |
253 | } |
254 | } |
255 | |
256 | +void SearchDialog::greekLetterClicked() |
257 | +{ |
258 | + QPushButton *sender = reinterpret_cast<QPushButton *>(this->sender()); |
259 | + if (sender) { |
260 | + ui->lineEditSearchSkyObject->setText(ui->lineEditSearchSkyObject->text() + sender->text()); |
261 | + } |
262 | + ui->lineEditSearchSkyObject->setFocus(); |
263 | +} |
264 | + |
265 | void SearchDialog::gotoObject() |
266 | { |
267 | QString name = ui->completionLabel->getSelected(); |
268 | @@ -346,11 +385,6 @@ |
269 | { |
270 | QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event); |
271 | |
272 | - // Kludgy workaround for Qt focusPolicy bug. Get rid of this if |
273 | - // they ever fix it. |
274 | - if(keyEvent->key() == Qt::Key_Tab) |
275 | - ui->lineEditSearchSkyObject->setFocus(Qt::OtherFocusReason); |
276 | - |
277 | if (keyEvent->key() == Qt::Key_Tab || keyEvent->key() == Qt::Key_Down) |
278 | { |
279 | ui->completionLabel->selectNext(); |
280 | |
281 | === modified file 'src/gui/SearchDialog.hpp' |
282 | --- src/gui/SearchDialog.hpp 2011-01-30 15:56:36 +0000 |
283 | +++ src/gui/SearchDialog.hpp 2011-04-16 16:14:51 +0000 |
284 | @@ -70,12 +70,13 @@ |
285 | //! Notify that the application style changed |
286 | void styleChanged(); |
287 | bool eventFilter(QObject *object, QEvent *event); |
288 | - void setSimpleStyle(bool b); |
289 | |
290 | public slots: |
291 | void languageChanged(); |
292 | //! Add auto focus of the edit line |
293 | void setVisible(bool); |
294 | + //! This style only displays the text search field and the search button |
295 | + void setSimpleStyle(); |
296 | |
297 | protected: |
298 | Ui_searchDialogForm* ui; |
299 | @@ -83,10 +84,11 @@ |
300 | virtual void createDialogContent(); |
301 | |
302 | private slots: |
303 | + void greekLetterClicked(); |
304 | //! Called when the current simbad query status changes |
305 | void onSimbadStatusChanged(); |
306 | //! Called when the user changed the input text |
307 | - void onTextChanged(const QString& text); |
308 | + void onSearchTextChanged(const QString& text); |
309 | |
310 | void gotoObject(); |
311 | |
312 | |
313 | === modified file 'src/gui/searchDialogGui.ui' |
314 | --- src/gui/searchDialogGui.ui 2010-11-02 20:01:10 +0000 |
315 | +++ src/gui/searchDialogGui.ui 2011-04-16 16:14:51 +0000 |
316 | @@ -6,8 +6,8 @@ |
317 | <rect> |
318 | <x>0</x> |
319 | <y>0</y> |
320 | - <width>399</width> |
321 | - <height>125</height> |
322 | + <width>493</width> |
323 | + <height>199</height> |
324 | </rect> |
325 | </property> |
326 | <property name="sizePolicy"> |
327 | @@ -162,9 +162,6 @@ |
328 | <enum>QFrame::StyledPanel</enum> |
329 | </property> |
330 | <layout class="QHBoxLayout" name="horizontalLayout"> |
331 | - <property name="spacing"> |
332 | - <number>6</number> |
333 | - </property> |
334 | <property name="margin"> |
335 | <number>0</number> |
336 | </property> |
337 | @@ -272,6 +269,339 @@ |
338 | </widget> |
339 | </item> |
340 | <item> |
341 | + <widget class="QGroupBox" name="greekLettersGroupBox"> |
342 | + <property name="sizePolicy"> |
343 | + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> |
344 | + <horstretch>0</horstretch> |
345 | + <verstretch>0</verstretch> |
346 | + </sizepolicy> |
347 | + </property> |
348 | + <property name="title"> |
349 | + <string/> |
350 | + </property> |
351 | + <layout class="QGridLayout" name="gridLayout"> |
352 | + <property name="margin"> |
353 | + <number>0</number> |
354 | + </property> |
355 | + <property name="spacing"> |
356 | + <number>0</number> |
357 | + </property> |
358 | + <item row="0" column="0"> |
359 | + <widget class="QPushButton" name="alphaPushButton"> |
360 | + <property name="focusPolicy"> |
361 | + <enum>Qt::NoFocus</enum> |
362 | + </property> |
363 | + <property name="toolTip"> |
364 | + <string>alpha</string> |
365 | + </property> |
366 | + <property name="text"> |
367 | + <string notr="true">α</string> |
368 | + </property> |
369 | + </widget> |
370 | + </item> |
371 | + <item row="0" column="1"> |
372 | + <widget class="QPushButton" name="betaPushButton"> |
373 | + <property name="focusPolicy"> |
374 | + <enum>Qt::NoFocus</enum> |
375 | + </property> |
376 | + <property name="toolTip"> |
377 | + <string>beta</string> |
378 | + </property> |
379 | + <property name="text"> |
380 | + <string notr="true">β</string> |
381 | + </property> |
382 | + </widget> |
383 | + </item> |
384 | + <item row="0" column="2"> |
385 | + <widget class="QPushButton" name="gammaPushButton"> |
386 | + <property name="focusPolicy"> |
387 | + <enum>Qt::NoFocus</enum> |
388 | + </property> |
389 | + <property name="toolTip"> |
390 | + <string>gamma</string> |
391 | + </property> |
392 | + <property name="text"> |
393 | + <string notr="true">γ</string> |
394 | + </property> |
395 | + </widget> |
396 | + </item> |
397 | + <item row="0" column="3"> |
398 | + <widget class="QPushButton" name="deltaPushButton"> |
399 | + <property name="focusPolicy"> |
400 | + <enum>Qt::NoFocus</enum> |
401 | + </property> |
402 | + <property name="toolTip"> |
403 | + <string>delta</string> |
404 | + </property> |
405 | + <property name="text"> |
406 | + <string notr="true">δ</string> |
407 | + </property> |
408 | + </widget> |
409 | + </item> |
410 | + <item row="0" column="4"> |
411 | + <widget class="QPushButton" name="epsilonPushButton"> |
412 | + <property name="focusPolicy"> |
413 | + <enum>Qt::NoFocus</enum> |
414 | + </property> |
415 | + <property name="toolTip"> |
416 | + <string>epsilon</string> |
417 | + </property> |
418 | + <property name="text"> |
419 | + <string notr="true">ε</string> |
420 | + </property> |
421 | + </widget> |
422 | + </item> |
423 | + <item row="0" column="5"> |
424 | + <widget class="QPushButton" name="zetaPushButton"> |
425 | + <property name="focusPolicy"> |
426 | + <enum>Qt::NoFocus</enum> |
427 | + </property> |
428 | + <property name="toolTip"> |
429 | + <string>zeta</string> |
430 | + </property> |
431 | + <property name="text"> |
432 | + <string notr="true">ζ</string> |
433 | + </property> |
434 | + </widget> |
435 | + </item> |
436 | + <item row="0" column="6"> |
437 | + <widget class="QPushButton" name="etaPushButton"> |
438 | + <property name="focusPolicy"> |
439 | + <enum>Qt::NoFocus</enum> |
440 | + </property> |
441 | + <property name="toolTip"> |
442 | + <string>eta</string> |
443 | + </property> |
444 | + <property name="text"> |
445 | + <string notr="true">η</string> |
446 | + </property> |
447 | + </widget> |
448 | + </item> |
449 | + <item row="0" column="7"> |
450 | + <widget class="QPushButton" name="thetaPushButton"> |
451 | + <property name="focusPolicy"> |
452 | + <enum>Qt::NoFocus</enum> |
453 | + </property> |
454 | + <property name="toolTip"> |
455 | + <string>theta</string> |
456 | + </property> |
457 | + <property name="text"> |
458 | + <string notr="true">θ</string> |
459 | + </property> |
460 | + </widget> |
461 | + </item> |
462 | + <item row="0" column="8"> |
463 | + <widget class="QPushButton" name="iotaPushButton"> |
464 | + <property name="focusPolicy"> |
465 | + <enum>Qt::NoFocus</enum> |
466 | + </property> |
467 | + <property name="toolTip"> |
468 | + <string>iota</string> |
469 | + </property> |
470 | + <property name="text"> |
471 | + <string notr="true">ι</string> |
472 | + </property> |
473 | + </widget> |
474 | + </item> |
475 | + <item row="0" column="9"> |
476 | + <widget class="QPushButton" name="kappaPushButton"> |
477 | + <property name="focusPolicy"> |
478 | + <enum>Qt::NoFocus</enum> |
479 | + </property> |
480 | + <property name="toolTip"> |
481 | + <string>kappa</string> |
482 | + </property> |
483 | + <property name="text"> |
484 | + <string notr="true">κ</string> |
485 | + </property> |
486 | + </widget> |
487 | + </item> |
488 | + <item row="0" column="10"> |
489 | + <widget class="QPushButton" name="lambdaPushButton"> |
490 | + <property name="focusPolicy"> |
491 | + <enum>Qt::NoFocus</enum> |
492 | + </property> |
493 | + <property name="toolTip"> |
494 | + <string>lambda</string> |
495 | + </property> |
496 | + <property name="text"> |
497 | + <string notr="true">λ</string> |
498 | + </property> |
499 | + </widget> |
500 | + </item> |
501 | + <item row="0" column="11"> |
502 | + <widget class="QPushButton" name="muPushButton"> |
503 | + <property name="focusPolicy"> |
504 | + <enum>Qt::NoFocus</enum> |
505 | + </property> |
506 | + <property name="toolTip"> |
507 | + <string>mu</string> |
508 | + </property> |
509 | + <property name="text"> |
510 | + <string notr="true">μ</string> |
511 | + </property> |
512 | + </widget> |
513 | + </item> |
514 | + <item row="1" column="0"> |
515 | + <widget class="QPushButton" name="nuPushButton"> |
516 | + <property name="focusPolicy"> |
517 | + <enum>Qt::NoFocus</enum> |
518 | + </property> |
519 | + <property name="toolTip"> |
520 | + <string>nu</string> |
521 | + </property> |
522 | + <property name="text"> |
523 | + <string notr="true">ν</string> |
524 | + </property> |
525 | + </widget> |
526 | + </item> |
527 | + <item row="1" column="1"> |
528 | + <widget class="QPushButton" name="xiPushButton"> |
529 | + <property name="focusPolicy"> |
530 | + <enum>Qt::NoFocus</enum> |
531 | + </property> |
532 | + <property name="toolTip"> |
533 | + <string>xi</string> |
534 | + </property> |
535 | + <property name="text"> |
536 | + <string notr="true">ξ</string> |
537 | + </property> |
538 | + </widget> |
539 | + </item> |
540 | + <item row="1" column="2"> |
541 | + <widget class="QPushButton" name="omicronPushButton"> |
542 | + <property name="focusPolicy"> |
543 | + <enum>Qt::NoFocus</enum> |
544 | + </property> |
545 | + <property name="toolTip"> |
546 | + <string>omicron</string> |
547 | + </property> |
548 | + <property name="text"> |
549 | + <string notr="true">ο</string> |
550 | + </property> |
551 | + </widget> |
552 | + </item> |
553 | + <item row="1" column="3"> |
554 | + <widget class="QPushButton" name="piPushButton"> |
555 | + <property name="focusPolicy"> |
556 | + <enum>Qt::NoFocus</enum> |
557 | + </property> |
558 | + <property name="toolTip"> |
559 | + <string>pi</string> |
560 | + </property> |
561 | + <property name="text"> |
562 | + <string notr="true">π</string> |
563 | + </property> |
564 | + </widget> |
565 | + </item> |
566 | + <item row="1" column="4"> |
567 | + <widget class="QPushButton" name="rhoPushButton"> |
568 | + <property name="focusPolicy"> |
569 | + <enum>Qt::NoFocus</enum> |
570 | + </property> |
571 | + <property name="toolTip"> |
572 | + <string>rho</string> |
573 | + </property> |
574 | + <property name="text"> |
575 | + <string notr="true">ρ</string> |
576 | + </property> |
577 | + </widget> |
578 | + </item> |
579 | + <item row="1" column="5"> |
580 | + <widget class="QPushButton" name="sigmaPushButton"> |
581 | + <property name="focusPolicy"> |
582 | + <enum>Qt::NoFocus</enum> |
583 | + </property> |
584 | + <property name="toolTip"> |
585 | + <string>sigma</string> |
586 | + </property> |
587 | + <property name="text"> |
588 | + <string notr="true">σ</string> |
589 | + </property> |
590 | + </widget> |
591 | + </item> |
592 | + <item row="1" column="6"> |
593 | + <widget class="QPushButton" name="tauPushButton"> |
594 | + <property name="focusPolicy"> |
595 | + <enum>Qt::NoFocus</enum> |
596 | + </property> |
597 | + <property name="toolTip"> |
598 | + <string>tau</string> |
599 | + </property> |
600 | + <property name="text"> |
601 | + <string notr="true">τ</string> |
602 | + </property> |
603 | + </widget> |
604 | + </item> |
605 | + <item row="1" column="7"> |
606 | + <widget class="QPushButton" name="upsilonPushButton"> |
607 | + <property name="focusPolicy"> |
608 | + <enum>Qt::NoFocus</enum> |
609 | + </property> |
610 | + <property name="toolTip"> |
611 | + <string>upsilon</string> |
612 | + </property> |
613 | + <property name="text"> |
614 | + <string notr="true">υ</string> |
615 | + </property> |
616 | + </widget> |
617 | + </item> |
618 | + <item row="1" column="8"> |
619 | + <widget class="QPushButton" name="phiPushButton"> |
620 | + <property name="focusPolicy"> |
621 | + <enum>Qt::NoFocus</enum> |
622 | + </property> |
623 | + <property name="toolTip"> |
624 | + <string>phi</string> |
625 | + </property> |
626 | + <property name="text"> |
627 | + <string notr="true">φ</string> |
628 | + </property> |
629 | + </widget> |
630 | + </item> |
631 | + <item row="1" column="9"> |
632 | + <widget class="QPushButton" name="chiPushButton"> |
633 | + <property name="focusPolicy"> |
634 | + <enum>Qt::NoFocus</enum> |
635 | + </property> |
636 | + <property name="toolTip"> |
637 | + <string>chi</string> |
638 | + </property> |
639 | + <property name="text"> |
640 | + <string notr="true">χ</string> |
641 | + </property> |
642 | + </widget> |
643 | + </item> |
644 | + <item row="1" column="10"> |
645 | + <widget class="QPushButton" name="psiPushButton"> |
646 | + <property name="focusPolicy"> |
647 | + <enum>Qt::NoFocus</enum> |
648 | + </property> |
649 | + <property name="toolTip"> |
650 | + <string>psi</string> |
651 | + </property> |
652 | + <property name="text"> |
653 | + <string notr="true">ψ</string> |
654 | + </property> |
655 | + </widget> |
656 | + </item> |
657 | + <item row="1" column="11"> |
658 | + <widget class="QPushButton" name="omegaPushButton"> |
659 | + <property name="focusPolicy"> |
660 | + <enum>Qt::NoFocus</enum> |
661 | + </property> |
662 | + <property name="toolTip"> |
663 | + <string>omega</string> |
664 | + </property> |
665 | + <property name="text"> |
666 | + <string notr="true">ω</string> |
667 | + </property> |
668 | + </widget> |
669 | + </item> |
670 | + </layout> |
671 | + </widget> |
672 | + </item> |
673 | + <item> |
674 | <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,1,1,1"> |
675 | <property name="spacing"> |
676 | <number>6</number> |
677 | @@ -294,8 +624,11 @@ |
678 | </item> |
679 | <item> |
680 | <widget class="AngleSpinBox" name="RAAngleSpinBox"> |
681 | - <property name="focusPolicy"> |
682 | - <enum>Qt::NoFocus</enum> |
683 | + <property name="sizePolicy"> |
684 | + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> |
685 | + <horstretch>0</horstretch> |
686 | + <verstretch>0</verstretch> |
687 | + </sizepolicy> |
688 | </property> |
689 | </widget> |
690 | </item> |
691 | @@ -317,8 +650,11 @@ |
692 | </item> |
693 | <item> |
694 | <widget class="AngleSpinBox" name="DEAngleSpinBox"> |
695 | - <property name="focusPolicy"> |
696 | - <enum>Qt::NoFocus</enum> |
697 | + <property name="sizePolicy"> |
698 | + <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> |
699 | + <horstretch>0</horstretch> |
700 | + <verstretch>0</verstretch> |
701 | + </sizepolicy> |
702 | </property> |
703 | </widget> |
704 | </item> |
Hi Tim
The new search panel looks great and works well however I think there should be a title abve the keyboard stating what it is eg "Keboard for Greek Character Entry"
Barry Gerdes
Beaumont Hills Observatory
S 33' 41' 44" E 150' 56' 32"
> To: <email address hidden> /code.launchpad .net/~treaves/ stellarium/ SearchGoto/ +merge/ 58005 /code.launchpad .net/~treaves/ stellarium/ SearchGoto/ +merge/ 58005
> From: <email address hidden>
> Subject: [Merge] lp:~treaves/stellarium/SearchGoto into lp:stellarium
> Date: Sat, 16 Apr 2011 16:14:53 +0000
>
> treaves has proposed merging lp:~treaves/stellarium/SearchGoto into lp:stellarium.
>
> Requested reviews:
> Stellarium (stellarium)
>
> For more details, see:
> https:/
>
> Added a Greek 'keyboard' for entering Greek characters.
> Added (re-enabled) absolute GOTO spin boxes.
> --
> https:/
> Your team Stellarium is requested to review the proposed merge of lp:~treaves/stellarium/SearchGoto into lp:stellarium.