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

List:       kde-commits
Subject:    playground/games/kamala/src
From:       Stanislas Marquis <roundphi () gmail ! com>
Date:       2009-03-29 15:23:10
Message-ID: 1238340190.615506.17992.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 946541 by smarquis:

Added horoscope dialog.


 M  +9 -9      core/models/horoscopemodel.cpp  
 M  +2 -0      gui/CMakeLists.txt  
 M  +7 -6      gui/actions.cpp  
 AM            gui/dialogs/horoscopedialog.cpp   [License: GPL (v2+)]
 AM            gui/dialogs/horoscopedialog.h   [License: GPL (v2+)]
 M  +5 -4      gui/mainwindow.cpp  
 M  +3 -3      gui/mainwindow.h  
 M  +19 -14    gui/widgets/searchwidget.cpp  


--- trunk/playground/games/kamala/src/core/models/horoscopemodel.cpp #946540:946541
@@ -95,17 +95,17 @@
             case 3: return horo->country();
             case 4:
                 GeoCoord_AsInt(horo->latitude(), x);
-                return i18nc("Latitude format {deg}:{N|S}:{min}:{sec}", "%1:%2:%3:%4")
-                    .arg(x[0])
-                    .arg(horo->latitude() >= 0 ? i18nc("North", "N") : i18nc("South", "S"))
-                    .arg(x[1]).arg(x[2]);
+                return i18nc("Latitude format {deg}:{N|S}:{min}:{sec}", "%1:%2:%3:%4",
+                    x[0],
+                    horo->latitude() >= 0 ? i18nc("North", "N") : i18nc("South", "S"),
+                    x[1], x[2]);
             case 5:
                 GeoCoord_AsInt(horo->longitude(), x);
-                return i18nc("Longitude format {deg}:{E|W}:{min}:{sec}", "%1:%2:%3:%4")
-                    .arg(x[0])
-                    .arg(horo->longitude() >= 0 ? i18nc("East", "E") : i18nc("West", "W"))
-                    .arg(x[1]).arg(x[2]);
-            case 6: return i18nc("{altitude} meters", "%1 m.").arg(horo->altitude());
+                return i18nc("Longitude format {deg}:{E|W}:{min}:{sec}", "%1:%2:%3:%4",
+                    x[0],
+                    horo->longitude() >= 0 ? i18nc("East", "E") : i18nc("West", "W"),
+                    x[1], x[2]);
+            case 6: return i18nc("{altitude} meters", "%1 m.", horo->altitude());
             case 7: return horo->comments();
             default: return QVariant();
         }
--- trunk/playground/games/kamala/src/gui/CMakeLists.txt #946540:946541
@@ -37,6 +37,7 @@
     dialogs/orbrestrictionviewdialog.h
     dialogs/settingsdialog.h
     dialogs/settingsviewdialog.h
