diff options
Diffstat (limited to 'kplato')
-rw-r--r-- | kplato/kptganttview.cpp | 6 | ||||
-rw-r--r-- | kplato/kptganttview.h | 4 | ||||
-rw-r--r-- | kplato/kptresource.cpp | 8 | ||||
-rw-r--r-- | kplato/kptresource.h | 4 | ||||
-rw-r--r-- | kplato/kptresourceappointmentsview.h | 2 | ||||
-rw-r--r-- | kplato/kpttaskappointmentsview.cpp | 36 | ||||
-rw-r--r-- | kplato/kpttaskappointmentsview.h | 16 | ||||
-rw-r--r-- | kplato/kpttaskappointmentsview.ui.h | 8 | ||||
-rw-r--r-- | kplato/kptview.cpp | 6 | ||||
-rw-r--r-- | kplato/kptview.h | 4 |
10 files changed, 47 insertions, 47 deletions
diff --git a/kplato/kptganttview.cpp b/kplato/kptganttview.cpp index 40dfbf75e..fe797fdaa 100644 --- a/kplato/kptganttview.cpp +++ b/kplato/kptganttview.cpp @@ -30,7 +30,7 @@ #include "kpttask.h" #include "kptresource.h" #include "kptdatetime.h" -#include "kpttaskappointmentsview.h" +#include "kpttastdeAppointmentsview.h" #include "kptrelation.h" #include "kptcontext.h" #include "kptschedule.h" @@ -114,8 +114,8 @@ GanttView::GanttView(TQWidget *parent, bool readWrite, const char* name) m_gantt->setScale(KDGanttView::Day); m_gantt->setShowLegendButton(false); m_gantt->setShowHeaderPopupMenu(); - m_taskView = new TaskAppointmentsView(this); - // hide TaskAppointmentsView + m_taskView = new TastdeAppointmentsView(this); + // hide TastdeAppointmentsView TQValueList<int> list = sizes(); list[0] += list[1]; list[1] = 0; diff --git a/kplato/kptganttview.h b/kplato/kptganttview.h index dc34fe869..826ec682b 100644 --- a/kplato/kptganttview.h +++ b/kplato/kptganttview.h @@ -45,7 +45,7 @@ namespace KPlato { class MyKDGanttView; -class TaskAppointmentsView; +class TastdeAppointmentsView; class Node; class Task; @@ -189,7 +189,7 @@ private: int m_defaultFontSize; KDGanttViewItem *m_currentItem; MyKDGanttView *m_gantt; - TaskAppointmentsView *m_taskView; + TastdeAppointmentsView *m_taskView; bool m_showExpected; bool m_showOptimistic; bool m_showPessimistic; diff --git a/kplato/kptresource.cpp b/kplato/kptresource.cpp index 3b3be7a28..ae56980ac 100644 --- a/kplato/kptresource.cpp +++ b/kplato/kptresource.cpp @@ -594,7 +594,7 @@ Duration Resource::effort(const DateTime &start, const Duration &duration, bool return e; } -DateTime Resource::availableAfter(const DateTime &time, const DateTime limit, bool checkAppointments) const { +DateTime Resource::availableAfter(const DateTime &time, const DateTime limit, bool chectdeAppointments) const { DateTime t; if (m_units == 0) { return t; @@ -617,14 +617,14 @@ DateTime Resource::availableAfter(const DateTime &time, const DateTime limit, bo } t = m_availableFrom > time ? m_availableFrom : time; t = cal->firstAvailableAfter(t, lmt); - if (checkAppointments) { + if (chectdeAppointments) { //TODO } //kdDebug()<<k_funcinfo<<time.toString()<<"="<<t.toString()<<" "<<m_name<<endl; return t; } -DateTime Resource::availableBefore(const DateTime &time, const DateTime limit, bool checkAppointments) const { +DateTime Resource::availableBefore(const DateTime &time, const DateTime limit, bool chectdeAppointments) const { DateTime t; if (m_units == 0) { return t; @@ -653,7 +653,7 @@ DateTime Resource::availableBefore(const DateTime &time, const DateTime limit, b } //kdDebug()<<k_funcinfo<<t<<", "<<lmt<<endl; t = cal->firstAvailableBefore(t, lmt); - if (checkAppointments) { + if (chectdeAppointments) { //TODO } //kdDebug()<<k_funcinfo<<m_name<<" returns: "<<time<<"="<<t<<" "<<endl; diff --git a/kplato/kptresource.h b/kplato/kptresource.h index d4930f2fa..e8cc8caf9 100644 --- a/kplato/kptresource.h +++ b/kplato/kptresource.h @@ -292,12 +292,12 @@ public: * Find the first available time after time, within limit. * Returns invalid DateTime if not available. */ - DateTime availableAfter(const DateTime &time, const DateTime limit=DateTime(), bool checkAppointments=false) const; + DateTime availableAfter(const DateTime &time, const DateTime limit=DateTime(), bool chectdeAppointments=false) const; /** * Find the first available time before time, within limit. * Returns invalid DateTime if not available. */ - DateTime availableBefore(const DateTime &time, const DateTime limit=DateTime(), bool checkAppointments=false) const; + DateTime availableBefore(const DateTime &time, const DateTime limit=DateTime(), bool chectdeAppointments=false) const; Resource *findId() const { return findId(m_id); } Resource *findId(const TQString &id) const; diff --git a/kplato/kptresourceappointmentsview.h b/kplato/kptresourceappointmentsview.h index c8b0c7053..f4feb890c 100644 --- a/kplato/kptresourceappointmentsview.h +++ b/kplato/kptresourceappointmentsview.h @@ -100,4 +100,4 @@ private: } //KPlato namespace -#endif // KPTTASKAPPOINTMENTSVIEW_H +#endif // KPTTAStdeAppOINTMENTSVIEW_H diff --git a/kplato/kpttaskappointmentsview.cpp b/kplato/kpttaskappointmentsview.cpp index 669bf0654..0cab9cc4c 100644 --- a/kplato/kpttaskappointmentsview.cpp +++ b/kplato/kpttaskappointmentsview.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include "kpttaskappointmentsview.h" +#include "kpttastdeAppointmentsview.h" #include "kptappointment.h" #include "kpttask.h" @@ -32,14 +32,14 @@ namespace KPlato { -TaskAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListView *parent, bool highlight) +TastdeAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListView *parent, bool highlight) : DoubleListViewBase::MasterListItem(parent, r->name(), highlight), resource(r) { setFormat(0, 'f', 1); //kdDebug()<<k_funcinfo<<endl; } -TaskAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListViewItem *p, bool highlight) +TastdeAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListViewItem *p, bool highlight) : DoubleListViewBase::MasterListItem(p, r->name(), highlight), resource(r) { @@ -47,7 +47,7 @@ TaskAppointmentsView::ResourceItem::ResourceItem(Resource *r, TQListViewItem *p, //kdDebug()<<k_funcinfo<<endl; } -TaskAppointmentsView::ResourceItem::ResourceItem(TQString text, TQListViewItem *parent, bool highlight) +TastdeAppointmentsView::ResourceItem::ResourceItem(TQString text, TQListViewItem *parent, bool highlight) : DoubleListViewBase::MasterListItem(parent, text, highlight), resource(0) { @@ -56,7 +56,7 @@ TaskAppointmentsView::ResourceItem::ResourceItem(TQString text, TQListViewItem * } //------------------------------------------- -TaskAppointmentsView::TaskAppointmentsView(TQWidget *parent) +TastdeAppointmentsView::TastdeAppointmentsView(TQWidget *parent) : DoubleListViewBase(parent), m_task(0) { @@ -70,17 +70,17 @@ TaskAppointmentsView::TaskAppointmentsView(TQWidget *parent) setSizes(list); } -void TaskAppointmentsView::zoom(double zoom) { +void TastdeAppointmentsView::zoom(double zoom) { Q_UNUSED(zoom); } -void TaskAppointmentsView::draw(Task *task) { +void TastdeAppointmentsView::draw(Task *task) { m_task = task; draw(); } -void TaskAppointmentsView::draw() { +void TastdeAppointmentsView::draw() { //kdDebug()<<k_funcinfo<<endl; clearLists(); if (!m_task) @@ -90,19 +90,19 @@ void TaskAppointmentsView::draw() { TQPtrListIterator<Appointment> it(lst); for (; it.current(); ++it) { Resource *r = it.current()->resource()->resource(); - TaskAppointmentsView::ResourceItem *item = new TaskAppointmentsView::ResourceItem(r, masterListView()); + TastdeAppointmentsView::ResourceItem *item = new TastdeAppointmentsView::ResourceItem(r, masterListView()); item->effortMap = it.current()->plannedPrDay(m_task->startTime().date(), m_task->endTime().date()); } slotUpdate(); } -void TaskAppointmentsView::drawContents(TQPainter* painter) +void TastdeAppointmentsView::drawContents(TQPainter* painter) { this->DoubleListViewBase::drawContents(painter); } -void TaskAppointmentsView::slotUpdate() { +void TastdeAppointmentsView::slotUpdate() { //kdDebug()<<k_funcinfo<<endl; if (!m_task) return; @@ -122,7 +122,7 @@ void TaskAppointmentsView::slotUpdate() { } TQListViewItemIterator it(masterListView()); for (;it.current(); ++it) { - TaskAppointmentsView::ResourceItem *item = static_cast<TaskAppointmentsView::ResourceItem*>(it.current()); + TastdeAppointmentsView::ResourceItem *item = static_cast<TastdeAppointmentsView::ResourceItem*>(it.current()); if (!item) { continue; } @@ -139,11 +139,11 @@ void TaskAppointmentsView::slotUpdate() { } -void TaskAppointmentsView::print(KPrinter &/*printer*/) { +void TastdeAppointmentsView::print(KPrinter &/*printer*/) { kdDebug()<<k_funcinfo<<endl; } -// bool TaskAppointmentsView::setContext(Context::TaskAppointmentsView &context) { +// bool TastdeAppointmentsView::setContext(Context::TastdeAppointmentsView &context) { // //kdDebug()<<k_funcinfo<<endl; // // TQValueList<int> list; @@ -158,7 +158,7 @@ void TaskAppointmentsView::print(KPrinter &/*printer*/) { // return true; // } // -// void TaskAppointmentsView::getContext(Context::TaskAppointmentsView &context) const { +// void TastdeAppointmentsView::getContext(Context::TastdeAppointmentsView &context) const { // //kdDebug()<<k_funcinfo<<endl; // context.accountsviewsize = m_dlv->sizes()[0]; // context.periodviewsize = m_dlv->sizes()[1]; @@ -168,15 +168,15 @@ void TaskAppointmentsView::print(KPrinter &/*printer*/) { // //kdDebug()<<k_funcinfo<<"sizes="<<sizes()[0]<<","<<sizes()[1]<<endl; // } -void TaskAppointmentsView::clear() { +void TastdeAppointmentsView::clear() { clearLists(); } -void TaskAppointmentsView::createSlaveItems() { +void TastdeAppointmentsView::createSlaveItems() { DoubleListViewBase::createSlaveItems(); setSlaveFormat(0, 'f', 1); } } //KPlato namespace -#include "kpttaskappointmentsview.moc" +#include "kpttastdeAppointmentsview.moc" diff --git a/kplato/kpttaskappointmentsview.h b/kplato/kpttaskappointmentsview.h index e913b439f..fefb08642 100644 --- a/kplato/kpttaskappointmentsview.h +++ b/kplato/kpttaskappointmentsview.h @@ -17,8 +17,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef KPTTASKAPPOINTMENTSVIEW_H -#define KPTTASKAPPOINTMENTSVIEW_H +#ifndef KPTTAStdeAppOINTMENTSVIEW_H +#define KPTTAStdeAppOINTMENTSVIEW_H #include "kptcontext.h" #include "kptdoublelistviewbase.h" @@ -47,15 +47,15 @@ class ResourceGroup; class Resource; class ResourceItemPrivate; -class TaskAppointmentsView : public DoubleListViewBase +class TastdeAppointmentsView : public DoubleListViewBase { TQ_OBJECT public: - TaskAppointmentsView(TQWidget *parent); + TastdeAppointmentsView(TQWidget *parent); - //~TaskAppointmentsView(); + //~TastdeAppointmentsView(); void zoom(double zoom); @@ -65,8 +65,8 @@ public: void print(KPrinter &printer); void clear(); - //virtual bool setContext(Context::TaskAppointmentsView &context); - //virtual void getContext(Context::TaskAppointmentsView &context) const; + //virtual bool setContext(Context::TastdeAppointmentsView &context); + //virtual void getContext(Context::TastdeAppointmentsView &context) const; virtual void createSlaveItems(); @@ -93,4 +93,4 @@ private: } //KPlato namespace -#endif // KPTTASKAPPOINTMENTSVIEW_H +#endif // KPTTAStdeAppOINTMENTSVIEW_H diff --git a/kplato/kpttaskappointmentsview.ui.h b/kplato/kpttaskappointmentsview.ui.h index b638597e8..00d2f961b 100644 --- a/kplato/kpttaskappointmentsview.ui.h +++ b/kplato/kpttaskappointmentsview.ui.h @@ -32,7 +32,7 @@ namespace KPlato { -void TaskAppointmentsView::clear() +void TastdeAppointmentsView::clear() { if (m_appList) m_appList->clear(); if (m_taskName) m_taskName->clear(); @@ -45,7 +45,7 @@ void TaskAppointmentsView::clear() if (m_cpi) m_cpi->clear(); } -void TaskAppointmentsView::draw(Task *task) +void TastdeAppointmentsView::draw(Task *task) { //kdDebug()<<k_funcinfo<<endl; m_task = task; @@ -81,7 +81,7 @@ void TaskAppointmentsView::draw(Task *task) } -void TaskAppointmentsView::init() +void TastdeAppointmentsView::init() { m_appList->setColumnAlignment(1, AlignHCenter); m_appList->setColumnAlignment(3, AlignRight); @@ -94,7 +94,7 @@ void TaskAppointmentsView::init() } -void TaskAppointmentsView::drawCostEffort() +void TastdeAppointmentsView::drawCostEffort() { if (m_task == 0) return; diff --git a/kplato/kptview.cpp b/kplato/kptview.cpp index 4b74eab26..e0e8d895a 100644 --- a/kplato/kptview.cpp +++ b/kplato/kptview.cpp @@ -194,7 +194,7 @@ View::View(Part* part, TQWidget* parent, const char* /*name*/) // actionViewGanttNotScheduled = new TDEToggleAction(i18n("Not Scheduled"), 0, 0, this, TQ_SLOT(slotViewGanttNotScheduled()), actionCollection(), "view_gantt_showNotScheduled"); - actionViewTaskAppointments = new TDEToggleAction(i18n("Show Allocations"), 0, 0, this, TQ_SLOT(slotViewTaskAppointments()), actionCollection(), "view_task_appointments"); + actionViewTastdeAppointments = new TDEToggleAction(i18n("Show Allocations"), 0, 0, this, TQ_SLOT(slotViewTastdeAppointments()), actionCollection(), "view_task_appointments"); actionViewPert = new TDEAction(i18n("Network"), "pert_chart", 0, this, TQ_SLOT(slotViewPert()), actionCollection(), "view_pert"); @@ -456,9 +456,9 @@ void View::slotViewGanttNoInformation() { slotUpdate(false); } -void View::slotViewTaskAppointments() { +void View::slotViewTastdeAppointments() { //kdDebug()<<k_funcinfo<<endl; - m_ganttview->setShowAppointments(actionViewTaskAppointments->isChecked()); + m_ganttview->setShowAppointments(actionViewTastdeAppointments->isChecked()); m_updateGanttview = true; if (m_tab->visibleWidget() == m_ganttview) slotUpdate(false); diff --git a/kplato/kptview.h b/kplato/kptview.h index f2726c70a..530be6b59 100644 --- a/kplato/kptview.h +++ b/kplato/kptview.h @@ -105,7 +105,7 @@ public slots: void slotViewGanttCriticalTasks(); void slotViewGanttCriticalPath(); void slotViewGanttNoInformation(); - void slotViewTaskAppointments(); + void slotViewTastdeAppointments(); void slotViewPert(); void slotViewResources(); void slotViewResourceAppointments(); @@ -223,7 +223,7 @@ private: TDEToggleAction *actionViewGanttCriticalTasks; TDEToggleAction *actionViewGanttCriticalPath; TDEToggleAction *actionViewGanttNotScheduled; - TDEToggleAction *actionViewTaskAppointments; + TDEToggleAction *actionViewTastdeAppointments; TDEAction *actionViewPert; TDEAction *actionViewResources; TDEToggleAction *actionViewResourceAppointments; |