Merge lp:~daggerstab/stellarium/printsky into lp:~peppujols/stellarium/printsky
- printsky
- Merge into printsky
Proposed by
Bogdan Marinov
Status: | Merged |
---|---|
Merged at revision: | 4712 |
Proposed branch: | lp:~daggerstab/stellarium/printsky |
Merge into: | lp:~peppujols/stellarium/printsky |
Diff against target: |
590 lines (+264/-163) 6 files modified
plugins/PrintSky/PrintSky.qrc (+3/-1) plugins/PrintSky/nightStyle.css (+31/-0) plugins/PrintSky/normalStyle.css (+31/-0) plugins/PrintSky/src/PrintSky.cpp (+3/-0) plugins/PrintSky/src/gui/PrintSkyDialog.cpp (+28/-20) plugins/PrintSky/src/gui/printskyDialog.ui (+168/-142) |
To merge this branch: | bzr merge lp:~daggerstab/stellarium/printsky |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Pep Pujols | Approve | ||
Review via email: mp+40229@code.launchpad.net |
Commit message
Description of the change
These are the changes I had made to the PrintSky's code when I included it in the second experimental build, with some additional modifications.
Note that most of this is just quick fixes to make the plug-in functional. Some of the problems need to be addressed more deeply. Please see the comments in the code.
To post a comment you must log in.
Revision history for this message
Pep Pujols (peppujols) wrote : | # |
Revision history for this message
Pep Pujols (peppujols) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'plugins/PrintSky/PrintSky.qrc' |
2 | --- plugins/PrintSky/PrintSky.qrc 2010-07-02 17:07:11 +0000 |
3 | +++ plugins/PrintSky/PrintSky.qrc 2010-11-05 20:04:43 +0000 |
4 | @@ -1,4 +1,6 @@ |
5 | <RCC> |
6 | - <qresource prefix="printSky" > |
7 | + <qresource prefix="printsky"> |
8 | + <file>nightStyle.css</file> |
9 | + <file>normalStyle.css</file> |
10 | </qresource> |
11 | </RCC> |
12 | |
13 | === added file 'plugins/PrintSky/nightStyle.css' |
14 | --- plugins/PrintSky/nightStyle.css 1970-01-01 00:00:00 +0000 |
15 | +++ plugins/PrintSky/nightStyle.css 2010-11-05 20:04:43 +0000 |
16 | @@ -0,0 +1,31 @@ |
17 | +QTabBar { |
18 | + border: none; |
19 | + margin: 0px; |
20 | + padding: 0px; |
21 | + font-weight: bold; |
22 | + color: rgb(120, 0, 0); |
23 | + background-color: rgb(22, 0, 0); |
24 | + font-size: 14px; |
25 | +} |
26 | + |
27 | +QTabBar::tab { |
28 | + border: 0px; |
29 | + margin: 0px; |
30 | + padding: 4px 1ex; |
31 | + min-height: 28px; |
32 | + /*font-size: 14px; <-- Causes text being cut by the frame*/ |
33 | +} |
34 | + |
35 | +QTabBar::tab:selected { |
36 | + border: none; |
37 | + margin: 0px; |
38 | + border-top-left-radius: 10px; |
39 | + border-top-right-radius: 10px; |
40 | + color: rgb(220, 0, 0); |
41 | + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 rgb(68, 0, 0), stop: 1 rgb(86, 0, 0)); |
42 | +} |
43 | + |
44 | +QTabWidget::pane { |
45 | + margin-top: 0px; |
46 | + border-top: none; |
47 | +} |
48 | |
49 | === added file 'plugins/PrintSky/normalStyle.css' |
50 | --- plugins/PrintSky/normalStyle.css 1970-01-01 00:00:00 +0000 |
51 | +++ plugins/PrintSky/normalStyle.css 2010-11-05 20:04:43 +0000 |
52 | @@ -0,0 +1,31 @@ |
53 | +QTabBar { |
54 | + border: none; |
55 | + margin: 0px; |
56 | + padding: 0px; |
57 | + font-weight: bold; |
58 | + color: rgb(170, 173, 164); |
59 | + background-color: rgb(31, 31, 31); |
60 | + font-size: 14px; |
61 | +} |
62 | + |
63 | +QTabBar::tab { |
64 | + border: 0px; |
65 | + margin: 0px; |
66 | + padding: 4px 1ex; |
67 | + min-height: 28px; |
68 | + /*font-size: 14px; <-- Causes text being cut by the frame*/ |
69 | +} |
70 | + |
71 | +QTabBar::tab:selected { |
72 | + border: none; |
73 | + margin: 0px; |
74 | + border-top-left-radius: 10px; |
75 | + border-top-right-radius: 10px; |
76 | + color: rgb(220, 223, 214); |
77 | + background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 rgb(68, 69, 72), stop: 1 rgb(86, 87, 90)); |
78 | +} |
79 | + |
80 | +QTabWidget::pane { |
81 | + margin-top: 0px; |
82 | + border-top: none; |
83 | +} |
84 | |
85 | === modified file 'plugins/PrintSky/src/PrintSky.cpp' |
86 | --- plugins/PrintSky/src/PrintSky.cpp 2010-07-02 17:07:11 +0000 |
87 | +++ plugins/PrintSky/src/PrintSky.cpp 2010-11-05 20:04:43 +0000 |
88 | @@ -66,6 +66,9 @@ |
89 | |
90 | try |
91 | { |
92 | + //Make sure that "/modules/PrintSky" exists |
93 | + StelFileMgr::makeSureDirExistsAndIsWritable(StelFileMgr::getUserDir() + "/modules/PrintSky/"); |
94 | + |
95 | StelFileMgr::Flags flags = (StelFileMgr::Flags)(StelFileMgr::Directory|StelFileMgr::Writable); |
96 | QString printskyIniPath = StelFileMgr::findFile("modules/PrintSky/", flags) + "printsky.ini"; |
97 | |
98 | |
99 | === modified file 'plugins/PrintSky/src/gui/PrintSkyDialog.cpp' |
100 | --- plugins/PrintSky/src/gui/PrintSkyDialog.cpp 2010-07-02 17:07:11 +0000 |
101 | +++ plugins/PrintSky/src/gui/PrintSkyDialog.cpp 2010-11-05 20:04:43 +0000 |
102 | @@ -83,7 +83,7 @@ |
103 | Q_ASSERT(gui); |
104 | const StelStyle pluginStyle = GETSTELMODULE(PrintSky)->getModuleStyleSheet(gui->getStelStyle()); |
105 | dialog->setStyleSheet(pluginStyle.qtStyleSheet); |
106 | - ui->textBrowser->document()->setDefaultStyleSheet(QString(pluginStyle.htmlStyleSheet)); |
107 | + //ui->textBrowser->document()->setDefaultStyleSheet(QString(pluginStyle.htmlStyleSheet)); |
108 | } |
109 | } |
110 | |
111 | @@ -313,18 +313,16 @@ |
112 | |
113 | //Initialize the style |
114 | updateStyle(); |
115 | - |
116 | - |
117 | } |
118 | |
119 | //! Print report on a preview window |
120 | void PrintSkyDialog::previewSky() |
121 | { |
122 | - currentVisibilityGui=gui->getVisible(); |
123 | + currentVisibilityGui = gui->getVisible(); |
124 | gui->setVisible(false); |
125 | dialog->setVisible(false); |
126 | |
127 | - outputOption=true; |
128 | + outputOption = true; |
129 | |
130 | QTimer::singleShot(50, this, SLOT(executePrinterOutputOption())); |
131 | } |
132 | @@ -361,7 +359,13 @@ |
133 | StelLocation locationData=core->getNavigator()->getCurrentLocation(); |
134 | double jd = core->getNavigator()->getJDay(); |
135 | |
136 | - painter.setFont(QFont("DejaVu Sans", 10)); |
137 | + QFont font("DejaVu Sans", 10, QFont::Normal); |
138 | + painter.setFont(font); |
139 | + qDebug() << "PrintSky: printer debugging information:"; |
140 | + qDebug() << "Current printer resolution:" << printer->resolution(); |
141 | + qDebug() << "Supported printer resolutions:" << printer->supportedResolutions(); |
142 | + qDebug() << "Page size (size index, 0-30)" << printer->paperSize(); |
143 | + //For the paper size index, see http://doc.qt.nokia.com/qprinter.html#PaperSize-enum |
144 | |
145 | if (printDataOption) |
146 | { |
147 | @@ -372,14 +376,12 @@ |
148 | // painter.drawRect(surfaceData); |
149 | |
150 | |
151 | - painter.drawText(surfaceData.adjusted(0, 0, 0, -200), Qt::AlignCenter, "STELLARIUM GENERAL DATA"); |
152 | - |
153 | - QString location="Location: "; |
154 | + painter.drawText(surfaceData.adjusted(0, 0, 0, -200), Qt::AlignCenter, "CHART INFORMATION"); |
155 | |
156 | QString printLatitude=StelUtils::radToDmsStr((std::fabs(locationData.latitude)/180.)*M_PI); |
157 | QString printLongitude=StelUtils::radToDmsStr((std::fabs(locationData.longitude)/180.)*M_PI); |
158 | |
159 | - location+=QString("%1\t%2\t%3\t%4\t%5\t%6m") |
160 | + QString location = QString("Location: %1\t%2\t%3\t%4\t%5\t%6m") |
161 | .arg(locationData.name) |
162 | .arg(locationData.country) |
163 | .arg(locationData.planetName) |
164 | @@ -396,7 +398,7 @@ |
165 | |
166 | QString str; |
167 | QTextStream wos(&str); |
168 | - wos << "FOV " << qSetRealNumberPrecision(3) << core->getMovementMgr()->getCurrentFov() << QChar(0x00B0); |
169 | + wos << "FOV: " << qSetRealNumberPrecision(3) << core->getMovementMgr()->getCurrentFov() << QChar(0x00B0); |
170 | painter.drawText(surfaceData.adjusted(50, 150, 0, 0), Qt::AlignLeft, *wos.string()); |
171 | |
172 | painter.drawText(surfaceData.adjusted(surfaceData.width()-700, 0, 0, 0), Qt::AlignLeft, "Radius-magnitude relation"); |
173 | @@ -423,15 +425,15 @@ |
174 | if (printSSEphemeridesOption) |
175 | { |
176 | printer->newPage(); |
177 | - painter.drawText(0, 0, printer->paperRect().width(), 50, Qt::AlignCenter, "STELLARIUM SOLAR SYSTEM EPHEMERIDES"); |
178 | + painter.drawText(0, 0, printer->paperRect().width(), 50, Qt::AlignCenter, "SOLAR SYSTEM EPHEMERIDES"); |
179 | painter.drawText(QRect(50, 150, 300, 50), Qt::AlignCenter, "Name"); |
180 | - painter.drawText(QRect(400, 150, 300, 50), Qt::AlignCenter, "A.R."); |
181 | - painter.drawText(QRect(700, 150, 300, 50), Qt::AlignCenter, "DEC."); |
182 | + painter.drawText(QRect(400, 150, 300, 50), Qt::AlignCenter, "RA"); |
183 | + painter.drawText(QRect(700, 150, 300, 50), Qt::AlignCenter, "Dec"); |
184 | painter.drawText(QRect(950, 100, 750, 50), Qt::AlignCenter, "Local Time"); |
185 | painter.drawText(QRect(950, 150, 250, 50), Qt::AlignCenter, "Rising"); |
186 | painter.drawText(QRect(1200, 150, 250, 50), Qt::AlignCenter, "Transit"); |
187 | painter.drawText(QRect(1450, 150, 250, 50), Qt::AlignCenter, "Setting"); |
188 | - painter.drawText(QRect(1700, 150, 300, 50), Qt::AlignCenter, "Distance (UA)"); |
189 | + painter.drawText(QRect(1700, 150, 300, 50), Qt::AlignCenter, "Distance (AU)"); |
190 | painter.drawText(QRect(2000, 150, 300, 50), Qt::AlignCenter, "Ap.Magnitude"); |
191 | |
192 | SolarSystem* ssmgr = GETSTELMODULE(SolarSystem); |
193 | @@ -442,6 +444,9 @@ |
194 | PlanetP pHome=ssmgr->searchByEnglishName(locationData.planetName); |
195 | double standardSideralTime=pHome->getSiderealTime(((int) jd)+0.5)*M_PI/180.; |
196 | |
197 | + //After the introduction of the Comets and Asteroids plug-in, |
198 | + //there will be *lots* of planet names. At the very least, |
199 | + //this needs a mechanism for creating page breaks. |
200 | QStringList allBodiesNames=ssmgr->getAllPlanetEnglishNames(); |
201 | allBodiesNames.sort(); |
202 | for (int iBodyName=1, yPos=200; iBodyName<=allBodiesNames.count(); ++iBodyName) |
203 | @@ -538,19 +543,23 @@ |
204 | } |
205 | |
206 | |
207 | - QPrinter printer(QPrinter::HighResolution); |
208 | + //QPrinter printer(QPrinter::HighResolution); |
209 | + QPrinter printer(QPrinter::ScreenResolution); |
210 | + printer.setResolution(300); |
211 | printer.setDocName("STELLARIUM REPORT"); |
212 | printer.setOrientation((orientationOption=="Portrait"? QPrinter::Portrait: QPrinter::Landscape)); |
213 | |
214 | if (outputOption) |
215 | { |
216 | - QPrintPreviewDialog oPrintPreviewDialog(&printer, &StelMainGraphicsView::getInstance()); |
217 | + //QPrintPreviewDialog oPrintPreviewDialog(&printer, &StelMainGraphicsView::getInstance()); |
218 | + QPrintPreviewDialog oPrintPreviewDialog(&printer); |
219 | connect(&oPrintPreviewDialog, SIGNAL(paintRequested(QPrinter *)), this, SLOT(printDataSky(QPrinter *))); |
220 | oPrintPreviewDialog.exec(); |
221 | } |
222 | else |
223 | { |
224 | - QPrintDialog dialogPrinter(&printer, &StelMainGraphicsView::getInstance()); |
225 | + //QPrintDialog dialogPrinter(&printer, &StelMainGraphicsView::getInstance()); |
226 | + QPrintDialog dialogPrinter(&printer); |
227 | if (dialogPrinter.exec() == QDialog::Accepted) |
228 | printDataSky(&printer); |
229 | } |
230 | @@ -563,8 +572,7 @@ |
231 | |
232 | void PrintSkyDialog::enableOutputOptions(bool enable) |
233 | { |
234 | - ui->previewSkyPushButton->setEnabled(enable); |
235 | - ui->printSkyPushButton->setEnabled(enable); |
236 | + ui->buttonsFrame->setVisible(enable); |
237 | } |
238 | |
239 | |
240 | |
241 | === modified file 'plugins/PrintSky/src/gui/printskyDialog.ui' |
242 | --- plugins/PrintSky/src/gui/printskyDialog.ui 2010-07-02 17:07:11 +0000 |
243 | +++ plugins/PrintSky/src/gui/printskyDialog.ui 2010-11-05 20:04:43 +0000 |
244 | @@ -6,8 +6,8 @@ |
245 | <rect> |
246 | <x>0</x> |
247 | <y>0</y> |
248 | - <width>513</width> |
249 | - <height>342</height> |
250 | + <width>500</width> |
251 | + <height>300</height> |
252 | </rect> |
253 | </property> |
254 | <property name="sizePolicy"> |
255 | @@ -19,12 +19,9 @@ |
256 | <property name="minimumSize"> |
257 | <size> |
258 | <width>300</width> |
259 | - <height>320</height> |
260 | + <height>300</height> |
261 | </size> |
262 | </property> |
263 | - <property name="windowTitle"> |
264 | - <string>Form</string> |
265 | - </property> |
266 | <layout class="QVBoxLayout" name="verticalLayout_2"> |
267 | <property name="spacing"> |
268 | <number>0</number> |
269 | @@ -156,149 +153,166 @@ |
270 | <attribute name="title"> |
271 | <string>General</string> |
272 | </attribute> |
273 | - <widget class="QWidget" name="layoutWidget"> |
274 | - <property name="geometry"> |
275 | - <rect> |
276 | - <x>170</x> |
277 | - <y>180</y> |
278 | - <width>158</width> |
279 | - <height>25</height> |
280 | - </rect> |
281 | - </property> |
282 | - <layout class="QHBoxLayout" name="horizontalLayout"> |
283 | - <item> |
284 | - <widget class="QPushButton" name="previewSkyPushButton"> |
285 | - <property name="text"> |
286 | - <string>Preview</string> |
287 | - </property> |
288 | - </widget> |
289 | - </item> |
290 | - <item> |
291 | - <widget class="QPushButton" name="printSkyPushButton"> |
292 | - <property name="text"> |
293 | - <string>Print</string> |
294 | - </property> |
295 | - </widget> |
296 | - </item> |
297 | - </layout> |
298 | - </widget> |
299 | - <widget class="QGroupBox" name="orientationGroupBox"> |
300 | - <property name="geometry"> |
301 | - <rect> |
302 | - <x>270</x> |
303 | - <y>10</y> |
304 | - <width>181</width> |
305 | - <height>110</height> |
306 | - </rect> |
307 | - </property> |
308 | - <property name="title"> |
309 | - <string>Orientation</string> |
310 | - </property> |
311 | - <property name="alignment"> |
312 | - <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set> |
313 | - </property> |
314 | - <widget class="QRadioButton" name="orientationPortraitRadioButton"> |
315 | - <property name="geometry"> |
316 | - <rect> |
317 | - <x>20</x> |
318 | - <y>44</y> |
319 | - <width>131</width> |
320 | - <height>17</height> |
321 | - </rect> |
322 | - </property> |
323 | - <property name="text"> |
324 | - <string>Portrait</string> |
325 | - </property> |
326 | - <property name="checked"> |
327 | - <bool>true</bool> |
328 | - </property> |
329 | - </widget> |
330 | - <widget class="QRadioButton" name="orientationLandscapeRadioButton"> |
331 | - <property name="geometry"> |
332 | - <rect> |
333 | - <x>20</x> |
334 | - <y>70</y> |
335 | - <width>131</width> |
336 | - <height>17</height> |
337 | - </rect> |
338 | - </property> |
339 | - <property name="text"> |
340 | - <string>Landscape</string> |
341 | - </property> |
342 | - </widget> |
343 | - </widget> |
344 | - <widget class="QWidget" name="layoutWidget"> |
345 | - <property name="geometry"> |
346 | - <rect> |
347 | - <x>18</x> |
348 | - <y>18</y> |
349 | - <width>251</width> |
350 | - <height>88</height> |
351 | - </rect> |
352 | - </property> |
353 | - <layout class="QVBoxLayout" name="verticalLayout"> |
354 | - <item> |
355 | - <widget class="QCheckBox" name="invertColorsCheckBox"> |
356 | - <property name="text"> |
357 | - <string>Invert colors</string> |
358 | - </property> |
359 | - </widget> |
360 | - </item> |
361 | - <item> |
362 | - <widget class="QCheckBox" name="scaleToFitCheckBox"> |
363 | - <property name="text"> |
364 | - <string>Scale to fit</string> |
365 | - </property> |
366 | - </widget> |
367 | - </item> |
368 | - <item> |
369 | - <widget class="QCheckBox" name="printDataCheckBox"> |
370 | - <property name="text"> |
371 | - <string>Print general data</string> |
372 | - </property> |
373 | - </widget> |
374 | - </item> |
375 | - <item> |
376 | - <widget class="QCheckBox" name="printSSEphemeridesCheckBox"> |
377 | - <property name="text"> |
378 | - <string>Print Solar System ephemerides</string> |
379 | - </property> |
380 | - </widget> |
381 | - </item> |
382 | - </layout> |
383 | - </widget> |
384 | + <layout class="QVBoxLayout" name="verticalLayout_3"> |
385 | + <property name="spacing"> |
386 | + <number>0</number> |
387 | + </property> |
388 | + <property name="margin"> |
389 | + <number>0</number> |
390 | + </property> |
391 | + <item> |
392 | + <widget class="QGroupBox" name="groupBox"> |
393 | + <property name="title"> |
394 | + <string>Options</string> |
395 | + </property> |
396 | + <layout class="QGridLayout" name="gridLayout_2"> |
397 | + <property name="margin"> |
398 | + <number>0</number> |
399 | + </property> |
400 | + <item row="0" column="0" colspan="2"> |
401 | + <layout class="QVBoxLayout" name="verticalLayout"> |
402 | + <item> |
403 | + <widget class="QCheckBox" name="invertColorsCheckBox"> |
404 | + <property name="text"> |
405 | + <string>Invert colors</string> |
406 | + </property> |
407 | + </widget> |
408 | + </item> |
409 | + <item> |
410 | + <widget class="QCheckBox" name="scaleToFitCheckBox"> |
411 | + <property name="text"> |
412 | + <string>Scale to fit</string> |
413 | + </property> |
414 | + </widget> |
415 | + </item> |
416 | + <item> |
417 | + <widget class="QCheckBox" name="printDataCheckBox"> |
418 | + <property name="text"> |
419 | + <string>Print scene information</string> |
420 | + </property> |
421 | + </widget> |
422 | + </item> |
423 | + <item> |
424 | + <widget class="QCheckBox" name="printSSEphemeridesCheckBox"> |
425 | + <property name="text"> |
426 | + <string>Print Solar System ephemerides</string> |
427 | + </property> |
428 | + </widget> |
429 | + </item> |
430 | + </layout> |
431 | + </item> |
432 | + <item row="0" column="2"> |
433 | + <widget class="QGroupBox" name="orientationGroupBox"> |
434 | + <property name="title"> |
435 | + <string>Orientation</string> |
436 | + </property> |
437 | + <layout class="QVBoxLayout" name="verticalLayout_5"> |
438 | + <property name="margin"> |
439 | + <number>0</number> |
440 | + </property> |
441 | + <item> |
442 | + <widget class="QRadioButton" name="orientationPortraitRadioButton"> |
443 | + <property name="text"> |
444 | + <string>Portrait</string> |
445 | + </property> |
446 | + <property name="checked"> |
447 | + <bool>true</bool> |
448 | + </property> |
449 | + </widget> |
450 | + </item> |
451 | + <item> |
452 | + <widget class="QRadioButton" name="orientationLandscapeRadioButton"> |
453 | + <property name="text"> |
454 | + <string>Landscape</string> |
455 | + </property> |
456 | + </widget> |
457 | + </item> |
458 | + </layout> |
459 | + </widget> |
460 | + </item> |
461 | + <item row="1" column="0" colspan="3"> |
462 | + <widget class="QFrame" name="buttonsFrame"> |
463 | + <layout class="QHBoxLayout" name="horizontalLayout"> |
464 | + <item> |
465 | + <widget class="QPushButton" name="previewSkyPushButton"> |
466 | + <property name="text"> |
467 | + <string>Preview</string> |
468 | + </property> |
469 | + </widget> |
470 | + </item> |
471 | + <item> |
472 | + <widget class="QPushButton" name="printSkyPushButton"> |
473 | + <property name="text"> |
474 | + <string>Print</string> |
475 | + </property> |
476 | + </widget> |
477 | + </item> |
478 | + </layout> |
479 | + </widget> |
480 | + </item> |
481 | + </layout> |
482 | + </widget> |
483 | + </item> |
484 | + <item> |
485 | + <spacer name="verticalSpacer"> |
486 | + <property name="orientation"> |
487 | + <enum>Qt::Vertical</enum> |
488 | + </property> |
489 | + <property name="sizeHint" stdset="0"> |
490 | + <size> |
491 | + <width>20</width> |
492 | + <height>40</height> |
493 | + </size> |
494 | + </property> |
495 | + </spacer> |
496 | + </item> |
497 | + </layout> |
498 | </widget> |
499 | <widget class="QWidget" name="About"> |
500 | <attribute name="title"> |
501 | <string>About</string> |
502 | </attribute> |
503 | <layout class="QGridLayout" name="gridLayout"> |
504 | - <property name="leftMargin"> |
505 | - <number>12</number> |
506 | - </property> |
507 | - <property name="topMargin"> |
508 | - <number>0</number> |
509 | - </property> |
510 | - <property name="rightMargin"> |
511 | - <number>12</number> |
512 | - </property> |
513 | - <property name="bottomMargin"> |
514 | - <number>12</number> |
515 | - </property> |
516 | + <item row="1" column="0"> |
517 | + <widget class="QLabel" name="labelAbout"> |
518 | + <property name="text"> |
519 | + <string>This plugin allows the user to preview and print the current screen and some aditional data as the current location, the screen time adding the GMT difference, and also a relation radius magnitude as a field reference. |
520 | + |
521 | +In a optional second page you can get some Solar System ephemerides. |
522 | + |
523 | +Use Ctrl+P to open the print window.</string> |
524 | + </property> |
525 | + <property name="textFormat"> |
526 | + <enum>Qt::AutoText</enum> |
527 | + </property> |
528 | + <property name="alignment"> |
529 | + <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set> |
530 | + </property> |
531 | + <property name="wordWrap"> |
532 | + <bool>true</bool> |
533 | + </property> |
534 | + </widget> |
535 | + </item> |
536 | + <item row="2" column="0"> |
537 | + <spacer name="verticalSpacer_2"> |
538 | + <property name="orientation"> |
539 | + <enum>Qt::Vertical</enum> |
540 | + </property> |
541 | + <property name="sizeHint" stdset="0"> |
542 | + <size> |
543 | + <width>20</width> |
544 | + <height>40</height> |
545 | + </size> |
546 | + </property> |
547 | + </spacer> |
548 | + </item> |
549 | <item row="0" column="0"> |
550 | - <widget class="QTextBrowser" name="textBrowser"> |
551 | - <property name="html"> |
552 | - <string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> |
553 | -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> |
554 | -p, li { white-space: pre-wrap; } |
555 | -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> |
556 | -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">Author: </span><a href="maslarocaxica@gmail.com"><span style=" font-size:12pt; text-decoration: underline; color:#0000ff;">Pep Pujols</span></a></p> |
557 | -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;"></p> |
558 | -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">This plugin allow the user preview and print the current screen and some aditional data as the current location, the screen time adding the GMT difference, and also a relation radius magnitude as a field reference.</span></p> |
559 | -<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;"></p> |
560 | -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">In a optional second page you can get some Solar System ephemerides.</span></p> |
561 | -<p align="justify" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;"></p> |
562 | -<p align="justify" style=" margin-top:0px; margin-bottom:0px; margin-left:30px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Lucida Grande'; font-size:13pt;">Use the key Ctrl-P to activate the print dialog.</span></p></body></html></string> |
563 | + <widget class="QLabel" name="label"> |
564 | + <property name="text"> |
565 | + <string>Author: <a href="mailto:maslarocaxica@gmail.com">Pep Pujols</a> (with fixes by Bogdan Marinov)</string> |
566 | + </property> |
567 | + <property name="openExternalLinks"> |
568 | + <bool>true</bool> |
569 | </property> |
570 | </widget> |
571 | </item> |
572 | @@ -319,6 +333,18 @@ |
573 | <container>1</container> |
574 | </customwidget> |
575 | </customwidgets> |
576 | + <tabstops> |
577 | + <tabstop>Tabs</tabstop> |
578 | + <tabstop>invertColorsCheckBox</tabstop> |
579 | + <tabstop>scaleToFitCheckBox</tabstop> |
580 | + <tabstop>printDataCheckBox</tabstop> |
581 | + <tabstop>printSSEphemeridesCheckBox</tabstop> |
582 | + <tabstop>orientationPortraitRadioButton</tabstop> |
583 | + <tabstop>orientationLandscapeRadioButton</tabstop> |
584 | + <tabstop>previewSkyPushButton</tabstop> |
585 | + <tabstop>printSkyPushButton</tabstop> |
586 | + <tabstop>labelAbout</tabstop> |
587 | + </tabstops> |
588 | <resources/> |
589 | <connections/> |
590 | </ui> |
> Bogdan Marinov has proposed merging lp:~daggerstab/stellarium/printsky into lp:~peppujols/stellarium/printsky.
>
> Requested reviews:
> Pep Pujols (peppujols)
>
>
> These are the changes I had made to the PrintSky's code when I included it in the second experimental build, with some additional modifications.
>
> Note that most of this is just quick fixes to make the plug-in functional. Some of the problems need to be addressed more deeply. Please see the comments in the code.
Good job Bogdan.
I will look the code and merge your branch in few days.
Pep.