prefs-patch-1.8_git.diff
| src/app/qgisapp.cpp | ||
|---|---|---|
| 928 | 928 |
connect( mActionCustomization, SIGNAL( triggered() ), this, SLOT( customize() ) ); |
| 929 | 929 | |
| 930 | 930 |
#ifdef Q_WS_MAC |
| 931 |
// copy of Options action that gets moved to app Preferences... |
|
| 932 |
mActionOptionsMac = new QAction( mActionOptions->text(), this ); |
|
| 933 |
mActionOptionsMac->setMenuRole( QAction::NoRole ); |
|
| 934 |
mActionOptionsMac->setIcon( mActionOptions->icon() ); |
|
| 935 |
connect( mActionOptionsMac, SIGNAL( triggered() ), this, SLOT( options() ) ); |
|
| 936 | ||
| 931 | 937 |
// Window Menu Items |
| 932 | 938 | |
| 933 | 939 |
mActionWindowMinimize = new QAction( tr( "Minimize" ), this ); |
| ... | ... | |
| 1158 | 1164 |
} |
| 1159 | 1165 | |
| 1160 | 1166 |
#ifdef Q_WS_MAC |
| 1167 |
// copy back the Options action after assigned to app Preferences... |
|
| 1168 |
mSettingsMenu->addAction( mActionOptionsMac ); |
|
| 1169 |
|
|
| 1161 | 1170 |
// Window Menu |
| 1162 | 1171 | |
| 1163 | 1172 |
mWindowMenu = menuBar()->addMenu( tr( "&Window" ) ); |
| src/app/qgisapp.h | ||
|---|---|---|
| 978 | 978 |
// actions for menus and toolbars ----------------- |
| 979 | 979 | |
| 980 | 980 |
#ifdef Q_WS_MAC |
| 981 |
QAction *mActionOptionsMac; |
|
| 981 | 982 |
QAction *mActionWindowMinimize; |
| 982 | 983 |
QAction *mActionWindowZoom; |
| 983 | 984 |
QAction *mActionWindowSeparator1; |
| src/ui/qgisapp.ui | ||
|---|---|---|
| 1378 | 1378 |
<property name="text"> |
| 1379 | 1379 |
<string>Configure shortcuts...</string> |
| 1380 | 1380 |
</property> |
| 1381 |
<property name="menuRole"> |
|
| 1382 |
<enum>QAction::NoRole</enum> |
|
| 1383 |
</property> |
|
| 1381 | 1384 |
</action> |
| 1382 | 1385 |
<action name="mActionLocalHistogramStretch"> |
| 1383 | 1386 |
<property name="icon"> |