X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fforms%2Factmgr%2FfrmActivityMgr.cpp;h=810ef50144a2e601bf3a4ec17f15d9839a544b34;hb=28f3ef896d323eb07dbc74bfb6e71c364295105a;hp=0773ea4e366a448d1e94289ebc7155e7228a0ca3;hpb=aa8d705bc2b35cab5aa877c47c765db7ca0d9748;p=xestiacalendar%2F.git

diff --git a/source/forms/actmgr/frmActivityMgr.cpp b/source/forms/actmgr/frmActivityMgr.cpp
index 0773ea4..810ef50 100644
--- a/source/forms/actmgr/frmActivityMgr.cpp
+++ b/source/forms/actmgr/frmActivityMgr.cpp
@@ -23,11 +23,57 @@ frmActivityMgr::frmActivityMgr( wxWindow* parent )
 frmActivityMgrADT( parent )
 {
 
+	/*wxMemoryInputStream istream(icons_activitywindow_png, sizeof(icons_activitywindow_png));
+	wxImage icons_activitywindow_pngi(istream, wxBITMAP_TYPE_PNG);
+	wxBitmap activityiconbmp(icons_activitywindow_pngi, -1);
+	wxIcon activityicon;
+	activityicon.CopyFromBitmap(activityiconbmp);
+	this->SetIcon(activityicon); 
+
+	wxMemoryInputStream istream2(misc_activitysleep_png, sizeof(misc_activitysleep_png));
+	wxImage misc_activitysleep_pngi(istream2, wxBITMAP_TYPE_PNG);
+	wxBitmap sleepiconbmp(misc_activitysleep_pngi, -1);
+	SleepBitmap = sleepiconbmp;
+	bmpActivity->SetBitmap(SleepBitmap);
+	ActProcessTimer.SetupPointers(this);
+	lblDetails->SetLabel(_("No activity."));
+	
+	ActListProcTimer.SetupPointers(&ActivityList, &ActivityListIndex, &ActivityListTaskDetail, 
+					&TasksActive, lstActivity, lblDetails, GauProgress, this, &AnimationTimer,
+					&ActProcessTimer, &ActivityListFinDate, &ActivityListConnObject);
+	
+	AnimationTimer.SetBitmap(bmpActivity);
+	AnimationTimer.SetSleepBitmap(&SleepBitmap);
+	AnimationTimer.SetupPointer(this->GetParent());
+	
+	wxListItem ColumnData;
+	ColumnData.SetId(0);
+	ColumnData.SetText(_("Activity"));
+	ColumnData.SetWidth(175);
+	lstActivity->InsertColumn(0, ColumnData);
+	
+	wxListItem ColumnData2;
+	ColumnData2.SetId(1);
+	ColumnData2.SetText(_("Account"));
+	ColumnData2.SetWidth(100);
+	lstActivity->InsertColumn(1, ColumnData2);
+
+	wxListItem ColumnData3;
+	ColumnData3.SetId(2);
+	ColumnData3.SetText(_("Status"));
+	ColumnData3.SetWidth(100);
+	lstActivity->InsertColumn(2, ColumnData3);*/
+
+}
+
+void frmActivityMgr::CloseWindow( wxCommandEvent& event )
+{
+	this->Hide();
 }
 
 void frmActivityMgr::CloseWindow( wxCloseEvent& event )
 {
-// TODO: Implement CloseWindow
+	this->Hide();
 }
 
 void frmActivityMgr::StopTask( wxCommandEvent& event )