782
|
1 |
--- qt-x11-free-3.3.5/tools/designer/designer/hierarchyview.cpp.orig Fri Feb 10 14:32:07 2006
|
|
2 |
+++ qt-x11-free-3.3.5/tools/designer/designer/hierarchyview.cpp Fri Feb 10 14:32:52 2006
|
|
3 |
@@ -605,6 +605,7 @@
|
|
4 |
formWindow->mainWindow()->setupTabWidgetHierarchyMenu(
|
|
5 |
this, SLOT( addTabPage() ),
|
|
6 |
SLOT( removeTabPage() ) );
|
|
7 |
+ tabWidgetMenu->setItemEnabled(MainWindow::POPUP_REMOVE_PAGE_ID, ((QDesignerTabWidget*)w )->count() > 1);
|
|
8 |
tabWidgetMenu->popup( p );
|
|
9 |
}
|
|
10 |
}
|
|
11 |
--- qt-x11-free-3.3.5/tools/designer/designer/mainwindow.cpp.orig Fri Feb 10 14:33:05 2006
|
|
12 |
+++ qt-x11-free-3.3.5/tools/designer/designer/mainwindow.cpp Fri Feb 10 14:34:20 2006
|
|
13 |
@@ -2463,8 +2463,8 @@
|
|
14 |
{
|
|
15 |
QPopupMenu *menu = new QPopupMenu( parent );
|
|
16 |
|
|
17 |
- menu->insertItem( tr( "Add Page" ), parent, addSlot );
|
|
18 |
- menu->insertItem( tr( "Delete Page" ), parent, removeSlot );
|
|
19 |
+ menu->insertItem( tr( "Add Page" ), parent, addSlot, 0, POPUP_REMOVE_PAGE_ID+1 );
|
|
20 |
+ menu->insertItem( tr( "Delete Page" ), parent, removeSlot, 0, POPUP_REMOVE_PAGE_ID );
|
|
21 |
menu->insertSeparator();
|
|
22 |
actionEditCut->addTo( menu );
|
|
23 |
actionEditCopy->addTo( menu );
|
|
24 |
--- qt-x11-free-3.3.5/tools/designer/designer/mainwindow.h.orig Fri Feb 10 14:34:31 2006
|
|
25 |
+++ qt-x11-free-3.3.5/tools/designer/designer/mainwindow.h Fri Feb 10 14:35:07 2006
|
|
26 |
@@ -107,6 +107,7 @@
|
|
27 |
|
|
28 |
QPopupMenu *setupNormalHierarchyMenu( QWidget *parent );
|
|
29 |
QPopupMenu *setupTabWidgetHierarchyMenu( QWidget *parent, const char *addSlot, const char *removeSlot );
|
|
30 |
+ static const int POPUP_REMOVE_PAGE_ID = 1;
|
|
31 |
|
|
32 |
FormWindow *openFormWindow( const QString &fn, bool validFileName = TRUE, FormFile *ff = 0 );
|
|
33 |
bool isCustomWidgetUsed( MetaDataBase::CustomWidget *w );
|