diff --git a/src/gui/qt/mainwindow.ui b/src/gui/qt/mainwindow.ui index bb6ec79f..84615cda 100644 --- a/src/gui/qt/mainwindow.ui +++ b/src/gui/qt/mainwindow.ui @@ -6102,7 +6102,7 @@ 0 0 1006 - 30 + 29 diff --git a/src/gui/qt/resources.qrc b/src/gui/qt/resources.qrc index 0bd63f47..cafabf10 100755 --- a/src/gui/qt/resources.qrc +++ b/src/gui/qt/resources.qrc @@ -10,13 +10,24 @@ resources/graphics/actions/action_winner.png + resources/avatar/Catherine_russia.png + resources/avatar/Columbus.png + resources/avatar/Elisabeth1.png + resources/avatar/George_Washington.png + resources/avatar/James_Watt.png + resources/avatar/Louis_XIV.png + resources/avatar/Martin_Luther_King.png + resources/avatar/Napoleon.png + resources/avatar/PopeInnocentX.png + resources/avatar/Pope_Clement_VII.png + resources/avatar/Sissi.png resources/avatar/albert_einstein.png + resources/avatar/bach.png resources/avatar/clipart1.png resources/avatar/goethe.png resources/avatar/linus.png resources/avatar/marc.png resources/avatar/mozart.png - resources/avatar/bach.png resources/graphics/cards/0.png diff --git a/src/gui/qt/resources/avatar/Catherine_russia.png b/src/gui/qt/resources/avatar/Catherine_russia.png new file mode 100644 index 00000000..c30f2896 Binary files /dev/null and b/src/gui/qt/resources/avatar/Catherine_russia.png differ diff --git a/src/gui/qt/resources/avatar/Columbus.png b/src/gui/qt/resources/avatar/Columbus.png new file mode 100644 index 00000000..cd424bb8 Binary files /dev/null and b/src/gui/qt/resources/avatar/Columbus.png differ diff --git a/src/gui/qt/resources/avatar/Elisabeth1.png b/src/gui/qt/resources/avatar/Elisabeth1.png new file mode 100644 index 00000000..60482dd8 Binary files /dev/null and b/src/gui/qt/resources/avatar/Elisabeth1.png differ diff --git a/src/gui/qt/resources/avatar/George_Washington.png b/src/gui/qt/resources/avatar/George_Washington.png new file mode 100644 index 00000000..0041f2b0 Binary files /dev/null and b/src/gui/qt/resources/avatar/George_Washington.png differ diff --git a/src/gui/qt/resources/avatar/James_Watt.png b/src/gui/qt/resources/avatar/James_Watt.png new file mode 100644 index 00000000..f1dc5a44 Binary files /dev/null and b/src/gui/qt/resources/avatar/James_Watt.png differ diff --git a/src/gui/qt/resources/avatar/Louis_XIV.png b/src/gui/qt/resources/avatar/Louis_XIV.png new file mode 100644 index 00000000..f1f907ac Binary files /dev/null and b/src/gui/qt/resources/avatar/Louis_XIV.png differ diff --git a/src/gui/qt/resources/avatar/Martin_Luther_King.png b/src/gui/qt/resources/avatar/Martin_Luther_King.png new file mode 100644 index 00000000..0839a7e9 Binary files /dev/null and b/src/gui/qt/resources/avatar/Martin_Luther_King.png differ diff --git a/src/gui/qt/resources/avatar/Napoleon.png b/src/gui/qt/resources/avatar/Napoleon.png new file mode 100644 index 00000000..30eb3d97 Binary files /dev/null and b/src/gui/qt/resources/avatar/Napoleon.png differ diff --git a/src/gui/qt/resources/avatar/PopeInnocentX.png b/src/gui/qt/resources/avatar/PopeInnocentX.png new file mode 100644 index 00000000..c0e0c96f Binary files /dev/null and b/src/gui/qt/resources/avatar/PopeInnocentX.png differ diff --git a/src/gui/qt/resources/avatar/Pope_Clement_VII.png b/src/gui/qt/resources/avatar/Pope_Clement_VII.png new file mode 100644 index 00000000..059a0b22 Binary files /dev/null and b/src/gui/qt/resources/avatar/Pope_Clement_VII.png differ diff --git a/src/gui/qt/resources/avatar/Sissi.png b/src/gui/qt/resources/avatar/Sissi.png new file mode 100644 index 00000000..69a1b81a Binary files /dev/null and b/src/gui/qt/resources/avatar/Sissi.png differ diff --git a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp index 089c502c..764f51b5 100644 --- a/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp +++ b/src/gui/qt/settingsdialog/selectavatardialog/selectavatardialogimpl.cpp @@ -52,14 +52,25 @@ selectAvatarDialogImpl::selectAvatarDialogImpl(QWidget *parent, ConfigFile *c) // }; QStringList avatarList; - avatarList << ":avatar/resources/avatar/albert_einstein.png"; - avatarList << ":avatar/resources/avatar/linus.png"; - avatarList << ":avatar/resources/avatar/mozart.png"; - avatarList << ":avatar/resources/avatar/bach.png"; - avatarList << ":avatar/resources/avatar/goethe.png"; - avatarList << ":avatar/resources/avatar/marc.png"; - avatarList << ":avatar/resources/avatar/clipart1.png"; + avatarList << ":avatar/resources/avatar/Catherine_russia.png"; + avatarList << ":avatar/resources/avatar/Columbus.png"; + avatarList << ":avatar/resources/avatar/Elisabeth1.png"; + avatarList << ":avatar/resources/avatar/George_Washington.png"; + avatarList << ":avatar/resources/avatar/James_Watt.png"; + avatarList << ":avatar/resources/avatar/Louis_XIV.png"; + avatarList << ":avatar/resources/avatar/Martin_Luther_King.png"; + avatarList << ":avatar/resources/avatar/Napoleon.png"; + avatarList << ":avatar/resources/avatar/PopeInnocentX.png"; + avatarList << ":avatar/resources/avatar/Pope_Clement_VII.png"; + avatarList << ":avatar/resources/avatar/Sissi.png"; + avatarList << ":avatar/resources/avatar/albert_einstein.png"; + avatarList << ":avatar/resources/avatar/bach.png"; + avatarList << ":avatar/resources/avatar/clipart1.png"; + avatarList << ":avatar/resources/avatar/goethe.png"; + avatarList << ":avatar/resources/avatar/linus.png"; + avatarList << ":avatar/resources/avatar/marc.png"; + avatarList << ":avatar/resources/avatar/mozart.png"; int i; for (i=0; i