-rw-r--r-- | korganizer/mainwindow.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 9e326a1..d8aa43a 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -846,17 +846,18 @@ void MainWindow::initActions() | |||
846 | if (p-> mShowIconWhatsThis) | 846 | if (p-> mShowIconWhatsThis) |
847 | QWhatsThis::whatsThisButton ( iconToolBar ); | 847 | QWhatsThis::whatsThisButton ( iconToolBar ); |
848 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); | 848 | connect( configureToolBarMenu, SIGNAL( activated( int ) ),this, SLOT(configureToolBar( int ) ) ); |
849 | configureAgenda( p->mHourSize ); | 849 | configureAgenda( p->mHourSize ); |
850 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); | 850 | connect( configureAgendaMenu, SIGNAL( activated( int ) ),this, SLOT(configureAgenda( int ) ) ); |
851 | } | 851 | } |
852 | void MainWindow::fillSyncMenu() | 852 | void MainWindow::fillSyncMenu() |
853 | { | 853 | { |
854 | syncMenu->clear(); | 854 | if ( syncMenu->count() ) |
855 | syncMenu->clear(); | ||
855 | syncMenu->insertItem( i18n("Configure..."), 0 ); | 856 | syncMenu->insertItem( i18n("Configure..."), 0 ); |
856 | syncMenu->insertSeparator(); | 857 | syncMenu->insertSeparator(); |
857 | syncMenu->insertItem( i18n("Multiple sync"), 1 ); | 858 | syncMenu->insertItem( i18n("Multiple sync"), 1 ); |
858 | syncMenu->insertSeparator(); | 859 | syncMenu->insertSeparator(); |
859 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); | 860 | KConfig config ( locateLocal( "config","ksyncprofilesrc" ) ); |
860 | config.setGroup("General"); | 861 | config.setGroup("General"); |
861 | QStringList prof = config.readListEntry("SyncProfileNames"); | 862 | QStringList prof = config.readListEntry("SyncProfileNames"); |
862 | KOPrefs::instance()->mLocalMachineName = config.readEntry("LocalMachineName","undefined"); | 863 | KOPrefs::instance()->mLocalMachineName = config.readEntry("LocalMachineName","undefined"); |
@@ -983,17 +984,22 @@ void MainWindow::multiSync( bool askforPrefs ) | |||
983 | setCaption(i18n("Nothing synced! No profiles defined for multisync!")); | 984 | setCaption(i18n("Nothing synced! No profiles defined for multisync!")); |
984 | return; | 985 | return; |
985 | } | 986 | } |
986 | void MainWindow::slotSyncMenu( int action ) | 987 | void MainWindow::slotSyncMenu( int action ) |
987 | { | 988 | { |
988 | //qDebug("syncaction %d ", action); | 989 | //qDebug("syncaction %d ", action); |
989 | if ( action == 0 ) { | 990 | if ( action == 0 ) { |
990 | 991 | ||
991 | confSync(); | 992 | // seems to be a Qt2 event handling bug |
993 | // syncmenu.clear causes a segfault at first time | ||
994 | // when we call it after the main event loop, it is ok | ||
995 | // same behaviour when calling OM/Pi via QCOP for the first time | ||
996 | QTimer::singleShot ( 1, this, SLOT ( confSync() ) ); | ||
997 | //confSync(); | ||
992 | 998 | ||
993 | return; | 999 | return; |
994 | } | 1000 | } |
995 | if ( action == 1 ) { | 1001 | if ( action == 1 ) { |
996 | multiSync( true ); | 1002 | multiSync( true ); |
997 | return; | 1003 | return; |
998 | } | 1004 | } |
999 | 1005 | ||
@@ -1907,19 +1913,16 @@ void MainWindow::quickSyncLocalFile() | |||
1907 | 1913 | ||
1908 | } | 1914 | } |
1909 | } | 1915 | } |
1910 | 1916 | ||
1911 | void MainWindow::confSync() | 1917 | void MainWindow::confSync() |
1912 | { | 1918 | { |
1913 | mView->confSync(); | 1919 | mView->confSync(); |
1914 | fillSyncMenu(); | 1920 | fillSyncMenu(); |
1915 | //mView->writeSettings(); | ||
1916 | |||
1917 | |||
1918 | } | 1921 | } |
1919 | void MainWindow::syncRemote( KSyncProfile* prof, bool ask) | 1922 | void MainWindow::syncRemote( KSyncProfile* prof, bool ask) |
1920 | { | 1923 | { |
1921 | QString question; | 1924 | QString question; |
1922 | if ( ask ) { | 1925 | if ( ask ) { |
1923 | question = i18n("Do you really want\nto remote sync\nwith profile \n")+ prof->getName()+" ?\n"; | 1926 | question = i18n("Do you really want\nto remote sync\nwith profile \n")+ prof->getName()+" ?\n"; |
1924 | if ( QMessageBox::information( this, i18n("KO/Pi Sync"), | 1927 | if ( QMessageBox::information( this, i18n("KO/Pi Sync"), |
1925 | question, | 1928 | question, |