many menu fixes

author: zautrix <zautrix> 2005-07-01 11:19:13 (UTC)
committer: zautrix <zautrix> 2005-07-01 11:19:13 (UTC)
commit: 5d603fd22bc8126c6a9a6f377701669d3cee18f2 (patch) (unidiff)
tree: 9fdef25d24a3a57e3ecf5ae2e4b1cc3d3fb0e0bf /korganizer/mainwindow.cpp
parent: 409f5296344084e22833b35c03923b89d7be653b (diff)
download: kdepimpi-5d603fd22bc8126c6a9a6f377701669d3cee18f2.zip
kdepimpi-5d603fd22bc8126c6a9a6f377701669d3cee18f2.tar.gz
kdepimpi-5d603fd22bc8126c6a9a6f377701669d3cee18f2.tar.bz2
1 files changed, 99 insertions, 72 deletions
diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp
index 23537a6..a5d8824 100644
--- a/korganizer/mainwindow.cpp
+++ b/korganizer/mainwindow.cpp
@@ -656,2 +656,7 @@ void MainWindow::initActions()
    QPopupMenu *actionMenu = new QPopupMenu( this );
+#ifdef DESKTOP_VERSION
+    mCurrentItemMenu = actionMenu;
+#else
+    mCurrentItemMenu = new QPopupMenu ( this );
+#endif
    QPopupMenu *importMenu = new QPopupMenu( this );
@@ -767,14 +772,23 @@ void MainWindow::initActions()
             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() ) );
-    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() ) );
    actionMenu->insertSeparator();
+    
+   
@@ -784,3 +798,2 @@ void MainWindow::initActions()
             mView, SLOT( undo_delete() ) );
-    actionMenu->insertSeparator();
@@ -794,2 +807,43 @@ void MainWindow::initActions()
    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 );
@@ -805,8 +859,3 @@ void MainWindow::initActions()
-    icon = loadPixmap( pathString + "today" );
+   
-    QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
-    today_action->addTo( viewMenu );
-    connect( today_action, SIGNAL( activated() ),
-             mView, SLOT( goToday() ) );
-    viewMenu->insertSeparator();
@@ -857,9 +906,4 @@ void MainWindow::initActions()
-    viewMenu->insertSeparator();
+    
-    icon = loadPixmap( pathString + "picker" );
+    dPickerAction->addTo( iconToolBar  );
-    action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
-    action->addTo( viewMenu );
-    connect( action, SIGNAL( activated() ),
-             mView, SLOT( showDatePicker() ) );
-    action->addTo( iconToolBar  );
    viewMenu->insertSeparator();
@@ -962,55 +1006,36 @@ void MainWindow::initActions()
-    actionMenu->insertSeparator();
+    action = new QAction( "purge_completed", i18n("Purge Completed..."), 0,
+                          this );
-    mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
+    action->addTo( actionMenu );
-    mShowAction->addTo( actionMenu );
+    connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
-    connect( mShowAction, SIGNAL( activated() ),
-             mView, SLOT( showIncidence() ) );
-    mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
+   
-    mEditAction->addTo( actionMenu );
+    configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
-    connect( mEditAction, SIGNAL( activated() ),
-             mView, SLOT( editIncidence() ) );
-    mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
-    mDeleteAction->addTo( actionMenu );
-    connect( mDeleteAction, SIGNAL( activated() ),
-             mView, SLOT( deleteIncidence() ) );
-    mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
-    mCloneAction->addTo( actionMenu );
-    connect( mCloneAction, SIGNAL( activated() ),
-             mView, SLOT( cloneIncidence() ) );
-    mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
-    mMoveAction->addTo( actionMenu );
-    connect( mMoveAction, SIGNAL( activated() ),
-             mView, SLOT( moveIncidence() ) );
-    mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
-    mBeamAction->addTo( actionMenu );
-    connect( mBeamAction, SIGNAL( activated() ),
-             mView, SLOT( beamIncidence() ) );
-    mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
-    mCancelAction->addTo( actionMenu );
-    connect( mCancelAction, SIGNAL( activated() ),
-             mView, SLOT( toggleCancelIncidence() ) );
    actionMenu->insertSeparator();
