Skip to content

Commit 669268f

Browse files
author
jef
committedDec 14, 2009
add context help for qgis options, style manager, spatialite selection and custom projection and application icon to help viewer
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12454 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent a86b225 commit 669268f

11 files changed

+49
-10
lines changed
 

‎resources/context_help/QgsCustomProjectionDialog-en_US

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<h3>Custom Coordinate Reference System Definition</h3>

‎resources/context_help/QgsOptions-en_US

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<h3>Options</h3>

‎resources/context_help/QgsSpatiaLiteSourceSelect-en_US

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<h3>Add SpatiaLite Tables</h3>

‎resources/context_help/QgsStyleV2ManagerDialog-en_US

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<h3>Style Manager</h3>

‎src/app/qgscustomprojectiondialog.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#define QGSCUSTOMCRSDIALOG_H
2020

2121
#include "ui_qgscustomprojectiondialogbase.h"
22+
#include "qgscontexthelp.h"
23+
2224
class QDir;
2325

2426
/**
@@ -48,8 +50,10 @@ class QgsCustomProjectionDialog : public QDialog, private Ui::QgsCustomProjectio
4850
void on_pbnNew_clicked();
4951
void on_pbnSave_clicked();
5052

53+
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
54+
5155
//
52-
// Contol population
56+
// Control population
5357
//
5458
/* These two methods will be deprecated
5559
void getProjList();

‎src/app/qgsoptions.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include "ui_qgsoptionsbase.h"
2323
#include "qgisgui.h"
24+
#include "qgscontexthelp.h"
2425

2526

2627
/**
@@ -100,6 +101,8 @@ class QgsOptions : public QDialog, private Ui::QgsOptionsBase
100101
*/
101102
void on_mBtnRemoveSVGPath_clicked();
102103

104+
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
105+
103106
protected:
104107
//! Populates combo box with ellipsoids
105108
void getEllipsoidList();

‎src/gui/symbology-ng/qgsstylev2managerdialog.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <QDialog>
66

77
#include "ui_qgsstylev2managerdialogbase.h"
8+
#include "qgscontexthelp.h"
89

910
class QgsStyleV2;
1011

@@ -25,6 +26,8 @@ class GUI_EXPORT QgsStyleV2ManagerDialog : public QDialog, private Ui::QgsStyleV
2526
//! called when the dialog is going to be closed
2627
void onFinished();
2728

29+
void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
30+
2831
protected:
2932

3033
//! populate combo box with known style items (symbols, color ramps)

‎src/helpviewer/CMakeLists.txt

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,31 @@ SET (HELP_MOC_HDRS
1919

2020
#SET (HELP_RCCS qgsgps_plugin.qrc)
2121

22+
IF (WIN32)
23+
IF (MSVC)
24+
SET (HELP_SRCS ${HELP_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/../app/qgis_win32.rc)
25+
ELSE(MSVC)
26+
27+
# Icon for windows MINGW
28+
# Note: can't include .rc directly to source files
29+
# as it's ignored when used MinGW
30+
31+
IF (NOT WINDRES)
32+
FIND_PROGRAM(WINDRES windres)
33+
IF (NOT WINDRES)
34+
MESSAGE(FATAL_ERROR "windres not found - aborting")
35+
ENDIF (NOT WINDRES)
36+
ENDIF (NOT WINDRES)
37+
#############################################################
38+
# application icon
39+
# resource compilation for MinGW
40+
ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/icon.o
41+
COMMAND ${WINDRES} -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/../app/qgis_win32.rc
42+
-o ${CMAKE_CURRENT_BINARY_DIR}/icon.o )
43+
SET(QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/icon.o)
44+
ENDIF (MSVC)
45+
ENDIF (WIN32)
46+
2247

2348
########################################################
2449
# Build
@@ -54,12 +79,12 @@ IF (${QTVERSION} STRLESS "4.3.0")
5479
)
5580
ELSE (${QTVERSION} STRLESS "4.3.0")
5681
TARGET_LINK_LIBRARIES(qgis_help
57-
${QT_QTCORE_LIBRARY}
58-
${QT_QTGUI_LIBRARY}
59-
${QT_QTNETWORK_LIBRARY}
60-
${QT_QTSVG_LIBRARY}
61-
${QT_QTXML_LIBRARY}
62-
${QT_QTWEBKIT_LIBRARY}
82+
${QT_QTCORE_LIBRA}
83+
${QT_QTGUI_LIBRARY}
84+
${QT_QTNETWORK_LIBRARY}
85+
${QT_QTSVG_LIBRARY}
86+
${QT_QTXML_LIBRARY}
87+
${QT_QTWEBKIT_LIBRARY}
6388
)
6489
ENDIF (${QTVERSION} STRLESS "4.3.0")
6590

‎src/ui/qgscustomprojectiondialogbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@
270270
<item row="2" column="0">
271271
<widget class="QDialogButtonBox" name="buttonBox">
272272
<property name="standardButtons">
273-
<set>QDialogButtonBox::Ok</set>
273+
<set>QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
274274
</property>
275275
</widget>
276276
</item>

‎src/ui/qgsoptionsbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1243,7 +1243,7 @@
12431243
<enum>Qt::Horizontal</enum>
12441244
</property>
12451245
<property name="standardButtons">
1246-
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
1246+
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
12471247
</property>
12481248
</widget>
12491249
</item>

‎src/ui/qgsstylev2managerdialogbase.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<enum>Qt::Horizontal</enum>
9494
</property>
9595
<property name="standardButtons">
96-
<set>QDialogButtonBox::Close</set>
96+
<set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
9797
</property>
9898
</widget>
9999
</item>

0 commit comments

Comments
 (0)
Please sign in to comment.