Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-26 09:41:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added a simple startup splash screen.

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3684 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-10-19 18:06:22 +00:00
parent 6a55d75a86
commit 3a50bcb8f7
6 changed files with 96 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
retroshare-gui/src/gui/MainWindow.cpp
View File

@ -152,13 +152,6 @@ MainWindow::MainWindow(QWidget* parent, Qt::WFlags flags)
m_bStatusLoadDone = false; m_bStatusLoadDone = false;
isIdle = false; isIdle = false;
if (Settings->value(QString::fromUtf8("FirstRun"), true).toBool())
{
Settings->setValue(QString::fromUtf8("FirstRun"), false);
QuickStartWizard *qstartWizard = new QuickStartWizard(this);
qstartWizard->exec();
}
setWindowTitle(tr("RetroShare %1 a secure decentralised communication platform").arg(retroshareVersion())); setWindowTitle(tr("RetroShare %1 a secure decentralised communication platform").arg(retroshareVersion()));
// Setting icons // Setting icons

1
retroshare-gui/src/gui/images.qrc
View File

@ -1,5 +1,6 @@
<RCC> <RCC>
<qresource prefix="/" > <qresource prefix="/" >
<file>images/splash.png</file>
<file>images/attach.png</file> <file>images/attach.png</file>
<file>images/audio-x-monkey.png</file> <file>images/audio-x-monkey.png</file>
<file>images/video-x-generic.png</file> <file>images/video-x-generic.png</file>

BIN
retroshare-gui/src/gui/images/splash.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 303 KiB

BIN
retroshare-gui/src/lang/retroshare_de.qm
View File

Binary file not shown.

111
retroshare-gui/src/lang/retroshare_de.ts
View File

