[Branch ~piorun/piorun/devel] Rev 64: menu rearrangement

1 view
Skip to first unread message

nor...@launchpad.net

unread,
Dec 30, 2007, 5:31:07 PM12/30/07
to piorun...@googlegroups.com
------------------------------------------------------------
revno: 64
committer: doza <doza@orkan>
branch nick: devel
timestamp: Sun 2007-12-30 23:30:41 +0100
message:
menu rearrangement
modified:
doc/piorun.xmi
res/ui.xml
src/Chat.boo
src/Database.boo
src/Session.boo
src/actions/EditActions.boo
src/actions/ViewActions.boo

=== modified file 'doc/piorun.xmi'
--- a/doc/piorun.xmi 2007-11-18 19:53:55 +0000
+++ b/doc/piorun.xmi 2007-12-30 22:30:41 +0000
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<XMI xmlns:UML="http://schema.omg.org/spec/UML/1.3" verified="false" timestamp="2007-11-17T23:00:26" xmi.version="1.2" >
+<XMI xmlns:UML="http://schema.omg.org/spec/UML/1.3" verified="false" timestamp="2007-12-15T23:27:23" xmi.version="1.2" >
<XMI.header>
<XMI.documentation>
<XMI.exporter>umbrello uml modeller http://uml.sf.net</XMI.exporter>
@@ -12,11 +12,12 @@
<UML:Model isSpecification="false" isLeaf="false" isRoot="false" xmi.id="m1" isAbstract="false" name="UML Model" >
<UML:Namespace.ownedElement>
<UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="folder" isRoot="false" isAbstract="false" name="folder" />
- <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="11" isRoot="false" isAbstract="false" name="datatype" />
+ <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="datatype" isRoot="false" isAbstract="false" name="datatype" />
<UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="262" isRoot="false" isAbstract="false" name="module" />
<UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="267" isRoot="false" isAbstract="false" name="entry point" />
<UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="static" isRoot="false" isAbstract="false" name="static" />
<UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="2" isRoot="false" isAbstract="false" name="2" />
+ <UML:Stereotype isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="11" isRoot="false" isAbstract="false" name="11" />
<UML:Model stereotype="2" isSpecification="false" isLeaf="false" visibility="public" namespace="m1" xmi.id="1" isRoot="false" isAbstract="false" name="Logical View" >
<UML:Namespace.ownedElement>
<UML:Package stereotype="folder" isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="Datatypes" isRoot="false" isAbstract="false" name="Datatypes" >
@@ -49,14 +50,14 @@
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="FUk8SLmsNwKm" isRoot="false" isAbstract="false" name="ChatPanel" />
<UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="BGIZsiy734Q3" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="ZNJRF9T1cyes" aggregation="composite" type="69ht3eyf5geD" name="" />
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Cpmmt9q9UpGN" aggregation="none" type="HM6K0iYKJJjl" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Q8c1JSahSd3b" aggregation="composite" type="69ht3eyf5geD" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="xnkzxTOSntbD" aggregation="none" type="HM6K0iYKJJjl" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="vxNwznyjjKkz" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="FQtrqJjPe2ps" aggregation="aggregate" type="KbnRUyl1t0df" name="" />
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="9ItjHVbRJLBC" aggregation="none" type="69ht3eyf5geD" name="" multiplicity="*" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="mNh0504V8eVP" aggregation="aggregate" type="KbnRUyl1t0df" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="556Xg96durbs" aggregation="none" type="69ht3eyf5geD" name="" multiplicity="*" />
</UML:Association.connection>
</UML:Association>
<UML:Generalization isSpecification="false" child="69ht3eyf5geD" visibility="public" namespace="1" xmi.id="RLRnAwAmAqOu" parent="HM6K0iYKJJjl" discriminator="" name="" />
@@ -65,34 +66,34 @@
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="FHNSEhY9ajre" isRoot="false" isAbstract="false" name="Client" />
<UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="TktpdgSIHHR8" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="VbB7b0zjGsSX" aggregation="aggregate" type="69ht3eyf5geD" name="" />
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="M4xfN8psAAox" aggregation="none" type="HM6K0iYKJJjl" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="ydo6IJVNMbs2" aggregation="aggregate" type="69ht3eyf5geD" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="jyddnET5Bl9z" aggregation="none" type="HM6K0iYKJJjl" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="f1zuGP0HSVcq" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="i6zfGpRjQcq0" aggregation="aggregate" type="69ht3eyf5geD" name="" />
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="aqjqg9M2BJfZ" aggregation="none" type="FUk8SLmsNwKm" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="dSYsQ7AMkyS0" aggregation="aggregate" type="69ht3eyf5geD" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="FvLZUBZDADpv" aggregation="none" type="FUk8SLmsNwKm" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="qgCGBo7ZFa5w" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="RURZdDULIU0Y" aggregation="aggregate" type="69ht3eyf5geD" name="" />
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="JPHi17gbvPQc" aggregation="none" type="FHNSEhY9ajre" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="PG1b0AYda6Vy" aggregation="aggregate" type="69ht3eyf5geD" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="DfKwckurfGR7" aggregation="none" type="FHNSEhY9ajre" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="ff8EADvo5lAP" isRoot="false" isAbstract="false" name="MenuBar" />
<UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="ME8dDhaOVhNR" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="rYi90hhI6y06" aggregation="aggregate" type="69ht3eyf5geD" name="" />
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="4efz35ZZrCFw" aggregation="none" type="ff8EADvo5lAP" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="cgzAnS8y6Qui" aggregation="aggregate" type="69ht3eyf5geD" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="8pXn3ysSxD28" aggregation="none" type="ff8EADvo5lAP" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="OnztSKJouDua" isRoot="false" isAbstract="false" name="Statusbar" />
<UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="eixjfWzmy2xE" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="xtG2pE8tsntt" aggregation="aggregate" type="69ht3eyf5geD" name="" />
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="tSSicgd2C2DN" aggregation="none" type="OnztSKJouDua" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="UnFaD8GLvo6y" aggregation="aggregate" type="69ht3eyf5geD" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="kyOhAOoRtT7o" aggregation="none" type="OnztSKJouDua" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="RGwQIueXOPCb" isRoot="false" isAbstract="false" name="Gtk.Window" >
@@ -108,26 +109,26 @@
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="dunhnb4iWIJ5" isRoot="false" isAbstract="false" name="PreferencesDialog" />
<UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="RM600I0dDoI0" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="zOXNSvOCwR8z" aggregation="none" type="S1ASRFxXOcQR" name="" />
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="fQVe4UeHtauw" aggregation="none" type="dunhnb4iWIJ5" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="UBhooLGpk8gb" aggregation="none" type="S1ASRFxXOcQR" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="9OlGNiXOhQBy" aggregation="none" type="dunhnb4iWIJ5" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="m1vxpExAac1D" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="UlsSlbIjzn4R" aggregation="aggregate" type="dunhnb4iWIJ5" name="" />
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="hSbdrjdU788A" aggregation="none" type="69ht3eyf5geD" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Xzc16WkYhSLT" aggregation="aggregate" type="dunhnb4iWIJ5" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="lZHThx5oJq4g" aggregation="none" type="69ht3eyf5geD" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="m31Kd0WCwT0I" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="anPRNJMr3EHm" aggregation="aggregate" type="69ht3eyf5geD" name="" />
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="pXVmLYB20mdq" aggregation="none" type="dunhnb4iWIJ5" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Zb3E2EAXDkYH" aggregation="aggregate" type="69ht3eyf5geD" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="HGqwg9QRihvQ" aggregation="none" type="dunhnb4iWIJ5" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Association isSpecification="false" visibility="public" namespace="1" xmi.id="YfQS9QlBzEcb" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="WGKbNTlxE9Nb" aggregation="aggregate" type="69ht3eyf5geD" name="" />
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="QjQTxiGnFjZY" aggregation="none" type="CBeoVfq6YgE0" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="eyCyoHcLqfYq" aggregation="aggregate" type="69ht3eyf5geD" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="uiL5TrNi8Beo" aggregation="none" type="CBeoVfq6YgE0" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Class isSpecification="false" isLeaf="false" visibility="public" namespace="1" xmi.id="FwzppwXTtTIo" isRoot="false" isAbstract="false" name="number" />
@@ -136,9 +137,9 @@
</UML:Namespace.ownedElement>
<XMI.extension xmi.extender="umbrello" >
<diagrams>
- <diagram snapgrid="1" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="8" canvaswidth="998" snapy="8" showatts="1" xmi.id="cVfIpWqwRMNZ" documentation="" type="1" showops="1" showpackage="0" name="class diagram" localid="" showstereotype="1" showscope="1" snapcsgrid="1" font="Sans Serif,8,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="841" >
+ <diagram snapgrid="1" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="1" showopsig="1" usefillcolor="1" snapx="8" canvaswidth="1025" snapy="8" showatts="1" xmi.id="cVfIpWqwRMNZ" documentation="" type="1" showops="1" showpackage="0" name="class diagram" localid="" showstereotype="1" showscope="1" snapcsgrid="1" font="Sans Serif,8,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="813" >
<widgets>
- <classwidget usesdiagramfillcolor="1" width="64" showattsigs="601" x="240" fillcolor="none" y="152" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="69ht3eyf5geD" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,8,-1,0,50,0,0,0,0,0" linecolor="none" />
+ <classwidget usesdiagramfillcolor="1" width="72" showattsigs="601" x="256" fillcolor="none" y="128" showopsigs="601" linewidth="none" height="112" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="69ht3eyf5geD" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,8,-1,0,50,0,0,0,0,0" linecolor="none" />
<classwidget usesdiagramfillcolor="0" width="56" showattsigs="601" x="240" fillcolor="#ffffc0" y="56" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="KbnRUyl1t0df" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="0" font="Sans Serif,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
<classwidget usesdiagramfillcolor="1" width="104" showattsigs="601" x="440" fillcolor="none" y="56" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="S1ASRFxXOcQR" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,8,-1,0,50,0,0,0,0,0" linecolor="none" />
<classwidget usesdiagramfillcolor="1" width="88" showattsigs="601" x="144" fillcolor="none" y="408" showopsigs="601" linewidth="none" height="32" usefillcolor="1" showpubliconly="0" showattributes="1" isinstance="0" xmi.id="HM6K0iYKJJjl" showoperations="1" showpackage="0" showscope="1" usesdiagramusefillcolor="1" font="Sans Serif,8,-1,0,50,0,0,0,0,0" linecolor="none" />
@@ -156,9 +157,9 @@
<assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="69ht3eyf5geD" widgetaid="KbnRUyl1t0df" xmi.id="vxNwznyjjKkz" type="501" linecolor="none" >
<linepath>
<startpoint startx="272" starty="88" />
- <endpoint endx="272" endy="152" />
+ <endpoint endx="296" endy="128" />
</linepath>
- <floatingtext usesdiagramfillcolor="1" width="16" x="280" fillcolor="none" y="128" linewidth="none" posttext="" role="702" height="24" usefillcolor="1" pretext="" isinstance="0" xmi.id="HlYGVC61QObl" text="*" usesdiagramusefillcolor="1" font="Sans Serif,8,-1,0,50,0,0,0,0,0" linecolor="none" />
+ <floatingtext usesdiagramfillcolor="1" width="16" x="304" fillcolor="none" y="104" linewidth="none" posttext="" role="702" height="24" usefillcolor="1" pretext="" isinstance="0" xmi.id="zmT4NnwDl7uN" text="*" usesdiagramusefillcolor="1" font="Sans Serif,8,-1,0,50,0,0,0,0,0" linecolor="none" />
</assocwidget>
<assocwidget totalcounta="2" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="S1ASRFxXOcQR" widgetaid="KbnRUyl1t0df" xmi.id="UZdi2AsstFxJ" type="500" linecolor="none" >
<linepath>
@@ -166,33 +167,33 @@
<endpoint endx="440" endy="72" />
</linepath>
</assocwidget>
- <assocwidget totalcounta="4" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="HM6K0iYKJJjl" widgetaid="69ht3eyf5geD" xmi.id="TktpdgSIHHR8" type="501" linecolor="none" >
+ <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="HM6K0iYKJJjl" widgetaid="69ht3eyf5geD" xmi.id="TktpdgSIHHR8" type="501" linecolor="none" >
<linepath>
- <startpoint startx="256" starty="184" />
+ <startpoint startx="280" starty="240" />
<endpoint endx="192" endy="408" />
</linepath>
</assocwidget>
- <assocwidget totalcounta="4" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="FUk8SLmsNwKm" widgetaid="69ht3eyf5geD" xmi.id="f1zuGP0HSVcq" type="501" linecolor="none" >
+ <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="FUk8SLmsNwKm" widgetaid="69ht3eyf5geD" xmi.id="f1zuGP0HSVcq" type="501" linecolor="none" >
<linepath>
- <startpoint startx="272" starty="184" />
+ <startpoint startx="304" starty="240" />
<endpoint endx="392" endy="352" />
</linepath>
</assocwidget>
<assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="FHNSEhY9ajre" widgetaid="69ht3eyf5geD" xmi.id="qgCGBo7ZFa5w" type="501" linecolor="none" >
<linepath>
- <startpoint startx="240" starty="160" />
+ <startpoint startx="256" starty="168" />
<endpoint endx="136" endy="168" />
</linepath>
</assocwidget>
<assocwidget totalcounta="4" indexa="3" totalcountb="2" indexb="1" linewidth="none" widgetbid="ff8EADvo5lAP" widgetaid="69ht3eyf5geD" xmi.id="ME8dDhaOVhNR" type="501" linecolor="none" >
<linepath>
- <startpoint startx="288" starty="184" />
+ <startpoint startx="328" starty="216" />
<endpoint endx="360" endy="224" />
</linepath>
</assocwidget>
<assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="OnztSKJouDua" widgetaid="69ht3eyf5geD" xmi.id="eixjfWzmy2xE" type="501" linecolor="none" >
<linepath>
- <startpoint startx="240" starty="176" />
+ <startpoint startx="256" starty="200" />
<endpoint endx="168" endy="216" />
</linepath>
</assocwidget>
@@ -202,15 +203,15 @@
<endpoint endx="512" endy="136" />
</linepath>
</assocwidget>
- <assocwidget totalcounta="3" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="dunhnb4iWIJ5" widgetaid="69ht3eyf5geD" xmi.id="m31Kd0WCwT0I" type="501" linecolor="none" >
+ <assocwidget totalcounta="4" indexa="1" totalcountb="2" indexb="1" linewidth="none" widgetbid="dunhnb4iWIJ5" widgetaid="69ht3eyf5geD" xmi.id="m31Kd0WCwT0I" type="501" linecolor="none" >
<linepath>
- <startpoint startx="304" starty="160" />
+ <startpoint startx="328" starty="160" />
<endpoint endx="448" endy="152" />
</linepath>
</assocwidget>
- <assocwidget totalcounta="3" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="CBeoVfq6YgE0" widgetaid="69ht3eyf5geD" xmi.id="YfQS9QlBzEcb" type="501" linecolor="none" >
+ <assocwidget totalcounta="4" indexa="2" totalcountb="2" indexb="1" linewidth="none" widgetbid="CBeoVfq6YgE0" widgetaid="69ht3eyf5geD" xmi.id="YfQS9QlBzEcb" type="501" linecolor="none" >
<linepath>
- <startpoint startx="304" starty="176" />
+ <startpoint startx="328" starty="184" />
<endpoint endx="472" endy="208" />
</linepath>
</assocwidget>
@@ -227,8 +228,8 @@
<UML:Actor isSpecification="false" isLeaf="false" visibility="public" namespace="3" xmi.id="Gp9o6F9saDlb" isRoot="false" isAbstract="false" name="Site user" />
<UML:Association isSpecification="false" visibility="public" namespace="3" xmi.id="b0jfSKPb70l1" name="Meeting registration" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="4AOoBF2P9H3Q" aggregation="none" type="Gp9o6F9saDlb" name="" />
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="7QbHTnvZdRRZ" aggregation="none" type="oN5u3GZ6XDzp" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="false" xmi.id="ZYcUFukj7EwM" aggregation="none" type="Gp9o6F9saDlb" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="aXSJynKpCG2J" aggregation="none" type="oN5u3GZ6XDzp" name="" />
</UML:Association.connection>
</UML:Association>
<UML:UseCase isSpecification="false" isLeaf="false" visibility="public" namespace="3" xmi.id="X5PysTEoL4gU" isRoot="false" isAbstract="false" name="Register meeting" />
@@ -236,7 +237,7 @@
</UML:Namespace.ownedElement>
<XMI.extension xmi.extender="umbrello" >
<diagrams>
- <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="998" snapy="10" showatts="1" xmi.id="5GevK8iq41dL" documentation="" type="2" showops="1" showpackage="0" name="use case diagram" localid="" showstereotype="1" showscope="1" snapcsgrid="0" font="Sans Serif,8,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="841" >
+ <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1025" snapy="10" showatts="1" xmi.id="5GevK8iq41dL" documentation="" type="2" showops="1" showpackage="0" name="use case diagram" localid="" showstereotype="1" showscope="1" snapcsgrid="0" font="Sans Serif,8,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="813" >
<widgets>
<actorwidget usesdiagramfillcolor="0" width="133" x="103" fillcolor="#ffffc0" y="476" linewidth="none" height="63" usefillcolor="1" isinstance="0" xmi.id="J7XGI3aWYJ8N" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="#ff0000" />
<actorwidget usesdiagramfillcolor="1" width="125" x="102" fillcolor="none" y="344" linewidth="none" height="63" usefillcolor="1" isinstance="0" xmi.id="oN5u3GZ6XDzp" usesdiagramusefillcolor="1" font="Sans Serif,10,-1,0,50,0,0,0,0,0" linecolor="none" />
@@ -303,32 +304,32 @@
</UML:Entity>
<UML:Association isSpecification="false" visibility="public" namespace="Entity Relationship Model" xmi.id="cZ2GP50uEznz" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="5H5u8WfOGd2Y" aggregation="none" type="x4Z551munQSg" name="" />
- <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="g7CQi7tmUK9q" aggregation="none" type="l1BvONpiK9Rv" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="NRKIAVaAkB6N" aggregation="none" type="x4Z551munQSg" name="" />
+ <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="9zxtRbPSicpI" aggregation="none" type="l1BvONpiK9Rv" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Association isSpecification="false" visibility="public" namespace="Entity Relationship Model" xmi.id="6caWU47umO3A" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="40iyi4MlKQfS" aggregation="none" type="KzKkdpcfYAWF" name="" />
- <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="wIoAvqjbvt1e" aggregation="none" type="w3YVC5isULcZ" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="XZKWBLOWmgpv" aggregation="none" type="KzKkdpcfYAWF" name="" />
+ <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="CN3wY9Ih6DZY" aggregation="none" type="w3YVC5isULcZ" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Association isSpecification="false" visibility="public" namespace="Entity Relationship Model" xmi.id="jiUW6VeQ9GUj" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="0tOUBVJFV1CB" aggregation="none" type="x4Z551munQSg" name="" />
- <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="4YxOyaqstc3m" aggregation="none" type="w3YVC5isULcZ" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="owyXXnn2K6YV" aggregation="none" type="x4Z551munQSg" name="" />
+ <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="Pu09bp2nA5hh" aggregation="none" type="w3YVC5isULcZ" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Association isSpecification="false" visibility="public" namespace="Entity Relationship Model" xmi.id="rvp9kxiRSHb1" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="RmOMdNyeGM6P" aggregation="none" type="KzKkdpcfYAWF" name="" />
- <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="rPdMPpWTLTrK" aggregation="none" type="gPdm5QWNOgf0" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="DzMJCtpzqnUL" aggregation="none" type="KzKkdpcfYAWF" name="" />
+ <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="YFNtJtMinMqO" aggregation="none" type="gPdm5QWNOgf0" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Association isSpecification="false" visibility="public" namespace="Entity Relationship Model" xmi.id="aoDC71txjsj4" name="" >
<UML:Association.connection>
- <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="1fAsFDfgx31b" aggregation="none" type="gPdm5QWNOgf0" name="" />
- <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="OzDfMJ2BjfY8" aggregation="none" type="l1BvONpiK9Rv" name="" />
+ <UML:AssociationEnd isSpecification="false" visibility="public" changeability="changeable" isNavigable="true" xmi.id="9sBIytz9qLS1" aggregation="none" type="gPdm5QWNOgf0" name="" />
+ <UML:AssociationEnd isSpecification="false" relationship="true" visibility="public" changeability="changeable" isNavigable="true" xmi.id="FI033SMchjV1" aggregation="none" type="l1BvONpiK9Rv" name="" />
</UML:Association.connection>
</UML:Association>
<UML:Entity isSpecification="false" isLeaf="false" visibility="public" namespace="Entity Relationship Model" xmi.id="0VFz44ex2FtV" isRoot="false" isAbstract="false" name="poll" />
@@ -338,10 +339,10 @@
</UML:Namespace.ownedElement>
<XMI.extension xmi.extender="umbrello" >
<diagrams>
- <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="998" snapy="10" showatts="1" xmi.id="zUB5yCJJSlLP" documentation="" type="9" showops="1" showpackage="0" name="History" localid="" showstereotype="1" showscope="1" snapcsgrid="0" font="Sans Serif,8,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="841" >
+ <diagram snapgrid="0" showattsig="1" fillcolor="#ffffc0" linewidth="0" zoom="100" showgrid="0" showopsig="1" usefillcolor="1" snapx="10" canvaswidth="1025" snapy="10" showatts="1" xmi.id="zUB5yCJJSlLP" documentation="" type="9" showops="1" showpackage="0" name="History" localid="" showstereotype="1" showscope="1" snapcsgrid="0" font="Sans Serif,8,-1,0,50,0,0,0,0,0" linecolor="#ff0000" canvasheight="813" >
<widgets>
- <entitywidget usesdiagramfillcolor="0" width="129" x="168" fillcolor="#ffffc0" y="191" linewidth="none" height="223" usefillcolor="1" isinstance="0" xmi.id="ML3mHBoWcvxk" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,8,-1,5,75,1,0,0,0,0" linecolor="#ff0000" />
- <entitywidget usesdiagramfillcolor="1" width="97" x="305" fillcolor="none" y="196" linewidth="none" height="22" usefillcolor="1" isinstance="0" xmi.id="ewyrxjqRutO4" showstereotype="1" usesdiagramusefillcolor="1" font="Sans Serif,8,-1,0,50,0,0,0,0,0" linecolor="none" />
+ <entitywidget usesdiagramfillcolor="0" width="129" x="161" fillcolor="#ffffc0" y="133" linewidth="none" height="223" usefillcolor="1" isinstance="0" xmi.id="ML3mHBoWcvxk" showstereotype="1" usesdiagramusefillcolor="0" font="Sans Serif,8,-1,5,50,0,0,0,0,0" linecolor="#ff0000" />
+ <entitywidget usesdiagramfillcolor="1" width="97" x="383" fillcolor="none" y="161" linewidth="none" height="22" usefillcolor="1" isinstance="0" xmi.id="ewyrxjqRutO4" showstereotype="1" usesdiagramusefillcolor="1" font="Sans Serif,8,-1,0,50,0,0,0,0,0" linecolor="none" />
</widgets>
<messages/>
<associations/>
@@ -353,7 +354,7 @@
</UML:Model>
</XMI.content>
<XMI.extensions xmi.extender="umbrello" >
- <docsettings viewid="zUB5yCJJSlLP" documentation="" uniqueid="V64cp9wm1f5w" />
+ <docsettings viewid="cVfIpWqwRMNZ" documentation="" uniqueid="znHNSl5h6feW" />
<listview>
<listitem open="1" type="800" label="Views" >
<listitem open="1" type="801" id="1" >

