summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qcocoamenuloader_mac.mm
Commit message (Collapse)AuthorAgeFilesLines
* Fix a namespace error and some warnings found by clangJiang Jiang2010-11-231-2/+2
| | | | Reviewed-by: Fabien Freling
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-021-1/+1
|\
| * Fix a few typos in comments and docs.Jason McDonald2010-11-011-1/+1
| | | | | | | | | | Task-number: QTBUG-13714 Reviewed-by: Trust Me
* | Don't assing 'const Foo*' to a 'Foo*'Tor Arne Vestbø2010-10-151-4/+4
|/ | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Multiple "Edit/Special Characters" menu entries on Mac OS X (Cocoa)Prasanth Ullattil2010-08-131-0/+5
| | | | | | | | | | | Every time [NSApp setMainMenu:] is called, Cocoa will add the 'Special Characters' item to the 'Edit' menu. Before adding a new entry it will make sure that menu items list doesn't contain an item with the selector 'orderFrontCharacterPalette' & a 'nil' target. We need to return the index for the first entry (we have QCocoaMenuLoader as target). Task-number: QTBUG-12842 Reviewed-by: Denis
* Cocoa: fix namespace build breakageRichard Moe Gustavsen2010-04-211-1/+6
| | | | | | Cocoa would not build with namespace. This patch fix makes the day. Reviewed-by: prasanth
* Incorrect translation for Application menu items in Mac.Prasanth Ullattil2010-03-181-0/+3
| | | | | | | | | | | | | A behavior change was introduced by the commit 97b8727635a73197fac4f5edb8a1122733933db4. The menu items with menuRoles will now be translated like Native Mac applications. Translations/merging of menu items are done as follows: 1) AboutRole ==> "About <Application>" 2) PreferencesRole ==> "Preferences..." 3) QuitRole ==> "Quit <Application>" Task-number: QTBUG-4463 Reviewed-by: mortens
* Application menu is not translated in Mac OS X CocoaPrasanth Ullattil2010-03-031-0/+20
| | | | | | | | | | | The application menu is loaded from the qt_menu.nib which only has English strings. These will now be translated using Qt's own translation mechanism. Every time a new translator is installed, the menu will now try to get the new string. Modification of qt_xx.ts files are done in a different patch. Task-number: QTBUG-4463 Reviewed-by: MortenS
* Cocoa: Menu in menubar stays highlightedRichard Moe Gustavsen2010-02-101-0/+6
| | | | | | | | | | | | | | | | | If you use the menu bar for a window to open up another window woth no menu bar, the first menu bar stays highlighted once it is set as current again. The reason is that we remove the first menu bar before cocoa gets a chance to update it correctly. This patch implements a system for us to post a message/call to cocoa, so we delay removing the toolbar until after cocoa has finished closing it properly. NB: Rather than posting the call to a window on screen, it would have been better and safer to post it no window, and then receive the event in the event handler of NSApplication. But for the moment, we have decided not to subclass NSApplication... Rev-By:prasanth
* Cocoa: qaccessibility test crashesRichard Moe Gustavsen2010-01-271-0/+6
| | | | | | | | | | | | | The reason is that the test first creates a menu bar with an exit item The exit item gets merged into the appmenu (together with a QAction) Then we destroy the menu bar, but leave the exit item in the appmenu untouched. Then we create a new menubar _without_ an exit item macUpdateMenubar will then, at one point, try to access the old exit item's QAction, wich is destroyed a long time ago; crash! This patch will make sure we clear out all actions in the menu bars appmenu when the menubar gets destroyed. Reviewed-by: Prasanth
* Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | | | Reviewed-by: Trust Me
* Cocoa: 'Quit' in menu bar does not workRichard Moe Gustavsen2009-11-251-1/+6
| | | | | | | | | | | | If you have two window, each with its own menu bar that has a 'Quit' action, we reuse the quit menu item when switching between the windows. Now, it we deleteLater one of the menu bars, the new menubar will update the 'Quit' item just before deleteLater will come along and remote the update again. This patch will fix this. Task-number: QTBUG-4684 Reviewed-by: Prasanth
* Fix memory leak when deleteLater is triggered via the main menu bar.Morten Sorvig2009-09-111-0/+2
| | | | | | | | | | The deleteLater was beeing created with loopLevel of 1, causing it to be defferd until QApplication::exec() returned. Add a QScopedLoopLevelCounter to increase the loopLevel while triggering the action. RevBy: Brad
* Update license headers again.Jason McDonald2009-09-081-4/+4
| | | | Reviewed-by: Trust Me
* Update license headers.Jason McDonald2009-09-021-3/+0
| | | | Reviewed-by: Trust Me
* Update tech preview license header.Jason McDonald2009-08-311-13/+13
| | | | Reviewed-by: Trust Me
* Update license headers.Jason McDonald2009-08-111-1/+1
| | | | Reviewed-by: Trust Me
* Update license headers as requested by the marketing department.Jason McDonald2009-06-161-2/+2
| | | | Reviewed-by: Trust Me
* BT: Fix up comments in new Cocoa files.Norwegian Rock Cat2009-04-081-11/+11
| | | | | | It seems that Vim or Xcode or whatever I was using to paste these in messed up and added an extra space. Now we should be consistent with the .cpp files and I found a file that we missed too.
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+215