@ -856,28 +856,28 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>ChanMsgItem</name> <name>ChanMsgItem</name>
<message> <message>
<location filename="../gui/feeds/ChanMsgItem.ui" line="+235"/> <location filename="../gui/feeds/ChanMsgItem.ui" line="+357"/>
<source>Remove Item</source> <source>Remove Item</source>
<translation>Eintrag entfernen</translation> <translation>Eintrag entfernen</translation>
</message> </message>
<message> <message>
<location line="+26"/> <location line="+26"/>
<location filename="../gui/feeds/ChanMsgItem.cpp" line="+290"/> <location filename="../gui/feeds/ChanMsgItem.cpp" line="+292"/>
<source>Expand</source> <source>Expand</source>
<translation>Erweitern</translation> <translation>Erweitern</translation>
</message> </message>
<message> <message>
<location line="+24"/> <location line="-107"/>
<source>Download</source> <source>Download</source>
<translation>Herunterladen</translation> <translation>Herunterladen</translation>
</message> </message>
<message> <message>
<location line="+11"/> <location line="+16"/>
<source>Play</source> <source>Play</source>
<translation>Abspielen</translation> <translation>Abspielen</translation>
</message> </message>
<message> <message>
<location line="+33"/> <location line="-69"/>
<source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
@ -886,12 +886,12 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished">Gelesen Status umschalten</translation> <translation type="unfinished">Gelesen Status umschalten</translation>
</message> </message>
<message> <message>
<location line="+36"/> <location line="+41"/>
<source>New</source> <source>New</source>
<translation>Neu</translation> <translation>Neu</translation>
</message> </message>
<message> <message>
<location line="-156"/> <location line="+67"/>
<source>Unsubscribe From Channel</source> <source>Unsubscribe From Channel</source>
<translation>Kanal abbestellen</translation> <translation>Kanal abbestellen</translation>
</message> </message>
@ -1009,12 +1009,32 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Arial&apos;; font-size:10pt; font-weight:600;&quot;&gt;Kanäle&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation> &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Arial&apos;; font-size:10pt; font-weight:600;&quot;&gt;Kanäle&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+29"/>
<source>Add</source> <source>Add</source>
<translation>Hinzufügen</translation> <translation>Hinzufügen</translation>
</message> </message>
<message> <message>
<location line="+355"/> <location line="+133"/>
<source>Reset</source>
<translation type="unfinished">Zurücksetzen</translation>
</message>
<message>
<location line="+43"/>
<source>Enter a Keyword here</source>
<translation type="unfinished">Geben sie einen Suchbegriff ein</translation>
</message>
<message>
<location line="+15"/>
<source>Start Search</source>
<translation type="unfinished">Starte Suche</translation>
</message>
<message>
<location line="+23"/>
<source>Search</source>
<translation type="unfinished">Suchen</translation>
</message>
<message>
<location line="+269"/>
<source>Set all to read</source> <source>Set all to read</source>
<translation>Alle als gelesen markieren</translation> <translation>Alle als gelesen markieren</translation>
</message> </message>
@ -1044,7 +1064,7 @@ p, li { white-space: pre-wrap; }
<translation>Kanal abbestellen</translation> <translation>Kanal abbestellen</translation>
</message> </message>
<message> <message>
<location filename="../gui/ChannelFeed.cpp" line="+78"/> <location filename="../gui/ChannelFeed.cpp" line="+84"/>
<source>Name</source> <source>Name</source>
<translation>Name</translation> <translation>Name</translation>
</message> </message>
@ -1074,8 +1094,8 @@ p, li { white-space: pre-wrap; }
<translation>Andere Kanäle</translation> <translation>Andere Kanäle</translation>
</message> </message>
<message> <message>
<location filename="../gui/ChannelFeed.ui" line="-162"/> <location filename="../gui/ChannelFeed.ui" line="-303"/>
<location filename="../gui/ChannelFeed.cpp" line="+37"/> <location filename="../gui/ChannelFeed.cpp" line="+38"/>
<source>Post to Channel</source> <source>Post to Channel</source>
<translation>Kanalbeitrag erstellen</translation> <translation>Kanalbeitrag erstellen</translation>
</message> </message>
@ -1100,7 +1120,7 @@ p, li { white-space: pre-wrap; }
<translation>Verteile Kanal</translation> <translation>Verteile Kanal</translation>
</message> </message>
<message> <message>
<location line="+236"/> <location line="+281"/>
<source>Popularity: %1 <source>Popularity: %1
Fetches: %2 Fetches: %2
Available: %3</source> Available: %3</source>
@ -1109,12 +1129,12 @@ Abgeholt: %2
Verfügbar: %3</translation> Verfügbar: %3</translation>
</message> </message>
<message> <message>
<location line="+125"/> <location line="+126"/>
<source>No Channel Selected</source> <source>No Channel Selected</source>
<translation>Keinen Kanal gewählt</translation> <translation>Keinen Kanal gewählt</translation>
</message> </message>
<message> <message>
<location line="-367"/> <location line="-413"/>
<source>Restore Publish Rights for Channel</source> <source>Restore Publish Rights for Channel</source>
<translation>Stelle Veröffentlichungsrechte für Kanal wieder her</translation> <translation>Stelle Veröffentlichungsrechte für Kanal wieder her</translation>
</message> </message>
@ -3448,7 +3468,7 @@ p, li { white-space: pre-wrap; }
<translation>Beliebtheit:</translation> <translation>Beliebtheit:</translation>
</message> </message>
<message> <message>
<location line="+336"/> <location line="+327"/>
<location line="+107"/> <location line="+107"/>
<source>Anonymous</source> <source>Anonymous</source>
<translation>Anonym</translation> <translation>Anonym</translation>
@ -3487,7 +3507,7 @@ p, li { white-space: pre-wrap; }
<translation>Du kannst einem anonymen Autor nicht antworten</translation> <translation>Du kannst einem anonymen Autor nicht antworten</translation>
</message> </message>
<message> <message>
<location line="-1498"/> <location line="-1489"/>
<source>Your Forums</source> <source>Your Forums</source>
<translation>Deine Foren</translation> <translation>Deine Foren</translation>
</message> </message>
@ -3630,7 +3650,7 @@ p, li { white-space: pre-wrap; }
</message> </message>
<message> <message>
<location filename="../gui/ForumsDialog.cpp" line="+127"/> <location filename="../gui/ForumsDialog.cpp" line="+127"/>
<location line="+1261"/> <location line="+1252"/>
<source>Start New Thread</source> <source>Start New Thread</source>
<translation>Erstelle neues Thema</translation> <translation>Erstelle neues Thema</translation>
</message> </message>
@ -3658,7 +3678,7 @@ p, li { white-space: pre-wrap; }
<translation>Inhalt</translation> <translation>Inhalt</translation>
</message> </message>
<message> <message>
<location filename="../gui/ForumsDialog.cpp" line="-1248"/> <location filename="../gui/ForumsDialog.cpp" line="-1239"/>
<location line="+3"/> <location line="+3"/>
<source>Mark as read</source> <source>Mark as read</source>
<translation>Als gelesen markieren</translation> <translation>Als gelesen markieren</translation>
@ -4931,7 +4951,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>MainWindow</name> <name>MainWindow</name>
<message> <message>
<location filename="../gui/MainWindow.cpp" line="+200"/> <location filename="../gui/MainWindow.cpp" line="+193"/>
<source>Network</source> <source>Network</source>
<translation>Netzwerk</translation> <translation>Netzwerk</translation>
</message> </message>
@ -8423,7 +8443,7 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>QObject</name> <name>QObject</name>
<message> <message>
<location filename="../main.cpp" line="+143"/> <location filename="../main.cpp" line="+151"/>
<location line="+6"/> <location line="+6"/>
<source>Multiple instances</source> <source>Multiple instances</source>
<translation>Mehrere Instanzen</translation> <translation>Mehrere Instanzen</translation>
@ -9962,6 +9982,24 @@ p, li { white-space: pre-wrap; }
<translation>Neue Nachricht</translation> <translation>Neue Nachricht</translation>
</message> </message>
</context> </context>
<context>
<name>SplashScreen</name>
<message>
<location filename="../main.cpp" line="-29"/>
<source>Load profile</source>
<translation>Lade Profil</translation>
</message>
<message>
<location line="+35"/>
<source>Load configuration</source>
<translation>Lade Konfiguration</translation>
</message>
<message>
<location line="+4"/>
<source>Create interface</source>
<translation>Erstelle Oberfläche</translation>
</message>
</context>
<context> <context>
<name>StartDialog</name> <name>StartDialog</name>
<message> <message>
@ -10390,33 +10428,28 @@ p, li { white-space: pre-wrap; }
<context> <context>
<name>SubFileItem</name> <name>SubFileItem</name>
<message> <message>
<location filename="../gui/feeds/SubFileItem.ui" line="+193"/> <location filename="../gui/feeds/SubFileItem.ui" line="+142"/>
<source>%p Kb</source> <source>%p Kb</source>
<translation>%p Kb</translation> <translation>%p Kb</translation>
</message> </message>
<message> <message>
<location line="+65"/> <location line="+117"/>
<source>Expand</source>
<translation>Erweitern</translation>
</message>
<message>
<location line="+26"/>
<source>Save File</source> <source>Save File</source>
<translation>Datei speichern</translation> <translation>Datei speichern</translation>
</message> </message>
<message> <message>
<location line="-72"/> <location line="-98"/>
<source>Cancel Download</source> <source>Cancel Download</source>
<translation>Download abbrechen</translation> <translation>Download abbrechen</translation>
</message> </message>
<message> <message>
<location line="-107"/> <location line="+26"/>
<source>Download File</source> <source>Download File</source>
<translation>Datei herunterladen</translation> <translation>Datei herunterladen</translation>
</message> </message>
<message> <message>
<location line="+26"/> <location line="+26"/>
<location filename="../gui/feeds/SubFileItem.cpp" line="+580"/> <location filename="../gui/feeds/SubFileItem.cpp" line="+573"/>
<location line="+6"/> <location line="+6"/>
<source>Play File</source> <source>Play File</source>
<translation>Datei abspielen</translation> <translation>Datei abspielen</translation>
@ -10437,38 +10470,38 @@ p, li { white-space: pre-wrap; }
<translation>Abspielen</translation> <translation>Abspielen</translation>
</message> </message>
<message> <message>
<location filename="../gui/feeds/SubFileItem.cpp" line="-429"/> <location filename="../gui/feeds/SubFileItem.cpp" line="-422"/>
<location line="+8"/> <location line="+7"/>
<source>ERROR</source> <source>ERROR</source>
<translation>FEHLER</translation> <translation>FEHLER</translation>
</message> </message>
<message> <message>
<location line="+16"/> <location line="+15"/>
<source>EXTRA</source> <source>EXTRA</source>
<translation>EXTRA</translation> <translation>EXTRA</translation>
</message> </message>
<message> <message>
<location line="+11"/> <location line="+10"/>
<source>REMOTE</source> <source>REMOTE</source>
<translation>ENTFERNT</translation> <translation>ENTFERNT</translation>
</message> </message>
<message> <message>
<location line="+9"/> <location line="+8"/>
<source>DOWNLOAD</source> <source>DOWNLOAD</source>
<translation>DOWNLOAD</translation> <translation>DOWNLOAD</translation>
</message> </message>
<message> <message>
<location line="+11"/> <location line="+10"/>
<source>LOCAL</source> <source>LOCAL</source>
<translation>LOKAL</translation> <translation>LOKAL</translation>
</message> </message>
<message> <message>
<location line="+9"/> <location line="+8"/>
<source>UPLOAD</source> <source>UPLOAD</source>
<translation>UPLOAD</translation> <translation>UPLOAD</translation>
</message> </message>
<message> <message>
<location line="+306"/> <location line="+305"/>
<source>File %1 does not exist at location.</source> <source>File %1 does not exist at location.</source>
<translation>Datei %1 existiert nicht.</translation> <translation>Datei %1 existiert nicht.</translation>
</message> </message>

