author | zautrix <zautrix> | 2005-07-01 14:47:16 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-01 14:47:16 (UTC) |
commit | f330b9d0a7f755660ddd59739e3ab9b98d60bc18 (patch) (unidiff) | |
tree | c29630a799dc39906e57ba1d23cba6861f1cc0bb /korganizer | |
parent | eee2e65aebe1c93a0c391a927b86ce87a278a4df (diff) | |
download | kdepimpi-f330b9d0a7f755660ddd59739e3ab9b98d60bc18.zip kdepimpi-f330b9d0a7f755660ddd59739e3ab9b98d60bc18.tar.gz kdepimpi-f330b9d0a7f755660ddd59739e3ab9b98d60bc18.tar.bz2 |
fixii
-rw-r--r-- | korganizer/calendarview.cpp | 18 | ||||
-rw-r--r-- | korganizer/koeditordetails.cpp | 2 | ||||
-rw-r--r-- | korganizer/koeditorgeneral.cpp | 7 | ||||
-rw-r--r-- | korganizer/koeditorgeneralevent.cpp | 5 | ||||
-rw-r--r-- | korganizer/koeditorgeneraltodo.cpp | 2 | ||||
-rw-r--r-- | korganizer/koeventeditor.cpp | 6 | ||||
-rw-r--r-- | korganizer/koincidenceeditor.cpp | 2 | ||||
-rw-r--r-- | korganizer/kotodoeditor.cpp | 4 |
8 files changed, 38 insertions, 8 deletions
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp index c0f3be7..fd026fa 100644 --- a/korganizer/calendarview.cpp +++ b/korganizer/calendarview.cpp | |||
@@ -675,24 +675,38 @@ void CalendarView::scrollBarValue(int val ) | |||
675 | block = false; | 675 | block = false; |
676 | return; | 676 | return; |
677 | } | 677 | } |
678 | QDate d ( year,1,1 ); | 678 | QDate d ( year,1,1 ); |
679 | mNavigator->selectDates( d.addDays( val ), count ); | 679 | mNavigator->selectDates( d.addDays( val ), count ); |
680 | block = false; | 680 | block = false; |
681 | #endif | 681 | #endif |
682 | 682 | ||
683 | } | 683 | } |
684 | 684 | ||
685 | void CalendarView::checkAlarms() | 685 | void CalendarView::checkAlarms() |
686 | { | 686 | { |
687 | |||
688 | QString message; | ||
689 | QPtrList<KopiCalendarFile> calendars = KOPrefs::instance()->mCalendars; | ||
690 | KopiCalendarFile * cal = calendars.first(); | ||
691 | while ( cal ) { | ||
692 | if ( cal->mErrorOnLoad ) { | ||
693 | message += cal->mName +"\n"+KGlobal::formatMessage ( "(" +i18n( "Filepath: ")+ cal->mFileName+")" ,0 )+"\n"; | ||
694 | } | ||
695 | cal = calendars.next(); | ||
696 | } | ||
697 | if ( !message.isEmpty() ) { | ||
698 | message = KGlobal::formatMessage( i18n("The loading of one or more calendar failed:"),0 )+"\n" + message +KGlobal::formatMessage(i18n("You can try to reload the calendar in the Resource View!"),0); | ||
699 | KMessageBox::error(this,message); | ||
700 | } | ||
687 | KConfig *config = KOGlobals::config(); | 701 | KConfig *config = KOGlobals::config(); |
688 | config->setGroup( "AppRun" ); | 702 | config->setGroup( "AppRun" ); |
689 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); | 703 | QDateTime dt ( QDate (2005,1,1), QTime( 0,0,0 ) ); |
690 | int daysto = dt.daysTo( QDate::currentDate() ); | 704 | int daysto = dt.daysTo( QDate::currentDate() ); |
691 | int days = config->readNumEntry( "LatestProgramStopDays" , daysto); | 705 | int days = config->readNumEntry( "LatestProgramStopDays" , daysto); |
692 | dt = dt.addDays( days ); | 706 | dt = dt.addDays( days ); |
693 | int secto = dt.secsTo( QDateTime::currentDateTime() ); | 707 | int secto = dt.secsTo( QDateTime::currentDateTime() ); |
694 | int secs = config->readNumEntry( "LatestProgramStopSecs" , secto) - 30; | 708 | int secs = config->readNumEntry( "LatestProgramStopSecs" , secto) - 30; |
695 | //qDebug("KO: Reading program stop %d ", secs); | 709 | //qDebug("KO: Reading program stop %d ", secs); |
696 | //secs -= ( 3600 * 24*3 ); // debug only | 710 | //secs -= ( 3600 * 24*3 ); // debug only |
697 | QDateTime latest = dt.addSecs ( secs ); | 711 | QDateTime latest = dt.addSecs ( secs ); |
698 | qDebug("KO: Last termination on %s ", latest.toString().latin1()); | 712 | qDebug("KO: Last termination on %s ", latest.toString().latin1()); |
@@ -1914,35 +1928,35 @@ bool CalendarView::restoreCalendarSettings() | |||
1914 | mCalendar->setDefaultCalendar( cal->mCalNumber ); | 1928 | mCalendar->setDefaultCalendar( cal->mCalNumber ); |
1915 | cal = calendars.next(); | 1929 | cal = calendars.next(); |
1916 | } | 1930 | } |
1917 | setSyncEventsReadOnly(); | 1931 | setSyncEventsReadOnly(); |
1918 | mCalendar->reInitAlarmSettings(); | 1932 | mCalendar->reInitAlarmSettings(); |
1919 | updateUnmanagedViews(); | 1933 | updateUnmanagedViews(); |
1920 | updateView(); | 1934 | updateView(); |
1921 | return true; | 1935 | return true; |
1922 | } | 1936 | } |
1923 | void CalendarView::addCalendarId( int id ) | 1937 | void CalendarView::addCalendarId( int id ) |
1924 | { | 1938 | { |
1925 | KopiCalendarFile * cal = KOPrefs::instance()->getCalendar( id ); | 1939 | KopiCalendarFile * cal = KOPrefs::instance()->getCalendar( id ); |
1940 | if ( cal ) | ||
1926 | addCalendar( cal ); | 1941 | addCalendar( cal ); |
1927 | } | 1942 | } |
1928 | bool CalendarView::addCalendar( KopiCalendarFile * cal ) | 1943 | bool CalendarView::addCalendar( KopiCalendarFile * cal ) |
1929 | { | 1944 | { |
1930 | cal->mErrorOnLoad = false; | 1945 | cal->mErrorOnLoad = false; |
1931 | if ( mCalendar->addCalendarFile( cal->mFileName, cal->mCalNumber )) { | 1946 | if ( mCalendar->addCalendarFile( cal->mFileName, cal->mCalNumber )) { |
1932 | cal->mLoadDt = QDateTime::currentDateTime(); | 1947 | cal->mLoadDt = QDateTime::currentDateTime(); |
1933 | return true; | 1948 | return true; |
1934 | } | 1949 | } |
1935 | qDebug("KO: Error adding calendar file %1 ",cal->mFileName.latin1() ); | 1950 | qDebug("KO: Error adding calendar file %s ",cal->mFileName.latin1() ); |
1936 | KMessageBox::error(this,i18n("Error loading calendar file\n%1.").arg(cal->mFileName)); | ||
1937 | cal->mErrorOnLoad = true; | 1951 | cal->mErrorOnLoad = true; |
1938 | return false; | 1952 | return false; |
1939 | } | 1953 | } |
1940 | bool CalendarView::openCalendar(QString filename, bool merge) | 1954 | bool CalendarView::openCalendar(QString filename, bool merge) |
1941 | { | 1955 | { |
1942 | 1956 | ||
1943 | if (filename.isEmpty()) { | 1957 | if (filename.isEmpty()) { |
1944 | return false; | 1958 | return false; |
1945 | } | 1959 | } |
1946 | 1960 | ||
1947 | if (!QFile::exists(filename)) { | 1961 | if (!QFile::exists(filename)) { |
1948 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); | 1962 | KMessageBox::error(this,i18n("File does not exist:\n '%1'.").arg(filename)); |
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index 7354940..479bd8b 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp | |||
@@ -24,24 +24,25 @@ | |||
24 | #include <qtooltip.h> | 24 | #include <qtooltip.h> |
25 | #include <qfiledialog.h> | 25 | #include <qfiledialog.h> |
26 | #include <qlayout.h> | 26 | #include <qlayout.h> |
27 | #include <qvbox.h> | 27 | #include <qvbox.h> |
28 | #include <qbuttongroup.h> | 28 | #include <qbuttongroup.h> |
29 | #include <qvgroupbox.h> | 29 | #include <qvgroupbox.h> |
30 | #include <qwidgetstack.h> | 30 | #include <qwidgetstack.h> |
31 | #include <qdatetime.h> | 31 | #include <qdatetime.h> |
32 | #include <qapp.h> | 32 | #include <qapp.h> |
33 | 33 | ||
34 | #include <klocale.h> | 34 | #include <klocale.h> |
35 | #include <kglobal.h> | 35 | #include <kglobal.h> |
36 | #include <kdialog.h> | ||
36 | #include <kiconloader.h> | 37 | #include <kiconloader.h> |
37 | #include <kstandarddirs.h> | 38 | #include <kstandarddirs.h> |
38 | #include <kmessagebox.h> | 39 | #include <kmessagebox.h> |
39 | #ifndef KORG_NOKABC | 40 | #ifndef KORG_NOKABC |
40 | 41 | ||
41 | #ifdef DESKTOP_VERSION | 42 | #ifdef DESKTOP_VERSION |
42 | #include <kabc/addresseedialog.h> | 43 | #include <kabc/addresseedialog.h> |
43 | #else //DESKTOP_VERSION | 44 | #else //DESKTOP_VERSION |
44 | #include <externalapphandler.h> | 45 | #include <externalapphandler.h> |
45 | #endif //DESKTOP_VERSION | 46 | #endif //DESKTOP_VERSION |
46 | 47 | ||
47 | #endif | 48 | #endif |
@@ -72,24 +73,25 @@ void CustomListViewItem<class Attendee *>::updateItem() | |||
72 | else { | 73 | else { |
73 | setPixmap(4,SmallIcon("nomailappt")); | 74 | setPixmap(4,SmallIcon("nomailappt")); |
74 | setSortKey(4,"n"); | 75 | setSortKey(4,"n"); |
75 | } | 76 | } |
76 | } | 77 | } |
77 | 78 | ||
78 | 79 | ||
79 | KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) | 80 | KOEditorDetails::KOEditorDetails (int spacing,QWidget* parent,const char* name) |
80 | : QWidget( parent, name), mDisableItemUpdate( false ) | 81 | : QWidget( parent, name), mDisableItemUpdate( false ) |
81 | { | 82 | { |
82 | QGridLayout *topLayout = new QGridLayout(this); | 83 | QGridLayout *topLayout = new QGridLayout(this); |
83 | topLayout->setSpacing(spacing); | 84 | topLayout->setSpacing(spacing); |
85 | topLayout->setMargin(KDialog::marginHint()-2); | ||
84 | 86 | ||
85 | QString organizer = KOPrefs::instance()->email(); | 87 | QString organizer = KOPrefs::instance()->email(); |
86 | mOrganizerLabel = new QLabel(i18n("Organizer: %1").arg(organizer),this); | 88 | mOrganizerLabel = new QLabel(i18n("Organizer: %1").arg(organizer),this); |
87 | 89 | ||
88 | mListView = new KListView(this,"mListView"); | 90 | mListView = new KListView(this,"mListView"); |
89 | mListView->addColumn(i18n("Name"),180); | 91 | mListView->addColumn(i18n("Name"),180); |
90 | mListView->addColumn(i18n("Email"),180); | 92 | mListView->addColumn(i18n("Email"),180); |
91 | mListView->addColumn(i18n("Role"),60); | 93 | mListView->addColumn(i18n("Role"),60); |
92 | mListView->addColumn(i18n("Status"),100); | 94 | mListView->addColumn(i18n("Status"),100); |
93 | mListView->addColumn(i18n("RSVP"),35); | 95 | mListView->addColumn(i18n("RSVP"),35); |
94 | if ( QApplication::desktop()->width() <= 320 || QApplication::desktop()->height() <= 240) { | 96 | if ( QApplication::desktop()->width() <= 320 || QApplication::desktop()->height() <= 240) { |
95 | int hei = 80; | 97 | int hei = 80; |
diff --git a/korganizer/koeditorgeneral.cpp b/korganizer/koeditorgeneral.cpp index e07bc53..29e68b3 100644 --- a/korganizer/koeditorgeneral.cpp +++ b/korganizer/koeditorgeneral.cpp | |||
@@ -26,24 +26,25 @@ | |||
26 | #include <qlayout.h> | 26 | #include <qlayout.h> |
27 | #include <qvbox.h> | 27 | #include <qvbox.h> |
28 | #include <qbuttongroup.h> | 28 | #include <qbuttongroup.h> |
29 | #include <qvgroupbox.h> | 29 | #include <qvgroupbox.h> |
30 | #include <qwidgetstack.h> | 30 | #include <qwidgetstack.h> |
31 | #include <qdatetime.h> | 31 | #include <qdatetime.h> |
32 | #include <qtimer.h> | 32 | #include <qtimer.h> |
33 | #include <qfile.h> | 33 | #include <qfile.h> |
34 | #include <qregexp.h> | 34 | #include <qregexp.h> |
35 | 35 | ||
36 | 36 | ||
37 | #include <kglobal.h> | 37 | #include <kglobal.h> |
38 | #include <kdialog.h> | ||
38 | #include <kdebug.h> | 39 | #include <kdebug.h> |
39 | #include <klocale.h> | 40 | #include <klocale.h> |
40 | #include <kiconloader.h> | 41 | #include <kiconloader.h> |
41 | #include <kmessagebox.h> | 42 | #include <kmessagebox.h> |
42 | #include <kfiledialog.h> | 43 | #include <kfiledialog.h> |
43 | #include <kstandarddirs.h> | 44 | #include <kstandarddirs.h> |
44 | 45 | ||
45 | #include <libkcal/todo.h> | 46 | #include <libkcal/todo.h> |
46 | #include <libkcal/event.h> | 47 | #include <libkcal/event.h> |
47 | #include <libkdepim/categoryselectdialog.h> | 48 | #include <libkdepim/categoryselectdialog.h> |
48 | #include <libkdepim/kdateedit.h> | 49 | #include <libkdepim/kdateedit.h> |
49 | 50 | ||
@@ -67,25 +68,27 @@ KOEditorGeneral::KOEditorGeneral(QObject* parent, const char* name) : | |||
67 | KOEditorGeneral::~KOEditorGeneral() | 68 | KOEditorGeneral::~KOEditorGeneral() |
68 | { | 69 | { |
69 | } | 70 | } |
70 | 71 | ||
71 | void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) | 72 | void KOEditorGeneral::initHeader(QWidget *parent,QBoxLayout *topLayout) |
72 | { | 73 | { |
73 | QGridLayout *headerLayout = new QGridLayout(topLayout); | 74 | QGridLayout *headerLayout = new QGridLayout(topLayout); |
74 | 75 | ||
75 | #if 0 | 76 | #if 0 |
76 | mOwnerLabel = new QLabel(i18n("Owner:"),parent); | 77 | mOwnerLabel = new QLabel(i18n("Owner:"),parent); |
77 | headerLayout->addMultiCellWidget(mOwnerLabel,0,0,0,1); | 78 | headerLayout->addMultiCellWidget(mOwnerLabel,0,0,0,1); |
78 | #endif | 79 | #endif |
79 | 80 | // 1 on pda | |
81 | // 11 on desktop | ||
82 | headerLayout->setSpacing( (KDialog::spacingHint()-3)*2+1 ); | ||
80 | QLabel *summaryLabel = new QLabel(i18n("Summary:"),parent); | 83 | QLabel *summaryLabel = new QLabel(i18n("Summary:"),parent); |
81 | headerLayout->addWidget(summaryLabel,1,0); | 84 | headerLayout->addWidget(summaryLabel,1,0); |
82 | 85 | ||
83 | mSummaryEdit = new KOLocationBox(TRUE,parent, 10); | 86 | mSummaryEdit = new KOLocationBox(TRUE,parent, 10); |
84 | mSummaryEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); | 87 | mSummaryEdit->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); |
85 | //mSummaryEdit->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5 ,(QSizePolicy::SizeType)3 ,FALSE) ); | 88 | //mSummaryEdit->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5 ,(QSizePolicy::SizeType)3 ,FALSE) ); |
86 | //qDebug("h %d %d ", summaryLabel->sizeHint().height(),mSummaryEdit->sizeHint().height() ); | 89 | //qDebug("h %d %d ", summaryLabel->sizeHint().height(),mSummaryEdit->sizeHint().height() ); |
87 | int hei = (summaryLabel->sizeHint().height() + mSummaryEdit->sizeHint().height())/2; | 90 | int hei = (summaryLabel->sizeHint().height() + mSummaryEdit->sizeHint().height())/2; |
88 | if ( QApplication::desktop()->width() > 320 ) | 91 | if ( QApplication::desktop()->width() > 320 ) |
89 | mSummaryEdit->setMaximumHeight( hei +6 ); | 92 | mSummaryEdit->setMaximumHeight( hei +6 ); |
90 | //qDebug("%d %d %d %d %d %d ", QSizePolicy::Fixed , QSizePolicy::Minimum , QSizePolicy:: Maximum , QSizePolicy:: Preferred , QSizePolicy:: MinimumExpanding , QSizePolicy::Expanding ); | 93 | //qDebug("%d %d %d %d %d %d ", QSizePolicy::Fixed , QSizePolicy::Minimum , QSizePolicy:: Maximum , QSizePolicy:: Preferred , QSizePolicy:: MinimumExpanding , QSizePolicy::Expanding ); |
91 | // SizeType { Fixed = 0, Minimum = MayGrow, Maximum = MayShrink, Preferred = MayGrow|MayShrink, MinimumExpanding = Minimum|ExpMask, Expanding = MinimumExpanding|MayShrink } | 94 | // SizeType { Fixed = 0, Minimum = MayGrow, Maximum = MayShrink, Preferred = MayGrow|MayShrink, MinimumExpanding = Minimum|ExpMask, Expanding = MinimumExpanding|MayShrink } |
@@ -180,25 +183,25 @@ void KOEditorGeneral::initCategories(QWidget *parent, QBoxLayout *topLayout) | |||
180 | { | 183 | { |
181 | QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout ); | 184 | QBoxLayout *categoriesLayout = new QHBoxLayout( topLayout ); |
182 | mCatPopup = new QPopupMenu ( parent ); | 185 | mCatPopup = new QPopupMenu ( parent ); |
183 | mCatPopup->setCheckable (true); | 186 | mCatPopup->setCheckable (true); |
184 | connect(mCatPopup,SIGNAL(aboutToShow () ), this ,SLOT(showCatPopup())); | 187 | connect(mCatPopup,SIGNAL(aboutToShow () ), this ,SLOT(showCatPopup())); |
185 | connect(mCatPopup,SIGNAL( activated ( int ) ), this ,SLOT(selectedCatPopup( int ))); | 188 | connect(mCatPopup,SIGNAL( activated ( int ) ), this ,SLOT(selectedCatPopup( int ))); |
186 | mCategoriesButton = new QPushButton(parent); | 189 | mCategoriesButton = new QPushButton(parent); |
187 | mCategoriesButton->setText(i18n("Categories...")); | 190 | mCategoriesButton->setText(i18n("Categories...")); |
188 | connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() )); | 191 | connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() )); |
189 | //connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() )); | 192 | //connect(mCategoriesButton,SIGNAL(clicked()),this, SLOT(editCategories() )); |
190 | categoriesLayout->addWidget(mCategoriesButton); | 193 | categoriesLayout->addWidget(mCategoriesButton); |
191 | mCategoriesLabel = new QPushButton(parent);//new QLabel(parent); | 194 | mCategoriesLabel = new QPushButton(parent);//new QLabel(parent); |
192 | mCategoriesLabel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::MinimumExpanding ,FALSE) ); | 195 | mCategoriesLabel->setSizePolicy( QSizePolicy( QSizePolicy::Preferred ,QSizePolicy::Fixed ,FALSE) ); |
193 | mCategoriesLabel->setPopup( mCatPopup ); | 196 | mCategoriesLabel->setPopup( mCatPopup ); |
194 | //mCategoriesLabel->setFrameStyle(QFrame::Panel|QFrame::Sunken); | 197 | //mCategoriesLabel->setFrameStyle(QFrame::Panel|QFrame::Sunken); |
195 | categoriesLayout->addWidget(mCategoriesLabel,1); | 198 | categoriesLayout->addWidget(mCategoriesLabel,1); |
196 | } | 199 | } |
197 | 200 | ||
198 | void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout) | 201 | void KOEditorGeneral::initSecrecy(QWidget *parent, QBoxLayout *topLayout) |
199 | { | 202 | { |
200 | QBoxLayout *secrecyLayout = new QHBoxLayout( topLayout ); | 203 | QBoxLayout *secrecyLayout = new QHBoxLayout( topLayout ); |
201 | 204 | ||
202 | QLabel *secrecyLabel = new QLabel(i18n("Access:"),parent); | 205 | QLabel *secrecyLabel = new QLabel(i18n("Access:"),parent); |
203 | mCancelBox = new QCheckBox ( i18n("Cancelled"), parent); | 206 | mCancelBox = new QCheckBox ( i18n("Cancelled"), parent); |
204 | secrecyLayout->addWidget(mCancelBox); | 207 | secrecyLayout->addWidget(mCancelBox); |
diff --git a/korganizer/koeditorgeneralevent.cpp b/korganizer/koeditorgeneralevent.cpp index 3dd7f5c..2c6ed9f 100644 --- a/korganizer/koeditorgeneralevent.cpp +++ b/korganizer/koeditorgeneralevent.cpp | |||
@@ -22,24 +22,25 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include <qtooltip.h> | 24 | #include <qtooltip.h> |
25 | #include <qlayout.h> | 25 | #include <qlayout.h> |
26 | #include <qvbox.h> | 26 | #include <qvbox.h> |
27 | #include <qbuttongroup.h> | 27 | #include <qbuttongroup.h> |
28 | #include <qvgroupbox.h> | 28 | #include <qvgroupbox.h> |
29 | #include <qwidgetstack.h> | 29 | #include <qwidgetstack.h> |
30 | #include <qdatetime.h> | 30 | #include <qdatetime.h> |
31 | 31 | ||
32 | #include <kdebug.h> | 32 | #include <kdebug.h> |
33 | #include <kglobal.h> | 33 | #include <kglobal.h> |
34 | #include <kdialog.h> | ||
34 | #include <klocale.h> | 35 | #include <klocale.h> |
35 | #include <kiconloader.h> | 36 | #include <kiconloader.h> |
36 | #include <kmessagebox.h> | 37 | #include <kmessagebox.h> |
37 | #include <kfiledialog.h> | 38 | #include <kfiledialog.h> |
38 | #include <kstandarddirs.h> | 39 | #include <kstandarddirs.h> |
39 | 40 | ||
40 | #include <libkcal/event.h> | 41 | #include <libkcal/event.h> |
41 | 42 | ||
42 | #include <libkdepim/kdateedit.h> | 43 | #include <libkdepim/kdateedit.h> |
43 | 44 | ||
44 | #include "koprefs.h" | 45 | #include "koprefs.h" |
45 | 46 | ||
@@ -82,26 +83,26 @@ void KOEditorGeneralEvent::finishSetup() | |||
82 | mSummaryEdit->load(KOLocationBox::SUMMARYEVENT); | 83 | mSummaryEdit->load(KOLocationBox::SUMMARYEVENT); |
83 | mSummaryEdit->setFocus(); | 84 | mSummaryEdit->setFocus(); |
84 | } | 85 | } |
85 | 86 | ||
86 | void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout) | 87 | void KOEditorGeneralEvent::initTime(QWidget *parent,QBoxLayout *topLayout) |
87 | { | 88 | { |
88 | QBoxLayout *timeLayout = new QVBoxLayout(topLayout); | 89 | QBoxLayout *timeLayout = new QVBoxLayout(topLayout); |
89 | 90 | ||
90 | QGroupBox *timeGroupBox = new QGroupBox(1,QGroupBox::Horizontal, | 91 | QGroupBox *timeGroupBox = new QGroupBox(1,QGroupBox::Horizontal, |
91 | i18n("Date && Time"),parent); | 92 | i18n("Date && Time"),parent); |
92 | timeLayout->addWidget(timeGroupBox); | 93 | timeLayout->addWidget(timeGroupBox); |
93 | 94 | ||
94 | timeGroupBox->layout()->setSpacing( 0 ); | 95 | timeGroupBox->layout()->setSpacing( KDialog::spacingHintSmall() ); |
95 | timeGroupBox->layout()->setMargin( 5 ); | 96 | timeGroupBox->layout()->setMargin( KDialog::marginHint() ); |
96 | QFrame *timeBoxFrame = new QFrame(timeGroupBox); | 97 | QFrame *timeBoxFrame = new QFrame(timeGroupBox); |
97 | 98 | ||
98 | QGridLayout *layoutTimeBox = new QGridLayout(timeBoxFrame,2,3); | 99 | QGridLayout *layoutTimeBox = new QGridLayout(timeBoxFrame,2,3); |
99 | layoutTimeBox->setSpacing(topLayout->spacing()); | 100 | layoutTimeBox->setSpacing(topLayout->spacing()); |
100 | 101 | ||
101 | mStartDateLabel = new QLabel(i18n("Start:"),timeBoxFrame); | 102 | mStartDateLabel = new QLabel(i18n("Start:"),timeBoxFrame); |
102 | layoutTimeBox->addWidget(mStartDateLabel,0,0); | 103 | layoutTimeBox->addWidget(mStartDateLabel,0,0); |
103 | 104 | ||
104 | mStartDateEdit = new KDateEdit(timeBoxFrame); | 105 | mStartDateEdit = new KDateEdit(timeBoxFrame); |
105 | layoutTimeBox->addWidget(mStartDateEdit,0,1); | 106 | layoutTimeBox->addWidget(mStartDateEdit,0,1); |
106 | 107 | ||
107 | mStartTimeEdit = new KOTimeEdit(timeBoxFrame); | 108 | mStartTimeEdit = new KOTimeEdit(timeBoxFrame); |
diff --git a/korganizer/koeditorgeneraltodo.cpp b/korganizer/koeditorgeneraltodo.cpp index 0a734ee..965cf47 100644 --- a/korganizer/koeditorgeneraltodo.cpp +++ b/korganizer/koeditorgeneraltodo.cpp | |||
@@ -80,25 +80,25 @@ void KOEditorGeneralTodo::finishSetup() | |||
80 | // QWidget::setTabOrder(mSecrecyCombo, mDescriptionEdit); | 80 | // QWidget::setTabOrder(mSecrecyCombo, mDescriptionEdit); |
81 | mSummaryEdit->load(KOLocationBox::SUMMARYTODO); | 81 | mSummaryEdit->load(KOLocationBox::SUMMARYTODO); |
82 | mSummaryEdit->setFocus(); | 82 | mSummaryEdit->setFocus(); |
83 | } | 83 | } |
84 | 84 | ||
85 | void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout) | 85 | void KOEditorGeneralTodo::initTime(QWidget *parent,QBoxLayout *topLayout) |
86 | { | 86 | { |
87 | QBoxLayout *timeLayout = new QVBoxLayout(topLayout); | 87 | QBoxLayout *timeLayout = new QVBoxLayout(topLayout); |
88 | 88 | ||
89 | QGroupBox *timeGroupBox = new QGroupBox(1,QGroupBox::Horizontal, | 89 | QGroupBox *timeGroupBox = new QGroupBox(1,QGroupBox::Horizontal, |
90 | i18n("Date && Time"),parent); | 90 | i18n("Date && Time"),parent); |
91 | timeLayout->addWidget(timeGroupBox); | 91 | timeLayout->addWidget(timeGroupBox); |
92 | timeGroupBox->layout()->setSpacing( KDialog::spacingHintSmall() ); | 92 | timeGroupBox->layout()->setSpacing( KDialog::spacingHint()-2 ); |
93 | timeGroupBox->layout()->setMargin( KDialog::marginHint() ); | 93 | timeGroupBox->layout()->setMargin( KDialog::marginHint() ); |
94 | QFrame *timeBoxFrame = new QFrame(timeGroupBox); | 94 | QFrame *timeBoxFrame = new QFrame(timeGroupBox); |
95 | 95 | ||
96 | QGridLayout *layoutTimeBox = new QGridLayout(timeBoxFrame,3,3); | 96 | QGridLayout *layoutTimeBox = new QGridLayout(timeBoxFrame,3,3); |
97 | layoutTimeBox->setSpacing(KDialog::spacingHintSmall()); | 97 | layoutTimeBox->setSpacing(KDialog::spacingHintSmall()); |
98 | layoutTimeBox->setColStretch( 1, 1 ); | 98 | layoutTimeBox->setColStretch( 1, 1 ); |
99 | 99 | ||
100 | mDueCheck = new QCheckBox(i18n("Due:"),timeBoxFrame); | 100 | mDueCheck = new QCheckBox(i18n("Due:"),timeBoxFrame); |
101 | layoutTimeBox->addWidget(mDueCheck,1,0); | 101 | layoutTimeBox->addWidget(mDueCheck,1,0); |
102 | connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(enableDueEdit(bool))); | 102 | connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(enableDueEdit(bool))); |
103 | connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(showAlarm())); | 103 | connect(mDueCheck,SIGNAL(toggled(bool)),SLOT(showAlarm())); |
104 | 104 | ||
diff --git a/korganizer/koeventeditor.cpp b/korganizer/koeventeditor.cpp index 75dae34..9ede543 100644 --- a/korganizer/koeventeditor.cpp +++ b/korganizer/koeventeditor.cpp | |||
@@ -99,28 +99,32 @@ void KOEventEditor::setCategories( QString s ) | |||
99 | 99 | ||
100 | } | 100 | } |
101 | void KOEventEditor::setupGeneral() | 101 | void KOEventEditor::setupGeneral() |
102 | { | 102 | { |
103 | mGeneral = new KOEditorGeneralEvent( this, "KOEditorGeneralEvent" ); | 103 | mGeneral = new KOEditorGeneralEvent( this, "KOEditorGeneralEvent" ); |
104 | connect ( mGeneral, SIGNAL ( allAccepted() ), this, SLOT ( slotOk () ) ); | 104 | connect ( mGeneral, SIGNAL ( allAccepted() ), this, SLOT ( slotOk () ) ); |
105 | 105 | ||
106 | if( KOPrefs::instance()->mCompactDialogs ) { | 106 | if( KOPrefs::instance()->mCompactDialogs ) { |
107 | QFrame *topFrame = addPage(i18n("General")); | 107 | QFrame *topFrame = addPage(i18n("General")); |
108 | QBoxLayout *topLayout = new QVBoxLayout(topFrame); | 108 | QBoxLayout *topLayout = new QVBoxLayout(topFrame); |
109 | topLayout->setSpacing(spacingHint()-1); | 109 | topLayout->setSpacing(spacingHint()-1); |
110 | topLayout->setMargin(marginHint()-1); | 110 | topLayout->setMargin(marginHint()-1); |
111 | topLayout->addStretch ( 1 ); | ||
111 | mGeneral->initHeader(topFrame,topLayout); | 112 | mGeneral->initHeader(topFrame,topLayout); |
113 | topLayout->addStretch ( 1 ); | ||
112 | mGeneral->initTime(topFrame,topLayout); | 114 | mGeneral->initTime(topFrame,topLayout); |
115 | topLayout->addStretch ( 1 ); | ||
113 | // QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout); | 116 | // QBoxLayout *alarmLineLayout = new QHBoxLayout(topLayout); |
114 | mGeneral->initAlarm(topFrame,topLayout); | 117 | mGeneral->initAlarm(topFrame,topLayout); |
118 | topLayout->addStretch ( 1 ); | ||
115 | mGeneral->enableAlarm( false ); | 119 | mGeneral->enableAlarm( false ); |
116 | 120 | ||
117 | QBoxLayout *buttonLayout; | 121 | QBoxLayout *buttonLayout; |
118 | if ( QApplication::desktop()->width() < 500 && QApplication::desktop()->height() > 240 ) | 122 | if ( QApplication::desktop()->width() < 500 && QApplication::desktop()->height() > 240 ) |
119 | buttonLayout = new QVBoxLayout( topLayout ); | 123 | buttonLayout = new QVBoxLayout( topLayout ); |
120 | else | 124 | else |
121 | buttonLayout = new QHBoxLayout( topLayout ); | 125 | buttonLayout = new QHBoxLayout( topLayout ); |
122 | QHBox* buttonWidget = new QHBox (topFrame); | 126 | QHBox* buttonWidget = new QHBox (topFrame); |
123 | QIconSet icon; | 127 | QIconSet icon; |
124 | if ( QApplication::desktop()->width() < 321 ) | 128 | if ( QApplication::desktop()->width() < 321 ) |
125 | icon = SmallIcon("fileexport16"); | 129 | icon = SmallIcon("fileexport16"); |
126 | else | 130 | else |
@@ -135,24 +139,26 @@ void KOEventEditor::setupGeneral() | |||
135 | else | 139 | else |
136 | icon = SmallIcon("fileimport"); | 140 | icon = SmallIcon("fileimport"); |
137 | loadTemplate->setIconSet (icon ) ; | 141 | loadTemplate->setIconSet (icon ) ; |
138 | loadTemplate->setFixedSize( size, size ); | 142 | loadTemplate->setFixedSize( size, size ); |
139 | buttonLayout->addWidget( buttonWidget ); | 143 | buttonLayout->addWidget( buttonWidget ); |
140 | mGeneral->initCategories( topFrame, buttonLayout ); | 144 | mGeneral->initCategories( topFrame, buttonLayout ); |
141 | 145 | ||
142 | topLayout->addStretch( 1 ); | 146 | topLayout->addStretch( 1 ); |
143 | 147 | ||
144 | QFrame *topFrame2 = addPage(i18n("Details")); | 148 | QFrame *topFrame2 = addPage(i18n("Details")); |
145 | 149 | ||
146 | QBoxLayout *topLayout2 = new QVBoxLayout(topFrame2); | 150 | QBoxLayout *topLayout2 = new QVBoxLayout(topFrame2); |
151 | topLayout2->setSpacing(spacingHint()-1); | ||
152 | topLayout2->setMargin(marginHint()-1); | ||
147 | topLayout2->setSpacing(spacingHint()); | 153 | topLayout2->setSpacing(spacingHint()); |
148 | 154 | ||
149 | mGeneral->initClass(topFrame2,topLayout2); | 155 | mGeneral->initClass(topFrame2,topLayout2); |
150 | mGeneral->initSecrecy( topFrame2, topLayout2 ); | 156 | mGeneral->initSecrecy( topFrame2, topLayout2 ); |
151 | mGeneral->initDescription(topFrame2,topLayout2); | 157 | mGeneral->initDescription(topFrame2,topLayout2); |
152 | 158 | ||
153 | connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); | 159 | connect( saveTemplate, SIGNAL( clicked() ), this , SLOT( slotSaveTemplate() ) ); |
154 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); | 160 | connect( loadTemplate, SIGNAL( clicked() ), this , SLOT( slotLoadTemplate() ) ); |
155 | } else { | 161 | } else { |
156 | QFrame *topFrame = addPage(i18n("General")); | 162 | QFrame *topFrame = addPage(i18n("General")); |
157 | 163 | ||
158 | QBoxLayout *topLayout = new QVBoxLayout(topFrame); | 164 | QBoxLayout *topLayout = new QVBoxLayout(topFrame); |
diff --git a/korganizer/koincidenceeditor.cpp b/korganizer/koincidenceeditor.cpp index 9813a80..9bc0302 100644 --- a/korganizer/koincidenceeditor.cpp +++ b/korganizer/koincidenceeditor.cpp | |||
@@ -77,25 +77,25 @@ KOIncidenceEditor::KOIncidenceEditor( const QString &caption, | |||
77 | 77 | ||
78 | KOIncidenceEditor::~KOIncidenceEditor() | 78 | KOIncidenceEditor::~KOIncidenceEditor() |
79 | { | 79 | { |
80 | //delete mCategoryDialog; | 80 | //delete mCategoryDialog; |
81 | } | 81 | } |
82 | 82 | ||
83 | void KOIncidenceEditor::setupAttendeesTab() | 83 | void KOIncidenceEditor::setupAttendeesTab() |
84 | { | 84 | { |
85 | QFrame *topFrame = addPage(i18n("Attendees")); | 85 | QFrame *topFrame = addPage(i18n("Attendees")); |
86 | 86 | ||
87 | QBoxLayout *topLayout = new QVBoxLayout(topFrame); | 87 | QBoxLayout *topLayout = new QVBoxLayout(topFrame); |
88 | 88 | ||
89 | mDetails = new KOEditorDetails(spacingHint(),topFrame); | 89 | mDetails = new KOEditorDetails(spacingHint()-2,topFrame); |
90 | topLayout->addWidget(mDetails); | 90 | topLayout->addWidget(mDetails); |
91 | } | 91 | } |
92 | 92 | ||
93 | 93 | ||
94 | void KOIncidenceEditor::slotApply() | 94 | void KOIncidenceEditor::slotApply() |
95 | { | 95 | { |
96 | processInput( false ); | 96 | processInput( false ); |
97 | } | 97 | } |
98 | void KOIncidenceEditor::accept() | 98 | void KOIncidenceEditor::accept() |
99 | { | 99 | { |
100 | slotOk(); | 100 | slotOk(); |
101 | } | 101 | } |
diff --git a/korganizer/kotodoeditor.cpp b/korganizer/kotodoeditor.cpp index 8b90ae5..555c1b1 100644 --- a/korganizer/kotodoeditor.cpp +++ b/korganizer/kotodoeditor.cpp | |||
@@ -111,27 +111,31 @@ void KOTodoEditor::setupGeneral() | |||
111 | 111 | ||
112 | if (KOPrefs::instance()->mCompactDialogs) { | 112 | if (KOPrefs::instance()->mCompactDialogs) { |
113 | QFrame *topFrame = addPage(i18n("General")); | 113 | QFrame *topFrame = addPage(i18n("General")); |
114 | 114 | ||
115 | QBoxLayout *topLayout = new QVBoxLayout(topFrame); | 115 | QBoxLayout *topLayout = new QVBoxLayout(topFrame); |
116 | if ( QApplication::desktop()->width() < 480 ) { | 116 | if ( QApplication::desktop()->width() < 480 ) { |
117 | topLayout->setMargin(marginHintSmall()); | 117 | topLayout->setMargin(marginHintSmall()); |
118 | topLayout->setSpacing(spacingHintSmall()); | 118 | topLayout->setSpacing(spacingHintSmall()); |
119 | } else { | 119 | } else { |
120 | topLayout->setMargin(marginHint()); | 120 | topLayout->setMargin(marginHint()); |
121 | topLayout->setSpacing(spacingHint()); | 121 | topLayout->setSpacing(spacingHint()); |
122 | } | 122 | } |
123 | topLayout->addStretch( 1 ); | ||
123 | mGeneral->initHeader(topFrame,topLayout); | 124 | mGeneral->initHeader(topFrame,topLayout); |
125 | topLayout->addStretch( 1 ); | ||
124 | mGeneral->initTime(topFrame,topLayout); | 126 | mGeneral->initTime(topFrame,topLayout); |
127 | topLayout->addStretch( 1 ); | ||
125 | mGeneral->initAlarm(topFrame,topLayout); | 128 | mGeneral->initAlarm(topFrame,topLayout); |
129 | topLayout->addStretch( 1 ); | ||
126 | mGeneral->enableAlarm( false ); | 130 | mGeneral->enableAlarm( false ); |
127 | 131 | ||
128 | 132 | ||
129 | QBoxLayout *priorityLayout; | 133 | QBoxLayout *priorityLayout; |
130 | if ( QApplication::desktop()->width() < 500 ) | 134 | if ( QApplication::desktop()->width() < 500 ) |
131 | priorityLayout = new QVBoxLayout( topLayout ); | 135 | priorityLayout = new QVBoxLayout( topLayout ); |
132 | else | 136 | else |
133 | priorityLayout = new QHBoxLayout( topLayout ); | 137 | priorityLayout = new QHBoxLayout( topLayout ); |
134 | QWidget* prioWidget = new QWidget (topFrame); | 138 | QWidget* prioWidget = new QWidget (topFrame); |
135 | priorityLayout->addWidget( prioWidget ); | 139 | priorityLayout->addWidget( prioWidget ); |
136 | QHBoxLayout* priorityLayout2 = new QHBoxLayout( prioWidget); | 140 | QHBoxLayout* priorityLayout2 = new QHBoxLayout( prioWidget); |
137 | 141 | ||