From 779ab72842f991c5f86c73c0329b2af5c06272b9 Mon Sep 17 00:00:00 2001
From: Denis Fomin <fominde@gmail.com>
Date: Thu, 8 Dec 2011 22:47:34 +0300
Subject: [PATCH] MsgBoxSizePlugin enabled
---
message_box_size/manifest.ini | 2 +-
message_box_size/msg_box_size.py | 27 +++++++--------------------
2 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/message_box_size/manifest.ini b/message_box_size/manifest.ini
index b33a8274..068a27af 100644
--- a/message_box_size/manifest.ini
+++ b/message_box_size/manifest.ini
@@ -1,7 +1,7 @@
[info]
name: Message Box Size
short_name: message_box_size
-#version: 0.1
+version: 0.1
description: Allows you to adjust the height of the new message input field.
authors: Denis Fomin <fominde@gmail.com>
homepage: http://trac-plugins.gajim.org/wiki/JuickPlugin
diff --git a/message_box_size/msg_box_size.py b/message_box_size/msg_box_size.py
index a3a11a62..cb028dab 100644
--- a/message_box_size/msg_box_size.py
+++ b/message_box_size/msg_box_size.py
@@ -37,37 +37,24 @@ class MsgBoxSizePlugin(GajimPlugin):
class Base(object):
def __init__(self, plugin, chat_control):
- if plugin.config['Do_not_resize']:
- chat_control.msg_textview.set_property('height-request',
- plugin.config['Message_box_size'])
+ chat_control.msg_textview.set_property('height-request',
+ plugin.config['Message_box_size'])
id_ = chat_control.msg_textview.connect('size-request',
self.size_request)
chat_control.handlers[id_] = chat_control.msg_textview
self.chat_control = chat_control
self.plugin = plugin
- self.scrolledwindow = chat_control.conv_scrolledwindow
def size_request(self, msg_textview, requisition):
- if msg_textview.window is None:
- return
-
if self.plugin.config['Do_not_resize']:
- self.chat_control.conv_scrolledwindow.set_property('height-request',
- self.chat_control.conv_scrolledwindow.allocation.height)
self.chat_control.msg_scrolledwindow.set_property(
'vscrollbar-policy', gtk.POLICY_AUTOMATIC)
+ elif requisition.height > self.plugin.config['Message_box_size']:
+ msg_textview.set_property('height-request', requisition.height)
else:
- if requisition.height < self.plugin.config['Message_box_size']:
- allc = self.chat_control.msg_textview.allocation
- allc.height = self.plugin.config['Message_box_size']
- msg_textview.set_size_request(allc.width, allc.height)
- else:
- new_req = self.scrolledwindow.allocation.height - (
- requisition.height - self.plugin.config['Message_box_size'])
- if new_req > 1:
- self.scrolledwindow.set_property('height-request', new_req)
- self.chat_control.msg_textview.set_property('height-request', -1)
+ msg_textview.set_property('height-request',
+ self.plugin.config['Message_box_size'])
def disconnect_from_chat_control(self):
pass
@@ -82,7 +69,7 @@ class MsgBoxSizePluginConfigDialog(GajimPluginConfigDialog):
self.xml.add_objects_from_file(self.GTK_BUILDER_FILE_PATH, ['vbox1'])
self.checkbutton = self.xml.get_object('checkbutton')
self.spinbutton = self.xml.get_object('message_box_size')
- self.spinbutton.get_adjustment().set_all(20, 15, 320, 1, 10, 0)
+ self.spinbutton.get_adjustment().set_all(20, 16, 200, 1, 10, 0)
vbox = self.xml.get_object('vbox1')
self.child.pack_start(vbox)
--
GitLab