+     action = new QAction( "manage cat", i18n("Edit category list..."), 0,
-    action = new QAction( "purge_completed", i18n("Purge Completed"), 0,
                          this );
-    action->addTo( actionMenu );
+    action->addTo(  actionMenu );
-    connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
+    connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) );
-    icon = loadPixmap( pathString + "search" );
+     action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
-    QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
+                          this );
-    configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
+    action->addTo(  actionMenu );
-    search_action->addTo( actionMenu );
+    connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
-    connect( search_action, SIGNAL( activated() ),
-             mView->dialogManager(), SLOT( showSearchDialog() ) );
-    
+    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->insertSeparator();
        actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
@@ -1126,7 +1151,3 @@ void MainWindow::initActions()
 #endif
-    importMenu->insertSeparator();
+    
-    action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
-                          this );
-    action->addTo( importMenu );
-    connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
    importMenu->insertSeparator();
@@ -1716,2 +1737,6 @@ void MainWindow::enableIncidenceActions( bool enabled )
 {
+#ifndef DESKTOP_VERSION
+    mCurrentItemMenu->setEnabled( enabled );
+#else
    mShowAction->setEnabled( enabled );
@@ -1724,2 +1749,3 @@ void MainWindow::enableIncidenceActions( bool enabled )
    mCancelAction->setEnabled( enabled );
+#endif
 }
@@ -2276,2 +2302,3 @@ void MainWindow::configureToolBar( int item  )
    // initActions();
+    setCaption ( i18n("Toolbar changes needs a restart!") ); 
 }
author	zautrix <zautrix>	2005-07-01 11:19:13 (UTC)
committer	zautrix <zautrix>	2005-07-01 11:19:13 (UTC)
commit	5d603fd22bc8126c6a9a6f377701669d3cee18f2 (patch) (unidiff)
tree	9fdef25d24a3a57e3ecf5ae2e4b1cc3d3fb0e0bf /korganizer/mainwindow.cpp
parent	409f5296344084e22833b35c03923b89d7be653b (diff)
download	kdepimpi-5d603fd22bc8126c6a9a6f377701669d3cee18f2.zip kdepimpi-5d603fd22bc8126c6a9a6f377701669d3cee18f2.tar.gz kdepimpi-5d603fd22bc8126c6a9a6f377701669d3cee18f2.tar.bz2

diff --git a/korganizer/mainwindow.cpp b/korganizer/mainwindow.cpp index 23537a6..a5d8824 100644 --- a/korganizer/mainwindow.cpp +++ b/korganizer/mainwindow.cpp
@@ -656,2 +656,7 @@ void MainWindow::initActions()
656	QPopupMenu *actionMenu = new QPopupMenu( this );	656	QPopupMenu *actionMenu = new QPopupMenu( this );
		657	#ifdef DESKTOP_VERSION
		658	mCurrentItemMenu = actionMenu;
		659	#else
		660	mCurrentItemMenu = new QPopupMenu ( this );
		661	#endif
657	QPopupMenu *importMenu = new QPopupMenu( this );	662	QPopupMenu *importMenu = new QPopupMenu( this );
@@ -767,14 +772,23 @@ void MainWindow::initActions()
767	this, SLOT( showConfigureAgenda( ) ) );	772	this, SLOT( showConfigureAgenda( ) ) );
		773	icon = loadPixmap( pathString + "today" );
		774	QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
		775	today_action->addTo( actionMenu );
		776	connect( today_action, SIGNAL( activated() ),
		777	mView, SLOT( goToday() ) );
		778
		779	icon = loadPixmap( pathString + "picker" );
		780	QAction* dPickerAction = new QAction( i18n("Select Date..."), icon, i18n("Select Date..."), 0, this );
		781	dPickerAction->addTo( actionMenu );
		782	connect( dPickerAction, SIGNAL( activated() ),
		783	mView, SLOT( showDatePicker() ) );
		784
		785	icon = loadPixmap( pathString + "search" );
		786	QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );
		787	search_action->addTo( actionMenu );
		788	connect( search_action, SIGNAL( activated() ),
		789	mView->dialogManager(), SLOT( showSearchDialog() ) );
768		790
769	icon = loadPixmap( pathString + "configure" );
770	action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
771	action->addTo( actionMenu );
772	connect( action, SIGNAL( activated() ),
773	mView, SLOT( edit_options() ) );
774	icon = loadPixmap( pathString + "configure" );
775	action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
776	action->addTo( actionMenu );
777	connect( action, SIGNAL( activated() ),
778	mView, SLOT( edit_global_options() ) );
779	actionMenu->insertSeparator();	791	actionMenu->insertSeparator();
		792
		793
