[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: EclipsesListDialog -> Ec
From:       Rene Kuettner <rene () bitkanal ! net>
Date:       2013-01-19 11:24:01
Message-ID: 20130119112401.AFC18A60C8 () git ! kde ! org
[Download RAW message or body]

Git commit 3dd86539b2e5ec112279b7010dfa8a71cc41138a by Rene Kuettner.
Committed on 19/01/2013 at 12:23.
Pushed by renek into branch 'esasocis-2012-eclipse'.

EclipsesPlugin: EclipsesListDialog -> EclipsesBrowserDialog

M  +2    -2    src/plugins/render/eclipses/CMakeLists.txt
R  +15   -15   src/plugins/render/eclipses/EclipsesBrowserDialog.cpp [from: \
src/plugins/render/eclipses/EclipsesListDialog.cpp - 074% similarity] R  +10   -10   \
src/plugins/render/eclipses/EclipsesBrowserDialog.h [from: \
src/plugins/render/eclipses/EclipsesListDialog.h - 082% similarity] R  +4    -4    \
src/plugins/render/eclipses/EclipsesBrowserDialog.ui [from: \
src/plugins/render/eclipses/EclipsesListDialog.ui - 096% similarity] M  +2    -2    \
src/plugins/render/eclipses/EclipsesPlugin.cpp M  +2    -2    \
src/plugins/render/eclipses/EclipsesPlugin.h

http://commits.kde.org/marble/3dd86539b2e5ec112279b7010dfa8a71cc41138a

diff --git a/src/plugins/render/eclipses/CMakeLists.txt \
b/src/plugins/render/eclipses/CMakeLists.txt index 1e0d10e..551adff 100644
--- a/src/plugins/render/eclipses/CMakeLists.txt
+++ b/src/plugins/render/eclipses/CMakeLists.txt
@@ -16,11 +16,11 @@ set( eclipses_SRCS
     EclipsesModel.cpp
     EclipsesItem.cpp
     EclipsesPlugin.cpp
-    EclipsesListDialog.cpp )
+    EclipsesBrowserDialog.cpp )
 
 qt4_wrap_ui( eclipses_SRCS
     EclipsesConfigDialog.ui
-    EclipsesListDialog.ui
+    EclipsesBrowserDialog.ui
     EclipsesReminderDialog.ui )
 
 qt4_add_resources( eclipses_SRCS eclipses.qrc )
diff --git a/src/plugins/render/eclipses/EclipsesListDialog.cpp \
b/src/plugins/render/eclipses/EclipsesBrowserDialog.cpp similarity index 74%
rename from src/plugins/render/eclipses/EclipsesListDialog.cpp
rename to src/plugins/render/eclipses/EclipsesBrowserDialog.cpp
index 63513c5..6e3caba 100644
--- a/src/plugins/render/eclipses/EclipsesListDialog.cpp
+++ b/src/plugins/render/eclipses/EclipsesBrowserDialog.cpp
@@ -8,7 +8,7 @@
 // Copyright 2012 Rene Kuettner <rene@bitkanal.net>
 //
 
-#include "EclipsesListDialog.h"
+#include "EclipsesBrowserDialog.h"
 
 #include "MarbleModel.h"
 #include "MarbleClock.h"
@@ -17,11 +17,11 @@
 #include "EclipsesModel.h"
 #include "EclipsesItem.h"
 
-#include "ui_EclipsesListDialog.h"
+#include "ui_EclipsesBrowserDialog.h"
 
 namespace Marble {
 
-EclipsesListDialog::EclipsesListDialog( const MarbleModel *model,
+EclipsesBrowserDialog::EclipsesBrowserDialog( const MarbleModel *model,
                                         QWidget *parent )
     : QDialog( parent ),
     m_marbleModel( model )
@@ -29,24 +29,24 @@ EclipsesListDialog::EclipsesListDialog( const MarbleModel *model,
     initialize();
 }
 
-EclipsesListDialog::~EclipsesListDialog()
+EclipsesBrowserDialog::~EclipsesBrowserDialog()
 {
     delete m_eclModel;
 }
 
-void EclipsesListDialog::setYear( int year )
+void EclipsesBrowserDialog::setYear( int year )
 {
     if( !isVisible() ) {
         m_listWidget->spinBoxYear->setValue( year );
     }
 }
 
-int EclipsesListDialog::year() const
+int EclipsesBrowserDialog::year() const
 {
     return m_listWidget->spinBoxYear->value();
 }
 
-void EclipsesListDialog::accept()
+void EclipsesBrowserDialog::accept()
 {
     QItemSelectionModel *s = m_listWidget->treeView->selectionModel();
     QModelIndex selected = s->currentIndex();
@@ -59,22 +59,22 @@ void EclipsesListDialog::accept()
     QDialog::accept();
 }
 
-void EclipsesListDialog::updateEclipsesListForYear( int year )
+void EclipsesBrowserDialog::updateEclipsesBrowserForYear( int year )
 {
     Q_ASSERT( year >= 0 );
     m_eclModel->setYear( year );
-    updateButtonsState();
+    updateButtonStates();
 }
 
-void EclipsesListDialog::updateButtonsState()
+void EclipsesBrowserDialog::updateButtonStates()
 {
     QItemSelectionModel *s = m_listWidget->treeView->selectionModel();
     m_listWidget->buttonShow->setEnabled( s->hasSelection() );
 }
 
-void EclipsesListDialog::initialize()
+void EclipsesBrowserDialog::initialize()
 {
-    m_listWidget = new Ui::EclipsesListDialog();
+    m_listWidget = new Ui::EclipsesBrowserDialog();
     m_listWidget->setupUi( this );
 
     m_listWidget->treeView->setExpandsOnDoubleClick( false );
@@ -87,11 +87,11 @@ void EclipsesListDialog::initialize()
     connect( m_listWidget->buttonClose, SIGNAL(clicked()),
              this, SLOT(reject()) );
     connect( m_listWidget->spinBoxYear, SIGNAL(valueChanged(int)),
-             this, SLOT(updateEclipsesListForYear(int)) );
+             this, SLOT(updateEclipsesBrowserForYear(int)) );
     connect( m_listWidget->treeView->selectionModel(),
              SIGNAL(selectionChanged(const QItemSelection&,
                                      const QItemSelection&)),
-             this, SLOT(updateButtonsState()) );
+             this, SLOT(updateButtonStates()) );
 
     setYear( m_marbleModel->clock()->dateTime().date().year() );
 
@@ -100,5 +100,5 @@ void EclipsesListDialog::initialize()
 
 } // namespace Marble
 
-#include "EclipsesListDialog.moc"
+#include "EclipsesBrowserDialog.moc"
 
diff --git a/src/plugins/render/eclipses/EclipsesListDialog.h \
b/src/plugins/render/eclipses/EclipsesBrowserDialog.h similarity index 82%
rename from src/plugins/render/eclipses/EclipsesListDialog.h
rename to src/plugins/render/eclipses/EclipsesBrowserDialog.h
index fdb3285..d167c19 100644
--- a/src/plugins/render/eclipses/EclipsesListDialog.h
+++ b/src/plugins/render/eclipses/EclipsesBrowserDialog.h
@@ -8,8 +8,8 @@
 // Copyright 2012 Rene Kuettner <rene@bitkanal.net>
 //
 
-#ifndef MARBLE_ECLIPSESLISTDIALOG_H
-#define MARBLE_ECLIPSESLISTDIALOG_H
+#ifndef MARBLE_ECLIPSESBROWSERDIALOG_H
+#define MARBLE_ECLIPSESBROWSERDIALOG_H
 
 #include <QDialog>
 #include <QTreeView>
