Skip to content

Commit

Permalink
#2692 wrap URL / filename at configurable width (default to 480 pixels)
Browse files Browse the repository at this point in the history
git-svn-id: https://xpra.org/svn/Xpra/trunk@25897 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Apr 1, 2020
1 parent 354a14d commit 8981780
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions src/xpra/client/gtk_base/open_requests.py
Expand Up @@ -10,9 +10,11 @@

import gi
gi.require_version("Gtk", "3.0")
from gi.repository import GLib, Gtk, GdkPixbuf
gi.require_version("Pango", "1.0")
from gi.repository import GLib, Gtk, GdkPixbuf, Pango

from xpra.gtk_common.gobject_compat import register_os_signals
from xpra.util import envint
from xpra.os_util import monotonic_time, bytestostr, get_util_logger, WIN32, OSX
from xpra.child_reaper import getChildReaper
from xpra.net.file_transfer import ACCEPT, OPEN, DENY
Expand All @@ -25,6 +27,8 @@

log = get_util_logger()

URI_MAX_WIDTH = envint("XPRA_URI_MAX_WIDTH", 480)


_instance = None
def getOpenRequestsWindow(show_file_upload_cb=None):
Expand Down Expand Up @@ -125,8 +129,13 @@ def populate_table(self):
tb = TableBuilder(rows=1, columns=4, row_spacings=15)
#generate a new table:
self.table = tb.get_table()
def l(s=""):
return Gtk.Label(label=s)
def l(s="", maxw=0):
label = Gtk.Label(label=s)
if maxw>0:
label.set_line_wrap(True)
label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR)
label.set_size_request(maxw, -1)
return label
if not self.requests:
tb.add_row(l("No requests pending"))
else:
Expand All @@ -139,7 +148,7 @@ def l(s=""):
expires_label = l()
self.expire_labels[expires_label] = expires
buttons = self.action_buttons(cb_answer, send_id, dtype, printit, openit)
items = (l(bytestostr(url)), l(details), expires_label, buttons)
items = (l(bytestostr(url), URI_MAX_WIDTH), l(details), expires_label, buttons)
tb.add_row(*items)
self.update_expires_label()
self.alignment.add(self.table)
Expand Down

0 comments on commit 8981780

Please sign in to comment.