5 files changed, 13 insertions(+), 4 deletions(-)

M config-sample.json
M defines.go
M helpers.go
M main.go
M qcard

@@ 6,5 6,6 @@
 			"Password":"supersecret"
 		}
 	],
-        "DetailThreshold": 3
+        "DetailThreshold": 3,
+	"SortByLastname": false
 }

@@ 47,6 47,7 @@ type configStruct struct {
 		Password string
 	}
 	DetailThreshold int
+	SortByLastname  bool
 }
 
 type contactStruct struct {

@@ 133,7 133,11 @@ func (e contactStruct) fancyOutput() {
 		if showColor {
 			fmt.Print(e.Color + colorBlock + ColDefault + ` `)
 		}
-		fmt.Println(e.fullName)
+		if config.SortByLastname {
+			fmt.Println(e.name)
+		} else {
+			fmt.Println(e.fullName)
+		}
 	}
 
 	if showDetails {

@@ 80,8 80,11 @@ func showAddresses(abNo int) {
 
 	// TODO: Allow sort by first and last name
 	sort.Slice(contactsSlice, func(i, j int) bool {
-		return contactsSlice[i].fullName < contactsSlice[j].fullName
-		//return contactsSlice[i].name < contactsSlice[j].name
+		if config.SortByLastname {
+			return contactsSlice[i].name < contactsSlice[j].name
+		} else {
+			return contactsSlice[i].fullName < contactsSlice[j].fullName
+		}
 	})
 
 	if len(contactsSlice) == 0 {