Skip to content

Commit c063838

Browse files
3nids3nids
committedJan 15, 2016
rename QgsFilePickerWidget to QgsFileWidget
·
ltr-3_40archive/master_2
1 parent 36157d4 commit c063838

17 files changed

+200
-189
lines changed
 

‎python/gui/gui.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
%Include qgsfieldproxymodel.sip
7474
%Include qgsfieldvalidator.sip
7575
%Include qgsfiledropedit.sip
76-
%Include qgsfilepickerwidget.sip
76+
%Include qgsfilewidget.sip
7777
%Include qgsfilterlineedit.sip
7878
%Include qgsformannotationitem.sip
7979
%Include qgsgenericprojectionselector.sip

‎python/gui/qgsexternalresourcewidget.sip

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,19 @@ class QgsExternalResourceWidget : QWidget
77

88
public:
99

10-
enum DocumentViewerContent
10+
enum DocumentViewerContent
1111
{
1212
NoContent,
1313
Image,
1414
Web
1515
};
1616

17-
explicit QgsExternalResourceWidget( QWidget* parent /TransferThis/ );
18-
19-
~QgsExternalResourceWidget();
17+
/**
18+
* @brief QgsExternalResourceWidget creates a widget with a file widget and a document viewer
19+
* Both part of the widget are optional.
20+
* @see QgsFileWidget
21+
*/
22+
explicit QgsExternalResourceWidget( QWidget *parent = 0 );
2023

2124
/**
2225
* @brief documentPath returns the path of the current document in the widget
@@ -25,30 +28,38 @@ class QgsExternalResourceWidget : QWidget
2528
QVariant documentPath( QVariant::Type type = QVariant::String ) const;
2629
void setDocumentPath( QVariant documentPath );
2730

28-
//! access the file picker widget to allow its configuration
29-
QgsFilePickerWidget* filePickerwidget();
31+
//! access the file widget to allow its configuration
32+
QgsFileWidget* fileWidget();
3033

31-
//! returns if the file picker is visible in the widget
32-
bool filePickerVisible() const;
33-
//! set the visiblity of the file picker in the widget
34-
void setFilePickerVisible( bool visible );
34+
//! returns if the file widget is visible in the widget
35+
bool fileWidgetVisible() const;
36+
//! set the visiblity of the file widget in the layout
37+
void setFileWidgetVisible( bool visible );
3538

3639
//! returns the type of content used in the document viewer
3740
QgsExternalResourceWidget::DocumentViewerContent documentViewerContent() const;
3841
//! setDocumentViewerContent defines the type of content to be shown. Widget will be adapated accordingly
3942
void setDocumentViewerContent( QgsExternalResourceWidget::DocumentViewerContent content );
4043

41-
//! set the configuration of the document viewer
44+
//! returns the height of the document viewer
4245
int documentViewerHeight() const;
46+
/**
47+
* @brief setDocumentViewerWidth set the height of the document viewer.
48+
* @param height the height. Use 0 for automatic best display.
49+
*/
4350
void setDocumentViewerHeight( int height );
51+
//! returns the width of the document viewer
4452
int documentViewerWidth() const ;
53+
/**
54+
* @brief setDocumentViewerWidth set the width of the document viewer.
55+
* @param width the width. Use 0 for automatic best display.
56+
*/
4557
void setDocumentViewerWidth( int width );
4658

4759
//! defines if the widget is readonly
4860
void setReadOnly( bool readOnly );
4961

5062
signals:
63+
//! emitteed as soon as the current document changes
5164
void valueChanged( QString );
52-
53-
5465
};

‎python/gui/qgsfilepickerwidget.sip renamed to ‎python/gui/qgsfilewidget.sip

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

2-
class QgsFilePickerWidget : QWidget
2+
class QgsFileWidget : QWidget
33
{
44
%TypeHeaderCode
5-
#include <qgsfilepickerwidget.h>
5+
#include <qgsfilewidget.h>
66
%End
77

88
public:
@@ -20,9 +20,9 @@ class QgsFilePickerWidget : QWidget
2020
RelativeDefaultPath
2121
};
2222

23-
explicit QgsFilePickerWidget( QWidget* parent /TransferThis/ );
23+
explicit QgsFileWidget( QWidget* parent /TransferThis/ );
2424

25-
~QgsFilePickerWidget();
25+
~QgsFileWidget();
2626

2727
//! Returns the current file path
2828
QString filePath();
@@ -50,9 +50,9 @@ class QgsFilePickerWidget : QWidget
5050
void setFilter( const QString &filter );
5151

5252
//! determines if the tool button is shown
53-
bool filePickerButtonVisible() const;
53+
bool fileWidgetButtonVisible() const;
5454
//! determines if the tool button is shown
55-
void setFilePickerButtonVisible( bool visible );
55+
void setFileWidgetButtonVisible( bool visible );
5656

5757
//! determines if the file path will be shown as a link
5858
bool useLink() const;
@@ -68,12 +68,12 @@ class QgsFilePickerWidget : QWidget
6868
void setDefaultRoot( QString defaultRoot );
6969

7070
//! determines the storage mode (i.e. file or directory)
71-
QgsFilePickerWidget::StorageMode storageMode() const;
72-
void setStorageMode( QgsFilePickerWidget::StorageMode storageMode );
71+
QgsFileWidget::StorageMode storageMode() const;
72+
void setStorageMode( QgsFileWidget::StorageMode storageMode );
7373

7474
//! determines if the relative path is with respect to the project path or the default path
75-
QgsFilePickerWidget::RelativeStorage relativeStorage() const;
76-
void setRelativeStorage( QgsFilePickerWidget::RelativeStorage relativeStorage );
75+
QgsFileWidget::RelativeStorage relativeStorage() const;
76+
void setRelativeStorage( QgsFileWidget::RelativeStorage relativeStorage );
7777

7878
signals:
7979
void fileChanged( QString );