@@ -17,7 +17,7 @@
 #include <QListWidgetItem>
 
 namespace Ui {
-    class EclipsesListDialog;
+    class EclipsesBrowserDialog;
 }
 
 namespace Marble {
@@ -30,14 +30,14 @@ class MarbleModel;
  *
  * This implements the logic for the eclipse browser dialog.
  */
-class EclipsesListDialog : public QDialog
+class EclipsesBrowserDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit EclipsesListDialog( const MarbleModel *model,
+    explicit EclipsesBrowserDialog( const MarbleModel *model,
                                  QWidget *parent = 0 );
-    ~EclipsesListDialog();
+    ~EclipsesBrowserDialog();
 
     /**
      * @brief Set the year
@@ -78,14 +78,14 @@ protected Q_SLOTS:
      * @brief Update the list of eclipses for the given year
      * @param year The year to list eclipses for
      */
-    void updateEclipsesListForYear( int year );
+    void updateEclipsesBrowserForYear( int year );
 
     /**
      * @brief Update the dialog's button states
      *
      * Disable/enable the show button according to the current selection.
      */
-    void updateButtonState();
+    void updateButtonStates();
 
 protected:
     /**
@@ -95,11 +95,11 @@ protected:
 
 private:
     const MarbleModel *m_marbleModel;
-    Ui::EclipsesListDialog *m_listWidget;
+    Ui::EclipsesBrowserDialog *m_listWidget;
     EclipsesModel *m_eclModel;
 };
 
 } // namespace Marble
 
-#endif // MARBLE_ECLIPSESLISTDIALOG_H
+#endif // MARBLE_ECLIPSESBROWSERDIALOG_H
 
diff --git a/src/plugins/render/eclipses/EclipsesListDialog.ui \
b/src/plugins/render/eclipses/EclipsesBrowserDialog.ui similarity index 96%
rename from src/plugins/render/eclipses/EclipsesListDialog.ui
rename to src/plugins/render/eclipses/EclipsesBrowserDialog.ui
index 5b6cede..ebaa67c 100644
--- a/src/plugins/render/eclipses/EclipsesListDialog.ui
+++ b/src/plugins/render/eclipses/EclipsesBrowserDialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>EclipsesListDialog</class>
- <widget class="QDialog" name="EclipsesListDialog">
+ <class>EclipsesBrowserDialog</class>
+ <widget class="QDialog" name="EclipsesBrowserDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -156,7 +156,7 @@
   <connection>
    <sender>buttonShow</sender>
    <signal>clicked()</signal>
-   <receiver>EclipsesListDialog</receiver>
+   <receiver>EclipsesBrowserDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -172,7 +172,7 @@
   <connection>
    <sender>buttonClose</sender>
    <signal>clicked()</signal>
-   <receiver>EclipsesListDialog</receiver>
+   <receiver>EclipsesBrowserDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/src/plugins/render/eclipses/EclipsesPlugin.cpp \
b/src/plugins/render/eclipses/EclipsesPlugin.cpp index 6830d52..e6a3565 100644
--- a/src/plugins/render/eclipses/EclipsesPlugin.cpp
+++ b/src/plugins/render/eclipses/EclipsesPlugin.cpp
@@ -19,7 +19,7 @@
 
 #include "EclipsesModel.h"
 #include "EclipsesItem.h"
-#include "EclipsesListDialog.h"
+#include "EclipsesBrowserDialog.h"
 
 #include "ui_EclipsesConfigDialog.h"
 #include "ui_EclipsesReminderDialog.h"
@@ -176,7 +176,7 @@ void EclipsesPlugin::initialize()
     connect( m_configWidget->buttonBox->button( QDialogButtonBox::Apply ),
              SIGNAL(clicked()), this, SLOT(writeSettings()) );
 
-    m_listDialog = new EclipsesListDialog( marbleModel() );
+    m_listDialog = new EclipsesBrowserDialog( marbleModel() );
     connect( m_listDialog, SIGNAL(buttonShowClicked(int, int)),
              this, SLOT(showEclipse(int,int)) );
 
diff --git a/src/plugins/render/eclipses/EclipsesPlugin.h \
b/src/plugins/render/eclipses/EclipsesPlugin.h index 7b16617..d3c5523 100644
--- a/src/plugins/render/eclipses/EclipsesPlugin.h
+++ b/src/plugins/render/eclipses/EclipsesPlugin.h
@@ -30,7 +30,7 @@ class MarbleWidget;
 class MarbleClock;
 class EclipsesModel;
 class EclipsesItem;
-class EclipsesListDialog;
+class EclipsesBrowserDialog;
 
 /**
  * @brief This plugin displays solar eclipses.
@@ -151,7 +151,7 @@ private:
     // dialogs
     QDialog *m_configDialog;
     Ui::EclipsesConfigDialog *m_configWidget;
-    EclipsesListDialog *m_listDialog;
+    EclipsesBrowserDialog *m_listDialog;
     QDialog *m_reminderDialog;
     Ui::EclipsesReminderDialog *m_reminderWidget;
 };


[prev in list] [next in list] [prev in thread] [next in thread]