Bitmessage/PyBitmessage-2025-02-02
Archived
2
0
Fork 0
Code Issues 167 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Bug fix - Doesn't reload sent and inbox tables when message is received/sent

Browse Source
This commit is contained in:
Arnukk 2013-11-18 22:57:40 +04:00
parent 4810acf57e
commit 9f07b06eb1
7 changed files with 225 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

206
.idea/workspace.xml
View File

@ -2,7 +2,13 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="0aa79bef-9e18-44a2-a1d3-4500168a4d2b" name="Default" comment="Implementing sorting of starred messages. Code refactoring."> <list default="true" id="0aa79bef-9e18-44a2-a1d3-4500168a4d2b" name="Default" comment="Implementing sorting of starred messages. Code refactoring.">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/.idea/scopes/scope_settings.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/bitmessageqt/bitmessageui.ui" afterPath="$PROJECT_DIR$/src/bitmessageqt/bitmessageui.ui" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/bitmessageqt/__init__.py" afterPath="$PROJECT_DIR$/src/bitmessageqt/__init__.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/bitmessageqt/bitmessageui.py" afterPath="$PROJECT_DIR$/src/bitmessageqt/bitmessageui.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/class_receiveDataThread.py" afterPath="$PROJECT_DIR$/src/class_receiveDataThread.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/class_singleWorker.py" afterPath="$PROJECT_DIR$/src/class_singleWorker.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/helper_inbox.py" afterPath="$PROJECT_DIR$/src/helper_inbox.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list> </list>
<ignored path="PyBitmessage.iws" /> <ignored path="PyBitmessage.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -14,7 +20,7 @@
</component> </component>
<component name="ChangesViewManager" flattened_view="true" show_ignored="false" /> <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
<component name="CoverageDataManager"> <component name="CoverageDataManager">
<SUITE FILE_PATH="coverage/PyBitmessage$bitmessagemain.coverage" NAME="bitmessagemain Coverage Results" MODIFIED="1384635004146" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src" /> <SUITE FILE_PATH="coverage/PyBitmessage$bitmessagemain.coverage" NAME="bitmessagemain Coverage Results" MODIFIED="1384800747337" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/src" />
</component> </component>
<component name="CreatePatchCommitExecutor"> <component name="CreatePatchCommitExecutor">
<option name="PATCH_PATH" value="" /> <option name="PATCH_PATH" value="" />
@ -28,12 +34,43 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="class_receiveDataThread.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/class_receiveDataThread.py">
<provider selected="true" editor-type-id="text-editor">
<state line="938" column="12" selection-start="51754" selection-end="51760" vertical-scroll-proportion="0.0" vertical-offset="13785" max-vertical-offset="32430">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="class_singleWorker.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/class_singleWorker.py">
<provider selected="true" editor-type-id="text-editor">
<state line="14" column="19" selection-start="384" selection-end="384" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="14160">
<folding>
<element signature="e#0#16#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="__init__.py" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="__init__.py" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/bitmessageqt/__init__.py"> <entry file="file://$PROJECT_DIR$/src/bitmessageqt/__init__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="813" column="59" selection-start="42996" selection-end="42996" vertical-scroll-proportion="0.33333334" vertical-offset="11860" max-vertical-offset="55140"> <state line="226" column="102" selection-start="9497" selection-end="9497" vertical-scroll-proportion="0.34700316" vertical-offset="3060" max-vertical-offset="48570">
<folding> <folding>
<element signature="e#228#251#0" expanded="true" /> <element signature="e#228#251#0" expanded="true" />
<element signature="e#36057#43520#0" expanded="false" />
<element signature="e#43613#49237#0" expanded="false" />
<element signature="e#49313#51434#0" expanded="false" />
<element signature="e#51553#51672#0" expanded="false" />
<element signature="e#51807#52801#0" expanded="false" />
<element signature="e#52892#53876#0" expanded="false" />
<element signature="e#54023#54624#0" expanded="false" />
<element signature="e#54710#55525#0" expanded="false" />
<element signature="e#55642#56621#0" expanded="false" />
<element signature="e#56780#56975#0" expanded="false" />
<element signature="e#61294#61394#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -42,21 +79,54 @@
<file leaf-file-name="bitmessageui.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="bitmessageui.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/bitmessageqt/bitmessageui.py"> <entry file="file://$PROJECT_DIR$/src/bitmessageqt/bitmessageui.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="613" column="13" selection-start="41233" selection-end="41257" vertical-scroll-proportion="-12.92" vertical-offset="8872" max-vertical-offset="9915"> <state line="513" column="133" selection-start="32877" selection-end="32877" vertical-scroll-proportion="0.0" vertical-offset="7079" max-vertical-offset="9885">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="helper_inbox.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/helper_inbox.py">
<provider selected="true" editor-type-id="text-editor">
<state line="3" column="9" selection-start="44" selection-end="50" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">
<folding>
<element signature="e#0#24#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="helper_sql.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/helper_sql.py">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="1080">
<folding>
<element signature="e#0#16#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="bitmessagemain.py" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="bitmessagemain.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/bitmessagemain.py"> <entry file="file://$PROJECT_DIR$/src/bitmessagemain.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="1001" column="35" selection-start="54451" selection-end="54451" vertical-scroll-proportion="0.0" vertical-offset="14773" max-vertical-offset="15990"> <state line="1001" column="35" selection-start="54451" selection-end="54451" vertical-scroll-proportion="-8.68" vertical-offset="14798" max-vertical-offset="15990">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="class_outgoingSynSender.py" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/class_outgoingSynSender.py">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="1.0" vertical-offset="25" max-vertical-offset="2700">
<folding>
<element signature="e#0#16#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FindManager"> <component name="FindManager">
@ -76,8 +146,11 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="changedFiles"> <option name="changedFiles">
<list> <list>
<option value="$PROJECT_DIR$/src/bitmessageqt/bitmessageui.py" />
<option value="$PROJECT_DIR$/src/bitmessagemain.py" /> <option value="$PROJECT_DIR$/src/bitmessagemain.py" />
<option value="$PROJECT_DIR$/src/helper_inbox.py" />
<option value="$PROJECT_DIR$/src/class_receiveDataThread.py" />
<option value="$PROJECT_DIR$/src/class_singleWorker.py" />
<option value="$PROJECT_DIR$/src/bitmessageqt/bitmessageui.py" />
<option value="$PROJECT_DIR$/src/bitmessageqt/__init__.py" /> <option value="$PROJECT_DIR$/src/bitmessageqt/__init__.py" />
</list> </list>
</option> </option>
@ -173,6 +246,11 @@
<property name="WebServerToolWindowFactoryState" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" />
<property name="recentsLimit" value="5" /> <property name="recentsLimit" value="5" />
</component> </component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src/bitmessageqt" />
</key>
</component>
<component name="RunManager" selected="Python.bitmessagemain"> <component name="RunManager" selected="Python.bitmessagemain">
<configuration default="false" name="bitmessagemain" type="PythonConfigurationType" factoryName="Python" temporary="true"> <configuration default="false" name="bitmessagemain" type="PythonConfigurationType" factoryName="Python" temporary="true">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
@ -277,9 +355,6 @@
<option name="PARAMETERS" value="" /> <option name="PARAMETERS" value="" />
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug" singleton="true">
<method />
</configuration>
<configuration default="true" type="tests" factoryName="Unittests"> <configuration default="true" type="tests" factoryName="Unittests">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
@ -303,6 +378,9 @@
<option name="USE_PARAM" value="false" /> <option name="USE_PARAM" value="false" />
<method /> <method />
</configuration> </configuration>
<configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug" singleton="true">
<method />
</configuration>
<configuration default="true" type="tests" factoryName="Doctests"> <configuration default="true" type="tests" factoryName="Doctests">
<option name="INTERPRETER_OPTIONS" value="" /> <option name="INTERPRETER_OPTIONS" value="" />
<option name="PARENT_ENVS" value="true" /> <option name="PARENT_ENVS" value="true" />
@ -380,29 +458,33 @@
<created>1384635076980</created> <created>1384635076980</created>
<updated>1384635076980</updated> <updated>1384635076980</updated>
</task> </task>
<option name="localTasksCounter" value="2" /> <task id="LOCAL-00002" summary="GUI changes.">
<created>1384703394029</created>
<updated>1384703394029</updated>
</task>
<option name="localTasksCounter" value="3" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="56" y="29" width="2489" height="1378" extended-state="0" /> <frame x="56" y="29" width="2489" height="1378" extended-state="0" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16534181" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16534181" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32936507" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25787964" sideWeight="0.8513514" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25992632" sideWeight="0.8084261" order="0" side_tool="false" content_ui="combo" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.14864865" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19157393" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3298887" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.112877585" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@ -416,12 +498,40 @@
<TodoPanelSettings /> <TodoPanelSettings />
</option> </option>
<MESSAGE value="Implementing sorting of starred messages. Code refactoring." /> <MESSAGE value="Implementing sorting of starred messages. Code refactoring." />
<option name="LAST_COMMIT_MESSAGE" value="Implementing sorting of starred messages. Code refactoring." /> <MESSAGE value="GUI changes." />
<option name="LAST_COMMIT_MESSAGE" value="GUI changes." />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager /> <breakpoint-manager />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/bitmessageqt/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state line="2516" column="0" selection-start="139379" selection-end="139379" vertical-scroll-proportion="0.0" vertical-offset="405" max-vertical-offset="55140">
<folding>
<element signature="e#228#251#0" expanded="true" />
<element signature="e#36057#43520#0" expanded="false" />
<element signature="e#43613#49237#0" expanded="false" />
<element signature="e#49313#51434#0" expanded="false" />
<element signature="e#51553#51672#0" expanded="false" />
<element signature="e#51807#52801#0" expanded="false" />
<element signature="e#52892#53876#0" expanded="false" />
<element signature="e#54023#54624#0" expanded="false" />
<element signature="e#54710#55525#0" expanded="false" />
<element signature="e#55642#56621#0" expanded="false" />
<element signature="e#56780#56975#0" expanded="false" />
<element signature="e#61294#61394#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/bitmessagemain.py">
<provider selected="true" editor-type-id="text-editor">
<state line="1001" column="35" selection-start="54451" selection-end="54451" vertical-scroll-proportion="0.0" vertical-offset="14773" max-vertical-offset="15990">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/bitmessagemain.py"> <entry file="file://$PROJECT_DIR$/src/bitmessagemain.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="40" column="19" selection-start="1254" selection-end="1254" vertical-scroll-proportion="0.0" vertical-offset="1125" max-vertical-offset="15990"> <state line="40" column="19" selection-start="1254" selection-end="1254" vertical-scroll-proportion="0.0" vertical-offset="1125" max-vertical-offset="15990">
@ -450,25 +560,79 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/bitmessageqt/bitmessageui.py"> <entry file="file://$PROJECT_DIR$/src/helper_inbox.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="613" column="13" selection-start="41233" selection-end="41257" vertical-scroll-proportion="-12.92" vertical-offset="8872" max-vertical-offset="9915"> <state line="3" column="9" selection-start="44" selection-end="50" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">
<folding /> <folding>
<element signature="e#0#24#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/helper_sql.py">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="1080">
<folding>
<element signature="e#0#16#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/bitmessagemain.py"> <entry file="file://$PROJECT_DIR$/src/bitmessagemain.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="1001" column="35" selection-start="54451" selection-end="54451" vertical-scroll-proportion="0.0" vertical-offset="14773" max-vertical-offset="15990"> <state line="1001" column="35" selection-start="54451" selection-end="54451" vertical-scroll-proportion="-8.68" vertical-offset="14798" max-vertical-offset="15990">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/class_outgoingSynSender.py">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="1.0" vertical-offset="25" max-vertical-offset="2700">
<folding>
<element signature="e#0#16#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/bitmessageqt/bitmessageui.py">
<provider selected="true" editor-type-id="text-editor">
<state line="513" column="133" selection-start="32877" selection-end="32877" vertical-scroll-proportion="0.0" vertical-offset="7079" max-vertical-offset="9885">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/class_receiveDataThread.py">
<provider selected="true" editor-type-id="text-editor">
<state line="938" column="12" selection-start="51754" selection-end="51760" vertical-scroll-proportion="0.0" vertical-offset="13785" max-vertical-offset="32430">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/class_singleWorker.py">
<provider selected="true" editor-type-id="text-editor">
<state line="14" column="19" selection-start="384" selection-end="384" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="14160">
<folding>
<element signature="e#0#16#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/bitmessageqt/__init__.py"> <entry file="file://$PROJECT_DIR$/src/bitmessageqt/__init__.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="813" column="59" selection-start="42996" selection-end="42996" vertical-scroll-proportion="0.33333334" vertical-offset="11860" max-vertical-offset="55140"> <state line="226" column="102" selection-start="9497" selection-end="9497" vertical-scroll-proportion="0.34700316" vertical-offset="3060" max-vertical-offset="48570">
<folding> <folding>
<element signature="e#228#251#0" expanded="true" /> <element signature="e#228#251#0" expanded="true" />
<element signature="e#36057#43520#0" expanded="false" />
<element signature="e#43613#49237#0" expanded="false" />
<element signature="e#49313#51434#0" expanded="false" />
<element signature="e#51553#51672#0" expanded="false" />
<element signature="e#51807#52801#0" expanded="false" />
<element signature="e#52892#53876#0" expanded="false" />
<element signature="e#54023#54624#0" expanded="false" />
<element signature="e#54710#55525#0" expanded="false" />
<element signature="e#55642#56621#0" expanded="false" />
<element signature="e#56780#56975#0" expanded="false" />
<element signature="e#61294#61394#0" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>

