[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/office/krone
From: Erlend Hamberg <ehamberg () gmail ! com>
Date: 2008-02-05 13:52:53
Message-ID: 1202219573.301479.28418.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 771209 by ehamberg:
Merge branch 'master' of ssh://hamberg.ath.cx:2222/var/git/krone
M +21 -5 expense_properties.cpp
M +20 -0 expense_properties.h
M +5 -5 expense_properties.ui
M +28 -13 expense_table.cpp
M +22 -3 expense_table.h
M +1 -1 expense_table.ui
M +21 -1 krone.cpp
M +21 -1 mainwindow.cpp
M +20 -0 mainwindow.h
--- trunk/playground/office/krone/expense_properties.cpp #771208:771209
@@ -1,15 +1,31 @@
-// include the header file of the dialog
+/*
+Copyright 2008 Erlend Hamberg <ehamberg@gmail.com>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of
+the License or (at your option) version 3 or any later version
+accepted by the membership of KDE e.V. (or its successor approved
+by the membership of KDE e.V.), which shall act as a proxy
+defined in Section 14 of version 3 of the license.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
#include "expense_properties.h"
ExpenseProperties::ExpenseProperties( QWidget *parent )
: QWidget( parent )
{
- // create the user interface, the parent widget is "widget"
- ui.setupUi(this); // this is the important part
+ ui.setupUi(this);
}
ExpenseProperties::~ExpenseProperties()
{
}
-
-#include "expense_properties.moc"
--- trunk/playground/office/krone/expense_properties.h #771208:771209
@@ -1,3 +1,23 @@
+/*
+Copyright 2008 Erlend Hamberg <ehamberg@gmail.com>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of
+the License or (at your option) version 3 or any later version
+accepted by the membership of KDE e.V. (or its successor approved
+by the membership of KDE e.V.), which shall act as a proxy
+defined in Section 14 of version 3 of the license.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
#ifndef EXPENSE_PROPERTIES_H
#define EXPENSE_PROPERTIES_H
--- trunk/playground/office/krone/expense_properties.ui #771208:771209
@@ -19,7 +19,7 @@
</sizepolicy>
</property>
<property name="windowTitle" >
- <string>Form</string>
+ <string>Expense properties</string>
</property>
<layout class="QVBoxLayout" >
<item>
@@ -48,17 +48,17 @@
<widget class="KLineEdit" name="klineeditExpense" />
</item>
<item>
- <widget class="QLabel" name="labelAmmount" >
+ <widget class="QLabel" name="labelAmount" >
<property name="text" >
- <string>&Ammount</string>
+ <string>&Amount</string>
</property>
<property name="buddy" >
- <cstring>klineeditAmmount</cstring>
+ <cstring>klineeditAmount</cstring>
</property>
</widget>
</item>
<item>
- <widget class="KLineEdit" name="klineeditAmmount" />
+ <widget class="KLineEdit" name="klineeditAmount" />
</item>
<item>
<widget class="QLabel" name="labelCategory" >
--- trunk/playground/office/krone/expense_table.cpp #771208:771209
@@ -1,19 +1,38 @@
+/*
+Copyright 2008 Erlend Hamberg <ehamberg@gmail.com>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of
+the License or (at your option) version 3 or any later version
+accepted by the membership of KDE e.V. (or its successor approved
+by the membership of KDE e.V.), which shall act as a proxy
+defined in Section 14 of version 3 of the license.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "expense_table.h"
+
#include <KMessageBox>
+#include <QModelIndex>
#include <QHeaderView>
+#include <QDebug>
-// include the header file of the dialog
-#include "expense_table.h"
-
ExpenseTable::ExpenseTable(QWidget *parent)
: QWidget(parent)
{
- // create the user interface, the parent widget is "widget"
- ui.setupUi(this); // this is the important part
+ ui.setupUi(this);
ui.expensesTable->verticalHeader()->hide();
- //connect(ui.expensesTable, SIGNAL(clicked(QModelIndex)), this, \
SLOT(slotInsertNewExpense()));
- //connect(ui.expensesTable, SIGNAL(cellChanged(int, int)), this, \
SLOT(slotInsertNewExpense())); + connect(ui.expensesTable, \
SIGNAL(clicked(QModelIndex)), this, SLOT(slotEditExpense(QModelIndex))); }
ExpenseTable::~ExpenseTable()
@@ -26,11 +45,7 @@
ui.expensesTable->insertRow(ui.expensesTable->rowCount());
}
-void ExpenseTable::mousePressEvent(QMouseEvent *event)
+void ExpenseTable::slotEditExpense(QModelIndex modelIndex)
{
- KMessageBox::information( this,
- i18n("LOL" ),
- i18n( "Hooray!" ) );
+ qDebug() << modelIndex;
}
-
-#include "expense_table.moc"
--- trunk/playground/office/krone/expense_table.h #771208:771209
@@ -1,3 +1,23 @@
+/*
+Copyright 2008 Erlend Hamberg <ehamberg@gmail.com>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of
+the License or (at your option) version 3 or any later version
+accepted by the membership of KDE e.V. (or its successor approved
+by the membership of KDE e.V.), which shall act as a proxy
+defined in Section 14 of version 3 of the license.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
#ifndef EXPENSE_TABLE_H
#define EXPENSE_TABLE_H
@@ -13,10 +33,9 @@
ExpenseTable(QWidget *parent=0);
~ExpenseTable();
- void mousePressEvent(QMouseEvent *event);
-
-public slots:
+private slots:
void slotInsertNewExpense();
+ void slotEditExpense(QModelIndex modelIndex);
private:
Ui::ExpenseTable ui;
--- trunk/playground/office/krone/expense_table.ui #771208:771209
@@ -48,7 +48,7 @@
</property>
<column>
<property name="text" >
- <string>Ammount</string>
+ <string>Amount</string>
</property>
</column>
<column>
--- trunk/playground/office/krone/krone.cpp #771208:771209
@@ -1,3 +1,23 @@
+/*
+Copyright 2008 Erlend Hamberg <ehamberg@gmail.com>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of
+the License or (at your option) version 3 or any later version
+accepted by the membership of KDE e.V. (or its successor approved
+by the membership of KDE e.V.), which shall act as a proxy
+defined in Section 14 of version 3 of the license.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
#include <QDockWidget>
#include <KMenu>
#include <KMenuBar>
@@ -20,7 +40,7 @@
"0.1", // The program \
version string.
ki18n("Simple expense manager"), // A short \
description of what the program does.
KAboutData::License_GPL, // License \
identifier
- ki18n("(c) 2008 Erlend Hamberg <ehamberg@gmail.com>"), // Copyright \
Statement + ki18n("(c) 2008 Erlend Hamberg, ehamberg@gmail.com"), // \
Copyright Statement
ki18n("Some text..."), // Some free \
form text, that can contain any kind of information.
"http://tutorial.com", // The program \
homepage string.
"submit@bugs.kde.org"); // The bug \
report email address string.
--- trunk/playground/office/krone/mainwindow.cpp #771208:771209
@@ -1,7 +1,27 @@
-#include <QDebug>
+/*
+Copyright 2008 Erlend Hamberg <ehamberg@gmail.com>
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of
+the License or (at your option) version 3 or any later version
+accepted by the membership of KDE e.V. (or its successor approved
+by the membership of KDE e.V.), which shall act as a proxy
+defined in Section 14 of version 3 of the license.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
#include "mainwindow.h"
+#include <QDebug>
+
KroneMainWindow::KroneMainWindow()
{
expensePropertiesDock = new QDockWidget(i18n("Expense properties"), this);
--- trunk/playground/office/krone/mainwindow.h #771208:771209
@@ -1,3 +1,23 @@
+/*
+Copyright 2008 Erlend Hamberg <ehamberg@gmail.com>
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as
+published by the Free Software Foundation; either version 2 of
+the License or (at your option) version 3 or any later version
+accepted by the membership of KDE e.V. (or its successor approved
+by the membership of KDE e.V.), which shall act as a proxy
+defined in Section 14 of version 3 of the license.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
#ifndef MAINWINDOW_H_INCLUDED
#define MAINWINDOW_H_INCLUDED
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic