From 30b5f112fd81890411d6fe52c1f442f4433e0d01 Mon Sep 17 00:00:00 2001 From: James Booth Date: Thu, 26 Feb 2015 23:23:15 +0000 Subject: [PATCH 1/6] Updated themes for release --- theme_template | 72 ++++++++++++++++++++++++++++++++++++++++ themes/advanced | 69 -------------------------------------- themes/aqua | 34 +++++++++++-------- themes/batman | 19 +++++++++-- themes/boothj5 | 75 ++++++++++++++++++++++-------------------- themes/complex | 22 +++++++++++++ themes/forest | 60 ++++++++++++++++----------------- themes/hacker | 58 ++++++++++++++++---------------- themes/headache | 39 ++++++++++++++-------- themes/joker | 53 ++++++++++++++++++----------- themes/minimal | 62 ---------------------------------- themes/mono | 58 ++++++++++++++++---------------- themes/orange | 37 ++++++++++++--------- themes/original | 60 ++++++++++++++++----------------- themes/original_bright | 58 ++++++++++++++++---------------- themes/shade | 41 +++++++++++++++-------- themes/simple | 65 ++++++------------------------------ themes/spawn | 54 ++++++++++++++++++------------ themes/whiteness | 43 +++++++++++++++--------- 19 files changed, 499 insertions(+), 480 deletions(-) create mode 100644 theme_template delete mode 100644 themes/advanced create mode 100644 themes/complex delete mode 100644 themes/minimal diff --git a/theme_template b/theme_template new file mode 100644 index 00000000..ece971a8 --- /dev/null +++ b/theme_template @@ -0,0 +1,72 @@ +[colours] +bkgnd= +titlebar= +titlebar.text= +titlebar.brackets= +titlebar.unencrypted= +titlebar.encrypted= +titlebar.untrusted= +titlebar.trusted= +titlebar.online= +titlebar.offline= +titlebar.away= +titlebar.chat= +titlebar.dnd= +titlebar.xa= +statusbar= +statusbar.text= +statusbar.brackets= +statusbar.active= +statusbar.new= +main.text= +main.text.me= +main.text.them= +main.splash= +main.time= +input.text= +subscribed= +unsubscribed= +otr.started.trusted= +otr.started.untrusted= +otr.ended= +otr.trusted= +otr.untrusted= +online= +away= +chat= +dnd= +xa= +offline= +incoming= +typing= +gone= +error= +roominfo= +roommention= +me= +them= +roster.header= +occupants.header= + +[ui] +beep= +flash= +splash= +wrap= +time= +privileges= +presence= +intype= +otr.warn= +resource.title= +resource.message= +statuses.console= +statuses.chat= +statuses.muc= +roster= +roster.offline= +roster.resource= +roster.by= +roster.size= +occupants= +occupants.size= \ No newline at end of file diff --git a/themes/advanced b/themes/advanced deleted file mode 100644 index a00948d8..00000000 --- a/themes/advanced +++ /dev/null @@ -1,69 +0,0 @@ -[colours] -bkgnd=default -titlebar=blue -statusbar=blue -titlebar.text=bold_white -titlebar.brackets=white -statusbar.text=bold_white -statusbar.brackets=white -statusbar.active=bold_cyan -statusbar.new=bold_green -main.text=white -main.text.me=cyan -main.text.them=bold_white -input.text=bold_green -main.time=yellow -main.splash=bold_red -online=bold_green -away=bold_cyan -chat=bold_white -dnd=magenta -xa=bold_blue -offline=red -typing=yellow -gone=red -error=red -incoming=bold_yellow -roominfo=yellow -roommention=bold_red -me=blue -them=bold_green -titlebar.unencrypted=bold_red -titlebar.encrypted=bold_white -titlebar.untrusted=bold_yellow -titlebar.trusted=bold_white -titlebar.online=bold_green -titlebar.offline=bold_red -titlebar.away=bold_cyan -titlebar.xa=bold_cyan -titlebar.dnd=bold_red -titlebar.chat=bold_green -otr.started.trusted=green -otr.started.untrusted=yellow -otr.ended=red -otr.trusted=green -otr.untrusted=yellow -roster.header=bold_yellow -occupants.header=bold_yellow - -[ui] -intype=true -beep=false -flash=false -privileges=true -presence=true -wrap=true -time=minutes -statuses.muc=off -statuses.chat=online -statuses.console=off -occupants=true -occupants.size=15 -roster=true -roster.size=25 -roster.offline=true -roster.resource=true -roster.by=presence -otr.warn=true - - diff --git a/themes/aqua b/themes/aqua index 7474d072..fe3fd56a 100644 --- a/themes/aqua +++ b/themes/aqua @@ -1,9 +1,19 @@ [colours] bkgnd=default titlebar=blue -statusbar=blue titlebar.text=bold_white titlebar.brackets=white +titlebar.unencrypted=cyan +titlebar.encrypted=white +titlebar.untrusted=cyan +titlebar.trusted=white +titlebar.online=bold_white +titlebar.offline=cyan +titlebar.away=white +titlebar.chat=bold_white +titlebar.dnd=cyan +titlebar.xa=bold_cyan +statusbar=blue statusbar.text=bold_white statusbar.brackets=white statusbar.active=cyan @@ -11,31 +21,29 @@ statusbar.new=white main.text=blue main.text.me=bold_cyan main.text.them=bold_white -input.text=white -main.time=cyan main.splash=bold_white +main.time=cyan +input.text=white +subscribed=bold_cyan +unsubscribed=blue +otr.started.trusted=white +otr.started.untrusted=cyan +otr.ended=cyan +otr.trusted=white +otr.untrusted=cyan online=bold_cyan away=bold_blue chat=white dnd=blue xa=cyan offline=bold_black +incoming=bold_cyan typing=cyan gone=blue error=bold_white -incoming=bold_cyan roominfo=white roommention=bold_blue me=cyan them=white -titlebar.unencrypted=cyan -titlebar.encrypted=white -titlebar.untrusted=cyan -titlebar.trusted=white -otr.started.trusted=white -otr.started.untrusted=cyan -otr.ended=cyan -otr.trusted=white -otr.untrusted=cyan roster.header=bold_white occupants.header=bold_white diff --git a/themes/batman b/themes/batman index fc8ce1be..358fc559 100644 --- a/themes/batman +++ b/themes/batman @@ -17,14 +17,13 @@ away=yellow chat=green dnd=green xa=yellow -offline=grey +offline=bold_black typing=cyan gone=red error=red incoming=yellow roominfo=green -roommention=cyan -me=black +me=black_bold them=yellow titlebar.unencrypted=red titlebar.encrypted=green @@ -35,3 +34,17 @@ otr.started.untrusted=red otr.ended=yellow otr.trusted=green otr.untrusted=red + +titlebar.online=magenta +titlebar.offline=black +titlebar.away=magenta +titlebar.chat=magenta +titlebar.dnd=magenta +titlebar.xa=magenta +main.text.me=white +main.text.them=white +subscribed=magenta +unsubscribed=black_bold +roommention=cyan +roster.header=yellow +occupants.header=yellow \ No newline at end of file diff --git a/themes/boothj5 b/themes/boothj5 index 3e086903..cd6379cd 100644 --- a/themes/boothj5 +++ b/themes/boothj5 @@ -1,33 +1,8 @@ [colours] bkgnd=default titlebar=blue -statusbar=blue titlebar.text=bold_white titlebar.brackets=white -statusbar.text=bold_white -statusbar.brackets=white -statusbar.active=bold_cyan -statusbar.new=bold_green -main.text=white -main.text.me=cyan -main.text.them=bold_white -input.text=bold_green -main.time=yellow -main.splash=bold_red -online=bold_green -away=bold_cyan -chat=bold_white -dnd=magenta -xa=bold_blue -offline=red -typing=yellow -gone=red -error=red -incoming=bold_yellow -roominfo=yellow -roommention=bold_red -me=blue -them=bold_green titlebar.unencrypted=bold_red titlebar.encrypted=bold_white titlebar.untrusted=bold_yellow @@ -38,32 +13,62 @@ titlebar.away=bold_cyan titlebar.xa=bold_cyan titlebar.dnd=bold_red titlebar.chat=bold_green +statusbar=blue +statusbar.text=bold_white +statusbar.brackets=white +statusbar.active=bold_cyan +statusbar.new=bold_green +main.text=white +main.text.me=cyan +main.text.them=bold_white +main.splash=bold_red +main.time=yellow +input.text=bold_green +subscribed=bold_green +unsubscribed=red otr.started.trusted=green otr.started.untrusted=yellow otr.ended=red otr.trusted=green otr.untrusted=yellow +online=bold_green +away=bold_cyan +chat=bold_white +dnd=magenta +xa=bold_blue +offline=red +incoming=bold_yellow +typing=yellow +gone=red +error=red +roominfo=yellow +roommention=bold_red +me=blue +them=bold_green roster.header=bold_yellow occupants.header=bold_yellow [ui] -intype=true beep=false flash=false +splash=true +wrap=true +time=seconds privileges=true presence=true -wrap=true -time=minutes -statuses.muc=none -statuses.chat=none -statuses.console=none -occupants=true -occupants.size=15 +intype=true +otr.warn=true +resource.title=true +resource.message=true +statuses.console=all +statuses.chat=all +statuses.muc=all roster=true -roster.size=25 roster.offline=true roster.resource=true roster.by=presence -otr.warn=true +roster.size=25 +occupants=true +occupants.size=15 diff --git a/themes/complex b/themes/complex new file mode 100644 index 00000000..a2695a1f --- /dev/null +++ b/themes/complex @@ -0,0 +1,22 @@ +[ui] +beep=false +flash=false +splash=true +wrap=true +time=seconds +resource.title=true +resource.message=true +statuses.console=all +statuses.chat=all +statuses.muc=all +occupants=true +occupants.size=15 +roster=true +roster.offline=true +roster.resource=true +roster.by=presence +roster.size=25 +privileges=true +presence=true +intype=true +otr.warn=true diff --git a/themes/forest b/themes/forest index fd170162..d04bc390 100644 --- a/themes/forest +++ b/themes/forest @@ -1,35 +1,8 @@ [colours] bkgnd=default titlebar=cyan -statusbar=green titlebar.text=black titlebar.brackets=black -statusbar.text=black -statusbar.brackets=black -statusbar.active=bold_green -statusbar.new=white -main.text=bold_cyan -main.text.me=yellow -main.text.them=green -input.text=bold_blue -main.time=bold_green -main.splash=bold_yellow -subscribed=green -unsubscribed=bold_black -online=green -away=blue -chat=green -dnd=bold_black -xa=blue -offline=bold_black -typing=yellow -gone=bold_black -error=bold_black -incoming=bold_yellow -roominfo=yellow -roommention=bold_cyan -me=blue -them=bold_blue titlebar.unencrypted=black titlebar.encrypted=white titlebar.untrusted=white @@ -37,13 +10,40 @@ titlebar.trusted=white titlebar.online=white titlebar.offline=white titlebar.away=white -titlebar.xa=white -titlebar.dnd=white titlebar.chat=white +titlebar.dnd=white +titlebar.xa=white +statusbar=green +statusbar.text=black +statusbar.brackets=black +statusbar.active=bold_green +statusbar.new=white +main.text=bold_cyan +main.text.me=yellow +main.text.them=green +main.splash=bold_yellow +main.time=bold_green +input.text=bold_blue +subscribed=green +unsubscribed=bold_black otr.started.trusted=green otr.started.untrusted=yellow otr.ended=red otr.trusted=green otr.untrusted=yellow +online=green +away=blue +chat=green +dnd=bold_black +xa=blue +offline=bold_black +incoming=bold_yellow +typing=yellow +gone=bold_black +error=bold_black +roominfo=yellow +roommention=bold_cyan +me=blue +them=bold_blue roster.header=bold_green -occupants.header=bold_green +occupants.header=bold_green \ No newline at end of file diff --git a/themes/hacker b/themes/hacker index 09928f61..a81a635c 100644 --- a/themes/hacker +++ b/themes/hacker @@ -1,33 +1,8 @@ [colours] bkgnd=default titlebar=green -statusbar=green titlebar.text=black titlebar.brackets=black -statusbar.text=black -statusbar.brackets=black -statusbar.active=black -statusbar.new=black -main.text=green -main.text.me=green -main.text.them=green -input.text=bold_green -main.time=bold_green -main.splash=bold_green -online=bold_green -away=green -chat=bold_green -dnd=green -xa=green -offline=green -typing=green -gone=green -error=bold_green -incoming=bold_green -roominfo=green -roommention=bold_green -me=green -them=bold_green titlebar.unencrypted=black titlebar.encrypted=black titlebar.untrusted=black @@ -35,13 +10,40 @@ titlebar.trusted=black titlebar.online=black titlebar.offline=black titlebar.away=black -titlebar.xa=black -titlebar.dnd=black titlebar.chat=black +titlebar.dnd=black +titlebar.xa=black +statusbar=green +statusbar.text=black +statusbar.brackets=black +statusbar.active=black +statusbar.new=black +main.text=green +main.text.me=green +main.text.them=green +main.splash=bold_green +main.time=bold_green +input.text=bold_green +subscribed=bold_green +unsubscribed=green otr.started.trusted=green otr.started.untrusted=green otr.ended=green otr.trusted=green otr.untrusted=green +online=bold_green +away=green +chat=bold_green +dnd=green +xa=green +offline=green +incoming=bold_green +typing=green +gone=green +error=bold_green +roominfo=green +roommention=bold_green +me=green +them=bold_green roster.header=bold_green -occupants.header=bold_green +occupants.header=bold_green \ No newline at end of file diff --git a/themes/headache b/themes/headache index ea5738ce..3a84d976 100644 --- a/themes/headache +++ b/themes/headache @@ -1,36 +1,49 @@ [colours] bkgnd=default titlebar=magenta -statusbar=default titlebar.text=white titlebar.brackets=white +titlebar.unencrypted=black +titlebar.encrypted=cyan +titlebar.untrusted=yellow +titlebar.trusted=cyan +titlebar.online=white +titlebar.offline=black +titlebar.away=white +titlebar.chat=white +titlebar.dnd=black +titlebar.xa=white +statusbar=default statusbar.text=white statusbar.brackets=red statusbar.active=cyan statusbar.new=white main.text=blue -input.text=yellow -main.time=green +main.text.me=white +main.text.them=bold_white main.splash=red +main.time=green +input.text=yellow +subscribed=bold_magenta +unsubscribed=bold_black +otr.started.trusted=cyan +otr.started.untrusted=yellow +otr.ended=blue +otr.trusted=cyan +otr.untrusted=yellow online=red away=cyan chat=green dnd=megenta xa=cyan offline=green +incoming=yellow typing=magenta gone=yellow error=red -incoming=yellow roominfo=white +roommention=bold_green me=white them=white -titlebar.unencrypted=black -titlebar.encrypted=cyan -titlebar.untrusted=yellow -titlebar.trusted=cyan -otr.started.trusted=cyan -otr.started.untrusted=yellow -otr.ended=blue -otr.trusted=cyan -otr.untrusted=yellow +roster.header=bold_cyan +occupants.header=bold_cyan \ No newline at end of file diff --git a/themes/joker b/themes/joker index 3c8adc39..a0986242 100644 --- a/themes/joker +++ b/themes/joker @@ -1,36 +1,49 @@ [colours] bkgnd=default titlebar=magenta -statusbar=magenta titlebar.text=white titlebar.brackets=cyan +titlebar.unencrypted=red +titlebar.encrypted=green +titlebar.untrusted=red +titlebar.trusted=green +titlebar.online=white +titlebar.offline=black +titlebar.away=white +titlebar.chat=white +titlebar.dnd=black +titlebar.xa=white +statusbar=magenta statusbar.text=green statusbar.brackets=cyan statusbar.active=green statusbar.new=white main.text=white -input.text=green -main.time=white +main.text.me=white +main.text.them=white main.splash=green -online=green -away=yellow -chat=green -dnd=green -xa=yellow -offline=grey -typing=green -gone=red -error=red -incoming=yellow -roominfo=green -me=magenta -them=green -titlebar.unencrypted=red -titlebar.encrypted=green -titlebar.untrusted=red -titlebar.trusted=green +main.time=white +input.text=green +subscribed=green +unsubscribed=white otr.started.trusted=green otr.started.untrusted=red otr.ended=yellow otr.trusted=green otr.untrusted=red +online=green +away=yellow +chat=green +dnd=green +xa=yellow +offline=bold_black +incoming=yellow +typing=green +gone=red +error=red +roominfo=green +roommention=green +me=magenta +them=green +roster.header=magenta +occupants.header=magenta \ No newline at end of file diff --git a/themes/minimal b/themes/minimal deleted file mode 100644 index cabf1887..00000000 --- a/themes/minimal +++ /dev/null @@ -1,62 +0,0 @@ -[colours] -bkgnd=default -titlebar=blue -statusbar=blue -titlebar.text=bold_white -titlebar.brackets=white -statusbar.text=bold_white -statusbar.brackets=white -statusbar.active=bold_cyan -statusbar.new=bold_green -main.text=white -main.text.me=cyan -main.text.them=bold_white -input.text=bold_green -main.time=yellow -main.splash=bold_red -online=bold_green -away=bold_cyan -chat=bold_white -dnd=magenta -xa=bold_blue -offline=red -typing=yellow -gone=red -error=red -incoming=bold_yellow -roominfo=yellow -roommention=bold_red -me=blue -them=bold_green -titlebar.unencrypted=bold_red -titlebar.encrypted=bold_white -titlebar.untrusted=bold_yellow -titlebar.trusted=bold_white -titlebar.online=bold_green -titlebar.offline=bold_red -titlebar.away=bold_cyan -titlebar.xa=bold_cyan -titlebar.dnd=bold_red -titlebar.chat=bold_green -otr.started.trusted=green -otr.started.untrusted=yellow -otr.ended=red -otr.trusted=green -otr.untrusted=yellow -roster.header=bold_yellow -occupants.header=bold_yellow - -[ui] -intype=true -beep=false -flash=false -privileges=false -presence=false -wrap=false -time=off -statuses.muc=all -statuses.chat=all -statuses.console=all -occupants=false -roster=false -otr.warn=false diff --git a/themes/mono b/themes/mono index 42beb174..779d04ff 100644 --- a/themes/mono +++ b/themes/mono @@ -1,33 +1,8 @@ [colours] bkgnd=default titlebar=white -statusbar=white titlebar.text=black titlebar.brackets=black -statusbar.text=black -statusbar.brackets=black -statusbar.active=black -statusbar.new=black -main.text=white -main.text.me=white -main.text.them=white -input.text=white -main.time=white -main.splash=white -online=white -away=white -chat=white -dnd=white -xa=white -offline=white -typing=white -gone=white -error=white -incoming=white -roominfo=white -roommention=white -me=white -them=white titlebar.unencrypted=black titlebar.encrypted=black titlebar.untrusted=black @@ -35,13 +10,40 @@ titlebar.trusted=black titlebar.online=black titlebar.offline=black titlebar.away=black -titlebar.xa=black -titlebar.dnd=black titlebar.chat=black +titlebar.dnd=black +titlebar.xa=black +statusbar=white +statusbar.text=black +statusbar.brackets=black +statusbar.active=black +statusbar.new=black +main.text=white +main.text.me=white +main.text.them=white +main.splash=white +main.time=white +input.text=white +subscribed=white +unsubscribed=white otr.started.trusted=white otr.started.untrusted=white otr.ended=white otr.trusted=white otr.untrusted=white +online=white +away=white +chat=white +dnd=white +xa=white +offline=white +incoming=white +typing=white +gone=white +error=white +roominfo=white +roommention=white +me=white +them=white roster.header=white -occupants.header=white +occupants.header=white \ No newline at end of file diff --git a/themes/orange b/themes/orange index cff5f58b..57df02fd 100644 --- a/themes/orange +++ b/themes/orange @@ -3,6 +3,16 @@ bkgnd=yellow titlebar=red titlebar.text=black titlebar.brackets=blue +titlebar.unencrypted=black +titlebar.encrypted=white +titlebar.untrusted=white +titlebar.trusted=green +titlebar.online=white +titlebar.offline=black +titlebar.away=white +titlebar.chat=white +titlebar.dnd=black +titlebar.xa=white statusbar=green statusbar.text=black statusbar.brackets=blue @@ -11,32 +21,29 @@ statusbar.new=white main.text=black main.text.me=black main.text.them=green -main.time=blue main.splash=blue +main.time=blue input.text=black subscribed=blue -unsubscribed=red +unsubscribed=white +otr.started.trusted=green +otr.started.untrusted=white +otr.ended=red +otr.trusted=green +otr.untrusted=white online=blue away=white chat=blue dnd=white xa=white offline=white +incoming=blue typing=black gone=green error=red -incoming=blue roominfo=blue -me=blue -them=green -titlebar.unencrypted=black -titlebar.encrypted=white -titlebar.untrusted=white -titlebar.trusted=green -otr.started.trusted=green -otr.started.untrusted=white -otr.ended=red -otr.trusted=green -otr.untrusted=white +roommention=blue +me=black +them=black roster.header=black -occupants.header=black +occupants.header=black \ No newline at end of file diff --git a/themes/original b/themes/original index db0818c5..33ae041b 100644 --- a/themes/original +++ b/themes/original @@ -1,35 +1,8 @@ [colours] bkgnd=default titlebar=blue -statusbar=blue titlebar.text=white titlebar.brackets=cyan -statusbar.text=white -statusbar.brackets=cyan -statusbar.active=cyan -statusbar.new=white -main.text=white -main.text.me=white -main.text.them=white -input.text=white -main.time=white -main.splash=cyan -subscribed=green -unsubscribed=red -online=green -away=cyan -chat=green -dnd=red -xa=cyan -offline=red -typing=yellow -gone=red -error=red -incoming=yellow -roominfo=yellow -roommention=yellow -me=yellow -them=green titlebar.unencrypted=red titlebar.encrypted=white titlebar.untrusted=yellow @@ -37,13 +10,40 @@ titlebar.trusted=white titlebar.online=white titlebar.offline=white titlebar.away=white -titlebar.xa=white -titlebar.dnd=white titlebar.chat=white +titlebar.dnd=white +titlebar.xa=white +statusbar=blue +statusbar.text=white +statusbar.brackets=cyan +statusbar.active=cyan +statusbar.new=white +main.text=white +main.text.me=white +main.text.them=white +main.splash=cyan +main.time=white +input.text=white +subscribed=green +unsubscribed=red otr.started.trusted=green otr.started.untrusted=yellow otr.ended=red otr.trusted=green otr.untrusted=yellow +online=green +away=cyan +chat=green +dnd=red +xa=cyan +offline=red +incoming=yellow +typing=yellow +gone=yellow +error=red +roominfo=yellow +roommention=yellow +me=yellow +them=green roster.header=yellow -occupants.header=yellow +occupants.header=yellow \ No newline at end of file diff --git a/themes/original_bright b/themes/original_bright index ffe0c12c..4ad4af17 100644 --- a/themes/original_bright +++ b/themes/original_bright @@ -1,35 +1,8 @@ [colours] bkgnd=default titlebar=blue -statusbar=blue titlebar.text=bold_white titlebar.brackets=bold_cyan -statusbar.text=bold_white -statusbar.brackets=bold_cyan -statusbar.active=bold_cyan -statusbar.new=bold_white -main.text=bold_white -main.text.me=bold_white -main.text.them=bold_white -input.text=bold_white -main.time=bold_white -main.splash=bold_cyan -subscribed=bold_green -unsubscribed=bold_red -online=bold_green -away=bold_cyan -chat=bold_green -dnd=bold_red -xa=bold_cyan -offline=bold_red -typing=bold_yellow -gone=bold_red -error=bold_red -incoming=bold_yellow -roominfo=bold_yellow -roommention=bold_yellow -me=bold_yellow -them=bold_green titlebar.unencrypted=bold_red titlebar.encrypted=bold_white titlebar.untrusted=bold_yellow @@ -37,13 +10,40 @@ titlebar.trusted=bold_white titlebar.online=bold_white titlebar.offline=bold_white titlebar.away=bold_white -titlebar.xa=bold_white -titlebar.dnd=bold_white titlebar.chat=bold_white +titlebar.dnd=bold_white +titlebar.xa=bold_white +statusbar=blue +statusbar.text=bold_white +statusbar.brackets=bold_cyan +statusbar.active=bold_cyan +statusbar.new=bold_white +main.text=bold_white +main.text.me=bold_white +main.text.them=bold_white +main.splash=bold_cyan +main.time=bold_white +input.text=bold_white +subscribed=bold_green +unsubscribed=bold_red otr.started.trusted=bold_green otr.started.untrusted=bold_yellow otr.ended=bold_red otr.trusted=bold_green otr.untrusted=bold_yellow +online=bold_green +away=bold_cyan +chat=bold_green +dnd=bold_red +xa=bold_cyan +offline=bold_red +incoming=bold_yellow +typing=bold_yellow +gone=bold_yellow +error=bold_red +roominfo=bold_yellow +roommention=bold_yellow +me=bold_yellow +them=bold_green roster.header=bold_yellow occupants.header=bold_yellow diff --git a/themes/shade b/themes/shade index 0b61a0f7..856b2fa4 100644 --- a/themes/shade +++ b/themes/shade @@ -1,36 +1,49 @@ [colours] bkgnd=default titlebar=default -statusbar=default titlebar.text=white titlebar.brackets=magenta +titlebar.unencrypted=red +titlebar.encrypted=green +titlebar.untrusted=red +titlebar.trusted=green +titlebar.online=green +titlebar.offline=red +titlebar.away=green +titlebar.chat=green +titlebar.dnd=red +titlebar.xa=green +statusbar=default statusbar.text=magenta statusbar.brackets=magenta statusbar.active=white statusbar.new=green main.text=white -input.text=white -main.time=magenta +main.text.me=white +main.text.them=white main.splash=magenta +main.time=magenta +input.text=white +subscribed=green +unsubscribed=yallow +otr.started.trusted=green +otr.started.untrusted=red +otr.ended=yellow +otr.trusted=green +otr.untrusted=red online=green away=yellow chat=green dnd=green xa=yellow offline=white +incoming=yellow typing=green gone=red error=red -incoming=yellow roominfo=green -me=black +roommention=green +me=bold_black them=magenta -titlebar.unencrypted=red -titlebar.encrypted=green -titlebar.untrusted=red -titlebar.trusted=green -otr.started.trusted=green -otr.started.untrusted=red -otr.ended=yellow -otr.trusted=green -otr.untrusted=red +roster.header=magenta +occupants.header=magenta \ No newline at end of file diff --git a/themes/simple b/themes/simple index 44c6977b..0b9baab5 100644 --- a/themes/simple +++ b/themes/simple @@ -1,67 +1,22 @@ -[colours] -bkgnd=default -titlebar=blue -statusbar=blue -titlebar.text=bold_white -titlebar.brackets=white -statusbar.text=bold_white -statusbar.brackets=white -statusbar.active=bold_cyan -statusbar.new=bold_green -main.text=white -main.text.me=cyan -main.text.them=bold_white -input.text=bold_green -main.time=yellow -main.splash=bold_red -online=bold_green -away=bold_cyan -chat=bold_white -dnd=magenta -xa=bold_blue -offline=red -typing=yellow -gone=red -error=red -incoming=bold_yellow -roominfo=yellow -roommention=bold_red -me=blue -them=bold_green -titlebar.unencrypted=bold_red -titlebar.encrypted=bold_white -titlebar.untrusted=bold_yellow -titlebar.trusted=bold_white -titlebar.online=bold_green -titlebar.offline=bold_red -titlebar.away=bold_cyan -titlebar.xa=bold_cyan -titlebar.dnd=bold_red -titlebar.chat=bold_green -otr.started.trusted=green -otr.started.untrusted=yellow -otr.ended=red -otr.trusted=green -otr.untrusted=yellow -roster.header=bold_yellow -occupants.header=bold_yellow - [ui] -intype=false beep=false flash=false -privileges=false -presence=false +splash=true wrap=true time=minutes -statuses.muc=off -statuses.chat=online -statuses.console=off +resource.title=false +resource.message=false +statuses.console=none +statuses.chat=none +statuses.muc=none occupants=true occupants.size=15 roster=true -roster.size=25 roster.offline=false roster.resource=false roster.by=presence +roster.size=25 +privileges=false +presence=false +intype=false otr.warn=false diff --git a/themes/spawn b/themes/spawn index 0b403905..44c9f098 100644 --- a/themes/spawn +++ b/themes/spawn @@ -1,37 +1,49 @@ [colours] bkgnd=default titlebar=red -statusbar=red titlebar.text=yellow titlebar.brackets=green +titlebar.unencrypted=red +titlebar.encrypted=green +titlebar.untrusted=red +titlebar.trusted=green +titlebar.online=green +titlebar.offline=red +titlebar.away=green +titlebar.chat=green +titlebar.dnd=red +titlebar.xa=green +statusbar=red statusbar.text=yellow statusbar.brackets=green statusbar.active=white statusbar.new=green main.text=white -input.text=green -main.time=red +main.text.me=white +main.text.them=white main.splash=red -online=green -away=yellow -chat=green -dnd=green -xa=yellow -offline=grey -typing=green -gone=red -error=red -incoming=yellow -roominfo=green -roommention=red -me=green -them=yellow -titlebar.unencrypted=red -titlebar.encrypted=green -titlebar.untrusted=red -titlebar.trusted=green +main.time=red +input.text=green +subscribed=green +unsubscribed=red otr.started.trusted=green otr.started.untrusted=red otr.ended=yellow otr.trusted=green otr.untrusted=red +online=green +away=yellow +chat=green +dnd=green +xa=yellow +offline=bold_black +incoming=yellow +typing=green +gone=red +error=red +roominfo=green +roommention=red +me=green +them=yellow +roster.header=white +occupants.header=white \ No newline at end of file diff --git a/themes/whiteness b/themes/whiteness index 597c9c83..c448fcfb 100644 --- a/themes/whiteness +++ b/themes/whiteness @@ -1,36 +1,49 @@ [colours] bkgnd=white titlebar=blue -statusbar=blue titlebar.text=white titlebar.brackets=white +titlebar.unencrypted=red +titlebar.encrypted=white +titlebar.untrusted=yellow +titlebar.trusted=white +titlebar.online=white +titlebar.offline=red +titlebar.away=white +titlebar.chat=white +titlebar.dnd=red +titlebar.xa=white +statusbar=blue statusbar.text=white statusbar.brackets=white statusbar.active=megenta statusbar.new=red main.text=black -input.text=black -main.time=black +main.text.me=black +main.text.them=black main.splash=black +main.time=black +input.text=black +subscribed=green +unsubscribed=red +otr.started.trusted=green +otr.started.untrusted=yellow +otr.ended=red +otr.trusted=green +otr.untrusted=yellow online=green away=cyan chat=green dnd=red xa=cyan offline=red +incoming=yellow typing=yellow gone=red error=red -incoming=yellow roominfo=yellow -me=yellow -them=green -titlebar.unencrypted=red -titlebar.encrypted=white -titlebar.untrusted=yellow -titlebar.trusted=white -otr.started.trusted=green -otr.started.untrusted=yellow -otr.ended=red -otr.trusted=green -otr.untrusted=yellow +roommention=yellow +me=black +them=black +roster.header=black +occupants.header=black \ No newline at end of file From 6be4b400b80d242538824d626297e1f70ed59b53 Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 3 Mar 2015 22:10:01 +0000 Subject: [PATCH 2/6] Fixed swapping windows when in source win --- src/ui/windows.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/ui/windows.c b/src/ui/windows.c index dba5290c..b534e973 100644 --- a/src/ui/windows.c +++ b/src/ui/windows.c @@ -639,20 +639,21 @@ wins_swap(int source_win, int target_win) { ProfWin *source = g_hash_table_lookup(windows, GINT_TO_POINTER(source_win)); - if (source != NULL) { + if (source) { ProfWin *target = g_hash_table_lookup(windows, GINT_TO_POINTER(target_win)); // target window empty - if (target == NULL) { + if (!target) { g_hash_table_steal(windows, GINT_TO_POINTER(source_win)); - status_bar_inactive(source_win); g_hash_table_insert(windows, GINT_TO_POINTER(target_win), source); + status_bar_inactive(source_win); if (win_unread(source) > 0) { status_bar_new(target_win); } else { status_bar_active(target_win); } - if ((wins_get_current_num() == source_win) || (wins_get_current_num() == target_win)) { + if (wins_get_current_num() == source_win) { + wins_set_current_by_num(target_win); ui_switch_win(1); } return TRUE; From f80689dd3549920c444c9613b72f7fc5901a8c5e Mon Sep 17 00:00:00 2001 From: James Booth Date: Tue, 3 Mar 2015 22:22:28 +0000 Subject: [PATCH 3/6] Set version to 0.4.6 --- configure.ac | 2 +- install-all.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 7369f112..a9896555 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ AS_CASE([$host_os], [cygwin], [PLATFORM="cygwin"], [PLATFORM="nix"]) -PACKAGE_STATUS="development" +PACKAGE_STATUS="release" ### Get git branch and revision if in development if test "x$PACKAGE_STATUS" = xdevelopment; then diff --git a/install-all.sh b/install-all.sh index cc32d8fd..7970804b 100755 --- a/install-all.sh +++ b/install-all.sh @@ -74,6 +74,7 @@ install_lib_strophe() echo git clone git://github.com/strophe/libstrophe.git cd libstrophe + git checkout 0.8.7 ./bootstrap.sh ./configure --prefix=$1 make @@ -102,6 +103,7 @@ cyg_install_lib_strophe() echo git clone git://github.com/strophe/libstrophe.git cd libstrophe + git checkout 0.8.7 ./bootstrap.sh ./bootstrap.sh # second call seems to fix problem on cygwin ./configure --prefix=/usr From 0dee898c01c851deeda17602d809c02708483a14 Mon Sep 17 00:00:00 2001 From: James Booth Date: Wed, 4 Mar 2015 00:45:42 +0000 Subject: [PATCH 4/6] Set version to 0.4.7 development --- configure.ac | 4 ++-- install-all.sh | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index a9896555..4665efb9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([profanity], [0.4.6], [boothj5web@gmail.com]) +AC_INIT([profanity], [0.4.7], [boothj5web@gmail.com]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_HEADERS([src/config.h]) @@ -20,7 +20,7 @@ AS_CASE([$host_os], [cygwin], [PLATFORM="cygwin"], [PLATFORM="nix"]) -PACKAGE_STATUS="release" +PACKAGE_STATUS="development" ### Get git branch and revision if in development if test "x$PACKAGE_STATUS" = xdevelopment; then diff --git a/install-all.sh b/install-all.sh index 7970804b..cc32d8fd 100755 --- a/install-all.sh +++ b/install-all.sh @@ -74,7 +74,6 @@ install_lib_strophe() echo git clone git://github.com/strophe/libstrophe.git cd libstrophe - git checkout 0.8.7 ./bootstrap.sh ./configure --prefix=$1 make @@ -103,7 +102,6 @@ cyg_install_lib_strophe() echo git clone git://github.com/strophe/libstrophe.git cd libstrophe - git checkout 0.8.7 ./bootstrap.sh ./bootstrap.sh # second call seems to fix problem on cygwin ./configure --prefix=/usr From 5e1ad0b0d215e11c330ba1e3687119304062d358 Mon Sep 17 00:00:00 2001 From: James Booth Date: Wed, 4 Mar 2015 22:37:42 +0000 Subject: [PATCH 5/6] Added profanity.sh (OSX helper script for codelite) to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 37449348..ba909849 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ # *.[oa] # *~ profanity +profanity.sh *.o *.log *.swp From 7638f379cac3869abdd8530faa09cc7481e99ec6 Mon Sep 17 00:00:00 2001 From: James Booth Date: Wed, 4 Mar 2015 23:32:47 +0000 Subject: [PATCH 6/6] Fixed tests for --disable-otr --- Makefile.am | 6 +++++- tests/testsuite.c | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index d9fa9729..809c3eea 100644 --- a/Makefile.am +++ b/Makefile.am @@ -44,6 +44,7 @@ tests_sources = \ src/roster_list.c src/roster_list.h \ src/xmpp/xmpp.h src/xmpp/form.c \ src/ui/ui.h \ + src/otr/otr.h \ src/command/command.h src/command/command.c \ src/command/commands.h src/command/commands.c \ src/tools/parser.c \ @@ -63,7 +64,6 @@ tests_sources = \ src/ui/titlebar.h src/ui/statusbar.h src/ui/inputwin.h \ src/server_events.c src/server_events.h \ tests/xmpp/stub_xmpp.c \ - tests/otr/stub_otr.c \ tests/ui/stub_ui.c \ tests/log/stub_log.c \ tests/config/stub_accounts.c \ @@ -104,6 +104,9 @@ otr3_sources = \ otr4_sources = \ src/otr/otrlib.h src/otr/otrlibv4.c src/otr/otr.h src/otr/otr.c +otr_test_sources = \ + tests/otr/stub_otr.c + themes_sources = themes/* script_sources = bootstrap.sh configure-debug install-all.sh @@ -111,6 +114,7 @@ script_sources = bootstrap.sh configure-debug install-all.sh man_sources = docs/profanity.1 if BUILD_OTR +tests_sources += $(otr_test_sources) if BUILD_OTR3 core_sources += $(otr3_sources) endif diff --git a/tests/testsuite.c b/tests/testsuite.c index ddfb45cd..645a1a40 100644 --- a/tests/testsuite.c +++ b/tests/testsuite.c @@ -346,9 +346,11 @@ int main(int argc, char* argv[]) { unit_test(cmd_account_set_eval_password_when_password_set), unit_test(cmd_account_set_muc_sets_muc), unit_test(cmd_account_set_nick_sets_nick), +#ifdef HAVE_LIBOTR unit_test(cmd_account_show_message_for_missing_otr_policy), unit_test(cmd_account_show_message_for_invalid_otr_policy), unit_test(cmd_account_set_otr_sets_otr), +#endif unit_test(cmd_account_set_status_shows_message_when_invalid_status), unit_test(cmd_account_set_status_sets_status_when_valid), unit_test(cmd_account_set_status_sets_status_when_last),