780		794
@@ -784,3 +798,2 @@ void MainWindow::initActions()
784	mView, SLOT( undo_delete() ) );	798	mView, SLOT( undo_delete() ) );
785	actionMenu->insertSeparator();
786		799
@@ -794,2 +807,43 @@ void MainWindow::initActions()
794	configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );	807	configureToolBarMenu->insertItem(icon, i18n("New Event..."), 10 );
		808
		809	#ifndef DESKTOP_VERSION
		810	actionMenu->insertItem ( i18n("Selected Item"), mCurrentItemMenu);
		811	#endif
		812	mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );
		813	mShowAction->addTo( mCurrentItemMenu );
		814	connect( mShowAction, SIGNAL( activated() ),
		815	mView, SLOT( showIncidence() ) );
		816
		817	mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );
		818	mEditAction->addTo( mCurrentItemMenu );
		819	connect( mEditAction, SIGNAL( activated() ),
		820	mView, SLOT( editIncidence() ) );
		821
		822	mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
		823	mDeleteAction->addTo( mCurrentItemMenu );
		824	connect( mDeleteAction, SIGNAL( activated() ),
		825	mView, SLOT( deleteIncidence() ) );
		826
		827
		828	mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
		829	mCloneAction->addTo( mCurrentItemMenu );
		830	connect( mCloneAction, SIGNAL( activated() ),
		831	mView, SLOT( cloneIncidence() ) );
		832	mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
		833	mMoveAction->addTo( mCurrentItemMenu );
		834	connect( mMoveAction, SIGNAL( activated() ),
		835	mView, SLOT( moveIncidence() ) );
		836	mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
		837	mBeamAction->addTo(mCurrentItemMenu );
		838	connect( mBeamAction, SIGNAL( activated() ),
		839	mView, SLOT( beamIncidence() ) );
		840	mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
		841	mCancelAction->addTo( mCurrentItemMenu );
		842	connect( mCancelAction, SIGNAL( activated() ),
		843	mView, SLOT( toggleCancelIncidence() ) );
		844	#ifdef DESKTOP_VERSION
		845	actionMenu->insertSeparator();
		846	#endif
		847
		848
