summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koeditordetails.cpp7
-rw-r--r--korganizer/kotodoeditor.cpp16
2 files changed, 12 insertions, 11 deletions
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index ef8025b..2fd13bd 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -95,12 +95,15 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
95 connect(mListView,SIGNAL(selectionChanged(QListViewItem *)), 95 connect(mListView,SIGNAL(selectionChanged(QListViewItem *)),
96 SLOT(updateAttendeeInput())); 96 SLOT(updateAttendeeInput()));
97 97
98 connect(mListView,SIGNAL(executed(QListViewItem * ,const QPoint&, int )), 98 connect(mListView,SIGNAL(executed(QListViewItem * ,const QPoint&, int )),
99 SLOT(itemClicked(QListViewItem * ,const QPoint& , int ))); 99 SLOT(itemClicked(QListViewItem * ,const QPoint& , int )));
100 100
101 mRsvpButton = new QCheckBox(this);
102 mRsvpButton->setText(i18n("Request response"));
103 mAddressBookButton = new QPushButton(i18n("Address &Book..."),this);
101 QLabel *attendeeLabel = new QLabel(this); 104 QLabel *attendeeLabel = new QLabel(this);
102 attendeeLabel->setText(i18n("Name:")); 105 attendeeLabel->setText(i18n("Name:"));
103 attendeeLabel->setFixedSize( attendeeLabel->sizeHint() ); 106 attendeeLabel->setFixedSize( attendeeLabel->sizeHint() );
104 mNameEdit = new QLineEdit(this); 107 mNameEdit = new QLineEdit(this);
105 connect(mNameEdit,SIGNAL(textChanged(const QString &)), 108 connect(mNameEdit,SIGNAL(textChanged(const QString &)),
106 SLOT(updateAttendeeItem())); 109 SLOT(updateAttendeeItem()));
@@ -124,27 +127,25 @@ KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name)
124 statusLabel->setText( i18n("Status:") ); 127 statusLabel->setText( i18n("Status:") );
125 128
126 mStatusCombo = new QComboBox(false,this); 129 mStatusCombo = new QComboBox(false,this);
127 mStatusCombo->insertStringList(Attendee::statusList()); 130 mStatusCombo->insertStringList(Attendee::statusList());
128 connect(mStatusCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem())); 131 connect(mStatusCombo,SIGNAL(activated(int)),SLOT(updateAttendeeItem()));
129 132
130 mRsvpButton = new QCheckBox(this); 133
131 mRsvpButton->setText(i18n("Request response"));
132 connect(mRsvpButton,SIGNAL(clicked()),SLOT(updateAttendeeItem())); 134 connect(mRsvpButton,SIGNAL(clicked()),SLOT(updateAttendeeItem()));
133 QWidget *buttonBox = new QWidget(this); 135 QWidget *buttonBox = new QWidget(this);
134 QVBoxLayout *buttonLayout = new QVBoxLayout(buttonBox); 136 QVBoxLayout *buttonLayout = new QVBoxLayout(buttonBox);
135 137
136 QPushButton *newButton = new QPushButton(i18n("&New"),buttonBox); 138 QPushButton *newButton = new QPushButton(i18n("&New"),buttonBox);
137 buttonLayout->addWidget(newButton); 139 buttonLayout->addWidget(newButton);
138 connect(newButton,SIGNAL(clicked()),SLOT(addNewAttendee())); 140 connect(newButton,SIGNAL(clicked()),SLOT(addNewAttendee()));
139 141
140 mRemoveButton = new QPushButton(i18n("&Remove"),buttonBox); 142 mRemoveButton = new QPushButton(i18n("&Remove"),buttonBox);
141 buttonLayout->addWidget(mRemoveButton); 143 buttonLayout->addWidget(mRemoveButton);
142 connect(mRemoveButton, SIGNAL(clicked()),SLOT(removeAttendee())); 144 connect(mRemoveButton, SIGNAL(clicked()),SLOT(removeAttendee()));
143 145
144 mAddressBookButton = new QPushButton(i18n("Address &Book..."),this);
145 // buttonLayout->addWidget(mAddressBookButton); 146 // buttonLayout->addWidget(mAddressBookButton);
146 connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook())); 147 connect(mAddressBookButton,SIGNAL(clicked()),SLOT(openAddressBook()));
147 //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () ); 148 //mRoleCombo->setFixedSize( mRoleCombo->sizeHint () );
148 149
149 if (qApp->desktop()->width() < 640 ) { 150 if (qApp->desktop()->width() < 640 ) {
150 if ( qApp->desktop()->width() < 300 ) 151 if ( qApp->desktop()->width() < 300 )
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp
index 9232e09..f9f037a 100644
--- a/korganizer/kotodoeditor.cpp
+++ b/korganizer/kotodoeditor.cpp
@@ -130,26 +130,26 @@ void KOTodoEditor::setupGeneral()
130 priorityLayout->addWidget( prioWidget ); 130 priorityLayout->addWidget( prioWidget );
131 QHBoxLayout* priorityLayout2 = new QHBoxLayout( prioWidget); 131 QHBoxLayout* priorityLayout2 = new QHBoxLayout( prioWidget);
132 132
133 133
134 QIconSet icon; 134 QIconSet icon;
135 if ( QApplication::desktop()->width() < 321 ) 135 if ( QApplication::desktop()->width() < 321 )
136 icon = SmallIcon("fileexport16");
137 else
138 icon = SmallIcon("fileexport");
139 QPushButton * saveTemplate = new QPushButton( prioWidget);
140 saveTemplate->setIconSet (icon ) ;
141 int size = saveTemplate->sizeHint().height();
142 saveTemplate->setFixedSize( size, size );
143 if ( QApplication::desktop()->width() < 321 )
144 icon = SmallIcon("fileimport16"); 136 icon = SmallIcon("fileimport16");
145 else 137 else
146 icon = SmallIcon("fileimport"); 138 icon = SmallIcon("fileimport");
147 QPushButton * loadTemplate = new QPushButton( prioWidget); 139 QPushButton * loadTemplate = new QPushButton( prioWidget);
148 loadTemplate->setIconSet (icon ) ; 140 loadTemplate->setIconSet (icon ) ;
141 int size = loadTemplate->sizeHint().height();
149 loadTemplate->setFixedSize( size, size ); 142 loadTemplate->setFixedSize( size, size );
143 if ( QApplication::desktop()->width() < 321 )
144 icon = SmallIcon("fileexport16");
145 else
146 icon = SmallIcon("fileexport");
147 QPushButton * saveTemplate = new QPushButton( prioWidget);
148 saveTemplate->setIconSet (icon ) ;
149 saveTemplate->setFixedSize( size, size );
150 150
151 priorityLayout2->addWidget(loadTemplate); 151 priorityLayout2->addWidget(loadTemplate);
152 priorityLayout2->addWidget(saveTemplate); 152 priorityLayout2->addWidget(saveTemplate);
153 mGeneral->initPriority(prioWidget,priorityLayout2); 153 mGeneral->initPriority(prioWidget,priorityLayout2);
154 mGeneral->initCategories( topFrame, priorityLayout ); 154 mGeneral->initCategories( topFrame, priorityLayout );
155 topLayout->addStretch(1); 155 topLayout->addStretch(1);