author | mickeyl <mickeyl> | 2004-08-24 22:03:14 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-08-24 22:03:14 (UTC) |
commit | bc5cab6c01856b89c8b407fe7cccdb52cfcb5697 (patch) (unidiff) | |
tree | ccae965c22eed8e2e6bdfc8043b3977907a07398 | |
parent | 73253e93327cf4ef0932de1b4afb56af22a0f37e (diff) | |
download | opie-bc5cab6c01856b89c8b407fe7cccdb52cfcb5697.zip opie-bc5cab6c01856b89c8b407fe7cccdb52cfcb5697.tar.gz opie-bc5cab6c01856b89c8b407fe7cccdb52cfcb5697.tar.bz2 |
- tweak version preparing the next release
- add eilers
- show fullscreen on small screens
-rw-r--r-- | core/applets/aboutapplet/about.cpp | 4 | ||||
-rw-r--r-- | core/applets/aboutapplet/dialog.ui | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/core/applets/aboutapplet/about.cpp b/core/applets/aboutapplet/about.cpp index bbdc1b1..3952d0a 100644 --- a/core/applets/aboutapplet/about.cpp +++ b/core/applets/aboutapplet/about.cpp | |||
@@ -1,27 +1,28 @@ | |||
1 | #include "about.h" | 1 | #include "about.h" |
2 | #include "dialog.h" | 2 | #include "dialog.h" |
3 | 3 | ||
4 | #include <qpe/qpeapplication.h> | ||
4 | #include <qpe/resource.h> | 5 | #include <qpe/resource.h> |
5 | #include <qpe/qcopenvelope_qws.h> | 6 | #include <qpe/qcopenvelope_qws.h> |
6 | 7 | ||
7 | #include <qapplication.h> | 8 | #include <qapplication.h> |
8 | #include <qlabel.h> | 9 | #include <qlabel.h> |
9 | 10 | ||
10 | AboutApplet::AboutApplet ( ) | 11 | AboutApplet::AboutApplet ( ) |
11 | : QObject ( 0, "AboutApplet" ) | 12 | : QObject ( 0, "AboutApplet" ) |
12 | {} | 13 | {} |
13 | 14 | ||
14 | AboutApplet::~AboutApplet ( ) | 15 | AboutApplet::~AboutApplet ( ) |
15 | {} | 16 | {} |
16 | 17 | ||
17 | int AboutApplet::position ( ) const | 18 | int AboutApplet::position ( ) const |
18 | { | 19 | { |
19 | return 1; | 20 | return 1; |
20 | } | 21 | } |
21 | 22 | ||
22 | QString AboutApplet::name ( ) const | 23 | QString AboutApplet::name ( ) const |
23 | { | 24 | { |
24 | return tr( "About shortcut" ); | 25 | return tr( "About shortcut" ); |
25 | } | 26 | } |
26 | 27 | ||
27 | QString AboutApplet::text ( ) const | 28 | QString AboutApplet::text ( ) const |
@@ -39,50 +40,49 @@ QString AboutApplet::tr( const char* s, const char* p ) const | |||
39 | return qApp->translate( "AboutApplet", s, p ); | 40 | return qApp->translate( "AboutApplet", s, p ); |
40 | } | 41 | } |
41 | 42 | ||
42 | QIconSet AboutApplet::icon ( ) const | 43 | QIconSet AboutApplet::icon ( ) const |
43 | { | 44 | { |
44 | QPixmap pix; | 45 | QPixmap pix; |
45 | QImage img = Resource::loadImage ( "logo/opielogo" ); | 46 | QImage img = Resource::loadImage ( "logo/opielogo" ); |
46 | 47 | ||
47 | if ( !img. isNull ( ) ) | 48 | if ( !img. isNull ( ) ) |
48 | pix. convertFromImage ( img. smoothScale ( 14, 14 ) ); | 49 | pix. convertFromImage ( img. smoothScale ( 14, 14 ) ); |
49 | return pix; | 50 | return pix; |
50 | } | 51 | } |
51 | 52 | ||
52 | QPopupMenu *AboutApplet::popup ( QWidget * ) const | 53 | QPopupMenu *AboutApplet::popup ( QWidget * ) const |
53 | { | 54 | { |
54 | return 0; | 55 | return 0; |
55 | } | 56 | } |
56 | 57 | ||
57 | void AboutApplet::activated() | 58 | void AboutApplet::activated() |
58 | { | 59 | { |
59 | AboutDialog* d = new AboutDialog( qApp->mainWidget(), "aboutDialog", true ); | 60 | AboutDialog* d = new AboutDialog( qApp->mainWidget(), "aboutDialog", true ); |
60 | if ( qApp->desktop()->width() == 240 ) | 61 | if ( qApp->desktop()->width() == 240 ) |
61 | { | 62 | { |
62 | d->logo->hide(); | 63 | d->logo->hide(); |
63 | d->setFixedWidth( qApp->desktop()->width() - 5 ); | 64 | d->showMaximized(); |
64 | d->setFixedHeight( qApp->desktop()->height() - 50 ); | ||
65 | } | 65 | } |
66 | d->exec(); | 66 | d->exec(); |
67 | } | 67 | } |
68 | 68 | ||
69 | QRESULT AboutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) | 69 | QRESULT AboutApplet::queryInterface ( const QUuid &uuid, QUnknownInterface **iface ) |
70 | { | 70 | { |
71 | *iface = 0; | 71 | *iface = 0; |
72 | if ( uuid == IID_QUnknown ) | 72 | if ( uuid == IID_QUnknown ) |
73 | * iface = this; | 73 | * iface = this; |
74 | else if ( uuid == IID_MenuApplet ) | 74 | else if ( uuid == IID_MenuApplet ) |
75 | * iface = this; | 75 | * iface = this; |
76 | else | 76 | else |
77 | return QS_FALSE; | 77 | return QS_FALSE; |
78 | 78 | ||
79 | if ( *iface ) | 79 | if ( *iface ) |
80 | ( *iface ) -> addRef ( ); | 80 | ( *iface ) -> addRef ( ); |
81 | return QS_OK; | 81 | return QS_OK; |
82 | } | 82 | } |
83 | 83 | ||
84 | Q_EXPORT_INTERFACE( ) | 84 | Q_EXPORT_INTERFACE( ) |
85 | { | 85 | { |
86 | Q_CREATE_INSTANCE( AboutApplet ) | 86 | Q_CREATE_INSTANCE( AboutApplet ) |
87 | } | 87 | } |
88 | 88 | ||
diff --git a/core/applets/aboutapplet/dialog.ui b/core/applets/aboutapplet/dialog.ui index dac241f..539bde1 100644 --- a/core/applets/aboutapplet/dialog.ui +++ b/core/applets/aboutapplet/dialog.ui | |||
@@ -1,69 +1,69 @@ | |||
1 | <!DOCTYPE UI><UI> | 1 | <!DOCTYPE UI><UI> |
2 | <class>AboutDialog</class> | 2 | <class>AboutDialog</class> |
3 | <widget> | 3 | <widget> |
4 | <class>QDialog</class> | 4 | <class>QDialog</class> |
5 | <property stdset="1"> | 5 | <property stdset="1"> |
6 | <name>name</name> | 6 | <name>name</name> |
7 | <cstring>AboutDialog</cstring> | 7 | <cstring>AboutDialog</cstring> |
8 | </property> | 8 | </property> |
9 | <property stdset="1"> | 9 | <property stdset="1"> |
10 | <name>geometry</name> | 10 | <name>geometry</name> |
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>402</width> | 14 | <width>398</width> |
15 | <height>210</height> | 15 | <height>210</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
18 | <property stdset="1"> | 18 | <property stdset="1"> |
19 | <name>caption</name> | 19 | <name>caption</name> |
20 | <string>About</string> | 20 | <string>About</string> |
21 | </property> | 21 | </property> |
22 | <property> | 22 | <property> |
23 | <name>layoutMargin</name> | 23 | <name>layoutMargin</name> |
24 | </property> | 24 | </property> |
25 | <property> | 25 | <property> |
26 | <name>layoutSpacing</name> | 26 | <name>layoutSpacing</name> |
27 | </property> | 27 | </property> |
28 | <grid> | 28 | <grid> |
29 | <property stdset="1"> | 29 | <property stdset="1"> |
30 | <name>margin</name> | 30 | <name>margin</name> |
31 | <number>2</number> | 31 | <number>2</number> |
32 | </property> | 32 | </property> |
33 | <property stdset="1"> | 33 | <property stdset="1"> |
34 | <name>spacing</name> | 34 | <name>spacing</name> |
35 | <number>1</number> | 35 | <number>1</number> |
36 | </property> | 36 | </property> |
37 | <widget row="0" column="0" rowspan="1" colspan="2" > | 37 | <widget row="0" column="0" rowspan="1" colspan="2" > |
38 | <class>QLabel</class> | 38 | <class>QLabel</class> |
39 | <property stdset="1"> | 39 | <property stdset="1"> |
40 | <name>name</name> | 40 | <name>name</name> |
41 | <cstring>TextLabel1</cstring> | 41 | <cstring>TextLabel1</cstring> |
42 | </property> | 42 | </property> |
43 | <property stdset="1"> | 43 | <property stdset="1"> |
44 | <name>text</name> | 44 | <name>text</name> |
45 | <string><center><b>The Open Palmtop Integrated Environment V1.1.3</b></center></string> | 45 | <string><center><b>The Open Palmtop Integrated Environment V1.1.6</b></center></string> |
46 | </property> | 46 | </property> |
47 | </widget> | 47 | </widget> |
48 | <widget row="1" column="0" > | 48 | <widget row="1" column="0" > |
49 | <class>QLabel</class> | 49 | <class>QLabel</class> |
50 | <property stdset="1"> | 50 | <property stdset="1"> |
51 | <name>name</name> | 51 | <name>name</name> |
52 | <cstring>logo</cstring> | 52 | <cstring>logo</cstring> |
53 | </property> | 53 | </property> |
54 | <property stdset="1"> | 54 | <property stdset="1"> |
55 | <name>palette</name> | 55 | <name>palette</name> |
56 | <palette> | 56 | <palette> |
57 | <active> | 57 | <active> |
58 | <color> | 58 | <color> |
59 | <red>0</red> | 59 | <red>0</red> |
60 | <green>0</green> | 60 | <green>0</green> |
61 | <blue>0</blue> | 61 | <blue>0</blue> |
62 | </color> | 62 | </color> |
63 | <color> | 63 | <color> |
64 | <red>197</red> | 64 | <red>197</red> |
65 | <green>196</green> | 65 | <green>196</green> |
66 | <blue>185</blue> | 66 | <blue>185</blue> |
67 | </color> | 67 | </color> |
68 | <color> | 68 | <color> |
69 | <red>255</red> | 69 | <red>255</red> |
@@ -361,48 +361,49 @@ Visit <i>http://opie.handhelds.org</i> for more information on the O | |||
361 | </property> | 361 | </property> |
362 | <attribute> | 362 | <attribute> |
363 | <name>title</name> | 363 | <name>title</name> |
364 | <string>Authors</string> | 364 | <string>Authors</string> |
365 | </attribute> | 365 | </attribute> |
366 | <hbox> | 366 | <hbox> |
367 | <property stdset="1"> | 367 | <property stdset="1"> |
368 | <name>margin</name> | 368 | <name>margin</name> |
369 | <number>1</number> | 369 | <number>1</number> |
370 | </property> | 370 | </property> |
371 | <property stdset="1"> | 371 | <property stdset="1"> |
372 | <name>spacing</name> | 372 | <name>spacing</name> |
373 | <number>1</number> | 373 | <number>1</number> |
374 | </property> | 374 | </property> |
375 | <widget> | 375 | <widget> |
376 | <class>QTextBrowser</class> | 376 | <class>QTextBrowser</class> |
377 | <property stdset="1"> | 377 | <property stdset="1"> |
378 | <name>name</name> | 378 | <name>name</name> |
379 | <cstring>TextBrowser2</cstring> | 379 | <cstring>TextBrowser2</cstring> |
380 | </property> | 380 | </property> |
381 | <property stdset="1"> | 381 | <property stdset="1"> |
382 | <name>text</name> | 382 | <name>text</name> |
383 | <string><p> | 383 | <string><p> |
384 | <b>Rajko 'alwin' Albrecht</b> (alwin@handhelds.org)<br/> | 384 | <b>Rajko 'alwin' Albrecht</b> (alwin@handhelds.org)<br/> |
385 | <b>Stefan 'eilers' Eilers</b> (eilers@handhelds.org)<br/> | ||
385 | <b>Holger 'Zecke' Freyther</b> (zecke@handhelds.org)<br/> | 386 | <b>Holger 'Zecke' Freyther</b> (zecke@handhelds.org)<br/> |
386 | <b>Chris 'Kergoth' Larson</b> (kergoth@handhelds.org)<br/> | 387 | <b>Chris 'Kergoth' Larson</b> (kergoth@handhelds.org)<br/> |
387 | <b>Michael 'Mickey' Lauer</b> (mickeyl@handhelds.org)<br/> | 388 | <b>Michael 'Mickey' Lauer</b> (mickeyl@handhelds.org)<br/> |
388 | <b>Lorn 'ljp' Potter</b> (ljp@handhelds.org)<br/> | 389 | <b>Lorn 'ljp' Potter</b> (ljp@handhelds.org)<br/> |
389 | <b>Max 'Harlekin' Reiss</b> (harlekin@handhelds.org)<br/> | 390 | <b>Max 'Harlekin' Reiss</b> (harlekin@handhelds.org)<br/> |
390 | <b>Andreas 'ar' Richter</b> (ar@handhelds.org)<br/> | 391 | <b>Andreas 'ar' Richter</b> (ar@handhelds.org)<br/> |
391 | <b>Dan 'drw' Williams</b> (drw@handhelds.org)</tt><br/> | 392 | <b>Dan 'drw' Williams</b> (drw@handhelds.org)</tt><br/> |
392 | </p></string> | 393 | </p></string> |
393 | </property> | 394 | </property> |
394 | </widget> | 395 | </widget> |
395 | </hbox> | 396 | </hbox> |
396 | </widget> | 397 | </widget> |
397 | <widget> | 398 | <widget> |
398 | <class>QWidget</class> | 399 | <class>QWidget</class> |
399 | <property stdset="1"> | 400 | <property stdset="1"> |
400 | <name>name</name> | 401 | <name>name</name> |
401 | <cstring>tab</cstring> | 402 | <cstring>tab</cstring> |
402 | </property> | 403 | </property> |
403 | <attribute> | 404 | <attribute> |
404 | <name>title</name> | 405 | <name>title</name> |
405 | <string>Report</string> | 406 | <string>Report</string> |
406 | </attribute> | 407 | </attribute> |
407 | <hbox> | 408 | <hbox> |
408 | <property stdset="1"> | 409 | <property stdset="1"> |
@@ -447,28 +448,28 @@ Visit <i>http://opie.handhelds.org</i> for more information on the O | |||
447 | <name>spacing</name> | 448 | <name>spacing</name> |
448 | <number>1</number> | 449 | <number>1</number> |
449 | </property> | 450 | </property> |
450 | <widget> | 451 | <widget> |
451 | <class>QTextBrowser</class> | 452 | <class>QTextBrowser</class> |
452 | <property stdset="1"> | 453 | <property stdset="1"> |
453 | <name>name</name> | 454 | <name>name</name> |
454 | <cstring>TextBrowser4</cstring> | 455 | <cstring>TextBrowser4</cstring> |
455 | </property> | 456 | </property> |
456 | <property stdset="1"> | 457 | <property stdset="1"> |
457 | <name>text</name> | 458 | <name>text</name> |
458 | <string><p>You don't have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!</p> | 459 | <string><p>You don't have to be a software developer to be a member of the Opie Team. You can join the national teams that translate program interfaces. You can provide graphics, themes, sounds and improved documentation. You decide!</p> |
459 | <p>Visit <i>http://opie.handhelds.org/</i> for information on some projects in which you can participate.</p> | 460 | <p>Visit <i>http://opie.handhelds.org/</i> for information on some projects in which you can participate.</p> |
460 | <p>If you need more information or documentation, then a visit to <i>http://opie.handhelds.org/</i> will provide you with what you need.</p></string> | 461 | <p>If you need more information or documentation, then a visit to <i>http://opie.handhelds.org/</i> will provide you with what you need.</p></string> |
461 | </property> | 462 | </property> |
462 | </widget> | 463 | </widget> |
463 | </vbox> | 464 | </vbox> |
464 | </widget> | 465 | </widget> |
465 | </widget> | 466 | </widget> |
466 | </grid> | 467 | </grid> |
467 | </widget> | 468 | </widget> |
468 | <images> | 469 | <images> |
469 | <image> | 470 | <image> |
470 | <name>image0</name> | 471 | <name>image0</name> |