795	QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );	849	QAction* ne_action = new QAction( i18n("New Event..."), icon, i18n("New Event..."), 0, this );
@@ -805,8 +859,3 @@ void MainWindow::initActions()
805		859
806	icon = loadPixmap( pathString + "today" );	860
807	QAction* today_action = new QAction( i18n("Go to Today"), icon, i18n("Go to Today"), 0, this );
808	today_action->addTo( viewMenu );
809	connect( today_action, SIGNAL( activated() ),
810	mView, SLOT( goToday() ) );
811	viewMenu->insertSeparator();
812		861
@@ -857,9 +906,4 @@ void MainWindow::initActions()
857		906
858	viewMenu->insertSeparator();	907
859	icon = loadPixmap( pathString + "picker" );	908	dPickerAction->addTo( iconToolBar );
860	action = new QAction( i18n("Date Picker"), icon, i18n("Date Picker"), 0, this );
861	action->addTo( viewMenu );
862	connect( action, SIGNAL( activated() ),
863	mView, SLOT( showDatePicker() ) );
864	action->addTo( iconToolBar );
865	viewMenu->insertSeparator();	909	viewMenu->insertSeparator();
@@ -962,55 +1006,36 @@ void MainWindow::initActions()
962		1006
963	actionMenu->insertSeparator();	1007	action = new QAction( "purge_completed", i18n("Purge Completed..."), 0,
964		1008	this );
965	mShowAction = new QAction( "show_incidence", i18n("Show..."), 0, this );	1009	action->addTo( actionMenu );
966	mShowAction->addTo( actionMenu );	1010	connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );
967	connect( mShowAction, SIGNAL( activated() ),
968	mView, SLOT( showIncidence() ) );
969		1011
970	mEditAction = new QAction( "edit_incidence", i18n("Edit..."), 0, this );	1012
971	mEditAction->addTo( actionMenu );	1013	configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);
972	connect( mEditAction, SIGNAL( activated() ),
973	mView, SLOT( editIncidence() ) );
974		1014
975	mDeleteAction = new QAction( "delete_incidence", i18n("Delete..."), 0, this );
976	mDeleteAction->addTo( actionMenu );
977	connect( mDeleteAction, SIGNAL( activated() ),
978	mView, SLOT( deleteIncidence() ) );
979		1015
980		1016
981	mCloneAction = new QAction( "clone_incidence", i18n("Clone..."), 0, this );
982	mCloneAction->addTo( actionMenu );
983	connect( mCloneAction, SIGNAL( activated() ),
984	mView, SLOT( cloneIncidence() ) );
985	mMoveAction = new QAction( "Move_incidence", i18n("Move..."), 0, this );
986	mMoveAction->addTo( actionMenu );
987	connect( mMoveAction, SIGNAL( activated() ),
988	mView, SLOT( moveIncidence() ) );
989	mBeamAction = new QAction( "Beam_incidence", i18n("Beam..."), 0, this );
990	mBeamAction->addTo( actionMenu );
991	connect( mBeamAction, SIGNAL( activated() ),
992	mView, SLOT( beamIncidence() ) );
993	mCancelAction = new QAction( "Cancel_incidence", i18n("Toggle Cancel"), 0, this );
994	mCancelAction->addTo( actionMenu );
995	connect( mCancelAction, SIGNAL( activated() ),
996	mView, SLOT( toggleCancelIncidence() ) );
997
998	actionMenu->insertSeparator();	1017	actionMenu->insertSeparator();
999		1018	action = new QAction( "manage cat", i18n("Edit category list..."), 0,
1000	action = new QAction( "purge_completed", i18n("Purge Completed"), 0,
1001	this );	1019	this );
1002	action->addTo( actionMenu );	1020	action->addTo( actionMenu );
1003	connect( action, SIGNAL( activated() ), mView, SLOT( purgeCompleted() ) );	1021	connect( action, SIGNAL( activated() ), mView, SLOT( editCategories() ) );
1004		1022
1005	icon = loadPixmap( pathString + "search" );	1023	action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
1006	QAction* search_action = new QAction( i18n("Search"), icon, i18n("Search..."), 0, this );	1024	this );
1007	configureToolBarMenu->insertItem(icon, i18n("Search"), 120 , 5);	1025	action->addTo( actionMenu );
1008	search_action->addTo( actionMenu );	1026	connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
1009	connect( search_action, SIGNAL( activated() ),
1010	mView->dialogManager(), SLOT( showSearchDialog() ) );
1011		1027
1012
1013		1028
		1029	actionMenu->insertSeparator();
		1030	icon = loadPixmap( pathString + "configure" );
		1031	action = new QAction( i18n("Configure"),icon, i18n("Configure KO/Pi..."), 0, this );
		1032	action->addTo( actionMenu );
		1033	connect( action, SIGNAL( activated() ),
		1034	mView, SLOT( edit_options() ) );
		1035	icon = loadPixmap( pathString + "configure" );
		1036	action = new QAction( i18n("Configure"),icon, i18n("Global Settings..."), 0, this );
		1037	action->addTo( actionMenu );
		1038	connect( action, SIGNAL( activated() ),
		1039	mView, SLOT( edit_global_options() ) );
1014	if ( KOPrefs::instance()->mShowFullMenu ) {	1040	if ( KOPrefs::instance()->mShowFullMenu ) {
1015	actionMenu->insertSeparator();
1016	actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );	1041	actionMenu->insertItem( i18n("Configure Toolbar"),configureToolBarMenu );
@@ -1126,7 +1151,3 @@ void MainWindow::initActions()
1126	#endif	1151	#endif
1127	importMenu->insertSeparator();	1152
1128	action = new QAction( "manage cat", i18n("Manage new categories..."), 0,
1129	this );
1130	action->addTo( importMenu );
1131	connect( action, SIGNAL( activated() ), mView, SLOT( manageCategories() ) );
1132	importMenu->insertSeparator();	1153	importMenu->insertSeparator();
@@ -1716,2 +1737,6 @@ void MainWindow::enableIncidenceActions( bool enabled )
1716	{	1737	{
		1738
		1739	#ifndef DESKTOP_VERSION
		1740	mCurrentItemMenu->setEnabled( enabled );
		1741	#else
1717	mShowAction->setEnabled( enabled );	1742	mShowAction->setEnabled( enabled );
@@ -1724,2 +1749,3 @@ void MainWindow::enableIncidenceActions( bool enabled )
1724	mCancelAction->setEnabled( enabled );	1749	mCancelAction->setEnabled( enabled );
		1750	#endif
1725	}	1751	}
@@ -2276,2 +2302,3 @@ void MainWindow::configureToolBar( int item )
2276	// initActions();	2302	// initActions();
		2303	setCaption ( i18n("Toolbar changes needs a restart!") );
2277	}	2304	}