Move directories, fix a bug into month generation (tree), add tooltips

Makefile

@@ -1,4 +1,4 @@
-CXXFLAGS=`wx-config --cxxflags` -Wall -I. -ggdb
+CXXFLAGS=`wx-config --cxxflags` -Wall -Isrc -ggdb
 CXXFLAGS+=-I./lib/wxsqlite3-1.9.9/include
 CXXFLAGS+=-I./lib/freechart/include
 
@@ -8,22 +8,22 @@ LDFLAGS+=-L./lib/freechart/lib -lwxcode_gtk2u_freechart-2.8
 
 CXX=g++
 
-SOURCES=$(wildcard model/*.cpp)
+SOURCES=$(wildcard src/model/*.cpp)
-SOURCES+=$(wildcard view/*.cpp)
+SOURCES+=$(wildcard src/view/*.cpp)
-SOURCES+=$(wildcard controller/*.cpp)
+SOURCES+=$(wildcard src/controller/*.cpp)
-SOURCES+=main.cpp sha1.cpp
+SOURCES+=src/main.cpp src/sha1.cpp
-HEADERS=$(wildcard model/*.h) 
+HEADERS=$(wildcard src/model/*.h) 
-HEADERS+=$(wildcard view/*.h)
+HEADERS+=$(wildcard src/view/*.h)
-HEADERS+=$(wildcard controller/*.h)
+HEADERS+=$(wildcard src/controller/*.h)
-HEADERS+=main.h sha1.h
+HEADERS+=src/main.h src/sha1.h
 OBJS=$(SOURCES:.cpp=.o)
 
 all: kc
 
 clean:
-	rm -f *~ *.o model/*.o model/*~ view/*.o view/*~ controller/*.o controller/*~ kc
+	rm -f *~ src/*~ src/*.o src/model/*.o src/model/*~ src/view/*.o src/view/*~ src/controller/*.o src/controller/*~ kc
 
-%.o : model/%.cpp view/%.cpp controller/%.cpp %.cpp
+%.o : src/model/%.cpp src/view/%.cpp src/controller/%.cpp src/%.cpp
 	$(CXX) $(CXXFLAGS) $< -c
 
 kc: $(OBJS)

ressources/icons/SOURCE

@@ -0,0 +1 @@
+http://www.iconarchive.com/category/application-icons.html

src/model/Account.h

@@ -0,0 +1,17 @@
+#ifndef ACCOUNT_H
+#define ACCOUNT_H
+
+#include <list>
+#include <map>
+#include <wx/wx.h>
+
+class Account {
+ public:
+  wxString id;
+  wxString name;
+  wxString number;
+  bool shared;
+  bool _default;
+};
+
+#endif

src/model/Category.h

@@ -0,0 +1,14 @@
+#ifndef CATEGORY_H
+#define CATEGORY_H
+
+class Category
+{
+ public:
+  wxString id;
+  wxString parent;
+  wxString name;
+  wxColour color;
+  wxString font;
+};
+
+#endif

src/model/Operation.h

@@ -0,0 +1,18 @@
+#ifndef OPERATION_H
+#define OPERATION_H
+
+class Operation {
+ public:
+  wxString id;
+  unsigned int day;
+  unsigned int month;
+  unsigned int year;
+  double amount;
+  wxString description;
+  wxString category;
+  bool fix_cost;
+  wxString account;
+  bool checked;
+} ;
+
+#endif

src/view/AccountPanel.cpp

@@ -939,9 +939,17 @@ void AccountPanel::GetTreeSelection(int* month, int* year)
 void AccountPanel::OnMenuGenerate(wxCommandEvent& event)
 {
   int month, year;
+  wxDateTime curDate;
+
+  curDate.SetToCurrent();
 
   GetTreeSelection(&month, &year);
 
+  if (month == -1 && year == curDate.GetYear())
+    {
+      month = _curMonth;
+    }
+
   GenerateDialog g(_kiss, _wxUI, month, year);
   g.ShowModal();
 }
@@ -1005,14 +1013,16 @@ void AccountPanel::GenerateMonth(int month, int year)
   wxTreeItemId root, years, node ;
   wxTreeItemIdValue cookie;
   wxString monthString, yearString;
-  std::map<unsigned int, std::vector<Operation> >::iterator it;
+  std::map<int, std::vector<int> > ops ;
+  std::vector<int>::iterator it ;
   int i;
-  User* user = _kiss->GetUser();
 
   root = _tree.GetRootItem();
   yearString = wxString::Format(wxT("%d"), year);
   monthString = months[month];
 
+  ops = _kiss->GetAllOperations();
+
   if (_tree.GetChildrenCount(root, true) < 1)
     {
       node = _tree.AppendItem(root, yearString);
@@ -1053,14 +1063,17 @@ void AccountPanel::GenerateMonth(int month, int year)
     node = _tree.AppendItem(years, monthString);
   else
     {
-      for(i=0, it = user->_operations[year]->begin(); 
+      for(i=0, it = ops[year].begin(); 
-	  it != user->_operations[year]->end(); 
+	  it != ops[year].end(); 
 	  it++, i++)
 	{
-	  if ((int)it->first > month)
+	  if (*it > month)
 	    break;
 	}
-      years = _tree.InsertItem(years, i, monthString); 
+      if (it == ops[year].end())
+	years = _tree.AppendItem(years, monthString);
+      else
+	years = _tree.InsertItem(years, i-1, monthString); 
     }
     
   _tree.SelectItem(node, true);

src/view/AccountPanel.h

@@ -18,8 +18,8 @@
 #define DEFAULT_FONT_SIZE 12
 #define DEFAULT_FONT(font_name)  wxFont font_name(DEFAULT_FONT_SIZE, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, DEFAULT_FONT_NAME);
 
-#define DELETE_ICON "ressources/process-stop.png"
+#define DELETE_ICON "ressources/icons/process-stop.png"
-#define CHECKED_ICON  "ressources/tick-icon.png"
+#define CHECKED_ICON  "ressources/icons/tick-icon.png"
 
 #include <controller/KissCount.h>
 #include "wxUI.h"

src/view/ButtonPanel.cpp

@@ -23,6 +23,14 @@ ButtonPanel::ButtonPanel(KissCount* kiss, wxUI *parent) : wxPanel(&(*parent)), _
 
   SetSizer(hbox);
 
+  _account->SetToolTip(_("Operations"));
+  _stats->SetToolTip(_("Statistics"));
+  _search->SetToolTip(_("Search"));
+  _prefs->SetToolTip(_("Preferences"));
+  _changeUser->SetToolTip(_("Change user"));
+  _about->SetToolTip(_("About"));
+  _quit->SetToolTip(_("Quit"));
+
   hbox->Add(_account);
   hbox->Add(_stats);
   hbox->Add(_search);

src/view/ButtonPanel.h

@@ -7,13 +7,13 @@
 #include <controller/KissCount.h>
 #include "wxUI.h"
 
-#define ACCOUNT_ICON "ressources/administrator-icon.png"
+#define ACCOUNT_ICON "ressources/icons/administrator-icon.png"
-#define STATS_ICON   "ressources/chart-icon.png"
+#define STATS_ICON   "ressources/icons/chart-icon.png"
-#define SEARCH_ICON  "ressources/Search-icon.png"
+#define SEARCH_ICON  "ressources/icons/Search-icon.png"
-#define PREFS_ICON   "ressources/options-icon.png"
+#define PREFS_ICON   "ressources/icons/options-icon.png"
-#define CHANGE_USER_ICON "ressources/Clients-icon.png"
+#define CHANGE_USER_ICON "ressources/icons/Clients-icon.png"
-#define ABOUT_ICON  "ressources/windows-users-icon.png"
+#define ABOUT_ICON  "ressources/icons/windows-users-icon.png"
-#define QUIT_ICON   "ressources/system-log-out.png"
+#define QUIT_ICON   "ressources/icons/system-log-out.png"
 
 class KissCount;
 class wxUI;