[GNUnet-SVN] r33626 - in gnunet-qt/SecureShare: . assets core qml

[gnunet]

Author: bratao
Date: 2014-06-10 16:57:51 +0200 (Tue, 10 Jun 2014)
New Revision: 33626

Added:
   gnunet-qt/SecureShare/assets/icon.ico
Modified:
   gnunet-qt/SecureShare/core/psyccore.cpp
   gnunet-qt/SecureShare/main.cpp
   gnunet-qt/SecureShare/qml.qrc
   gnunet-qt/SecureShare/qml/Splash.qml
Log:
Add Icon

Added: gnunet-qt/SecureShare/assets/icon.ico
===================================================================
(Binary files differ)

Index: gnunet-qt/SecureShare/assets/icon.ico
===================================================================
--- gnunet-qt/SecureShare/assets/icon.ico       2014-06-10 14:20:55 UTC (rev 
33625)
+++ gnunet-qt/SecureShare/assets/icon.ico       2014-06-10 14:57:51 UTC (rev 
33626)

Property changes on: gnunet-qt/SecureShare/assets/icon.ico
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+image/x-icon
\ No newline at end of property
Modified: gnunet-qt/SecureShare/core/psyccore.cpp
===================================================================
--- gnunet-qt/SecureShare/core/psyccore.cpp     2014-06-10 14:20:55 UTC (rev 
33625)
+++ gnunet-qt/SecureShare/core/psyccore.cpp     2014-06-10 14:57:51 UTC (rev 
33626)
@@ -62,7 +62,7 @@
 
 
 
-  m_tray = new QSystemTrayIcon(QIcon(":/asserts/CangoteHead.ico"),theWindow); 
//Same as above
+  m_tray = new QSystemTrayIcon(QIcon(":/assets/icon.ico"),theWindow); //Same 
as above
   m_tray->setContextMenu(m_trayMenu);
   m_tray->setVisible(true);
 

Modified: gnunet-qt/SecureShare/main.cpp
===================================================================
--- gnunet-qt/SecureShare/main.cpp      2014-06-10 14:20:55 UTC (rev 33625)
+++ gnunet-qt/SecureShare/main.cpp      2014-06-10 14:57:51 UTC (rev 33626)
@@ -33,8 +33,10 @@
     //Create the tray icon
     theApp->setupTray();
 
-    theWindow->setTitle(QString("PSYC 2.0"));
+    theWindow->setTitle(QString("SecureShare 1.0"));
+    theWindow->setIcon(QIcon(":/assets/icon.ico"));
 
+
     theWindow->show();
 
 

Modified: gnunet-qt/SecureShare/qml/Splash.qml
===================================================================
--- gnunet-qt/SecureShare/qml/Splash.qml        2014-06-10 14:20:55 UTC (rev 
33625)
+++ gnunet-qt/SecureShare/qml/Splash.qml        2014-06-10 14:57:51 UTC (rev 
33626)
@@ -40,14 +40,13 @@
                 textRole: "name"
                 currentIndex: -1
 
-                onActivated: {
 
-                    if(index === model.getCount()){
+                onCurrentIndexChanged: {
+                    if(currentIndex === model.getCount()){
                         var newego = 
Qt.createComponent("qrc:///qml/NewEgo.qml");
                         var newegoWnd = newego.createObject();
                         newegoWnd.show();
                     }
-
                 }
 
             }

Modified: gnunet-qt/SecureShare/qml.qrc
===================================================================
--- gnunet-qt/SecureShare/qml.qrc       2014-06-10 14:20:55 UTC (rev 33625)
+++ gnunet-qt/SecureShare/qml.qrc       2014-06-10 14:57:51 UTC (rev 33626)
@@ -17,5 +17,7 @@
         <file>qml/threadChat/assets/lynX.jpg</file>
         <file>qml/threadChat/assets/Conffeti-background.jpg</file>
         <file>qml/threadChat/assets/popcorn-background.jpg</file>
+        <file>assets/icon.png</file>
+        <file>assets/icon.ico</file>
     </qresource>
 </RCC>