equal
deleted
inserted
replaced
147 |
147 |
148 Q_ASSERT_X(action->command <= QT_SYMBIAN_LAST_MENU_ITEM, "qt_symbian_insert_action", |
148 Q_ASSERT_X(action->command <= QT_SYMBIAN_LAST_MENU_ITEM, "qt_symbian_insert_action", |
149 "Too many menu actions"); |
149 "Too many menu actions"); |
150 |
150 |
151 const int underlineShortCut = QApplication::style()->styleHint(QStyle::SH_UnderlineShortcut); |
151 const int underlineShortCut = QApplication::style()->styleHint(QStyle::SH_UnderlineShortcut); |
152 QString iconText = action->action->iconText(); |
152 QString actionText; |
153 TPtrC menuItemText = qt_QString2TPtrC( underlineShortCut ? action->action->text() : iconText); |
153 if (underlineShortCut) |
|
154 actionText = action->action->text().left(CEikMenuPaneItem::SData::ENominalTextLength); |
|
155 else |
|
156 actionText = action->action->iconText().left(CEikMenuPaneItem::SData::ENominalTextLength); |
|
157 TPtrC menuItemText = qt_QString2TPtrC(actionText); |
154 if (action->action->menu()) { |
158 if (action->action->menu()) { |
155 SymbianMenuItem* menuItem = new SymbianMenuItem(); |
159 SymbianMenuItem* menuItem = new SymbianMenuItem(); |
156 menuItem->menuItemData.iCascadeId = action->command; |
160 menuItem->menuItemData.iCascadeId = action->command; |
157 menuItem->menuItemData.iCommandId = action->command; |
161 menuItem->menuItemData.iCommandId = action->command; |
158 menuItem->menuItemData.iFlags = 0; |
162 menuItem->menuItemData.iFlags = 0; |