23
retroshare-gui/src/main.cpp
View File

@ -21,6 +21,7 @@
#include <QObject> #include <QObject>
#include <QMessageBox> #include <QMessageBox>
#include <QSplashScreen>
#include <rshare.h> #include <rshare.h>
#ifndef MINIMAL_RSGUI #ifndef MINIMAL_RSGUI
#include "gui/MainWindow.h" #include "gui/MainWindow.h"
@ -40,6 +41,7 @@
#include "gui/connect/ConfCertDialog.h" #include "gui/connect/ConfCertDialog.h"
#include "idle/idle.h" #include "idle/idle.h"
#include "gui/common/Emoticons.h" #include "gui/common/Emoticons.h"
#include "gui/QuickStartWizard.h"
/*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers. /*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers.
#include <gui/qskinobject/qskinobject.h> #include <gui/qskinobject/qskinobject.h>
@ -83,6 +85,8 @@ int main(int argc, char *argv[])
Rshare rshare(args, argc, argv, Rshare rshare(args, argc, argv,
QString::fromStdString(RsInit::RsConfigDirectory())); QString::fromStdString(RsInit::RsConfigDirectory()));
QSplashScreen splashScreen(QPixmap(":/images/splash.png")/* , Qt::WindowStaysOnTopHint*/);
/* Login Dialog */ /* Login Dialog */
if (!okStart) if (!okStart)
{ {
@ -121,9 +125,13 @@ int main(int argc, char *argv[])
GenCertDialog gd; GenCertDialog gd;
gd.exec (); gd.exec ();
} }
splashScreen.show();
} }
else else
{ {
splashScreen.show();
splashScreen.showMessage(rshare.translate("SplashScreen", "Load profile"), Qt::AlignHCenter | Qt::AlignBottom);
std::string preferredId, gpgId, gpgName, gpgEmail, sslName; std::string preferredId, gpgId, gpgName, gpgEmail, sslName;
RsInit::getPreferedAccountId(preferredId); RsInit::getPreferedAccountId(preferredId);
@ -158,8 +166,12 @@ int main(int argc, char *argv[])
} }
} }
splashScreen.showMessage(rshare.translate("SplashScreen", "Load configuration"), Qt::AlignHCenter | Qt::AlignBottom);
rsicontrol->StartupRetroShare(); rsicontrol->StartupRetroShare();
splashScreen.showMessage(rshare.translate("SplashScreen", "Create interface"), Qt::AlignHCenter | Qt::AlignBottom);
/* recreate global settings object, now with correct path */ /* recreate global settings object, now with correct path */
RshareSettings::Create (); RshareSettings::Create ();
RsharePeerSettings::Create(); RsharePeerSettings::Create();
@ -171,7 +183,16 @@ int main(int argc, char *argv[])
#else #else
Emoticons::load(); Emoticons::load();
if (Settings->value(QString::fromUtf8("FirstRun"), true).toBool()) {
splashScreen.hide();
Settings->setValue(QString::fromUtf8("FirstRun"), false);
QuickStartWizard qstartWizard;
qstartWizard.exec();
}
MainWindow *w = MainWindow::Create (); MainWindow *w = MainWindow::Create ();
splashScreen.finish(w);
// I'm using a signal to transfer the hashing info to the mainwindow, because Qt schedules signals properly to // I'm using a signal to transfer the hashing info to the mainwindow, because Qt schedules signals properly to
// avoid clashes between infos from threads. // avoid clashes between infos from threads.
@ -214,6 +235,8 @@ int main(int argc, char *argv[])
if(!Settings->value(QString::fromUtf8("StartMinimized"), false).toBool()) if(!Settings->value(QString::fromUtf8("StartMinimized"), false).toBool())
{ {
w->show(); w->show();
} else {
splashScreen.close();
} }
/* Startup a Timer to keep the gui's updated */ /* Startup a Timer to keep the gui's updated */