[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [marble/esasocis-2012-eclipse] src/plugins/render/eclipses: EclipsesPlugin: Adjust eclipse browser d
From: Rene Kuettner <rene () bitkanal ! net>
Date: 2013-01-19 17:48:20
Message-ID: 20130119174820.EF2CDA6091 () git ! kde ! org
[Download RAW message or body]
Git commit 13f3facd69c8f83bc713eedb078b65fd84be3b81 by Rene Kuettner.
Committed on 19/01/2013 at 18:46.
Pushed by renek into branch 'esasocis-2012-eclipse'.
EclipsesPlugin: Adjust eclipse browser dialog
M +14 -12 src/plugins/render/eclipses/EclipsesBrowserDialog.cpp
M +6 -1 src/plugins/render/eclipses/EclipsesBrowserDialog.h
M +49 -57 src/plugins/render/eclipses/EclipsesBrowserDialog.ui
M +8 -6 src/plugins/render/eclipses/EclipsesPlugin.cpp
M +1 -1 src/plugins/render/eclipses/EclipsesPlugin.h
M +0 -1 src/plugins/render/eclipses/eclipses.qrc
http://commits.kde.org/marble/13f3facd69c8f83bc713eedb078b65fd84be3b81
diff --git a/src/plugins/render/eclipses/EclipsesBrowserDialog.cpp \
b/src/plugins/render/eclipses/EclipsesBrowserDialog.cpp index 8c386ce..bccf589 100644
--- a/src/plugins/render/eclipses/EclipsesBrowserDialog.cpp
+++ b/src/plugins/render/eclipses/EclipsesBrowserDialog.cpp
@@ -38,7 +38,7 @@ EclipsesBrowserDialog::~EclipsesBrowserDialog()
void EclipsesBrowserDialog::setYear( int year )
{
m_year = year;
- m_listWidget->spinBoxYear->setValue( year );
+ m_browserWidget->spinBoxYear->setValue( year );
}
int EclipsesBrowserDialog::year() const
@@ -48,7 +48,7 @@ int EclipsesBrowserDialog::year() const
void EclipsesBrowserDialog::accept()
{
- QItemSelectionModel *s = m_listWidget->treeView->selectionModel();
+ QItemSelectionModel *s = m_browserWidget->treeView->selectionModel();
QModelIndex selected = s->currentIndex();
if( selected.isValid() ) {
@@ -73,30 +73,32 @@ void EclipsesBrowserDialog::updateEclipsesBrowserForYear( int \
year )
void EclipsesBrowserDialog::updateButtonStates()
{
- QItemSelectionModel *s = m_listWidget->treeView->selectionModel();
- m_listWidget->buttonShow->setEnabled( s->hasSelection() );
+ QItemSelectionModel *s = m_browserWidget->treeView->selectionModel();
+ m_browserWidget->buttonShow->setEnabled( s->hasSelection() );
}
void EclipsesBrowserDialog::initialize()
{
- m_listWidget = new Ui::EclipsesBrowserDialog();
- m_listWidget->setupUi( this );
+ m_browserWidget = new Ui::EclipsesBrowserDialog();
+ m_browserWidget->setupUi( this );
- m_listWidget->treeView->setExpandsOnDoubleClick( false );
+ m_browserWidget->treeView->setExpandsOnDoubleClick( false );
m_eclModel = new EclipsesModel( m_marbleModel );
- m_listWidget->treeView->setModel( m_eclModel );
+ m_browserWidget->treeView->setModel( m_eclModel );
- connect( m_listWidget->buttonShow, SIGNAL(clicked()),
+ connect( m_browserWidget->buttonShow, SIGNAL(clicked()),
this, SLOT(accept()) );
- connect( m_listWidget->buttonClose, SIGNAL(clicked()),
+ connect( m_browserWidget->buttonClose, SIGNAL(clicked()),
this, SLOT(reject()) );
- connect( m_listWidget->spinBoxYear, SIGNAL(valueChanged(int)),
+ connect( m_browserWidget->spinBoxYear, SIGNAL(valueChanged(int)),
this, SLOT(updateEclipsesBrowserForYear(int)) );
- connect( m_listWidget->treeView->selectionModel(),
+ connect( m_browserWidget->treeView->selectionModel(),
SIGNAL(selectionChanged(const QItemSelection&,
const QItemSelection&)),
this, SLOT(updateButtonStates()) );
+ connect( m_browserWidget->buttonSettings, SIGNAL(clicked()),
+ SIGNAL(buttonSettingsClicked()) );
setYear( m_marbleModel->clock()->dateTime().date().year() );
diff --git a/src/plugins/render/eclipses/EclipsesBrowserDialog.h \
b/src/plugins/render/eclipses/EclipsesBrowserDialog.h index 3927bf2..5c3d81a 100644
--- a/src/plugins/render/eclipses/EclipsesBrowserDialog.h
+++ b/src/plugins/render/eclipses/EclipsesBrowserDialog.h
@@ -65,6 +65,11 @@ Q_SIGNALS:
*/
void buttonShowClicked( int year, int index );
+ /**
+ * @brief This signal is emitted when the 'Settings' button is clicked
+ */
+ void buttonSettingsClicked();
+
protected Q_SLOTS:
/**
* @brief Accept the dialog
@@ -96,7 +101,7 @@ protected:
private:
const MarbleModel *m_marbleModel;
- Ui::EclipsesBrowserDialog *m_listWidget;
+ Ui::EclipsesBrowserDialog *m_browserWidget;
EclipsesModel *m_eclModel;
int m_year;
};
diff --git a/src/plugins/render/eclipses/EclipsesBrowserDialog.ui \
b/src/plugins/render/eclipses/EclipsesBrowserDialog.ui index 0170d92..583946c 100644
--- a/src/plugins/render/eclipses/EclipsesBrowserDialog.ui
+++ b/src/plugins/render/eclipses/EclipsesBrowserDialog.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>591</width>
- <height>183</height>
+ <height>218</height>
</rect>
</property>
<property name="windowTitle">
@@ -20,6 +20,9 @@
<item>
<widget class="QWidget" name="widget" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>6</number>
+ </property>
<property name="margin">
<number>0</number>
</property>
@@ -92,23 +95,6 @@
</property>
</spacer>
</item>
- <item>
- <widget class="QPushButton" name="buttonClose">
- <property name="text">
- <string>&Close</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="buttonShow">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>&Go To Selected Eclipse</string>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -139,13 +125,50 @@
</item>
<item>
<widget class="QWidget" name="widgetButtons" native="true">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <property name="spacing">
- <number>6</number>
- </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="margin">
<number>0</number>
</property>
+ <item>
+ <widget class="QPushButton" name="buttonSettings">
+ <property name="text">
+ <string>&Settings...</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="buttonClose">
+ <property name="text">
+ <string>&Close</string>
+ </property>
+ <property name="default">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="buttonShow">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>&Go To Selected Eclipse</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
@@ -154,39 +177,8 @@
<tabstops>
<tabstop>treeView</tabstop>
</tabstops>
- <resources/>
- <connections>
- <connection>
- <sender>buttonShow</sender>
- <signal>clicked()</signal>
- <receiver>EclipsesBrowserDialog</receiver>
- <slot>accept()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>377</x>
- <y>252</y>
- </hint>
- <hint type="destinationlabel">
- <x>380</x>
- <y>280</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>buttonClose</sender>
- <signal>clicked()</signal>
- <receiver>EclipsesBrowserDialog</receiver>
- <slot>reject()</slot>
- <hints>
- <hint type="sourcelabel">
- <x>291</x>
- <y>264</y>
- </hint>
- <hint type="destinationlabel">
- <x>280</x>
- <y>283</y>
- </hint>
- </hints>
- </connection>
- </connections>
+ <resources>
+ <include location="eclipses.qrc"/>
+ </resources>
+ <connections/>
</ui>
diff --git a/src/plugins/render/eclipses/EclipsesPlugin.cpp \
b/src/plugins/render/eclipses/EclipsesPlugin.cpp index e7c2fff..e0c5fc6 100644
--- a/src/plugins/render/eclipses/EclipsesPlugin.cpp
+++ b/src/plugins/render/eclipses/EclipsesPlugin.cpp
@@ -43,7 +43,7 @@ EclipsesPlugin::EclipsesPlugin()
m_menuYear( 0 ),
m_configDialog( 0 ),
m_configWidget( 0 ),
- m_listDialog( 0 ),
+ m_browserDialog( 0 ),
m_reminderDialog( 0 ),
m_reminderWidget( 0 )
{
@@ -61,7 +61,7 @@ EclipsesPlugin::EclipsesPlugin( const MarbleModel *marbleModel )
m_menuYear( 0 ),
m_configDialog( 0 ),
m_configWidget( 0 ),
- m_listDialog( 0 ),
+ m_browserDialog( 0 ),
m_reminderDialog( 0 ),
m_reminderWidget( 0 )
{
@@ -78,7 +78,7 @@ EclipsesPlugin::~EclipsesPlugin()
delete m_eclipsesActionGroup;
delete m_eclipsesListMenu;
delete m_configDialog;
- delete m_listDialog;
+ delete m_browserDialog;
delete m_reminderDialog;
}
}
@@ -176,9 +176,11 @@ void EclipsesPlugin::initialize()
connect( m_configWidget->buttonBox->button( QDialogButtonBox::Apply ),
SIGNAL(clicked()), this, SLOT(writeSettings()) );
- m_listDialog = new EclipsesBrowserDialog( marbleModel() );
- connect( m_listDialog, SIGNAL(buttonShowClicked(int, int)),
+ m_browserDialog = new EclipsesBrowserDialog( marbleModel() );
+ connect( m_browserDialog, SIGNAL(buttonShowClicked(int, int)),
this, SLOT(showEclipse(int,int)) );
+ connect( m_browserDialog, SIGNAL(buttonSettingsClicked()),
+ m_configDialog, SLOT(show()) );
m_reminderDialog = new QDialog();
m_reminderWidget = new Ui::EclipsesReminderDialog();
@@ -198,7 +200,7 @@ void EclipsesPlugin::initialize()
m_eclipsesMenuAction->setIcon( QIcon( ":res/eclipses.png" ) );
m_eclipsesActionGroup->addAction( m_eclipsesMenuAction );
connect( m_eclipsesMenuAction, SIGNAL(triggered()),
- m_listDialog, SLOT(show()) );
+ m_browserDialog, SLOT(show()) );
// initialize eclipses model
m_model = new EclipsesModel( marbleModel() );
diff --git a/src/plugins/render/eclipses/EclipsesPlugin.h \
b/src/plugins/render/eclipses/EclipsesPlugin.h index 8c0ef39..d79ecad 100644
--- a/src/plugins/render/eclipses/EclipsesPlugin.h
+++ b/src/plugins/render/eclipses/EclipsesPlugin.h
@@ -144,7 +144,7 @@ private:
// dialogs
QDialog *m_configDialog;
Ui::EclipsesConfigDialog *m_configWidget;
- EclipsesBrowserDialog *m_listDialog;
+ EclipsesBrowserDialog *m_browserDialog;
QDialog *m_reminderDialog;
Ui::EclipsesReminderDialog *m_reminderWidget;
};
diff --git a/src/plugins/render/eclipses/eclipses.qrc \
b/src/plugins/render/eclipses/eclipses.qrc index 6a3a32e..086914a 100644
--- a/src/plugins/render/eclipses/eclipses.qrc
+++ b/src/plugins/render/eclipses/eclipses.qrc
@@ -1,7 +1,6 @@
<RCC>
<qresource prefix="/">
<file>res/eclipses.png</file>
- <file>res/eclipses.png</file>
<file>res/lunar_penumbra.png</file>
<file>res/solar_annular.png</file>
<file>res/solar_total.png</file>
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic