summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-06-29 21:43:21 (UTC)
committer zautrix <zautrix>2005-06-29 21:43:21 (UTC)
commit54dd512d3980381c2b02263462db03ae7c5a0264 (patch) (side-by-side diff)
tree82a31315a85ad5e0a95ef37274fa96f7c4a88dfa
parent7ccfe9b674bd5cc52eab708c2e7dfb02c3328deb (diff)
downloadkdepimpi-54dd512d3980381c2b02263462db03ae7c5a0264.zip
kdepimpi-54dd512d3980381c2b02263462db03ae7c5a0264.tar.gz
kdepimpi-54dd512d3980381c2b02263462db03ae7c5a0264.tar.bz2
fixxx
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--bin/kdepim/korganizer/germantranslation.txt2
-rw-r--r--kaddressbook/kaimportoldialog.cpp7
-rw-r--r--korganizer/koimportoldialog.cpp8
3 files changed, 10 insertions, 7 deletions
diff --git a/bin/kdepim/korganizer/germantranslation.txt b/bin/kdepim/korganizer/germantranslation.txt
index 792cb91..5e2180f 100644
--- a/bin/kdepim/korganizer/germantranslation.txt
+++ b/bin/kdepim/korganizer/germantranslation.txt
@@ -827,7 +827,7 @@
{ "Anonymous","Anonymo" },
{ "nobody@nowhere","niemand@nirgendwo" },
{ "calendar.html","calendar.html" },
-{ " Local Time"," Locale Zeit" },
+{ " Local Time"," Lokale Zeit" },
{ "Unknown Name","Unbekannter Name" },
{ "unknown@nowhere","unbekannt@nirgendwo" },
{ "Beam via IR!","Beam via IR!" },
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp
index 7bb8bd8..2f794d6 100644
--- a/kaddressbook/kaimportoldialog.cpp
+++ b/kaddressbook/kaimportoldialog.cpp
@@ -26,6 +26,7 @@
#include <qpixmap.h>
#include <qlayout.h>
#include <qprogressbar.h>
+#include <qprogressdialog.h>
#include <qwidgetstack.h>
#include <qdatetime.h>
#include <qdir.h>
@@ -218,13 +219,13 @@ void KAImportOLdialog::readContactData( DWORD folder )
LPDISPATCH itm;
int i;
folderItems = mf.GetItems();
- QProgressBar bar( folderItems.GetCount(),0 );
- bar.setCaption (i18n("Importing - close to abort!") );
+ QProgressDialog bar( i18n("Importing contact data"),i18n("Abort"), folderItems.GetCount(),this);
+ bar.setCaption (i18n("Importing!") );
int h = bar.sizeHint().height() ;
int w = 300;
int dw = QApplication::desktop()->width();
int dh = QApplication::desktop()->height();
- bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+ //bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
bar.show();
for(i=1; i <= folderItems.GetCount(); ++i)
{
diff --git a/korganizer/koimportoldialog.cpp b/korganizer/koimportoldialog.cpp
index 7aa6076..2af436c 100644
--- a/korganizer/koimportoldialog.cpp
+++ b/korganizer/koimportoldialog.cpp
@@ -26,6 +26,7 @@
#include <qpixmap.h>
#include <qlayout.h>
#include <qprogressbar.h>
+#include <qprogressdialog.h>
#include <qwidgetstack.h>
#include <qdatetime.h>
#include <qdir.h>
@@ -211,13 +212,13 @@ void KOImportOLdialog::readCalendarData( DWORD folder )
LPDISPATCH itm;
int i;
folderItems = mf.GetItems();
- QProgressBar bar( folderItems.GetCount(),0 );
- bar.setCaption (i18n("Importing - close to abort!") );
+ QProgressDialog bar( i18n("Importing calendar data"),i18n("Abort"), folderItems.GetCount(),this );
+ bar.setCaption (i18n("Importing!") );
int h = bar.sizeHint().height() ;
int w = 300;
int dw = QApplication::desktop()->width();
int dh = QApplication::desktop()->height();
- bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
+ //bar.setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
bar.show();
for(i=1; i <= folderItems.GetCount(); ++i)
{
@@ -225,6 +226,7 @@ void KOImportOLdialog::readCalendarData( DWORD folder )
if ( ! bar.isVisible() )
return ;
bar.setProgress( i );
+ bar.raise();
indx = (long)i;
itm = folderItems.Item(indx.Detach());
_AppointmentItem * pItem = (_AppointmentItem *)&itm;