summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-07-01 18:39:59 (UTC)
committer zautrix <zautrix>2005-07-01 18:39:59 (UTC)
commitc53efbe8f53f468d21d93f5e19b625d1a4beb242 (patch) (side-by-side diff)
treef8fe2180733b6bd3514c02845cefa9f26e967e27
parent98d29d15275c4b8e9a3348742925f6e6d03f7a07 (diff)
downloadkdepimpi-c53efbe8f53f468d21d93f5e19b625d1a4beb242.zip
kdepimpi-c53efbe8f53f468d21d93f5e19b625d1a4beb242.tar.gz
kdepimpi-c53efbe8f53f468d21d93f5e19b625d1a4beb242.tar.bz2
fixxx
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt13
-rw-r--r--korganizer/calendarview.cpp15
-rw-r--r--korganizer/calendarview.h1
-rw-r--r--korganizer/kofilterview.cpp2
-rw-r--r--korganizer/kofilterview.h1
-rw-r--r--korganizer/mainwindow.cpp7
6 files changed, 28 insertions, 11 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 593806b..708ac19 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -1474,3 +1474,2 @@
{ "Filepath: ","Dateipfad: " },
-{ "The loading of one or more calendar failed:","Das Laden eines oder mehrerer Kalender schlug fehl:" },
{ "You can try to reload the calendar in the Resource View!","In der Resourcenansicht können Sie erneut versuchen den Kalender zu laden!" },
@@ -1478,2 +1477,14 @@
{ "Pending Suspend Alarm","Laufender Suspend Alarm" },
+{ "Error loading calendar %1","Fehler beim Laden von Kalender %1" },
+{ "Calendar(s) not loaded:","Nicht geladene(r) Kalender:" },
+{ "Loding of calendar(s) failed","Laden von Kalendern fehlgeschlagen" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
+{ "","" },
{ "","" },
diff --git a/korganizer/calendarview.cpp b/korganizer/calendarview.cpp
index 70a1d2d..678143d 100644
--- a/korganizer/calendarview.cpp
+++ b/korganizer/calendarview.cpp
@@ -476,2 +476,3 @@ void CalendarView::init()
connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateView()) );
+ connect( mCalEditView, SIGNAL( checkCalendar() ),this, SLOT( checkFiles() ));
connect( mCalEditView, SIGNAL( needsUpdate() ),this, SLOT( updateUnmanagedViews()) );
@@ -683,6 +684,4 @@ void CalendarView::scrollBarValue(int val )
}
-
-void CalendarView::checkAlarms()
+void CalendarView::checkFiles()
{
-
QString message;
@@ -697,5 +696,11 @@ void CalendarView::checkAlarms()
if ( !message.isEmpty() ) {
- 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);
- KMessageBox::error(this,message);
+ message = KGlobal::formatMessage( i18n("Calendar(s) not loaded:"),0 )+"\n" + message +KGlobal::formatMessage(i18n("You can try to reload the calendar in the Resource View!"),0);
+ KMessageBox::error(this,message, i18n("Loding of calendar(s) failed"));
+ }
+ QTimer::singleShot( 2000, this, SLOT ( checkAlarms() ));
}
+void CalendarView::checkAlarms()
+{
+
+
KConfig *config = KOGlobals::config();
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index c9e9870..651194b 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -203,2 +203,3 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
void checkAlarms();
+ void checkFiles();
void slotprintSelInc();
diff --git a/korganizer/kofilterview.cpp b/korganizer/kofilterview.cpp
index 3cde103..20118aa 100644
--- a/korganizer/kofilterview.cpp
+++ b/korganizer/kofilterview.cpp
@@ -217,2 +217,3 @@ void KOCalEditView::infoCal( int id )
QTimer::singleShot( 0, this, SLOT ( readConfig() ) );
+ QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) );
}
@@ -381,2 +382,3 @@ void KOCalEditView::addCal()
addCalendar ( name, file );
+ QTimer::singleShot( 100, this, SIGNAL ( checkCalendar() ) );
}
diff --git a/korganizer/kofilterview.h b/korganizer/kofilterview.h
index 54fe2c5..02107cf 100644
--- a/korganizer/kofilterview.h
+++ b/korganizer/kofilterview.h
@@ -235,2 +235,3 @@ class KOCalEditView : public QScrollView
void needsUpdate();
+ void checkCalendar();
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index b797d8c..501eed5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -400,7 +400,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name ) :
//toggleBeamReceive();
- int tiint= 3000;
-#ifndef DESKTOP_VERSION
- tiint = 5000;
-#endif
- QTimer::singleShot( tiint, mView, SLOT ( checkAlarms() ));
+
+ QTimer::singleShot( 1000, mView, SLOT ( checkFiles() ));
}