=== modified file 'res/ui.xml'
--- a/res/ui.xml 2007-11-25 22:25:46 +0000
+++ b/res/ui.xml 2007-12-30 22:30:41 +0000
@@ -28,9 +28,6 @@
<separator />
<menuitem action="ViewVerticalMode" />
<separator />
- <menu action="ViewChatMenu" >
- <menuitem action="ViewChatTimestamps" />
- </menu>
<menu action="ViewRosterMenu" >
<menuitem action="RosterDescriptions" />
<menuitem action="RosterOffline" />
@@ -45,7 +42,8 @@
</menu>
</menu>
<menu action="ChatMenu">
- <menuitem action="EditUseSpellchecking" />
+ <menuitem action="ChatSpellchecking" />
+ <menuitem action="ChatTimestamps" />
<menuitem action="ChatHistory" />
<menuitem action="ChatSearch" />
<separator />
@@ -98,7 +96,6 @@
<toolitem action="SessionSetStatus" />
<separator />
<toolitem action="EditPreferences" />
- <toolitem action="ViewChatTimestamps" />
<separator />
<toolitem action="ContactAdd" />
</toolbar>

=== modified file 'src/Chat.boo'
--- a/src/Chat.boo 2007-11-25 22:25:46 +0000
+++ b/src/Chat.boo 2007-12-30 22:30:41 +0000
@@ -18,12 +18,13 @@

