Skip to content

Commit

Permalink
add context help for qgis options, style manager, spatialite selectio…
Browse files Browse the repository at this point in the history
…n 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
  • Loading branch information
jef committed Dec 14, 2009
1 parent a86b225 commit 669268f
Show file tree
Hide file tree
Showing 11 changed files with 49 additions and 10 deletions.
1 change: 1 addition & 0 deletions resources/context_help/QgsCustomProjectionDialog-en_US
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h3>Custom Coordinate Reference System Definition</h3>
1 change: 1 addition & 0 deletions resources/context_help/QgsOptions-en_US
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h3>Options</h3>
1 change: 1 addition & 0 deletions resources/context_help/QgsSpatiaLiteSourceSelect-en_US
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h3>Add SpatiaLite Tables</h3>
1 change: 1 addition & 0 deletions resources/context_help/QgsStyleV2ManagerDialog-en_US
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<h3>Style Manager</h3>
6 changes: 5 additions & 1 deletion src/app/qgscustomprojectiondialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
#define QGSCUSTOMCRSDIALOG_H

#include "ui_qgscustomprojectiondialogbase.h"
#include "qgscontexthelp.h"

class QDir;

/**
Expand Down Expand Up @@ -48,8 +50,10 @@ class QgsCustomProjectionDialog : public QDialog, private Ui::QgsCustomProjectio
void on_pbnNew_clicked();
void on_pbnSave_clicked();

void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }

//
// Contol population
// Control population
//
/* These two methods will be deprecated
void getProjList();
Expand Down
3 changes: 3 additions & 0 deletions src/app/qgsoptions.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

#include "ui_qgsoptionsbase.h"
#include "qgisgui.h"
#include "qgscontexthelp.h"


/**
Expand Down Expand Up @@ -100,6 +101,8 @@ class QgsOptions : public QDialog, private Ui::QgsOptionsBase
*/
void on_mBtnRemoveSVGPath_clicked();

void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }

protected:
//! Populates combo box with ellipsoids
void getEllipsoidList();
Expand Down
3 changes: 3 additions & 0 deletions src/gui/symbology-ng/qgsstylev2managerdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <QDialog>

#include "ui_qgsstylev2managerdialogbase.h"
#include "qgscontexthelp.h"

class QgsStyleV2;

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

void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }

protected:

//! populate combo box with known style items (symbols, color ramps)
Expand Down
37 changes: 31 additions & 6 deletions src/helpviewer/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,31 @@ SET (HELP_MOC_HDRS

#SET (HELP_RCCS qgsgps_plugin.qrc)

IF (WIN32)
IF (MSVC)
SET (HELP_SRCS ${HELP_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/../app/qgis_win32.rc)
ELSE(MSVC)

# Icon for windows MINGW
# Note: can't include .rc directly to source files
# as it's ignored when used MinGW

IF (NOT WINDRES)
FIND_PROGRAM(WINDRES windres)
IF (NOT WINDRES)
MESSAGE(FATAL_ERROR "windres not found - aborting")
ENDIF (NOT WINDRES)
ENDIF (NOT WINDRES)
#############################################################
# application icon
# resource compilation for MinGW
ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/icon.o
COMMAND ${WINDRES} -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/../app/qgis_win32.rc
-o ${CMAKE_CURRENT_BINARY_DIR}/icon.o )
SET(QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/icon.o)
ENDIF (MSVC)
ENDIF (WIN32)


########################################################
# Build
Expand Down Expand Up @@ -54,12 +79,12 @@ IF (${QTVERSION} STRLESS "4.3.0")
)
ELSE (${QTVERSION} STRLESS "4.3.0")
TARGET_LINK_LIBRARIES(qgis_help
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTNETWORK_LIBRARY}
${QT_QTSVG_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
${QT_QTCORE_LIBRA}
${QT_QTGUI_LIBRARY}
${QT_QTNETWORK_LIBRARY}
${QT_QTSVG_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTWEBKIT_LIBRARY}
)
ENDIF (${QTVERSION} STRLESS "4.3.0")

Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgscustomprojectiondialogbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@
<item row="2" column="0">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsoptionsbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
Expand Down
2 changes: 1 addition & 1 deletion src/ui/qgsstylev2managerdialogbase.ui
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
<set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
</property>
</widget>
</item>
Expand Down

0 comments on commit 669268f

Please sign in to comment.