|
24 | 24 | #include <QApplication>
|
25 | 25 | #include <QBitmap>
|
26 | 26 | #include <QCheckBox>
|
27 |
| -#include <QSpinBox> |
28 | 27 | #include <QClipboard>
|
29 | 28 | #include <QColor>
|
30 | 29 | #include <QCursor>
|
|
55 | 54 | #include <QRegExp>
|
56 | 55 | #include <QRegExpValidator>
|
57 | 56 | #include <QSettings>
|
| 57 | +#include <QSpinBox> |
58 | 58 | #include <QSplashScreen>
|
59 | 59 | #include <QStatusBar>
|
60 | 60 | #include <QStringList>
|
61 | 61 | #include <QTcpSocket>
|
62 | 62 | #include <QTextStream>
|
63 | 63 | #include <QtGlobal>
|
| 64 | +#include <QThread> |
64 | 65 | #include <QTimer>
|
65 | 66 | #include <QToolButton>
|
66 | 67 | #include <QUuid>
|
67 | 68 | #include <QVBoxLayout>
|
68 | 69 | #include <QWhatsThis>
|
69 |
| -#include <QThread> |
| 70 | +#include <QWidgetAction> |
70 | 71 |
|
71 | 72 | #include <qgsnetworkaccessmanager.h>
|
72 | 73 | #include <qgsapplication.h>
|
@@ -322,7 +323,7 @@ extern "C"
|
322 | 323 |
|
323 | 324 | class QTreeWidgetItem;
|
324 | 325 |
|
325 |
| -/** set the application title bar text |
| 326 | +/** Set the application title bar text |
326 | 327 |
|
327 | 328 | If the current project title is null
|
328 | 329 | if the project file is null then
|
@@ -8056,7 +8057,7 @@ QgsMapLayer *QgisApp::activeLayer()
|
8056 | 8057 | return mLayerTreeView ? mLayerTreeView->currentLayer() : 0;
|
8057 | 8058 | }
|
8058 | 8059 |
|
8059 |
| -/** set the current layer */ |
| 8060 | +/** Set the current layer */ |
8060 | 8061 | bool QgisApp::setActiveLayer( QgsMapLayer *layer )
|
8061 | 8062 | {
|
8062 | 8063 | if ( !layer )
|
@@ -10558,11 +10559,17 @@ QMenu* QgisApp::createPopupMenu()
|
10558 | 10559 | }
|
10559 | 10560 |
|
10560 | 10561 | qSort( panels.begin(), panels.end(), cmpByText_ );
|
| 10562 | + QWidgetAction* panelstitle = new QWidgetAction( menu ); |
| 10563 | + panelstitle->setDefaultWidget( new QLabel( QString( "<b>%1</b>" ).arg( tr( "Panels" ) ) ) ); |
| 10564 | + menu->addAction( panelstitle ); |
10561 | 10565 | foreach ( QAction* a, panels )
|
10562 | 10566 | {
|
10563 | 10567 | menu->addAction( a );
|
10564 | 10568 | }
|
10565 | 10569 | menu->addSeparator();
|
| 10570 | + QWidgetAction* toolbarstitle = new QWidgetAction( menu ); |
| 10571 | + toolbarstitle->setDefaultWidget( new QLabel( QString( "<b>%1</b>" ).arg( tr( "Toolbars" ) ) ) ); |
| 10572 | + menu->addAction( toolbarstitle ); |
10566 | 10573 | qSort( toolbars.begin(), toolbars.end(), cmpByText_ );
|
10567 | 10574 | foreach ( QAction* a, toolbars )
|
10568 | 10575 | {
|
|
0 commit comments