1 files changed, 1 insertions, 7 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index a5d8824..b6ce7d5 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -593,133 +593,129 @@ void MainWindow::recieve( const QCString& cmsg, const QByteArray& data )
            mView->viewManager()->showWeekView();
        }
        else if ( msg == "-showTodo" ) {
            mView->viewManager()->showTodoView();
        }
        else if ( msg == "-showJournal"  ) {
            mView->dateNavigator()->selectDates( 1 );
            mView->dateNavigator()->selectToday();
            mView->viewManager()->showJournalView();
        }
        else if ( msg == "-showKO" ) {
            mView->viewManager()->showNextXView();
        }
        else if ( msg == "-showWNext"  ) {
            mView->viewManager()->showWhatsNextView();
        }
        else if ( msg == "nextView()" ) {
            mView->viewManager()->showNextView();
        }
        else if ( msg == "-showNextXView" ) {
            mView->viewManager()->showNextXView();
        }
    }
    showMaximized();
    raise();
 }
 void MainWindow::startMultiSync()
 {
    QString question = i18n("Do you really want\nto multiple sync\nwith all checked profiles?\nSyncing takes some\ntime - all profiles\nare synced twice!");
    if ( QMessageBox::information( this, i18n("KDE-Pim Sync"),
                                   question,
                                   i18n("Yes"), i18n("No"),
                                   0, 0 ) != 0 ) {
        setCaption(i18n("Aborted! Nothing synced!"));
        return;
    }
    mSyncManager->multiSync( false );
 #ifndef DESKTOP_VERSION
    QCopEnvelope e("QPE/Application/kapi", "doRingSync");
 #endif
 }
 QPixmap MainWindow::loadPixmap( QString name )
 {
    return SmallIcon( name );
 }
 void MainWindow::setUsesBigPixmaps ( bool b )
 {
    qDebug("KO: MainWindow::setUsesBigPixmaps %d called", b);
    if ( b )
        qDebug("KO: BigPixmaps are not supported ");
 }
 void MainWindow::initActions()
 {
    //KOPrefs::instance()->mShowFullMenu
    iconToolBar->clear();
    KOPrefs *p = KOPrefs::instance();
    //QPEMenuBar *menuBar1;// = new QPEMenuBar( iconToolBar );
    QPopupMenu *viewMenu = new QPopupMenu( this );
    QPopupMenu *actionMenu = new QPopupMenu( this );
-#ifdef DESKTOP_VERSION
-    mCurrentItemMenu = actionMenu;
-#else
    mCurrentItemMenu = new QPopupMenu ( this );
-#endif
    QPopupMenu *importMenu = new QPopupMenu( this );
    QPopupMenu *importMenu_X = new QPopupMenu( this );
    QPopupMenu *exportMenu_X = new QPopupMenu( this );
    QPopupMenu *beamMenu_X = new QPopupMenu( this );
    selectFilterMenu = new QPopupMenu( this );
    selectFilterMenu->setCheckable( true );
    syncMenu = new QPopupMenu( this );
    configureAgendaMenu = new QPopupMenu( this );
    configureToolBarMenu = new QPopupMenu( this );
    QPopupMenu *helpMenu = new QPopupMenu( this );
    QIconSet icon;
    int pixWid = 22, pixHei = 22;
    QString pathString = "";
    if ( !p->mToolBarMiniIcons ) {
        if ( QApplication::desktop()->width() < 480 /*|| QApplication::desktop()->height() < 320*/) {
            pathString += "icons16/";
            pixWid = 18; pixHei = 16;
        }
    } else {
        pathString += "iconsmini/";
        pixWid = 18; pixHei = 16;
    }
    if ( KOPrefs::instance()->mShowFullMenu ) {
        QMenuBar *menuBar1;
        menuBar1 = menuBar();
        menuBar1->insertItem( i18n("File"), importMenu );
        menuBar1->insertItem( i18n("View"), viewMenu );
        menuBar1->insertItem( i18n("Actions"), actionMenu );
 #ifdef DESKTOP_VERSION
        menuBar1->insertItem( i18n("Synchronize"), syncMenu );
        menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
 #else
        menuBar1->insertItem( i18n("Sync"), syncMenu );
        menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu  );
 #endif
        //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu );
        menuBar1->insertItem( i18n("Filter"),selectFilterMenu  );
        menuBar1->insertItem( i18n("Help"), helpMenu );
    } else {
        QPEMenuBar *menuBar1;
        menuBar1 = new QPEMenuBar( iconToolBar );
        QPopupMenu *menuBar = new QPopupMenu( this );
        icon = loadPixmap( pathString + "z_menu" );
        menuBar1->insertItem( icon.pixmap(), menuBar);
        //menuBar1->insertItem( i18n("ME"), menuBar);
        menuBar->insertItem( i18n("File"), importMenu );
        menuBar->insertItem( i18n("View"), viewMenu );
        menuBar->insertItem( i18n("Actions"), actionMenu );
        menuBar->insertItem( i18n("Synchronize"), syncMenu );
        menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu  );
        menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu );
        menuBar->insertItem( i18n("Filter"),selectFilterMenu  );
        menuBar->insertItem( i18n("Help"), helpMenu );
        //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() );
        menuBar1->setMaximumSize( menuBar1->sizeHint( ));
    }
    connect ( selectFilterMenu, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
    connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) );
   
    mWeekBgColor = iconToolBar->backgroundColor();
    mWeekPixmap.resize( pixWid , pixHei );
    mWeekPixmap.fill( mWeekBgColor );
    icon = mWeekPixmap;
