Commit 4296ae62 authored by squbs's avatar squbs

Merge branch 'master' of https://github.com/straks/straks

parents 95033888 6ddc6ccb
......@@ -348,7 +348,7 @@ FORMS += \
../src/qt/forms/overviewpage.ui \
../src/qt/forms/receivecoinsdialog.ui \
../src/qt/forms/receiverequestdialog.ui \
../src/qt/forms/rpcconsole.ui \
../src/qt/forms/debugwindow.ui \
../src/qt/forms/sendcoinsdialog.ui \
../src/qt/forms/sendcoinsentry.ui \
../src/qt/forms/signverifymessagedialog.ui \
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<TS language="el" version="2.1">
<context>
<name>AddressBookPage</name>
<message>
<source>Create a new address</source>
<translation>Δημιουργία νέου λογαριασμού</translation>
</message>
</context>
<context>
<name>AddressTableModel</name>
</context>
<context>
<name>AskPassphraseDialog</name>
<message>
<source>Enter passphrase</source>
<translation>Εισάγετε συνθηματικό</translation>
</message>
<message>
<source>New passphrase</source>
<translation>Νέο συνθηματικό</translation>
</message>
<message>
<source>Repeat new passphrase</source>
<translation>Επαναλάβετε νέο συνθηματικό</translation>
</message>
</context>
<context>
<name>BanTableModel</name>
</context>
<context>
<name>STRAKSGUI</name>
<message>
<source>Quit application</source>
<translation>Κλείσιμο εφαρμογής</translation>
</message>
<message>
<source>Wallet</source>
<translation>Πορτοφόλι</translation>
</message>
<message>
<source>Error</source>
<translation>Σφάλμα</translation>
</message>
</context>
<context>
<name>CoinControlDialog</name>
<message>
<source>Date</source>
<translation>Ημερομηνία</translation>
</message>
</context>
<context>
<name>EditAddressDialog</name>
<message>
<source>&amp;Label</source>
<translation>Ετικέτα</translation>
</message>
<message>
<source>&amp;Address</source>
<translation>Διεύθυνση</translation>
</message>
</context>
<context>
<name>FreespaceChecker</name>
</context>
<context>
<name>HelpMessageDialog</name>
<message>
<source>version</source>
<translation>έκδοση</translation>
</message>
</context>
<context>
<name>Intro</name>
<message>
<source>Welcome</source>
<translation>Καλώς Ήλθατε</translation>
</message>
<message>
<source>Error</source>
<translation>Σφάλμα</translation>
</message>
</context>
<context>
<name>ModalOverlay</name>
</context>
<context>
<name>OpenURIDialog</name>
</context>
<context>
<name>OptionsDialog</name>
<message>
<source>W&amp;allet</source>
<translation>Πορτοφόλι</translation>
</message>
</context>
<context>
<name>OverviewPage</name>
</context>
<context>
<name>PaymentServer</name>
</context>
<context>
<name>PeerTableModel</name>
</context>
<context>
<name>QObject</name>
</context>
<context>
<name>QObject::QObject</name>
</context>
<context>
<name>QRImageWidget</name>
</context>
<context>
<name>RPCConsole</name>
<message>
<source>Services</source>
<translation>Υπηρεσίες</translation>
</message>
</context>
<context>
<name>ReceiveCoinsDialog</name>
<message>
<source>Remove</source>
<translation>Αφαίρεση</translation>
</message>
</context>
<context>
<name>ReceiveRequestDialog</name>
</context>
<context>
<name>RecentRequestsTableModel</name>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<source>Insufficient funds!</source>
<translation>Κεφάλαια μη επαρκή</translation>
</message>
<message>
<source>Recommended:</source>
<translation>Συνίσταται:</translation>
</message>
</context>
<context>
<name>SendCoinsEntry</name>
<message>
<source>Message:</source>
<translation>Μήνυμα:</translation>
</message>
</context>
<context>
<name>SendConfirmationDialog</name>
</context>
<context>
<name>ShutdownWindow</name>
</context>
<context>
<name>SignVerifyMessageDialog</name>
</context>
<context>
<name>SplashScreen</name>
</context>
<context>
<name>TrafficGraphWidget</name>
</context>
<context>
<name>TransactionDesc</name>
</context>
<context>
<name>TransactionDescDialog</name>
</context>
<context>
<name>TransactionTableModel</name>
</context>
<context>
<name>TransactionView</name>
</context>
<context>
<name>UnitDisplayStatusBarControl</name>
</context>
<context>
<name>WalletFrame</name>
</context>
<context>
<name>WalletModel</name>
</context>
<context>
<name>WalletView</name>
</context>
<context>
<name>straks-core</name>
<message>
<source>Insufficient funds</source>
<translation>Κεφάλαια μη επαρκή</translation>
</message>
<message>
<source>Loading wallet...</source>
<translation>Φόρτωση πορτοφολιού...</translation>
</message>
<message>
<source>Rescanning...</source>
<translation>Επανάληψη σάρωσης</translation>
</message>
<message>
<source>Done loading</source>
<translation>Η φόρτωση ολοκληρώθηκε</translation>
</message>
<message>
<source>Error</source>
<translation>Σφάλμα</translation>
</message>
</context>
</TS>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<TS language="vi" version="2.1">
<context>
<name>AddressBookPage</name>
<message>
<source>Create a new address</source>
<translation>To mt địa ch mi</translation>
</message>
<message>
<source>&amp;New</source>
<translation>To mi</translation>
</message>
<message>
<source>Copy the currently selected address to the system clipboard</source>
<translation>Sao chép các địa ch đã được chn vào b nh tm thi ca h thng</translation>
</message>
<message>
<source>&amp;Copy</source>
<translation>Sao chép</translation>
</message>
<message>
<source>&amp;Delete</source>
<translation>&amp;Xóa</translation>
</message>
</context>
<context>
<name>AddressTableModel</name>
</context>
<context>
<name>AskPassphraseDialog</name>
</context>
<context>
<name>BanTableModel</name>
</context>
<context>
<name>STRAKSGUI</name>
</context>
<context>
<name>CoinControlDialog</name>
<message>
<source>Amount:</source>
<translation>S lượng:</translation>
</message>
<message>
<source>Amount</source>
<translation>S lượng</translation>
</message>
</context>
<context>
<name>EditAddressDialog</name>
<message>
<source>&amp;Label</source>
<translation>Nhãn d liu</translation>
</message>
<message>
<source>&amp;Address</source>
<translation>Địa ch</translation>
</message>
</context>
<context>
<name>FreespaceChecker</name>
</context>
<context>
<name>HelpMessageDialog</name>
</context>
<context>
<name>Intro</name>
</context>
<context>
<name>ModalOverlay</name>
</context>
<context>
<name>OpenURIDialog</name>
</context>
<context>
<name>OptionsDialog</name>
</context>
<context>
<name>OverviewPage</name>
</context>
<context>
<name>PaymentServer</name>
</context>
<context>
<name>PeerTableModel</name>
</context>
<context>
<name>QObject</name>
<message>
<source>Amount</source>
<translation>S lượng</translation>
</message>
</context>
<context>
<name>QObject::QObject</name>
</context>
<context>
<name>QRImageWidget</name>
</context>
<context>
<name>RPCConsole</name>
</context>
<context>
<name>ReceiveCoinsDialog</name>
</context>
<context>
<name>ReceiveRequestDialog</name>
<message>
<source>Copy &amp;Address</source>
<translation>Sao chép địa ch</translation>
</message>
</context>
<context>
<name>RecentRequestsTableModel</name>
</context>
<context>
<name>SendCoinsDialog</name>
<message>
<source>Amount:</source>
<translation>S lượng:</translation>
</message>
</context>
<context>
<name>SendCoinsEntry</name>
</context>
<context>
<name>SendConfirmationDialog</name>
</context>
<context>
<name>ShutdownWindow</name>
</context>
<context>
<name>SignVerifyMessageDialog</name>
</context>
<context>
<name>SplashScreen</name>
</context>
<context>
<name>TrafficGraphWidget</name>
</context>
<context>
<name>TransactionDesc</name>
</context>
<context>
<name>TransactionDescDialog</name>
</context>
<context>
<name>TransactionTableModel</name>
</context>
<context>
<name>TransactionView</name>
</context>
<context>
<name>UnitDisplayStatusBarControl</name>
</context>
<context>
<name>WalletFrame</name>
</context>
<context>
<name>WalletModel</name>
</context>
<context>
<name>WalletView</name>
</context>
<context>
<name>straks-core</name>
</context>
</TS>
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
......@@ -26,11 +26,9 @@
#include <QPainter>
#include <QRadialGradient>
SplashScreen::SplashScreen(Qt::WindowFlags f, const QPixmap &pixmap) :
QSplashScreen(pixmap, f)
SplashScreen::SplashScreen(Qt::WindowFlags f) :
QWidget(0, f), curAlignment(0)
{
setAutoFillBackground(true);
// set reference point, paddings
int paddingLeft = 14;
int paddingTop = 470;
......@@ -49,11 +47,9 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const QPixmap &pixmap) :
QString font = "Arial";
// load the bitmap for writing some text over it
QPixmap newPixmap;
newPixmap = QPixmap(":/images/splash");
pixmap = QPixmap(":/images/splash");
QPainter pixPaint(&newPixmap);
QPainter pixPaint(&pixmap);
pixPaint.setPen(QColor(100,100,100));
// check font size and drawing with
......@@ -90,7 +86,11 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const QPixmap &pixmap) :
pixPaint.end();
this->setPixmap(newPixmap);
// Center and set as no-resize
QRect r(QPoint(), pixmap.size());
resize(r.size());
setFixedSize(r.size());
move(QApplication::desktop()->screenGeometry().center() - r.center());
subscribeToCoreSignals();
}
......
......@@ -16,12 +16,12 @@ class NetworkStyle;
* can take a long time, and in that case a progress window that cannot be
* moved around and minimized has turned out to be frustrating to the user.
*/
class SplashScreen : public QSplashScreen/* QWidget */
class SplashScreen : public QWidget
{
Q_OBJECT
public:
explicit SplashScreen(Qt::WindowFlags f, const QPixmap &pixmap);
explicit SplashScreen(Qt::WindowFlags f);
~SplashScreen();
protected:
......
......@@ -409,9 +409,10 @@ void StraksApplication::createWindow(const NetworkStyle *networkStyle)
void StraksApplication::createSplashScreen(/* const NetworkStyle *networkStyle */)
{
SplashScreen *splash = new SplashScreen(0, QPixmap());
SplashScreen *splash = new SplashScreen(0);
// We don't hold a direct pointer to the splash screen after creation, but the splash
// screen will take care of deleting itself when slotFinish happens.
splash->setWindowFlags(Qt::CustomizeWindowHint | Qt::WindowTitleHint);
splash->show();
connect(this, SIGNAL(splashFinished(QWidget*)), splash, SLOT(slotFinish(QWidget*)));
connect(this, SIGNAL(requestedShutdown()), splash, SLOT(close()));
......
......@@ -3665,6 +3665,7 @@ CWallet* CWallet::CreateWalletFromFile(const std::string walletFile)
if (fFirstRun)
{
uiInterface.InitMessage(_("Generating keypool... This can take a while..."));
// Create new keyUser and set as default key
if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) && !walletInstance->IsHDEnabled()) {
// generate a new master key
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment