myadm

commit e6d2c5b9ef795343fcea2b9ba29231d62cadd72d
parent f432f8425f0a4f41660c62ff50b7fcb6df228bde
Author: Claudio Alessi <smoppy@gmail.com>
Date:   Sun, 28 Feb 2016 14:03:39 +0100

items.stfl replaces all views

Diffstat:
M
core.c
 | 
25
+++++++++++++------------
D
databases.stfl
 | 
10
----------
A
items.stfl
 | 
10
++++++++++
D
tables.stfl
 | 
10
----------

4 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/core.c b/core.c
@@ -278,12 +278,12 @@ databases(void) {
 	mysql_free_result(res);
 
 	if(!selview->form)
-		selview->form = stfl_create(L"<databases.stfl>");
+		selview->form = stfl_create(L"<items.stfl>");
 
-	stfl_modify(selview->form, L"databases", L"replace_inner", L"vbox"); /* clear */
+	stfl_modify(selview->form, L"items", L"replace_inner", L"vbox"); /* clear */
 	for(item = selview->items; item; item = item->next) {
 		snprintf(txt, sizeof txt, "listitem text:\"%s\"", item->fields[0]);
-		stfl_modify(selview->form, L"databases", L"append", stfl_ipool_towc(ipool, txt));
+		stfl_modify(selview->form, L"items", L"append", stfl_ipool_towc(ipool, txt));
 	}
 	stfl_set(selview->form, L"pos", 0);
 }
@@ -302,12 +302,12 @@ tables(void) {
 	mysql_free_result(res);
 
 	if(!selview->form)
-		selview->form = stfl_create(L"<tables.stfl>");
+		selview->form = stfl_create(L"<items.stfl>");
 
-	stfl_modify(selview->form, L"tables", L"replace_inner", L"vbox"); /* clear */
+	stfl_modify(selview->form, L"items", L"replace_inner", L"vbox"); /* clear */
 	for(item = selview->items; item; item = item->next) {
 		snprintf(txt, sizeof txt, "listitem text:\"%s\"", item->fields[0]);
-		stfl_modify(selview->form, L"tables", L"append", stfl_ipool_towc(ipool, txt));
+		stfl_modify(selview->form, L"items", L"append", stfl_ipool_towc(ipool, txt));
 	}
 	stfl_set(selview->form, L"pos", 0);
 }
@@ -316,7 +316,8 @@ void
 records(void) {
 	Item *item;
 	MYSQL_RES *res;
-	char txt[256];
+	char txt[512];
+	char t[32];
 
 	snprintf(txt, sizeof txt, "select * from `%s`", selitem->fields[0]);
 	if(!(res = mysql_exec(txt)))
@@ -327,19 +328,19 @@ records(void) {
 	mysql_free_result(res);
 
 	if(!selview->form)
-		selview->form = stfl_create(L"<records.stfl>");
+		selview->form = stfl_create(L"<items.stfl>");
 
-	stfl_modify(selview->form, L"records", L"replace_inner", L"vbox"); /* clear */
+	stfl_modify(selview->form, L"items", L"replace_inner", L"vbox"); /* clear */
 	for(item = selview->items; item; item = item->next) {
 		strncpy(txt, "listitem text:\"", sizeof txt);
 		for(int i = 0; i < item->nfields; ++i) {
+			snprintf(t, sizeof t, "%18.16s", item->fields[i]);
 			if(i)
 				strncat(txt, " | ", sizeof txt);
-			strncat(txt, item->fields[i], sizeof txt);
+			strncat(txt, t, sizeof txt);
 		}
 		strncat(txt, "\"", sizeof txt);
-		//snprintf(txt, sizeof txt, "listitem text:\"%s\"", item->fields[0]);
-		stfl_modify(selview->form, L"records", L"append", stfl_ipool_towc(ipool, txt));
+		stfl_modify(selview->form, L"items", L"append", stfl_ipool_towc(ipool, txt));
 	}
 	stfl_set(selview->form, L"pos", 0);
 }
diff --git a/databases.stfl b/databases.stfl
@@ -1,10 +0,0 @@
-vbox[main]
-  .expand:w
-  list[databases]
-    @style_normal:fg=white,bg=black
-    @style_focus:fg=blue,bg=black
-    pos[pos]:0
-  hbox
-    .expand:0
-    label
-      text[stext]:""
diff --git a/items.stfl b/items.stfl
@@ -0,0 +1,10 @@
+vbox[main]
+  .expand:w
+  list[items]
+    @style_normal:fg=white,bg=black
+    @style_focus:fg=blue,bg=black
+    pos[pos]:0
+  hbox
+    .expand:0
+    label
+      text[stext]:""
diff --git a/tables.stfl b/tables.stfl
@@ -1,10 +0,0 @@
-vbox[main]
-  .expand:w
-  list[tables]
-    @style_normal:fg=white,bg=black
-    @style_focus:fg=blue,bg=black
-    pos[pos]:0
-  hbox
-    .expand:0
-    label
-      text[stext]:""