@@ -745,131 +741,129 @@ void MainWindow::initActions()
    connect( this, SIGNAL( selectWeek ( int ) ), mView->dateNavigator(), SLOT( selectWeek ( int ) ) );
    if ( p->mShowIconFilterview ) {
        icon = loadPixmap( pathString + "filter" );
        actionFilterMenuTB = new QAction( i18n("Filter selector"), icon, i18n("Filter selector"), 0, this );
        connect( actionFilterMenuTB, SIGNAL( activated() ),
                 this, SLOT( fillFilterMenuTB() ) );
        actionFilterMenuTB->addTo( iconToolBar  );
        selectFilterMenuTB = new QPopupMenu( this );
        selectFilterMenuTB->setCheckable( true ); 
        connect ( selectFilterMenuTB, SIGNAL( activated ( int )  ), this, SLOT (selectFilter( int ) ) );
    }
    //#endif
    // ******************
    QAction *action;
    // QPopupMenu *configureMenu= new QPopupMenu( menuBar );
    configureToolBarMenu->setCheckable( true );
   
    configureAgendaMenu->setCheckable( true );
    int iii ;
    for ( iii = 1;iii<= 10 ;++iii ){
        configureAgendaMenu->insertItem(i18n("Size %1").arg(iii), (iii+1)*2 );
    }
    //configureMenu->insertItem( "AgendaSize",configureAgendaMenu  );
    connect( configureAgendaMenu, SIGNAL( aboutToShow()),
             this, SLOT( showConfigureAgenda( ) ) );
    icon = loadPixmap( pathString + "today" );
    QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
    today_action->addTo( actionMenu );
    connect( today_action, SIGNAL( activated() ),
             mView, SLOT( goToday() ) );
    icon = loadPixmap( pathString + "picker" );
    QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this );
    dPickerAction->addTo( actionMenu );
    connect( dPickerAction, SIGNAL( activated() ),
             mView, SLOT( showDatePicker() ) );
    icon = loadPixmap( pathString + "search" );
    QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
    search_action->addTo( actionMenu );
    connect( search_action, SIGNAL( activated() ),
             mView->dialogManager(), SLOT( showSearchDialog() ) );
    actionMenu->insertSeparator();
    
   
    action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this );
    action->addTo( actionMenu );
    connect( action, SIGNAL( activated() ),
             mView, SLOT( undo_delete() ) );
    icon = loadPixmap( pathString + "newevent" );
    configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 );
    configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 );
    configureToolBarMenu->insertSeparator();
    configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 );
    configureToolBarMenu->insertSeparator();
    configureToolBarMenu->insertItem(i18n("Week Number"), 400);
    configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
-#ifndef DESKTOP_VERSION
    actionMenu->insertItem (  i18n("Selected Item"),  mCurrentItemMenu);
