diff --git a/application.qrc b/application.qrc
index 42f093b..62ceb1d 100644
--- a/application.qrc
+++ b/application.qrc
@@ -12,16 +12,16 @@
res/sdlogo.png
res/sdlogo2.png
res/Berg.png
- res/denio.png
- res/duke.png
- res/sharpee.png
- res/yoda.png
- res/mickey.png
- res/snoopy.png
- res/popey.png
- res/garfield.png
- res/pinguin.png
- res/hirsch.png
+ res/Denio.png
+ res/Duke.png
+ res/Sharpee.png
+ res/Yoda.png
+ res/Mickey.png
+ res/Snoopy.png
+ res/Popey.png
+ res/Garfield.png
+ res/Pinguin.png
+ res/Hirsch.png
res/hushdlogo.gif
diff --git a/res/denio.png b/res/Denio.png
similarity index 100%
rename from res/denio.png
rename to res/Denio.png
diff --git a/res/duke.png b/res/Duke.png
similarity index 100%
rename from res/duke.png
rename to res/Duke.png
diff --git a/res/garfield.png b/res/Garfield.png
similarity index 100%
rename from res/garfield.png
rename to res/Garfield.png
diff --git a/res/hirsch.png b/res/Hirsch.png
similarity index 100%
rename from res/hirsch.png
rename to res/Hirsch.png
diff --git a/res/mickey.png b/res/Mickey.png
similarity index 100%
rename from res/mickey.png
rename to res/Mickey.png
diff --git a/res/pinguin.png b/res/Pinguin.png
similarity index 100%
rename from res/pinguin.png
rename to res/Pinguin.png
diff --git a/res/popey.png b/res/Popey.png
similarity index 100%
rename from res/popey.png
rename to res/Popey.png
diff --git a/res/sharpee.png b/res/Sharpee.png
similarity index 100%
rename from res/sharpee.png
rename to res/Sharpee.png
diff --git a/res/snoopy.png b/res/Snoopy.png
similarity index 100%
rename from res/snoopy.png
rename to res/Snoopy.png
diff --git a/res/Unbenannt-4 Kopie.png b/res/Unbenannt-4 Kopie.png
deleted file mode 100644
index e9d0d54..0000000
Binary files a/res/Unbenannt-4 Kopie.png and /dev/null differ
diff --git a/res/yoda.png b/res/Yoda.png
similarity index 100%
rename from res/yoda.png
rename to res/Yoda.png
diff --git a/src/addressbook.cpp b/src/addressbook.cpp
index 70df68e..6f209d1 100644
--- a/src/addressbook.cpp
+++ b/src/addressbook.cpp
@@ -169,7 +169,10 @@ void AddressBook::open(MainWindow* parent, QLineEdit* target)
auto myAddr = ab.addr_chat->text().trimmed();
QString newLabel = ab.label->text();
QString cid = ab.cid->text();
- QString avatar = "res/yoda.png";
+
+
+ QString avatar = QString("res/") + ab.comboBoxAvatar->currentText() + QString(".png");
+ qDebug()<<"AVATAR NAME : " << avatar;
if (addr.isEmpty() || newLabel.isEmpty())
{
@@ -332,11 +335,34 @@ void AddressBook::open(MainWindow* parent, QLineEdit* target)
}
};
+ // Get Avatar Data
+
+
+ // int avatar_index = ab.comboBoxAvatar->findText(AddressBook::getInstance()->get_avatar_name(), Qt::MatchExactly);
+ // ab.comboBoxAvatar->setCurrentIndex(avatar_index);
+
+ // QObject::connect(ab.comboBoxAvatar, &QComboBox::currentTextChanged, [=] (QString avatar_name) {
+ // parent->slot_change_avatar(avatar_name);
+ // rpc->refresh(true);
+ // });
+
// Refresh after the dialog is closed to update the labels everywhere.
parent->getRPC()->refresh(true);
model.updateUi(); //todo fix updating gui after adding
}
+QString AddressBook::get_avatar_name() {
+ // Load from the QT Settings.
+ // QString avatar = ab.comboBoxAvatar.text();
+ // return QString()
+}
+
+void AddressBook::set_avatar_name(QString avatar_name) {
+ avatar_name = "abs.comboBoxAvatar.text()";
+}
+
+
+
//=============
// AddressBook singleton class
//=============
@@ -515,6 +541,8 @@ QString AddressBook::addLabelToAddress(QString addr)
return addr;
}
+
+
QString AddressBook::addressFromAddressLabel(const QString& lblAddr)
{
return lblAddr.trimmed().split("/").last();
diff --git a/src/addressbook.h b/src/addressbook.h
index 6c7a450..fee3ac6 100644
--- a/src/addressbook.h
+++ b/src/addressbook.h
@@ -22,6 +22,7 @@ public:
int columnCount(const QModelIndex &parent) const;
QVariant data(const QModelIndex &index, int role) const;
QVariant headerData(int section, Qt::Orientation orientation, int role) const;
+
private:
void loadData();
@@ -58,6 +59,14 @@ public:
QString getLabelForAddress(QString address);
// Get a Label's address
QString getAddressForLabel(QString label);
+
+ QString get_avatar_name();
+ void set_avatar_name(QString avatar_name);
+
+
+
+
+
private:
AddressBook();
diff --git a/src/addressbook.ui b/src/addressbook.ui
index 6f3015d..4cec4b1 100644
--- a/src/addressbook.ui
+++ b/src/addressbook.ui
@@ -69,7 +69,7 @@
- :/icons/res/hirsch.png
+ :/icons/res/Hirsch.png
@@ -79,7 +79,7 @@
- :/icons/res/denio.png
+ :/icons/res/Denio.png
@@ -89,7 +89,7 @@
- :/icons/res/duke.png
+ :/icons/res/Duke.png
@@ -99,7 +99,7 @@
- :/icons/res/yoda.png
+ :/icons/res/Yoda.png
@@ -119,7 +119,7 @@
- :/icons/res/sharpee.png
+ :/icons/res/Sharpee.png
@@ -129,7 +129,7 @@
- :/icons/res/garfield.png
+ :/icons/res/Garfield.png
@@ -139,7 +139,7 @@
- :/icons/res/snoopy.png
+ :/icons/res/Snoopy.png
@@ -149,7 +149,7 @@
- :/icons/res/popey.png
+ :/icons/res/Popey.png
@@ -159,7 +159,17 @@
- :/icons/res/pinguin.png
+ :/icons/res/Pinguin.png
+
+
+
+ -
+
+ Mickey
+
+
+
+ :/icons/res/Mickey.png
diff --git a/src/contactmodel.cpp b/src/contactmodel.cpp
index 6131485..0475e6e 100644
--- a/src/contactmodel.cpp
+++ b/src/contactmodel.cpp
@@ -13,7 +13,7 @@ void ContactModel::renderContactList(QListView* view)
if ((theme == "dark" || theme == "midnight")) {
// QIcon avatar = c.getAvatar();
- QString avatar = "res/yoda.png";
+ QString avatar = c.getAvatar();
QStandardItem* Items1 = new QStandardItem(QIcon(avatar) ,c.getName());
contact->appendRow(Items1);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 05126f8..5e166e4 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -436,7 +436,9 @@ void MainWindow::setupSettingsModal() {
this->slot_change_currency(currency_name);
- ;
+ // Include Avatar
+
+
// Setup theme combo
@@ -461,7 +463,7 @@ void MainWindow::setupSettingsModal() {
// Tell the user to restart
QMessageBox::information(this, tr("Currency Change"), tr("This change can take a few seconds."), QMessageBox::Ok);
});
-
+
// Check for updates
settings.chkCheckUpdates->setChecked(Settings::getInstance()->getCheckForUpdates());
@@ -1468,6 +1470,26 @@ void MainWindow::slot_change_currency(const QString& currency_name)
}
}
+void MainWindow::slot_change_avatar(const QString& avatar_name)
+
+{
+
+ AddressBook::getInstance()->set_avatar_name(avatar_name);
+
+ // Include currency
+
+ QString saved_avatar_name;
+ try
+ {
+ saved_avatar_name = AddressBook::getInstance()->get_avatar_name();
+
+ }
+ catch (...)
+ {
+ saved_avatar_name = "Yoda";
+
+ }
+}
void MainWindow::slot_change_theme(const QString& theme_name)
diff --git a/src/mainwindow.h b/src/mainwindow.h
index c767128..0441de3 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -83,6 +83,7 @@ public:
public slots:
void slot_change_theme(const QString& themeName);
void slot_change_currency(const QString& currencyName);
+ void slot_change_avatar(const QString& avatarName);
private:
void closeEvent(QCloseEvent* event);
diff --git a/src/settings.cpp b/src/settings.cpp
index fbfb1cb..2d99ff7 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -225,13 +225,9 @@ QString Settings::get_currency_name() {
}
void Settings::set_currency_name(QString currency_name) {
- QSettings().setValue("options/currency_name", currency_name);
-
-
-
+ QSettings().setValue("options/currency_name", currency_name);
}
-
QString Settings::get_theme_name() {
// Load from the QT Settings.
return QSettings().value("options/theme_name", false).toString();
@@ -242,6 +238,9 @@ void Settings::set_theme_name(QString theme_name) {
}
+
+
+
//=================================
// Static Stuff
//=================================
diff --git a/src/settings.h b/src/settings.h
index a917d67..c598369 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -67,6 +67,8 @@ public:
void set_currency_name(QString currency_name);
+
+
bool isSaplingActive();
void setZECPrice(double p) { ZECPrice = p; }