Renamed the studio startup settings dialog to avoid name conflict with the core plugin's settings dialog.

This commit is contained in:
dfighter1985 2015-02-09 17:54:27 +01:00
parent 33d658a444
commit 53e8f8ed94
6 changed files with 34 additions and 34 deletions

View file

@ -11,7 +11,7 @@ FILE(GLOB STUDIO_SRC extension_system/*.h
SET(STUDIO_HDR extension_system/iplugin_manager.h SET(STUDIO_HDR extension_system/iplugin_manager.h
extension_system/plugin_manager.h extension_system/plugin_manager.h
settings_dialog.h startup_settings_dlg.h
splash_screen.h splash_screen.h
pm_watcher.h ) pm_watcher.h )
@ -22,7 +22,7 @@ SET(STUDIO_TS translations/object_viewer_qt_en.ts
translations/object_viewer_qt_de.ts translations/object_viewer_qt_de.ts
translations/object_viewer_qt_ru.ts) translations/object_viewer_qt_ru.ts)
SET(STUDIO_PLUGIN_UIS settings_dialog.ui ) SET(STUDIO_PLUGIN_UIS startup_settings_dlg.ui )
SET(QT_USE_QTGUI TRUE) SET(QT_USE_QTGUI TRUE)
SET(QT_USE_QTOPENGL TRUE) SET(QT_USE_QTOPENGL TRUE)

View file

@ -41,7 +41,7 @@
#include <QtGui/QFileDialog> #include <QtGui/QFileDialog>
#include <QtGui/QInputDialog> #include <QtGui/QInputDialog>
#include "settings_dialog.h" #include "startup_settings_dlg.h"
#include "splash_screen.h" #include "splash_screen.h"
#include "pm_watcher.h" #include "pm_watcher.h"
@ -160,7 +160,7 @@ int main(int argc, char **argv)
{ {
settings->setValue( "FirstRun", false ); settings->setValue( "FirstRun", false );
SettingsDialog sd; StartupSettingsDlg sd;
sd.setSettings( settings ); sd.setSettings( settings );
sd.load(); sd.load();
sd.exec(); sd.exec();

View file

@ -19,7 +19,7 @@
#ifndef SETTINGS_DIALOG_H #ifndef SETTINGS_DIALOG_H
#define SETTINGS_DIALOG_H #define SETTINGS_DIALOG_H
#include "../core/ui_settings_dialog.h" #include "ui_settings_dialog.h"
// Qt includes // Qt includes
#include <QtCore/QList> #include <QtCore/QList>

View file

@ -15,7 +15,7 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "settings_dialog.h" #include "startup_settings_dlg.h"
#include <QFileDialog> #include <QFileDialog>
#include <QSettings> #include <QSettings>
#include <QStringList> #include <QStringList>
@ -32,7 +32,7 @@ int findListItem( QListWidget *l, const QString &s )
return -1; return -1;
} }
SettingsDialog::SettingsDialog( QDialog *parent ) : StartupSettingsDlg::StartupSettingsDlg( QDialog *parent ) :
QDialog( parent ) QDialog( parent )
{ {
setupUi( this ); setupUi( this );
@ -40,11 +40,11 @@ QDialog( parent )
settings = NULL; settings = NULL;
} }
SettingsDialog::~SettingsDialog() StartupSettingsDlg::~StartupSettingsDlg()
{ {
} }
void SettingsDialog::load() void StartupSettingsDlg::load()
{ {
pluginsLE->setText( settings->value( "PluginPath" ).toString() ); pluginsLE->setText( settings->value( "PluginPath" ).toString() );
@ -82,7 +82,7 @@ void SettingsDialog::load()
settings->endGroup(); settings->endGroup();
} }
void SettingsDialog::saveSearchPaths() void StartupSettingsDlg::saveSearchPaths()
{ {
QStringList l; QStringList l;
for( int i = 0; i < searchLW->count(); i++ ) for( int i = 0; i < searchLW->count(); i++ )
@ -93,7 +93,7 @@ void SettingsDialog::saveSearchPaths()
settings->setValue( "SearchPaths", l ); settings->setValue( "SearchPaths", l );
} }
void SettingsDialog::saveRecursivePaths() void StartupSettingsDlg::saveRecursivePaths()
{ {
QStringList l; QStringList l;
for( int i = 0; i < recursiveLW->count(); i++ ) for( int i = 0; i < recursiveLW->count(); i++ )
@ -104,7 +104,7 @@ void SettingsDialog::saveRecursivePaths()
settings->setValue( "RecursiveSearchPathes", l ); settings->setValue( "RecursiveSearchPathes", l );
} }
void SettingsDialog::save() void StartupSettingsDlg::save()
{ {
settings->setValue( "PluginPath", pluginsLE->text() ); settings->setValue( "PluginPath", pluginsLE->text() );
@ -123,59 +123,59 @@ void SettingsDialog::save()
settings->sync(); settings->sync();
} }
void SettingsDialog::accept() void StartupSettingsDlg::accept()
{ {
save(); save();
QDialog::accept(); QDialog::accept();
} }
void SettingsDialog::reject() void StartupSettingsDlg::reject()
{ {
QDialog::reject(); QDialog::reject();
} }
void SettingsDialog::onOKClicked() void StartupSettingsDlg::onOKClicked()
{ {
accept(); accept();
} }
void SettingsDialog::onCancelClicked() void StartupSettingsDlg::onCancelClicked()
{ {
reject(); reject();
} }
void SettingsDialog::onPluginBClicked() void StartupSettingsDlg::onPluginBClicked()
{ {
QString p = QFileDialog::getExistingDirectory( this, tr( "Plugins directory" ), "" ); QString p = QFileDialog::getExistingDirectory( this, tr( "Plugins directory" ), "" );
pluginsLE->setText( p ); pluginsLE->setText( p );
} }
void SettingsDialog::onSheetsBClicked() void StartupSettingsDlg::onSheetsBClicked()
{ {
QString p = QFileDialog::getExistingDirectory( this, tr( "Sheets directory" ), "" ); QString p = QFileDialog::getExistingDirectory( this, tr( "Sheets directory" ), "" );
sheetsLE->setText( p ); sheetsLE->setText( p );
} }
void SettingsDialog::onAssetsBClicked() void StartupSettingsDlg::onAssetsBClicked()
{ {
QString p = QFileDialog::getExistingDirectory( this, tr( "Assets directory" ), "" ); QString p = QFileDialog::getExistingDirectory( this, tr( "Assets directory" ), "" );
assetsLE->setText( p ); assetsLE->setText( p );
} }
void SettingsDialog::onPrimitivesBClicked() void StartupSettingsDlg::onPrimitivesBClicked()
{ {
QString p = QFileDialog::getExistingDirectory( this, tr( "Primitives directory" ), "" ); QString p = QFileDialog::getExistingDirectory( this, tr( "Primitives directory" ), "" );
primitivesLE->setText( p ); primitivesLE->setText( p );
} }
void SettingsDialog::onLigoBClicked() void StartupSettingsDlg::onLigoBClicked()
{ {
QString p; QString p;
p = QFileDialog::getOpenFileName( this, tr( "LIGO config file" ), "" ); p = QFileDialog::getOpenFileName( this, tr( "LIGO config file" ), "" );
ligoLE->setText( p ); ligoLE->setText( p );
} }
void SettingsDialog::onPathAddClicked() void StartupSettingsDlg::onPathAddClicked()
{ {
QString p = QFileDialog::getExistingDirectory( this, tr( "Search path" ), "" ); QString p = QFileDialog::getExistingDirectory( this, tr( "Search path" ), "" );
if( p.isEmpty() ) if( p.isEmpty() )
@ -187,7 +187,7 @@ void SettingsDialog::onPathAddClicked()
searchLW->addItem( p ); searchLW->addItem( p );
} }
void SettingsDialog::onPathRemoveClicked() void StartupSettingsDlg::onPathRemoveClicked()
{ {
QListWidgetItem *i = searchLW->currentItem(); QListWidgetItem *i = searchLW->currentItem();
if( i == NULL ) if( i == NULL )
@ -196,7 +196,7 @@ void SettingsDialog::onPathRemoveClicked()
delete i; delete i;
} }
void SettingsDialog::onRecursiveAddClicked() void StartupSettingsDlg::onRecursiveAddClicked()
{ {
QString p = QFileDialog::getExistingDirectory( this, tr( "Recursive search path" ), "" ); QString p = QFileDialog::getExistingDirectory( this, tr( "Recursive search path" ), "" );
if( p.isEmpty() ) if( p.isEmpty() )
@ -208,7 +208,7 @@ void SettingsDialog::onRecursiveAddClicked()
recursiveLW->addItem( p ); recursiveLW->addItem( p );
} }
void SettingsDialog::onRecursiveRemoveClicked() void StartupSettingsDlg::onRecursiveRemoveClicked()
{ {
QListWidgetItem *i = recursiveLW->currentItem(); QListWidgetItem *i = recursiveLW->currentItem();
if( i == NULL ) if( i == NULL )
@ -218,7 +218,7 @@ void SettingsDialog::onRecursiveRemoveClicked()
} }
void SettingsDialog::setupConnections() void StartupSettingsDlg::setupConnections()
{ {
connect( bb, SIGNAL( accepted() ), this, SLOT( onOKClicked() ) ); connect( bb, SIGNAL( accepted() ), this, SLOT( onOKClicked() ) );
connect( bb, SIGNAL( rejected() ), this, SLOT( onCancelClicked() ) ); connect( bb, SIGNAL( rejected() ), this, SLOT( onCancelClicked() ) );

View file

@ -14,19 +14,19 @@
// You should have received a copy of the GNU Affero General Public License // You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>. // along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifndef SETTINGS_DIALOG_H #ifndef STARTUP_SETTINGS_DIALOG_H
#define SETTINGS_DIALOG_H #define STARTUP_SETTINGS_DIALOG_H
#include "ui_settings_dialog.h" #include "ui_startup_settings_dlg.h"
class QSettings; class QSettings;
class SettingsDialog : public QDialog, public Ui::SettingsDialog class StartupSettingsDlg : public QDialog, public Ui::StartupSettingsDlg
{ {
Q_OBJECT Q_OBJECT
public: public:
SettingsDialog( QDialog *parent = NULL ); StartupSettingsDlg( QDialog *parent = NULL );
~SettingsDialog(); ~StartupSettingsDlg();
void setSettings( QSettings *s ){ settings = s; } void setSettings( QSettings *s ){ settings = s; }

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>SettingsDialog</class> <class>StartupSettingsDlg</class>
<widget class="QDialog" name="SettingsDialog"> <widget class="QDialog" name="StartupSettingsDlg">
<property name="windowModality"> <property name="windowModality">
<enum>Qt::ApplicationModal</enum> <enum>Qt::ApplicationModal</enum>
</property> </property>