author | zautrix <zautrix> | 2005-03-25 00:08:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-03-25 00:08:08 (UTC) |
commit | 7c2e130ddd194f1c4b5365af6999a27c08232f4b (patch) (unidiff) | |
tree | 75665681327ee49d7650f4d840b5c8c772180fb4 /libkdepim/ksyncmanager.cpp | |
parent | 5cf054b82738d65f9b0a34ccb51c993ee4a0189f (diff) | |
download | kdepimpi-7c2e130ddd194f1c4b5365af6999a27c08232f4b.zip kdepimpi-7c2e130ddd194f1c4b5365af6999a27c08232f4b.tar.gz kdepimpi-7c2e130ddd194f1c4b5365af6999a27c08232f4b.tar.bz2 |
fixes
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 7319285..184cb39 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -52,39 +52,33 @@ | |||
52 | 52 | ||
53 | #include <klocale.h> | 53 | #include <klocale.h> |
54 | #include <kglobal.h> | 54 | #include <kglobal.h> |
55 | #include <kconfig.h> | 55 | #include <kconfig.h> |
56 | #include <kfiledialog.h> | 56 | #include <kfiledialog.h> |
57 | 57 | ||
58 | QDateTime KSyncManager::mRequestedSyncEvent; | 58 | QDateTime KSyncManager::mRequestedSyncEvent; |
59 | 59 | ||
60 | 60 | ||
61 | KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu) | 61 | KSyncManager::KSyncManager(QWidget* parent, KSyncInterface* implementation, TargetApp ta, KPimPrefs* prefs, QPopupMenu* syncmenu) |
62 | : QObject(), mPrefs(prefs ), mParent(parent),mImplementation(implementation), mTargetApp(ta), mSyncMenu(syncmenu) | 62 | : QObject(), mPrefs(prefs ), mParent(parent),mImplementation(implementation), mTargetApp(ta), mSyncMenu(syncmenu) |
63 | { | 63 | { |
64 | mServerSocket = 0; | 64 | mServerSocket = 0; |
65 | bar = new QProgressBar ( 1, 0 ); | 65 | bar = new QProgressBar ( 1, 0 ); |
66 | bar->setCaption (""); | 66 | bar->setCaption (""); |
67 | mWriteBackInPast = 2; | 67 | mWriteBackInPast = 2; |
68 | int w = 300; | 68 | |
69 | if ( QApplication::desktop()->width() < 320 ) | ||
70 | w = 220; | ||
71 | int h = bar->sizeHint().height() ; | ||
72 | int dw = QApplication::desktop()->width(); | ||
73 | int dh = QApplication::desktop()->height(); | ||
74 | bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | ||
75 | 69 | ||
76 | } | 70 | } |
77 | 71 | ||
78 | KSyncManager::~KSyncManager() | 72 | KSyncManager::~KSyncManager() |
79 | { | 73 | { |
80 | delete bar; | 74 | delete bar; |
81 | } | 75 | } |
82 | 76 | ||
83 | void KSyncManager::setDefaultFileName( QString s) | 77 | void KSyncManager::setDefaultFileName( QString s) |
84 | { | 78 | { |
85 | mDefFileName = s ; | 79 | mDefFileName = s ; |
86 | if ( mPrefs->mPassiveSyncAutoStart ) | 80 | if ( mPrefs->mPassiveSyncAutoStart ) |
87 | enableQuick( false ); | 81 | enableQuick( false ); |
88 | } | 82 | } |
89 | 83 | ||
90 | void KSyncManager::fillSyncMenu() | 84 | void KSyncManager::fillSyncMenu() |
@@ -996,32 +990,39 @@ bool KSyncManager::syncExternalApplication(QString resource) | |||
996 | 990 | ||
997 | return syncOK; | 991 | return syncOK; |
998 | 992 | ||
999 | } | 993 | } |
1000 | 994 | ||
1001 | void KSyncManager::syncPhone() | 995 | void KSyncManager::syncPhone() |
1002 | { | 996 | { |
1003 | 997 | ||
1004 | syncExternalApplication("phone"); | 998 | syncExternalApplication("phone"); |
1005 | 999 | ||
1006 | } | 1000 | } |
1007 | 1001 | ||
1008 | void KSyncManager::showProgressBar(int percentage, QString caption, int total) | 1002 | void KSyncManager::showProgressBar(int percentage, QString caption, int total) |
1009 | { | 1003 | { |
1010 | if (!bar->isVisible()) | 1004 | if (!bar->isVisible()) |
1011 | { | 1005 | { |
1006 | int w = 300; | ||
1007 | if ( QApplication::desktop()->width() < 320 ) | ||
1008 | w = 220; | ||
1009 | int h = bar->sizeHint().height() ; | ||
1010 | int dw = QApplication::desktop()->width(); | ||
1011 | int dh = QApplication::desktop()->height(); | ||
1012 | bar->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h ); | ||
1012 | bar->setCaption (caption); | 1013 | bar->setCaption (caption); |
1013 | bar->setTotalSteps ( total ) ; | 1014 | bar->setTotalSteps ( total ) ; |
1014 | bar->show(); | 1015 | bar->show(); |
1015 | } | 1016 | } |
1016 | bar->raise(); | 1017 | bar->raise(); |
1017 | bar->setProgress( percentage ); | 1018 | bar->setProgress( percentage ); |
1018 | qApp->processEvents(); | 1019 | qApp->processEvents(); |
1019 | } | 1020 | } |
1020 | 1021 | ||
1021 | void KSyncManager::hideProgressBar() | 1022 | void KSyncManager::hideProgressBar() |
1022 | { | 1023 | { |
1023 | bar->hide(); | 1024 | bar->hide(); |
1024 | qApp->processEvents(); | 1025 | qApp->processEvents(); |
1025 | } | 1026 | } |
1026 | 1027 | ||
1027 | bool KSyncManager::isProgressBarCanceled() | 1028 | bool KSyncManager::isProgressBarCanceled() |