-#endif
    mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
    mShowAction->addTo( mCurrentItemMenu  );
    connect( mShowAction, SIGNAL( activated() ),
             mView, SLOT( showIncidence() ) );
    mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
    mEditAction->addTo( mCurrentItemMenu  );
    connect( mEditAction, SIGNAL( activated() ),
             mView, SLOT( editIncidence() ) );
    mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
    mDeleteAction->addTo(  mCurrentItemMenu );
    connect( mDeleteAction, SIGNAL( activated() ),
             mView, SLOT( deleteIncidence() ) );
    mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
    mCloneAction->addTo( mCurrentItemMenu  );
    connect( mCloneAction, SIGNAL( activated() ),
             mView, SLOT( cloneIncidence() ) );
    mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
    mMoveAction->addTo( mCurrentItemMenu  );
    connect( mMoveAction, SIGNAL( activated() ),
             mView, SLOT( moveIncidence() ) );
    mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
    mBeamAction->addTo(mCurrentItemMenu  );
    connect( mBeamAction, SIGNAL( activated() ),
             mView, SLOT( beamIncidence() ) );
    mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
    mCancelAction->addTo( mCurrentItemMenu  );
    connect( mCancelAction, SIGNAL( activated() ),
             mView, SLOT( toggleCancelIncidence() ) );
 #ifdef DESKTOP_VERSION
    actionMenu->insertSeparator();
 #endif
    QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
    ne_action->addTo( actionMenu );
    connect( ne_action, SIGNAL( activated() ),
             mView, SLOT( newEvent() ) );
    icon = loadPixmap( pathString + "newtodo" );
    configureToolBarMenu->insertItem(icon, i18n("New Todo..."), 20 );
    QAction* nt_action = new QAction( i18n("New Todo..."), icon, i18n("New Todo..."), 0, this );
    nt_action->addTo( actionMenu );
    connect( nt_action, SIGNAL( activated() ),
             mView, SLOT( newTodo() ) );
   
    // ***********************
    if ( KOPrefs::instance()->mVerticalScreen ) {
         icon = SmallIcon( "1updownarrow" );
    } else {
        icon = SmallIcon("1leftrightarrow" );
    }
    configureToolBarMenu->insertItem(icon, i18n("Toggle Fullscreen"), 28 );
    QAction* FSaction = new QAction( i18n("Toggle Fullscreen"), icon, i18n("Toggle Fullscreen"), 0, this );
    FSaction->addTo( viewMenu );
    connect( FSaction, SIGNAL( activated() ), mView, SLOT( toggleExpand() ));
   
    icon = loadPixmap( pathString + "filter" );
    configureToolBarMenu->insertItem(icon, i18n("Filter menu icon"), 26 );
@@ -1017,129 +1011,129 @@ void MainWindow::initActions()
    actionMenu->insertSeparator();
     action = new QAction( "manage cat", i18n("Edit category list..."), 0,
                          this );
    action->addTo(  actionMenu );
    connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) );
     action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
                          this );
    action->addTo(  actionMenu );
    connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
    actionMenu->insertSeparator();
    icon = loadPixmap( pathString + "configure" );
    action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
    action->addTo( actionMenu );
    connect( action, SIGNAL( activated() ),
             mView, SLOT( edit_options() ) );  
    icon = loadPixmap( pathString + "configure" );
    action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
    action->addTo( actionMenu );
    connect( action, SIGNAL( activated() ),
             mView, SLOT( edit_global_options() ) );
    if ( KOPrefs::instance()->mShowFullMenu ) {
        actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
    }
    // actionMenu->insertSeparator();
    action = new QAction( "import_qtopia", i18n("Import (*.ics/*.vcs) file"), 0,
                          this );
    action->addTo( importMenu_X );
    connect( action, SIGNAL( activated() ), SLOT( importIcal() ) );
    action = new QAction( "import_quick", i18n("Import last file"), 0,
                          this );
    action->addTo( importMenu_X );
    connect( action, SIGNAL( activated() ), SLOT( quickImportIcal() ) );
    importMenu_X->insertSeparator();
    action = new QAction( "import_bday", i18n("Import Birthdays (KA/Pi)"), 0,
                          this );
    action->addTo( importMenu_X );
    connect( action, SIGNAL( activated() ), SLOT( importBday() ) );
    //#ifndef DESKTOP_VERSION
    importMenu_X->insertSeparator();
    action = new QAction( "import_qtopia", i18n("Import Opie/Qtopia Cal."), 0,
                          this );
    action->addTo( importMenu_X );
    connect( action, SIGNAL( activated() ), SLOT( importQtopia() ) );
    //#else
 #ifdef _OL_IMPORT_
    importMenu_X->insertSeparator();
    action = new QAction( "import_ol", i18n("Import from OL"), 0,
                          this );
    action->addTo( importMenu_X );
    connect( action, SIGNAL( activated() ), SLOT( importOL() ) );
 #endif
    //#endif
    //importMenu->insertSeparator();
 #if 0
    action = new QAction( "load_cal", i18n("Load Calendar Backup"), 0,
                          this );
    action->addTo( importMenu );
    connect( action, SIGNAL( activated() ), SLOT( loadCalendar() ) );
 #endif
