summaryrefslogtreecommitdiffabout
path: root/korganizer
authorzautrix <zautrix>2005-01-29 07:48:23 (UTC)
committer zautrix <zautrix>2005-01-29 07:48:23 (UTC)
commitef1d97a243957180f5ffc3c3b055ffd8bf52e157 (patch) (unidiff)
tree57ebf97cfd0d324ffcecbfb0c9814745f73d54a5 /korganizer
parent0850ade22908615389800c6ee973f5906154d980 (diff)
downloadkdepimpi-ef1d97a243957180f5ffc3c3b055ffd8bf52e157.zip
kdepimpi-ef1d97a243957180f5ffc3c3b055ffd8bf52e157.tar.gz
kdepimpi-ef1d97a243957180f5ffc3c3b055ffd8bf52e157.tar.bz2
many stribg fixes
Diffstat (limited to 'korganizer') (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/filteredit_base.cpp13
-rw-r--r--korganizer/koeditordetails.cpp3
-rw-r--r--korganizer/koeditorgeneral.cpp8
-rw-r--r--korganizer/koprefsdialog.cpp6
4 files changed, 18 insertions, 12 deletions
diff --git a/korganizer/filteredit_base.cpp b/korganizer/filteredit_base.cpp
index 15a4aaa..505edf6 100644
--- a/korganizer/filteredit_base.cpp
+++ b/korganizer/filteredit_base.cpp
@@ -1,145 +1,152 @@
1/**************************************************************************** 1/****************************************************************************
2** Form implementation generated from reading ui file 'filteredit_base.ui' 2** Form implementation generated from reading ui file 'filteredit_base.ui'
3** 3**
4** Created: Fr Jan 21 21:25:30 2005 4** Created: Fr Jan 21 21:25:30 2005
5** by: The User Interface Compiler ($Id$) 5** by: The User Interface Compiler ($Id$)
6** 6**
7** WARNING! All changes made in this file will be lost! 7** WARNING! All changes made in this file will be lost!
8****************************************************************************/ 8****************************************************************************/
9 9
10#include "filteredit_base.h" 10#include "filteredit_base.h"
11 11
12#include <qvariant.h> 12#include <qvariant.h>
13#include <qpushbutton.h> 13#include <qpushbutton.h>
14#include <qframe.h> 14#include <qframe.h>
15#include <qbuttongroup.h> 15#include <qbuttongroup.h>
16#include <qapplication.h>
16#include <qradiobutton.h> 17#include <qradiobutton.h>
17#include <qlistbox.h> 18#include <qlistbox.h>
18#include <qlabel.h> 19#include <qlabel.h>
19#include <qcheckbox.h> 20#include <qcheckbox.h>
20#include <qlayout.h> 21#include <qlayout.h>
21#include <qtooltip.h> 22#include <qtooltip.h>
22#include <qwhatsthis.h> 23#include <qwhatsthis.h>
23#include "tr.h" 24#include "tr.h"
24 25
25/* 26/*
26 * Constructs a FilterEdit_base as a child of 'parent', with the 27 * Constructs a FilterEdit_base as a child of 'parent', with the
27 * name 'name' and widget flags set to 'f'. 28 * name 'name' and widget flags set to 'f'.
28 */ 29 */
29FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl ) 30FilterEdit_base::FilterEdit_base( QWidget* parent, const char* name, WFlags fl )
30 : QWidget( parent, name, fl ) 31 : QWidget( parent, name, fl )
31{ 32{
32 if ( !name ) 33 if ( !name )
33 setName( "FilterEdit_base" ); 34 setName( "FilterEdit_base" );
34 FilterEdit_baseLayout = new QVBoxLayout( this, 0, 0, "FilterEdit_baseLayout"); 35 FilterEdit_baseLayout = new QVBoxLayout( this, 0, 0, "FilterEdit_baseLayout");
35 36
36 mCriteriaFrame = new QFrame( this, "mCriteriaFrame" ); 37 mCriteriaFrame = new QFrame( this, "mCriteriaFrame" );
37 mCriteriaFrame->setFrameShape( QFrame::StyledPanel ); 38 mCriteriaFrame->setFrameShape( QFrame::StyledPanel );
38 mCriteriaFrame->setFrameShadow( QFrame::Raised ); 39 mCriteriaFrame->setFrameShadow( QFrame::Raised );
39 mCriteriaFrameLayout = new QVBoxLayout( mCriteriaFrame, 3, 2, "mCriteriaFrameLayout"); 40 mCriteriaFrameLayout = new QVBoxLayout( mCriteriaFrame, 3, 2, "mCriteriaFrameLayout");
40 41
41 ButtonGroup1 = new QButtonGroup( mCriteriaFrame, "ButtonGroup1" ); 42 ButtonGroup1 = new QButtonGroup( mCriteriaFrame, "ButtonGroup1" );
42 ButtonGroup1->setColumnLayout(0, Qt::Vertical ); 43 ButtonGroup1->setColumnLayout(0, Qt::Vertical );
43 ButtonGroup1->layout()->setSpacing( 6 ); 44 ButtonGroup1->layout()->setSpacing( 6 );
44 ButtonGroup1->layout()->setMargin( 6 ); 45 ButtonGroup1->layout()->setMargin( 6 );
45 ButtonGroup1Layout = new QGridLayout( ButtonGroup1->layout() ); 46 ButtonGroup1Layout = new QGridLayout( ButtonGroup1->layout() );
46 ButtonGroup1Layout->setAlignment( Qt::AlignTop ); 47 ButtonGroup1Layout->setAlignment( Qt::AlignTop );
47 48
48 layout4 = new QHBoxLayout( 0, 0, 6, "layout4"); 49 layout4 = new QHBoxLayout( 0, 0, 6, "layout4");
49 50
50 mCatShowCheck = new QRadioButton( ButtonGroup1, "mCatShowCheck" ); 51 mCatShowCheck = new QRadioButton( ButtonGroup1, "mCatShowCheck" );
51 layout4->addWidget( mCatShowCheck ); 52 layout4->addWidget( mCatShowCheck );
52 53
53 mCatHideCheck = new QRadioButton( ButtonGroup1, "mCatHideCheck" ); 54 mCatHideCheck = new QRadioButton( ButtonGroup1, "mCatHideCheck" );
54 layout4->addWidget( mCatHideCheck ); 55 layout4->addWidget( mCatHideCheck );
55 56
56 mCatEditButton = new QPushButton( ButtonGroup1, "mCatEditButton" ); 57 mCatEditButton = new QPushButton( ButtonGroup1, "mCatEditButton" );
57 layout4->addWidget( mCatEditButton ); 58 layout4->addWidget( mCatEditButton );
58 59
59 ButtonGroup1Layout->addLayout( layout4, 0, 0 ); 60 ButtonGroup1Layout->addLayout( layout4, 0, 0 );
60 61
61 mCatList = new QListBox( ButtonGroup1, "mCatList" ); 62 mCatList = new QListBox( ButtonGroup1, "mCatList" );
62 63
63 ButtonGroup1Layout->addWidget( mCatList, 1, 0 ); 64 ButtonGroup1Layout->addWidget( mCatList, 1, 0 );
64 mCriteriaFrameLayout->addWidget( ButtonGroup1 ); 65 mCriteriaFrameLayout->addWidget( ButtonGroup1 );
65 66
66 layout7 = new QHBoxLayout( 0, 0, 6, "layout7"); 67 layout7 = new QHBoxLayout( 0, 0, 6, "layout7");
67 68
68 textLabel1 = new QLabel( mCriteriaFrame, "textLabel1" ); 69 textLabel1 = new QLabel( mCriteriaFrame, "textLabel1" );
69 layout7->addWidget( textLabel1 ); 70 layout7->addWidget( textLabel1 );
70 71
71 mRecurringCheck = new QCheckBox( mCriteriaFrame, "mRecurringCheck" ); 72 mRecurringCheck = new QCheckBox( mCriteriaFrame, "mRecurringCheck" );
72 layout7->addWidget( mRecurringCheck ); 73 layout7->addWidget( mRecurringCheck );
73 74
74 mCompletedCheck = new QCheckBox( mCriteriaFrame, "mCompletedCheck" ); 75 mCompletedCheck = new QCheckBox( mCriteriaFrame, "mCompletedCheck" );
75 layout7->addWidget( mCompletedCheck ); 76 layout7->addWidget( mCompletedCheck );
76 mCriteriaFrameLayout->addLayout( layout7 ); 77 mCriteriaFrameLayout->addLayout( layout7 );
77 78
78 layout9 = new QHBoxLayout( 0, 0, 6, "layout9"); 79 layout9 = new QHBoxLayout( 0, 0, 6, "layout9");
79 80
80 textLabel1_2 = new QLabel( mCriteriaFrame, "textLabel1_2" ); 81 textLabel1_2 = new QLabel( mCriteriaFrame, "textLabel1_2" );
81 layout9->addWidget( textLabel1_2 ); 82 layout9->addWidget( textLabel1_2 );
82 83
83 mEventCheck = new QCheckBox( mCriteriaFrame, "mEventCheck" ); 84 mEventCheck = new QCheckBox( mCriteriaFrame, "mEventCheck" );
84 layout9->addWidget( mEventCheck ); 85 layout9->addWidget( mEventCheck );
85 86
86 mTodoCheck = new QCheckBox( mCriteriaFrame, "mTodoCheck" ); 87 mTodoCheck = new QCheckBox( mCriteriaFrame, "mTodoCheck" );
87 layout9->addWidget( mTodoCheck ); 88 layout9->addWidget( mTodoCheck );
88 89
89 mJournalCheck = new QCheckBox( mCriteriaFrame, "mJournalCheck" ); 90 mJournalCheck = new QCheckBox( mCriteriaFrame, "mJournalCheck" );
90 layout9->addWidget( mJournalCheck ); 91 layout9->addWidget( mJournalCheck );
91 mCriteriaFrameLayout->addLayout( layout9 ); 92 mCriteriaFrameLayout->addLayout( layout9 );
92 93
93 layout2 = new QHBoxLayout( 0, 0, 0, "layout2"); 94 layout2 = new QHBoxLayout( 0, 0, 0, "layout2");
94 95
95 textLabel2 = new QLabel( mCriteriaFrame, "textLabel2" ); 96 textLabel2 = new QLabel( mCriteriaFrame, "textLabel2" );
96 layout2->addWidget( textLabel2 ); 97 layout2->addWidget( textLabel2 );
97 98
98 mPublicCheck = new QCheckBox( mCriteriaFrame, "mPublicCheck" ); 99 mPublicCheck = new QCheckBox( mCriteriaFrame, "mPublicCheck" );
99 layout2->addWidget( mPublicCheck ); 100 layout2->addWidget( mPublicCheck );
100 101
101 mPrivateCheck = new QCheckBox( mCriteriaFrame, "mPrivateCheck" ); 102 mPrivateCheck = new QCheckBox( mCriteriaFrame, "mPrivateCheck" );
102 layout2->addWidget( mPrivateCheck ); 103 layout2->addWidget( mPrivateCheck );
103 104
104 mConfidentialCheck = new QCheckBox( mCriteriaFrame, "mConfidentialCheck" ); 105 mConfidentialCheck = new QCheckBox( mCriteriaFrame, "mConfidentialCheck" );
105 mConfidentialCheck->setChecked( FALSE ); 106 mConfidentialCheck->setChecked( FALSE );
106 layout2->addWidget( mConfidentialCheck ); 107 layout2->addWidget( mConfidentialCheck );
107 mCriteriaFrameLayout->addLayout( layout2 ); 108 mCriteriaFrameLayout->addLayout( layout2 );
108 FilterEdit_baseLayout->addWidget( mCriteriaFrame ); 109 FilterEdit_baseLayout->addWidget( mCriteriaFrame );
109 languageChange(); 110 languageChange();
110 resize( QSize(324, 281).expandedTo(minimumSizeHint()) ); 111 resize( QSize(300, 200).expandedTo(minimumSizeHint()) );
111 clearWState( WState_Polished ); 112 clearWState( WState_Polished );
112} 113}
113 114
114/* 115/*
115 * Destroys the object and frees any allocated resources 116 * Destroys the object and frees any allocated resources
116 */ 117 */
117FilterEdit_base::~FilterEdit_base() 118FilterEdit_base::~FilterEdit_base()
118{ 119{
119 // no need to delete child widgets, Qt does it all for us 120 // no need to delete child widgets, Qt does it all for us
120} 121}
121 122
122/* 123/*
123 * Sets the strings of the subwidgets using the current 124 * Sets the strings of the subwidgets using the current
124 * language. 125 * language.
125 */ 126 */
126void FilterEdit_base::languageChange() 127void FilterEdit_base::languageChange()
127{ 128{
128 setCaption( tr( "FilterEditor" ) ); 129 setCaption( tr( "FilterEditor" ) );
129 ButtonGroup1->setTitle( tr( "Categories" ) ); 130 ButtonGroup1->setTitle( tr( "Categories" ) );
130 mCatShowCheck->setText( tr( "Include" ) ); 131 mCatShowCheck->setText( tr( "Include" ) );
131 mCatHideCheck->setText( tr( "Exclude" ) ); 132 mCatHideCheck->setText( tr( "Exclude" ) );
132 mCatEditButton->setText( tr( "Edit Selection..." ) ); 133 mCatEditButton->setText( tr( "Edit Selection..." ) );
133 textLabel1->setText( tr( "Exclude" ) ); 134 textLabel1->setText( tr( "Exclude" ) );
134 mRecurringCheck->setText( tr( "recurring events" ) ); 135 if (QApplication::desktop()->width() > 480 ) {
135 mCompletedCheck->setText( tr( "completed to-dos" ) ); 136 mCompletedCheck->setText( tr( "completed to-dos" ) );
137 mRecurringCheck->setText( tr( "recurring events" ) );
138 }
139 else {
140 mCompletedCheck->setText( tr( "compl.todos" ) );
141 mRecurringCheck->setText( tr( "recurr. events" ) );
142 }
136 textLabel1_2->setText( tr( "Exclude" ) ); 143 textLabel1_2->setText( tr( "Exclude" ) );
137 mEventCheck->setText( tr( "events" ) ); 144 mEventCheck->setText( tr( "events" ) );
138 mTodoCheck->setText( tr( "todos" ) ); 145 mTodoCheck->setText( tr( "todos" ) );
139 mJournalCheck->setText( tr( "journals" ) ); 146 mJournalCheck->setText( tr( "journals" ) );
140 textLabel2->setText( tr( "Include" ) ); 147 textLabel2->setText( tr( "Include" ) );
141 mPublicCheck->setText( tr( "public" ) ); 148 mPublicCheck->setText( tr( "public" ) );
142 mPrivateCheck->setText( tr( "private" ) ); 149 mPrivateCheck->setText( tr( "private" ) );
143 mConfidentialCheck->setText( tr( "confidential" ) ); 150 mConfidentialCheck->setText( tr( "confidential" ) );
144} 151}
145 152
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index b73d22f..cf0a458 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -99,97 +99,98 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
99 attendeeLabel->setFixedSize( attendeeLabel->sizeHint() ); 99 attendeeLabel->setFixedSize( attendeeLabel->sizeHint() );
100 mNameEdit = new QLineEdit(this); 100 mNameEdit = new QLineEdit(this);
101 connect(mNameEdit,SIGNAL(textChanged(const QString &)), 101 connect(mNameEdit,SIGNAL(textChanged(const QString &)),
102 SLOT(updateAttendeeItem())); 102 SLOT(updateAttendeeItem()));
103 103
104 mUidEdit = new QLineEdit(0); 104 mUidEdit = new QLineEdit(0);
105 mUidEdit->setText(""); 105 mUidEdit->setText("");
106 106
107 QLabel *emailLabel = new QLabel(this); 107 QLabel *emailLabel = new QLabel(this);
108 emailLabel->setText(i18n("Email:")); 108 emailLabel->setText(i18n("Email:"));
109 mEmailEdit = new QLineEdit(this); 109 mEmailEdit = new QLineEdit(this);
110 connect(mEmailEdit,SIGNAL(textChanged(const QString &)), 110 connect(mEmailEdit,SIGNAL(textChanged(const QString &)),
111 SLOT(updateAttendeeItem())); 111 SLOT(updateAttendeeItem()));
112 112
113 QLabel *attendeeRoleLabel = new QLabel(this); 113 QLabel *attendeeRoleLabel = new QLabel(this);
114 attendeeRoleLabel->setText(i18n("Role:")); 114 attendeeRoleLabel->setText(i18n("Role:"));
115 mRoleCombo = new QComboBox(false,this); 115 mRoleCombo = new QComboBox(false,this);
116 mRoleCombo->insertStringList(Attendee::roleList()); 116 mRoleCombo->insertStringList(Attendee::roleList());
117 connect(mRoleCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem())); 117 connect(mRoleCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem()));
118 118
119 QLabel *statusLabel = new QLabel(this); 119 QLabel *statusLabel = new QLabel(this);
120 statusLabel->setText( i18n("Status:") ); 120 statusLabel->setText( i18n("Status:") );
121 121
122 mStatusCombo = new QComboBox(false,this); 122 mStatusCombo = new QComboBox(false,this);
123 mStatusCombo->insertStringList(Attendee::statusList()); 123 mStatusCombo->insertStringList(Attendee::statusList());
124 connect(mStatusCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem())); 124 connect(mStatusCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem()));
125 125
126 mRsvpButton = new QCheckBox(this); 126 mRsvpButton = new QCheckBox(this);
127 mRsvpButton->setText(i18n("Request response")); 127 mRsvpButton->setText(i18n("Request response"));
128 connect(mRsvpButton,SIGNAL(clicked()),SLOT(updateAttendeeItem())); 128 connect(mRsvpButton,SIGNAL(clicked()),SLOT(updateAttendeeItem()));
129 QWidget *buttonBox = new QWidget(this); 129 QWidget *buttonBox = new QWidget(this);
130 QVBoxLayout *buttonLayout = new QVBoxLayout(buttonBox); 130 QVBoxLayout *buttonLayout = new QVBoxLayout(buttonBox);
131 131
132 QPushButton *newButton = new QPushButton(i18n("&New"),buttonBox); 132 QPushButton *newButton = new QPushButton(i18n("&New"),buttonBox);
133 buttonLayout->addWidget(newButton); 133 buttonLayout->addWidget(newButton);
134 connect(newButton,SIGNAL(clicked()),SLOT(addNewAttendee())); 134 connect(newButton,SIGNAL(clicked()),SLOT(addNewAttendee()));
135 135
136 mRemoveButton = new QPushButton(i18n("&Remove"),buttonBox); 136 mRemoveButton = new QPushButton(i18n("&Remove"),buttonBox);
137 buttonLayout->addWidget(mRemoveButton); 137 buttonLayout->addWidget(mRemoveButton);
138 connect(mRemoveButton, SIGNAL(clicked()),SLOT(removeAttendee())); 138 connect(mRemoveButton, SIGNAL(clicked()),SLOT(removeAttendee()));
139 139
140 mAddressBookButton = new QPushButton(i18n("Address &Book..."),this); 140 mAddressBookButton = new QPushButton(i18n("Address &Book..."),this);
141 // buttonLayout->addWidget(mAddressBookButton); 141 // buttonLayout->addWidget(mAddressBookButton);
142 connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook())); 142 connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook()));
143 //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () ); 143 //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () );
144 144
145 if (qApp->desktop()->width() < 640 ) { 145 if (qApp->desktop()->width() < 640 ) {
146 if ( qApp->desktop()->width() < 300 ) 146 if ( qApp->desktop()->width() < 300 )
147 mListView->setFixedHeight(80); 147 topLayout->setSpacing(1);
148 ;//mListView->setFixedHeight(80);
148 topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3); 149 topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,3);
149 topLayout->addMultiCellWidget(mListView,1,1,0,3); 150 topLayout->addMultiCellWidget(mListView,1,1,0,3);
150 topLayout->addWidget(attendeeLabel,3,0); 151 topLayout->addWidget(attendeeLabel,3,0);
151 topLayout->addMultiCellWidget(mNameEdit,3,3,1,2); 152 topLayout->addMultiCellWidget(mNameEdit,3,3,1,2);
152 topLayout->addWidget(emailLabel,4,0); 153 topLayout->addWidget(emailLabel,4,0);
153 topLayout->addMultiCellWidget(mEmailEdit,4,4,1,2); 154 topLayout->addMultiCellWidget(mEmailEdit,4,4,1,2);
154 topLayout->addWidget(attendeeRoleLabel,5,0); 155 topLayout->addWidget(attendeeRoleLabel,5,0);
155 topLayout->addMultiCellWidget(mRoleCombo,5,5,1,3); 156 topLayout->addMultiCellWidget(mRoleCombo,5,5,1,3);
156 topLayout->addWidget(statusLabel,6,0); 157 topLayout->addWidget(statusLabel,6,0);
157 topLayout->addMultiCellWidget(mStatusCombo,6,6,1,3); 158 topLayout->addMultiCellWidget(mStatusCombo,6,6,1,3);
158 topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,3); 159 topLayout->addMultiCellWidget(mAddressBookButton,2,2,2,3);
159 topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1); 160 topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1);
160 topLayout->addMultiCellWidget(buttonBox,3,4,3,3); 161 topLayout->addMultiCellWidget(buttonBox,3,4,3,3);
161 topLayout->setRowStretch(1,2); 162 topLayout->setRowStretch(1,2);
162 topLayout->setColStretch(0,0); 163 topLayout->setColStretch(0,0);
163 topLayout->setColStretch(1,2); 164 topLayout->setColStretch(1,2);
164 topLayout->setColStretch(2,1); 165 topLayout->setColStretch(2,1);
165 topLayout->setColStretch(3,1); 166 topLayout->setColStretch(3,1);
166 167
167 } else { 168 } else {
168 topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,5); 169 topLayout->addMultiCellWidget(mOrganizerLabel,0,0,0,5);
169 topLayout->addMultiCellWidget(mListView,1,1,0,5); 170 topLayout->addMultiCellWidget(mListView,1,1,0,5);
170 topLayout->addWidget(attendeeLabel,3,0); 171 topLayout->addWidget(attendeeLabel,3,0);
171 topLayout->addMultiCellWidget(mNameEdit,3,3,1,4); 172 topLayout->addMultiCellWidget(mNameEdit,3,3,1,4);
172 topLayout->addWidget(emailLabel,4,0); 173 topLayout->addWidget(emailLabel,4,0);
173 topLayout->addMultiCellWidget(mEmailEdit,4,4,1,4); 174 topLayout->addMultiCellWidget(mEmailEdit,4,4,1,4);
174 topLayout->addWidget(attendeeRoleLabel,5,0); 175 topLayout->addWidget(attendeeRoleLabel,5,0);
175 topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2); 176 topLayout->addMultiCellWidget(mRoleCombo,5,5,1,2);
176 topLayout->addWidget(statusLabel,5,3); 177 topLayout->addWidget(statusLabel,5,3);
177 topLayout->addMultiCellWidget(mStatusCombo,5,5,4,5); 178 topLayout->addMultiCellWidget(mStatusCombo,5,5,4,5);
178 topLayout->addMultiCellWidget(mAddressBookButton,2,2,4,5); 179 topLayout->addMultiCellWidget(mAddressBookButton,2,2,4,5);
179 topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1); 180 topLayout->addMultiCellWidget(mRsvpButton,2,2,0,1);
180 topLayout->addMultiCellWidget(buttonBox,3,4,5,5); 181 topLayout->addMultiCellWidget(buttonBox,3,4,5,5);
181 topLayout->setRowStretch(1,5); 182 topLayout->setRowStretch(1,5);
182 topLayout->setColStretch(0,0); 183 topLayout->setColStretch(0,0);
183 } 184 }
184// #if 0 185// #if 0
185// topLayout->setColStretch(2,1); 186// topLayout->setColStretch(2,1);
186// topLayout->addWidget(statusLabel,3,3); 187// topLayout->addWidget(statusLabel,3,3);
187// topLayout->addWidget(mStatusCombo,3,4); 188// topLayout->addWidget(mStatusCombo,3,4);
188// #else 189// #else
189// topLayout->addWidget(statusLabel,4,3); 190// topLayout->addWidget(statusLabel,4,3);
190// // topLayout->addWidget(mStatusCombo,4,3); 191// // topLayout->addWidget(mStatusCombo,4,3);
191// topLayout->addMultiCellWidget(mStatusCombo,4,4,4,5); 192// topLayout->addMultiCellWidget(mStatusCombo,4,4,4,5);
192 193
193// #endif 194// #endif
194// // topLayout->setRowStretch(5,1); 195// // topLayout->setRowStretch(5,1);
195// topLayout->addMultiCellWidget(mRsvpButton,5,5,0,1); 196// topLayout->addMultiCellWidget(mRsvpButton,5,5,0,1);
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp
index b4fe965..f5eb52e 100644
--- a/korganizer/koeditorgeneral.cpp
+++ b/korganizer/koeditorgeneral.cpp
@@ -204,127 +204,127 @@ void KOEditorGeneral::initAlarm(QWidget *parent,QBoxLayout *topLayout)
204 mAlarmSoundButton->setPixmap(SmallIcon("playsound")); 204 mAlarmSoundButton->setPixmap(SmallIcon("playsound"));
205 mAlarmSoundButton->setToggleButton(true); 205 mAlarmSoundButton->setToggleButton(true);
206 QToolTip::add(mAlarmSoundButton, i18n("No sound set")); 206 QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
207 connect(mAlarmSoundButton, SIGNAL(clicked()), SLOT(pickAlarmSound())); 207 connect(mAlarmSoundButton, SIGNAL(clicked()), SLOT(pickAlarmSound()));
208 alarmLayout->addWidget(mAlarmSoundButton); 208 alarmLayout->addWidget(mAlarmSoundButton);
209 209
210 mAlarmProgramButton = new QPushButton(parent); 210 mAlarmProgramButton = new QPushButton(parent);
211 mAlarmProgramButton->setPixmap(SmallIcon("run")); 211 mAlarmProgramButton->setPixmap(SmallIcon("run"));
212 mAlarmProgramButton->setToggleButton(true); 212 mAlarmProgramButton->setToggleButton(true);
213 QToolTip::add(mAlarmProgramButton, i18n("No program set")); 213 QToolTip::add(mAlarmProgramButton, i18n("No program set"));
214 connect(mAlarmProgramButton, SIGNAL(clicked()), SLOT(pickAlarmProgram())); 214 connect(mAlarmProgramButton, SIGNAL(clicked()), SLOT(pickAlarmProgram()));
215 alarmLayout->addWidget(mAlarmProgramButton); 215 alarmLayout->addWidget(mAlarmProgramButton);
216 mAlarmSoundButton->setMaximumWidth( mAlarmSoundButton->sizeHint().width() + 4 ); 216 mAlarmSoundButton->setMaximumWidth( mAlarmSoundButton->sizeHint().width() + 4 );
217 mAlarmProgramButton->setMaximumWidth(mAlarmProgramButton->sizeHint().width() + 4 ); 217 mAlarmProgramButton->setMaximumWidth(mAlarmProgramButton->sizeHint().width() + 4 );
218 // if ( KOPrefs::instance()->mCompactDialogs ) { 218 // if ( KOPrefs::instance()->mCompactDialogs ) {
219 // mAlarmSoundButton->hide(); 219 // mAlarmSoundButton->hide();
220 // mAlarmProgramButton->hide(); 220 // mAlarmProgramButton->hide();
221 // } 221 // }
222} 222}
223 223
224void KOEditorGeneral::pickAlarmSound() 224void KOEditorGeneral::pickAlarmSound()
225{ 225{
226 226
227 //QString prefix = mAlarmSound; 227 //QString prefix = mAlarmSound;
228 if (!mAlarmSoundButton->isOn()) { 228 if (!mAlarmSoundButton->isOn()) {
229 //mAlarmSound = ""; 229 //mAlarmSound = "";
230 QToolTip::remove(mAlarmSoundButton); 230 QToolTip::remove(mAlarmSoundButton);
231 QToolTip::add(mAlarmSoundButton, i18n("No sound set")); 231 QToolTip::add(mAlarmSoundButton, i18n("No sound set"));
232 mAlarmProgramButton->setOn(true); 232 mAlarmProgramButton->setOn(true);
233 mAlarmSoundButton->setOn(false); 233 mAlarmSoundButton->setOn(false);
234 } else { 234 } else {
235 QString fileName(KFileDialog::getOpenFileName(mAlarmSound, 235 QString fileName(KFileDialog::getOpenFileName(mAlarmSound,
236 i18n("*.wav|Wav Files"), 0)); 236 i18n("*.wav|Wav Files"), 0));
237 if (!fileName.isEmpty()) { 237 if (!fileName.isEmpty()) {
238 mAlarmSound = fileName; 238 mAlarmSound = fileName;
239 QToolTip::remove(mAlarmSoundButton); 239 QToolTip::remove(mAlarmSoundButton);
240 QString dispStr = i18n("Playing '%1'").arg(fileName); 240 QString dispStr = i18n("Playing '%1'").arg(fileName);
241 QToolTip::add(mAlarmSoundButton, dispStr); 241 QToolTip::add(mAlarmSoundButton, dispStr);
242 mAlarmProgramButton->setOn(false); 242 mAlarmProgramButton->setOn(false);
243 mAlarmSoundButton->setOn(true); 243 mAlarmSoundButton->setOn(true);
244 } else { 244 } else {
245 mAlarmProgramButton->setOn(true); 245 mAlarmProgramButton->setOn(true);
246 mAlarmSoundButton->setOn(false); 246 mAlarmSoundButton->setOn(false);
247 247
248 } 248 }
249 } 249 }
250 250
251 if (mAlarmProgramButton->isOn()) 251 if (mAlarmProgramButton->isOn())
252 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + mAlarmProgram ); 252 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
253 if ( mAlarmSoundButton->isOn()) 253 if ( mAlarmSoundButton->isOn())
254 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + mAlarmSound ); 254 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio.Al.: ") + getFittingPath(mAlarmSound) );
255} 255}
256 256
257void KOEditorGeneral::pickAlarmProgram() 257void KOEditorGeneral::pickAlarmProgram()
258{ 258{
259 if (!mAlarmProgramButton->isOn()) { 259 if (!mAlarmProgramButton->isOn()) {
260 //mAlarmProgram = ""; 260 //mAlarmProgram = "";
261 QToolTip::remove(mAlarmProgramButton); 261 QToolTip::remove(mAlarmProgramButton);
262 QToolTip::add(mAlarmProgramButton, i18n("No program set")); 262 QToolTip::add(mAlarmProgramButton, i18n("No program set"));
263 mAlarmProgramButton->setOn(false); 263 mAlarmProgramButton->setOn(false);
264 mAlarmSoundButton->setOn(true); 264 mAlarmSoundButton->setOn(true);
265 } else { 265 } else {
266 QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm.: ") , 0)); 266 QString fileName(KFileDialog::getOpenFileName(mAlarmProgram,i18n("Procedure Alarm.: ") , 0));
267 if (!fileName.isEmpty()) { 267 if (!fileName.isEmpty()) {
268 mAlarmProgram = fileName; 268 mAlarmProgram = fileName;
269 QToolTip::remove(mAlarmProgramButton); 269 QToolTip::remove(mAlarmProgramButton);
270 QString dispStr = i18n("Running '%1'").arg(fileName); 270 QString dispStr = i18n("Running '%1'").arg(fileName);
271 QToolTip::add(mAlarmProgramButton, dispStr); 271 QToolTip::add(mAlarmProgramButton, dispStr);
272 mAlarmSoundButton->setOn(false); 272 mAlarmSoundButton->setOn(false);
273 mAlarmProgramButton->setOn(true); 273 mAlarmProgramButton->setOn(true);
274 } else { 274 } else {
275 mAlarmProgramButton->setOn(false); 275 mAlarmProgramButton->setOn(false);
276 mAlarmSoundButton->setOn(true); 276 mAlarmSoundButton->setOn(true);
277 } 277 }
278 } 278 }
279 if (mAlarmProgramButton->isOn()) 279 if (mAlarmProgramButton->isOn())
280 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + mAlarmProgram ); 280 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
281 if ( mAlarmSoundButton->isOn()) 281 if ( mAlarmSoundButton->isOn())
282 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + mAlarmSound ); 282 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Sound.Al.: ") + getFittingPath(mAlarmSound) );
283} 283}
284 284
285 285
286QString KOEditorGeneral::getFittingPath( const QString s ) 286QString KOEditorGeneral::getFittingPath( const QString s )
287{ 287{
288 int maxlen = 50; 288 int maxlen = 50;
289 if ( QApplication::desktop()->width() < 640 ) { 289 if ( QApplication::desktop()->width() < 640 ) {
290 if ( QApplication::desktop()->width() < 320 ) 290 if ( QApplication::desktop()->width() < 320 )
291 maxlen = 22; 291 maxlen = 22;
292 else 292 else
293 maxlen = 35; 293 maxlen = 35;
294 } 294 }
295 if ( s.length() > maxlen ) { 295 if ( s.length() > maxlen ) {
296 return "..."+s.right(maxlen -3); 296 return "..."+s.right(maxlen -3);
297 } 297 }
298 return s; 298 return s;
299} 299}
300 300
301void KOEditorGeneral::enableAlarmEdit(bool enable) 301void KOEditorGeneral::enableAlarmEdit(bool enable)
302{ 302{
303 if ( enable ) { 303 if ( enable ) {
304 if (!mAlarmProgramButton->isOn() && !mAlarmSoundButton->isOn()) { 304 if (!mAlarmProgramButton->isOn() && !mAlarmSoundButton->isOn()) {
305 mAlarmSoundButton->setOn( true ); 305 mAlarmSoundButton->setOn( true );
306 if ( mAlarmSound.isEmpty() ) 306 if ( mAlarmSound.isEmpty() )
307 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile; 307 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile;
308 else { 308 else {
309 if ( ! QFile::exists( mAlarmSound ) ) 309 if ( ! QFile::exists( mAlarmSound ) )
310 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile; 310 mAlarmSound = KOPrefs::instance()->mDefaultAlarmFile;
311 } 311 }
312 } 312 }
313 if (mAlarmProgramButton->isOn()) 313 if (mAlarmProgramButton->isOn())
314 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) ); 314 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Proc.Al.: ") + getFittingPath(mAlarmProgram) );
315 if (!mAlarmSound.isEmpty() && mAlarmSoundButton->isOn()) 315 if (!mAlarmSound.isEmpty() && mAlarmSoundButton->isOn())
316 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) ); 316 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Audio Al.: ") + getFittingPath(mAlarmSound) );
317 } 317 }
318 else { 318 else {
319 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Alarm disabled for this item")); 319 ((QWidget*)parent())->topLevelWidget()->setCaption(i18n("Alarm disabled for this item"));
320 320
321 } 321 }
322 mAlarmTimeEdit->setEnabled(enable); 322 mAlarmTimeEdit->setEnabled(enable);
323 mAlarmSoundButton->setEnabled(enable); 323 mAlarmSoundButton->setEnabled(enable);
324 mAlarmProgramButton->setEnabled(enable); 324 mAlarmProgramButton->setEnabled(enable);
325 mAlarmIncrCombo->setEnabled(enable); 325 mAlarmIncrCombo->setEnabled(enable);
326} 326}
327 327
328void KOEditorGeneral::disableAlarmEdit(bool disable) 328void KOEditorGeneral::disableAlarmEdit(bool disable)
329{ 329{
330 enableAlarmEdit( !disable ); 330 enableAlarmEdit( !disable );
diff --git a/korganizer/koprefsdialog.cpp b/korganizer/koprefsdialog.cpp
index ea73fd0..1b24f56 100644
--- a/korganizer/koprefsdialog.cpp
+++ b/korganizer/koprefsdialog.cpp
@@ -671,119 +671,117 @@ void KOPrefsDialog::setupViewsTab()
671 dummy = 671 dummy =
672 addWidBool(i18n("Hold non-fullscreen on view change"), 672 addWidBool(i18n("Hold non-fullscreen on view change"),
673 &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame); 673 &(KOPrefs::instance()->mViewChangeHoldNonFullscreen),topFrame);
674 topLayout->addWidget(dummy->checkBox(),ii++,0); 674 topLayout->addWidget(dummy->checkBox(),ii++,0);
675 675
676 676
677 KPrefsDialogWidBool *fullViewTodo = 677 KPrefsDialogWidBool *fullViewTodo =
678 addWidBool(i18n("Event list view uses full window"), 678 addWidBool(i18n("Event list view uses full window"),
679 &(KOPrefs::instance()->mFullViewTodo),topFrame); 679 &(KOPrefs::instance()->mFullViewTodo),topFrame);
680 topLayout->addWidget(fullViewTodo->checkBox(),ii++,0); 680 topLayout->addWidget(fullViewTodo->checkBox(),ii++,0);
681 681
682 KPrefsDialogWidBool *fullViewMonth = 682 KPrefsDialogWidBool *fullViewMonth =
683 addWidBool(i18n("Next days view uses full window"), 683 addWidBool(i18n("Next days view uses full window"),
684 &(KOPrefs::instance()->mFullViewMonth),topFrame); 684 &(KOPrefs::instance()->mFullViewMonth),topFrame);
685 topLayout->addWidget(fullViewMonth->checkBox(),ii++,0); 685 topLayout->addWidget(fullViewMonth->checkBox(),ii++,0);
686 686
687 dummy = 687 dummy =
688 addWidBool(i18n("Set agenda to DayBeginsAt on change"), 688 addWidBool(i18n("Set agenda to DayBeginsAt on change"),
689 &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame); 689 &(KOPrefs::instance()->mSetTimeToDayStartAt),topFrame);
690 topLayout->addWidget(dummy->checkBox(),ii++,0); 690 topLayout->addWidget(dummy->checkBox(),ii++,0);
691 691
692 dummy = 692 dummy =
693 addWidBool(i18n("Set agenda to current time on change"), 693 addWidBool(i18n("Set agenda to current time on change"),
694 &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame); 694 &(KOPrefs::instance()->mCenterOnCurrentTime),topFrame);
695 topLayout->addWidget(dummy->checkBox(),ii++,0); 695 topLayout->addWidget(dummy->checkBox(),ii++,0);
696 696
697 dummy = 697 dummy =
698 addWidBool(i18n("Listview uses monthly timespan"), 698 addWidBool(i18n("Listview uses monthly timespan"),
699 &(KOPrefs::instance()->mListViewMonthTimespan),topFrame); 699 &(KOPrefs::instance()->mListViewMonthTimespan),topFrame);
700 topLayout->addWidget(dummy->checkBox(),ii++,0); 700 topLayout->addWidget(dummy->checkBox(),ii++,0);
701 dummy = 701 dummy =
702 addWidBool(i18n("Highlight selection in Time Edit"), 702 addWidBool(i18n("Highlight selection in Time Edit"),
703 &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame); 703 &(KOPrefs::instance()->mHightlightDateTimeEdit),topFrame);
704 topLayout->addWidget( dummy->checkBox(), ii++,0); 704 topLayout->addWidget( dummy->checkBox(), ii++,0);
705 705
706 706
707 707
708 708
709 709
710 topFrame = addPage(i18n("Month View"),0,0); 710 topFrame = addPage(i18n("Month View"),0,0);
711 // DesktopIcon("viewmag",KIcon::SizeMedium)); 711 // DesktopIcon("viewmag",KIcon::SizeMedium));
712 712
713 topLayout = new QGridLayout(topFrame,5,1); 713 topLayout = new QGridLayout(topFrame,5,1);
714 topLayout->setSpacing(spacingHint()); 714 topLayout->setSpacing(spacingHint());
715 topLayout->setMargin(marginHint()); 715 topLayout->setMargin(marginHint());
716 ii = 0; 716 ii = 0;
717 QLabel *lab; 717 QLabel *lab;
718 QHBox *habo = new QHBox( topFrame ); 718 QHBox *habo = new QHBox( topFrame );
719 if ( QApplication::desktop()->width() < 320 ) { 719 if ( QApplication::desktop()->width() <= 480 ) {
720 lab = new QLabel ( i18n("Show events that recur "), topFrame ); 720 lab = new QLabel ( i18n("Show events that recur "), topFrame );
721 topLayout->addMultiCellWidget(lab,ii, ii,0,1); 721 topLayout->addMultiCellWidget(lab,ii, ii,0,1);
722 ii++; 722 ii++;
723
724 } else { 723 } else {
725 new QLabel ( i18n("Show events that recur "), habo ); 724 new QLabel ( i18n("Show events that recur "), habo );
726
727 } 725 }
728 dailyRecur = 726 dailyRecur =
729 addWidBool(i18n("daily"), 727 addWidBool(i18n("daily"),
730 &(KOPrefs::instance()->mMonthDailyRecur),habo); 728 &(KOPrefs::instance()->mMonthDailyRecur),habo);
731 // topLayout->addWidget(dailyRecur->checkBox(),ii++,0); 729 // topLayout->addWidget(dailyRecur->checkBox(),ii++,0);
732 730
733 weeklyRecur = 731 weeklyRecur =
734 addWidBool(i18n("weekly"), 732 addWidBool(i18n("weekly"),
735 &(KOPrefs::instance()->mMonthWeeklyRecur),habo); 733 &(KOPrefs::instance()->mMonthWeeklyRecur),habo);
736 topLayout->addMultiCellWidget(habo,ii, ii,0,1); 734 topLayout->addMultiCellWidget(habo,ii, ii,0,1);
737 ii++; 735 ii++;
738 736
739 737
740 habo = new QHBox( topFrame ); 738 habo = new QHBox( topFrame );
741 if ( QApplication::desktop()->width() < 320 ) { 739 if ( QApplication::desktop()->width() <= 480 ) {
742 lab = new QLabel (i18n("Show in every cell ") , topFrame ); 740 lab = new QLabel (i18n("Show in every cell ") , topFrame );
743 topLayout->addMultiCellWidget(lab,ii, ii,0,1); 741 topLayout->addMultiCellWidget(lab,ii, ii,0,1);
744 ii++; 742 ii++;
745 743
746 } else { 744 } else {
747 new QLabel ( i18n("Show in every cell "), habo ); 745 new QLabel ( i18n("Show in every cell "), habo );
748 } 746 }
749 weeklyRecur = 747 weeklyRecur =
750 addWidBool(i18n("short month"), 748 addWidBool(i18n("short month"),
751 &(KOPrefs::instance()->mMonthShowShort),habo); 749 &(KOPrefs::instance()->mMonthShowShort),habo);
752 weeklyRecur = 750 weeklyRecur =
753 addWidBool(i18n("icons"), 751 addWidBool(i18n("icons"),
754 &(KOPrefs::instance()->mMonthShowIcons),habo); 752 &(KOPrefs::instance()->mMonthShowIcons),habo);
755 753
756 topLayout->addMultiCellWidget(habo,ii, ii,0,1); 754 topLayout->addMultiCellWidget(habo,ii, ii,0,1);
757 ii++; 755 ii++;
758#ifdef DESKTOP_VERSION 756#ifdef DESKTOP_VERSION
759 KPrefsDialogWidBool *enableMonthScroll = 757 KPrefsDialogWidBool *enableMonthScroll =
760 addWidBool(i18n("Enable scrollbars in month view cells"), 758 addWidBool(i18n("Enable scrollbars in month view cells"),
761 &(KOPrefs::instance()->mEnableMonthScroll),topFrame); 759 &(KOPrefs::instance()->mEnableMonthScroll),topFrame);
762 topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0); 760 topLayout->addWidget(enableMonthScroll->checkBox(),ii++,0);
763#endif 761#endif
764 762
765 dummy = 763 dummy =
766 addWidBool(i18n("Show Sat/Sun together"), 764 addWidBool(i18n("Show Sat/Sun together"),
767 &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame); 765 &(KOPrefs::instance()->mMonthViewSatSunTog),topFrame);
768 topLayout->addWidget(dummy->checkBox(),ii++,0); 766 topLayout->addWidget(dummy->checkBox(),ii++,0);
769 767
770 KPrefsDialogWidBool *coloredCategoriesInMonthView = 768 KPrefsDialogWidBool *coloredCategoriesInMonthView =
771 addWidBool(i18n("Month view uses category colors"), 769 addWidBool(i18n("Month view uses category colors"),
772 &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame); 770 &(KOPrefs::instance()->mMonthViewUsesCategoryColor),topFrame);
773 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 771 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
774 772
775 dummy = 773 dummy =
776 addWidBool(i18n("Categorie colors are applied to text"), 774 addWidBool(i18n("Categorie colors are applied to text"),
777 &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame); 775 &(KOPrefs::instance()->mMonthViewUsesForegroundColor),topFrame);
778 topLayout->addWidget(dummy->checkBox(),ii++,0); 776 topLayout->addWidget(dummy->checkBox(),ii++,0);
779 coloredCategoriesInMonthView = 777 coloredCategoriesInMonthView =
780 addWidBool(i18n("Month view uses day colors"), 778 addWidBool(i18n("Month view uses day colors"),
781 &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame); 779 &(KOPrefs::instance()->mMonthViewUsesDayColors),topFrame);
782 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0); 780 topLayout->addWidget(coloredCategoriesInMonthView->checkBox(),ii++,0);
783 781
784 KPrefsDialogWidColor *holidayColor = 782 KPrefsDialogWidColor *holidayColor =
785 addWidColor(i18n("Day color odd months"), 783 addWidColor(i18n("Day color odd months"),
786 &(KOPrefs::instance()->mMonthViewOddColor),topFrame); 784 &(KOPrefs::instance()->mMonthViewOddColor),topFrame);
787 topLayout->addWidget(holidayColor->label(),ii,0); 785 topLayout->addWidget(holidayColor->label(),ii,0);
788 topLayout->addWidget(holidayColor->button(),ii++,1); 786 topLayout->addWidget(holidayColor->button(),ii++,1);
789 787