about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorJames Booth <boothj5@gmail.com>2015-11-22 00:48:18 +0000
committerJames Booth <boothj5@gmail.com>2015-11-22 00:48:18 +0000
commitb4482b9fe1cb121500b85e2716c561d55215afaa (patch)
tree8aba54a17f48676bce3930a83b82b9efb17dafab
parent7a324abcd632a30b603586a1eef80eee4140e91a (diff)
downloadprofani-tty-b4482b9fe1cb121500b85e2716c561d55215afaa.tar.gz
Updated themes
-rw-r--r--src/config/theme.c12
-rw-r--r--src/ui/rosterwin.c2
-rw-r--r--theme_template3
-rw-r--r--themes/boothj528
-rw-r--r--themes/complex3
-rw-r--r--themes/simple3
6 files changed, 37 insertions, 14 deletions
diff --git a/src/config/theme.c b/src/config/theme.c
index b875f46f..271a48c8 100644
--- a/src/config/theme.c
+++ b/src/config/theme.c
@@ -483,6 +483,18 @@ _load_preferences(void)
             g_free(ch);
         }
     }
+    if (g_key_file_has_key(theme, "ui", "roster.contact.indent", NULL)) {
+        gint contact_indent = g_key_file_get_integer(theme, "ui", "roster.contact.indent", NULL);
+        prefs_set_roster_contact_indent(contact_indent);
+    }
+    if (g_key_file_has_key(theme, "ui", "roster.resource.indent", NULL)) {
+        gint resource_indent = g_key_file_get_integer(theme, "ui", "roster.resource.indent", NULL);
+        prefs_set_roster_resource_indent(resource_indent);
+    }
+    if (g_key_file_has_key(theme, "ui", "roster.presence.indent", NULL)) {
+        gint presence_indent = g_key_file_get_integer(theme, "ui", "roster.presence.indent", NULL);
+        prefs_set_roster_presence_indent(presence_indent);
+    }
 
     _set_boolean_preference("privileges", PREF_MUC_PRIVILEGES);
 
diff --git a/src/ui/rosterwin.c b/src/ui/rosterwin.c
index f3a10257..bc04511c 100644
--- a/src/ui/rosterwin.c
+++ b/src/ui/rosterwin.c
@@ -148,7 +148,7 @@ _rosterwin_resources(ProfLayoutSplit *layout, PContact contact, int current_inde
             }
             g_string_append(msg, resource->name);
             if (prefs_get_boolean(PREF_ROSTER_PRIORITY)) {
-                g_string_append_printf(msg, " [%d]", resource->priority);
+                g_string_append_printf(msg, " %d", resource->priority);
             }
             win_newline_lazy(layout->subwin);
             win_print_nowrap(layout->subwin, msg->str, FALSE);
diff --git a/theme_template b/theme_template
index 7eca6ff9..14645ce0 100644
--- a/theme_template
+++ b/theme_template
@@ -84,6 +84,9 @@ roster.priority=
 roster.size=
 roster.header.char=
 roster.contact.char=
+roster.contact.indent=
+roster.resource.indent=
+roster.presence.indent=
 occupants=
 occupants.size=
 occupants.jid=
diff --git a/themes/boothj5 b/themes/boothj5
index 48ada774..3c4fdc1d 100644
--- a/themes/boothj5
+++ b/themes/boothj5
@@ -71,19 +71,21 @@ resource.message=true
 statuses.console=all
 statuses.chat=all
 statuses.muc=all
-roster=true
-roster.offline=true
-roster.resource=true
-roster.presence=true
-roster.status=true
-roster.empty=true
-roster.by=group
-roster.order=presence
-roster.count=true
-roster.priority=true
-roster.size=25
-roster.header.char=@
-roster.contact.char=-
+roster.by=presence                                                                                                 
+roster.offline=true                                                                                                
+roster.empty=false                                                                                                 
+roster.presence=true                                                                                               
+roster.order=presence                                                                                              
+roster.status=true                                                                                                 
+roster.resource=true                                                                                               
+roster.priority=false                                                                                              
+roster=true                                                                                                        
+roster.count=true                                                                                                  
+roster.size=25                                                                                                     
+roster.contact.indent=1                                                                                            
+roster.resource.indent=2                                                                                           
+roster.presence.indent=-1                                                                                          
+roster.header.char=@ 
 occupants=true
 occupants.size=15
 occupants.jid=false
diff --git a/themes/complex b/themes/complex
index e2667944..ba11735c 100644
--- a/themes/complex
+++ b/themes/complex
@@ -31,6 +31,9 @@ roster.priority=true
 roster.size=25
 roster.header.char=-
 roster.contact.char=-
+roster.contact.indent=2
+roster.resource.indent=2
+roster.presence.indent=2
 privileges=true
 presence=true
 intype=true
diff --git a/themes/simple b/themes/simple
index a31c9c01..ef11247e 100644
--- a/themes/simple
+++ b/themes/simple
@@ -28,6 +28,9 @@ roster.order=presence
 roster.count=false
 roster.priority=false
 roster.size=25
+roster.contact.indent=0
+roster.resource.indent=0
+roster.presence.indent=-1
 privileges=false
 presence=false
 intype=false