namespace Piorun

-import GLib
import Gtk
import Gdk
import Pango
import Piorun.Xmpp
import System
+import System.Collections
+import System.Collections.Generic
import System.Text
import System.Diagnostics

@@ -37,8 +38,10 @@
bigLabel as Label
headerButton = ToolButton(null, null, Expand:true, Visible:true)
avatarToolItem = AvatarToolItem(Visible:true)
+ historyDates = [DateTime(2005,09,3),
+ DateTime(2006,1,30),DateTime(2006,2,11),DateTime(2006,4,5)]

- historyScale = HScale(0, 30, 1)
+ historyScale = HScale(0, 1, 1)
searchBox = HBox()
searchEntry = Entry(Visible:true)

@@ -68,11 +71,11 @@
Shadow = ShadowType.None
Gtk.Icon.SizeLookup(IconSize.LargeToolbar, toolIconWidth, toolIconHeight)

-
def HistoryFormatValue(o, args as FormatValueArgs ):
-# args.RetVal = (args.Value * 200).ToString()
- now = DateTime.Now
- args.RetVal = now.ToString('dddd')+' '+now.ToString('d')
+ d = DateTime.Now
+ if args.Value < historyDates.Count:
+ d = historyDates[args.Value]
+ args.RetVal = d.ToString('dddd')+' '+d.ToString('d')

