Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
dfc3749a
by Philipp Hörist at 2019-02-02T17:03:57Z
-
15dc059b
by Philipp Hörist at 2019-02-02T18:12:06Z
3 changed files:
Changes:
| 1 |
-.gajim-incoming-nickname {
color: rgb(164, 0, 0)
}.gajim-outgoing-nickname {
color: rgb(52, 101, 164)
}.gajim-outgoing-message-text {
color: rgb(85, 87, 83)
}.gajim-status-message {
color: rgb(78, 154, 6)
}.gajim-url {
color: rgb(32, 74, 135)
}.gajim-highlight-message {
color: rgb(255, 128, 128)
}.gajim-restored-message {
color: rgb(85, 87, 83)
}.gajim-roster-disconnected {
background: rgb(171 ,97 ,97)
}.gajim-roster-connected {
background: rgb(173, 195, 198)
}.gajim-state-composing {
color: rgb(0, 139, 0)
}.gajim-state-inactive {
color: rgb(158, 158, 158)
}.gajim-state-gone {
color: rgb(128, 128, 128)
}.gajim-state-paused {
color: rgb(0, 0, 205)
}
|
|
| \ No newline at end of file | ||
| 1 |
+.gajim-incoming-nickname {
color: rgb(164, 0, 0)
}.gajim-outgoing-nickname {
color: rgb(52, 101, 164)
}.gajim-outgoing-message-text {
color: rgb(85, 87, 83)
}.gajim-status-message {
color: rgb(78, 154, 6)
}.gajim-url {
color: rgb(32, 74, 135)
}.gajim-highlight-message {
color: rgb(255, 128, 128)
}.gajim-restored-message {
color: rgb(85, 87, 83)
}.gajim-roster-disconnected {
background: rgb(171 ,97 ,97)
}.gajim-roster-connected {
background: rgb(173, 195, 198)
}.gajim-state-composing {
color: rgb(0, 139, 0)
}.gajim-state-inactive {
color: rgb(158, 158, 158)
}.gajim-state-gone {
color: rgb(128, 128, 128)
}.gajim-state-paused {
color: rgb(0, 0, 205)
}.gajim-message-placeholder {
color: rgb(195, 195, 192)
}
|
|
| \ No newline at end of file |
| ... | ... | @@ -41,7 +41,6 @@ except Exception: |
| 41 | 41 |
|
| 42 | 42 |
from gajim.common.i18n import _
|
| 43 | 43 |
from gajim.common import app
|
| 44 |
-from gajim.common.const import PEPEventType
|
|
| 45 | 44 |
|
| 46 | 45 |
HAS_PYWIN32 = True
|
| 47 | 46 |
if os.name == 'nt':
|
| ... | ... | @@ -55,14 +54,6 @@ if os.name == 'nt': |
| 55 | 54 |
log = logging.getLogger('gajim.gtkgui_helpers')
|
| 56 | 55 |
|
| 57 | 56 |
|
| 58 |
-class Color:
|
|
| 59 |
- BLACK = Gdk.RGBA(red=0, green=0, blue=0, alpha=1)
|
|
| 60 |
- GREEN = Gdk.RGBA(red=115/255, green=210/255, blue=22/255, alpha=1)
|
|
| 61 |
- RED = Gdk.RGBA(red=204/255, green=0, blue=0, alpha=1)
|
|
| 62 |
- GREY = Gdk.RGBA(red=195/255, green=195/255, blue=192/255, alpha=1)
|
|
| 63 |
- ORANGE = Gdk.RGBA(red=245/255, green=121/255, blue=0/255, alpha=1)
|
|
| 64 |
- |
|
| 65 |
- |
|
| 66 | 57 |
def get_pixbuf_from_data(file_data):
|
| 67 | 58 |
"""
|
| 68 | 59 |
Get image data and returns GdkPixbuf.Pixbuf
|
| ... | ... | @@ -24,10 +24,9 @@ from gi.repository import GLib |
| 24 | 24 |
from gi.repository import GObject
|
| 25 | 25 |
from gi.repository import Pango
|
| 26 | 26 |
|
| 27 |
-from gajim import gtkgui_helpers
|
|
| 28 |
- |
|
| 29 | 27 |
from gajim.common import app
|
| 30 | 28 |
from gajim.common.i18n import _
|
| 29 |
+from gajim.common.const import StyleAttr
|
|
| 31 | 30 |
|
| 32 | 31 |
from gajim.gtk.util import scroll_to_end
|
| 33 | 32 |
|
| ... | ... | @@ -76,9 +75,12 @@ class MessageTextView(Gtk.TextView): |
| 76 | 75 |
self.color_tags = []
|
| 77 | 76 |
self.fonts_tags = []
|
| 78 | 77 |
self.other_tags = {}
|
| 78 |
+ |
|
| 79 |
+ color = app.css_config.get_value(
|
|
| 80 |
+ '.gajim-message-placeholder', StyleAttr.COLOR)
|
|
| 79 | 81 |
self.placeholder_tag = buffer_.create_tag('placeholder')
|
| 80 |
- self.placeholder_tag.set_property('foreground_rgba',
|
|
| 81 |
- gtkgui_helpers.Color.GREY)
|
|
| 82 |
+ self.placeholder_tag.set_property('foreground', color)
|
|
| 83 |
+ |
|
| 82 | 84 |
self.other_tags['bold'] = buffer_.create_tag('bold')
|
| 83 | 85 |
self.other_tags['bold'].set_property('weight', Pango.Weight.BOLD)
|
| 84 | 86 |
self.begin_tags['bold'] = '<strong>'
|