author | zautrix <zautrix> | 2005-07-02 21:45:23 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-07-02 21:45:23 (UTC) |
commit | 5cf73f798229641d23025af064e87fa88ab3de91 (patch) (unidiff) | |
tree | 12b618f0eedea62fb281e576b657b60bd2c3cc9c /korganizer | |
parent | c69004813dce7402f56e7f90e172c8fb56e9cc55 (diff) | |
download | kdepimpi-5cf73f798229641d23025af064e87fa88ab3de91.zip kdepimpi-5cf73f798229641d23025af064e87fa88ab3de91.tar.gz kdepimpi-5cf73f798229641d23025af064e87fa88ab3de91.tar.bz2 |
fixes
-rw-r--r-- | korganizer/koeventpopupmenu.cpp | 2 | ||||
-rw-r--r-- | korganizer/kolistview.cpp | 2 | ||||
-rw-r--r-- | korganizer/mainwindow.cpp | 17 |
3 files changed, 9 insertions, 12 deletions
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp index 41d331a..0b0fe8e 100644 --- a/korganizer/koeventpopupmenu.cpp +++ b/korganizer/koeventpopupmenu.cpp | |||
@@ -31,25 +31,25 @@ | |||
31 | 31 | ||
32 | #include "koeventpopupmenu.h" | 32 | #include "koeventpopupmenu.h" |
33 | #include "koprefs.h" | 33 | #include "koprefs.h" |
34 | 34 | ||
35 | KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu() | 35 | KOEventPopupMenu::KOEventPopupMenu(): QPopupMenu() |
36 | { | 36 | { |
37 | mCurrentIncidence = 0; | 37 | mCurrentIncidence = 0; |
38 | mHasAdditionalItems = false; | 38 | mHasAdditionalItems = false; |
39 | 39 | ||
40 | 40 | ||
41 | mSingleOnlyItems.append( insertItem (i18n("&Show"),this,SLOT(popupShow()))); | 41 | mSingleOnlyItems.append( insertItem (i18n("&Show"),this,SLOT(popupShow()))); |
42 | mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit()))); | 42 | mEditOnlyItems.append(insertItem (i18n("&Edit..."),this,SLOT(popupEdit()))); |
43 | mEditOnlyItems.append(insertItem (i18n("&Delete"), | 43 | mEditOnlyItems.append(insertItem (i18n("&Delete..."), |
44 | this,SLOT(popupDelete()))); | 44 | this,SLOT(popupDelete()))); |
45 | mEditOnlyItems.append(insertItem (i18n("&Clone..."), | 45 | mEditOnlyItems.append(insertItem (i18n("&Clone..."), |
46 | this,SLOT(popupClone()))); | 46 | this,SLOT(popupClone()))); |
47 | mEditOnlyItems.append(insertItem (i18n("&Move..."), | 47 | mEditOnlyItems.append(insertItem (i18n("&Move..."), |
48 | this,SLOT(popupMove()))); | 48 | this,SLOT(popupMove()))); |
49 | #ifndef DESKTOP_VERSION | 49 | #ifndef DESKTOP_VERSION |
50 | mEditOnlyItems.append(insertItem (i18n("&Beam..."), | 50 | mEditOnlyItems.append(insertItem (i18n("&Beam..."), |
51 | this,SLOT(popupBeam()))); | 51 | this,SLOT(popupBeam()))); |
52 | #endif | 52 | #endif |
53 | mEditOnlyItems.append(insertItem (i18n("&Toggle Cancel"), | 53 | mEditOnlyItems.append(insertItem (i18n("&Toggle Cancel"), |
54 | this,SLOT(popupCancel()))); | 54 | this,SLOT(popupCancel()))); |
55 | isDisabled = false; | 55 | isDisabled = false; |
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index cdcbbf0..ea037a9 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp | |||
@@ -338,25 +338,25 @@ KOListView::KOListView(Calendar *calendar, QWidget *parent, | |||
338 | SLOT(saveToFile())); | 338 | SLOT(saveToFile())); |
339 | exportPO->insertItem( i18n("As vCal (vcs) file..."),this, | 339 | exportPO->insertItem( i18n("As vCal (vcs) file..."),this, |
340 | SLOT(saveToFileVCS())); | 340 | SLOT(saveToFileVCS())); |
341 | exportPO->insertItem( i18n("Journal/Details..."),this, | 341 | exportPO->insertItem( i18n("Journal/Details..."),this, |
342 | SLOT(saveDescriptionToFile())); | 342 | SLOT(saveDescriptionToFile())); |
343 | // mPopupMenu->insertSeparator(); | 343 | // mPopupMenu->insertSeparator(); |
344 | // mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | 344 | // mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), |
345 | // i18n("Add Categ. to selected..."),this, | 345 | // i18n("Add Categ. to selected..."),this, |
346 | // SLOT(addCat()),true); | 346 | // SLOT(addCat()),true); |
347 | //mPopupMenu->insertSeparator(); | 347 | //mPopupMenu->insertSeparator(); |
348 | #ifndef DESKTOP_VERSION | 348 | #ifndef DESKTOP_VERSION |
349 | selPopup->insertSeparator(); | 349 | selPopup->insertSeparator(); |
350 | selPopup->insertItem( i18n("Beam via IR"),this, | 350 | selPopup->insertItem( i18n("Beam via IR..."),this, |
351 | SLOT(beamSelected())); | 351 | SLOT(beamSelected())); |
352 | #if 0 | 352 | #if 0 |
353 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), | 353 | mPopupMenu->addAdditionalItem(QIconSet(QPixmap()), |
354 | i18n("Beam via IR"),this, | 354 | i18n("Beam via IR"),this, |
355 | SLOT(beamSelected()),true); | 355 | SLOT(beamSelected()),true); |
356 | #endif | 356 | #endif |
357 | #endif | 357 | #endif |
358 | /* | 358 | /* |
359 | mPopupMenu = new QPopupMenu; | 359 | mPopupMenu = new QPopupMenu; |
360 | mPopupMenu->insertItem(i18n("Edit Event"), this, | 360 | mPopupMenu->insertItem(i18n("Edit Event"), this, |
361 | SLOT (editEvent())); | 361 | SLOT (editEvent())); |
362 | mPopupMenu->insertItem(SmallIcon("delete"), i18n("Delete Event"), this, | 362 | mPopupMenu->insertItem(SmallIcon("delete"), i18n("Delete Event"), this, |
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index f68f032..7a5f3e5 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp | |||
@@ -666,45 +666,47 @@ void MainWindow::initActions() | |||
666 | pathString += "icons16/"; | 666 | pathString += "icons16/"; |
667 | pixWid = 18; pixHei = 16; | 667 | pixWid = 18; pixHei = 16; |
668 | } | 668 | } |
669 | } else { | 669 | } else { |
670 | pathString += "iconsmini/"; | 670 | pathString += "iconsmini/"; |
671 | pixWid = 18; pixHei = 16; | 671 | pixWid = 18; pixHei = 16; |
672 | } | 672 | } |
673 | if ( KOPrefs::instance()->mShowFullMenu ) { | 673 | if ( KOPrefs::instance()->mShowFullMenu ) { |
674 | QMenuBar *menuBar1; | 674 | QMenuBar *menuBar1; |
675 | menuBar1 = menuBar(); | 675 | menuBar1 = menuBar(); |
676 | menuBar1->insertItem( i18n("File"), importMenu ); | 676 | menuBar1->insertItem( i18n("File"), importMenu ); |
677 | menuBar1->insertItem( i18n("View"), viewMenu ); | 677 | menuBar1->insertItem( i18n("View"), viewMenu ); |
678 | menuBar1->insertItem( i18n("Actions"), actionMenu ); | 678 | menuBar1->insertItem( i18n("Edit"), mCurrentItemMenu ); |
679 | menuBar1->insertItem( i18n("Action"), actionMenu ); | ||
679 | #ifdef DESKTOP_VERSION | 680 | #ifdef DESKTOP_VERSION |
680 | menuBar1->insertItem( i18n("Synchronize"), syncMenu ); | 681 | menuBar1->insertItem( i18n("Synchronize"), syncMenu ); |
681 | menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); | 682 | menuBar1->insertItem( i18n("AgendaSize"),configureAgendaMenu ); |
682 | #else | 683 | #else |
683 | menuBar1->insertItem( i18n("Sync"), syncMenu ); | 684 | menuBar1->insertItem( i18n("Sync"), syncMenu ); |
684 | menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu ); | 685 | menuBar1->insertItem( i18n("Agenda"),configureAgendaMenu ); |
685 | #endif | 686 | #endif |
686 | //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); | 687 | //menuBar1->insertItem( i18n("Toolbar"),configureToolBarMenu ); |
687 | menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); | 688 | menuBar1->insertItem( i18n("Filter"),selectFilterMenu ); |
688 | menuBar1->insertItem( i18n("Help"), helpMenu ); | 689 | menuBar1->insertItem( i18n("Help"), helpMenu ); |
689 | } else { | 690 | } else { |
690 | QPEMenuBar *menuBar1; | 691 | QPEMenuBar *menuBar1; |
691 | menuBar1 = new QPEMenuBar( iconToolBar ); | 692 | menuBar1 = new QPEMenuBar( iconToolBar ); |
692 | QPopupMenu *menuBar = new QPopupMenu( this ); | 693 | QPopupMenu *menuBar = new QPopupMenu( this ); |
693 | icon = loadPixmap( pathString + "z_menu" ); | 694 | icon = loadPixmap( pathString + "z_menu" ); |
694 | menuBar1->insertItem( icon.pixmap(), menuBar); | 695 | menuBar1->insertItem( icon.pixmap(), menuBar); |
695 | //menuBar1->insertItem( i18n("ME"), menuBar); | 696 | //menuBar1->insertItem( i18n("ME"), menuBar); |
696 | menuBar->insertItem( i18n("File"), importMenu ); | 697 | menuBar->insertItem( i18n("File"), importMenu ); |
697 | menuBar->insertItem( i18n("View"), viewMenu ); | 698 | menuBar->insertItem( i18n("View"), viewMenu ); |
698 | menuBar->insertItem( i18n("Actions"), actionMenu ); | 699 | menuBar->insertItem( i18n("Edit"), mCurrentItemMenu ); |
700 | menuBar->insertItem( i18n("Action"), actionMenu ); | ||
699 | menuBar->insertItem( i18n("Synchronize"), syncMenu ); | 701 | menuBar->insertItem( i18n("Synchronize"), syncMenu ); |
700 | menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); | 702 | menuBar->insertItem( i18n("AgendaSize"),configureAgendaMenu ); |
701 | menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); | 703 | menuBar->insertItem( i18n("Toolbar"),configureToolBarMenu ); |
702 | menuBar->insertItem( i18n("Filter"),selectFilterMenu ); | 704 | menuBar->insertItem( i18n("Filter"),selectFilterMenu ); |
703 | menuBar->insertItem( i18n("Help"), helpMenu ); | 705 | menuBar->insertItem( i18n("Help"), helpMenu ); |
704 | //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); | 706 | //menuBar1->setMaximumWidth( menuBar1->sizeHint().width() ); |
705 | menuBar1->setMaximumSize( menuBar1->sizeHint( )); | 707 | menuBar1->setMaximumSize( menuBar1->sizeHint( )); |
706 | } | 708 | } |
707 | connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); | 709 | connect ( selectFilterMenu, SIGNAL( activated ( int ) ), this, SLOT (selectFilter( int ) ) ); |
708 | connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); | 710 | connect ( selectFilterMenu, SIGNAL( aboutToShow() ), this, SLOT (fillFilterMenu() ) ); |
709 | 711 | ||
710 | 712 | ||
@@ -773,38 +775,38 @@ void MainWindow::initActions() | |||
773 | 775 | ||
774 | icon = loadPixmap( pathString + "search" ); | 776 | icon = loadPixmap( pathString + "search" ); |
775 | QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); | 777 | QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this ); |
776 | search_action->addTo( actionMenu ); | 778 | search_action->addTo( actionMenu ); |
777 | connect( search_action, SIGNAL( activated() ), | 779 | connect( search_action, SIGNAL( activated() ), |
778 | mView->dialogManager(), SLOT( showSearchDialog() ) ); | 780 | mView->dialogManager(), SLOT( showSearchDialog() ) ); |
779 | 781 | ||
780 | actionMenu->insertSeparator(); | 782 | actionMenu->insertSeparator(); |
781 | 783 | ||
782 | 784 | ||
783 | 785 | ||
784 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); | 786 | action = new QAction( i18n("Undo Delete"), i18n("Undo Delete..."), 0, this ); |
785 | action->addTo( actionMenu ); | 787 | action->addTo( mCurrentItemMenu ); |
786 | connect( action, SIGNAL( activated() ), | 788 | connect( action, SIGNAL( activated() ), |
787 | mView, SLOT( undo_delete() ) ); | 789 | mView, SLOT( undo_delete() ) ); |
788 | 790 | mCurrentItemMenu->insertSeparator(); | |
789 | icon = loadPixmap( pathString + "newevent" ); | 791 | icon = loadPixmap( pathString + "newevent" ); |
790 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); | 792 | configureToolBarMenu->insertItem(i18n("Stretched TB"), 5 ); |
791 | configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); | 793 | configureToolBarMenu->insertItem(i18n("Only one toolbar"), 6 ); |
792 | configureToolBarMenu->insertSeparator(); | 794 | configureToolBarMenu->insertSeparator(); |
793 | configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); | 795 | configureToolBarMenu->insertItem(i18n("Filtermenu"), 7 ); |
794 | configureToolBarMenu->insertSeparator(); | 796 | configureToolBarMenu->insertSeparator(); |
795 | configureToolBarMenu->insertItem(i18n("Week Number"), 400); | 797 | configureToolBarMenu->insertItem(i18n("Week Number"), 400); |
796 | configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); | 798 | configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 ); |
797 | 799 | ||
798 | actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); | 800 | //actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu); |
799 | mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); | 801 | mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this ); |
800 | mShowAction->addTo( mCurrentItemMenu ); | 802 | mShowAction->addTo( mCurrentItemMenu ); |
801 | connect( mShowAction, SIGNAL( activated() ), | 803 | connect( mShowAction, SIGNAL( activated() ), |
802 | mView, SLOT( showIncidence() ) ); | 804 | mView, SLOT( showIncidence() ) ); |
803 | 805 | ||
804 | mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); | 806 | mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this ); |
805 | mEditAction->addTo( mCurrentItemMenu ); | 807 | mEditAction->addTo( mCurrentItemMenu ); |
806 | connect( mEditAction, SIGNAL( activated() ), | 808 | connect( mEditAction, SIGNAL( activated() ), |
807 | mView, SLOT( editIncidence() ) ); | 809 | mView, SLOT( editIncidence() ) ); |
808 | 810 | ||
809 | mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); | 811 | mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this ); |
810 | mDeleteAction->addTo( mCurrentItemMenu ); | 812 | mDeleteAction->addTo( mCurrentItemMenu ); |
@@ -1713,37 +1715,32 @@ void MainWindow::processIncidenceSelection( Incidence *incidence ) | |||
1713 | mNewSubTodoAction->setEnabled( true ); | 1715 | mNewSubTodoAction->setEnabled( true ); |
1714 | } else { | 1716 | } else { |
1715 | mShowAction->setText( i18n("Show...") ); | 1717 | mShowAction->setText( i18n("Show...") ); |
1716 | mShowAction->setText( i18n("Edit...") ); | 1718 | mShowAction->setText( i18n("Edit...") ); |
1717 | mShowAction->setText( i18n("Delete...") ); | 1719 | mShowAction->setText( i18n("Delete...") ); |
1718 | 1720 | ||
1719 | mNewSubTodoAction->setEnabled( false ); | 1721 | mNewSubTodoAction->setEnabled( false ); |
1720 | } | 1722 | } |
1721 | } | 1723 | } |
1722 | 1724 | ||
1723 | void MainWindow::enableIncidenceActions( bool enabled ) | 1725 | void MainWindow::enableIncidenceActions( bool enabled ) |
1724 | { | 1726 | { |
1725 | |||
1726 | #ifndef DESKTOP_VERSION | ||
1727 | mCurrentItemMenu->setEnabled( enabled ); | ||
1728 | #else | ||
1729 | mShowAction->setEnabled( enabled ); | 1727 | mShowAction->setEnabled( enabled ); |
1730 | mEditAction->setEnabled( enabled ); | 1728 | mEditAction->setEnabled( enabled ); |
1731 | mDeleteAction->setEnabled( enabled ); | 1729 | mDeleteAction->setEnabled( enabled ); |
1732 | 1730 | ||
1733 | mCloneAction->setEnabled( enabled ); | 1731 | mCloneAction->setEnabled( enabled ); |
1734 | mMoveAction->setEnabled( enabled ); | 1732 | mMoveAction->setEnabled( enabled ); |
1735 | mBeamAction->setEnabled( enabled ); | 1733 | mBeamAction->setEnabled( enabled ); |
1736 | mCancelAction->setEnabled( enabled ); | 1734 | mCancelAction->setEnabled( enabled ); |
1737 | #endif | ||
1738 | } | 1735 | } |
1739 | 1736 | ||
1740 | void MainWindow::importOL() | 1737 | void MainWindow::importOL() |
1741 | { | 1738 | { |
1742 | #ifdef _OL_IMPORT_ | 1739 | #ifdef _OL_IMPORT_ |
1743 | mView->clearAllViews(); | 1740 | mView->clearAllViews(); |
1744 | KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); | 1741 | KOImportOLdialog *id = new KOImportOLdialog("Import from OL - select folder!" , mView->calendar(),this ); |
1745 | id->exec(); | 1742 | id->exec(); |
1746 | delete id; | 1743 | delete id; |
1747 | mView->calendar()->checkAlarmForIncidence( 0, true ); | 1744 | mView->calendar()->checkAlarmForIncidence( 0, true ); |
1748 | mView->updateView(); | 1745 | mView->updateView(); |
1749 | #endif | 1746 | #endif |