def Init():
historyScale.FormatValue += HistoryFormatValue
@@ -194,6 +197,13 @@

def OnChatHistory(o, args as EventArgs):
historyScale.Visible = (o as ToggleAction).Active
+ if historyScale.Visible:
+ UpdateHistoryScale()
+
+ def UpdateHistoryScale():
+ historyScale.SetRange(0, historyDates.Count-1)
+ historyScale.SetIncrements(1, 1)
+

def OnChatSearch(o, args as EventArgs):
searchBox.Visible = (o as ToggleAction).Active
@@ -341,4 +351,67 @@
ScrollToMark(ChatBuffer.EndMark, 0.1, false, 0, 0)

def Clear(sender, args as EventArgs):
- ChatBuffer.Clear()
\ No newline at end of file
+ ChatBuffer.Clear()
+
+
+class ChatActions(ActionGroup):
+
+ session as Session
+
+ [getter(ChatMenu)] chat as Action
+ [getter(History)] history as ToggleAction
+ [getter(Search)] search as ToggleAction
+ [getter(Spellchecking)] spellchecking as ToggleAction
+ timestamps as ToggleAction
+ Timestamps:
+ get:
+ return timestamps
+
+ def constructor(session as Session):
+ super('Contact')
+ self.session = session
+ ctrl = Gdk.ModifierType.ControlMask
+
+ chatMenu = Action("ChatMenu", _("Cha_t"), null, null)
+ Add(chatMenu)
+
+ history = ToggleAction("ChatHistory", _("_History"), null, App.Stock.History)
+ Add(history)
+ history.Toggled += session.Chat.OnChatHistory
+ session.Chat.OnChatHistory(history, null)
+ AccelMap.AddEntry('<piorun>/chat/history', cast(uint,Gdk.Key.h), ctrl)
+ history.AccelPath = '<piorun>/chat/history'
+
+ search = ToggleAction("ChatSearch", null, null, Gtk.Stock.Find )
+ Add(search)
+ search.Toggled += session.Chat.OnChatSearch
+ session.Chat.OnChatSearch(search, null)
+ AccelMap.AddEntry('<piorun>/chat/search', cast(uint,Gdk.Key.f), ctrl)
+ search.AccelPath = '<piorun>/chat/search'
+
+ spellchecking = ToggleAction("ChatSpellchecking",_('Use s_pellchecking'), null, null)
+ spellchecking.Toggled += do:
+ App.Conf.UseSpellchecking.Value = spellchecking.Active
+ Add(spellchecking)
+
+ # event is globally set in Main
+ timestamps = ToggleAction("ChatTimestamps", _('_Timestamps'), null,
+ App.Stock.Clock)
+ Add(timestamps)
+ timestamps.Toggled += do:
+ App.Conf.ShowTimestamps.Value = timestamps.Active
+ App.Conf.ShowTimestamps.Changed += do:
+ timestamps.Active = App.Conf.ShowTimestamps.Value
+
+ def Init():
+ App.Conf.UseSpellchecking.Changed += do:
+ spellchecking.Active = App.Conf.UseSpellchecking.Value
+
+ if GtkSpell.LibraryAvailable:
+ spellchecking.Active = App.Conf.UseSpellchecking.Value
+ else:
+ App.Conf.UseSpellchecking.Value = false
+ spellchecking.Sensitive = false
+
+ timestamps.Active = App.Conf.ShowTimestamps.Value
+ # initial value is globally set in Main

