Skip to content

Commit

Permalink
Merge pull request #401 from duality-solutions/v2.4.4.0-WIP-Locales
Browse files Browse the repository at this point in the history 
Adding missing sections/translations to locale files.
  • Loading branch information
@Duality-CDOO
Duality-CDOO committed Nov 13, 2019
2 parents 4dacd4e + 878204c commit cfec40a
Show file tree
Hide file tree
Showing 25 changed files with 8,055 additions and 3,222 deletions.
29 changes: 11 additions & 18 deletions src/qt/bdapaccounttablemodel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,16 +102,7 @@ class BdapAccountTablePriv

inputtable->clearContents();
inputtable->setRowCount(0);
inputtable->setColumnCount(0);
inputtable->setSortingEnabled(true);
inputtable->setColumnCount(3);
inputtable->setColumnWidth(0, COMMONNAME_COLWIDTH); //Common Name (fixed)
inputtable->setColumnWidth(1, FULLPATH_COLWIDTH); //Object Full Path (fixed)
//inputtable->setColumnWidth(2, 175);

inputtable->setHorizontalHeaderItem(0, new QTableWidgetItem(QObject::tr("Common Name")));
inputtable->setHorizontalHeaderItem(1, new QTableWidgetItem(QObject::tr("Object Full Path")));
inputtable->setHorizontalHeaderItem(2, new QTableWidgetItem(QObject::tr("Expiration Date")));

//Parse results and populate QWidgetTable
for (size_t i {0} ; i < result.size() ; ++i) {
Expand Down Expand Up @@ -154,7 +145,7 @@ class BdapAccountTablePriv

std::string statusString = "Records found: " + std::to_string(recordsFound);

statusDisplay->setText(QObject::tr(statusString.c_str()));
statusDisplay->setText(std::to_string(recordsFound).c_str());

} //refreshAccounts

Expand All @@ -177,15 +168,17 @@ BdapAccountTableModel::BdapAccountTableModel(BdapPage* parent) : QAbstractTableM
bdapPage(parent),
timer(0)
{

currentIndex = bdapPage->getCurrentIndex();
userTable = bdapPage->getUserTable();
groupTable = bdapPage->getGroupTable();
userStatus = bdapPage->getUserStatus();
groupStatus = bdapPage->getGroupStatus();


columns << tr("Common Name") << tr("Object Full Path") << tr("Expiration Date");
userStatus = bdapPage->getNumRecordsFound();
groupStatus = bdapPage->getNumRecordsFound();
userTable->setColumnWidth(0, COMMONNAME_COLWIDTH); //Common Name (fixed)
userTable->setColumnWidth(1, FULLPATH_COLWIDTH); //Object Full Path (fixed)
userTable->setColumnWidth(2, 175);
groupTable->setColumnWidth(0, COMMONNAME_COLWIDTH); //Common Name (fixed)
groupTable->setColumnWidth(1, FULLPATH_COLWIDTH); //Object Full Path (fixed)
groupTable->setColumnWidth(2, 175);
priv.reset(new BdapAccountTablePriv());
// default to unsorted
priv->sortColumn = -1;
Expand Down Expand Up @@ -280,7 +273,7 @@ void BdapAccountTableModel::refreshUsers()
searchUserPath = bdapPage->getPathUserSearch();

Q_EMIT layoutAboutToBeChanged();
priv->refreshAccounts(userTable,userStatus,myUsersChecked,searchUserCommon,searchUserPath);
priv->refreshAccounts(userTable, userStatus, myUsersChecked, searchUserCommon, searchUserPath);
Q_EMIT layoutChanged();
}

Expand All @@ -291,7 +284,7 @@ void BdapAccountTableModel::refreshGroups()
searchGroupPath = bdapPage->getPathGroupSearch();

Q_EMIT layoutAboutToBeChanged();
priv->refreshAccounts(groupTable,groupStatus,myGroupsChecked,searchGroupCommon,searchGroupPath);
priv->refreshAccounts(groupTable, groupStatus, myGroupsChecked, searchGroupCommon, searchGroupPath);
Q_EMIT layoutChanged();
}

Expand Down
1 change: 1 addition & 0 deletions src/qt/bdapaccounttablemodel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#define DYNAMIC_QT_BDAPACCOUNTTABLEMODEL_H

#include <QAbstractTableModel>
#include <QObject>
#include <QStringList>
#include <QTableWidget>
#include <QLabel>
Expand Down
6 changes: 0 additions & 6 deletions src/qt/bdaplinktablemodel.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,13 +103,7 @@ class BdapLinkTablePriv

inputtable->clearContents();
inputtable->setRowCount(0);
inputtable->setColumnCount(0);
inputtable->setSortingEnabled(true);
inputtable->setColumnCount(3);