-    action = new QAction( "save_cal", i18n("Save Calendar Backup"), 0,
+    action = new QAction( "save_cal", i18n("Save Calendar Backup..."), 0,
                          this );
    action->addTo( importMenu );
    connect( action, SIGNAL( activated() ), SLOT( saveCalendar() ) );
    importMenu->insertSeparator();
    importMenu->insertItem( i18n("Import"), importMenu_X );
    //importMenu->insertSeparator();
    action = new QAction( "import_qtopia", i18n("Export VCalendar"), 0,
                          this );
    action->addTo( exportMenu_X );    
    connect( action, SIGNAL( activated() ), SLOT( exportVCalendar() ) );
    //LR
    QPopupMenu *ex2phone = new QPopupMenu( this );
    ex2phone->insertItem(i18n("Complete calendar..."), 1 );
    ex2phone->insertItem(i18n("Filtered calendar..."), 2 );
    connect( ex2phone, SIGNAL( activated(int) ), this, SLOT( exportToPhone( int)) );
    exportMenu_X->insertItem( i18n("Export to phone"), ex2phone );
    importMenu->insertItem( i18n("Export"), exportMenu_X );
 #ifndef DESKTOP_VERSION
    //importMenu->insertSeparator();
    brAction = new QAction( "beam toggle", i18n("Beam receive enabled"), 0,
                          this );
    brAction->addTo( beamMenu_X ); 
    brAction->setToggleAction (true ) ;
    connect( brAction, SIGNAL( activated() ), this, SLOT( toggleBeamReceive() ) );
    action = new QAction( "beam all", i18n("Beam complete calendar..."), 0,
                          this );
    action->addTo( beamMenu_X );
    connect( action, SIGNAL( activated() ), mView, SLOT( beamCalendar() ) );
    action = new QAction( "beam all", i18n("Beam filtered calendar..."), 0,
                          this );
    action->addTo( beamMenu_X );
    connect( action, SIGNAL( activated() ), mView, SLOT( beamFilteredCalendar()) );
    importMenu->insertItem( i18n("Beam"), beamMenu_X );
 #else
    //importMenu->insertSeparator();
    icon = loadPixmap( pathString + "print" );
    action = new QAction( i18n("Print calendar..."),icon,i18n("Print calendar..."), 0, this );
    action->addTo( beamMenu_X );
    connect( action, SIGNAL( activated() ),
             this, SLOT( printCal() ) );
    icon = loadPixmap( pathString + "print" );
    action = new QAction( i18n("Print agenda selection..."),icon,i18n("Print agenda selection..."), 0, this );
    action->addTo( beamMenu_X );
    connect( action, SIGNAL( activated() ),
             this, SLOT( printSel() ) );  
    action = new QAction( i18n("Print What's Next View..."),icon,i18n("Print What's Next View..."), 0, this );
    action->addTo( beamMenu_X );
    connect( action, SIGNAL( activated() ),
             mView->viewManager(), SLOT( slotprintWNV() ) );
 
    icon = loadPixmap( pathString + "print" );
    action = new QAction( i18n("Print List View..."),icon,i18n("Print List View..."), 0, this );
    action->addTo( beamMenu_X );
    connect( action, SIGNAL( activated() ),
             this, SLOT( printListView() ) );
   action = new QAction( i18n("Print selected event / todo..."),icon,i18n("Print selected event / todo..."), 0, this );