+    dialogs/horoscopedialog.h
     )
 
 set(KAMALA_GUIWIDGETS_HDRS
@@ -81,6 +82,7 @@
     dialogs/orbrestrictionviewdialog.cpp
     dialogs/settingsdialog.cpp
     dialogs/settingsviewdialog.cpp
+    dialogs/horoscopedialog.cpp
     widgets/geocoordwidget.cpp
     widgets/orbiswidget.cpp
     widgets/orbmodifierwidget.cpp
--- trunk/playground/games/kamala/src/gui/actions.cpp #946540:946541
@@ -34,13 +34,14 @@
 
 void MainWindow::createActions()
 {
-//     KStandardAction::openNew(this, SLOT(newChart()), (QObject*) actionCollection());
-//     //KStandardAction::open(this, SLOT(openChart()), (QObject*) actionCollection());
-//     KStandardAction::save(this, SLOT(saveChart()), (QObject*) actionCollection());
-//     KStandardAction::saveAs(this, SLOT(saveChartAs()), (QObject*) actionCollection());
-//     KStandardAction::quit(this, SLOT(close()), (QObject*) actionCollection());
-     KStandardAction::preferences(this, SLOT(preferences()), (QObject*) actionCollection());
+    KStandardAction::openNew(this, SLOT(newHoroscope()), (QObject*) actionCollection());
+    KStandardAction::preferences(this, SLOT(preferences()), (QObject*) actionCollection());
 
+    /*KStandardAction::open(this, SLOT(openChart()), (QObject*) actionCollection());
+    KStandardAction::save(this, SLOT(saveChart()), (QObject*) actionCollection());
+    KStandardAction::saveAs(this, SLOT(saveChartAs()), (QObject*) actionCollection());
+    KStandardAction::quit(this, SLOT(close()), (QObject*) actionCollection());*/
+
     KAction *planetFilterMan = actionCollection()->addAction("planetFilterManager");
     planetFilterMan->setText(i18nc("Menu item", "Configure Planets Filters..."));
     planetFilterMan->setIcon(KIcon(KStandardDirs::locate("data",
** trunk/playground/games/kamala/src/gui/dialogs/horoscopedialog.cpp #property svn:eol-style
   + native
** trunk/playground/games/kamala/src/gui/dialogs/horoscopedialog.h #property svn:eol-style
   + native
--- trunk/playground/games/kamala/src/gui/mainwindow.cpp #946540:946541
@@ -37,6 +37,7 @@
 #include "dialogs/aspectrestrictionviewdialog.h"
 #include "dialogs/orbrestrictionviewdialog.h"
 #include "dialogs/settingsviewdialog.h"
+#include "dialogs/horoscopedialog.h"
 #include "widgets/searchdockwidget.h"
 
 namespace Kamala
@@ -65,15 +66,15 @@
 
     setupGUI();
 }
-/*
-void MainWindow::newChart()
+
+void MainWindow::newHoroscope()
 {
-    ChartDlg *dlg = new ChartDlg((QWidget*) this);
+    HoroscopeDialog *dlg = new HoroscopeDialog((QWidget*) this);
     dlg->exec();
     delete dlg;
 }
 
-void MainWindow::openChart()
+/*void MainWindow::openChart()
 {
 }
 
--- trunk/playground/games/kamala/src/gui/mainwindow.h #946540:946541
@@ -48,7 +48,8 @@
 
   public Q_SLOTS:
 
-//     void newChart();
+    void newHoroscope();
+
 //     void openChart();
 //     void saveChart();
 //     void saveChartAs();
@@ -61,8 +62,6 @@
 
     void keywordManager();
 
-//     void executeScript();
-
     void planetFilterManager();
 
     void aspectFilterManager();
@@ -76,6 +75,7 @@
     void settingsManager();
 
 //     void midpFiltersManager();
+//     void executeScript();
 
   private:
 
--- trunk/playground/games/kamala/src/gui/widgets/searchwidget.cpp #946540:946541
@@ -25,11 +25,11 @@
 #include <QGridLayout>
 #include <QModelIndex>
 #include <KLineEdit>
-#include <KStandardDirs>
 #include <KLocalizedString>
 #include <KDebug>
 #include "../../core/models/horoscopeproxymodel.h"
 #include "../views/horoscopeview.h"
+#include "../dialogs/horoscopedialog.h"
 
 namespace Kamala
 {
@@ -39,24 +39,21 @@
     QGridLayout *grid = new QGridLayout(this);
     setLayout(grid);
 
-    m_view = new HoroscopeView(HoroscopeProxyModel::dbModel(), this);
-    connect(m_view, SIGNAL(clicked(const QModelIndex&)),
-        this, SLOT(viewClicked(const QModelIndex&)));
-    connect(m_view, SIGNAL(doubleClicked(const QModelIndex&)),
-        this, SLOT(viewDoubleClicked(const QModelIndex&)));
-    grid->addWidget(m_view, 1, 0);
-
-
     m_searchEdit = new KLineEdit(this);
     m_searchEdit->setClearButtonShown(true);
     m_searchEdit->setClickMessage(i18n("Search horoscope"));
     grid->addWidget(m_searchEdit, 0, 0);
+
+    m_view = new HoroscopeView(HoroscopeProxyModel::dbModel(), this);
+    grid->addWidget(m_view, 1, 0);
+
     connect(m_searchEdit, SIGNAL(textChanged(const QString&)),
         (HoroscopeProxyModel*) m_view->model(), SLOT(filterByName(const QString&)));
 
-    /*Q_ASSERT(Context::self() != 0);
-    connect(Context::self(), SIGNAL(chartSaved(BaseChart*)),
-        this, SLOT(reset()));*/
+    connect(m_view, SIGNAL(clicked(const QModelIndex&)),
+        this, SLOT(viewClicked(const QModelIndex&)));
+    connect(m_view, SIGNAL(doubleClicked(const QModelIndex&)),
+        this, SLOT(viewDoubleClicked(const QModelIndex&)));
 
     m_searchEdit->setText("*");
 }
@@ -69,8 +66,16 @@
 
 void SearchWidget::viewDoubleClicked(const QModelIndex &index)
 {
-    kDebug() << "Double clicked";
-    Q_UNUSED(index);
+    if (!index.isValid())
+        return;
+
+    HoroscopeProxyModel *model = (HoroscopeProxyModel*) m_view->model();
+    Horoscope *horo = (Horoscope*) model->mapToSource(index).internalPointer();
+    Q_ASSERT(horo != 0);
+
+    HoroscopeDialog *dlg = new HoroscopeDialog(this, horo);
+    dlg->exec();
+    delete dlg;
 }
 
 } // namespace Kamala
[prev in list] [next in list] [prev in thread] [next in thread]