Permalink
Browse files

Fixed tabbed windows, trying to debug a leak..

  • Loading branch information...
1 parent a3d36be commit e9d824ed5eb833a1e0b9e0b6964d13114b84fc11 @mnunberg committed Oct 19, 2010
Showing with 179 additions and 136 deletions.
  1. +7 −4 py/gui/chatwindow.py
  2. +2 −2 py/gui/chatwindow_auto.py
  3. +1 −1 py/gui/chatwindow_auto.ui
  4. +169 −129 py/gui/tabwindows.py
View
@@ -14,6 +14,8 @@
from PyQt4.QtCore import (QPoint, QSize, Qt, QObject, SIGNAL,)
+from tabwindows import ChatPane, TabContainer
+
signal_connect = QObject.connect
CHAT, IM = (1,2)
@@ -24,7 +26,6 @@
from html_fmt import simplify_css, process_input, insert_smileys
import smileys_rc
from gui_util import qlw_delitem, qlw_additem, TINY_VERTICAL_SCROLLBAR_STYLE, stylesheet_append
-from tabwindows import ChatPane, DragBar, TabContainer
import datetime
import yobotops
import re
@@ -220,7 +221,6 @@ def _wheelEvent(event):
signal_connect(w.zoom_in, SIGNAL("clicked()"), convtext_zoomIn)
signal_connect(w.zoom_out, SIGNAL("clicked()"), convtext_zoomOut)
- self.centralWidget().layout().setMenuBar(DragBar(self, "Drag me"))
left, top, right, bottom = self.centralWidget().layout().getContentsMargins()
self.centralWidget().layout().setContentsMargins(left, 0, right, bottom)
@@ -480,6 +480,9 @@ def roomLeft(self):
_ChatText.errFmt)
if __name__ == "__main__":
+ log_err("MEMSTATS")
+ from memcheckutil import memstats
+ memstats()
import sys
import random
from yobotclass import YobotAccount
@@ -521,7 +524,7 @@ def spamtext(text="Some Text", iterations=100, format=_ChatText.defaultFmt):
first = ChatWindow(None, target="first", acct_obj=YobotAccount(), type=CHAT)
second = ChatWindow(None, target="second", acct_obj=YobotAccount(), type=CHAT)
third = ChatWindow(None, target="third", acct_obj=YobotAccount(), type=IM)
- fillwindow(first)
- fillwindow(second)
+ #fillwindow(first)
+ #fillwindow(second)
app.exec_()
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'chatwindow_auto.ui'
#
-# Created: Sat Oct 16 01:42:28 2010
+# Created: Mon Oct 18 16:14:06 2010
# by: PyQt4 UI code generator 4.7.3
#
# WARNING! All changes made in this file will be lost!
@@ -302,7 +302,7 @@ def setupUi(self, w_chatwindow):
self.horizontalLayout.addWidget(self.underline)
self.gridLayout_3.addWidget(self.format_button_frame, 0, 5, 1, 1)
self.fg_color = QtGui.QToolButton(self.w_formatframe)
- self.fg_color.setMinimumSize(QtCore.QSize(16, 24))
+ self.fg_color.setMinimumSize(QtCore.QSize(27, 24))
self.fg_color.setMaximumSize(QtCore.QSize(24, 27))
self.fg_color.setStyleSheet("None")
self.fg_color.setText("")
@@ -687,7 +687,7 @@ margin-bottom:2px
<widget class="QToolButton" name="fg_color">
<property name="minimumSize">
<size>
- <width>16</width>
+ <width>27</width>
<height>24</height>
</size>
</property>
Oops, something went wrong.

0 comments on commit e9d824e

Please sign in to comment.