‎src/customwidgets/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ SET (QGIS_CUSTOMWIDGETS_SRCS
3434
qgsexternalresourcewidgetplugin.cpp
3535
qgsfieldcomboboxplugin.cpp
3636
qgsfieldexpressionwidgetplugin.cpp
37-
qgsfilepickerwidgetplugin.cpp
37+
qgsfilewidgetplugin.cpp
3838
qgsfilterlineeditplugin.cpp
3939
qgsmaplayercomboboxplugin.cpp
4040
qgsprojectionselectionwidgetplugin.cpp
@@ -58,7 +58,7 @@ SET (QGIS_CUSTOMWIDGETS_MOC_HDRS
5858
qgsexternalresourcewidgetplugin.h
5959
qgsfieldcomboboxplugin.h
6060
qgsfieldexpressionwidgetplugin.h
61-
qgsfilepickerwidgetplugin.h
61+
qgsfilewidgetplugin.h
6262
qgsfilterlineeditplugin.h
6363
qgsmaplayercomboboxplugin.h
6464
qgsprojectionselectionwidgetplugin.h
@@ -88,7 +88,7 @@ SET(QGIS_CUSTOMWIDGETS_HDRS
8888
qgsexternalresourcewidgetplugin.h
8989
qgsfieldcomboboxplugin.h
9090
qgsfieldexpressionwidgetplugin.h
91-
qgsfilepickerwidgetplugin.h
91+
qgsfilewidgetplugin.h
9292
qgsfilterlineeditplugin.h
9393
qgsmaplayercomboboxplugin.h
9494
qgsprojectionselectionwidgetplugin.h

‎src/customwidgets/qgsfilepickerwidgetplugin.cpp renamed to ‎src/customwidgets/qgsfilewidgetplugin.cpp

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsfilepickerwidgetplugin.cpp
2+
qgsfilewidgetplugin.cpp
33
--------------------------------------
44
Date : 13.01.2016
55
Copyright : (C) 2016 Denis Rouzaud
@@ -14,52 +14,52 @@
1414
***************************************************************************/
1515

1616
#include "qgiscustomwidgets.h"
17-
#include "qgsfilepickerwidgetplugin.h"
18-
#include "qgsfilepickerwidget.h"
17+
#include "qgsfilewidgetplugin.h"
18+
#include "qgsfilewidget.h"
1919

2020

21-
QgsFilePickerWidgetPlugin::QgsFilePickerWidgetPlugin( QObject *parent )
21+
QgsFileWidgetPlugin::QgsFileWidgetPlugin( QObject *parent )
2222
: QObject( parent )
2323
, mInitialized( false )
2424
{
2525
}
2626

27-
QString QgsFilePickerWidgetPlugin::name() const
27+
QString QgsFileWidgetPlugin::name() const
2828
{
29-
return "QgsFilePickerWidget";
29+
return "QgsFileWidget";
3030
}
3131

32-
QString QgsFilePickerWidgetPlugin::group() const
32+
QString QgsFileWidgetPlugin::group() const
3333
{
3434
return QgisCustomWidgets::groupName();
3535
}
3636

37-
QString QgsFilePickerWidgetPlugin::includeFile() const
37+
QString QgsFileWidgetPlugin::includeFile() const
3838
{
39-
return "qgsfilepickerwidget.h";
39+
return "qgsfilewidget.h";
4040
}
4141

42-
QIcon QgsFilePickerWidgetPlugin::icon() const
42+
QIcon QgsFileWidgetPlugin::icon() const
4343
{
4444
return QIcon( ":/images/icons/qgis-icon-60x60.png" );
4545
}
4646

47-
bool QgsFilePickerWidgetPlugin::isContainer() const
47+
bool QgsFileWidgetPlugin::isContainer() const
4848
{
4949
return false;
5050
}
5151

52-
QWidget *QgsFilePickerWidgetPlugin::createWidget( QWidget *parent )
52+
QWidget *QgsFileWidgetPlugin::createWidget( QWidget *parent )
5353
{
54-
return new QgsFilePickerWidget( parent );
54+
return new QgsFileWidget( parent );
5555
}
5656

57-
bool QgsFilePickerWidgetPlugin::isInitialized() const
57+
bool QgsFileWidgetPlugin::isInitialized() const
5858
{
5959
return mInitialized;
6060
}
6161

62-
void QgsFilePickerWidgetPlugin::initialize( QDesignerFormEditorInterface *core )
62+
void QgsFileWidgetPlugin::initialize( QDesignerFormEditorInterface *core )
6363
{
6464
Q_UNUSED( core );
6565
if ( mInitialized )
@@ -68,20 +68,20 @@ void QgsFilePickerWidgetPlugin::initialize( QDesignerFormEditorInterface *core )
6868
}
6969

7070

71-
QString QgsFilePickerWidgetPlugin::toolTip() const
71+
QString QgsFileWidgetPlugin::toolTip() const
7272
{
7373
return "";
7474
}
7575

76-
QString QgsFilePickerWidgetPlugin::whatsThis() const
76+
QString QgsFileWidgetPlugin::whatsThis() const
7777
{
7878
return "";
7979
}
8080

81-
QString QgsFilePickerWidgetPlugin::domXml() const
81+
QString QgsFileWidgetPlugin::domXml() const
8282
{
8383
return QString( "<ui language=\"c++\">\n"
84-
" <widget class=\"%1\" name=\"mQgsFilePickerWidget\">\n"
84+
" <widget class=\"%1\" name=\"mQgsFileWidget\">\n"
8585
" <property name=\"geometry\">\n"
8686
" <rect>\n"
8787
" <x>0</x>\n"

‎src/customwidgets/qgsfilepickerwidgetplugin.h renamed to ‎src/customwidgets/qgsfilewidgetplugin.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsfilepickerwidgetplugin.h
2+
qgsfilewidgetplugin.h
33
--------------------------------------
44
Date : 13.01.2016
55
Copyright : (C) 2016 Denis Rouzaud
@@ -13,8 +13,8 @@
1313
* *
1414
***************************************************************************/
1515

16-
#ifndef QGSFILEPICKERWIDGETPLUGIN_H
17-
#define QGSFILEPICKERWIDGETPLUGIN_H
16+
#ifndef QGSFILEWIDGETPLUGIN_H
17+
#define QGSFILEWIDGETPLUGIN_H
1818

1919

2020
#include <QtGlobal>
@@ -27,13 +27,13 @@
2727
#endif
2828

2929

30-
class CUSTOMWIDGETS_EXPORT QgsFilePickerWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
30+
class CUSTOMWIDGETS_EXPORT QgsFileWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
3131
{
3232
Q_OBJECT
3333
Q_INTERFACES( QDesignerCustomWidgetInterface )
3434

3535
public:
36-
explicit QgsFilePickerWidgetPlugin( QObject *parent = 0 );
36+
explicit QgsFileWidgetPlugin( QObject *parent = 0 );
3737

3838
private:
3939
bool mInitialized;
@@ -52,4 +52,4 @@ class CUSTOMWIDGETS_EXPORT QgsFilePickerWidgetPlugin : public QObject, public QD
5252
QString whatsThis() const override;
5353
QString domXml() const override;
5454
};
55-
#endif // QGSFILEPICKERWIDGETPLUGIN_H
55+
#endif // QGSFILEWIDGETPLUGIN_H

‎src/gui/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ SET(QGIS_GUI_SRCS
198198
qgsfieldproxymodel.cpp
199199
qgsfieldvalidator.cpp
200200
qgsfiledropedit.cpp
201-
qgsfilepickerwidget.cpp
201+
qgsfilewidget.cpp
202202
qgsfilterlineedit.cpp
203203
qgsformannotationitem.cpp
204204
qgsgenericprojectionselector.cpp
@@ -338,7 +338,7 @@ SET(QGIS_GUI_MOC_HDRS
338338
qgsfieldproxymodel.h
339339
qgsfieldvalidator.h
340340
qgsfiledropedit.h
341-
qgsfilepickerwidget.h
341+
qgsfilewidget.h
342342
qgsfilterlineedit.h
343343
qgsformannotationitem.h
344344
qgsgenericprojectionselector.h

‎src/gui/editorwidgets/qgsexternalresourceconfigdlg.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@ QgsExternalResourceConfigDlg::QgsExternalResourceConfigDlg( QgsVectorLayer* vl,
4343
connect( mRelativeGroupBox, SIGNAL( toggled( bool ) ), this, SLOT( enableRelative( bool ) ) );
4444

4545
// set ids for StorageTypeButtons
46-
mStorageButtonGroup->setId( mStoreFilesButton, QgsFilePickerWidget::GetFile );
47-
mStorageButtonGroup->setId( mStoreDirsButton, QgsFilePickerWidget::GetDirectory );
46+
mStorageButtonGroup->setId( mStoreFilesButton, QgsFileWidget::GetFile );
47+
mStorageButtonGroup->setId( mStoreDirsButton, QgsFileWidget::GetDirectory );
4848
mStoreFilesButton->setChecked( true );
4949

5050
// set ids for RelativeButtons
51-
mRelativeButtonGroup->setId( mRelativeProject, QgsFilePickerWidget::RelativeProject );
52-
mRelativeButtonGroup->setId( mRelativeDefault, QgsFilePickerWidget::RelativeDefaultPath );
51+
mRelativeButtonGroup->setId( mRelativeProject, QgsFileWidget::RelativeProject );
52+
mRelativeButtonGroup->setId( mRelativeDefault, QgsFileWidget::RelativeDefaultPath );
5353
mRelativeProject->setChecked( true );
5454

5555
mDocumentViewerContentComboBox->addItem( tr( "Image" ), QgsExternalResourceWidget::Image );
@@ -109,9 +109,9 @@ QgsEditorWidgetConfig QgsExternalResourceConfigDlg::config()
109109
{
110110
QgsEditorWidgetConfig cfg;
111111

112-
cfg.insert( "FilePicker", mFilePickerGroupBox->isChecked() );
113-
cfg.insert( "FilePickerButton", mFilePickerButtonGroupBox->isChecked() );
114-
cfg.insert( "FilePickerFilter", mFilePickerFilterLineEdit->text() );
112+
cfg.insert( "FileWidget", mFileWidgetGroupBox->isChecked() );
113+
cfg.insert( "FileWidgetButton", mFileWidgetButtonGroupBox->isChecked() );
114+
cfg.insert( "FileWidgetFilter", mFileWidgetFilterLineEdit->text() );
115115

116116
if ( mUseLink->isChecked() )
117117
{
@@ -135,7 +135,7 @@ QgsEditorWidgetConfig QgsExternalResourceConfigDlg::config()
135135
}
136136
else
137137
{
138-
cfg.insert( "RelativeStorage", ( int )QgsFilePickerWidget::Absolute );
138+
cfg.insert( "RelativeStorage", ( int )QgsFileWidget::Absolute );
139139
}
140140

141141
if ( mDocumentViewerGroupBox->isChecked() )
@@ -155,17 +155,17 @@ QgsEditorWidgetConfig QgsExternalResourceConfigDlg::config()
155155

156156
void QgsExternalResourceConfigDlg::setConfig( const QgsEditorWidgetConfig& config )
157157
{
158-
if ( config.contains( "FilePicker" ) )
158+
if ( config.contains( "FileWidget" ) )
159159
{
160-
mFilePickerGroupBox->setChecked( config.value( "FilePicker" ).toBool() );
160+
mFileWidgetGroupBox->setChecked( config.value( "FileWidget" ).toBool() );
161161
}
162-
if ( config.contains( "FilePicker" ) )
162+
if ( config.contains( "FileWidget" ) )
163163
{
164-
mFilePickerButtonGroupBox->setChecked( config.value( "FilePickerButton" ).toBool() );
164+
mFileWidgetButtonGroupBox->setChecked( config.value( "FileWidgetButton" ).toBool() );
165165
}
166-
if ( config.contains( "FilePickerFilter" ) )
166+
if ( config.contains( "FileWidgetFilter" ) )
167167
{
168-
mFilePickerFilterLineEdit->setText( config.value( "Filter" ).toString() );
168+
mFileWidgetFilterLineEdit->setText( config.value( "Filter" ).toString() );
169169
}
170170

171171
if ( config.contains( "UseLink" ) )
@@ -184,7 +184,7 @@ void QgsExternalResourceConfigDlg::setConfig( const QgsEditorWidgetConfig& confi
184184
if ( config.contains( "RelativeStorage" ) )
185185
{
186186
int relative = config.value( "RelativeStorage" ).toInt();
187-
if (( QgsFilePickerWidget::RelativeStorage )relative == QgsFilePickerWidget::Absolute )
187+
if (( QgsFileWidget::RelativeStorage )relative == QgsFileWidget::Absolute )
188188
{
189189
mRelativeGroupBox->setChecked( false );
190190
}

‎src/gui/editorwidgets/qgsexternalresourcewidgetfactory.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ void QgsExternalResourceWidgetFactory::writeConfig( const QgsEditorWidgetConfig&
3737
Q_UNUSED( layer )
3838
Q_UNUSED( fieldIdx )
3939

40-
configElement.setAttribute( "FilePicker", config.value( "FilePicker", true ).toBool() );
41-
configElement.setAttribute( "FilePickerButton", config.value( "FilePickerButton", true ).toBool() );
40+
configElement.setAttribute( "FileWidget", config.value( "FileWidget", true ).toBool() );
41+
configElement.setAttribute( "FileWidgetButton", config.value( "FileWidgetButton", true ).toBool() );
4242

4343

4444
// Non mandatory options are not saved into project file (to save some space).
@@ -57,8 +57,8 @@ void QgsExternalResourceWidgetFactory::writeConfig( const QgsEditorWidgetConfig&
5757
if ( config.contains( "DocumentViewer" ) )
5858
configElement.setAttribute( "DocumentViewer", config.value( "DocumentViewer" ).toInt() );
5959

60-
if ( config.contains( "FilePickerFilter" ) )
61-
configElement.setAttribute( "FilePickerFilter", config.value( "FilePickerFilter" ).toString() );
60+
if ( config.contains( "FileWidgetFilter" ) )
61+
configElement.setAttribute( "FileWidgetFilter", config.value( "FileWidgetFilter" ).toString() );
6262

6363
configElement.setAttribute( "StorageMode", config.value( "StorageMode" ).toString() );
6464
}
@@ -70,11 +70,11 @@ QgsEditorWidgetConfig QgsExternalResourceWidgetFactory::readConfig( const QDomEl
7070

7171
QgsEditorWidgetConfig cfg;
7272

73-
if ( configElement.hasAttribute( "FilePickerButton" ) )
74-
cfg.insert( "FilePickerButton", configElement.attribute( "FilePickerButton" ) == "1" );
73+
if ( configElement.hasAttribute( "FileWidgetButton" ) )
74+
cfg.insert( "FileWidgetButton", configElement.attribute( "FileWidgetButton" ) == "1" );
7575

76-
if ( configElement.hasAttribute( "FilePicker" ) )
77-
cfg.insert( "FilePicker", configElement.attribute( "FilePicker" ) == "1" );
76+
if ( configElement.hasAttribute( "FileWidget" ) )
77+
cfg.insert( "FileWidget", configElement.attribute( "FileWidget" ) == "1" );
7878

7979
if ( configElement.hasAttribute( "UseLink" ) )
8080
cfg.insert( "UseLink", configElement.attribute( "UseLink" ) == "1" );
@@ -95,8 +95,8 @@ QgsEditorWidgetConfig QgsExternalResourceWidgetFactory::readConfig( const QDomEl
9595
if ( configElement.hasAttribute( "DocumentViewer" ) )
9696
cfg.insert( "DocumentViewer", configElement.attribute( "DocumentViewer" ) );
9797

98-
if ( configElement.hasAttribute( "FilePickerFilter" ) )
99-
cfg.insert( "FilePickerFilter", configElement.attribute( "FilePickerFilter" ) );
98+
if ( configElement.hasAttribute( "FileWidgetFilter" ) )
99+
cfg.insert( "FileWidgetFilter", configElement.attribute( "FileWidgetFilter" ) );
100100

101101

102102
cfg.insert( "StorageMode", configElement.attribute( "StorageMode", "Files" ) );

‎src/gui/editorwidgets/qgsexternalresourcewidgetwrapper.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,42 +82,42 @@ void QgsExternalResourceWidgetWrapper::initWidget( QWidget* editor )
8282

8383
if ( mQgsWidget )
8484
{
85-
mQgsWidget->filePickerwidget()->setStorageMode( QgsFilePickerWidget::GetFile );
85+
mQgsWidget->fileWidget()->setStorageMode( QgsFileWidget::GetFile );
8686
if ( config().contains( "UseLink" ) )
8787
{
88-
mQgsWidget->filePickerwidget()->setUseLink( config( "UseLink" ).toBool() );
88+
mQgsWidget->fileWidget()->setUseLink( config( "UseLink" ).toBool() );
8989
}
9090
if ( config().contains( "FullUrl" ) )
9191
{
92-
mQgsWidget->filePickerwidget()->setFullUrl( config( "FullUrl" ).toBool() );
92+
mQgsWidget->fileWidget()->setFullUrl( config( "FullUrl" ).toBool() );
9393
}
9494
if ( config().contains( "DefaultRoot" ) )
9595
{
96-
mQgsWidget->filePickerwidget()->setDefaultRoot( config( "DefaultRoot" ).toString() );
96+
mQgsWidget->fileWidget()->setDefaultRoot( config( "DefaultRoot" ).toString() );
9797
}
9898
if ( config().contains( "StorageMode" ) )
9999
{
100-
mQgsWidget->filePickerwidget()->setStorageMode(( QgsFilePickerWidget::StorageMode )config( "StorageMode" ).toInt() );
100+
mQgsWidget->fileWidget()->setStorageMode(( QgsFileWidget::StorageMode )config( "StorageMode" ).toInt() );
101101
}
102102
if ( config().contains( "RelativeStorage" ) )
103103
{
104-
mQgsWidget->filePickerwidget()->setRelativeStorage(( QgsFilePickerWidget::RelativeStorage )config( "RelativeStorage" ).toInt() );
104+
mQgsWidget->fileWidget()->setRelativeStorage(( QgsFileWidget::RelativeStorage )config( "RelativeStorage" ).toInt() );
105105
}
106-
if ( config().contains( "FilePicker" ) )
106+
if ( config().contains( "FileWidget" ) )
107107
{
108-
mQgsWidget->setFilePickerVisible( config( "FilePicker" ).toBool() );
108+
mQgsWidget->setFileWidgetVisible( config( "FileWidget" ).toBool() );
109109
}
110-
if ( config().contains( "FilePickerButton" ) )
110+
if ( config().contains( "FileWidgetButton" ) )
111111
{
112-
mQgsWidget->filePickerwidget()->setFilePickerButtonVisible( config( "FilePickerButton" ).toBool() );
112+
mQgsWidget->fileWidget()->setFileWidgetButtonVisible( config( "FileWidgetButton" ).toBool() );
113113
}
114114
if ( config().contains( "DocumentViewer" ) )
115115
{
116116
mQgsWidget->setDocumentViewerContent(( QgsExternalResourceWidget::DocumentViewerContent )config( "DocumentViewer" ).toInt() );
117117
}
118-
if ( config().contains( "FilePickerFilter" ) )
118+
if ( config().contains( "FileWidgetFilter" ) )
119119
{
120-
mQgsWidget->filePickerwidget()->setFilter( config( "FilePickerFilter" ).toString() );
120+
mQgsWidget->fileWidget()->setFilter( config( "FileWidgetFilter" ).toString() );
121121
}
122122
}
123123
}

‎src/gui/qgsexternalresourcewidget.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
QgsExternalResourceWidget::QgsExternalResourceWidget( QWidget *parent )
2929
: QWidget( parent )
30-
, mFilePickerVisible( true )
30+
, mFileWidgetVisible( true )
3131
, mDocumentViewerContent( NoContent )
3232
, mDocumentViewerHeight( 0 )
3333
, mDocumentViewerWidth( 0 )
@@ -39,9 +39,9 @@ QgsExternalResourceWidget::QgsExternalResourceWidget( QWidget *parent )
3939
QGridLayout* layout = new QGridLayout();
4040
layout->setMargin( 0 );
4141

42-
mFilePicker = new QgsFilePickerWidget( this );
43-
layout->addWidget( mFilePicker, 0, 0 );
44-
mFilePicker->setVisible( mFilePickerVisible );
42+
mFileWidget = new QgsFileWidget( this );
43+
layout->addWidget( mFileWidget, 0, 0 );
44+
mFileWidget->setVisible( mFileWidgetVisible );
4545

4646
mPixmapLabel = new QgsPixmapLabel( this );
4747
layout->addWidget( mPixmapLabel, 1, 0 );
@@ -55,12 +55,12 @@ QgsExternalResourceWidget::QgsExternalResourceWidget( QWidget *parent )
5555

5656
setLayout( layout );
5757

58-
connect( mFilePicker, SIGNAL( fileChanged( QString ) ), this, SLOT( loadDocument( QString ) ) );
58+
connect( mFileWidget, SIGNAL( fileChanged( QString ) ), this, SLOT( loadDocument( QString ) ) );
5959
}
6060

6161
QVariant QgsExternalResourceWidget::documentPath( QVariant::Type type ) const
6262
{
63-
QString path = mFilePicker->filePath();
63+
QString path = mFileWidget->filePath();
6464
if ( path.isEmpty() )
6565
{
6666
return QVariant( type );
@@ -73,23 +73,23 @@ QVariant QgsExternalResourceWidget::documentPath( QVariant::Type type ) const
7373

7474
void QgsExternalResourceWidget::setDocumentPath( QVariant path )
7575
{
76-
mFilePicker->setFilePath( path.toString() );
76+
mFileWidget->setFilePath( path.toString() );
7777
}
7878

79-
QgsFilePickerWidget*QgsExternalResourceWidget::filePickerwidget()
79+
QgsFileWidget*QgsExternalResourceWidget::fileWidget()
8080
{
81-
return mFilePicker;
81+
return mFileWidget;
8282
}
8383

84-
bool QgsExternalResourceWidget::filePickerVisible() const
84+
bool QgsExternalResourceWidget::fileWidgetVisible() const
8585
{
86-
return mFilePickerVisible;
86+
return mFileWidgetVisible;
8787
}
8888

89-
void QgsExternalResourceWidget::setFilePickerVisible( bool visible )
89+
void QgsExternalResourceWidget::setFileWidgetVisible( bool visible )
9090
{
91-
mFilePickerVisible = visible;
92-
mFilePicker->setVisible( visible );
91+
mFileWidgetVisible = visible;
92+
mFileWidget->setVisible( visible );
9393
}
9494

9595
QgsExternalResourceWidget::DocumentViewerContent QgsExternalResourceWidget::documentViewerContent() const
@@ -127,7 +127,7 @@ void QgsExternalResourceWidget::setDocumentViewerWidth( int width )
127127

128128
void QgsExternalResourceWidget::setReadOnly( bool readOnly )
129129
{
130-
mFilePicker->setReadOnly( readOnly );
130+
mFileWidget->setReadOnly( readOnly );
131131
}
132132

133133
void QgsExternalResourceWidget::updateDocumentViewer()

‎src/gui/qgsexternalresourcewidget.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class QgsPixmapLabel;
2323
#include <QWidget>
2424
#include <QVariant>
2525

26-
#include "qgsfilepickerwidget.h"
26+
#include "qgsfilewidget.h"
2727

2828

2929

@@ -36,7 +36,7 @@ class GUI_EXPORT QgsExternalResourceWidget : public QWidget
3636
{
3737

3838
Q_OBJECT
39-
Q_PROPERTY( bool filePickerVisible READ filePickerVisible WRITE setFilePickerVisible )
39+
Q_PROPERTY( bool fileWidgetVisible READ fileWidgetVisible WRITE setFileWidgetVisible )
4040
Q_PROPERTY( DocumentViewerContent documentViewerContent READ documentViewerContent WRITE setDocumentViewerContent )
4141
Q_PROPERTY( int documentViewerHeight READ documentViewerHeight WRITE setDocumentViewerHeight )
4242
Q_PROPERTY( int documentViewerWidth READ documentViewerWidth WRITE setDocumentViewerWidth )
@@ -50,9 +50,9 @@ class GUI_EXPORT QgsExternalResourceWidget : public QWidget
5050
};
5151

5252
/**
53-
* @brief QgsExternalResourceWidget creates a widget with a file picker and a document viewer
53+
* @brief QgsExternalResourceWidget creates a widget with a file widget and a document viewer
5454
* Both part of the widget are optional.
55-
* @see QgsFilePickerwidget
55+
* @see QgsFileWidget
5656
*/
5757
explicit QgsExternalResourceWidget( QWidget *parent = 0 );
5858

@@ -63,13 +63,13 @@ class GUI_EXPORT QgsExternalResourceWidget : public QWidget
6363
QVariant documentPath( QVariant::Type type = QVariant::String ) const;
6464
void setDocumentPath( QVariant documentPath );
6565

66-
//! access the file picker widget to allow its configuration
67-
QgsFilePickerWidget* filePickerwidget();
66+
//! access the file widget to allow its configuration
67+
QgsFileWidget* fileWidget();
6868

69-
//! returns if the file picker is visible in the widget
70-
bool filePickerVisible() const;
71-
//! set the visiblity of the file picker in the widget
72-
void setFilePickerVisible( bool visible );
69+
//! returns if the file widget is visible in the widget
70+
bool fileWidgetVisible() const;
71+
//! set the visiblity of the file widget in the layout
72+
void setFileWidgetVisible( bool visible );
7373

7474
//! returns the type of content used in the document viewer
7575
QgsExternalResourceWidget::DocumentViewerContent documentViewerContent() const;
@@ -105,13 +105,13 @@ class GUI_EXPORT QgsExternalResourceWidget : public QWidget
105105
void updateDocumentViewer();
106106

107107
//! properties
108-
bool mFilePickerVisible;
108+
bool mFileWidgetVisible;
109109
DocumentViewerContent mDocumentViewerContent;
110110
int mDocumentViewerHeight;
111111
int mDocumentViewerWidth;
112112

113113
//! UI objects
114-
QgsFilePickerWidget* mFilePicker;
114+
QgsFileWidget* mFileWidget;
115115
QgsPixmapLabel* mPixmapLabel;
116116
#ifdef WITH_QTWEBKIT
117117
//! This webview is used as a container to display the picture

‎src/gui/qgsfilepickerwidget.cpp renamed to ‎src/gui/qgsfilewidget.cpp

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsfilepickerwidget.cpp
2+
qgsfilewidget.cpp
33
44
---------------------
55
begin : 17.12.2015
@@ -14,7 +14,7 @@
1414
* *
1515
***************************************************************************/
1616

17-
#include "qgsfilepickerwidget.h"
17+
#include "qgsfilewidget.h"
1818

1919
#include <QLineEdit>
2020
#include <QToolButton>
@@ -28,7 +28,7 @@
2828
#include "qgslogger.h"
2929
#include "qgsproject.h"
3030

31-
QgsFilePickerWidget::QgsFilePickerWidget( QWidget *parent )
31+
QgsFileWidget::QgsFileWidget( QWidget *parent )
3232
: QWidget( parent )
3333
, mFilePath( QString() )
3434
, mButtonVisible( true )
@@ -62,24 +62,24 @@ QgsFilePickerWidget::QgsFilePickerWidget( QWidget *parent )
6262
connect( mLineEdit, SIGNAL( textEdited( QString ) ), this, SLOT( textEdited( QString ) ) );
6363
layout->addWidget( mLineEdit, 1, 0 );
6464

65-
mFilePickerButton = new QToolButton( this );
66-
mFilePickerButton->setText( "..." );
67-
connect( mFilePickerButton, SIGNAL( clicked() ), this, SLOT( openFileDialog() ) );
68-
layout->addWidget( mFilePickerButton, 0, 1, 2, 1 );
65+
mFileWidgetButton = new QToolButton( this );
66+
mFileWidgetButton->setText( "..." );
67+
connect( mFileWidgetButton, SIGNAL( clicked() ), this, SLOT( openFileDialog() ) );
68+
layout->addWidget( mFileWidgetButton, 0, 1, 2, 1 );
6969

7070
setLayout( layout );
7171
}
7272

73-
QgsFilePickerWidget::~QgsFilePickerWidget()
73+
QgsFileWidget::~QgsFileWidget()
7474
{
7575
}
7676

77-
QString QgsFilePickerWidget::filePath()
77+
QString QgsFileWidget::filePath()
7878
{
7979
return mFilePath;
8080
}
8181

82-
void QgsFilePickerWidget::setFilePath( QString path )
82+
void QgsFileWidget::setFilePath( QString path )
8383
{
8484
if ( path == QSettings().value( "qgis/nullValue", "NULL" ) )
8585
{
@@ -91,103 +91,103 @@ void QgsFilePickerWidget::setFilePath( QString path )
9191
emit fileChanged( mFilePath );
9292
}
9393

94-
void QgsFilePickerWidget::setReadOnly( bool readOnly )
94+
void QgsFileWidget::setReadOnly( bool readOnly )
9595
{
96-
mFilePickerButton->setEnabled( !readOnly );
96+
mFileWidgetButton->setEnabled( !readOnly );
9797
mLineEdit->setEnabled( !readOnly );
9898
}
9999

100-
QString QgsFilePickerWidget::dialogTitle() const
100+
QString QgsFileWidget::dialogTitle() const
101101
{
102102
return mDialogTitle;
103103
}
104104

105-
void QgsFilePickerWidget::setDialogTitle( QString title )
105+
void QgsFileWidget::setDialogTitle( QString title )
106106
{
107107
mDialogTitle = title;
108108
}
109109

110-
QString QgsFilePickerWidget::filter() const
110+
QString QgsFileWidget::filter() const
111111
{
112112
return mFilter;
113113
}
114114

115-
void QgsFilePickerWidget::setFilter( const QString& filters )
115+
void QgsFileWidget::setFilter( const QString& filters )
116116
{
117117
mFilter = filters;
118118
}
119119

120-
bool QgsFilePickerWidget::filePickerButtonVisible() const
120+
bool QgsFileWidget::fileWidgetButtonVisible() const
121121
{
122122
return mButtonVisible;
123123
}
124124

125-
void QgsFilePickerWidget::setFilePickerButtonVisible( bool visible )
125+
void QgsFileWidget::setFileWidgetButtonVisible( bool visible )
126126
{
127127
mButtonVisible = visible;
128-
mFilePickerButton->setVisible( visible );
128+
mFileWidgetButton->setVisible( visible );
129129
}
130130

131-
void QgsFilePickerWidget::textEdited( QString path )
131+
void QgsFileWidget::textEdited( QString path )
132132
{
133133
mFilePath = path;
134134
mLinkLabel->setText( toUrl( path ) );
135135
emit fileChanged( mFilePath );
136136
}
137137

138-
bool QgsFilePickerWidget::useLink() const
138+
bool QgsFileWidget::useLink() const
139139
{
140140
return mUseLink;
141141
}
142142

143-
void QgsFilePickerWidget::setUseLink( bool useLink )
143+
void QgsFileWidget::setUseLink( bool useLink )
144144
{
145145
mUseLink = useLink;
146146
mLinkLabel->setVisible( mUseLink );
147147
mLineEdit->setVisible( !mUseLink );
148148
}
149149

150-
bool QgsFilePickerWidget::fullUrl() const
150+
bool QgsFileWidget::fullUrl() const
151151
{
152152
return mFullUrl;
153153
}
154154

155-
void QgsFilePickerWidget::setFullUrl( bool fullUrl )
155+
void QgsFileWidget::setFullUrl( bool fullUrl )
156156
{
157157
mFullUrl = fullUrl;
158158
}
159159

160-
QString QgsFilePickerWidget::defaultRoot() const
160+
QString QgsFileWidget::defaultRoot() const
161161
{
162162
return mDefaultRoot;
163163
}
164164

165-
void QgsFilePickerWidget::setDefaultRoot( QString defaultRoot )
165+
void QgsFileWidget::setDefaultRoot( QString defaultRoot )
166166
{
167167
mDefaultRoot = defaultRoot;
168168
}
169169

170-
QgsFilePickerWidget::StorageMode QgsFilePickerWidget::storageMode() const
170+
QgsFileWidget::StorageMode QgsFileWidget::storageMode() const
171171
{
172172
return mStorageMode;
173173
}
174174

175-
void QgsFilePickerWidget::setStorageMode( QgsFilePickerWidget::StorageMode storageMode )
175+
void QgsFileWidget::setStorageMode( QgsFileWidget::StorageMode storageMode )
176176
{
177177
mStorageMode = storageMode;
178178
}
179179

180-
QgsFilePickerWidget::RelativeStorage QgsFilePickerWidget::relativeStorage() const
180+
QgsFileWidget::RelativeStorage QgsFileWidget::relativeStorage() const
181181
{
182182
return mRelativeStorage;
183183
}
184184

185-
void QgsFilePickerWidget::setRelativeStorage( QgsFilePickerWidget::RelativeStorage relativeStorage )
185+
void QgsFileWidget::setRelativeStorage( QgsFileWidget::RelativeStorage relativeStorage )
186186
{
187187
mRelativeStorage = relativeStorage;
188188
}
189189

190-
void QgsFilePickerWidget::openFileDialog()
190+
void QgsFileWidget::openFileDialog()
191191
{
192192
QSettings settings;
193193
QString oldPath;
@@ -253,7 +253,7 @@ void QgsFilePickerWidget::openFileDialog()
253253
}
254254

255255

256-
QString QgsFilePickerWidget::relativePath( QString filePath, bool removeRelative ) const
256+
QString QgsFileWidget::relativePath( QString filePath, bool removeRelative ) const
257257
{
258258
QString RelativePath;
259259
if ( mRelativeStorage == RelativeProject )
@@ -281,7 +281,7 @@ QString QgsFilePickerWidget::relativePath( QString filePath, bool removeRelative
281281
}
282282

283283

284-
QString QgsFilePickerWidget::toUrl( const QString& path ) const
284+
QString QgsFileWidget::toUrl( const QString& path ) const
285285
{
286286
QString rep;
287287
if ( path.isEmpty() )

‎src/gui/qgsfilepickerwidget.h renamed to ‎src/gui/qgsfilewidget.h

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgsfilepickerwidget.h
2+
qgsfilewidget.h
33
44
---------------------
55
begin : 17.12.2015
@@ -14,8 +14,8 @@
1414
* *
1515
***************************************************************************/
1616

17-
#ifndef QGSFILEPICKERWIDGET_H
18-
#define QGSFILEPICKERWIDGET_H
17+
#ifndef QGSFILEWIDGET_H
18+
#define QGSFILEWIDGET_H
1919

2020
class QLabel;
2121
class QToolButton;
@@ -26,12 +26,12 @@ class QgsFilterLineEdit;
2626
#include <QWidget>
2727

2828
/**
29-
* @brief The QgsFilePickerWidget class creates a widget for selecting a file or a folder.
29+
* @brief The QgsFileWidget class creates a widget for selecting a file or a folder.
3030
*/
31-
class GUI_EXPORT QgsFilePickerWidget : public QWidget
31+
class GUI_EXPORT QgsFileWidget : public QWidget
3232
{
3333
Q_OBJECT
34-
Q_PROPERTY( bool filePickerButtonVisible READ filePickerButtonVisible WRITE setFilePickerButtonVisible )
34+
Q_PROPERTY( bool fileWidgetButtonVisible READ fileWidgetButtonVisible WRITE setFileWidgetButtonVisible )
3535
Q_PROPERTY( bool useLink READ useLink WRITE setUseLink )
3636
Q_PROPERTY( bool fullUrl READ fullUrl WRITE setFullUrl )
3737
Q_PROPERTY( QString dialogTitle READ dialogTitle WRITE setDialogTitle )
@@ -61,11 +61,11 @@ class GUI_EXPORT QgsFilePickerWidget : public QWidget
6161
};
6262

6363
/**
64-
* @brief QgsFilePickerWidget creates a widget for selecting a file or a folder.
64+
* @brief QgsFileWidget creates a widget for selecting a file or a folder.
6565
*/
66-
explicit QgsFilePickerWidget( QWidget *parent = 0 );
66+
explicit QgsFileWidget( QWidget *parent = 0 );
6767

68-
~QgsFilePickerWidget();
68+
~QgsFileWidget();
6969

7070
//! Returns the current file path
7171
QString filePath();
@@ -93,9 +93,9 @@ class GUI_EXPORT QgsFilePickerWidget : public QWidget
9393
void setFilter( const QString &filter );
9494

9595
//! determines if the tool button is shown
96-
bool filePickerButtonVisible() const;
96+
bool fileWidgetButtonVisible() const;
9797
//! determines if the tool button is shown
98-
void setFilePickerButtonVisible( bool visible );
98+
void setFileWidgetButtonVisible( bool visible );
9999

100100
//! determines if the file path will be shown as a link
101101
bool useLink() const;
@@ -113,14 +113,14 @@ class GUI_EXPORT QgsFilePickerWidget : public QWidget
113113
void setDefaultRoot( QString defaultRoot );
114114

115115
//! returns the storage mode (i.e. file or directory)
116-
QgsFilePickerWidget::StorageMode storageMode() const;
116+
QgsFileWidget::StorageMode storageMode() const;
117117
//! determines the storage mode (i.e. file or directory)
118-
void setStorageMode( QgsFilePickerWidget::StorageMode storageMode );
118+
void setStorageMode( QgsFileWidget::StorageMode storageMode );
119119

120120
//! returns if the relative path is with respect to the project path or the default path
121-
QgsFilePickerWidget::RelativeStorage relativeStorage() const;
121+
QgsFileWidget::RelativeStorage relativeStorage() const;
122122
//! determines if the relative path is with respect to the project path or the default path
123-
void setRelativeStorage( QgsFilePickerWidget::RelativeStorage relativeStorage );
123+
void setRelativeStorage( QgsFileWidget::RelativeStorage relativeStorage );
124124

125125
signals:
126126
//! emitted as soon as the current file or directory is changed
@@ -143,15 +143,15 @@ class GUI_EXPORT QgsFilePickerWidget : public QWidget
143143

144144
QLabel* mLinkLabel;
145145
QgsFilterLineEdit* mLineEdit;
146-
QToolButton* mFilePickerButton;
146+
QToolButton* mFileWidgetButton;
147147

148148
//! returns a HTML code with a link to the given file path
149149
QString toUrl( const QString& path ) const;
150150

151151
//! Returns a filePath with relative path options applied (or not) !
152152
QString relativePath( QString filePath, bool removeRelative ) const;
153153

154-
friend class TestQgsFilePickerWidget;
154+
friend class TestQgsFileWidget;
155155
};
156156

157-
#endif // QGSFILEPICKERWIDGET_H
157+
#endif // QGSFILEWIDGET_H

‎src/ui/editorwidgets/qgsexternalresourceconfigdlg.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
</widget>
193193
</item>
194194
<item>
195-
<widget class="QGroupBox" name="mFilePickerGroupBox">
195+
<widget class="QGroupBox" name="mFileWidgetGroupBox">
196196
<property name="title">
197197
<string>Display resource path</string>
198198
</property>
@@ -235,7 +235,7 @@
235235
</widget>
236236
</item>
237237
<item row="0" column="0">
238-
<widget class="QGroupBox" name="mFilePickerButtonGroupBox">
238+
<widget class="QGroupBox" name="mFileWidgetButtonGroupBox">
239239
<property name="title">
240240
<string>Display button to open file dialog</string>
241241
</property>
@@ -251,7 +251,7 @@
251251
</widget>
252252
</item>
253253
<item row="0" column="1">
254-
<widget class="QLineEdit" name="mFilePickerFilterLineEdit"/>
254+
<widget class="QLineEdit" name="mFileWidgetFilterLineEdit"/>
255255
</item>
256256
</layout>
257257
</widget>

‎tests/src/gui/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ ADD_QGIS_TEST(zoomtest testqgsmaptoolzoom.cpp)
123123
#ADD_QGIS_TEST(histogramtest testqgsrasterhistogram.cpp)
124124
ADD_QGIS_TEST(doublespinbox testqgsdoublespinbox.cpp)
125125
ADD_QGIS_TEST(dualviewtest testqgsdualview.cpp )
126-
ADD_QGIS_TEST(filepickerwidget testqgsfilepickerwidget.cpp )
126+
ADD_QGIS_TEST(filewidget testqgsfilewidget.cpp )
127127
ADD_QGIS_TEST(mapcanvastest testqgsmapcanvas.cpp )
128128
ADD_QGIS_TEST(projectionissues testprojectionissues.cpp)
129129
ADD_QGIS_TEST(qgsguitest testqgsgui.cpp)

‎tests/src/gui/testqgsfilepickerwidget.cpp renamed to ‎tests/src/gui/testqgsfilewidget.cpp

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616

1717
#include <QtTest/QtTest>
1818

19-
#include "qgsfilepickerwidget.h"
19+
#include "qgsfilewidget.h"
2020

21-
class TestQgsFilePickerWidget: public QObject
21+
class TestQgsFileWidget: public QObject
2222
{
2323
Q_OBJECT
2424
private slots:
@@ -32,47 +32,47 @@ class TestQgsFilePickerWidget: public QObject
3232

3333
};
3434

35-
void TestQgsFilePickerWidget::initTestCase()
35+
void TestQgsFileWidget::initTestCase()
3636
{
3737

3838
}
3939

40-
void TestQgsFilePickerWidget::cleanupTestCase()
40+
void TestQgsFileWidget::cleanupTestCase()
4141
{
4242
}
4343

44-
void TestQgsFilePickerWidget::init()
44+
void TestQgsFileWidget::init()
4545
{
4646
}
4747

48-
void TestQgsFilePickerWidget::cleanup()
48+
void TestQgsFileWidget::cleanup()
4949
{
5050
}
5151

52-
void TestQgsFilePickerWidget::relativePath()
52+
void TestQgsFileWidget::relativePath()
5353
{
54-
QgsFilePickerWidget* w = new QgsFilePickerWidget();
54+
QgsFileWidget* w = new QgsFileWidget();
5555
w->setDefaultRoot( "/home/test" );
56-
w->setRelativeStorage( QgsFilePickerWidget::Absolute );
56+
w->setRelativeStorage( QgsFileWidget::Absolute );
5757
QCOMPARE( w->relativePath( "/home/test2/file1.ext", true ), QString( "/home/test2/file1.ext" ) );
5858
QCOMPARE( w->relativePath( "/home/test2/file2.ext", false ), QString( "/home/test2/file2.ext" ) );
59-
w->setRelativeStorage( QgsFilePickerWidget::RelativeDefaultPath );
59+
w->setRelativeStorage( QgsFileWidget::RelativeDefaultPath );
6060
QCOMPARE( w->relativePath( "/home/test2/file3.ext", true ), QString( "../test2/file3.ext" ) );
6161
QCOMPARE( w->relativePath( "../test2/file4.ext", true ), QString( "../test2/file4.ext" ) );
6262
QCOMPARE( w->relativePath( "/home/test2/file5.ext", false ), QString( "/home/test2/file5.ext" ) );
6363
QCOMPARE( w->relativePath( "../test2/file6.ext", false ), QString( "/home/test2/file6.ext" ) );
6464
}
6565

66-
void TestQgsFilePickerWidget::toUrl()
66+
void TestQgsFileWidget::toUrl()
6767
{
68-
QgsFilePickerWidget* w = new QgsFilePickerWidget();
68+
QgsFileWidget* w = new QgsFileWidget();
6969
w->setDefaultRoot( "/home/test" );
70-
w->setRelativeStorage( QgsFilePickerWidget::Absolute );
70+
w->setRelativeStorage( QgsFileWidget::Absolute );
7171
w->setFullUrl( true );
7272
QCOMPARE( w->toUrl( "/home/test2/file1.ext" ), QString( "<a href=\"file:///home/test2/file1.ext\">/home/test2/file1.ext</a>" ) );
7373
w->setFullUrl( false );
7474
QCOMPARE( w->toUrl( "/home/test2/file2.ext" ), QString( "<a href=\"file:///home/test2/file2.ext\">file2.ext</a>" ) );
75-
w->setRelativeStorage( QgsFilePickerWidget::RelativeDefaultPath );
75+
w->setRelativeStorage( QgsFileWidget::RelativeDefaultPath );
7676
w->setFullUrl( true );
7777
QCOMPARE( w->toUrl( "/home/test2/file3.ext" ), QString( "<a href=\"file:///home/test2/file3.ext\">/home/test2/file3.ext</a>" ) );
7878
QCOMPARE( w->toUrl( "../test2/file4.ext" ), QString( "<a href=\"file:///home/test2/file4.ext\">../test2/file4.ext</a>" ) );
@@ -83,5 +83,5 @@ void TestQgsFilePickerWidget::toUrl()
8383

8484

8585

86-
QTEST_MAIN( TestQgsFilePickerWidget )
87-
#include "testqgsfilepickerwidget.moc"
86+
QTEST_MAIN( TestQgsFileWidget )
87+
#include "testqgsfilewidget.moc"

0 commit comments

Comments
 (0)
Please sign in to comment.