inputtable->setHorizontalHeaderItem(0, new QTableWidgetItem(QObject::tr("Requestor")));
inputtable->setHorizontalHeaderItem(1, new QTableWidgetItem(QObject::tr("Recipient")));
inputtable->setHorizontalHeaderItem(2, new QTableWidgetItem(QObject::tr("Date")));

//make columns resize dynamically
QHeaderView* header = inputtable->horizontalHeader();
Expand Down
5 changes: 5 additions & 0 deletions src/qt/bdappage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,11 @@ QLabel* BdapPage::getUserStatus()
return ui->labelUserStatus;
}

QLabel* BdapPage::getNumRecordsFound()
{
return ui->labelNumRecordsFound;
}

QLabel* BdapPage::getLinkCompleteRecords()
{
return ui->labelCompleteRecords;
Expand Down
1 change: 1 addition & 0 deletions src/qt/bdappage.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ class BdapPage : public QWidget
QTableWidget* getPendingRequestTable();

QLabel* getUserStatus();
QLabel* getNumRecordsFound();
QLabel* getGroupStatus();
bool getMyUserCheckBoxChecked();
bool getMyGroupCheckBoxChecked();
Expand Down
3 changes: 3 additions & 0 deletions src/qt/dynamicgui.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ class DynodeList;
class HelpMessageDialog;
class MiningPage;
class BdapPage;
class BdapAccountTableModel;
class BdapAddUserDialog;
class BdapLinkDetailDialog;
class ModalOverlay;
class NetworkStyle;
class Notificator;
Expand Down
105 changes: 97 additions & 8 deletions src/qt/forms/bdappage.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,21 @@ QTabBar { alignment: left; }
<attribute name="verticalHeaderStretchLastSection">
<bool>false</bool>
</attribute>
<column>
<property name="text">
<string>Common Name</string>
</property>
</column>
<column>
<property name="text">
<string>Object Full Path</string>
</property>
</column>
<column>
<property name="text">
<string>Expiration Date</string>
</property>
</column>
</widget>
</item>
<item>
Expand Down Expand Up @@ -200,13 +215,20 @@ QTabBar { alignment: left; }
</sizepolicy>
</property>
<property name="text">
<string/>
<string>Records found: </string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelNumRecordsFound">
<property name="text">
<string>0</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
Expand Down Expand Up @@ -294,6 +316,21 @@ QTabBar { alignment: left; }
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<column>
<property name="text">
<string>Common Name</string>
</property>
</column>
<column>
<property name="text">
<string>Object Full Path</string>
</property>
</column>
<column>
<property name="text">
<string>Expiration Date</string>
</property>
</column>
</widget>
</item>
<item>
Expand Down Expand Up @@ -387,13 +424,20 @@ QTabBar { alignment: left; }
</sizepolicy>
</property>
<property name="text">
<string/>
<string>Records found: </string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="labelNumGroupsFound">
<property name="text">
<string>0</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
Expand Down Expand Up @@ -476,8 +520,23 @@ QTabBar { alignment: left; }
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="columnCount">
<number>0</number>
</property>
<number>3</number>
</property>
<column>
<property name="text">
<string>Requestor</string>
</property>
</column>
<column>
<property name="text">
<string>Recipient</string>
</property>
</column>
<column>
<property name="text">
<string>Date</string>
</property>
</column>
</widget>
</item>
<item>
Expand Down Expand Up @@ -638,8 +697,23 @@ QTabBar { alignment: left; }
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="columnCount">
<number>0</number>
</property>
<number>3</number>
</property>
<column>
<property name="text">
<string>Requestor</string>
</property>
</column>
<column>
<property name="text">
<string>Recipient</string>
</property>
</column>
<column>
<property name="text">
<string>Date</string>
</property>
</column>
</widget>
</item>
<item>
Expand Down Expand Up @@ -770,8 +844,23 @@ QTabBar { alignment: left; }
<enum>QAbstractItemView::SelectRows</enum>
</property>
<property name="columnCount">
<number>0</number>
</property>
<number>3</number>
</property>
<column>
<property name="text">
<string>Requestor</string>
</property>
</column>
<column>
<property name="text">
<string>Recipient</string>
</property>
</column>
<column>
<property name="text">
<string>Date</string>
</property>
</column>
</widget>
</item>
<item>
Expand Down
2 changes: 1 addition & 1 deletion src/qt/forms/mnemonicdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ font-weight: bold;</string>
<widget class="QLabel" name="label_8">
<property name="text">
<string>Please ensure you backup your Recovery Phrase and Passphrase - they are not recoverable!
Wallet wil restart after mnemonic has been imported.</string>
Wallet will restart after mnemonic has been imported.</string>
</property>
</widget>
</item>
Expand Down

0 comments on commit cfec40a

Please sign in to comment.