=== modified file 'src/Database.boo'
--- a/src/Database.boo 2007-12-03 17:58:19 +0000
+++ b/src/Database.boo 2007-12-30 22:30:41 +0000
@@ -22,7 +22,7 @@

import Gtk
import Gdk
-import Mono.Data.SqliteClient
+import Mono.Data.Sqlite
import Piorun.Xmpp
import System
import System.Collections
@@ -48,7 +48,10 @@
connection = SqliteConnection("URI=file:" + filename)
if not connection:
raise Exception("Can't open the DBConnection! SQLLite not present?")
- connection.Open()
+ try:
+ connection.Open()
+ except e:
+ raise ApplicationException('Error opening database file '+filename+':\n'+e.Message)
version = GetDBVersion()
debug version
version = 0 # force scheme creation
@@ -69,10 +72,27 @@
"""
debug q
return ExecuteQuery(q)
-
+
+/*
def GetEntries() as List:
+ q = "SELECT Name, Owner, Contact, Comment, Version FROM DBInfo"
+ reader = Read(q)
+
+ reader.Read()
+ list = List()
+
+
+ if reader.FieldCount = 0:
+ raise Exception("Can't find database information! Aborting...")
+
+ DBInfo __Inf = new DBInfo()
+ __Inf.Name = Reader.GetString(0)
+ __Inf.Owner = Reader.GetString(1)
+ __Inf.Contact = Reader.GetString(2)
+ __Inf.Comment = Reader.GetString(3)
+ __Inf.Version = Reader.GetInt32(4);
return []
-
+*/

def ExecuteQuery(q as string) as int:
""" Execute a Query without any return results """
@@ -81,6 +101,11 @@
cmd.ExecuteNonQuery()
return cmd.LastInsertRowID()

+ def Read(q as string) as IDataReader:
+ cmd = connection.CreateCommand() as SqliteCommand
+ cmd.CommandText = q
+ return cmd.ExecuteReader()
+
def GetDBVersion() as int:
q = "select db_version from info"
using cmd = connection.CreateCommand():
@@ -197,112 +222,3 @@
*/


-class HistSidebar(Frame):
-
- _scroll = ScrolledWindow(ShadowType: ShadowType.In)
- _view = HistView()
- _vBox = VBox()
- _findBox = HBox()
- _findEntry = Entry()
- _findButton = Button(Gtk.Stock.Find)
- _selfInfo = DiscoInfo()
-
- def constructor():
- Add(_vBox)
- _scroll.Add(_view)
- _vBox.PackStart(_findBox, false, false, Pad)
- _findBox.PackStart(_findEntry, true, true, Pad)
- _findBox.PackStart(_findButton, false, false, Pad)
- _vBox.PackStart(_scroll, true, true, Pad)
-# _view.NodeActivated += OnNodeActivated
-# _nodeEntry.Activated += OnEntryActivated
-
-# def OnNodeActivated(o, node as DiscoItem):
-# if node.Jid:
-# OpenNode(node.Jid)
-
-# def OnEntryActivated(o, args as EventArgs):
-# if _nodeEntry.Text.Length > 0:
-# OpenNode(_nodeEntry.Text)
-# else:
-# _view.Clear()
-
-
-
-enum HistNodeType:
- Item
- Folder # groupping by month, etc.
-
-[TreeNode(ListOnly:false)]
-class HistNode(TreeNode):
-""" Represents single row in roster item, group, etc. """
-
-# public Item as DiscoItem
-
-
- [TreeNodeValue(Column:0)]
- Markup as string:
- get:
- return 'current'
-
-
-#callable NodeActivatedHandler(o, node as DiscoItem)
-
-class HistView(NodeView):
-""" NodeView based widget displaying list of contacts """
-
- event NodeActivated as NodeActivatedHandler
-
- _store as NodeStore
-
- _connected = true # ie. view with model
- Connected as bool:
- get:
- return _connected
- set:
- _connected = value
- if _connected:
- NodeStore = _store
- else:
- NodeStore = null
-
- def constructor():
- FixedHeightMode = false
- HeadersVisible = false
- _store = NodeStore(typeof(HistNode))
- NodeStore = _store
- #Reorderable = true
-
- col = TreeViewColumn()
- renderer = CellRendererText()
- renderer.SingleParagraphMode = true
- renderer.Ellipsize = Pango.EllipsizeMode.End
- col.PackStart(renderer, true)
- col.AddAttribute (renderer, "markup", 0)
- AppendColumn(col)
-# ExpanderColumn = col
-
- _store.AddNode(HistNode())
- ShowAll()
-
-
-# def Add(item as DiscoItem):
-# """ Appends contact to all its groups in roster """
-# dn = DiscoNode()
-# dn.Item = item
-# _store.AddNode(dn)
-
- def Clear():
- """ Removes all contacts and any related information """
- _store.Clear()
-
-# protected override def OnRowActivated(path as TreePath, column as TreeViewColumn):
-# """ Event fired by double click or return key """
-# node = _store.GetNode(path) as DiscoNode
-# if node.Item and node.Item.Jid:
-# NodeActivated(self, node.Item)
-# if node.Type == RosterNodeType.Group:
-# # contrary to arrow click, will expand all successors
-# if not CollapseRow(path): ExpandRow(path, true) # alternate
-# elif node.Type == RosterNodeType.Contact:
-# node.Contact.ForceChat(true)

=== modified file 'src/Session.boo'
--- a/src/Session.boo 2007-11-25 22:25:46 +0000
+++ b/src/Session.boo 2007-12-30 22:30:41 +0000
@@ -158,6 +158,7 @@
viewActions = ViewActions(self)
accountActions = AccountActions(self)
contactActions = ContactActions(self)
+ chatActions = ChatActions(self)
roomActions = RoomActions(self)
helpActions = HelpActions(self)

@@ -165,9 +166,10 @@
UIManager.InsertActionGroup(editActions, 20)
UIManager.InsertActionGroup(viewActions, 30)
UIManager.InsertActionGroup(accountActions, 40)
- UIManager.InsertActionGroup(contactActions, 50)
- UIManager.InsertActionGroup(roomActions, 60)
- UIManager.InsertActionGroup(helpActions, 70)
+ UIManager.InsertActionGroup(chatActions, 50)
+ UIManager.InsertActionGroup(contactActions, 60)
+ UIManager.InsertActionGroup(roomActions, 70)
+ UIManager.InsertActionGroup(helpActions, 80)
UIManager.EnsureUpdate() # to set toolbar variable
AddAccelGroup(UIManager.AccelGroup)
Roster.View.SelectedChanged += contactActions.Update
@@ -182,8 +184,8 @@
Roster.View.Selection.SelectPath(path)

sessionActions.Init()
- editActions.Init()
viewActions.Init()
+ chatActions.Init()


privMgr = PrivacyMgr(self)

=== modified file 'src/actions/EditActions.boo'
--- a/src/actions/EditActions.boo 2007-11-25 22:25:46 +0000
+++ b/src/actions/EditActions.boo 2007-12-30 22:30:41 +0000
@@ -29,7 +29,6 @@
session as Session

editMenu as Action
- editUseSpellchecking as ToggleAction
editClearChat as Action
editCertificates as Action
editCut as Action
@@ -42,16 +41,10 @@
super('Edit')
self.session = session
ctrl = Gdk.ModifierType.ControlMask
-
+
editMenu = Action("EditMenu", _("_Edit"), null, null)
Add(editMenu)
- editUseSpellchecking = ToggleAction("EditUseSpellchecking",
- _('Use s_pellchecking'), null, null)
- editUseSpellchecking.Toggled += do:
- App.Conf.UseSpellchecking.Value = editUseSpellchecking.Active
- Add(editUseSpellchecking)
-
-
+
editCut = Action("EditCut", null, null, Gtk.Stock.Cut)
Add(editCut)
# editClearChat.Activated += { session.Chat.ChatView.Clear(self, null) }
@@ -84,14 +77,3 @@
PreferencesDialog(session).Run()
AccelMap.AddEntry('<piorun>/Edit/Preferences', cast(uint,Gdk.Key.p), ctrl)
preferences.AccelPath = '<piorun>/Edit/Preferences'
-
-
- def Init():
- App.Conf.UseSpellchecking.Changed += do:
- editUseSpellchecking.Active = App.Conf.UseSpellchecking.Value
-
- if GtkSpell.LibraryAvailable:
- editUseSpellchecking.Active = App.Conf.UseSpellchecking.Value
- else:
- App.Conf.UseSpellchecking.Value = false
- editUseSpellchecking.Sensitive = false

=== modified file 'src/actions/ViewActions.boo'
--- a/src/actions/ViewActions.boo 2007-11-25 22:25:46 +0000
+++ b/src/actions/ViewActions.boo 2007-12-30 22:30:41 +0000
@@ -35,9 +35,7 @@
statusIcon as ToggleAction
verticalMode as ToggleAction

- chatMenu as Action
- chatTimestamps as ToggleAction
-
+
rosterMenu as Action
rosterDescriptions as ToggleAction
rosterOffline as ToggleAction
@@ -84,17 +82,6 @@
Add(verticalMode)
verticalMode.Toggled += { App.Conf.VerticalMode.Value = verticalMode.Active }

- chatMenu = Action("ViewChatMenu", _("_Chat"), null, null)
- Add(chatMenu)
-
-
- # event is globally set in Main
- chatTimestamps = ToggleAction("ViewChatTimestamps", _('_Timestamps'), null,
- App.Stock.Clock)
- Add(chatTimestamps)
- chatTimestamps.Toggled += { App.Conf.ShowTimestamps.Value = chatTimestamps.Active }
- App.Conf.ShowTimestamps.Changed += {chatTimestamps.Active = App.Conf.ShowTimestamps.Value}
-
rosterMenu = Action("ViewRosterMenu", _("_Roster"), null, null)
Add(rosterMenu)

@@ -150,9 +137,6 @@

verticalMode.Active = App.Conf.VerticalMode.Value

- chatTimestamps.Active = App.Conf.ShowTimestamps.Value
- # initial value is globally set in Main
-
contactJid.Active = App.Conf.ShowJid.Value
session.Chat.InfoPanel.ShowJid = App.Conf.ShowJid.Value

--

https://code.launchpad.net/~piorun/piorun/devel

You are receiving this branch notification because you are subscribed to it.

Reply all
Reply to author
Forward
0 new messages