Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cb31afc
)
frmContactEditorNickname/Notes: Use list of ISO 639-1 languages
author
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Mon, 6 Mar 2017 11:14:03 +0000
(11:14 +0000)
committer
Steve Brokenshire
<sbrokenshire@xestia.co.uk>
Mon, 6 Mar 2017 11:14:03 +0000
(11:14 +0000)
source/contacteditor/frmContactEditorNickname.cpp
patch
|
blob
|
history
source/contacteditor/frmContactEditorNickname.h
patch
|
blob
|
history
source/contacteditor/frmContactEditorNotes.cpp
patch
|
blob
|
history
source/contacteditor/frmContactEditorNotes.h
patch
|
blob
|
history
diff --git
a/source/contacteditor/frmContactEditorNickname.cpp
b/source/contacteditor/frmContactEditorNickname.cpp
index
9c909a9
..
c67302c
100644
(file)
--- a/
source/contacteditor/frmContactEditorNickname.cpp
+++ b/
source/contacteditor/frmContactEditorNickname.cpp
@@
-17,13
+17,24
@@
// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
#include "frmContactEditorNickname.h"
// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
#include "frmContactEditorNickname.h"
-#include "../common/textprocessing.h"
frmContactEditorNickname::frmContactEditorNickname( wxWindow* parent )
:
frmContactEditorNicknameADT( parent )
{
frmContactEditorNickname::frmContactEditorNickname( wxWindow* parent )
:
frmContactEditorNicknameADT( parent )
{
+ std::vector<std::string> LanguageCodeList = GetLanguageCodeList();
+
+ wxArrayString LanguageList;
+
+ for (auto LanguageItem : LanguageCodeList){
+
+ LanguageList.Add((wxString)LanguageItem, 1);
+
+ }
+
+ cmbLanguage->Append(LanguageList);
+
}
void frmContactEditorNickname::InitAddressEditor( wxInitDialogEvent& event )
}
void frmContactEditorNickname::InitAddressEditor( wxInitDialogEvent& event )
diff --git
a/source/contacteditor/frmContactEditorNickname.h
b/source/contacteditor/frmContactEditorNickname.h
index
e8ea37a
..
e14699c
100644
(file)
--- a/
source/contacteditor/frmContactEditorNickname.h
+++ b/
source/contacteditor/frmContactEditorNickname.h
@@
-28,6
+28,8
@@
Subclass of frmContactEditorNicknameADT, which is generated by wxFormBuilder.
#include <string>
#include "../AppXestiaAddrBk.h"
#include "../enums.h"
#include <string>
#include "../AppXestiaAddrBk.h"
#include "../enums.h"
+#include "../common/textprocessing.h"
+#include "../common/languages.h"
//// end generated include
//// end generated include
diff --git
a/source/contacteditor/frmContactEditorNotes.cpp
b/source/contacteditor/frmContactEditorNotes.cpp
index
b2b6983
..
ab0a64d
100644
(file)
--- a/
source/contacteditor/frmContactEditorNotes.cpp
+++ b/
source/contacteditor/frmContactEditorNotes.cpp
@@
-17,8
+17,6
@@
// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
#include "frmContactEditorNotes.h"
// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
#include "frmContactEditorNotes.h"
-#include "../common/textprocessing.h"
-#include <wx/tokenzr.h>
frmContactEditorNotes::frmContactEditorNotes( wxWindow* parent )
:
frmContactEditorNotes::frmContactEditorNotes( wxWindow* parent )
:
@@
-29,6
+27,21
@@
frmContactEditorNotesADT( parent )
EditorMode = FALSE;
sliPriority->Disable();
EditorMode = FALSE;
sliPriority->Disable();
+
+ // Setup the language combo box.
+
+ std::vector<std::string> LanguageCodeList = GetLanguageCodeList();
+
+ wxArrayString LanguageList;
+
+ for (auto LanguageItem : LanguageCodeList){
+
+ LanguageList.Add((wxString)LanguageItem, 1);
+
+ }
+
+ cmbLanguage->Append(LanguageList);
+
}
void frmContactEditorNotes::EnablePriority( wxCommandEvent& event )
}
void frmContactEditorNotes::EnablePriority( wxCommandEvent& event )
@@
-233,6
+246,8
@@
void frmContactEditorNotes::SetEditorMode(bool EditMode, SectionType SectType)
striter = NotesListLangPtr->find(NotesListIndex);
striter = NotesListLangPtr->find(NotesListIndex);
+ strValue.clear();
+
if (striter->first == NotesListIndex &&
striter != NotesListLangPtr->end()){
if (striter->first == NotesListIndex &&
striter != NotesListLangPtr->end()){
diff --git
a/source/contacteditor/frmContactEditorNotes.h
b/source/contacteditor/frmContactEditorNotes.h
index
bdded43
..
ad7267e
100644
(file)
--- a/
source/contacteditor/frmContactEditorNotes.h
+++ b/
source/contacteditor/frmContactEditorNotes.h
@@
-25,8
+25,12
@@
Subclass of frmContactEditorNotesADT, which is generated by wxFormBuilder.
*/
#include <map>
*/
#include <map>
+#include <wx/tokenzr.h>
+
#include "../AppXestiaAddrBk.h"
#include "../enums.h"
#include "../AppXestiaAddrBk.h"
#include "../enums.h"
+#include "../common/textprocessing.h"
+#include "../common/languages.h"
//// end generated include
//// end generated include
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy