[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33464 - in gnunet-qt/SecureShare: . core core/identity mod
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33464 - in gnunet-qt/SecureShare: . core core/identity models qml |
|
Date: |
Mon, 2 Jun 2014 02:13:39 +0200 |
Author: bratao
Date: 2014-06-02 02:13:38 +0200 (Mon, 02 Jun 2014)
New Revision: 33464
Added:
gnunet-qt/SecureShare/SecureShare.pro
gnunet-qt/SecureShare/core/identity/identity.cpp
gnunet-qt/SecureShare/core/identity/identity.h
Removed:
gnunet-qt/SecureShare/SecureShare.pro.user
gnunet-qt/SecureShare/SecureShare.pro.user.16
Modified:
gnunet-qt/SecureShare/
gnunet-qt/SecureShare/core/identity/identityService.cpp
gnunet-qt/SecureShare/core/identity/identityService.h
gnunet-qt/SecureShare/core/place.h
gnunet-qt/SecureShare/main.cpp
gnunet-qt/SecureShare/models/IdentityModel.cpp
gnunet-qt/SecureShare/models/IdentityModel.h
gnunet-qt/SecureShare/models/models.cpp
gnunet-qt/SecureShare/models/models.h
gnunet-qt/SecureShare/psyc.cpp
gnunet-qt/SecureShare/qml.qrc
gnunet-qt/SecureShare/qml/Splash.qml
gnunet-qt/SecureShare/qml/main.qml
Log:
Implement Identity ego picker
Index: gnunet-qt/SecureShare
===================================================================
--- gnunet-qt/SecureShare 2014-06-01 22:08:47 UTC (rev 33463)
+++ gnunet-qt/SecureShare 2014-06-02 00:13:38 UTC (rev 33464)
Property changes on: gnunet-qt/SecureShare
___________________________________________________________________
Added: svn:ignore
## -0,0 +1,2 ##
+*.16
+*.user
Added: gnunet-qt/SecureShare/SecureShare.pro
===================================================================
--- gnunet-qt/SecureShare/SecureShare.pro (rev 0)
+++ gnunet-qt/SecureShare/SecureShare.pro 2014-06-02 00:13:38 UTC (rev
33464)
@@ -0,0 +1,39 @@
+TEMPLATE = app
+
+QT += qml quick widgets
+
+LIBS += -lgnunetutil -lgnunetcore -lgnunetidentity -lgnunetarm -lgnunetfriends
-lextractor
+
+
+SOURCES += main.cpp \
+ core/psyccore.cpp \
+ preferences/preferences.cpp \
+ psyc.cpp \
+ models/models.cpp \
+ models/PlacesModel.cpp \
+ core/place.cpp \
+ core/gnunet/gnunet.cpp \
+ core/identity/identityService.cpp \
+ core/identity/identity.cpp \
+ models/IdentityModel.cpp
+
+RESOURCES += qml.qrc
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH =
+
+# Default rules for deployment.
+include(deployment.pri)
+
+HEADERS += \
+ core/psyccore.h \
+ preferences/preferences.h \
+ psyc.h \
+ models/models.h \
+ models/PlacesModel.h \
+ core/place.h \
+ core/gnunet/gnunet.h \
+ core/gnunet/gnunet_includes.h \
+ core/identity/identityService.h \
+ core/identity/identity.h \
+ models/IdentityModel.h
Deleted: gnunet-qt/SecureShare/SecureShare.pro.user
===================================================================
--- gnunet-qt/SecureShare/SecureShare.pro.user 2014-06-01 22:08:47 UTC (rev
33463)
+++ gnunet-qt/SecureShare/SecureShare.pro.user 2014-06-02 00:13:38 UTC (rev
33464)
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.1.1, 2014-05-31T18:56:55. -->
-<qtcreator>
- <data>
- <variable>ProjectExplorer.Project.ActiveTarget</variable>
- <value type="int">0</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.EditorSettings</variable>
- <valuemap type="QVariantMap">
- <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
- <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
- <value type="bool"
key="EditorConfiguration.CamelCaseNavigation">true</value>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
- <value type="QString" key="language">Cpp</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
- </valuemap>
- </valuemap>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
- <value type="QString" key="language">QmlJS</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
- </valuemap>
- </valuemap>
- <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
- <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
- <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
- <value type="int" key="EditorConfiguration.IndentSize">4</value>
- <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
- <value type="int" key="EditorConfiguration.MarginColumn">80</value>
- <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
- <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
- <value type="int" key="EditorConfiguration.PaddingMode">1</value>
- <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
- <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
- <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
- <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
- <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
- <value type="int" key="EditorConfiguration.TabSize">8</value>
- <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
- <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
- <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
- <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
- <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
- <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.PluginSettings</variable>
- <valuemap type="QVariantMap">
- <valuemap type="QVariantMap" key="ClangProjectSettings">
- <value type="QString" key="CustomPchFile"></value>
- <value type="int" key="PchUsage">1</value>
- </valuemap>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Target.0</variable>
- <valuemap type="QVariantMap">
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.3.0
(Qt32-5.3)</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.3.0
(Qt32-5.3)</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">{2df16ca3-6436-403d-92d4-5b6f5462a870}</value>
- <value type="int"
key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
- <value type="int"
key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
- <value type="int"
key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
- <valuemap type="QVariantMap"
key="ProjectExplorer.Target.BuildConfiguration.0">
- <value type="QString"
key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/GSOC/build-SecureShare-Qt_5_3_0_Qt32_5_3-Debug</value>
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
- <value type="QString"
key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList"
key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList"
key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool"
key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList"
key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int"
key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
- <value type="bool"
key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <valuemap type="QVariantMap"
key="ProjectExplorer.Target.BuildConfiguration.1">
- <value type="QString"
key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/GSOC/build-SecureShare-Qt_5_3_0_Qt32_5_3-Release</value>
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
- <value type="QString"
key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList"
key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList"
key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool"
key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList"
key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int"
key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
- <value type="bool"
key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
- <valuemap type="QVariantMap"
key="ProjectExplorer.Target.DeployConfiguration.0">
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy
locally</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
- <valuemap type="QVariantMap"
key="ProjectExplorer.Target.RunConfiguration.0">
- <valuelist type="QVariantList"
key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double"
key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double"
key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool"
key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList"
key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int"
key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool"
key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString"
key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SecureShare</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/GSOC/SecureShare/SecureShare.pro</value>
- <value type="QString"
key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
- <value type="QString"
key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">SecureShare.pro</value>
- <value type="bool"
key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
- <value type="bool"
key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
- <value type="QString"
key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.Target.RunConfigurationCount">1</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.TargetCount</variable>
- <value type="int">1</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
- <value type="QByteArray">{6781a312-6fd1-420e-a8b5-87c86d1f5aac}</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
- <value type="int">15</value>
- </data>
-</qtcreator>
Deleted: gnunet-qt/SecureShare/SecureShare.pro.user.16
===================================================================
--- gnunet-qt/SecureShare/SecureShare.pro.user.16 2014-06-01 22:08:47 UTC
(rev 33463)
+++ gnunet-qt/SecureShare/SecureShare.pro.user.16 2014-06-02 00:13:38 UTC
(rev 33464)
@@ -1,445 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.1.81, 2014-05-31T18:49:35. -->
-<qtcreator>
- <data>
- <variable>EnvironmentId</variable>
- <value type="QByteArray">{6781a312-6fd1-420e-a8b5-87c86d1f5aac}</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.ActiveTarget</variable>
- <value type="int">1</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.EditorSettings</variable>
- <valuemap type="QVariantMap">
- <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
- <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
- <value type="bool"
key="EditorConfiguration.CamelCaseNavigation">true</value>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
- <value type="QString" key="language">Cpp</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
- </valuemap>
- </valuemap>
- <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
- <value type="QString" key="language">QmlJS</value>
- <valuemap type="QVariantMap" key="value">
- <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
- </valuemap>
- </valuemap>
- <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
- <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
- <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
- <value type="int" key="EditorConfiguration.IndentSize">4</value>
- <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
- <value type="int" key="EditorConfiguration.MarginColumn">80</value>
- <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
- <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
- <value type="int" key="EditorConfiguration.PaddingMode">1</value>
- <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
- <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
- <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
- <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
- <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
- <value type="int" key="EditorConfiguration.TabSize">8</value>
- <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
- <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
- <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
- <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
- <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
- <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.PluginSettings</variable>
- <valuemap type="QVariantMap">
- <valuemap type="QVariantMap" key="ClangProjectSettings">
- <value type="QString" key="CustomPchFile"></value>
- <value type="int" key="PchUsage">1</value>
- </valuemap>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Target.0</variable>
- <valuemap type="QVariantMap">
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.3
Download</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.3 Download</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">{fd7e039f-4da7-4f6a-84ff-88db2ad72899}</value>
- <value type="int"
key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
- <value type="int"
key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
- <value type="int"
key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
- <valuemap type="QVariantMap"
key="ProjectExplorer.Target.BuildConfiguration.0">
- <value type="QString"
key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/GSOC/build-SecureShare-Qt_5_3_Download-Debug</value>
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
- <value type="QString"
key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList"
key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList"
key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool"
key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList"
key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int"
key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
- <value type="bool"
key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <valuemap type="QVariantMap"
key="ProjectExplorer.Target.BuildConfiguration.1">
- <value type="QString"
key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/GSOC/build-SecureShare-Qt_5_3_Download-Release</value>
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
- <value type="QString"
key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList"
key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList"
key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool"
key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList"
key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int"
key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
- <value type="bool"
key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
- <valuemap type="QVariantMap"
key="ProjectExplorer.Target.DeployConfiguration.0">
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy
locally</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
- <valuemap type="QVariantMap"
key="ProjectExplorer.Target.RunConfiguration.0">
- <valuelist type="QVariantList"
key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double"
key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double"
key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool"
key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList"
key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int"
key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool"
key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString"
key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SecureShare</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/GSOC/SecureShare/SecureShare.pro</value>
- <value type="QString"
key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
- <value type="QString"
key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">SecureShare.pro</value>
- <value type="bool"
key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
- <value type="bool"
key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
- <value type="QString"
key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.Target.RunConfigurationCount">1</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Target.1</variable>
- <valuemap type="QVariantMap">
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 5.3.0
(Qt32-5.3)</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 5.3.0
(Qt32-5.3)</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">{2df16ca3-6436-403d-92d4-5b6f5462a870}</value>
- <value type="int"
key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
- <value type="int"
key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
- <value type="int"
key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
- <valuemap type="QVariantMap"
key="ProjectExplorer.Target.BuildConfiguration.0">
- <value type="QString"
key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/GSOC/build-SecureShare-Qt_5_3_0_Qt32_5_3-Debug</value>
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
- <value type="QString"
key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList"
key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList"
key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool"
key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList"
key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Debug</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int"
key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
- <value type="bool"
key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <valuemap type="QVariantMap"
key="ProjectExplorer.Target.BuildConfiguration.1">
- <value type="QString"
key="ProjectExplorer.BuildConfiguration.BuildDirectory">C:/GSOC/build-SecureShare-Qt_5_3_0_Qt32_5_3-Release</value>
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
- <value type="QString"
key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
- <value type="bool"
key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
- </valuemap>
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList"
key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
- </valuemap>
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
- <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
- <valuelist type="QVariantList"
key="Qt4ProjectManager.MakeStep.AutomaticallyAddedMakeArguments"/>
- <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
- <value type="QString"
key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
- </valuemap>
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
- <value type="bool"
key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
- <valuelist type="QVariantList"
key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Release</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int"
key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
- <value type="bool"
key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
- <valuemap type="QVariantMap"
key="ProjectExplorer.Target.DeployConfiguration.0">
- <valuemap type="QVariantMap"
key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
- <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy
locally</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
- <valuemap type="QVariantMap"
key="ProjectExplorer.Target.RunConfiguration.0">
- <valuelist type="QVariantList"
key="Analyzer.Valgrind.AddedSuppressionFiles"/>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
- <value type="bool"
key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
- <value type="double"
key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
- <value type="double"
key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
- <value type="bool"
key="Analyzer.Valgrind.FilterExternalIssues">true</value>
- <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
- <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
- <valuelist type="QVariantList"
key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
- <value type="int"
key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
- <value type="bool"
key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
- <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
- <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
- <value type="QString"
key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
- <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
- <value type="int">0</value>
- <value type="int">1</value>
- <value type="int">2</value>
- <value type="int">3</value>
- <value type="int">4</value>
- <value type="int">5</value>
- <value type="int">6</value>
- <value type="int">7</value>
- <value type="int">8</value>
- <value type="int">9</value>
- <value type="int">10</value>
- <value type="int">11</value>
- <value type="int">12</value>
- <value type="int">13</value>
- <value type="int">14</value>
- </valuelist>
- <value type="int" key="PE.EnvironmentAspect.Base">2</value>
- <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">SecureShare</value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString"
key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:C:/GSOC/SecureShare/SecureShare.pro</value>
- <value type="QString"
key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments"></value>
- <value type="QString"
key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">SecureShare.pro</value>
- <value type="bool"
key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
- <value type="bool"
key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
- <value type="QString"
key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
- <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
- <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
- <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
- <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
- </valuemap>
- <value type="int"
key="ProjectExplorer.Target.RunConfigurationCount">1</value>
- </valuemap>
- </data>
- <data>
- <variable>ProjectExplorer.Project.TargetCount</variable>
- <value type="int">2</value>
- </data>
- <data>
- <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
- <value type="int">16</value>
- </data>
- <data>
- <variable>Version</variable>
- <value type="int">16</value>
- </data>
-</qtcreator>
Added: gnunet-qt/SecureShare/core/identity/identity.cpp
===================================================================
--- gnunet-qt/SecureShare/core/identity/identity.cpp
(rev 0)
+++ gnunet-qt/SecureShare/core/identity/identity.cpp 2014-06-02 00:13:38 UTC
(rev 33464)
@@ -0,0 +1,7 @@
+#include "identity.h"
+
+Identity::Identity(QString key, QObject *parent) :
+ QObject(parent)
+{
+ m_key = key;
+}
Added: gnunet-qt/SecureShare/core/identity/identity.h
===================================================================
--- gnunet-qt/SecureShare/core/identity/identity.h
(rev 0)
+++ gnunet-qt/SecureShare/core/identity/identity.h 2014-06-02 00:13:38 UTC
(rev 33464)
@@ -0,0 +1,46 @@
+#ifndef IDENTITY_H
+#define IDENTITY_H
+
+#include <QObject>
+
+class Identity : public QObject
+{
+ Q_OBJECT
+ Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+
+public:
+ explicit Identity(QString key, QObject *parent = 0);
+
+ //Index
+ int getIndex() const
+ { return m_index; }
+ void setIndex(int index)
+ {
+ m_index = index;
+ }
+
+
+ QString name(){
+ return m_name;
+ }
+ void setName(QString name){
+ m_name = name;
+ emit nameChanged(name);
+ emit modifiedSignal(m_index);
+ }
+
+
+private:
+ int m_index;
+ QString m_name;
+ QString m_key;
+
+signals:
+ void modifiedSignal(int index);
+ void nameChanged(QString name);
+
+public slots:
+
+};
+
+#endif // IDENTITY_H
Modified: gnunet-qt/SecureShare/core/identity/identityService.cpp
===================================================================
--- gnunet-qt/SecureShare/core/identity/identityService.cpp 2014-06-01
22:08:47 UTC (rev 33463)
+++ gnunet-qt/SecureShare/core/identity/identityService.cpp 2014-06-02
00:13:38 UTC (rev 33464)
@@ -1,4 +1,9 @@
#include "identityService.h"
+#include "psyc.h"
+#include "core/psyccore.h"
+#include "models/models.h"
+#include "models/IdentityModel.h"
+#include "core/identity/identity.h"
IdentityService::IdentityService(QObject *parent) :
QObject(parent)
@@ -17,8 +22,8 @@
this->m_config = config;
m_identityHandle = GNUNET_IDENTITY_connect (config,
- &add_ego_callback,
- NULL);
+ &addEgoCallback,
+ this);
}
@@ -32,65 +37,51 @@
* @param name name of the namespace to add
*/
void
-IdentityService::add_ego_callback (void *cls,
+IdentityService::addEgoCallback (void *cls,
struct GNUNET_IDENTITY_Ego *ego,
void **ego_ctx,
const char *name)
{
+ IdentityService* classPointer = (IdentityService*)cls;
+ classPointer->addEgo(ego,ego_ctx,name);
- /*
- GtkTreePath *path;
- GtkTreeRowReference *rr;
- GtkTreeIter iter;
- char *id;
- struct GNUNET_CRYPTO_EcdsaPublicKey pub;
+}
- if (NULL == ego)
- return; // nothing to be done
- rr = *ego_ctx;
- if (NULL == rr)
- {
- // insert operation
- GNUNET_assert (NULL != name);
- GNUNET_IDENTITY_ego_get_public_key (ego, &pub);
- id = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pub);
- gtk_list_store_insert_with_values (ls,
- &iter, G_MAXINT,
- IDENTITY_MC_NAME, name,
- IDENTITY_MC_IDENTIFIER, id,
- IDENTITY_MC_EGO, ego,
- -1);
- GNUNET_free (id);
- path = gtk_tree_model_get_path (GTK_TREE_MODEL (ls),
- &iter);
- rr = gtk_tree_row_reference_new (GTK_TREE_MODEL (ls),
- path);
- gtk_tree_path_free (path);
- *ego_ctx = rr;
- }
- else if (NULL == name)
- {
- // delete operation
- path = gtk_tree_row_reference_get_path (rr);
- gtk_tree_row_reference_free (rr);
- GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (ls),
- &iter, path));
- gtk_tree_path_free (path);
- gtk_list_store_remove (ls, &iter);
- *ego_ctx = NULL;
- }
- else
- {
- // rename operation
- path = gtk_tree_row_reference_get_path (rr);
- GNUNET_assert (gtk_tree_model_get_iter (GTK_TREE_MODEL (ls),
- &iter, path));
- gtk_list_store_set (ls,
- &iter,
- IDENTITY_MC_NAME, name,
- -1);
- gtk_tree_path_free (path);
- }
- */
+void
+IdentityService::addEgo(struct GNUNET_IDENTITY_Ego *ego,
+ void **ego_ctx,
+ const char *name)
+{
+ Identity* identity;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pub;
+
+
+ if (NULL == ego)
+ return; /* nothing to be done */
+
+ identity = (Identity*)*ego_ctx;
+
+ if(identity == NULL) // Its a new identity
+ {
+ GNUNET_IDENTITY_ego_get_public_key (ego, &pub);
+ char* id = GNUNET_CRYPTO_ecdsa_public_key_to_string (&pub);
+ QString strId = QString::fromLatin1(id);
+ QString strName = QString::fromLatin1(name);
+
+ identity = theApp->models()->identityModel()->add(strId,strName);
+
+
+ *ego_ctx = identity;
+ }
+ else if (NULL == name) // Delete
+ {
+
+ }
+ else // Rename
+ {
+ QString strName = QString::fromLatin1(name);
+ identity->setName(strName);
+ }
+
}
Modified: gnunet-qt/SecureShare/core/identity/identityService.h
===================================================================
--- gnunet-qt/SecureShare/core/identity/identityService.h 2014-06-01
22:08:47 UTC (rev 33463)
+++ gnunet-qt/SecureShare/core/identity/identityService.h 2014-06-02
00:13:38 UTC (rev 33464)
@@ -11,8 +11,9 @@
explicit IdentityService(QObject *parent = 0);
void start(GNUNET_CONFIGURATION_Handle *config);
- static void add_ego_callback(void *cls, struct GNUNET_IDENTITY_Ego *ego,
void **ego_ctx, const char *name);
+ static void addEgoCallback(void *cls, struct GNUNET_IDENTITY_Ego *ego,
void **ego_ctx, const char *name);
+ void addEgo(GNUNET_IDENTITY_Ego *ego, void **ego_ctx, const char *name);
signals:
public slots:
Modified: gnunet-qt/SecureShare/core/place.h
===================================================================
--- gnunet-qt/SecureShare/core/place.h 2014-06-01 22:08:47 UTC (rev 33463)
+++ gnunet-qt/SecureShare/core/place.h 2014-06-02 00:13:38 UTC (rev 33464)
@@ -24,6 +24,7 @@
void setName(QString name)
{
m_name = name;
+ emit nameChanged(name);
}
private:
Modified: gnunet-qt/SecureShare/main.cpp
===================================================================
--- gnunet-qt/SecureShare/main.cpp 2014-06-01 22:08:47 UTC (rev 33463)
+++ gnunet-qt/SecureShare/main.cpp 2014-06-02 00:13:38 UTC (rev 33464)
@@ -15,7 +15,7 @@
Psyc psyc;
- QQmlApplicationEngine
engine(QUrl(QStringLiteral("qrc:///qml/Splash.qml")));
+ QQmlApplicationEngine engine(QUrl(QStringLiteral("qrc:///qml/Main.qml")));
//Connect Window to quit signal
@@ -35,6 +35,8 @@
theWindow->show();
+
+
return app.exec();
Modified: gnunet-qt/SecureShare/models/IdentityModel.cpp
===================================================================
--- gnunet-qt/SecureShare/models/IdentityModel.cpp 2014-06-01 22:08:47 UTC
(rev 33463)
+++ gnunet-qt/SecureShare/models/IdentityModel.cpp 2014-06-02 00:13:38 UTC
(rev 33464)
@@ -21,44 +21,44 @@
#include <sstream>
-#include "models/PlacesModel.h"
-#include "core/place.h"
+#include "models/IdentityModel.h"
+#include "core/identity/identity.h"
#include <QQmlEngine>
-PlacesModel::PlacesModel(QObject *parent) :
+IdentityModel::IdentityModel(QObject *parent) :
QAbstractListModel(parent)
{
- //connect(this, &PlacesModel::addNewPeerSignal, this,
&PlacesModel::addNewPeerSlot, Qt::BlockingQueuedConnection);
- connect(this, &PlacesModel::addNewPeerSignal, this,
&PlacesModel::addNewPeerSlot);
+ //connect(this, &IdentityModel::addNewPeerSignal, this,
&IdentityModel::addNewPeerSlot, Qt::BlockingQueuedConnection);
+ connect(this, &IdentityModel::addNewIdentitySignal, this,
&IdentityModel::addNewIdentitySlot, Qt::BlockingQueuedConnection);
}
-int PlacesModel::rowCount(const QModelIndex& parent) const
+int IdentityModel::rowCount(const QModelIndex& parent) const
{
return m_data.size();
}
-bool PlacesModel::contains(QString id)
+bool IdentityModel::contains(QString id)
{
return m_lookupIndex.contains(id);
}
-QVariant PlacesModel::data(const QModelIndex& index, int role) const
+QVariant IdentityModel::data(const QModelIndex& index, int role) const
{
if (index.row() < 0 || index.row() >= m_data.count())
return QVariant();
- Place* peer = m_data[index.row()];
+ Identity* iden = m_data[index.row()];
switch(role)
{
case NAME:
- return peer->name();
+ return iden->name();
break;
default:
return QVariant::Invalid;
@@ -68,7 +68,7 @@
return QVariant::Invalid;
}
-QHash<int, QByteArray> PlacesModel::roleNames() const {
+QHash<int, QByteArray> IdentityModel::roleNames() const {
QHash<int, QByteArray> roles;
roles[NAME] = "name";
@@ -77,7 +77,7 @@
}
-void PlacesModel::modifiedSlot(int indexRow)
+void IdentityModel::modifiedSlot(int indexRow)
{
QModelIndex modelIndex = this->index(indexRow);
@@ -89,12 +89,14 @@
* @param key
* @return Return the new created place
*/
-Place* PlacesModel::add(QString key)
+Identity* IdentityModel::add(QString key, QString name)
{
- Place* peer = new Place(key);
- peer->moveToThread(this->thread());
- emit addNewPeerSignal(peer,key);
- return peer;
+ Identity* iden = new Identity(key);
+ iden->setName(name);
+
+ iden->moveToThread(this->thread());
+ emit addNewIdentitySignal(iden,key);
+ return iden;
}
@@ -103,7 +105,7 @@
* @param key, the place ID.
* @return return the same place as item
*/
-Place* PlacesModel::addNewPeerSlot(Place* item, QString key)
+Identity* IdentityModel::addNewIdentitySlot(Identity* item, QString key)
{
//Search if already exists
@@ -119,7 +121,7 @@
item->setIndex(index);
//Notify modifications
- connect(item, &Place::modifiedSignal,this, &PlacesModel::modifiedSlot);
+ connect(item, &Identity::modifiedSignal,this,
&IdentityModel::modifiedSlot);
m_lookupIndex[key] = index;
endInsertRows();
@@ -129,42 +131,42 @@
}
-Place* PlacesModel::get(QString key)
+Identity* IdentityModel::get(QString key)
{
if (m_lookupIndex.contains(key))
{
- Place* peer = m_data[m_lookupIndex[key]];
- return peer;
+ Identity* iden = m_data[m_lookupIndex[key]];
+ return iden;
}
else
return NULL;
}
-Place* PlacesModel::get(QModelIndex index)
+Identity* IdentityModel::get(QModelIndex index)
{
- if(getCount() < index.row())
+ if(getCount() <= index.row())
return NULL;
return m_data[index.row()];
}
-Place* PlacesModel::get(int index)
+Identity* IdentityModel::get(int index)
{
- if(getCount() < index)
+ if(getCount() <= index)
return NULL;
- Place *peer = m_data[index];
+ Identity *iden = m_data[index];
//Set he ownership so QML don't delete it.
- QQmlEngine::setObjectOwnership(peer, QQmlEngine::CppOwnership);
+ QQmlEngine::setObjectOwnership(iden, QQmlEngine::CppOwnership);
- return peer;
+ return iden;
}
-int PlacesModel::getCount()
+int IdentityModel::getCount()
{
return m_data.count();
}
Modified: gnunet-qt/SecureShare/models/IdentityModel.h
===================================================================
--- gnunet-qt/SecureShare/models/IdentityModel.h 2014-06-01 22:08:47 UTC
(rev 33463)
+++ gnunet-qt/SecureShare/models/IdentityModel.h 2014-06-02 00:13:38 UTC
(rev 33464)
@@ -39,7 +39,7 @@
explicit IdentityModel(QObject *parent = 0);
- Identity *add(QString key);
+ Identity *add(QString key, QString name);
int getCount();
bool contains(QString id);
@@ -53,7 +53,7 @@
public slots:
void modifiedSlot(int indexRow);
private slots:
- Place *addNewIdentitySlot(Identity* item, QString name);
+ Identity *addNewIdentitySlot(Identity* item, QString name);
private:
@@ -63,7 +63,7 @@
private:
QHash<QString, int> m_lookupIndex;
- QList<Place*> m_data;
+ QList<Identity*> m_data;
Modified: gnunet-qt/SecureShare/models/models.cpp
===================================================================
--- gnunet-qt/SecureShare/models/models.cpp 2014-06-01 22:08:47 UTC (rev
33463)
+++ gnunet-qt/SecureShare/models/models.cpp 2014-06-02 00:13:38 UTC (rev
33464)
@@ -21,12 +21,15 @@
#include "models.h"
#include "models/PlacesModel.h"
#include "core/place.h"
+#include "models/IdentityModel.h"
Models::Models(QObject *parent) :
QObject(parent)
{
m_places = new PlacesModel(this);
+ m_identities = new IdentityModel(this);
+
test();
}
Modified: gnunet-qt/SecureShare/models/models.h
===================================================================
--- gnunet-qt/SecureShare/models/models.h 2014-06-01 22:08:47 UTC (rev
33463)
+++ gnunet-qt/SecureShare/models/models.h 2014-06-02 00:13:38 UTC (rev
33464)
@@ -25,10 +25,12 @@
class PlacesModel;
+class IdentityModel;
class Models : public QObject
{
Q_OBJECT
Q_PROPERTY(PlacesModel * placesModel READ placesModel NOTIFY
placesModelChanged)
+ Q_PROPERTY(IdentityModel * identityModel READ identityModel NOTIFY
identityModelChanged)
public:
explicit Models(QObject *parent = 0);
@@ -37,14 +39,19 @@
PlacesModel* placesModel() const
{ return m_places; }
+ IdentityModel* identityModel() const
+ { return m_identities; }
+
void test();
signals:
void placesModelChanged(PlacesModel*);
+ void identityModelChanged(IdentityModel*);
public slots:
private:
PlacesModel* m_places;
+ IdentityModel* m_identities;
};
Modified: gnunet-qt/SecureShare/psyc.cpp
===================================================================
--- gnunet-qt/SecureShare/psyc.cpp 2014-06-01 22:08:47 UTC (rev 33463)
+++ gnunet-qt/SecureShare/psyc.cpp 2014-06-02 00:13:38 UTC (rev 33464)
@@ -4,8 +4,8 @@
#include "core/psyccore.h"
#include "models/models.h"
#include "models/PlacesModel.h"
+#include "models/IdentityModel.h"
-
#include <QQmlEngine>
#include <QtQml/qqml.h>
@@ -57,6 +57,7 @@
qmlRegisterUncreatableType<Models>(URI, 1, 0, "Models", QLatin1String("Use
calling the psyc method."));
qmlRegisterUncreatableType<PlacesModel>(URI, 1, 0, "PlacesModel",
QLatin1String("Use calling the psyc method."));
+ qmlRegisterUncreatableType<IdentityModel>(URI, 1, 0, "IdentityModel",
QLatin1String("Use calling the psyc method."));
Modified: gnunet-qt/SecureShare/qml/Splash.qml
===================================================================
--- gnunet-qt/SecureShare/qml/Splash.qml 2014-06-01 22:08:47 UTC (rev
33463)
+++ gnunet-qt/SecureShare/qml/Splash.qml 2014-06-02 00:13:38 UTC (rev
33464)
@@ -1,21 +1,56 @@
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
+import QtQuick.Window 2.0
import Psyc 1.0
-ApplicationWindow {
+Window {
visible: true
width: 444
height: 400
id:splashWnd
+ flags: Qt.Window
+ /*onActiveChanged: {
+ mainWnd.visible = false;
+ }*/
+
+
+
+
+
ColumnLayout{
Image {
id: imageSplash
source: "qrc:///assets/banner.png"
}
+ RowLayout{
+ Layout.fillWidth: true
+
+ anchors.horizontalCenter: parent.horizontalCenter
+ Label{
+ text: "Select your ego"
+ }
+
+ ComboBox {
+ width: 200
+ model: Psyc.models.identityModel
+ textRole: "name"
+ }
+ }
+
+ Button{
+ text: "Enter"
+ anchors.horizontalCenter: parent.horizontalCenter
+
+ onClicked: {
+ splashWnd.visible = false;
+ mainWnd.visible = true;
+ }
+ }
+
}
Modified: gnunet-qt/SecureShare/qml/main.qml
===================================================================
--- gnunet-qt/SecureShare/qml/main.qml 2014-06-01 22:08:47 UTC (rev 33463)
+++ gnunet-qt/SecureShare/qml/main.qml 2014-06-02 00:13:38 UTC (rev 33464)
@@ -1,12 +1,13 @@
import QtQuick 2.2
import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1
+import QtQuick.Window 2.0
import Psyc 1.0
ApplicationWindow {
- visible: true
width: 300
height: 600
+ id: mainWnd
menuBar: MenuBar {
Menu {
@@ -19,13 +20,24 @@
}
+
+ Splash{
+ id:splashWnd
+ visible: true;
+ }
+
ConversationWindow{
id: conversationWnd
}
+ onActiveChanged: {
+ if(splashWnd.visible)
+ visible = false;
+ }
+
TableView {
TableViewColumn{ role: "title" ; title: "Title" ; width: 100 }
model: Psyc.models.placesModel
Modified: gnunet-qt/SecureShare/qml.qrc
===================================================================
--- gnunet-qt/SecureShare/qml.qrc 2014-06-01 22:08:47 UTC (rev 33463)
+++ gnunet-qt/SecureShare/qml.qrc 2014-06-02 00:13:38 UTC (rev 33464)
@@ -1,6 +1,6 @@
<RCC>
<qresource prefix="/">
- <file>qml/main.qml</file>
+ <file>qml/Main.qml</file>
<file>qml/images/chat.png</file>
<file>qml/images/person.png</file>
<file>qml/ConversationWindow.qml</file>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33464 - in gnunet-qt/SecureShare: . core core/identity models qml,
gnunet <=