13
src/bitmessageqt/__init__.py
View File

@ -223,6 +223,8 @@ class MyForm(QtGui.QMainWindow):
self.timer.start(2000) # milliseconds self.timer.start(2000) # milliseconds
QtCore.QObject.connect(self.timer, QtCore.SIGNAL("timeout()"), self.runEveryTwoSeconds) QtCore.QObject.connect(self.timer, QtCore.SIGNAL("timeout()"), self.runEveryTwoSeconds)
#Sent and Inbox Tabs
QtCore.QObject.connect(self.ui.tabWidget, QtCore.SIGNAL("currentChanged(int)"), self.loadInbox)
# FILE MENU and other buttons # FILE MENU and other buttons
QtCore.QObject.connect(self.ui.actionExit, QtCore.SIGNAL( QtCore.QObject.connect(self.ui.actionExit, QtCore.SIGNAL(
"triggered()"), self.quit) "triggered()"), self.quit)
@ -1778,7 +1780,7 @@ class MyForm(QtGui.QMainWindow):
ackdata = OpenSSL.rand(32) ackdata = OpenSSL.rand(32)
t = () t = ()
sqlExecute( sqlExecute(
'''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''', '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)''',
'', '',
toAddress, toAddress,
ripe, ripe,
@ -1791,7 +1793,8 @@ class MyForm(QtGui.QMainWindow):
1, 1,
1, 1,
'sent', 'sent',
2) 2,
0)
toLabel = '' toLabel = ''
queryreturn = sqlQuery('''select label from addressbook where address=?''', queryreturn = sqlQuery('''select label from addressbook where address=?''',
@ -1809,6 +1812,7 @@ class MyForm(QtGui.QMainWindow):
self.ui.lineEditTo.setText('') self.ui.lineEditTo.setText('')
self.ui.lineEditSubject.setText('') self.ui.lineEditSubject.setText('')
self.ui.textEditMessage.setText('') self.ui.textEditMessage.setText('')
self.loadSent()
self.ui.tabWidget.setCurrentIndex(2) self.ui.tabWidget.setCurrentIndex(2)
self.ui.tableWidgetSent.setCurrentCell(0, 0) self.ui.tableWidgetSent.setCurrentCell(0, 0)
else: else:
@ -1827,9 +1831,9 @@ class MyForm(QtGui.QMainWindow):
toAddress = self.str_broadcast_subscribers toAddress = self.str_broadcast_subscribers
ripe = '' ripe = ''
t = ('', toAddress, ripe, fromAddress, subject, message, ackdata, int( t = ('', toAddress, ripe, fromAddress, subject, message, ackdata, int(
time.time()), 'broadcastqueued', 1, 1, 'sent', 2) time.time()), 'broadcastqueued', 1, 1, 'sent', 2, 0)
sqlExecute( sqlExecute(
'''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''', *t) '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', *t)
toLabel = self.str_broadcast_subscribers toLabel = self.str_broadcast_subscribers
@ -1843,6 +1847,7 @@ class MyForm(QtGui.QMainWindow):
self.ui.lineEditTo.setText('') self.ui.lineEditTo.setText('')
self.ui.lineEditSubject.setText('') self.ui.lineEditSubject.setText('')
self.ui.textEditMessage.setText('') self.ui.textEditMessage.setText('')
self.loadSent()
self.ui.tabWidget.setCurrentIndex(2) self.ui.tabWidget.setCurrentIndex(2)
self.ui.tableWidgetSent.setCurrentCell(0, 0) self.ui.tableWidgetSent.setCurrentCell(0, 0)

20
src/bitmessageqt/bitmessageui.py
View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'bitmessageui.ui' # Form implementation generated from reading ui file 'bitmessageui.ui'
# #
# Created: Sun Nov 17 14:29:34 2013 # Created: Mon Nov 18 22:23:35 2013
# by: PyQt4 UI code generator 4.10.3 # by: PyQt4 UI code generator 4.10.3
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!
@ -93,9 +93,9 @@ class Ui_MainWindow(object):
item.setTextAlignment(QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) item.setTextAlignment(QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter)
self.tableWidgetInbox.setHorizontalHeaderItem(4, item) self.tableWidgetInbox.setHorizontalHeaderItem(4, item)
self.tableWidgetInbox.horizontalHeader().setCascadingSectionResizes(True) self.tableWidgetInbox.horizontalHeader().setCascadingSectionResizes(True)
self.tableWidgetInbox.horizontalHeader().setDefaultSectionSize(178) self.tableWidgetInbox.horizontalHeader().setDefaultSectionSize(179)
self.tableWidgetInbox.horizontalHeader().setHighlightSections(False) self.tableWidgetInbox.horizontalHeader().setHighlightSections(False)
self.tableWidgetInbox.horizontalHeader().setMinimumSectionSize(28) self.tableWidgetInbox.horizontalHeader().setMinimumSectionSize(27)
self.tableWidgetInbox.horizontalHeader().setSortIndicatorShown(False) self.tableWidgetInbox.horizontalHeader().setSortIndicatorShown(False)
self.tableWidgetInbox.horizontalHeader().setStretchLastSection(True) self.tableWidgetInbox.horizontalHeader().setStretchLastSection(True)
self.tableWidgetInbox.verticalHeader().setVisible(False) self.tableWidgetInbox.verticalHeader().setVisible(False)
@ -225,9 +225,9 @@ class Ui_MainWindow(object):
item = QtGui.QTableWidgetItem() item = QtGui.QTableWidgetItem()
self.tableWidgetSent.setHorizontalHeaderItem(4, item) self.tableWidgetSent.setHorizontalHeaderItem(4, item)
self.tableWidgetSent.horizontalHeader().setCascadingSectionResizes(True) self.tableWidgetSent.horizontalHeader().setCascadingSectionResizes(True)
self.tableWidgetSent.horizontalHeader().setDefaultSectionSize(178) self.tableWidgetSent.horizontalHeader().setDefaultSectionSize(179)
self.tableWidgetSent.horizontalHeader().setHighlightSections(False) self.tableWidgetSent.horizontalHeader().setHighlightSections(False)
self.tableWidgetSent.horizontalHeader().setMinimumSectionSize(28) self.tableWidgetSent.horizontalHeader().setMinimumSectionSize(29)
self.tableWidgetSent.horizontalHeader().setSortIndicatorShown(False) self.tableWidgetSent.horizontalHeader().setSortIndicatorShown(False)
self.tableWidgetSent.horizontalHeader().setStretchLastSection(True) self.tableWidgetSent.horizontalHeader().setStretchLastSection(True)
self.tableWidgetSent.verticalHeader().setVisible(False) self.tableWidgetSent.verticalHeader().setVisible(False)
@ -508,7 +508,7 @@ class Ui_MainWindow(object):
self.menubar.addAction(self.menuHelp.menuAction()) self.menubar.addAction(self.menuHelp.menuAction())
self.retranslateUi(MainWindow) self.retranslateUi(MainWindow)
self.tabWidget.setCurrentIndex(0) self.tabWidget.setCurrentIndex(2)
QtCore.QObject.connect(self.radioButtonSpecific, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.lineEditTo.setEnabled) QtCore.QObject.connect(self.radioButtonSpecific, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.lineEditTo.setEnabled)
QtCore.QObject.connect(self.radioButtonSpecific, QtCore.SIGNAL(_fromUtf8("clicked(bool)")), self.labelSendBroadcastWarning.hide) QtCore.QObject.connect(self.radioButtonSpecific, QtCore.SIGNAL(_fromUtf8("clicked(bool)")), self.labelSendBroadcastWarning.hide)
QtCore.QObject.connect(self.radioButtonBroadcast, QtCore.SIGNAL(_fromUtf8("clicked()")), self.labelSendBroadcastWarning.show) QtCore.QObject.connect(self.radioButtonBroadcast, QtCore.SIGNAL(_fromUtf8("clicked()")), self.labelSendBroadcastWarning.show)
@ -650,12 +650,4 @@ class Ui_MainWindow(object):
import bitmessage_icons_rc import bitmessage_icons_rc
if __name__ == "__main__":
import sys
app = QtGui.QApplication(sys.argv)
MainWindow = QtGui.QMainWindow()
ui = Ui_MainWindow()
ui.setupUi(MainWindow)
MainWindow.show()
sys.exit(app.exec_())

22
src/bitmessageqt/bitmessageui.ui
View File

@ -57,7 +57,7 @@
<enum>QTabWidget::Rounded</enum> <enum>QTabWidget::Rounded</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>2</number>
</property> </property>
<widget class="QWidget" name="inbox"> <widget class="QWidget" name="inbox">
<attribute name="icon"> <attribute name="icon">
@ -1290,8 +1290,24 @@ p, li { white-space: pre-wrap; }
<y>84</y> <y>84</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>218</x> <x>275</x>
<y>546</y> <y>544</y>
</hint>
</hints>
</connection>
<connection>
<sender>tabWidget</sender>
<signal>tabCloseRequested(int)</signal>
<receiver>tableWidgetSent</receiver>
<slot>update()</slot>
<hints>
<hint type="sourcelabel">
<x>201</x>
<y>36</y>
</hint>
<hint type="destinationlabel">
<x>204</x>
<y>101</y>
</hint> </hint>
</hints> </hints>
</connection> </connection>

8
src/class_receiveDataThread.py
View File

@ -541,7 +541,7 @@ class receiveDataThread(threading.Thread):
if messageEncodingType != 0: if messageEncodingType != 0:
t = (self.inventoryHash, toAddress, fromAddress, subject, int( t = (self.inventoryHash, toAddress, fromAddress, subject, int(
time.time()), body, 'inbox', messageEncodingType, 0) time.time()), body, 'inbox', messageEncodingType, 0, 0)
helper_inbox.insert(t) helper_inbox.insert(t)
shared.UISignalQueue.put(('displayNewInboxMessage', ( shared.UISignalQueue.put(('displayNewInboxMessage', (
@ -688,7 +688,7 @@ class receiveDataThread(threading.Thread):
if messageEncodingType != 0: if messageEncodingType != 0:
t = (self.inventoryHash, toAddress, fromAddress, subject, int( t = (self.inventoryHash, toAddress, fromAddress, subject, int(
time.time()), body, 'inbox', messageEncodingType, 0) time.time()), body, 'inbox', messageEncodingType, 0, 0)
helper_inbox.insert(t) helper_inbox.insert(t)
shared.UISignalQueue.put(('displayNewInboxMessage', ( shared.UISignalQueue.put(('displayNewInboxMessage', (
@ -834,7 +834,7 @@ class receiveDataThread(threading.Thread):
if messageEncodingType != 0: if messageEncodingType != 0:
t = (self.inventoryHash, toAddress, fromAddress, subject, int( t = (self.inventoryHash, toAddress, fromAddress, subject, int(
time.time()), body, 'inbox', messageEncodingType, 0) time.time()), body, 'inbox', messageEncodingType, 0, 0)
helper_inbox.insert(t) helper_inbox.insert(t)
shared.UISignalQueue.put(('displayNewInboxMessage', ( shared.UISignalQueue.put(('displayNewInboxMessage', (
@ -1144,7 +1144,7 @@ class receiveDataThread(threading.Thread):
subject = '' subject = ''
if messageEncodingType != 0: if messageEncodingType != 0:
t = (self.inventoryHash, toAddress, fromAddress, subject, int( t = (self.inventoryHash, toAddress, fromAddress, subject, int(
time.time()), body, 'inbox', messageEncodingType, 0) time.time()), body, 'inbox', messageEncodingType, 0, 0)
helper_inbox.insert(t) helper_inbox.insert(t)
shared.UISignalQueue.put(('displayNewInboxMessage', ( shared.UISignalQueue.put(('displayNewInboxMessage', (

2
src/class_singleWorker.py
View File

@ -835,7 +835,7 @@ class singleWorker(threading.Thread):
# our own inbox. # our own inbox.
if shared.config.has_section(toaddress): if shared.config.has_section(toaddress):
t = (inventoryHash, toaddress, fromaddress, subject, int( t = (inventoryHash, toaddress, fromaddress, subject, int(
time.time()), message, 'inbox', 2, 0) time.time()), message, 'inbox', 2, 0, 0)
helper_inbox.insert(t) helper_inbox.insert(t)
shared.UISignalQueue.put(('displayNewInboxMessage', ( shared.UISignalQueue.put(('displayNewInboxMessage', (

2
src/helper_inbox.py
View File

@ -2,7 +2,7 @@ from helper_sql import *
import shared import shared
def insert(t): def insert(t):
sqlExecute('''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?)''', *t) sqlExecute('''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?,?)''', *t)
def trash(msgid): def trash(msgid):
sqlExecute('''UPDATE inbox SET folder='trash' WHERE msgid=?''', msgid) sqlExecute('''UPDATE inbox SET folder='trash' WHERE msgid=?''', msgid)