First runnable version

src/view/SupportedLanguages.hpp

@@ -20,22 +20,20 @@
 #ifndef SUPPORTEDLANGUAGES_H
 #define SUPPORTEDLANGUAGES_H
 
-#include <wx/wx.h>
-
 namespace SupportedLanguages {
 #define ICONS_PATH RESSOURCES_ROOT "icons/"
 
     typedef struct {
-        wxString name;
-        wxString icon;
+        QString name;
+        QString icon;
         wxLanguage language;
     } language ;
 
     const int NB_SUPPORTED_LANGUAGES = 2;
 
     static const language languages[NB_SUPPORTED_LANGUAGES] = {
-        { wxT("Englishpp"), wxT(ICONS_PATH "/United Kingdom.png"), wxLANGUAGE_ENGLISH},
-        { wxT("Français"), wxT(ICONS_PATH "/France.png"), wxLANGUAGE_FRENCH}
+        { "English", ICONS_PATH "/United Kingdom.png", wxLANGUAGE_ENGLISH},
+        { "Français",ICONS_PATH "/France.png", wxLANGUAGE_FRENCH}
     };
 }
 

src/view/view.hpp

@@ -20,11 +20,13 @@
 #ifndef VIEW_H
 #define VIEW_H
 
+#include <QColor>
+
 namespace view {
     const QColor OWN_CYAN(0x99, 0xCC, 0xFF);
     const QColor OWN_YELLOW(0xFF, 0xFF, 0x99);
     const QColor OWN_GREEN(0x3D, 0xEB, 0x3D);
-    const std::string DEFAULT_FONT_NAME("Liberation Sans");
+    const QString DEFAULT_FONT_NAME("Liberation Sans");
     const int DEFAULT_FONT_SIZE = 12;
 
 #define DEFAULT_FONT(font_name)  QFont font_name(view::DEFAULT_FONT_NAME, view::DEFAULT_FONT_SIZE);

src/view/wxUI.cpp

@@ -35,7 +35,7 @@
 
 enum {BUTTON_CHANGE_USER_ID=-4, BUTTON_ABOUT_ID=-5, BUTTON_QUIT_ID=-6};
 
-std::string wxUI::months[12] ;
+QString wxUI::months[12] ;
 QColor wxUI::categoryColors[MAX_CATEGORY] = {QColor(0x00, 0x45, 0x86),
                               QColor(0xFF, 0x3E, 0x0E),
                               QColor(0xFF, 0xD3, 0x20),
@@ -90,7 +90,7 @@ wxUI::~wxUI()
     if (_locale) delete _locale;
 }
 
-bool wxUI::SetLanguage(std::string language)
+bool wxUI::SetLanguage(QString language)
 {
     bool res = true;
 

src/view/wxUI.hpp

@@ -44,13 +44,13 @@ class wxUI: public QFrame
 {
 public:
     static const int MAX_CATEGORY = 12;
-    static std::string months[MAX_CATEGORY];
+    static QString months[MAX_CATEGORY];
     static QColor categoryColors[MAX_CATEGORY];
 
     wxUI(KissCount* kiss, const QString& title);
     ~wxUI();
 
-    bool SetLanguage(std::string language);
+    bool SetLanguage(QString language);
 
     void ChangeUser();
     void LoadUser();
@@ -98,7 +98,7 @@ public:
     virtual void OnShow(QShowEvent * event)=0;
     virtual KissPanel* CreatePanel()=0;
     virtual QPushButton* GetButton(int id) {return 0;}
-    virtual std::string GetToolTip() {return "";}
+    virtual QString GetToolTip() {return "";}
 
 protected:
     KissCount* _kiss;