sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix for ticket #404 (print composer needs a help button).

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@6164 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
g_j_m 2006-12-01 09:27:40 +00:00
parent 9ca4093eb0
commit f3d2a25fb1
4 changed files with 55 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/context_help/contextids.txt
View File

@ -10,3 +10,4 @@
1033030847_en_US QgsDelimitedTextPluginGui 1033030847_en_US QgsDelimitedTextPluginGui
863656587_en_US QgsMapserverExport 863656587_en_US QgsMapserverExport
94000531_en_US QgsVectorLayerProperties 94000531_en_US QgsVectorLayerProperties
1212121212_en_US QgsComposer

13
src/composer/qgscomposer.cpp
View File

@ -23,6 +23,7 @@
#include "qgsexception.h" #include "qgsexception.h"
#include "qgsproject.h" #include "qgsproject.h"
#include "qgsmessageviewer.h" #include "qgsmessageviewer.h"
#include "qgscontexthelp.h"
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QFileDialog> #include <QFileDialog>
@ -86,6 +87,8 @@ QgsComposer::QgsComposer( QgisApp *qgis): QMainWindow()
restoreWindowState(); restoreWindowState();
selectItem(); // Set selection tool selectItem(); // Set selection tool
statusBar()->setHidden(true);
} }
QgsComposer::~QgsComposer() QgsComposer::~QgsComposer()
@ -839,6 +842,16 @@ void QgsComposer::restoreWindowState()
mSplitter->setSizes ( list ); mSplitter->setSizes ( list );
} }
void QgsComposer::on_helpPButton_clicked()
{
QgsContextHelp::run(context_id);
}
void QgsComposer::on_closePButton_clicked()
{
close();
}
void QgsComposer::projectRead(void) void QgsComposer::projectRead(void)
{ {
#ifdef QGISDEBUG #ifdef QGISDEBUG

10
src/composer/qgscomposer.h
View File

@ -146,6 +146,12 @@ public slots:
//! Save window state //! Save window state
void saveWindowState(); void saveWindowState();
//! Slot for when the help button is clicked
void on_helpPButton_clicked();
//! Slot for when the close button is clicked
void on_closePButton_clicked();
private: private:
//! Set teh pixmap / icons on the toolbar buttons //! Set teh pixmap / icons on the toolbar buttons
void setupTheme(); void setupTheme();
@ -175,6 +181,10 @@ private:
//! Layout //! Layout
QGridLayout *mItemOptionsLayout; QGridLayout *mItemOptionsLayout;
//! Help context id
static const int context_id = 1212121212; // CHANGE ME PLEASE GARY :)
}; };
#endif #endif

50
src/ui/qgscomposerbase.ui
View File

@ -1,7 +1,4 @@
<ui version="4.0" > <ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<class>QgsComposerBase</class> <class>QgsComposerBase</class>
<widget class="QMainWindow" name="QgsComposerBase" > <widget class="QMainWindow" name="QgsComposerBase" >
<property name="geometry" > <property name="geometry" >
@ -9,7 +6,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>800</width> <width>800</width>
<height>600</height> <height>609</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle" >
@ -23,7 +20,7 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0" colspan="3" >
<widget class="QSplitter" name="mSplitter" > <widget class="QSplitter" name="mSplitter" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy>
@ -195,18 +192,36 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="1" column="2" >
<widget class="QPushButton" name="closePButton" >
<property name="text" >
<string>Close</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QPushButton" name="helpPButton" >
<property name="text" >
<string>Help</string>
</property>
</widget>
</item>
<item row="1" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QStatusBar" name="statusbar" > <widget class="QStatusBar" name="statusbar" />
<property name="geometry" >
<rect>
<x>0</x>
<y>578</y>
<width>800</width>
<height>22</height>
</rect>
</property>
</widget>
<widget class="QToolBar" name="toolBar" > <widget class="QToolBar" name="toolBar" >
<property name="orientation" > <property name="orientation" >
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -227,7 +242,6 @@
<addaction name="separator" /> <addaction name="separator" />
<addaction name="mActionAddNewMap" /> <addaction name="mActionAddNewMap" />
<addaction name="mActionAddNewLabel" /> <addaction name="mActionAddNewLabel" />
<addaction name="mActionAddImage" />
<addaction name="mActionAddNewVectLegend" /> <addaction name="mActionAddNewVectLegend" />
<addaction name="mActionAddNewScalebar" /> <addaction name="mActionAddNewScalebar" />
<addaction name="mActionSelectMoveItem" /> <addaction name="mActionSelectMoveItem" />
@ -353,14 +367,12 @@
</property> </property>
</action> </action>
</widget> </widget>
<pixmapfunction></pixmapfunction>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>Q3Frame</class> <class>Q3Frame</class>
<extends></extends> <extends>QFrame</extends>
<header>Qt3Support/Q3Frame</header> <header>Qt3Support/Q3Frame</header>
<container>1</container> <container>1</container>
<pixmap></pixmap>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>