Skip to content

Commit

Permalink
welcome-text is back, a 'last' bug is fixed, try it :)
Browse files Browse the repository at this point in the history
  • Loading branch information
skamster committed Apr 3, 2014
1 parent 1a38eb7 commit 2d70659
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 7 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ Important to know: friendRequests get automatic accepted, also groupchat for deb
<li>Groupchat is working</li>
<li>Make colors and like blocks in chats to do a diffrent between users</li>
<li>Set Loglevel for console and file on the flow</li>
<li>Grouped chatview</li>
<li>Grouped chatview, including create groups and invite people into them</li>
</ul>

<b>Not working / known Bugs</b>
<ul>
<li>fileTransfer</li>
<li>friends keys are weirdly shorted - crap for giving to a friend</li>
<li>friends keys are weirdly shorted - crap for giving to a friend (the own is well)</li>
<li>nr's of peers isn't right (ever 1 persons)</li>
<li>this stuff i couldn't resolve for moment, but there's enough to improve :)</li>
</ul>
Expand Down
2 changes: 1 addition & 1 deletion lib/controller.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ def onClickToxUser(self,item=None):
tmpBeginnString = "<div style='background-color: "+self.colorchanger(tu.friendId)+";float: right;'>"

for msg in tu.messages:
if tu.name[0:7] == "Group #" and msg.individualName != "" and name[0:10] != "ownGroup #":
if tu.name[0:7] == "Group #" and msg.individualName != "" and tu.name[0:10] != "ownGroup #":
name = msg.individualName
else:
name = tu.name
Expand Down
24 changes: 22 additions & 2 deletions ui/main.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Form implementation generated from reading ui file 'main.ui'
#
# Created: Wed Apr 2 22:53:14 2014
# Created: Thu Apr 3 12:54:56 2014
# by: PyQt4 UI code generator 4.10.3
#
# WARNING! All changes made in this file will be lost!
Expand Down Expand Up @@ -33,7 +33,7 @@ def setupUi(self, MainWindow):
sizePolicy.setHeightForWidth(MainWindow.sizePolicy().hasHeightForWidth())
MainWindow.setSizePolicy(sizePolicy)
icon = QtGui.QIcon()
icon.addPixmap(QtGui.QPixmap(_fromUtf8("logo.jpg")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
icon.addPixmap(QtGui.QPixmap(_fromUtf8("../../../.designer/backup/logo.jpg")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
MainWindow.setWindowIcon(icon)
self.centralwidget = QtGui.QWidget(MainWindow)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
Expand Down Expand Up @@ -276,6 +276,26 @@ def retranslateUi(self, MainWindow):
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'Sans Serif\';\"><br /></p></body></html>", None))
self.toxTryCreateGroupchat.setText(_translate("MainWindow", "Create new groupchat", None))
self.toxTrySendButton.setText(_translate("MainWindow", "Send", None))
self.toxTryChat.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:\'Ubuntu\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
"<p style=\" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:x-large; font-weight:600;\">Welcome to tryToxic</span></p>\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">This application is just another tox-apli-client.</p>\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">For using the programm: You\'ve a context-menu in your friendlist, where you could invite friends to groupchats and delete both of them.</p>\n"
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">In parts like username, just press enter/return to save. To get infos, just click a friend.</p>\n"
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">It\'s tried to be useble and easy way. For feedback about usability (and Bugs) go to the tryToxic-Website.</p>\n"
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">tryToxic: https://github.com/skamster/tryToxics</p>\n"
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">PyTox: https://github.com/aitjcize/PyTox</p>\n"
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Project Tox-Core: https://github.com/irungentoo/ProjectTox-Core</p>\n"
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">tryToxic and it\'s full code (exclude PyTox and Project Tox-Core) is licensed by GPL v2:</p>\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">http://www.gnu.org/licenses/gpl-2.0.html</p></body></html>", None))
self.mainTab.setTabText(self.mainTab.indexOf(self.tab_9), _translate("MainWindow", "ToxTry", None))
self.label_23.setText(_translate("MainWindow", "Configs", None))
self.label_26.setText(_translate("MainWindow", "Key", None))
Expand Down
26 changes: 24 additions & 2 deletions ui/main.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</property>
<property name="windowIcon">
<iconset>
<normaloff>logo.jpg</normaloff>logo.jpg</iconset>
<normaloff>../../../.designer/backup/logo.jpg</normaloff>../../../.designer/backup/logo.jpg</iconset>
</property>
<widget class="QWidget" name="centralwidget">
<property name="sizePolicy">
Expand Down Expand Up @@ -56,7 +56,7 @@
</property>
<attribute name="icon">
<iconset>
<normaloff>logo.jpg</normaloff>logo.jpg</iconset>
<normaloff>../../../.designer/backup/logo.jpg</normaloff>../../../.designer/backup/logo.jpg</iconset>
</attribute>
<attribute name="title">
<string>ToxTry</string>
Expand Down Expand Up @@ -289,6 +289,28 @@ p, li { white-space: pre-wrap; }
<property name="readOnly">
<bool>true</bool>
</property>
<property name="html">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:x-large; font-weight:600;&quot;&gt;Welcome to tryToxic&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This application is just another tox-apli-client.&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;For using the programm: You've a context-menu in your friendlist, where you could invite friends to groupchats and delete both of them.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;In parts like username, just press enter/return to save. To get infos, just click a friend.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;It's tried to be useble and easy way. For feedback about usability (and Bugs) go to the tryToxic-Website.&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tryToxic: https://github.com/skamster/tryToxics&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;PyTox: https://github.com/aitjcize/PyTox&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Project Tox-Core: https://github.com/irungentoo/ProjectTox-Core&lt;/p&gt;
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;tryToxic and it's full code (exclude PyTox and Project Tox-Core) is licensed by GPL v2:&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;http://www.gnu.org/licenses/gpl-2.0.html&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
</layout>
Expand Down

0 comments on commit 2d70659

Please sign in to comment.