summaryrefslogtreecommitdiff
authorharlekin <harlekin>2003-03-08 22:19:44 (UTC)
committer harlekin <harlekin>2003-03-08 22:19:44 (UTC)
commit1d96fca5d80a2e7e96f2bd28168175a6e5c5c04a (patch) (unidiff)
tree00ba4dd57941d11a2592e024cb76e71b9b45e6cf
parent6d0502893df34cc9918a3848133cb8b581e127cc (diff)
downloadopie-1d96fca5d80a2e7e96f2bd28168175a6e5c5c04a.zip
opie-1d96fca5d80a2e7e96f2bd28168175a6e5c5c04a.tar.gz
opie-1d96fca5d80a2e7e96f2bd28168175a6e5c5c04a.tar.bz2
use icons from inline instead of inlining some icons in the ui file
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/datebook/datebookdayheader.ui14
-rw-r--r--core/pim/datebook/datebookdayheaderimpl.cpp5
2 files changed, 7 insertions, 12 deletions
diff --git a/core/pim/datebook/datebookdayheader.ui b/core/pim/datebook/datebookdayheader.ui
index bb0c1ac..308bad3 100644
--- a/core/pim/datebook/datebookdayheader.ui
+++ b/core/pim/datebook/datebookdayheader.ui
@@ -50,33 +50,33 @@
50 <property stdset="1"> 50 <property stdset="1">
51 <name>spacing</name> 51 <name>spacing</name>
52 <number>0</number> 52 <number>0</number>
53 </property> 53 </property>
54 <widget> 54 <widget>
55 <class>QToolButton</class> 55 <class>QToolButton</class>
56 <property stdset="1"> 56 <property stdset="1">
57 <name>name</name> 57 <name>name</name>
58 <cstring>back</cstring> 58 <cstring>back</cstring>
59 </property> 59 </property>
60 <property stdset="1"> 60 <property stdset="1">
61 <name>text</name> 61 <name>text</name>
62 <string></string> 62 <string></string>
63 </property> 63 </property>
64 <property stdset="1"> 64 <property stdset="1">
65 <name>pixmap</name> 65 <name>pixmap</name>
66 <pixmap>image0</pixmap> 66 <pixmap></pixmap>
67 </property> 67 </property>
68 <property stdset="1"> 68 <property stdset="1">
69 <name>toggleButton</name> 69 <name>toggleButton</name>
70 <bool>false</bool> 70 <bool>false</bool>
71 </property> 71 </property>
72 <property stdset="1"> 72 <property stdset="1">
73 <name>autoRepeat</name> 73 <name>autoRepeat</name>
74 <bool>true</bool> 74 <bool>true</bool>
75 </property> 75 </property>
76 <property stdset="1"> 76 <property stdset="1">
77 <name>autoRaise</name> 77 <name>autoRaise</name>
78 <bool>true</bool> 78 <bool>true</bool>
79 </property> 79 </property>
80 <property stdset="1"> 80 <property stdset="1">
81 <name>toggleButton</name> 81 <name>toggleButton</name>
82 <bool>false</bool> 82 <bool>false</bool>
@@ -357,55 +357,45 @@
357 </property> 357 </property>
358 </widget> 358 </widget>
359 </hbox> 359 </hbox>
360 </widget> 360 </widget>
361 <widget> 361 <widget>
362 <class>QToolButton</class> 362 <class>QToolButton</class>
363 <property stdset="1"> 363 <property stdset="1">
364 <name>name</name> 364 <name>name</name>
365 <cstring>forward</cstring> 365 <cstring>forward</cstring>
366 </property> 366 </property>
367 <property stdset="1"> 367 <property stdset="1">
368 <name>text</name> 368 <name>text</name>
369 <string></string> 369 <string></string>
370 </property> 370 </property>
371 <property stdset="1"> 371 <property stdset="1">
372 <name>pixmap</name> 372 <name>pixmap</name>
373 <pixmap>image1</pixmap> 373 <pixmap></pixmap>
374 </property> 374 </property>
375 <property stdset="1"> 375 <property stdset="1">
376 <name>autoRepeat</name> 376 <name>autoRepeat</name>
377 <bool>true</bool> 377 <bool>true</bool>
378 </property> 378 </property>
379 <property stdset="1"> 379 <property stdset="1">
380 <name>autoRaise</name> 380 <name>autoRaise</name>
381 <bool>true</bool> 381 <bool>true</bool>
382 </property> 382 </property>
383 </widget> 383 </widget>
384 </hbox> 384 </hbox>
385</widget> 385</widget>
386<images>
387 <image>
388 <name>image0</name>
389 <data format="XPM.GZ" length="582">789c6dcfcd4e843010c0f13b4fd1d01b31bb6cb325211b1f41e3d1c4789876a60bcbd7aeae07637c773b6d5985d870e0f7ef50605b88e7a707516cb3f72b5c5b2b6c036fa2c08f61f87c79bdffcaf2dd5ef0558b5d7e97e51b61c5e33412df4b7f2fcbb09896a94ab557817063cd744cad74a915734aac35308740d018d9332d5ab0c8ec1229f2c2448d156a661b489ee1ab4e4cf2a08a790e24020abb0dd355442eec8e914e45526215790c749e8e89891069125de466b1fe14295705ccaa5863e2d05cc01894925b2a7e8217dd8a631eb169fd509af10fd1a9ebfbdf32008d9d0c07cd274f70ee162773ba2cdfee935c977ffe6b2edf87ec07796f81cd</data>
390 </image>
391 <image>
392 <name>image1</name>
393 <data format="XPM.GZ" length="627">789c7dcfc94ec3301006e07b9ec28a6f114a13cbb1a8108f00e28884387819676993340b07847877329ea8697a60ec83bfdf232f8784bdbfbdb0e4104db39e6bcb6ca54796b8afb6fdfef87cfe89e25cb2650ac1f2f8218a5366d96bdf01aef9b2e65928a4458a0c07b25c29890352e63293e19c53a0968f52230159e8c22981744495133552097554a1f982b4ce6aeb9013d215165c81ec894e109b4070ca85378f2b35f18c04050214b20d04d010762ba457003eecd6442f88f34a45f4817ea147762b35d1acf4c47457d784737d9f18ebee1363614bf852c6f812b6c460f90abb6e93ba694ed7c49fdbaeee2f76b83da71ba772e0db5d9ccf4b07dfdd5e858edd9b2948fff9d796fc3e457f660e8d47</data>
394 </image>
395</images>
396<connections> 386<connections>
397 <connection> 387 <connection>
398 <sender>forward</sender> 388 <sender>forward</sender>
399 <signal>clicked()</signal> 389 <signal>clicked()</signal>
400 <receiver>DateBookDayHeaderBase</receiver> 390 <receiver>DateBookDayHeaderBase</receiver>
401 <slot>goForward()</slot> 391 <slot>goForward()</slot>
402 </connection> 392 </connection>
403 <connection> 393 <connection>
404 <sender>back</sender> 394 <sender>back</sender>
405 <signal>clicked()</signal> 395 <signal>clicked()</signal>
406 <receiver>DateBookDayHeaderBase</receiver> 396 <receiver>DateBookDayHeaderBase</receiver>
407 <slot>goBack()</slot> 397 <slot>goBack()</slot>
408 </connection> 398 </connection>
409 <connection> 399 <connection>
410 <sender>grpDays</sender> 400 <sender>grpDays</sender>
411 <signal>clicked(int)</signal> 401 <signal>clicked(int)</signal>
diff --git a/core/pim/datebook/datebookdayheaderimpl.cpp b/core/pim/datebook/datebookdayheaderimpl.cpp
index fbcb3d2..7d77153 100644
--- a/core/pim/datebook/datebookdayheaderimpl.cpp
+++ b/core/pim/datebook/datebookdayheaderimpl.cpp
@@ -7,56 +7,61 @@
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20#include "datebookdayheaderimpl.h" 20#include "datebookdayheaderimpl.h"
21 21
22#include <qpe/datebookmonth.h> 22#include <qpe/datebookmonth.h>
23#include <qpe/resource.h>
23#include <qpe/timestring.h> 24#include <qpe/timestring.h>
24 25
25#include <qbuttongroup.h> 26#include <qbuttongroup.h>
26#include <qpopupmenu.h> 27#include <qpopupmenu.h>
27#include <qstringlist.h> 28#include <qstringlist.h>
28#include <qtimer.h> 29#include <qtimer.h>
29#include <qtoolbutton.h> 30#include <qtoolbutton.h>
30 31
32
31/* 33/*
32 * Constructs a DateBookDayHeader which is a child of 'parent', with the 34 * Constructs a DateBookDayHeader which is a child of 'parent', with the
33 * name 'name' and widget flags set to 'f' 35 * name 'name' and widget flags set to 'f'
34 * 36 *
35 * The dialog will by default be modeless, unless you set 'modal' to 37 * The dialog will by default be modeless, unless you set 'modal' to
36 * TRUE to construct a modal dialog. 38 * TRUE to construct a modal dialog.
37 */ 39 */
38DateBookDayHeader::DateBookDayHeader( bool useMonday, 40DateBookDayHeader::DateBookDayHeader( bool useMonday,
39 QWidget* parent, const char* name ) 41 QWidget* parent, const char* name )
40 : DateBookDayHeaderBase( parent, name ), 42 : DateBookDayHeaderBase( parent, name ),
41 bUseMonday( useMonday ) 43 bUseMonday( useMonday )
42{ 44{
43 connect(date,SIGNAL(pressed()),this,SLOT(pickDate())); 45 connect(date,SIGNAL(pressed()),this,SLOT(pickDate()));
44 46
45 setupNames(); 47 setupNames();
46 48
49 forward->setPixmap( Resource::loadPixmap( "forward" ) );
50 back->setPixmap( Resource::loadPixmap( "back" ) );
51
47 setBackgroundMode( PaletteButton ); 52 setBackgroundMode( PaletteButton );
48 grpDays->setBackgroundMode( PaletteButton ); 53 grpDays->setBackgroundMode( PaletteButton );
49} 54}
50 55
51/* 56/*
52 * Destroys the object and frees any allocated resources 57 * Destroys the object and frees any allocated resources
53 */ 58 */
54DateBookDayHeader::~DateBookDayHeader() 59DateBookDayHeader::~DateBookDayHeader()
55{ 60{
56 // no need to delete child widgets, Qt does it all for us 61 // no need to delete child widgets, Qt does it all for us
57} 62}
58 63
59void DateBookDayHeader::setStartOfWeek( bool onMonday ) 64void DateBookDayHeader::setStartOfWeek( bool onMonday )
60{ 65{
61 bUseMonday = onMonday; 66 bUseMonday = onMonday;
62 setupNames(); 67 setupNames();