AskDavis/Casinotest
1
0
Fork 0
mirror of https://github.com/AskDavis/Casinotest.git synced 2026-01-03 04:19:47 -08:00
Code Issues Packages Projects Releases Wiki Activity

Layout changes

Browse Source
This commit is contained in:
Andre Jochems
2015-12-01 10:57:18 +01:00
parent 9411ed14a5
commit d6ba4a154c
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/qt/aboutdialog.cpp
View File

@@ -6,7 +6,7 @@
// Copyright year (2009-this) // Copyright year (2009-this)
// Todo: update this when changing our copyright comments in the source // Todo: update this when changing our copyright comments in the source
const int ABOUTDIALOG_COPYRIGHT_YEAR = 2013; const int ABOUTDIALOG_COPYRIGHT_YEAR = 2015;
AboutDialog::AboutDialog(QWidget *parent) : AboutDialog::AboutDialog(QWidget *parent) :
QDialog(parent), QDialog(parent),
@@ -15,7 +15,9 @@ AboutDialog::AboutDialog(QWidget *parent) :
ui->setupUi(this); ui->setupUi(this);
// Set current copyright year // Set current copyright year
ui->copyrightLabel->setText(tr("Copyright") + QString(" &copy; 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin developers") + QString("<br>") + tr("Copyright") + QString(" &copy; ") + tr("2013-%1 The CasinoCoin developers").arg(ABOUTDIALOG_COPYRIGHT_YEAR)); ui->copyrightLabel->setText(tr("Copyright") + QString(" &copy; 2009-%1 ").arg(COPYRIGHT_YEAR) + tr("The Bitcoin developers") + QString("<br>") +
tr("Copyright") + QString(" &copy; ") + tr("2013-%1 The CasinoCoin developers").arg(ABOUTDIALOG_COPYRIGHT_YEAR) + QString("<br>") +
tr("Copyright") + QString(" &copy; ") + tr("2015 - GUI 2.0 Design by Felix Rojauro (felix.rojauro@gmail.com)"));
} }
void AboutDialog::setModel(ClientModel *model) void AboutDialog::setModel(ClientModel *model)

14
src/qt/forms/optionsdialog.ui
View File

@@ -23,7 +23,7 @@
<enum>QTabWidget::North</enum> <enum>QTabWidget::North</enum>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>3</number>
</property> </property>
<widget class="QWidget" name="tabMain"> <widget class="QWidget" name="tabMain">
<attribute name="title"> <attribute name="title">
@@ -31,7 +31,7 @@
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_Main"> <layout class="QVBoxLayout" name="verticalLayout_Main">
<item> <item>
<widget class="QFrame" name="verticalFrame"> <widget class="QFrame" name="verticalFrame1">
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout_6">
<item> <item>
<widget class="QLabel" name="transactionFeeInfoLabel"> <widget class="QLabel" name="transactionFeeInfoLabel">
@@ -72,7 +72,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QFrame" name="verticalFrame"> <widget class="QFrame" name="verticalFrame2">
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_5">
<item> <item>
<widget class="QCheckBox" name="bitcoinAtStartup"> <widget class="QCheckBox" name="bitcoinAtStartup">
@@ -143,7 +143,7 @@
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_Network"> <layout class="QVBoxLayout" name="verticalLayout_Network">
<item> <item>
<widget class="QFrame" name="verticalFrame"> <widget class="QFrame" name="verticalFrame3">
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<widget class="QCheckBox" name="connectSocks"> <widget class="QCheckBox" name="connectSocks">
@@ -280,7 +280,7 @@
</attribute> </attribute>
<layout class="QVBoxLayout" name="verticalLayout_Window"> <layout class="QVBoxLayout" name="verticalLayout_Window">
<item> <item>
<widget class="QFrame" name="verticalFrame"> <widget class="QFrame" name="verticalFrame4">
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<widget class="QCheckBox" name="minimizeToTray"> <widget class="QCheckBox" name="minimizeToTray">
@@ -326,7 +326,7 @@
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QFrame" name="verticalFrame"> <widget class="QFrame" name="verticalFrame5">
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_display_Language"> <layout class="QHBoxLayout" name="horizontalLayout_display_Language">
@@ -404,7 +404,7 @@
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QFrame" name="verticalFrame"> <widget class="QFrame" name="verticalFrame6">
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item> <item>
<widget class="QCheckBox" name="displayAddresses"> <widget class="QCheckBox" name="displayAddresses">

2
src/qt/guiconstants.h
View File

@@ -2,7 +2,7 @@
#define GUICONSTANTS_H #define GUICONSTANTS_H
/* Milliseconds between model updates */ /* Milliseconds between model updates */
static const int MODEL_UPDATE_DELAY = 250; static const int MODEL_UPDATE_DELAY = 1000;
/* AskPassphraseDialog -- Maximum passphrase length */ /* AskPassphraseDialog -- Maximum passphrase length */
static const int MAX_PASSPHRASE_SIZE = 1024; static const int MAX_PASSPHRASE_SIZE = 1024;

2
src/qt/overviewpage.cpp
View File

@@ -20,7 +20,7 @@
#include <QDebug> #include <QDebug>
#define DECORATION_SIZE 64 #define DECORATION_SIZE 64
#define NUM_ITEMS 3 #define NUM_ITEMS 5
class TxViewDelegate : public QAbstractItemDelegate class TxViewDelegate : public QAbstractItemDelegate
{ {

7
src/qt/splashscreen.cpp
View File

@@ -10,7 +10,7 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) :
QSplashScreen(pixmap, f) QSplashScreen(pixmap, f)
{ {
// set reference point, paddings // set reference point, paddings
int paddingLeftCol1 = 110; int paddingLeftCol1 = 90;
int paddingLeftCol2 = 170; int paddingLeftCol2 = 170;
int paddingTopCol = 300; int paddingTopCol = 300;
int line1 = 0; int line1 = 0;
@@ -20,8 +20,7 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) :
// define text to place // define text to place
QString versionText = QString("Version %1 ").arg(QString::fromStdString(FormatFullVersion())); QString versionText = QString("Version %1 ").arg(QString::fromStdString(FormatFullVersion()));
QString copyrightText = QChar(0xA9)+QString(" 2013-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The CasinoCoin developers")); QString copyrightText1 = QString("Copyright ") + QChar(0xA9) + QString(" 2013-%1 - ").arg(COPYRIGHT_YEAR) + QString(tr("The CasinoCoin developers"));
QString font = "Arial"; QString font = "Arial";
// load the bitmap for writing some text over it // load the bitmap for writing some text over it
@@ -41,7 +40,7 @@ SplashScreen::SplashScreen(const QPixmap &pixmap, Qt::WindowFlags f) :
// draw copyright stuff // draw copyright stuff
pixPaint.setFont(QFont(font, 8*fontFactor)); pixPaint.setFont(QFont(font, 8*fontFactor));
pixPaint.drawText(paddingLeftCol1,paddingTopCol+line1,copyrightText); pixPaint.drawText(paddingLeftCol1,paddingTopCol+line1,copyrightText1);
// draw version number // draw version number
pixPaint.setFont(QFont(font, 8*fontFactor)); pixPaint.setFont(QFont(font, 8*fontFactor));
pixPaint.drawText(paddingLeftCol2,paddingTopCol+line2,versionText); pixPaint.drawText(paddingLeftCol2,paddingTopCol+line2,versionText);